From fc0adbcba394eee7dd62890dbcf5d27850104e1b Mon Sep 17 00:00:00 2001
From: Bernhard Landauer <oberon@manjaro.org>
Date: Tue, 29 May 2018 14:45:17 +0200
Subject: [PATCH] pacman 5.1.0 update

---
 bin/mkchrootpkg.in      |  7 +------
 data/makepkg.conf       | 21 ++++++++++-----------
 data/manjaro-tools.conf |  2 +-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/bin/mkchrootpkg.in b/bin/mkchrootpkg.in
index 41742c2..1ca6ec4 100644
--- a/bin/mkchrootpkg.in
+++ b/bin/mkchrootpkg.in
@@ -198,11 +198,6 @@ prepare_chroot() {
 
     $install -d "$copydir"/{build,build/.gnupg,startdir,{pkg,srcpkg,src,log}dest}
 
-    for x in .gnupg/pubring.{kbx,gpg}; do
-        [[ -r $USER_HOME/$x ]] || continue
-        $install -m 644 "$USER_HOME/$x" "$copydir/build/$x"
-    done
-
     sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf"
     for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \
         "MAKEFLAGS='$MAKEFLAGS'" "PACKAGER='$PACKAGER'"
@@ -254,7 +249,7 @@ _chrootnamcap() {
 
 download_sources() {
     local builddir="$(mktemp -d)"
-    chmod 1777 "$builddir"
+    chown $SUDO_USER:$SUDO_USER "$builddir"
 
     # Ensure sources are downloaded
     if [[ -n $SUDO_USER ]]; then
diff --git a/data/makepkg.conf b/data/makepkg.conf
index d6c7f20..b51f4eb 100644
--- a/data/makepkg.conf
+++ b/data/makepkg.conf
@@ -1,3 +1,4 @@
+#!/hint/bash
 #
 # /etc/makepkg.conf
 #
@@ -8,9 +9,10 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
-          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
+DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
+          'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
@@ -34,8 +36,6 @@ CARCH="@CARCH@"
 CHOST="@CHOST@"
 
 #-- Compiler and Linker Flags
-# -march (or -mcpu) builds exclusively for an architecture
-# -mtune optimizes for an architecture, but builds for whole processor family
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
 CFLAGS="@CFLAGS@"
 CXXFLAGS="@CFLAGS@"
@@ -50,7 +50,7 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
+# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- fakeroot: Allow building packages as a non-root user
@@ -74,7 +74,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
+# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -84,10 +84,9 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- emptydirs:  Leave empty directories in packages
 #-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:      Remove files specified by PURGE_TARGETS
-#-- upx:        Compress binary executable files using UPX
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
@@ -103,6 +102,8 @@ MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
 DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 #-- Files to be removed from all packages (if purge is specified)
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+#-- Directory to store source code in for debug packages
+DBGSRCDIR="/usr/src/debug"
 
 #########################################################################
 # PACKAGE OUTPUT
@@ -143,5 +144,3 @@ COMPRESSZ=(compress -c -f)
 #
 PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
-
-# vim: set ft=sh ts=2 sw=2 et:
diff --git a/data/manjaro-tools.conf b/data/manjaro-tools.conf
index 6b9e498..f18fdc3 100644
--- a/data/manjaro-tools.conf
+++ b/data/manjaro-tools.conf
@@ -63,7 +63,7 @@
 # Set to 'true' to use ssh-agent to store passphrase.
 # ssh_agent=false
 
-# use alternative storage server (one or the other might be more stable) 
+# use alternative storage server (one or the other might be more stable)
 # alt_storage=false
 
 # the server project: manjaro|manjaro-community