pacman-4.1.2-7.parabola1: fix gnupg 2.1 issue

5 files changed, 38 insertions, 7 deletions

diff --git a/libre/pacman/0001-pacman-key-compatibility-with-gnupg-2.1.patch b/libre/pacman/0001-pacman-key-compatibility-with-gnupg-2.1.patch
new file mode 100644
index 000000000..65b72efd3
--- /dev/null
+++ b/libre/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
+
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 8635ab195..404b7abf4 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=6.1.parabola3
+pkgrel=7.parabola1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -23,6 +23,7 @@ replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
 backup=('etc/pacman.conf' 'etc/makepkg.conf')
 options=('strip' 'debug')
 source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        "0001-pacman-key-compatibility-with-gnupg-2.1.patch"
         "$pkgname.conf."{i686,x86_64,mips64el}
         "makepkg.conf"
         "gpg.conf"
@@ -31,17 +32,20 @@ source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
         "refresh-$pkgname-keys")
 md5sums=('063c8b0ff6bdf903dc235445525627cd'
          'SKIP'
-         '32c8477e410e41116d4c71a2f19dbb5c'
-         'b0dbeddb2776a33b12457ee33424a514'
-         'ec0a36b140856436538c1c1467b88224'
+         'd0e015b1bf78cbf9762d9c44ea5f77a9'
+         'b70916f89e1f801dd6368a3c4883526d'
+         '75b714d530f7de108b5562d1801bf2e2'
+         '20b328234c49330db780565463064f9b'
          'f0f310df411f943dbc4e2dd376c88662'
          '8c339b2bf027979d1edcfc6ac0e7e81d'
          '3cfc5d2867a6672f4f629220632948f4'
          '5873359871833b40c2a8e08863d0613c'
          '093f0779ac55ae781ba028ad74b95f84')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae <allan@archlinux.org>
 
 prepare(){
   cd "$pkgname-$pkgver"
+  patch -p1 -i $srcdir/0001-pacman-key-compatibility-with-gnupg-2.1.patch
   patch -Np1 -i "$srcdir/makepkg-pkgrel-4.patch"
 }
 
diff --git a/libre/pacman/pacman.conf.i686 b/libre/pacman/pacman.conf.i686
index 459b5ad65..410bcb17a 100644
--- a/libre/pacman/pacman.conf.i686
+++ b/libre/pacman/pacman.conf.i686
@@ -90,7 +90,7 @@ Include = /etc/pacman.d/mirrorlist
 Include = /etc/pacman.d/mirrorlist
 
 # Parabola also supports community projects and personal repositories, to find
-# them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories
+# them check out this wiki page: https://wiki.parabola.nu/Repositories
 
 # Parabola community repo
 #[pcr]
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index 2e2d01ee1..49faa2af5 100644
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
@@ -90,7 +90,7 @@ Include = /etc/pacman.d/mirrorlist
 Include = /etc/pacman.d/mirrorlist
 
 # Parabola also supports community projects and personal repositories, to find
-# them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories
+# them check out this wiki page: https://wiki.parabola.nu/Repositories
 
 # Parabola community repo
 #[pcr]
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index 0aaa3814d..9e6c3fe88 100644
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
@@ -105,7 +105,7 @@ Include = /etc/pacman.d/mirrorlist
 #Include = /etc/pacman.d/mirrorlist
 
 # Parabola also supports community projects and personal repositories, to find
-# them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories
+# them check out this wiki page: https://wiki.parabola.nu/Repositories
 
 # Parabola community repo
 #[pcr]