diff options
46 files changed, 389 insertions, 559 deletions
diff --git a/system/gzip/APKBUILD b/system/gzip/APKBUILD index 84cb58b78..4682daca3 100644 --- a/system/gzip/APKBUILD +++ b/system/gzip/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=gzip -pkgver=1.12 +pkgver=1.14 pkgrel=0 pkgdesc="The GNU data compression program" subpackages="$pkgname-doc" @@ -45,4 +45,4 @@ package() { ln -sf /bin/gunzip "$pkgdir"/usr/bin/uncompress } -sha512sums="09b441299039479488700b7ef267ab7f71268af0d648d32cf6b1efcac58e59f1f352fa9d4f95278e96a76dc21239be1a5acab319bc85a7501cf5d8573c83d857 gzip-1.12.tar.gz" +sha512sums="65db6f01d982a976c431d33e9725dab84fcb991c9603cb2a492a2d578a58f9ac03a14ade4b91af49e9e877d81afec61dea563cf1e599f5b2eee2087613a2d368 gzip-1.14.tar.gz" diff --git a/system/icu/APKBUILD b/system/icu/APKBUILD index 17741042d..a27b1fda6 100644 --- a/system/icu/APKBUILD +++ b/system/icu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sergey Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=icu -pkgver=75.1 +pkgver=77.1 # convert x.y.z to x_y_z _ver=$(printf '%s' "$pkgver" | tr . _) @@ -17,7 +17,6 @@ makedepends="" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs" source="https://github.com/unicode-org/icu/releases/download/release-$(printf '%s' "$pkgver" | tr . -)/${pkgname}4c-$_ver-src.tgz icu-60.2-always-use-utf8.patch - islamic-calendar.patch " # secfixes: @@ -79,6 +78,5 @@ static() { mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/ } -sha512sums="70ea842f0d5f1f6c6b65696ac71d96848c4873f4d794bebc40fd87af2ad4ef064c61a786bf7bc430ce4713ec6deabb8cc1a8cc0212eab148cee2d498a3683e45 icu4c-75_1-src.tgz -f89e9f389621ed9a58548ac961fc93fca8377b91fbb0df1991049757deadf72f6f11346eb7af883040c85b28621140805636a7f90d94f3b53e666d67b9681989 icu-60.2-always-use-utf8.patch -1a4305e6145ecab171d044e4cc14e074294c73e221f780803363823bafa2f79d2efd77d63f6c0bb6df6d5f9767de38d321196d85649be929a583f1abc27dbdd0 islamic-calendar.patch" +sha512sums="a47d6d9c327d037a05ea43d1d1a06b2fd757cc02a94f7c1a238f35cfc3dfd4ab78d0612790f3a3cca0292c77412a9c2c15c8f24b718f79a857e007e66f07e7cd icu4c-77_1-src.tgz +95c37febf7b6291dd0766de0dbd8eaee14132ad1b84bc93260b9e19cb3c05a786e8780ac0cbd47bf80182f73c647d4e5f067c9b4f5fbeda13a7fcc34b3bc0341 icu-60.2-always-use-utf8.patch" diff --git a/system/icu/icu-60.2-always-use-utf8.patch b/system/icu/icu-60.2-always-use-utf8.patch index 801a907d0..17ff834a4 100644 --- a/system/icu/icu-60.2-always-use-utf8.patch +++ b/system/icu/icu-60.2-always-use-utf8.patch @@ -1,6 +1,6 @@ --- source/common/unicode/platform.h 2017-10-25 13:41:15.000000000 -0500 +++ source/common/unicode/platform.h 2018-04-04 02:07:28.851222016 -0500 -@@ -606,7 +606,7 @@ +@@ -612,7 +612,7 @@ U_PLATFORM == U_PF_EMSCRIPTEN # define U_CHARSET_IS_UTF8 1 #else diff --git a/system/icu/islamic-calendar.patch b/system/icu/islamic-calendar.patch deleted file mode 100644 index bae9734af..000000000 --- a/system/icu/islamic-calendar.patch +++ /dev/null @@ -1,14 +0,0 @@ -The addition is duplicated, causing some dates to be one year off. - -Fixes: d43d216feb ("ICU-22633 Test and fix int32_t overflow for Calendar set") - ---- source/i18n/islamcal.cpp.old 2024-04-16 16:08:53.000000000 -0500 -+++ source/i18n/islamcal.cpp 2024-08-12 00:03:20.102380147 -0500 -@@ -452,7 +452,6 @@ - // This may be called by Calendar::handleComputeJulianDay with months out of the range - // 0..11. Need to handle that here since monthStart requires months in the range 0.11. - if (month > 11) { -- eyear += (month / 12); - if (uprv_add32_overflow(eyear, (month / 12), &eyear)) { - status = U_ILLEGAL_ARGUMENT_ERROR; - return 0; diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD index ec3a915eb..8060532bb 100644 --- a/system/iproute2/APKBUILD +++ b/system/iproute2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iproute2 -pkgver=5.17.0 +pkgver=6.15.0 pkgrel=0 pkgdesc="Advanced IP routing and network device configuration tools" url="https://wiki.linuxfoundation.org/networking/iproute2" @@ -15,26 +15,17 @@ makedepends="bison flex bash db-dev libelf-dev libmnl-dev libcap-dev bsd-compat- subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz" -prepare() { - default_prepare - - sed -i '/^TARGETS=/s: arpd : :' misc/Makefile - sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h - sed -i -e 's:=/share:=/usr/share:' \ - -e 's:-Werror::' Makefile -} - build() { - ./configure - make CCOPTS="-D_GNU_SOURCE $CFLAGS" LIBDIR=/lib + ./configure --libdir=/lib --color=auto + make CCOPTS="-D_GNU_SOURCE $CFLAGS" } package() { make -j1 DESTDIR="$pkgdir" install mkdir "$pkgdir"/bin - mv "$pkgdir"/sbin/ip "$pkgdir"/bin/ip + ln -s ../sbin/ip "$pkgdir"/bin/ip mkdir "$pkgdir"/usr/share/man/man1 - mv "$pkgdir"/usr/share/man/man8/ip.8 \ + ln -s ../man8/ip.8 \ "$pkgdir"/usr/share/man/man1/ip.1 } @@ -50,4 +41,4 @@ bashcomp() { rmdir -p "$pkgdir"/usr/share 2>/dev/null || true } -sha512sums="fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d iproute2-5.17.0.tar.xz" +sha512sums="1a438941cd939e1c8e32cfe8c40e6fd826c89185f1bb0c623eaad7380a66afd9fa9e0d7cdc5e5b193d2761b7dbdc78fd0811537eecc500be633730c32ff55ad4 iproute2-6.15.0.tar.xz" diff --git a/system/isl/APKBUILD b/system/isl/APKBUILD index 413c82956..bc07ee387 100644 --- a/system/isl/APKBUILD +++ b/system/isl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> pkgname=isl -pkgver=0.24 +pkgver=0.27 pkgrel=0 pkgdesc="Integer Set Library" url="https://libisl.sourceforge.io/" @@ -10,6 +10,7 @@ options="!dbg strip" # Static libs only license="MIT" depends="" depends_dev="gmp-dev" +checkdepends="!python3" # Python test fails with missing symbol error. (#1332) makedepends_host="$depends_dev" makedepends="$makedepends_host" replaces="cloog" @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" INSTALL="install -D" install } -sha512sums="aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95 isl-0.24.tar.bz2" +sha512sums="e14ab1a622d3f6219b264b8e2512487aecd6725b7b88f40bc8f31651bfe7d89db4649aae12eaa0052dd904bac21607f63c83fbab73251767425d91989a969f7e isl-0.27.tar.bz2" diff --git a/system/kmod/APKBUILD b/system/kmod/APKBUILD index 171f279ce..c973ea098 100644 --- a/system/kmod/APKBUILD +++ b/system/kmod/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmod -pkgver=30 +pkgver=33 pkgrel=0 pkgdesc="Linux kernel module management utilities" -url="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary" +url="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/about/" arch="all" options="!check" # https://bugs.gentoo.org/408915#c3 license="GPL-2.0+" depends="" -makedepends="openssl-dev zlib-dev xz-dev zstd-dev" +makedepends="openssl-dev scdoc xz-dev zlib-dev zstd-dev" triggers="$pkgname.trigger=/lib/modules/*" subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-bash-completion:bashcomp:noarch" @@ -25,6 +25,7 @@ build() { --prefix=/usr \ --bindir=/bin \ --sysconfdir=/etc \ + --libdir=/lib \ --with-rootlibdir=/lib \ --with-zlib \ --with-xz \ @@ -41,11 +42,14 @@ package() { make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/sbin for i in lsmod rmmod insmod modinfo modprobe depmod; do + case $i in + lsmod|modinfo) ;; + *) rm "$pkgdir"/bin/$i;; + esac ln -sf ../bin/kmod "$pkgdir"/sbin/$i done - for i in lsmod modinfo; do - ln -s kmod "$pkgdir"/bin/$i - done + mkdir -p "$pkgdir"/usr/lib + mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib/ install -Dm755 "$srcdir"/kmod-static-nodes.initd \ "$pkgdir"/etc/init.d/kmod-static-nodes } @@ -60,6 +64,6 @@ bashcomp() { } -sha512sums="e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e kmod-30.tar.xz -f2ea3527bfba182c5e15557c224a5bba8c7e2ea3d21cf604e6eb2277226dcf983c3aeb9ac44a322c7f2b4942b35135da999d63a5b946b829d3f3b09c050a0f17 strndupa.patch +sha512sums="32d79d0bb7e89012f18458d4e88325f8e19a7dba6e1d5cff01aec3e618d1757b0f7c119735bf38d02e0d056a14273fd7522fca7c61a4d12a3ea5854bb662fff8 kmod-33.tar.xz +8bc365bbff8e9602c18c6ba0ae635b6648216ba367a631818ec99851e68aba27742c5f1f0a51b0981877359da7668f6fa79584dc956757299d08c0f77b3dd559 strndupa.patch 7f0f89fe98167f71b7924f341ba701d001158225463c2f5e39f706a0224b1e952ee901b441f28cb15787563e83bb6e54eb752bf8669ae7c0ffbb11984542f354 kmod-static-nodes.initd" diff --git a/system/kmod/strndupa.patch b/system/kmod/strndupa.patch index d4527140e..bde1b23a6 100644 --- a/system/kmod/strndupa.patch +++ b/system/kmod/strndupa.patch @@ -2,7 +2,7 @@ diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c index df12433..142e767 100644 --- a/shared/util.c +++ b/shared/util.c -@@ -334,7 +334,9 @@ int mkdir_p(const char *path, int len, mode_t mode) +@@ -389,7 +389,9 @@ int mkdir_p(const char *path, int len, mode_t mode) { char *start, *end; diff --git a/system/less/APKBUILD b/system/less/APKBUILD index 793d3bbab..71448ea19 100644 --- a/system/less/APKBUILD +++ b/system/less/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Cameron Banta <cbanta@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=less -pkgver=590 +pkgver=678 pkgrel=0 pkgdesc="File pager" url="http://www.greenwoodsoftware.com/less/" arch="all" license="BSD-2-Clause OR GPL-3.0+" -options="!check" +depends="" makedepends="ncurses-dev" subpackages="$pkgname-doc" source="http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz - search-path-history-file.patch - search-path-lesskey-file.patch + test-tinfow.patch " prepare() { @@ -31,10 +30,13 @@ build() { make } +check() { + make check +} + package() { make DESTDIR="$pkgdir" install } -sha512sums="426fa5840fd43c17bd5a452ad35ad24f2d6684623c6914403fd0059af62266bf2138e6828c7d73a1cef26a736c0d2b8ed4ab180eea8297281dae79a4228eb903 less-590.tar.gz -d059a3b4e28c8c8473a9834e00eade8bb9ab14922235bf0344d71604ad656449dcb95763f7103a21d2443881d599178d333f1e4c88a4372d9cb526eb36ebd8b0 search-path-history-file.patch -62d92ba9ae2e152cbf47d214f92a202591f901a68e74afa7a46fbaa6af1f6c38b76e067cf5c9f4fba2ee9602857c5900a0857d5402ebd593ab2410527b5f162d search-path-lesskey-file.patch" +sha512sums="ad1983229bfb5a30c6139db60012d3a12b613011f044acb4c0ec5c0fc809b8dc9be40255bf420f65d51425152c4cfc943076ccd2ee63b196165d6ab1426ea187 less-678.tar.gz +ef417e321e8af95cfec0dbd4411f2676f1649052b8a99097472e82b52774d485a304d307183370b14a265c4e2381a0bb9a7d3e389ba17553824e6d6b5216567a test-tinfow.patch" diff --git a/system/less/search-path-history-file.patch b/system/less/search-path-history-file.patch deleted file mode 100644 index 7ec0ce9f1..000000000 --- a/system/less/search-path-history-file.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 5e1f4ce2c3a2c0fd6a953c4f7ca2839370f9c3ae Mon Sep 17 00:00:00 2001 -From: Mark Nudelman <markn@greenwoodsoftware.com> -Date: Fri, 3 Dec 2021 09:38:22 -0800 -Subject: [PATCH] Add $XDG_STATE_HOME and $HOME/.local/state to list of - directories to search for the history file. - ---- - cmdbuf.c | 48 ++++++++++++++++++++++++++++++++---------------- - less.nro.VER | 6 +++--- - 2 files changed, 35 insertions(+), 19 deletions(-) - -diff --git a/cmdbuf.c b/cmdbuf.c -index cd99010d..abbda9b9 100644 ---- a/cmdbuf.c -+++ b/cmdbuf.c -@@ -1401,14 +1401,41 @@ mlist_size(ml) - /* - * Get the name of the history file. - */ -+ static char * -+histfile_find(must_exist) -+ int must_exist; -+{ -+ char *home = lgetenv("HOME"); -+ char *name = NULL; -+ -+ /* Try in $XDG_DATA_STATE, then in $HOME/.local/state, then in $XDG_DATA_HOME, then in $HOME. */ -+#if OS2 -+ if (isnullenv(home)) -+ home = lgetenv("INIT"); -+#endif -+ name = dirfile(lgetenv("XDG_STATE_HOME"), &LESSHISTFILE[1], must_exist); -+ if (name == NULL) -+ { -+ char *dir = dirfile(home, ".local/state", 1); -+ if (dir != NULL) -+ { -+ name = dirfile(dir, &LESSHISTFILE[1], must_exist); -+ free(dir); -+ } -+ } -+ if (name == NULL) -+ name = dirfile(lgetenv("XDG_DATA_HOME"), &LESSHISTFILE[1], must_exist); -+ if (name == NULL) -+ name = dirfile(home, LESSHISTFILE, must_exist); -+ return (name); -+} -+ - static char * - histfile_name(must_exist) - int must_exist; - { -- char *home; -- char *xdg; - char *name; -- -+ - /* See if filename is explicitly specified by $LESSHISTFILE. */ - name = lgetenv("LESSHISTFILE"); - if (!isnullenv(name)) -@@ -1423,25 +1450,14 @@ histfile_name(must_exist) - if (strcmp(LESSHISTFILE, "") == 0 || strcmp(LESSHISTFILE, "-") == 0) - return (NULL); - -- /* Try in $XDG_DATA_HOME first, then in $HOME. */ -- xdg = lgetenv("XDG_DATA_HOME"); -- home = lgetenv("HOME"); --#if OS2 -- if (isnullenv(home)) -- home = lgetenv("INIT"); --#endif - name = NULL; - if (!must_exist) - { - /* If we're writing the file and the file already exists, use it. */ -- name = dirfile(xdg, &LESSHISTFILE[1], 1); -- if (name == NULL) -- name = dirfile(home, LESSHISTFILE, 1); -+ name = histfile_find(1); - } - if (name == NULL) -- name = dirfile(xdg, &LESSHISTFILE[1], must_exist); -- if (name == NULL) -- name = dirfile(home, LESSHISTFILE, must_exist); -+ name = histfile_find(must_exist); - return (name); - } - diff --git a/system/less/search-path-lesskey-file.patch b/system/less/search-path-lesskey-file.patch deleted file mode 100644 index 422376930..000000000 --- a/system/less/search-path-lesskey-file.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d3edebf528da8a9e15d6be518c24e90462a28698 Mon Sep 17 00:00:00 2001 -From: Mark Nudelman <markn@greenwoodsoftware.com> -Date: Tue, 19 Oct 2021 14:24:04 -0700 -Subject: [PATCH] Add $HOME/.config to possible locations of lesskey file. - ---- - NEWS | 4 ++++ - decode.c | 13 ++++++++++++- - less.nro.VER | 2 +- - 3 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/decode.c b/decode.c -index e1a55198..2eb480fa 100644 ---- a/decode.c -+++ b/decode.c -@@ -952,9 +952,20 @@ add_hometable(call_lesskey, envname, def_filename, sysvar) - filename = save(def_filename); - else /* def_filename is just basename */ - { -+ /* Remove first char (normally a dot) unless stored in $HOME. */ - char *xdg = lgetenv("XDG_CONFIG_HOME"); - if (!isnullenv(xdg)) -- filename = dirfile(xdg, def_filename+1, 1); -+ filename = dirfile(xdg, &def_filename[1], 1); -+ if (filename == NULL) -+ { -+ char *home = lgetenv("HOME"); -+ if (!isnullenv(home)) -+ { -+ char *cfg_dir = dirfile(home, ".config", 0); -+ filename = dirfile(cfg_dir, &def_filename[1], 1); -+ free(cfg_dir); -+ } -+ } - if (filename == NULL) - filename = homefile(def_filename); - } diff --git a/system/less/test-tinfow.patch b/system/less/test-tinfow.patch new file mode 100644 index 000000000..a24c45746 --- /dev/null +++ b/system/less/test-tinfow.patch @@ -0,0 +1,13 @@ +Upstream-URL: https://github.com/gwsw/less/issues/631 + +--- less-678/lesstest/Makefile.old 2025-05-01 15:42:10.000000000 -0500 ++++ less-678/lesstest/Makefile 2025-05-31 16:46:46.402951544 -0500 +@@ -1,7 +1,7 @@ + CC ?= gcc + CFLAGS ?= -Wall -O2 + LDFLAGS ?= +-TERMLIB = -lncurses ++TERMLIB = -ltinfow + srcdir ?= . + + all: lesstest lt_screen diff --git a/system/libarchive/APKBUILD b/system/libarchive/APKBUILD index 9fcca3319..4c63983d6 100644 --- a/system/libarchive/APKBUILD +++ b/system/libarchive/APKBUILD @@ -1,20 +1,20 @@ # Contributor: Sergey Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libarchive -pkgver=3.7.2 +pkgver=3.8.0 pkgrel=0 pkgdesc="Multi-format archive and compression library" url="https://www.libarchive.org/" arch="all" license="BSD-2-Clause AND BSD-3-Clause AND Public-Domain" depends="" -makedepends="zlib-dev bzip2-dev xz-dev lz4-dev acl-dev openssl-dev expat-dev - attr-dev zstd-dev" +makedepends="acl-dev attr-dev bzip2-dev expat-dev lz4-dev openssl-dev pcre2-dev + xz-dev zlib-dev zstd-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="https://github.com/libarchive/libarchive/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz disable-locale-tests.patch disable-unaligned-access-arm32-xxhash.patch - fix-test-32-bit-zstd.patch + test-fix.patch " # secfixes: @@ -40,6 +40,7 @@ build () { --with-lz4 \ --enable-acl \ --enable-xattr \ + --enable-posix-regex-lib=libpcre2posix \ ac_cv_header_linux_fiemap_h=no make } @@ -61,7 +62,7 @@ tools() { ln -s bsdcpio "$subpkgdir"/usr/bin/cpio } -sha512sums="1af253203df3014d1fbf3e99ebdc7aa2a3f036c7c2606d0f0550c49973b0fff99ee7262f4a6e20090c0806c40e964731334360daa3b718bde40108183eacc8a1 libarchive-3.7.2.tar.gz -27cf2aaa3e70e3a2a9944fac0c96c411e669c7e1a48daad1423bff68eef0f49153e5ef9d22dc9591a65353119d7fe203a28258ab82278aeb86b46fe691bcfb6a disable-locale-tests.patch +sha512sums="e563cd10cd447daf7c5d11c657cbc3d8971add4440264fb4754ea7670a249e8b7b1c31f62f78259867960392623dba73c2d20efc57dc02564c8f55841dc8f2cc libarchive-3.8.0.tar.gz +0360eb38364af93ebe81fc59e6a2b1bdb9c1d42487560c3565c5723a57f8f5ee85638ad6906f761d9b41f7d6ad03bad800810394ea1bfcfc70e6c07b25bcfad6 disable-locale-tests.patch 56a2b13b6cd7b127c04ac50ebf49994ec91ff2467d5d0f32b8428bd4df82b167459d4630dee5d1b5119f70b04ea6fe4411d44b768e0f313fa302c9e5fe51b7cd disable-unaligned-access-arm32-xxhash.patch -f0a8e3881e742395afc74e418eceab419280152f0884fd6b9dc971d90e117de1cd0a7578c08f14f694c75b904f12fa71fb0102dde0d67a095f6369b3413f7348 fix-test-32-bit-zstd.patch" +1eee8588058ce1de122d20de1ac67f8294be5b8d1ea28dc7adf28cee86eb45e697983a051f25a38d2e0ca92b9996e1d13707b985b86ff1647c8960ffca965fea test-fix.patch" diff --git a/system/libarchive/disable-locale-tests.patch b/system/libarchive/disable-locale-tests.patch index 885490c95..0775e8cc9 100644 --- a/system/libarchive/disable-locale-tests.patch +++ b/system/libarchive/disable-locale-tests.patch @@ -1,6 +1,6 @@ --- libarchive-3.6.0/libarchive/test/test_gnutar_filename_encoding.c.old 2022-02-09 06:24:12.000000000 -0600 +++ libarchive-3.6.0/libarchive/test/test_gnutar_filename_encoding.c 2022-02-20 17:08:38.820000000 -0600 -@@ -75,7 +75,7 @@ +@@ -73,7 +73,7 @@ char buff[4096]; size_t used; @@ -9,7 +9,7 @@ skipping("KOI8-R locale not available on this system."); return; } -@@ -116,7 +116,7 @@ +@@ -114,7 +114,7 @@ char buff[4096]; size_t used; @@ -18,7 +18,7 @@ skipping("KOI8-R locale not available on this system."); return; } -@@ -157,8 +157,7 @@ +@@ -155,8 +155,7 @@ char buff[4096]; size_t used; @@ -28,7 +28,7 @@ skipping("KOI8-R locale not available on this system."); return; } -@@ -242,7 +241,7 @@ +@@ -240,7 +239,7 @@ char buff[4096]; size_t used; @@ -37,7 +37,7 @@ skipping("Russian_Russia locale not available on this system."); return; } -@@ -277,7 +276,7 @@ +@@ -275,7 +274,7 @@ char buff[4096]; size_t used; @@ -46,7 +46,7 @@ skipping("eucJP locale not available on this system."); return; } -@@ -357,8 +356,7 @@ +@@ -355,8 +354,7 @@ char buff[4096]; size_t used; @@ -58,7 +58,7 @@ } --- libarchive-3.6.0/libarchive/test/test_pax_filename_encoding.c.old 2022-02-09 06:24:12.000000000 -0600 +++ libarchive-3.6.0/libarchive/test/test_pax_filename_encoding.c 2022-02-20 17:09:41.050000000 -0600 -@@ -342,7 +342,7 @@ +@@ -341,7 +341,7 @@ char buff[4096]; size_t used; @@ -67,7 +67,7 @@ skipping("KOI8-R locale not available on this system."); return; } -@@ -388,8 +388,7 @@ +@@ -387,8 +387,7 @@ char buff[4096]; size_t used; @@ -77,7 +77,7 @@ skipping("KOI8-R locale not available on this system."); return; } -@@ -435,7 +434,7 @@ +@@ -434,7 +433,7 @@ char buff[4096]; size_t used; @@ -86,7 +86,7 @@ skipping("eucJP locale not available on this system."); return; } -@@ -482,8 +481,7 @@ +@@ -481,8 +480,7 @@ char buff[4096]; size_t used; @@ -98,7 +98,7 @@ } --- libarchive-3.6.0/libarchive/test/test_read_format_cpio_filename.c.old 2022-02-09 06:24:12.000000000 -0600 +++ libarchive-3.6.0/libarchive/test/test_read_format_cpio_filename.c 2022-02-20 17:16:18.580000000 -0600 -@@ -91,7 +91,7 @@ +@@ -90,7 +90,7 @@ /* * Read UTF-8 filename in ja_JP.eucJP with "hdrcharset=UTF-8" option. */ @@ -107,7 +107,7 @@ skipping("ja_JP.eucJP locale not available on this system."); return; } -@@ -191,8 +191,7 @@ +@@ -196,8 +196,7 @@ /* * Read CP866 filename in ru_RU.KOI8-R with "hdrcharset=CP866" option. */ @@ -117,7 +117,7 @@ skipping("ru_RU.KOI8-R locale not available on this system."); return; } -@@ -296,8 +295,7 @@ +@@ -301,8 +300,7 @@ /* * Read KOI8-R filename in ru_RU.CP866 with "hdrcharset=KOI8-R" option. */ @@ -127,7 +127,7 @@ skipping("ru_RU.CP866 locale not available on this system."); return; } -@@ -401,8 +399,7 @@ +@@ -406,8 +404,7 @@ /* * Read UTF-8 filename in ru_RU.KOI8-R with "hdrcharset=UTF-8" option. */ @@ -137,7 +137,7 @@ skipping("ru_RU.KOI8-R locale not available on this system."); return; } -@@ -454,8 +451,7 @@ +@@ -459,8 +456,7 @@ /* * Read UTF-8 filename in ru_RU.CP866 with "hdrcharset=UTF-8" option. */ @@ -147,7 +147,7 @@ skipping("ru_RU.CP866 locale not available on this system."); return; } -@@ -553,8 +549,7 @@ +@@ -564,8 +560,7 @@ /* * Read eucJP filename in CP932/SJIS with "hdrcharset=eucJP" option. */ @@ -157,7 +157,7 @@ skipping("CP932 locale not available on this system."); return; } -@@ -604,8 +599,7 @@ +@@ -615,8 +600,7 @@ /* * Read UTF-8 filename in CP932/SJIS with "hdrcharset=UTF-8" option. */ @@ -167,7 +167,7 @@ skipping("CP932 locale not available on this system."); return; } -@@ -656,8 +650,7 @@ +@@ -667,8 +661,7 @@ /* * Read CP866 filename in CP1251 with "hdrcharset=CP866" option. */ @@ -177,7 +177,7 @@ skipping("CP1251 locale not available on this system."); return; } -@@ -715,7 +708,7 @@ +@@ -726,7 +719,7 @@ /* * Read CP866 filename in CP1251 without "hdrcharset=CP866" option. */ @@ -186,7 +186,7 @@ skipping("Russian_Russia locale not available on this system."); return; } -@@ -761,8 +754,7 @@ +@@ -772,8 +765,7 @@ /* * Read KOI8-R filename in CP1251 with "hdrcharset=KOI8-R" option. */ @@ -196,7 +196,7 @@ skipping("CP1251 locale not available on this system."); return; } -@@ -814,8 +806,7 @@ +@@ -825,8 +817,7 @@ /* * Read KOI8-R filename in CP1251 with "hdrcharset=KOI8-R" option. */ @@ -208,7 +208,7 @@ } --- libarchive-3.6.0/libarchive/test/test_read_format_gtar_filename.c.old 2022-02-09 06:24:12.000000000 -0600 +++ libarchive-3.6.0/libarchive/test/test_read_format_gtar_filename.c 2022-02-20 17:17:56.960000000 -0600 -@@ -89,8 +89,7 @@ +@@ -88,8 +88,7 @@ /* * Read CP866 filename in ru_RU.KOI8-R with "hdrcharset=CP866" option. */ @@ -218,7 +218,7 @@ skipping("ru_RU.KOI8-R locale not available on this system."); return; } -@@ -194,8 +193,7 @@ +@@ -193,8 +192,7 @@ /* * Read KOI8-R filename in ru_RU.CP866 with "hdrcharset=KOI8-R" option. */ @@ -228,7 +228,7 @@ skipping("ru_RU.CP866 locale not available on this system."); return; } -@@ -299,8 +297,7 @@ +@@ -298,8 +296,7 @@ /* * Read eucJP filename in CP932/SJIS with "hdrcharset=eucJP" option. */ @@ -238,7 +238,7 @@ skipping("CP932 locale not available on this system."); return; } -@@ -350,8 +347,7 @@ +@@ -349,8 +346,7 @@ /* * Read CP866 filename in CP1251 with "hdrcharset=CP866" option. */ @@ -248,7 +248,7 @@ skipping("CP1251 locale not available on this system."); return; } -@@ -409,7 +405,7 @@ +@@ -408,7 +404,7 @@ /* * Read CP866 filename in CP1251 without "hdrcharset=CP866" option. */ @@ -257,7 +257,7 @@ skipping("Russian_Russia locale not available on this system."); return; } -@@ -455,8 +451,7 @@ +@@ -454,8 +450,7 @@ /* * Read KOI8-R filename in CP1251 with "hdrcharset=KOI8-R" option. */ @@ -269,7 +269,7 @@ } --- libarchive-3.6.0/libarchive/test/test_read_format_rar.c.old 2022-02-09 06:24:12.000000000 -0600 +++ libarchive-3.6.0/libarchive/test/test_read_format_rar.c 2022-02-20 17:19:17.710000000 -0600 -@@ -336,8 +336,7 @@ +@@ -344,8 +344,7 @@ struct archive_entry *ae; struct archive *a; @@ -281,7 +281,7 @@ } --- libarchive-3.6.0/libarchive/test/test_read_format_zip_filename.c.old 2022-02-09 06:24:12.000000000 -0600 +++ libarchive-3.6.0/libarchive/test/test_read_format_zip_filename.c 2022-02-20 17:29:22.640000000 -0600 -@@ -176,7 +176,7 @@ +@@ -175,7 +175,7 @@ * because the file name in the sample file is UTF-8 and * Bit 11 of its general purpose bit flag is set. */ @@ -290,7 +290,7 @@ skipping("ja_JP.eucJP locale not availablefilename_ on " "this system."); return; -@@ -343,8 +343,7 @@ +@@ -342,8 +342,7 @@ /* * Read CP866 filename in ru_RU.KOI8-R with "hdrcharset=CP866" option. */ @@ -300,7 +300,7 @@ skipping("ru_RU.KOI8-R locale not available on this system."); return; } -@@ -456,8 +455,7 @@ +@@ -455,8 +454,7 @@ /* * Read KOI8-R filename in ru_RU.CP866 with "hdrcharset=KOI8-R" option. */ @@ -310,7 +310,7 @@ skipping("ru_RU.CP866 locale not available on this system."); return; } -@@ -569,8 +567,7 @@ +@@ -568,8 +566,7 @@ /* * Read UTF-8 filename in ru_RU.KOI8-R with "hdrcharset=UTF-8" option. */ @@ -320,7 +320,7 @@ skipping("ru_RU.KOI8-R locale not available on this system."); return; } -@@ -633,8 +630,7 @@ +@@ -632,8 +629,7 @@ * because the file name in the sample file is UTF-8 and * Bit 11 of its general purpose bit flag is set. */ @@ -330,7 +330,7 @@ skipping("ru_RU.CP866 locale not available on this system."); return; } -@@ -809,8 +805,7 @@ +@@ -808,8 +804,7 @@ * because the file name in the sample file is UTF-8 and * Bit 11 of its general purpose bit flag is set. */ @@ -340,7 +340,7 @@ skipping("CP932 locale not available on this system."); return; } -@@ -884,8 +879,7 @@ +@@ -883,8 +878,7 @@ /* * Read CP866 filename in CP1251 with "hdrcharset=CP866" option. */ @@ -350,7 +350,7 @@ skipping("CP1251 locale not available on this system."); return; } -@@ -947,7 +941,7 @@ +@@ -946,7 +940,7 @@ /* * Read CP866 filename in CP1251 without "hdrcharset=CP866" option. */ @@ -359,7 +359,7 @@ skipping("Russian_Russia locale not available on this system."); return; } -@@ -997,8 +991,7 @@ +@@ -996,8 +990,7 @@ /* * Read KOI8-R filename in CP1251 with "hdrcharset=KOI8-R" option. */ @@ -369,7 +369,7 @@ skipping("CP1251 locale not available on this system."); return; } -@@ -1056,8 +1049,7 @@ +@@ -1055,8 +1048,7 @@ * because the file name in the sample file is UTF-8 and * Bit 11 of its general purpose bit flag is set. */ @@ -381,7 +381,7 @@ } --- libarchive-3.6.0/libarchive/test/test_ustar_filename_encoding.c.old 2022-02-09 06:24:12.000000000 -0600 +++ libarchive-3.6.0/libarchive/test/test_ustar_filename_encoding.c 2022-02-20 17:30:54.440000000 -0600 -@@ -75,7 +75,7 @@ +@@ -74,7 +74,7 @@ char buff[4096]; size_t used; @@ -390,7 +390,7 @@ skipping("KOI8-R locale not available on this system."); return; } -@@ -116,7 +116,7 @@ +@@ -115,7 +115,7 @@ char buff[4096]; size_t used; @@ -399,7 +399,7 @@ skipping("KOI8-R locale not available on this system."); return; } -@@ -157,8 +157,7 @@ +@@ -156,8 +156,7 @@ char buff[4096]; size_t used; @@ -409,7 +409,7 @@ skipping("KOI8-R locale not available on this system."); return; } -@@ -242,7 +241,7 @@ +@@ -241,7 +240,7 @@ char buff[4096]; size_t used; @@ -418,7 +418,7 @@ skipping("Russian_Russia locale not available on this system."); return; } -@@ -277,7 +276,7 @@ +@@ -276,7 +275,7 @@ char buff[4096]; size_t used; @@ -427,7 +427,7 @@ skipping("eucJP locale not available on this system."); return; } -@@ -357,8 +356,7 @@ +@@ -356,8 +355,7 @@ char buff[4096]; size_t used; @@ -439,7 +439,7 @@ } --- libarchive-3.6.0/libarchive/test/test_zip_filename_encoding.c.old 2022-02-09 06:24:12.000000000 -0600 +++ libarchive-3.6.0/libarchive/test/test_zip_filename_encoding.c 2022-02-20 17:41:15.060000000 -0600 -@@ -122,7 +122,7 @@ +@@ -124,7 +124,7 @@ char buff[4096]; size_t used; @@ -448,7 +448,7 @@ skipping("KOI8-R locale not available on this system."); return; } -@@ -222,7 +222,7 @@ +@@ -224,7 +224,7 @@ char buff[4096]; size_t used; @@ -457,7 +457,7 @@ skipping("Russian_Russia locale not available on this system."); return; } -@@ -265,7 +265,7 @@ +@@ -267,7 +267,7 @@ char buff[4096]; size_t used; @@ -466,7 +466,7 @@ skipping("Russian_Russia locale not available on this system."); return; } -@@ -334,7 +334,7 @@ +@@ -336,7 +336,7 @@ char buff[4096]; size_t used; @@ -475,7 +475,7 @@ skipping("eucJP locale not available on this system."); return; } -@@ -433,8 +433,7 @@ +@@ -435,8 +435,7 @@ char buff[4096]; size_t used; @@ -487,7 +487,7 @@ } --- libarchive-3.6.0/libarchive/test/test_read_format_tar_filename.c.old 2022-02-09 06:24:12.000000000 -0600 +++ libarchive-3.6.0/libarchive/test/test_read_format_tar_filename.c 2022-02-20 17:54:34.540000000 -0600 -@@ -47,8 +47,7 @@ +@@ -46,8 +46,7 @@ * Read filename in ru_RU.CP866 with "hdrcharset=KOI8-R" option. * We should correctly read two filenames. */ @@ -497,7 +497,7 @@ skipping("ru_RU.CP866 locale not available on this system."); return; } -@@ -276,8 +275,7 @@ +@@ -275,8 +274,7 @@ * Read filename in CP1251 with "hdrcharset=KOI8-R" option. * We should correctly read two filenames. */ @@ -509,7 +509,7 @@ } --- libarchive-3.6.0/libarchive/test/test_read_format_ustar_filename.c.old 2022-02-09 06:24:12.000000000 -0600 +++ libarchive-3.6.0/libarchive/test/test_read_format_ustar_filename.c 2022-02-20 17:56:02.310000000 -0600 -@@ -90,8 +90,7 @@ +@@ -89,8 +89,7 @@ /* * Read CP866 filename in ru_RU.KOI8-R with "hdrcharset=CP866" option. */ @@ -519,7 +519,7 @@ skipping("ru_RU.KOI8-R locale not available on this system."); return; } -@@ -200,8 +199,7 @@ +@@ -199,8 +198,7 @@ /* * Read KOI8-R filename in ru_RU.CP866 with "hdrcharset=KOI8-R" option. */ @@ -529,7 +529,7 @@ skipping("ru_RU.CP866 locale not available on this system."); return; } -@@ -311,8 +309,7 @@ +@@ -310,8 +308,7 @@ /* * Read eucJP filename in CP932/SJIS with "hdrcharset=eucJP" option. */ @@ -539,7 +539,7 @@ skipping("CP932 locale not available on this system."); return; } -@@ -365,8 +362,7 @@ +@@ -364,8 +361,7 @@ /* * Read CP866 filename in CP1251 with "hdrcharset=CP866" option. */ @@ -549,7 +549,7 @@ skipping("CP1251 locale not available on this system."); return; } -@@ -427,7 +423,7 @@ +@@ -426,7 +422,7 @@ /* * Read CP866 filename in CP1251 without "hdrcharset=CP866" option. */ @@ -558,7 +558,7 @@ skipping("Russian_Russia locale not available on this system."); return; } -@@ -476,8 +472,7 @@ +@@ -475,8 +471,7 @@ /* * Read KOI8-R filename in CP1251 with "hdrcharset=KOI8-R" option. */ @@ -568,3 +568,14 @@ skipping("CP1251 locale not available on this system."); return; } +--- libarchive-3.8.0/libarchive/test/test_archive_string_conversion.c.old 2025-05-20 04:00:39.000000000 -0500 ++++ libarchive-3.8.0/libarchive/test/test_archive_string_conversion.c 2025-05-31 18:27:37.470770608 -0500 +@@ -995,7 +995,7 @@ + + memset(&mstr, 0, sizeof(mstr)); + +- if (setlocale(LC_ALL, "ru_RU.KOI8-R") == NULL) { ++ if (1) { + skipping("KOI8-R locale not available on this system."); + return; + } diff --git a/system/libarchive/fix-test-32-bit-zstd.patch b/system/libarchive/fix-test-32-bit-zstd.patch deleted file mode 100644 index 5f43c2626..000000000 --- a/system/libarchive/fix-test-32-bit-zstd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3bd918d92f8c34ba12de9c6604d96f9e262a59fc Mon Sep 17 00:00:00 2001 -From: Martin Matuska <martin@matuska.de> -Date: Tue, 12 Sep 2023 08:54:47 +0200 -Subject: [PATCH] tests: fix zstd long option test for 32-bit architectures - -Fixes #1968 ---- - libarchive/test/test_write_filter_zstd.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/libarchive/test/test_write_filter_zstd.c b/libarchive/test/test_write_filter_zstd.c -index 3cdbd812a..c9731f1b6 100644 ---- a/libarchive/test/test_write_filter_zstd.c -+++ b/libarchive/test/test_write_filter_zstd.c -@@ -161,8 +161,12 @@ DEFINE_TEST(test_write_filter_zstd) - archive_write_set_filter_option(a, NULL, "max-frame-size", "1048576")); - #endif - #if ZSTD_VERSION_NUMBER >= MINVER_LONG -- assertEqualIntA(a, ARCHIVE_OK, -- archive_write_set_filter_option(a, NULL, "long", "27")); -+ if ((int)(sizeof(size_t) == 4)) -+ assertEqualIntA(a, ARCHIVE_OK, -+ archive_write_set_filter_option(a, NULL, "long", "26")); -+ else -+ assertEqualIntA(a, ARCHIVE_OK, -+ archive_write_set_filter_option(a, NULL, "long", "27")); - assertEqualIntA(a, ARCHIVE_FAILED, - archive_write_set_filter_option(a, NULL, "long", "-1")); /* negative */ - #endif diff --git a/system/libarchive/test-fix.patch b/system/libarchive/test-fix.patch new file mode 100644 index 000000000..484145dd3 --- /dev/null +++ b/system/libarchive/test-fix.patch @@ -0,0 +1,13 @@ +Upstream-URL: https://github.com/libarchive/libarchive/issues/2653 + +--- libarchive-3.8.0/test_utils/test_main.c.old 2025-05-20 04:00:39.000000000 -0500 ++++ libarchive-3.8.0/test_utils/test_main.c 2025-05-31 17:39:16.638713788 -0500 +@@ -2456,7 +2456,7 @@ + + /* Skip arbitrary third-party version numbers. */ + while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || +- isalnum((unsigned char)*q))) { ++ *q == '_' || isalnum((unsigned char)*q))) { + ++q; + --s; + } diff --git a/system/libbsd/APKBUILD b/system/libbsd/APKBUILD index 66270a012..8153a76e6 100644 --- a/system/libbsd/APKBUILD +++ b/system/libbsd/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Ariadne Conill <ariadne@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libbsd -pkgver=0.10.0 +pkgver=0.12.2 pkgrel=0 pkgdesc="Commonly used BSD functions not implemented by all libcs" url="https://libbsd.freedesktop.org/" @@ -10,16 +10,9 @@ arch="all" license="BSD-2-Clause-NetBSD AND BSD-3-Clause AND BSD-4-Clause AND BSD-5-Clause AND Expat AND ISC AND Public-Domain AND Beerware" depends="musl>=1.1.16-r22" depends_dev="bsd-compat-headers linux-headers" -makedepends="$depends_dev autoconf automake libtool" +makedepends="$depends_dev libmd-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz - disable-fpurge-test.patch - " - -prepare() { - default_prepare - autoreconf -fi -} +source="https://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz" build() { ./configure \ @@ -41,5 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9 libbsd-0.10.0.tar.xz -424828e759420afbf2d4b97f5d402be9b3d51cb90241da1f047517bb75048255ea6cbbbc1e98bffa67449a7f48efe00d8f99b38bdaac9e8c461d1e989e9697b7 disable-fpurge-test.patch" +sha512sums="ce43e4f0486d5f00d4a8119ee863eaaa2f968cae4aa3d622976bb31ad601dfc565afacef7ebade5eba33fff1c329b5296c6387c008d1e1805d878431038f8b21 libbsd-0.12.2.tar.xz" diff --git a/system/libbsd/disable-fpurge-test.patch b/system/libbsd/disable-fpurge-test.patch deleted file mode 100644 index ef6241f62..000000000 --- a/system/libbsd/disable-fpurge-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libbsd-0.8.3/test/Makefile.am.old 2017-08-17 02:42:30.045825258 +0000 -+++ libbsd-0.8.3/test/Makefile.am 2017-08-17 03:49:17.928202106 +0000 -@@ -38,7 +38,6 @@ - humanize \ - fgetln \ - fparseln \ -- fpurge \ - md5 \ - proctitle-init \ - strmode \ diff --git a/system/libcap-ng/APKBUILD b/system/libcap-ng/APKBUILD index f2a2d4207..ef308a6bb 100644 --- a/system/libcap-ng/APKBUILD +++ b/system/libcap-ng/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=libcap-ng -pkgver=0.8.3 +pkgver=0.8.5 pkgrel=0 pkgdesc="POSIX capabilities library" url="https://people.redhat.com/sgrubb/libcap-ng/index.html" @@ -41,4 +41,4 @@ utils() { mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/ } -sha512sums="0ef9bc7bc6b7b59991f43b79aa6cde3e8d2c22c4b9ced2af8deae501e01d51e893033d109cb8aa0fdcba190140110993089245346334d7b114d18f1bb1b55b97 libcap-ng-0.8.3.tar.gz" +sha512sums="89fb86454847f354c012411ecdc7e17f07bb40d7e9719ca0b93ea81c436113685bbbb5c1b9cb1b7ac92d216c105c687285304135beb156aedd55ab1c61e4f269 libcap-ng-0.8.5.tar.gz" diff --git a/system/libcap/APKBUILD b/system/libcap/APKBUILD index 8aadc5445..2882ccce1 100644 --- a/system/libcap/APKBUILD +++ b/system/libcap/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Zach van Rijn <me@zv.io> pkgname=libcap -pkgver=2.68 -pkgrel=1 +pkgver=2.76 +pkgrel=0 pkgdesc="POSIX 1003.1e capabilities" arch="all" license="BSD-3-Clause OR GPL-2.0-only" @@ -44,4 +44,4 @@ package() { mv "$pkgdir"/usr/sbin "$pkgdir"/ } -sha512sums="ede3e1356aef22e18a46dc8ff0727500ab023bea698cf2bb822abb06625e272940afea52ad6457d0cd8cf1c7f435f1b568baf0a6bf0a08ae96fbf6d7502f9de2 libcap-2.68.tar.xz" +sha512sums="f9448628ce036a10ce71958b25e5dd31032c4d86d8d34d905d2dfa32890ad443804169d4c6b825fd4bfe260b5de20f046cee958e40268bcadbbe7f7731ae40ad libcap-2.76.tar.xz" diff --git a/system/libedit/APKBUILD b/system/libedit/APKBUILD index 6968aed53..72d063912 100644 --- a/system/libedit/APKBUILD +++ b/system/libedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libedit -pkgver=20210910.3.1 +pkgver=20250104.3.1 _realver="${pkgver%%.*}-${pkgver#*.}" pkgrel=0 pkgdesc="Library providing line editing, history, and tokenisation functions" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b7361c277f971ebe87e0e539e5e1fb01a4ca1bbab61e199eb97774d8b60dddeb9e35796faf9cc68eb86d1890e8aac11db13b44b57ccc8302d559741fbe9d979e libedit-20210910-3.1.tar.gz" +sha512sums="4b4a8b4b1f2cb952bbb3d128605eba9bc7cd0ad35c44b2c099f067c8bea69455bd11faae4ff20384bbe0ea901b25a1249d8323dea4ccd6141a17393f62bb8df2 libedit-20250104-3.1.tar.gz" diff --git a/system/libffi/APKBUILD b/system/libffi/APKBUILD index 48f7bb2d5..da046103d 100644 --- a/system/libffi/APKBUILD +++ b/system/libffi/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libffi -pkgver=3.4.4 +pkgver=3.4.8 pkgrel=0 pkgdesc="A portable foreign function interface library" -url="https://sourceware.org/libffi" +url="https://sourceware.org/libffi/" arch="all" license="MIT" depends="" @@ -21,8 +21,6 @@ build () { } check() { - rm -v testsuite/libffi.call/s55.c #979 - make check } @@ -32,4 +30,4 @@ package() { install -m644 LICENSE ""$pkgdir"/usr/share/licenses/$pkgname/" } -sha512sums="88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889 libffi-3.4.4.tar.gz" +sha512sums="05344c6c1a1a5b44704f6cf99277098d1ea3ac1dc11c2a691c501786a214f76184ec0637135588630db609ce79e49df3dbd00282dd61e7f21137afba70e24ffe libffi-3.4.8.tar.gz" diff --git a/system/libgcrypt/APKBUILD b/system/libgcrypt/APKBUILD index da5eb8713..baa40fc7a 100644 --- a/system/libgcrypt/APKBUILD +++ b/system/libgcrypt/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgcrypt -pkgver=1.10.1 +pkgver=1.11.1 pkgrel=0 pkgdesc="GnuPG cryptography library" url="https://www.gnupg.org" @@ -29,13 +29,6 @@ build() { ;; esac - case "$CARCH" in - pmmx) - # https://git.adelielinux.org/adelie/packages/-/issues/511 - _arch_configure="${_arch_configure} --disable-asm" - ;; - esac - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -58,4 +51,4 @@ package() { rm -f ${pkgdir}/usr/share/info/dir } -sha512sums="e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13 libgcrypt-1.10.1.tar.bz2" +sha512sums="85846d62ce785e4250a2bf8a2b13ec24837e48ab8e10d537ad4a18d650d2cca747f82fd1501feab47ad3114b9593b36c9fa7a892f48139e2a71ef61295a47678 libgcrypt-1.11.1.tar.bz2" diff --git a/system/libgpg-error/APKBUILD b/system/libgpg-error/APKBUILD index dec8c1613..3a75f5e81 100644 --- a/system/libgpg-error/APKBUILD +++ b/system/libgpg-error/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgpg-error -pkgver=1.46 +pkgver=1.55 pkgrel=0 pkgdesc="GnuPG runtime library" url="https://www.gnupg.org" @@ -36,4 +36,4 @@ lisp() { mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/ } -sha512sums="b06223bb2b0f67d3db5d0d9ab116361a0eda175d4667352b5c0941408d37f2b0ba8e507297e480ccebb88cbba9d0a133820b896914b07d264fb3edaac7b8c99d libgpg-error-1.46.tar.bz2" +sha512sums="d3f6ca9d9abefe81f5cbbc195fbe259d3362119018c535ad2621ee407cad3487011325a9f4c4a15442a9ac5a0fe7ce86dafd7b3d891a446516362ba6b7b9047b libgpg-error-1.55.tar.bz2" diff --git a/system/libidn/APKBUILD b/system/libidn/APKBUILD index 2cf6e7a1a..f8143e85e 100644 --- a/system/libidn/APKBUILD +++ b/system/libidn/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: pkgname=libidn -pkgver=1.40 +pkgver=1.43 pkgrel=0 pkgdesc="Library for internationalized domain names" url="https://www.gnu.org/software/libidn/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6588454c0a6153b76090057c0f3b97ef6cd78b3d7c84dd27cb9537556b7f6d2b4048485c3b82e33e9fb3c9b8d308c0899676ea92f92cf201a6454bd9af781f96 libidn-1.40.tar.gz" +sha512sums="a098d9c1df9d47181e7707a115dcfa12ba4b1aba68b1d070eff4f0578fd2e09b9c453457f83fc1a704726eac3a6f90e5a00772ab116affd07efe1e1ab9d5b0f1 libidn-1.43.tar.gz" diff --git a/system/libmd/APKBUILD b/system/libmd/APKBUILD new file mode 100644 index 000000000..361dcd8d3 --- /dev/null +++ b/system/libmd/APKBUILD @@ -0,0 +1,33 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libmd +pkgver=1.1.0 +pkgrel=0 +pkgdesc="Message Digest functions from BSD systems" +url="https://libbsd.freedesktop.org/" +arch="all" +license="BSD-2-Clause AND BSD-2-Clause-NetBSD AND BSD-3-Clause AND Public-Domain AND Beerware" +depends="" +makedepends="" +subpackages="$pkgname-dev $pkgname-doc" +source="https://libbsd.freedesktop.org/releases/libmd-$pkgver.tar.xz" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="5d0da3337038e474fae7377bbc646d17214e72dc848a7aadc157f49333ce7b5ac1456e45d13674bd410ea08477c6115fc4282fed6c8e6a0bf63537a418c0df96 libmd-1.1.0.tar.xz" diff --git a/system/libpipeline/APKBUILD b/system/libpipeline/APKBUILD index a772cc14e..8888a4f40 100644 --- a/system/libpipeline/APKBUILD +++ b/system/libpipeline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libpipeline -pkgver=1.5.7 +pkgver=1.5.8 pkgrel=0 pkgdesc="C pipeline manipulation library" url="https://libpipeline.nongnu.org/" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bb3be954f5d826cef805f85d65759fb197c31adf80d92360c7d0caa486e0d4877510681390ca01c028b6e805f968f14e8bf4b3eca02e429529031787e7f14d84 libpipeline-1.5.7.tar.gz" +sha512sums="0ae94df4bd508f0e664fa5430687d64904c60d69d9565c18cacb70251f8653cb7c571325d1406c859fdd149048adce8c4b3bf028573064496d7da3436e27b9b0 libpipeline-1.5.8.tar.gz" diff --git a/system/libssh2/APKBUILD b/system/libssh2/APKBUILD index abf895908..b2a057903 100644 --- a/system/libssh2/APKBUILD +++ b/system/libssh2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ariadne Conill <ariadne@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libssh2 -pkgver=1.10.0 +pkgver=1.11.1 pkgrel=0 pkgdesc="Library for accessing SSH servers" url="https://libssh2.org/" @@ -10,12 +10,8 @@ license="BSD-3-Clause" checkdepends="openssh-server" makedepends="openssl-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc" -#< zv> heads up that ipv6 on www.libssh2.org seems to be down -#< bagder> yeah, I know. its a misconfigure thing since a while back -#source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz -source="https://github.com/libssh2/libssh2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz +source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz test-sshd.patch - fix-tests.patch " # secfixes: @@ -31,7 +27,8 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --localstatedir=/var \ - --disable-rpath + --disable-rpath \ + --disable-docker-tests make } @@ -43,6 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30 libssh2-1.10.0.tar.gz -d6d4dfcd96bfa08210ecfb94c71624e011f294bab0b88548f41caff48283c2102ff012a6a6e71a100aa1d6430c8470fc0175449f31ae4583b6f8cfa224983603 test-sshd.patch -d075765062e3ffefb90902c9644ecde17f9bb39eac8ab5759370a26206f5804cb71b8b2d9b8d3ce9989c209bc36483dbc25f894f8c0ec9081aaef1a489c048df fix-tests.patch" +sha512sums="8703636fc28f0b12c8171712f3d605e0466a5bb9ba06e136c3203548fc3408ab07defd71dc801d7009a337e1e02fd60e8933a2a526d5ef0ce53153058d201233 libssh2-1.11.1.tar.gz +3df4e616bfa994876d60c1a6883a3d48c6c51d20423e2a7d2fa13cfc9ce61b0079bd17f51a0fcc1cc0de2dd9e8b06b5bbc59ad20389128781929ef3d5ef7ef8d test-sshd.patch" diff --git a/system/libssh2/fix-tests.patch b/system/libssh2/fix-tests.patch deleted file mode 100644 index 29f554991..000000000 --- a/system/libssh2/fix-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libssh2-1.9.0/tests/ssh2.sh.old 2022-04-27 23:22:54.532007741 -0500 -+++ libssh2-1.9.0/tests/ssh2.sh 2022-04-27 23:34:30.501706060 -0500 -@@ -27,6 +27,8 @@ - -o "AuthorizedKeysFile $srcdir/etc/user.pub" \ - -o 'UsePrivilegeSeparation no' \ - -o 'StrictModes no' \ -+ -o 'HostkeyAlgorithms +ssh-rsa' \ -+ -o 'PubkeyAcceptedAlgorithms +ssh-rsa' \ - -D \ - -e \ - $libssh2_sshd_params & diff --git a/system/libssh2/test-sshd.patch b/system/libssh2/test-sshd.patch index 5daa8ce00..a4bf65615 100644 --- a/system/libssh2/test-sshd.patch +++ b/system/libssh2/test-sshd.patch @@ -1,21 +1,12 @@ ---- libssh2-1.9.0/tests/ssh2.sh 2010-10-25 17:15:14.000000000 -0500 -+++ libssh2-1.9.0/tests/ssh2.sh 2019-09-11 18:52:25.932354801 -0500 -@@ -28,6 +28,7 @@ $SSHD -f /dev/null -h "$srcdir"/etc/host - -o 'UsePrivilegeSeparation no' \ - -o 'StrictModes no' \ - -D \ -+ -e \ - $libssh2_sshd_params & - sshdpid=$! - ---- libssh2-1.9.0/tests/ssh2.c 2019-03-26 08:08:54.000000000 -0500 -+++ libssh2-1.9.0/tests/ssh2.c 2019-09-11 19:38:03.782403778 -0500 -@@ -147,20 +147,6 @@ int main(int argc, char *argv[]) +--- libssh2-1.9.0/tests/test_ssh2.c 2019-03-26 08:08:54.000000000 -0500 ++++ libssh2-1.9.0/tests/test_ssh2.c 2019-09-11 19:38:03.782403778 -0500 +@@ -225,21 +225,6 @@ int main(int argc, char *argv[]) */ libssh2_channel_setenv(channel, "FOO", "bar"); - /* Request a terminal with 'vanilla' terminal emulation -- * See /etc/termcap for more options +- * See /etc/termcap for more options. This is useful when opening +- * an interactive shell. - */ - if(libssh2_channel_request_pty(channel, "vanilla")) { - fprintf(stderr, "Failed requesting pty\n"); @@ -28,6 +19,6 @@ - goto shutdown; - } - - ec = 0; + rc = 0; skip_shell: diff --git a/system/libucontext/APKBUILD b/system/libucontext/APKBUILD index ae05f76ff..b3e71e9ba 100644 --- a/system/libucontext/APKBUILD +++ b/system/libucontext/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libucontext -pkgver=1.2 +pkgver=1.3.2 pkgrel=0 pkgdesc="Implementation of software-defined threading" url=" " @@ -9,9 +9,7 @@ license="ISC" depends="" makedepends="" subpackages="$pkgname-dev" -source="https://distfiles.dereferenced.org/libucontext/libucontext-$pkgver.tar.xz - pmmx.patch - " +source="https://distfiles.dereferenced.org/libucontext/libucontext-$pkgver.tar.xz" case "$CTARGET_ARCH" in aarch64_be) LIBUCONTEXT_ARCH="aarch64" ;; @@ -22,16 +20,15 @@ pmmx) LIBUCONTEXT_ARCH="x86" ;; esac build() { - make ARCH="$LIBUCONTEXT_ARCH" + make ARCH="$LIBUCONTEXT_ARCH" libdir="/lib" } check() { - make ARCH="$LIBUCONTEXT_ARCH" check + make ARCH="$LIBUCONTEXT_ARCH" libdir="/lib" check } package() { - make ARCH="$LIBUCONTEXT_ARCH" DESTDIR="$pkgdir" install + make ARCH="$LIBUCONTEXT_ARCH" libdir="/lib" DESTDIR="$pkgdir" install } -sha512sums="6603f2dcd87c4d9919c1726f2964632483e1a647733ff543d5935e3e2dac548adf320f1f9fb4c494691fe99fb393d64b15369f04d3783b2ca4c40b68c3d87865 libucontext-1.2.tar.xz -e5855aaf5042856e019dcd8bbf85c1319c4ed3ea836fd64617595b1fcacc14a101f7631e9d07a8af7f624a82c59a5bc6d2c1011b961ba4fede37725b6f5e9c37 pmmx.patch" +sha512sums="3911a9a772832dad68dc4dbb78ca646cba92170d4e192948e0a6e78295f6ee27f20b637986d39450edae805c96b08f7e1716fa7904fc84258acab8691d87c4f5 libucontext-1.3.2.tar.xz" diff --git a/system/libucontext/pmmx.patch b/system/libucontext/pmmx.patch deleted file mode 100644 index 3f6019ab8..000000000 --- a/system/libucontext/pmmx.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 196db62779287efb098943c2d4f2433e4b8ea592 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Mon, 25 Apr 2022 23:34:32 -0500 -Subject: [PATCH] Revert "x86: port to use common trampoline" - -This reverts commit 388edbe12138e8300e230e2bc9c08a8f273e98d9. ---- - arch/x86/defs.h | 3 --- - arch/x86/startcontext.S | 41 +++++++++++++++++++++++++++++++++++++++++ - arch/x86/trampoline.c | 3 --- - 3 files changed, 41 insertions(+), 6 deletions(-) - create mode 100644 arch/x86/startcontext.S - delete mode 100644 arch/x86/trampoline.c - -diff --git a/arch/x86/defs.h b/arch/x86/defs.h -index 9370869..e0166e5 100644 ---- a/arch/x86/defs.h -+++ b/arch/x86/defs.h -@@ -57,9 +57,6 @@ - - #define MCONTEXT_GREGS (20) - --#define FETCH_LINKPTR(dest) \ -- asm("movl (%%esp, %%ebx, 4), %0" : "=r" ((dest))); -- - #include "common-defs.h" - - #endif -diff --git a/arch/x86/startcontext.S b/arch/x86/startcontext.S -new file mode 100644 -index 0000000..1cbc68c ---- /dev/null -+++ b/arch/x86/startcontext.S -@@ -0,0 +1,41 @@ -+/* -+ * Copyright (c) 2018, 2020 Ariadne Conill <ariadne@dereferenced.org> -+ * -+ * Permission to use, copy, modify, and/or distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * This software is provided 'as is' and without any warranty, express or -+ * implied. In no event shall the authors be liable for any damages arising -+ * from the use of this software. -+ */ -+ -+#include "defs.h" -+ -+FUNC(libucontext_trampoline) -+ /* get the proper context into position and test for NULL */ -+ leal (%esp,%ebx,4), %esp -+ cmpl $0, (%esp) -+ -+ /* restore global offset table, exit@plt and libucontext_setcontext@plt need this */ -+ call __i686.get_pc_thunk.bx -+ addl $_GLOBAL_OFFSET_TABLE_, %ebx -+ -+ /* if we have no linked context, lets get out of here */ -+ je no_linked_context -+ -+ /* call setcontext to switch to the linked context */ -+ call libucontext_setcontext@plt -+ movl %eax, (%esp) -+ -+no_linked_context: -+ /* we are returning into a null context, it seems, so maybe we should exit */ -+ call exit@plt -+ -+ /* something is really hosed, call hlt to force termination */ -+ hlt -+ -+__i686.get_pc_thunk.bx: -+ mov (%esp), %ebx -+ ret -+END(libucontext_trampoline) -diff --git a/arch/x86/trampoline.c b/arch/x86/trampoline.c -deleted file mode 100644 -index 699a050..0000000 ---- a/arch/x86/trampoline.c -+++ /dev/null -@@ -1,3 +0,0 @@ --#include "defs.h" --#include <libucontext/libucontext.h> --#include "common-trampoline.c" --- -2.32.0 (Apple Git-132) - diff --git a/system/libxml2/APKBUILD b/system/libxml2/APKBUILD index 02b24e0ec..3c01c9ae7 100644 --- a/system/libxml2/APKBUILD +++ b/system/libxml2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxml2 -pkgver=2.13.3 +pkgver=2.13.7 pkgrel=0 pkgdesc="XML parsing library" url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" @@ -9,12 +9,12 @@ arch="all" options="!strip" license="MIT" depends="" -depends_dev="zlib-dev icu-dev" checkdepends="perl libarchive" -makedepends="$depends_dev python3-dev" +makedepends="$depends_dev icu-dev python3-dev zlib-dev" subpackages="$pkgname-doc $pkgname-dev py3-libxml2:py" provides="$pkgname-utils=$pkgver-r$pkgrel" source="https://download.gnome.org/sources/libxml2/${pkgver%.*}/libxml2-$pkgver.tar.xz + icu-77.patch python-segfault-fix.patch " @@ -45,6 +45,7 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --with-icu \ + --with-zlib \ --without-iconv \ --with-python=/usr/bin/python3 \ --enable-static @@ -65,5 +66,6 @@ py() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="682da3fc0e15852c3963207edb66aa201cabe9ec16f1fb2ca97d6d1273daa33fff6ed70e91589204cc09bf49961dc163b5e3d9ee38fdedac957453b0fd64b36d libxml2-2.13.3.tar.xz +sha512sums="6e69ed38cdf2aaa5df7e26b654a7aadd2d80131619184380bafc6a22811acb6b7286c819175c3b37edb194019a93ba6085852a0281934d6bb36d0b52ce138541 libxml2-2.13.7.tar.xz +226d72c42db8d9161ed7429869210bccec17e403b83df5525e2c8c7ac22326b7345f15b2072ba6d0467dd786285b02bccc8f2a4d1c4a627f4700f31f08abea9f icu-77.patch 384b3d2031cd8f77528190bbb7652faa9ccb22bc604bcf4927e59046d38830dac38010828fe1568b6514976f725981a6d3ac1aa595d31477a36db2afe491452c python-segfault-fix.patch" diff --git a/system/libxml2/icu-77.patch b/system/libxml2/icu-77.patch new file mode 100644 index 000000000..67040ee59 --- /dev/null +++ b/system/libxml2/icu-77.patch @@ -0,0 +1,87 @@ +--- libxml2-2.13.7/configure.old 2025-03-27 08:37:45.000000000 -0500 ++++ libxml2-2.13.7/configure 2025-05-31 00:21:33.827860625 -0500 +@@ -1711,7 +1711,7 @@ + LZMA_LIBS linker flags for LZMA, overriding pkg-config + ICU_CFLAGS C compiler flags for ICU, overriding pkg-config + ICU_LIBS linker flags for ICU, overriding pkg-config +- ICU_DEFS value of DEFS for icu-i18n, overriding pkg-config ++ ICU_DEFS value of DEFS for icu-uc, overriding pkg-config + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. +@@ -16281,19 +16281,19 @@ + # If this succeeeds, we ignore the WITH_ICU directory. + + pkg_failed=no +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icu-i18n" >&5 +-printf %s "checking for icu-i18n... " >&6; } ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icu-uc" >&5 ++printf %s "checking for icu-uc... " >&6; } + + if test -n "$ICU_CFLAGS"; then + pkg_cv_ICU_CFLAGS="$ICU_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "icu-i18n") 2>&5 ++ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "icu-uc") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n" 2>/dev/null` ++ pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-uc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16305,12 +16305,12 @@ + pkg_cv_ICU_LIBS="$ICU_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "icu-i18n") 2>&5 ++ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "icu-uc") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-i18n" 2>/dev/null` ++ pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-uc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -16331,9 +16331,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-i18n" 2>&1` ++ ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "icu-uc" 2>&1` + else +- ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-i18n" 2>&1` ++ ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "icu-uc" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ICU_PKG_ERRORS" >&5 +@@ -16349,18 +16349,18 @@ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + printf "%s\n" "yes" >&6; } + +- WITH_ICU=1; XML_PC_REQUIRES="${XML_PC_REQUIRES} icu-i18n" ++ WITH_ICU=1; XML_PC_REQUIRES="${XML_PC_REQUIRES} icu-uc" + + if test -n "$ICU_DEFS"; then + pkg_cv_ICU_DEFS="$ICU_DEFS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "icu-i18n") 2>&5 ++ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "icu-uc") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_ICU_DEFS=`$PKG_CONFIG --variable="DEFS" "icu-i18n" 2>/dev/null` ++ pkg_cv_ICU_DEFS=`$PKG_CONFIG --variable="DEFS" "icu-uc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD index 626c1da98..e624e1822 100644 --- a/system/lvm2/APKBUILD +++ b/system/lvm2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=lvm2 -pkgver=2.03.21 +pkgver=2.03.32 pkgrel=0 pkgdesc="Logical Volume Manager 2 utilities" url="https://sourceware.org/lvm2/" @@ -16,6 +16,7 @@ makedepends_host="$depends_dev util-linux-dev" makedepends="$makedepends_build $makedepends_host" replaces="device-mapper $pkgname-dmeventd" source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz + bashism-configure.patch fix-stdio-usage.patch mlockall-default-config.patch lvm.initd @@ -86,8 +87,9 @@ udev() { } -sha512sums="6024811c3fa92afd2fc13a10d1c3542352aa9a016f40c3ef588bd2f5f3e41245fed4b36c8a87d9f7f8dddc6e13b7253396f5c811f99665df27751676dc7b5bde LVM2.2.03.21.tgz -40e49bb34a9c07493ab6a9948e3ac1a85e22f069b69ad2a1369cb7d30a6ea6d72a27f380ad8951f55d939834e2f29c9da589ae475322ea41b4dfce72060b9557 fix-stdio-usage.patch +sha512sums="6a7acebf10274b029211b0f5b7c7a9aabf2074a8e9ce1b72fce7eadffdaf2ebb23d9d998be41ff31a9e10808ece32ec2dde3454c82103c39084ac1beffe18ec1 LVM2.2.03.32.tgz +0a16a8f42de0eafcfed994f06a7adb14097ee44937b184aea6e1526a0cfbaf27a03d4dacaa3f3f272fdb2e90fc036984a43c42271a7558b47e6b6f2e824a9e5a bashism-configure.patch +ab5eb15aff6be96fe91245749095da28ec4d1f51f039e0d36f29eecaed5596cf79ea4cda90401a9d6fa78453b5247707f6018e11fa544bfdfd5c0c4de20b028c fix-stdio-usage.patch 0f1feeddf35a7208a240b13d87f479eeb5410ccb534ccd62714355b10721c4eff77d725c72a2b5270320bef12828c32d60003f187db990fad3fef37ec08c1dff mlockall-default-config.patch a853078660fd2fd943538924f56e81dc5793294e26b8f61d93e6188893f15f4a438d33792b341c1865d61e03f4a371b7c7ee0db5f4130ef7cb7aeaeb9290086a lvm.initd 07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d lvm.confd diff --git a/system/lvm2/bashism-configure.patch b/system/lvm2/bashism-configure.patch new file mode 100644 index 000000000..5c9f3258c --- /dev/null +++ b/system/lvm2/bashism-configure.patch @@ -0,0 +1,49 @@ +Upstream-URL: https://gitlab.com/lvmteam/lvm2/-/merge_requests/29 + +From b0b259e3571b5be49d912e56518c9af734f317d4 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Mon, 2 Jun 2025 04:08:08 +0000 +Subject: [PATCH] configure: Use portable string comparison + += and == are equivalent in Bash for strings, but = is the only portable +operator for compatibility with other shells. Before this change, +running ./configure with Dash as /bin/sh resulted in: + +./configure: 14558: test: yes: unexpected operator + +and the test did not work (i.e. --enable-cmdlib --disable-shared allowed +a failed build to continue). Now, the test works in Bash and Dash. +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 342bd0047..75564a228 100755 +--- a/configure ++++ b/configure +@@ -14564,7 +14564,7 @@ printf %s "checking whether to compile liblvm2cmd.so... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CMDLIB" >&5 + printf "%s\n" "$CMDLIB" >&6; } + +-if test "$CMDLIB" == "yes" && test "$SHARED_LINK" = "no" ++if test "$CMDLIB" = "yes" && test "$SHARED_LINK" = "no" + then : + as_fn_error $? "--enable-cmdlib requires dynamic linking." "$LINENO" 5 + fi +diff --git a/configure.ac b/configure.ac +index 6fcf6f2b5..470057be4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1395,7 +1395,7 @@ AS_IF([test "$CMDLIB" != "yes"], [CMDLIB="no" LVM2CMD_LIB=], [LVM2CMD_LIB="-llvm + AC_MSG_CHECKING([whether to compile liblvm2cmd.so]) + AC_MSG_RESULT([$CMDLIB]) + +-AS_IF([test "$CMDLIB" == "yes" && test "$SHARED_LINK" = "no"], ++AS_IF([test "$CMDLIB" = "yes" && test "$SHARED_LINK" = "no"], + [AC_MSG_ERROR([--enable-cmdlib requires dynamic linking.])]) + + +-- +2.40.0 + diff --git a/system/lvm2/fix-stdio-usage.patch b/system/lvm2/fix-stdio-usage.patch index 2b3f0a91f..5a66665ea 100644 --- a/system/lvm2/fix-stdio-usage.patch +++ b/system/lvm2/fix-stdio-usage.patch @@ -10,7 +10,7 @@ Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr} +++ b/lib/log/log.c @@ -208,7 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) - _check_and_replace_standard_log_streams(old_stream, new_stream); + _check_and_replace_standard_log_streams(*stream, new_stream); +#ifdef __GLIBC__ *stream = new_stream; @@ -22,7 +22,7 @@ Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr} --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c -@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void) +@@ -3407,7 +3407,7 @@ static int _check_standard_fds(void) int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && @@ -31,7 +31,7 @@ Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr} if (err) perror("stdin stream open"); else -@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void) +@@ -3417,7 +3417,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDOUT_FILENO) && @@ -40,7 +40,7 @@ Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr} if (err) perror("stdout stream open"); /* else no stdout */ -@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void) +@@ -3425,7 +3425,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDERR_FILENO) && 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" diff --git a/system/zstd/APKBUILD b/system/zstd/APKBUILD index 6ed1b2fd3..6c41ccc29 100644 --- a/system/zstd/APKBUILD +++ b/system/zstd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=zstd -pkgver=1.5.4 +pkgver=1.5.7 pkgrel=0 pkgdesc="Fast real-time compression algorithm" url="https://facebook.github.io/zstd/" @@ -18,15 +18,15 @@ source="https://github.com/facebook/zstd/releases/download/v$pkgver/zstd-$pkgver # - CVE-2021-24032 build() { - make PREFIX="/usr" + make PREFIX="/usr" LIBDIR="/lib" PKGCONFIGDIR="/usr/lib/pkgconfig" } check() { - make PREFIX="/usr" check + make PREFIX="/usr" LIBDIR="/lib" PKGCONFIGDIR="/usr/lib/pkgconfig" check } package() { - make PREFIX="/usr" DESTDIR="$pkgdir" install + make PREFIX="/usr" LIBDIR="/lib" PKGCONFIGDIR="/usr/lib/pkgconfig" DESTDIR="$pkgdir" install } -sha512sums="2896a6dd6b60cc251720356babcbab6018c874eb2149121b26e28041496fc355a9cb5fd1b39c91558fcfbafb789b3d721264a0f9b5734f893d5f3cdf97016394 zstd-1.5.4.tar.gz" +sha512sums="b4de208f179b68d4c6454139ca60d66ed3ef3893a560d6159a056640f83d3ee67cdf6ffb88971cdba35449dba4b597eaa8b4ae908127ef7fd58c89f40bf9a705 zstd-1.5.7.tar.gz" |