Add fix from upstream for build failure with USE=audit #216291.

Package-Manager: portage-2.2_pre5

4 files changed, 35 insertions, 11 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/Manifest b/sys-apps/shadow/Manifest
index 909b77df2429..7d9096d0e436 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -28,6 +28,7 @@ AUX shadow-4.0.17-login.defs.patch 372 RMD160 055add143d873be6a57dbd1f8620b7e452
 AUX shadow-4.0.18.1-useradd-usermod.patch 1081 RMD160 65bb85eba9f2e08f4febeea97d522d515f7d9fb7 SHA1 c13cf8b5c566e129d4fc62ad3ac08b6c856c992e SHA256 ca34bc36424585c9f1d64c6b4201ce62c964773c7c6c16faecdd2610ad655cfb
 AUX shadow-4.0.18.2-useradd.patch 489 RMD160 8b4b6f9e83a1da6152ae588355709d0df3deb0b6 SHA1 8a829fa144597a0806a136bc275e484c6029dd61 SHA256 9069a1a025e1dd96d3a3b4e5e759f55b297a34a2943f27e160864c090390a8c4
 AUX shadow-4.1.0-fix-useradd-usergroups.patch 2569 RMD160 d8c719470c7df384f9d5ebcdd98603d2d30f1718 SHA1 982b8e53962be4583beeb09efff472d2b34ea2e3 SHA256 c7f7de07b82295289e9bce0e93353527dd70451149978c70129348ff9ad80957
+AUX shadow-4.1.1-audit.patch 469 RMD160 3e8280481a337350524ced18a307a32ac84beb8a SHA1 128d3983834da3be4f1f3de7c71d40a99196bf61 SHA256 d44d7cebaa482bc2aee4ad5e29e76ab56a1b2737ebd86373bb9e8e16f1051521
 DIST shadow-4.0.18.1.tar.bz2 1516296 RMD160 05a1f609370371de3112479cb6a98d966c45fa6c SHA1 1a30458e9db05560bfc82529048bd5d60b45cf9b SHA256 3da368d87a94270c3db4bae6ff634b8db5dcbc8822d554dbfea955a676c1ab12
 DIST shadow_4.0.18.2.orig.tar.gz 2501791 RMD160 f13d5c06bc88eea8d851a8c396110b2e96d1bb39 SHA1 c3426cddc8605ddb7ff55fdc231dc191ecc46989 SHA256 0b3cbfb32200cacd8544734d227d0a576642baf573f972f046bbbae457145cae
 DIST shadow_4.1.0.orig.tar.gz 2651512 RMD160 82c78efd61cb7cadfa2fd7fa0f1f3cb65c72363a SHA1 f4c99d44c33415d9ea68f98e47f6f7e9f47350f9 SHA256 cf132866ad1741da2072b8faa16e6e2d98ff85270151fe7383c818549187e3ae
@@ -36,13 +37,13 @@ EBUILD shadow-4.0.18.1-r1.ebuild 5981 RMD160 38115dd55e067629891b67bac1540d8aa44
 EBUILD shadow-4.0.18.2.ebuild 5180 RMD160 057ab5d87fdbdf18b53fe37f93ba97348a03720c SHA1 533b21f7c80310a2b9e6e78842de4175a08f7ab3 SHA256 7bc4f4f400b1f720e67594bccce45f8d73699c8485b1e1b1615105a100827b86
 EBUILD shadow-4.1.0-r1.ebuild 4788 RMD160 4fcba9e4a6841588c635569110dba0601c560b2c SHA1 0a80acb66b29a21f39c710cb6ca047cbbf40d7ae SHA256 1cc83366ab62fff3f6d95811e873bee787acfb960b3644a087ada501ed95b95d
 EBUILD shadow-4.1.0.ebuild 4718 RMD160 fa0a7e7feb90bf02d369d46c92ff0b0b8696dfa7 SHA1 09d70acde021c8a18c0c5e1e5da0b1edb088c028 SHA256 7ca97061f3dbac39fdc0ef6822b2e8b7686b4cc66f8108be9539fad3acdc2cf7
-EBUILD shadow-4.1.1.ebuild 4770 RMD160 9191ef2b1912337eaaf5d3eb8bd522b358374efe SHA1 550cf9cefcb2f2d472cbc8824a8a3a8d13a1630d SHA256 97c67585dd828a0822ea50d8489e18749bf941b5c5a6457ab5740fbf4d115e08
-MISC ChangeLog 34907 RMD160 e148d80d1f088566f3487f40a56c6d8f5c4a7042 SHA1 fba4a5363be70648672986202bd8101032437a93 SHA256 31fea24627adfd16b461a93f43df62fcfc5a01906a2aa0e41f1c30e5286f6e23
+EBUILD shadow-4.1.1.ebuild 4552 RMD160 2d029ab9abb96f76ea6a94eb773b0241cda84f62 SHA1 4cfebd60c4321f3364f0241249254fe0a1c2c5ab SHA256 d308c928c7e11f65bf4af6324c559cdd70cb138f26a594e0f1ab0a160795f3e3
+MISC ChangeLog 35080 RMD160 a369d318a8eedc32d1314f0f34e24b74785c42ec SHA1 89a6e5aaca332d30153d7cdb077797a9302f64d4 SHA256 1f16224e4ff4933866952e70dec365f4d3776f195a4d0810bf1c262d500039d1
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH+U7fj9hvisErhMIRAk2fAKCCQND0699Vr+XBCY4zfZmbsF3jiwCcDTJe
-3etvf//vgNTcbEEmkTdwfug=
-=hsOU
+iD8DBQFICun2j9hvisErhMIRAgR+AJ4sNdb8XUixgvV3ZpuLBhWOs3sUXQCgshBJ
+rxAU+cXelI7mnwT1eOHrYuk=
+=Qn/9
 -----END PGP SIGNATURE-----
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