summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-daemons
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-daemons')
-rw-r--r--meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb1
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch30
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch50
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch115
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch31
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch56
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch29
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0001-no-bash.patch (renamed from meta-networking/recipes-daemons/autofs/autofs/no-bash.patch)13
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch60
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch106
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0002-using-pkg-config-to-detect-krb5.patch (renamed from meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch)30
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0003-force-STRIP-to-emtpy.patch (renamed from meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch)16
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0004-autofs.init.in-remove-bashism.patch (renamed from meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch)6
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0005-fix-the-YACC-rule-to-fix-a-building-failure.patch (renamed from meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch)67
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch31
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch (renamed from meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch)17
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0008-include-libgen.h-for-basename.patch (renamed from meta-networking/recipes-daemons/autofs/autofs/0001-include-libgen.h-for-basename.patch)11
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch35
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch64
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch25
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch26
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/cross.patch55
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch47
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch37
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs_5.1.9.bb (renamed from meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb)43
-rw-r--r--meta-networking/recipes-daemons/ippool/ippool_1.3.bb9
-rw-r--r--meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.11.bb (renamed from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.10.bb)3
-rw-r--r--meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch27
-rw-r--r--meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch34
-rw-r--r--meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb (renamed from meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb)14
-rw-r--r--meta-networking/recipes-daemons/lldpd/lldpd_1.0.19.bb (renamed from meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb)2
-rw-r--r--meta-networking/recipes-daemons/ncftp/ncftp/0001-ncftp-3.2.7-fix-gcc14.patch20
-rw-r--r--meta-networking/recipes-daemons/ncftp/ncftp/0002-ncftp-3.2.7-fix-clang.patch73
-rw-r--r--meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb9
-rw-r--r--meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.2.4.bb1
-rw-r--r--meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb1
-rw-r--r--meta-networking/recipes-daemons/postfix/files/0001-Fix-makedefs.patch20
-rw-r--r--meta-networking/recipes-daemons/postfix/files/0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch32
-rw-r--r--meta-networking/recipes-daemons/postfix/files/0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch20
-rw-r--r--meta-networking/recipes-daemons/postfix/files/0004-Fix-icu-config.patch12
-rw-r--r--meta-networking/recipes-daemons/postfix/files/0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch10
-rw-r--r--meta-networking/recipes-daemons/postfix/files/main.cf2
-rw-r--r--meta-networking/recipes-daemons/postfix/postfix_3.10.1.bb (renamed from meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb)31
-rw-r--r--meta-networking/recipes-daemons/proftpd/files/build_fixup.patch20
-rw-r--r--meta-networking/recipes-daemons/proftpd/files/contrib.patch8
-rw-r--r--meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb (renamed from meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb)23
-rw-r--r--meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb2
-rw-r--r--meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch7
-rw-r--r--meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.52.bb (renamed from meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.51.bb)10
-rw-r--r--meta-networking/recipes-daemons/radvd/files/0001-Reverts-the-include.h-change-in-46883f8a1a02fe42040d.patch32
-rw-r--r--[-rwxr-xr-x]meta-networking/recipes-daemons/radvd/files/radvd.init0
-rw-r--r--meta-networking/recipes-daemons/radvd/files/radvd.service7
-rw-r--r--meta-networking/recipes-daemons/radvd/radvd_2.20.bb (renamed from meta-networking/recipes-daemons/radvd/radvd_2.19.bb)48
-rw-r--r--meta-networking/recipes-daemons/squid/files/0001-libltdl-remove-reference-to-nonexisting-directory.patch55
-rw-r--r--meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch2
-rw-r--r--meta-networking/recipes-daemons/squid/squid_6.12.bb (renamed from meta-networking/recipes-daemons/squid/squid_6.9.bb)12
-rw-r--r--meta-networking/recipes-daemons/vblade/vblade_25.bb3
-rw-r--r--meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb4
58 files changed, 620 insertions, 934 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
14S = "${WORKDIR}/git"
15 14
16inherit autotools update-rc.d systemd 15inherit autotools update-rc.d systemd
17 16
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch
deleted file mode 100644
index 2a583466e3..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From d0d5ac317dab11610a5fc91ca3e7f5ad72ce2236 Mon Sep 17 00:00:00 2001
2From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
3Date: Tue, 29 Oct 2019 13:19:37 +0800
4Subject: [PATCH] Bug fix for pid_t not found on musl.
5
6When compiling version 5.1.6 on musl, the following error occurs:
7log.h:49:8: error: unknown type name 'pid_t'
8
9Upstream-Status: Pending
10
11Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
12---
13 lib/defaults.c | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/lib/defaults.c b/lib/defaults.c
17index a6ea116..b3ecfa5 100644
18--- a/lib/defaults.c
19+++ b/lib/defaults.c
20@@ -21,6 +21,7 @@
21 #include <string.h>
22 #include <sys/utsname.h>
23 #include <sys/stat.h>
24+#include <sys/types.h>
25 #include <stdarg.h>
26
27 #include "config.h"
28--
292.20.1
30
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch
deleted file mode 100644
index 6128f3d0ed..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 987c8f4a718cdd6b764592ba7510090a59623959 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 31 Mar 2017 19:10:57 -0700
4Subject: [PATCH] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF
5
6if they are not defined as is in musl then define
7them here
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11---
12Upstream-Status: Pending
13
14 include/automount.h | 8 ++++++++
15 include/nsswitch.h | 3 +++
16 2 files changed, 11 insertions(+)
17
18diff --git a/include/automount.h b/include/automount.h
19index cc336ad..8bdcf12 100644
20--- a/include/automount.h
21+++ b/include/automount.h
22@@ -42,6 +42,14 @@
23
24 #define ENABLE_CORES 1
25
26+#ifndef __SWORD_TYPE
27+# if __WORDSIZE == 32 /* System word size */
28+# define __SWORD_TYPE int
29+# else /* __WORDSIZE == 64 */
30+# define __SWORD_TYPE long int
31+# endif
32+#endif
33+
34 /* We MUST have the paths to mount(8) and umount(8) */
35 #ifndef HAVE_MOUNT
36 #error Failed to locate mount(8)!
37diff --git a/include/nsswitch.h b/include/nsswitch.h
38index d3e4027..7a0c38f 100644
39--- a/include/nsswitch.h
40+++ b/include/nsswitch.h
41@@ -24,6 +24,9 @@
42 #include <netdb.h>
43 #include "list.h"
44
45+#ifndef _PATH_NSSWITCH_CONF
46+#define _PATH_NSSWITCH_CONF "/etc/nsswitch.conf"
47+#endif
48 #define NSSWITCH_FILE _PATH_NSSWITCH_CONF
49
50 enum nsswitch_status {
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch
deleted file mode 100644
index f16ae5277e..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch
+++ /dev/null
@@ -1,115 +0,0 @@
1From 9fe90ab1e333b2e2bed370ff13ba552eb54c3aaf Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 17 Jul 2021 09:56:28 -0700
4Subject: [PATCH] Define __SWORD_TYPE if undefined
5
6These fixes are inspired when building autofs on musl
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 daemon/automount.c | 20 ++++++++++++++------
12 include/hash.h | 5 +++++
13 lib/log.c | 6 +++++-
14 3 files changed, 24 insertions(+), 7 deletions(-)
15
16--- a/daemon/automount.c
17+++ b/daemon/automount.c
18@@ -1,7 +1,7 @@
19 /* ----------------------------------------------------------------------- *
20 *
21 * automount.c - Linux automounter daemon
22- *
23+ *
24 * Copyright 1997 Transmeta Corporation - All Rights Reserved
25 * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org>
26 * Copyright 2001-2005 Ian Kent <raven@themaw.net>
27@@ -11,7 +11,7 @@
28 * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
29 * USA; either version 2 of the License, or (at your option) any later
30 * version.
31- *
32+ *
33 * This program is distributed in the hope that it will be useful,
34 * but WITHOUT ANY WARRANTY; without even the implied warranty of
35 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
36@@ -40,6 +40,14 @@
37 #include <systemd/sd-daemon.h>
38 #endif
39
40+#ifndef __SWORD_TYPE
41+# if __WORDSIZE == 32 /* System word size */
42+# define __SWORD_TYPE int
43+# else /* __WORDSIZE == 64 */
44+# define __SWORD_TYPE long int
45+# endif
46+#endif
47+
48 #include "automount.h"
49 #if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND)
50 #include <dlfcn.h>
51@@ -282,7 +290,7 @@ int rmdir_path(struct autofs_point *ap,
52 dev, buf, st.st_dev);
53 return -1;
54 }
55-
56+
57 /*
58 * Last element of path may be a symbolic link; all others
59 * are directories (and the last directory element is
60@@ -455,7 +463,7 @@ int count_mounts(struct autofs_point *ap
61
62 counter.count = 0;
63 counter.dev = dev;
64-
65+
66 if (walk_tree(path, counter_fn, 1, ap, &counter) == -1)
67 return -1;
68
69@@ -811,7 +819,7 @@ static char *automount_path_to_fifo(unsi
70 /*
71 * An automount path can be made up of subdirectories. So, to
72 * create the fifo name, we will just replace instances of '/' with
73- * '-'.
74+ * '-'.
75 */
76 p = fifo_name + strlen(fifodir);
77 while (*p != '\0') {
78@@ -1640,7 +1648,7 @@ static void return_start_status(void *ar
79 sc->done = 1;
80
81 /*
82- * Startup condition mutex must be locked during
83+ * Startup condition mutex must be locked during
84 * the startup process.
85 */
86 status = pthread_cond_signal(&sc->cond);
87--- a/include/hash.h
88+++ b/include/hash.h
89@@ -5,6 +5,11 @@
90
91 #include <sys/types.h>
92 #include <stdint.h>
93+#include <linux/stddef.h>
94+
95+#ifndef __GLIBC__
96+#include <sys/reg.h>
97+#endif
98
99 /*
100 * The "GOLDEN_RATIO_PRIME" is used in ifs/btrfs/brtfs_inode.h and
101--- a/lib/log.c
102+++ b/lib/log.c
103@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons
104 char buffer[ATTEMPT_ID_SIZE + 1];
105 char *prefixed_msg = NULL;
106
107- attempt_id = pthread_getspecific(key_thread_attempt_id);
108+ if (key_thread_attempt_id) {
109+ attempt_id = pthread_getspecific(key_thread_attempt_id);
110+ } else {
111+ attempt_id = 0;
112+ }
113 if (attempt_id) {
114 int len = sizeof(buffer) + 1 + strlen(msg) + 1;
115
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch
deleted file mode 100644
index f18f237d98..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From d7a34bb388e33d16260b67275cdb58f9c877d324 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 27 Nov 2018 15:27:47 +0800
4Subject: [PATCH] From 6d24365f0828185fd1bb4d199209ca07eb95c41d Mon Sep 17
5 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 24 Aug 2018
6 06:24:36 +0000 Subject: [PATCH] Do not hardcode path for pkg.m4
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12update patch to version 5.1.6
13Signed-off-by: Changqing Li <changqing.li@windriver.com>
14
15---
16 configure.in | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/configure.in b/configure.in
20index 07c2051..e85d718 100644
21--- a/configure.in
22+++ b/configure.in
23@@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl
24 AC_INIT(.autofs-5.1.8)
25
26 # for pkg-config macros
27-m4_include([/usr/share/aclocal/pkg.m4])
28+m4_include([pkg.m4])
29
30 #
31 # autofs installs by default in /usr
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch
deleted file mode 100644
index caf0105118..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 88f991b0ebb6fb8fcaad3d0eb8fb51a7439d053e Mon Sep 17 00:00:00 2001
2From: Fabian Groffen <grobian@gentoo.org>
3Date: Wed, 2 Feb 2022 09:27:13 +0800
4Subject: [PATCH 1/2] autofs-5.1.8 - add autofs_strerror_r() helper for musl
5
6If using musl libc the XSI-compliant variant strerror_r() which returns
7an integer instead of a pointer so add a helper function to handle this
8case.
9
10Signed-off-by: Fabian Groffen <grobian@gentoo.org>
11Signed-off-by: Ian Kent <raven@themaw.net>
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14Upstream-Status: Pending
15
16 include/automount.h | 5 +++++
17 lib/log.c | 10 ++++++++++
18 2 files changed, 15 insertions(+)
19
20diff --git a/include/automount.h b/include/automount.h
21index 8cd8b3a..f759e59 100644
22--- a/include/automount.h
23+++ b/include/automount.h
24@@ -51,6 +51,11 @@
25 # endif
26 #endif
27
28+#ifndef __GLIBC__
29+# define strerror_r(N,B,S) autofs_strerror_r(N,B,S)
30+char *autofs_strerror_r(int errnum, char *buf, size_t buflen); /* GNU */
31+#endif
32+
33 /* We MUST have the paths to mount(8) and umount(8) */
34 #ifndef HAVE_MOUNT
35 #error Failed to locate mount(8)!
36diff --git a/lib/log.c b/lib/log.c
37index 39b1e3b..b99fa39 100644
38--- a/lib/log.c
39+++ b/lib/log.c
40@@ -368,3 +368,13 @@ pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label) {
41
42 return ppid;
43 }
44+
45+#ifndef __GLIBC__
46+# undef strerror_r
47+char *autofs_strerror_r(int errnum, char *buf, size_t buflen) {
48+ int s = strerror_r(errnum, buf, buflen);
49+ if (s)
50+ return NULL;
51+ return buf;
52+}
53+#endif
54--
552.37.3
56
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch
deleted file mode 100644
index 8eec3014a0..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 745e355ac8b595a27e1fcca75bf01d3e244f4a5f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 7 Sep 2017 22:22:31 -0700
4Subject: [PATCH] modules/lookup_multi.c: Replace __S_IEXEC with S_IEXEC
5
6__S_IEXEC is internal to libc and may not be available on
7all libc e.g. musl
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11---
12Upstream-Status: Pending
13
14 modules/lookup_multi.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
18index 3ecda6d..cf109de 100644
19--- a/modules/lookup_multi.c
20+++ b/modules/lookup_multi.c
21@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt,
22 continue;
23 }
24
25- if (st.st_mode & __S_IEXEC)
26+ if (st.st_mode & S_IEXEC)
27 type = src_prog;
28 else
29 type = src_file;
diff --git a/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-no-bash.patch
index f91c307d34..cd9b14358a 100644
--- a/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch
+++ b/meta-networking/recipes-daemons/autofs/autofs/0001-no-bash.patch
@@ -1,16 +1,18 @@
1From a3007d7ea930823926611081bb873ddd771325cb Mon Sep 17 00:00:00 2001 1From f53458e0b4cca0b0eedcd00b0e90b39d91228085 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 5 Jan 2013 19:53:10 -0800 3Date: Sat, 5 Jan 2013 19:53:10 -0800
4Subject: [PATCH] no bash
4 5
5---
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
8 samples/auto.net | 2 +- 10 samples/auto.net | 2 +-
9 samples/auto.smb | 2 +- 11 samples/auto.smb | 2 +-
10 2 files changed, 2 insertions(+), 2 deletions(-) 12 2 files changed, 2 insertions(+), 2 deletions(-)
11 13
12diff --git a/samples/auto.net b/samples/auto.net 14diff --git a/samples/auto.net b/samples/auto.net
13index 0384f61..61215f6 100755 15index c5b145d..a09d56d 100755
14--- a/samples/auto.net 16--- a/samples/auto.net
15+++ b/samples/auto.net 17+++ b/samples/auto.net
16@@ -1,4 +1,4 @@ 18@@ -1,4 +1,4 @@
@@ -20,7 +22,7 @@ index 0384f61..61215f6 100755
20 # This file must be executable to work! chmod 755! 22 # This file must be executable to work! chmod 755!
21 23
22diff --git a/samples/auto.smb b/samples/auto.smb 24diff --git a/samples/auto.smb b/samples/auto.smb
23index 6af5d85..d296b81 100755 25index f6d41d3..0d945ee 100755
24--- a/samples/auto.smb 26--- a/samples/auto.smb
25+++ b/samples/auto.smb 27+++ b/samples/auto.smb
26@@ -1,4 +1,4 @@ 28@@ -1,4 +1,4 @@
@@ -29,3 +31,6 @@ index 6af5d85..d296b81 100755
29 31
30 # This file must be executable to work! chmod 755! 32 # This file must be executable to work! chmod 755!
31 33
34--
352.25.1
36
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch
deleted file mode 100644
index d67f6300c8..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From 096e33743158e0e8c04d60d01cc66e2945d79777 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 27 Nov 2018 16:52:35 +0800
4Subject: [PATCH] From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17
5 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017
6 19:12:10 -0700 Subject: [PATCH] Replace __S_IEXEC with S_IEXEC
7
8S_IEXEC is portable
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12update patch to version 5.1.5
13Signed-off-by: Changqing Li <changqing.li@windriver.com>
14---
15Upstream-Status: Pending
16
17 daemon/lookup.c | 6 +++---
18 modules/lookup_multi.c | 2 +-
19 2 files changed, 4 insertions(+), 4 deletions(-)
20
21--- a/daemon/lookup.c
22+++ b/daemon/lookup.c
23@@ -397,7 +397,7 @@ static int read_file_source_instance(str
24 return NSS_STATUS_NOTFOUND;
25 }
26
27- if (st.st_mode & __S_IEXEC)
28+ if (st.st_mode & S_IEXEC)
29 type = src_prog;
30 else
31 type = src_file;
32@@ -930,7 +930,7 @@ static int lookup_name_file_source_insta
33 return NSS_STATUS_NOTFOUND;
34 }
35
36- if (st.st_mode & __S_IEXEC)
37+ if (st.st_mode & S_IEXEC)
38 type = src_prog;
39 else
40 type = src_file;
41@@ -1077,7 +1077,7 @@ static struct map_source *lookup_get_map
42 if (!S_ISREG(st.st_mode))
43 return NULL;
44
45- if (st.st_mode & __S_IEXEC)
46+ if (st.st_mode & S_IEXEC)
47 type = "program";
48 else
49 type = "file";
50--- a/modules/lookup_multi.c
51+++ b/modules/lookup_multi.c
52@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_looku
53 continue;
54 }
55
56- if (st.st_mode & __S_IEXEC)
57+ if (st.st_mode & S_IEXEC)
58 type = src_prog;
59 else
60 type = src_file;
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch
deleted file mode 100644
index 9d0caae312..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch
+++ /dev/null
@@ -1,106 +0,0 @@
1From 1c0b0b70a276280f431d72319109a0bbc0267970 Mon Sep 17 00:00:00 2001
2From: Fabian Groffen <grobian@gentoo.org>
3Date: Wed, 2 Feb 2022 10:15:22 +0800
4Subject: [PATCH 2/2] autofs-5.1.8 - handle innetgr() not present in musl
5
6The function innetgr(3) may not be present in musl libc, add a check
7for this.
8
9Originally contributed by Fabian, modified by me.
10
11Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=f60e40af3c038b8955325a11b7294ad38c15c9e8]
12Signed-off-by: Fabian Groffen <grobian@gentoo.org>
13Signed-off-by: Ian Kent <raven@themaw.net>
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 configure | 6 ++++++
17 configure.in | 2 +-
18 include/config.h.in | 3 +++
19 modules/parse_amd.c | 7 +++++++
20 4 files changed, 17 insertions(+), 1 deletion(-)
21
22--- a/configure.in
23+++ b/configure.in
24@@ -169,7 +169,7 @@ AF_CHECK_SSS_LIB(SSS_AUTOFS, libsss_auto
25 AC_SUBST(HAVE_SSS_AUTOFS)
26 AC_SUBST(sssldir)
27
28-AC_CHECK_FUNCS(pipe2)
29+AC_CHECK_FUNCS(pipe2 innetgr)
30
31 #
32 # Newer mounts have the -s (sloppy) option to ignore unknown options,
33--- a/include/config.h.in
34+++ b/include/config.h.in
35@@ -30,6 +30,9 @@
36 /* Define to 1 if you have the `getservbyname' function. */
37 #undef HAVE_GETSERVBYNAME
38
39+/* Define to 1 if you have the `innetgr' function. */
40+#undef HAVE_INNETGR
41+
42 /* Define to 1 if you have the <inttypes.h> header file. */
43 #undef HAVE_INTTYPES_H
44
45@@ -45,9 +48,6 @@
46 /* Define if you have the Linux /proc filesystem. */
47 #undef HAVE_LINUX_PROCFS
48
49-/* Define to 1 if you have the <memory.h> header file. */
50-#undef HAVE_MEMORY_H
51-
52 /* define if you have MOUNT */
53 #undef HAVE_MOUNT
54
55@@ -69,6 +69,9 @@
56 /* Define to 1 if you have the <stdint.h> header file. */
57 #undef HAVE_STDINT_H
58
59+/* Define to 1 if you have the <stdio.h> header file. */
60+#undef HAVE_STDIO_H
61+
62 /* Define to 1 if you have the <stdlib.h> header file. */
63 #undef HAVE_STDLIB_H
64
65@@ -141,7 +144,9 @@
66 /* define if you have YACC */
67 #undef PATH_YACC
68
69-/* Define to 1 if you have the ANSI C header files. */
70+/* Define to 1 if all of the C90 standard headers exist (not just the ones
71+ required in a freestanding environment). This macro is provided for
72+ backward compatibility; new code need not use it. */
73 #undef STDC_HEADERS
74
75 /* Define to 1 to use the libtirpc tsd usage workaround */
76--- a/modules/parse_amd.c
77+++ b/modules/parse_amd.c
78@@ -424,6 +424,7 @@ static int sel_in_network(struct autofs_
79 return ret;
80 }
81
82+#ifdef HAVE_INNETGR
83 static int sel_netgrp(struct autofs_point *ap,
84 struct selector *s, struct substvar *sv)
85 {
86@@ -488,6 +489,7 @@ out:
87
88 return ret;
89 }
90+#endif
91
92 static int eval_selector(struct autofs_point *ap,
93 struct amd_entry *this, struct substvar *sv)
94@@ -627,7 +629,12 @@ static int eval_selector(struct autofs_p
95 switch (s->sel->selector) {
96 case SEL_NETGRP:
97 case SEL_NETGRPD:
98+#ifndef HAVE_INNETGR
99+ error(logopt, MODPREFIX
100+ "netgroups not available, function innetgr(3) not available");
101+#else
102 ret = sel_netgrp(ap, s, sv);
103+#endif
104 break;
105
106 default:
diff --git a/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-using-pkg-config-to-detect-krb5.patch
index 41de373fd4..1bf95b8a45 100644
--- a/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch
+++ b/meta-networking/recipes-daemons/autofs/autofs/0002-using-pkg-config-to-detect-krb5.patch
@@ -1,10 +1,7 @@
1From dd90a690f95569b999b8ac9ab57e834b3421dcbb Mon Sep 17 00:00:00 2001 1From 796f1b5cfca595ba4e11ca9dab5c2c46c0710d95 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Roy Li <rongqing.li@windriver.com>
3Date: Tue, 27 Nov 2018 15:19:07 +0800 3Date: Tue, 19 Aug 2014 11:31:35 +0800
4Subject: [PATCH] From dabcbdae38038a8e4ad2c4286112381c407c5ce7 Mon Sep 17 4Subject: [PATCH] using pkg-config to detect krb5
5 00:00:00 2001 From: Roy Li <rongqing.li@windriver.com> Date: Tue, 19 Aug 2014
6 11:31:35 +0800 Subject: [PATCH] using pkg-config to detect libxml-2.0 and
7 krb5
8 5
9Upstream-Status: Pending 6Upstream-Status: Pending
10 7
@@ -13,15 +10,17 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
13update patch to 5.1.5 10update patch to 5.1.5
14Signed-off-by: Changqing Li <changqing.li@windriver.com> 11Signed-off-by: Changqing Li <changqing.li@windriver.com>
15--- 12---
16 configure.in | 16 ++++++++++++++-- 13 configure.ac | 9 ++++++++-
17 1 file changed, 14 insertions(+), 2 deletions(-) 14 1 file changed, 8 insertions(+), 1 deletion(-)
18 15
19--- a/configure.in 16diff --git a/configure.ac b/configure.ac
20+++ b/configure.in 17index 76a38f4..1bb1a52 100644
21@@ -215,7 +215,14 @@ PKG_CHECK_MODULES([XML], [libxml-2.0], [ 18--- a/configure.ac
19+++ b/configure.ac
20@@ -214,7 +214,14 @@ PKG_CHECK_MODULES([XML], [libxml-2.0], [
22 AC_DEFINE(LIBXML2_WORKAROUND, 1, [Use libxml2 tsd usage workaround]) 21 AC_DEFINE(LIBXML2_WORKAROUND, 1, [Use libxml2 tsd usage workaround])
23 ], [HAVE_LIBXML=0]) 22 ], [HAVE_LIBXML=0])
24 23
25-AF_CHECK_KRB5() 24-AF_CHECK_KRB5()
26+PKG_CHECK_MODULES(KRB5, [krb5], [ 25+PKG_CHECK_MODULES(KRB5, [krb5], [
27+ HAVE_KRB5=1 26+ HAVE_KRB5=1
@@ -31,6 +30,9 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
31+ LIBS="$LIBS $KRB5_LIBS" 30+ LIBS="$LIBS $KRB5_LIBS"
32+ AC_CHECK_FUNCS([krb5_principal_get_realm]) 31+ AC_CHECK_FUNCS([krb5_principal_get_realm])
33+], [HAVE_KRB5=0]) 32+], [HAVE_KRB5=0])
34 33
35 AC_SEARCH_LIBS([versionsort],[]) 34 AC_SEARCH_LIBS([versionsort],[])
36 if test "$ac_cv_search_versionsort" = "no"; then 35 if test "$ac_cv_search_versionsort" = "no"; then
36--
372.25.1
38
diff --git a/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch b/meta-networking/recipes-daemons/autofs/autofs/0003-force-STRIP-to-emtpy.patch
index 1fc500319e..942f38d8b0 100644
--- a/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch
+++ b/meta-networking/recipes-daemons/autofs/autofs/0003-force-STRIP-to-emtpy.patch
@@ -1,23 +1,22 @@
1From 3cbee00fe5725b87abdae80cfa2ee735e4513ca6 Mon Sep 17 00:00:00 2001 1From efacbbe29b7212735046a7d0f2cd61148546ce9e Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com> 2From: Roy Li <rongqing.li@windriver.com>
3Date: Tue, 19 Aug 2014 11:31:35 +0800 3Date: Tue, 19 Aug 2014 11:31:35 +0800
4Subject: [PATCH] [PATCH] force STRIP to emtpy 4Subject: [PATCH] force STRIP to emtpy
5 5
6otherwise the generate file will be stripped 6otherwise the generate file will be stripped
7 7
8Signed-off-by: Roy Li <rongqing.li@windriver.com>
9
10---
11Upstream-Status: Pending 8Upstream-Status: Pending
12 9
10Signed-off-by: Roy Li <rongqing.li@windriver.com>
11---
13 Makefile.rules | 2 +- 12 Makefile.rules | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
15 14
16diff --git a/Makefile.rules b/Makefile.rules 15diff --git a/Makefile.rules b/Makefile.rules
17index 709dd04..b1f7e50 100644 16index 6ce39e5..a6dcd7b 100644
18--- a/Makefile.rules 17--- a/Makefile.rules
19+++ b/Makefile.rules 18+++ b/Makefile.rules
20@@ -31,7 +31,7 @@ LDFLAGS ?= -s 19@@ -36,7 +36,7 @@ LDFLAGS ?= -s
21 endif 20 endif
22 21
23 ifdef DONTSTRIP 22 ifdef DONTSTRIP
@@ -26,3 +25,6 @@ index 709dd04..b1f7e50 100644
26 else 25 else
27 STRIP ?= strip --strip-debug 26 STRIP ?= strip --strip-debug
28 endif 27 endif
28--
292.25.1
30
diff --git a/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch b/meta-networking/recipes-daemons/autofs/autofs/0004-autofs.init.in-remove-bashism.patch
index 4183069bb1..6065bc71bf 100644
--- a/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch
+++ b/meta-networking/recipes-daemons/autofs/autofs/0004-autofs.init.in-remove-bashism.patch
@@ -1,4 +1,4 @@
1From cfacbb917f87b903b50132a5025f86b0cc522e9c Mon Sep 17 00:00:00 2001 1From b5f4a3c2f02244209ac613aeb8ea406bdc39af27 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sat, 13 Sep 2014 20:19:28 -0700 3Date: Sat, 13 Sep 2014 20:19:28 -0700
4Subject: [PATCH] autofs.init.in: remove bashism 4Subject: [PATCH] autofs.init.in: remove bashism
@@ -9,7 +9,6 @@ Upstream-Status: Pending
9 9
10Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> 10Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12
13--- 12---
14 redhat/autofs.init.in | 12 ++++++------ 13 redhat/autofs.init.in | 12 ++++++------
15 samples/rc.autofs.in | 10 +++++----- 14 samples/rc.autofs.in | 10 +++++-----
@@ -116,3 +115,6 @@ index 487669f..e96cde1 100644
116 pid=`pidof $prog` 115 pid=`pidof $prog`
117 if [ -z $pid ]; then 116 if [ -z $pid ]; then
118 echo $"$prog not running" 117 echo $"$prog not running"
118--
1192.25.1
120
diff --git a/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch b/meta-networking/recipes-daemons/autofs/autofs/0005-fix-the-YACC-rule-to-fix-a-building-failure.patch
index fd736296a5..462644b011 100644
--- a/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch
+++ b/meta-networking/recipes-daemons/autofs/autofs/0005-fix-the-YACC-rule-to-fix-a-building-failure.patch
@@ -1,9 +1,7 @@
1From 971d48a00ef82880c34e89778bf430a01360ebd5 Mon Sep 17 00:00:00 2001 1From 40318f4f6109d9810b7cb31518a7879ae7632f58 Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com> 2From: Roy Li <rongqing.li@windriver.com>
3Date: Mon, 18 May 2015 16:28:36 +0800 3Date: Mon, 18 May 2015 16:28:36 +0800
4Subject: [PATCH] [PATCH] fix the YACC rule to fix a building failure 4Subject: [PATCH] fix the YACC rule to fix a building failure
5
6Upstream-Statu: Pending
7 5
8The original rule will create the header file twice, one is that the header 6The original rule will create the header file twice, one is that the header
9file as the object file is created, other time is when create the C source file. 7file as the object file is created, other time is when create the C source file.
@@ -16,18 +14,35 @@ This lead to a race when compile amd_tok.o, the header file maybe rewritten.
16 | ^ 14 | ^
17 |../Makefile.rules:64: recipe for target 'amd_tok.o' failed 15 |../Makefile.rules:64: recipe for target 'amd_tok.o' failed
18 |---------------------- 16 |----------------------
19Signed-off-by: Roy Li <rongqing.li@windriver.com>
20 17
21---
22Upstream-Status: Pending 18Upstream-Status: Pending
23 19
24 lib/Makefile | 6 ++++-- 20Signed-off-by: Roy Li <rongqing.li@windriver.com>
21---
22 daemon/Makefile | 3 ++-
23 lib/Makefile | 3 ++-
25 modules/Makefile | 3 ++- 24 modules/Makefile | 3 ++-
26 2 files changed, 6 insertions(+), 3 deletions(-) 25 3 files changed, 6 insertions(+), 3 deletions(-)
27 26
27diff --git a/daemon/Makefile b/daemon/Makefile
28index 3af38e6..2a7ffe9 100644
29--- a/daemon/Makefile
30+++ b/daemon/Makefile
31@@ -44,7 +44,8 @@ automount: $(OBJS) $(AUTOFS_LIB)
32 master_tok.c: master_tok.l
33 $(LEX) -o$@ -Pmaster_ $?
34
35-master_parse.tab.c master_parse.tab.h: master_parse.y
36+master_parse.tab.h: master_parse.tab.c
37+master_parse.tab.c: master_parse.y
38 $(YACC) -v -d -p master_ -b master_parse $?
39
40 master_tok.o: master_tok.c master_parse.tab.h
41diff --git a/lib/Makefile b/lib/Makefile
42index d18c67b..51445fd 100644
28--- a/lib/Makefile 43--- a/lib/Makefile
29+++ b/lib/Makefile 44+++ b/lib/Makefile
30@@ -53,7 +53,8 @@ mount_xdr.o: mount_xdr.c 45@@ -35,7 +35,8 @@ libautofs.so: $(OBJS)
31 nss_tok.c: nss_tok.l 46 nss_tok.c: nss_tok.l
32 $(LEX) -o$@ -Pnss_ $? 47 $(LEX) -o$@ -Pnss_ $?
33 48
@@ -37,9 +52,11 @@ Upstream-Status: Pending
37 $(YACC) -v -d -p nss_ -b nss_parse $? 52 $(YACC) -v -d -p nss_ -b nss_parse $?
38 53
39 nss_tok.o: nss_tok.c nss_parse.tab.h 54 nss_tok.o: nss_tok.c nss_parse.tab.h
55diff --git a/modules/Makefile b/modules/Makefile
56index 6908da0..00dd7ce 100644
40--- a/modules/Makefile 57--- a/modules/Makefile
41+++ b/modules/Makefile 58+++ b/modules/Makefile
42@@ -103,7 +103,8 @@ amd_tok.c: amd_tok.l 59@@ -105,7 +105,8 @@ amd_tok.c: amd_tok.l
43 60
44 amd_tok.o: amd_tok.c amd_parse.tab.h 61 amd_tok.o: amd_tok.c amd_parse.tab.h
45 62
@@ -49,30 +66,6 @@ Upstream-Status: Pending
49 $(YACC) -v -d -p amd_ -b amd_parse $? 66 $(YACC) -v -d -p amd_ -b amd_parse $?
50 67
51 amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h 68 amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h
52--- a/daemon/Makefile 69--
53+++ b/daemon/Makefile 702.25.1
54@@ -16,7 +16,7 @@ YACCSRC = master_tok.c master_parse.tab. 71
55 version := $(shell cat ../.version)
56
57 CFLAGS += -rdynamic $(DAEMON_CFLAGS) -D_GNU_SOURCE -I../include
58-CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\"
59+CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\"
60 CFLAGS += -DAUTOFS_MAP_DIR=\"$(autofsmapdir)\"
61 CFLAGS += -DAUTOFS_CONF_DIR=\"$(autofsconfdir)\"
62 CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfifodir)\"
63@@ -44,7 +44,8 @@ automount: $(OBJS) $(AUTOFS_LIB)
64 master_tok.c: master_tok.l
65 $(LEX) -o$@ -Pmaster_ $?
66
67-master_parse.tab.c master_parse.tab.h: master_parse.y
68+master_parse.tab.h: master_parse.tab.c
69+master_parse.tab.c: master_parse.y
70 $(YACC) -v -d -p master_ -b master_parse $?
71
72 master_tok.o: master_tok.c master_parse.tab.h
73@@ -57,5 +58,3 @@ clean:
74 install: all
75 install -d -m 755 $(INSTALLROOT)$(sbindir)
76 install -c automount -m 755 $(INSTALLROOT)$(sbindir)
77-
78-
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch b/meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch
new file mode 100644
index 0000000000..ab99a98cf9
--- /dev/null
+++ b/meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch
@@ -0,0 +1,31 @@
1From 349cc55c4cb7c7b2f5e7de937e11f3c581028b23 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 24 Aug 2018 06:24:36 +0000
4Subject: [PATCH] Do not hardcode path for pkg.m4
5
6Upstream-Status: Pending
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10update patch to version 5.1.6
11Signed-off-by: Changqing Li <changqing.li@windriver.com>
12---
13 configure.ac | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/configure.ac b/configure.ac
17index 1bb1a52..4cebbd2 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl
21 AC_INIT(.autofs-5.1.9)
22
23 # for pkg-config macros
24-m4_include([/usr/share/aclocal/pkg.m4])
25+m4_include([pkg.m4])
26
27 #
28 # autofs installs by default in /usr
29--
302.25.1
31
diff --git a/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch b/meta-networking/recipes-daemons/autofs/autofs/0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch
index e2a94bf825..14faa0c753 100644
--- a/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch
+++ b/meta-networking/recipes-daemons/autofs/autofs/0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch
@@ -1,4 +1,7 @@
1Avoid conflicts between sys/mount.h and linux/mount.h 1From 96e0e3ed49a0e00573fa5907ae80e6d262cb7644 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 9 Sep 2024 23:01:06 +0800
4Subject: [PATCH] Avoid conflicts between sys/mount.h and linux/mount.h
2 5
3linux/fs.h includes linux/mount.h and this include file is unused so 6linux/fs.h includes linux/mount.h and this include file is unused so
4do not include it and avoid conflict too with glibc 2.36+ see [1] 7do not include it and avoid conflict too with glibc 2.36+ see [1]
@@ -8,6 +11,13 @@ do not include it and avoid conflict too with glibc 2.36+ see [1]
8Upstream-Status: Pending 11Upstream-Status: Pending
9 12
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 modules/parse_amd.c | 1 -
16 modules/parse_sun.c | 1 -
17 2 files changed, 2 deletions(-)
18
19diff --git a/modules/parse_amd.c b/modules/parse_amd.c
20index fb6b1b7..d86adf1 100644
11--- a/modules/parse_amd.c 21--- a/modules/parse_amd.c
12+++ b/modules/parse_amd.c 22+++ b/modules/parse_amd.c
13@@ -27,7 +27,6 @@ 23@@ -27,7 +27,6 @@
@@ -18,6 +28,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18 28
19 #define MODULE_PARSE 29 #define MODULE_PARSE
20 #include "automount.h" 30 #include "automount.h"
31diff --git a/modules/parse_sun.c b/modules/parse_sun.c
32index a5351fd..8509781 100644
21--- a/modules/parse_sun.c 33--- a/modules/parse_sun.c
22+++ b/modules/parse_sun.c 34+++ b/modules/parse_sun.c
23@@ -30,7 +30,6 @@ 35@@ -30,7 +30,6 @@
@@ -28,3 +40,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
28 40
29 #define MODULE_PARSE 41 #define MODULE_PARSE
30 #include "automount.h" 42 #include "automount.h"
43--
442.25.1
45
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-include-libgen.h-for-basename.patch b/meta-networking/recipes-daemons/autofs/autofs/0008-include-libgen.h-for-basename.patch
index 4c8b4ef779..13254f2c41 100644
--- a/meta-networking/recipes-daemons/autofs/autofs/0001-include-libgen.h-for-basename.patch
+++ b/meta-networking/recipes-daemons/autofs/autofs/0008-include-libgen.h-for-basename.patch
@@ -1,4 +1,4 @@
1From 1651e7a35be8b3e2fa90ca57b073f6944664fa62 Mon Sep 17 00:00:00 2001 1From c754222ce955c893e8e3ad75d8c73835950d1931 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 25 Mar 2024 12:04:03 -0700 3Date: Mon, 25 Mar 2024 12:04:03 -0700
4Subject: [PATCH] include libgen.h for basename 4Subject: [PATCH] include libgen.h for basename
@@ -10,6 +10,7 @@ include libgen.h for providing it.
10[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 10[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
11 11
12Upstream-Status: Pending 12Upstream-Status: Pending
13
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Signed-off-by: Khem Raj <raj.khem@gmail.com>
14--- 15---
15 daemon/automount.c | 1 + 16 daemon/automount.c | 1 +
@@ -18,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18 3 files changed, 3 insertions(+) 19 3 files changed, 3 insertions(+)
19 20
20diff --git a/daemon/automount.c b/daemon/automount.c 21diff --git a/daemon/automount.c b/daemon/automount.c
21index 3d9461d..61b3478 100644 22index 6cb3b1b..efc2680 100644
22--- a/daemon/automount.c 23--- a/daemon/automount.c
23+++ b/daemon/automount.c 24+++ b/daemon/automount.c
24@@ -21,6 +21,7 @@ 25@@ -21,6 +21,7 @@
@@ -30,7 +31,7 @@ index 3d9461d..61b3478 100644
30 #include <stdio.h> 31 #include <stdio.h>
31 #include <stdlib.h> 32 #include <stdlib.h>
32diff --git a/daemon/master.c b/daemon/master.c 33diff --git a/daemon/master.c b/daemon/master.c
33index f99359c..3f56499 100644 34index f2c11e9..1455e40 100644
34--- a/daemon/master.c 35--- a/daemon/master.c
35+++ b/daemon/master.c 36+++ b/daemon/master.c
36@@ -21,6 +21,7 @@ 37@@ -21,6 +21,7 @@
@@ -42,7 +43,7 @@ index f99359c..3f56499 100644
42 #include <sys/types.h> 43 #include <sys/types.h>
43 #include <sys/stat.h> 44 #include <sys/stat.h>
44diff --git a/modules/lookup_file.c b/modules/lookup_file.c 45diff --git a/modules/lookup_file.c b/modules/lookup_file.c
45index 6afc558..82b1f28 100644 46index 99f2e21..4914395 100644
46--- a/modules/lookup_file.c 47--- a/modules/lookup_file.c
47+++ b/modules/lookup_file.c 48+++ b/modules/lookup_file.c
48@@ -15,6 +15,7 @@ 49@@ -15,6 +15,7 @@
@@ -54,5 +55,5 @@ index 6afc558..82b1f28 100644
54 #include <string.h> 55 #include <string.h>
55 #include <time.h> 56 #include <time.h>
56-- 57--
572.44.0 582.25.1
58 59
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch b/meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch
new file mode 100644
index 0000000000..442a3138c2
--- /dev/null
+++ b/meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch
@@ -0,0 +1,35 @@
1From 1a08bbed376c0dfa0ce2d12a93b34fb2d5620c05 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Tue, 10 Sep 2024 21:08:09 +0800
4Subject: [PATCH] hash.h: include <sys/reg.h> instead of <bits/reg.h>
5
6Fix build on musl:
7In file included from ../include/automount.h:25,
8 from parse_subs.c:29:
9../include/hash.h:27:2: error: #error Wordsize not 32 or 64
10 27 | #error Wordsize not 32 or 64
11 | ^~~~~
12
13Upstream-Status: Pending
14
15Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
16---
17 include/hash.h | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/include/hash.h b/include/hash.h
21index 0f1d7b5..f465ab8 100644
22--- a/include/hash.h
23+++ b/include/hash.h
24@@ -6,7 +6,7 @@
25 #ifdef __GLIBC__
26 #include <bits/wordsize.h>
27 #else
28-#include <bits/reg.h>
29+#include <sys/reg.h>
30 #endif
31 #include <linux/stddef.h>
32 #include <sys/types.h>
33--
342.25.1
35
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch b/meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch
new file mode 100644
index 0000000000..0e15587340
--- /dev/null
+++ b/meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch
@@ -0,0 +1,64 @@
1From a6a79230110e998f780796cb1d4c5d3f59f20d1d Mon Sep 17 00:00:00 2001
2From: Florian Weimer <fweimer@redhat.com>
3Date: Mon, 18 Dec 2023 13:48:18 +0100
4Subject: [PATCH] autofs-5.1.9 - Fix incompatible function pointer types in
5 cyrus-sasl module
6
7Add casts to SASL callbacks to avoid incompatible-pointer-types
8errors. Avoids a build failure with stricter compilers.
9
10Signed-off-by: Florian Weimer <fweimer@redhat.com>
11Signed-off-by: Ian Kent <raven@themaw.net>
12
13Upstream-Status: Backport
14[https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=b7ff971bb8aa3fc609bb531ddc4c2ce56226383f]
15
16Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
17---
18 CHANGELOG | 2 ++
19 modules/cyrus-sasl.c | 14 +++++++-------
20 2 files changed, 9 insertions(+), 7 deletions(-)
21
22diff --git a/CHANGELOG b/CHANGELOG
23index 3e47daa..fd9d861 100644
24--- a/CHANGELOG
25+++ b/CHANGELOG
26@@ -1,4 +1,6 @@
27
28+- Fix incompatible function pointer types in cyrus-sasl module.
29+
30 02/11/2023 autofs-5.1.9
31 - fix kernel mount status notification.
32 - fix fedfs build flags.
33diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c
34index e742eaf..78b7794 100644
35--- a/modules/cyrus-sasl.c
36+++ b/modules/cyrus-sasl.c
37@@ -109,17 +109,17 @@ static int getpass_func(sasl_conn_t *, void *, int, sasl_secret_t **);
38 static int getuser_func(void *, int, const char **, unsigned *);
39
40 static sasl_callback_t callbacks[] = {
41- { SASL_CB_USER, &getuser_func, NULL },
42- { SASL_CB_AUTHNAME, &getuser_func, NULL },
43- { SASL_CB_PASS, &getpass_func, NULL },
44+ { SASL_CB_USER, (int(*)(void)) &getuser_func, NULL },
45+ { SASL_CB_AUTHNAME, (int(*)(void)) &getuser_func, NULL },
46+ { SASL_CB_PASS, (int(*)(void)) &getpass_func, NULL },
47 { SASL_CB_LIST_END, NULL, NULL },
48 };
49
50 static sasl_callback_t debug_callbacks[] = {
51- { SASL_CB_LOG, &sasl_log_func, NULL },
52- { SASL_CB_USER, &getuser_func, NULL },
53- { SASL_CB_AUTHNAME, &getuser_func, NULL },
54- { SASL_CB_PASS, &getpass_func, NULL },
55+ { SASL_CB_LOG, (int(*)(void)) &sasl_log_func, NULL },
56+ { SASL_CB_USER, (int(*)(void)) &getuser_func, NULL },
57+ { SASL_CB_AUTHNAME, (int(*)(void)) &getuser_func, NULL },
58+ { SASL_CB_PASS, (int(*)(void)) &getpass_func, NULL },
59 { SASL_CB_LIST_END, NULL, NULL },
60 };
61
62--
632.25.1
64
diff --git a/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch b/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch
deleted file mode 100644
index 4cfd8edf9f..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From df5d45b2d7ad7e7b5f0542a816d08b0409a529a1 Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com>
3Date: Tue, 19 Aug 2014 11:31:35 +0800
4Subject: [PATCH] [PATCH] add the needed stdarg.h
5
6Upstream-Status: Pending
7
8Signed-off-by: Roy Li <rongqing.li@windriver.com>
9
10---
11 lib/defaults.c | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/lib/defaults.c b/lib/defaults.c
15index 0e48a78..667f35d 100644
16--- a/lib/defaults.c
17+++ b/lib/defaults.c
18@@ -16,6 +16,7 @@
19
20 #include <stdlib.h>
21 #include <stdio.h>
22+#include <stdarg.h>
23 #include <ctype.h>
24 #include <string.h>
25 #include <sys/utsname.h>
diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch
deleted file mode 100644
index 8e06db6e4a..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 080626108c9ab70e2489752ef2a14006d0564b0c Mon Sep 17 00:00:00 2001
2From: Joe MacDonald <joe.macdonald@windriver.com>
3Date: Tue, 18 Jun 2013 10:05:21 -0400
4Subject: [PATCH] Fix the dependency issue
5
6Upstream-Status: Pending
7
8autofs's lib sources have a dependency on a number of files that are
9generated by rpcgen during buildtime
10
11Signed-off-by: Roy.Li <rongqing.li@windriver.com>
12Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
13
14---
15 lib/Makefile | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/lib/Makefile b/lib/Makefile
19index 518b483..4798a4b 100644
20--- a/lib/Makefile
21+++ b/lib/Makefile
22@@ -81,3 +81,4 @@ install: all
23 clean:
24 rm -f $(LIB) $(RPCS) $(OBJS) $(YACCSRC) *.output *~
25
26+$(OBJS): $(RPCS)
diff --git a/meta-networking/recipes-daemons/autofs/autofs/cross.patch b/meta-networking/recipes-daemons/autofs/autofs/cross.patch
deleted file mode 100644
index 2a4f4fd0dd..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/cross.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From b9b44cd82caceeb638cc6a862b5bb90b93ad6c6a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 5 Jan 2013 19:53:10 -0800
4
5---
6Upstream-Status: Pending
7
8 aclocal.m4 | 2 ++
9 configure.in | 8 ++++++--
10 2 files changed, 8 insertions(+), 2 deletions(-)
11
12diff --git a/aclocal.m4 b/aclocal.m4
13index 2115204..2a9a802 100644
14--- a/aclocal.m4
15+++ b/aclocal.m4
16@@ -7,6 +7,8 @@ dnl --------------------------------------------------------------------------
17 AC_DEFUN(AF_PATH_INCLUDE,
18 [AC_PATH_PROGS($1,$2,$3,$4)
19 if test -n "$$1"; then
20+ AH_TEMPLATE([HAVE_$1], [Have $2])
21+ AH_TEMPLATE([PATH_$1], [Have $2])
22 AC_DEFINE(HAVE_$1,1,[define if you have $1])
23 AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1])
24 HAVE_$1=1
25diff --git a/configure.in b/configure.in
26index 25d7c4e..44a1c8b 100644
27--- a/configure.in
28+++ b/configure.in
29@@ -324,13 +324,15 @@ AC_PROG_CC
30 cat > pietest.c <<EOF
31 int main(void) { return 0; }
32 EOF
33+AF_tmp_ldflags="$LDFLAGS"
34+AF_tmp_cflags="$CFLAGS"
35 CFLAGS=-fPIE
36 LDFLAGS=-pie
37 DAEMON_CFLAGS=
38 DAEMON_LDFLAGS=
39 AC_MSG_CHECKING([whether gcc -fPIE works])
40-AC_RUN_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])],
41- [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no])
42+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])],
43+ [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no])
44 AC_MSG_RESULT([$gcc_supports_pie])
45 if test $gcc_supports_pie = yes ; then
46 DAEMON_CFLAGS="-fPIE"
47@@ -339,6 +341,8 @@ fi
48 rm -f pietest.c
49 AC_SUBST(DAEMON_CFLAGS)
50 AC_SUBST(DAEMON_LDFLAGS)
51+CFLAGS="${AF_tmp_cflags}"
52+LDFLAGS="${AF_tmp_ldflags}"
53
54 #
55 # Enable ability to access value in external env variable
diff --git a/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch b/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch
deleted file mode 100644
index 414325974d..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From c500d9906f163bf716c872d37403b9de02ef0a86 Mon Sep 17 00:00:00 2001
2From: Amy Fong <amy.fong@windriver.com>
3Date: Fri, 18 Jan 2013 12:13:32 -0500
4Subject: [PATCH] autofs: fails to compile with openldap disabled
5
6As of 5.0.6, it appears that changes were introduced so that
7if you compile with openldap disabled and openldap headers are not
8available, then autofs fails to build.
9
10Upstream-Status: Pending
11
12Signed-off-by: Amy Fong <amy.fong@windriver.com>
13--
14 lookup_ldap.h | 4 ++++
15 1 file changed, 4 insertions(+)
16
17---
18 include/lookup_ldap.h | 4 ++++
19 1 file changed, 4 insertions(+)
20
21diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h
22index 3a7aba7..bfdb0b3 100644
23--- a/include/lookup_ldap.h
24+++ b/include/lookup_ldap.h
25@@ -1,7 +1,9 @@
26 #ifndef LOOKUP_LDAP_H
27 #define LOOKUP_LDAP_H
28
29+#ifdef WITH_LDAP
30 #include <ldap.h>
31+#endif
32
33 #ifdef WITH_SASL
34 #include <openssl/ssl.h>
35@@ -117,10 +119,12 @@ struct lookup_context {
36
37 #define LDAP_AUTH_USESIMPLE 0x0008
38
39+#ifdef WITH_LDAP
40 /* lookup_ldap.c */
41 LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt);
42 int unbind_ldap_connection(unsigned logopt, struct ldap_conn *conn, struct lookup_context *ctxt);
43 int authtype_requires_creds(const char *authtype);
44+#endif
45
46 #ifdef WITH_SASL
47 /* cyrus-sasl.c */
diff --git a/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch b/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch
deleted file mode 100644
index be750ab897..0000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 602f9ca83c2bdbf511bcb178fcb4b9fc54da955f Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 27 Nov 2018 15:20:46 +0800
4Subject: [PATCH] From e3ae56cf0bb4063c31295f45d04e3c504f4b6cc7 Mon Sep 17
5 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 24 Apr 2017
6 20:41:25 -0700 Subject: [PATCH] autofs: Upgrade to 5.1.2 release
7
8Use pkg-config first to look for external libnsl which is now
9split out from glibc, if it does not exist then see if its provided
10by glibc itself.
11
12-Khem
13
14Upstream-Status: Pending
15
16update patch to version 5.1.5
17Signed-off-by: Changqing Li <changqing.li@windriver.com>
18---
19 configure.in | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/configure.in b/configure.in
23index 76ecb40..493b9f1 100644
24--- a/configure.in
25+++ b/configure.in
26@@ -238,7 +238,7 @@ AC_SUBST(LIBCLOCK_GETTIME)
27
28 PKG_CHECK_MODULES([NSL],[libnsl],,
29 [
30-AC_CHECK_LIB(nsl, yp_match, NSL_LIBS="-lnsl")
31+PKG_CHECK_MODULES([NSL], [libnsl], [], [AC_CHECK_LIB([nsl],[yp_match],[LIBNSL="-lnsl"],[LIBNSL=""])])
32 AC_SUBST(NSL_LIBS)
33 NSL_CFLAGS=""
34 ])
35--
362.7.4
37
diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb b/meta-networking/recipes-daemons/autofs/autofs_5.1.9.bb
index e3f9777380..bc52f40d1c 100644
--- a/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb
+++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.9.bb
@@ -3,55 +3,44 @@ SECTION = "utils"
3LICENSE = "GPL-2.0-only" 3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=ee9324a6f564bb2376b63878ac396798" 4LIC_FILES_CHKSUM = "file://COPYING;md5=ee9324a6f564bb2376b63878ac396798"
5 5
6DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl libxml2 util-linux cyrus-sasl libnsl2" 6DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl util-linux libnsl2"
7 7
8CFLAGS += "-I${STAGING_INCDIR}/tirpc" 8CFLAGS += "-I${STAGING_INCDIR}/tirpc"
9 9
10inherit autotools-brokensep systemd update-rc.d pkgconfig 10inherit autotools-brokensep systemd update-rc.d pkgconfig
11 11
12SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ 12SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \
13 file://no-bash.patch \ 13 file://0001-no-bash.patch \
14 file://cross.patch \ 14 file://0002-using-pkg-config-to-detect-krb5.patch \
15 file://fix_disable_ldap.patch \ 15 file://0003-force-STRIP-to-emtpy.patch \
16 file://autofs-5.0.7-fix-lib-deps.patch \ 16 file://0004-autofs.init.in-remove-bashism.patch \
17 file://add-the-needed-stdarg.h.patch \ 17 file://0005-fix-the-YACC-rule-to-fix-a-building-failure.patch \
18 file://using-pkg-config-to-detect-libxml-2.0-and-krb5.patch \ 18 file://0006-Do-not-hardcode-path-for-pkg.m4.patch \
19 file://force-STRIP-to-emtpy.patch \ 19 file://0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch \
20 file://remove-bashism.patch \ 20 file://0008-include-libgen.h-for-basename.patch \
21 file://fix-the-YACC-rule-to-fix-a-building-failure.patch \ 21 file://0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch \
22 file://0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch \ 22 file://0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch \
23 file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \
24 file://pkgconfig-libnsl.patch \
25 file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \
26 file://0001-Do-not-hardcode-path-for-pkg.m4.patch \
27 file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \
28 file://0001-Define-__SWORD_TYPE-if-undefined.patch \
29 file://mount_conflict.patch \
30 file://0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch \
31 file://0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch \
32 file://0001-include-libgen.h-for-basename.patch \
33 " 23 "
34SRC_URI[sha256sum] = "0bd401c56f0eb1ca6251344c3a3d70bface3eccf9c67117cd184422c4cace30c" 24SRC_URI[sha256sum] = "46c30b763ef896f4c4a6df6d62aaaef7afc410e0b7f50d52dbfc6cf728cacd4f"
35 25
36UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/" 26UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/"
37 27
38INITSCRIPT_NAME = "autofs" 28INITSCRIPT_NAME = "autofs"
39INITSCRIPT_PARAMS = "defaults" 29INITSCRIPT_PARAMS = "defaults"
40 30
41# FIXME: modules/Makefile has crappy rules that don't obey LDFLAGS
42#CFLAGS += "${LDFLAGS}"
43
44PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" 31PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd"
32PACKAGECONFIG[openldap] = "--with-openldap=yes,--with-openldap=no,libxml2 openldap"
33PACKAGECONFIG[sasl] = "--with-sasl=yes,--with-sasl=no,cyrus-sasl krb5"
45 34
46PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 35PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
47 36
48EXTRA_OEMAKE = "DONTSTRIP=1" 37EXTRA_OEMAKE = "DONTSTRIP=1"
49EXTRA_OECONF += "--disable-mount-locking \ 38EXTRA_OECONF += "--disable-mount-locking \
50 --enable-ignore-busy --with-openldap=no \ 39 --enable-ignore-busy \
51 --with-confdir=${sysconfdir}/default \ 40 --with-confdir=${sysconfdir}/default \
52 --with-fifodir=/run \ 41 --with-fifodir=/run \
53 --with-flagdir=/run \ 42 --with-flagdir=/run \
54 --with-sasl=no --with-libtirpc \ 43 --with-libtirpc \
55 --with-mapdir=${sysconfdir} \ 44 --with-mapdir=${sysconfdir} \
56 --with-path=${STAGING_BINDIR_NATIVE} \ 45 --with-path=${STAGING_BINDIR_NATIVE} \
57 --with-fifodir=${localstatedir}/run \ 46 --with-fifodir=${localstatedir}/run \
diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb
index 7947ffe457..ede4491309 100644
--- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb
+++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb
@@ -42,7 +42,7 @@ inherit systemd
42DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc" 42DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc"
43RDEPENDS:${PN} = "rpcbind" 43RDEPENDS:${PN} = "rpcbind"
44 44
45EXTRA_OEMAKE = "CC='${CC}' AS='${AS}' LD='${LD}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" 45EXTRA_OEMAKE = "CC='${CC} ${CFLAGS}' AS='${AS}' LD='${LD} ${LDFLAGS}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'"
46EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}" 46EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}"
47# enable self tests 47# enable self tests
48EXTRA_OEMAKE += "IPPOOL_TEST=y" 48EXTRA_OEMAKE += "IPPOOL_TEST=y"
@@ -52,12 +52,7 @@ CPPFLAGS += "${SELECTED_OPTIMIZATION} -I${STAGING_INCDIR}/tirpc"
52SYSTEMD_SERVICE:${PN} = "ippool.service" 52SYSTEMD_SERVICE:${PN} = "ippool.service"
53 53
54do_compile:prepend() { 54do_compile:prepend() {
55 # fix the CFLAGS= and CPPFLAGS= in main Makefile, to have the extra CFLAGS in env
56 sed -i -e "s/^CFLAGS=/CFLAGS+=/" ${S}/Makefile
57 sed -i -e "s/^CPPFLAGS=/CPPFLAGS+=/" ${S}/Makefile
58
59 sed -i -e "s:-I/usr/include/pppd:-I=/usr/include/pppd:" ${S}/pppd/Makefile 55 sed -i -e "s:-I/usr/include/pppd:-I=/usr/include/pppd:" ${S}/pppd/Makefile
60
61} 56}
62 57
63 58
@@ -88,7 +83,7 @@ FILES:${PN}-test = "/opt/${BPN}"
88# needs tcl to run tests 83# needs tcl to run tests
89RDEPENDS:${PN}-test += "tcl ${BPN}" 84RDEPENDS:${PN}-test += "tcl ${BPN}"
90 85
91PPPD_VERSION="${@get_ppp_version(d)}" 86PPPD_VERSION = "${@get_ppp_version(d)}"
92 87
93def get_ppp_version(d): 88def get_ppp_version(d):
94 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
13LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 13LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
14 14
15SRCREV = "d0f04ae4b9bf0bc0be55fbda5f235afdfbf5dd19" 15SRCREV = "4b3e853ab468a95d8a035efa8fc4298a6c6318a3"
16 16
17SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ 17SRC_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 "
26S = "${WORKDIR}/git"
27 26
28inherit update-rc.d systemd autotools pkgconfig 27inherit 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
new file mode 100644
index 0000000000..e44e2035c2
--- /dev/null
+++ b/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch
@@ -0,0 +1,27 @@
1From 5b1b04356f3efc08ae279cafc6ee86df11f10c9a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 15 Aug 2024 23:13:02 -0700
4Subject: [PATCH] configure.ac: Do not emit compiler flags into object files
5
6They contain options which have absolute paths in them e.g. --sysroot
7therefore do not record them and make build reproducible
8
9Upstream-Status: Inappropriate [OE-Specific]
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 configure.ac | 3 +--
14 1 file changed, 1 insertion(+), 2 deletions(-)
15
16--- a/configure.ac
17+++ b/configure.ac
18@@ -1013,8 +1013,7 @@ if test "$enable_hardening" != no; then
19 "-Wp,-D_FORTIFY_SOURCE=$FORTIFY_SOURCE" \
20 "-fexceptions" \
21 "-fstack-protector-strong" \
22- "--param=ssp-buffer-size=4" \
23- "-grecord-gcc-switches"
24+ "--param=ssp-buffer-size=4"
25 do
26 AC_MSG_CHECKING([for $FLAG support])
27 CFLAGS="$CFLAGS $FLAG"
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 @@
1From f129c588f7c8a66e595d8ae96a43d585018e79cd Mon Sep 17 00:00:00 2001
2From: Quentin Armitage <quentin@armitage.org.uk>
3Date: Thu, 7 Nov 2024 11:09:43 +0000
4Subject: [PATCH] vrrp: Don't include <linux/if_ether.h> if not needed
5
6The musl headers do not allow including both <linux/if_ether.h> and
7<net/ethernet.h> since they both define struct ethhdr.
8
9It is likely that we do not need to include <linux/if_ether.h> at all
10since with both glibc and musl including <net/ethernet.h> is sufficient,
11but removing <linux/if_ether.h> is for another day.
12
13Upstream-Status: Backport [https://github.com/acassen/keepalived/commit/f129c588f7c8a66e595d8ae96a43d585018e79cd]
14Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
15---
16 keepalived/vrrp/vrrp.c | 4 +++-
17 1 file changed, 3 insertions(+), 1 deletion(-)
18
19diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c
20index 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 85f4a6aa59..6fb4886b96 100644
--- a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb
+++ b/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb
@@ -11,18 +11,21 @@ LICENSE = "GPL-2.0-only"
11LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 11LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
12 12
13SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ 13SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \
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 \
14 " 16 "
15SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6" 17SRC_URI[sha256sum] = "77f4a22e5a23fa8e49b8916acdfb584c864e72905a2f1de2a7f62ed40a896160"
16UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" 18UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases"
17 19
18DEPENDS = "libnfnetlink openssl" 20DEPENDS = "libnfnetlink openssl"
19 21
20inherit autotools pkgconfig systemd 22inherit autotools pkgconfig systemd
21 23
22PACKAGECONFIG ??= "libnl snmp \ 24PACKAGECONFIG ??= "libnl snmp reproducible \
23 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ 25 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
24" 26"
25PACKAGECONFIG[libnl] = "--enable-libnl,--disable-libnl,libnl" 27PACKAGECONFIG[libnl] = "--enable-libnl,--disable-libnl,libnl"
28PACKAGECONFIG[reproducible] = "--enable-reproducible-build,,"
26PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" 29PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
27PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--with-init=SYSV,systemd" 30PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--with-init=SYSV,systemd"
28 31
@@ -30,6 +33,10 @@ EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d"
30 33
31export EXTRA_CFLAGS = "${CFLAGS}" 34export EXTRA_CFLAGS = "${CFLAGS}"
32 35
36do_configure:append() {
37 sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${B}/lib/config.h
38}
39
33do_install:append() { 40do_install:append() {
34 if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then 41 if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then
35 chmod 0755 ${D}${sysconfdir}/init.d/${BPN} 42 chmod 0755 ${D}${sysconfdir}/init.d/${BPN}
@@ -39,6 +46,9 @@ do_install:append() {
39 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 46 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
40 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
41 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
42} 52}
43 53
44PACKAGE_BEFORE_PN = "${PN}-samples" 54PACKAGE_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
15SRC_URI[sha256sum] = "4b320675d608901a4a0d4feff8f96bb846d4913d914b0cf75b7d0ae80490f2f7" 15SRC_URI[sha256sum] = "f87df3163d5e5138da901d055b384009785d1eb50fdb17a2343910fcf30a997f"
16 16
17inherit autotools update-rc.d useradd systemd pkgconfig bash-completion github-releases ptest 17inherit 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 @@
1fix select arg detection
2
3Reference:
4 https://bugs.gentoo.org/921487
5
6Upstream-Status: Inappropriate [unresponsive contact email address]
7
8Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
9Signed-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 @@
1Fix compilation with clang-16
2
3aclocal.m4 contains code that no longer compiles: missing headers and missing
4return types.
5
6Reference:
7 https://gitweb.gentoo.org/repo/gentoo.git/tree/net-ftp/ncftp/files/ncftp-3.2.7-fix-clang.patch
8
9Upstream-Status: Inappropriate [unresponsive contact email address]
10
11Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
12Signed-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 15bb00a3af..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 "
13SRC_URI[sha256sum] = "d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8" 15SRC_URI[sha256sum] = "d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8"
14 16
17# Doesn't use automake
15inherit autotools-brokensep pkgconfig 18inherit autotools-brokensep pkgconfig
16 19
17CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall" 20CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall"
@@ -19,8 +22,8 @@ CFLAGS += "-DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -Wall"
19PACKAGECONFIG ??= "" 22PACKAGECONFIG ??= ""
20PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,," 23PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,,"
21 24
25EXTRA_AUTORECONF += "--exclude=aclocal -I ${S}/autoconf_local"
22EXTRA_OECONF = "--disable-precomp --disable-universal ac_cv_path_TAR=tar" 26EXTRA_OECONF = "--disable-precomp --disable-universal ac_cv_path_TAR=tar"
23ACLOCALEXTRAPATH:append = " -I ${S}/autoconf_local"
24 27
25do_install () { 28do_install () {
26 install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir} 29 install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir}
@@ -28,3 +31,7 @@ do_install () {
28 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \ 31 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \
29 install 32 install
30} 33}
34
35# http://errors.yoctoproject.org/Errors/Details/766888/
36# ncftp/3.2.7/ncftp-3.2.7/config.h:358:28: error: passing argument 2 of 'select' from incompatible pointer type [-Wincompatible-pointer-types]
37CFLAGS += "-Wno-error=incompatible-pointer-types"
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"
14SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2" 14SRCREV = "dfd26d72793914eb3da910ef8c71de6d7c8942a2"
15SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1" 15SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranch=1"
16 16
17S = "${WORKDIR}/git"
18 17
19SYSTEMD_PACKAGES = "${PN}" 18SYSTEMD_PACKAGES = "${PN}"
20SYSTEMD_SERVICE:${PN} = "networkd-dispatcher.service" 19SYSTEMD_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,"
66PACKAGECONFIG[libgcrypt] = "--enable-encryption,--disable-encryption,libgcrypt," 66PACKAGECONFIG[libgcrypt] = "--enable-encryption,--disable-encryption,libgcrypt,"
67PACKAGECONFIG[non32bit] = "--enable-non32bit-int,--disable-non32bit-int,," 67PACKAGECONFIG[non32bit] = "--enable-non32bit-int,--disable-non32bit-int,,"
68PACKAGECONFIG[snmp-bc] = "--enable-snmp_bc,--disable-snmp_bc" 68PACKAGECONFIG[snmp-bc] = "--enable-snmp_bc,--disable-snmp_bc"
69PACKAGECONFIG[ov-rest] = "--enable-ov_rest,--disable-ov_rest,curl rabbitmq-c json-c"
69 70
70export DISTRO 71export 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 @@
1From 9000ee4d8bb5c5e0bcc588e9bec86eb56f4285e1 Mon Sep 17 00:00:00 2001 1From e4197bc1f431fd7e555a31e6f7f1e020b4ec8f4c Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com> 2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Fri, 19 Jun 2015 16:45:54 +0900 3Date: Fri, 19 Jun 2015 16:45:54 +0900
4Subject: [PATCH] Fix makedefs 4Subject: [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
21diff --git a/makedefs b/makedefs 21diff --git a/makedefs b/makedefs
22index 3448c1e..78e0717 100644 22index 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--
1162.17.1 1162.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 @@
1From cb69ffda0c2cbde6acdc8b01c8d5ff78d81a84fc Mon Sep 17 00:00:00 2001 1From 953719878466c55572294f42e85127bda5d34999 Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com> 2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Fri, 19 Jun 2015 17:14:58 +0900 3Date: Fri, 19 Jun 2015 17:14:58 +0900
4Subject: [PATCH] Change fixed postconf to a variable for cross-compiling 4Subject: [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
14diff --git a/Makefile.in b/Makefile.in 14diff --git a/Makefile.in b/Makefile.in
15index 65e7911..40295be 100644 15index 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
27diff --git a/postfix-install b/postfix-install 27diff --git a/postfix-install b/postfix-install
28index e498cd3..8049f43 100644 28index 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--
1062.17.1 1062.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 @@
1From 995bddd9563b1aecca2369f2f9c675f88bdc0053 Mon Sep 17 00:00:00 2001 1From a8ec63a71361ccd3f6d2959c4c87b7824282b291 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 26 Aug 2017 10:29:37 -0700 3Date: Sat, 26 Aug 2017 10:29:37 -0700
4Subject: [PATCH] makedefs: Use native compiler to build makedefs.test 4Subject: [PATCH] makedefs: Use native compiler to build makedefs.test
5 5
6Its a binary used during build 6Its a binary used during build
7 7
8Upstream-Status: Inappropriate [embedded specific]
9
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
9--- 11---
10Upstream-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
15diff --git a/makedefs b/makedefs 15diff --git a/makedefs b/makedefs
16index 78e0717..3299eba 100644 16index 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--
652.17.1 652.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 @@
1From afef4a9391e6bb1a6c3e73d370f240577ed8b0dd Mon Sep 17 00:00:00 2001 1From 404150f53bb49af987d7338a808f47fdbd50ba7f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 16 Jan 2022 11:21:54 +0800 3Date: Sun, 16 Jan 2022 11:21:54 +0800
4Subject: [PATCH] Fix icu config 4Subject: [PATCH] Fix icu config
@@ -10,18 +10,18 @@ corrupted in any case its just adding -I/usr/include
10to the CCARGS which we loose nothing if its not 10to the CCARGS which we loose nothing if its not
11entertained. 11entertained.
12 12
13Upstream-Status: Inappropriate [embedded specific]
14
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 15Signed-off-by: Khem Raj <raj.khem@gmail.com>
14--- 16---
15Upstream-Status: Pending
16
17 makedefs | 1 - 17 makedefs | 1 -
18 1 file changed, 1 deletion(-) 18 1 file changed, 1 deletion(-)
19 19
20diff --git a/makedefs b/makedefs 20diff --git a/makedefs b/makedefs
21index 3299eba..2a76f20 100644 21index 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--
332.17.1 332.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 @@
1From 545d4a79b50caa5698622c0c1905ae154197a16f Mon Sep 17 00:00:00 2001 1From 25e7d1a9bc64f39666eb0e2b9b175773615e28d2 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Fri, 12 Oct 2018 12:38:02 +0800 3Date: Fri, 12 Oct 2018 12:38:02 +0800
4Subject: [PATCH] makedefs: add -lnsl and -lresolv to SYSLIBS by default 4Subject: [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
16diff --git a/makedefs b/makedefs 16diff --git a/makedefs b/makedefs
17index 2a76f20..9d5db9f 100644 17index 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--
572.17.1 572.25.1
58 58
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 @@
1compatibility_level = 3.6 1compatibility_level = 3.10
2smtputf8_enable = no 2smtputf8_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..a85176d871 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. \
4Postfix attempts to be fast, easy to administer, and secure. The outsidei \ 4Postfix attempts to be fast, easy to administer, and secure. The outsidei \
5has a definite Sendmail-ish flavor, but the inside is completely different." 5has a definite Sendmail-ish flavor, but the inside is completely different."
6 6
7HOMEPAGE= "http://www.postfix.org" 7HOMEPAGE = "http://www.postfix.org"
8SECTION = "mail" 8SECTION = "mail"
9DEPENDS = "db icu libpcre libnsl2 m4-native openssl postfix-native \ 9DEPENDS = "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)} \
@@ -28,11 +28,11 @@ SRC_URI = "http://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P
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 " 29 "
30 30
31SRC_URI[sha256sum] = "4b6e17c826cc438cc3016a9c0a55ea7e77c6cbafba7dd57241d81b690b0e9774" 31SRC_URI[sha256sum] = "75868db7a8ed252cd3a14c13a3ce383ddd42563160c02027d061202ee36799bf"
32 32
33UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.8(\.\d+)+).tar.gz" 33UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.10(\.\d+)+).tar.gz"
34 34
35S = "${WORKDIR}/postfix-${PV}" 35S = "${UNPACKDIR}/postfix-${PV}"
36 36
37CLEANBROKEN = "1" 37CLEANBROKEN = "1"
38 38
@@ -87,6 +87,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 87# ignore the OPTS="CC=$CC" in Makefile it will not use the CC=$CC $CCARGS
88EXTRA_OEMAKE += "OPT= DEBUG= OPTS= " 88EXTRA_OEMAKE += "OPT= DEBUG= OPTS= "
89 89
90# use gnu17 for now as recommended in:
91# https://marc.info/?l=postfix-users&m=173542420611213
92CFLAGS += "-std=gnu17"
93
90do_compile () { 94do_compile () {
91 unset CFLAGS CPPFLAGS CXXFLAGS 95 unset CFLAGS CPPFLAGS CXXFLAGS
92 local native_build 96 local native_build
@@ -135,20 +139,25 @@ do_install () {
135 rm -rf ${D}${localstatedir}/spool/postfix 139 rm -rf ${D}${localstatedir}/spool/postfix
136 mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/${MLPREFIX}sample-main.cf 140 mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/${MLPREFIX}sample-main.cf
137 install -m 755 ${S}/bin/smtp-sink ${D}/${sbindir}/ 141 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 142 install -m 644 ${UNPACKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf
140 sed -i 's#@LIBEXECDIR@#${libexecdir}#' ${D}${sysconfdir}/postfix/main.cf 143 sed -i 's#@LIBEXECDIR@#${libexecdir}#' ${D}${sysconfdir}/postfix/main.cf
141 144
142 install -m 755 ${UNPACKDIR}/check_hostname.sh ${D}${sbindir}/ 145 install -m 755 ${UNPACKDIR}/check_hostname.sh ${D}${sbindir}/
143 146
144 install -m 755 ${UNPACKDIR}/postfix ${D}${sysconfdir}/init.d/postfix
145 install -m 644 ${UNPACKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient 147 install -m 644 ${UNPACKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient
146 148
147 install -d ${D}${systemd_unitdir}/system 149 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
148 install -m 0644 ${UNPACKDIR}/postfix.service ${D}${systemd_unitdir}/system 150 install -d ${D}${sysconfdir}/init.d
149 sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/postfix.service 151 install -m 755 ${UNPACKDIR}/postfix ${D}${sysconfdir}/init.d/postfix
150 sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/postfix.service 152 fi
151 sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/postfix.service 153
154 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
155 install -d ${D}${systemd_unitdir}/system
156 install -m 0644 ${UNPACKDIR}/postfix.service ${D}${systemd_unitdir}/system
157 sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/postfix.service
158 sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/postfix.service
159 sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/postfix.service
160 fi
152 161
153 install -m 0755 ${UNPACKDIR}/aliasesdb ${D}${libexecdir}/postfix 162 install -m 0755 ${UNPACKDIR}/aliasesdb ${D}${libexecdir}/postfix
154 163
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
30index 9434cbd..13f2e16 100644 30index 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
64index 0a51670..69fa130 100755 64index 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
86index 50561de..93cad3f 100644 86index 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
14index 9434cbd..8da7d1f 100644 14index 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
26diff --git a/contrib/Makefile.in b/contrib/Makefile.in 26diff --git a/contrib/Makefile.in b/contrib/Makefile.in
27index d1a31af..65d2abc 100644 27index d1a31af..65d2abc 100644
28--- a/contrib/Makefile.in 28--- a/contrib/Makefile.in
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb
index aa8d5fabd6..65dd2f9561 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.9.bb
@@ -4,10 +4,10 @@ HOMEPAGE = "http://www.proftpd.org"
4LICENSE = "GPL-2.0-or-later" 4LICENSE = "GPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" 5LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"
6 6
7SRCREV = "75aa739805a6e05eeb31189934a3d324e7862962" 7SRCREV = "ae25959adb05ae1d6ebfa1f36bf778c9c34e9410"
8BRANCH = "1.3.7" 8BRANCH = "${PV}"
9 9
10SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https \ 10SRC_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,11 +17,16 @@ SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https
17 file://proftpd.service \ 17 file://proftpd.service \
18 " 18 "
19 19
20S = "${WORKDIR}/git"
21 20
22inherit autotools-brokensep useradd update-rc.d systemd multilib_script 21inherit autotools-brokensep useradd update-rc.d systemd multilib_script
23 22
24EXTRA_OECONF += "--enable-largefile" 23# patch releases have character after version
24UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+\w?))"
25CVE_VERSION_SUFFIX = "alphabetical"
26
27CVE_STATUS[CVE-2001-0027] = "fixed-version: version 1.2.0rc3 removed affected module"
28
29EXTRA_OECONF += "--enable-largefile INSTALL=install"
25 30
26PACKAGECONFIG ??= "shadow \ 31PACKAGECONFIG ??= "shadow \
27 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ 32 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \
@@ -70,6 +75,12 @@ do_configure () {
70 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} 75 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
71 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} 76 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
72 oe_runconf 77 oe_runconf
78 sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \
79 -e 's|${STAGING_DIR_NATIVE}||g' \
80 -e 's|-ffile-prefix-map=[^ ]*||g' \
81 -e 's|-fdebug-prefix-map=[^ ]*||g' \
82 -e 's|-fmacro-prefix-map=[^ ]*||g' \
83 -i ${B}/config.h
73} 84}
74 85
75FTPUSER = "ftp" 86FTPUSER = "ftp"
@@ -116,7 +127,7 @@ do_install () {
116 -e 's|-ffile-prefix-map=[^ ]*||g' \ 127 -e 's|-ffile-prefix-map=[^ ]*||g' \
117 -e 's|-fdebug-prefix-map=[^ ]*||g' \ 128 -e 's|-fdebug-prefix-map=[^ ]*||g' \
118 -e 's|-fmacro-prefix-map=[^ ]*||g' \ 129 -e 's|-fmacro-prefix-map=[^ ]*||g' \
119 -i ${D}/${bindir}/prxs 130 -i ${D}/${bindir}/prxs ${D}${includedir}/proftpd/Make.rules ${D}${includedir}/proftpd/config.h
120 131
121 # ftpmail perl script, which reads the proftpd log file and sends 132 # ftpmail perl script, which reads the proftpd log file and sends
122 # automatic email notifications once an upload finishs, 133 # automatic email notifications once an upload finishs,
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
35UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ptpd/files/releases" 35UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ptpd/files/releases"
36 36
37S = "${WORKDIR}/ptpd-${PV}" 37S = "${UNPACKDIR}/ptpd-${PV}"
38 38
39EXTRA_OEMAKE = "" 39EXTRA_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 @@
1From 79fd22c0def26eba130db98e312bb00fec32ac0a Mon Sep 17 00:00:00 2001 1From ed60c2ad3a7ed9762fcb6a304c7f60544606baef Mon Sep 17 00:00:00 2001
2From: Tudor Florea <tudor.florea@enea.com> 2From: Tudor Florea <tudor.florea@enea.com>
3Date: Tue, 4 Aug 2015 03:07:01 +0200 3Date: Tue, 4 Aug 2015 03:07:01 +0200
4Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is 4Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is
@@ -10,16 +10,15 @@ Upstream-Status: Inappropriate [config]
10 10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12Signed-off-by: Tudor Florea <tudor.florea@enea.com> 12Signed-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
18diff --git a/configure.ac b/configure.ac 17diff --git a/configure.ac b/configure.ac
19index 695ce68..0f28b55 100644 18index 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
3HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" 3HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd"
4SECTION = "net" 4SECTION = "net"
5LICENSE = "0BSD" 5LICENSE = "0BSD"
6LIC_FILES_CHKSUM = "file://COPYING;md5=194bc994ad6bbd4ff5a021082fe52156" 6LIC_FILES_CHKSUM = "file://COPYING;md5=5138d4a8a877b32de6a78cf7e9e99c25"
7 7
8DEPENDS = "libcap virtual/crypt" 8DEPENDS = "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"
14SRC_URI[sha256sum] = "4160f66b76615eea2397eac4ea3f0a146b7928207b79bc4cc2f99ad7b7bd9513" 14SRC_URI[sha256sum] = "1126f3a95856d08889ff89703cb1aa9ec9924d939d154e96904c920f05dc3c74"
15 15
16inherit autotools 16inherit autotools
17 17
18PACKAGECONFIG[libsodium] ="ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=yes, \ 18EXTRA_AUTORECONF += "-I m4"
19 ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no, libsodium" 19
20PACKAGECONFIG[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 @@
1From 15f439c555289f900eb33111b010bf1266f97edb Mon Sep 17 00:00:00 2001
2From: Jonathan Davies <jpds@protonmail.com>
3Date: Thu, 25 Nov 2021 15:29:18 +0000
4Subject: [PATCH] Reverts the include.h change in
5 46883f8a1a02fe42040dd8e48aec0ed871545d4d
6
7Closes: #158
8
9Upstream-Status: Backport [https://github.com/radvd-project/radvd/commit/06689f8c06f44c7e87f7ff1d814428f88375b53f]
10Signed-off-by: Jonathan Davies <jpds@protonmail.com>
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 includes.h | 5 -----
14 1 file changed, 5 deletions(-)
15
16diff --git a/includes.h b/includes.h
17index 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
4ConditionPathExists=@SYSCONFDIR@/radvd.conf 4ConditionPathExists=@SYSCONFDIR@/radvd.conf
5 5
6[Service] 6[Service]
7EnvironmentFile=-@SYSCONFDIR@/default/radvd 7Type=forking
8ExecStart=@SBINDIR@/radvd -n $OPTIONS 8EnvironmentFile=@SYSCONFDIR@/default/radvd
9ExecStart=@SBINDIR@/radvd $OPTIONS
10PIDFile=/run/radvd.pid
11ExecReload=/bin/kill -HUP $MAINPID
9 12
10[Install] 13[Install]
11WantedBy=multi-user.target 14WantedBy=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 \
8choose a default router based on these advertisements." 8choose a default router based on these advertisements."
9HOMEPAGE = "http://www.litech.org/radvd/" 9HOMEPAGE = "http://www.litech.org/radvd/"
10SECTION = "net" 10SECTION = "net"
11DEPENDS = "flex-native bison-native libdaemon " 11DEPENDS = "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
14LICENSE = "radvd" 14LICENSE = "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 "
25SRC_URI[sha256sum] = "c36470706fec3a9e6bed394ffea08acaff5dac647848d26b96bb9b9c65d58da0" 24SRC_URI[sha256sum] = "af37c5a81d59f3bdc00d83056606ffa1810d4550beed6caa4f81181246494220"
26 25
27inherit autotools useradd pkgconfig systemd 26inherit autotools useradd pkgconfig systemd
28 27
@@ -30,34 +29,37 @@ SYSTEMD_SERVICE:${PN} = "radvd.service"
30SYSTEMD_AUTO_ENABLE = "disable" 29SYSTEMD_AUTO_ENABLE = "disable"
31 30
32do_install:append () { 31do_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
63USERADD_PACKAGES = "${PN}" 65USERADD_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 @@
1From a6638a007a42917fea4b03e5c30d9b7208c634c4 Mon Sep 17 00:00:00 2001
2From: Peter Marko <peter.marko@siemens.com>
3Date: Thu, 7 Nov 2024 22:04:40 +0100
4Subject: [PATCH] libltdl: remove reference to nonexisting directory
5
6Commit [1] removed directory libltdl/m4 from release tarball by merging
7all those files into libltdl/aclocal.m4, however makefiles still
8reference 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
16Remove these invalid references.
17
18[1] https://github.com/squid-cache/squid/commit/b4addc2262e5bee37543f8d1ab9dd98337bafba3
19
20Signed-off-by: Peter Marko <peter.marko@siemens.com>
21Upstream-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
27diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
28index 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 =
40diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in
41index 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--
542.30.2
55
diff --git a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch
index e0d002c68c..489850e3bd 100644
--- a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch
+++ b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch
@@ -37,7 +37,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
37 ]) 37 ])
38--- a/acinclude/lib-checks.m4 38--- a/acinclude/lib-checks.m4
39+++ b/acinclude/lib-checks.m4 39+++ b/acinclude/lib-checks.m4
40@@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_ 40@@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[
41 [ 41 [
42 AC_MSG_RESULT([no]) 42 AC_MSG_RESULT([no])
43 ], 43 ],
diff --git a/meta-networking/recipes-daemons/squid/squid_6.9.bb b/meta-networking/recipes-daemons/squid/squid_6.12.bb
index f670a776eb..87144fb049 100644
--- a/meta-networking/recipes-daemons/squid/squid_6.9.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
25SRC_URI[sha256sum] = "1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882" 26SRC_URI[sha256sum] = "f3df3abb2603a513266f24a5d4699a9f0d76b9f554d1848b67f9c51cd3b3cb50"
26 27
27LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 28LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
28 file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \ 29 file://errors/COPYRIGHT;md5=6fbb6a2adc362e206da7b4f42846cdec \
29 " 30 "
30DEPENDS = "libtool" 31DEPENDS = "libtool"
31 32
@@ -47,7 +48,6 @@ PACKAGECONFIG ??= "auth url-rewrite-helpers \
47PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" 48PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack"
48PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 49PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
49PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," 50PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking,"
50PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2"
51PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl" 51PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl"
52PACKAGECONFIG[auth] = "--enable-auth-basic='${BASIC_AUTH}',--disable-auth --disable-auth-basic,krb5 openldap db cyrus-sasl" 52PACKAGECONFIG[auth] = "--enable-auth-basic='${BASIC_AUTH}',--disable-auth --disable-auth-basic,krb5 openldap db cyrus-sasl"
53PACKAGECONFIG[url-rewrite-helpers] = "--enable-url-rewrite-helpers,--disable-url-rewrite-helpers," 53PACKAGECONFIG[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)}"
66EXTRA_OECONF += "--with-default-user=squid \ 66EXTRA_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
74BUILD_CXXFLAGS += "-std=c++17" 76BUILD_CXXFLAGS += "-std=c++17"
75 77
76export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" 78export BUILDCXXFLAGS = "${BUILD_CXXFLAGS}"
77 79
78TESTDIR = "test-suite" 80TESTDIR = "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
19S = "${WORKDIR}/git"
20 19
21UPSTREAM_CHECK_URI = "https://github.com/OpenAoE/vblade/archive/" 20UPSTREAM_CHECK_URI = "https://github.com/OpenAoE/vblade/archive/"
22 21
23inherit autotools-brokensep update-rc.d systemd 22inherit update-rc.d systemd
24 23
25do_install() { 24do_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)}"
39RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" 39RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}"
40PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" 40PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}"
41WRAPLIB = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '-lwrap', '', d)}" 41WRAPLIB = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '-lwrap', '', d)}"
42NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" 42NOPAM_SRC = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}"
43 43
44inherit update-rc.d useradd systemd 44inherit update-rc.d useradd systemd
45 45
46CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf" 46CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf"
47LDFLAGS:append =" -lcrypt -lcap" 47LDFLAGS:append = " -lcrypt -lcap"
48CFLAGS:append:libc-musl = " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -include fcntl.h" 48CFLAGS:append:libc-musl = " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -include fcntl.h"
49EXTRA_OEMAKE = "-e MAKEFLAGS=" 49EXTRA_OEMAKE = "-e MAKEFLAGS="
50 50
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-02 02:32:30 +0000