core/pacman to 4.1.2-7

core/pacman/0001-pacman-key-compatibility-with-gnupg-2.1.patch

@@ -0,0 +1,27 @@
+From 41c8263ba289dac191d7f74faaa62476baf41c28 Mon Sep 17 00:00:00 2001
+From: Tobias Powalowski <tpowa@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@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@localhost
+ Expire-Date: 0
++%no-protection
+ %commit
+ %echo Done
+ EOF
+-- 
+2.1.3
+

core/pacman/PKGBUILD

@@ -11,7 +11,7 @@
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=6.1
+pkgrel=7
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
@@ -27,18 +27,22 @@ replaces=('pacman-contrib')
 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
         0001-Sychronize-filesystem.patch
         pacman.conf
         makepkg.conf)
 md5sums=('063c8b0ff6bdf903dc235445525627cd'
          'SKIP'
+         'd0e015b1bf78cbf9762d9c44ea5f77a9'
          'f7f7bd5bdd5f7973955f3af8bbceae61'
          '5c491b27bae54d93d6ba972ce0fccfa7'
          '1f8d6efc76a395956fdae71927698666')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae <allan@archlinux.org>
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -p1 -i ../0001-Sychronize-filesystem.patch
+  patch -p1 -i $srcdir/0001-pacman-key-compatibility-with-gnupg-2.1.patch
 }
 
 build() {