summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD30
-rw-r--r--nvchecker-deps.ini3
-rw-r--r--nvchecker-new.txt13
-rw-r--r--nvchecker-old.txt13
5 files changed, 50 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5556417..9834d7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = pacman-static
pkgdesc = Statically-compiled pacman (to fix or install systems without libc)
pkgver = 5.1.1
- pkgrel = 3
+ pkgrel = 4
url = https://www.archlinux.org/pacman/
arch = i686
arch = x86_64
@@ -10,24 +10,25 @@ pkgbase = pacman-static
options = staticlibs
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://github.com/nghttp2/nghttp2/releases/download/v1.33.0/nghttp2-1.33.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.61.0.tar.gz
- source = https://curl.haxx.se/download/curl-7.61.0.tar.gz.asc
- source = https://www.openssl.org/source/openssl-1.1.0i.tar.gz
- source = https://www.openssl.org/source/openssl-1.1.0i.tar.gz.asc
+ source = https://curl.haxx.se/download/curl-7.61.1.tar.gz
+ source = https://curl.haxx.se/download/curl-7.61.1.tar.gz.asc
+ source = https://www.openssl.org/source/openssl-1.1.1.tar.gz
+ source = https://www.openssl.org/source/openssl-1.1.1.tar.gz.asc
source = ca-dir.patch
source = https://tukaani.org/xz/xz-5.2.4.tar.gz
source = https://tukaani.org/xz/xz-5.2.4.tar.gz.sig
source = https://sources.archlinux.org/other/packages/bzip2/bzip2-1.0.6.tar.gz
+ source = zstd-1.3.5.tar.gz::https://github.com/facebook/zstd/archive/v1.3.5.tar.gz
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
source = https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.11.1.tar.bz2.sig
- source = libarchive-3.3.2.tar.gz::https://github.com/libarchive/libarchive/archive/v3.3.2.tar.gz
+ source = libarchive-3.3.3.tar.gz::https://github.com/libarchive/libarchive/archive/v3.3.3.tar.gz
validpgpkeys = 6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD
validpgpkeys = B8151B117037781095514CA7BBDFFC92306B1121
validpgpkeys = 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
@@ -37,24 +38,25 @@ pkgbase = pacman-static
validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
sha512sums = 7112025dbd3e263c16f5b0ab34c9db3e8d631a0801bb086b47a2252d1764172261be6a14df1f24598c62935dcdfd74c89fa9d116deea41efb9e0f53dcadeb61c
sha512sums = SKIP
- sha512sums = ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e
+ sha512sums = eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
sha512sums = 30cd3f8c4eea15f994b2ceb44d84e506858f69f624e651e39bb4db523fea9ad5e8906b75abf07131ae364be19172274ed4053059669091f21ce4463cdbb857bf
sha512sums = SKIP
- sha512sums = e55193d1893e7619c8a599299bc030db1307260b19803d01983d4229820e3da8afd274eaee9c5be57911591ffe1fe44ac10d2da38f2d3d3204d8ce9df8d06a93
+ sha512sums = 6469a3ff27623826bf29a9256ba730ae0a5135c20b27377027554e19ed26be6d0225db0101b60e7f12aa22d55eccaa53f4015414ef5736ee6002c6d780ed513f
sha512sums = SKIP
- sha512sums = 4a9d454031f644a3072a980f4ea20df976f6c5c58178549dfa62fd4dcf1417509e3be517d2ccb265c87688836f2993531b142fc5971bac5c41d33060057627df
+ sha512sums = c0284a4fe84bdf765ca5bc5148da4441ffc36392cfecaf9d372af00cf93b6de5681cab1248b6f8246474532155dc205da5ad49549ad7c61c07c917145e7c9c71
sha512sums = SKIP
sha512sums = 3857c298663728a465b5f95a3ef44547efbfb420d755e9dde7f20aa3905171b400e1c126d8db5c2b916c733bbd0724d8753cad16c9baf7b12dcd225a3ee04a97
sha512sums = e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578
sha512sums = SKIP
sha512sums = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
+ sha512sums = a5347b132d6b79e6a7f39a4546cafc5cf85e8d01b765477011008908035789e914b1093e2b2405c75086f05a7bc87e29b69e10252260d747c5c056ce16f91661
sha512sums = 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
sha512sums = SKIP
sha512sums = c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
sha512sums = SKIP
sha512sums = 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
sha512sums = SKIP
- sha512sums = 7bc17d6f742080278e35f86b0233d70045df0ca1578cd427126e0acce183709bf33ecca689db65e2e67bdfaf687c04d36cae1202a926beeebc88076648aa40bc
+ sha512sums = 10063764b610c0c966ba0177cac0d2cb781e297a45545cc8a587741513089af26f40769670894c86e7985b73c47e9cb985253bc3bef3a12fa83fe2a6a30acb6d
pkgname = pacman-static
diff --git a/PKGBUILD b/PKGBUILD
index bf221b2..2468078 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,22 @@
# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
+# All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds
+
pkgname=pacman-static
pkgver=5.1.1
_cares_ver=1.14.0
-_nghttp2_ver=1.32.0
-_curlver=7.61.0
-_sslver=1.1.0i
+_nghttp2_ver=1.33.0
+_curlver=7.61.1
+_sslver=1.1.1
_xzver=5.2.4
_bzipver=1.0.6
-_libarchive_ver=3.3.2
+_zstdver=1.3.5
+_libarchive_ver=3.3.3
_gpgerrorver=1.32
_libassuanver=2.5.1
_gpgmever=1.11.1
-_gnupgver=2.2.9
-pkgrel=3
+_gnupgver=2.2.10
+pkgrel=4
pkgdesc="Statically-compiled pacman (to fix or install systems without libc)"
arch=('i686' 'x86_64')
url="https://www.archlinux.org/pacman/"
@@ -41,6 +44,8 @@ source+=("https://tukaani.org/xz/xz-${_xzver}.tar.gz"{,.sig})
validpgpkeys+=('3690C240CE51B4670D30AD1C38EE757D69184620') # Lasse Collin <lasse.collin@tukaani.org>
# bzip2
source+=("https://sources.archlinux.org/other/packages/bzip2/bzip2-${_bzipver}.tar.gz")
+# zstd
+source+=("zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz")
# libgpg-error
source+=("https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${_gpgerrorver}.tar.bz2"{,.sig})
validpgpkeys+=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch
@@ -55,24 +60,25 @@ source+=("libarchive-${_libarchive_ver}.tar.gz::https://github.com/libarchive/li
sha512sums=('7112025dbd3e263c16f5b0ab34c9db3e8d631a0801bb086b47a2252d1764172261be6a14df1f24598c62935dcdfd74c89fa9d116deea41efb9e0f53dcadeb61c'
'SKIP'
- 'ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e'
+ 'eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74'
'30cd3f8c4eea15f994b2ceb44d84e506858f69f624e651e39bb4db523fea9ad5e8906b75abf07131ae364be19172274ed4053059669091f21ce4463cdbb857bf'
'SKIP'
- 'e55193d1893e7619c8a599299bc030db1307260b19803d01983d4229820e3da8afd274eaee9c5be57911591ffe1fe44ac10d2da38f2d3d3204d8ce9df8d06a93'
+ '6469a3ff27623826bf29a9256ba730ae0a5135c20b27377027554e19ed26be6d0225db0101b60e7f12aa22d55eccaa53f4015414ef5736ee6002c6d780ed513f'
'SKIP'
- '4a9d454031f644a3072a980f4ea20df976f6c5c58178549dfa62fd4dcf1417509e3be517d2ccb265c87688836f2993531b142fc5971bac5c41d33060057627df'
+ 'c0284a4fe84bdf765ca5bc5148da4441ffc36392cfecaf9d372af00cf93b6de5681cab1248b6f8246474532155dc205da5ad49549ad7c61c07c917145e7c9c71'
'SKIP'
'3857c298663728a465b5f95a3ef44547efbfb420d755e9dde7f20aa3905171b400e1c126d8db5c2b916c733bbd0724d8753cad16c9baf7b12dcd225a3ee04a97'
'e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578'
'SKIP'
'00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12'
+ 'a5347b132d6b79e6a7f39a4546cafc5cf85e8d01b765477011008908035789e914b1093e2b2405c75086f05a7bc87e29b69e10252260d747c5c056ce16f91661'
'0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20'
'SKIP'
'c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d'
'SKIP'
'42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a'
'SKIP'
- '7bc17d6f742080278e35f86b0233d70045df0ca1578cd427126e0acce183709bf33ecca689db65e2e67bdfaf687c04d36cae1202a926beeebc88076648aa40bc')
+ '10063764b610c0c966ba0177cac0d2cb781e297a45545cc8a587741513089af26f40769670894c86e7985b73c47e9cb985253bc3bef3a12fa83fe2a6a30acb6d')
export LDFLAGS="$LDFLAGS -static"
@@ -121,6 +127,10 @@ build() {
install -Dvm644 bzlib.h "${srcdir}"/temp/usr/include/
install -Dvm644 libbz2.a "${srcdir}"/temp/usr/lib/
+ cd "${srcdir}"/zstd-${_zstdver}/lib
+ make libzstd.a
+ make PREFIX="${srcdir}"/temp/usr install-pc install-static install-includes
+
# libarchive
cd "${srcdir}"/libarchive-${_libarchive_ver}
CPPFLAGS="-I${srcdir}/temp/usr/include" CFLAGS="-L${srcdir}/temp/usr/lib" \
diff --git a/nvchecker-deps.ini b/nvchecker-deps.ini
index c84fa30..3373439 100644
--- a/nvchecker-deps.ini
+++ b/nvchecker-deps.ini
@@ -20,6 +20,9 @@ archpkg = xz
[bzip]
archpkg = bzip2
+[zstd]
+archpkg = zstd
+
[libarchive]
archpkg = libarchive
diff --git a/nvchecker-new.txt b/nvchecker-new.txt
index b9a04d9..dc63e2a 100644
--- a/nvchecker-new.txt
+++ b/nvchecker-new.txt
@@ -1,11 +1,12 @@
-bzip 1.0.6-7
+bzip 1.0.6-8
c-ares 1.14.0-1
-curl 7.61.0-2
-gnupg 2.2.9-1
+curl 7.61.1-3
+gnupg 2.2.10-1
gpgerror 1.32-1
gpgme 1.11.1-2
-libarchive 3.3.2-2
+libarchive 3.3.3-1
libassuan 2.5.1-1
-nghttp2 1.32.0-1
-ssl 1.1.0.i-1
+nghttp2 1.33.0-1
+ssl 1.1.1-1
xz 5.2.4-1
+zstd 1.3.5-1
diff --git a/nvchecker-old.txt b/nvchecker-old.txt
index b9a04d9..dc63e2a 100644
--- a/nvchecker-old.txt
+++ b/nvchecker-old.txt
@@ -1,11 +1,12 @@
-bzip 1.0.6-7
+bzip 1.0.6-8
c-ares 1.14.0-1
-curl 7.61.0-2
-gnupg 2.2.9-1
+curl 7.61.1-3
+gnupg 2.2.10-1
gpgerror 1.32-1
gpgme 1.11.1-2
-libarchive 3.3.2-2
+libarchive 3.3.3-1
libassuan 2.5.1-1
-nghttp2 1.32.0-1
-ssl 1.1.0.i-1
+nghttp2 1.33.0-1
+ssl 1.1.1-1
xz 5.2.4-1
+zstd 1.3.5-1