[arch-commits] Commit in pacman/trunk (2 files)

[Allan McRae]

    Date: Friday, November 21, 2014 @ 12:22:42
  Author: allan
Revision: 226780

upgpkg: pacman 4.1.2-7

fix gnupg 2.1 issue

Added:
  pacman/trunk/0001-pacman-key-compatibility-with-gnupg-2.1.patch
Modified:
  pacman/trunk/PKGBUILD

----------------------------------------------------+
 0001-pacman-key-compatibility-with-gnupg-2.1.patch |   27 +++++++++++++++++++
 PKGBUILD                                           |   10 ++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

Added: 0001-pacman-key-compatibility-with-gnupg-2.1.patch
===================================================================
--- 0001-pacman-key-compatibility-with-gnupg-2.1.patch	                        (rev 0)
+++ 0001-pacman-key-compatibility-with-gnupg-2.1.patch	2014-11-21 11:22:42 UTC (rev 226780)
@@ -0,0 +1,27 @@
+From 41c8263ba289dac191d7f74faaa62476baf41c28 Mon Sep 17 00:00:00 2001
+From: Tobias Powalowski <tpowa at archlinux.org>
+Date: Fri, 21 Nov 2014 20:54:58 +1000
+Subject: [PATCH] pacman-key: compatibility with gnupg-2.1
+
+GnuPG 2.1 no longer allow empty passphrases by default.
+
+Signed-off-by: Allan McRae <allan at archlinux.org>
+---
+ scripts/pacman-key.sh.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
+index ba8d02e..5ba0ad8 100644
+--- a/scripts/pacman-key.sh.in
++++ b/scripts/pacman-key.sh.in
+@@ -151,6 +151,7 @@ Key-Usage: sign
+ Name-Real: Pacman Keyring Master Key
+ Name-Email: pacman at localhost
+ Expire-Date: 0
++%no-protection
+ %commit
+ %echo Done
+ EOF
+-- 
+2.1.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-21 09:08:18 UTC (rev 226779)
+++ PKGBUILD	2014-11-21 11:22:42 UTC (rev 226780)
@@ -5,7 +5,7 @@
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=6
+pkgrel=7
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
@@ -21,15 +21,23 @@
 backup=(etc/pacman.conf etc/makepkg.conf)
 options=('strip' 'debug')
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+	0001-pacman-key-compatibility-with-gnupg-2.1.patch
         pacman.conf.i686
         pacman.conf.x86_64
         makepkg.conf)
 md5sums=('063c8b0ff6bdf903dc235445525627cd'
          'SKIP'
+         'd0e015b1bf78cbf9762d9c44ea5f77a9'
          '2db6c94709bb30cc614a176ecf8badb1'
          'de74a13618347f08ae4a9637f74471c4'
          '2da6544e387f940588a90cb4b9b914e2')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae <allan at archlinux.org>
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -p1 -i $srcdir/0001-pacman-key-compatibility-with-gnupg-2.1.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"