pacman added patch: libmakepkg: Support file 5.33's application/x-pie-executable

pacman/PKGBUILD

 
 pkgname=pacman
-pkgver=4.2.1
-pkgrel=13
+pkgver=5.0.2
+pkgrel=2
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
 groups=('base' 'base-devel')
-depends=('bash>=4.3.025-1' 'glibc>=2.20-2' 'libarchive>=3.2.1' 'curl>=7.28.1'
+depends=('bash>=4.3.025-1' 'glibc>=2.20-2' 'libarchive=3.2.2' 'curl>=7.28.1'
          'gpgme' 'pacman-mirrorlist' 'nettle>=3.1')
 checkdepends=('python2' 'fakechroot')
 makedepends=('asciidoc')
 optdepends=('fakeroot: for makepkg usage as normal user')
-provides=('pacman-contrib')
-conflicts=('pacman-contrib')
-replaces=('pacman-contrib')
 backup=(etc/pacman.conf etc/makepkg.conf)
 install=pacman.install
 options=(!libtool)
-source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
+source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+        https://git.archlinux.org/svntogit/packages.git/plain/trunk/0001-libmakepkg-Support-file-5.33-s-application-x-pie-exe.patch?h=packages/pacman
         pacman.conf
         makepkg.conf)
-sha1sums=('61a87226ff3676c0c1e6c8bfadafb6d5750d1e06'
-          '41f4d1ca64bbeee0ec758c1b99615cb3a1619718'
-          'bb2fe75a0e94444c5397d616988a35a51e9380a2')
+sha1sums=('3b9c0797ac04a89d1517771595f13bddc68933b1'
+          'SKIP'
+          '6e760dbfc5b05ac9fb6bcc80e553c4c08fbf59e2'
+          '735dfdbf78f1249567b3250a2766f55eb6ae9a0c'
+          '0e61e106d58a332ac7bb0a34885358d37297886e')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@archlinux.org>
+              'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
+
+prepare() {
+   cd "$pkgname-$pkgver"
+    # apply patch from the source array (should be a pacman feature)
+    local filename
+    for filename in "${source[@]}"; do
+        if [[ "$filename" =~ \.patch$ ]]; then
+        msg2 "Applying patch ${filename##*/}"
+        patch -p1 -N -i "$srcdir/${filename##*/}"
+        fi
+    done
+    :
+}
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
@@ -32,7 +47,7 @@ build() {
     --localstatedir=/var --enable-doc \
     --with-scriptlet-shell=/usr/bin/bash \
     --with-ldconfig=/usr/bin/ldconfig
-  make
+  make V=1
   make -C contrib
 }
 
@@ -46,14 +61,13 @@ package() {
   make DESTDIR="$pkgdir" -C contrib install
 
   # install Chakra specific stuff
-  install -dm755 "$pkgdir"/etc
-  install -m644 "$srcdir"/pacman.conf "$pkgdir"/etc/pacman.conf
+  install -Dm644 "$srcdir"/pacman.conf "$pkgdir"/etc/pacman.conf
 
   mycarch="x86_64"
   mychost="x86_64-pc-linux-gnu"
   myflags="-march=x86-64"
 
-  install -m644 "$srcdir"/makepkg.conf "$pkgdir"/etc/
+  install -Dm644 "$srcdir"/makepkg.conf "$pkgdir"/etc/makepkg.conf
   # set things correctly in the default conf file
   sed -i "$pkgdir"/etc/makepkg.conf \
     -e "s|@CARCH[@]|$mycarch|g" \

pacman/makepkg.conf

@@ -73,7 +73,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
+# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -84,6 +84,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- 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
+#-- optipng:    Optimize PNG images with optipng
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #
 OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)

pacman/pacman.conf

@@ -14,7 +14,8 @@
 #CacheDir    = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
 #GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg     = pacman glibc pacman-helpme
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
@@ -37,10 +38,15 @@ CheckSpace
 
 # 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.
+#SigLevel    = Required DatabaseOptional
+#LocalFileSigLevel = Optional
 SigLevel = Never
 LocalFileSigLevel = Never
 #RemoteFileSigLevel = Required
 
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Chakra GNU/Linux
+# packagers with `pacman-key --populate chakralinux`.
 
 #
 # REPOSITORIES
@@ -61,6 +67,10 @@ LocalFileSigLevel = Never
 # uncommented to enable the repo.
 #
 
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
 #[testing]
 #Include = /etc/pacman.d/mirrorlist