1.4.2.2 version bump for bug 125217.

(Portage version: 2.0.54)

5 files changed, 284 insertions, 1 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index a3596ed8eaa9..b31ed5d7e45d 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.166 2006/03/05 14:10:23 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.167 2006/03/08 18:25:26 vanquirius Exp $
+
+*gnupg-1.4.2.2 (08 Mar 2006)
+
+  08 Mar 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/gnupg-1.4.2.2-badruman.patch, +files/gnupg-1.4.2.2-selftest.patch,
+  +gnupg-1.4.2.2.ebuild:
+  1.4.2.2 version bump for bug 125217.
 
 *gnupg-1.9.20-r1 (05 Mar 2006)
 
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.2.2 b/app-crypt/gnupg/files/digest-gnupg-1.4.2.2
new file mode 100644
index 000000000000..c04d7b90ed84
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.4.2.2
@@ -0,0 +1,3 @@
+MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
+MD5 c34736eb7cb687f9e5b6d4df48aaf7c8 gnupg-1.4.2.2.tar.bz2 3034652
+MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/gnupg-1.4.2.2-badruman.patch b/app-crypt/gnupg/files/gnupg-1.4.2.2-badruman.patch
new file mode 100644
index 000000000000..4584cd15f0d1
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-1.4.2.2-badruman.patch
@@ -0,0 +1,12 @@
+diff --exclude='*~' -Naur gnupg-1.4.2.2.orig/doc/Makefile.in gnupg-1.4.2.2/doc/Makefile.in
+--- gnupg-1.4.2.2.orig/doc/Makefile.in	2006-03-08 15:20:05.000000000 -0300
++++ gnupg-1.4.2.2/doc/Makefile.in	2006-03-08 15:20:39.000000000 -0300
+@@ -280,7 +280,7 @@
+              HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 \
+              TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt
+ 
+-man_MANS = gpg.1 gpgv.1 gnupg.7 gpg.ru.1
++man_MANS = gpg.1 gpgv.1 gnupg.7
+ info_TEXINFOS = gpg.texi gpgv.texi
+ 
+ # Need this to avoid building of dvis with automake 1.4
diff --git a/app-crypt/gnupg/files/gnupg-1.4.2.2-selftest.patch b/app-crypt/gnupg/files/gnupg-1.4.2.2-selftest.patch
new file mode 100644
index 000000000000..87f4e887ad8e
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-1.4.2.2-selftest.patch
@@ -0,0 +1,30 @@
+diff --exclude='*~' -Naur gnupg-1.4.2.2.orig/checks/Makefile.in gnupg-1.4.2.2/checks/Makefile.in
+--- gnupg-1.4.2.2.orig/checks/Makefile.in	2006-03-08 15:14:42.000000000 -0300
++++ gnupg-1.4.2.2/checks/Makefile.in	2006-03-08 15:16:53.000000000 -0300
+@@ -517,9 +517,11 @@
+ 
+ ./gpg_dearmor:
+ 	echo '#!/bin/sh' >./gpg_dearmor
+-	echo "../g10/gpg --no-options --no-greeting \
++	echo "../g10/gpg --no-options --no-greeting --homedir . \
+              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
+ 	chmod 755 ./gpg_dearmor
++	if test ! -f ./pubring.gpg; then touch -t 197001020000 ./pubring.gpg; fi
++	if test ! -f ./secring.gpg; then touch -t 197001020000 ./secring.gpg; fi
+ 
+ ./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc ./gpg_dearmor
+ 	./gpg_dearmor > ./pubring.gpg < $(srcdir)/pubring.asc
+diff --exclude='*~' -Naur gnupg-1.4.2.2.orig/g10/openfile.c gnupg-1.4.2.2/g10/openfile.c
+--- gnupg-1.4.2.2.orig/g10/openfile.c	2006-03-08 15:14:42.000000000 -0300
++++ gnupg-1.4.2.2/g10/openfile.c	2006-03-08 15:17:31.000000000 -0300
+@@ -399,8 +399,10 @@
+      * To cope with HOME, we do compare only the suffix if we see that
+      * the default homedir does start with a tilde.
+      */
++#ifndef ENABLE_SELINUX_HACKS
+     if( opt.dry_run || opt.no_homedir_creation )
+ 	return;
++#endif
+ 
+     if ( ( *defhome == '~'
+            && ( strlen(fname) >= strlen (defhome+1)
diff --git a/app-crypt/gnupg/gnupg-1.4.2.2.ebuild b/app-crypt/gnupg/gnupg-1.4.2.2.ebuild
new file mode 100644
index 000000000000..4d817117f184
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.2.2.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2.2.ebuild,v 1.1 2006/03/08 18:25:26 vanquirius Exp $
+
+inherit eutils flag-o-matic linux-info
+
+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="mirror://gnupg/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 ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bzip2 caps curl ecc idea ldap nls readline selinux smartcard static usb zlib X"
+
+COMMON_DEPEND="
+	caps? ( sys-libs/libcap )
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	curl? ( net-misc/curl )
+	virtual/libc
+	virtual/mta
+	readline? ( sys-libs/readline )
+	smartcard? ( dev-libs/libusb )
+	usb? ( dev-libs/libusb )"
+
+RDEPEND="!static? (
+		${COMMON_DEPEND}
+		X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+	)
+	selinux? ( sec-policy/selinux-gnupg )
+	nls? ( virtual/libintl )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# fix bug #113474 - no compiled kernel needed now
+	if use kernel_linux; then
+	    get_running_version
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Jari's patch to boost iterated key setup by factor of 128
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.2-jari.patch
+
+	if use idea; then
+		ewarn "Please read http://www.gnupg.org/why-not-idea.html"
+		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
+	fi
+
+	# maketest fix
+	epatch "${FILESDIR}"/${PN}-1.4.2.2-selftest.patch
+
+	# install RU man page in right location
+	epatch "${FILESDIR}"/${PN}-1.4.2.2-badruman.patch
+
+	cd "${S}"
+	# keyserver fix
+	epatch "${FILESDIR}"/${PN}-1.4.2-keyserver.patch
+
+	epatch "${FILESDIR}"/${PN}-1.4.2-mpicoder.patch
+
+	# Fix PIC definitions
+	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"
+
+	append-ldflags $(bindnow-flags)
+
+	# configure doesn't trean --disable-asm correctly
+	use x86 && myconf="${myconf} --enable-asm"
+
+	# fix compile problem on ppc64
+	use ppc64 && myconf="${myconf} --disable-asm"
+
+	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) \
+		$(use_with usb libusb /usr) \
+		$(use_enable static) \
+		$(use_enable X photo-viewers) \
+		--enable-static-rnd=linux \
+		--libexecdir=/usr/libexec \
+		--enable-sha512 \
+		--enable-noexecstack \
+		${myconf} || die
+	# this is because it will run some tests directly
+	gnupg_fixcheckperms
+	emake || die
+}
+
+src_install() {
+	gnupg_fixcheckperms
+	make DESTDIR="${D}" install || die
+
+	# keep the documentation in /usr/share/doc/...
+	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
+
+	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+
+	docinto sgml
+	dodoc doc/*.sgml
+
+	dohtml doc/faq.html
+
+	# install RU documentation in right location
+	if use linguas_ru
+	then
+		cp doc/gpg.ru.1 ${T}/gpg.1
+		doman -i18n=ru ${T}/gpg.1
+	fi
+
+	# Remove collissions
+	if use ppc-macos; then
+		rm ${D}/usr/lib/charset.alias ${D}/usr/share/locale/locale.alias
+	fi
+}
+
+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 kernel_linux || (! use caps && kernel_is lt 2 6 9); then
+		chmod u+s,go-r ${ROOT}/usr/bin/gpg
+		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."
+	else
+		chmod u-s,go-r ${ROOT}/usr/bin/gpg
+	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
+}