Reference to GnuPG Gentoo user guide added to all ebuilds as per bug #77314 Added idea capabilities to gnupg-1.9.14. Added suid gnupg to gnupg-1.4.0. Fixed __PIC__ definations in 1.9.*

Package-Manager: portage-2.0.51-r12

8 files changed, 104 insertions, 24 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 8f5dc4d91a8e..634faaf2c1fb 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.96 2005/01/06 10:55:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.97 2005/01/15 01:08:45 dragonheart Exp $
+
+  15 Jan 2005; Daniel Black <dragonheart@gentoo.org> gnupg-1.2.4.ebuild,
+  gnupg-1.2.6.ebuild, gnupg-1.4.0-r1.ebuild, gnupg-1.9.10.ebuild,
+  gnupg-1.9.14.ebuild:
+  Reference to GnuPG Gentoo user guide added to all ebuilds as per bug #77314 by
+  Chris Rebert <krebert@mindspring.com>. Added idea capabilities to
+  gnupg-1.9.14. Added suid gnupg to gnupg-1.4.0. Fixed __PIC__ definations in
+  1.9.10 and 1.9.14.
 
 *gnupg-1.9.14 (06 Jan 2005)
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index fc5955004407..24be9029f129 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5d8031beefc34bb4e9f4f3139418cb8d ChangeLog 14730
-MD5 df5722ac1ebeb8d7b2f741b56fbed9d6 gnupg-1.9.10.ebuild 2854
-MD5 edc18da65abb2c4ea780b6f4820c9b1b gnupg-1.2.4.ebuild 4251
-MD5 1372720780db9734bcd08aecd93ae14d gnupg-1.4.0-r1.ebuild 3300
+MD5 80c1cf33c058c58ac5ad63030f7b0c30 ChangeLog 15142
+MD5 da7b7db2bc7da1da7b2fd7f513f314ec gnupg-1.9.14.ebuild 4010
+MD5 60abe012deb7ef3299727bdf308700e3 gnupg-1.2.4.ebuild 4349
+MD5 31e47fabf70190e99e427f9861707069 gnupg-1.2.6.ebuild 3780
 MD5 f060c73f6f74e7174b1f7d7c570421fe metadata.xml 572
-MD5 d4f5b9c4a281906444ecf57321fa16f8 gnupg-1.2.6.ebuild 3677
-MD5 c711b8662c10596ef5ecc3cb1f4d2fb0 gnupg-1.9.14.ebuild 2853
-MD5 a614d4d6eb27b31d9b4651c349b31c3e files/digest-gnupg-1.9.14 65
-MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
-MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
+MD5 565496fbc556b3007d61f9e42d069cb6 gnupg-1.4.0-r1.ebuild 4467
+MD5 e698420245e3ee4535db946dfd41cfcd gnupg-1.9.10.ebuild 2985
+MD5 e23491eb03cb2bea5a2011f12c84b4ef files/digest-gnupg-1.9.14 117
+MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
 MD5 a8d4b32b219641e9b9df83b581a935ba files/digest-gnupg-1.4.0-r1 117
+MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
+MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
+MD5 8c88d9fdef69bdda173170c5a8abd59e files/digest-gnupg-1.9.10 65
 MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
 MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
-MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
-MD5 8c88d9fdef69bdda173170c5a8abd59e files/digest-gnupg-1.9.10 65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB3RkyArHZZzCEUG0RAp9OAJ9JEBVu9wruDiDRaABjN1lPTl5XnQCeP6FL
-Nd0yba3vUkLOV2kDom0xk2U=
-=EghH
+iD8DBQFB6G0lmdTrptrqvGERAlosAJ9N9kd332KftbpoTgmWwNnHJzSFpgCglzIJ
+Z+y7cuIPo8FL+EtmOdOGqxA=
+=BUZ/
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.14 b/app-crypt/gnupg/files/digest-gnupg-1.9.14
index 63c90efe8d60..57be0edc52d4 100644
--- a/app-crypt/gnupg/files/digest-gnupg-1.9.14
+++ b/app-crypt/gnupg/files/digest-gnupg-1.9.14
@@ -1 +1,2 @@
 MD5 72b56586392c7be6668df4ef8ea7c879 gnupg-1.9.14.tar.gz 1925582
+MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
diff --git a/app-crypt/gnupg/gnupg-1.2.4.ebuild b/app-crypt/gnupg/gnupg-1.2.4.ebuild
index d8aceb461e83..016f650c6a3f 100644
--- a/app-crypt/gnupg/gnupg-1.2.4.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.4.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.2.4.ebuild,v 1.26 2004/12/31 14:50:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.27 2005/01/15 01:08:45 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -145,4 +145,7 @@ pkg_postinst() {
 		einfo
 		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
 	fi
+	einfo
+	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+	einfo
 }
diff --git a/app-crypt/gnupg/gnupg-1.2.6.ebuild b/app-crypt/gnupg/gnupg-1.2.6.ebuild
index 0edcbbdcb3d5..7ca91ac222f3 100644
--- a/app-crypt/gnupg/gnupg-1.2.6.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.6.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.2.6.ebuild,v 1.21 2005/01/02 23:56:01 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.22 2005/01/15 01:08:46 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -125,4 +125,7 @@ pkg_postinst() {
 		einfo "Countries where the patent applies are listed here"
 		einfo "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
 	fi
+	einfo
+	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+	einfo
 }
diff --git a/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild
index e30eb0bb4944..a97003f4dfdd 100644
--- a/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.0-r1.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.4.0-r1.ebuild,v 1.2 2005/01/06 10:44:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild,v 1.3 2005/01/15 01:08:46 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -107,6 +107,10 @@ src_compile() {
 		--enable-sha512 \
 		${myconf} || die
 	emake || die
+
+	if ! use caps ; then
+		fperms u+s /usr/bin/gpg
+	fi
 }
 
 src_install() {
@@ -124,3 +128,30 @@ src_install() {
 	dohtml doc/faq.html
 }
 
+pkg_postinst() {
+	if ! use caps; then
+		einfo "gpg is installed suid root to make use of protected memory space"
+		einfo "This is needed in order to have a secure place to store your"
+		einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
+	fi
+	echo
+	if use idea; then
+		einfo "you have compiled ${PN} with support for the IDEA algorithm, this code"
+		einfo "is distributed under the GPL in countries where it is permitted to do so"
+		einfo "by law."
+		einfo
+		einfo "Please read http://www.gnupg.org/why-not-idea.html for more information."
+		einfo
+		einfo "If you are in a country where the IDEA algorithm is patented, you are permitted"
+		einfo "to use it at no cost for 'non revenue generating data transfer between private"
+		einfo "individuals'."
+		einfo
+		einfo "Countries where the patent applies are listed here"
+		einfo "http://www.mediacrypt.com/engl/Content/patent_info.htm"
+		einfo
+		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
+	fi
+	einfo
+	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+	einfo
+}
diff --git a/app-crypt/gnupg/gnupg-1.9.10.ebuild b/app-crypt/gnupg/gnupg-1.9.10.ebuild
index 603f4b907fda..aa0d14916928 100644
--- a/app-crypt/gnupg/gnupg-1.9.10.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.10.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.10.ebuild,v 1.11 2005/01/06 10:55:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.10.ebuild,v 1.12 2005/01/15 01:08:46 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.gz"
 
-LICENSE="GPL-2 idea? ( IDEA )"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="X caps ldap nls smartcard static"
@@ -42,7 +42,7 @@ DEPEND="caps? ( sys-libs/libcap )
 
 src_compile() {
 	local myconf=""
-
+	sed -i -e 's/PIC/__PIC__/g' intl/relocatable.c
 	if use X; then
 		local viewer
 		if has_version 'media-gfx/xloadimage'; then
@@ -103,4 +103,7 @@ pkg_postinst() {
 	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
 
 	einfo "gpg-agent is now provided in app-crypt/gpg-agent"
+	einfo
+	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+	einfo
 }
diff --git a/app-crypt/gnupg/gnupg-1.9.14.ebuild b/app-crypt/gnupg/gnupg-1.9.14.ebuild
index 6775888df2ee..5a206f23d5de 100644
--- a/app-crypt/gnupg/gnupg-1.9.14.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.14.ebuild
@@ -1,17 +1,18 @@
 # 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.14.ebuild,v 1.2 2005/01/06 10:55:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.14.ebuild,v 1.3 2005/01/15 01:08:46 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.gz"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.gz
+	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )"
 
 LICENSE="GPL-2 idea? ( IDEA )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="X caps ldap nls smartcard static"
+IUSE="X caps ldap nls smartcard static idea"
 
 RDEPEND="
 	!static? (
@@ -40,6 +41,16 @@ DEPEND="caps? ( sys-libs/libcap )
 	dev-lang/perl
 	dev-libs/pth"
 
+src_unpack() {
+	unpack ${A}
+	# Please read http://www.gnupg.org/why-not-idea.html
+	if use idea; then
+		mv ${WORKDIR}/idea.c ${S}/cipher/idea.c || \
+			ewarn "failed to insert IDEA module"
+	fi
+	sed -i -e 's/PIC/__PIC__/g' ${S}/intl/relocatable.c
+}
+
 src_compile() {
 	local myconf=""
 
@@ -89,6 +100,22 @@ pkg_postinst() {
 		einfo "This is needed in order to have a secure place to store your"
 		einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
 	fi
+	if use idea; then
+		einfo "you have compiled ${PN} with support for the IDEA algorithm, this code"
+		einfo "is distributed under the GPL in countries where it is permitted to do so"
+		einfo "by law."
+		einfo
+		einfo "Please read http://www.gnupg.org/why-not-idea.html for more information."
+		einfo
+		einfo "If you are in a country where the IDEA algorithm is patented, you are permitted"
+		einfo "to use it at no cost for 'non revenue generating data transfer between private"
+		einfo "individuals'."
+		einfo
+		einfo "Countries where the patent applies are listed here"
+		einfo "http://www.mediacrypt.com/engl/Content/patent_info.htm"
+		einfo
+		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
+	fi
 	echo
 	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
 	ewarn "	THIS IS _ALPHA_ CODE, IT MAY NOT WORK CORRECTLY OR AT ALL. THERE"
@@ -103,4 +130,8 @@ pkg_postinst() {
 	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
 
 	einfo "gpg-agent is now provided in app-crypt/gpg-agent"
+
+	einfo ""
+	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+	einfo ""
 }