summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-14 17:53:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-15 08:40:09 +0000
commitcd69e50cf4555891322cafb97f6de95d3b2ffdb6 (patch)
tree2ffd14f95b74fd75172d0698d9414ae5f7bbea12 /meta/recipes-extended
parentd38868cfff2f4be2bc9e44951b01785b142d91e4 (diff)
downloadpoky-cd69e50cf4555891322cafb97f6de95d3b2ffdb6.tar.gz
shadow-native: Simplify and fix syslog disable patch
Shadow is happily spamming the host syslog with messages and shouldn't be which suggests the patch isn't working. Redo it to work at the configure level which is simpler and hopefully more effective. (From OE-Core rev: 8f1816862b884f226c0ce7f5c89fd75b6791c007) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch134
1 files changed, 16 insertions, 118 deletions
diff --git a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
index 4d6f6d68ec..4bb6be43ed 100644
--- a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
+++ b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
@@ -1,124 +1,22 @@
1From 531cd5ca6eadef29b4799459f1bcfc002ecbd424 Mon Sep 17 00:00:00 2001 1Disable use of syslog for shadow-native tools
2From: Scott Garman <scott.a.garman@intel.com>
3Date: Thu, 14 Apr 2016 12:28:57 +0200
4Subject: [PATCH] Disable use of syslog for sysroot
5 2
6Disable use of syslog to prevent sysroot user and group additions from 3Disable use of syslog to prevent sysroot user and group additions from
7writing entries to the host's syslog. This patch should only be used 4writing entries to the host's syslog. This patch should only be used
8with the shadow-native recipe. 5with the shadow-native recipe.
9 6
10Upstream-Status: Inappropriate [disable feature] 7Upstream-Status: Inappropriate [OE specific configuration]
8Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11 9
12Signed-off-by: Scott Garman <scott.a.garman@intel.com> 10Index: shadow-4.11.1/configure.ac
13Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> 11===================================================================
14Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 12--- shadow-4.11.1.orig/configure.ac
15 13+++ shadow-4.11.1/configure.ac
16--- 14@@ -204,7 +204,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$sha
17 src/groupadd.c | 3 +++ 15 [Path to passwd program.])
18 src/groupdel.c | 3 +++ 16
19 src/groupmems.c | 3 +++ 17 dnl XXX - quick hack, should disappear before anyone notices :).
20 src/groupmod.c | 3 +++ 18-AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().])
21 src/useradd.c | 3 +++ 19+AC_DEFINE(USE_SYSLOG, 0, [Define to use syslog().])
22 src/userdel.c | 4 ++++ 20 if test "$ac_cv_func_ruserok" = "yes"; then
23 src/usermod.c | 3 +++ 21 AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.])
24 7 files changed, 22 insertions(+) 22 AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).])
25
26diff --git a/src/groupadd.c b/src/groupadd.c
27index 66ccb53..776ea51 100644
28--- a/src/groupadd.c
29+++ b/src/groupadd.c
30@@ -11,6 +11,9 @@
31
32 #ident "$Id$"
33
34+/* Disable use of syslog since we're running this command against a sysroot */
35+#undef USE_SYSLOG
36+
37 #include <ctype.h>
38 #include <fcntl.h>
39 #include <getopt.h>
40diff --git a/src/groupdel.c b/src/groupdel.c
41index c84faa7..1076f4b 100644
42--- a/src/groupdel.c
43+++ b/src/groupdel.c
44@@ -11,6 +11,9 @@
45
46 #ident "$Id$"
47
48+/* Disable use of syslog since we're running this command against a sysroot */
49+#undef USE_SYSLOG
50+
51 #include <ctype.h>
52 #include <fcntl.h>
53 #include <grp.h>
54diff --git a/src/groupmems.c b/src/groupmems.c
55index a0e3266..6540cb1 100644
56--- a/src/groupmems.c
57+++ b/src/groupmems.c
58@@ -9,6 +9,9 @@
59
60 #include <config.h>
61
62+/* Disable use of syslog since we're running this command against a sysroot */
63+#undef USE_SYSLOG
64+
65 #include <fcntl.h>
66 #include <getopt.h>
67 #include <grp.h>
68diff --git a/src/groupmod.c b/src/groupmod.c
69index 006eca1..78b1ad6 100644
70--- a/src/groupmod.c
71+++ b/src/groupmod.c
72@@ -11,6 +11,9 @@
73
74 #ident "$Id$"
75
76+/* Disable use of syslog since we're running this command against a sysroot */
77+#undef USE_SYSLOG
78+
79 #include <ctype.h>
80 #include <fcntl.h>
81 #include <getopt.h>
82diff --git a/src/useradd.c b/src/useradd.c
83index 456b9de..2b0d703 100644
84--- a/src/useradd.c
85+++ b/src/useradd.c
86@@ -11,6 +11,9 @@
87
88 #ident "$Id$"
89
90+/* Disable use of syslog since we're running this command against a sysroot */
91+#undef USE_SYSLOG
92+
93 #include <assert.h>
94 #include <ctype.h>
95 #include <errno.h>
96diff --git a/src/userdel.c b/src/userdel.c
97index 7012b0e..08bb5d1 100644
98--- a/src/userdel.c
99+++ b/src/userdel.c
100@@ -8,6 +8,10 @@
101 */
102
103 #include <config.h>
104+
105+/* Disable use of syslog since we're running this command against a sysroot */
106+#undef USE_SYSLOG
107+
108 #include <assert.h>
109 #include <dirent.h>
110 #include <errno.h>
111diff --git a/src/usermod.c b/src/usermod.c
112index 9473a7d..7d4f7b5 100644
113--- a/src/usermod.c
114+++ b/src/usermod.c
115@@ -11,6 +11,9 @@
116
117 #ident "$Id$"
118
119+/* Disable use of syslog since we're running this command against a sysroot */
120+#undef USE_SYSLOG
121+
122 #include <assert.h>
123 #include <ctype.h>
124 #include <errno.h>