diff options
17 files changed, 189 insertions, 135 deletions
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 index 075af5707b..87159718b2 100644 --- 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 | |||
| @@ -1,19 +1,20 @@ | |||
| 1 | From 933e065cf8aecfa0cce5f8f92abbed5baaaf3f77 Mon Sep 17 00:00:00 2001 | 1 | From 987c8f4a718cdd6b764592ba7510090a59623959 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 31 Mar 2017 19:10:57 -0700 | 3 | Date: Fri, 31 Mar 2017 19:10:57 -0700 |
| 4 | Subject: [PATCH 1/2] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF | 4 | Subject: [PATCH] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF |
| 5 | 5 | ||
| 6 | if they are not defined as is in musl then define | 6 | if they are not defined as is in musl then define |
| 7 | them here | 7 | them here |
| 8 | 8 | ||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | |||
| 10 | --- | 11 | --- |
| 11 | include/automount.h | 8 ++++++++ | 12 | include/automount.h | 8 ++++++++ |
| 12 | include/nsswitch.h | 3 +++ | 13 | include/nsswitch.h | 3 +++ |
| 13 | 2 files changed, 11 insertions(+) | 14 | 2 files changed, 11 insertions(+) |
| 14 | 15 | ||
| 15 | diff --git a/include/automount.h b/include/automount.h | 16 | diff --git a/include/automount.h b/include/automount.h |
| 16 | index 219b07d..b12c22a 100644 | 17 | index cc336ad..8bdcf12 100644 |
| 17 | --- a/include/automount.h | 18 | --- a/include/automount.h |
| 18 | +++ b/include/automount.h | 19 | +++ b/include/automount.h |
| 19 | @@ -42,6 +42,14 @@ | 20 | @@ -42,6 +42,14 @@ |
| @@ -32,7 +33,7 @@ index 219b07d..b12c22a 100644 | |||
| 32 | #ifndef HAVE_MOUNT | 33 | #ifndef HAVE_MOUNT |
| 33 | #error Failed to locate mount(8)! | 34 | #error Failed to locate mount(8)! |
| 34 | diff --git a/include/nsswitch.h b/include/nsswitch.h | 35 | diff --git a/include/nsswitch.h b/include/nsswitch.h |
| 35 | index 2b445a9..3db77b2 100644 | 36 | index d3e4027..7a0c38f 100644 |
| 36 | --- a/include/nsswitch.h | 37 | --- a/include/nsswitch.h |
| 37 | +++ b/include/nsswitch.h | 38 | +++ b/include/nsswitch.h |
| 38 | @@ -24,6 +24,9 @@ | 39 | @@ -24,6 +24,9 @@ |
| @@ -45,6 +46,3 @@ index 2b445a9..3db77b2 100644 | |||
| 45 | #define NSSWITCH_FILE _PATH_NSSWITCH_CONF | 46 | #define NSSWITCH_FILE _PATH_NSSWITCH_CONF |
| 46 | 47 | ||
| 47 | enum nsswitch_status { | 48 | enum nsswitch_status { |
| 48 | -- | ||
| 49 | 2.12.1 | ||
| 50 | |||
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 index 7ac1456748..32293dd09f 100644 --- 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 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From e4ee00e08acd7c0912a3264ad32e4de861c7416f Mon Sep 17 00:00:00 2001 | 1 | From 745e355ac8b595a27e1fcca75bf01d3e244f4a5f Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 7 Sep 2017 22:22:31 -0700 | 3 | Date: Thu, 7 Sep 2017 22:22:31 -0700 |
| 4 | Subject: [PATCH] modules/lookup_multi.c: Replace __S_IEXEC with S_IEXEC | 4 | Subject: [PATCH] modules/lookup_multi.c: Replace __S_IEXEC with S_IEXEC |
| @@ -7,6 +7,7 @@ __S_IEXEC is internal to libc and may not be available on | |||
| 7 | all libc e.g. musl | 7 | all libc e.g. musl |
| 8 | 8 | ||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | |||
| 10 | --- | 11 | --- |
| 11 | modules/lookup_multi.c | 2 +- | 12 | modules/lookup_multi.c | 2 +- |
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| @@ -24,6 +25,3 @@ index 3ecda6d..cf109de 100644 | |||
| 24 | type = src_prog; | 25 | type = src_prog; |
| 25 | else | 26 | else |
| 26 | type = src_file; | 27 | type = src_file; |
| 27 | -- | ||
| 28 | 2.14.1 | ||
| 29 | |||
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 index 6b6ba6d855..469027aacc 100644 --- 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 | |||
| @@ -1,21 +1,22 @@ | |||
| 1 | From 8fd74ddb3369572c594b22b396346131af00faee Mon Sep 17 00:00:00 2001 | 1 | From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 31 Mar 2017 19:12:10 -0700 | 3 | Date: Fri, 31 Mar 2017 19:12:10 -0700 |
| 4 | Subject: [PATCH 2/2] Replace __S_IEXEC with S_IEXEC | 4 | Subject: [PATCH] Replace __S_IEXEC with S_IEXEC |
| 5 | 5 | ||
| 6 | S_IEXEC is portable | 6 | S_IEXEC is portable |
| 7 | 7 | ||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | |||
| 9 | --- | 10 | --- |
| 10 | daemon/lookup.c | 4 ++-- | 11 | daemon/lookup.c | 4 ++-- |
| 11 | modules/lookup_multi.c | 2 +- | 12 | modules/lookup_multi.c | 2 +- |
| 12 | 2 files changed, 3 insertions(+), 3 deletions(-) | 13 | 2 files changed, 3 insertions(+), 3 deletions(-) |
| 13 | 14 | ||
| 14 | diff --git a/daemon/lookup.c b/daemon/lookup.c | 15 | diff --git a/daemon/lookup.c b/daemon/lookup.c |
| 15 | index 62071df..1bec97f 100644 | 16 | index 201ccbb..d821db8 100644 |
| 16 | --- a/daemon/lookup.c | 17 | --- a/daemon/lookup.c |
| 17 | +++ b/daemon/lookup.c | 18 | +++ b/daemon/lookup.c |
| 18 | @@ -400,7 +400,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source | 19 | @@ -366,7 +366,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source |
| 19 | if (!S_ISREG(st.st_mode)) | 20 | if (!S_ISREG(st.st_mode)) |
| 20 | return NSS_STATUS_NOTFOUND; | 21 | return NSS_STATUS_NOTFOUND; |
| 21 | 22 | ||
| @@ -24,7 +25,7 @@ index 62071df..1bec97f 100644 | |||
| 24 | type = src_prog; | 25 | type = src_prog; |
| 25 | else | 26 | else |
| 26 | type = src_file; | 27 | type = src_file; |
| 27 | @@ -890,7 +890,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ | 28 | @@ -856,7 +856,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ |
| 28 | if (!S_ISREG(st.st_mode)) | 29 | if (!S_ISREG(st.st_mode)) |
| 29 | return NSS_STATUS_NOTFOUND; | 30 | return NSS_STATUS_NOTFOUND; |
| 30 | 31 | ||
| @@ -34,10 +35,10 @@ index 62071df..1bec97f 100644 | |||
| 34 | else | 35 | else |
| 35 | type = src_file; | 36 | type = src_file; |
| 36 | diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c | 37 | diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c |
| 37 | index 6ec8434..88d081f 100644 | 38 | index fadd2ea..3ecda6d 100644 |
| 38 | --- a/modules/lookup_multi.c | 39 | --- a/modules/lookup_multi.c |
| 39 | +++ b/modules/lookup_multi.c | 40 | +++ b/modules/lookup_multi.c |
| 40 | @@ -104,7 +104,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch | 41 | @@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch |
| 41 | continue; | 42 | continue; |
| 42 | } | 43 | } |
| 43 | 44 | ||
| @@ -46,6 +47,3 @@ index 6ec8434..88d081f 100644 | |||
| 46 | type = src_prog; | 47 | type = src_prog; |
| 47 | else | 48 | else |
| 48 | type = src_file; | 49 | type = src_file; |
| 49 | -- | ||
| 50 | 2.12.1 | ||
| 51 | |||
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 index fdb906b22b..816a409cdd 100644 --- 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 | |||
| @@ -1,14 +1,18 @@ | |||
| 1 | [PATCH] add the needed stdarg.h | 1 | From df5d45b2d7ad7e7b5f0542a816d08b0409a529a1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Roy Li <rongqing.li@windriver.com> | ||
| 3 | Date: Tue, 19 Aug 2014 11:31:35 +0800 | ||
| 4 | Subject: [PATCH] [PATCH] add the needed stdarg.h | ||
| 2 | 5 | ||
| 3 | Upstream-status: Pending | 6 | Upstream-status: Pending |
| 4 | 7 | ||
| 5 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
| 9 | |||
| 6 | --- | 10 | --- |
| 7 | lib/defaults.c | 1 + | 11 | lib/defaults.c | 1 + |
| 8 | 1 file changed, 1 insertion(+) | 12 | 1 file changed, 1 insertion(+) |
| 9 | 13 | ||
| 10 | diff --git a/lib/defaults.c b/lib/defaults.c | 14 | diff --git a/lib/defaults.c b/lib/defaults.c |
| 11 | index 2b03ea2..5728e67 100644 | 15 | index 0e48a78..667f35d 100644 |
| 12 | --- a/lib/defaults.c | 16 | --- a/lib/defaults.c |
| 13 | +++ b/lib/defaults.c | 17 | +++ b/lib/defaults.c |
| 14 | @@ -16,6 +16,7 @@ | 18 | @@ -16,6 +16,7 @@ |
| @@ -19,6 +23,3 @@ index 2b03ea2..5728e67 100644 | |||
| 19 | #include <ctype.h> | 23 | #include <ctype.h> |
| 20 | #include <string.h> | 24 | #include <string.h> |
| 21 | #include <sys/utsname.h> | 25 | #include <sys/utsname.h> |
| 22 | -- | ||
| 23 | 1.7.10.4 | ||
| 24 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch index af5be6a830..1d5c3e1eeb 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | From 2cbc576ea1fbd1cbf4579d64b30e41d762084e7f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "yanjun.zhu" <yanjun.zhu@windriver.com> | ||
| 3 | Date: Tue, 15 Jan 2013 12:45:44 +0800 | ||
| 4 | Subject: [PATCH] autofs: do not check for modprobe | ||
| 5 | |||
| 1 | Description: Loading autofs module is #ifdef'ed in the source, so | 6 | Description: Loading autofs module is #ifdef'ed in the source, so |
| 2 | there is no need to check for /proc (which is only used | 7 | there is no need to check for /proc (which is only used |
| 3 | to load module) or modprobe. Both modprobe and /proc | 8 | to load module) or modprobe. Both modprobe and /proc |
| @@ -7,9 +12,16 @@ Description: Loading autofs module is #ifdef'ed in the source, so | |||
| 7 | Upstream-Status: Backport [1] | 12 | Upstream-Status: Backport [1] |
| 8 | [1] http://www.spinics.net/lists/autofs/msg00139.html | 13 | [1] http://www.spinics.net/lists/autofs/msg00139.html |
| 9 | 14 | ||
| 10 | diff -urpN a/configure.in b/configure.in | 15 | --- |
| 11 | --- a/configure.in 2013-01-15 11:30:22.000000000 +0800 | 16 | configure.in | 6 ------ |
| 12 | +++ b/configure.in 2013-01-15 11:31:45.000000000 +0800 | 17 | daemon/module.c | 3 +++ |
| 18 | include/automount.h | 11 +++-------- | ||
| 19 | 3 files changed, 6 insertions(+), 14 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/configure.in b/configure.in | ||
| 22 | index 44a1c8b..b226236 100644 | ||
| 23 | --- a/configure.in | ||
| 24 | +++ b/configure.in | ||
| 13 | @@ -34,11 +34,6 @@ AC_MSG_CHECKING([for binaries in]) | 25 | @@ -34,11 +34,6 @@ AC_MSG_CHECKING([for binaries in]) |
| 14 | AC_MSG_RESULT([$searchpath]) | 26 | AC_MSG_RESULT([$searchpath]) |
| 15 | 27 | ||
| @@ -22,7 +34,7 @@ diff -urpN a/configure.in b/configure.in | |||
| 22 | # Location of init.d directory? | 34 | # Location of init.d directory? |
| 23 | # | 35 | # |
| 24 | AF_INIT_D() | 36 | AF_INIT_D() |
| 25 | @@ -142,7 +137,6 @@ AF_PATH_INCLUDE(UMOUNT, umount, /bin/umo | 37 | @@ -142,7 +137,6 @@ AF_PATH_INCLUDE(UMOUNT, umount, /bin/umount, $searchpath) |
| 26 | AF_PATH_INCLUDE(E2FSCK, fsck.ext2 e2fsck, , $searchpath) | 38 | AF_PATH_INCLUDE(E2FSCK, fsck.ext2 e2fsck, , $searchpath) |
| 27 | AF_PATH_INCLUDE(E3FSCK, fsck.ext3 e3fsck, , $searchpath) | 39 | AF_PATH_INCLUDE(E3FSCK, fsck.ext3 e3fsck, , $searchpath) |
| 28 | AF_PATH_INCLUDE(E4FSCK, fsck.ext4 e4fsck, , $searchpath) | 40 | AF_PATH_INCLUDE(E4FSCK, fsck.ext4 e4fsck, , $searchpath) |
| @@ -30,30 +42,32 @@ diff -urpN a/configure.in b/configure.in | |||
| 30 | 42 | ||
| 31 | AF_CHECK_PROG(LEX, flex lex, , $searchpath) | 43 | AF_CHECK_PROG(LEX, flex lex, , $searchpath) |
| 32 | AF_CHECK_PROG(YACC, bison, , $searchpath) | 44 | AF_CHECK_PROG(YACC, bison, , $searchpath) |
| 33 | diff -urpN a/daemon/module.c b/daemon/module.c | 45 | diff --git a/daemon/module.c b/daemon/module.c |
| 34 | --- a/daemon/module.c 2013-01-15 11:30:49.000000000 +0800 | 46 | index bed8f7a..e41a98e 100644 |
| 35 | +++ b/daemon/module.c 2013-01-15 11:32:00.000000000 +0800 | 47 | --- a/daemon/module.c |
| 36 | @@ -18,6 +18,8 @@ | 48 | +++ b/daemon/module.c |
| 37 | #include <stdlib.h> | 49 | @@ -19,6 +19,8 @@ |
| 38 | #include "automount.h" | 50 | #include "automount.h" |
| 51 | #include "nsswitch.h" | ||
| 39 | 52 | ||
| 40 | +#if 0 | 53 | +#if 0 |
| 41 | +/* see comment in daemon/automount.c around load_autofs4_module() call */ | 54 | +/* see comment in daemon/automount.c around load_autofs4_module() call */ |
| 42 | int load_autofs4_module(void) | 55 | int load_autofs4_module(void) |
| 43 | { | 56 | { |
| 44 | FILE *fp; | 57 | FILE *fp; |
| 45 | @@ -52,6 +54,7 @@ int load_autofs4_module(void) | 58 | @@ -53,6 +55,7 @@ int load_autofs4_module(void) |
| 46 | 59 | ||
| 47 | return 1; | 60 | return 1; |
| 48 | } | 61 | } |
| 49 | +#endif | 62 | +#endif |
| 50 | 63 | ||
| 51 | struct lookup_mod *open_lookup(const char *name, const char *err_prefix, | 64 | int open_lookup(const char *name, const char *err_prefix, const char *mapfmt, |
| 52 | const char *mapfmt, int argc, const char *const *argv) | 65 | int argc, const char *const *argv, struct lookup_mod **lookup) |
| 53 | diff -urpN a/include/automount.h b/include/automount.h | 66 | diff --git a/include/automount.h b/include/automount.h |
| 54 | --- a/include/automount.h 2013-01-15 11:31:10.000000000 +0800 | 67 | index c0f5fbf..cc336ad 100644 |
| 55 | +++ b/include/automount.h 2013-01-15 11:32:06.000000000 +0800 | 68 | --- a/include/automount.h |
| 56 | @@ -50,16 +50,11 @@ | 69 | +++ b/include/automount.h |
| 70 | @@ -51,16 +51,11 @@ | ||
| 57 | #error Failed to locate umount(8)! | 71 | #error Failed to locate umount(8)! |
| 58 | #endif | 72 | #endif |
| 59 | 73 | ||
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 index 09fea495df..8e06db6e4a 100644 --- 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 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 54a9bd28a307dd74df044d779ca85adcf36aa202 Mon Sep 17 00:00:00 2001 | 1 | From 080626108c9ab70e2489752ef2a14006d0564b0c Mon Sep 17 00:00:00 2001 |
| 2 | From: Joe MacDonald <joe.macdonald@windriver.com> | 2 | From: Joe MacDonald <joe.macdonald@windriver.com> |
| 3 | Date: Tue, 18 Jun 2013 10:05:21 -0400 | 3 | Date: Tue, 18 Jun 2013 10:05:21 -0400 |
| 4 | Subject: [PATCH] Fix the dependency issue | 4 | Subject: [PATCH] Fix the dependency issue |
| @@ -10,19 +10,17 @@ generated by rpcgen during buildtime | |||
| 10 | 10 | ||
| 11 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | 11 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> |
| 12 | Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> | 12 | Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> |
| 13 | |||
| 13 | --- | 14 | --- |
| 14 | lib/Makefile | 1 + | 15 | lib/Makefile | 1 + |
| 15 | 1 file changed, 1 insertion(+) | 16 | 1 file changed, 1 insertion(+) |
| 16 | 17 | ||
| 17 | diff --git a/lib/Makefile b/lib/Makefile | 18 | diff --git a/lib/Makefile b/lib/Makefile |
| 18 | index 5418009..bff4e1d 100644 | 19 | index 518b483..4798a4b 100644 |
| 19 | --- a/lib/Makefile | 20 | --- a/lib/Makefile |
| 20 | +++ b/lib/Makefile | 21 | +++ b/lib/Makefile |
| 21 | @@ -75,3 +75,4 @@ install: all | 22 | @@ -81,3 +81,4 @@ install: all |
| 22 | clean: | 23 | clean: |
| 23 | rm -f $(LIB) $(RPCS) $(OBJS) $(YACCSRC) *.output *~ | 24 | rm -f $(LIB) $(RPCS) $(OBJS) $(YACCSRC) *.output *~ |
| 24 | 25 | ||
| 25 | +$(OBJS): $(RPCS) | 26 | +$(OBJS): $(RPCS) |
| 26 | -- | ||
| 27 | 1.7.10.4 | ||
| 28 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch index 3a878980a4..9b0942ebf6 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch | |||
| @@ -1,21 +1,22 @@ | |||
| 1 | Upstream-Status: Pending | 1 | From 2256b8aa98cff15ddf2a8d36496e6c9125927901 Mon Sep 17 00:00:00 2001 |
| 2 | |||
| 3 | From 44bdce8c6ed9b30c1643e5981172a4f9025f013c Mon Sep 17 00:00:00 2001 | ||
| 4 | From: Andreas Oberritter <obi@opendreambox.org> | 2 | From: Andreas Oberritter <obi@opendreambox.org> |
| 5 | Date: Wed, 13 Mar 2013 16:17:08 +0100 | 3 | Date: Wed, 13 Mar 2013 16:17:08 +0100 |
| 6 | Subject: [PATCH] autofs-5.0.7: include linux/nfs.h directly in rpc_subs.h | 4 | Subject: [PATCH] autofs-5.0.7: include linux/nfs.h directly in rpc_subs.h |
| 7 | 5 | ||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Fixes compile error with uclibc. Glibc's nfs/nfs.h contains | 8 | Fixes compile error with uclibc. Glibc's nfs/nfs.h contains |
| 9 | nothing but "#include linux/nfs.h". rpc_subs.h already includes | 9 | nothing but "#include linux/nfs.h". rpc_subs.h already includes |
| 10 | other linux/nfs*.h files directly. | 10 | other linux/nfs*.h files directly. |
| 11 | 11 | ||
| 12 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | 12 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> |
| 13 | |||
| 13 | --- | 14 | --- |
| 14 | include/rpc_subs.h | 2 +- | 15 | include/rpc_subs.h | 2 +- |
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 16 | 17 | ||
| 17 | diff --git a/include/rpc_subs.h b/include/rpc_subs.h | 18 | diff --git a/include/rpc_subs.h b/include/rpc_subs.h |
| 18 | index b6d59f9..a2d9648 100644 | 19 | index e744e89..83db47e 100644 |
| 19 | --- a/include/rpc_subs.h | 20 | --- a/include/rpc_subs.h |
| 20 | +++ b/include/rpc_subs.h | 21 | +++ b/include/rpc_subs.h |
| 21 | @@ -18,7 +18,7 @@ | 22 | @@ -18,7 +18,7 @@ |
| @@ -27,6 +28,3 @@ index b6d59f9..a2d9648 100644 | |||
| 27 | #include <linux/nfs2.h> | 28 | #include <linux/nfs2.h> |
| 28 | #include <linux/nfs3.h> | 29 | #include <linux/nfs3.h> |
| 29 | 30 | ||
| 30 | -- | ||
| 31 | 1.7.10.4 | ||
| 32 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch index cbf2bf8047..18ce193855 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch | |||
| @@ -1,12 +1,21 @@ | |||
| 1 | From b31decac4acb194b020c621d2d11019f636a45e0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 24 Apr 2017 20:41:25 -0700 | ||
| 4 | Subject: [PATCH] autofs: Upgrade to 5.1.2 release | ||
| 5 | |||
| 1 | Make configure compatible with -Wl,--as-needed following | 6 | Make configure compatible with -Wl,--as-needed following |
| 2 | https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Failure_in_..2Fconfigure | 7 | https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Failure_in_..2Fconfigure |
| 3 | 8 | ||
| 4 | 2016-07-05 Martin von Gagern | 9 | 2016-07-05 Martin von Gagern |
| 5 | 10 | ||
| 6 | Index: autofs-5.1.2/aclocal.m4 | 11 | --- |
| 7 | =================================================================== | 12 | aclocal.m4 | 6 +++--- |
| 8 | --- autofs-5.1.2.orig/aclocal.m4 | 13 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 9 | +++ autofs-5.1.2/aclocal.m4 | 14 | |
| 15 | diff --git a/aclocal.m4 b/aclocal.m4 | ||
| 16 | index 0e4a624..2e620cd 100644 | ||
| 17 | --- a/aclocal.m4 | ||
| 18 | +++ b/aclocal.m4 | ||
| 10 | @@ -415,9 +415,9 @@ AC_DEFUN([AF_CHECK_LIBTIRPC], | 19 | @@ -415,9 +415,9 @@ AC_DEFUN([AF_CHECK_LIBTIRPC], |
| 11 | [ | 20 | [ |
| 12 | # save current flags | 21 | # save current flags |
| @@ -19,7 +28,7 @@ Index: autofs-5.1.2/aclocal.m4 | |||
| 19 | 28 | ||
| 20 | AC_TRY_LINK( | 29 | AC_TRY_LINK( |
| 21 | [ #include <rpc/rpc.h> ], | 30 | [ #include <rpc/rpc.h> ], |
| 22 | @@ -440,7 +440,7 @@ AC_CHECK_FUNCS([getrpcbyname getservbyna | 31 | @@ -440,7 +440,7 @@ AC_CHECK_FUNCS([getrpcbyname getservbyname]) |
| 23 | 32 | ||
| 24 | # restore flags | 33 | # restore flags |
| 25 | CFLAGS="$af_check_libtirpc_save_cflags" | 34 | CFLAGS="$af_check_libtirpc_save_cflags" |
diff --git a/meta-networking/recipes-daemons/autofs/autofs/cross.patch b/meta-networking/recipes-daemons/autofs/autofs/cross.patch index 8f1af625f0..b25c43f747 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/cross.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/cross.patch | |||
| @@ -1,8 +1,17 @@ | |||
| 1 | Index: autofs-5.0.7/aclocal.m4 | 1 | From b9b44cd82caceeb638cc6a862b5bb90b93ad6c6a Mon Sep 17 00:00:00 2001 |
| 2 | =================================================================== | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | --- autofs-5.0.7.orig/aclocal.m4 2012-10-28 04:45:07.000000000 -0700 | 3 | Date: Sat, 5 Jan 2013 19:53:10 -0800 |
| 4 | +++ autofs-5.0.7/aclocal.m4 2012-10-28 10:47:53.263996910 -0700 | 4 | |
| 5 | @@ -7,6 +7,8 @@ | 5 | --- |
| 6 | aclocal.m4 | 2 ++ | ||
| 7 | configure.in | 8 ++++++-- | ||
| 8 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
| 9 | |||
| 10 | diff --git a/aclocal.m4 b/aclocal.m4 | ||
| 11 | index 2115204..2a9a802 100644 | ||
| 12 | --- a/aclocal.m4 | ||
| 13 | +++ b/aclocal.m4 | ||
| 14 | @@ -7,6 +7,8 @@ dnl -------------------------------------------------------------------------- | ||
| 6 | AC_DEFUN(AF_PATH_INCLUDE, | 15 | AC_DEFUN(AF_PATH_INCLUDE, |
| 7 | [AC_PATH_PROGS($1,$2,$3,$4) | 16 | [AC_PATH_PROGS($1,$2,$3,$4) |
| 8 | if test -n "$$1"; then | 17 | if test -n "$$1"; then |
| @@ -11,11 +20,11 @@ Index: autofs-5.0.7/aclocal.m4 | |||
| 11 | AC_DEFINE(HAVE_$1,1,[define if you have $1]) | 20 | AC_DEFINE(HAVE_$1,1,[define if you have $1]) |
| 12 | AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1]) | 21 | AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1]) |
| 13 | HAVE_$1=1 | 22 | HAVE_$1=1 |
| 14 | Index: autofs-5.0.7/configure.in | 23 | diff --git a/configure.in b/configure.in |
| 15 | =================================================================== | 24 | index 25d7c4e..44a1c8b 100644 |
| 16 | --- autofs-5.0.7.orig/configure.in 2012-10-28 04:45:06.000000000 -0700 | 25 | --- a/configure.in |
| 17 | +++ autofs-5.0.7/configure.in 2012-10-28 10:50:07.580000628 -0700 | 26 | +++ b/configure.in |
| 18 | @@ -301,13 +301,15 @@ | 27 | @@ -324,13 +324,15 @@ AC_PROG_CC |
| 19 | cat > pietest.c <<EOF | 28 | cat > pietest.c <<EOF |
| 20 | int main(void) { return 0; } | 29 | int main(void) { return 0; } |
| 21 | EOF | 30 | EOF |
| @@ -33,7 +42,7 @@ Index: autofs-5.0.7/configure.in | |||
| 33 | AC_MSG_RESULT([$gcc_supports_pie]) | 42 | AC_MSG_RESULT([$gcc_supports_pie]) |
| 34 | if test $gcc_supports_pie = yes ; then | 43 | if test $gcc_supports_pie = yes ; then |
| 35 | DAEMON_CFLAGS="-fPIE" | 44 | DAEMON_CFLAGS="-fPIE" |
| 36 | @@ -316,6 +318,8 @@ | 45 | @@ -339,6 +341,8 @@ fi |
| 37 | rm -f pietest.c | 46 | rm -f pietest.c |
| 38 | AC_SUBST(DAEMON_CFLAGS) | 47 | AC_SUBST(DAEMON_CFLAGS) |
| 39 | AC_SUBST(DAEMON_LDFLAGS) | 48 | AC_SUBST(DAEMON_LDFLAGS) |
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/fix-the-YACC-rule-to-fix-a-building-failure.patch index 9b641838fa..21a97c8f5c 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/fix-the-YACC-rule-to-fix-a-building-failure.patch | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | [PATCH] fix the YACC rule to fix a building failure | 1 | From 971d48a00ef82880c34e89778bf430a01360ebd5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Roy Li <rongqing.li@windriver.com> | ||
| 3 | Date: Mon, 18 May 2015 16:28:36 +0800 | ||
| 4 | Subject: [PATCH] [PATCH] fix the YACC rule to fix a building failure | ||
| 2 | 5 | ||
| 3 | Upstream-Statu: Pending | 6 | Upstream-Statu: Pending |
| 4 | 7 | ||
| @@ -14,6 +17,7 @@ This lead to a race when compile amd_tok.o, the header file maybe rewritten. | |||
| 14 | |../Makefile.rules:64: recipe for target 'amd_tok.o' failed | 17 | |../Makefile.rules:64: recipe for target 'amd_tok.o' failed |
| 15 | |---------------------- | 18 | |---------------------- |
| 16 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 19 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
| 20 | |||
| 17 | --- | 21 | --- |
| 18 | lib/Makefile | 6 ++++-- | 22 | lib/Makefile | 6 ++++-- |
| 19 | modules/Makefile | 3 ++- | 23 | modules/Makefile | 3 ++- |
| @@ -44,7 +48,7 @@ index 4798a4b..c40cf86 100644 | |||
| 44 | 48 | ||
| 45 | nss_tok.o: nss_tok.c nss_parse.tab.h | 49 | nss_tok.o: nss_tok.c nss_parse.tab.h |
| 46 | diff --git a/modules/Makefile b/modules/Makefile | 50 | diff --git a/modules/Makefile b/modules/Makefile |
| 47 | index 237b70b..71415d0 100644 | 51 | index d9ab06c..abc7698 100644 |
| 48 | --- a/modules/Makefile | 52 | --- a/modules/Makefile |
| 49 | +++ b/modules/Makefile | 53 | +++ b/modules/Makefile |
| 50 | @@ -103,7 +103,8 @@ amd_tok.c: amd_tok.l | 54 | @@ -103,7 +103,8 @@ amd_tok.c: amd_tok.l |
| @@ -57,6 +61,3 @@ index 237b70b..71415d0 100644 | |||
| 57 | $(YACC) -v -d -p amd_ -b amd_parse $? | 61 | $(YACC) -v -d -p amd_ -b amd_parse $? |
| 58 | 62 | ||
| 59 | amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h | 63 | amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h |
| 60 | -- | ||
| 61 | 1.9.1 | ||
| 62 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch b/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch index 94750b257c..414325974d 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch | |||
| @@ -1,6 +1,9 @@ | |||
| 1 | autofs: fails to compile with openldap disabled | 1 | From c500d9906f163bf716c872d37403b9de02ef0a86 Mon Sep 17 00:00:00 2001 |
| 2 | From: Amy Fong <amy.fong@windriver.com> | ||
| 3 | Date: Fri, 18 Jan 2013 12:13:32 -0500 | ||
| 4 | Subject: [PATCH] autofs: fails to compile with openldap disabled | ||
| 2 | 5 | ||
| 3 | As of 5.0.6, it appears that changes were introduced so that | 6 | As of 5.0.6, it appears that changes were introduced so that |
| 4 | if you compile with openldap disabled and openldap headers are not | 7 | if you compile with openldap disabled and openldap headers are not |
| 5 | available, then autofs fails to build. | 8 | available, then autofs fails to build. |
| 6 | 9 | ||
| @@ -12,13 +15,13 @@ Signed-off-by: Amy Fong <amy.fong@windriver.com> | |||
| 12 | 1 file changed, 4 insertions(+) | 15 | 1 file changed, 4 insertions(+) |
| 13 | 16 | ||
| 14 | --- | 17 | --- |
| 15 | include/lookup_ldap.h | 4 ++++ | 18 | include/lookup_ldap.h | 4 ++++ |
| 16 | 1 file changed, 4 insertions(+) | 19 | 1 file changed, 4 insertions(+) |
| 17 | 20 | ||
| 18 | Index: autofs-5.1.2/include/lookup_ldap.h | 21 | diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h |
| 19 | =================================================================== | 22 | index 3a7aba7..bfdb0b3 100644 |
| 20 | --- autofs-5.1.2.orig/include/lookup_ldap.h | 23 | --- a/include/lookup_ldap.h |
| 21 | +++ autofs-5.1.2/include/lookup_ldap.h | 24 | +++ b/include/lookup_ldap.h |
| 22 | @@ -1,7 +1,9 @@ | 25 | @@ -1,7 +1,9 @@ |
| 23 | #ifndef LOOKUP_LDAP_H | 26 | #ifndef LOOKUP_LDAP_H |
| 24 | #define LOOKUP_LDAP_H | 27 | #define LOOKUP_LDAP_H |
diff --git a/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch b/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch index 634005bd27..21396dd6f6 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch | |||
| @@ -1,14 +1,18 @@ | |||
| 1 | [PATCH] force STRIP to emtpy | 1 | From 3cbee00fe5725b87abdae80cfa2ee735e4513ca6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Roy Li <rongqing.li@windriver.com> | ||
| 3 | Date: Tue, 19 Aug 2014 11:31:35 +0800 | ||
| 4 | Subject: [PATCH] [PATCH] force STRIP to emtpy | ||
| 2 | 5 | ||
| 3 | otherwise the generate file will be stripped | 6 | otherwise the generate file will be stripped |
| 4 | 7 | ||
| 5 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
| 9 | |||
| 6 | --- | 10 | --- |
| 7 | Makefile.rules | 2 +- | 11 | Makefile.rules | 2 +- |
| 8 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 9 | 13 | ||
| 10 | diff --git a/Makefile.rules b/Makefile.rules | 14 | diff --git a/Makefile.rules b/Makefile.rules |
| 11 | index 710a2c9..e4334db 100644 | 15 | index 709dd04..b1f7e50 100644 |
| 12 | --- a/Makefile.rules | 16 | --- a/Makefile.rules |
| 13 | +++ b/Makefile.rules | 17 | +++ b/Makefile.rules |
| 14 | @@ -31,7 +31,7 @@ LDFLAGS ?= -s | 18 | @@ -31,7 +31,7 @@ LDFLAGS ?= -s |
| @@ -20,6 +24,3 @@ index 710a2c9..e4334db 100644 | |||
| 20 | else | 24 | else |
| 21 | STRIP ?= strip --strip-debug | 25 | STRIP ?= strip --strip-debug |
| 22 | endif | 26 | endif |
| 23 | -- | ||
| 24 | 1.7.10.4 | ||
| 25 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch b/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch index d68944b459..0a2d502b8d 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch | |||
| @@ -1,21 +1,17 @@ | |||
| 1 | Index: autofs-5.0.7/aclocal.m4 | 1 | From cb6a4f61adb027f2366318f2c08c8264ebf39218 Mon Sep 17 00:00:00 2001 |
| 2 | =================================================================== | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | --- autofs-5.0.7.orig/aclocal.m4 2012-10-28 13:17:45.504237027 -0700 | 3 | Date: Sat, 5 Jan 2013 19:53:10 -0800 |
| 4 | +++ autofs-5.0.7/aclocal.m4 2012-10-28 13:20:50.108242739 -0700 | 4 | |
| 5 | @@ -403,7 +403,7 @@ | 5 | --- |
| 6 | # save current flags | 6 | Makefile.rules | 2 +- |
| 7 | af_check_libtirpc_save_cflags="$CFLAGS" | 7 | aclocal.m4 | 2 +- |
| 8 | af_check_libtirpc_save_ldflags="$LDFLAGS" | 8 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 9 | -CFLAGS="$CFLAGS -I/usr/include/tirpc" | 9 | |
| 10 | +CFLAGS="$CFLAGS -I=/usr/include/tirpc" | 10 | diff --git a/Makefile.rules b/Makefile.rules |
| 11 | LDFLAGS="$LDFLAGS -ltirpc" | 11 | index 6fa3e02..709dd04 100644 |
| 12 | 12 | --- a/Makefile.rules | |
| 13 | AC_TRY_LINK( | 13 | +++ b/Makefile.rules |
| 14 | Index: autofs-5.0.7/Makefile.rules | 14 | @@ -46,7 +46,7 @@ CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 |
| 15 | =================================================================== | ||
| 16 | --- autofs-5.0.7.orig/Makefile.rules 2012-10-28 13:17:45.308237022 -0700 | ||
| 17 | +++ autofs-5.0.7/Makefile.rules 2012-10-28 13:21:25.720242803 -0700 | ||
| 18 | @@ -48,7 +48,7 @@ | ||
| 19 | LIBS += -lpthread | 15 | LIBS += -lpthread |
| 20 | 16 | ||
| 21 | ifdef TIRPCLIB | 17 | ifdef TIRPCLIB |
| @@ -24,3 +20,16 @@ Index: autofs-5.0.7/Makefile.rules | |||
| 24 | LIBS += $(TIRPCLIB) | 20 | LIBS += $(TIRPCLIB) |
| 25 | endif | 21 | endif |
| 26 | 22 | ||
| 23 | diff --git a/aclocal.m4 b/aclocal.m4 | ||
| 24 | index 2a9a802..0e4a624 100644 | ||
| 25 | --- a/aclocal.m4 | ||
| 26 | +++ b/aclocal.m4 | ||
| 27 | @@ -416,7 +416,7 @@ AC_DEFUN([AF_CHECK_LIBTIRPC], | ||
| 28 | # save current flags | ||
| 29 | af_check_libtirpc_save_cflags="$CFLAGS" | ||
| 30 | af_check_libtirpc_save_ldflags="$LDFLAGS" | ||
| 31 | -CFLAGS="$CFLAGS -I/usr/include/tirpc" | ||
| 32 | +CFLAGS="$CFLAGS -I=/usr/include/tirpc" | ||
| 33 | LDFLAGS="$LDFLAGS -ltirpc" | ||
| 34 | |||
| 35 | AC_TRY_LINK( | ||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch b/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch index cf03635270..c46c0e5ad2 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch | |||
| @@ -1,17 +1,26 @@ | |||
| 1 | Index: autofs-5.0.7/samples/auto.net | 1 | From a3007d7ea930823926611081bb873ddd771325cb Mon Sep 17 00:00:00 2001 |
| 2 | =================================================================== | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | --- autofs-5.0.7.orig/samples/auto.net 2012-07-24 23:05:26.000000000 -0700 | 3 | Date: Sat, 5 Jan 2013 19:53:10 -0800 |
| 4 | +++ autofs-5.0.7/samples/auto.net 2012-10-28 10:44:25.035991715 -0700 | 4 | |
| 5 | --- | ||
| 6 | samples/auto.net | 2 +- | ||
| 7 | samples/auto.smb | 2 +- | ||
| 8 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 9 | |||
| 10 | diff --git a/samples/auto.net b/samples/auto.net | ||
| 11 | index 0384f61..61215f6 100755 | ||
| 12 | --- a/samples/auto.net | ||
| 13 | +++ b/samples/auto.net | ||
| 5 | @@ -1,4 +1,4 @@ | 14 | @@ -1,4 +1,4 @@ |
| 6 | -#!/bin/bash | 15 | -#!/bin/bash |
| 7 | +#!/bin/sh | 16 | +#!/bin/sh |
| 8 | 17 | ||
| 9 | # This file must be executable to work! chmod 755! | 18 | # This file must be executable to work! chmod 755! |
| 10 | 19 | ||
| 11 | Index: autofs-5.0.7/samples/auto.smb | 20 | diff --git a/samples/auto.smb b/samples/auto.smb |
| 12 | =================================================================== | 21 | index 6af5d85..d296b81 100755 |
| 13 | --- autofs-5.0.7.orig/samples/auto.smb 2012-07-24 23:05:26.000000000 -0700 | 22 | --- a/samples/auto.smb |
| 14 | +++ autofs-5.0.7/samples/auto.smb 2012-10-28 10:44:25.035991715 -0700 | 23 | +++ b/samples/auto.smb |
| 15 | @@ -1,4 +1,4 @@ | 24 | @@ -1,4 +1,4 @@ |
| 16 | -#!/bin/bash | 25 | -#!/bin/bash |
| 17 | +#!/bin/sh | 26 | +#!/bin/sh |
diff --git a/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch b/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch index bf2c964a0e..1c7b11997c 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch | |||
| @@ -1,13 +1,22 @@ | |||
| 1 | From e3ae56cf0bb4063c31295f45d04e3c504f4b6cc7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 24 Apr 2017 20:41:25 -0700 | ||
| 4 | Subject: [PATCH] autofs: Upgrade to 5.1.2 release | ||
| 5 | |||
| 1 | Use pkg-config first to look for external libnsl which is now | 6 | Use pkg-config first to look for external libnsl which is now |
| 2 | split out from glibc, if it does not exist then see if its provided | 7 | split out from glibc, if it does not exist then see if its provided |
| 3 | by glibc itself. | 8 | by glibc itself. |
| 4 | 9 | ||
| 5 | -Khem | 10 | -Khem |
| 6 | 11 | ||
| 7 | Index: autofs-5.1.2/configure.in | 12 | --- |
| 8 | =================================================================== | 13 | configure.in | 2 +- |
| 9 | --- autofs-5.1.2.orig/configure.in | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 10 | +++ autofs-5.1.2/configure.in | 15 | |
| 16 | diff --git a/configure.in b/configure.in | ||
| 17 | index 9cf73b8..1016c71 100644 | ||
| 18 | --- a/configure.in | ||
| 19 | +++ b/configure.in | ||
| 11 | @@ -186,7 +186,7 @@ fi | 20 | @@ -186,7 +186,7 @@ fi |
| 12 | # | 21 | # |
| 13 | # glibc/libc 6 new libraries | 22 | # glibc/libc 6 new libraries |
diff --git a/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch b/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch index 282d6f0ad2..4183069bb1 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 79034f969bbd12215d65b4337dfd38a13d02d4ef Mon Sep 17 00:00:00 2001 | 1 | From cfacbb917f87b903b50132a5025f86b0cc522e9c Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Yang <liezhi.yang@windriver.com> | 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Sat, 13 Sep 2014 20:19:28 -0700 | 3 | Date: Sat, 13 Sep 2014 20:19:28 -0700 |
| 4 | Subject: [PATCH] autofs.init.in: remove bashism | 4 | Subject: [PATCH] autofs.init.in: remove bashism |
| @@ -9,9 +9,10 @@ Upstream-Status: Pending | |||
| 9 | 9 | ||
| 10 | Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> | 10 | Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> |
| 11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 12 | |||
| 12 | --- | 13 | --- |
| 13 | redhat/autofs.init.in | 12 ++++++------ | 14 | redhat/autofs.init.in | 12 ++++++------ |
| 14 | samples/rc.autofs.in | 10 +++++----- | 15 | samples/rc.autofs.in | 10 +++++----- |
| 15 | 2 files changed, 11 insertions(+), 11 deletions(-) | 16 | 2 files changed, 11 insertions(+), 11 deletions(-) |
| 16 | 17 | ||
| 17 | diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in | 18 | diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in |
| @@ -115,6 +116,3 @@ index 487669f..e96cde1 100644 | |||
| 115 | pid=`pidof $prog` | 116 | pid=`pidof $prog` |
| 116 | if [ -z $pid ]; then | 117 | if [ -z $pid ]; then |
| 117 | echo $"$prog not running" | 118 | echo $"$prog not running" |
| 118 | -- | ||
| 119 | 1.7.9.5 | ||
| 120 | |||
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/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch index 93b76bd66e..3d0c6bd715 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/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch | |||
| @@ -1,14 +1,18 @@ | |||
| 1 | using pkg-config to detect libxml-2.0 and krb5 | 1 | From dabcbdae38038a8e4ad2c4286112381c407c5ce7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Roy Li <rongqing.li@windriver.com> | ||
| 3 | Date: Tue, 19 Aug 2014 11:31:35 +0800 | ||
| 4 | Subject: [PATCH] using pkg-config to detect libxml-2.0 and krb5 | ||
| 2 | 5 | ||
| 3 | Upstream-status: Pending | 6 | Upstream-status: Pending |
| 4 | 7 | ||
| 5 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
| 9 | |||
| 6 | --- | 10 | --- |
| 7 | configure.in | 16 ++++++++++++++-- | 11 | configure.in | 16 ++++++++++++++-- |
| 8 | 2 files changed, 14 insertions(+), 2 deletions(-) | 12 | 1 file changed, 14 insertions(+), 2 deletions(-) |
| 9 | 13 | ||
| 10 | diff --git a/configure.in b/configure.in | 14 | diff --git a/configure.in b/configure.in |
| 11 | index 392d122..a3028aa 100644 | 15 | index b226236..9cf73b8 100644 |
| 12 | --- a/configure.in | 16 | --- a/configure.in |
| 13 | +++ b/configure.in | 17 | +++ b/configure.in |
| 14 | @@ -162,8 +162,20 @@ if test x$enable_sloppy_mount = xyes; then | 18 | @@ -162,8 +162,20 @@ if test x$enable_sloppy_mount = xyes; then |
| @@ -34,6 +38,3 @@ index 392d122..a3028aa 100644 | |||
| 34 | 38 | ||
| 35 | AC_SEARCH_LIBS([versionsort],[]) | 39 | AC_SEARCH_LIBS([versionsort],[]) |
| 36 | if test "$ac_cv_search_versionsort" = "no"; then | 40 | if test "$ac_cv_search_versionsort" = "no"; then |
| 37 | -- | ||
| 38 | 1.7.10.4 | ||
| 39 | |||
