From ce64a64c632400e32cb8b7ae2c1d1508a6cfb9ed Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 15 Nov 2011 22:25:02 +0000 Subject: [PATCH] Restore hardcoded --with-plugindir configure flag #390659 by Priit Laes. Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64 --- app-admin/sudo/ChangeLog | 8 +++++++- app-admin/sudo/Manifest | 10 +++++----- ...sudo-1.8.3_p1-r1.ebuild => sudo-1.8.3_p1-r2.ebuild} | 9 ++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) rename app-admin/sudo/{sudo-1.8.3_p1-r1.ebuild => sudo-1.8.3_p1-r2.ebuild} (93%) diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog index 815c7f4bddaa..8d1c35ad9fec 100644 --- a/app-admin/sudo/ChangeLog +++ b/app-admin/sudo/ChangeLog @@ -1,6 +1,12 @@ # 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.285 2011/11/15 06:05:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.286 2011/11/15 22:25:02 vapier Exp $ + +*sudo-1.8.3_p1-r2 (15 Nov 2011) + + 15 Nov 2011; Mike Frysinger -sudo-1.8.3_p1-r1.ebuild, + +sudo-1.8.3_p1-r2.ebuild: + Restore hardcoded --with-plugindir configure flag #390659 by Priit Laes. *sudo-1.8.3_p1-r1 (15 Nov 2011) diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index abe94c292824..8e9842212dd5 100644 --- a/app-admin/sudo/Manifest +++ b/app-admin/sudo/Manifest @@ -12,14 +12,14 @@ DIST sudo-1.8.3p1.tar.gz 1536465 RMD160 7809cbde339220d7dc10ae8da504d5c4e219b55c 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-r1.ebuild 5208 RMD160 b6dee6dac8d10b6afd9d4419fedf5693b2592335 SHA1 45826e9a6478ff9c0a2c9c0a6f4bc8c31258eed4 SHA256 2f3fc06da841356c8524c48c388d0b181ae3edaeb6c8448cca2cd790df7ff544 -EBUILD sudo-1.8.3_p1-r1.ebuild 4675 RMD160 b540f8d8828269a583a394632201fc840c21c6c3 SHA1 b99162461b01fa4c160528ab6f12d972331f3221 SHA256 75358f5b8880ff89976fb9838b9447363fbeca75fbd35e7518b51e4bc3cad53a +EBUILD sudo-1.8.3_p1-r2.ebuild 4856 RMD160 491bf899dcbca3ecb760ff47fcbf18eb11f083e8 SHA1 1d1c6d3f020103481c53b0a5b02ae06bd0917def SHA256 d5b7a7befc6b58cdf2133d5e597470c7d19c170ab86bcacde47b810dcb67fd2d EBUILD sudo-1.8.3_p1.ebuild 5109 RMD160 b958efc43a95bf1a5a1cb4f196df22317d0d1b4b SHA1 c069b14b38274cf53a711de3e422d4f58f31a917 SHA256 b79fb3d8a91f29d5a1472be1892e4510cd658c5cd0c5b31364bb9658244176fc -MISC ChangeLog 41952 RMD160 39d625b5698d379d367bbf6b7b77a5ba8c593b15 SHA1 e3270b964a0115780dca804643b7540e819939f9 SHA256 540e7db4b4ac5551f80ffd39fe3482833959d1190a5d94f3e9588dae47104ce1 +MISC ChangeLog 42165 RMD160 35b3b452f372a9a0620a92210e9709bd74c55859 SHA1 aa21d53e93c2a4c18e0c435e993f0d0450cebc32 SHA256 12695c88e6faffd4c748ef099742bbbcd0aa6a7db72b4ecf7e09429ff47a7cf8 MISC metadata.xml 560 RMD160 4e8bb9df73a4095b15b23d4ca31dea29b3f376d2 SHA1 a29e70672a1c039c4a97ee65e3e077ba0a01f26b SHA256 465d0ea14b7db3ecd0bad7c175f9e17003794145f5f59c4941f848960c91048a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7CAS8ACgkQaC/OocHi7JbXEgD/c9G1jDIrdEI2mnVyIxUJUPIr -9ktjuWWtjzFDS3n6XQEA/1EPCcEz7LATtY4jzjsPekIhe88BnF+fx5A8yTnpGp21 -=Q0pY +iF4EAREIAAYFAk7C5sYACgkQaC/OocHi7JarKAD/WQJqDK8hUT15/dxBi0DkVcoP +kdjtv1ww68Nye83W7nAA/ROuyBP8X4BDoiaW5q8r18DZFZGB/sv/yEhJbVpQASmD +=AzZN -----END PGP SIGNATURE----- diff --git a/app-admin/sudo/sudo-1.8.3_p1-r1.ebuild b/app-admin/sudo/sudo-1.8.3_p1-r2.ebuild similarity index 93% rename from app-admin/sudo/sudo-1.8.3_p1-r1.ebuild rename to app-admin/sudo/sudo-1.8.3_p1-r2.ebuild index 1632b6692625..856a31d15c8f 100644 --- a/app-admin/sudo/sudo-1.8.3_p1-r1.ebuild +++ b/app-admin/sudo/sudo-1.8.3_p1-r2.ebuild @@ -1,10 +1,10 @@ # 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.3_p1-r1.ebuild,v 1.1 2011/11/15 06:05:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.3_p1-r2.ebuild,v 1.1 2011/11/15 22:25:02 vapier Exp $ EAPI="4" -inherit eutils pam libtool +inherit eutils pam multilib libtool MY_P=${P/_/} MY_P=${MY_P/beta/b} @@ -100,6 +100,9 @@ src_configure() { # audit: somebody got to explain me how I can test this before I # enable it.. - Diego + # plugindir: autoconf code is crappy and does not delay evaluation + # until `make` time, so we have to use a full path here rather than + # basing off other values. econf \ --enable-zlib=system \ --with-secure-path="${ROOTPATH}" \ @@ -114,7 +117,7 @@ src_configure() { --without-opie \ --without-linux-audit \ --with-timedir=/var/db/sudo \ - --with-plugindir='${libdir}'/sudo \ + --with-plugindir=/usr/$(get_libdir)/sudo \ --docdir=/usr/share/doc/${PF} } -- 2.26.2