Version bump to rc2 for both 1.8.1 and 1.7.6; move plugins for 1.8 to /usr/lib/sudo; don't install sample plugins; filter gnat-gcc paths from secure_path as it's done for gcc already.

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

6 files changed, 59 insertions, 33 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 2fed2103c916..37e7facb12ee 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,16 @@
 # 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.261 2011/04/06 08:33:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.262 2011/04/06 14:18:41 flameeyes Exp $
+
+*sudo-1.8.1_rc2 (06 Apr 2011)
+*sudo-1.7.6_rc2 (06 Apr 2011)
+
+  06 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> -sudo-1.7.6_rc1.ebuild,
+  +sudo-1.7.6_rc2.ebuild, -sudo-1.8.1_rc1.ebuild, +sudo-1.8.1_rc2.ebuild,
+  -files/sudo-1.8.1_rc1-ldflags.patch, +files/sudo-1.8.1_rc2-plugindir.patch:
+  Version bump to rc2 for both 1.8.1 and 1.7.6; move plugins for 1.8 to
+  /usr/lib/sudo; don't install sample plugins; filter gnat-gcc paths from
+  secure_path as it's done for gcc already.
 
   06 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> sudo-1.7.6_rc1.ebuild:
   Use EAPI=4 properly.
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 4db61ec28869..d7f8b762c2d9 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX sudo-1.8.1_rc1-ldflags.patch 497 RMD160 c128802e86610221a2962d614748302dfbaa4f9a SHA1 208105e56554a3ced6fbcc1342671dfd482db3c6 SHA256 0d0c8a41f8c837df5edebe48909a48854cb4aa2029a260a34cfafa50666b3694
 AUX sudo-1.8.1_rc1-recursion.patch 1181 RMD160 8e487d3811e6ba20c376841a129b83cfb1ff1925 SHA1 588b3aa68853f2d04582f5e96b43d53939fa7cc9 SHA256 3ec7997b9f7143175160b2358e65e9a899bca1fdca9b359b6d197b5be35c5624
 AUX sudo-1.8.1_rc1-skey.patch 2304 RMD160 02bd31547a8758ba53c18b9e0d84c6a8a7efff98 SHA1 e066158141459005f2dc4f6e746df421c786da08 SHA256 27b0a78270b3af9a307f250a0ed444fe4828db8c5bdc2ebe102bdabe0437cb1f
+AUX sudo-1.8.1_rc2-plugindir.patch 753 RMD160 2472fc771ad313287e6b50c55c8adceb2baf9ba9 SHA1 490e9b5725743faee2371e8795f4def09436479d SHA256 79a32861c7dee57deefefc04903a2c6b31c3c505dd675dd09cc359e4ee30e11e
 AUX sudo-CVE-2010-2956.patch 2815 RMD160 6d48eb1dce125a129e56a208ee47bd502f0cd18a SHA1 ab3dbcc8de166bdf01aef0cf0bc53a6d86950c95 SHA256 4cc2c68d65a8ce95e3b248a426774a20896d36cbf21980137c77af1f0b674c4b
 AUX sudo-skeychallengeargs.diff 567 RMD160 906ee43a7c2f21d1cf5130eac5c98ef0833154fd SHA1 b0efbedc72a1ed85c74ba10e343a68368e76c3e9 SHA256 dd2f4fdba26be6c3b4af15f3b6e18efa19375e1f9c579cdc2c76ee1adcce5e1d
 DIST sudo-1.7.4p4.tar.gz 963663 RMD160 3b5eb69b4317c72def0e811c58a24df8c9c1c892 SHA1 c873f509f80d5722989a912a42a61ad27b71453f SHA256 38de3c3e08346b2b8dcb3cf7ed0813300d1a1d5696d0f338ea8a4ef232aacf97
 DIST sudo-1.7.4p5.tar.gz 966176 RMD160 24fcaa065f9efc229abcf2b70ec4faca03efa32d SHA1 bb9c9ff6ce6d4c70bdc546316442e7021ca754c2 SHA256 72e8e3545f314d342f178b0fee4b483e26d70ef132b081699be035da0f0acbba
 DIST sudo-1.7.5.tar.gz 1117718 RMD160 b325d664b6597662568949e50bb781bbfc8c6abb SHA1 5d12121aaf65b9fcd1012582c6d3a89f403c25d1 SHA256 c16af034260a3c3e7cabf7e94d1ff9881a16348a334912e8264e6257ebcf2bac
-DIST sudo-1.7.6rc1.tar.gz 1123635 RMD160 77aaea27995211507b90dc19e4c2334f77839075 SHA1 8a0666f4cfc840003b488eeb2904806924e20693 SHA256 d4f26ecf21a6f45d89878ce378dfb8ed4dc2ee50d87aa1fb943c6be1bb6d2c31
-DIST sudo-1.8.1rc1.tar.gz 1235042 RMD160 6e2699847d22d6fa6db8deaa554dbfed06a339f0 SHA1 dbbc2d530a0bcaad381ddae5730608628b601d7f SHA256 1ea4c25641ff13626e1350f0ad5a5c343a123a97d2e623daef5379d691ffd2ba
+DIST sudo-1.7.6rc2.tar.gz 1123758 RMD160 d2356530bd9bc0bf81d43c70925a38973fe4d7a9 SHA1 af3085755a92b3207e607348717f985687b32287 SHA256 0063040af73ae740add9d6e2b573b6c3c5ca2c84bb304e9b91ca75c1f96286ad
+DIST sudo-1.8.1rc2.tar.gz 1236753 RMD160 b8ae30ae38b158caa7fb478adb13f59c42d52a2c SHA1 bc6db64366d8f36d3360addbff1db2a4028be2eb SHA256 b0cc2cd8958fae54b02db2c92a791e1e9f80d3756e99f32e6f2383f9ac229561
 EBUILD sudo-1.7.4_p4.ebuild 7209 RMD160 66eab6cd5ccf87e87913bcd52bde8791e316fe82 SHA1 4bfedb8f6a7354f50422cb8b4baaf266699b5b7c SHA256 0ffac351399a497f94ffd4f674dc2fea9e9e6aed80936aea27bc8ff998ca73bb
 EBUILD sudo-1.7.4_p5.ebuild 7208 RMD160 3e8714403edb762e6e31c084001a82fb7160fbf7 SHA1 7a5fa03c5c68ef5ad43dab98ddeb53d43b4cea9a SHA256 5dcdf6cf6e8a73dae5cdd92d2b447dfb9c7e959eab14fc76ca31a3e0f82d3d26
 EBUILD sudo-1.7.5.ebuild 7219 RMD160 23211092f3a5c1ba5c7cc3a637949bd867339ffc SHA1 1a0d66757f6015a29683ea4bbf865e83ae6b47e6 SHA256 07c6400d605592153f3ffcaad57400d1fd9c07a878d9cb67e100d83326a9bedd
-EBUILD sudo-1.7.6_rc1.ebuild 5253 RMD160 31736a57376e22f2e3a2370ed38c7533ae5cda09 SHA1 3387a83785f2a30d8cf53eac3f339539484a3e29 SHA256 411ec00d9678b9115c03f6fcbc3c2db7885b3bddeb569c9a712c20d469402b75
-EBUILD sudo-1.8.1_rc1.ebuild 5063 RMD160 c9b077f5271a1925b6e316c76458ca1af5000f60 SHA1 93af9a5157bcd7596064cc0842fd17b69d6b5e10 SHA256 f0bb164a6af93c1b324ca4749700bc05d606f5e20799733c1f9a4461674dcf43
-MISC ChangeLog 37322 RMD160 5d057f5095ebcf18a8b15a5618c9da188e9d1254 SHA1 54b3bf49094769241d319f429b9e9d25341c3d5d SHA256 b1447e04ceccb927c481cf9acdb8c0c78afab08516f0e7ff6fc77089bc0ec7ca
+EBUILD sudo-1.7.6_rc2.ebuild 5323 RMD160 efca702a6b6f1bbe7171b244ee33a86e2003b5b7 SHA1 4ca1f5c268335fd3ebe92358789f89d071c135c2 SHA256 2144e0324735aed0f2995eb5957d551d2d3d2eb2be318b2894de1cd1ac5e67e7
+EBUILD sudo-1.8.1_rc2.ebuild 5244 RMD160 309fa5bccfddf340bcdeb01aa860b5dbfef21c50 SHA1 682b3cde897856272a54327a2f6573b5e2d45785 SHA256 dda14f629ad305e2a805851f80f992313273c21c3dcf464805a4c7530f0abf77
+MISC ChangeLog 37806 RMD160 4ab24598ef8b2da24e0e10e45bb74158435f10f0 SHA1 8a2b9ef2e89961ae1089b01fc1539f37783a942f SHA256 fbd461d88eab5400385f0474429d1e62306b3e29d950c0f08b473fcd544a9986
 MISC metadata.xml 560 RMD160 4e8bb9df73a4095b15b23d4ca31dea29b3f376d2 SHA1 a29e70672a1c039c4a97ee65e3e077ba0a01f26b SHA256 465d0ea14b7db3ecd0bad7c175f9e17003794145f5f59c4941f848960c91048a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2cJW4ACgkQAiZjviIA2Xj09ACeJ5TD7/kur1dc7Ah2W1rh6rUh
-spIAoNi+At/6FjGz1M+M1K5Mm2ARWaYv
-=ZJ+U
+iEYEARECAAYFAk2cdkMACgkQAiZjviIA2XjkBQCeJsbP+CK+NbGjWxNUJ+LVsU1j
+xBcAnRkpCtiGSzBwGgcQi4pwdSde14qR
+=7fU4
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/files/sudo-1.8.1_rc1-ldflags.patch b/app-admin/sudo/files/sudo-1.8.1_rc1-ldflags.patch
deleted file mode 100644
index e0ac730b2d56..000000000000
--- a/app-admin/sudo/files/sudo-1.8.1_rc1-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: sudo-1.8.1rc1/plugins/sudoers/Makefile.in
-===================================================================
---- sudo-1.8.1rc1.orig/plugins/sudoers/Makefile.in
-+++ sudo-1.8.1rc1/plugins/sudoers/Makefile.in
-@@ -55,8 +55,8 @@ CPPFLAGS = -I$(incdir) -I$(top_builddir)
- CFLAGS = @CFLAGS@
- 
- # Flags to pass to the link stage
--LDFLAGS =
--SUDOERS_LDFLAGS = @SUDOERS_LDFLAGS@
-+LDFLAGS = @LDFLAGS@
-+SUDOERS_LDFLAGS = $(LDFLAGS) @SUDOERS_LDFLAGS@
- 
- # Where to install things...
- prefix = @prefix@
diff --git a/app-admin/sudo/files/sudo-1.8.1_rc2-plugindir.patch b/app-admin/sudo/files/sudo-1.8.1_rc2-plugindir.patch
new file mode 100644
index 000000000000..9fa2e0dd22f8
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.8.1_rc2-plugindir.patch
@@ -0,0 +1,24 @@
+Index: sudo-1.8.1rc2/configure.in
+===================================================================
+--- sudo-1.8.1rc2.orig/configure.in
++++ sudo-1.8.1rc2/configure.in
+@@ -1099,13 +1099,14 @@ AC_ARG_WITH(askpass, [AS_HELP_STRING([--
+ 		;;
+ esac], AC_MSG_RESULT(no))
+ 
+-with_plugindir="$libexecdir"
+-AC_ARG_WITH(plugin_dir, [AS_HELP_STRING([--with-plugin_dir], [set directory to load plugins from])],
+-[case $with_plugin_dir in
++AC_ARG_WITH(plugindir, [AS_HELP_STRING([--with-plugin_dir], [set directory to load plugins from])],
++[case $withval in
+     no)		AC_MSG_ERROR(["illegal argument: --without-plugin_dir."])
+ 		;;
+-    *)		;;
+-esac])
++    *)		with_plugindir=$withval;;
++esac],
++[with_plugindir="$libexecdir"
++])
+ 
+ dnl
+ dnl Options for --enable
diff --git a/app-admin/sudo/sudo-1.7.6_rc1.ebuild b/app-admin/sudo/sudo-1.7.6_rc2.ebuild
index 2e8de11c6945..caa4d4018c74 100644
--- a/app-admin/sudo/sudo-1.7.6_rc1.ebuild
+++ b/app-admin/sudo/sudo-1.7.6_rc2.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.7.6_rc1.ebuild,v 1.3 2011/04/06 08:33:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.7.6_rc2.ebuild,v 1.1 2011/04/06 14:18:41 flameeyes Exp $
 
 EAPI=4
 
@@ -107,6 +107,8 @@ src_configure() {
 		}
 
 		rmpath ROOTPATH '*/gcc-bin/*'
+		rmpath ROOTPATH '*/gnat-gcc-bin/*'
+		rmpath ROOTPATH '*/gnat-gcc/*'
 
 	einfo "...done."
 
diff --git a/app-admin/sudo/sudo-1.8.1_rc1.ebuild b/app-admin/sudo/sudo-1.8.1_rc2.ebuild
index 75bbaed6b9b3..dfa0492d119d 100644
--- a/app-admin/sudo/sudo-1.8.1_rc1.ebuild
+++ b/app-admin/sudo/sudo-1.8.1_rc2.ebuild
@@ -1,12 +1,12 @@
 # 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.1_rc1.ebuild,v 1.2 2011/04/06 08:30:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_rc2.ebuild,v 1.1 2011/04/06 14:18:41 flameeyes Exp $
 
 EAPI=4
 
 WANT_AUTOMAKE=none
 
-inherit eutils pam libtool autotools
+inherit eutils pam multilib libtool autotools
 
 MY_P=${P/_/}
 MY_P=${MY_P/beta/b}
@@ -52,10 +52,13 @@ S=${WORKDIR}/${MY_P}
 
 REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
 
+MAKEOPTS="${MAKEOPTS} SAMPLES="
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-recursion.patch \
-		"${FILESDIR}"/${P}-skey.patch
+	epatch\
+		"${FILESDIR}"/${PN}-1.8.1_rc1-recursion.patch \
+		"${FILESDIR}"/${PN}-1.8.1_rc1-skey.patch \
+		"${FILESDIR}"/${PN}-1.8.1_rc2-plugindir.patch
 
 	export AT_M4DIR="m4"
 	eautoheader
@@ -111,6 +114,8 @@ src_configure() {
 		}
 
 		rmpath ROOTPATH '*/gcc-bin/*'
+		rmpath ROOTPATH '*/gnat-gcc-bin/*'
+		rmpath ROOTPATH '*/gnat-gcc/*'
 
 	einfo "...done."
 
@@ -128,8 +133,8 @@ src_configure() {
 		--without-opie \
 		--without-linux-audit \
 		--with-timedir=/var/db/sudo \
-		--docdir=/usr/share/doc/${PF} \
-		${myconf}
+		--with-plugindir=/usr/$(get_libdir)/sudo \
+		--docdir=/usr/share/doc/${PF}
 }
 
 src_install() {