diff options
| -rw-r--r-- | system/lz4/APKBUILD | 15 | ||||
| -rw-r--r-- | system/lzip/APKBUILD | 4 | ||||
| -rw-r--r-- | system/m4/APKBUILD | 18 | ||||
| -rw-r--r-- | system/m4/fix-ppc-ucontext-regs.patch | 12 | ||||
| -rw-r--r-- | system/m4/gnulib-tests-dont-require-gpg-passphrase.patch | 2 | ||||
| -rw-r--r-- | system/m4/m4-1.4.19-test-198.patch | 31 | ||||
| -rw-r--r-- | system/m4/posix-test.patch | 18 | ||||
| -rw-r--r-- | system/man-pages/APKBUILD | 10 |
8 files changed, 21 insertions, 89 deletions
diff --git a/system/lz4/APKBUILD b/system/lz4/APKBUILD index 3911e26f4..9b4991db7 100644 --- a/system/lz4/APKBUILD +++ b/system/lz4/APKBUILD @@ -1,20 +1,16 @@ # Contributor: Stuart Cardall <developer@it-offshore.co.uk> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lz4 -pkgver=1.9.4 +pkgver=1.10.0 pkgrel=0 pkgdesc="LZ4: Extremely Fast Compression algorithm" url="https://github.com/lz4/lz4" arch="all" -license="BSD-2-Clause GPL-2.0-only" +license="GPL-2.0+" checkdepends="diffutils" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz" -case "$CARCH" in -armhf) options="!check" ;; # FIXME -esac - # secfixes: # 1.9.3-r1: # - CVE-2021-3520 @@ -31,4 +27,9 @@ package() { make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="043a9acb2417624019d73db140d83b80f1d7c43a6fd5be839193d68df8fd0b3f610d7ed4d628c2a9184f7cde9a0fd1ba9d075d8251298e3eb4b3a77f52736684 lz4-1.9.4.tar.gz" +libs() { + license="BSD-2-Clause" + default_libs +} + +sha512sums="8c4ceb217e6dc8e7e0beba99adc736aca8963867bcf9f970d621978ba11ce92855912f8b66138037a1d2ae171e8e17beb7be99281fea840106aa60373c455b28 lz4-1.10.0.tar.gz" diff --git a/system/lzip/APKBUILD b/system/lzip/APKBUILD index 9f664b6ce..c31cbf0cb 100644 --- a/system/lzip/APKBUILD +++ b/system/lzip/APKBUILD @@ -1,7 +1,7 @@ # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lzip -pkgver=1.23 +pkgver=1.25 pkgrel=0 pkgdesc="Lossless data compressor" url="https://www.nongnu.org/lzip/lzip.html" @@ -28,4 +28,4 @@ package() { make DESTDIR=$pkgdir install } -sha512sums="482804205b6e92fdf9cb17fb9482df7987227c7b1bef9e42d78787acfabe73995f5b1a66f847d2176423f22dce56f1122c5b1c9670f0b778c0bdad2852369c85 lzip-1.23.tar.gz" +sha512sums="6dec5625d5668d2f6f93816b0f2d7050ef357b5ce9a9af100bde45dddc21171341c2bcb623acdde8146b7eaed2248f8e0f5f32e64f57ecc6fe6cb9a0e187b796 lzip-1.25.tar.gz" diff --git a/system/m4/APKBUILD b/system/m4/APKBUILD index 90b5145c7..f24881d02 100644 --- a/system/m4/APKBUILD +++ b/system/m4/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=m4 -pkgver=1.4.19 -pkgrel=1 +pkgver=1.4.20 +pkgrel=0 pkgdesc="GNU macro processor" url="https://www.gnu.org/software/m4" arch="all" @@ -10,12 +10,8 @@ depends="" checkdepends="diffutils" makedepends="texinfo" subpackages="$pkgname-doc $pkgname-lang" -source="https://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz - disable-mbrtowc-test.patch +source="https://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz gnulib-tests-dont-require-gpg-passphrase.patch - m4-1.4.19-test-198.patch - posix-test.patch - fix-ppc-ucontext-regs.patch " build() { @@ -36,9 +32,5 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2 m4-1.4.19.tar.gz -c39562852502282f83b9bfa46aff00c8859b19d4d4335dbdb488748b10f6df6a13ea8291784683bf967674a5a824276419af47d2395e8af18823452a8d4999da disable-mbrtowc-test.patch -fb7344bc8a7aea1f1ce87474109aaf3d5a5ca0cd86b517025c6aad9a388a9ede7c267e7095d171d8768d1c0f0d9d8009e307467352afa81484c54dc476db0ebd gnulib-tests-dont-require-gpg-passphrase.patch -f409fcfd70d55c099bba7d784bea8f99cd6ccbfe24dfc3d76a2e757df96b6c71f7e4b42f63d433259e3bec7b7e40e6569533c032c98537003a6e7314754dd6fb m4-1.4.19-test-198.patch -43c68f84c465b2e26a73ef0a5cf9bacafee70849f9de166eef45d7699438dce0ea3cacdd513daa8a8ae7fb677778290e2a78d01b551d9465de68eb167abcbc93 posix-test.patch -0d40a28e2a4d40c5f18c317e4e6bce7fda2c7316249ebf102c585eda32d069a63a1fb5ced5efcba6d2beb2d68d54d67c6b2789f881bbb488899c95130e152744 fix-ppc-ucontext-regs.patch" +sha512sums="dc7b4f61452e564b095010029bf6ce4246e5a03959989cd76b09eb8012db7424c52819143020fab21a3471ff57ab026d3eccbd00dd3969819208980565a9fec0 m4-1.4.20.tar.xz +aec2ad41e0e340491d764ca2fd3e64b06ea6874116700cbe514ef8e44d8edd4a02568dda0e012811d7e619518baa2279f409c7a65101d067da23fe842a8c904e gnulib-tests-dont-require-gpg-passphrase.patch" diff --git a/system/m4/fix-ppc-ucontext-regs.patch b/system/m4/fix-ppc-ucontext-regs.patch deleted file mode 100644 index d696da4ad..000000000 --- a/system/m4/fix-ppc-ucontext-regs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/lib/sigsegv.c b/lib/sigsegv.c ---- a/lib/sigsegv.c 2022-03-05 20:30:15.030000000 +0000 -+++ b/lib/sigsegv.c 2022-03-05 20:42:49.910000000 +0000 -@@ -220,7 +220,7 @@ - # if 0 - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] - # else --# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1] - # endif - # endif - diff --git a/system/m4/gnulib-tests-dont-require-gpg-passphrase.patch b/system/m4/gnulib-tests-dont-require-gpg-passphrase.patch index d00fbfd6a..c414f2154 100644 --- a/system/m4/gnulib-tests-dont-require-gpg-passphrase.patch +++ b/system/m4/gnulib-tests-dont-require-gpg-passphrase.patch @@ -1,6 +1,6 @@ --- m4-1.4.18/tests/test-vc-list-files-git.sh.old 2018-01-03 18:36:29.000000000 -0600 +++ m4-1.4.18/tests/test-vc-list-files-git.sh 2018-06-18 21:57:08.305562148 -0500 -@@ -32,6 +32,7 @@ +@@ -39,6 +39,7 @@ touch d/a b c && git config user.email "you@example.com" && git config user.name "Your Name" && diff --git a/system/m4/m4-1.4.19-test-198.patch b/system/m4/m4-1.4.19-test-198.patch deleted file mode 100644 index 3ca4bd478..000000000 --- a/system/m4/m4-1.4.19-test-198.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cd7f4d153ccccf601751e9fa82424412f6ecfc96 Mon Sep 17 00:00:00 2001 -From: Eric Blake <eblake@redhat.com> -Date: Tue, 1 Jun 2021 08:10:51 -0500 -Subject: [PATCH] tests: Fix 198.sysval - -In my attempt to avoid test failures on Haiku, I caused test failures -on platforms where sh is noisy when reporting a killed sub-process. - -* doc/m4.texi (Sysval): Avoid stderr noise during test. -Fixes: 17011ea76a (tests: Skip signal detection on Haiku) -Fixes: https://lists.gnu.org/archive/html/bug-m4/2021-05/msg00029.html ---- - doc/m4.texi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/m4.texi b/doc/m4.texi -index 247f2be5..3b833b2a 100644 ---- a/doc/m4.texi -+++ b/doc/m4.texi -@@ -6756,6 +6756,7 @@ ifdef(`__unix__', , - ')m4exit(`77')')dnl - changequote(`[', `]') - @result{} --syscmd([/bin/sh -c 'kill -9 $$'; st=$?; test $st = 137 || test $st = 265]) -+syscmd([@{ /bin/sh -c 'kill -9 $$'; @} 2>/dev/null; st=$?; -+test $st = 137 || test $st = 265]) - @result{} - ifelse(sysval, [0], , [errprint([ skipping: shell does not send signal 9 --- -2.17.1 - diff --git a/system/m4/posix-test.patch b/system/m4/posix-test.patch deleted file mode 100644 index 058c85c6f..000000000 --- a/system/m4/posix-test.patch +++ /dev/null @@ -1,18 +0,0 @@ -This behaviour does not pass on *this* platform. - ---- m4-1.4.19/tests/test-posix_spawn_file_actions_addclose.c.old 2021-04-22 15:28:47.000000000 -0500 -+++ m4-1.4.19/tests/test-posix_spawn_file_actions_addclose.c 2022-02-09 03:27:59.030000000 -0600 -@@ -54,13 +54,6 @@ - errno = 0; - ASSERT (posix_spawn_file_actions_addclose (&actions, -1) == EBADF); - } -- /* This behaviour is not mandated by POSIX, but happens to pass on all -- platforms. */ -- { -- int bad_fd = big_fd (); -- errno = 0; -- ASSERT (posix_spawn_file_actions_addclose (&actions, bad_fd) == EBADF); -- } - - posix_spawn_file_actions_destroy (&actions); - diff --git a/system/man-pages/APKBUILD b/system/man-pages/APKBUILD index 2ee5c69f1..53ac72bfc 100644 --- a/system/man-pages/APKBUILD +++ b/system/man-pages/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=man-pages -pkgver=5.13 +pkgver=6.14 _posixver=2017 -pkgrel=1 +pkgrel=0 pkgdesc="Linux man pages" url="https://www.kernel.org/doc/man-pages/" arch="noarch" @@ -12,7 +12,7 @@ license="GPL-2.0+ AND POSIX" depends="" makedepends="" install_if="docs build-tools" -source="https://cdn.kernel.org/pub/linux/docs/$pkgname/Archive/$pkgname-$pkgver.tar.xz +source="https://cdn.kernel.org/pub/linux/docs/$pkgname/$pkgname-$pkgver.tar.xz https://cdn.kernel.org/pub/linux/docs/$pkgname/$pkgname-posix/$pkgname-posix-${_posixver}-a.tar.xz " @@ -27,7 +27,7 @@ build() { } package() { - make prefix="$pkgdir"/usr install + make -R prefix="$pkgdir"/usr install find "$pkgdir"/usr/share/man -name "*.[0-9]" | xargs gzip -9 # provided by libiconv-doc @@ -50,5 +50,5 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/localedef* } -sha512sums="a68c0bd5f078aff2f13f962060863e5d30734c1c562e8e9e3d5eda5a329b18ad3e9b4ebb883d31cacfc0a476f91fccb8dd4257598acd75d09dd21351893d3499 man-pages-5.13.tar.xz +sha512sums="e2981bb75e22d74ae4424dde7a9529d685693635777b072318af73e76f8156783bc74205e8fff5a433ec4d769ccaa8388078a9d061f3878b5182128e5af50693 man-pages-6.14.tar.xz dac6bd5bb3e1d5f8918bad3eb15e08eeb3e06ae160c04ccd5619bfb0c536139ac06faa62b6856656a1bb9a7496f3148e52a5227b83e4099be6e6b93230de211d man-pages-posix-2017-a.tar.xz" |