diff options
Diffstat (limited to 'system')
58 files changed, 546 insertions, 736 deletions
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index 6c16562e1..e92435f73 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abuild -pkgver=3.4.2 -pkgrel=3 +pkgver=3.5 +pkgrel=0 pkgdesc="Script to build APK packages" url="https://git.adelielinux.org/adelie/abuild" arch="all" @@ -19,9 +19,7 @@ makedepends="$makedepends_host $makedepends_build" subpackages="abuild-rootbld:_rootbld:noarch $pkgname-doc" install="$pkgname.pre-install $pkgname.pre-upgrade" source="https://distfiles.adelielinux.org/source/abuild-$pkgver.tar.xz - inode.patch keyhole.patch - libarchive.patch noarch.patch " @@ -56,8 +54,6 @@ _rootbld() { mkdir -p "$subpkgdir" } -sha512sums="9bdeb31f54879878697b4a5436ec2bc7764e1b9840798e913ba3dd47c344437e362a3067b89440ca8a7940af1efcaa83a24e7c1077187f924bf73fb058f97fbf abuild-3.4.2.tar.xz -53b0f2c15da767fbdde5a28b6f428943907e8752490ffae580e4a4198fea76fd71fc253a526c81bbbf17311ce3c72a563649a416ea0fda219a35cee50fcd46d1 inode.patch +sha512sums="50e6ad1dfb033688a4a06bbb313db6bb90c0a2e7c47dbab30c1cd7f30520b782fdfd113babed8796104c415f096071a49feb8ab9e71286889d0ac79bb4acc039 abuild-3.5.tar.xz 757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch -2452a2b2ecf64bb6bfef1e71c35d39f02be1a5930ebd3e4c139156979b6c2249adcd4437c5c49f4af5b478f2a69529807fcbcd31ca01e6be6430165bcad74353 libarchive.patch -5ba235c3f3c3c5cf8c8973ea8cc3fdf97364b5bb69c6e60b8738c3f0cf585868bcf77a0b05ff1a49879eec1ad5c37f28f5fe28f883643a44b3ba6c543616bbe7 noarch.patch" +06542b3baca0a52d0a74c32683738ebe4bfc5c7c3fef867b3cbed5767cd4c5e1517a2174934320bd4184894f3462538a77ae2f4641dff8530c29a6fa0e8184a0 noarch.patch" diff --git a/system/abuild/inode.patch b/system/abuild/inode.patch deleted file mode 100644 index a3a7cef09..000000000 --- a/system/abuild/inode.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9969ec002c408b616714a99a6317c7f996965dd4 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Wed, 19 Jan 2022 02:35:19 -0600 -Subject: [PATCH] abuild: Correctly package files that fit in inode - -On filesystems such as XFS, abuild will skip small files and symlinks -because the file fits in an inode and shows a size of 0. - -Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> -Acked-by: Zach van Rijn <me@zv.io> ---- - abuild.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/abuild.in b/abuild.in -index 6bb087a..3e83563 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -927,7 +927,7 @@ prepare_metafiles() { - sync;; - esac - -- local size="$(du -sk | awk '{print $1 * 1024}')" -+ local size="$(du -sk --apparent-size | awk '{print $1 * 1024}')" - - if [ "$arch" != "$apkbuild_arch" ]; then - local msg="Split function set arch=\"$arch\" for $name, use subpackages=pkg:split:arch format instead" --- -2.32.0 (Apple Git-132) - diff --git a/system/abuild/libarchive.patch b/system/abuild/libarchive.patch deleted file mode 100644 index 7f0132971..000000000 --- a/system/abuild/libarchive.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 70943ead0e226e2db81f20867b11144e449b12c6 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Sun, 20 Feb 2022 22:38:17 -0600 -Subject: [PATCH] abuild: Fix package building with libarchive >=3.6 - -Now that we have sparse file support, libarchive wants to use it. - -APK doesn't support sparse file entries in tar files, so it fails to -install any package made in this manner. ---- - abuild.in | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/abuild.in b/abuild.in -index 3e83563..b0c0f9c 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -1503,7 +1503,9 @@ create_apks() { - touch .dummy - set -- .dummy - fi -- tar --format pax --xattrs -f - -c "$@" | abuild-tar --hash | $gzip -9 >"$dir"/data.tar.gz -+ tar --no-read-sparse --format pax --xattrs -f - -c "$@" \ -+ | abuild-tar --hash \ -+ | $gzip -9 >"$dir"/data.tar.gz - - msg "Create checksum..." - # append the hash for data.tar.gz -@@ -1512,7 +1514,8 @@ create_apks() { - - # control.tar.gz - cd "$dir" -- tar --format pax -f - -c $(cat "$dir"/.metafiles) | abuild-tar --cut \ -+ tar --no-read-sparse --format pax -f - -c $(cat "$dir"/.metafiles) \ -+ | abuild-tar --cut \ - | $gzip -9 > control.tar.gz - abuild-sign -q control.tar.gz || exit 1 - --- -2.32.0 (Apple Git-132) - diff --git a/system/abuild/noarch.patch b/system/abuild/noarch.patch index 8c61d32a6..d6e59d4db 100644 --- a/system/abuild/noarch.patch +++ b/system/abuild/noarch.patch @@ -2,7 +2,7 @@ diff --git a/abuild.in b/abuild.in index b0c0f9c..a6a0fe1 100644 --- a/abuild.in +++ b/abuild.in -@@ -516,7 +516,7 @@ cleanpkg() { +@@ -518,7 +518,7 @@ cleanpkg() { rm -f "$REPODEST/$repo/src/$pkgname-$pkgver-r$pkgrel.src.tar.gz" for i in $allpackages; do subpkg_set "$i" @@ -11,7 +11,7 @@ index b0c0f9c..a6a0fe1 100644 rm -f "$REPODEST/$repo/$subpkgarch/$subpkgname-$pkgver-r$pkgrel.apk" done subpkg_unset -@@ -931,7 +931,7 @@ prepare_metafiles() { +@@ -943,7 +943,7 @@ prepare_metafiles() { if [ "$arch" != "$apkbuild_arch" ]; then local msg="Split function set arch=\"$arch\" for $name, use subpackages=pkg:split:arch format instead" @@ -20,7 +20,7 @@ index b0c0f9c..a6a0fe1 100644 warning "$msg" subpkgarch="$arch" fi -@@ -1027,7 +1027,7 @@ prepare_metafiles() { +@@ -1039,7 +1039,7 @@ prepare_metafiles() { prepare_trace_rpaths() { local dir="${subpkgdir:-$pkgdir}" local etype= soname= file= sover= @@ -29,7 +29,7 @@ index b0c0f9c..a6a0fe1 100644 options_has "!tracedeps" && return 0 # lets tell all the places we should look for .so files - all rpaths scanelf --quiet --recursive --rpath "$dir" \ -@@ -1115,10 +1115,10 @@ is_openrc_pkg() { +@@ -1137,10 +1137,10 @@ is_openrc_pkg() { archcheck() { options_has "!archcheck" && return 0 if dir_has_arch_binaries "${subpkgdir:-$pkgdir}"; then @@ -42,7 +42,7 @@ index b0c0f9c..a6a0fe1 100644 # we dont want -dev package go to noarch warning "No arch specific binaries found so arch should probably be set to \"noarch\"" fi -@@ -1317,7 +1317,7 @@ scan_shared_objects() { +@@ -1339,7 +1339,7 @@ scan_shared_objects() { local name="$1" controldir="$2" datadir="$3" local opt= i= @@ -51,7 +51,7 @@ index b0c0f9c..a6a0fe1 100644 return 0 fi -@@ -1520,7 +1520,7 @@ create_apks() { +@@ -1542,7 +1542,7 @@ create_apks() { abuild-sign -q control.tar.gz || exit 1 msg "Create $apk" @@ -60,7 +60,7 @@ index b0c0f9c..a6a0fe1 100644 mkdir -p "$REPODEST"/$repo/$subpkgarch cat control.tar.gz data.tar.gz > "$REPODEST"/$repo/$subpkgarch/$apk ) -@@ -1562,7 +1562,7 @@ update_abuildrepo_index() { +@@ -1590,7 +1590,7 @@ update_abuildrepo_index() { # thinks they are for $CARCH and apk-tools will fetch them from # correct URL path. Remainder of the script uses ${subpkgarch/noarch/$CARCH} # when expanding to the target repository path. @@ -69,7 +69,7 @@ index b0c0f9c..a6a0fe1 100644 list_has "$subpkgarch" "$allarch" || allarch="$allarch $subpkgarch" done subpkg_unset -@@ -1856,7 +1856,7 @@ apk_up2date() { +@@ -1936,7 +1936,7 @@ apk_up2date() { local i s for i in $allpackages; do subpkg_set "$i" @@ -78,7 +78,7 @@ index b0c0f9c..a6a0fe1 100644 if [ ! -f "$REPODEST/$repo/$subpkgarch/$subpkgname-$pkgver-r$pkgrel.apk" ]; then subpkg_unset return 1 -@@ -1872,7 +1872,7 @@ apk_up2date() { +@@ -1952,7 +1952,7 @@ apk_up2date() { else s="$startdir/${i##*/}" fi @@ -87,7 +87,7 @@ index b0c0f9c..a6a0fe1 100644 if [ "$s" -nt "$REPODEST/$repo/$pkgarch/$pkgname-$pkgver-r$pkgrel.apk" ]; then return 1 fi -@@ -1886,7 +1886,7 @@ abuildindex_up2date() { +@@ -1966,7 +1966,7 @@ abuildindex_up2date() { for i in $allpackages; do subpkg_set "$i" @@ -96,7 +96,7 @@ index b0c0f9c..a6a0fe1 100644 local dir="$REPODEST"/$repo/$subpkgarch local idx="$dir"/APKINDEX.tar.gz local file="$dir"/$subpkgname-$pkgver-r$pkgrel.apk -@@ -2253,7 +2253,7 @@ rootbld() { +@@ -2335,7 +2335,7 @@ rootbld() { stripbin() { local bin @@ -105,12 +105,11 @@ index b0c0f9c..a6a0fe1 100644 return 0 fi cd "${subpkgdir:-$pkgdir}" || return 1 -@@ -2597,7 +2597,7 @@ fi - export REPODEST SRCDEST +@@ -2679,7 +2679,7 @@ fi + fi # add dbg subpackage if its enabled globally --if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && [ "$arch" != "noarch" ]; then -+if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && ! list_has noarch "$arch"; then +-if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && [ "$pkgarch" != "noarch" ]; then ++if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && ! list_has noarch "$pkgarch"; then subpackages="$pkgname-dbg $subpackages" fi - diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index cc7d48397..bbb9d15c7 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adelie-base -pkgver=0.9.7 +pkgver=0.9.8 pkgrel=0 pkgdesc="The Adélie Linux Base System" url="https://www.adelielinux.org/" @@ -18,7 +18,7 @@ depends="adelie-core binutils curl debianutils file gettys-openrc makedepends="" makedepends_host="$depends" subpackages="adelie-core:core $pkgname-doc $pkgname-posix $pkgname-lsb dev - dev-kit:devkit docs symbols" + dev-kit:devkit docs lang symbols" provides="alpine-base" source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.xz group @@ -106,6 +106,13 @@ docs() { return 0 } +lang() { + depends="" + pkgdesc="Metapackage that will magically install all translations for your system" + mkdir -p "$subpkgdir" + return 0 +} + symbols() { depends="" pkgdesc="Metapackage that will magically install all debugging symbols for your system" @@ -113,7 +120,7 @@ symbols() { return 0 } -sha512sums="897a4733c49bbb460ac815a95d812bc22f6d603ffebb4a5f4405be404cd526637191116e614d51377a1c2b322b44ac95c865cb1cfff6ec9d88c76eb6b5601888 adelie-base-0.9.7.tar.xz +sha512sums="2f79f6bcd4239280ab10f7e46fb6a03187c74c3637be9010ac3708e1ffbca6dc4a8925ee904a988b9da82a4fe95bc76239807910f7083ec9fffc053646210d0b adelie-base-0.9.8.tar.xz 37260d9315fd8d8b0df3dfb5bd3e1035a47ba1e43f33aa195e3feca6d169da282c1b067ef4603e7e9acaedbfef8b58cf490c00bdca444d43c9d570355ad29eac group 33aca5423feadd02cce1ac5598ab26ce4f10f2e0d955d953c5ec12b61e605d92b25c2449aec224923bf8affb4fa918458ab67e4292a29c357ad15b74ebc68183 passwd f2437ebfbc83aa6eaeec3a111aae98751215cebfaec3991ccc511be8c8938778ae46f15e07c7306bd431d036bc4ba49b33b724b839c125bd882d2e93c0314ae8 addgroup diff --git a/system/chelf/APKBUILD b/system/chelf/APKBUILD new file mode 100644 index 000000000..cf3b34228 --- /dev/null +++ b/system/chelf/APKBUILD @@ -0,0 +1,24 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=chelf +pkgver=0.2.2 +pkgrel=0 +pkgdesc="Display or change the stack size of an ELF binary" +url=" " +arch="all" +options="!check" # No test suite. +license="BSD-2-Clause" +depends="" +makedepends="" +subpackages="" +source="$pkgname-$pkgver.tar.xz::https://distfiles.adelielinux.org/source/$pkgname-$pkgver.txz" + +build() { + make +} + +package() { + install -D -m755 chelf "$pkgdir"/usr/bin/chelf +} + +sha512sums="bf29f0f526ca1977e0d0743901f6afeb23b2dd78b60618ea65201ea95000832854250f44de6e7625b6d546cace4638be094989cdb96b4e842285ef85718c0082 chelf-0.2.2.tar.xz" diff --git a/system/chrpath/APKBUILD b/system/chrpath/APKBUILD new file mode 100644 index 000000000..7bdb44c39 --- /dev/null +++ b/system/chrpath/APKBUILD @@ -0,0 +1,35 @@ +# Maintainer: +pkgname=chrpath +pkgver=0.16 +pkgrel=2 +pkgdesc="Modify rpath of compiled programs" +url="https://github.com/jwilk-mirrors/chrpath" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="https://alioth-archive.debian.org/releases/chrpath/chrpath/0.16/chrpath-0.16.tar.gz" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" docdir=/usr/share/doc/$pkgname-$pkgver \ + install +} + +sha512sums="aa04d490f78bff20a56fe20539cec10218c0772a668909eda8324ca825f51e8ef92001e95d9c316e79a145a043c9c327ec94d1a82e104ab408ca1021832745aa chrpath-0.16.tar.gz" diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index 9b0e881b2..4653c349b 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -5,7 +5,7 @@ _kflavour="" _patchver=2 # must match 1000-version.patch _pkgname=easy-kernel$_kflavour pkgver=6.6.58 -pkgrel=0 +pkgrel=1 pkgname=$_pkgname-$pkgver-mc$_patchver pkgdesc="The Linux kernel, packaged for your convenience" url="https://kernel.org/" @@ -13,7 +13,7 @@ arch="all" options="!check !dbg !strip !tracedeps" license="GPL-2.0-only" depends="kernel-boot" -makedepends="bc bison flex gzip kmod lzop openssl-dev xz" +makedepends="bc bison elfutils-dev flex gzip kmod lzop openssl-dev xz" provides="easy-kernel$_kflavour=$pkgver-r$pkgrel" replaces="easy-kernel-power8 easy-kernel-power8-64k" subpackages="$_pkgname-modules-$pkgver-mc$_patchver:modules @@ -56,6 +56,7 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgmin 1000-version.patch no-require-gnu-tar.patch + bsdtar.patch no-require-lilo.patch no-autoload-fb.conf @@ -73,6 +74,17 @@ prepare() { if [ -f $HOME/kernel_key.pem ]; then cp $HOME/kernel_key.pem "$builddir"/certs/signing_key.pem fi + + # see #1316; note that the "|| true" is required to prevent failure + # if 'grep' matches no lines and has a nonzero return code + cd "$srcdir/linux-src" + _newconfig=$(make LDFLAGS="" listnewconfig | grep ^CONFIG_ || true) + if [ -n "${_newconfig}" ]; then + # the 'printf' is because 'error' doesn't accept '\n' + error ".config does not account for NEW options:"; + printf "%s\n" "${_newconfig}"; + return 1; + fi } build() { @@ -166,11 +178,11 @@ sha512sums="458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6 c16e726450602b271802b74bcfced1e2373c21b7cea8108bb722f9b4abcad44ae6e135a26296d76ad869c554360d1e043d163934592e5899e4c9514f179ac094 config-aarch64 237b7eff4ecab68600497761eb3716c158f1f3fc6e55f70559189cd15ecc381017cb0017a44c766eb016b50d091410e590312d5eaebebb2e6e13495f5602281b config-armv7 af1495f11e7252ee65af2ce00b551b4715a9d663e1bf8cff1a1235ba922e7d0b9e90dcdacd469db1d7831d8580071f0f7fef24c89362afccde63058393d115f5 config-m68k -6f8423960598667edbfc67fda03957018d5fa4842a73497d6e57f9af7c7c0ce1e890307e4663347f0864b4522f3c3b22c2de24a5b6840ec029d149d786626a67 config-pmmx -a4a2e4579a33d2720fb141d83f5a6f1b1b8be701cfee12a479a9b63021974159df7d5984a730dfa8da2e8e761d506ab6f5cce1d72b99ee577582bac7d2348cb0 config-ppc -60116d4f5c454539d3c86538611bbcd683e46352419bcea1bb0c3f4e08e0915dff3053f80f600b54656eb12fa1f6ca818424ef91f59f0301ce71a0dc4b49a86f config-ppc64 +52d65ad133b66550e651b9165f647b094730e42d9d2e7036879f32b7c6f4f9c2320cddb0506efa832e7365156b70ed09cc66ed213bfbc67e94d60a916291e1aa config-pmmx +fd1c8b0fa7bf0122fe670e54fa592ebb792415fba528011c83bdbfbbf16bd442339c9e1338214cb8e7522ac3ab51f45c1360dd3ce40607da902eb99ec03bc62d config-ppc +95796cf8c2416d12fa61d72ffe1403b33f0b35dead111c94cc6835d74586761ec47b562ad1516a917a5411de043164daf13a35b5d86ee03266db2a0b146d507b config-ppc64 17a07b7563acba1f5b99b9055198f5f93e7c65432ec46c35fa6c2b5307107ad9d4e8ffea9800f50cf8a8445b69561b9a95ba1ac8cd5bb2b6814dab540edb17d4 config-sparc64 -e60d5f939341e2202b6dd5d4c02143b8b0e84b3961461286e8e4a0e36ddf273ee6979604d9fb83cc9f3314ab04e14fc9bf7c01f045530c9f55a01f61a266f423 config-x86_64 +137b549a61a241c21f956c9f13f476858bbffd4b393a3630e39d7c810f25d71cdcfd5307788c5c40fb3a92552ee1081f06ccb2379a9c0868ce25cb36f31cbda2 config-x86_64 1ca1bc094a8106b33176ab6cfb55c9514e7d69f1ed30c580eee419a3c422a2e6625d71c4581702e911f36c4bbac175010f46b7123bb81fda3303d4decdc57287 kernel.h d0a0498c0200ff65e1feecf04dfad915fe4cc96bedaa6ed41b920d3385a67998649abc85254fd092d59bac756d67e93eabed4e909694fff13b12a1b7da7dddfd 0100-linux-6.6.58.patch d333494e1a261175ab11d84ace49ad3dcb010614e61d0bfe1d39d7c330d1c0e0311699423fbec5841c9c6ff514f4f5b1e63072f0289450ac2883f1d3a80c2961 0122-link-security-restrictions.patch @@ -195,6 +207,7 @@ dfd940af1d14e8a2cc1fcffbfa0fa8db52accf67cad3a7f435fc84047c945ba64dc3c45eb8dbbcc8 ad92d5e21e61811a1f27cc9595f9870ca6d3d22d008b78238a0223ac504aeb0f5c8574a1d38951cefde331ed18fe70c4b086078db55ae15a5a285f733c66235e 0504-update-zstd-to-v1_5_6.patch 5e71f65d2f96fd3f7f531a8c8c37e5ffbaf921bbc54236eeb8b8d76f425cb53418e5d55e7c9567754d17eff4c40bb85b0b559c8d6ce0b45837bdf744be44880b 1000-version.patch 5a60551ce859f591ffd772b37cb46be3194ac6ba7e08e2dddc6df967add96c5cf51d6a92aed3a7b6805dde691da5f7670bcbcc68ce1f51763f59f725cbc28f9d no-require-gnu-tar.patch +191cf9dfad4778977fe1d0127bd0463caef98bead48a06ef68c4ba0134b97e3ebb461403bd2f16a941304bd61b005010ae159810f2c597ad4dbe26408919bb51 bsdtar.patch d3b9e580db6006d25297b2dc17c4dc97be35992f9a02dd3bc37afa7d8054f8828a5c2060a5ffbd8e540e9d8babdca369b2af4106961e74652687e53d5bc7887b no-require-lilo.patch 7bb07eb22002cc48caf0cd55d17ce4097aa583e0ca4048c11c92e1519761b2ae982ffe98311543d4b0dfc991c8bc411b2e1c7be9488b6c6f19ffaa08e69e2f47 no-autoload-fb.conf b0e0634c84440a480be208da5157b03cb914790faab08fd3fdc2faeceed2c0a03d52c0e029084190708190f80028648923c4fd6feb11ec68ab4f740488161b0a mkimage-missing-not-fatal.patch" diff --git a/system/easy-kernel/config-pmmx b/system/easy-kernel/config-pmmx index f836b9124..db5fe789c 100644 --- a/system/easy-kernel/config-pmmx +++ b/system/easy-kernel/config-pmmx @@ -11,6 +11,8 @@ CONFIG_AS_VERSION=24200 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=24200 CONFIG_LLD_VERSION=0 +CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_TOOLS_SUPPORT_RELR=y @@ -309,6 +311,7 @@ CONFIG_X86_32_SMP=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=2 +CONFIG_CC_HAS_SANE_STACKPROTECTOR=y # # Processor type and features @@ -526,11 +529,14 @@ CONFIG_MODIFY_LDT_SYSCALL=y # CONFIG_STRICT_SIGALTSTACK_SIZE is not set # end of Processor type and features +CONFIG_CC_HAS_SLS=y +CONFIG_CC_HAS_RETURN_THUNK=y CONFIG_CC_HAS_ENTRY_PADDING=y CONFIG_FUNCTION_PADDING_CFI=11 CONFIG_FUNCTION_PADDING_BYTES=16 CONFIG_CPU_MITIGATIONS=y CONFIG_RETPOLINE=y +# CONFIG_RETHUNK is not set # CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_MITIGATION_RFDS=y CONFIG_MITIGATION_SPECTRE_BHI=y @@ -751,6 +757,11 @@ CONFIG_KVM_AMD=m CONFIG_KVM_SMM=y # CONFIG_KVM_XEN is not set # CONFIG_KVM_PROVE_MMU is not set +CONFIG_AS_AVX512=y +CONFIG_AS_SHA1_NI=y +CONFIG_AS_SHA256_NI=y +CONFIG_AS_TPAUSE=y +CONFIG_AS_GFNI=y CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y # @@ -822,6 +833,9 @@ CONFIG_SECCOMP=y CONFIG_SECCOMP_FILTER=y # CONFIG_SECCOMP_CACHE_DEBUG is not set CONFIG_HAVE_ARCH_STACKLEAK=y +CONFIG_HAVE_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y CONFIG_ARCH_SUPPORTS_LTO_CLANG=y CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y CONFIG_LTO_NONE=y @@ -2011,7 +2025,7 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS_CMDLINE=y CONFIG_SYSFB=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_GOOGLE_FIRMWARE is not set # @@ -3496,12 +3510,12 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_CYPRESS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y -# CONFIG_MOUSE_PS2_ELANTECH is not set -# CONFIG_MOUSE_PS2_SENTELIC is not set -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -# CONFIG_MOUSE_PS2_OLPC is not set +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +CONFIG_MOUSE_PS2_TOUCHKIT=y +CONFIG_MOUSE_PS2_OLPC=y CONFIG_MOUSE_PS2_FOCALTECH=y -# CONFIG_MOUSE_PS2_VMMOUSE is not set +CONFIG_MOUSE_PS2_VMMOUSE=y CONFIG_MOUSE_SERIAL=y CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m diff --git a/system/easy-kernel/config-ppc b/system/easy-kernel/config-ppc index 86965b861..717fc60c3 100644 --- a/system/easy-kernel/config-ppc +++ b/system/easy-kernel/config-ppc @@ -7,9 +7,9 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=130300 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24301 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24301 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y @@ -595,7 +595,7 @@ CONFIG_OLD_SIGSUSPEND=y CONFIG_OLD_SIGACTION=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y -CONFIG_VMAP_STACK=y +# CONFIG_VMAP_STACK is not set CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_KSTACK_OFFSET=y # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set @@ -4832,11 +4832,11 @@ CONFIG_DRM_ARCPGU=m CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m # CONFIG_DRM_GM12U320 is not set -CONFIG_DRM_OFDRM=m +# CONFIG_DRM_OFDRM is not set CONFIG_DRM_SIMPLEDRM=m # CONFIG_DRM_GUD is not set # CONFIG_DRM_SSD130X is not set -CONFIG_DRM_LEGACY=y +# CONFIG_DRM_LEGACY is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m # @@ -4848,7 +4848,7 @@ CONFIG_FB_MACMODES=y CONFIG_FB_CIRRUS=m # CONFIG_FB_PM2 is not set # CONFIG_FB_CYBER2000 is not set -CONFIG_FB_OF=m +CONFIG_FB_OF=y CONFIG_FB_CONTROL=y CONFIG_FB_PLATINUM=y CONFIG_FB_VALKYRIE=y @@ -4859,10 +4859,7 @@ CONFIG_FB_IMSTT=y CONFIG_FB_UVESA=m # CONFIG_FB_OPENCORES is not set # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y +# CONFIG_FB_NVIDIA is not set CONFIG_FB_RIVA=m # CONFIG_FB_RIVA_I2C is not set # CONFIG_FB_RIVA_DEBUG is not set @@ -4873,10 +4870,7 @@ CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y CONFIG_FB_MATROX_G=y # CONFIG_FB_MATROX_I2C is not set -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set +# CONFIG_FB_RADEON is not set CONFIG_FB_ATY128=m CONFIG_FB_ATY128_BACKLIGHT=y CONFIG_FB_ATY=m @@ -4967,7 +4961,7 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set diff --git a/system/easy-kernel/config-ppc64 b/system/easy-kernel/config-ppc64 index aa02a42fc..4b51a8c09 100644 --- a/system/easy-kernel/config-ppc64 +++ b/system/easy-kernel/config-ppc64 @@ -7,9 +7,9 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=130300 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24301 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24301 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -2151,7 +2151,7 @@ CONFIG_SCSI_SNIC=m # CONFIG_SCSI_SNIC_DEBUG_FS is not set CONFIG_SCSI_DMX3191D=m # CONFIG_SCSI_FDOMAIN_PCI is not set -CONFIG_SCSI_IPS=y +CONFIG_SCSI_IPS=m CONFIG_SCSI_IBMVSCSI=y CONFIG_SCSI_INITIO=m CONFIG_SCSI_INIA100=m @@ -4630,7 +4630,7 @@ CONFIG_DRM_PANEL_BRIDGE=y CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m # CONFIG_DRM_GM12U320 is not set -CONFIG_DRM_OFDRM=m +# CONFIG_DRM_OFDRM is not set CONFIG_DRM_SIMPLEDRM=m # CONFIG_DRM_GUD is not set # CONFIG_DRM_SSD130X is not set @@ -4641,11 +4641,11 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m # Frame buffer Devices # CONFIG_FB=y -CONFIG_FB_MACMODES=m +CONFIG_FB_MACMODES=y # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_CYBER2000 is not set -CONFIG_FB_OF=m +CONFIG_FB_OF=y # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_VGA16 is not set @@ -4656,10 +4656,7 @@ CONFIG_FB_OF=m # CONFIG_FB_RIVA is not set # CONFIG_FB_I740 is not set # CONFIG_FB_MATROX is not set -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set +# CONFIG_FB_RADEON is not set CONFIG_FB_ATY128=m CONFIG_FB_ATY128_BACKLIGHT=y # CONFIG_FB_ATY is not set @@ -4689,7 +4686,6 @@ CONFIG_FB_CORE=y CONFIG_FB_NOTIFY=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DEVICE=y -CONFIG_FB_DDC=m CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y diff --git a/system/easy-kernel/config-x86_64 b/system/easy-kernel/config-x86_64 index aa3537867..d05bb0ffb 100644 --- a/system/easy-kernel/config-x86_64 +++ b/system/easy-kernel/config-x86_64 @@ -2108,7 +2108,7 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y CONFIG_FW_CFG_SYSFS=m CONFIG_FW_CFG_SYSFS_CMDLINE=y CONFIG_SYSFB=y -CONFIG_SYSFB_SIMPLEFB=y +# CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_GOOGLE_FIRMWARE is not set # diff --git a/system/elfutils/APKBUILD b/system/elfutils/APKBUILD index 3d6baf127..1bbd6a8e2 100644 --- a/system/elfutils/APKBUILD +++ b/system/elfutils/APKBUILD @@ -7,8 +7,9 @@ url="https://sourceware.org/elfutils/" arch="all" license="GPL-2.0+ AND LGPL-3.0+ AND GPL-3.0+" depends="" -checkdepends="shimmy>0.7" -makedepends="argp-standalone-dev bzip2-dev curl-dev fts-dev libarchive-dev libbsd-dev musl-obstack-dev xz-dev zlib-dev zstd-dev" +checkdepends="musl-dbg shimmy>0.7" +makedepends="argp-standalone-dev bzip2-dev fts-dev libarchive-dev m4 + musl-obstack-dev xz-dev zlib-dev zstd-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" source="https://sourceware.org/elfutils/ftp/$pkgver/elfutils-$pkgver.tar.bz2 aarch64-regs.patch @@ -16,6 +17,12 @@ source="https://sourceware.org/elfutils/ftp/$pkgver/elfutils-$pkgver.tar.bz2 backtrace-cfi-fault.patch elfcompress-wildcard.patch fnm.patch + skip-run-deleted.patch + skip-run-backtrace-native-core.patch + skip-run-backtrace-native.patch + skip-run-elflint-self.patch + skip-run-reverse-sections-self.patch + skip-run-strip-strmerge.patch error.h " @@ -26,7 +33,7 @@ prepare() { } build() { - export CFLAGS="$CFLAGS -I$srcdir/vendor-error" + export CFLAGS="$CFLAGS -I$srcdir/vendor-error -Og" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -54,4 +61,10 @@ sha512sums="543188f5f2cfe5bc7955a878416c5f252edff9926754e5de0c6c57b132f21d9285c9 90f8b6b894e79334c66522675e47debb60266fcdb7124bfd9eb0938a276ad4168bee734d3e125b56c76f20b849aa70ac8181382f01313264ecca08225e5fe411 backtrace-cfi-fault.patch 7fa88ba58fb5eb7c835074dcd1db19591a001bb713c472f08eba3a94d80129011365f9cad70b04ec162897a13e4d2cc2d05ccec9130fd51b163621bb6e7ecc9d elfcompress-wildcard.patch 95c46254dbd6ad358c29d2f9577ccb9ce884e51b3d7587b7d91c02c1b4e54378ceba707a9d3800b1a7a15b7a4ba8bce6e7601fb6eb3cc93bbe82d484fc16103e fnm.patch +a85900ec75e72cc394b7e188f1f93dbf8b0555987e122cf4cb3369ecc8446d7af7d078c5e387f550806f5a738dcb12d4dde4d4313ed6ffb56d1de0481249016d skip-run-deleted.patch +339da4817c86d40b0581530bdd05006371d37568f66f766bf1307c65af941dd3ee373ee5d2dd32b0381de1a0649b0c4349c2c7f842adcec911c89f6a24cb0c99 skip-run-backtrace-native-core.patch +4300f063886941213caa4306221424cdc65a6a1ed43efec6ab3303ccddfd589efd14359c3347ce6dd6ac348514da0bfb38a3f0a034e5d09fad3322f8be7afae2 skip-run-backtrace-native.patch +eda7d5203019cf6f5412c8a0bb3c6406150a70ad883682cbd38e61f183a2c4246ab94c29f46d2886beb3152e7b78bf79cf89078fb9e63f594f4906f94a0e77f7 skip-run-elflint-self.patch +4c3f27bcbd7aed6a19c4597081b5b7b3881e4e25bb7274597f093793112c0ea316e5b282b9b10fe739b47925dea17a58524a2a26901bbc8008541fd2c6c7ae08 skip-run-reverse-sections-self.patch +034c0d320ea47b60da58b142a78dc9eb24d65d4cd61e3dc1e339bbbf9d0346d1be2a68ed7a77c997a32b33b813f5fdb5a9d7a1523a5c0624ae8140949115590d skip-run-strip-strmerge.patch b33d7f210b9652b7b919afb32b4674ca125b660bf5f81fafb4e4e8405ea16be74ce85f653e6c0ac83e5fff1b192e82e273c5b5baa3802fdc7602edfa1086936d error.h" diff --git a/system/elfutils/skip-run-backtrace-native-core.patch b/system/elfutils/skip-run-backtrace-native-core.patch new file mode 100644 index 000000000..b17a9adbe --- /dev/null +++ b/system/elfutils/skip-run-backtrace-native-core.patch @@ -0,0 +1,11 @@ +Fails on at least ppc64. + +Upstream-URL: https://sourceware.org/bugzilla/show_bug.cgi?id=32406 +--- elfutils-0.192/tests/run-backtrace-native-core.sh.old 2024-10-18 14:03:43.000000000 -0500 ++++ elfutils-0.192/tests/run-backtrace-native-core.sh 2024-12-02 12:16:35.094705219 -0600 +@@ -1,4 +1,5 @@ + #! /usr/bin/env bash ++exit 77 + # Copyright (C) 2013 Red Hat, Inc. + # This file is part of elfutils. + # diff --git a/system/elfutils/skip-run-backtrace-native.patch b/system/elfutils/skip-run-backtrace-native.patch new file mode 100644 index 000000000..184f81265 --- /dev/null +++ b/system/elfutils/skip-run-backtrace-native.patch @@ -0,0 +1,11 @@ +Ref: #1267 + +diff -ur a/tests/run-backtrace-native.sh b/tests/run-backtrace-native.sh +--- a/tests/run-backtrace-native.sh 2024-12-06 16:26:53.148727130 +0000 ++++ b/tests/run-backtrace-native.sh 2024-12-06 16:27:48.328928662 +0000 +@@ -1,4 +1,5 @@ + #! /usr/bin/env bash ++exit 77 + # Copyright (C) 2013 Red Hat, Inc. + # This file is part of elfutils. + # diff --git a/system/elfutils/skip-run-deleted.patch b/system/elfutils/skip-run-deleted.patch new file mode 100644 index 000000000..4bcb4d6da --- /dev/null +++ b/system/elfutils/skip-run-deleted.patch @@ -0,0 +1,12 @@ +Fails on at least aarch64 and ppc64. + +Upstream-URL: https://sourceware.org/bugzilla/show_bug.cgi?id=32405 +Ref: #1263 +--- elfutils-0.192/tests/run-deleted.sh.old 2024-10-18 14:03:43.000000000 -0500 ++++ elfutils-0.192/tests/run-deleted.sh 2024-12-02 12:15:12.783566126 -0600 +@@ -1,4 +1,5 @@ + #! /usr/bin/env bash ++exit 77 + # Copyright (C) 2014 Red Hat, Inc. + # This file is part of elfutils. + # diff --git a/system/elfutils/skip-run-elflint-self.patch b/system/elfutils/skip-run-elflint-self.patch new file mode 100644 index 000000000..0c764faf1 --- /dev/null +++ b/system/elfutils/skip-run-elflint-self.patch @@ -0,0 +1,11 @@ +Ref: #1267, #1268 + +diff -ur a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh +--- a/tests/run-elflint-self.sh 2024-12-06 16:26:53.140727100 +0000 ++++ b/tests/run-elflint-self.sh 2024-12-06 16:27:40.388900152 +0000 +@@ -1,4 +1,5 @@ + #! /bin/sh ++exit 77 + # Copyright (C) 2005, 2007, 2017 Red Hat, Inc. + # This file is part of elfutils. + # Written by Ulrich Drepper <drepper@redhat.com>, 2005. diff --git a/system/elfutils/skip-run-reverse-sections-self.patch b/system/elfutils/skip-run-reverse-sections-self.patch new file mode 100644 index 000000000..ad449cddf --- /dev/null +++ b/system/elfutils/skip-run-reverse-sections-self.patch @@ -0,0 +1,11 @@ +Ref: #1267, #1268 + +diff -ur a/tests/run-reverse-sections-self.sh b/tests/run-reverse-sections-self.sh +--- a/tests/run-reverse-sections-self.sh 2024-12-06 16:26:53.156727160 +0000 ++++ b/tests/run-reverse-sections-self.sh 2024-12-06 16:28:01.332975016 +0000 +@@ -1,4 +1,5 @@ + #! /bin/sh ++exit 77 + # Copyright (C) 2019 Red Hat, Inc. + # This file is part of elfutils. + # diff --git a/system/elfutils/skip-run-strip-strmerge.patch b/system/elfutils/skip-run-strip-strmerge.patch new file mode 100644 index 000000000..747d81bc7 --- /dev/null +++ b/system/elfutils/skip-run-strip-strmerge.patch @@ -0,0 +1,11 @@ +Ref: #1267, #1268 + +diff -ur a/tests/run-strip-strmerge.sh b/tests/run-strip-strmerge.sh +--- a/tests/run-strip-strmerge.sh 2024-12-06 16:26:53.140727100 +0000 ++++ b/tests/run-strip-strmerge.sh 2024-12-06 16:27:17.872818425 +0000 +@@ -1,4 +1,5 @@ + #! /bin/sh ++exit 77 + # Copyright (C) 2015 Red Hat, Inc. + # This file is part of elfutils. + # diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD index 8a912713f..028c1a0f6 100644 --- a/system/execline/APKBUILD +++ b/system/execline/APKBUILD @@ -1,22 +1,23 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=execline -pkgver=2.9.6.1 +pkgver=2.9.7.0 pkgrel=0 pkgdesc="A small scripting language for non-interactive scripts" url="https://skarnet.org/software/execline/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev" subpackages="$pkgname-libs $pkgname-dev $pkgname-doc" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz execline.pc.in" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ --enable-shared \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-static-libc \ --enable-pedantic-posix make @@ -25,11 +26,8 @@ build() { package() { make DESTDIR="$pkgdir" install mkdir -p -m 0755 "$pkgdir/usr/share/doc" "$pkgdir/usr/bin" - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" - ln -s ../bin/execlineb "$pkgdir/usr/bin/execlineb" + ln -s ../../bin/execlineb "$pkgdir/usr/bin/execlineb" } -sha512sums="86e20a63926cc03cb81e07c9cbea9da5d0384436a82b93e331da6b3ced33829baf5adae4286d2c053b21474d41602d53804ff0bc280da60f7bccc64cbe5f601e execline-2.9.6.1.tar.gz -54026153ee1b96357bdf4614c520a287b34db1ded012cb563240c1292daea33af6da6b39a051ad18dd5b53a1d42c25cc109185ce83c8cbc67fcb098a9418d78e execline.pc.in" +sha512sums="c46aa4954a560610074a5a4f8cecc1512bab05b40739c4dddc74881edb30468f248fc08ca1a461ec66279fa43fa25d130b339790995fb1eeb1612a13dc479ac1 execline-2.9.7.0.tar.gz" diff --git a/system/execline/execline.pc.in b/system/execline/execline.pc.in deleted file mode 100644 index c0b28d9df..000000000 --- a/system/execline/execline.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: execline -Description: the execline library for argv and envp manipulation -URL: https://skarnet.org/software/execline/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -lexecline diff --git a/system/inih/APKBUILD b/system/inih/APKBUILD deleted file mode 100644 index 9d701cd95..000000000 --- a/system/inih/APKBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=inih -pkgver=58 -pkgrel=0 -pkgdesc="Simple .INI file parser in C" -url=" " -arch="all" -license="BSD-3-Clause" -depends="" -makedepends="meson" -subpackages="$pkgname-dev" -source="https://github.com/benhoyt/inih/archive/r58/$pkgname-$pkgver.tar.gz - testrun.patch - " -builddir="$srcdir/inih-r58" - -build() { - meson setup \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --buildtype=release \ - --wrap-mode=nofallback \ - . output - meson compile -C output -} - -check() { - meson test -C output -} - -package() { - DESTDIR="$pkgdir" meson install -C output -} - -sha512sums="d69f488299c1896e87ddd3dd20cd9db5848da7afa4c6159b8a99ba9a5d33f35cadfdb9f65d6f2fe31decdbadb8b43bf610ff2699df475e1f9ff045e343ac26ae inih-58.tar.gz -88f38fa41efa91a3eeef065251a6424fdfbb6d4ed975dfcce4730374f61f328ca2b13f3db123eed2c5ade9e54c1f797481dbcb284b22554dd89068053ead1035 testrun.patch" diff --git a/system/inih/testrun.patch b/system/inih/testrun.patch deleted file mode 100644 index 987712773..000000000 --- a/system/inih/testrun.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 59461b32ee99e1573ecee98c1122815187ef6e82 Mon Sep 17 00:00:00 2001 -From: matoro <matoro@users.noreply.github.com> -Date: Tue, 7 May 2024 15:41:36 -0400 -Subject: [PATCH] Add meson support for tests - -Allows tests to use "meson test" instead of a shell script. This also -means that they now fully respect user-specified toolchain (e.g. clang -compiler, custom CFLAGS, etc). Running C++ test is conditional on -enabling INIReader support in the build. - -``` - 1/16 test_multi OK 0.05s - 2/16 test_multi_max_line OK 0.04s - 3/16 test_single OK 0.04s - 4/16 test_disallow_inline_comments OK 0.03s - 5/16 test_stop_on_first_error OK 0.03s - 6/16 test_handler_lineno OK 0.02s - 7/16 test_heap OK 0.06s - 8/16 test_string OK 0.06s - 9/16 test_heap_max_line OK 0.05s -10/16 test_heap_realloc OK 0.05s -11/16 test_heap_realloc_max_line OK 0.05s -12/16 test_heap_string OK 0.04s -13/16 test_call_handler_on_new_section OK 0.04s -14/16 test_allow_no_value OK 0.03s -15/16 test_alloc OK 0.02s -16/16 test_INIReaderExample OK 0.02s - -Ok: 16 -Expected Fail: 0 -Fail: 0 -Unexpected Pass: 0 -Skipped: 0 -Timeout: 0 -``` ---- - .github/workflows/tests.yml | 13 ++++++++++++- - examples/meson.build | 10 ++++++++++ - meson.build | 15 ++++++++++++--- - tests/meson.build | 25 +++++++++++++++++++++++++ - tests/runtest.sh | 6 ++++++ - 5 files changed, 65 insertions(+), 4 deletions(-) - create mode 100644 examples/meson.build - create mode 100644 tests/meson.build - create mode 100755 tests/runtest.sh - -diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml -index 4971e43..b34ab59 100644 ---- a/.github/workflows/tests.yml -+++ b/.github/workflows/tests.yml -@@ -11,7 +11,7 @@ jobs: - runs-on: ubuntu-latest - - steps: -- - uses: actions/checkout@v2 -+ - uses: actions/checkout@v4 - - - name: Run Diff Tests - run: | -@@ -20,3 +20,14 @@ jobs: - cd ../examples - ./cpptest.sh - git diff --exit-code -+ -+ build-meson: -+ runs-on: ubuntu-latest -+ -+ steps: -+ - uses: actions/checkout@v4 -+ - uses: actions/setup-python@v5 -+ - uses: BSFishy/meson-build@v1.0.3 -+ with: -+ action: test -+ meson-version: 1.4.1 -diff --git a/examples/meson.build b/examples/meson.build -new file mode 100644 -index 0000000..bb1979e ---- /dev/null -+++ b/examples/meson.build -@@ -0,0 +1,10 @@ -+runtest = files(join_paths(meson.project_source_root(), 'tests', 'runtest.sh')) -+ -+tests = { -+ 'INIReaderExample': { 'args': [] }, -+} -+ -+foreach name, properties : tests -+ exe = executable('unittest_' + name, src_inih, src_INIReader, 'INIReaderExample.cpp', cpp_args : ['-Wall', properties['args']]) -+ test('test_' + name, runtest, depends : [exe], args : [files('cpptest.txt'), exe.full_path()]) -+endforeach -diff --git a/meson.build b/meson.build -index d440cbc..4e4fe4b 100644 ---- a/meson.build -+++ b/meson.build -@@ -2,7 +2,8 @@ project('inih', - ['c'], - license : 'BSD-3-Clause', - version : '58', -- default_options : ['cpp_std=c++11'] -+ default_options : ['cpp_std=c++11'], -+ meson_version: '>=0.56.0' - ) - - #### options #### -@@ -71,8 +72,10 @@ endif - #### inih #### - inc_inih = include_directories('.') - -+src_inih = files('ini.c') -+ - lib_inih = library('inih', -- ['ini.c'], -+ [src_inih], - include_directories : inc_inih, - c_args : [arg_static, extra_args], - install : distro_install, -@@ -96,13 +99,17 @@ inih_dep = declare_dependency( - include_directories : inc_inih - ) - -+subdir('tests') -+ - #### INIReader #### - if get_option('with_INIReader') - add_languages('cpp') - inc_INIReader = include_directories('cpp') - -+ src_INIReader = files(join_paths('cpp', 'INIReader.cpp')) -+ - lib_INIReader = library('INIReader', -- ['cpp/INIReader.cpp'], -+ src_INIReader, - cpp_args : extra_args, - include_directories : inc_INIReader, - dependencies : inih_dep, -@@ -126,4 +133,6 @@ if get_option('with_INIReader') - include_directories : inc_INIReader, - compile_args : extra_args - ) -+ -+ subdir('examples') - endif -diff --git a/tests/meson.build b/tests/meson.build -new file mode 100644 -index 0000000..d0a2c52 ---- /dev/null -+++ b/tests/meson.build -@@ -0,0 +1,25 @@ -+runtest = files(join_paths(meson.project_source_root(), 'tests', 'runtest.sh')) -+ -+tests = { -+ 'multi': { 'args': [] }, -+ 'multi_max_line': { 'args': ['-DINI_MAX_LINE=20'] }, -+ 'single': { 'args': ['-DINI_ALLOW_MULTILINE=0'] }, -+ 'disallow_inline_comments': { 'args': ['-DINI_ALLOW_INLINE_COMMENTS=0'] }, -+ 'stop_on_first_error': { 'args': ['-DINI_STOP_ON_FIRST_ERROR=1'] }, -+ 'handler_lineno': { 'args': ['-DINI_HANDLER_LINENO=1'] }, -+ 'string': { 'src': 'unittest_string.c', 'args': ['-DINI_MAX_LINE=20'] }, -+ 'heap': { 'args': ['-DINI_USE_STACK=0'] }, -+ 'heap_max_line': { 'args': ['-DINI_USE_STACK=0', '-DINI_MAX_LINE=20', '-DINI_INITIAL_ALLOC=20'] }, -+ 'heap_realloc': { 'args': ['-DINI_USE_STACK=0', '-DINI_ALLOW_REALLOC=1', '-DINI_INITIAL_ALLOC=5'] }, -+ 'heap_realloc_max_line': { 'args': ['-DINI_USE_STACK=0', '-DINI_MAX_LINE=20', '-DINI_ALLOW_REALLOC=1', '-DINI_INITIAL_ALLOC=5'] }, -+ 'heap_string': { 'src': 'unittest_string.c', 'args': ['-DINI_USE_STACK=0', '-DINI_MAX_LINE=20', '-DINI_INITIAL_ALLOC=20'] }, -+ 'call_handler_on_new_section': { 'args': ['-DINI_CALL_HANDLER_ON_NEW_SECTION=1'] }, -+ 'allow_no_value': { 'args': ['-DINI_ALLOW_NO_VALUE=1'] }, -+ 'alloc': { 'src': 'unittest_alloc.c', 'args': ['-DINI_CUSTOM_ALLOCATOR=1', '-DINI_USE_STACK=0', '-DINI_ALLOW_REALLOC=1', '-DINI_INITIAL_ALLOC=12'] } -+} -+ -+foreach name, properties : tests -+ test_src = 'src' in properties ? properties['src'] : 'unittest.c' -+ exe = executable('unittest_' + name, src_inih, test_src, c_args : ['-Wall', properties['args']]) -+ test('test_' + name, runtest, depends : [exe], args : [files('baseline_' + name + '.txt'), exe.full_path()]) -+endforeach -diff --git a/tests/runtest.sh b/tests/runtest.sh -new file mode 100755 -index 0000000..9db945b ---- /dev/null -+++ b/tests/runtest.sh -@@ -0,0 +1,6 @@ -+#!/usr/bin/env bash -+ -+set -euo pipefail -+ -+cd "$(dirname "${1}")" -+diff "${1}" <("${2}") diff --git a/system/kbd/APKBUILD b/system/kbd/APKBUILD index 144ddcefc..4380b9161 100644 --- a/system/kbd/APKBUILD +++ b/system/kbd/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbd pkgver=2.2.0_git20190823 -pkgrel=2 +pkgrel=3 pkgdesc="Console keyboard and font management utilities" url="https://kbd-project.org/" arch="all" options="!check" # padding error on at least ppc64 license="GPL-2.0+" -depends="" +depends="gzip" checkdepends="check-dev" makedepends="linux-headers linux-pam-dev autoconf automake libtool" provides="$pkgname-keymaps" diff --git a/system/libexecinfo/APKBUILD b/system/libexecinfo/APKBUILD index b2a2c4591..02ec8213c 100644 --- a/system/libexecinfo/APKBUILD +++ b/system/libexecinfo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libexecinfo pkgver=1.1 -pkgrel=3 +pkgrel=4 pkgdesc="Library for inspecting backtraces" url="https://www.freshports.org/devel/libexecinfo" arch="all" @@ -21,7 +21,7 @@ build() { } check() { - ${CC:-cc} -I. -L. -ggdb -o test test.c -lexecinfo + ${CC:-cc} -I. -L. ${CFLAGS} -o test test.c -lexecinfo ./test } diff --git a/system/libxslt/APKBUILD b/system/libxslt/APKBUILD index 1db907710..edf54750a 100644 --- a/system/libxslt/APKBUILD +++ b/system/libxslt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxslt -pkgver=1.1.37 +pkgver=1.1.42 pkgrel=0 pkgdesc="XML stylesheet transformation library" url="https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a4e477d2bb918b7d01945e2c7491c3a4aae799dc1602bbd13de55c8a5052e210a20bc45115347eae44473c8b1d03dbc5e4a2aa18c2218f1fdfd376d87cd501ca libxslt-1.1.37.tar.xz" +sha512sums="02a2189b6cd65fa1fb929fc0e6868bc046bdd8827849f0048cdf9267ed9450745158cef0f2713a833e28fb520b312ff86dc5754dd423ce768c457bfd8812bdc7 libxslt-1.1.42.tar.xz" diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD index f97c26160..b4ef7fa4e 100644 --- a/system/mdevd/APKBUILD +++ b/system/mdevd/APKBUILD @@ -1,20 +1,24 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=mdevd -pkgver=0.1.6.5 +pkgver=0.1.7.0 pkgrel=0 pkgdesc="A small uevent manager daemon" url="https://skarnet.org/software/mdevd/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-doc $pkgname-openrc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz mdev.conf mdevd.run mdevd.initd" build() { - ./configure --enable-allstatic --enable-static-libc + ./configure \ + --enable-allstatic \ + --with-pkgconfig \ + --enable-pkgconfig \ + --enable-static-libc make } @@ -40,7 +44,7 @@ openrc() { ln -s ../../init.d/mdevd "$rldir/mdevd" } -sha512sums="a6d4fd9802e46746b7c677bf1c5d496f7af46eb3d827248781989c0cfcd81e14b5eb7ab6af6aef9be6f3b3f1bc4fa6de1a61735f2fc2aa6b7dc994b0f73999f7 mdevd-0.1.6.5.tar.gz +sha512sums="b50750afbba81c5168348acc2b38ba28abe0ac19bf4ea49c04f68eec1269a079642bccbed0acb1ef5da4848aea20c5f71c2711945eb2218ab79d570ffecdce57 mdevd-0.1.7.0.tar.gz f966d66366eac3b9b9eeb9b8523ea0924ada2b858c85ca0c0151d0fb374dfbf56c49ec2210d2d5ca19aa4d9f24371c85d777050eb8bf9f57821ec65704f18717 mdev.conf 427a5903fa2126060955dcce8144d59255a679c4973f2dbc3145a4d646e879fc241ebcaa53289498719d343c746fc376c41defa87932dcbe91192b2d6f4ed1c4 mdevd.run -e7599f51a4280243a5be459c6fad7eb8ba3b5f65fae8cad923ccca2addab55787819909fea311c998e1126e6802a81ab000ee6de7474f3245ce72521244c22ba mdevd.initd" +afda8cb4fbf3125367b67df713b51a1de4fea9e444580bcf7e0056a236f7a1b72b64f1b3feabe9aff308d46ff04b2f2711e64fada305eea4290080017c8a72fe mdevd.initd" diff --git a/system/mdevd/mdevd.initd b/system/mdevd/mdevd.initd index e9dff025f..1b55a3a84 100644 --- a/system/mdevd/mdevd.initd +++ b/system/mdevd/mdevd.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 2019-2023 Adélie Linux +# Copyright 2019-2025 Adélie Linux description="mdevd manages device permissions and symbolic links in /dev" extra_started_commands="reload" diff --git a/system/musl/0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch b/system/musl/0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch new file mode 100644 index 000000000..ff92d8ef9 --- /dev/null +++ b/system/musl/0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch @@ -0,0 +1,38 @@ +From e5adcd97b5196e29991b524237381a0202a60659 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Sun, 9 Feb 2025 10:07:19 -0500 +Subject: [PATCH] iconv: fix erroneous input validation in EUC-KR decoder + +as a result of incorrect bounds checking on the lead byte being +decoded, certain invalid inputs which should produce an encoding +error, such as "\xc8\x41", instead produced out-of-bounds loads from +the ksc table. + +in a worst case, the loaded value may not be a valid unicode scalar +value, in which case, if the output encoding was UTF-8, wctomb would +return (size_t)-1, causing an overflow in the output pointer and +remaining buffer size which could clobber memory outside of the output +buffer. + +bug report was submitted in private by Nick Wellnhofer on account of +potential security implications. +--- + src/locale/iconv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/locale/iconv.c b/src/locale/iconv.c +index 9605c8e9..008c93f0 100644 +--- a/src/locale/iconv.c ++++ b/src/locale/iconv.c +@@ -502,7 +502,7 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri + if (c >= 93 || d >= 94) { + c += (0xa1-0x81); + d += 0xa1; +- if (c >= 93 || c>=0xc6-0x81 && d>0x52) ++ if (c > 0xc6-0x81 || c==0xc6-0x81 && d>0x52) + goto ilseq; + if (d-'A'<26) d = d-'A'; + else if (d-'a'<26) d = d-'a'+26; +-- +2.21.0 + diff --git a/system/musl/0002-iconv-harden-UTF-8-output-code-path-against-input-de.patch b/system/musl/0002-iconv-harden-UTF-8-output-code-path-against-input-de.patch new file mode 100644 index 000000000..d66e66e3f --- /dev/null +++ b/system/musl/0002-iconv-harden-UTF-8-output-code-path-against-input-de.patch @@ -0,0 +1,37 @@ +From c47ad25ea3b484e10326f933e927c0bc8cded3da Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Wed, 12 Feb 2025 17:06:30 -0500 +Subject: [PATCH] iconv: harden UTF-8 output code path against input decoder + bugs + +the UTF-8 output code was written assuming an invariant that iconv's +decoders only emit valid Unicode Scalar Values which wctomb can encode +successfully, thereby always returning a value between 1 and 4. + +if this invariant is not satisfied, wctomb returns (size_t)-1, and the +subsequent adjustments to the output buffer pointer and remaining +output byte count overflow, moving the output position backwards, +potentially past the beginning of the buffer, without storing any +bytes. +--- + src/locale/iconv.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/locale/iconv.c b/src/locale/iconv.c +index 008c93f0..52178950 100644 +--- a/src/locale/iconv.c ++++ b/src/locale/iconv.c +@@ -545,6 +545,10 @@ size_t iconv(iconv_t cd, char **restrict in, size_t *restrict inb, char **restri + if (*outb < k) goto toobig; + memcpy(*out, tmp, k); + } else k = wctomb_utf8(*out, c); ++ /* This failure condition should be unreachable, but ++ * is included to prevent decoder bugs from translating ++ * into advancement outside the output buffer range. */ ++ if (k>4) goto ilseq; + *out += k; + *outb -= k; + break; +-- +2.21.0 + diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD index 9816d009e..5951328a1 100644 --- a/system/musl/APKBUILD +++ b/system/musl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=musl pkgver=1.2.3 -pkgrel=1 +pkgrel=3 pkgdesc="System library (libc) implementation" url="https://www.musl-libc.org/" arch="all" @@ -26,9 +26,13 @@ source="https://musl.libc.org/releases/musl-${pkgver}.tar.gz 3001-make-real-lastlog-h.patch handle-aux-at_base.patch fgetspent_r.patch + ppc-hwcap.patch realpath.patch signed-wchar_t-fixes.patch + 0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch + 0002-iconv-harden-UTF-8-output-code-path-against-input-de.patch + ldconfig getent.c iconv.c @@ -41,6 +45,8 @@ source="https://musl.libc.org/releases/musl-${pkgver}.tar.gz # - CVE-2019-14697 # 1.2.0-r2: # - CVE-2020-28928 +# 1.2.3-r3: +# - CVE-2025-26519 build() { [ "$BOOTSTRAP" = "nocc" ] && return 0 @@ -125,8 +131,11 @@ f7b05d8c5f804ba3ad6998b3de5fa4d9dfceac4aca63dd67298c2d5f27cdd28a91eba74f6e428c25 88ae443dbb8e0a4368235bdc3a1c5c7b718495afa75e06deb8e01becc76cb1f0d6964589e2204fc749c9c1b3190b8b9ac1ae2c0099cab8e2ce3ec877103d4332 3001-make-real-lastlog-h.patch 1f4e9aea5a546015c75f77aa0dec10d56fc14831ccc15cf71ff27fc15ac5230ffeadb382ebe1c87c1ea07a462620e16ed01cd36252d997d1a9c2af11cb5c9ff3 handle-aux-at_base.patch ded41235148930f8cf781538f7d63ecb0c65ea4e8ce792565f3649ee2523592a76b2a166785f0b145fc79f5852fd1fb1729a7a09110b3b8f85cba3912e790807 fgetspent_r.patch +96d88bb9c03f6eddcfc22cbd04efa73535f4ab78409954a042a2e08294cc8df1fb2cb0475eadb92a7fa281229abaa600f034d3ef08e918c6016dbf9be1db28d9 ppc-hwcap.patch d5ec3f1a86f2194e0af83c2391508811b939d0f8f2fd2ac5ac7f03774f8a250ce42399110d2ae04d32b864ee292863fed683a029b64598dbbcb21d9811a825d0 realpath.patch 3770af3bc961e5d5b8c152c428cd20dc54e026b23b31d764fbc2e71ee38140d160db2267755f23800bc8586fd4b51554b1caebb2415bef82fd0f4a6dd8bf640d signed-wchar_t-fixes.patch +a69f77c4b4c7fefb543f5a1678f981b001c35cdb4c0bb2dfb56548eebc88e725330b9961a5435d11e6e1e3185b508f1fd5bf72e6aa67b708a8e8186c4b33392a 0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch +c4777d653007ea3e2af5e3edf7804e5b5562823e41543991b7c04843203a6e93c1e1e2c63b178c8ed2f89411040230268d8a83ebc3018ad199aad958587c0faf 0002-iconv-harden-UTF-8-output-code-path-against-input-de.patch cb71d29a87f334c75ecbc911becde7be825ab30d8f39fa6d64cb53812a7c9abaf91d9804c72540e5be3ddd3c84cfe7fd9632274309005cb8bcdf9a9b09b4b923 ldconfig 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c" diff --git a/system/musl/ppc-hwcap.patch b/system/musl/ppc-hwcap.patch new file mode 100644 index 000000000..3ebd5c42b --- /dev/null +++ b/system/musl/ppc-hwcap.patch @@ -0,0 +1,36 @@ +From 2c788798c1f625c42e844311f5a5d2e19707d581 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Fri, 3 Jan 2025 13:36:33 -0600 +Subject: [PATCH] powerpc: Update HWCAP bits for Power10 + +Linux kernel commit ee988c11acf6f9464b7b44e9a091bf6afb3b3a49 added two +new HWCAP bits: one for ARCH_3_1, which is the Power10 ISA revision, and +one for MMA, which is the optional Matrix Multiply Assist extension. +--- + arch/powerpc/bits/hwcap.h | 2 ++ + arch/powerpc64/bits/hwcap.h | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/arch/powerpc/bits/hwcap.h b/arch/powerpc/bits/hwcap.h +index 803de9b5..12981623 100644 +--- a/arch/powerpc/bits/hwcap.h ++++ b/arch/powerpc/bits/hwcap.h +@@ -41,3 +41,5 @@ + #define PPC_FEATURE2_DARN 0x00200000 + #define PPC_FEATURE2_SCV 0x00100000 + #define PPC_FEATURE2_HTM_NO_SUSPEND 0x00080000 ++#define PPC_FEATURE2_ARCH_3_1 0x00040000 ++#define PPC_FEATURE2_MMA 0x00020000 +diff --git a/arch/powerpc64/bits/hwcap.h b/arch/powerpc64/bits/hwcap.h +index 803de9b5..12981623 100644 +--- a/arch/powerpc64/bits/hwcap.h ++++ b/arch/powerpc64/bits/hwcap.h +@@ -41,3 +41,5 @@ + #define PPC_FEATURE2_DARN 0x00200000 + #define PPC_FEATURE2_SCV 0x00100000 + #define PPC_FEATURE2_HTM_NO_SUSPEND 0x00080000 ++#define PPC_FEATURE2_ARCH_3_1 0x00040000 ++#define PPC_FEATURE2_MMA 0x00020000 +-- +2.40.0 + diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD index 3b9da03fc..f3350bb00 100644 --- a/system/ncurses/APKBUILD +++ b/system/ncurses/APKBUILD @@ -9,6 +9,7 @@ arch="all" options="!check" # "tests" are actual demo programs, not a test suite. license="MIT" depends="" +makedepends_build="ncurses" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-terminfo-base:base:noarch $pkgname-terminfo:terminfo:noarch" source="https://invisible-mirror.net/archives/ncurses/current/$pkgname-$pkgver-$_ver.tgz" diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD index 05c36455b..3c877c3c8 100644 --- a/system/openssh/APKBUILD +++ b/system/openssh/APKBUILD @@ -2,16 +2,16 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Horst Burkhardt <horst@adelielinux.org> pkgname=openssh -pkgver=9.4_p1 +pkgver=9.9_p2 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=0 +pkgrel=1 pkgdesc="Remote login tool using encrypted SSH protocol" url="https://www.openssh.com/portable.html" arch="all" options="suid !check" license="BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause" depends="openssh-client openssh-sftp-server openssh-server" -makedepends_build="linux-pam-dev gettext-tiny" +makedepends_build="autoconf automake linux-pam-dev gettext-tiny" makedepends_host="openssl-dev zlib-dev linux-headers linux-pam-dev gettext-tiny-dev utmps-dev" makedepends="$makedepends_build $makedepends_host" @@ -26,13 +26,12 @@ subpackages="$pkgname-doc source="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz disable-forwarding-by-default.patch - fix-utmpx.patch - sftp-interactive.patch - time64-seccomp.patch + utmpx.patch sshd.initd sshd.confd " + # secfixes: # 9.0_p1-r0: # - CVE-2021-41617 @@ -53,6 +52,7 @@ source="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.ta builddir="$srcdir"/$pkgname-$_myver build() { + autoreconf -vif export LD="$CC" LIBS="-lutmps -lskarnet" ./configure --build=$CBUILD \ --host=$CHOST \ @@ -65,7 +65,7 @@ build() { --with-ldflags="${LDFLAGS}" \ --enable-lastlog \ --disable-strip \ - --enable-wtmp \ + --enable-wtmpx \ --with-privsep-path=/var/empty \ --with-xauth=/usr/bin/xauth \ --with-privsep-user=sshd \ @@ -137,8 +137,12 @@ server() { replaces="openssh-server-common" install -d "$subpkgdir"/usr/sbin - install -d "$subpkgdir"/etc/ssh mv "$pkgdir"/usr/sbin/sshd "$subpkgdir"/usr/sbin/ + + install -d "$subpkgdir"/usr/lib/ssh + mv "$pkgdir"/usr/lib/ssh/sshd-session "$subpkgdir"/usr/lib/ssh/ + + install -d "$subpkgdir"/etc/ssh mv "$pkgdir"/etc/ssh/sshd_config "$subpkgdir"/etc/ssh/ } @@ -148,10 +152,8 @@ openrc() { install_if="openssh-server=$pkgver-r$pkgrel openrc" } -sha512sums="0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25 openssh-9.4p1.tar.gz +sha512sums="4c6d839aa3189cd5254c745f2bd51cd3f468b02f8e427b8d7a16b9ad017888a41178d2746dc51fb2d3fec5be00e54b9ab7c32c472ca7dec57a1dea4fc9840278 openssh-9.9p2.tar.gz f3d5960572ddf49635d4edbdff45835df1b538a81840db169c36b39862e6fa8b0393ca90626000b758f59567ff6810b2537304098652483b3b31fb438a061de6 disable-forwarding-by-default.patch -70bffa6c061a02dd790dbaa68cd0b488395aa2312039b037e1a707e8cf7465754bf376d943d351914b64044c074af7504e845de865dec45ea00d992c2bbb8925 fix-utmpx.patch -34c0673f550e7afcd47eda4fe1da48fb42e5344c95ba8064c9c3c137fda9c43635b0f7b8145d0300f59c79f75a396ebd467afb54cdaa42aa251d624d0752dc84 sftp-interactive.patch -ad5b209f7f3fff69c10bae34da143e071e107a2141eee94f393532d6bb04a36bfe6d9b5d2c08b713f67118503c38d11b4aad689df1df7c8a918d52db8326821d time64-seccomp.patch +56543469db242699d8a04d0ba133b9ab0d980224035de57f70f773ca1593828cf4e41d3306f72b5ac95423f1e512bd6b92f69f86b847e05abfbd48737431104b utmpx.patch 964c0f8538ba25bdc9cdbd1467bbdfb2090e38492ff0ef7c64473785713fe26d752ea6a7b0ee7a0b34e08f4d3b4bccf6a69e6c456f0c57d0d0c581aa8a046936 sshd.initd ce0abddbd2004891f88efd8522c4b37a4989290269fab339c0fa9aacc051f7fd3b20813e192e92e0e64315750041cb74012d4321260f4865ff69d7a935b259d4 sshd.confd" diff --git a/system/openssh/fix-utmpx.patch b/system/openssh/fix-utmpx.patch deleted file mode 100644 index d04742e2f..000000000 --- a/system/openssh/fix-utmpx.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- openssh-7.7p1/loginrec.c.old 2018-04-02 00:38:28.000000000 -0500 -+++ openssh-7.7p1/loginrec.c 2018-06-15 22:09:00.091482769 -0500 -@@ -1663,7 +1663,11 @@ - const char *ttyn) - { - int fd; -+#if defined(USE_UTMPX) -+ struct utmpx ut; -+#else - struct utmp ut; -+#endif - struct sockaddr_storage from; - socklen_t fromlen = sizeof(from); - struct sockaddr_in *a4; diff --git a/system/openssh/sftp-interactive.patch b/system/openssh/sftp-interactive.patch deleted file mode 100644 index e4b8967bf..000000000 --- a/system/openssh/sftp-interactive.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/sftp.c 2014-10-24 10:32:15.793544472 +0500 -+++ b/sftp.c 2014-10-24 10:35:22.329199875 +0500 -@@ -2243,8 +2243,10 @@ - signal(SIGINT, SIG_IGN); - - if (el == NULL) { -- if (interactive) -+ if (interactive) { - printf("sftp> "); -+ fflush(stdout); -+ } - if (fgets(cmd, sizeof(cmd), infile) == NULL) { - if (interactive) - printf("\n"); diff --git a/system/openssh/time64-seccomp.patch b/system/openssh/time64-seccomp.patch deleted file mode 100644 index 9f9a8a247..000000000 --- a/system/openssh/time64-seccomp.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b1c82f4b8adf3f42476d8a1f292df33fb7aa1a56 Mon Sep 17 00:00:00 2001 -From: Darren Tucker <dtucker@dtucker.net> -Date: Wed, 13 Nov 2019 23:19:35 +1100 -Subject: [PATCH] seccomp: Allow clock_nanosleep() in sandbox. - -seccomp: Allow clock_nanosleep() to make OpenSSH working with latest -glibc. Patch from Jakub Jelen <jjelen@redhat.com> via bz #3093. - -From 5af6fd5461bb709304e6979c8b7856c7af921c9e Mon Sep 17 00:00:00 2001 -From: Darren Tucker <dtucker@dtucker.net> -Date: Mon, 16 Dec 2019 13:55:56 +1100 -Subject: [PATCH] Allow clock_nanosleep_time64 in seccomp sandbox. - -Needed on Linux ARM. bz#3100, patch from jjelen@redhat.com. - -From b110cefdfbf5a20f49b774a55062d6ded2fb6e22 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 7 Jan 2020 16:26:45 -0800 -Subject: [PATCH] seccomp: Allow clock_gettime64() in sandbox. - -This helps sshd accept connections on mips platforms with -upcoming glibc ( 2.31 ) - -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index b5cda70bb..96ab141f7 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -242,6 +242,15 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_nanosleep - SC_ALLOW(__NR_nanosleep), - #endif -+#ifdef __NR_clock_nanosleep -+ SC_ALLOW(__NR_clock_nanosleep), -+#endif -+#ifdef __NR_clock_nanosleep_time64 -+ SC_ALLOW(__NR_clock_nanosleep_time64), -+#endif -+#ifdef __NR_clock_gettime64 -+ SC_ALLOW(__NR_clock_gettime64), -+#endif - #ifdef __NR__newselect - SC_ALLOW(__NR__newselect), - #endif diff --git a/system/openssh/utmpx.patch b/system/openssh/utmpx.patch new file mode 100644 index 000000000..d3f24aa76 --- /dev/null +++ b/system/openssh/utmpx.patch @@ -0,0 +1,103 @@ +--- openssh-9.9p2/configure.ac.old 2025-02-18 02:15:08.000000000 -0600 ++++ openssh-9.9p2/configure.ac 2025-02-18 20:57:12.172701096 -0600 +@@ -5449,7 +5449,9 @@ + AC_MSG_CHECKING([if your system defines LASTLOG_FILE]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <sys/types.h> +-#include <utmp.h> ++#ifdef HAVE_UTMP_H ++# include <utmp.h> ++#endif + #ifdef HAVE_LASTLOG_H + # include <lastlog.h> + #endif +@@ -5466,7 +5468,9 @@ + AC_MSG_CHECKING([if your system defines _PATH_LASTLOG]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <sys/types.h> +-#include <utmp.h> ++#ifdef HAVE_UTMP_H ++# include <utmp.h> ++#endif + #ifdef HAVE_LASTLOG_H + # include <lastlog.h> + #endif +@@ -5504,7 +5508,9 @@ + AC_MSG_CHECKING([if your system defines UTMP_FILE]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <sys/types.h> +-#include <utmp.h> ++#ifdef HAVE_UTMP_H ++# include <utmp.h> ++#endif + #ifdef HAVE_PATHS_H + # include <paths.h> + #endif +@@ -5534,7 +5540,9 @@ + AC_MSG_CHECKING([if your system defines WTMP_FILE]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <sys/types.h> +-#include <utmp.h> ++#ifdef HAVE_UTMP_H ++# include <utmp.h> ++#endif + #ifdef HAVE_PATHS_H + # include <paths.h> + #endif +@@ -5564,7 +5572,9 @@ + AC_MSG_CHECKING([if your system defines WTMPX_FILE]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <sys/types.h> +-#include <utmp.h> ++#ifdef HAVE_UTMP_H ++# include <utmp.h> ++#endif + #ifdef HAVE_UTMPX_H + #include <utmpx.h> + #endif +--- openssh-9.9p2/loginrec.c.old 2025-02-18 02:15:08.000000000 -0600 ++++ openssh-9.9p2/loginrec.c 2025-02-18 21:01:26.034757676 -0600 +@@ -614,7 +614,7 @@ + ** into account. + **/ + +-#if defined(USE_BTMP) || defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) ++#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) + + /* build the utmp structure */ + void +@@ -698,7 +698,7 @@ + } + # endif + } +-#endif /* USE_BTMP || USE_UTMP || USE_WTMP || USE_LOGIN */ ++#endif /* USE_UTMP || USE_WTMP || USE_LOGIN */ + + /** + ** utmpx utility functions +@@ -1644,7 +1644,13 @@ + const char *ttyn) + { + int fd; ++#if defined(USE_UTMP) + struct utmp ut; ++#elif defined(USE_UTMPX) ++ struct utmpx ut; ++#else ++# error either UTMP or UTMPX must be present to use BTMP ++#endif + struct logininfo li; + socklen_t fromlen = sizeof(li.hostaddr); + time_t t; +@@ -1681,7 +1687,11 @@ + (void)getpeername(ssh_packet_get_connection_in(ssh), + &li.hostaddr.sa, &fromlen); + } ++#if defined(USE_UTMP) + construct_utmp(&li, &ut); ++#elif defined(USE_UTMPX) ++ construct_utmpx(&li, &ut); ++#endif + + if (atomicio(vwrite, fd, &ut, sizeof(ut)) != sizeof(ut)) { + error("Failed to write to %s: %s", _PATH_BTMP, diff --git a/system/pcre2/APKBUILD b/system/pcre2/APKBUILD index 4e4aa309d..ddf7de0e4 100644 --- a/system/pcre2/APKBUILD +++ b/system/pcre2/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Zach van Rijn <me@zv.io> pkgname=pcre2 -pkgver=10.42 +pkgver=10.45 pkgrel=0 pkgdesc="Perl-compatible regular expression library" -url="https://pcre.org" +url="https://www.pcre.org/" arch="all" license="BSD-3-Clause" depends="" @@ -12,7 +12,7 @@ depends_dev="libedit-dev zlib-dev" makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools libpcre2-16:_libpcre libpcre2-32:_libpcre" -source="https://github.com/PhilipHazel/pcre2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz +source="https://github.com/PhilipHazel/pcre2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2 " # secfixes: @@ -40,7 +40,7 @@ build() { --enable-pcre2-32 \ --enable-pcre2grep-libz \ --enable-pcre2test-libedit \ - --with-match-limit-recursion=8192 \ + --with-match-limit-depth=262144 \ $_enable_jit make } @@ -69,4 +69,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="a3db6c5c620775838819be616652e73ce00f5ef5c1f49f559ff3efb51a119d02f01254c5901c1f7d0c47c0ddfcf4313e38d6ca32c35381b8f87f36896d10e6f7 pcre2-10.42.tar.gz" +sha512sums="4c1f0cf793624516d7eeb15745d6c07c9f678dd2c2b349062c6b614e88bf42262972d133576e85140dee2a882984aaf2d688953fc9c69ec7105b2daaeae89845 pcre2-10.45.tar.bz2" diff --git a/system/rsync/APKBUILD b/system/rsync/APKBUILD index b508f9b42..09fe1740c 100644 --- a/system/rsync/APKBUILD +++ b/system/rsync/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=rsync -pkgver=3.2.7 +pkgver=3.4.0 pkgrel=0 pkgdesc="File transfer program to keep remote files in sync" url="https://rsync.samba.org/" @@ -20,6 +20,13 @@ source="https://download.samba.org/pub/$pkgname/src/$pkgname-$pkgver.tar.gz " # secfixes: +# 3.4.0-r0: +# - CVE-2024-12747 +# - CVE-2024-12084 +# - CVE-2024-12085 +# - CVE-2024-12086 +# - CVE-2024-12087 +# - CVE-2024-12088 # 3.2.7-r0: # - CVE-2022-29154 # 3.2.3-r0: @@ -68,7 +75,7 @@ rrsync() { install -D -m 755 "$builddir"/support/rrsync "$subpkgdir"/usr/bin/rrsync } -sha512sums="c2afba11a352fd88133f9e96e19d6df80eb864450c83eced13a7faa23df947bccf2ef093f2101df6ee30abff4cbbd39ac802e9aa5f726e42c9caff274fad8377 rsync-3.2.7.tar.gz +sha512sums="4a0e7817e6e71e0173713ddd6b6bc7ee86237d092bd0a8c830a69f9993b76b5712a13a3ca60c7bbf42162cdc837df8783e07f8cd65c32fcb12c35f751043c56b rsync-3.4.0.tar.gz 638d87c9a753b35044f6321ccd09d2c0addaab3c52c40863eb6905905576b5268bec67b496df81225528c9e39fbd92e9225d7b3037ab1fda78508d452c78158f rsyncd.initd c7527e289c81bee5e4c14b890817cdb47d14f0d26dd8dcdcbe85c7199cf27c57a0b679bdd1b115bfe00de77b52709cc5d97522a47f63c1bb5104f4a7220c9961 rsyncd.confd 3db8a2b364fc89132af6143af90513deb6be3a78c8180d47c969e33cb5edde9db88aad27758a6911f93781e3c9846aeadc80fffc761c355d6a28358853156b62 rsyncd.conf diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD index 099a3cb5e..c01d0fec0 100644 --- a/system/ruby/APKBUILD +++ b/system/ruby/APKBUILD @@ -42,7 +42,7 @@ # - CVE-2020-8130 # pkgname=ruby -pkgver=3.3.5 +pkgver=3.4.1 _abiver="${pkgver%.*}.0" pkgrel=0 pkgdesc="An object-oriented language for quick and easy programming" @@ -77,7 +77,7 @@ replaces="ruby-etc ruby-gems" _gemdir="/usr/lib/ruby/gems/$_abiver" _rubydir="/usr/lib/ruby/$_abiver" -_chost="$(printf '%s' "$CHOST" | sed 's/-foxkit-/-/')" +_chost="$(printf '%s' "$CHOST" | sed 's/-.*-linux-musl/-linux-musl/')" case "$CARCH" in x86 | pmmx) _arch="i386";; @@ -274,7 +274,7 @@ _mvgem() { done } -sha512sums="dd5c6a7f74854e143e0ca46b9d7c0d1983fc4886f5f733cd108345dbf4b21f61ad978ad6806e05a57b7af28fd9216dd38d7145808188bbb3695a7f3a4eda3883 ruby-3.3.5.tar.xz +sha512sums="8d2e34117696f9debf463ae1eed288fdbb5c1a12e32800e901b69218e3b7302a0066052077e2ebca851e3a635296199bd5a10437eea1d6f787f69a77bb865680 ruby-3.4.1.tar.xz a142199140fa711a64717429e9069fd2082319abaf4b129f561db374b3bc16e2a90cc4c849b5d28334505d1c71fed242aef3c44d983da3513d239dcb778673a5 rubygems-avoid-platform-specific-gems.patch 814fe6359505b70d8ff680adf22f20a74b4dbd3fecc9a63a6c2456ee9824257815929917b6df5394ed069a6869511b8c6dce5b95b4acbbb7867c1f3a975a0150 test_insns-lower-recursion-depth.patch 3ffc034c01110ee5531265333ca5ee8d61d08131843fe3004c5b34c88c9c1b32cb4ed89574f393177c8bd526e9c15da61ab344f93adf07b9148c561ee19e2eb5 fix-get_main_stack.patch" diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index 8131fbb38..a5ad313c1 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -1,17 +1,16 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-init -pkgver=1.1.2.1 +pkgver=1.1.3.0 pkgrel=0 pkgdesc="A s6-based init system" url="https://skarnet.org/software/s6-linux-init/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 -_utmps_version=0.1.2 -_execline_version=2.9.6 -_s6_version=2.13.1 +_skalibs_version=2.14.4 +_utmps_version=0.1.3 +_execline_version=2.9.7 +_s6_version=2.13.2 depends="execline s6>=$_s6_version s6-linux-init-common" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev execline-dev>=$_execline_version s6-dev>=$_s6_version utmps-dev>=$_utmps_version" @@ -28,7 +27,6 @@ source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.shutdown reboot.sh earlygetty.run - s6-linux-init.pc.in dracut_module.sh" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" provides="/sbin/init=0" @@ -36,6 +34,8 @@ provides="/sbin/init=0" build() { ./configure \ --enable-shared \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-static-libc \ --libexecdir="/lib/$pkgname" \ --enable-utmps @@ -68,8 +68,6 @@ package() { for i in init halt poweroff reboot shutdown telinit ; do ln -sf "../etc/s6-linux-init/current/bin/$i" "$pkgdir/sbin/$i" done - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } @@ -106,11 +104,10 @@ dracut() { install -D -m755 "$srcdir"/dracut_module.sh "$subpkgdir"/usr/lib/dracut/modules.d/99s6li/module-setup.sh } -sha512sums="343b6a9bdcf3b1abb544409bb2d7a6c8a1dbcb07d1b941ae74e8800e48ad605c6427f724d7692569b3ade4829948d0e57024c764c18a60c3bb2eb2efefedb622 s6-linux-init-1.1.2.1.tar.gz +sha512sums="671f0532f708f570b307510d76eefabfecf0fb989491b2bb02dfccc1043ed80761367c2f7a56821aa44d159b57b4c1eca739b50362ec56f2be3b498df6f9a34a s6-linux-init-1.1.3.0.tar.gz 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown 6fb2a1112988fd2322b4bc4862bfb948a1c2e43921c5d01ae873c0d31b39fe74fc2934a5018c08b1704a2b2199b31d3a3d7365be369bba734f153b74e000aa74 reboot.sh dfff483b61370ce2c8fe653cb4e9b6ec7ef678f26b128eab8e677548a48b668b532b12a2e4618c85bf95777a666ac30189780708803d6ea12e43ab0072399212 earlygetty.run -1e617f0a1ae724c80d0f577c1484297b4aea3107cad6b2589ffeabcad3a12a8ba5de876fd2a6d7ddc03c4e6e9d34938dd0356b273fe62c475ff31da9aef2596d s6-linux-init.pc.in a62cf543e64aaf24f16c0e3d23497890de7a4a621c9d8f93c447001ea56a21324046ee589188d11b3d4dbfea4a707b5a1889d2b703c00ea6a81207a0442f9799 dracut_module.sh" diff --git a/system/s6-linux-init/s6-linux-init.pc.in b/system/s6-linux-init/s6-linux-init.pc.in deleted file mode 100644 index 338fef40a..000000000 --- a/system/s6-linux-init/s6-linux-init.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: s6-linux-init -Description: Library to register a logout hook -URL: https://skarnet.org/software/s6-linux-init/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -ls6_linux_init diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD index a45dcc5aa..f4b23483a 100644 --- a/system/s6-rc/APKBUILD +++ b/system/s6-rc/APKBUILD @@ -1,25 +1,26 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-rc -pkgver=0.5.5.0 +pkgver=0.5.6.0 pkgrel=0 pkgdesc="skarnet.org's service manager, working on top of s6" url="https://skarnet.org/software/s6-rc/" arch="all" options="!check" license="ISC" -_skalibs_version=2.14.3 -_execline_version=2.9.6 -_s6_version=2.13.1 +_skalibs_version=2.14.4 +_execline_version=2.9.7 +_s6_version=2.13.2 depends="execline" depends_dev="skalibs-dev>=$_skalibs_version s6-dev>=$_s6_version" makedepends="$depends_dev execline-dev>=$_execline_version" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6-rc.pc.in" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ --enable-shared \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-static-libc \ --libexecdir="/lib/$pkgname" make @@ -27,11 +28,8 @@ build() { package() { make DESTDIR="$pkgdir" install - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g; s/@@S6_VERSION@@/${_s6_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" mkdir -p -m 0755 "$pkgdir/usr/share/doc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="8769c71eaf1416fb1d2040865585e0c3c7abb0c9732313d3534f82be8f50417500796cda41a434e8a521bff77960ba23009e51080892700a158ae61537303081 s6-rc-0.5.5.0.tar.gz -1ca049b2ad49a8ad22f9136d4a82ab692616e82e14b27657b82433b937c5f7ff193ad230a9c968498fb0a1597a4f58174757576444a27bd865347cf28c149ae2 s6-rc.pc.in" +sha512sums="1e65ff999b7c5b4f34c90ae1edf5e4315e3323d03ac82ca1467848a41936f57623cb2d20b77b43f944b6845992ceb482a5573acbfa1c1d241eb825ea4b7ca90b s6-rc-0.5.6.0.tar.gz" diff --git a/system/s6-rc/s6-rc.pc.in b/system/s6-rc/s6-rc.pc.in deleted file mode 100644 index 1b8f1b180..000000000 --- a/system/s6-rc/s6-rc.pc.in +++ /dev/null @@ -1,7 +0,0 @@ -Name: s6-rc -Description: The C interface to the s6-rc service manager -URL: https://skarnet.org/software/s6-rc/ -Version: @@VERSION@@ -Requires.private: s6 >= @@S6_VERSION@@, skalibs >= @@SKALIBS_VERSION@@ -Libs: -ls6rc - diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index b5a96d864..022dc594c 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,26 +1,27 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.13.1.0 +pkgver=2.13.2.0 pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/s6/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 -_execline_version=2.9.6 +_skalibs_version=2.14.4 +_execline_version=2.9.7 depends="execline" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev execline-dev>=$_execline_version" install="$pkgname.post-upgrade" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" triggers="$pkgname.trigger=/run/service" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6.pc.in" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ --enable-shared \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-static-libc \ --libexecdir="/lib/$pkgname" make @@ -28,11 +29,8 @@ build() { package() { make DESTDIR="$pkgdir" install - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g; s/@@EXECLINE_VERSION@@/${_execline_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" mkdir -p -m 0755 "$pkgdir/var/lib/s6/services" "$pkgdir/usr/share/doc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="89912f627d239e9d0b830c97e3b35b0358ac3ea1b3b958de091318e19ee9ca0bac0a008f114682bc0ed8388e15592ffd683c4bbf1128fe7109cad16f18a1065b s6-2.13.1.0.tar.gz -0af788e78b5840a0ed612de6d2c15bc868d4f2444063f283af1ac42aec7029af24c660abf65c7d9fa369aa1ca96bb8503ffffe37db531fdd75b80db570888a38 s6.pc.in" +sha512sums="0ee3b319fb0731681e8823bd6c0b415c556b87819b1ca72be2ff622b4f35f87ffe7a71ccaa2c783933d76eedcde7ded1fe767ee44a63e1717b2299a2b5aa81e1 s6-2.13.2.0.tar.gz" diff --git a/system/s6/s6.pc.in b/system/s6/s6.pc.in deleted file mode 100644 index f01fd55ac..000000000 --- a/system/s6/s6.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: s6 -Description: The C interface to the s6 supervision suite -URL: https://skarnet.org/software/s6/ -Version: @@VERSION@@ -Requires.private: execline >= @@EXECLINE_VERSION@@, skalibs >= @@SKALIBS_VERSION@@ -Libs: -ls6 diff --git a/system/shimmy/APKBUILD b/system/shimmy/APKBUILD index 7c2baec8b..7974637f3 100644 --- a/system/shimmy/APKBUILD +++ b/system/shimmy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=shimmy -pkgver=0.7 +pkgver=0.8 pkgrel=0 pkgdesc="Utilities for stricter POSIX conformance" url="https://git.adelielinux.org/adelie/shimmy" @@ -21,4 +21,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c5bce2dd54fcbc1367f06a64e117c7333fc5762999b75c5cb55f00742bb0a05fa2ff1f8b2a5773ab77cfcd4e83179b19870a67012bbd668aef1b404ef57a452c shimmy-0.7.tar.xz" +sha512sums="b20b0b81a9121e288489d870f20badc1630e187cbc4b1d4e61f595a99ced89262f46c93e5b92c324a2752d81e342419497e38707168be18c7e5096ebaa381771 shimmy-0.8.tar.xz" diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD index d1f6e1f8d..05fc9ebde 100644 --- a/system/skalibs/APKBUILD +++ b/system/skalibs/APKBUILD @@ -1,7 +1,6 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=skalibs -pkgver=2.14.3.0 +pkgver=2.14.4.0 pkgrel=0 pkgdesc="A set of general-purpose C programming libraries for skarnet.org software" url="https://skarnet.org/software/skalibs/" @@ -9,19 +8,19 @@ arch="all" options="!check" # No test suite. license="ISC" subpackages="$pkgname-dev $pkgname-doc" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz skalibs.pc.in" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ + --enable-pkgconfig \ --with-sysdeps-devurandom=yes \ - --with-sysdeps-posixspawnearlyreturn=no + --with-sysdeps-posixspawnearlyreturn=no \ + --with-sysdeps-procselfexe=/proc/self/exe make } package() { make DESTDIR="$pkgdir" install - sed -e "s/@@VERSION@@/$pkgver/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" mkdir -p -m 0755 "$pkgdir/usr/share/doc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } @@ -32,5 +31,4 @@ dev() { mv "$pkgdir/usr/lib/skalibs/sysdeps" "$subpkgdir/usr/lib/skalibs/" } -sha512sums="f40222740494425477252e78c772edda3f6cb201723558c513acb6c87d55a0f3432c918acf112c9457ed3ff0ee71bf5192f61b1c9070e668f219fd6d3f6f3bfa skalibs-2.14.3.0.tar.gz -5771f0e72e7e7e9a45cafdf2e4508938a29ff9474845c897e383004b031ad142dee1b65d83a9a0168696782163cb4a32f82db4d7360413b433e68282cd4cc487 skalibs.pc.in" +sha512sums="a97c9ecd62e4d751a6613c01831bff5856c5d23f8fd295d539c3280c6ffa2379e67789c728552cb4d85aa03b30af7e2499b80cb8025b52ca6d1c1746b48102b1 skalibs-2.14.4.0.tar.gz" diff --git a/system/skalibs/skalibs.pc.in b/system/skalibs/skalibs.pc.in deleted file mode 100644 index 33849426f..000000000 --- a/system/skalibs/skalibs.pc.in +++ /dev/null @@ -1,5 +0,0 @@ -Name: skalibs -Description: The skarnet.org general-purpose C library. -URL: https://skarnet.org/software/skalibs/ -Version: @@VERSION@@ -Libs: -lskarnet diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD index 3454add94..7894f3ae4 100644 --- a/system/strace/APKBUILD +++ b/system/strace/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=strace -pkgver=5.17 +pkgver=6.9 pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="https://strace.io/" @@ -54,5 +54,5 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="1b63cf7e6e339333b9d24fa20232409192abc815f2ebe2e336ef4acc039cd06c976b3c12e9ce993491a0e6b86c26b90ceba962f580e894b1ff5ab9863bdfcc44 strace-5.17.tar.xz +sha512sums="aa80b9b6ec41082f1710f2327f7a22003cdce6d95ab0e5083ada9c5b7b40b8f7cbc7dc6c017878dc0e42c52e405e98ed1488c51d17bc3538989ff4be2c2411e1 strace-6.9.tar.xz 6616161b6e015c5e56b7171995d28ab63a865156b7f9826b4be26beaac863f0ebc341014910ea53157a810c6afafc10ce80b2d31f4d649d28718a9be78795c6c nlattr-fix.patch" diff --git a/system/userspace-rcu/APKBUILD b/system/userspace-rcu/APKBUILD deleted file mode 100644 index e36f0f6bf..000000000 --- a/system/userspace-rcu/APKBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=userspace-rcu -pkgver=0.14.0 -pkgrel=0 -pkgdesc="Userspace RCU (read-copy-update) library" -url="https://liburcu.org" -arch="all" -license="LGPL-2.1-only" -depends="" -makedepends="" -subpackages="$pkgname-doc $pkgname-dev" -source="https://lttng.org/files/urcu/userspace-rcu-$pkgver.tar.bz2 - endian.patch - " - -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="7297e51012f4c44ee27c0e18ed9d87bf24be34db68a5398394c1e683a045bb561cf74aa913398404c0ed5cb8011af728ea12947717fa5f27627e5ca78e63a40f userspace-rcu-0.14.0.tar.bz2 -07935ed9741554b2cbc343fdd6218172deca4d4167b31b92f2be82623c5d83191472da2b4bee5adcd59e3d4bec3751d3e793cc720b822b6060dc588b8ee58f16 endian.patch" diff --git a/system/userspace-rcu/endian.patch b/system/userspace-rcu/endian.patch deleted file mode 100644 index d80495c8a..000000000 --- a/system/userspace-rcu/endian.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- userspace-rcu-0.14.0/doc/examples/rculfhash/jhash.h.old 2023-02-13 11:51:12.000000000 -0600 -+++ userspace-rcu-0.14.0/doc/examples/rculfhash/jhash.h 2024-08-10 18:35:07.651374111 -0500 -@@ -51,7 +51,7 @@ - c ^= b; c -= rot(b, 24); \ - } - --#if (BYTE_ORDER == LITTLE_ENDIAN) -+#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) - #define HASH_LITTLE_ENDIAN 1 - #else - #define HASH_LITTLE_ENDIAN 0 diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index b8dda2050..75c22fb25 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -1,7 +1,6 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps -pkgver=0.1.2.3 +pkgver=0.1.3.0 pkgrel=0 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/utmps/" @@ -9,7 +8,7 @@ arch="all" options="!check" # No test suite license="ISC" depends="execline s6" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 depends_dev="skalibs-dev>=$_skalibs_version" makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-openrc" @@ -18,14 +17,15 @@ source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz utmpd.run wtmpd.run btmpd.run - utmps.initd - utmps.pc.in" + utmps.initd" build() { ./configure \ --enable-shared \ --enable-static-libc \ --libexecdir="/lib/$pkgname" \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-libc-includes make } @@ -36,8 +36,6 @@ package() { mkdir -p -m 0755 "$runimage/utmps" "$pkgdir/usr/share/doc" chown utmp:utmp "$runimage/utmps" install -D -m 0755 "$srcdir/utmps.initd" "$pkgdir/etc/init.d/utmps" - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } @@ -62,9 +60,8 @@ openrc() { ln -s ../../init.d/utmps "$rldir/utmps" } -sha512sums="41822b5ef582c86cd2439f13c88871bef2d496e6c7ae5493d9e2be70c7cf2f25656dedf045b4dbe925b1c6b3bfbadc7430a898ccc56951f096e768990a9735df utmps-0.1.2.3.tar.gz +sha512sums="307010371d8c7d9e56e1823c599d84f44719e6050ccf30799f08d7a6c071ca2fbc46ef236d5e2422dc1b96f8a7582ae735635302c28becd6aac3263302c385d9 utmps-0.1.3.0.tar.gz 0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run 9e875a5cd37be531320a8e582afed2c980dd0a1bdfc2f6f3d826d5e5389fc6ab93f973ed1506edb23f4c73cf24a2357aefe856148eaacff86c2aafe376c575e2 wtmpd.run 503bdbb3d244243934b9b4e3deea0bf92a95f88417c822ad9cf6202584d4724d5e182a0d88d7f09069e435a8a97230b85d2b264736c85c893da193fd5ec34c71 btmpd.run -89fb24ab5759b3a1162044895efbe01c7a17d505a29df0cd7141654783b7ada8e934a1ce5981218af41812cfb517263bbd608948102af40b7a41a843b7aaf6ca utmps.initd -d5ac39af2e688b5a118302ff31f15a0ea708eff4a94e2f6631c37f77ae528d64034ada1685f302af5b09816b617aae13b3513721883c8d9fee33fe729377f435 utmps.pc.in" +89fb24ab5759b3a1162044895efbe01c7a17d505a29df0cd7141654783b7ada8e934a1ce5981218af41812cfb517263bbd608948102af40b7a41a843b7aaf6ca utmps.initd" diff --git a/system/utmps/utmps.pc.in b/system/utmps/utmps.pc.in deleted file mode 100644 index ef581ec6f..000000000 --- a/system/utmps/utmps.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: utmps -Description: A secure implementation of the utmp mechanism. -URL: https://skarnet.org/software/utmps/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -lutmps diff --git a/system/xfsprogs/APKBUILD b/system/xfsprogs/APKBUILD deleted file mode 100644 index 8d717f51e..000000000 --- a/system/xfsprogs/APKBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=xfsprogs -pkgver=6.9.0 -pkgrel=0 -pkgdesc="XFS filesystem utilities" -url="https://xfs.org/index.php/Main_Page" -arch="all" -options="!check" # No test suite. -license="GPL-1.0-only" -depends="$pkgname-base" -makedepends="attr-dev bash icu-dev inih-dev libedit-dev linux-headers - userspace-rcu-dev util-linux-dev" -subpackages="$pkgname-base $pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" -source="https://www.kernel.org/pub/linux/utils/fs/xfs/$pkgname/$pkgname-$pkgver.tar.gz - no-utmp-header.patch - scrub.patch - " - -build() { - export DEBUG=-DNDEBUG - export OPTIMIZER="$CFLAGS" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sbindir=/sbin \ - --libexecdir=/usr/lib \ - --enable-editline - make SHELL=/bin/bash -} - -check() { - make check -} - -package() { - make -j1 DIST_ROOT="$pkgdir" install install-dev - find "$pkgdir" -name *.la -delete - chown -R 0:0 "$pkgdir" -} - -base() { - # Everything except xfs_scrub, which pulls in 50 MiB of icu libs. - pkgdesc="Base $pkgdesc" - mkdir "$subpkgdir" - mv "$pkgdir"/sbin "$subpkgdir"/ - mkdir "$pkgdir"/sbin - mv "$subpkgdir"/sbin/xfs_scrub "$pkgdir"/sbin/ -} - -sha512sums="bfb3c98e7571180f1c5c130ca9aece5dde97bc6c628dc3d6560b0da75e5b43e8febe3eec193d3db2ec877b3a27258c53c033c7ed3d881efd2d4e3216033aaf2b xfsprogs-6.9.0.tar.gz -29c77c550fa8f7a0b3794649d278a2cb3a65c9368db19415866910160adb6d5a52f1be4f8713b58c5c87f149b6212c068ae27a4547a6c4e4fe7b1584e1261dae no-utmp-header.patch -d83e2ae819a338273fae7999a0ae1376faa593308974f93abc6db140b134ec98f855a2ea5585583f739b041fbb5d4b8a0d4d27ecd73df6c34cd799b2cee55b9a scrub.patch" diff --git a/system/xfsprogs/no-utmp-header.patch b/system/xfsprogs/no-utmp-header.patch deleted file mode 100644 index f272bc152..000000000 --- a/system/xfsprogs/no-utmp-header.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xfsprogs-4.17.0/quota/report.c.old 2018-06-28 12:00:43.000000000 -0500 -+++ xfsprogs-4.17.0/quota/report.c 2018-07-04 00:50:44.940000000 -0500 -@@ -8,7 +8,6 @@ - #include <sys/types.h> - #include <pwd.h> - #include <grp.h> --#include <utmp.h> - #include "init.h" - #include "quota.h" - ---- xfsprogs-4.17.0/quota/util.c.old 2018-06-28 12:00:43.000000000 -0500 -+++ xfsprogs-4.17.0/quota/util.c 2018-07-04 00:53:25.470000000 -0500 -@@ -8,7 +8,6 @@ - #include <stdbool.h> - #include <pwd.h> - #include <grp.h> --#include <utmp.h> - #include "init.h" - #include "quota.h" - diff --git a/system/xfsprogs/scrub.patch b/system/xfsprogs/scrub.patch deleted file mode 100644 index a466aab34..000000000 --- a/system/xfsprogs/scrub.patch +++ /dev/null @@ -1,49 +0,0 @@ -From da3ad6ffc9ecf75ebb734bbb863c1412d11b9beb Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Sat, 10 Aug 2024 21:26:57 -0500 -Subject: [PATCH] xfs_scrub: Use POSIX-conformant strerror_r - -When building xfsprogs with musl libc, strerror_r returns int as -specified in POSIX. This differs from the glibc extension that returns -char*. Successful calls will return 0, which will be dereferenced as a -NULL pointer by (v)fprintf. - -Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> ---- - scrub/common.c | 3 ++- - scrub/inodes.c | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/scrub/common.c b/scrub/common.c -index 283ac84e..bd8bde35 100644 ---- a/scrub/common.c -+++ b/scrub/common.c -@@ -122,7 +122,8 @@ __str_out( - fprintf(stream, "%s%s: %s: ", stream_start(stream), - _(err_levels[level].string), descr); - if (error) { -- fprintf(stream, _("%s."), strerror_r(error, buf, DESCR_BUFSZ)); -+ strerror_r(error, buf, DESCR_BUFSZ); -+ fprintf(stream, _("%s."), buf); - } else { - va_start(args, format); - vfprintf(stream, format, args); -diff --git a/scrub/inodes.c b/scrub/inodes.c -index 16c79cf4..f0e7289c 100644 ---- a/scrub/inodes.c -+++ b/scrub/inodes.c -@@ -65,9 +65,9 @@ bulkstat_for_inumbers( - error = -xfrog_bulkstat(&ctx->mnt, breq); - if (error) { - char errbuf[DESCR_BUFSZ]; -+ strerror_r(error, errbuf, DESCR_BUFSZ); - -- str_info(ctx, descr_render(dsc), "%s", -- strerror_r(error, errbuf, DESCR_BUFSZ)); -+ str_info(ctx, descr_render(dsc), "%s", errbuf); - } - - /* --- -2.40.0 - |