From 6fd875ec26576cea1cf7a175be7ae9d73c7b4b64 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 23 Oct 2019 11:51:08 +0200
Subject: core/pacman: assimilate upstream's changes into pacman.conf and
 makepkg.conf

---
 core/pacman/PKGBUILD     | 10 +++++-----
 core/pacman/makepkg.conf |  6 +++---
 core/pacman/pacman.conf  |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'core')

diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index 6c656486..468455c2 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -1,14 +1,14 @@
-# upstream git revision: 2519f7ad3a9ad47ee6bb997d53a2266ca34fdd52
+# upstream git revision: 6a11428ac69b84060dc0b80bad752bd008e0b6d3
 
 depends+=(archlinux32-keyring)
 
 # fail if upstream changes makepkg.conf or pacman.conf
 for ((i=0; i<${#sha256sums[@]}; i++)); do
-  if [ "${sha256sums[${i}]}" = 'b82e9c1073292766c2f49b5c771dddf37383f1151117ef9cd5e0c11047b4f3eb' ]; then
-    sha256sums[${i}]='d75bbbe42d290c4f22a95e6ac86d4723dc6d0c08228d14c3dcbae9dc5d2514e5'
+  if [ "${sha256sums[${i}]}" = '8c100b64450f5a19a16325dd05c143d49395bdeb96bd957f863cde4b95d3cb86' ]; then
+    sha256sums[${i}]='3c65dbd2518c9522d1a65d83b49dbebf5fac1a5488d73b62e10b423aee27dc8c'
   fi
-  if [ "${sha256sums[${i}]}" = '8442bbb3d1d83f09610e9d687f9121037d97c6acaa06c4e907fc6e9eb0b127ec' ]; then
-    sha256sums[${i}]='730b6d399dc03ea0ea505fde9387b3fd14475a0e5421e53be30b6b2f946b974f'
+  if [ "${sha256sums[${i}]}" = '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2' ]; then
+    sha256sums[${i}]='428ceeb0d8b96ac5e4274ef098bde00916f9e1b62369eb3566eaf6f6b3ac3984'
   fi
 done
 
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
index 0b49df35..7fd2d854 100644
--- a/core/pacman/makepkg.conf
+++ b/core/pacman/makepkg.conf
@@ -130,16 +130,16 @@ 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
 #########################################################################
 #
-# WARNING: Do NOT modify these variables unless you know what you are
-#          doing.
-#
 PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf
index f6afcb76..7163168c 100644
--- a/core/pacman/pacman.conf
+++ b/core/pacman/pacman.conf
@@ -19,7 +19,6 @@ HoldPkg     = pacman glibc
 #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
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-- 
cgit v1.2.3