smartcard fix with bug #95938 and bug #67656. Version bump as per bug #97710.

(Portage version: 2.0.51.22-r2)

4 files changed, 129 insertions, 11 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index e833958675b7..6bead3984988 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.124 2005/08/06 00:03:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.125 2005/08/06 03:50:07 dragonheart Exp $
+
+*gnupg-1.9.18 (06 Aug 2005)
+
+  06 Aug 2005; Daniel Black <dragonheart@gentoo.org> +gnupg-1.9.18.ebuild:
+  smartcard fix with bug #95938 and bug #67656. Version bump as per bug
+  #97710. Thanks to Felix Kurth, Stian Skjelstad, Rouslan Solomakhin, Michael
+  Helmling, Chris White, Benjamin Smee, David Somers and whoever else I
+  missed.
 
 *gnupg-1.4.2-r1 (05 Aug 2005)
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 805b3ef64d8e..22b29b669330 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 25a999808b1e5bec4eeae25e06382c34 gnupg-1.9.18.ebuild 3204
 MD5 d6077cd65580b4fe18e938407ab0c706 ChangeLog 20333
 MD5 b47d1016e516b746f7bc12f92ef133e8 gnupg-1.4.2-r1.ebuild 6262
 MD5 921f00a83ce6b1d77190396b4456f05f gnupg-1.2.6.ebuild 3800
@@ -8,6 +6,7 @@ MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 MD5 cfe5a67b1204af18a6b03edbdbaa5363 gnupg-1.4.1.ebuild 6292
 MD5 65762289b0895c03fa47da7283a216a6 gnupg-1.9.15-r1.ebuild 3050
 MD5 25cc01bef564eb349af85dbb81aa06dc gnupg-1.4.1-r1.ebuild 6365
+MD5 7247c8f0379977f0a3dd13568bf283c7 files/digest-gnupg-1.9.18 66
 MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
 MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2-r1 190
 MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
@@ -16,10 +15,3 @@ MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15-r1 66
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
 MD5 494103ac08d870d8a9c1ed0b83c4ae35 files/gnupg-1.4.1-selftest.patch 1180
 MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC8/5WmdTrptrqvGERAlBLAJ9rTjeCQ63tGYcCCXFymKIZt4+3VgCcD4AZ
-4P2GO+nRudNEja1ZFQSpTFY=
-=38CP
------END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.9.18 b/app-crypt/gnupg/files/digest-gnupg-1.9.18
new file mode 100644
index 000000000000..75225acad957
--- /dev/null
+++ b/app-crypt/gnupg/files/digest-gnupg-1.9.18
@@ -0,0 +1 @@
+MD5 221d843dc23b4f33cdb8a91788a00e4d gnupg-1.9.18.tar.bz2 1754957
diff --git a/app-crypt/gnupg/gnupg-1.9.18.ebuild b/app-crypt/gnupg/gnupg-1.9.18.ebuild
new file mode 100644
index 000000000000..0cc28e40d2c0
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.9.18.ebuild
@@ -0,0 +1,117 @@
+# 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.18.ebuild,v 1.1 2005/08/06 03:50:07 dragonheart Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/alpha/gnupg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="X caps ldap nls smartcard selinux"
+
+DEPEND="
+	nls? ( sys-devel/gettext )
+	dev-lang/perl
+	sys-libs/zlib
+	virtual/libc
+	>=dev-libs/pth-1.3.7
+	smartcard? ( >=dev-libs/opensc-0.8.0 )
+	>=dev-libs/libgcrypt-1.1.94
+	>=dev-libs/libksba-0.9.12
+	>=dev-libs/libgpg-error-1.0
+	=dev-libs/libassuan-0.6.10
+	ldap? ( net-nds/openldap )
+	caps? ( sys-libs/libcap )"
+
+RDEPEND="
+	X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
+	virtual/mta
+	selinux? ( sec-policy/selinux-gnupg )"
+
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use smartcard && ! built_with_use opensc pcsc-lite ; then
+		sed -i -e 's:OPENSC_LIBS="\$OPENSC_LIBS -lpcsclite -lpthread":OPENSC_LIBS="\$OPENSC_LIBS -lopenct -lpthread":' \
+		acinclude.m4 || die "openct patching failed."
+		./autogen.sh
+	fi
+	sed -i -e 's/PIC/__PIC__/g' intl/relocatable.c || die "PIC patching failed"
+}
+
+src_compile() {
+	local myconf=""
+
+	if use X; then
+		local viewer
+		if has_version 'media-gfx/xloadimage'; then
+			viewer=/usr/bin/xloadimage
+		else
+			viewer=/usr/bin/xli
+		fi
+		myconf="${myconf} --with-photo-viewer=${viewer}"
+	else
+		myconf="${myconf} --disable-photo-viewers"
+	fi
+
+	use ppc-macos || append-ldflags -Wl,-z,now
+
+	econf \
+		--disable-agent \
+		--enable-symcryptrun \
+		--enable-gpg \
+		$(use_enable smartcard scdaemon) \
+		$(use_enable nls) \
+		$(use_enable ldap) \
+		$(use_with caps capabilities) \
+		${myconf} \
+		|| die
+	emake || die
+}
+
+src_test() {
+	einfo "self tests can't work since it depends on gpg-agent"
+	einfo "Gentoo has put this in its own package (app-crypt/gpg-agent"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog INSTALL NEWS README THANKS TODO VERSION
+
+	if ! use caps ; then
+		fperms u+s,go-r /usr/bin/gpg2
+	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
+	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
+	ewarn "	THIS IS _ALPHA_ CODE, IT MAY NOT WORK CORRECTLY OR AT ALL. THERE"
+	ewarn "	MAY BE UNDISCOVERED SECURITY OR DATA-LOSS ISSUES, DO NOT USE"
+	ewarn "	IN A PRODUCTION ENVIRONMENT."
+	ewarn
+	ewarn "	This ebuild is provided for those who wish to experiment with this"
+	ewarn "	new branch of gnupg and beta-testers, not for general purpose use"
+	ewarn "	by non-developers"
+	ewarn
+	ewarn "	Please see #37109"
+	ewarn "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **"
+
+	einfo
+	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
+}