Fix parallel build failures with sudoreplay.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 28 insertions, 9 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 630eeaed9b1a..5c6df6466215 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.280 2011/09/03 16:08:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.281 2011/10/07 16:27:53 vapier Exp $
+
+  07 Oct 2011; Mike Frysinger <vapier@gentoo.org> sudo-1.8.2.ebuild,
+  +files/sudo-1.8.2-parallel-build.patch:
+  Fix parallel build failures with sudoreplay.
 
   03 Sep 2011; Raúl Porcel <armin76@gentoo.org> sudo-1.8.1_p2.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #379743
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 169c03bf9828..5fc20f6aaea6 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX sudo-1.8.2-parallel-build.patch 517 RMD160 1fa308ce579f9c3e8d32b6155ee6e89044c2997e SHA1 8237b096164527704e865f95cd563b5d5aa01d22 SHA256 f21f4c60c8d9bbbf8ff372393e5d753a123021573dc4ace9665ff451dda9326c
 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
 DIST sudo-1.7.4p5.tar.gz 966176 RMD160 24fcaa065f9efc229abcf2b70ec4faca03efa32d SHA1 bb9c9ff6ce6d4c70bdc546316442e7021ca754c2 SHA256 72e8e3545f314d342f178b0fee4b483e26d70ef132b081699be035da0f0acbba
 DIST sudo-1.8.1p2.tar.gz 1238804 RMD160 165029d462e737c885b1d32accb9b2b19411a0fb SHA1 b743b3d7bdb06de68ea24eedfe13530e8fbcae09 SHA256 281f90c80547cf22132e351e7f61c25ba4ba9cf393438468f318f9a7884026fb
 DIST sudo-1.8.2.tar.gz 1465051 RMD160 daebd7f67fff6429c3cb85260e9b11f0c3e28e3c SHA1 6a9400ba3e40394fd9c913219e3b6bb102bb3906 SHA256 37fe6ee670329bc45937fbe402e847f80b3a0a1c8fc9a66487e92b4b810152b0
 EBUILD sudo-1.7.4_p5.ebuild 7202 RMD160 6a25c3582d4a4765b58851e769ea13b06a90fd30 SHA1 6c0d870bc05e758f40f1028192a77836ff5a50ba SHA256 e5142ec5ea32a80daca760bf8413828bfba8aa3c54e9f58eed326da4661ebcb2
 EBUILD sudo-1.8.1_p2.ebuild 5052 RMD160 830050dd4b7d2aea5b12fcfa4c659400e00b95ab SHA1 18ce6dfc5d645f0a5a5968ae344e9b6ec33efac8 SHA256 6485402e94a6229f4f89980b10b927150372040dc24e295cbafb8cca969aa305
-EBUILD sudo-1.8.2.ebuild 5103 RMD160 5be70bf8e11787ac8755127b4c413f3380dff7ab SHA1 70ca52a200df5d35cc5ac87925d9a3e3fd906ea6 SHA256 58cb6c27aec5d3279f4ca684ee3d59b0391b91a2bc5b07f706cca237665e20c7
-MISC ChangeLog 41060 RMD160 78fcad9c4b870786feb8ff0ae2f480bf252037ce SHA1 57abfc6cfa6bcea66641d2c79707f729af33b7f4 SHA256 2d2fe8930f6a05870c39304fc51fdf9f661cbc85b9c4b73b503889b0ca007e79
+EBUILD sudo-1.8.2.ebuild 5151 RMD160 236cdf8401b3a57a0f7d5f3e7132c6884e2f79a7 SHA1 7ee08c6314eef505c50551f4eaf4b54fc71a3aa0 SHA256 5298c11583f35b5e12d6be6fdcf8efc5dad477ba6641eec7e4b18994216346f6
+MISC ChangeLog 41218 RMD160 e4d2aa090634f7950c9c7fcbd68db2f07f0e606c SHA1 c6452667cc329a66040721ad6a4d9cc7ab470cb6 SHA256 b16d76c163f0348ee0771382806e48dc46d56b6182de03d0b0794d28158747ad
 MISC metadata.xml 560 RMD160 4e8bb9df73a4095b15b23d4ca31dea29b3f376d2 SHA1 a29e70672a1c039c4a97ee65e3e077ba0a01f26b SHA256 465d0ea14b7db3ecd0bad7c175f9e17003794145f5f59c4941f848960c91048a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5iUOsACgkQuQc30/atMkDLowCdE3bff0ldZi+yPBqelaS6Xu72
-pjYAoLDEH6PKS6KfyScH1TFL93BMT0l7
-=oYOQ
+iF4EAREIAAYFAk6PKJcACgkQaC/OocHi7JYvdQD/Q9sy/bb2vXajyy1ZoaBji4PZ
+CUu8MdbLaZrve0wAMA0BAILH+Jm/52ig+SOEzuL2CUAq2yJCKkQhZgZz/2pAKO1g
+=m7on
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/files/sudo-1.8.2-parallel-build.patch b/app-admin/sudo/files/sudo-1.8.2-parallel-build.patch
new file mode 100644
index 000000000000..4f7b78f707e0
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.8.2-parallel-build.patch
@@ -0,0 +1,13 @@
+http://crosbug.com/20607
+
+--- a/plugins/sudoers/Makefile.in
++++ b/plugins/sudoers/Makefile.in
+@@ -164,7 +164,7 @@
+ visudo: libparsesudoers.la $(VISUDO_OBJS) $(LT_LIBS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(VISUDO_OBJS) $(LDFLAGS) libparsesudoers.la $(LIBS) $(NET_LIBS)
+ 
+-sudoreplay: $(REPLAY_OBJS) $(LT_LIBS)
++sudoreplay: $(REPLAY_OBJS) $(LT_LIBS) timestr.lo
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(REPLAY_OBJS) $(LDFLAGS) timestr.lo $(REPLAY_LIBS) $(LIBS)
+ 
+ testsudoers: libparsesudoers.la $(TEST_OBJS) $(LT_LIBS)
diff --git a/app-admin/sudo/sudo-1.8.2.ebuild b/app-admin/sudo/sudo-1.8.2.ebuild
index fefd72ab5c87..7d7407f470ca 100644
--- a/app-admin/sudo/sudo-1.8.2.ebuild
+++ b/app-admin/sudo/sudo-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.2.ebuild,v 1.3 2011/08/26 01:03:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.2.ebuild,v 1.4 2011/10/07 16:27:53 vapier Exp $
 
 EAPI=4
 
@@ -55,6 +55,7 @@ REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
 MAKEOPTS="${MAKEOPTS} SAMPLES="
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
 	elibtoolize
 }