From e711794db4c0736cddf7e45fb4408f79fa93d765 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 28 Jan 2015 02:10:45 -0200
Subject: pacman-4.2.0-6.parabola1: pull from upstream main branch

---
 libre/pacman/PKGBUILD | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'libre/pacman/PKGBUILD')

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index c6749f5b8..b69778d07 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,5 +1,5 @@
 # vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 228108 2014-12-28 09:07:13Z allan $
+# $Id: PKGBUILD 228934 2015-01-12 05:54:31Z allan $
 # Maintainer (Arch): Dan McGee <dan@archlinux.org>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
@@ -9,7 +9,7 @@
 
 pkgname=pacman
 pkgver=4.2.0
-pkgrel=5.parabola1
+pkgrel=6.parabola1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -18,9 +18,8 @@ groups=('base' 'base-devel')
 depends=('bash' 'glibc' 'libarchive>=3.1.2' 'curl>=7.39.0'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring'
          'parabola-keyring' 'ca-certificates-cacert')
-makedepends=('asciidoc') # build man pages
+makedepends=('asciidoc')   # roundup patch alters docs
 checkdepends=('python2' 'fakechroot')
-optdepends=('fakeroot: for makepkg usage as normal user')
 provides=("$pkgname-contrib")
 conflicts=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
 replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
@@ -40,7 +39,7 @@ md5sums=('184ce14f1f326fede72012cca51bba51'
          '7279d086428df483fd60c33f7c88cf3e'
          'a12b1a4533c170aecc8b9b8561048248'
          'ce525a9af50f1d9b824806d2e5a4f0c8'
-         '8b8e478e3b6f785f6fb0029f792cea38'
+         'abe3baaf610d9cc42b4e3748c936bbce'
          '8c339b2bf027979d1edcfc6ac0e7e81d'
          '3cfc5d2867a6672f4f629220632948f4'
          '0ee98dc38ff80ba127772f5104e18e46'
@@ -53,6 +52,10 @@ prepare() {
   # v4.2.0-13-gacc639a
   patch -p1 -i "$srcdir/pacman-4.2.0-roundup.patch"
 
+  # fix bad translation mistake - corrected in transifex
+  sed -i 's#pacman-db-update#pacman-db-upgrade#' src/pacman/po/nl.po
+
+  # treat pkgrel more similarly to pkgver
   patch -p1 -i "$srcdir/makepkg-pkgrel-4.patch"
 }
 
@@ -126,5 +129,5 @@ package() {
                  "${pkgdir}/etc/pacman.d/sks-keyservers.netCA.pem"
 
   install -Dm644 "${srcdir}/gpg.conf" \
-                 "${pkgdir}/etc/pacman.d/gpg.conf"
+                 "${pkgdir}/etc/pacman.d/gnupg/gpg.conf"
 }
-- 
cgit v1.2.3


From 7119ac4d12bcb73d0e8d345be94fc39fb7c7fc08 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Thu, 29 Jan 2015 14:17:02 -0200
Subject: pacman-4.2.0-6.parabola2: fix ca-cert-file path

---
 libre/pacman/PKGBUILD | 6 +++---
 libre/pacman/gpg.conf | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libre/pacman/PKGBUILD')

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:
-- 
cgit v1.2.3