diff options
| author | Scott Garman <scott.a.garman@intel.com> | 2012-04-05 10:14:28 -0700 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-04-10 00:20:48 -0700 |
| commit | e5aee0a2f5973a7aef81d0f38307a93791f616c6 (patch) | |
| tree | 0a8cfc3ec14dad0602183cc1ee86fcf4f05d00e9 /meta/recipes-extended | |
| parent | d9d4fe9885e398df2062b3f2aed3fc274c656736 (diff) | |
| download | openembedded-core-e5aee0a2f5973a7aef81d0f38307a93791f616c6.tar.gz openembedded-core-e5aee0a2f5973a7aef81d0f38307a93791f616c6.tar.bz2 openembedded-core-e5aee0a2f5973a7aef81d0f38307a93791f616c6.tar.xz openembedded-core-e5aee0a2f5973a7aef81d0f38307a93791f616c6.zip | |
shadow-native: disable logging to syslog
Disable use of syslog to prevent sysroot user and group additions
from writing entries to the host's syslog.
This fixes [YOCTO #2012]
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/shadow/files/disable-syslog.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb | 5 |
2 files changed, 37 insertions, 2 deletions
diff --git a/meta/recipes-extended/shadow/files/disable-syslog.patch b/meta/recipes-extended/shadow/files/disable-syslog.patch new file mode 100644 index 000000000..1943fd6fa --- /dev/null +++ b/meta/recipes-extended/shadow/files/disable-syslog.patch @@ -0,0 +1,34 @@ +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 <scott.a.garman@intel.com> + +diff -urN shadow-4.1.4.3.orig//src/groupadd.c shadow-4.1.4.3/src/groupadd.c +--- shadow-4.1.4.3.orig//src/groupadd.c 2011-02-13 09:58:16.000000000 -0800 ++++ shadow-4.1.4.3/src/groupadd.c 2012-04-05 10:05:59.440001758 -0700 +@@ -34,6 +34,9 @@ + + #ident "$Id: groupadd.c 3015 2009-06-05 22:16:56Z nekral-guest $" + ++/* 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 -urN shadow-4.1.4.3.orig//src/useradd.c shadow-4.1.4.3/src/useradd.c +--- shadow-4.1.4.3.orig//src/useradd.c 2011-02-13 09:58:16.000000000 -0800 ++++ shadow-4.1.4.3/src/useradd.c 2012-04-05 10:06:25.076001315 -0700 +@@ -34,6 +34,9 @@ + + #ident "$Id: useradd.c 3015 2009-06-05 22:16:56Z nekral-guest $" + ++/* 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/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb index 42ecc6a87..38bb92228 100644 --- a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb +++ b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb @@ -7,14 +7,15 @@ LICENSE = "BSD | Artistic-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe" -PR = "r3" +PR = "r4" SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ file://shadow.automake-1.11.patch \ file://shadow-4.1.3-dots-in-usernames.patch \ file://shadow-4.1.4.2-env-reset-keep-locale.patch \ file://add_root_cmd_options.patch \ - file://useradd.patch" + file://disable-syslog.patch \ + file://useradd.patch" SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" |