virtual/mta re-added for mailto support. new network code using CURL provides FTPS support. Removed the use ppc-macos && use caps hackery, since ppc-macos has caps in use.mask and this case will never happen. Re-enabled photo-viewers as xli is available again, everywhere except arm. Spelling errors fixed. The ECC patch for 1.4.0 applies perfectly still, only the version number in configure needs tweaking. Add a proper src_test that works, fixing bug #80044. This release also fixes mail signatures as per bug #76440. This release solves security bug #85547.

Package-Manager: portage-2.0.51.19

3 files changed, 202 insertions, 2 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index ee8e464e3e40..1e78f72a05d0 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -3,8 +3,8 @@ 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 84cf85e579f860997c9830a66eec8dd7 gnupg-1.4.0-r2.ebuild 5180
-MD5 20003089681c430257e7190789e46de1 gnupg-1.4.1.ebuild 5187
-MD5 8237d1997979fb10e74fe7ef4138e811 ChangeLog 16250
+MD5 3be5fea260a60fc87d8382d1aa29ac15 gnupg-1.4.1.ebuild 6072
+MD5 7584d86422d9756073644605f474276a ChangeLog 16932
 MD5 f060c73f6f74e7174b1f7d7c570421fe metadata.xml 572
 MD5 64182f539542ec33e240ccaae7bfd21f gnupg-1.4.0-r1.ebuild 4512
 MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.1 b/app-crypt/gnupg/files/digest-gnupg-1.4.1
new file mode 100644
index 000000000000..fa28828dd944
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.4.1
@@ -0,0 +1,3 @@
+MD5 fdfc5553d0904cd65011e47a42a9532c gnupg-1.4.1.tar.bz2 2822791
+MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
+MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
diff --git a/app-crypt/gnupg/gnupg-1.4.1.ebuild b/app-crypt/gnupg/gnupg-1.4.1.ebuild
new file mode 100644
index 000000000000..1602f35ef637
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.1.ebuild
@@ -0,0 +1,197 @@
+# 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.1.ebuild,v 1.1 2005/03/16 22:31:34 robbat2 Exp $
+
+inherit eutils flag-o-matic
+
+ECCVER=0.1.6
+ECCVER_GNUPG=1.4.0
+
+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 )
+	ecc? ( http://alumnes.eps.udl.es/%7Ed4372211/src/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc-macos ~s390 ~sparc ~x86 ~ia64 ~mips ~ppc64"
+IUSE="bzip2 caps curl ecc idea ldap nls readline selinux smartcard zlib X"
+
+#static not working yet
+#!static? (
+#			ldap? ( net-nds/openldap )
+#			bzip2? ( app-arch/bzip2 )
+#			zlib? ( sys-libs/zlib )
+#		)
+
+RDEPEND="
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	nls? ( sys-devel/gettext )
+	curl? ( net-misc/curl )
+	virtual/libc
+	virtual/mta
+	readline? ( sys-libs/readline )
+	smartcard? ( dev-libs/libusb )
+	selinux? ( sec-policy/selinux-gnupg )"
+# waiting on arm arch - bug #76234
+RDEPEND="${RDEPEND}
+	!arm? ( X? ( media-gfx/xloadimage media-gfx/xli ) )"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+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
+
+	if use ecc; then
+		# this trickery is because the only reject in the 1.4.0 patch is the
+		# version number!
+		local eccpatch=${WORKDIR}/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
+		if [ "${ECCVER_GNUPG}" != "${PV}" ]; then
+			einfo "Tweaking PV in ECC patch"
+			sed -i "s/ VERSION='${ECCVER_GNUPG}/ VERSION='${PV}/g" $eccpatch
+		fi
+		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch || die "ecc patch failed"
+	fi
+
+	# Fix PIC definitions
+	cd ${S}
+	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
+	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
+}
+
+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
+
+	# `USE=static` support was requested in #29299
+	# use static && append-ldflags -static
+
+	# Still needed?
+	# Bug #6387, --enable-m-guard causes bus error on sparcs
+	use sparc || myconf="${myconf} --enable-m-guard"
+
+	use ppc-macos || append-ldflags -Wl,-z,now
+
+	# configure doesn't trean --disable-asm correctly
+	use x86 && myconf="${myconf} --enable-asm"
+
+	# waiting on arm bug #76234
+	use arm || myconf="${myconf} `use_enable X photo-viewers`"
+
+	econf \
+		`use_enable ldap` \
+		--enable-mailto \
+		--enable-hkp \
+		--enable-finger \
+		`use_with !zlib included-zlib` \
+		`use_with curl libcurl /usr` \
+		`use_enable nls` \
+		`use_enable bzip2` \
+		`use_enable smartcard card-support` \
+		`use_enable selinux selinux-support` \
+		`use_with caps capabilities` \
+		`use_with readline` \
+		--enable-static-rnd=linux \
+		--libexecdir=/usr/libexec \
+		--enable-sha512 \
+		${myconf} || die
+	# this is because it will run some tests directly
+	gnupg_fixcheckperms
+	emake || die
+
+	# NOTE libexecdir dir is deliberately different from that in the install
+}
+
+src_install() {
+	gnupg_fixcheckperms
+	emake DESTDIR=${D} libexecdir="/usr/libexec/gnupg" install || die
+
+	# caps support makes life easier
+	use caps || fperms u+s /usr/bin/gpg
+
+	# 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}
+
+	docinto sgml
+	dodoc doc/*.sgml
+
+	dohtml doc/faq.html
+}
+
+gnupg_fixcheckperms() {
+	# GnuPG does weird things for testing that it build correctly
+	# as we as for the additional tests. It WILL fail with perms 770 :-(.
+	# See bug #80044
+	if has userpriv ${FEATURES}; then
+		einfo "Fixing permissions in check directory"
+		chown -R portage:portage ${S}/checks
+		chmod -R ugo+rw ${S}/checks
+		chmod ugo+rw ${S}/checks
+	fi
+}
+
+src_test() {
+	gnupg_fixcheckperms
+	einfo "Running tests"
+	emake check
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		die "Some tests failed! Please report to the Gentoo Bugzilla"
+	fi
+}
+
+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 "-----------------------------------------------------------------------------------"
+		einfo "IDEA"
+		ewarn "you have compiled ${PN} with support for the IDEA algorithm, this code"
+		ewarn "is distributed under the GPL in countries where it is permitted to do so"
+		ewarn "by law."
+		einfo
+		einfo "Please read http://www.gnupg.org/why-not-idea.html for more information."
+		einfo
+		ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted"
+		ewarn "to use it at no cost for 'non revenue generating data transfer between private"
+		ewarn "individuals'."
+		einfo
+		einfo "Countries where the patent applies are listed here"
+		einfo "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
+		einfo
+		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
+		einfo "-----------------------------------------------------------------------------------"
+	fi
+	if use ecc; then
+		einfo
+		ewarn "The elliptical curves patch is experimental"
+		einfo "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
+	fi
+	if use caps; then
+		einfo
+		ewarn "Capabilities code is experimental"
+	fi
+	einfo
+	einfo "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+	einfo
+}