upgpkg: pacman-static 5.1.1-1

upstream release
be more built-in about installing only part of pacman
use native binary renaming feature
bump versions of various dependencies

2 files changed, 22 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51165fa45b47..80105c7995f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = pacman-static
 	pkgdesc = Statically-compiled pacman (to fix or install systems without libc)
-	pkgver = 5.1.0
+	pkgver = 5.1.1
 	pkgrel = 1
 	url = https://www.archlinux.org/pacman/
 	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = pacman=5.1.0
+	depends = pacman=5.1.1
 	options = staticlibs
-	source = https://sources.archlinux.org/other/pacman/pacman-5.1.0.tar.gz
-	source = https://sources.archlinux.org/other/pacman/pacman-5.1.0.tar.gz.sig
-	source = https://github.com/nghttp2/nghttp2/releases/download/v1.31.1/nghttp2-1.31.1.tar.xz
+	source = https://sources.archlinux.org/other/pacman/pacman-5.1.1.tar.gz
+	source = https://sources.archlinux.org/other/pacman/pacman-5.1.1.tar.gz.sig
+	source = https://github.com/nghttp2/nghttp2/releases/download/v1.32.0/nghttp2-1.32.0.tar.xz
 	source = https://c-ares.haxx.se/download/c-ares-1.14.0.tar.gz
 	source = https://c-ares.haxx.se/download/c-ares-1.14.0.tar.gz.asc
 	source = https://curl.haxx.se/download/curl-7.57.0.tar.gz
@@ -21,8 +21,8 @@ pkgbase = pacman-static
 	source = https://tukaani.org/xz/xz-5.2.4.tar.gz
 	source = https://tukaani.org/xz/xz-5.2.4.tar.gz.sig
 	source = http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
-	source = https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.31.tar.bz2
-	source = https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.31.tar.bz2.sig
+	source = https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.32.tar.bz2
+	source = https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.32.tar.bz2.sig
 	source = https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.1.tar.bz2
 	source = https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.1.tar.bz2.sig
 	source = https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.11.1.tar.bz2
@@ -35,9 +35,9 @@ pkgbase = pacman-static
 	validpgpkeys = 3690C240CE51B4670D30AD1C38EE757D69184620
 	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
 	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
-	sha512sums = 0c5148e97b63e7c0ea1a6b1f5212360c6ce65a26a5a9b935de2e93595efca01e5716dc3167f336926c9a1ba03c395667fc67a99fea926b74d81bfc795f0d5abe
+	sha512sums = 7112025dbd3e263c16f5b0ab34c9db3e8d631a0801bb086b47a2252d1764172261be6a14df1f24598c62935dcdfd74c89fa9d116deea41efb9e0f53dcadeb61c
 	sha512sums = SKIP
-	sha512sums = e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f
+	sha512sums = ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e
 	sha512sums = 30cd3f8c4eea15f994b2ceb44d84e506858f69f624e651e39bb4db523fea9ad5e8906b75abf07131ae364be19172274ed4053059669091f21ce4463cdbb857bf
 	sha512sums = SKIP
 	sha512sums = 1ce8138c708965d29628f9b3e37cb9cb5c586f82f42091d5e60ba66ddcebcd55dba874c5d903365af0ef94c5c1679430bdd8c0cefbffdf5f7f347d9055824648
@@ -48,7 +48,7 @@ pkgbase = pacman-static
 	sha512sums = e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578
 	sha512sums = SKIP
 	sha512sums = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
-	sha512sums = 23983470be51035b2bc0cdbfa20f0915aec92c53c964c645eac51ba4e992b8436bd3a21f0b48d77d7c4ef178d2aacaf57ab33c7fad24b4f96f4ffb1d7116e67f
+	sha512sums = 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
 	sha512sums = SKIP
 	sha512sums = c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 12911b40177c..de669ce1d0c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Eli Schwartz <eschwartz@archlinux.org>
 
 pkgname=pacman-static
-pkgver=5.1.0
+pkgver=5.1.1
 _cares_ver=1.14.0
-_nghttp2_ver=1.31.1
+_nghttp2_ver=1.32.0
 _curlver=7.57.0
 _sslver=1.1.0h
 _xzver=5.2.4
 _bzipver=1.0.6
 _libarchive_ver=3.3.2
-_gpgerrorver=1.31
+_gpgerrorver=1.32
 _libassuanver=2.5.1
 _gpgmever=1.11.1
-_gnupgver=2.2.7
+_gnupgver=2.2.9
 pkgrel=1
 pkgdesc="Statically-compiled pacman (to fix or install systems without libc)"
 arch=('i686' 'x86_64')
@@ -53,9 +53,9 @@ source+=("https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${_gpgmever}.tar.bz2"{,.s
 # libarchive
 source+=("libarchive-${_libarchive_ver}.tar.gz::https://github.com/libarchive/libarchive/archive/v${_libarchive_ver}.tar.gz")
 
-sha512sums=('0c5148e97b63e7c0ea1a6b1f5212360c6ce65a26a5a9b935de2e93595efca01e5716dc3167f336926c9a1ba03c395667fc67a99fea926b74d81bfc795f0d5abe'
+sha512sums=('7112025dbd3e263c16f5b0ab34c9db3e8d631a0801bb086b47a2252d1764172261be6a14df1f24598c62935dcdfd74c89fa9d116deea41efb9e0f53dcadeb61c'
             'SKIP'
-            'e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f'
+            'ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e'
             '30cd3f8c4eea15f994b2ceb44d84e506858f69f624e651e39bb4db523fea9ad5e8906b75abf07131ae364be19172274ed4053059669091f21ce4463cdbb857bf'
             'SKIP'
             '1ce8138c708965d29628f9b3e37cb9cb5c586f82f42091d5e60ba66ddcebcd55dba874c5d903365af0ef94c5c1679430bdd8c0cefbffdf5f7f347d9055824648'
@@ -66,7 +66,7 @@ sha512sums=('0c5148e97b63e7c0ea1a6b1f5212360c6ce65a26a5a9b935de2e93595efca01e571
             'e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578'
             'SKIP'
             '00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12'
-            '23983470be51035b2bc0cdbfa20f0915aec92c53c964c645eac51ba4e992b8436bd3a21f0b48d77d7c4ef178d2aacaf57ab33c7fad24b4f96f4ffb1d7116e67f'
+            '0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20'
             'SKIP'
             'c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d'
             'SKIP'
@@ -83,6 +83,7 @@ prepare() {
 
 build() {
     export PKG_CONFIG_PATH="${srcdir}"/temp/usr/lib/pkgconfig
+    export PATH="${srcdir}/temp/usr/bin:${PATH}"
 
     # openssl
     cd "${srcdir}"/openssl-${_sslver}
@@ -192,11 +193,11 @@ build() {
     # Finally, it's a pacman!
     # TODO: figure out why any pacman action that attempts to download things, segfaults
     cd "${srcdir}"/pacman-${pkgver}
-    export PATH="${srcdir}/temp/usr/bin:${PATH}"
     ./configure --prefix=/usr \
                 --libdir=/usr/lib/pacman/lib \
                 --sysconfdir=/etc \
                 --localstatedir=/var \
+                --program-suffix=-static \
                 --with-scriptlet-shell=/usr/bin/bash \
                 --with-ldconfig=/usr/bin/ldconfig \
                 --disable-shared \
@@ -208,18 +209,10 @@ build() {
 
 package() {
     cd "${srcdir}"/pacman-${pkgver}
-    make DESTDIR="${pkgdir}" install
-
-    for f in "${pkgdir}"/usr/bin/*; do
-        if file "${f}" | grep -q ELF; then
-            mv "${f}" "${f}-static"
-        else
-            rm "${f}"
-        fi
-    done
+    make -C lib/libalpm  DESTDIR="${pkgdir}" install-libLTLIBRARIES install-pkgconfigDATA
+    make -C src/util  DESTDIR="${pkgdir}" install
+    make -C src/pacman  DESTDIR="${pkgdir}" install-binPROGRAMS
 
     cp -a "${srcdir}"/temp/usr/{include,lib} "${pkgdir}"/usr/lib/pacman/
     sed -i "s@${srcdir}/temp/usr@/usr/lib/pacman@g" "${pkgdir}"/usr/lib/pacman/lib/pkgconfig/*.pc
-
-    rm -rf "${pkgdir}"/{etc,usr/include,usr/share,var}
 }