From 44f0e489d004fc0fa27ba0b5c2903fb75edf7773 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 28 Jan 2019 16:05:02 -0500 Subject: upgpkg: pacman-static 5.1.2-2 staticlibs rebuild: musl, zstd, libgpg-error --- .SRCINFO | 16 ++++++++-------- PKGBUILD | 16 ++++++++-------- nvchecker-new.txt | 8 ++++---- nvchecker-old.txt | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9fae81f..fc55e72 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.2 - pkgrel = 1 + pkgrel = 2 url = https://www.archlinux.org/pacman/ arch = i686 arch = x86_64 @@ -20,16 +20,16 @@ pkgbase = pacman-static source = https://c-ares.haxx.se/download/c-ares-1.15.0.tar.gz.asc source = https://curl.haxx.se/download/curl-7.63.0.tar.gz source = https://curl.haxx.se/download/curl-7.63.0.tar.gz.asc - source = curl-3399.patch::https://github.com/curl/curl/pull/3399.patch + source = https://github.com/curl/curl/commit/6dc1780ea54129b3e6721fe9ee3f9d4f1d7abc1b.patch source = https://www.openssl.org/source/openssl-1.1.1a.tar.gz source = https://www.openssl.org/source/openssl-1.1.1a.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 = https://github.com/facebook/zstd/releases/download/v1.3.7/zstd-1.3.7.tar.gz - source = https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.33.tar.bz2 - source = https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.33.tar.bz2.sig + source = https://github.com/facebook/zstd/releases/download/v1.3.8/zstd-1.3.8.tar.gz + source = https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.34.tar.bz2 + source = https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.34.tar.bz2.sig source = https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.2.tar.bz2 source = https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.2.tar.bz2.sig source = https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.12.0.tar.bz2 @@ -49,15 +49,15 @@ pkgbase = pacman-static sha512sums = SKIP sha512sums = 25ad69a1978de2178ac7a456e72152907203931ad895234c14781c27681ea2c5d6669794880c4ebae6e38b8014c6538bc88a6afec2c192210b6d491d60b8f691 sha512sums = SKIP - sha512sums = 233ccf215722657f8db5fd8e959836515361aa76bb67ae058ab8d946ae7673e623acb144b72ef429a240075ea23fd57adbbc0248a575537f4fcd18910bac289f + sha512sums = 8a351ee445f79e54b46cc584fc0c341875d012f1db6e858de1b790177f12c622361eeccec1758d439ef1d839c9688899dd761b949b33311aa717709ba6040c05 sha512sums = 1523985ba90f38aa91aa6c2d57652f4e243cb2a095ce6336bf34b39b5a9b5b876804299a6825c758b65990e57948da532cca761aa12b10958c97478d04dd6d34 sha512sums = SKIP sha512sums = 3857c298663728a465b5f95a3ef44547efbfb420d755e9dde7f20aa3905171b400e1c126d8db5c2b916c733bbd0724d8753cad16c9baf7b12dcd225a3ee04a97 sha512sums = e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578 sha512sums = SKIP sha512sums = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 - sha512sums = fb9ac61b79b22a628e602e68f7c59c85a00020f7f25b8653076895da7589ca1203adc7fe3d9b865f36648bc30d765b9630cf0955f970596253da74c089b97af1 - sha512sums = c0396a63ea54e321b207d84fb4eac247ba8a791058db00a8bbf1dd7698c6593b13c77de08fc0971cccd6c3c27925637d1f9fdc59c4cac1344ddfe4c25adc2e42 + sha512sums = 5c1c0a7a998b814a9edc1466f6d321b0d8ffcf927295fd5499137c9075a8823be03d98f61ea5212d1969f8d52b32e940b1cc10d1507d7702424ea2eea0e79a1b + sha512sums = f21b558ad13d550e25cc07a12aeedfbaf035828c38382935e8f2c595a7affe6b41190ae5af3126db05cee4355d5e2a514759871baf09f3174993ce60ee5492c4 sha512sums = SKIP sha512sums = 1c6f87e3f785a053e6b736eb3554fa704c798c7078307391ca45961e06d9282c659c8e46d230d1f52e67acc2cc12d841f9ec0d5184443f68555d3f0d240865b3 sha512sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 6b911c4..44038f7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,13 +10,13 @@ _curlver=7.63.0 _sslver=1.1.1a _xzver=5.2.4 _bzipver=1.0.6 -_zstdver=1.3.7 +_zstdver=1.3.8 _libarchive_ver=3.3.3 -_gpgerrorver=1.33 +_gpgerrorver=1.34 _libassuanver=2.5.2 _gpgmever=1.12.0 _gnupgver=2.2.12 -pkgrel=1 +pkgrel=2 pkgdesc="Statically-compiled pacman (to fix or install systems without libc)" arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://www.archlinux.org/pacman/" @@ -35,7 +35,7 @@ source+=("https://c-ares.haxx.se/download/c-ares-${_cares_ver}.tar.gz"{,.asc}) validpgpkeys+=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg # curl source+=("https://curl.haxx.se/download/curl-${_curlver}.tar.gz"{,.asc} - "curl-3399.patch::https://github.com/curl/curl/pull/3399.patch") + "https://github.com/curl/curl/commit/6dc1780ea54129b3e6721fe9ee3f9d4f1d7abc1b.patch") # openssl source+=("https://www.openssl.org/source/openssl-${_sslver}.tar.gz"{,.asc} "ca-dir.patch") @@ -66,15 +66,15 @@ sha512sums=('3c123005587359315ab0c24d50a58d10f365eb92b24840213559cd951c863beaa2e 'SKIP' '25ad69a1978de2178ac7a456e72152907203931ad895234c14781c27681ea2c5d6669794880c4ebae6e38b8014c6538bc88a6afec2c192210b6d491d60b8f691' 'SKIP' - '233ccf215722657f8db5fd8e959836515361aa76bb67ae058ab8d946ae7673e623acb144b72ef429a240075ea23fd57adbbc0248a575537f4fcd18910bac289f' + '8a351ee445f79e54b46cc584fc0c341875d012f1db6e858de1b790177f12c622361eeccec1758d439ef1d839c9688899dd761b949b33311aa717709ba6040c05' '1523985ba90f38aa91aa6c2d57652f4e243cb2a095ce6336bf34b39b5a9b5b876804299a6825c758b65990e57948da532cca761aa12b10958c97478d04dd6d34' 'SKIP' '3857c298663728a465b5f95a3ef44547efbfb420d755e9dde7f20aa3905171b400e1c126d8db5c2b916c733bbd0724d8753cad16c9baf7b12dcd225a3ee04a97' 'e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578' 'SKIP' '00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12' - 'fb9ac61b79b22a628e602e68f7c59c85a00020f7f25b8653076895da7589ca1203adc7fe3d9b865f36648bc30d765b9630cf0955f970596253da74c089b97af1' - 'c0396a63ea54e321b207d84fb4eac247ba8a791058db00a8bbf1dd7698c6593b13c77de08fc0971cccd6c3c27925637d1f9fdc59c4cac1344ddfe4c25adc2e42' + '5c1c0a7a998b814a9edc1466f6d321b0d8ffcf927295fd5499137c9075a8823be03d98f61ea5212d1969f8d52b32e940b1cc10d1507d7702424ea2eea0e79a1b' + 'f21b558ad13d550e25cc07a12aeedfbaf035828c38382935e8f2c595a7affe6b41190ae5af3126db05cee4355d5e2a514759871baf09f3174993ce60ee5492c4' 'SKIP' '1c6f87e3f785a053e6b736eb3554fa704c798c7078307391ca45961e06d9282c659c8e46d230d1f52e67acc2cc12d841f9ec0d5184443f68555d3f0d240865b3' 'SKIP' @@ -102,7 +102,7 @@ prepare() { cd "${srcdir}"/curl-${_curlver} # See https://github.com/curl/curl/issues/3392 - patch -p1 -i "${srcdir}"/curl-3399.patch + patch -p1 -i "${srcdir}"/6dc1780ea54129b3e6721fe9ee3f9d4f1d7abc1b.patch } build() { diff --git a/nvchecker-new.txt b/nvchecker-new.txt index 8ee0004..43f63ed 100644 --- a/nvchecker-new.txt +++ b/nvchecker-new.txt @@ -1,12 +1,12 @@ bzip 1.0.6-8 c-ares 1.15.0-1 -curl 7.63.0-2 -gnupg 2.2.12-1 -gpgerror 1.33-1 +curl 7.63.0-4 +gnupg 2.2.12-2 +gpgerror 1.34-1 gpgme 1.12.0-1 libarchive 3.3.3-1 libassuan 2.5.2-1 nghttp2 1.35.1-1 ssl 1.1.1.a-1 xz 5.2.4-1 -zstd 1.3.7-1 +zstd 1.3.8-1 diff --git a/nvchecker-old.txt b/nvchecker-old.txt index 8ee0004..43f63ed 100644 --- a/nvchecker-old.txt +++ b/nvchecker-old.txt @@ -1,12 +1,12 @@ bzip 1.0.6-8 c-ares 1.15.0-1 -curl 7.63.0-2 -gnupg 2.2.12-1 -gpgerror 1.33-1 +curl 7.63.0-4 +gnupg 2.2.12-2 +gpgerror 1.34-1 gpgme 1.12.0-1 libarchive 3.3.3-1 libassuan 2.5.2-1 nghttp2 1.35.1-1 ssl 1.1.1.a-1 xz 5.2.4-1 -zstd 1.3.7-1 +zstd 1.3.8-1 -- cgit v1.2.3-70-g09d2