Version bump to 2.0.26. Add patch to fix an import issue for trust-model=always (bug #519760)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xFC3B17DE05E136A0!

4 files changed, 226 insertions, 15 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 7ac358c91ac9..13dac3e051ea 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.537 2014/07/30 15:54:34 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.538 2014/08/13 14:24:41 k_f Exp $
+
+*gnupg-2.0.26 (13 Aug 2014)
+
+  13 Aug 2014; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch,
+  +gnupg-2.0.26.ebuild:
+  Version bump to 2.0.26. Add patch to fix an import issue for trust-
+  model=always (bug #519760)
 
   30 Jul 2014; Kristian Fiskerstrand <k_f@gentoo.org> metadata.xml:
   Update metadata longdesc to reflect IDEA is now also part of GnuPG and the
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 52f5d659d342..e947d7e9d652 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,27 +2,30 @@
 Hash: SHA256
 
 AUX gnupg-2.0.17-gpgsm-gencert.patch 1121 SHA256 fa8369a4466b3cce54215a348940422f46f4d359f9e9b3c7029a1138870888df SHA512 ecde032b205cc16c33ff21ded55b93e74058cd804d68e4a0738ac70d54b5b388b6f709d21719a5e418c662b7ee74bc4aef7a0c59de106e2d4bd06b7bc1a11138 WHIRLPOOL 5dc4d3de29290e8e274a0f4fef871cea7f49553846254d819ca776000978a72c694212559d9ad03312f94f71f406de4641c0575188d340017a7937b01753b8a0
+AUX gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch 895 SHA256 063f50e8293282ec59ccf30567dafc16f5cdec800d2965acf8cf8a5050d8a9b3 SHA512 85423d0c0a2d6e85d569bd31c8f8209fb8707c827f041055bc2a1b20ec1372257574a2b72d86cdc1fa61188966bbb0e0ca176505bbd2bb1e2df12257f33ae259 WHIRLPOOL b9ee365eb55e637ca80b1ab88f1b48a9f925be73aba4f3e8e1c5526cbdb18a4c6326aa0282b45c6ad285b9c0d2f624e161679abd41bfcbd6cbf37764c0123467
 DIST gnupg-1.4.18.tar.bz2 3649557 SHA256 b7b5fdda78849955e0cdbc5a085f3a08f8b7fba126c622085debb62def5d6388 SHA512 f9619ede8e0d2844774e07fb42359444c5ab8e15565a87f419f76cc3d781940c564f35f429131686fdd7559c5c2edb49506b3c0a1feecbd95438743075be3e63 WHIRLPOOL 780876be0603fd0605b192721e2bbb770ad67d98acba8ef0fd769ab3241467696da5f49a189d89600d076691bf2cedb1294ffade5c44f6d24512d6a93a6f8981
 DIST gnupg-2.0.25.tar.bz2 4301689 SHA256 b3abe97df096cf53d6a422ac922f3c48e688bc892b7ccf669b92f0b7fc6c5823 SHA512 8b80c86ec53ed3b82d15a8e316baf175691e06e1bcac28d66c61fd37d07e26196a7ee7855e6eb958c301cee764866cc3cf00e5ec0aef23abddf7427bb3d23fb1 WHIRLPOOL 786f3db3af0c96249e128ce3a30dee7e9fbec38d75ed29138f0dfdcbe4f4377c39d4152844087cec0147921eed73c1a01382b542c6a27e86e8bd9265f67e65e2
+DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
 DIST gnupg-2.1.0-beta751.tar.bz2 3078612 SHA256 5abd2bc02365ba3007ed484a256651341a87a1f2a03970bac4015809de09ade5 SHA512 230a2e37eea401465017053e3c5e47187a5963f06dc5528c9a3ff6c76ee9e2ff857cb9e4ddf0b72d8d79eadb50834858f5340c02625279c403f30ed709da4869 WHIRLPOOL ccf8426c4f11df69dc3ee96bb4444df1479228f2b1ed2a7da98fc0000f9a5b8c7d82624a36e9de78e5b87bf4296c6ca17c3351f29e1752b58ae73433b1b7d9ee
 EBUILD gnupg-1.4.18.ebuild 3763 SHA256 37cedb3946b555e83111f5096b3dd73f9506175976be10d648f8eb76b0b5fd3a SHA512 3dd165eb15a4946a9e2157549f0da6864e84c054a6369d7053730a899b50c5f05a703c1ce8e208b9de21b135bc8888f0f13835fce50f0e9eec467140e7e63355 WHIRLPOOL 9c64d59b7c444dde1fb601a6ab8d1085525153174b5995009ff7758866e56b88028056b42154fa0e28b3328978e15df515e4c65e65cb667fc17b75fb340e8e15
 EBUILD gnupg-2.0.25.ebuild 4747 SHA256 6c57559a986cb9271891d041a6f1e7903ccce835c00d7ea16818078f56f11d78 SHA512 f3d81564eb1c708d188d357521f3c6c43f15a8ac8f2758d14328cc3d7cc40306af50a8269f09dd2f80ec6469dc5f31dd2864008d7526dd9f108b1972ce1a7000 WHIRLPOOL f41c54bef5b0b4b7a7cba514c4c39d2cc938eae5e56c8a225755435393f4e483e5c1bd02d02dd0c86c9d6a945ccfe40090523b7f35228a899043dfa79eff9ba1
+EBUILD gnupg-2.0.26.ebuild 4823 SHA256 27512cd47b79fa8e81efc068ced5aece0c08919bfc4b582c9e39b04f0e587831 SHA512 8b89b1a1a3027a2d6f50fa5265ff3f0a38db6080b44b1791e2edb3e8695b4374a0d2079e466c2911f3aca58657cb8d6bcf4aefda4bdcc2dcce2d3aa7e8ae6ef1 WHIRLPOOL 8cb593260649a838c554f45de26e0be60b34908d1813875fd10c333ab9983bd664b348d8c289b0746dbd02ffd0d2397088966f3ee92dab1004fffe1d83db2268
 EBUILD gnupg-2.1.0_beta751.ebuild 4380 SHA256 f4bf0b6a4ad091b2ecc757c53c1a1e3f09637fcd97abf80faae117e7804b5882 SHA512 078083cf6608211c214d5b4baf060d53e01fcdc1aa1a6ea9b3568431f51cd19dcfba2c849539d14d17116f7c3f416fce5d72d7eb5ec392a19dfff8a2d6bafa8a WHIRLPOOL 0d42edc351d55ab3b89e730a651f8e0a969969e71874d3667fa1c20b77a6377c4f02702465d978a85ed3a6865a9f93d3fd42c57daa9b60789c221e76293716c7
-MISC ChangeLog 78675 SHA256 ef57732774118db0cf886267ddf2f92d4f7b3b80026aee6a6053045777b91791 SHA512 f76510000b89f9abafe3906aabb637dd9a294dc0d2fea3639aedc2a4f5710edda90d41dacd060ebb1192c490c083c0673ec2e9799f2444ce1352d50ae03d38cb WHIRLPOOL 22daf85e250858b710eb0a7d7cbf9d025add2ab44fbe0df1807eaf285d402b982eadce27ca79434f591a6058e961db77e0c5f141484282324174e16fbd0bdf67
+MISC ChangeLog 78947 SHA256 41c852d1ffaf2b862a549ec9de19b0d6203808618848a5d3aeef5b8d317202f2 SHA512 5accc895f76f9ecf90353b8eb1fad0098cd737704b2bcdf2ae3515fb52642c00300cf9b972116731c0926e968c3ce5734acfbd334d579b7600d31adeb94d080e WHIRLPOOL b7b6479742011b18eb9bd12ec22608fec611d69531149b42e0f817a11b155d8dc1b7c7009ee67e81183d17b3aa38a15e85cec38f86e7ec9d462ef1953d1b1b9a
 MISC metadata.xml 969 SHA256 969b10a1be20daa309d3e392d005a9b1325e7e1a5bf638ae7a9151c625e79d66 SHA512 8cfc927b9df66c91a16e1d54091d36c4610575f7cbc45732dd2d7ce943859b6ec1afd7b25effb16da61d5ad2df7958daf4769fdcef4f137ceaf5112b24a78793 WHIRLPOOL a043979724cc3f4a5cf869459d60998948ed9018666824c2941a21823c3ce03a3012006767951300bdf346582f3aa6f9c035bfa0c607363eb8ef35713cd18254
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJT2RTsAAoJEPw7F94F4TagrEMQAIJnFbG2nmH9bcA+5Jc8EPjI
-DlE0uhgUgIAl2CroJKtSkBOV0j111wqJWwnT/E+eCG2ebXo97zN6jCRKqlV9DtCI
-u3CyyJzFrxN0ao4FWgCGxzQpaSKFBitm7tYYfkmaLFJHcYKCT15f1iGLKlfTmpgk
-tEDu5yqHpPExGbIVesNyKLuf6AYkI0NvnFoaLfx3DMUpQh1BdOeOHsHZmjOQ3xtc
-TOHmo4tgDou3FbEgKFZGyignYANg+iipY4sQjzsVnZ3GauNJCe4Hw120elofpw7+
-aWfKhdx+fEgUyJLGDTSsH+VQX3ab+5gB/VutryhVWG1kZkFRBRRpQ5SII4zvv6ki
-7Zsi+E/qbQTg3mOFCWUreaBKepbxe6RDRH1LSFck81vYokpco7cVf41yEJ/fjhQ6
-uWonHttOsQtSZG+w80nOIqAraAU+anQdDWo+RQ9MGpDmsUwimm5ZbnGNiEpmRBPW
-lEvRYX7D8p6lj8zNxWX1ypBxPoJaMYhSPAD9xMVfFT2gQmoUbYVGk1Tn0HN3Opiv
-KIX+Yr1G92JcblzALudc0B02OrhMvCvztH0ktl4ZY6r7ZtiiXjRlbAPUtAcqOT52
-V1UqrzVQIhBF1qvLr3atVwRrTcqLFFJeq96RomVKachGCRIzIRureAcYVbxUnzVu
-0FKXbGm0r3moD3mkW13l
-=+FhO
+iQIcBAEBCAAGBQJT63TDAAoJEPw7F94F4Tag1PMP/1AwpdGk1Y/XvGA8P1uS4p/m
+8B1qXdMHQLacXCg6ipzD8nTj2Dt6HVAElaUoU0SHaTvRhn9pjy7laxnupPlapdV7
+/HWTX1D7Te5rbf/7Of7oRWTp6IIh/cViJrsSwaRLSjS3v3FeYi2yZ1Z18ZdBqEAn
+AThna3qW4rIrNa8w3c4HgxTpjmJk/B4sC34eIM+KwWaArcq6IIutDes6v7GLsPkB
+DSVVZ1T9bMQmxHi2gmxmT+8+pslefv3sYHhXNpIwBPl2cTwt71OsKf/gWcVmyxCf
+dNK6sRVroX+nY8zcl/mkr58FO0HUBDV9yQ3I7lQzDR9zk7XBUY1mYhbeDX2tJLUw
+9wBHGtMbWtqMYwPJ84F87xgPs1Uj9jKMshNvYaZEDg6MRNfmNshK4OyMZHKV131I
+8qwYqyrdr0rrps0HGPCsW42rJmgVQEseiI2KzsJ/SlHA+iI+Mz4WiNL34LvTuOSs
+8WQmlfc0HHQi5Pa8J8T9EjvQt3xMRj8lHZS1HBGjVDZ+73MUi0f6n9lEV3AuK7Gs
+q5lc6Q/jqMGwcFphYGPtUOralLBuYMAbxOFbPxrZtagTxbZ2WIDlhcbdPwRyGWPw
+zWR+aA29s9unCuueqJC1AzFAAPXPhlHYF8JY1jWsMJOc0WJVXsorOGIVyL6niyMJ
+/jvyApYTmdC1l/3b93Rr
+=J6N9
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch b/app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch
new file mode 100644
index 000000000000..4c9eff26fd58
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.26-Need-to-init-the-trustdb-for-import.patch
@@ -0,0 +1,35 @@
+From a2dcc5cc49c3e79d64bd1a2ad7a5bc4df5b073ee Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Wed, 13 Aug 2014 11:13:34 +0200
+Subject: [PATCH] gpg: Need to init the trustdb for import.
+
+* g10/trustdb.c (clear_ownertrusts): Init trustdb.
+
+--
+
+This was fixed in 1.4 branch in commit
+23191d7851eae2217ecdac6484349849a24fd94a but was not applied to the
+2.0 branch that exhibits the same problem. This is actually a hack
+to fix a bug introduced with commit 2528178.
+
+GnuPG-bug-id: 1622
+---
+ g10/trustdb.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/g10/trustdb.c b/g10/trustdb.c
+index f96701a..7bfef25 100644
+--- a/g10/trustdb.c
++++ b/g10/trustdb.c
+@@ -923,6 +923,8 @@ clear_ownertrusts (PKT_public_key *pk)
+   TRUSTREC rec;
+   int rc;
+ 
++  init_trustdb();
++
+   if (trustdb_args.no_trustdb && opt.trust_model == TM_ALWAYS)
+     return 0;
+ 
+-- 
+1.8.5.5
+
diff --git a/app-crypt/gnupg/gnupg-2.0.26.ebuild b/app-crypt/gnupg/gnupg-2.0.26.ebuild
new file mode 100644
index 000000000000..902bf2b96515
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.0.26.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.26.ebuild,v 1.1 2014/08/13 14:24:41 k_f Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/libassuan-2
+	>=dev-libs/libgcrypt-1.4:0=
+	>=dev-libs/libgpg-error-1.11
+	>=dev-libs/libksba-1.0.7
+	>=dev-libs/pth-1.3.7
+	>=net-misc/curl-7.10
+	sys-libs/zlib
+	adns? ( >=net-libs/adns-1.4 )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	ldap? ( net-nds/openldap )"
+COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	static? (
+		>=dev-libs/libassuan-2[static-libs]
+		>=dev-libs/libgcrypt-1.4:0=[static-libs]
+		>=dev-libs/libgpg-error-1.11[static-libs]
+		>=dev-libs/libksba-1.0.7[static-libs]
+		>=dev-libs/pth-1.3.7[static-libs]
+		>=net-misc/curl-7.10[static-libs]
+		sys-libs/zlib[static-libs]
+		bzip2? ( app-arch/bzip2[static-libs] )
+	)
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+	${COMMON_DEPEND_BINS}
+	mta? ( virtual/mta )
+	!<=app-crypt/gnupg-2.0.1
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
+	epatch "${FILESDIR}/${P}-Need-to-init-the-trustdb-for-import.patch"
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# 'USE=static' support was requested:
+	# gnupg1: bug #29299
+	# gnupg2: bug #159623
+	use static && append-ldflags -static
+
+	if use smartcard; then
+		myconf+=(
+			--enable-scdaemon
+			$(use_enable usb ccid-driver)
+		)
+	else
+		myconf+=( --disable-scdaemon )
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-agent \
+		"${myconf[@]}" \
+		$(use_with adns) \
+		$(use_enable bzip2) \
+		$(use_enable nls) \
+		$(use_enable mta mailto) \
+		$(use_enable ldap) \
+		$(use_with readline) \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd doc
+		emake html
+	fi
+}
+
+src_install() {
+	default
+
+	# bug#192151
+	dobin tools/gpgsplit tools/gpg-zip
+
+	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+	rm "${ED}"/usr/share/gnupg/help* || die
+
+	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+	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
+	if use ldap; then
+		dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
+	fi
+	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+	if use doc; then
+		dohtml doc/gnupg.html/* doc/*.png
+	fi
+}
+
+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."
+	elog
+
+	if use smartcard; then
+		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+		elog " - sys-apps/pcsc-lite and a compatible reader device;"
+		elog " - dev-libs/openct and a compatible reader device;"
+		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+		elog ""
+		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+		elog "app-crypt/ccid first."
+	fi
+
+	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'."
+}