prevent stripping, ldap tweaks.

Package-Manager: portage-2.0.51.19

4 files changed, 35 insertions, 16 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 1d633201ccad..6075d6f63052 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sudo
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.56 2005/06/15 06:55:11 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.57 2005/06/16 22:00:39 taviso Exp $
+
+  16 Jun 2005; Tavis Ormandy <taviso@gentoo.org> sudo-1.6.8_p8-r3.ebuild:
+  prevent binaries from being stripped if FEATURES=nostrip.
+  make tls_cacert synonymous with tls_cacertfile for consistency.
 
   15 Jun 2005; Markus Rothe <corsair@gentoo.org> sudo-1.6.7_p5-r4.ebuild:
   Stable on ppc64
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 6db1be1a4af2..da024ae642e3 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,20 +1,21 @@
-MD5 f984d5d56b01e421d7d862790ede4440 ChangeLog 7651
-MD5 994fa3d27c4fddfd287e805b67f5434c sudo-1.6.7_p5-r4.ebuild 1497
-MD5 1830dd653b9b5b92fa5cc86823e06d65 sudo-1.6.7_p5-r2.ebuild 1438
 MD5 eec74c7e7844116754be94ca7ed74d49 sudo-1.6.8_p8-r2.ebuild 4708
-MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222
+MD5 1830dd653b9b5b92fa5cc86823e06d65 sudo-1.6.7_p5-r2.ebuild 1438
+MD5 994fa3d27c4fddfd287e805b67f5434c sudo-1.6.7_p5-r4.ebuild 1497
+MD5 6b7b3c52fad4efff3e09515491a776bf sudo-1.6.8_p8-r3.ebuild 5669
+MD5 27fcb457ce9ec6ea1d6d83b325b501ac ChangeLog 7851
 MD5 02caf6e86d5e08fd89baccd299a0ee3c sudo-1.6.7_p5-r5.ebuild 1508
-MD5 245dba239e20940c8b10d249c03c0d82 sudo-1.6.8_p8-r3.ebuild 5536
-MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r4 64
-MD5 0c8a06b3d3d86e988a826c8d9e86dbbf files/digest-sudo-1.6.8_p8-r2 64
-MD5 6c08a6d5527a45278ebc165df7f0031d files/sudo-1.6.8_p8 223
+MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222
+MD5 a5463236fbb98e4ee6b1a0faba8c9c52 files/sudo 135
 MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r2 64
-MD5 b1fc3dd8440dc02690820c01190106a3 files/sudo-strip-shellopts.diff 316
+MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r4 64
 MD5 ea5d9d51e647a2dbd410d952019ff19b files/digest-sudo-1.6.7_p5-r5 64
+MD5 6c08a6d5527a45278ebc165df7f0031d files/sudo-1.6.8_p8 223
+MD5 0c8a06b3d3d86e988a826c8d9e86dbbf files/digest-sudo-1.6.8_p8-r2 64
 MD5 0c8a06b3d3d86e988a826c8d9e86dbbf files/digest-sudo-1.6.8_p8-r3 64
-MD5 a5463236fbb98e4ee6b1a0faba8c9c52 files/sudo 135
-MD5 b906eb71f7564707384cfa9fc80c1b5f files/sudo-1.6.7_p5-strip-bash-functions.diff 1101
 MD5 0b50aabedf9bb326893b5f1c333e46b2 files/sudo-skeychallengeargs.diff 567
-MD5 4362800877ccb8e27de5437707d8a954 files/sudo-strip-bash-functions.diff 1335
-MD5 774b75e759fe13c7334c523b1db8ab2e files/sudo_include 67
 MD5 59acf8b0292a8e60b5277b5dc952cfc4 files/sudoers 1645
+MD5 b906eb71f7564707384cfa9fc80c1b5f files/sudo-1.6.7_p5-strip-bash-functions.diff 1101
+MD5 b1fc3dd8440dc02690820c01190106a3 files/sudo-strip-shellopts.diff 316
+MD5 774b75e759fe13c7334c523b1db8ab2e files/sudo_include 67
+MD5 4a46750ff53c19dbfed39d894dd6ff4d files/sudo-1.6.8_p8-ldap-tls_cacert.diff 542
+MD5 4362800877ccb8e27de5437707d8a954 files/sudo-strip-bash-functions.diff 1335
diff --git a/app-admin/sudo/files/sudo-1.6.8_p8-ldap-tls_cacert.diff b/app-admin/sudo/files/sudo-1.6.8_p8-ldap-tls_cacert.diff
new file mode 100644
index 000000000000..bb2570e86b5c
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.6.8_p8-ldap-tls_cacert.diff
@@ -0,0 +1,10 @@
+--- ldap.c.orig	2005-06-16 22:55:41.047152568 +0100
++++ ldap.c	2005-06-16 22:56:49.707714576 +0100
+@@ -539,6 +539,7 @@
+     else MATCH_S("ssl",     ldap_conf.ssl)
+     else MATCH_B("tls_checkpeer",   ldap_conf.tls_checkpeer)
+     else MATCH_S("tls_cacertfile",  ldap_conf.tls_cacertfile)
++    else MATCH_S("tls_cacert",      ldap_conf.tls_cacertfile)
+     else MATCH_S("tls_cacertdir",   ldap_conf.tls_cacertdir)
+     else MATCH_S("tls_randfile",    ldap_conf.tls_random_file)
+     else MATCH_S("tls_ciphers",     ldap_conf.tls_cipher_suite)
diff --git a/app-admin/sudo/sudo-1.6.8_p8-r3.ebuild b/app-admin/sudo/sudo-1.6.8_p8-r3.ebuild
index 10204b0b74f0..ab81bec3bc38 100644
--- a/app-admin/sudo/sudo-1.6.8_p8-r3.ebuild
+++ b/app-admin/sudo/sudo-1.6.8_p8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.6.8_p8-r3.ebuild,v 1.6 2005/06/14 16:27:02 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.6.8_p8-r3.ebuild,v 1.7 2005/06/16 22:00:39 taviso Exp $
 
 inherit eutils pam
 
@@ -24,7 +24,8 @@ src_unpack() {
 	unpack ${A}; cd ${S}
 
 	# compatability fix.
-	use skey && epatch ${FILESDIR}/${PN}-skeychallengeargs.diff
+	epatch ${FILESDIR}/${PN}-skeychallengeargs.diff
+	epatch ${FILESDIR}/${P}-ldap-tls_cacert.diff
 
 	# additional variables to disallow, should user disable env_reset.
 
@@ -69,6 +70,9 @@ src_unpack() {
 #		sudo_bad_var 'RUBYPATH'       # ruby, script search path. <?>
 		sudo_bad_var 'ZDOTDIR'        # zsh, path to search for dotfiles.
 	einfo "...done."
+
+	# prevent binaries from being stripped.
+	sed -i 's/-s \([(sudo|visudo)]\)/\1/g' ${S}/Makefile.in
 }
 
 src_compile() {