pacman-4.2.0-6.parabola3: use hkp instead of hkps until solve issue -> https://labs.parabola.nu/issues/647#note-2

3 files changed, 19 insertions, 16 deletions

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 8ef4240df..eb04cf5b3 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=pacman
 pkgver=4.2.0
-pkgrel=6.parabola2
+pkgrel=6.parabola3
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -23,16 +23,17 @@ checkdepends=('python2' 'fakechroot')
 provides=("$pkgname-contrib")
 conflicts=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
 replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
-backup=('etc/pacman.conf' 'etc/makepkg.conf')
+backup=('etc/pacman.conf' 'etc/makepkg.conf' 'etc/pacman.d/gnupg/gpg.conf')
 options=('strip' 'debug')
 source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
         "$pkgname.conf."{i686,x86_64,mips64el}
         "makepkg.conf"
         "pacman-4.2.0-roundup.patch"
         "gpg.conf"
+        "dirmngr.conf"
+        "refresh-$pkgname-keys"
         "sks-keyservers.netCA.pem"
-        "makepkg-pkgrel-4.patch"
-        "refresh-$pkgname-keys")
+        "makepkg-pkgrel-4.patch")
 md5sums=('184ce14f1f326fede72012cca51bba51'
          'SKIP'
          '9c1454e48b2216b23f931e04d6dab1ee'
@@ -40,10 +41,11 @@ md5sums=('184ce14f1f326fede72012cca51bba51'
          'a12b1a4533c170aecc8b9b8561048248'
          'ce525a9af50f1d9b824806d2e5a4f0c8'
          'abe3baaf610d9cc42b4e3748c936bbce'
-         'e86946908762aa44e8d3c582d4d872bb'
+         '65da808317595b310e59f2f395f787a9'
+         'e1174020d2edf2e770857d005b7af0b9'
+         '093f0779ac55ae781ba028ad74b95f84'
          '3cfc5d2867a6672f4f629220632948f4'
-         '0ee98dc38ff80ba127772f5104e18e46'
-         '093f0779ac55ae781ba028ad74b95f84')
+         '0ee98dc38ff80ba127772f5104e18e46')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae <allan@archlinux.org>
 
 prepare() {
@@ -122,12 +124,11 @@ package() {
 
   install -Dm644 contrib/PKGBUILD.vim "$pkgdir/usr/share/vim/vimfiles/syntax/PKGBUILD.vim"
 
-  install -Dm755 "${srcdir}/refresh-pacman-keys" \
-                 "${pkgdir}/etc/cron.weekly/refresh-pacman-keys"
+  install -Dm644 "$srcdir/gpg.conf" "$pkgdir/etc/pacman.d/gnupg/gpg.conf"
 
-  install -Dm644 "${srcdir}/sks-keyservers.netCA.pem" \
-                 "${pkgdir}/etc/pacman.d/gnupg/sks-keyservers.netCA.pem"
+  install -Dm644 "$srcdir/dirmngr.conf" "$pkgdir/etc/pacman.d/gnupg/dirmngr.conf"
 
-  install -Dm644 "${srcdir}/gpg.conf" \
-                 "${pkgdir}/etc/pacman.d/gnupg/gpg.conf"
+  install -Dm755 "$srcdir/refresh-pacman-keys" "$pkgdir/etc/cron.weekly/refresh-pacman-keys"
+
+  install -Dm644 "$srcdir/sks-keyservers.netCA.pem" "$pkgdir/etc/pacman.d/gnupg/sks-keyservers.netCA.pem"
 }
diff --git a/libre/pacman/dirmngr.conf b/libre/pacman/dirmngr.conf
new file mode 100644
index 000000000..6a724eafd
--- /dev/null
+++ b/libre/pacman/dirmngr.conf
@@ -0,0 +1 @@
+hkp-cacert /etc/pacman.d/gnupg/sks-keyservers.netCA.pem
diff --git a/libre/pacman/gpg.conf b/libre/pacman/gpg.conf
index 48ce83628..ec9ef9dc1 100644
--- a/libre/pacman/gpg.conf
+++ b/libre/pacman/gpg.conf
@@ -18,9 +18,10 @@ default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB
 # From
 # https://crabgrass.riseup.net/riseuplabs+paow/openpgp-best-practices
 # Only use secure keyservers
-keyserver hkps://hkps.pool.sks-keyservers.net
-keyserver-options ca-cert-file=/etc/pacman.d/gnupg/sks-keyservers.netCA.pem
-keyserver-options no-honor-keyserver-url
+#keyserver hkps://hkps.pool.sks-keyservers.net
+#keyserver-options no-honor-keyserver-url
+
+keyserver hkp://pool.sks-keyservers.net
 
 # when outputting certificates, view user IDs distinctly from keys:
 fixed-list-mode