[arch-commits] Commit in gnupg/repos (8 files)

2019-12-09 Thread Gaëtan Bisson via arch-commits 
Date: Monday, December 9, 2019 @ 19:54:58
  Author: bisson
Revision: 370562

db-move: moved gnupg from [testing] to [core] (x86_64)

Added:
  gnupg/repos/core-x86_64/PKGBUILD
(from rev 370561, gnupg/repos/testing-x86_64/PKGBUILD)
  gnupg/repos/core-x86_64/install
(from rev 370561, gnupg/repos/testing-x86_64/install)
  gnupg/repos/core-x86_64/self-sigs-only.patch
(from rev 370561, gnupg/repos/testing-x86_64/self-sigs-only.patch)
Deleted:
  
gnupg/repos/core-x86_64/0001-gpg-Fix-double-free-with-anonymous-recipients.patch
  gnupg/repos/core-x86_64/PKGBUILD
  gnupg/repos/core-x86_64/install
  gnupg/repos/core-x86_64/self-sigs-only.patch
  gnupg/repos/testing-x86_64/

--+
 /PKGBUILD|   66 
+++
 /install |   31 +++
 /self-sigs-only.patch|   56 
++
 core-x86_64/0001-gpg-Fix-double-free-with-anonymous-recipients.patch |   84 
--
 core-x86_64/PKGBUILD |   69 

 core-x86_64/install  |   31 ---
 core-x86_64/self-sigs-only.patch |   56 
--
 7 files changed, 153 insertions(+), 240 deletions(-)

Deleted: core-x86_64/0001-gpg-Fix-double-free-with-anonymous-recipients.patch
===
--- core-x86_64/0001-gpg-Fix-double-free-with-anonymous-recipients.patch
2019-12-09 16:05:43 UTC (rev 370561)
+++ core-x86_64/0001-gpg-Fix-double-free-with-anonymous-recipients.patch
2019-12-09 19:54:58 UTC (rev 370562)
@@ -1,84 +0,0 @@
-From 9ac182f376abf910a7b737b0e1ebd447eaa582f1 Mon Sep 17 00:00:00 2001
-From: Werner Koch 
-Date: Fri, 29 Nov 2019 17:44:12 +0100
-Subject: [PATCH GnuPG] gpg: Fix double free with anonymous recipients.
-
-* g10/pubkey-enc.c (get_session_key): Do not release SK.
---
-
-Bug is in 2.2.18 only.
-
-The semantics of the enum_secret_keys function changed in master.
-When back porting this for 2.2.18 I missed this change and thus we ran
-into a double free.  The patches fixes the regression but is it clumsy.
-We need to change the enum_secret_keys interface to avoid such a
-surprising behaviour; this needs to be done in master first.
-
-Regression-due-to: 9a317557c58d2bdcc504b70c366b77f4cac71df7
-GnuPG-bug-id: 4762
-Signed-off-by: Werner Koch 

- g10/pubkey-enc.c | 8 ++--
- g10/skclist.c| 7 +--
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
-index 71a48cc41..4e6f893f3 100644
 a/g10/pubkey-enc.c
-+++ b/g10/pubkey-enc.c
-@@ -114,11 +114,11 @@ get_session_key (ctrl_t ctrl, PKT_pubkey_enc * k, DEK * 
dek)
- 
-   for (;;)
- {
--  free_public_key (sk);
-   sk = xmalloc_clear (sizeof *sk);
-   rc = enum_secret_keys (ctrl, _context, sk);
-   if (rc)
- {
-+  sk = NULL;  /* enum_secret_keys turns SK into a shallow copy! */
-   rc = GPG_ERR_NO_SECKEY;
-   break;
- }
-@@ -148,10 +148,14 @@ get_session_key (ctrl_t ctrl, PKT_pubkey_enc * k, DEK * 
dek)
- {
-   if (!opt.quiet)
- log_info (_("okay, we are the anonymous recipient.\n"));
-+  sk = NULL;
-   break;
- }
-   else if (gpg_err_code (rc) == GPG_ERR_FULLY_CANCELED)
--break; /* Don't try any more secret keys.  */
-+{
-+  sk = NULL;
-+  break; /* Don't try any more secret keys.  */
-+}
- }
-   enum_secret_keys (ctrl, _context, NULL);  /* free context */
- }
-diff --git a/g10/skclist.c b/g10/skclist.c
-index 8817ee904..5a32b6a17 100644
 a/g10/skclist.c
-+++ b/g10/skclist.c
-@@ -292,14 +292,17 @@ build_sk_list (ctrl_t ctrl,
-  * --default-key and --try-secret-key).  Use the following procedure:
-  *
-  *  1) Initialize a void pointer to NULL
-- *  2) Pass a reference to this pointer to this function (content)
-- * and provide space for the secret key (sk)
-+ *  2) Pass a reference to this pointer to this function (CONTEXT)
-+ * and provide space for the secret key (SK)
-  *  3) Call this function as long as it does not return an error (or
-  * until you are done).  The error code GPG_ERR_EOF indicates the
-  * end of the listing.
-  *  4) Call this function a last time with SK set to NULL,
-  * so that can free it's context.
-  *
-+ *  TAKE CARE: When the function returns SK belongs to CONTEXT and may
-+ *  not be freed by the caller; neither on success nor on error.
-+ *
-  * In pseudo-code:
-  *
-  *   void *ctx = NULL;
--- 
-2.11.0
-

Deleted: core-x86_64/PKGBUILD
===
---

[arch-commits] Commit in gnupg/repos (8 files)

2019-12-02 Thread Gaëtan Bisson via arch-commits 
Date: Monday, December 2, 2019 @ 19:12:01
  Author: bisson
Revision: 370220

db-move: moved gnupg from [testing] to [core] (x86_64)

Added:
  
gnupg/repos/core-x86_64/0001-gpg-Fix-double-free-with-anonymous-recipients.patch
(from rev 370219, 
gnupg/repos/testing-x86_64/0001-gpg-Fix-double-free-with-anonymous-recipients.patch)
  gnupg/repos/core-x86_64/PKGBUILD
(from rev 370219, gnupg/repos/testing-x86_64/PKGBUILD)
  gnupg/repos/core-x86_64/install
(from rev 370219, gnupg/repos/testing-x86_64/install)
  gnupg/repos/core-x86_64/self-sigs-only.patch
(from rev 370219, gnupg/repos/testing-x86_64/self-sigs-only.patch)
Deleted:
  gnupg/repos/core-x86_64/PKGBUILD
  gnupg/repos/core-x86_64/install
  gnupg/repos/core-x86_64/self-sigs-only.patch
  gnupg/repos/testing-x86_64/

--+
 /PKGBUILD|   69 

 /install |   31 +++
 /self-sigs-only.patch|   56 
++
 core-x86_64/0001-gpg-Fix-double-free-with-anonymous-recipients.patch |   84 
++
 core-x86_64/PKGBUILD |   66 
---
 core-x86_64/install  |   31 ---
 core-x86_64/self-sigs-only.patch |   56 
--
 7 files changed, 240 insertions(+), 153 deletions(-)

Copied: 
gnupg/repos/core-x86_64/0001-gpg-Fix-double-free-with-anonymous-recipients.patch
 (from rev 370219, 
gnupg/repos/testing-x86_64/0001-gpg-Fix-double-free-with-anonymous-recipients.patch)
===
--- core-x86_64/0001-gpg-Fix-double-free-with-anonymous-recipients.patch
(rev 0)
+++ core-x86_64/0001-gpg-Fix-double-free-with-anonymous-recipients.patch
2019-12-02 19:12:01 UTC (rev 370220)
@@ -0,0 +1,84 @@
+From 9ac182f376abf910a7b737b0e1ebd447eaa582f1 Mon Sep 17 00:00:00 2001
+From: Werner Koch 
+Date: Fri, 29 Nov 2019 17:44:12 +0100
+Subject: [PATCH GnuPG] gpg: Fix double free with anonymous recipients.
+
+* g10/pubkey-enc.c (get_session_key): Do not release SK.
+--
+
+Bug is in 2.2.18 only.
+
+The semantics of the enum_secret_keys function changed in master.
+When back porting this for 2.2.18 I missed this change and thus we ran
+into a double free.  The patches fixes the regression but is it clumsy.
+We need to change the enum_secret_keys interface to avoid such a
+surprising behaviour; this needs to be done in master first.
+
+Regression-due-to: 9a317557c58d2bdcc504b70c366b77f4cac71df7
+GnuPG-bug-id: 4762
+Signed-off-by: Werner Koch 
+---
+ g10/pubkey-enc.c | 8 ++--
+ g10/skclist.c| 7 +--
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
+index 71a48cc41..4e6f893f3 100644
+--- a/g10/pubkey-enc.c
 b/g10/pubkey-enc.c
+@@ -114,11 +114,11 @@ get_session_key (ctrl_t ctrl, PKT_pubkey_enc * k, DEK * 
dek)
+ 
+   for (;;)
+ {
+-  free_public_key (sk);
+   sk = xmalloc_clear (sizeof *sk);
+   rc = enum_secret_keys (ctrl, _context, sk);
+   if (rc)
+ {
++  sk = NULL;  /* enum_secret_keys turns SK into a shallow copy! */
+   rc = GPG_ERR_NO_SECKEY;
+   break;
+ }
+@@ -148,10 +148,14 @@ get_session_key (ctrl_t ctrl, PKT_pubkey_enc * k, DEK * 
dek)
+ {
+   if (!opt.quiet)
+ log_info (_("okay, we are the anonymous recipient.\n"));
++  sk = NULL;
+   break;
+ }
+   else if (gpg_err_code (rc) == GPG_ERR_FULLY_CANCELED)
+-break; /* Don't try any more secret keys.  */
++{
++  sk = NULL;
++  break; /* Don't try any more secret keys.  */
++}
+ }
+   enum_secret_keys (ctrl, _context, NULL);  /* free context */
+ }
+diff --git a/g10/skclist.c b/g10/skclist.c
+index 8817ee904..5a32b6a17 100644
+--- a/g10/skclist.c
 b/g10/skclist.c
+@@ -292,14 +292,17 @@ build_sk_list (ctrl_t ctrl,
+  * --default-key and --try-secret-key).  Use the following procedure:
+  *
+  *  1) Initialize a void pointer to NULL
+- *  2) Pass a reference to this pointer to this function (content)
+- * and provide space for the secret key (sk)
++ *  2) Pass a reference to this pointer to this function (CONTEXT)
++ * and provide space for the secret key (SK)
+  *  3) Call this function as long as it does not return an error (or
+  * until you are done).  The error code GPG_ERR_EOF indicates the
+  * end of the listing.
+  *  4) Call this function a last time with SK set to NULL,
+  * so that can free it's context.
+  *
++ *  TAKE CARE: When the function returns SK belongs to CONTEXT and may
++ *  not be freed by the

[arch-commits] Commit in gnupg/repos (8 files)

2017-06-09 Thread Jan Steffens 
Date: Friday, June 9, 2017 @ 08:55:53
  Author: heftig
Revision: 298462

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 298461, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 298461, gnupg/trunk/install)
  gnupg/repos/testing-i686/scdaemon.patch
(from rev 298461, gnupg/trunk/scdaemon.patch)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 298461, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 298461, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/scdaemon.patch
(from rev 298461, gnupg/trunk/scdaemon.patch)

---+
 testing-i686/PKGBUILD |   71 
 testing-i686/install  |   41 ++
 testing-i686/scdaemon.patch   |   87 
 testing-x86_64/PKGBUILD   |   71 
 testing-x86_64/install|   41 ++
 testing-x86_64/scdaemon.patch |   87 
 6 files changed, 398 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 298461, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-06-09 08:55:53 UTC (rev 298462)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.21
+pkgrel=3
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+checkdepends=('openssh')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+'scdaemon.patch')
+sha256sums=('7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd'
+'SKIP'
+'b4972dc221c7b76ed15b4cc9d15e2d80b399d76307cf046d1ac617b2b5750278')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   patch -p1 -i ../scdaemon.patch # FS#54271
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make check
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+
+   cd doc/examples/systemd-user
+   for i in *.*; do
+   install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
+   done
+}

Copied: gnupg/repos/testing-i686/install (from rev 298461, gnupg/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2017-06-09 08:55:53 UTC (rev 298462)
@@ -0,0 +1,41 @@
+_global_units() {
+   _units=(dirmngr.socket gpg-agent.socket 
gpg-agent-{browser,extra,ssh}.socket)
+   _dir=/etc/systemd/user/sockets.target.wants
+
+   case $1 in
+   enable)
+   mkdir -p $_dir
+   for _u in "${_units[@]}"; do
+   ln -sf /usr/lib/systemd/user/$_u $_dir/$_u
+   done
+   ;;
+   disable)
+   for _u in "${_units[@]}"; do
+   rm -f $_dir/$_u
+   done
+   rmdir -p --ignore-fail-on-non-empty $_dir
+   ;;
+   esac
+}
+
+post_install() {
+   # See FS#42798 and FS#47371
+   dirmngr /dev/null
+
+   # Let systemd supervise daemons by default
+   _global_units enable
+}
+

[arch-commits] Commit in gnupg/repos (8 files)

2017-06-06 Thread Gaëtan Bisson 
Date: Tuesday, June 6, 2017 @ 22:04:22
  Author: bisson
Revision: 298113

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 298112, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/gnupg.install
(from rev 298112, gnupg/trunk/gnupg.install)
  gnupg/repos/testing-i686/scdaemon.patch
(from rev 298112, gnupg/trunk/scdaemon.patch)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 298112, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/gnupg.install
(from rev 298112, gnupg/trunk/gnupg.install)
  gnupg/repos/testing-x86_64/scdaemon.patch
(from rev 298112, gnupg/trunk/scdaemon.patch)

---+
 testing-i686/PKGBUILD |   70 
 testing-i686/gnupg.install|   25 +++
 testing-i686/scdaemon.patch   |   87 
 testing-x86_64/PKGBUILD   |   70 
 testing-x86_64/gnupg.install  |   25 +++
 testing-x86_64/scdaemon.patch |   87 
 6 files changed, 364 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 298112, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-06-06 22:04:22 UTC (rev 298113)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.21
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+'scdaemon.patch')
+sha256sums=('7aead8a8ba75b69866f583b6c747d91414d523bfdfbe9a8e0fe026b16ba427dd'
+'SKIP'
+'b4972dc221c7b76ed15b4cc9d15e2d80b399d76307cf046d1ac617b2b5750278')
+
+install=gnupg.install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   patch -p1 -i ../scdaemon.patch # FS#54271
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make check
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+
+   cd doc/examples/systemd-user
+   for i in *.*; do
+   install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
+   done
+}

Copied: gnupg/repos/testing-i686/gnupg.install (from rev 298112, 
gnupg/trunk/gnupg.install)
===
--- testing-i686/gnupg.install  (rev 0)
+++ testing-i686/gnupg.install  2017-06-06 22:04:22 UTC (rev 298113)
@@ -0,0 +1,25 @@
+_global_units() {
+   systemctl --global $1 dirmngr.socket gpg-agent.socket 
gpg-agent-{browser,extra,ssh}.socket
+}
+
+post_install() {
+   # See FS#42798 and FS#47371
+   dirmngr /dev/null
+
+   # Let systemd supervise daemons by default
+   _global_units enable
+}
+
+post_upgrade() {
+   if (( $(vercmp $2 2.1.13-1) < 0 )); then
+   echo "==> Please kill running gpg-agent and dirmngr processes 
before using this release."
+   fi
+
+   if (( $(vercmp $2 2.1.21-2) < 0 )); then
+   _global_units enable
+   fi
+}
+
+pre_remove() {
+   _global_units disable
+}

Copied: gnupg/repos/testing-i686/scdaemon.patch (from rev 298112, 
gnupg/trunk/scdaemon.patch)
===
--- testing-i686/scdaemon.patch (rev 0)
+++

[arch-commits] Commit in gnupg/repos (8 files)

2017-04-27 Thread Gaëtan Bisson 
Date: Thursday, April 27, 2017 @ 09:02:47
  Author: bisson
Revision: 294900

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 294899, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 294899, gnupg/trunk/install)
  gnupg/repos/testing-i686/keyring.patch
(from rev 294899, gnupg/trunk/keyring.patch)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 294899, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 294899, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/keyring.patch
(from rev 294899, gnupg/trunk/keyring.patch)

--+
 testing-i686/PKGBUILD|   70 +
 testing-i686/install |   10 +
 testing-i686/keyring.patch   |   44 +
 testing-x86_64/PKGBUILD  |   70 +
 testing-x86_64/install   |   10 +
 testing-x86_64/keyring.patch |   44 +
 6 files changed, 248 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 294899, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-04-27 09:02:47 UTC (rev 294900)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.20
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+'keyring.patch')
+sha256sums=('24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d'
+'SKIP'
+'23070daefc97bc7cca7e7a69539425135a9324a56bfadf54da2766ef6789d566')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   patch -p1 -i ../keyring.patch
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make check
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+
+   cd doc/examples/systemd-user
+   for i in *.*; do
+   install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
+   done
+}

Copied: gnupg/repos/testing-i686/install (from rev 294899, gnupg/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2017-04-27 09:02:47 UTC (rev 294900)
@@ -0,0 +1,10 @@
+post_install() {
+   # See FS#42798 and FS#47371
+   dirmngr /dev/null || true
+}
+
+post_upgrade() {
+   if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
+   echo "==> Please kill running gpg-agent and dirmngr processes 
before using this release."
+   fi
+}

Copied: gnupg/repos/testing-i686/keyring.patch (from rev 294899, 
gnupg/trunk/keyring.patch)
===
--- testing-i686/keyring.patch  (rev 0)
+++ testing-i686/keyring.patch  2017-04-27 09:02:47 UTC (rev 294900)
@@ -0,0 +1,44 @@
+From 116cfd60779fbb3540da629db54dc2e148f4a3a2 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka 
+Date: Tue, 25 Apr 2017 07:48:51 +0900
+Subject: [PATCH] g10: invalidate the fd cache for keyring.
+
+* g10/keyring.c (keyring_search_reset): Don't keep the FD cache.
+
+--
+
+GnuPG-bug-id: 3096
+Fixes-commit: 5556eca5acd46983bff0b38a1ffbc2f07fbaba9f

[arch-commits] Commit in gnupg/repos (8 files)

2017-02-18 Thread Gaëtan Bisson 
Date: Saturday, February 18, 2017 @ 17:20:25
  Author: bisson
Revision: 289208

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 289207, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 289207, gnupg/trunk/install)
  gnupg/repos/testing-i686/scd.patch
(from rev 289207, gnupg/trunk/scd.patch)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 289207, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 289207, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/scd.patch
(from rev 289207, gnupg/trunk/scd.patch)

--+
 testing-i686/PKGBUILD|   70 
 testing-i686/install |   10 
 testing-i686/scd.patch   |   97 +
 testing-x86_64/PKGBUILD  |   70 
 testing-x86_64/install   |   10 
 testing-x86_64/scd.patch |   97 +
 6 files changed, 354 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 289207, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-02-18 17:20:25 UTC (rev 289208)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.18
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+'scd.patch')
+sha1sums=('b698012cc2d77c2652afd168a15e679d1394fa89' 'SKIP'
+  '568f48e1048f1dac721dd4055447a93485f6b2b1')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   patch -p1 -i ../scd.patch
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make check || [[ $CARCH = i686 ]]
+   # 
https://lists.gnupg.org/pipermail/gnupg-devel/2016-December/032364.html
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+
+   cd doc/examples/systemd-user
+   for i in *.*; do
+   install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
+   done
+}

Copied: gnupg/repos/testing-i686/install (from rev 289207, gnupg/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2017-02-18 17:20:25 UTC (rev 289208)
@@ -0,0 +1,10 @@
+post_install() {
+   # See FS#42798 and FS#47371
+   dirmngr /dev/null || true
+}
+
+post_upgrade() {
+   if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
+   echo "==> Please kill running gpg-agent and dirmngr processes 
before using this release."
+   fi
+}

Copied: gnupg/repos/testing-i686/scd.patch (from rev 289207, 
gnupg/trunk/scd.patch)
===
--- testing-i686/scd.patch  (rev 0)
+++ testing-i686/scd.patch  2017-02-18 17:20:25 UTC (rev 289208)
@@ -0,0 +1,97 @@
+From da4c132cca2c6df81243c9660b7348268a848f88 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka 
+Date: Mon, 13 Feb 2017 11:09:13 +0900
+Subject: [PATCH 1/1] scd: Fix use case of PC/SC.
+
+* scd/apdu.c (apdu_open_reader): Add an argument APP_EMPTY.
+When CCID driver fails to open, try PC/SC if APP is nothing.
+* scd/app.c (select_application):

[arch-commits] Commit in gnupg/repos (8 files)

2016-12-22 Thread Gaëtan Bisson 
Date: Friday, December 23, 2016 @ 07:21:24
  Author: bisson
Revision: 284519

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 284518, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 284518, gnupg/trunk/install)
  gnupg/repos/testing-i686/libdns.patch
(from rev 284518, gnupg/trunk/libdns.patch)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 284518, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 284518, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/libdns.patch
(from rev 284518, gnupg/trunk/libdns.patch)

-+
 testing-i686/PKGBUILD   |   71 ++
 testing-i686/install|   10 +
 testing-i686/libdns.patch   |   50 +
 testing-x86_64/PKGBUILD |   71 ++
 testing-x86_64/install  |   10 +
 testing-x86_64/libdns.patch |   50 +
 6 files changed, 262 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 284518, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-12-23 07:21:24 UTC (rev 284519)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.17
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+'libdns.patch')
+sha1sums=('d83ab893faab35f37ace772ca29b939e6a5aa6a7' 'SKIP'
+  '704c9dd4b88c5ba6a613b2e2ad4aef4fd3a52412')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   patch -p1 -i ../libdns.patch
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+   --disable-libdns # FS#52234
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make check || [[ $CARCH = i686 ]]
+   # 
https://lists.gnupg.org/pipermail/gnupg-devel/2016-December/032364.html
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+
+   cd doc/examples/systemd-user
+   for i in *.*; do
+   install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
+   done
+}

Copied: gnupg/repos/testing-i686/install (from rev 284518, gnupg/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2016-12-23 07:21:24 UTC (rev 284519)
@@ -0,0 +1,10 @@
+post_install() {
+   # See FS#42798 and FS#47371
+   dirmngr /dev/null || true
+}
+
+post_upgrade() {
+   if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
+   echo "==> Please kill running gpg-agent and dirmngr processes 
before using this release."
+   fi
+}

Copied: gnupg/repos/testing-i686/libdns.patch (from rev 284518, 
gnupg/trunk/libdns.patch)
===
--- testing-i686/libdns.patch   (rev 0)
+++ testing-i686/libdns.patch   2016-12-23 07:21:24 UTC (rev 284519)
@@ -0,0 +1,50 @@
+diff -Naur old/dirmngr/dns-stuff.c new/dirmngr/dns-stuff.c
+--- old/dirmngr/dns-stuff.c2016-12-20 00:19:05.0 -1000
 new/dirmngr/dns-stuff.c2016-12-22 21:14:41.123388787 -1000
+@@ -181,7 +181,9 @@
+ enable_recursive_resolver (int yes)
+ {
+   recursive_resolver

[arch-commits] Commit in gnupg/repos (8 files)

2016-11-13 Thread Jan Steffens 
Date: Monday, November 14, 2016 @ 07:52:33
  Author: heftig
Revision: 280713

db-move: moved gnupg from [testing] to [core] (i686, x86_64)

Added:
  gnupg/repos/core-i686/
  gnupg/repos/core-i686/PKGBUILD
(from rev 280712, gnupg/repos/testing-i686/PKGBUILD)
  gnupg/repos/core-i686/install
(from rev 280712, gnupg/repos/testing-i686/install)
  gnupg/repos/core-x86_64/
  gnupg/repos/core-x86_64/PKGBUILD
(from rev 280712, gnupg/repos/testing-x86_64/PKGBUILD)
  gnupg/repos/core-x86_64/install
(from rev 280712, gnupg/repos/testing-x86_64/install)
Deleted:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-x86_64/

--+
 core-i686/PKGBUILD   |   61 +
 core-i686/install|   10 
 core-x86_64/PKGBUILD |   61 +
 core-x86_64/install  |   10 
 4 files changed, 142 insertions(+)

Copied: gnupg/repos/core-i686/PKGBUILD (from rev 280712, 
gnupg/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2016-11-14 07:52:33 UTC (rev 280713)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.15
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('908c86dac8e9a1fbf47e1605e570b11391b04ece' 'SKIP')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make check
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+}

Copied: gnupg/repos/core-i686/install (from rev 280712, 
gnupg/repos/testing-i686/install)
===
--- core-i686/install   (rev 0)
+++ core-i686/install   2016-11-14 07:52:33 UTC (rev 280713)
@@ -0,0 +1,10 @@
+post_install() {
+   # See FS#42798 and FS#47371
+   dirmngr /dev/null || true
+}
+
+post_upgrade() {
+   if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
+   echo "==> Please kill running gpg-agent and dirmngr processes 
before using this release."
+   fi
+}

Copied: gnupg/repos/core-x86_64/PKGBUILD (from rev 280712, 
gnupg/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2016-11-14 07:52:33 UTC (rev 280713)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.15
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')

[arch-commits] Commit in gnupg/repos (8 files)

2016-11-13 Thread Jan Steffens 
Date: Monday, November 14, 2016 @ 07:52:01
  Author: heftig
Revision: 280704

db-move: moved gnupg from [core] to [testing] (i686, x86_64)

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 280703, gnupg/repos/core-i686/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 280703, gnupg/repos/core-i686/install)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 280703, gnupg/repos/core-x86_64/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 280703, gnupg/repos/core-x86_64/install)
Deleted:
  gnupg/repos/core-i686/
  gnupg/repos/core-x86_64/

-+
 testing-i686/PKGBUILD   |   61 ++
 testing-i686/install|   10 +++
 testing-x86_64/PKGBUILD |   61 ++
 testing-x86_64/install  |   10 +++
 4 files changed, 142 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 280703, 
gnupg/repos/core-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-11-14 07:52:01 UTC (rev 280704)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.15
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('908c86dac8e9a1fbf47e1605e570b11391b04ece' 'SKIP')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make check
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+}

Copied: gnupg/repos/testing-i686/install (from rev 280703, 
gnupg/repos/core-i686/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2016-11-14 07:52:01 UTC (rev 280704)
@@ -0,0 +1,10 @@
+post_install() {
+   # See FS#42798 and FS#47371
+   dirmngr /dev/null || true
+}
+
+post_upgrade() {
+   if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
+   echo "==> Please kill running gpg-agent and dirmngr processes 
before using this release."
+   fi
+}

Copied: gnupg/repos/testing-x86_64/PKGBUILD (from rev 280703, 
gnupg/repos/core-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-11-14 07:52:01 UTC (rev 280704)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.15
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')

[arch-commits] Commit in gnupg/repos (8 files)

2016-07-14 Thread Gaëtan Bisson 
Date: Friday, July 15, 2016 @ 00:30:58
  Author: bisson
Revision: 271878

db-move: moved gnupg from [staging] to [testing] (i686, x86_64)

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 271877, gnupg/repos/staging-i686/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 271877, gnupg/repos/staging-i686/install)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 271877, gnupg/repos/staging-x86_64/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 271877, gnupg/repos/staging-x86_64/install)
Deleted:
  gnupg/repos/staging-i686/
  gnupg/repos/staging-x86_64/

-+
 testing-i686/PKGBUILD   |   61 ++
 testing-i686/install|   10 +++
 testing-x86_64/PKGBUILD |   61 ++
 testing-x86_64/install  |   10 +++
 4 files changed, 142 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 271877, 
gnupg/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-07-15 00:30:58 UTC (rev 271878)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.14
+pkgrel=1
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('bc7609a3a0daf0ed0efb22f77b43e82f28e20e34' 'SKIP')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make check
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+}

Copied: gnupg/repos/testing-i686/install (from rev 271877, 
gnupg/repos/staging-i686/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2016-07-15 00:30:58 UTC (rev 271878)
@@ -0,0 +1,10 @@
+post_install() {
+   # See FS#42798 and FS#47371
+   dirmngr /dev/null || true
+}
+
+post_upgrade() {
+   if [[ $(vercmp $2 2.1.13-1) = -1 ]]; then
+   echo "==> Please kill running gpg-agent and dirmngr processes 
before using this release."
+   fi
+}

Copied: gnupg/repos/testing-x86_64/PKGBUILD (from rev 271877, 
gnupg/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-07-15 00:30:58 UTC (rev 271878)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.14
+pkgrel=1
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+

[arch-commits] Commit in gnupg/repos (8 files)

2016-05-11 Thread Gaetan Bisson 
Date: Wednesday, May 11, 2016 @ 21:58:29
  Author: bisson
Revision: 267822

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 267821, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 267821, gnupg/trunk/install)
  gnupg/repos/testing-i686/sig-check-correction.diff
(from rev 267821, gnupg/trunk/sig-check-correction.diff)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 267821, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 267821, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/sig-check-correction.diff
(from rev 267821, gnupg/trunk/sig-check-correction.diff)

--+
 testing-i686/PKGBUILD|   65 +
 testing-i686/install |4 +
 testing-i686/sig-check-correction.diff   |   50 ++
 testing-x86_64/PKGBUILD  |   65 +
 testing-x86_64/install   |4 +
 testing-x86_64/sig-check-correction.diff |   50 ++
 6 files changed, 238 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 267821, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-05-11 19:58:29 UTC (rev 267822)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.12
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+'sig-check-correction.diff')
+sha1sums=('3b01a35ac04277ea31cc01b4ac4e230e54b5480c' 'SKIP'
+  '3b9e42ff60a3ec28f507e3da9401a7201e3cff14')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   patch -p1 -i ../sig-check-correction.diff
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make check
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+   rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059
+}

Copied: gnupg/repos/testing-i686/install (from rev 267821, gnupg/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2016-05-11 19:58:29 UTC (rev 267822)
@@ -0,0 +1,4 @@
+post_install() {
+   # See FS#42798 and FS#47371
+   dirmngr /dev/null || true
+}

Copied: gnupg/repos/testing-i686/sig-check-correction.diff (from rev 267821, 
gnupg/trunk/sig-check-correction.diff)
===
--- testing-i686/sig-check-correction.diff  (rev 0)
+++ testing-i686/sig-check-correction.diff  2016-05-11 19:58:29 UTC (rev 
267822)
@@ -0,0 +1,50 @@
+From 83a90a916e8e2f8e44c3b11d11e1dd75f65a87fb Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka 
+Date: Wed, 11 May 2016 19:27:03 +0900
+Subject: [PATCH 1/1] g10: Fix signature checking.
+
+* g10/sig-check.c (check_signature_over_key_or_uid): Fix call to
+walk_kbnode.
+
+--
+
+Thanks to Vincent Brillault (Feandil).
+
+GnuPG-bug-id: 2351
+Signed-off-by: NIIBE Yutaka 
+---
+ g10/sig-check.c | 13 +
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/g10/sig-check.c

[arch-commits] Commit in gnupg/repos (8 files)

2015-12-23 Thread Gaetan Bisson 
Date: Thursday, December 24, 2015 @ 05:01:46
  Author: bisson
Revision: 257238

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/PKGBUILD
(from rev 257237, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 257237, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 257237, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 257237, gnupg/trunk/install)
Deleted:
  gnupg/repos/testing-i686/PKGBUILD
  gnupg/repos/testing-i686/install
  gnupg/repos/testing-x86_64/PKGBUILD
  gnupg/repos/testing-x86_64/install

-+
 /PKGBUILD   |  124 ++
 /install|   46 +
 testing-i686/PKGBUILD   |   62 ---
 testing-i686/install|   25 -
 testing-x86_64/PKGBUILD |   62 ---
 testing-x86_64/install  |   25 -
 6 files changed, 170 insertions(+), 174 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2015-12-24 04:01:30 UTC (rev 257237)
+++ testing-i686/PKGBUILD   2015-12-24 04:01:46 UTC (rev 257238)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson 
-# Contributor: Tobias Powalowski 
-# Contributor: Andreas Radke 
-# Contributor: Judd Vinet 
-
-pkgname=gnupg
-pkgver=2.1.10
-pkgrel=2
-pkgdesc='Complete and free implementation of the OpenPGP standard'
-url='http://www.gnupg.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-optdepends=('libldap: gpg2keys_ldap'
-'libusb-compat: scdaemon')
-makedepends=('libldap' 'libusb-compat')
-depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
- 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
-validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
-  '46CC730865BB5C78EBABADCF04376F3EE0856959'
-  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
-  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('4aa2594d2d364fe7708a9739ae7cebd251e536c4' 'SKIP')
-
-install=install
-
-conflicts=('dirmngr' 'gnupg2')
-provides=('dirmngr' "gnupg2=${pkgver}")
-replaces=('dirmngr' 'gnupg2')
-
-prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
-}
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   ./configure \
-   --prefix=/usr \
-   --sysconfdir=/etc \
-   --sbindir=/usr/bin \
-   --libexecdir=/usr/lib/gnupg \
-   --enable-maintainer-mode \
-   --enable-symcryptrun \
-
-   make
-}
-
-check() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make check
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
-   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
-   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
-   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
-   rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059
-}

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 257237, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-12-24 04:01:46 UTC (rev 257238)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.10
+pkgrel=3
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('4aa2594d2d364fe7708a9739ae7cebd251e536c4' 'SKIP')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+

[arch-commits] Commit in gnupg/repos (8 files)

2015-12-04 Thread Gaetan Bisson 
Date: Friday, December 4, 2015 @ 22:55:28
  Author: bisson
Revision: 252359

db-move: moved gnupg from [staging] to [testing] (i686, x86_64)

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 252358, gnupg/repos/staging-i686/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 252358, gnupg/repos/staging-i686/install)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 252358, gnupg/repos/staging-x86_64/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 252358, gnupg/repos/staging-x86_64/install)
Deleted:
  gnupg/repos/staging-i686/
  gnupg/repos/staging-x86_64/

-+
 testing-i686/PKGBUILD   |   63 ++
 testing-i686/install|   25 ++
 testing-x86_64/PKGBUILD |   63 ++
 testing-x86_64/install  |   25 ++
 4 files changed, 176 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 252358, 
gnupg/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-12-04 21:55:28 UTC (rev 252359)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.10
+pkgrel=1
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('4aa2594d2d364fe7708a9739ae7cebd251e536c4' 'SKIP')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make check
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+   rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059
+}

Copied: gnupg/repos/testing-i686/install (from rev 252358, 
gnupg/repos/staging-i686/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2015-12-04 21:55:28 UTC (rev 252359)
@@ -0,0 +1,25 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+   [ -x usr/bin/install-info ] || return 0
+   for f in ${info_files[@]}; do
+   usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null
+   done
+}
+
+pre_remove() {
+   [ -x usr/bin/install-info ] || return 0
+   for f in ${info_files[@]}; do
+   usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> 
/dev/null
+   done
+}
+
+post_upgrade() {
+   post_install
+
+   # Fix upgrade to 2.1; see FS#42798
+   [ $(vercmp $2 2.1.0-4) = -1 ] &&
+   dirmngr /dev/null ||
+   return 0
+}

Copied: gnupg/repos/testing-x86_64/PKGBUILD (from rev 252358, 
gnupg/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-12-04 21:55:28 UTC (rev 252359)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.10
+pkgrel=1
+pkgdesc='Complete and free implementation of the OpenPGP standard'

[arch-commits] Commit in gnupg/repos (8 files)

2015-09-21 Thread Gaetan Bisson 
Date: Tuesday, September 22, 2015 @ 06:13:07
  Author: bisson
Revision: 247053

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 247052, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 247052, gnupg/trunk/install)
  gnupg/repos/testing-i686/ssh-ed25519.patch
(from rev 247052, gnupg/trunk/ssh-ed25519.patch)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 247052, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 247052, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/ssh-ed25519.patch
(from rev 247052, gnupg/trunk/ssh-ed25519.patch)

--+
 testing-i686/PKGBUILD|   66 +
 testing-i686/install |   25 ++
 testing-i686/ssh-ed25519.patch   |   60 +
 testing-x86_64/PKGBUILD  |   66 +
 testing-x86_64/install   |   25 ++
 testing-x86_64/ssh-ed25519.patch |   60 +
 6 files changed, 302 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 247052, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-09-22 04:13:07 UTC (rev 247053)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.8
+pkgrel=3
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
+'ssh-ed25519.patch')
+sha1sums=('61f5bc656dd7fddd4ab67b720d47ef0651bfb727' 'SKIP'
+  'fd77cf366f6bd70c1d33e910044612aebe6bbe63')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+   patch -p1 -i ../ssh-ed25519.patch
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make check
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
+   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+   rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059
+}

Copied: gnupg/repos/testing-i686/install (from rev 247052, gnupg/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2015-09-22 04:13:07 UTC (rev 247053)
@@ -0,0 +1,25 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+   [ -x usr/bin/install-info ] || return 0
+   for f in ${info_files[@]}; do
+   usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null
+   done
+}
+
+pre_remove() {
+   [ -x usr/bin/install-info ] || return 0
+   for f in ${info_files[@]}; do
+   usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> 
/dev/null
+   done
+}
+
+post_upgrade() {
+   post_install
+
+   # Fix upgrade to 2.1; see FS#42798
+   [ $(vercmp $2 2.1.0-4) = -1 ] &&
+   dirmngr /dev/null ||
+   return 0
+}

Copied: gnupg/repos/testing-i686/ssh-ed25519.patch (from rev 247052, 
gnupg/trunk/ssh-ed25519.patch)
===
--- testing-i686/ssh-ed25519.patch  (rev 0)
+++ testing-i686/ssh-ed25519.patch  2015-09-22 04:13:07 UTC (rev 247053)
@@ -0,0 +1,60 @@

[arch-commits] Commit in gnupg/repos (8 files)

2015-09-14 Thread Gaetan Bisson 
Date: Monday, September 14, 2015 @ 17:56:49
  Author: bisson
Revision: 246033

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/PKGBUILD
(from rev 246032, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 246032, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 246032, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 246032, gnupg/trunk/install)
Deleted:
  gnupg/repos/testing-i686/PKGBUILD
  gnupg/repos/testing-i686/install
  gnupg/repos/testing-x86_64/PKGBUILD
  gnupg/repos/testing-x86_64/install

-+
 /PKGBUILD   |  126 ++
 /install|   50 ++
 testing-i686/PKGBUILD   |   63 ---
 testing-i686/install|   25 -
 testing-x86_64/PKGBUILD |   63 ---
 testing-x86_64/install  |   25 -
 6 files changed, 176 insertions(+), 176 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2015-09-14 15:56:17 UTC (rev 246032)
+++ testing-i686/PKGBUILD   2015-09-14 15:56:49 UTC (rev 246033)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson 
-# Contributor: Tobias Powalowski 
-# Contributor: Andreas Radke 
-# Contributor: Judd Vinet 
-
-pkgname=gnupg
-pkgver=2.1.8
-pkgrel=1
-pkgdesc='Complete and free implementation of the OpenPGP standard'
-url='http://www.gnupg.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-optdepends=('libldap: gpg2keys_ldap'
-'libusb-compat: scdaemon')
-makedepends=('libldap' 'libusb-compat')
-depends=('npth' 'libgpg-error' 'libgcrypt' 'libassuan'
- 'pinentry' 'bzip2' 'readline' 'gnutls')
-validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
-  '46CC730865BB5C78EBABADCF04376F3EE0856959'
-  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
-  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
-source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
-sha1sums=('61f5bc656dd7fddd4ab67b720d47ef0651bfb727' 'SKIP')
-
-install=install
-
-conflicts=('dirmngr' 'gnupg2')
-provides=('dirmngr' "gnupg2=${pkgver}")
-replaces=('dirmngr' 'gnupg2')
-
-prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
-}
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   ./configure \
-   --prefix=/usr \
-   --sysconfdir=/etc \
-   --sbindir=/usr/bin \
-   --libexecdir=/usr/lib/gnupg \
-   --enable-maintainer-mode \
-   --enable-symcryptrun \
-   --enable-gpgtar \
-
-   make
-}
-
-check() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make check
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
-   ln -s gpg2 "${pkgdir}"/usr/bin/gpg
-   ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
-   ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
-   rm "${pkgdir}/usr/share/gnupg/com-certs.pem" # FS#33059
-}

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 246032, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-09-14 15:56:49 UTC (rev 246033)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Gaetan Bisson 
+# Contributor: Tobias Powalowski 
+# Contributor: Andreas Radke 
+# Contributor: Judd Vinet 
+
+pkgname=gnupg
+pkgver=2.1.8
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('61f5bc656dd7fddd4ab67b720d47ef0651bfb727' 'SKIP')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' "gnupg2=${pkgver}")
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+}
+
+build() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure \
+

[arch-commits] Commit in gnupg/repos (8 files)

2015-04-09 Thread Gaetan Bisson 
Date: Thursday, April 9, 2015 @ 22:45:14
  Author: bisson
Revision: 235994

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  gnupg/repos/staging-i686/
  gnupg/repos/staging-i686/PKGBUILD
(from rev 235993, gnupg/trunk/PKGBUILD)
  gnupg/repos/staging-i686/hkps-hostname.patch
(from rev 235993, gnupg/trunk/hkps-hostname.patch)
  gnupg/repos/staging-i686/install
(from rev 235993, gnupg/trunk/install)
  gnupg/repos/staging-x86_64/
  gnupg/repos/staging-x86_64/PKGBUILD
(from rev 235993, gnupg/trunk/PKGBUILD)
  gnupg/repos/staging-x86_64/hkps-hostname.patch
(from rev 235993, gnupg/trunk/hkps-hostname.patch)
  gnupg/repos/staging-x86_64/install
(from rev 235993, gnupg/trunk/install)

+
 staging-i686/PKGBUILD  |   66 +++
 staging-i686/hkps-hostname.patch   |  100 +++
 staging-i686/install   |   25 
 staging-x86_64/PKGBUILD|   66 +++
 staging-x86_64/hkps-hostname.patch |  100 +++
 staging-x86_64/install |   25 
 6 files changed, 382 insertions(+)

Copied: gnupg/repos/staging-i686/PKGBUILD (from rev 235993, 
gnupg/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-04-09 20:45:14 UTC (rev 235994)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.1.2
+pkgrel=4
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+'hkps-hostname.patch')
+sha1sums=('7e972cb9af47d9b8ce164dcf37fc4f32634d6cd6' 'SKIP'
+  '11d96926f92c3303bf8443d55863fdf12c76f43a')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' gnupg2=${pkgver})
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../hkps-hostname.patch # FS#43364
+   sed '/noinst_SCRIPTS = gpg-zip/c bin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+}
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
+}

Copied: gnupg/repos/staging-i686/hkps-hostname.patch (from rev 235993, 
gnupg/trunk/hkps-hostname.patch)
===
--- staging-i686/hkps-hostname.patch(rev 0)
+++ staging-i686/hkps-hostname.patch2015-04-09 20:45:14 UTC (rev 235994)
@@ -0,0 +1,100 @@
+From: Werner Koch w...@gnupg.org
+Date: Thu, 19 Mar 2015 14:37:05 + (+0100)
+Subject: hkps: Fix host name verification when using pools.
+X-Git-Url: 
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=dc10d466bff53821f23d2cb4814c259d40c5d9c5;hp=28bb3ab686c1c994f67a92b6846b3726c58a0bc3
+
+hkps: Fix host name verification when using pools.
+
+* common/http.c (send_request): Set the requested for SNI.
+* dirmngr/ks-engine-hkp.c (map_host): Return the poolname and not
+the selecting a host.
+--
+
+GnuPG-bug-id: 1792
+
+Thanks to davidw for figuring out the problem.
+
+Signed-off-by: Werner Koch w...@gnupg.org
+---
+
+diff --git a/common/http.c b/common/http.c
+index 50c0692..12e3fcb 100644
+--- a/common/http.c
 b/common/http.c
+@@ -1443,7 +1443,8 @@ send_request (http_t hd, const char *httphost, const 
char *auth,
+ }
+ 
+ # if HTTP_USE_NTBTLS
+-  err = ntbtls_set_hostname (hd-session-tls_session, server);
++  err = ntbtls_set_hostname

[arch-commits] Commit in gnupg/repos (8 files)

2015-03-26 Thread Gaetan Bisson 
Date: Thursday, March 26, 2015 @ 18:51:17
  Author: bisson
Revision: 234980

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 234979, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/hkps-hostname.patch
(from rev 234979, gnupg/trunk/hkps-hostname.patch)
  gnupg/repos/testing-i686/install
(from rev 234979, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 234979, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/hkps-hostname.patch
(from rev 234979, gnupg/trunk/hkps-hostname.patch)
  gnupg/repos/testing-x86_64/install
(from rev 234979, gnupg/trunk/install)

+
 testing-i686/PKGBUILD  |   66 +++
 testing-i686/hkps-hostname.patch   |  100 +++
 testing-i686/install   |   25 
 testing-x86_64/PKGBUILD|   66 +++
 testing-x86_64/hkps-hostname.patch |  100 +++
 testing-x86_64/install |   25 
 6 files changed, 382 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 234979, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-03-26 17:51:17 UTC (rev 234980)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.1.2
+pkgrel=3
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
+  '46CC730865BB5C78EBABADCF04376F3EE0856959'
+  '031EC2536E580D8EA286A9F22071B08A33BD3F06'
+  'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+'hkps-hostname.patch')
+sha1sums=('7e972cb9af47d9b8ce164dcf37fc4f32634d6cd6' 'SKIP'
+  '11d96926f92c3303bf8443d55863fdf12c76f43a')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' gnupg2=${pkgver})
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../hkps-hostname.patch # FS#43364
+   sed '/noinst_SCRIPTS = gpg-zip/c bin_SCRIPTS += gpg-zip' -i 
tools/Makefile.in
+}
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
+}

Copied: gnupg/repos/testing-i686/hkps-hostname.patch (from rev 234979, 
gnupg/trunk/hkps-hostname.patch)
===
--- testing-i686/hkps-hostname.patch(rev 0)
+++ testing-i686/hkps-hostname.patch2015-03-26 17:51:17 UTC (rev 234980)
@@ -0,0 +1,100 @@
+From: Werner Koch w...@gnupg.org
+Date: Thu, 19 Mar 2015 14:37:05 + (+0100)
+Subject: hkps: Fix host name verification when using pools.
+X-Git-Url: 
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=dc10d466bff53821f23d2cb4814c259d40c5d9c5;hp=28bb3ab686c1c994f67a92b6846b3726c58a0bc3
+
+hkps: Fix host name verification when using pools.
+
+* common/http.c (send_request): Set the requested for SNI.
+* dirmngr/ks-engine-hkp.c (map_host): Return the poolname and not
+the selecting a host.
+--
+
+GnuPG-bug-id: 1792
+
+Thanks to davidw for figuring out the problem.
+
+Signed-off-by: Werner Koch w...@gnupg.org
+---
+
+diff --git a/common/http.c b/common/http.c
+index 50c0692..12e3fcb 100644
+--- a/common/http.c
 b/common/http.c
+@@ -1443,7 +1443,8 @@ send_request (http_t hd, const char *httphost, const 
char *auth,
+ }
+ 
+ # if HTTP_USE_NTBTLS
+-  err = ntbtls_set_hostname (hd-session-tls_session, server);
++  err = ntbtls_set_hostname

[arch-commits] Commit in gnupg/repos (8 files)

2015-03-19 Thread Gaetan Bisson 
Date: Thursday, March 19, 2015 @ 22:15:31
  Author: bisson
Revision: 234176

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 234175, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/hkps-hostname.patch
(from rev 234175, gnupg/trunk/hkps-hostname.patch)
  gnupg/repos/testing-i686/install
(from rev 234175, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 234175, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/hkps-hostname.patch
(from rev 234175, gnupg/trunk/hkps-hostname.patch)
  gnupg/repos/testing-x86_64/install
(from rev 234175, gnupg/trunk/install)

+
 testing-i686/PKGBUILD  |   61 +
 testing-i686/hkps-hostname.patch   |  100 +++
 testing-i686/install   |   25 
 testing-x86_64/PKGBUILD|   61 +
 testing-x86_64/hkps-hostname.patch |  100 +++
 testing-x86_64/install |   25 
 6 files changed, 372 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 234175, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-03-19 21:15:31 UTC (rev 234176)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.1.2
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline' 'gnutls')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2;
+'hkps-hostname.patch')
+sha1sums=('7e972cb9af47d9b8ce164dcf37fc4f32634d6cd6'
+  '11d96926f92c3303bf8443d55863fdf12c76f43a')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' gnupg2=${pkgver})
+replaces=('dirmngr' 'gnupg2')
+
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../hkps-hostname.patch # FS#43364
+}
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
+}

Copied: gnupg/repos/testing-i686/hkps-hostname.patch (from rev 234175, 
gnupg/trunk/hkps-hostname.patch)
===
--- testing-i686/hkps-hostname.patch(rev 0)
+++ testing-i686/hkps-hostname.patch2015-03-19 21:15:31 UTC (rev 234176)
@@ -0,0 +1,100 @@
+From: Werner Koch w...@gnupg.org
+Date: Thu, 19 Mar 2015 14:37:05 + (+0100)
+Subject: hkps: Fix host name verification when using pools.
+X-Git-Url: 
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=dc10d466bff53821f23d2cb4814c259d40c5d9c5;hp=28bb3ab686c1c994f67a92b6846b3726c58a0bc3
+
+hkps: Fix host name verification when using pools.
+
+* common/http.c (send_request): Set the requested for SNI.
+* dirmngr/ks-engine-hkp.c (map_host): Return the poolname and not
+the selecting a host.
+--
+
+GnuPG-bug-id: 1792
+
+Thanks to davidw for figuring out the problem.
+
+Signed-off-by: Werner Koch w...@gnupg.org
+---
+
+diff --git a/common/http.c b/common/http.c
+index 50c0692..12e3fcb 100644
+--- a/common/http.c
 b/common/http.c
+@@ -1443,7 +1443,8 @@ send_request (http_t hd, const char *httphost, const 
char *auth,
+ }
+ 
+ # if HTTP_USE_NTBTLS
+-  err = ntbtls_set_hostname (hd-session-tls_session, server);
++  err = ntbtls_set_hostname (hd-session-tls_session,
++ hd-session-servername);
+   if (err)
+ {
+   log_info (ntbtls_set_hostname failed: %s\n, gpg_strerror (err));
+@@ -1452,7 +1453,8 @@ send_request (http_t hd, const char *httphost, const 
char *auth,
+ # elif HTTP_USE_GNUTLS
+   rc = gnutls_server_name_set

[arch-commits] Commit in gnupg/repos (8 files)

2014-11-11 Thread Gaetan Bisson 
Date: Tuesday, November 11, 2014 @ 19:53:51
  Author: bisson
Revision: 226070

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/PKGBUILD
(from rev 226069, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 226069, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 226069, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 226069, gnupg/trunk/install)
Deleted:
  gnupg/repos/testing-i686/PKGBUILD
  gnupg/repos/testing-i686/install
  gnupg/repos/testing-x86_64/PKGBUILD
  gnupg/repos/testing-x86_64/install

-+
 /PKGBUILD   |  112 ++
 /install|   40 
 testing-i686/PKGBUILD   |   56 ---
 testing-i686/install|   20 
 testing-x86_64/PKGBUILD |   56 ---
 testing-x86_64/install  |   20 
 6 files changed, 152 insertions(+), 152 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2014-11-11 18:53:23 UTC (rev 226069)
+++ testing-i686/PKGBUILD   2014-11-11 18:53:51 UTC (rev 226070)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-# Contributor: Tobias Powalowski tp...@archlinux.org
-# Contributor: Andreas Radke andy...@archlinux.org
-# Contributor: Judd Vinet jvi...@zeroflux.org
-
-pkgname=gnupg
-pkgver=2.1.0
-pkgrel=1
-pkgdesc='Complete and free implementation of the OpenPGP standard'
-url='http://www.gnupg.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-optdepends=('curl: gpg2keys_curl'
-'libldap: gpg2keys_ldap'
-'libusb-compat: scdaemon')
-makedepends=('curl' 'libldap' 'libusb-compat')
-depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
- 'pinentry' 'bzip2' 'readline')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('2fcd0ca6889ef6cb59e3275e8411f8b7778c2f33' 'SKIP')
-
-install=install
-
-conflicts=('dirmngr' 'gnupg2')
-provides=('dirmngr' gnupg2=${pkgver})
-replaces=('dirmngr' 'dirmngr')
-
-build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   ./configure \
-   --prefix=/usr \
-   --sysconfdir=/etc \
-   --sbindir=/usr/bin \
-   --libexecdir=/usr/lib/gnupg \
-   --enable-maintainer-mode \
-   --enable-standard-socket \
-   --enable-symcryptrun \
-   --enable-gpgtar \
-
-   make
-}
-
-check() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make check
-}
-
-package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make DESTDIR=${pkgdir} install
-   ln -s gpg2 ${pkgdir}/usr/bin/gpg
-   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
-   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
-   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
-}

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 226069, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-11-11 18:53:51 UTC (rev 226070)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.1.0
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha1sums=('2fcd0ca6889ef6cb59e3275e8411f8b7778c2f33' 'SKIP')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' gnupg2=${pkgver})
+replaces=('dirmngr' 'gnupg2')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-standard-socket \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+   rm

[arch-commits] Commit in gnupg/repos (8 files)

2014-11-10 Thread Gaetan Bisson 
Date: Tuesday, November 11, 2014 @ 00:24:32
  Author: bisson
Revision: 225965

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/PKGBUILD
(from rev 225963, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 225963, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 225963, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 225964, gnupg/trunk/install)
Deleted:
  gnupg/repos/testing-i686/PKGBUILD
  gnupg/repos/testing-i686/install
  gnupg/repos/testing-x86_64/PKGBUILD
  gnupg/repos/testing-x86_64/install

-+
 /PKGBUILD   |  112 ++
 /install|   40 
 testing-i686/PKGBUILD   |   56 ---
 testing-i686/install|   20 
 testing-x86_64/PKGBUILD |   56 ---
 testing-x86_64/install  |   20 
 6 files changed, 152 insertions(+), 152 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2014-11-10 23:24:23 UTC (rev 225964)
+++ testing-i686/PKGBUILD   2014-11-10 23:24:32 UTC (rev 225965)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-# Contributor: Tobias Powalowski tp...@archlinux.org
-# Contributor: Andreas Radke andy...@archlinux.org
-# Contributor: Judd Vinet jvi...@zeroflux.org
-
-pkgname=gnupg
-pkgver=2.1.0
-pkgrel=1
-pkgdesc='Complete and free implementation of the OpenPGP standard'
-url='http://www.gnupg.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-optdepends=('curl: gpg2keys_curl'
-'libldap: gpg2keys_ldap'
-'libusb-compat: scdaemon')
-makedepends=('curl' 'libldap' 'libusb-compat')
-depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
- 'pinentry' 'bzip2' 'readline')
-source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('2fcd0ca6889ef6cb59e3275e8411f8b7778c2f33' 'SKIP')
-
-install=install
-
-conflicts=('dirmngr' 'gnupg2')
-provides=('dirmngr' gnupg2=${pkgver})
-replaces=('dirmngr' 'dirmngr')
-
-build() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   ./configure \
-   --prefix=/usr \
-   --sysconfdir=/etc \
-   --sbindir=/usr/bin \
-   --libexecdir=/usr/lib/gnupg \
-   --enable-maintainer-mode \
-   --enable-standard-socket \
-   --enable-symcryptrun \
-   --enable-gpgtar \
-
-   make
-}
-
-check() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make check
-}
-
-package() {
-   cd ${srcdir}/${pkgname}-${pkgver}
-   make DESTDIR=${pkgdir} install
-   ln -s gpg2 ${pkgdir}/usr/bin/gpg
-   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
-   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
-   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
-}

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 225963, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-11-10 23:24:32 UTC (rev 225965)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.1.0
+pkgrel=1
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha1sums=('2fcd0ca6889ef6cb59e3275e8411f8b7778c2f33' 'SKIP')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' gnupg2=${pkgver})
+replaces=('dirmngr' 'dirmngr')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-standard-socket \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+   rm

[arch-commits] Commit in gnupg/repos (8 files)

2014-08-12 Thread Gaetan Bisson 
Date: Tuesday, August 12, 2014 @ 23:37:29
  Author: bisson
Revision: 219631

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 219630, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/PKGBUILD.21
(from rev 219630, gnupg/trunk/PKGBUILD.21)
  gnupg/repos/testing-i686/install
(from rev 219630, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 219630, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/PKGBUILD.21
(from rev 219630, gnupg/trunk/PKGBUILD.21)
  gnupg/repos/testing-x86_64/install
(from rev 219630, gnupg/trunk/install)

+
 testing-i686/PKGBUILD  |   55 +
 testing-i686/PKGBUILD.21   |   57 +++
 testing-i686/install   |   20 +++
 testing-x86_64/PKGBUILD|   55 +
 testing-x86_64/PKGBUILD.21 |   57 +++
 testing-x86_64/install |   20 +++
 6 files changed, 264 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 219630, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-08-12 21:37:29 UTC (rev 219631)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.0.26
+pkgrel=1
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+sha1sums=('3ff5b38152c919724fd09cf2f17df704272ba192' 'SKIP')
+
+install=install
+
+conflicts=('gnupg2')
+provides=(gnupg2=${pkgver})
+replaces=('gnupg2')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-standard-socket \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
+}

Copied: gnupg/repos/testing-i686/PKGBUILD.21 (from rev 219630, 
gnupg/trunk/PKGBUILD.21)
===
--- testing-i686/PKGBUILD.21(rev 0)
+++ testing-i686/PKGBUILD.212014-08-12 21:37:29 UTC (rev 219631)
@@ -0,0 +1,57 @@
+# $Id: PKGBUILD 215944 2014-07-01 06:16:40Z bisson $
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+_pkgver=2.1.0-beta751
+pkgver=${_pkgver/-/.}
+pkgrel=1
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
+ 'pinentry' 'bzip2' 'readline')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/unstable/${pkgname}-${_pkgver}.tar.bz2{,.sig})
+sha1sums=('3d6dd8a35780626428d98dba80dbbc5c27ac' 'SKIP')
+
+install=install
+
+conflicts=('dirmngr' 'gnupg2')
+provides=('dirmngr' gnupg2=${pkgver})
+replaces=('dirmngr' 'dirmngr')
+
+build() {
+   cd ${srcdir}/${pkgname}-${_pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-standard-socket \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${_pkgver}
+   make check
+}
+
+package() {
+   cd

[arch-commits] Commit in gnupg/repos (8 files)

2014-06-03 Thread Gaetan Bisson 
Date: Tuesday, June 3, 2014 @ 13:16:10
  Author: bisson
Revision: 214081

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 214080, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 214080, gnupg/trunk/install)
  gnupg/repos/testing-i686/protect-tool-env.patch
(from rev 214080, gnupg/trunk/protect-tool-env.patch)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 214080, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 214080, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/protect-tool-env.patch
(from rev 214080, gnupg/trunk/protect-tool-env.patch)

---+
 testing-i686/PKGBUILD |   61 
 testing-i686/install  |   20 ++
 testing-i686/protect-tool-env.patch   |   28 ++
 testing-x86_64/PKGBUILD   |   61 
 testing-x86_64/install|   20 ++
 testing-x86_64/protect-tool-env.patch |   28 ++
 6 files changed, 218 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 214080, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-06-03 11:16:10 UTC (rev 214081)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.0.23
+pkgrel=1
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+'protect-tool-env.patch')
+sha1sums=('c90e47ab95a40dd070fd75faef0a05c7b679553b' 'SKIP'
+  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
+
+install=install
+
+conflicts=('gnupg2')
+provides=(gnupg2=${pkgver})
+replaces=('gnupg2')
+
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../protect-tool-env.patch # FS#31900
+}
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
+}

Copied: gnupg/repos/testing-i686/install (from rev 214080, gnupg/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2014-06-03 11:16:10 UTC (rev 214081)
@@ -0,0 +1,20 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}

Copied: gnupg/repos/testing-i686/protect-tool-env.patch (from rev 214080, 
gnupg/trunk/protect-tool-env.patch)
===
--- testing-i686/protect-tool-env.patch (rev 0)
+++ testing-i686/protect-tool-env.patch 2014-06-03 11:16:10 UTC (rev 214081)
@@ -0,0 +1,28 @@
+diff -Naur old/agent/protect-tool.c new/agent/protect-tool.c
+--- old/agent/protect-tool.c   2012-12-08 13:53:17.067611957 +1100
 new/agent/protect-tool.c   2012-12-08 13:53:28.247633012 +1100
+@@ -102,6 +102,7 @@
+ static int opt_status_msg;
+ static const char *opt_p12_charset;
+ static const char *opt_agent_program; 
++static session_env_t opt_session_env;
+ 
+ static char *get_passphrase (int promptno);
+ static void release_passphrase (char *pw);
+@@ -1040,6 +1041,7 @@
+ 
+   opt_homedir = default_homedir ();
+

[arch-commits] Commit in gnupg/repos (8 files)

2013-12-16 Thread Thomas Bächler 
Date: Tuesday, December 17, 2013 @ 00:09:11
  Author: thomas
Revision: 201608

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  gnupg/repos/staging-i686/
  gnupg/repos/staging-i686/PKGBUILD
(from rev 201607, gnupg/trunk/PKGBUILD)
  gnupg/repos/staging-i686/install
(from rev 201607, gnupg/trunk/install)
  gnupg/repos/staging-i686/protect-tool-env.patch
(from rev 201607, gnupg/trunk/protect-tool-env.patch)
  gnupg/repos/staging-x86_64/
  gnupg/repos/staging-x86_64/PKGBUILD
(from rev 201607, gnupg/trunk/PKGBUILD)
  gnupg/repos/staging-x86_64/install
(from rev 201607, gnupg/trunk/install)
  gnupg/repos/staging-x86_64/protect-tool-env.patch
(from rev 201607, gnupg/trunk/protect-tool-env.patch)

---+
 staging-i686/PKGBUILD |   61 
 staging-i686/install  |   20 ++
 staging-i686/protect-tool-env.patch   |   28 ++
 staging-x86_64/PKGBUILD   |   61 
 staging-x86_64/install|   20 ++
 staging-x86_64/protect-tool-env.patch |   28 ++
 6 files changed, 218 insertions(+)

Copied: gnupg/repos/staging-i686/PKGBUILD (from rev 201607, 
gnupg/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2013-12-16 23:09:11 UTC (rev 201608)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.0.22
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+'protect-tool-env.patch')
+sha1sums=('9ba9ee288e9bf813e0f1e25cbe06b58d3072d8b8' 'SKIP'
+  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
+
+install=install
+
+conflicts=('gnupg2')
+provides=(gnupg2=${pkgver})
+replaces=('gnupg2')
+
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../protect-tool-env.patch # FS#31900
+}
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
+}

Copied: gnupg/repos/staging-i686/install (from rev 201607, gnupg/trunk/install)
===
--- staging-i686/install(rev 0)
+++ staging-i686/install2013-12-16 23:09:11 UTC (rev 201608)
@@ -0,0 +1,20 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}

Copied: gnupg/repos/staging-i686/protect-tool-env.patch (from rev 201607, 
gnupg/trunk/protect-tool-env.patch)
===
--- staging-i686/protect-tool-env.patch (rev 0)
+++ staging-i686/protect-tool-env.patch 2013-12-16 23:09:11 UTC (rev 201608)
@@ -0,0 +1,28 @@
+diff -Naur old/agent/protect-tool.c new/agent/protect-tool.c
+--- old/agent/protect-tool.c   2012-12-08 13:53:17.067611957 +1100
 new/agent/protect-tool.c   2012-12-08 13:53:28.247633012 +1100
+@@ -102,6 +102,7 @@
+ static int opt_status_msg;
+ static const char *opt_p12_charset;
+ static const char *opt_agent_program; 
++static session_env_t opt_session_env;
+ 
+ static char *get_passphrase (int promptno);
+ static void release_passphrase (char *pw);
+@@ -1040,6 +1041,7 @@
+ 
+   opt_homedir = default_homedir

[arch-commits] Commit in gnupg/repos (8 files)

2013-10-05 Thread Gaetan Bisson 
Date: Saturday, October 5, 2013 @ 16:13:01
  Author: bisson
Revision: 195925

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 195924, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 195924, gnupg/trunk/install)
  gnupg/repos/testing-i686/protect-tool-env.patch
(from rev 195924, gnupg/trunk/protect-tool-env.patch)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 195924, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 195924, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/protect-tool-env.patch
(from rev 195924, gnupg/trunk/protect-tool-env.patch)

---+
 testing-i686/PKGBUILD |   61 
 testing-i686/install  |   20 ++
 testing-i686/protect-tool-env.patch   |   28 ++
 testing-x86_64/PKGBUILD   |   61 
 testing-x86_64/install|   20 ++
 testing-x86_64/protect-tool-env.patch |   28 ++
 6 files changed, 218 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 195924, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-10-05 14:13:01 UTC (rev 195925)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.0.22
+pkgrel=1
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+'protect-tool-env.patch')
+sha1sums=('9ba9ee288e9bf813e0f1e25cbe06b58d3072d8b8' 'SKIP'
+  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
+
+install=install
+
+conflicts=('gnupg2')
+provides=(gnupg2=${pkgver})
+replaces=('gnupg2')
+
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../protect-tool-env.patch # FS#31900
+}
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
+}

Copied: gnupg/repos/testing-i686/install (from rev 195924, gnupg/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2013-10-05 14:13:01 UTC (rev 195925)
@@ -0,0 +1,20 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}

Copied: gnupg/repos/testing-i686/protect-tool-env.patch (from rev 195924, 
gnupg/trunk/protect-tool-env.patch)
===
--- testing-i686/protect-tool-env.patch (rev 0)
+++ testing-i686/protect-tool-env.patch 2013-10-05 14:13:01 UTC (rev 195925)
@@ -0,0 +1,28 @@
+diff -Naur old/agent/protect-tool.c new/agent/protect-tool.c
+--- old/agent/protect-tool.c   2012-12-08 13:53:17.067611957 +1100
 new/agent/protect-tool.c   2012-12-08 13:53:28.247633012 +1100
+@@ -102,6 +102,7 @@
+ static int opt_status_msg;
+ static const char *opt_p12_charset;
+ static const char *opt_agent_program; 
++static session_env_t opt_session_env;
+ 
+ static char *get_passphrase (int promptno);
+ static void release_passphrase (char *pw);
+@@ -1040,6 +1041,7 @@
+ 
+   opt_homedir = default_homedir ();

[arch-commits] Commit in gnupg/repos (8 files)

2013-08-19 Thread Gaetan Bisson 
Date: Monday, August 19, 2013 @ 16:14:29
  Author: bisson
Revision: 193391

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 193390, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 193390, gnupg/trunk/install)
  gnupg/repos/testing-i686/protect-tool-env.patch
(from rev 193390, gnupg/trunk/protect-tool-env.patch)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 193390, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 193390, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/protect-tool-env.patch
(from rev 193390, gnupg/trunk/protect-tool-env.patch)

---+
 testing-i686/PKGBUILD |   61 
 testing-i686/install  |   20 ++
 testing-i686/protect-tool-env.patch   |   28 ++
 testing-x86_64/PKGBUILD   |   61 
 testing-x86_64/install|   20 ++
 testing-x86_64/protect-tool-env.patch |   28 ++
 6 files changed, 218 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 193390, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-08-19 14:14:29 UTC (rev 193391)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.0.21
+pkgrel=1
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+'protect-tool-env.patch')
+sha1sums=('5ba8cce72eb4fd1a3ac1a282d25d7c7b90d3bf26' 'SKIP'
+  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
+
+install=install
+
+conflicts=('gnupg2')
+provides=(gnupg2=${pkgver})
+replaces=('gnupg2')
+
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../protect-tool-env.patch # FS#31900
+}
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
+}

Copied: gnupg/repos/testing-i686/install (from rev 193390, gnupg/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2013-08-19 14:14:29 UTC (rev 193391)
@@ -0,0 +1,20 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}

Copied: gnupg/repos/testing-i686/protect-tool-env.patch (from rev 193390, 
gnupg/trunk/protect-tool-env.patch)
===
--- testing-i686/protect-tool-env.patch (rev 0)
+++ testing-i686/protect-tool-env.patch 2013-08-19 14:14:29 UTC (rev 193391)
@@ -0,0 +1,28 @@
+diff -Naur old/agent/protect-tool.c new/agent/protect-tool.c
+--- old/agent/protect-tool.c   2012-12-08 13:53:17.067611957 +1100
 new/agent/protect-tool.c   2012-12-08 13:53:28.247633012 +1100
+@@ -102,6 +102,7 @@
+ static int opt_status_msg;
+ static const char *opt_p12_charset;
+ static const char *opt_agent_program; 
++static session_env_t opt_session_env;
+ 
+ static char *get_passphrase (int promptno);
+ static void release_passphrase (char *pw);
+@@ -1040,6 +1041,7 @@
+ 
+   opt_homedir = default_homedir ();
+

[arch-commits] Commit in gnupg/repos (8 files)

2013-05-15 Thread Gaetan Bisson 
Date: Wednesday, May 15, 2013 @ 18:37:28
  Author: bisson
Revision: 185601

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 185600, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 185600, gnupg/trunk/install)
  gnupg/repos/testing-i686/protect-tool-env.patch
(from rev 185600, gnupg/trunk/protect-tool-env.patch)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 185600, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 185600, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/protect-tool-env.patch
(from rev 185600, gnupg/trunk/protect-tool-env.patch)

---+
 testing-i686/PKGBUILD |   61 
 testing-i686/install  |   20 ++
 testing-i686/protect-tool-env.patch   |   28 ++
 testing-x86_64/PKGBUILD   |   61 
 testing-x86_64/install|   20 ++
 testing-x86_64/protect-tool-env.patch |   28 ++
 6 files changed, 218 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 185600, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-05-15 16:37:28 UTC (rev 185601)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.0.20
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+'protect-tool-env.patch')
+sha1sums=('7ddfefa37ee9da89a8aaa8f9059d251b4cd02562' 'SKIP'
+  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
+
+install=install
+
+conflicts=('gnupg2')
+provides=(gnupg2=${pkgver})
+replaces=('gnupg2')
+
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../protect-tool-env.patch # FS#31900
+}
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --sbindir=/usr/bin \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
+}

Copied: gnupg/repos/testing-i686/install (from rev 185600, gnupg/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2013-05-15 16:37:28 UTC (rev 185601)
@@ -0,0 +1,20 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}

Copied: gnupg/repos/testing-i686/protect-tool-env.patch (from rev 185600, 
gnupg/trunk/protect-tool-env.patch)
===
--- testing-i686/protect-tool-env.patch (rev 0)
+++ testing-i686/protect-tool-env.patch 2013-05-15 16:37:28 UTC (rev 185601)
@@ -0,0 +1,28 @@
+diff -Naur old/agent/protect-tool.c new/agent/protect-tool.c
+--- old/agent/protect-tool.c   2012-12-08 13:53:17.067611957 +1100
 new/agent/protect-tool.c   2012-12-08 13:53:28.247633012 +1100
+@@ -102,6 +102,7 @@
+ static int opt_status_msg;
+ static const char *opt_p12_charset;
+ static const char *opt_agent_program; 
++static session_env_t opt_session_env;
+ 
+ static char *get_passphrase (int promptno);
+ static void release_passphrase (char *pw);
+@@ -1040,6 +1041,7 @@
+ 
+   opt_homedir = default_homedir ();
+

[arch-commits] Commit in gnupg/repos (8 files)

2013-05-10 Thread Gaetan Bisson 
Date: Friday, May 10, 2013 @ 21:08:38
  Author: bisson
Revision: 185065

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 185064, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 185064, gnupg/trunk/install)
  gnupg/repos/testing-i686/protect-tool-env.patch
(from rev 185064, gnupg/trunk/protect-tool-env.patch)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 185064, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 185064, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/protect-tool-env.patch
(from rev 185064, gnupg/trunk/protect-tool-env.patch)

---+
 testing-i686/PKGBUILD |   60 
 testing-i686/install  |   20 ++
 testing-i686/protect-tool-env.patch   |   28 ++
 testing-x86_64/PKGBUILD   |   60 
 testing-x86_64/install|   20 ++
 testing-x86_64/protect-tool-env.patch |   28 ++
 6 files changed, 216 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 185064, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-05-10 19:08:38 UTC (rev 185065)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.0.20
+pkgrel=1
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+'protect-tool-env.patch')
+sha1sums=('7ddfefa37ee9da89a8aaa8f9059d251b4cd02562' 'SKIP'
+  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
+
+install=install
+
+conflicts=('gnupg2')
+provides=(gnupg2=${pkgver})
+replaces=('gnupg2')
+
+prepare() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../protect-tool-env.patch # FS#31900
+}
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --libexecdir=/usr/lib/gnupg \
+   --enable-maintainer-mode \
+   --enable-symcryptrun \
+   --enable-gpgtar \
+
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpgv2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+   rm ${pkgdir}/usr/share/gnupg/com-certs.pem # FS#33059
+}

Copied: gnupg/repos/testing-i686/install (from rev 185064, gnupg/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2013-05-10 19:08:38 UTC (rev 185065)
@@ -0,0 +1,20 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}

Copied: gnupg/repos/testing-i686/protect-tool-env.patch (from rev 185064, 
gnupg/trunk/protect-tool-env.patch)
===
--- testing-i686/protect-tool-env.patch (rev 0)
+++ testing-i686/protect-tool-env.patch 2013-05-10 19:08:38 UTC (rev 185065)
@@ -0,0 +1,28 @@
+diff -Naur old/agent/protect-tool.c new/agent/protect-tool.c
+--- old/agent/protect-tool.c   2012-12-08 13:53:17.067611957 +1100
 new/agent/protect-tool.c   2012-12-08 13:53:28.247633012 +1100
+@@ -102,6 +102,7 @@
+ static int opt_status_msg;
+ static const char *opt_p12_charset;
+ static const char *opt_agent_program; 
++static session_env_t opt_session_env;
+ 
+ static char *get_passphrase (int promptno);
+ static void release_passphrase (char *pw);
+@@ -1040,6 +1041,7 @@
+ 
+   opt_homedir = default_homedir ();
+ 
++  opt_session_env = session_env_new

[arch-commits] Commit in gnupg/repos (8 files)

2012-12-07 Thread Gaetan Bisson 
Date: Friday, December 7, 2012 @ 22:15:35
  Author: bisson
Revision: 172987

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/
  gnupg/repos/testing-i686/PKGBUILD
(from rev 172986, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/install
(from rev 172986, gnupg/trunk/install)
  gnupg/repos/testing-i686/protect-tool-env.patch
(from rev 172986, gnupg/trunk/protect-tool-env.patch)
  gnupg/repos/testing-x86_64/
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 172986, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/install
(from rev 172986, gnupg/trunk/install)
  gnupg/repos/testing-x86_64/protect-tool-env.patch
(from rev 172986, gnupg/trunk/protect-tool-env.patch)

---+
 testing-i686/PKGBUILD |   49 
 testing-i686/install  |   20 +
 testing-i686/protect-tool-env.patch   |   28 ++
 testing-x86_64/PKGBUILD   |   49 
 testing-x86_64/install|   20 +
 testing-x86_64/protect-tool-env.patch |   28 ++
 6 files changed, 194 insertions(+)

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 172986, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-12-08 03:15:35 UTC (rev 172987)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.0.19
+pkgrel=3
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
+source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+'protect-tool-env.patch')
+sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f'
+  'f6e6830610a8629b0aad69d789373bf8ca481733'
+  '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
+
+install=install
+
+conflicts=('gnupg2')
+provides=(gnupg2=${pkgver})
+replaces=('gnupg2')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p1 -i ../protect-tool-env.patch # FS#31900
+   ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
+   make
+}
+
+check() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make check
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   ln -s gpg2 ${pkgdir}/usr/bin/gpg
+   ln -s gpg2 ${pkgdir}/usr/bin/gpgv
+   ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+}

Copied: gnupg/repos/testing-i686/install (from rev 172986, gnupg/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2012-12-08 03:15:35 UTC (rev 172987)
@@ -0,0 +1,20 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2 /dev/null
+  done
+}

Copied: gnupg/repos/testing-i686/protect-tool-env.patch (from rev 172986, 
gnupg/trunk/protect-tool-env.patch)
===
--- testing-i686/protect-tool-env.patch (rev 0)
+++ testing-i686/protect-tool-env.patch 2012-12-08 03:15:35 UTC (rev 172987)
@@ -0,0 +1,28 @@
+diff -Naur old/agent/protect-tool.c new/agent/protect-tool.c
+--- old/agent/protect-tool.c   2012-12-08 13:53:17.067611957 +1100
 new/agent/protect-tool.c   2012-12-08 13:53:28.247633012 +1100
+@@ -102,6 +102,7 @@
+ static int opt_status_msg;
+ static const char *opt_p12_charset;
+ static const char *opt_agent_program; 
++static session_env_t opt_session_env;
+ 
+ static char *get_passphrase (int promptno);
+ static void release_passphrase (char *pw);
+@@ -1040,6 +1041,7 @@
+ 
+   opt_homedir = default_homedir ();
+ 
++  opt_session_env = session_env_new ();
+ 
+   pargs.argc = argc;
+   pargs.argv = argv;
+@@ -1091,7 +1093,7 @@
+ opt.verbose,
+ opt_homedir,
+ opt_agent_program,
+-

[arch-commits] Commit in gnupg/repos (8 files)

2012-03-24 Thread Gaetan Bisson 
Date: Saturday, March 24, 2012 @ 16:57:26
  Author: bisson
Revision: 154248

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnupg/repos/testing-i686/PKGBUILD
(from rev 154247, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-i686/gnupg.install
(from rev 154247, gnupg/trunk/gnupg.install)
  gnupg/repos/testing-x86_64/PKGBUILD
(from rev 154247, gnupg/trunk/PKGBUILD)
  gnupg/repos/testing-x86_64/gnupg.install
(from rev 154247, gnupg/trunk/gnupg.install)
Deleted:
  gnupg/repos/testing-i686/PKGBUILD
  gnupg/repos/testing-i686/gnupg.install
  gnupg/repos/testing-x86_64/PKGBUILD
  gnupg/repos/testing-x86_64/gnupg.install

--+
 testing-i686/PKGBUILD|   87 -
 testing-i686/gnupg.install   |   42 +--
 testing-x86_64/PKGBUILD  |   87 -
 testing-x86_64/gnupg.install |   42 +--
 4 files changed, 130 insertions(+), 128 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2012-03-24 20:57:08 UTC (rev 154247)
+++ testing-i686/PKGBUILD   2012-03-24 20:57:26 UTC (rev 154248)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
-# Contributor: Andreas Radke andy...@archlinux.org
-# Contributor: Judd Vinet jvi...@zeroflux.org
-
-pkgname=gnupg
-pkgver=2.0.18
-pkgrel=1
-pkgdesc='Complete and free implementation of the OpenPGP standard'
-url='http://www.gnupg.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-optdepends=('curl: gpg2keys_curl'
-'libldap: gpg2keys_ldap'
-'libusb-compat: scdaemon'
-'texinfo: documentation')
-makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo')
-depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
-install=${pkgname}.install
-source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2{,.sig})
-sha1sums=('5ec2f718760cc3121970a140aeea004b64545c46'
-  'c1b15a6c204434081e2bd8249dde233b6c88c4d0')
-
-conflicts=('gnupg2')
-provides=(gnupg2=${pkgver})
-replaces=('gnupg2')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  ln -s gpg2 ${pkgdir}/usr/bin/gpg
-}

Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 154247, 
gnupg/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-03-24 20:57:26 UTC (rev 154248)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+# Contributor: Andreas Radke andy...@archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=gnupg
+pkgver=2.0.18
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+'libldap: gpg2keys_ldap'
+'libusb-compat: scdaemon'
+'texinfo: documentation')
+makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 
'dirmngr')
+install=${pkgname}.install
+source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2{,.sig})
+sha1sums=('5ec2f718760cc3121970a140aeea004b64545c46'
+  'c1b15a6c204434081e2bd8249dde233b6c88c4d0')
+
+conflicts=('gnupg2')
+provides=(gnupg2=${pkgver})
+replaces=('gnupg2')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  ln -s gpg2 ${pkgdir}/usr/bin/gpg
+  ln -s gpg2.1.gz ${pkgdir}/usr/share/man/man1/gpg.1.gz
+}

Deleted: testing-i686/gnupg.install
===
--- testing-i686/gnupg.install  2012-03-24 20:57:08 UTC (rev 154247)
+++ testing-i686/gnupg.install  2012-03-24 20:57:26 UTC (rev 154248)
@@ -1,21 +0,0 @@
-info_dir=/usr/share/info
-info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2 /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2 /dev/null
-  done
-}
-# vim:set ts=2 sw=2 et:

Copied: gnupg/repos/testing-i686/gnupg.install (from rev 154247, 
gnupg/trunk/gnupg.install)