diff options
Diffstat (limited to 'meta-networking/recipes-daemons')
34 files changed, 372 insertions, 165 deletions
diff --git a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb index 41b7cf0878..eca004302b 100644 --- a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb +++ b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb | |||
@@ -11,7 +11,6 @@ SRC_URI = "git://git.code.sf.net/p/atftp/code;branch=master;protocol=https \ | |||
11 | file://atftpd.service \ | 11 | file://atftpd.service \ |
12 | " | 12 | " |
13 | 13 | ||
14 | S = "${WORKDIR}/git" | ||
15 | 14 | ||
16 | inherit autotools update-rc.d systemd | 15 | inherit autotools update-rc.d systemd |
17 | 16 | ||
diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 90e7814a0f..ede4491309 100644 --- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb | |||
@@ -83,7 +83,7 @@ FILES:${PN}-test = "/opt/${BPN}" | |||
83 | # needs tcl to run tests | 83 | # needs tcl to run tests |
84 | RDEPENDS:${PN}-test += "tcl ${BPN}" | 84 | RDEPENDS:${PN}-test += "tcl ${BPN}" |
85 | 85 | ||
86 | PPPD_VERSION="${@get_ppp_version(d)}" | 86 | PPPD_VERSION = "${@get_ppp_version(d)}" |
87 | 87 | ||
88 | def get_ppp_version(d): | 88 | def get_ppp_version(d): |
89 | import re | 89 | import re |
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.10.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.11.bb index 6a272775f6..db4a4313a4 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.10.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.11.bb | |||
@@ -12,7 +12,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) | |||
12 | 12 | ||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
14 | 14 | ||
15 | SRCREV = "d0f04ae4b9bf0bc0be55fbda5f235afdfbf5dd19" | 15 | SRCREV = "4b3e853ab468a95d8a035efa8fc4298a6c6318a3" |
16 | 16 | ||
17 | SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ | 17 | SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ |
18 | file://0001-Makefile-Do-not-set-Werror.patch \ | 18 | file://0001-Makefile-Do-not-set-Werror.patch \ |
@@ -23,7 +23,6 @@ SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ | |||
23 | file://iscsi-initiator-targets.service \ | 23 | file://iscsi-initiator-targets.service \ |
24 | file://set_initiatorname \ | 24 | file://set_initiatorname \ |
25 | " | 25 | " |
26 | S = "${WORKDIR}/git" | ||
27 | 26 | ||
28 | inherit update-rc.d systemd autotools pkgconfig | 27 | inherit update-rc.d systemd autotools pkgconfig |
29 | 28 | ||
diff --git a/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch b/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch index 1f9f8b30b1..e44e2035c2 100644 --- a/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch +++ b/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch | |||
@@ -13,12 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | configure.ac | 3 +-- | 13 | configure.ac | 3 +-- |
14 | 1 file changed, 1 insertion(+), 2 deletions(-) | 14 | 1 file changed, 1 insertion(+), 2 deletions(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index fae16f1..677b94a 100644 | ||
18 | --- a/configure.ac | 16 | --- a/configure.ac |
19 | +++ b/configure.ac | 17 | +++ b/configure.ac |
20 | @@ -904,8 +904,7 @@ if test "$enable_hardening" != no; then | 18 | @@ -1013,8 +1013,7 @@ if test "$enable_hardening" != no; then |
21 | "-Wp,-D_FORTIFY_SOURCE=2" \ | 19 | "-Wp,-D_FORTIFY_SOURCE=$FORTIFY_SOURCE" \ |
22 | "-fexceptions" \ | 20 | "-fexceptions" \ |
23 | "-fstack-protector-strong" \ | 21 | "-fstack-protector-strong" \ |
24 | - "--param=ssp-buffer-size=4" \ | 22 | - "--param=ssp-buffer-size=4" \ |
diff --git a/meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch b/meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch new file mode 100644 index 0000000000..f6a38668ee --- /dev/null +++ b/meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From f129c588f7c8a66e595d8ae96a43d585018e79cd Mon Sep 17 00:00:00 2001 | ||
2 | From: Quentin Armitage <quentin@armitage.org.uk> | ||
3 | Date: Thu, 7 Nov 2024 11:09:43 +0000 | ||
4 | Subject: [PATCH] vrrp: Don't include <linux/if_ether.h> if not needed | ||
5 | |||
6 | The musl headers do not allow including both <linux/if_ether.h> and | ||
7 | <net/ethernet.h> since they both define struct ethhdr. | ||
8 | |||
9 | It is likely that we do not need to include <linux/if_ether.h> at all | ||
10 | since with both glibc and musl including <net/ethernet.h> is sufficient, | ||
11 | but removing <linux/if_ether.h> is for another day. | ||
12 | |||
13 | Upstream-Status: Backport [https://github.com/acassen/keepalived/commit/f129c588f7c8a66e595d8ae96a43d585018e79cd] | ||
14 | Signed-off-by: Quentin Armitage <quentin@armitage.org.uk> | ||
15 | --- | ||
16 | keepalived/vrrp/vrrp.c | 4 +++- | ||
17 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c | ||
20 | index 96b2c4c8..4b06e387 100644 | ||
21 | --- a/keepalived/vrrp/vrrp.c | ||
22 | +++ b/keepalived/vrrp/vrrp.c | ||
23 | @@ -40,8 +40,10 @@ | ||
24 | #include <netinet/ip6.h> | ||
25 | #include <stdint.h> | ||
26 | #include <net/if_arp.h> | ||
27 | -#include <linux/if_ether.h> | ||
28 | #include <net/ethernet.h> | ||
29 | +#if !defined ETH_HLEN || !defined ETH_ZLEN | ||
30 | +#include <linux/if_ether.h> /* This may not be needed at all - try removing and see if any issues raised */ | ||
31 | +#endif | ||
32 | #ifdef _NETWORK_TIMESTAMP_ | ||
33 | #include <linux/net_tstamp.h> | ||
34 | #endif | ||
diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb b/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb index c4d59d3caa..6fb4886b96 100644 --- a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb +++ b/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb | |||
@@ -12,18 +12,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
12 | 12 | ||
13 | SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ | 13 | SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ |
14 | file://0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch \ | 14 | file://0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch \ |
15 | file://0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch \ | ||
15 | " | 16 | " |
16 | SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6" | 17 | SRC_URI[sha256sum] = "77f4a22e5a23fa8e49b8916acdfb584c864e72905a2f1de2a7f62ed40a896160" |
17 | UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" | 18 | UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" |
18 | 19 | ||
19 | DEPENDS = "libnfnetlink openssl" | 20 | DEPENDS = "libnfnetlink openssl" |
20 | 21 | ||
21 | inherit autotools pkgconfig systemd | 22 | inherit autotools pkgconfig systemd |
22 | 23 | ||
23 | PACKAGECONFIG ??= "libnl snmp \ | 24 | PACKAGECONFIG ??= "libnl snmp reproducible \ |
24 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ | 25 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ |
25 | " | 26 | " |
26 | PACKAGECONFIG[libnl] = "--enable-libnl,--disable-libnl,libnl" | 27 | PACKAGECONFIG[libnl] = "--enable-libnl,--disable-libnl,libnl" |
28 | PACKAGECONFIG[reproducible] = "--enable-reproducible-build,," | ||
27 | PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" | 29 | PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" |
28 | PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--with-init=SYSV,systemd" | 30 | PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--with-init=SYSV,systemd" |
29 | 31 | ||
@@ -44,6 +46,9 @@ do_install:append() { | |||
44 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 46 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
45 | install -D -m 0644 ${B}/${BPN}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service | 47 | install -D -m 0644 ${B}/${BPN}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service |
46 | fi | 48 | fi |
49 | if [ -n "${@bb.utils.filter('PACKAGECONFIG', 'reproducible', d)}" ]; then | ||
50 | sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${D}${sysconfdir}/keepalived/keepalived.config-opts | ||
51 | fi | ||
47 | } | 52 | } |
48 | 53 | ||
49 | PACKAGE_BEFORE_PN = "${PN}-samples" | 54 | PACKAGE_BEFORE_PN = "${PN}-samples" |
diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.19.bb index 4deab153c4..f4c030f7ce 100644 --- a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.19.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "\ | |||
12 | file://run-ptest \ | 12 | file://run-ptest \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "4b320675d608901a4a0d4feff8f96bb846d4913d914b0cf75b7d0ae80490f2f7" | 15 | SRC_URI[sha256sum] = "f87df3163d5e5138da901d055b384009785d1eb50fdb17a2343910fcf30a997f" |
16 | 16 | ||
17 | inherit autotools update-rc.d useradd systemd pkgconfig bash-completion github-releases ptest | 17 | inherit autotools update-rc.d useradd systemd pkgconfig bash-completion github-releases ptest |
18 | 18 | ||
diff --git a/meta-networking/recipes-daemons/ncftp/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch b/meta-networking/recipes-daemons/ncftp/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch new file mode 100644 index 0000000000..9b8a0c778b --- /dev/null +++ b/meta-networking/recipes-daemons/ncftp/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | fix select arg detection | ||
2 | |||
3 | Reference: | ||
4 | https://bugs.gentoo.org/921487 | ||
5 | |||
6 | Upstream-Status: Inappropriate [unresponsive contact email address] | ||
7 | |||
8 | Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- a/autoconf_local/aclocal.m4 | ||
11 | +++ b/autoconf_local/aclocal.m4 | ||
12 | @@ -4196,7 +4196,7 @@ AC_MSG_CHECKING([types of arguments for | ||
13 | #include <sys/select.h> | ||
14 | #endif | ||
15 | #include <sys/socket.h> /* MG: always incl */ | ||
16 | -extern select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl | ||
17 | +extern int select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl | ||
18 | [ac_not_found=no ; break 3],ac_not_found=yes) | ||
19 | done | ||
20 | done | ||
diff --git a/meta-networking/recipes-daemons/ncftp/ncftp/0002-ncftp-3.2.7-fix-clang.patch b/meta-networking/recipes-daemons/ncftp/ncftp/0002-ncftp-3.2.7-fix-clang.patch new file mode 100644 index 0000000000..a8de816e62 --- /dev/null +++ b/meta-networking/recipes-daemons/ncftp/ncftp/0002-ncftp-3.2.7-fix-clang.patch | |||
@@ -0,0 +1,73 @@ | |||
1 | Fix compilation with clang-16 | ||
2 | |||
3 | aclocal.m4 contains code that no longer compiles: missing headers and missing | ||
4 | return types. | ||
5 | |||
6 | Reference: | ||
7 | https://gitweb.gentoo.org/repo/gentoo.git/tree/net-ftp/ncftp/files/ncftp-3.2.7-fix-clang.patch | ||
8 | |||
9 | Upstream-Status: Inappropriate [unresponsive contact email address] | ||
10 | |||
11 | Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- a/autoconf_local/aclocal.m4 | ||
14 | +++ b/autoconf_local/aclocal.m4 | ||
15 | @@ -3057,6 +3057,7 @@ AC_TRY_LINK([ | ||
16 | #include <sys/uio.h> | ||
17 | #include <sys/socket.h> | ||
18 | #include <sys/un.h> | ||
19 | +#include <string.h> | ||
20 | ],[ | ||
21 | struct sockaddr_un uaddr; | ||
22 | |||
23 | @@ -3285,6 +3286,7 @@ AC_TRY_LINK([ | ||
24 | #ifdef HAVE_RESOLV_H | ||
25 | # include <resolv.h> | ||
26 | #endif | ||
27 | +#include <string.h> | ||
28 | ],[ | ||
29 | /* function-body */ | ||
30 | int len; | ||
31 | @@ -3363,6 +3365,7 @@ else | ||
32 | #include <stdio.h> | ||
33 | #include <stdlib.h> | ||
34 | |||
35 | + int | ||
36 | main(int argc, char **argv) | ||
37 | { | ||
38 | /* Note: don't actually call readline, | ||
39 | @@ -5144,6 +5147,7 @@ do | ||
40 | #ifdef HAVE_STDLIB_H | ||
41 | # include <stdlib.h> | ||
42 | #endif | ||
43 | +#include <string.h> | ||
44 | |||
45 | #ifdef HAVE_NCURSES_H | ||
46 | # define NCURSES_OPAQUE 0 | ||
47 | @@ -5175,6 +5179,7 @@ do | ||
48 | #endif | ||
49 | |||
50 | |||
51 | +int | ||
52 | main(int argc, char **argv) | ||
53 | { | ||
54 | /* Note: don't actually call curses, since it may block; | ||
55 | @@ -6509,7 +6514,6 @@ char *malloc(); | ||
56 | #endif | ||
57 | #endif /* MG */ | ||
58 | |||
59 | -int | ||
60 | int main(void) | ||
61 | { | ||
62 | char *data, *data2, *data3; | ||
63 | @@ -6606,8 +6610,9 @@ else | ||
64 | AC_CACHE_CHECK(whether setvbuf arguments are reversed, | ||
65 | ac_cv_func_setvbuf_reversed, | ||
66 | [AC_TRY_RUN([#include <stdio.h> | ||
67 | + $include <stdlib.h> | ||
68 | /* If setvbuf has the reversed format, exit 0. */ | ||
69 | - main () { | ||
70 | + int main (void) { | ||
71 | /* This call has the arguments reversed. | ||
72 | A reversed system may check and see that the address of main | ||
73 | is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */ | ||
diff --git a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb index de111cac05..6b62e135d6 100644 --- a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb +++ b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb | |||
@@ -9,9 +9,12 @@ SRC_URI = "https://www.ncftp.com/public_ftp/ncftp/${BP}-src.tar.xz \ | |||
9 | file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \ | 9 | file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \ |
10 | file://unistd.patch \ | 10 | file://unistd.patch \ |
11 | file://0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch \ | 11 | file://0001-Forward-port-defining-PREFIX_BINDIR-to-use-new-autoc.patch \ |
12 | file://0001-ncftp-3.2.7-fix-gcc14.patch \ | ||
13 | file://0002-ncftp-3.2.7-fix-clang.patch \ | ||
12 | " | 14 | " |
13 | SRC_URI[sha256sum] = "d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8" | 15 | SRC_URI[sha256sum] = "d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8" |
14 | 16 | ||
17 | # Doesn't use automake | ||
15 | inherit autotools-brokensep pkgconfig | 18 | inherit autotools-brokensep pkgconfig |
16 | 19 | ||
17 | CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall" | 20 | CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall" |
@@ -19,8 +22,8 @@ CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall" | |||
19 | PACKAGECONFIG ??= "" | 22 | PACKAGECONFIG ??= "" |
20 | PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,," | 23 | PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,," |
21 | 24 | ||
25 | EXTRA_AUTORECONF += "--exclude=aclocal -I ${S}/autoconf_local" | ||
22 | EXTRA_OECONF = "--disable-precomp --disable-universal ac_cv_path_TAR=tar" | 26 | EXTRA_OECONF = "--disable-precomp --disable-universal ac_cv_path_TAR=tar" |
23 | ACLOCALEXTRAPATH:append = " -I ${S}/autoconf_local" | ||
24 | 27 | ||
25 | do_install () { | 28 | do_install () { |
26 | install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir} | 29 | install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir} |
diff --git a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb index 7f06e0ebf3..e7db8a948b 100644 --- a/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb +++ b/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb | |||
@@ -14,7 +14,6 @@ REQUIRED_DISTRO_FEATURES = "systemd gobject-introspection-data" | |||
14 | SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2" | 14 | SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2" |
15 | SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1" | 15 | SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | ||
18 | 17 | ||
19 | SYSTEMD_PACKAGES = "${PN}" | 18 | SYSTEMD_PACKAGES = "${PN}" |
20 | SYSTEMD_SERVICE:${PN} = "networkd-dispatcher.service" | 19 | SYSTEMD_SERVICE:${PN} = "networkd-dispatcher.service" |
diff --git a/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb index ac13d7a196..d1e08cd073 100644 --- a/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb +++ b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb | |||
@@ -66,6 +66,7 @@ PACKAGECONFIG[sysfs] = "--enable-sysfs,--disable-sysfs,sysfsutils," | |||
66 | PACKAGECONFIG[libgcrypt] = "--enable-encryption,--disable-encryption,libgcrypt," | 66 | PACKAGECONFIG[libgcrypt] = "--enable-encryption,--disable-encryption,libgcrypt," |
67 | PACKAGECONFIG[non32bit] = "--enable-non32bit-int,--disable-non32bit-int,," | 67 | PACKAGECONFIG[non32bit] = "--enable-non32bit-int,--disable-non32bit-int,," |
68 | PACKAGECONFIG[snmp-bc] = "--enable-snmp_bc,--disable-snmp_bc" | 68 | PACKAGECONFIG[snmp-bc] = "--enable-snmp_bc,--disable-snmp_bc" |
69 | PACKAGECONFIG[ov-rest] = "--enable-ov_rest,--disable-ov_rest,curl rabbitmq-c json-c" | ||
69 | 70 | ||
70 | export DISTRO | 71 | export DISTRO |
71 | 72 | ||
diff --git a/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch b/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch index 8c9c13b1c4..785fe87452 100644 --- a/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch +++ b/meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9000ee4d8bb5c5e0bcc588e9bec86eb56f4285e1 Mon Sep 17 00:00:00 2001 | 1 | From e4197bc1f431fd7e555a31e6f7f1e020b4ec8f4c Mon Sep 17 00:00:00 2001 |
2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
3 | Date: Fri, 19 Jun 2015 16:45:54 +0900 | 3 | Date: Fri, 19 Jun 2015 16:45:54 +0900 |
4 | Subject: [PATCH] Fix makedefs | 4 | Subject: [PATCH] Fix makedefs |
@@ -19,10 +19,10 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | |||
19 | 1 file changed, 11 insertions(+), 16 deletions(-) | 19 | 1 file changed, 11 insertions(+), 16 deletions(-) |
20 | 20 | ||
21 | diff --git a/makedefs b/makedefs | 21 | diff --git a/makedefs b/makedefs |
22 | index 3448c1e..78e0717 100644 | 22 | index a740e41..28fb128 100644 |
23 | --- a/makedefs | 23 | --- a/makedefs |
24 | +++ b/makedefs | 24 | +++ b/makedefs |
25 | @@ -197,9 +197,6 @@ echo "# pie=$pie" | 25 | @@ -230,9 +230,6 @@ echo "# pie=$pie" |
26 | 26 | ||
27 | # Defaults for most sane systems | 27 | # Defaults for most sane systems |
28 | 28 | ||
@@ -32,7 +32,7 @@ index 3448c1e..78e0717 100644 | |||
32 | ARFL=rv | 32 | ARFL=rv |
33 | 33 | ||
34 | # Ugly function to make our error message more visible among the | 34 | # Ugly function to make our error message more visible among the |
35 | @@ -492,12 +489,12 @@ case "$SYSTEM.$RELEASE" in | 35 | @@ -563,12 +560,12 @@ case "$SYSTEM.$RELEASE" in |
36 | case "$CCARGS" in | 36 | case "$CCARGS" in |
37 | *-DNO_DB*) ;; | 37 | *-DNO_DB*) ;; |
38 | *-DHAS_DB*) ;; | 38 | *-DHAS_DB*) ;; |
@@ -48,7 +48,7 @@ index 3448c1e..78e0717 100644 | |||
48 | else | 48 | else |
49 | # No, we're not going to try db1 db2 db3 etc. | 49 | # No, we're not going to try db1 db2 db3 etc. |
50 | # On a properly installed system, Postfix builds | 50 | # On a properly installed system, Postfix builds |
51 | @@ -506,12 +503,12 @@ case "$SYSTEM.$RELEASE" in | 51 | @@ -577,12 +574,12 @@ case "$SYSTEM.$RELEASE" in |
52 | echo "Install the appropriate db*-devel package first." 1>&2 | 52 | echo "Install the appropriate db*-devel package first." 1>&2 |
53 | exit 1 | 53 | exit 1 |
54 | fi | 54 | fi |
@@ -63,7 +63,7 @@ index 3448c1e..78e0717 100644 | |||
63 | do | 63 | do |
64 | test -e $lib/lib$name.a -o -e $lib/lib$name.so && { | 64 | test -e $lib/lib$name.a -o -e $lib/lib$name.so && { |
65 | SYSLIBS="$SYSLIBS -l$name" | 65 | SYSLIBS="$SYSLIBS -l$name" |
66 | @@ -531,7 +528,7 @@ case "$SYSTEM.$RELEASE" in | 66 | @@ -602,7 +599,7 @@ case "$SYSTEM.$RELEASE" in |
67 | if [ `expr "X$CCARGS" : "X.*-DNO_EPOLL"` -gt 0 ] | 67 | if [ `expr "X$CCARGS" : "X.*-DNO_EPOLL"` -gt 0 ] |
68 | then | 68 | then |
69 | : | 69 | : |
@@ -72,7 +72,7 @@ index 3448c1e..78e0717 100644 | |||
72 | then | 72 | then |
73 | echo CCARGS="$CCARGS -DNO_EPOLL" | 73 | echo CCARGS="$CCARGS -DNO_EPOLL" |
74 | else | 74 | else |
75 | @@ -555,8 +552,6 @@ int main(int argc, char **argv) | 75 | @@ -626,8 +623,6 @@ int main(int argc, char **argv) |
76 | } | 76 | } |
77 | EOF | 77 | EOF |
78 | ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 | 78 | ${CC-gcc} -o makedefs.test makedefs.test.c || exit 1 |
@@ -81,7 +81,7 @@ index 3448c1e..78e0717 100644 | |||
81 | rm -f makedefs.test makedefs.test.[co] | 81 | rm -f makedefs.test makedefs.test.[co] |
82 | fi;; | 82 | fi;; |
83 | esac | 83 | esac |
84 | @@ -572,12 +567,12 @@ EOF | 84 | @@ -644,12 +639,12 @@ EOF |
85 | case "$CCARGS" in | 85 | case "$CCARGS" in |
86 | *-DNO_DB*) ;; | 86 | *-DNO_DB*) ;; |
87 | *-DHAS_DB*) ;; | 87 | *-DHAS_DB*) ;; |
@@ -97,7 +97,7 @@ index 3448c1e..78e0717 100644 | |||
97 | else | 97 | else |
98 | # On a properly installed system, Postfix builds | 98 | # On a properly installed system, Postfix builds |
99 | # by including <db.h> and by linking with -ldb | 99 | # by including <db.h> and by linking with -ldb |
100 | @@ -585,12 +580,12 @@ EOF | 100 | @@ -657,12 +652,12 @@ EOF |
101 | echo "Install the appropriate db*-devel package first." 1>&2 | 101 | echo "Install the appropriate db*-devel package first." 1>&2 |
102 | exit 1 | 102 | exit 1 |
103 | fi | 103 | fi |
@@ -113,5 +113,5 @@ index 3448c1e..78e0717 100644 | |||
113 | test -e $lib/lib$name.a -o -e $lib/lib$name.so && { | 113 | test -e $lib/lib$name.a -o -e $lib/lib$name.so && { |
114 | SYSLIBS="$SYSLIBS -l$name" | 114 | SYSLIBS="$SYSLIBS -l$name" |
115 | -- | 115 | -- |
116 | 2.17.1 | 116 | 2.25.1 |
117 | 117 | ||
diff --git a/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch b/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch index 28199ccdd2..d46efb95cb 100644 --- a/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch +++ b/meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cb69ffda0c2cbde6acdc8b01c8d5ff78d81a84fc Mon Sep 17 00:00:00 2001 | 1 | From 953719878466c55572294f42e85127bda5d34999 Mon Sep 17 00:00:00 2001 |
2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
3 | Date: Fri, 19 Jun 2015 17:14:58 +0900 | 3 | Date: Fri, 19 Jun 2015 17:14:58 +0900 |
4 | Subject: [PATCH] Change fixed postconf to a variable for cross-compiling | 4 | Subject: [PATCH] Change fixed postconf to a variable for cross-compiling |
@@ -12,7 +12,7 @@ Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | |||
12 | 2 files changed, 11 insertions(+), 9 deletions(-) | 12 | 2 files changed, 11 insertions(+), 9 deletions(-) |
13 | 13 | ||
14 | diff --git a/Makefile.in b/Makefile.in | 14 | diff --git a/Makefile.in b/Makefile.in |
15 | index 65e7911..40295be 100644 | 15 | index a37f89f..17cb64b 100644 |
16 | --- a/Makefile.in | 16 | --- a/Makefile.in |
17 | +++ b/Makefile.in | 17 | +++ b/Makefile.in |
18 | @@ -22,7 +22,7 @@ META = meta/main.cf.proto meta/master.cf.proto meta/postfix-files \ | 18 | @@ -22,7 +22,7 @@ META = meta/main.cf.proto meta/master.cf.proto meta/postfix-files \ |
@@ -25,10 +25,10 @@ index 65e7911..40295be 100644 | |||
25 | default: update | 25 | default: update |
26 | 26 | ||
27 | diff --git a/postfix-install b/postfix-install | 27 | diff --git a/postfix-install b/postfix-install |
28 | index e498cd3..8049f43 100644 | 28 | index 563ee27..00d4651 100644 |
29 | --- a/postfix-install | 29 | --- a/postfix-install |
30 | +++ b/postfix-install | 30 | +++ b/postfix-install |
31 | @@ -244,8 +244,8 @@ test -z "$non_interactive" -a ! -t 0 && { | 31 | @@ -249,8 +249,8 @@ test -z "$non_interactive" -a ! -t 0 && { |
32 | exit 1 | 32 | exit 1 |
33 | } | 33 | } |
34 | 34 | ||
@@ -39,7 +39,7 @@ index e498cd3..8049f43 100644 | |||
39 | exit 1 | 39 | exit 1 |
40 | } | 40 | } |
41 | 41 | ||
42 | @@ -266,7 +266,7 @@ do | 42 | @@ -271,7 +271,7 @@ do |
43 | case "$junk" in | 43 | case "$junk" in |
44 | *MAIL_VERSION*) | 44 | *MAIL_VERSION*) |
45 | case "$mail_version" in | 45 | case "$mail_version" in |
@@ -48,7 +48,7 @@ index e498cd3..8049f43 100644 | |||
48 | esac | 48 | esac |
49 | val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1 | 49 | val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1 |
50 | case "$val" in | 50 | case "$val" in |
51 | @@ -454,7 +454,7 @@ template files main.cf.proto and master.cf.proto." | 51 | @@ -459,7 +459,7 @@ template files main.cf.proto and master.cf.proto." |
52 | 52 | ||
53 | : ${install_root=/} | 53 | : ${install_root=/} |
54 | : ${tempdir=`pwd`} | 54 | : ${tempdir=`pwd`} |
@@ -57,16 +57,16 @@ index e498cd3..8049f43 100644 | |||
57 | 57 | ||
58 | # Find out the location of installed configuration files. | 58 | # Find out the location of installed configuration files. |
59 | 59 | ||
60 | @@ -520,7 +520,7 @@ test -f $CONFIG_DIRECTORY/main.cf && { | 60 | @@ -525,7 +525,7 @@ test -f $CONFIG_DIRECTORY/main.cf && { |
61 | case "$junk" in | 61 | case "$junk" in |
62 | "") eval unset $name;; | 62 | "") eval unset $name;; |
63 | esac | 63 | esac |
64 | - eval : \${$name=\`bin/postconf -c $CONFIG_DIRECTORY -hx $name\`} || | 64 | - eval : \${$name=\`bin/postconf -qc $CONFIG_DIRECTORY -hx $name\`} || |
65 | + eval : \${$name=\`$POSTCONF -c $CONFIG_DIRECTORY -hx $name\`} || | 65 | + eval : \${$name=\`$POSTCONF -qc $CONFIG_DIRECTORY -hx $name\`} || |
66 | exit 1 | 66 | exit 1 |
67 | done | 67 | done |
68 | } | 68 | } |
69 | @@ -533,7 +533,7 @@ do | 69 | @@ -538,7 +538,7 @@ do |
70 | case "$junk" in | 70 | case "$junk" in |
71 | "") eval unset $name;; | 71 | "") eval unset $name;; |
72 | esac | 72 | esac |
@@ -75,7 +75,7 @@ index e498cd3..8049f43 100644 | |||
75 | done | 75 | done |
76 | 76 | ||
77 | # Override settings manually. | 77 | # Override settings manually. |
78 | @@ -670,6 +670,8 @@ README_DIRECTORY=$install_root$readme_directory | 78 | @@ -675,6 +675,8 @@ README_DIRECTORY=$install_root$readme_directory |
79 | SHLIB_DIRECTORY=$install_root$shlib_directory | 79 | SHLIB_DIRECTORY=$install_root$shlib_directory |
80 | META_DIRECTORY=$install_root$meta_directory | 80 | META_DIRECTORY=$install_root$meta_directory |
81 | 81 | ||
@@ -84,7 +84,7 @@ index e498cd3..8049f43 100644 | |||
84 | # Avoid repeated tests for existence of these; default permissions suffice. | 84 | # Avoid repeated tests for existence of these; default permissions suffice. |
85 | 85 | ||
86 | test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1 | 86 | test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1 |
87 | @@ -841,7 +843,7 @@ IFS="$BACKUP_IFS" | 87 | @@ -846,7 +848,7 @@ IFS="$BACKUP_IFS" |
88 | # the wrong place when Postfix is being upgraded. | 88 | # the wrong place when Postfix is being upgraded. |
89 | 89 | ||
90 | case "$mail_version" in | 90 | case "$mail_version" in |
@@ -93,15 +93,15 @@ index e498cd3..8049f43 100644 | |||
93 | esac | 93 | esac |
94 | 94 | ||
95 | # Undo MAIL_VERSION expansion at the end of a parameter value. If | 95 | # Undo MAIL_VERSION expansion at the end of a parameter value. If |
96 | @@ -861,7 +863,7 @@ do | 96 | @@ -866,7 +868,7 @@ do |
97 | esac | 97 | esac |
98 | done | 98 | done |
99 | 99 | ||
100 | -bin/postconf -c $CONFIG_DIRECTORY -e \ | 100 | -bin/postconf -qc $CONFIG_DIRECTORY -e \ |
101 | +"$POSTCONF" -c $CONFIG_DIRECTORY -e \ | 101 | +"$POSTCONF" -qc $CONFIG_DIRECTORY -e \ |
102 | "daemon_directory = $daemon_directory" \ | 102 | "daemon_directory = $daemon_directory" \ |
103 | "data_directory = $data_directory" \ | 103 | "data_directory = $data_directory" \ |
104 | "command_directory = $command_directory" \ | 104 | "command_directory = $command_directory" \ |
105 | -- | 105 | -- |
106 | 2.17.1 | 106 | 2.25.1 |
107 | 107 | ||
diff --git a/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch b/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch index 1545f21637..6f8e3e84da 100644 --- a/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch +++ b/meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch | |||
@@ -1,22 +1,22 @@ | |||
1 | From 995bddd9563b1aecca2369f2f9c675f88bdc0053 Mon Sep 17 00:00:00 2001 | 1 | From a8ec63a71361ccd3f6d2959c4c87b7824282b291 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 26 Aug 2017 10:29:37 -0700 | 3 | Date: Sat, 26 Aug 2017 10:29:37 -0700 |
4 | Subject: [PATCH] makedefs: Use native compiler to build makedefs.test | 4 | Subject: [PATCH] makedefs: Use native compiler to build makedefs.test |
5 | 5 | ||
6 | Its a binary used during build | 6 | Its a binary used during build |
7 | 7 | ||
8 | Upstream-Status: Inappropriate [embedded specific] | ||
9 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | --- | 11 | --- |
10 | Upstream-Status: Pending | ||
11 | |||
12 | makedefs | 10 +++++----- | 12 | makedefs | 10 +++++----- |
13 | 1 file changed, 5 insertions(+), 5 deletions(-) | 13 | 1 file changed, 5 insertions(+), 5 deletions(-) |
14 | 14 | ||
15 | diff --git a/makedefs b/makedefs | 15 | diff --git a/makedefs b/makedefs |
16 | index 78e0717..3299eba 100644 | 16 | index 28fb128..313b401 100644 |
17 | --- a/makedefs | 17 | --- a/makedefs |
18 | +++ b/makedefs | 18 | +++ b/makedefs |
19 | @@ -551,7 +551,7 @@ int main(int argc, char **argv) | 19 | @@ -622,7 +622,7 @@ int main(int argc, char **argv) |
20 | exit(0); | 20 | exit(0); |
21 | } | 21 | } |
22 | EOF | 22 | EOF |
@@ -25,7 +25,7 @@ index 78e0717..3299eba 100644 | |||
25 | rm -f makedefs.test makedefs.test.[co] | 25 | rm -f makedefs.test makedefs.test.[co] |
26 | fi;; | 26 | fi;; |
27 | esac | 27 | esac |
28 | @@ -787,7 +787,7 @@ int main(int argc, char **argv) | 28 | @@ -865,7 +865,7 @@ int main(int argc, char **argv) |
29 | exit(0); | 29 | exit(0); |
30 | } | 30 | } |
31 | EOF | 31 | EOF |
@@ -34,7 +34,7 @@ index 78e0717..3299eba 100644 | |||
34 | ./makedefs.test 2>/dev/null || | 34 | ./makedefs.test 2>/dev/null || |
35 | CCARGS="$CCARGS -DNO_SIGSETJMP" | 35 | CCARGS="$CCARGS -DNO_SIGSETJMP" |
36 | rm -f makedefs.test makedefs.test.[co] | 36 | rm -f makedefs.test makedefs.test.[co] |
37 | @@ -823,7 +823,7 @@ int main(int argc, char **argv) | 37 | @@ -903,7 +903,7 @@ int main(int argc, char **argv) |
38 | &error) != 14); | 38 | &error) != 14); |
39 | } | 39 | } |
40 | EOF | 40 | EOF |
@@ -43,7 +43,7 @@ index 78e0717..3299eba 100644 | |||
43 | $icu_ldflags >/dev/null 2>&1 | 43 | $icu_ldflags >/dev/null 2>&1 |
44 | if ./makedefs.test 2>/dev/null ; then | 44 | if ./makedefs.test 2>/dev/null ; then |
45 | CCARGS="$CCARGS $icu_cppflags" | 45 | CCARGS="$CCARGS $icu_cppflags" |
46 | @@ -938,7 +938,7 @@ int main(void) | 46 | @@ -1024,7 +1024,7 @@ int main(void) |
47 | exit(ferror(stdout) ? 1 : 0); | 47 | exit(ferror(stdout) ? 1 : 0); |
48 | } | 48 | } |
49 | EOF | 49 | EOF |
@@ -52,7 +52,7 @@ index 78e0717..3299eba 100644 | |||
52 | ./makedefs.test || exit 1 | 52 | ./makedefs.test || exit 1 |
53 | rm -f makedefs.test makedefs.test.[co] | 53 | rm -f makedefs.test makedefs.test.[co] |
54 | } | 54 | } |
55 | @@ -1094,7 +1094,7 @@ int main(void) | 55 | @@ -1180,7 +1180,7 @@ int main(void) |
56 | exit(ferror(stdout) ? 1 : 0); | 56 | exit(ferror(stdout) ? 1 : 0); |
57 | } | 57 | } |
58 | EOF | 58 | EOF |
@@ -62,5 +62,5 @@ index 78e0717..3299eba 100644 | |||
62 | rm -f makedefs.test makedefs.test.[co] | 62 | rm -f makedefs.test makedefs.test.[co] |
63 | eval ${parm_name}=\""\$parm_val"\" | 63 | eval ${parm_name}=\""\$parm_val"\" |
64 | -- | 64 | -- |
65 | 2.17.1 | 65 | 2.25.1 |
66 | 66 | ||
diff --git a/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch b/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch index a38e783309..0660ee098e 100644 --- a/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch +++ b/meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From afef4a9391e6bb1a6c3e73d370f240577ed8b0dd Mon Sep 17 00:00:00 2001 | 1 | From 404150f53bb49af987d7338a808f47fdbd50ba7f Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 16 Jan 2022 11:21:54 +0800 | 3 | Date: Sun, 16 Jan 2022 11:21:54 +0800 |
4 | Subject: [PATCH] Fix icu config | 4 | Subject: [PATCH] Fix icu config |
@@ -10,18 +10,18 @@ corrupted in any case its just adding -I/usr/include | |||
10 | to the CCARGS which we loose nothing if its not | 10 | to the CCARGS which we loose nothing if its not |
11 | entertained. | 11 | entertained. |
12 | 12 | ||
13 | Upstream-Status: Inappropriate [embedded specific] | ||
14 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | --- | 16 | --- |
15 | Upstream-Status: Pending | ||
16 | |||
17 | makedefs | 1 - | 17 | makedefs | 1 - |
18 | 1 file changed, 1 deletion(-) | 18 | 1 file changed, 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/makedefs b/makedefs | 20 | diff --git a/makedefs b/makedefs |
21 | index 3299eba..2a76f20 100644 | 21 | index 313b401..e5db212 100644 |
22 | --- a/makedefs | 22 | --- a/makedefs |
23 | +++ b/makedefs | 23 | +++ b/makedefs |
24 | @@ -826,7 +826,6 @@ EOF | 24 | @@ -906,7 +906,6 @@ EOF |
25 | ${BUILD_CC-gcc} -o makedefs.test makedefs.test.c $icu_cppflags \ | 25 | ${BUILD_CC-gcc} -o makedefs.test makedefs.test.c $icu_cppflags \ |
26 | $icu_ldflags >/dev/null 2>&1 | 26 | $icu_ldflags >/dev/null 2>&1 |
27 | if ./makedefs.test 2>/dev/null ; then | 27 | if ./makedefs.test 2>/dev/null ; then |
@@ -30,5 +30,5 @@ index 3299eba..2a76f20 100644 | |||
30 | else | 30 | else |
31 | CCARGS="$CCARGS -DNO_EAI" | 31 | CCARGS="$CCARGS -DNO_EAI" |
32 | -- | 32 | -- |
33 | 2.17.1 | 33 | 2.25.1 |
34 | 34 | ||
diff --git a/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch b/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch index b425cf8432..1571aa844d 100644 --- a/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch +++ b/meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 545d4a79b50caa5698622c0c1905ae154197a16f Mon Sep 17 00:00:00 2001 | 1 | From 25e7d1a9bc64f39666eb0e2b9b175773615e28d2 Mon Sep 17 00:00:00 2001 |
2 | From: Yi Zhao <yi.zhao@windriver.com> | 2 | From: Yi Zhao <yi.zhao@windriver.com> |
3 | Date: Fri, 12 Oct 2018 12:38:02 +0800 | 3 | Date: Fri, 12 Oct 2018 12:38:02 +0800 |
4 | Subject: [PATCH] makedefs: add -lnsl and -lresolv to SYSLIBS by default | 4 | Subject: [PATCH] makedefs: add -lnsl and -lresolv to SYSLIBS by default |
@@ -14,10 +14,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
14 | 1 file changed, 2 insertions(+), 20 deletions(-) | 14 | 1 file changed, 2 insertions(+), 20 deletions(-) |
15 | 15 | ||
16 | diff --git a/makedefs b/makedefs | 16 | diff --git a/makedefs b/makedefs |
17 | index 2a76f20..9d5db9f 100644 | 17 | index e5db212..b00049b 100644 |
18 | --- a/makedefs | 18 | --- a/makedefs |
19 | +++ b/makedefs | 19 | +++ b/makedefs |
20 | @@ -506,16 +506,7 @@ case "$SYSTEM.$RELEASE" in | 20 | @@ -577,16 +577,7 @@ case "$SYSTEM.$RELEASE" in |
21 | SYSLIBS="$SYSLIBS -ldb" | 21 | SYSLIBS="$SYSLIBS -ldb" |
22 | ;; | 22 | ;; |
23 | esac | 23 | esac |
@@ -35,7 +35,7 @@ index 2a76f20..9d5db9f 100644 | |||
35 | # Kernel 2.4 added IPv6 | 35 | # Kernel 2.4 added IPv6 |
36 | case "$RELEASE" in | 36 | case "$RELEASE" in |
37 | 2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";; | 37 | 2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";; |
38 | @@ -583,16 +574,7 @@ EOF | 38 | @@ -655,16 +646,7 @@ EOF |
39 | SYSLIBS="$SYSLIBS -ldb" | 39 | SYSLIBS="$SYSLIBS -ldb" |
40 | ;; | 40 | ;; |
41 | esac | 41 | esac |
@@ -54,5 +54,5 @@ index 2a76f20..9d5db9f 100644 | |||
54 | : ${SHLIB_SUFFIX=.so} | 54 | : ${SHLIB_SUFFIX=.so} |
55 | : ${SHLIB_CFLAGS=-fPIC} | 55 | : ${SHLIB_CFLAGS=-fPIC} |
56 | -- | 56 | -- |
57 | 2.17.1 | 57 | 2.25.1 |
58 | 58 | ||
diff --git a/meta-networking/recipes-daemons/postfix/files/0006-postfix-add-preliminary-setting.patch b/meta-networking/recipes-daemons/postfix/files/0006-postfix-add-preliminary-setting.patch new file mode 100644 index 0000000000..62b3cf0c05 --- /dev/null +++ b/meta-networking/recipes-daemons/postfix/files/0006-postfix-add-preliminary-setting.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From a5863e19d298789328e11057c469636aa8775847 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jinfeng Wang <jinfeng.wang.cn@windriver.com> | ||
3 | Date: Wed, 2 Jul 2025 10:55:53 +0800 | ||
4 | Subject: [PATCH] postfix: add preliminary setting | ||
5 | |||
6 | post-install call postconf commands to modify main.cf. When multiple | ||
7 | parameters to postconf, the order of those parameters in main.cf is random. | ||
8 | Then it will reproduce random results in rootfs file(sample-main.cf). To | ||
9 | fix this, add preliminary setting in main.cf. | ||
10 | |||
11 | Upstream-Status: Inappropriate [this is the use of post-install, | ||
12 | upstream is not affected] | ||
13 | |||
14 | Signed-off-by: Jinfeng Wang <jinfeng.wang.cn@windriver.com> | ||
15 | --- | ||
16 | conf/main.cf | 2 ++ | ||
17 | 1 file changed, 2 insertions(+) | ||
18 | |||
19 | diff --git a/conf/main.cf b/conf/main.cf | ||
20 | index 1d2c8c2..50398ba 100644 | ||
21 | --- a/conf/main.cf | ||
22 | +++ b/conf/main.cf | ||
23 | @@ -683,3 +683,5 @@ sample_directory = | ||
24 | # | ||
25 | readme_directory = | ||
26 | inet_protocols = ipv4 | ||
27 | +shlib_directory = | ||
28 | +meta_directory = | ||
29 | -- | ||
30 | 2.34.1 | ||
31 | |||
diff --git a/meta-networking/recipes-daemons/postfix/files/main.cf b/meta-networking/recipes-daemons/postfix/files/main.cf index 22c57485d7..e9f80af15d 100644 --- a/meta-networking/recipes-daemons/postfix/files/main.cf +++ b/meta-networking/recipes-daemons/postfix/files/main.cf | |||
@@ -1,4 +1,4 @@ | |||
1 | compatibility_level = 3.6 | 1 | compatibility_level = 3.10 |
2 | smtputf8_enable = no | 2 | smtputf8_enable = no |
3 | 3 | ||
4 | # Configure your domain and accounts | 4 | # Configure your domain and accounts |
diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb b/meta-networking/recipes-daemons/postfix/postfix_3.10.1.bb index d48e9145f8..444bee0668 100644 --- a/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb +++ b/meta-networking/recipes-daemons/postfix/postfix_3.10.1.bb | |||
@@ -4,7 +4,7 @@ IBM research as an alternative to the widely-used Sendmail program. \ | |||
4 | Postfix attempts to be fast, easy to administer, and secure. The outsidei \ | 4 | Postfix attempts to be fast, easy to administer, and secure. The outsidei \ |
5 | has a definite Sendmail-ish flavor, but the inside is completely different." | 5 | has a definite Sendmail-ish flavor, but the inside is completely different." |
6 | 6 | ||
7 | HOMEPAGE= "http://www.postfix.org" | 7 | HOMEPAGE = "http://www.postfix.org" |
8 | SECTION = "mail" | 8 | SECTION = "mail" |
9 | DEPENDS = "db icu libpcre libnsl2 m4-native openssl postfix-native \ | 9 | DEPENDS = "db icu libpcre libnsl2 m4-native openssl postfix-native \ |
10 | ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ | 10 | ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ |
@@ -26,13 +26,14 @@ SRC_URI = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P | |||
26 | file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \ | 26 | file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \ |
27 | file://0004-Fix-icu-config.patch \ | 27 | file://0004-Fix-icu-config.patch \ |
28 | file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ | 28 | file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ |
29 | file://0006-postfix-add-preliminary-setting.patch \ | ||
29 | " | 30 | " |
30 | 31 | ||
31 | SRC_URI[sha256sum] = "4b6e17c826cc438cc3016a9c0a55ea7e77c6cbafba7dd57241d81b690b0e9774" | 32 | SRC_URI[sha256sum] = "75868db7a8ed252cd3a14c13a3ce383ddd42563160c02027d061202ee36799bf" |
32 | 33 | ||
33 | UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.8(\.\d+)+).tar.gz" | 34 | UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.10(\.\d+)+).tar.gz" |
34 | 35 | ||
35 | S = "${WORKDIR}/postfix-${PV}" | 36 | S = "${UNPACKDIR}/postfix-${PV}" |
36 | 37 | ||
37 | CLEANBROKEN = "1" | 38 | CLEANBROKEN = "1" |
38 | 39 | ||
@@ -87,6 +88,10 @@ export POSTCONF = "${STAGING_DIR_NATIVE}${sbindir_native}/postconf" | |||
87 | # ignore the OPTS="CC=$CC" in Makefile it will not use the CC=$CC $CCARGS | 88 | # ignore the OPTS="CC=$CC" in Makefile it will not use the CC=$CC $CCARGS |
88 | EXTRA_OEMAKE += "OPT= DEBUG= OPTS= " | 89 | EXTRA_OEMAKE += "OPT= DEBUG= OPTS= " |
89 | 90 | ||
91 | # use gnu17 for now as recommended in: | ||
92 | # https://marc.info/?l=postfix-users&m=173542420611213 | ||
93 | CFLAGS += "-std=gnu17" | ||
94 | |||
90 | do_compile () { | 95 | do_compile () { |
91 | unset CFLAGS CPPFLAGS CXXFLAGS | 96 | unset CFLAGS CPPFLAGS CXXFLAGS |
92 | local native_build | 97 | local native_build |
@@ -135,20 +140,25 @@ do_install () { | |||
135 | rm -rf ${D}${localstatedir}/spool/postfix | 140 | rm -rf ${D}${localstatedir}/spool/postfix |
136 | mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/${MLPREFIX}sample-main.cf | 141 | mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/${MLPREFIX}sample-main.cf |
137 | install -m 755 ${S}/bin/smtp-sink ${D}/${sbindir}/ | 142 | install -m 755 ${S}/bin/smtp-sink ${D}/${sbindir}/ |
138 | install -d ${D}${sysconfdir}/init.d | ||
139 | install -m 644 ${UNPACKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf | 143 | install -m 644 ${UNPACKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf |
140 | sed -i 's#@LIBEXECDIR@#${libexecdir}#' ${D}${sysconfdir}/postfix/main.cf | 144 | sed -i 's#@LIBEXECDIR@#${libexecdir}#' ${D}${sysconfdir}/postfix/main.cf |
141 | 145 | ||
142 | install -m 755 ${UNPACKDIR}/check_hostname.sh ${D}${sbindir}/ | 146 | install -m 755 ${UNPACKDIR}/check_hostname.sh ${D}${sbindir}/ |
143 | 147 | ||
144 | install -m 755 ${UNPACKDIR}/postfix ${D}${sysconfdir}/init.d/postfix | ||
145 | install -m 644 ${UNPACKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient | 148 | install -m 644 ${UNPACKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient |
146 | 149 | ||
147 | install -d ${D}${systemd_unitdir}/system | 150 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
148 | install -m 0644 ${UNPACKDIR}/postfix.service ${D}${systemd_unitdir}/system | 151 | install -d ${D}${sysconfdir}/init.d |
149 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/postfix.service | 152 | install -m 755 ${UNPACKDIR}/postfix ${D}${sysconfdir}/init.d/postfix |
150 | sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/postfix.service | 153 | fi |
151 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/postfix.service | 154 | |
155 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | ||
156 | install -d ${D}${systemd_unitdir}/system | ||
157 | install -m 0644 ${UNPACKDIR}/postfix.service ${D}${systemd_unitdir}/system | ||
158 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/postfix.service | ||
159 | sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/postfix.service | ||
160 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/postfix.service | ||
161 | fi | ||
152 | 162 | ||
153 | install -m 0755 ${UNPACKDIR}/aliasesdb ${D}${libexecdir}/postfix | 163 | install -m 0755 ${UNPACKDIR}/aliasesdb ${D}${libexecdir}/postfix |
154 | 164 | ||
diff --git a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch index 8126b3619a..2b01d3a682 100644 --- a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch +++ b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch | |||
@@ -30,7 +30,7 @@ diff --git a/Makefile.in b/Makefile.in | |||
30 | index 9434cbd..13f2e16 100644 | 30 | index 9434cbd..13f2e16 100644 |
31 | --- a/Makefile.in | 31 | --- a/Makefile.in |
32 | +++ b/Makefile.in | 32 | +++ b/Makefile.in |
33 | @@ -123,7 +123,6 @@ check: proftpd$(EXEEXT) | 33 | @@ -129,7 +129,6 @@ check: proftpd$(EXEEXT) |
34 | $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: | 34 | $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: |
35 | @if [ ! -d $@ ]; then \ | 35 | @if [ ! -d $@ ]; then \ |
36 | mkdir -p $@; \ | 36 | mkdir -p $@; \ |
@@ -38,18 +38,18 @@ index 9434cbd..13f2e16 100644 | |||
38 | chmod 0755 $@; \ | 38 | chmod 0755 $@; \ |
39 | fi | 39 | fi |
40 | 40 | ||
41 | @@ -133,7 +132,6 @@ install-proftpd: proftpd$(EXEEXT) $(DESTDIR)$(includedir) $(DESTDIR)$(localstate | 41 | @@ -139,7 +138,6 @@ install-proftpd: $(DESTDIR)$(includedir) $(DESTDIR)$(localstatedir) $(DESTDIR)$( |
42 | rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ | 42 | rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ |
43 | fi | 43 | fi |
44 | ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd | 44 | ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd |
45 | - -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd | 45 | - -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd |
46 | 46 | ||
47 | install-libs: $(DESTDIR)$(libdir)/proftpd | 47 | install-libs: $(DESTDIR)$(libdir)/proftpd |
48 | cd lib/ && $(MAKE) install | 48 | cd lib/ && $(MAKE) install |
49 | @@ -170,11 +168,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) | 49 | @@ -177,11 +175,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) |
50 | $(INSTALL_SBIN) $(top_builddir)/ftpshut $(DESTDIR)$(sbindir)/ftpshut | 50 | $(INSTALL_SBIN) $(top_builddir)/ftpshut $(DESTDIR)$(sbindir)/ftpshut |
51 | $(INSTALL_BIN) $(top_builddir)/ftptop $(DESTDIR)$(bindir)/ftptop | 51 | $(INSTALL_BIN) $(top_builddir)/ftptop $(DESTDIR)$(bindir)/ftptop |
52 | $(INSTALL_BIN) $(top_builddir)/ftpwho $(DESTDIR)$(bindir)/ftpwho | 52 | $(INSTALL_BIN) $(top_builddir)/ftpwho $(DESTDIR)$(bindir)/ftpwho |
53 | - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs | 53 | - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs |
54 | + $(INSTALL) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs | 54 | + $(INSTALL) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs |
55 | 55 | ||
@@ -64,7 +64,7 @@ diff --git a/configure b/configure | |||
64 | index 0a51670..69fa130 100755 | 64 | index 0a51670..69fa130 100755 |
65 | --- a/configure | 65 | --- a/configure |
66 | +++ b/configure | 66 | +++ b/configure |
67 | @@ -25116,7 +25116,7 @@ _ACEOF | 67 | @@ -25683,7 +25683,7 @@ _ACEOF |
68 | 68 | ||
69 | 69 | ||
70 | cat >>confdefs.h <<_ACEOF | 70 | cat >>confdefs.h <<_ACEOF |
@@ -73,7 +73,7 @@ index 0a51670..69fa130 100755 | |||
73 | _ACEOF | 73 | _ACEOF |
74 | 74 | ||
75 | 75 | ||
76 | @@ -25126,7 +25126,7 @@ _ACEOF | 76 | @@ -25693,7 +25693,7 @@ _ACEOF |
77 | 77 | ||
78 | 78 | ||
79 | cat >>confdefs.h <<_ACEOF | 79 | cat >>confdefs.h <<_ACEOF |
@@ -86,7 +86,7 @@ diff --git a/configure.in b/configure.in | |||
86 | index 50561de..93cad3f 100644 | 86 | index 50561de..93cad3f 100644 |
87 | --- a/configure.in | 87 | --- a/configure.in |
88 | +++ b/configure.in | 88 | +++ b/configure.in |
89 | @@ -4059,8 +4059,8 @@ locale_dir="`eval echo ${locale_dir}`" | 89 | @@ -4248,8 +4248,8 @@ locale_dir="`eval echo ${locale_dir}`" |
90 | AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) | 90 | AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) |
91 | 91 | ||
92 | AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) | 92 | AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) |
diff --git a/meta-networking/recipes-daemons/proftpd/files/contrib.patch b/meta-networking/recipes-daemons/proftpd/files/contrib.patch index 96c237d386..53f7b89556 100644 --- a/meta-networking/recipes-daemons/proftpd/files/contrib.patch +++ b/meta-networking/recipes-daemons/proftpd/files/contrib.patch | |||
@@ -14,15 +14,15 @@ diff --git a/Makefile.in b/Makefile.in | |||
14 | index 9434cbd..8da7d1f 100644 | 14 | index 9434cbd..8da7d1f 100644 |
15 | --- a/Makefile.in | 15 | --- a/Makefile.in |
16 | +++ b/Makefile.in | 16 | +++ b/Makefile.in |
17 | @@ -163,7 +163,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir) | 17 | @@ -170,7 +170,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir) |
18 | test -z "$(SHARED_MODULE_OBJS)" -a -z "$(SHARED_MODULE_DIRS)" -a -z "$(STATIC_MODULE_DIRS)" || (cd modules/ && $(MAKE) install) | 18 | test -z "$(SHARED_MODULE_OBJS)" -a -z "$(SHARED_MODULE_DIRS)" -a -z "$(STATIC_MODULE_DIRS)" || (cd modules/ && $(MAKE) install) |
19 | 19 | ||
20 | install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) | 20 | install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) |
21 | - cd contrib/ && $(MAKE) install-utils | 21 | - cd contrib/ && $(MAKE) install-utils |
22 | + cd contrib/ && $(MAKE) DESTDIR=${DESTDIR} install-utils | 22 | + cd contrib/ && $(MAKE) DESTDIR=${DESTDIR} install-utils |
23 | $(INSTALL_BIN) $(top_builddir)/ftpcount $(DESTDIR)$(bindir)/ftpcount | 23 | $(INSTALL_BIN) $(top_builddir)/ftpcount $(DESTDIR)$(bindir)/ftpcount |
24 | $(INSTALL_BIN) $(top_builddir)/ftpdctl $(DESTDIR)$(bindir)/ftpdctl | 24 | $(INSTALL_BIN) $(top_builddir)/ftpdctl $(DESTDIR)$(bindir)/ftpdctl |
25 | $(INSTALL_SBIN) $(top_builddir)/ftpscrub $(DESTDIR)$(sbindir)/ftpscrub | 25 | $(INSTALL_SBIN) $(top_builddir)/ftpscrub $(DESTDIR)$(sbindir)/ftpscrub |
26 | diff --git a/contrib/Makefile.in b/contrib/Makefile.in | 26 | diff --git a/contrib/Makefile.in b/contrib/Makefile.in |
27 | index d1a31af..65d2abc 100644 | 27 | index d1a31af..65d2abc 100644 |
28 | --- a/contrib/Makefile.in | 28 | --- a/contrib/Makefile.in |
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb index 33480bff2c..65dd2f9561 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb | |||
@@ -4,10 +4,10 @@ HOMEPAGE = "http://www.proftpd.org" | |||
4 | LICENSE = "GPL-2.0-or-later" | 4 | LICENSE = "GPL-2.0-or-later" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" |
6 | 6 | ||
7 | SRCREV = "0a7ea9b0ba9fcdf368374a226370d08f10397d99" | 7 | SRCREV = "ae25959adb05ae1d6ebfa1f36bf778c9c34e9410" |
8 | BRANCH = "1.3.8" | 8 | BRANCH = "${PV}" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https \ | 10 | SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https;tag=v${PV} \ |
11 | file://basic.conf.patch \ | 11 | file://basic.conf.patch \ |
12 | file://proftpd-basic.init \ | 12 | file://proftpd-basic.init \ |
13 | file://default \ | 13 | file://default \ |
@@ -17,10 +17,15 @@ SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https | |||
17 | file://proftpd.service \ | 17 | file://proftpd.service \ |
18 | " | 18 | " |
19 | 19 | ||
20 | S = "${WORKDIR}/git" | ||
21 | 20 | ||
22 | inherit autotools-brokensep useradd update-rc.d systemd multilib_script | 21 | inherit autotools-brokensep useradd update-rc.d systemd multilib_script |
23 | 22 | ||
23 | # patch releases have character after version | ||
24 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+\w?))" | ||
25 | CVE_VERSION_SUFFIX = "alphabetical" | ||
26 | |||
27 | CVE_STATUS[CVE-2001-0027] = "fixed-version: version 1.2.0rc3 removed affected module" | ||
28 | |||
24 | EXTRA_OECONF += "--enable-largefile INSTALL=install" | 29 | EXTRA_OECONF += "--enable-largefile INSTALL=install" |
25 | 30 | ||
26 | PACKAGECONFIG ??= "shadow \ | 31 | PACKAGECONFIG ??= "shadow \ |
diff --git a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb index f2c300855c..be0652dfbd 100644 --- a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb +++ b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb | |||
@@ -34,7 +34,7 @@ SRC_URI[sha256sum] = "0dbf54dd2c178bd9fe62481d2c37513ee36636d8bf137cfdad96891490 | |||
34 | 34 | ||
35 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ptpd/files/releases" | 35 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ptpd/files/releases" |
36 | 36 | ||
37 | S = "${WORKDIR}/ptpd-${PV}" | 37 | S = "${UNPACKDIR}/ptpd-${PV}" |
38 | 38 | ||
39 | EXTRA_OEMAKE = "" | 39 | EXTRA_OEMAKE = "" |
40 | 40 | ||
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch index 32d714f6f4..90244cf096 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 79fd22c0def26eba130db98e312bb00fec32ac0a Mon Sep 17 00:00:00 2001 | 1 | From ed60c2ad3a7ed9762fcb6a304c7f60544606baef Mon Sep 17 00:00:00 2001 |
2 | From: Tudor Florea <tudor.florea@enea.com> | 2 | From: Tudor Florea <tudor.florea@enea.com> |
3 | Date: Tue, 4 Aug 2015 03:07:01 +0200 | 3 | Date: Tue, 4 Aug 2015 03:07:01 +0200 |
4 | Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is | 4 | Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is |
@@ -10,16 +10,15 @@ Upstream-Status: Inappropriate [config] | |||
10 | 10 | ||
11 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | 11 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
12 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> | 12 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> |
13 | |||
14 | --- | 13 | --- |
15 | configure.ac | 2 -- | 14 | configure.ac | 2 -- |
16 | 1 file changed, 2 deletions(-) | 15 | 1 file changed, 2 deletions(-) |
17 | 16 | ||
18 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
19 | index 695ce68..0f28b55 100644 | 18 | index e578b2b..3874124 100644 |
20 | --- a/configure.ac | 19 | --- a/configure.ac |
21 | +++ b/configure.ac | 20 | +++ b/configure.ac |
22 | @@ -414,8 +414,6 @@ AC_ARG_WITH(minimal, | 21 | @@ -415,8 +415,6 @@ AC_ARG_WITH(minimal, |
23 | AC_DEFINE(NO_FTP_USERS) | 22 | AC_DEFINE(NO_FTP_USERS) |
24 | AC_DEFINE(WITHOUT_ASCII) | 23 | AC_DEFINE(WITHOUT_ASCII) |
25 | AC_DEFINE(BORING_MODE) | 24 | AC_DEFINE(BORING_MODE) |
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.52.bb index 6f03f73db5..c5c9c87c7f 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.52.bb | |||
@@ -3,7 +3,7 @@ DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and | |||
3 | HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" | 3 | HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" |
4 | SECTION = "net" | 4 | SECTION = "net" |
5 | LICENSE = "0BSD" | 5 | LICENSE = "0BSD" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=194bc994ad6bbd4ff5a021082fe52156" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=5138d4a8a877b32de6a78cf7e9e99c25" |
7 | 7 | ||
8 | DEPENDS = "libcap virtual/crypt" | 8 | DEPENDS = "libcap virtual/crypt" |
9 | 9 | ||
@@ -11,9 +11,11 @@ SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.t | |||
11 | file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ | 11 | file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \ |
12 | file://nostrip.patch \ | 12 | file://nostrip.patch \ |
13 | " | 13 | " |
14 | SRC_URI[sha256sum] = "4160f66b76615eea2397eac4ea3f0a146b7928207b79bc4cc2f99ad7b7bd9513" | 14 | SRC_URI[sha256sum] = "1126f3a95856d08889ff89703cb1aa9ec9924d939d154e96904c920f05dc3c74" |
15 | 15 | ||
16 | inherit autotools | 16 | inherit autotools |
17 | 17 | ||
18 | PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ | 18 | EXTRA_AUTORECONF += "-I m4" |
19 | ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" | 19 | |
20 | PACKAGECONFIG[libsodium] = "ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ | ||
21 | ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" | ||
diff --git a/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch b/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch deleted file mode 100644 index 57338d4713..0000000000 --- a/meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 15f439c555289f900eb33111b010bf1266f97edb Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan Davies <jpds@protonmail.com> | ||
3 | Date: Thu, 25 Nov 2021 15:29:18 +0000 | ||
4 | Subject: [PATCH] Reverts the include.h change in | ||
5 | 46883f8a1a02fe42040dd8e48aec0ed871545d4d | ||
6 | |||
7 | Closes: #158 | ||
8 | |||
9 | Upstream-Status: Backport [https://github.com/radvd-project/radvd/commit/06689f8c06f44c7e87f7ff1d814428f88375b53f] | ||
10 | Signed-off-by: Jonathan Davies <jpds@protonmail.com> | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | includes.h | 5 ----- | ||
14 | 1 file changed, 5 deletions(-) | ||
15 | |||
16 | diff --git a/includes.h b/includes.h | ||
17 | index ef30b10..c528c86 100644 | ||
18 | --- a/includes.h | ||
19 | +++ b/includes.h | ||
20 | @@ -76,12 +76,7 @@ | ||
21 | #include <sys/sysctl.h> | ||
22 | #endif | ||
23 | |||
24 | -#if !defined(__GLIBC__) && defined(linux) | ||
25 | -#include <linux/if.h> | ||
26 | -#define IF_NAMESIZE IFNAMSIZ | ||
27 | -#else | ||
28 | #include <net/if.h> | ||
29 | -#endif | ||
30 | |||
31 | #ifdef HAVE_NET_IF_DL_H | ||
32 | #include <net/if_dl.h> | ||
diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.init b/meta-networking/recipes-daemons/radvd/files/radvd.init index 8b26317ee6..8b26317ee6 100755..100644 --- a/meta-networking/recipes-daemons/radvd/files/radvd.init +++ b/meta-networking/recipes-daemons/radvd/files/radvd.init | |||
diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.service b/meta-networking/recipes-daemons/radvd/files/radvd.service index e60798a6b3..9230543c48 100644 --- a/meta-networking/recipes-daemons/radvd/files/radvd.service +++ b/meta-networking/recipes-daemons/radvd/files/radvd.service | |||
@@ -4,8 +4,11 @@ After=network.target | |||
4 | ConditionPathExists=@SYSCONFDIR@/radvd.conf | 4 | ConditionPathExists=@SYSCONFDIR@/radvd.conf |
5 | 5 | ||
6 | [Service] | 6 | [Service] |
7 | EnvironmentFile=-@SYSCONFDIR@/default/radvd | 7 | Type=forking |
8 | ExecStart=@SBINDIR@/radvd -n $OPTIONS | 8 | EnvironmentFile=@SYSCONFDIR@/default/radvd |
9 | ExecStart=@SBINDIR@/radvd $OPTIONS | ||
10 | PIDFile=/run/radvd.pid | ||
11 | ExecReload=/bin/kill -HUP $MAINPID | ||
9 | 12 | ||
10 | [Install] | 13 | [Install] |
11 | WantedBy=multi-user.target | 14 | WantedBy=multi-user.target |
diff --git a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb b/meta-networking/recipes-daemons/radvd/radvd_2.20.bb index a8a116cbe5..e2d606823b 100644 --- a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb +++ b/meta-networking/recipes-daemons/radvd/radvd_2.20.bb | |||
@@ -8,7 +8,7 @@ addresses and some other parameters. They also can \ | |||
8 | choose a default router based on these advertisements." | 8 | choose a default router based on these advertisements." |
9 | HOMEPAGE = "http://www.litech.org/radvd/" | 9 | HOMEPAGE = "http://www.litech.org/radvd/" |
10 | SECTION = "net" | 10 | SECTION = "net" |
11 | DEPENDS = "flex-native bison-native libdaemon " | 11 | DEPENDS = "flex-native bison-native libdaemon libbsd" |
12 | 12 | ||
13 | # License is BSD-Style (with advertising clause) but also has an additional 0th clause | 13 | # License is BSD-Style (with advertising clause) but also has an additional 0th clause |
14 | LICENSE = "radvd" | 14 | LICENSE = "radvd" |
@@ -20,9 +20,8 @@ SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ | |||
20 | file://volatiles.03_radvd \ | 20 | file://volatiles.03_radvd \ |
21 | file://radvd.default \ | 21 | file://radvd.default \ |
22 | file://radvd.conf \ | 22 | file://radvd.conf \ |
23 | file://0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch \ | ||
24 | " | 23 | " |
25 | SRC_URI[sha256sum] = "c36470706fec3a9e6bed394ffea08acaff5dac647848d26b96bb9b9c65d58da0" | 24 | SRC_URI[sha256sum] = "af37c5a81d59f3bdc00d83056606ffa1810d4550beed6caa4f81181246494220" |
26 | 25 | ||
27 | inherit autotools useradd pkgconfig systemd | 26 | inherit autotools useradd pkgconfig systemd |
28 | 27 | ||
@@ -30,34 +29,37 @@ SYSTEMD_SERVICE:${PN} = "radvd.service" | |||
30 | SYSTEMD_AUTO_ENABLE = "disable" | 29 | SYSTEMD_AUTO_ENABLE = "disable" |
31 | 30 | ||
32 | do_install:append () { | 31 | do_install:append () { |
33 | install -m 0755 -d ${D}${sysconfdir}/init.d \ | 32 | install -m 0755 -d ${D}${sysconfdir}/default |
34 | ${D}${sysconfdir}/default/volatiles \ | 33 | install -m 0644 ${UNPACKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf |
35 | ${D}${docdir}/radvd | 34 | install -m 0644 ${UNPACKDIR}/radvd.default ${D}${sysconfdir}/default/radvd |
36 | # Install init script and volatiles | ||
37 | install -m 0755 ${UNPACKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd | ||
38 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd | ||
39 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd | ||
40 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd | ||
41 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd | ||
42 | 35 | ||
43 | install -m 0644 ${UNPACKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd | 36 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
37 | install -m 0755 -d ${D}${sysconfdir}/init.d \ | ||
38 | ${D}${sysconfdir}/default/volatiles | ||
44 | 39 | ||
45 | # Install systemd service files | 40 | install -m 0755 ${UNPACKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd |
46 | install -d ${D}${systemd_unitdir}/system | 41 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd |
47 | install -m 0644 ${UNPACKDIR}/radvd.service ${D}${systemd_unitdir}/system | 42 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd |
48 | sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \ | 43 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd |
49 | -e 's#@SBINDIR@#${sbindir}#g' \ | 44 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd |
50 | -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service | ||
51 | 45 | ||
52 | # Install default environment file | 46 | install -m 0644 ${UNPACKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd |
53 | install -m 0644 ${UNPACKDIR}/radvd.default ${D}${sysconfdir}/default/radvd | 47 | fi |
48 | |||
49 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | ||
50 | install -m 0755 -d ${D}${systemd_unitdir}/system | ||
51 | |||
52 | install -m 0644 ${UNPACKDIR}/radvd.service ${D}${systemd_unitdir}/system | ||
53 | sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \ | ||
54 | -e 's#@SBINDIR@#${sbindir}#g' \ | ||
55 | ${D}${systemd_unitdir}/system/radvd.service | ||
56 | fi | ||
54 | 57 | ||
55 | # Documentation | 58 | # Documentation |
59 | install -m 0755 -d ${D}${docdir}/radvd | ||
56 | for i in radvd.conf.example README; do \ | 60 | for i in radvd.conf.example README; do \ |
57 | install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ | 61 | install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ |
58 | done | 62 | done |
59 | |||
60 | install -m 0644 ${UNPACKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf | ||
61 | } | 63 | } |
62 | 64 | ||
63 | USERADD_PACKAGES = "${PN}" | 65 | USERADD_PACKAGES = "${PN}" |
diff --git a/meta-networking/recipes-daemons/squid/files/0001-libltdl-remove-reference-to-nonexisting-directory.patch b/meta-networking/recipes-daemons/squid/files/0001-libltdl-remove-reference-to-nonexisting-directory.patch new file mode 100644 index 0000000000..9babcfb24d --- /dev/null +++ b/meta-networking/recipes-daemons/squid/files/0001-libltdl-remove-reference-to-nonexisting-directory.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | From a6638a007a42917fea4b03e5c30d9b7208c634c4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Marko <peter.marko@siemens.com> | ||
3 | Date: Thu, 7 Nov 2024 22:04:40 +0100 | ||
4 | Subject: [PATCH] libltdl: remove reference to nonexisting directory | ||
5 | |||
6 | Commit [1] removed directory libltdl/m4 from release tarball by merging | ||
7 | all those files into libltdl/aclocal.m4, however makefiles still | ||
8 | reference it causing following error in do_configure: | ||
9 | |||
10 | | autoreconf: Entering directory 'libltdl' | ||
11 | | autoreconf: configure.ac: not using Gettext | ||
12 | | autoreconf: running: aclocal --system-acdir=WORKDIR/recipe-sysroot/usr/share/aclocal/ -I WORKDIR/squid-6.12/acinclude/ -I WORKDIR/recipe-sysroot-native/usr/share/aclocal/ --force -I m4 | ||
13 | | aclocal: error: couldn't open directory 'm4': No such file or directory | ||
14 | | autoreconf: error: aclocal failed with exit status: 1 | ||
15 | |||
16 | Remove these invalid references. | ||
17 | |||
18 | [1] https://github.com/squid-cache/squid/commit/b4addc2262e5bee37543f8d1ab9dd98337bafba3 | ||
19 | |||
20 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
21 | Upstream-Status: Inappropriate [upstream ticket https://lists.squid-cache.org/pipermail/squid-users/2024-November/027244.html] | ||
22 | --- | ||
23 | libltdl/Makefile.am | 2 +- | ||
24 | libltdl/Makefile.in | 2 +- | ||
25 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
26 | |||
27 | diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am | ||
28 | index aad98e2..8a9539b 100644 | ||
29 | --- a/libltdl/Makefile.am | ||
30 | +++ b/libltdl/Makefile.am | ||
31 | @@ -29,7 +29,7 @@ | ||
32 | ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
33 | ##### | ||
34 | |||
35 | -ACLOCAL_AMFLAGS = -I m4 | ||
36 | +ACLOCAL_AMFLAGS = | ||
37 | AUTOMAKE_OPTIONS = foreign | ||
38 | AM_CPPFLAGS = | ||
39 | AM_LDFLAGS = | ||
40 | diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in | ||
41 | index 9929557..c77df2e 100644 | ||
42 | --- a/libltdl/Makefile.in | ||
43 | +++ b/libltdl/Makefile.in | ||
44 | @@ -448,7 +448,7 @@ target_alias = @target_alias@ | ||
45 | top_build_prefix = @top_build_prefix@ | ||
46 | top_builddir = @top_builddir@ | ||
47 | top_srcdir = @top_srcdir@ | ||
48 | -ACLOCAL_AMFLAGS = -I m4 | ||
49 | +ACLOCAL_AMFLAGS = | ||
50 | AUTOMAKE_OPTIONS = foreign | ||
51 | |||
52 | # -I$(srcdir) is needed for user that built libltdl with a sub-Automake | ||
53 | -- | ||
54 | 2.30.2 | ||
55 | |||
diff --git a/meta-networking/recipes-daemons/squid/squid_6.10.bb b/meta-networking/recipes-daemons/squid/squid_6.12.bb index 984209ad21..87144fb049 100644 --- a/meta-networking/recipes-daemons/squid/squid_6.10.bb +++ b/meta-networking/recipes-daemons/squid/squid_6.12.bb | |||
@@ -19,13 +19,14 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \ | |||
19 | file://run-ptest \ | 19 | file://run-ptest \ |
20 | file://volatiles.03_squid \ | 20 | file://volatiles.03_squid \ |
21 | file://0002-squid-make-squid-conf-tests-run-on-target-device.patch \ | 21 | file://0002-squid-make-squid-conf-tests-run-on-target-device.patch \ |
22 | file://0001-libltdl-remove-reference-to-nonexisting-directory.patch \ | ||
22 | file://squid.nm \ | 23 | file://squid.nm \ |
23 | " | 24 | " |
24 | 25 | ||
25 | SRC_URI[sha256sum] = "0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7" | 26 | SRC_URI[sha256sum] = "f3df3abb2603a513266f24a5d4699a9f0d76b9f554d1848b67f9c51cd3b3cb50" |
26 | 27 | ||
27 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 28 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
28 | file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \ | 29 | file://errors/COPYRIGHT;md5=6fbb6a2adc362e206da7b4f42846cdec \ |
29 | " | 30 | " |
30 | DEPENDS = "libtool" | 31 | DEPENDS = "libtool" |
31 | 32 | ||
@@ -47,7 +48,6 @@ PACKAGECONFIG ??= "auth url-rewrite-helpers \ | |||
47 | PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" | 48 | PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" |
48 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 49 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
49 | PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," | 50 | PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," |
50 | PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2" | ||
51 | PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl" | 51 | PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl" |
52 | PACKAGECONFIG[auth] = "--enable-auth-basic='${BASIC_AUTH}',--disable-auth --disable-auth-basic,krb5 openldap db cyrus-sasl" | 52 | PACKAGECONFIG[auth] = "--enable-auth-basic='${BASIC_AUTH}',--disable-auth --disable-auth-basic,krb5 openldap db cyrus-sasl" |
53 | PACKAGECONFIG[url-rewrite-helpers] = "--enable-url-rewrite-helpers,--disable-url-rewrite-helpers," | 53 | PACKAGECONFIG[url-rewrite-helpers] = "--enable-url-rewrite-helpers,--disable-url-rewrite-helpers," |
@@ -66,14 +66,16 @@ BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" | |||
66 | EXTRA_OECONF += "--with-default-user=squid \ | 66 | EXTRA_OECONF += "--with-default-user=squid \ |
67 | --sysconfdir=${sysconfdir}/${BPN} \ | 67 | --sysconfdir=${sysconfdir}/${BPN} \ |
68 | --with-logdir=${localstatedir}/log/${BPN} \ | 68 | --with-logdir=${localstatedir}/log/${BPN} \ |
69 | 'PERL=${USRBINPATH}/env perl'" | 69 | 'PERL=${USRBINPATH}/env perl' \ |
70 | --disable-esi \ | ||
71 | " | ||
70 | 72 | ||
71 | # Workaround a build failure when using a native compiler that need -std=c++17 | 73 | # Workaround a build failure when using a native compiler that need -std=c++17 |
72 | # with a cross-compiler that doesn't. | 74 | # with a cross-compiler that doesn't. |
73 | # Upstream issue closed as invalid : https://bugs.squid-cache.org/show_bug.cgi?id=5376 | 75 | # Upstream issue closed as invalid : https://bugs.squid-cache.org/show_bug.cgi?id=5376 |
74 | BUILD_CXXFLAGS += "-std=c++17" | 76 | BUILD_CXXFLAGS += "-std=c++17" |
75 | 77 | ||
76 | export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" | 78 | export BUILDCXXFLAGS = "${BUILD_CXXFLAGS}" |
77 | 79 | ||
78 | TESTDIR = "test-suite" | 80 | TESTDIR = "test-suite" |
79 | 81 | ||
diff --git a/meta-networking/recipes-daemons/vblade/vblade_25.bb b/meta-networking/recipes-daemons/vblade/vblade_25.bb index 7f20e927c6..f73e72442b 100644 --- a/meta-networking/recipes-daemons/vblade/vblade_25.bb +++ b/meta-networking/recipes-daemons/vblade/vblade_25.bb | |||
@@ -16,11 +16,10 @@ SRC_URI = "git://github.com/OpenAoE/vblade;branch=master;protocol=https \ | |||
16 | file://volatiles.99_vblade \ | 16 | file://volatiles.99_vblade \ |
17 | " | 17 | " |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | ||
20 | 19 | ||
21 | UPSTREAM_CHECK_URI = "https://github.com/OpenAoE/vblade/archive/" | 20 | UPSTREAM_CHECK_URI = "https://github.com/OpenAoE/vblade/archive/" |
22 | 21 | ||
23 | inherit autotools-brokensep update-rc.d systemd | 22 | inherit update-rc.d systemd |
24 | 23 | ||
25 | do_install() { | 24 | do_install() { |
26 | install -D -m 0755 ${S}/vblade ${D}/${sbindir}/vblade | 25 | install -D -m 0755 ${S}/vblade ${D}/${sbindir}/vblade |
diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb index 4a843bd800..9b2be6236b 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb | |||
@@ -39,12 +39,12 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | |||
39 | RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" | 39 | RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" |
40 | PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" | 40 | PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" |
41 | WRAPLIB = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '-lwrap', '', d)}" | 41 | WRAPLIB = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '-lwrap', '', d)}" |
42 | NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" | 42 | NOPAM_SRC = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" |
43 | 43 | ||
44 | inherit update-rc.d useradd systemd | 44 | inherit update-rc.d useradd systemd |
45 | 45 | ||
46 | CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf" | 46 | CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf" |
47 | LDFLAGS:append =" -lcrypt -lcap" | 47 | LDFLAGS:append = " -lcrypt -lcap" |
48 | CFLAGS:append:libc-musl = " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -include fcntl.h" | 48 | CFLAGS:append:libc-musl = " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -include fcntl.h" |
49 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | 49 | EXTRA_OEMAKE = "-e MAKEFLAGS=" |
50 | 50 | ||