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/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.bb7
-rw-r--r--meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch29
-rw-r--r--meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb5
-rw-r--r--meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb4
-rw-r--r--meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb (renamed from meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb)14
-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.10.bb (renamed from meta-networking/recipes-daemons/squid/squid_6.9.bb)2
31 files changed, 287 insertions, 776 deletions
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 2a583466e..000000000
--- 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 6128f3d0e..000000000
--- 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 f16ae5277..000000000
--- 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 f18f237d9..000000000
--- 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 caf010511..000000000
--- 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 8eec3014a..000000000
--- 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 f91c307d3..cd9b14358 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 d67f6300c..000000000
--- 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 9d0caae31..000000000
--- 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 41de373fd..1bf95b8a4 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 1fc500319..942f38d8b 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 4183069bb..6065bc71b 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 fd736296a..462644b01 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 000000000..ab99a98cf
--- /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 e2a94bf82..14faa0c75 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 4c8b4ef77..13254f2c4 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 000000000..442a3138c
--- /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 000000000..0e1558734
--- /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 4cfd8edf9..000000000
--- 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 8e06db6e4..000000000
--- 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 2a4f4fd0d..000000000
--- 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 414325974..000000000
--- 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 be750ab89..000000000
--- 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 e3f977738..bc52f40d1 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 7947ffe45..90e7814a0 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
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 000000000..1f9f8b30b
--- /dev/null
+++ b/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch
@@ -0,0 +1,29 @@
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
16diff --git a/configure.ac b/configure.ac
17index fae16f1..677b94a 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -904,8 +904,7 @@ if test "$enable_hardening" != no; then
21 "-Wp,-D_FORTIFY_SOURCE=2" \
22 "-fexceptions" \
23 "-fstack-protector-strong" \
24- "--param=ssp-buffer-size=4" \
25- "-grecord-gcc-switches"
26+ "--param=ssp-buffer-size=4"
27 do
28 AC_MSG_CHECKING([for $FLAG support])
29 CFLAGS="$CFLAGS $FLAG"
diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb b/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb
index 85f4a6aa5..c4d59d3ca 100644
--- a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb
+++ b/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb
@@ -11,6 +11,7 @@ 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 \
14 " 15 "
15SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6" 16SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6"
16UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" 17UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases"
@@ -30,6 +31,10 @@ EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d"
30 31
31export EXTRA_CFLAGS = "${CFLAGS}" 32export EXTRA_CFLAGS = "${CFLAGS}"
32 33
34do_configure:append() {
35 sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${B}/lib/config.h
36}
37
33do_install:append() { 38do_install:append() {
34 if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then 39 if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then
35 chmod 0755 ${D}${sysconfdir}/init.d/${BPN} 40 chmod 0755 ${D}${sysconfdir}/init.d/${BPN}
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 15bb00a3a..de111cac0 100644
--- a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb
+++ b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb
@@ -28,3 +28,7 @@ do_install () {
28 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \ 28 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \
29 install 29 install
30} 30}
31
32# http://errors.yoctoproject.org/Errors/Details/766888/
33# 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]
34CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb
index aa8d5fabd..33480bff2 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb
@@ -4,8 +4,8 @@ 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 = "0a7ea9b0ba9fcdf368374a226370d08f10397d99"
8BRANCH = "1.3.7" 8BRANCH = "1.3.8"
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 \
11 file://basic.conf.patch \ 11 file://basic.conf.patch \
@@ -21,7 +21,7 @@ S = "${WORKDIR}/git"
21 21
22inherit autotools-brokensep useradd update-rc.d systemd multilib_script 22inherit autotools-brokensep useradd update-rc.d systemd multilib_script
23 23
24EXTRA_OECONF += "--enable-largefile" 24EXTRA_OECONF += "--enable-largefile INSTALL=install"
25 25
26PACKAGECONFIG ??= "shadow \ 26PACKAGECONFIG ??= "shadow \
27 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ 27 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \
@@ -70,6 +70,12 @@ do_configure () {
70 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} 70 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
71 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} 71 install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
72 oe_runconf 72 oe_runconf
73 sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \
74 -e 's|${STAGING_DIR_NATIVE}||g' \
75 -e 's|-ffile-prefix-map=[^ ]*||g' \
76 -e 's|-fdebug-prefix-map=[^ ]*||g' \
77 -e 's|-fmacro-prefix-map=[^ ]*||g' \
78 -i ${B}/config.h
73} 79}
74 80
75FTPUSER = "ftp" 81FTPUSER = "ftp"
@@ -116,7 +122,7 @@ do_install () {
116 -e 's|-ffile-prefix-map=[^ ]*||g' \ 122 -e 's|-ffile-prefix-map=[^ ]*||g' \
117 -e 's|-fdebug-prefix-map=[^ ]*||g' \ 123 -e 's|-fdebug-prefix-map=[^ ]*||g' \
118 -e 's|-fmacro-prefix-map=[^ ]*||g' \ 124 -e 's|-fmacro-prefix-map=[^ ]*||g' \
119 -i ${D}/${bindir}/prxs 125 -i ${D}/${bindir}/prxs ${D}${includedir}/proftpd/Make.rules ${D}${includedir}/proftpd/config.h
120 126
121 # ftpmail perl script, which reads the proftpd log file and sends 127 # ftpmail perl script, which reads the proftpd log file and sends
122 # automatic email notifications once an upload finishs, 128 # automatic email notifications once an upload finishs,
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 e0d002c68..489850e3b 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.10.bb
index f670a776e..984209ad2 100644
--- a/meta-networking/recipes-daemons/squid/squid_6.9.bb
+++ b/meta-networking/recipes-daemons/squid/squid_6.10.bb
@@ -22,7 +22,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \
22 file://squid.nm \ 22 file://squid.nm \
23 " 23 "
24 24
25SRC_URI[sha256sum] = "1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882" 25SRC_URI[sha256sum] = "0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7"
26 26
27LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 27LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
28 file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \ 28 file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-30 00:27:44 +0000