diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-04-20 06:59:59 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-20 06:59:59 +0000 |
| commit | 69e158ffc6256c39691a79b2b36b3a8885a784db (patch) | |
| tree | ee6c19f1b7620ffaf3753fa71dc86014ae1227de /sys-apps/shadow | |
| parent | Version bumped. (diff) | |
| download | gentoo-2-69e158ffc6256c39691a79b2b36b3a8885a784db.tar.gz gentoo-2-69e158ffc6256c39691a79b2b36b3a8885a784db.tar.bz2 gentoo-2-69e158ffc6256c39691a79b2b36b3a8885a784db.zip | |
Add fix from upstream for build failure with USE=audit #216291.
(Portage version: 2.2_pre5)
Diffstat (limited to 'sys-apps/shadow')
| -rw-r--r-- | sys-apps/shadow/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/shadow/files/shadow-4.1.1-audit.patch | 22 | ||||
| -rw-r--r-- | sys-apps/shadow/shadow-4.1.1.ebuild | 7 |
3 files changed, 29 insertions, 6 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog index 7ea330b4b2dd..72d552883b36 100644 --- a/sys-apps/shadow/ChangeLog +++ b/sys-apps/shadow/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/shadow # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.199 2008/04/06 22:29:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.200 2008/04/20 06:59:59 vapier Exp $ + + 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> + +files/shadow-4.1.1-audit.patch, shadow-4.1.1.ebuild: + Add fix from upstream for build failure with USE=audit #216291. 06 Apr 2008; Mike Frysinger <vapier@gentoo.org> shadow-4.1.1.ebuild: Add support for USE=audit. diff --git a/sys-apps/shadow/files/shadow-4.1.1-audit.patch b/sys-apps/shadow/files/shadow-4.1.1-audit.patch new file mode 100644 index 000000000000..1a4c95ae58bb --- /dev/null +++ b/sys-apps/shadow/files/shadow-4.1.1-audit.patch @@ -0,0 +1,22 @@ +--- /upstream/trunk/src/newgrp.c 2008/04/16 22:03:43 1975 ++++ upstream/trunk/src/newgrp.c 2008/04/16 22:04:46 1976 +@@ -53,6 +53,10 @@ + static char *Prog; + static int is_newgrp; + ++#ifdef WITH_AUDIT ++char audit_buf[80]; ++#endif ++ + /* local function prototypes */ + static void usage (void); + static void check_perms (const struct group *grp, +@@ -349,8 +353,6 @@ + #endif + + #ifdef WITH_AUDIT +- char audit_buf[80]; +- + audit_help_open (); + #endif + setlocale (LC_ALL, ""); diff --git a/sys-apps/shadow/shadow-4.1.1.ebuild b/sys-apps/shadow/shadow-4.1.1.ebuild index 5cd0694ed39d..968d42ce349d 100644 --- a/sys-apps/shadow/shadow-4.1.1.ebuild +++ b/sys-apps/shadow/shadow-4.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.1.ebuild,v 1.2 2008/04/06 22:29:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.1.ebuild,v 1.3 2008/04/20 06:59:59 vapier Exp $ inherit eutils libtool toolchain-funcs autotools pam multilib @@ -31,10 +31,7 @@ src_unpack() { unpack ${A} cd "${S}" - # If su should not simulate a login shell, use '/bin/sh' as shell to enable - # running of commands as user with /bin/false as shell, closing bug #15015. - # *** This one could be a security hole; disable for now *** - #epatch "${FILESDIR}"/${P}-nologin-run-sh.patch + epatch "${FILESDIR}"/${P}-audit.patch #216291 # tweak the default login.defs epatch "${FILESDIR}"/${PN}-4.0.17-login.defs.patch |