*ping* //Peter
> -----Original Message----- > From: [email protected] > <[email protected]> On Behalf Of Peter Kjellerstedt > Sent: den 20 april 2022 13:54 > To: [email protected] > Subject: [OE-core] [honister][PATCH] shadow-native: Simplify and fix syslog > disable patch > > From: Richard Purdie <[email protected]> > > 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. > > This is a squashed cherry-pick of commit 8f181686 (shadow-native: > Simplify and fix syslog disable patch) and commit e1f21d0d (shadow: > Disable the use of syslog() for the native tools). > > Signed-off-by: Peter Kjellerstedt <[email protected]> > Signed-off-by: Richard Purdie <[email protected]> > --- > ...01-Disable-use-of-syslog-for-sysroot.patch | 150 +++++------------- > 1 file changed, 39 insertions(+), 111 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 95728bcd3f..628db42136 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,52 @@ > -From 30a3906a0a21120fa6bbc918b6258ab9303fbeaa Mon Sep 17 00:00:00 2001 > -From: Scott Garman <[email protected]> > -Date: Thu, 14 Apr 2016 12:28:57 +0200 > -Subject: [PATCH] Disable use of syslog for sysroot > +From 8b845fff891798a03bdf21354b52e4487c2c0200 Mon Sep 17 00:00:00 2001 > +From: Richard Purdie <[email protected]> > +Date: Thu, 14 Apr 2022 23:11:53 +0000 > +Subject: [PATCH] Disable use of syslog for shadow-native tools > > Disable use of syslog to prevent sysroot user and group additions from > writing entries to the host's syslog. This patch should only be used > with the shadow-native recipe. > > -Upstream-Status: Inappropriate [disable feature] > - > -Signed-off-by: Scott Garman <[email protected]> > +Upstream-Status: Inappropriate [OE specific configuration] > +Signed-off-by: Richard Purdie <[email protected]> > Signed-off-by: Peter Kjellerstedt <[email protected]> > -Signed-off-by: Chen Qi <[email protected]> > > --- > - src/groupadd.c | 3 +++ > - src/groupdel.c | 3 +++ > - src/groupmems.c | 3 +++ > - src/groupmod.c | 3 +++ > - src/useradd.c | 3 +++ > - src/userdel.c | 4 ++++ > - src/usermod.c | 3 +++ > - 7 files changed, 22 insertions(+) > + configure.ac | 2 +- > + src/login_nopam.c | 3 ++- > + 2 files changed, 3 insertions(+), 2 deletions(-) > > -diff --git a/src/groupadd.c b/src/groupadd.c > -index d7f68b1..5fe5f43 100644 > ---- a/src/groupadd.c > -+++ b/src/groupadd.c > -@@ -34,6 +34,9 @@ > - > - #ident "$Id$" > - > -+/* Disable use of syslog since we're running this command against a sysroot > */ > -+#undef USE_SYSLOG > -+ > - #include <ctype.h> > - #include <fcntl.h> > - #include <getopt.h> > -diff --git a/src/groupdel.c b/src/groupdel.c > -index 5c89312..2aefc5a 100644 > ---- a/src/groupdel.c > -+++ b/src/groupdel.c > -@@ -34,6 +34,9 @@ > - > +diff --git a/configure.ac b/configure.ac > +index 5dcae19..b2c58f5 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -204,7 +204,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, > "$shadow_cv_passwd_dir/passwd", > + [Path to passwd program.]) > + > + dnl XXX - quick hack, should disappear before anyone notices :). > +-AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) > ++#AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) > + if test "$ac_cv_func_ruserok" = "yes"; then > + AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for > rlogind.]) > + AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value > (0 or 1).]) > +diff --git a/src/login_nopam.c b/src/login_nopam.c > +index df6ba88..fc24e13 100644 > +--- a/src/login_nopam.c > ++++ b/src/login_nopam.c > +@@ -29,7 +29,6 @@ > + #ifndef USE_PAM > #ident "$Id$" > > -+/* Disable use of syslog since we're running this command against a sysroot > */ > -+#undef USE_SYSLOG > -+ > - #include <ctype.h> > - #include <fcntl.h> > - #include <grp.h> > -diff --git a/src/groupmems.c b/src/groupmems.c > -index 654a8f3..6b2026b 100644 > ---- a/src/groupmems.c > -+++ b/src/groupmems.c > -@@ -32,6 +32,9 @@ > - > - #include <config.h> > - > -+/* Disable use of syslog since we're running this command against a sysroot > */ > -+#undef USE_SYSLOG > -+ > - #include <fcntl.h> > - #include <getopt.h> > - #include <grp.h> > -diff --git a/src/groupmod.c b/src/groupmod.c > -index acd6f35..a2c5247 100644 > ---- a/src/groupmod.c > -+++ b/src/groupmod.c > -@@ -34,6 +34,9 @@ > - > - #ident "$Id$" > - > -+/* Disable use of syslog since we're running this command against a sysroot > */ > -+#undef USE_SYSLOG > -+ > - #include <ctype.h> > - #include <fcntl.h> > - #include <getopt.h> > -diff --git a/src/useradd.c b/src/useradd.c > -index 127177e..b80e505 100644 > ---- a/src/useradd.c > -+++ b/src/useradd.c > -@@ -34,6 +34,9 @@ > - > - #ident "$Id$" > - > -+/* Disable use of syslog since we're running this command against a sysroot > */ > -+#undef USE_SYSLOG > -+ > - #include <assert.h> > - #include <ctype.h> > - #include <errno.h> > -diff --git a/src/userdel.c b/src/userdel.c > -index 79a7c89..c1e010a 100644 > ---- a/src/userdel.c > -+++ b/src/userdel.c > -@@ -31,6 +31,10 @@ > - */ > - > - #include <config.h> > -+ > -+/* Disable use of syslog since we're running this command against a sysroot > */ > -+#undef USE_SYSLOG > -+ > - #include <assert.h> > - #include <dirent.h> > - #include <errno.h> > -diff --git a/src/usermod.c b/src/usermod.c > -index 03bb9b9..e15fdd4 100644 > ---- a/src/usermod.c > -+++ b/src/usermod.c > -@@ -34,6 +34,9 @@ > - > - #ident "$Id$" > +-#include "prototypes.h" > + /* > + * This module implements a simple but effective form of login access > + * control based on login names and on host (or domain) names, internet > +@@ -57,6 +56,8 @@ > + #include <netinet/in.h> > + #include <arpa/inet.h> /* for inet_ntoa() */ > > -+/* Disable use of syslog since we're running this command against a sysroot > */ > -+#undef USE_SYSLOG > ++#include "prototypes.h" > + > - #include <assert.h> > - #include <ctype.h> > - #include <errno.h> > + #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64) > + #undef MAXHOSTNAMELEN > + #define MAXHOSTNAMELEN 256
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#164910): https://lists.openembedded.org/g/openembedded-core/message/164910 Mute This Topic: https://lists.openembedded.org/mt/90581916/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
