upgpkg: pacman-git 5.1.1.r160.gd37e6d40-2

sync conf files from [core] and upstream changes

6 files changed, 21 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b9d9619b4b5..958c630b79b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pacman-git
 	pkgdesc = A library-based package manager with dependency support
-	pkgver = 5.1.1.r140.gd197d8ab
-	pkgrel = 1
+	pkgver = 5.1.1.r160.gd37e6d40
+	pkgrel = 2
 	url = https://www.archlinux.org/pacman/
 	arch = i686
 	arch = x86_64
@@ -22,7 +22,7 @@ pkgbase = pacman-git
 	depends = libarchive
 	depends = pacman-mirrorlist
 	optdepends = pacman-contrib: various helper utilities
-	optdepends = xdelta3: delta support in repo-add
+	optdepends = perl-locale-gettext: translation support in makepkg-template
 	provides = pacman=5.1.1
 	conflicts = pacman
 	options = emptydirs
@@ -36,10 +36,10 @@ pkgbase = pacman-git
 	source = pacman.conf.arm
 	source = makepkg.conf
 	sha256sums = SKIP
-	sha256sums = 0c087d26e80333267391a6e9e34b95a2ffb103cb9391cb53cc5d97ad954af774
-	sha256sums = c5a3ec55f9d1bc52e5e5b127f76b7b16b79738268691a3e1d842359033e460da
-	sha256sums = 2d17478fd607c75e396fe10ef2add8bc9fcc12054810fb6f4409dfb70e01989e
-	sha256sums = 3159b78d6112f4e8906945d1adc1f33b6186d566b54a5976e3a684597c082942
+	sha256sums = 059121e28a55a7cdcc726ff95455b94f327f65a5b75d98fa7d3cdb81989c42a8
+	sha256sums = 1b293a6096c996c930e2eac3fbc4827ab3d99c8cc7a7ae842ce747dba47e1cc0
+	sha256sums = 24dc59b5806e9d4cd4661db7631ee4138780ebfc1d6cb23927181e50d94073ea
+	sha256sums = d69bbcba75bc1d43fa8efed03ee43f06189ef947fea070e09d2110b6800d56f2
 
 pkgname = pacman-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 66fdee8dd7ca..9bab224534ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: Andres Perera <aepd87@gmail.com>
 
 pkgname=pacman-git
-pkgver=5.1.1.r140.gd197d8ab
-pkgrel=1
+pkgver=5.1.1.r160.gd37e6d40
+pkgrel=2
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://www.archlinux.org/pacman/"
@@ -14,7 +14,7 @@ license=('GPL')
 depends=('archlinux-keyring' 'bash' 'curl' 'gpgme' 'libarchive'
          'pacman-mirrorlist')
 optdepends=('pacman-contrib: various helper utilities'
-            'xdelta3: delta support in repo-add')
+            'perl-locale-gettext: translation support in makepkg-template')
 makedepends=('git' 'asciidoc' 'meson')
 checkdepends=('python' 'fakechroot')
 provides=("pacman=${pkgver%.*.*}")
@@ -28,10 +28,10 @@ source=("git+https://git.archlinux.org/pacman.git"
         "pacman.conf.arm"
         "makepkg.conf")
 sha256sums=('SKIP'
-            '0c087d26e80333267391a6e9e34b95a2ffb103cb9391cb53cc5d97ad954af774'
-            'c5a3ec55f9d1bc52e5e5b127f76b7b16b79738268691a3e1d842359033e460da'
-            '2d17478fd607c75e396fe10ef2add8bc9fcc12054810fb6f4409dfb70e01989e'
-            '3159b78d6112f4e8906945d1adc1f33b6186d566b54a5976e3a684597c082942')
+            '059121e28a55a7cdcc726ff95455b94f327f65a5b75d98fa7d3cdb81989c42a8'
+            '1b293a6096c996c930e2eac3fbc4827ab3d99c8cc7a7ae842ce747dba47e1cc0'
+            '24dc59b5806e9d4cd4661db7631ee4138780ebfc1d6cb23927181e50d94073ea'
+            'd69bbcba75bc1d43fa8efed03ee43f06189ef947fea070e09d2110b6800d56f2')
 
 pkgver() {
   cd pacman
diff --git a/makepkg.conf b/makepkg.conf
index 11372171ecce..49e3e14ac5f0 100644
--- a/makepkg.conf
+++ b/makepkg.conf
@@ -87,7 +87,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #
 OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
 
-#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(md5)
 #-- Options to be used when stripping binaries. See `man strip' for details.
 STRIP_BINARIES="--strip-all"
@@ -130,9 +130,12 @@ DBGSRCDIR="/usr/src/debug"
 COMPRESSGZ=(gzip -c -f -n)
 COMPRESSBZ2=(bzip2 -c -f)
 COMPRESSXZ=(xz -c -z -)
+COMPRESSZST=(zstd -c -z -q -)
 COMPRESSLRZ=(lrzip -q)
 COMPRESSLZO=(lzop -q)
 COMPRESSZ=(compress -c -f)
+COMPRESSLZ4=(lz4 -q)
+COMPRESSLZ=(lzip -c -f)
 
 #########################################################################
 # EXTENSION DEFAULTS
diff --git a/pacman.conf.arm b/pacman.conf.arm
index 503ef7600dcb..8e90fbb926b5 100644
--- a/pacman.conf.arm
+++ b/pacman.conf.arm
@@ -16,7 +16,7 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman-git glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 #UseDelta    = 0.7
diff --git a/pacman.conf.i686 b/pacman.conf.i686
index 8b2fe248c05b..7e9b03b83488 100644
--- a/pacman.conf.i686
+++ b/pacman.conf.i686
@@ -16,7 +16,7 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman-git glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 #UseDelta    = 0.7
diff --git a/pacman.conf.x86_64 b/pacman.conf.x86_64
index 822e9310901d..e75448dabe53 100644
--- a/pacman.conf.x86_64
+++ b/pacman.conf.x86_64
@@ -16,7 +16,7 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman-git glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 #UseDelta    = 0.7