From b40dcb4e13bbd2f37535ce3ad772c89e81d3e8f3 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 16 Oct 2018 03:14:38 -0400 Subject: upgpkg: pacman-static 5.1.1-5 update static deps add release script to build binary repos --- .SRCINFO | 12 ++++++------ PKGBUILD | 10 +++++----- build-packages.sh | 28 ++++++++++++++++++++++++++++ nvchecker-new.txt | 4 ++-- nvchecker-old.txt | 4 ++-- 5 files changed, 43 insertions(+), 15 deletions(-) create mode 100755 build-packages.sh diff --git a/.SRCINFO b/.SRCINFO index 95f9b8a..ebda366 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 = 4 + pkgrel = 5 url = https://www.archlinux.org/pacman/ arch = i686 arch = x86_64 @@ -25,13 +25,13 @@ 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 = 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 = zstd-1.3.6.tar.gz::https://github.com/facebook/zstd/archive/v1.3.6.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 = https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.12.0.tar.bz2 + source = https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.12.0.tar.bz2.sig source = libarchive-3.3.3.tar.gz::https://github.com/libarchive/libarchive/archive/v3.3.3.tar.gz validpgpkeys = 6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD validpgpkeys = B8151B117037781095514CA7BBDFFC92306B1121 @@ -53,12 +53,12 @@ pkgbase = pacman-static sha512sums = e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578 sha512sums = SKIP sha512sums = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 - sha512sums = a5347b132d6b79e6a7f39a4546cafc5cf85e8d01b765477011008908035789e914b1093e2b2405c75086f05a7bc87e29b69e10252260d747c5c056ce16f91661 + sha512sums = f37c3f45ee7b0367c1fd48f572a1931ea4a664a1f5669c56a0f1883c5c9555c3d8b622c1d8bd8c074d157259b4eda24782670137c354c2e2633ec98b235b5625 sha512sums = 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20 sha512sums = SKIP sha512sums = c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d sha512sums = SKIP - sha512sums = 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a + sha512sums = c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014 sha512sums = SKIP sha512sums = 10063764b610c0c966ba0177cac0d2cb781e297a45545cc8a587741513089af26f40769670894c86e7985b73c47e9cb985253bc3bef3a12fa83fe2a6a30acb6d diff --git a/PKGBUILD b/PKGBUILD index 18235ea..2c440a4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,13 +10,13 @@ _curlver=7.61.1 _sslver=1.1.1 _xzver=5.2.4 _bzipver=1.0.6 -_zstdver=1.3.5 +_zstdver=1.3.6 _libarchive_ver=3.3.3 _gpgerrorver=1.32 _libassuanver=2.5.1 -_gpgmever=1.11.1 +_gpgmever=1.12.0 _gnupgver=2.2.10 -pkgrel=4 +pkgrel=5 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/" @@ -71,12 +71,12 @@ sha512sums=('7112025dbd3e263c16f5b0ab34c9db3e8d631a0801bb086b47a2252d1764172261b 'e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578' 'SKIP' '00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12' - 'a5347b132d6b79e6a7f39a4546cafc5cf85e8d01b765477011008908035789e914b1093e2b2405c75086f05a7bc87e29b69e10252260d747c5c056ce16f91661' + 'f37c3f45ee7b0367c1fd48f572a1931ea4a664a1f5669c56a0f1883c5c9555c3d8b622c1d8bd8c074d157259b4eda24782670137c354c2e2633ec98b235b5625' '0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20' 'SKIP' 'c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d' 'SKIP' - '42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a' + 'c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014' 'SKIP' '10063764b610c0c966ba0177cac0d2cb781e297a45545cc8a587741513089af26f40769670894c86e7985b73c47e9cb985253bc3bef3a12fa83fe2a6a30acb6d') diff --git a/build-packages.sh b/build-packages.sh new file mode 100755 index 0000000..b1eb05a --- /dev/null +++ b/build-packages.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# requires devtools, devtools32 (for extra-i686-build) +# if debug variants of extra-* exist, use them (I have a custom script for this) + +rm -rf artifacts/ + +for buildarch in x86_64 i686; do + extradir=artifacts/${buildarch}-extracted + + if command -v debug-${buildarch}-build; then + debug-${buildarch}-build + else + extra-${buildarch}-build + fi + + CARCH=${buildarch} makepkg --packagelist | while read -r pkgfile; do + if bsdtar -tf "${pkgfile}" usr/bin/pacman-static > /dev/null 2>&1; then + mkdir -p ${extradir} + bsdtar --strip-components 2 -C ${extradir} -xf "${pkgfile}" usr/bin/pacman-static + break + fi + done + + xz -ke ${extradir}/pacman-static + gpg --detach-sign ${extradir}/pacman-static + gpg --detach-sign ${extradir}/pacman-static.xz +done diff --git a/nvchecker-new.txt b/nvchecker-new.txt index dc63e2a..618371a 100644 --- a/nvchecker-new.txt +++ b/nvchecker-new.txt @@ -3,10 +3,10 @@ c-ares 1.14.0-1 curl 7.61.1-3 gnupg 2.2.10-1 gpgerror 1.32-1 -gpgme 1.11.1-2 +gpgme 1.12.0-1 libarchive 3.3.3-1 libassuan 2.5.1-1 nghttp2 1.33.0-1 ssl 1.1.1-1 xz 5.2.4-1 -zstd 1.3.5-1 +zstd 1.3.6-1 diff --git a/nvchecker-old.txt b/nvchecker-old.txt index dc63e2a..618371a 100644 --- a/nvchecker-old.txt +++ b/nvchecker-old.txt @@ -3,10 +3,10 @@ c-ares 1.14.0-1 curl 7.61.1-3 gnupg 2.2.10-1 gpgerror 1.32-1 -gpgme 1.11.1-2 +gpgme 1.12.0-1 libarchive 3.3.3-1 libassuan 2.5.1-1 nghttp2 1.33.0-1 ssl 1.1.1-1 xz 5.2.4-1 -zstd 1.3.5-1 +zstd 1.3.6-1 -- cgit v1.2.3-54-g00ecf