fixing #58865

4 files changed, 150 insertions, 5 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 936942918b2f..211a75e7c1fb 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.68 2004/07/31 02:12:30 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.69 2004/07/31 17:00:22 taviso Exp $
+
+*gnupg-1.2.5 (31 Jul 2004)
+
+  31 Jul 2004; Tavis Ormandy <taviso@gentoo.org> +gnupg-1.2.5.ebuild:
+  fixing #58865
 
   31 Jul 2004; Tom Gall <tgall@gentoo.org> gnupg-1.2.4.ebuild:
   stable on ppc64,bug #57114
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 31cc47d89289..1a2649c71f80 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,16 +1,18 @@
-MD5 0bef7aabab032dfd5a8871d6c89ec600 ChangeLog 10056
-MD5 e67585ea4e6025b1918462ba737c8e2a gnupg-1.2.3-r2.ebuild 1659
 MD5 ff47ed97d51df4d1b7030dc173048956 gnupg-1.2.3-r5.ebuild 3628
 MD5 5cf952300c6e6d393425894853e1b766 gnupg-1.2.4.ebuild 4173
-MD5 df041bf7bc487bd26079fc500e65925a gnupg-1.9.0.ebuild 2730
+MD5 e67585ea4e6025b1918462ba737c8e2a gnupg-1.2.3-r2.ebuild 1659
 MD5 eb6cc5be23c0c4842e94538a7d6daf2b gnupg-1.9.8.ebuild 2745
+MD5 df041bf7bc487bd26079fc500e65925a gnupg-1.9.0.ebuild 2730
+MD5 7bd5b5288df68f0902ab378427600271 gnupg-1.2.5.ebuild 3938
+MD5 a166a70598f4ca45b28f6027fb2e054b ChangeLog 10172
 MD5 ad53378ee0bb633bb019209272913196 metadata.xml 484
 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r2 65
 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r5 65
 MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
+MD5 f9d1684c9a72a84146163170439892b1 files/digest-gnupg-1.2.5 117
 MD5 df557d150f1c32564de9c0f66b47997a files/digest-gnupg-1.9.0 116
 MD5 b19d6b7e508333e5b1fd007ae4334ec2 files/digest-gnupg-1.9.8 64
-MD5 b12193638991111d4dc2c9864fa8e15a files/gnupg-1.2.3-disable-elgamal.diff 12554
 MD5 db3c4c4fe234f87d269216f6e0be8817 files/gnupg-1.2.3-hkp-format-string.diff 922
 MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
+MD5 b12193638991111d4dc2c9864fa8e15a files/gnupg-1.2.3-disable-elgamal.diff 12554
 MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.2.5 b/app-crypt/gnupg/files/digest-gnupg-1.2.5
new file mode 100644
index 000000000000..a1bf44f4e3cc
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.2.5
@@ -0,0 +1,2 @@
+MD5 e4991e46fde52b216410ef0f485b4217 gnupg-1.2.5.tar.bz2 2488670
+MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
diff --git a/app-crypt/gnupg/gnupg-1.2.5.ebuild b/app-crypt/gnupg/gnupg-1.2.5.ebuild
new file mode 100644
index 000000000000..f54cffaf25d1
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.2.5.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.5.ebuild,v 1.1 2004/07/31 17:00:22 taviso 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/gnupg/${P}.tar.bz2
+	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )"
+
+LICENSE="GPL-2 | IDEA GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="X ldap nls static idea"
+
+RDEPEND="!static? ( ldap? ( net-nds/openldap )
+		app-arch/bzip2
+		sys-libs/zlib )
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+	nls? ( sys-devel/gettext )
+	dev-lang/perl
+	virtual/libc"
+# XXX: libpcap earlier than 1.10-r3 did not provide libcap.a
+#	DEPEND="caps? ( static? ( >=sys-libs/libcap-1.10-r3 )
+#				!static? ( sys-libs/libcap ) )
+DEPEND="ldap? ( net-nds/openldap )
+	nls? ( sys-devel/gettext )
+	!static? ( sys-libs/zlib )
+	app-arch/bzip2
+	dev-lang/perl
+	virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	if use hppa
+	then
+		cd ${S}
+		epatch ${FILESDIR}/gnupg-1.2.4-hppa_unaligned_constant.patch
+	fi
+
+	# 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
+
+	use ppc64 && epatch ${FILESDIR}/gnupg-1.2.4.ppc64.patch
+}
+
+src_compile() {
+	# Certain sparc32 machines seem to have trouble building correctly with 
+	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
+	# fix until the gcc problem can be tracked down.
+	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
+		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
+	fi
+
+	# support for external HKP keyservers requested in #16457.
+	local myconf="--enable-external-hkp --enable-static-rnd=linux --libexecdir=/usr/lib --enable-sha512"
+
+	if ! use nls; then
+		myconf="${myconf} --disable-nls"
+	fi
+
+	if use ldap; then
+		myconf="${myconf} --enable-ldap"
+	else
+		myconf="${myconf} --disable-ldap"
+	fi
+
+	if use X; then
+		myconf="${myconf} --enable-photo-viewers"
+	else
+		myconf="${myconf} --disable-photo-viewers"
+	fi
+
+	# `USE=static` support was requested in #29299
+	if use static; then
+		myconf="${myconf} --with-included-zlib"
+		append-ldflags -static
+	else
+		myconf="${myconf} --without-included-zlib"
+	fi
+
+	# Still needed?
+	# Bug #6387, --enable-m-guard causes bus error on sparcs
+	if ! use sparc; then
+		myconf="${myconf} --enable-m-guard"
+	fi
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	einstall libexecdir="${D}/usr/lib/gnupg"
+
+	# keep the documentation in /usr/share/doc/...
+	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+
+	use idea && dodoc ${S}/cipher/idea.c
+
+	docinto sgml
+	dodoc doc/*.sgml
+
+	dohtml doc/faq.html
+
+	chmod u+s "${D}/usr/bin/gpg"
+}
+
+pkg_postinst() {
+	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."
+	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
+}