Bug #339005: SHA2 support. Bug #285289: CONFIG_PROTECT for /usr/share/gnupg/qualified.txt. Bug #301941: USE=openct/pcsc-lite without USE=smartcard is useless. Bug #219423: USE=smartcard/openct/pcsc-lite and USE=static are not permitted together.

Package-Manager: portage-2.2_rc98/cvs/Linux x86_64

4 files changed, 189 insertions, 2 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index f9bf34e55293..51fa75cb80c6 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.392 2010/10/19 00:49:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.393 2010/10/19 01:42:08 robbat2 Exp $
+
+*gnupg-2.0.16-r2 (19 Oct 2010)
+
+  19 Oct 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +gnupg-2.0.16-r2.ebuild, +files/gnupg-2.0.16-opengpgv2-sha2.patch:
+  Bug #339005: SHA2 support. Bug #285289: CONFIG_PROTECT for
+  /usr/share/gnupg/qualified.txt. Bug #301941: USE=openct/pcsc-lite without
+  USE=smartcard is useless. Bug #219423: USE=smartcard/openct/pcsc-lite and
+  USE=static are not permitted together.
 
 *gnupg-1.4.11 (19 Oct 2010)
 
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 1cfed2e592f5..bf8d2effff09 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,4 +1,5 @@
 AUX gnupg-2.0.12-adns.patch 818 RMD160 5d1b0a267cfd290c0e3b68c58f2fe5a5286c52c2 SHA1 fe3f7a1468a70768f36ef7e8f20b6d8fb8406366 SHA256 cb7b9dcf8019db1afc5aeee0a16659f53c7b41660278c8ecc056f874c22ceea6
+AUX gnupg-2.0.16-opengpgv2-sha2.patch 1279 RMD160 10477e39c734df91d82e5f9d97039c9b9f8ceab5 SHA1 638d9c7cb3cae325db56f9a51f82d22069cbfe01 SHA256 c8cb42219bdc2e2fee790b48112868f5556e10e54a74d656ff9a05bfc5e07f2f
 AUX gnupg-realloc-X.509.patch 295 RMD160 2428ed04b6f4ee1d8fc5f5ee9fa58ed820aea9f0 SHA1 aa096528a4ffaf5c50a154a6c793feee901a5e46 SHA256 9c6d7f905662e655a5a7cb04381b4deeaaee714f2d00c736a670b1b2dba3c114
 DIST gnupg-1.4.10.tar.bz2 3410814 RMD160 d54063eaa5b25dc3c3f4ad924411ec69c25c1e62 SHA1 fd1b6a5f3b2dd836b598a1123ac257b8f105615d SHA256 a2907f4432d67894e425e48ae85785dd60ecb01658c9682bcd96f5e91043bb38
 DIST gnupg-1.4.11.tar.bz2 3407075 RMD160 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378 SHA1 78e22f5cca88514ee71034aafff539c33f3c6676 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
@@ -18,6 +19,7 @@ EBUILD gnupg-2.0.13.ebuild 3188 RMD160 9870213d08a85e548d3c51940e98caf243f3ad4c
 EBUILD gnupg-2.0.14.ebuild 3274 RMD160 cfb59ca50fafe7ab0c2d3d9e2452a23ca3a3b5e1 SHA1 19b663620fa8f20e5bfa11ce55b1d0281a25abe5 SHA256 e13246d0ffbe5d3dec8666f8a4b858172a6935d177dbdd4baefd395ed658b409
 EBUILD gnupg-2.0.15.ebuild 3397 RMD160 f7033731621c64be43443e100f0a2d1d0099d60b SHA1 1c08ff76d9117218e90af8f504aaee27e16e00e5 SHA256 e59f83bee25b6a6f82f5a2f101a6dc9c3072487f0d879fb4f3a1ea93875a63b8
 EBUILD gnupg-2.0.16-r1.ebuild 3495 RMD160 a9ba552f10b1728440e361d2f00e56f95c663c90 SHA1 f4e22310ee4dd607eb220aa74cfcfd22363902a1 SHA256 71ffb3b17afacd1c13aaedb3621f0f9696be680ee8cb118536d0c4f50bacac8c
+EBUILD gnupg-2.0.16-r2.ebuild 4380 RMD160 b0b3a5ab31b8249c77ad3182f3b6860fac66333f SHA1 e612f3836a5d3cc32604affed0a75ecacd489fdf SHA256 72626deec78c0d3faab05980175965f9caf6b2b4cc1910b50fd3c15907c2552b
 EBUILD gnupg-2.0.16.ebuild 3409 RMD160 aca83b8bfe52da4f6cdb89b77d7480b56540988b SHA1 40ada55022909a978585405bf2361e024ad62576 SHA256 51c27ff74626aef25a572b0afb1a520775db95189419a1cef1ac0a2a11e29c7d
-MISC ChangeLog 59224 RMD160 2d0e2a199492c7fc3f8a89b71d7a64e5cfee1a4a SHA1 2ab01f13b4a0a378cc0ff6cca221054478765c8a SHA256 41c7205a9203d7d2d8c2144a830768bb6ad3f3cc47afd4b40c47f705fb2989fa
+MISC ChangeLog 59633 RMD160 bd8022776cd35d9a8da579d9ddf2986e4b760748 SHA1 8f9d89329ccc672964b6d515294fef0ec53b3543 SHA256 bdce145827c26912e821a8e717091f50f5e0c411300ae3eff6aeb3ef20b93c0c
 MISC metadata.xml 698 RMD160 8c3577ffbf64da24c47d181ef24f8f7e9e09a224 SHA1 92579ce4870e7bbee4bf596bb466b3f9ce587157 SHA256 8f18f677d1d437d3033b367e8a7514b745a762d518af7a3afdc44e1ddbf2b31e
diff --git a/app-crypt/gnupg/files/gnupg-2.0.16-opengpgv2-sha2.patch b/app-crypt/gnupg/files/gnupg-2.0.16-opengpgv2-sha2.patch
new file mode 100644
index 000000000000..36f912ca7d80
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.16-opengpgv2-sha2.patch
@@ -0,0 +1,40 @@
+Index: g10/call-agent.c
+===================================================================
+--- g10/call-agent.c	(revisione 5423)
++++ g10/call-agent.c	(revisione 5424)
+@@ -892,6 +892,25 @@
+   return 0;
+ }
+   
++
++/* Helper returning a command option to describe the used hash
++   algorithm.  See scd/command.c:cmd_pksign.  */
++static const char *
++hash_algo_option (int algo)
++{
++  switch (algo)
++    {
++    case GCRY_MD_RMD160: return "--hash=rmd160 ";
++    case GCRY_MD_SHA1  : return "--hash=sha1 ";
++    case GCRY_MD_SHA224: return "--hash=sha224 ";
++    case GCRY_MD_SHA256: return "--hash=sha256 ";
++    case GCRY_MD_SHA384: return "--hash=sha384 ";
++    case GCRY_MD_SHA512: return "--hash=sha512 ";
++    case GCRY_MD_MD5   : return "--hash=md5 ";
++    default:             return "";
++    }
++}
++
+ /* Send a sign command to the scdaemon via gpg-agent's pass thru
+    mechanism. */
+ int
+@@ -938,8 +957,7 @@
+   else
+ #endif
+     snprintf (line, DIM(line)-1, "SCD PKSIGN %s%s",
+-              hashalgo == GCRY_MD_RMD160? "--hash=rmd160 " : "",
+-              serialno);
++              hash_algo_option (hashalgo), serialno);
+   line[DIM(line)-1] = 0;
+   rc = assuan_transact (agent_ctx, line, membuf_data_cb, &data,
+                         default_inq_cb, NULL, NULL, NULL);
diff --git a/app-crypt/gnupg/gnupg-2.0.16-r2.ebuild b/app-crypt/gnupg/gnupg-2.0.16-r2.ebuild
new file mode 100644
index 000000000000..e19f74935a75
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.16-r2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.16-r2.ebuild,v 1.1 2010/10/19 01:42:08 robbat2 Exp $
+
+EAPI="3"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns bzip2 caps doc ldap nls openct pcsc-lite static selinux smartcard"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/libassuan-2
+	>=dev-libs/libgcrypt-1.4
+	>=dev-libs/libgpg-error-1.7
+	>=dev-libs/libksba-1.0.2
+	>=dev-libs/pth-1.3.7
+	>=net-misc/curl-7.10
+	adns? ( >=net-libs/adns-1.4 )
+	bzip2? ( app-arch/bzip2 )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+	openct? ( >=dev-libs/openct-0.5.0 )
+	smartcard? ( =virtual/libusb-0* )
+	ldap? ( net-nds/openldap )"
+COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
+
+# existence of bins are checked during configure
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	static? ( >=dev-libs/libassuan-2[static-libs] )
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+	${COMMON_DEPEND_BINS}
+	virtual/mta
+	!app-crypt/gpg-agent
+	!<=app-crypt/gnupg-2.0.1
+	selinux? ( sec-policy/selinux-gnupg )
+	nls? ( virtual/libintl )"
+
+pkg_setup() {
+	if ( use openct || use pcsc-lite ) && ! use smartcard; then
+		ewarn "You have openct or pcsc-lite enabled but do not"
+		ewarn "have smartcard support enabled. This will not affect"
+		ewarn "the building of this package, but it may affect others."
+	fi
+}
+
+src_prepare() {
+	EPATCH_OPTS="-l" epatch "${FILESDIR}"/gnupg-realloc-X.509.patch
+	epatch "${FILESDIR}"/gnupg-2.0.16-opengpgv2-sha2.patch
+	#epatch "${FILESDIR}"/gnupg-2.0.14-encode-s2k.patch
+}
+
+src_configure() {
+	local want_scdaemon=0
+	if use openct || use pcsc-lite || use smartcard ; then
+		want_scdaemon=1
+	fi
+
+	# 'USE=static' support was requested:
+	# gnupg1: bug #29299
+	# gnupg2: bug #159623
+	if use static ; then
+		append-ldflags -static
+		# but ..., now see bug #219423
+		if [[ $want_scdaemon -eq 1 ]] ; then
+			die "Upstream explicitly disallows static builds when combining with smartcard support: http://www.mail-archive.com/gnupg-users@gnupg.org/msg10851.html"
+		fi
+	fi
+	
+	[[ $want_scdaemon -eq 1 ]] && myconf="--enable-scdaemon" || myconf="--disable-scdaemon"
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-agent \
+		${myconf} \
+		$(use_with adns) \
+		$(use_enable bzip2) \
+		$(use_enable !elibc_SunOS symcryptrun) \
+		$(use_enable nls) \
+		$(use_enable ldap) \
+		$(use_with caps capabilities) \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use doc; then
+		cd doc
+		emake html || die "emake html failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog NEWS README THANKS TODO VERSION
+
+	mv "${ED}usr/share/gnupg/help"* "${ED}usr/share/doc/${PF}"
+	ecompressdir "/usr/share/doc/${PF}"
+
+	dosym gpg2 /usr/bin/gpg
+	dosym gpgv2 /usr/bin/gpgv
+	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
+	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
+	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
+	use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
+	echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1"
+	echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1"
+
+	use doc && dohtml doc/gnupg.html/* doc/*jpg doc/*png
+
+	echo 'CONFIG_PROTECT=/usr/share/gnupg/qualified.txt' >>"${ED}"/etc/env.d/30gnupg
+}
+
+pkg_postinst() {
+	elog "If you wish to view images emerge:"
+	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+	elog "Remember to use photo-viewer option in configuration file to activate"
+	elog "the right viewer."
+
+	ewarn "Please remember to restart gpg-agent if a different version"
+	ewarn "of the agent is currently used. If you are unsure of the gpg"
+	ewarn "agent you are using please run 'killall gpg-agent',"
+	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+}