[arch-commits] Commit in gnupg/repos (10 files)
Gaetan Bisson
bisson at nymeria.archlinux.org
Mon Jun 23 17:13:41 UTC 2014
Date: Monday, June 23, 2014 @ 19:13:41
Author: bisson
Revision: 215364
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gnupg/repos/testing-i686/
gnupg/repos/testing-i686/PKGBUILD
(from rev 215363, gnupg/trunk/PKGBUILD)
gnupg/repos/testing-i686/install
(from rev 215363, gnupg/trunk/install)
gnupg/repos/testing-i686/libgcrypt.patch
(from rev 215363, gnupg/trunk/libgcrypt.patch)
gnupg/repos/testing-i686/protect-tool-env.patch
(from rev 215363, gnupg/trunk/protect-tool-env.patch)
gnupg/repos/testing-x86_64/
gnupg/repos/testing-x86_64/PKGBUILD
(from rev 215363, gnupg/trunk/PKGBUILD)
gnupg/repos/testing-x86_64/install
(from rev 215363, gnupg/trunk/install)
gnupg/repos/testing-x86_64/libgcrypt.patch
(from rev 215363, gnupg/trunk/libgcrypt.patch)
gnupg/repos/testing-x86_64/protect-tool-env.patch
(from rev 215363, gnupg/trunk/protect-tool-env.patch)
---------------------------------------+
testing-i686/PKGBUILD | 64 ++++++++++++++++++++++++++++++++
testing-i686/install | 20 ++++++++++
testing-i686/libgcrypt.patch | 28 ++++++++++++++
testing-i686/protect-tool-env.patch | 28 ++++++++++++++
testing-x86_64/PKGBUILD | 64 ++++++++++++++++++++++++++++++++
testing-x86_64/install | 20 ++++++++++
testing-x86_64/libgcrypt.patch | 28 ++++++++++++++
testing-x86_64/protect-tool-env.patch | 28 ++++++++++++++
8 files changed, 280 insertions(+)
Copied: gnupg/repos/testing-i686/PKGBUILD (from rev 215363, gnupg/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-06-23 17:13:41 UTC (rev 215364)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=gnupg
+pkgver=2.0.23
+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'
+ 'libgcrypt.patch')
+sha1sums=('c90e47ab95a40dd070fd75faef0a05c7b679553b' 'SKIP'
+ '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db'
+ '700c462d7d106b845b655165b127e2b66cad3e30')
+
+install=install
+
+conflicts=('gnupg2')
+provides=("gnupg2=${pkgver}")
+replaces=('gnupg2')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../protect-tool-env.patch # FS#31900
+ patch -p1 -i ../libgcrypt.patch # FS#40552
+}
+
+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 215363, gnupg/trunk/install)
===================================================================
--- testing-i686/install (rev 0)
+++ testing-i686/install 2014-06-23 17:13:41 UTC (rev 215364)
@@ -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/libgcrypt.patch (from rev 215363, gnupg/trunk/libgcrypt.patch)
===================================================================
--- testing-i686/libgcrypt.patch (rev 0)
+++ testing-i686/libgcrypt.patch 2014-06-23 17:13:41 UTC (rev 215364)
@@ -0,0 +1,28 @@
+From ceef5568d53b286efe639c6fd1d37f154be133ef Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk at gnupg.org>
+Date: Mon, 23 Jun 2014 13:16:44 +0200
+Subject: [PATCH] ssh: Fix for newer Libgcrypt versions.
+
+* common/ssh-utils.c (get_fingerprint): Add GCRY_PK_ECC case.
+--
+
+Reported-by: Anatol Pomozov
+---
+ common/ssh-utils.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/common/ssh-utils.c b/common/ssh-utils.c
+index d8f057d..11ff0fb 100644
+--- a/common/ssh-utils.c
++++ b/common/ssh-utils.c
+@@ -89,6 +89,7 @@ get_fingerprint (gcry_sexp_t key, void **r_fpr, size_t *r_len,
+ elems = "pqgy";
+ gcry_md_write (md, "\0\0\0\x07ssh-dss", 11);
+ break;
++ case GCRY_PK_ECC:
+ case GCRY_PK_ECDSA:
+ /* We only support the 3 standard curves for now. It is just a
+ quick hack. */
+--
+2.0.0
+
Copied: gnupg/repos/testing-i686/protect-tool-env.patch (from rev 215363, gnupg/trunk/protect-tool-env.patch)
===================================================================
--- testing-i686/protect-tool-env.patch (rev 0)
+++ testing-i686/protect-tool-env.patch 2014-06-23 17:13:41 UTC (rev 215364)
@@ -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,
+- NULL, NULL, NULL);
++ NULL, NULL, opt_session_env);
+
+ if (opt_prompt)
+ opt_prompt = percent_plus_unescape (opt_prompt, 0);
Copied: gnupg/repos/testing-x86_64/PKGBUILD (from rev 215363, gnupg/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-06-23 17:13:41 UTC (rev 215364)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=gnupg
+pkgver=2.0.23
+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'
+ 'libgcrypt.patch')
+sha1sums=('c90e47ab95a40dd070fd75faef0a05c7b679553b' 'SKIP'
+ '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db'
+ '700c462d7d106b845b655165b127e2b66cad3e30')
+
+install=install
+
+conflicts=('gnupg2')
+provides=("gnupg2=${pkgver}")
+replaces=('gnupg2')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../protect-tool-env.patch # FS#31900
+ patch -p1 -i ../libgcrypt.patch # FS#40552
+}
+
+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-x86_64/install (from rev 215363, gnupg/trunk/install)
===================================================================
--- testing-x86_64/install (rev 0)
+++ testing-x86_64/install 2014-06-23 17:13:41 UTC (rev 215364)
@@ -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-x86_64/libgcrypt.patch (from rev 215363, gnupg/trunk/libgcrypt.patch)
===================================================================
--- testing-x86_64/libgcrypt.patch (rev 0)
+++ testing-x86_64/libgcrypt.patch 2014-06-23 17:13:41 UTC (rev 215364)
@@ -0,0 +1,28 @@
+From ceef5568d53b286efe639c6fd1d37f154be133ef Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk at gnupg.org>
+Date: Mon, 23 Jun 2014 13:16:44 +0200
+Subject: [PATCH] ssh: Fix for newer Libgcrypt versions.
+
+* common/ssh-utils.c (get_fingerprint): Add GCRY_PK_ECC case.
+--
+
+Reported-by: Anatol Pomozov
+---
+ common/ssh-utils.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/common/ssh-utils.c b/common/ssh-utils.c
+index d8f057d..11ff0fb 100644
+--- a/common/ssh-utils.c
++++ b/common/ssh-utils.c
+@@ -89,6 +89,7 @@ get_fingerprint (gcry_sexp_t key, void **r_fpr, size_t *r_len,
+ elems = "pqgy";
+ gcry_md_write (md, "\0\0\0\x07ssh-dss", 11);
+ break;
++ case GCRY_PK_ECC:
+ case GCRY_PK_ECDSA:
+ /* We only support the 3 standard curves for now. It is just a
+ quick hack. */
+--
+2.0.0
+
Copied: gnupg/repos/testing-x86_64/protect-tool-env.patch (from rev 215363, gnupg/trunk/protect-tool-env.patch)
===================================================================
--- testing-x86_64/protect-tool-env.patch (rev 0)
+++ testing-x86_64/protect-tool-env.patch 2014-06-23 17:13:41 UTC (rev 215364)
@@ -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,
+- NULL, NULL, NULL);
++ NULL, NULL, opt_session_env);
+
+ if (opt_prompt)
+ opt_prompt = percent_plus_unescape (opt_prompt, 0);
More information about the arch-commits
mailing list