fix bind now markings so they are only applied to the setuid binary (gpg)

Package-Manager: portage-2.0.51.22-r1

2 files changed, 31 insertions, 32 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index b5acd4b06bb2..b8b0eaf5737d 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,25 +1,25 @@
-MD5 bf8d77a7d64cc34b11da70edbc35e068 gnupg-1.9.15.ebuild 3231
-MD5 7cf0ca92817de23e81cb83fbcb6e8754 gnupg-1.2.4.ebuild 4250
-MD5 73e87591d6d3ccdaf39979c0ba9deed2 gnupg-1.2.6.ebuild 3817
-MD5 aaaeeeff8a9b06ba7f0eb28f6bbf336d gnupg-1.9.14.ebuild 3077
-MD5 afbd0db2e66222db5fec6282c641ff3c gnupg-1.9.15-r1.ebuild 3070
-MD5 84cf85e579f860997c9830a66eec8dd7 gnupg-1.4.0-r2.ebuild 5180
-MD5 bb91a985f901f48470f51c2a084fa5cb gnupg-1.9.16.ebuild 3452
-MD5 433cedea756396fb38e637f9b3bc9c1c gnupg-1.4.1-r1.ebuild 6344
-MD5 69888aacc50184d8b0722eec700070ef gnupg-1.4.1.ebuild 6268
 MD5 dd6c9feefa6edab7f6c638c331b2637a ChangeLog 18609
+MD5 aaaeeeff8a9b06ba7f0eb28f6bbf336d gnupg-1.9.14.ebuild 3077
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
+MD5 7cf0ca92817de23e81cb83fbcb6e8754 gnupg-1.2.4.ebuild 4250
 MD5 64182f539542ec33e240ccaae7bfd21f gnupg-1.4.0-r1.ebuild 4512
-MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
-MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
-MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
+MD5 84cf85e579f860997c9830a66eec8dd7 gnupg-1.4.0-r2.ebuild 5180
+MD5 69888aacc50184d8b0722eec700070ef gnupg-1.4.1.ebuild 6268
+MD5 afbd0db2e66222db5fec6282c641ff3c gnupg-1.9.15-r1.ebuild 3070
+MD5 73e87591d6d3ccdaf39979c0ba9deed2 gnupg-1.2.6.ebuild 3817
+MD5 bf8d77a7d64cc34b11da70edbc35e068 gnupg-1.9.15.ebuild 3231
+MD5 bb16c12599f7951a87b5a300173b50af gnupg-1.9.16.ebuild 3415
+MD5 433cedea756396fb38e637f9b3bc9c1c gnupg-1.4.1-r1.ebuild 6344
+MD5 a614d4d6eb27b31d9b4651c349b31c3e files/digest-gnupg-1.9.14 65
+MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
 MD5 a8d4b32b219641e9b9df83b581a935ba files/digest-gnupg-1.4.0-r1 117
 MD5 9e4bb59ff6cbb14c85cf044408669ccd files/digest-gnupg-1.4.0-r2 190
-MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
-MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
-MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15-r1 66
-MD5 a614d4d6eb27b31d9b4651c349b31c3e files/digest-gnupg-1.9.14 65
+MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
 MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15 66
-MD5 8c4a537dc8228a95208b0e227c93ed7d files/digest-gnupg-1.9.16 66
 MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
+MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
 MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
+MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15-r1 66
+MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
+MD5 8c4a537dc8228a95208b0e227c93ed7d files/digest-gnupg-1.9.16 66
+MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
diff --git a/app-crypt/gnupg/gnupg-1.9.16.ebuild b/app-crypt/gnupg/gnupg-1.9.16.ebuild
index 8a24aebf2fca..9286abd8ffeb 100644
--- a/app-crypt/gnupg/gnupg-1.9.16.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.16.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-crypt/gnupg/gnupg-1.9.16.ebuild,v 1.2 2005/05/23 14:03:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.16.ebuild,v 1.3 2005/06/18 00:32:17 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,8 +13,6 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-*"
-#very broken with keyservers - will look later
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="X caps ldap nls smartcard static threads selinux"
 
 DEPEND_COMMON="
@@ -44,11 +42,15 @@ DEPEND="
 	caps? ( sys-libs/libcap )
 	ldap? ( net-nds/openldap )"
 
-
 src_unpack() {
 	ewarn "Danger BETA software"
 	unpack ${A}
-	sed -i -e 's/PIC/__PIC__/g' ${S}/intl/relocatable.c
+	cd "${S}"
+	sed -i -e 's/PIC/__PIC__/g' intl/relocatable.c
+	use caps && return 0
+	sed -i \
+		-e '/^gpg2_LDADD/s:=:=-Wl,-z,now:' \
+		g10/Makefile.in || die "sed -z now"
 }
 
 src_compile() {
@@ -66,19 +68,17 @@ src_compile() {
 		myconf="${myconf} --disable-photo-viewers"
 	fi
 
-	append-ldflags -Wl,-z,now
-
 	econf \
 		--disable-agent \
 		--enable-gpg \
 		--enable-hkp \
 		--enable-mailto \
 		--enable-keyserver-helpers \
-		`use_enable smartcard scdaemon` \
-		`use_enable nls` \
-		`use_enable ldap` \
-		`use_with caps capabilities` \
-		`use_enable threads` \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable nls) \
+		$(use_enable ldap) \
+		$(use_with caps capabilities) \
+		$(use_enable threads) \
 		${myconf} \
 		|| die
 	emake || die
@@ -93,8 +93,7 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-
+	make DESTDIR="${D}" install || die
 	dosym gpg2 /usr/bin/gpg
 
 	# keep the documentation in /usr/share/doc/...
@@ -103,7 +102,7 @@ src_install() {
 	dodoc ChangeLog INSTALL NEWS README THANKS TODO VERSION
 
 	if ! use caps ; then
-		fperms u+s /usr/bin/gpg2
+		fperms u+s,go-r /usr/bin/gpg2
 	fi
 }