app-crypt/gnupg: Several updates
authorKristian Fiskerstrand <kf@sumptuouscapital.com>
Fri, 18 Nov 2016 01:02:59 +0000 (02:02 +0100)
committerKristian Fiskerstrand <kf@sumptuouscapital.com>
Fri, 18 Nov 2016 01:02:59 +0000 (02:02 +0100)
app-crypt/gnupg/Manifest
app-crypt/gnupg/files/gnupg-9999-g10-tofu.c-Specify-file-access-mode.patch [deleted file]
app-crypt/gnupg/gnupg-9999.ebuild
app-crypt/gnupg/metadata.xml [new file with mode: 0644]

index 4902345..d202503 100644 (file)
@@ -1,3 +1,3 @@
-AUX gnupg-9999-g10-tofu.c-Specify-file-access-mode.patch 870 SHA256 7855ae0a2d36773bb8bea6bf14331bc060d145a3d1d40079e2654f08ac1062c3 SHA512 e7c5d8098fdeec3ba350cb983fc375f463b217e295121bd0df194186df4b76578cddc53ab2e8d4bb41b00ed22e575df8877a265823622e0e40e27b3bdca077c0 WHIRLPOOL b619c1ee03aa507993f9a512263b5748f2b402a7ab4d57e0710f3fc28c41a7af2b8ee1644ed0bb0c535589882bb0e9fcb52d6fc3ffe31cd72113bf101e469b6d
 AUX gnupg-9999-tests-pkits-Makefile.am-Remove-failing-tests.patch 821 SHA256 5ab4c085d499a0d22e504d8e81f2317e1cf4ea59dba52fa12de213a829e3f40a SHA512 f3006885aaa69c51d9f6c6b61888518783c1bb95ce7ae7985cbaf5c1a9c858115f8e8446b3cfc6169a645f3705464728e3a81e5c060f5ccda16055ae6a199cf8 WHIRLPOOL 6d0dad38ee411f200b6fbff73d2f266c46335822eca158b1e837f1a8b79555b38df8be6bdfef70860e0355e0f6c2a51fdd26498a7fe13a219d2bcbc03673bd2d
-EBUILD gnupg-9999.ebuild 3776 SHA256 54329a914cc0ad3927d2dd5bfed48497f8ec82f29ef5ea09ceebd4dde13f1340 SHA512 325fa05d4f003389739e54d186ad5c6395fe0235016586fa0923ab9335f35781e934f7adddfb26f9ec1aaa339d9672e451a7044fd5c38551608964cbc5e69a16 WHIRLPOOL 04b7203079926cb28d4734f19fbc95ecb5de44a131f87a8081ba58220c5ad2108a330720f355a2530a46a7af6094070061bae8b8f9f03e47d0c8d664b069a2a9
+EBUILD gnupg-9999.ebuild 3572 SHA256 710ddfb077e6e456920ad34379bee902e9ca62abd21f73fdb6ed9f1a4694004b SHA512 170bc4a2b884d5c92e18e698d2263d2f3428bcdb6d8613f0bafc4dbd0f19008d282814c28d580d92ea221e6f032e0fd2f9671c18258f12aca1c6c79bd9616639 WHIRLPOOL 1ea2f1996c545bb86e905ea7670ad59fcd2d76411c112d9a315305bdc2bfa0e27ddf5356d5b6c96b2c6eab6bff9d1ab08bf9550a92af170cec3a5f912247dbdf
+MISC metadata.xml 1366 SHA256 cb2997a736840b0db98ca7ea5328a40b4d53375441fb05047641fe2ff147822b SHA512 9c0fda3cc3bcbbd3bcc883df0b39a4e9c4dd058ef3ef4751699c39270bdbe6dbc9b049d91c3fe78689c7a878eb483f7cfe1641e8e4421535ca3b6a56e06c13fe WHIRLPOOL 44a243cc732333007723a37214b34e8f26dae2f778d34880db8f6ccb235b24d2f96c3e0583aeb74a982f54e88b7df9a4fea3291a897c6ddfdba3b594e29a70c1
diff --git a/app-crypt/gnupg/files/gnupg-9999-g10-tofu.c-Specify-file-access-mode.patch b/app-crypt/gnupg/files/gnupg-9999-g10-tofu.c-Specify-file-access-mode.patch
deleted file mode 100644 (file)
index 39790b3..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From fb4925fb62393e5c947c3994df82336d4cfda741 Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Thu, 17 Nov 2016 22:16:11 +0100
-Subject: [PATCH] (g10/tofu.c) Specify file access mode
-
-Specify explicit file access mode for open
----
- g10/tofu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/g10/tofu.c b/g10/tofu.c
-index 03d8ebe..0794405 100644
---- a/g10/tofu.c
-+++ b/g10/tofu.c
-@@ -732,7 +732,7 @@ busy_handler (void *cookie, int call_count)
-          process will have to wait a bit longer, but otherwise nothing
-          horrible should happen.  */
--      int fd = open (dbs->want_lock_file, O_CREAT);
-+      int fd = open (dbs->want_lock_file, O_RDWR, O_CREAT);
-       if (fd == -1)
-         log_debug ("TOFU: Error opening '%s': %s\n",
-                    dbs->want_lock_file, strerror (errno));
--- 
-2.7.3
-
index c7a62d7..fe51a13 100644 (file)
@@ -20,13 +20,12 @@ if [[ ${PV} != *9999* ]]; then
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s39    0 ~sh ~sparc ~x86"
 else
        KEYWORDS=""
-       WANT_AUTOMAKE=1.14
        EGIT_REPO_URI="git://git.gnupg.org/${PN}.git"
 fi
 
 SLOT="0"
 KEYWORDS=""
-IUSE="bzip2 doc +gnutls ldap nls readline selinux smartcard +system-cert-store tofu tools usb"
+IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server"
 
 COMMON_DEPEND_LIBS="
        >=dev-libs/npth-1.2
@@ -62,8 +61,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
        default
        if [[ ${PV} == *9999* ]]; then
-               epatch "${FILESDIR}"/${P}-g10-tofu.c-Specify-file-access-mode.patch \
-               "${FILESDIR}"/${P}-tests-pkits-Makefile.am-Remove-failing-tests.patch
+               epatch "${FILESDIR}"/${P}-tests-pkits-Makefile.am-Remove-failing-tests.patch
        fi
 
        epatch_user
@@ -96,7 +94,7 @@ src_configure() {
                export gl_cv_absolute_stdint_h=/usr/include/stdint.h
 
        maintainer_mode=""
-       
+
        if [[ ${PV} == *9999* ]]; then
                maintainer_mode+="--enable-maintainer-mode "
        fi
@@ -131,7 +129,14 @@ src_compile() {
 
 src_install() {
        default
+       
+       if ! use wks-server; then
+               rm -f "${D}/usr/bin/gpg-wks-server" || die
+       fi
 
+       use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
+               tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+               tools/make-dns-cert
        emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
 
        dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
@@ -149,12 +154,3 @@ src_install() {
                dohtml doc/gnupg.html/* doc/*.png
        fi
 }
-
-pkg_postinst() {
-       if [[ -n ${REPLACING_VERSIONS} ]]; then
-               elog "If upgrading from a version prior than 2.1 you might have to re-import"
-               elog "secret keys after restarting the gpg-agent as the new version is using"
-               elog "a new storage mechanism."
-               elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
-       fi
-}
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
new file mode 100644 (file)
index 0000000..c651aea
--- /dev/null
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+        <email>k_f@gentoo.org</email>
+        <name>Kristian Fiskerstrand</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>crypto@gentoo.org</email>
+    <name>Crypto</name>
+  </maintainer>
+  <longdescription>
+    GnuPG is a complete and free implementation of the OpenPGP standard as
+    defined by RFC4880.
+  </longdescription>
+  <use>
+    <flag name="smartcard">
+      Build scdaemon software. Enables usage of OpenPGP cards. For
+      other type of smartcards, try
+      <pkg>app-crypt/gnupg-pkcs11-scd</pkg>.
+      Bring in <pkg>dev-libs/libusb</pkg> as a dependency; enable
+      scdaemon.
+    </flag>
+       <flag name="system-cert-store">
+         Use gnutls system TLS cert store for hkps access
+       </flag>
+    <flag name="usb">
+      Build direct CCID access for scdaemon; requires
+      <pkg>dev-libs/libusb</pkg>.
+    </flag>
+    <flag name="mta">
+      Build mta support using
+      <pkg>virtual/mta</pkg>.
+    </flag>
+    <flag name="tofu">
+      Enable support for Trust of First use trust model; requires
+      <pkg>dev-db/sqlite</pkg>.
+    </flag>
+    <flag name="tools">
+      Install extra tools.
+    </flag>
+       <flag name="wks-server">
+         Install the wks-server
+       </flag>
+  </use>
+</pkgmetadata>