diff options
| -rw-r--r-- | libre/pacman/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/pacman/gpg.conf | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index b69778d07..8ef4240df 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -9,7 +9,7 @@ pkgname=pacman pkgver=4.2.0 -pkgrel=6.parabola1 +pkgrel=6.parabola2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -40,7 +40,7 @@ md5sums=('184ce14f1f326fede72012cca51bba51' 'a12b1a4533c170aecc8b9b8561048248' 'ce525a9af50f1d9b824806d2e5a4f0c8' 'abe3baaf610d9cc42b4e3748c936bbce' - '8c339b2bf027979d1edcfc6ac0e7e81d' + 'e86946908762aa44e8d3c582d4d872bb' '3cfc5d2867a6672f4f629220632948f4' '0ee98dc38ff80ba127772f5104e18e46' '093f0779ac55ae781ba028ad74b95f84') @@ -126,7 +126,7 @@ package() { "${pkgdir}/etc/cron.weekly/refresh-pacman-keys" install -Dm644 "${srcdir}/sks-keyservers.netCA.pem" \ - "${pkgdir}/etc/pacman.d/sks-keyservers.netCA.pem" + "${pkgdir}/etc/pacman.d/gnupg/sks-keyservers.netCA.pem" install -Dm644 "${srcdir}/gpg.conf" \ "${pkgdir}/etc/pacman.d/gnupg/gpg.conf" diff --git a/libre/pacman/gpg.conf b/libre/pacman/gpg.conf index 7fc6fc661..48ce83628 100644 --- a/libre/pacman/gpg.conf +++ b/libre/pacman/gpg.conf @@ -19,7 +19,7 @@ default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB # 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=~/.gnupg/sks-keyservers.netCA.pem +keyserver-options ca-cert-file=/etc/pacman.d/gnupg/sks-keyservers.netCA.pem keyserver-options no-honor-keyserver-url # when outputting certificates, view user IDs distinctly from keys: |