From d4b029b01d155dbefbe18a16f62faaaa5567130a Mon Sep 17 00:00:00 2001
From: RealStickman <mrc@frm01.net>
Date: Mon, 7 Jun 2021 09:37:31 +0200
Subject: [PATCH] Merge with pacnew for pacman 6

---
 arch-config/etc/arch-pacman.conf | 14 ++++++--------
 arch-config/etc/arco-pacman.conf |  9 ++++-----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/arch-config/etc/arch-pacman.conf b/arch-config/etc/arch-pacman.conf
index 5b525377..27f2db63 100755
--- a/arch-config/etc/arch-pacman.conf
+++ b/arch-config/etc/arch-pacman.conf
@@ -15,15 +15,14 @@
 #LogFile     = /var/log/pacman.log
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
-HoldPkg      = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
+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
-IgnorePkg   = packettracer
+#IgnorePkg   =
 #IgnoreGroup =
 
 #NoUpgrade   =
@@ -32,11 +31,11 @@ IgnorePkg   = packettracer
 # Misc options
 #UseSyslog
 Color
-#TotalDownload
-#CheckSpace
+#NoProgressBar
+CheckSpace
 VerbosePkgLists
 ILoveCandy
-ParallelDownloads=5
+ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -100,4 +99,3 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
diff --git a/arch-config/etc/arco-pacman.conf b/arch-config/etc/arco-pacman.conf
index cc3fbe09..1a630717 100755
--- a/arch-config/etc/arco-pacman.conf
+++ b/arch-config/etc/arco-pacman.conf
@@ -19,11 +19,10 @@ HoldPkg      = pacman glibc
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #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
-IgnorePkg   = packettracer
+#IgnorePkg   =
 #IgnoreGroup =
 
 #NoUpgrade   =
@@ -32,11 +31,11 @@ IgnorePkg   = packettracer
 # Misc options
 #UseSyslog
 Color
-#TotalDownload
-#CheckSpace
+#NoProgressBar
+CheckSpace
 VerbosePkgLists
 ILoveCandy
-ParallelDownloads=5
+ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.