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

Gaetan Bisson bisson at nymeria.archlinux.org
Fri May 17 13:22:09 EDT 2013


    Date: Friday, May 17, 2013 @ 19:22:08
  Author: bisson
Revision: 185721

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

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

------------------------------------+
 /PKGBUILD                          |  122 +++++++++++++++++++++++++++++++++++
 /install                           |   40 +++++++++++
 /protect-tool-env.patch            |   56 ++++++++++++++++
 core-i686/PKGBUILD                 |   60 -----------------
 core-i686/install                  |   20 -----
 core-i686/protect-tool-env.patch   |   28 --------
 core-x86_64/PKGBUILD               |   60 -----------------
 core-x86_64/install                |   20 -----
 core-x86_64/protect-tool-env.patch |   28 --------
 9 files changed, 218 insertions(+), 216 deletions(-)

Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2013-05-17 17:15:08 UTC (rev 185720)
+++ core-i686/PKGBUILD	2013-05-17 17:22:08 UTC (rev 185721)
@@ -1,60 +0,0 @@
-# $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.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/core-i686/PKGBUILD (from rev 185720, gnupg/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2013-05-17 17:22:08 UTC (rev 185721)
@@ -0,0 +1,61 @@
+# $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.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
+}

Deleted: core-i686/install
===================================================================
--- core-i686/install	2013-05-17 17:15:08 UTC (rev 185720)
+++ core-i686/install	2013-05-17 17:22:08 UTC (rev 185721)
@@ -1,20 +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
-}

Copied: gnupg/repos/core-i686/install (from rev 185720, gnupg/repos/testing-i686/install)
===================================================================
--- core-i686/install	                        (rev 0)
+++ core-i686/install	2013-05-17 17:22:08 UTC (rev 185721)
@@ -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
+}

Deleted: core-i686/protect-tool-env.patch
===================================================================
--- core-i686/protect-tool-env.patch	2013-05-17 17:15:08 UTC (rev 185720)
+++ core-i686/protect-tool-env.patch	2013-05-17 17:22:08 UTC (rev 185721)
@@ -1,28 +0,0 @@
-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/core-i686/protect-tool-env.patch (from rev 185720, gnupg/repos/testing-i686/protect-tool-env.patch)
===================================================================
--- core-i686/protect-tool-env.patch	                        (rev 0)
+++ core-i686/protect-tool-env.patch	2013-05-17 17:22:08 UTC (rev 185721)
@@ -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);

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2013-05-17 17:15:08 UTC (rev 185720)
+++ core-x86_64/PKGBUILD	2013-05-17 17:22:08 UTC (rev 185721)
@@ -1,60 +0,0 @@
-# $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.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/core-x86_64/PKGBUILD (from rev 185720, gnupg/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2013-05-17 17:22:08 UTC (rev 185721)
@@ -0,0 +1,61 @@
+# $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.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
+}

Deleted: core-x86_64/install
===================================================================
--- core-x86_64/install	2013-05-17 17:15:08 UTC (rev 185720)
+++ core-x86_64/install	2013-05-17 17:22:08 UTC (rev 185721)
@@ -1,20 +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
-}

Copied: gnupg/repos/core-x86_64/install (from rev 185720, gnupg/repos/testing-x86_64/install)
===================================================================
--- core-x86_64/install	                        (rev 0)
+++ core-x86_64/install	2013-05-17 17:22:08 UTC (rev 185721)
@@ -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
+}

Deleted: core-x86_64/protect-tool-env.patch
===================================================================
--- core-x86_64/protect-tool-env.patch	2013-05-17 17:15:08 UTC (rev 185720)
+++ core-x86_64/protect-tool-env.patch	2013-05-17 17:22:08 UTC (rev 185721)
@@ -1,28 +0,0 @@
-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/core-x86_64/protect-tool-env.patch (from rev 185720, gnupg/repos/testing-x86_64/protect-tool-env.patch)
===================================================================
--- core-x86_64/protect-tool-env.patch	                        (rev 0)
+++ core-x86_64/protect-tool-env.patch	2013-05-17 17:22:08 UTC (rev 185721)
@@ -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