diff options
190 files changed, 3999 insertions, 2178 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/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index a23937679..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/" @@ -74,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() { @@ -167,9 +178,9 @@ sha512sums="458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6 c16e726450602b271802b74bcfced1e2373c21b7cea8108bb722f9b4abcad44ae6e135a26296d76ad869c554360d1e043d163934592e5899e4c9514f179ac094 config-aarch64 237b7eff4ecab68600497761eb3716c158f1f3fc6e55f70559189cd15ecc381017cb0017a44c766eb016b50d091410e590312d5eaebebb2e6e13495f5602281b config-armv7 af1495f11e7252ee65af2ce00b551b4715a9d663e1bf8cff1a1235ba922e7d0b9e90dcdacd469db1d7831d8580071f0f7fef24c89362afccde63058393d115f5 config-m68k -9b3ca7e6f8b18374da0c58ff7fc9211a41a717e68eb87dc8f78af3fe8387fc03500cd5f4f66d2b8292b117d0067edfc89adf9370b323c5fd0ed7ec6d5616b1ff config-pmmx -a4a2e4579a33d2720fb141d83f5a6f1b1b8be701cfee12a479a9b63021974159df7d5984a730dfa8da2e8e761d506ab6f5cce1d72b99ee577582bac7d2348cb0 config-ppc -60116d4f5c454539d3c86538611bbcd683e46352419bcea1bb0c3f4e08e0915dff3053f80f600b54656eb12fa1f6ca818424ef91f59f0301ce71a0dc4b49a86f config-ppc64 +52d65ad133b66550e651b9165f647b094730e42d9d2e7036879f32b7c6f4f9c2320cddb0506efa832e7365156b70ed09cc66ed213bfbc67e94d60a916291e1aa config-pmmx +fd1c8b0fa7bf0122fe670e54fa592ebb792415fba528011c83bdbfbbf16bd442339c9e1338214cb8e7522ac3ab51f45c1360dd3ce40607da902eb99ec03bc62d config-ppc +95796cf8c2416d12fa61d72ffe1403b33f0b35dead111c94cc6835d74586761ec47b562ad1516a917a5411de043164daf13a35b5d86ee03266db2a0b146d507b config-ppc64 17a07b7563acba1f5b99b9055198f5f93e7c65432ec46c35fa6c2b5307107ad9d4e8ffea9800f50cf8a8445b69561b9a95ba1ac8cd5bb2b6814dab540edb17d4 config-sparc64 137b549a61a241c21f956c9f13f476858bbffd4b393a3630e39d7c810f25d71cdcfd5307788c5c40fb3a92552ee1081f06ccb2379a9c0868ce25cb36f31cbda2 config-x86_64 1ca1bc094a8106b33176ab6cfb55c9514e7d69f1ed30c580eee419a3c422a2e6625d71c4581702e911f36c4bbac175010f46b7123bb81fda3303d4decdc57287 kernel.h diff --git a/system/easy-kernel/config-pmmx b/system/easy-kernel/config-pmmx index 7597f52a0..db5fe789c 100644 --- a/system/easy-kernel/config-pmmx +++ b/system/easy-kernel/config-pmmx @@ -3510,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/execline/APKBUILD b/system/execline/APKBUILD index 502097bcd..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 -pkgrel=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" } -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/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/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/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/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/user/apaste/APKBUILD b/user/apaste/APKBUILD index 13db635b0..99851d559 100644 --- a/user/apaste/APKBUILD +++ b/user/apaste/APKBUILD @@ -1,17 +1,16 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=apaste -pkgver=0.0.2.1 +pkgver=0.0.3.0 pkgrel=0 pkgdesc="A command-line pastebin" url="https://skarnet.org/software/apaste/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 -_execline_version=2.9.6 -_s6_version=2.13.1 -_s6net_version=2.7.0 +_skalibs_version=2.14.4 +_execline_version=2.9.7 +_s6_version=2.13.2 +_s6net_version=2.7.1 depends="s6-networking" makedepends="skalibs-dev>=$_skalibs_version s6-networking-dev>=$_s6net_version" subpackages="apaste-doc apasted:server apasted-openrc:apasted_openrc" @@ -30,7 +29,9 @@ build() { ./configure \ --enable-shared \ --disable-allstatic \ - --prefix=/usr + --prefix=/usr \ + --with-pkgconfig \ + --enable-pkgconfig make } @@ -75,7 +76,7 @@ apasted_openrc() { install -D -m 0755 "$srcdir/apasted.initd" "$subpkgdir/etc/init.d/apasted" } -sha512sums="262c149941d414130e7bfcbf7ecbc858427f5acd20880a68216935f79ad2632b9d82ff87cc09874d3d7215db9ebc4c55de7355ac9e29740751f44e9b2b4f8229 apaste-0.0.2.1.tar.gz +sha512sums="ac3031b5d43447cf33bb4300ce866716b650ed730d74e6d41fff83a7a3eff2233172d9962e13c6d624002537a7c13ac5d581715a9a49145f392139c21b921ea6 apaste-0.0.3.0.tar.gz 970a79b6da5a7c58539cd9d47cba36855eb4f37e1e0bbd841ade15022b5fb291a077f7ad118ff662a45f3b2b59162264a180c338f23f964ea3e48364c68ac606 apasted.run 817b276ae51e9bd769e39a8313a84449d181c65749640119ba1e4af3c21d2572152c7bdd5eec70cbcfaa3255fd6cba966dfc1dc7a818a60d329283c39ae058a8 apastesd.run 9341c1c69c1d45b35052b0042665fffb9cff6583fad558ed37a19af574b53a5e298727c43a6c718fd40936e8f16d1a10e9c229392595ba1e06ddb21d1d8b055b apasted-log.run diff --git a/user/aria2/APKBUILD b/user/aria2/APKBUILD new file mode 100644 index 000000000..7d5a89150 --- /dev/null +++ b/user/aria2/APKBUILD @@ -0,0 +1,71 @@ +# Contributor: Alice <alicela1n@protonmail.com> +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Alice <alicela1n@protonmail.com> +pkgname=aria2 +pkgver=1.37.0 +pkgrel=0 +pkgdesc="The ultra fast download utility" +url="https://aria2.github.io/" +arch="all" +license="GPL-2.0+" +depends="ca-certificates" +checkdepends="cppunit-dev" +makedepends="openssl-dev sqlite-dev libuv-dev" +install="aria2.pre-install" +pkgusers="aria2" +pkggroups="aria2" +subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc::noarch" +source="https://github.com/aria2/$pkgname/releases/download/release-$pkgver/$pkgname-$pkgver.tar.xz + $pkgname.conf + $pkgname.initd + $pkgname.confd + $pkgname.logrotate + " + +build() { + ./configure --build=$CBUILD \ + --host=$CHOST \ + --with-openssl \ + --with-sqlite3 \ + --with-libuv \ + --enable-libaria2 \ + --enable-shared \ + --disable-static \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +openrc() { + default_openrc + pkgdesc="Support for running Aria2 as a daemon using OpenRC" + depends="$pkgname=$pkgver-r$pkgrel" + + mkdir -p "$subpkgdir" + + install -Dm755 "$srcdir"/$pkgname.initd "$subpkgdir"/etc/init.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.confd "$subpkgdir"/etc/conf.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.logrotate "$subpkgdir"/etc/logrotate.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.conf "$subpkgdir"/etc/$pkgname/$pkgname.conf + install -m750 -o aria2 -g aria2 -d "$subpkgdir"var/lib/$pkgname + install -m700 -o aria2 -g aria2 -d "$subpkgdir"/var/cache/$pkgname +} + +sha512sums="df3b8b4de8fa8d78f203ea00c059e43585e18a229009f202e42e6a9e59db67d09df0dbba8a016e99ed73c82f59e4f8b26f86c2288afdbb96a6807cbe2c56e6b3 aria2-1.37.0.tar.xz +dd716f27eae2628bd528fd2842de7881e8f8f00d587b179e832f1639241db5bd8f4e74a5b791ca4de984923654b38a28813a89ad49a864f64534903a46878a60 aria2.conf +c65bef73a519b567ab35558bd60310081f5d4fcb630538666a5b2435f23dc9d741c7bfa6080e4ff46e646e977f4d5e8ba937ce9cdfb55880a3dc0eb1c2ee617a aria2.initd +f1b5b66c00eeac4b332913d55441adb2ce7aa081f29ed030dc3c69c4767b68c4def6b7f16ea6d7ffbf149cee476df6878e35f8774eea300f241d4aca95e59ef6 aria2.confd +2ed9ff7a5fd1801643e4fb3cdd8cb21f0ead60420c87636bb581fe00828a98a5290a0888e49f6a6becb9f39c3c145b1399aa3a9ae452eb10ac2064c0e7bca1f8 aria2.logrotate" diff --git a/user/aria2/aria2.conf b/user/aria2/aria2.conf new file mode 100644 index 000000000..abca1ea73 --- /dev/null +++ b/user/aria2/aria2.conf @@ -0,0 +1,61 @@ +# Run aria2c --help=#all to see all the available options. + +# The directory to store the downloaded file. +dir=/var/lib/aria2 + +# Save error/unfinished downloads to this file on exit. +save-session=/var/lib/aria2/aria2.session +input-file=/var/lib/aria2/aria2.session + +# Save error/unfinished downloads to a file specified by save-session option +# every SEC seconds. If 0 is given, file will be saved only when aria2 exits. +save-session-interval=60 + +# Save download even if the download is completed or removed. +force-save=true + +# Continue downloading a partially downloaded files. Only for HTTP/FTP. +continue=true + +# Always resume download. +always-resume=true + +# Set log level to output to file. +# Possible Values: debug, info, notice, warn, error. +log-level=notice + +# Set interval to output download progress summary. +# Setting 0 suppresses the output. +summary-interval=0 + +# File allocation method. "falloc" is the best choice for newer file systems +# such as ext4, Btrfs or XFS. +file-allocation=falloc + + +## RPC + +# Specify a port number for JSON-RPC/XML-RPC server to listen to. +#rpc-listen-port=6800 + +# Listen incoming JSON-RPC/XML-RPC requests on all network interfaces. +#rpc-listen-all=false + +# RPC secret authorization token. Change to some random string! +rpc-secret=top-secret + + +## BitTorrent + +# Specify the external IP address to use in BitTorrent download and DHT. +#bt-external-ip= + +# TCP port number(s) for BitTorrent downloads. +#listen-port=6881-6999 + +# Requires BitTorrent message payload encryption with arc4. +#bt-force-encryption=false + +# Maximum number of files to open in multi-file BitTorrent/Metalink +# downloads globally. +#bt-max-open-files=100 diff --git a/user/aria2/aria2.confd b/user/aria2/aria2.confd new file mode 100644 index 000000000..8b20cb34d --- /dev/null +++ b/user/aria2/aria2.confd @@ -0,0 +1,10 @@ +# Configuration for /etc/init.d/aria2 + +# The user (and group) to run Aria2 daemon. +#command_user="aria2" + +# Path of the configuration file. +#cfgfile="/etc/aria2/aria2.conf" + +# Path of the log file. +#logfile="/var/log/aria2.log" diff --git a/user/aria2/aria2.initd b/user/aria2/aria2.initd new file mode 100644 index 000000000..a23b6eb0d --- /dev/null +++ b/user/aria2/aria2.initd @@ -0,0 +1,42 @@ +#!/sbin/openrc-run + +: ${cfgfile:="/etc/aria2/aria2.conf"} +: ${logfile:="/var/log/aria2.log"} +: ${command_user:="aria2"} + +command="/usr/bin/aria2c" +command_args=" + --enable-rpc=true + --quiet=true + --log=$logfile + --conf-path=$cfgfile + ${command_args:-}" +command_background="yes" + +pidfile="/run/$RC_SVCNAME.pid" +output_log="/dev/null" +error_log="/dev/null" +start_stop_daemon_args="--env XDG_CACHE_HOME=/var/cache" + +required_files="$cfgfile" + +depend() { + need net + use dns netmount +} + +start_pre() { + local _logfile=$(sed -En 's|^log=([^#]+)|\1|p' "$cfgfile") + + checkpath -f -m 640 -o "$command_user" "${_logfile:-$logfile}" + + # Session + local _inputfile=$(sed -En 's|^input-file=([^#]+)|\1|p' "$cfgfile") + + if [ "$_inputfile" != "" ]; then + checkpath -f -m 644 -o "$command_user" "$_inputfile" + fi + + # DHT + checkpath -d -m 755 -o "$command_user" "/var/cache/$command_user" +} diff --git a/user/aria2/aria2.logrotate b/user/aria2/aria2.logrotate new file mode 100644 index 000000000..e73ffc044 --- /dev/null +++ b/user/aria2/aria2.logrotate @@ -0,0 +1,6 @@ +/var/log/aria2.log { + compress + copytruncate + missingok + notifempty +} diff --git a/user/aria2/aria2.pre-install b/user/aria2/aria2.pre-install new file mode 100644 index 000000000..d819d3388 --- /dev/null +++ b/user/aria2/aria2.pre-install @@ -0,0 +1,7 @@ +#!/bin/sh + +groupadd -r aria2 2>/dev/null +useradd -c aria2 -d /var/lib/aria2 -s /sbin/nologin -g aria2 \ + -r aria2 2>/dev/null + +exit 0 diff --git a/user/bcnm/APKBUILD b/user/bcnm/APKBUILD index 1a3c6380b..69fc94ef5 100644 --- a/user/bcnm/APKBUILD +++ b/user/bcnm/APKBUILD @@ -1,39 +1,32 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=bcnm -pkgver=0.0.1.8 +pkgver=0.0.2.0 pkgrel=0 pkgdesc="Client network manager" url="https://skarnet.org/software/bcnm/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 depends="" makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" -source="https://skarnet.org/software/bcnm/bcnm-$pkgver.tar.gz - $pkgname.pc.in - wpactrl.pc.in" +source="https://skarnet.org/software/bcnm/bcnm-$pkgver.tar.gz" build() { ./configure \ --enable-shared \ --disable-allstatic \ - --prefix=/usr + --prefix=/usr \ + --with-pkgconfig \ + --enable-pkgconfig make } package() { make DESTDIR="$pkgdir" install - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/wpactrl.pc.in" > "$srcdir/wpactrl.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" - install -D -m 0644 "$srcdir/wpactrl.pc" "$pkgdir/usr/lib/pkgconfig/wpactrl.pc" mkdir -p "$pkgdir/usr/share/doc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="78868ba9f5c58acba1e8283492929164096a9e66ea8fd6fc6b5adb4c81bce78cba96173afb4510daa0e16b79313d0ee9ef790523b062f4ceb181ecdea5973f9a bcnm-0.0.1.8.tar.gz -168127832b78284e4388fa983ea44612e760ca3b5789a863a4a82adb8a75044e006640711a8426d321bb2995425a8cb8e1fb8f788e6d09e5f7b93e55a457fdb6 bcnm.pc.in -ccc46c7a918328236cc5730710a114d06fb91fa6f023f853df70725581469b5b980dc3a5d20046df26393d21b51b4c87f1588cb5fa6cd065b32801a4dfeebb72 wpactrl.pc.in" +sha512sums="826f8f5dce5bc07396c5c8af116c438ad9da0b320e9002e33e3da8f16619f36f2c295f25ef2acbdbf90e241b5887f6d0b51abab5f3f547d5e067378d220913f5 bcnm-0.0.2.0.tar.gz" diff --git a/user/bcnm/bcnm.pc.in b/user/bcnm/bcnm.pc.in deleted file mode 100644 index 710ae09ec..000000000 --- a/user/bcnm/bcnm.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: bcnm -Description: C library to get network interface information -URL: https://skarnet.org/software/bcnm/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -lbcnm diff --git a/user/bcnm/wpactrl.pc.in b/user/bcnm/wpactrl.pc.in deleted file mode 100644 index 09b893dc6..000000000 --- a/user/bcnm/wpactrl.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: wpactrl -Description: C Library to control wpa_supplicant -URL: https://skarnet.org/software/bcnm/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -lwpactrl diff --git a/user/brillo/APKBUILD b/user/brillo/APKBUILD new file mode 100644 index 000000000..f377b047f --- /dev/null +++ b/user/brillo/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=brillo +pkgver=1.4.12 +pkgrel=0 +pkgdesc="Utility for controlling display brightness" +url="https://gitlab.com/cameronnemo/brillo" +arch="all" +options="!check" # no testsuite +license="GPL-3.0-only AND 0BSD" +depends="udev polkit" +makedepends="" +subpackages="" +source="https://gitlab.com/cameronnemo/brillo/-/archive/v$pkgver/brillo-v$pkgver.tar.bz2" +builddir="$srcdir/brillo-v$pkgver" + +build() { + make +} + +package() { + make DESTDIR="$pkgdir" install.bin install.udev install.polkit +} + +sha512sums="f7bb6df12a8ddd7df6ac3c973cf24a0b4974387479d20477c7cec75503ca0bfbff8d16645464f79f73074711e62614ffcc5c9388384100274ba8be0bfaae26b8 brillo-v1.4.12.tar.bz2" diff --git a/user/cairo/APKBUILD b/user/cairo/APKBUILD index d9be3529f..3f1823ece 100644 --- a/user/cairo/APKBUILD +++ b/user/cairo/APKBUILD @@ -1,25 +1,22 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=cairo -pkgver=1.16.0 -pkgrel=3 +pkgver=1.18.4 +pkgrel=0 pkgdesc="A vector graphics library" url="https://cairographics.org/" arch="all" -options="!check" # Recursive dependency on gtk+2.0 for check. +options="!check" # Times out (after 3600 seconds). license="LGPL-2.0+ AND MPL-1.1" depends="" -depends_dev="fontconfig-dev freetype-dev libxrender-dev pixman-dev - xcb-util-dev libxext-dev $pkgname-tools" -makedepends="$depends_dev zlib-dev expat-dev glib-dev libpng-dev cmd:which" +depends_dev="$pkgname-tools" +makedepends="expat-dev fontconfig-dev freetype-dev glib-dev gtk-doc libpng-dev + libx11-dev libxext-dev libxrender-dev meson pixman-dev xcb-util-dev + zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-gobject $pkgname-tools" -# fontconfig-ultimate https://github.com/bohoomil/fontconfig-ultimate -_ultver="2016-04-23" source="https://cairographics.org/releases/$pkgname-$pkgver.tar.xz - fontconfig-ultimate-$_ultver.tar.gz::https://github.com/bohoomil/fontconfig-ultimate/archive/$_ultver.tar.gz musl-stacksize.patch - CVE-2018-19876.patch - CVE-2019-6462.patch - CVE-2020-35492.patch + cairo-respect-fontconfig_pb.patch + cairo-webkit-html5-fix.patch " # secfixes: @@ -29,42 +26,30 @@ source="https://cairographics.org/releases/$pkgname-$pkgver.tar.xz # 1.16.0-r1: # - CVE-2018-19876 -prepare() { - default_prepare +build() { + meson setup \ + -Dprefix=/usr \ + -Dfontconfig=enabled \ + -Dfreetype=enabled \ + -Dglib=enabled \ + -Dpng=enabled \ + -Dspectre=disabled \ + -Dtee=enabled \ + -Dxcb=enabled \ + -Dxlib=enabled \ + -Dzlib=enabled \ + -Dgtk_doc=true \ + build - # infinality - for j in "$srcdir"/fontconfig-ultimate-$_ultver/$pkgname/*.patch; do - msg "Applying ${j}" - patch -p1 -i $j - done + meson compile -C build } -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-ft \ - --enable-gobject \ - --enable-pdf \ - --enable-png \ - --enable-ps \ - --enable-svg \ - --enable-tee \ - --enable-x \ - --enable-xcb \ - --enable-xcb-shm \ - --enable-xlib \ - --enable-xlib-xrender \ - --disable-xlib-xcb \ - --disable-static - make +check() { + meson test -C build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } gobject() { @@ -81,9 +66,7 @@ tools() { "$subpkgdir"/usr/lib/cairo/ } -sha512sums="9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f cairo-1.16.0.tar.xz -d8185f4ec74f44c4746acf7e79bba7ff7ffd9d35bdabeb25e10b4e12825942d910931aa857f1645e5c8185bcb40a1f1ffe1e7e647428e9ea66618b2aec52fac3 fontconfig-ultimate-2016-04-23.tar.gz +sha512sums="863679f817ed67dc2c916c035d740916e27e7e69c04fca63936e37d274e7f4c79848d16c8f7c481798864602e8847c489f698df89b785cbc576c925dbd513316 cairo-1.18.4.tar.xz 86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch -9020c596caa54a2ac435d5dae0f121d36d3c3f34d487b9c1032665b1bd15813506adf31984e34b5dd328ee0e068de0627e1d061230758328cae4fa993c3a9209 CVE-2018-19876.patch -ebe5d71b18aa9eefe1e0a6c150761bb7abef41f144f37eb0bfa8a01947aacb1292ac131cf815dcaaaa6478c0aac07ca5428fba28ad346a00c5aaa5fa64f6ff5b CVE-2019-6462.patch -8dcb95b6a8e023ad5675f81f9a87a087868dc74113cd0ab96568d525582266c366064cc7cc168738dc75968385ab0444911f54754d31962dfe1235526afbd72c CVE-2020-35492.patch" +bdc01ec3619e40e6e260890e038628607076d56d8e64ceaf8a3fd3c92e348d451a12852148a168f2e0e69d40285800fa66e39fdee771d1e0d632311c61923ca2 cairo-respect-fontconfig_pb.patch +9bf936f9c84f00409d75665034b21fa345c2e1c414715a899ad37ae10eaf54348537a3386ce078a56f1e931c749c3e50a99dd3b4e8aab484077ee18b5b89abe9 cairo-webkit-html5-fix.patch" diff --git a/user/cairo/CVE-2018-19876.patch b/user/cairo/CVE-2018-19876.patch deleted file mode 100644 index 33731e4fc..000000000 --- a/user/cairo/CVE-2018-19876.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos <cgarcia@igalia.com> -Date: Mon, 19 Nov 2018 12:33:07 +0100 -Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in - cairo_ft_apply_variations - -Fixes a crash when using freetype >= 2.9 ---- - src/cairo-ft-font.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61b4..981973f78 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -2393,7 +2393,11 @@ skip: - done: - free (coords); - free (current_coords); -+#if HAVE_FT_DONE_MM_VAR -+ FT_Done_MM_Var (face->glyph->library, ft_mm_var); -+#else - free (ft_mm_var); -+#endif - } - } - --- -2.21.0 - diff --git a/user/cairo/CVE-2019-6462.patch b/user/cairo/CVE-2019-6462.patch deleted file mode 100644 index 2a26876c3..000000000 --- a/user/cairo/CVE-2019-6462.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bbeaf08190d3006a80b80a77724801cd477a37b8 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin <hlewin@worldiety.de> -Date: Sat, 17 Apr 2021 19:15:03 +0200 -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop - ---- - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ - - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; - - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); -- } while (error > tolerance); -+ } while (error > tolerance && i < max_segments); - - return angle; - } --- -GitLab - diff --git a/user/cairo/CVE-2020-35492.patch b/user/cairo/CVE-2020-35492.patch deleted file mode 100644 index d7369b3d6..000000000 --- a/user/cairo/CVE-2020-35492.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 -From: Heiko Lewin <heiko.lewin@worldiety.de> -Date: Tue, 15 Dec 2020 16:48:19 +0100 -Subject: [PATCH] Fix mask usage in image-compositor - ---- - src/cairo-image-compositor.c | 8 ++-- - test/Makefile.sources | 1 + - test/bug-image-compositor.c | 39 ++++++++++++++++++++ - test/reference/bug-image-compositor.ref.png | Bin 0 -> 185 bytes - 4 files changed, 44 insertions(+), 4 deletions(-) - create mode 100644 test/bug-image-compositor.c - create mode 100644 test/reference/bug-image-compositor.ref.png - -diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c -index 79ad69f68..4f8aaed99 100644 ---- a/src/cairo-image-compositor.c -+++ b/src/cairo-image-compositor.c -@@ -2610,14 +2610,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - unsigned num_spans) - { - cairo_image_span_renderer_t *r = abstract_renderer; -- uint8_t *m; -+ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); - int x0; - - if (num_spans == 0) - return CAIRO_STATUS_SUCCESS; - - x0 = spans[0].x; -- m = r->_buf; -+ m = base; - do { - int len = spans[1].x - spans[0].x; - if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { -@@ -2655,7 +2655,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - spans[0].x, y, - spans[1].x - spans[0].x, h); - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else if (spans[0].coverage == 0x0) { - if (spans[0].x != x0) { -@@ -2684,7 +2684,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - #endif - } - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else { - *m++ = spans[0].coverage; - diff --git a/user/cairo/cairo-respect-fontconfig_pb.patch b/user/cairo/cairo-respect-fontconfig_pb.patch new file mode 100644 index 000000000..0bb0f4a7a --- /dev/null +++ b/user/cairo/cairo-respect-fontconfig_pb.patch @@ -0,0 +1,13 @@ +--- a/src/cairo-ft-font.c 2015-03-10 23:21:07.000000000 +0100 ++++ b/src/cairo-ft-font.c 2015-03-11 21:59:05.747697134 +0100 +@@ -1932,7 +1932,9 @@ _cairo_ft_options_merge (cairo_ft_option + options->base.subpixel_order = other->base.subpixel_order; + } + +- if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT) ++ options->base.hint_style = CAIRO_HINT_STYLE_DEFAULT; ++ ++ if (other->base.hint_style != CAIRO_HINT_STYLE_DEFAULT) + options->base.hint_style = other->base.hint_style; + + if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) diff --git a/user/cairo/cairo-webkit-html5-fix.patch b/user/cairo/cairo-webkit-html5-fix.patch new file mode 100644 index 000000000..07c5c6db8 --- /dev/null +++ b/user/cairo/cairo-webkit-html5-fix.patch @@ -0,0 +1,30 @@ +From 0742b90a214b35951414558f6f5579f79b8a8194 Mon Sep 17 00:00:00 2001 +From: Massimo Valentini <mvalentini@src.gnome.org> +Date: Thu, 21 Aug 2014 17:15:51 +0200 +Subject: [PATCH] Fix segfault rendering videos in webkit based browsers + +do not tessellate empty boxes. + +Reported-by: Henrique Lengler <henriqueleng@openmailbox.org> +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81699 +--- + src/cairo-bentley-ottmann-rectangular.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/cairo-bentley-ottmann-rectangular.c b/src/cairo-bentley-ottmann-rectangular.c +index 5541bdc..4bcd8d1 100644 +--- a/src/cairo-bentley-ottmann-rectangular.c ++++ b/src/cairo-bentley-ottmann-rectangular.c +@@ -834,6 +834,9 @@ _cairo_bentley_ottmann_tessellate_boxes (const cairo_boxes_t *in, + for (i = 0; i < chunk->count; i++) { + int h; + ++ if (box[i].p1.y == box[i].p2.y) ++ continue; ++ + if (box[i].p1.x < box[i].p2.x) { + rectangles[j].left.x = box[i].p1.x; + rectangles[j].left.dir = 1; +-- +1.9.3 + diff --git a/user/clang/APKBUILD b/user/clang/APKBUILD index 7d8f46369..5084a4020 100644 --- a/user/clang/APKBUILD +++ b/user/clang/APKBUILD @@ -3,7 +3,7 @@ pkgname=clang # Note: Update together with llvm. pkgver=18.1.8 -pkgrel=0 +pkgrel=1 _llvmver=${pkgver%%.*} pkgdesc="A C language family front-end for LLVM" arch="all" @@ -21,7 +21,6 @@ source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/l big-endian-32.patch cfe-005-ppc64-dynamic-linker-path.patch ppc-dirwatcher.patch - ppc-interp.patch use-llvm-lit.patch " builddir="$srcdir/llvm-project-$pkgver.src/$pkgname" @@ -66,16 +65,6 @@ prepare() { rm -f test/Driver/ppc-float-abi-warning.cpp # known broken on 32-bit platforms rm -f test/CodeGenCUDA/static-device-var-rdc.cu - - case $CARCH in - ppc) - for _interp_test in code-undo.cpp const.cpp execute-stmts.cpp \ - execute-weak.cpp execute.cpp fail.cpp global-dtor.cpp \ - inline-virtual.cpp lambda.cpp multiline.cpp \ - simple-exception.cpp; do - rm test/Interpreter/$_interp_test - done;; - esac } build() { @@ -166,5 +155,4 @@ d37d2339a76c21666aa4405b2a620100e6967eb933535b5cea05f5de25a4d7551047944350071552 241a087888b7b5373b54653c4675c77c70d82b61a1b79359cba7d5fe0187851e790cb4e7e278a0a59c660b9a980cf087b393dc43a19a975fc9b97717bca12bc4 big-endian-32.patch 8272ec0eeb93287c9cc961099139f7cb0f94561befc31a4521387fa5f7216dc4b3d99750c4560a0b71ec4acde5bd776abef733cfafe81058ef054b62f72fc209 cfe-005-ppc64-dynamic-linker-path.patch 0032fdd3864870d345caff9c4ff44f58bebc802bddf06c4b3bf30276c89e237167e6dea03456d322d3f6e2ee5e3a2ecf9f649ed033f0ab078b80bda44371b3ce ppc-dirwatcher.patch -a2d90bcfc7cee261d6c8ac3b5dd011f55eab94deff456b63c5ef3598397e358b271e7ae86dec9e56c09c874736645ffbecccde4d31826d9b20908a4a16c61387 ppc-interp.patch 6c6b4fc49539ecf02e4eec9c2bbd89cc37fe01383e7884aa52c90ab0a4aa23cd9a86716bc645af6949f787d2fe3b9a3ad177baef1edbec928437872d14db536d use-llvm-lit.patch" diff --git a/user/clang/ppc-interp.patch b/user/clang/ppc-interp.patch deleted file mode 100644 index fae58aa3d..000000000 --- a/user/clang/ppc-interp.patch +++ /dev/null @@ -1,35 +0,0 @@ -PPC32 doesn't support some of the clang-repl due to R_PPC_REL24 not being -implemented in RuntimeDyld. - ---- clang-14.0.6.src/test/Interpreter/execute.cpp.old 2022-06-22 16:46:24.000000000 +0000 -+++ clang-14.0.6.src/test/Interpreter/execute.cpp 2022-12-05 01:04:26.517960246 +0000 -@@ -1,4 +1,4 @@ --// UNSUPPORTED: system-aix -+// UNSUPPORTED: system-aix, powerpc- - - // clang-format off - // RUN: clang-repl "int i = 10;" 'extern "C" int printf(const char*,...);' \ ---- clang/unittests/Interpreter/InterpreterTest.cpp.old 2024-10-10 18:11:05.390017076 +0000 -+++ clang/unittests/Interpreter/InterpreterTest.cpp 2024-10-10 22:34:07.176019197 +0000 -@@ -30,7 +30,7 @@ - - using namespace clang; - --#if defined(_AIX) -+#if defined(_AIX) || (!defined(__powerpc64__) && defined(__powerpc__)) - #define CLANG_INTERPRETER_NO_SUPPORT_EXEC - #endif - ---- clang/unittests/Interpreter/ExceptionTests/InterpreterExceptionTest.cpp.old 2024-06-15 17:21:32.000000000 +0000 -+++ clang/unittests/Interpreter/ExceptionTests/InterpreterExceptionTest.cpp 2024-10-10 22:36:53.358466534 +0000 -@@ -113,8 +113,8 @@ - if (Triple.isOSAIX()) - GTEST_SKIP(); - -- // FIXME: ARM fails due to `Not implemented relocation type!` -- if (Triple.isARM()) -+ // FIXME: ARM and PPC32 fail due to `Not implemented relocation type!` -+ if (Triple.isARM() || Triple.isPPC32()) - GTEST_SKIP(); - - // FIXME: libunwind on darwin is broken, see PR49692. diff --git a/user/darkman/APKBUILD b/user/darkman/APKBUILD new file mode 100644 index 000000000..1600fae79 --- /dev/null +++ b/user/darkman/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=darkman +pkgver=2.0.1 +pkgrel=0 +pkgdesc="Framework for managing dark- and light-mode transitions" +url="https://darkman.whynothugo.nl/" +arch="all" +options="!check" # no testsuite +license="0BSD" +depends="" +makedepends="gcc-go scdoc" +subpackages="$pkgname-doc $pkgname-systemd" +source="https://gitlab.com/WhyNotHugo/darkman/-/archive/v$pkgver/darkman-v$pkgver.tar.bz2" +builddir="$srcdir/darkman-v$pkgver" + +build() { + make VERSION="$pkgver" +} + +package() { + make VERSION="$pkgver" DESTDIR="$pkgdir" install +} + +sha512sums="8036e3470d22e1f689d8305cb3faf81a1fc2f0692afd8fb9657c2c22af417f25fd928189fcda42df7c053cb9129c90cdf11df64e6f597498af95f330de76f282 darkman-v2.0.1.tar.bz2" diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD index 39890797a..b85f3a97e 100644 --- a/user/dovecot/APKBUILD +++ b/user/dovecot/APKBUILD @@ -10,7 +10,7 @@ case "$pkgver" in *.*.*.*) _pkgvermajor=${pkgver%.*.*};; *.*.*) _pkgvermajor=${pkgver%.*};; esac -pkgrel=0 +pkgrel=1 _pigeonholevel=0.5.21.1 pkgdesc="IMAP and POP3 server" url="https://www.dovecot.org/" diff --git a/user/dovecot/dovecot.pre-install b/user/dovecot/dovecot.pre-install index 73a0aa3e3..0f6df4c75 100644 --- a/user/dovecot/dovecot.pre-install +++ b/user/dovecot/dovecot.pre-install @@ -2,7 +2,7 @@ groupadd -r dovecot 2>/dev/null groupadd -r dovenull 2>/dev/null -useradd -r -u 90 -h /dev/null -s /sbin/nologin -g dovecot dovecot 2>/dev/null -useradd -r -u 91 -h /dev/null -s /sbin/nologin -g dovenull dovenull 2>/dev/null +useradd -r -u 90 -d / -s /sbin/nologin -g dovecot dovecot 2>/dev/null +useradd -r -u 91 -d / -s /sbin/nologin -g dovenull dovenull 2>/dev/null exit 0 diff --git a/user/drm_info/APKBUILD b/user/drm_info/APKBUILD new file mode 100644 index 000000000..2f367c1a4 --- /dev/null +++ b/user/drm_info/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Michał Polański <michal@polanski.me> +# Maintainer: Ermine <mustela@erminea.space> +pkgname=drm_info +pkgver=2.7.0 +pkgrel=0 +pkgdesc="Small utility to dump info about DRM devices" +url="https://gitlab.freedesktop.org/emersion/drm_info" +license="MIT" +arch="all" +options="!check" # no test suite +makedepends="meson libdrm-dev pciutils-dev json-c-dev scdoc" +subpackages="$pkgname-doc" +source="https://gitlab.freedesktop.org/emersion/drm_info/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz" +builddir="$srcdir/$pkgname-v$pkgver" + +build() { + meson setup \ + -Dprefix=/usr \ + output + meson compile -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} +sha512sums="1eeaa103699655dd6b5d0e81e43c5422b843bb8cea991585047c3cc3e118b65c7dac4cef84155346df2c887ca57702a82e6fac202fe0146fe5280e3c83519ab8 drm_info-v2.7.0.tar.gz" diff --git a/user/dwl/APKBUILD b/user/dwl/APKBUILD new file mode 100644 index 000000000..000ac4151 --- /dev/null +++ b/user/dwl/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=dwl +pkgver=0.7 +pkgrel=0 +pkgdesc="Minimal, DWM-like compositor for Wayland" +url="https://codeberg.org/dwl/dwl" +arch="all" +options="!check" # no testsuite +license="GPL-3.0+ AND MIT AND CC0-1.0" +depends="wlroots-0.18" +makedepends="libinput-dev libxkbcommon-dev wayland-dev wayland-protocols wlroots-0.18-dev" +subpackages="$pkgname-doc" +source="https://codeberg.org/dwl/dwl/releases/download/v$pkgver/dwl-v$pkgver.tar.gz" +builddir="$srcdir/dwl-v$pkgver" + +build() { + make PREFIX="/usr" +} + +package() { + make PREFIX="/usr" DESTDIR="$pkgdir" install +} + +sha512sums="d2ec9467bb7758ea52e0face555cb505624062eb66c8959b59e715b7d1c7bb74c649029f365c9bfd07d7b5806fdef018f555d7e64bd62e7e413ead45b5d73986 dwl-v0.7.tar.gz" diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD index 3aac43a30..8e928d919 100644 --- a/user/exo/APKBUILD +++ b/user/exo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=exo -pkgver=4.18.0 +pkgver=4.20.0 pkgrel=0 pkgdesc="Support library for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="32f3a319ff31a37cdaf8e2e7bdbdbaa9b797d6731a27854838b47d6078f45af83ed1a664aef4663f616fd9abcae9233c6f68ab2cc18599f1b2ced487602c51ce exo-4.18.0.tar.bz2" +sha512sums="7481f47bb0c8eb5cdc8d7db3e67c1cdaa81e3ef0833281b5380f3eab41e3c2f7112a22b37a3ce305a052b261444fd9f11c130150663deb1b4a220a998321284b exo-4.20.0.tar.bz2" diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index 5a306b1f8..66803e8b4 100644 --- a/user/firefox-esr/APKBUILD +++ b/user/firefox-esr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Molly Miller <adelie@m-squa.red> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=firefox-esr -pkgver=128.4.0 +pkgver=128.10.1 _llvmver=18 pkgrel=0 pkgdesc="Firefox web browser (extended support release)" @@ -21,7 +21,7 @@ makedepends=" ncurses-dev openssl-dev alsa-lib-dev bzip2-dev icu-dev libevent-dev libffi-dev libpng-dev - libjpeg-turbo-dev nspr-dev nss-dev pulseaudio-dev zlib-dev + libjpeg-turbo-dev nspr-dev nss-dev pcre-dev pulseaudio-dev zlib-dev dbus-glib-dev fts-dev gconf-dev gtk+3.0-dev hunspell-dev libnotify-dev libsm-dev libxcomposite-dev libxdamage-dev @@ -158,7 +158,7 @@ package() { EOF } -sha512sums="e720b1f993926d73f5a5727648f753176ac2fd093fb0b71393946bbc5919ce5fc7b88b82960bd1aa427b5663c7f659828dc6702485fc0c1e7a6961571c67faa3 firefox-128.4.0esr.source.tar.xz +sha512sums="6e7363d8cbecda1cedaf534ac10dc046b5f515399ec754492357e8a558c61ee3389f7bb90aa929dbcb4d6eba041ae1e778a0a8f90aa1e1f939eea517333b6c45 firefox-128.10.1esr.source.tar.xz aaeec88eda3ca5ef00503f2e1656f8a143017d5ff60bd289ce7a49b7f8352ce5b61556c732e5eb3b6859e1c30551219eb5bbb954e9b88eca8d3f44683bdd747d mozconfig 1fff71be77aa34791ef8aa972b5dc5f131d79f4b895ebbfb59bc223078764d6f79c82a3a4e4c717a3893ecbe4907d556f27e97d2692e41f02365f06da759a71a bad-google-code.patch 5e6c3fa027052cc43ba161cf5c12016b07723e7c0b002a42431bbd5d716d512d5245ab6befbb56c37c7d244441533f810f4e7b583f83bbe965981931f1435a94 fix-mutex-build.patch @@ -174,7 +174,7 @@ c2248297df00633771da7e6b9f2caba3dd5108d93617f652fa8b2fb4e6975821e5fee866c00713f8 11f7ce86376b54281082fa5b9d3fefee8046eabe38a0ec17266764b4f62cb90f4744245c1ca93d73ed74cf81c066dab7ddcb3fe9704be8f91e0a2a4f664b203a skia-endian.patch a6a14104ee6985867efb1937a262aba1538ed4b069bba56e400d75f51d84d29363d8bbb2183ee27785758ad3a8b8ae4350e23dc854d50c92cb2147eddf83b9bb skia-unified.patch 9df89366bd51670f534591e4c169186703ad3166a493f522e58f129fb79af375d71baaf0f6b238126792118a2d3ed0f011b010e39497ab5901ee5bea63a84fa2 stackwalk-x86-ppc.patch -e1d9e30a1c8d1c6bdd3530183400d7d245e437ce18bb5b262bec1d01932b02b8eaededd892efcdd277eaccb357aede4537972382be9f00eedf1785acebbd1ca6 webrender.patch +7d6c5f3cafd29eae4e7c5433b14f49cc679eebdcb4e602af18819f685500747a6daa8d38fbb0f91878331b14ce299ca8b731f62ab013b69e579fc450b29fe743 webrender.patch ed78e15030d79b10026ebae26e44a68d16c2a8567082072b5099b0dde4f79ae217a21737e0d9c7ec6a3cc99de3ab3c9083cca7d82889d559bb18cc15fa7e6f2a without-jit.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" diff --git a/user/firefox-esr/webrender.patch b/user/firefox-esr/webrender.patch index e6b145956..cfc920cfd 100644 --- a/user/firefox-esr/webrender.patch +++ b/user/firefox-esr/webrender.patch @@ -8,7 +8,7 @@ Bug 1716707 [s390x] Software WebRender does not support big endian --- firefox-128.0/image/imgFrame.cpp +++ firefox-128.0/image/imgFrame.cpp -@@ -372,6 +372,17 @@ mAborted = true; +@@ -382,6 +382,17 @@ mAborted = true; return NS_ERROR_OUT_OF_MEMORY; } diff --git a/user/flameshot/APKBUILD b/user/flameshot/APKBUILD new file mode 100644 index 000000000..3ac292020 --- /dev/null +++ b/user/flameshot/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=flameshot +pkgver=12.1.0 +pkgrel=0 +pkgdesc="Simple, powerful screenshot utility" +url="https://flameshot.org/" +arch="all" +license="GPL-3.0+ AND LGPL-3.0+ AND MIT AND (GPL-3.0+ AND GPL-2.0-only) AND Apache-2.0 AND CC0-1.0 AND FAL-1.3" +depends="" +makedepends="cmake qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="flameshot-$pkgver.tar.gz::https://github.com/flameshot-org/flameshot/archive/refs/tags/v$pkgver.tar.gz" +langdir="/usr/share/flameshot/translations" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="159bf3a8ff406b3881dcc77fc48d9e7cc0d595bd47ee2363396d7efc95f69160cf25ccf99cd1b2c2b527baeadf91c209784a7bca23ed5f17caacc385e161c83c flameshot-12.1.0.tar.gz" diff --git a/user/fontconfig/APKBUILD b/user/fontconfig/APKBUILD index aeae4256d..415f0c925 100644 --- a/user/fontconfig/APKBUILD +++ b/user/fontconfig/APKBUILD @@ -1,40 +1,41 @@ # Contributor: Mika Havela <mika.havela@gmail.com> -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fontconfig -pkgver=2.13.1 +pkgver=2.15.0 pkgrel=0 pkgdesc="Library for configuring and customizing font access" url="https://www.freedesktop.org/wiki/Software/fontconfig/" arch="all" -options="!check" # Fails test with fixed fonts license="MIT" depends="" -makedepends="freetype-dev expat-dev python3-dev gperf util-linux-dev" +makedepends="expat-dev freetype-dev gperf meson python3-dev util-linux-dev" triggers="$pkgname.trigger=/usr/share/fonts/*" subpackages="$pkgname-dev $pkgname-lang" -source="https://www.freedesktop.org/software/fontconfig/release/${pkgname}-${pkgver}.tar.gz" +source="https://www.freedesktop.org/software/fontconfig/release/${pkgname}-${pkgver}.tar.xz + disable-crbug.patch + " build() { - # regenerate hash functions - rm -f src/fcobjshash.h - - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static \ - --disable-docs - make + --wrap-mode=nofallback \ + -Dnls=enabled \ + -Dtests=enabled \ + -Dtools=enabled \ + build + + meson compile -C build } check() { - make check + meson test -C build } package() { - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="830df32e944ee21ad02a9df04787b9902af36ffc13913524acef6e38799a38c5df7a6e407cc0ff9c24455520549d53b3d85d22642a229ac654dc9269926f130b fontconfig-2.13.1.tar.gz" +sha512sums="754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417 fontconfig-2.15.0.tar.xz +4295ce39520f0b24348ee0ad742de627a7f46084744022d8920da6a67a15e529fd89d31e7cfa33c2b7e613186bf9c20ad03a090f18dab63a66fbf9f50bbe6bfb disable-crbug.patch" diff --git a/user/fontconfig/disable-crbug.patch b/user/fontconfig/disable-crbug.patch new file mode 100644 index 000000000..2c2720ac6 --- /dev/null +++ b/user/fontconfig/disable-crbug.patch @@ -0,0 +1,13 @@ +i.e. the comment. + +--- fontconfig-2.15.0/test/meson.build.old 2020-12-16 23:27:27.000000000 -0600 ++++ fontconfig-2.15.0/test/meson.build 2025-05-09 20:36:03.552602973 -0500 +@@ -14,8 +14,6 @@ + # FIXME: ['test-migration.c'], + ['test-bz106632.c', {'c_args': ['-DFONTFILE="@0@"'.format(join_paths(meson.current_source_dir(), '4x6.pcf'))]}], + ['test-issue107.c'], # FIXME: fails on mingw +- # FIXME: this needs NotoSans-hinted.zip font downloaded and unpacked into test build directory! see run-test.sh +- ['test-crbug1004254.c', {'dependencies': dependency('threads')}], # for pthread + ] + + if get_option('default_library') == 'static' diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD index a6c7990bb..a3e99e3b6 100644 --- a/user/garcon/APKBUILD +++ b/user/garcon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=garcon -pkgver=4.18.2 +pkgver=4.20.0 pkgrel=0 pkgdesc="freedesktop.org menu library for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f74547a29dbf47469e9448ea0fb89a297d02c7a5d2f7ec1a1f05706f89160730e04743ce84de29de21f32a2d2e4e4410f6c12fd14777c65944529f5104973cee garcon-4.18.2.tar.bz2" +sha512sums="5ed8b031cceb5943af56d006b05dc9f8ac28695a35d17a8f27f8bde1a0a75067fc4d307c87250a436d1b317f92d501f01ce4078b5c961e4e9daccd175f2f261a garcon-4.20.0.tar.bz2" diff --git a/user/gdk-pixbuf/APKBUILD b/user/gdk-pixbuf/APKBUILD index 7377083bb..cd1ac322d 100644 --- a/user/gdk-pixbuf/APKBUILD +++ b/user/gdk-pixbuf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gdk-pixbuf -pkgver=2.40.0 +pkgver=2.42.12 pkgrel=0 pkgdesc="GTK+ image loading library" url="https://www.gtk.org/" @@ -9,11 +9,13 @@ options="!check" # bug753605-atsize.jpg is missing from tarball. license="LGPL-2.0+" depends="shared-mime-info" makedepends="glib-dev gobject-introspection-dev libjpeg-turbo-dev libpng-dev - meson ninja python3 tiff-dev xmlto" + meson python3 py3-docutils tiff-dev xmlto" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/gdk-pixbuf-2.0/*/loaders" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz" +source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz + fix-pkgconfig.patch + " # secfixes: # 2.36.6-r1: @@ -22,19 +24,20 @@ source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$p # - CVE-2017-6314 build() { - meson \ + meson setup \ -Dprefix=/usr \ -Dinstalled_tests=false \ build - ninja -C build + meson compile -C build } check() { - ninja -C build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa gdk-pixbuf-2.40.0.tar.xz" +sha512sums="ae9fcc9b4e8fd10a4c9bf34c3a755205dae7bbfe13fbc93ec4e63323dad10cc862df6a9e2e2e63c84ffa01c5e120a3be06ac9fad2a7c5e58d3dc6ba14d1766e8 gdk-pixbuf-2.42.12.tar.xz +24d461273c262e52299b9a70bc89e6fd4bd4425c1aef9575f5fcd6f3fb6d0ee0d05c4151f6bb9a28708f189ad26764b3c9b76a9d1e5094405a679abdf3905663 fix-pkgconfig.patch" diff --git a/user/gdk-pixbuf/fix-pkgconfig.patch b/user/gdk-pixbuf/fix-pkgconfig.patch new file mode 100644 index 000000000..a15c2c29c --- /dev/null +++ b/user/gdk-pixbuf/fix-pkgconfig.patch @@ -0,0 +1,11 @@ +diff '--color=auto' -Nurd gdk-pixbuf-2.42.12/gdk-pixbuf/meson.build gdk-pixbuf-2.42.12.new/gdk-pixbuf/meson.build +--- gdk-pixbuf-2.42.12/gdk-pixbuf/meson.build 2025-07-01 18:58:08.263906972 -0700 ++++ gdk-pixbuf-2.42.12.new/gdk-pixbuf/meson.build 2025-07-01 18:54:50.384849537 -0700 +@@ -383,6 +383,7 @@ + 'gdk_pixbuf_query_loaders=${bindir}/gdk-pixbuf-query-loaders', + ], + requires: 'gobject-2.0', ++ requires_private: 'libpng', + subdirs: gdk_pixbuf_api_name, + filebase: gdk_pixbuf_api_name, + ) diff --git a/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch b/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch index 50a9a8c28..ba4c03906 100644 --- a/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch +++ b/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch @@ -20,7 +20,7 @@ diff --git a/glib/gquark.c b/glib/gquark.c index 9e51a92..17ecd7f 100644 --- a/glib/gquark.c +++ b/glib/gquark.c -@@ -57,6 +57,11 @@ static gint quark_block_offset = 0; +@@ -60,6 +60,11 @@ static gint quark_block_offset = 0; void g_quark_init (void) { diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index 45d91ed79..1de391541 100644 --- a/user/glib/APKBUILD +++ b/user/glib/APKBUILD @@ -1,17 +1,16 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glib -pkgver=2.72.4 +pkgver=2.84.0 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" arch="all" -options="!check" # Now requires D-Bus running. license="LGPL-2.1+" depends="dbus" depends_dev="perl python3 attr-dev bzip2-dev libffi-dev util-linux-dev" -checkdepends="tzdata shared-mime-info" -makedepends="$depends_dev dbus-dev meson ninja pcre-dev xmlto zlib-dev" +checkdepends="dbus-x11 tzdata shared-mime-info" +makedepends="$depends_dev dbus-dev meson pcre2-dev py3-docutils xmlto zlib-dev" triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules" subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp:noarch" @@ -21,7 +20,7 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve i386-fpu-test.patch musl-no-locale.patch ridiculous-strerror-nonconformance.patch - meson-sucks-and-i-hate-you-so-much-right-now.patch + sigstksz.patch " # secfixes: @@ -29,20 +28,23 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve # - CVE-2019-12450 build() { - meson --default-library=both \ + meson setup \ + --default-library=both \ -Dprefix=/usr \ -Dselinux=disabled \ - -Dman=true build - ninja -C build + -Dman-pages=enabled \ + --wrap-mode=nofallback \ + build + meson compile -C build } check() { # workaround if a user builds it on a computer running X11 - DISPLAY= ninja -C build test + DISPLAY= dbus-run-session meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build rm -rf "$pkgdir"/usr/lib/charset.alias } @@ -75,10 +77,10 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="b4e2e0985e2184ee9656c4f1b4e15d8d1264f3d23d31349bc43d92e8432cffa48e1685c40517efb08dc5b57b8285acf65f2747deeb50e50d9cacec7160e7edf8 glib-2.72.4.tar.xz -32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch -48d367d21a740161431c6ea2e062415e403d1a7af40515c71c60f11a8784d8725595386dc5a801c351540d67dee4186fb4af875f0165d21d13fe1a5167e02099 broken-gio-tests.patch -aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84 i386-fpu-test.patch -db9de1fbf953afe76df9047d878c405ceeb6bd674c4382a8437612d788ff1c65c78012831888b2c4916f8125dab6bda50f1bba040744563dc8dcad30aeb1dd4d musl-no-locale.patch -56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c ridiculous-strerror-nonconformance.patch -dc1f0232433f6fb2cb2edebc8f5e15b4dcca557191af0a0ca45ff5cc5d109362e1dde4a532b08423e74c6b716801a516ad4ea105435e1332cd1a42f8131df46b meson-sucks-and-i-hate-you-so-much-right-now.patch" +sha512sums="72b85e30c535c5da7d8598d1cec02b1b481c467e612dbb396a0a64ad1d37cf2f1802c6fa576885c99cf8a22f4f0fc7dfdf42a3f32f7f40394f72db588fdbebb7 glib-2.84.0.tar.xz +ee128ea2f1b4d1b3179bbc4af56ebb671e1e6a1d0c4d9b279ecf77bc33dc6ab34d5dcbe35af7f5fd703c4eda3cc06cfabe1ee39ead059401ff7902500f2eefe6 0001-gquark-fix-initialization-with-c-constructors.patch +348fa10b38c8d7ea4181dbfd321c33d62475fc83461235e33ff5fb5170f2af44e587bd2f4805c49004ef6e33ed89252a493cf88687a246c4e34c1c09e14cb047 broken-gio-tests.patch +69e23d20b2682eb6adc013f78160902ad9a9703e06904b98725541b6d20f6bf5ce8958a5b43831485c87f6d8116768f591a5d5ee6c2c6ce6843581d6d05b8599 i386-fpu-test.patch +0b5515a9fd4bfe566d2d236374a8cdbec49191030aa74c56e0fe1b297daf65b172ce5e02477d3bc1e67a2c07bc979fd9de4ce2fb7a00a9754f88b5e76d2dddf2 musl-no-locale.patch +06af1c22004c34ae896bb5eaeb94599b42e46769408ac4c2575d809307922005d65d0053b9aeccb2049b85303cc1ba5d26cac733608aa2d407ad9ae39210beb0 ridiculous-strerror-nonconformance.patch +893a61dac6b4da6330bab9d5b9a9f7b3ae6643f4681895e24cc4a55518bdf16996af6175149299fbf782e633f7a37e308e7c3b52f9eb58d24f7fcf0c015e947b sigstksz.patch" diff --git a/user/glib/broken-gio-tests.patch b/user/glib/broken-gio-tests.patch index 75354ad8b..bb5b32418 100644 --- a/user/glib/broken-gio-tests.patch +++ b/user/glib/broken-gio-tests.patch @@ -1,7 +1,7 @@ Requires update-desktop-database --- glib-2.52.1/gio/tests/appinfo.c.old 2016-10-22 00:17:49.000000000 -0500 +++ glib-2.52.1/gio/tests/appinfo.c 2017-08-20 23:23:32.581229536 -0500 -@@ -486,7 +486,7 @@ +@@ -637,7 +637,7 @@ g_test_add_func ("/appinfo/launch-context", test_launch_context); g_test_add_func ("/appinfo/launch-context-signals", test_launch_context_signals); g_test_add_func ("/appinfo/tryexec", test_tryexec); @@ -15,7 +15,7 @@ Requires update-desktop-database Requires working iconv --- glib-2.52.1/gio/tests/converter-stream.c.old 2016-10-22 00:18:11.000000000 -0500 +++ glib-2.52.1/gio/tests/converter-stream.c 2017-08-20 23:21:31.711358101 -0500 -@@ -1203,7 +1203,7 @@ +@@ -1208,7 +1208,7 @@ }; CharsetTest charset_tests[] = { { "/converter-input-stream/charset/utf8->latin1", "UTF-8", "\303\205rr Sant\303\251", "ISO-8859-1", "\305rr Sant\351", 0 }, @@ -30,7 +30,7 @@ Requires working iconv Requires update-desktop-database --- glib-2.52.1/gio/tests/resources.c.old 2016-10-22 00:18:12.000000000 -0500 +++ glib-2.52.1/gio/tests/resources.c 2017-08-20 23:39:47.127025718 -0500 -@@ -426,6 +426,7 @@ +@@ -819,6 +819,7 @@ g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test1\n"); g_bytes_unref (data); @@ -40,7 +40,7 @@ Requires update-desktop-database found = g_resources_get_info ("/resourceplugin/test1.txt", --- a/gio/tests/resources.c +++ b/gio/tests/resources.c -@@ -763,6 +763,7 @@ +@@ -828,6 +828,7 @@ g_assert_false (found); g_assert_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND); g_clear_error (&error); diff --git a/user/glib/i386-fpu-test.patch b/user/glib/i386-fpu-test.patch index 986c33164..f400a10d6 100644 --- a/user/glib/i386-fpu-test.patch +++ b/user/glib/i386-fpu-test.patch @@ -1,6 +1,6 @@ --- glib-2.54.2/glib/tests/timer.c.old 2016-10-22 00:21:30.000000000 -0500 +++ glib-2.54.2/glib/tests/timer.c 2018-03-03 18:39:40.424741042 -0600 -@@ -203,7 +203,10 @@ +@@ -386,7 +386,10 @@ { g_test_init (&argc, &argv, NULL); diff --git a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch b/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch deleted file mode 100644 index 1e63ac0f4..000000000 --- a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- glib-2.58.0/glib/libcharset/meson.build.old 2018-08-30 17:12:09.000000000 +0000 -+++ glib-2.58.0/glib/libcharset/meson.build 2018-09-10 03:42:01.930000000 +0000 -@@ -1,4 +1,5 @@ - charset_lib = static_library('charset', 'localcharset.c', - include_directories : configinc, - pic : true, -+ install : true, - c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(glib_charsetaliasdir) ] + glib_hidden_visibility_args) diff --git a/user/glib/musl-no-locale.patch b/user/glib/musl-no-locale.patch index 1624b0078..461454fc0 100644 --- a/user/glib/musl-no-locale.patch +++ b/user/glib/musl-no-locale.patch @@ -1,6 +1,6 @@ --- glib-2.52.1/glib/tests/option-context.c.old 2016-10-22 05:21:34.000000000 +0000 +++ glib-2.52.1/glib/tests/option-context.c 2017-08-20 23:14:46.364133517 +0000 -@@ -638,7 +638,7 @@ +@@ -641,7 +641,7 @@ old_locale = g_strdup (setlocale (LC_NUMERIC, locale)); current_locale = setlocale (LC_NUMERIC, NULL); @@ -11,7 +11,7 @@ goto cleanup; --- glib-2.52.1/glib/tests/convert.c.old 2016-10-22 00:21:34.000000000 -0500 +++ glib-2.52.1/glib/tests/convert.c 2017-08-20 22:51:48.363430954 -0500 -@@ -707,7 +707,7 @@ +@@ -995,7 +995,7 @@ g_test_add_func ("/conversion/no-conv", test_no_conv); g_test_add_func ("/conversion/iconv-state", test_iconv_state); @@ -23,7 +23,7 @@ g_test_add_func ("/conversion/filename-utf8", test_filename_utf8); --- glib-2.56.1/glib/tests/gdatetime.c.old 2018-07-02 21:11:49.890000000 -0500 +++ glib-2.56.1/glib/tests/gdatetime.c 2018-07-02 21:19:30.340000000 -0500 -@@ -2329,7 +2329,6 @@ +@@ -3547,7 +3547,6 @@ g_test_add_func ("/GDateTime/printf", test_GDateTime_printf); g_test_add_func ("/GDateTime/non_utf8_printf", test_non_utf8_printf); g_test_add_func ("/GDateTime/strftime", test_strftime); diff --git a/user/glib/ridiculous-strerror-nonconformance.patch b/user/glib/ridiculous-strerror-nonconformance.patch index 3ffc0aafa..b900672a8 100644 --- a/user/glib/ridiculous-strerror-nonconformance.patch +++ b/user/glib/ridiculous-strerror-nonconformance.patch @@ -1,6 +1,6 @@ --- glib-2.52.1/glib/tests/strfuncs.c.old 2016-10-22 00:21:44.000000000 -0500 +++ glib-2.52.1/glib/tests/strfuncs.c 2017-08-20 22:48:18.233702952 -0500 -@@ -1335,7 +1335,7 @@ +@@ -2067,7 +2067,7 @@ setlocale (LC_ALL, "C"); strs = g_hash_table_new (g_str_hash, g_str_equal); diff --git a/user/glib/sigstksz.patch b/user/glib/sigstksz.patch new file mode 100644 index 000000000..b0de031f1 --- /dev/null +++ b/user/glib/sigstksz.patch @@ -0,0 +1,20 @@ +See-also: https://inbox.vuxu.org/musl/D3S38EL8UO9V.U731IQFLR32X@ayaya.dev/ + +--- glib-2.84.0/glib/tests/unix.c.old 2025-03-06 07:09:13.000000000 -0600 ++++ glib-2.84.0/glib/tests/unix.c 2025-05-04 21:55:45.796547202 -0500 +@@ -588,13 +588,13 @@ + #ifndef SA_ONSTACK + g_test_skip ("alternate stack is not supported"); + #else +- size_t minsigstksz = MINSIGSTKSZ; ++ size_t minsigstksz = 32768; + guint8 *stack_memory = NULL; + guint8 *zero_mem = NULL; + stack_t stack = { 0 }; + stack_t old_stack = { 0 }; + +-#ifdef _SC_MINSIGSTKSZ ++#if 0 + /* Use the kernel-provided minimum stack size, if available. Otherwise default + * to MINSIGSTKSZ. Unfortunately that might not be big enough for huge + * register files for big CPU instruction set extensions. */ diff --git a/user/grub/0001-unmerged-usr.patch b/user/grub/0001-unmerged-usr.patch deleted file mode 100644 index 93dd838c3..000000000 --- a/user/grub/0001-unmerged-usr.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e641b4ab32f1724005ec8bf58214df86de7e81d9 Mon Sep 17 00:00:00 2001 -From: Oskari Pirhonen <xxc3ncoredxx@gmail.com> -Date: Mon, 10 Jul 2023 23:55:43 -0500 -Subject: util/grub.d/25_bli.in: Fix shebang on unmerged-usr - -On an unmerged-usr system, grub-mkconfig errors out with the following -error due to /usr/bin/sh not existing: - - /usr/sbin/grub-mkconfig: /etc/grub.d/25_bli: /usr/bin/sh: bad interpreter: No such file or directory - -Use a /bin/sh shebang to fix the error as well as match the other -existing files. - -Fixes: 158a6583e (util/grub.d/25_bli.in: Activate bli module on EFI) - -Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com> -Reviewed-by: Glenn Washburn <development@efficientek.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> -Reviewed-by: Oliver Steffen <osteffen@redhat.com> ---- - util/grub.d/25_bli.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/grub.d/25_bli.in b/util/grub.d/25_bli.in -index 6e45387..26e27a0 100644 ---- a/util/grub.d/25_bli.in -+++ b/util/grub.d/25_bli.in -@@ -1,4 +1,4 @@ --#!/usr/bin/sh -+#! /bin/sh - set -e - - # grub-mkconfig helper script. --- -cgit v1.1 - diff --git a/user/grub/0002-revert-gawk.patch b/user/grub/0002-revert-gawk.patch index 565e22d6a..93ed3448d 100644 --- a/user/grub/0002-revert-gawk.patch +++ b/user/grub/0002-revert-gawk.patch @@ -6,7 +6,7 @@ We don't ship gawk, so we can't use asorti. The old way worked fine enough. --- grub-2.12-rc1/grub-core/genmoddep.awk.old 2023-07-10 15:43:48.000000000 +0000 +++ grub-2.12-rc1/grub-core/genmoddep.awk 2023-10-01 07:52:03.407286373 +0000 -@@ -59,9 +59,7 @@ +@@ -63,9 +63,7 @@ } modlist = "" depcount[mod] = 0 diff --git a/user/grub/0003-spcr-revision.patch b/user/grub/0003-spcr-revision.patch deleted file mode 100644 index 48b5e2f48..000000000 --- a/user/grub/0003-spcr-revision.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b0890d371ca1e49877c45d696deb9102f1b605c3 Mon Sep 17 00:00:00 2001 -From: Glenn Washburn <development@efficientek.com> -Date: Wed, 26 Jul 2023 16:02:36 -0500 -Subject: term/ns8250-spcr: Continue processing SPCR table even if revision is - < 2 - -According to commit 0231d00082 (ACPI: SPCR: Make SPCR available to x86) -to the Linux kernel, "On x86, many systems have a valid SPCR table but the -table version is not 2 so the table version check must be a warning." - -Signed-off-by: Glenn Washburn <development@efficientek.com> -Reviewed-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/term/ns8250-spcr.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/grub-core/term/ns8250-spcr.c b/grub-core/term/ns8250-spcr.c -index d101bff..d52b52c 100644 ---- a/grub-core/term/ns8250-spcr.c -+++ b/grub-core/term/ns8250-spcr.c -@@ -18,6 +18,7 @@ - - #if !defined(GRUB_MACHINE_IEEE1275) && !defined(GRUB_MACHINE_QEMU) - -+#include <grub/misc.h> - #include <grub/serial.h> - #include <grub/ns8250.h> - #include <grub/types.h> -@@ -34,7 +35,8 @@ grub_ns8250_spcr_init (void) - if (spcr == NULL) - return NULL; - if (spcr->hdr.revision < 2) -- return NULL; -+ grub_dprintf ("serial", "SPCR table revision %d < 2, continuing anyway\n", -+ (int) spcr->hdr.revision); - if (spcr->intf_type != GRUB_ACPI_SPCR_INTF_TYPE_16550 && - spcr->intf_type != GRUB_ACPI_SPCR_INTF_TYPE_16550X) - return NULL; --- -cgit v1.1 - diff --git a/user/grub/0004-videoinfo-no-reinit.patch b/user/grub/0004-videoinfo-no-reinit.patch deleted file mode 100644 index c3877bf07..000000000 --- a/user/grub/0004-videoinfo-no-reinit.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1de58326994b0045ccfb28017d05fc1ddecdb92d Mon Sep 17 00:00:00 2001 -From: Glenn Washburn <development@efficientek.com> -Date: Fri, 11 Aug 2023 16:30:04 -0500 -Subject: commands/videoinfo: Prevent crash when run while video driver already - active - -The videoinfo command will initialize all non-active video adapters. Video -drivers tend to zero out the global framebuffer object on initialization. -This is not a problem when there is no active video adapter. However, when -there is, then outputting to the video adapter will cause a crash because -methods in the framebuffer object are reinitialized. For example, this -command sequence will cause a crash. - - terminal_output --append gfxterm; videoinfo - -When running in a QEMU headless with GRUB built for the x86_64-efi target, -the first command initializes the Bochs video adapter, which, among -other things, sets the set_page() member function. Then when videoinfo is -run, all non-Bochs video adapters will be initialized, each one wiping -the framebuffer and thus setting set_page to NULL. Soon after the videoinfo -command finishes there will be a call to grub_refresh(), which will -ultimately call the framebuffer's set_page which will be NULL and cause -a crash when called. - -Signed-off-by: Glenn Washburn <development@efficientek.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/commands/videoinfo.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c -index 5eb9697..205ba78 100644 ---- a/grub-core/commands/videoinfo.c -+++ b/grub-core/commands/videoinfo.c -@@ -191,6 +191,11 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)), - /* Don't worry about errors. */ - grub_errno = GRUB_ERR_NONE; - } -+ else if (id != GRUB_VIDEO_DRIVER_NONE) -+ { -+ grub_puts_ (N_(" A video driver is active, cannot initialize this driver until it is deactivated\n")); -+ continue; -+ } - else - { - if (adapter->init ()) --- -cgit v1.1 - diff --git a/user/grub/0005-vsnprintf.patch b/user/grub/0005-vsnprintf.patch deleted file mode 100644 index 88c3e0f09..000000000 --- a/user/grub/0005-vsnprintf.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 14c95e57fddb6c826bee7755232de62efc8eb45b Mon Sep 17 00:00:00 2001 -From: Glenn Washburn <development@efficientek.com> -Date: Fri, 18 Aug 2023 12:15:27 -0500 -Subject: kern/misc: Make grub_vsnprintf() C99/POSIX conformant - -To comply with C99 and POSIX standards, snprintf() should return the -number of bytes that would be written to the string (excluding the -terminating NUL byte) if the buffer size was big enough. Before this -change, the return value was the minimum of the standard return and the -length of the buffer. Rarely is the return value of grub_snprintf() or -grub_vsnprintf() used with current code, and the few places where it is -used do not need to be changed. - -Signed-off-by: Glenn Washburn <development@efficientek.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/kern/misc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 2890aad..b57249a 100644 ---- a/grub-core/kern/misc.c -+++ b/grub-core/kern/misc.c -@@ -1201,7 +1201,7 @@ grub_vsnprintf (char *str, grub_size_t n, const char *fmt, va_list ap) - - free_printf_args (&args); - -- return ret < n ? ret : n; -+ return ret; - } - - int --- -cgit v1.1 - diff --git a/user/grub/0006-cryptodisk-retval.patch b/user/grub/0006-cryptodisk-retval.patch deleted file mode 100644 index 9db7f8434..000000000 --- a/user/grub/0006-cryptodisk-retval.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 296d3ec835ed6e3b90d740e497bb534f14fe4b79 Mon Sep 17 00:00:00 2001 -From: Glenn Washburn <development@efficientek.com> -Date: Fri, 18 Aug 2023 12:27:22 -0500 -Subject: disk/cryptodisk: Fix missing change when updating to use - grub_uuidcasecmp() - -This was causing the cryptomount command to return failure even though -the crypto device was successfully added. Of course, this meant that any -script using the return code would behave unexpectedly. - -Fixes: 3cf2e848bc03 (disk/cryptodisk: Allows UUIDs to be compared in a dash-insensitive manner) - -Suggested-by: Olaf Hering <olaf@aepfle.de> -Signed-off-by: Glenn Washburn <development@efficientek.com> -Reviewed-by: Patrich Steinhardt <ps@pks.im> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/disk/cryptodisk.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c -index 34b67a7..fb807e2 100644 ---- a/grub-core/disk/cryptodisk.c -+++ b/grub-core/disk/cryptodisk.c -@@ -1236,7 +1236,8 @@ grub_cryptodisk_scan_device (const char *name, - dev = grub_cryptodisk_scan_device_real (name, source, cargs); - if (dev) - { -- ret = (cargs->search_uuid != NULL && grub_strcasecmp (cargs->search_uuid, dev->uuid) == 0); -+ ret = (cargs->search_uuid != NULL -+ && grub_uuidcasecmp (cargs->search_uuid, dev->uuid, sizeof (dev->uuid)) == 0); - goto cleanup; - } - --- -cgit v1.1 - diff --git a/user/grub/0007-efi_gop-shadow.patch b/user/grub/0007-efi_gop-shadow.patch deleted file mode 100644 index 7709641cd..000000000 --- a/user/grub/0007-efi_gop-shadow.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 34a3adff822a6d136430e631d0a93448b27fac4e Mon Sep 17 00:00:00 2001 -From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> -Date: Mon, 28 Aug 2023 23:50:09 +0200 -Subject: video/efi_gop: Require shadow if PixelBltOnly - -If the EFI graphics pixel format is PixelBltOnly, we cannot write directly -to the frame buffer. We need the shadow frame buffer which we copy via -the BitBlt operation to the hardware. - -If the pixel format is PixelBltOnly and allocation of the shadow frame -buffer fails, we must raise an error to signal that the EFI GOP protocol -is not usable. - -Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/video/efi_gop.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c -index 7247aee..9452f5e 100644 ---- a/grub-core/video/efi_gop.c -+++ b/grub-core/video/efi_gop.c -@@ -480,6 +480,10 @@ grub_video_gop_setup (unsigned int width, unsigned int height, - if (!buffer) - { - grub_dprintf ("video", "GOP: couldn't allocate shadow\n"); -+ -+ if (info->pixel_format == GRUB_EFI_GOT_BLT_ONLY) -+ return grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); -+ - grub_errno = 0; - grub_video_gop_fill_mode_info (gop->mode->mode, info, - &framebuffer.mode_info); --- -cgit v1.1 - diff --git a/user/grub/0008-efi-pure64.patch b/user/grub/0008-efi-pure64.patch deleted file mode 100644 index e07323c63..000000000 --- a/user/grub/0008-efi-pure64.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 67ae3981dc5113e5af3a0539174bcd7eab8f7722 Mon Sep 17 00:00:00 2001 -From: Ard Biesheuvel <ardb@kernel.org> -Date: Thu, 3 Aug 2023 15:24:09 +0200 -Subject: loader/i386/linux: Prefer entry in long mode when booting via EFI - -The x86_64 Linux kernel can be booted in 32-bit mode, in which case the -startup code creates a set of preliminary page tables that map the first -4 GiB of physical memory 1:1 and enables paging. This is a prerequisite -for 64-bit execution and can therefore only be implemented in 32-bit code. - -The x86_64 Linux kernel can also be booted in 64-bit mode directly: this -implies that paging is already enabled and it is the responsibility of -the bootloader to ensure that the active page tables cover the entire -loaded image, including its BSS space, the size of which is described in -the image's setup header. - -Given that the EFI spec mandates execution in long mode for x86_64 and -stipulates that all system memory is mapped 1:1, the Linux/x86 -requirements for 64-bit entry can be met trivially when booting on -x86_64 via EFI. So, enter via the 64-bit entry point in this case. - -This involves inspecting the xloadflags field in the setup header to -check whether the 64-bit entry point is supported. This field was -introduced in Linux version v3.8 (early 2013). - -This change ensures that all EFI firmware tables and other assets passed -by the firmware or bootloader in memory remain mapped and accessible -throughout the early startup code. - -Avoiding the drop out of long mode will also be needed to support -upcoming CPU designs that no longer implement 32-bit mode at all -(as recently announced by Intel [0]). - -[0] https://www.intel.com/content/www/us/en/developer/articles/technical/envisioning-future-simplified-architecture.html - -Cc: Daniel Kiper <daniel.kiper@oracle.com> -Cc: Julian Andres Klode <julian.klode@canonical.com> -Signed-off-by: Ard Biesheuvel <ardb@kernel.org> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/loader/i386/linux.c | 12 ++++++++++++ - include/grub/i386/linux.h | 15 +++++++++++++-- - 2 files changed, 25 insertions(+), 2 deletions(-) - -diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index 997647a..977757f 100644 ---- a/grub-core/loader/i386/linux.c -+++ b/grub-core/loader/i386/linux.c -@@ -624,6 +624,18 @@ grub_linux_boot (void) - } - #endif - -+#if defined (__x86_64__) && defined (GRUB_MACHINE_EFI) -+ if (grub_le_to_cpu16 (ctx.params->version) >= 0x020c && -+ (linux_params.xloadflags & LINUX_X86_XLF_KERNEL_64) != 0) -+ { -+ struct grub_relocator64_efi_state state64; -+ -+ state64.rsi = ctx.real_mode_target; -+ state64.rip = ctx.params->code32_start + LINUX_X86_STARTUP64_OFFSET; -+ return grub_relocator64_efi_boot (relocator, state64); -+ } -+#endif -+ - /* FIXME. */ - /* asm volatile ("lidt %0" : : "m" (idt_desc)); */ - state.ebp = state.edi = state.ebx = 0; -diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h -index 0fd6e12..d4b5508 100644 ---- a/include/grub/i386/linux.h -+++ b/include/grub/i386/linux.h -@@ -69,6 +69,16 @@ - #define GRUB_LINUX_OFW_SIGNATURE \ - (' ' << 24 | 'W' << 16 | 'F' << 8 | 'O') - -+#define LINUX_X86_XLF_KERNEL_64 (1<<0) -+#define LINUX_X86_XLF_CAN_BE_LOADED_ABOVE_4G (1<<1) -+#define LINUX_X86_XLF_EFI_HANDOVER_32 (1<<2) -+#define LINUX_X86_XLF_EFI_HANDOVER_64 (1<<3) -+#define LINUX_X86_XLF_EFI_KEXEC (1<<4) -+#define LINUX_X86_XLF_5LEVEL (1<<5) -+#define LINUX_X86_XLF_5LEVEL_ENABLED (1<<6) -+ -+#define LINUX_X86_STARTUP64_OFFSET 0x200 -+ - #ifndef ASM_FILE - - #define GRUB_E820_RAM 1 -@@ -138,7 +148,7 @@ struct linux_i386_kernel_header - grub_uint32_t kernel_alignment; - grub_uint8_t relocatable; - grub_uint8_t min_alignment; -- grub_uint8_t pad[2]; -+ grub_uint16_t xloadflags; - grub_uint32_t cmdline_size; - grub_uint32_t hardware_subarch; - grub_uint64_t hardware_subarch_data; -@@ -315,7 +325,8 @@ struct linux_kernel_params - grub_uint32_t initrd_addr_max; /* Maximum initrd address */ - grub_uint32_t kernel_alignment; /* Alignment of the kernel */ - grub_uint8_t relocatable_kernel; /* Is the kernel relocatable */ -- grub_uint8_t pad1[3]; -+ grub_uint8_t min_alignment; -+ grub_uint16_t xloadflags; - grub_uint32_t cmdline_size; /* Size of the kernel command line */ - grub_uint32_t hardware_subarch; - grub_uint64_t hardware_subarch_data; --- -cgit v1.1 - diff --git a/user/grub/0009-linux-mixed-mode.patch b/user/grub/0009-linux-mixed-mode.patch deleted file mode 100644 index d3b2135f2..000000000 --- a/user/grub/0009-linux-mixed-mode.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 1f5b180742ff2706bc3a696d115ddbc677ec75b9 Mon Sep 17 00:00:00 2001 -From: Ard Biesheuvel <ardb@kernel.org> -Date: Mon, 7 Aug 2023 14:21:51 +0200 -Subject: loader/efi/linux: Implement x86 mixed mode using legacy boot - -Recent mixed-mode Linux kernels, i.e., v4.0 or newer, can access EFI -runtime services at OS runtime even when the OS was not entered via the -EFI stub. This is because, instead of reverting back to the firmware's -segment selectors, GDTs and IDTs, the 64-bit kernel simply calls 32-bit -runtime services using compatibility mode, i.e., the same mode used for -32-bit user space, without taking down all interrupt handling, exception -handling, etc. - -This means that GRUB's legacy x86 boot mode is sufficient to make use of -this: 32-bit i686 builds of GRUB can already boot 64-bit kernels in EFI -enlightened mode, but without going via the EFI stub, and provide all -the metadata that the OS needs to map the EFI runtime regions and call -EFI runtime services successfully. - -It does mean that GRUB should not attempt to invoke the firmware's -LoadImage()/StartImage() methods on kernel builds that it knows cannot -be started natively. So, add a check for this in the native EFI boot -path and fall back to legacy x86 mode in such cases. - -Note that in the general case, booting non-native images of the same -native word size, e.g., x64 EFI apps on arm64 firmware, might be -supported by means of emulation. So, let's only disallow images that use -a non-native word size. This will also permit booting i686 kernels on -x86_64 builds, although without access to runtime services, as this is -not supported by Linux. - -This change on top of 2.12-rc1 is sufficient to boot ordinary Linux -mixed mode builds and get full access to the EFI runtime services. - -Cc: Daniel Kiper <daniel.kiper@oracle.com> -Cc: Steve McIntyre <steve@einval.com> -Cc: Julian Andres Klode <julian.klode@canonical.com> -Signed-off-by: Ard Biesheuvel <ardb@kernel.org> -Acked-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/loader/efi/linux.c | 3 +++ - include/grub/efi/pe32.h | 6 ++++++ - 2 files changed, 9 insertions(+) - -diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index ab8fb35..bfbd95a 100644 ---- a/grub-core/loader/efi/linux.c -+++ b/grub-core/loader/efi/linux.c -@@ -117,6 +117,9 @@ grub_arch_efi_linux_load_image_header (grub_file_t file, - return grub_error (GRUB_ERR_FILE_READ_ERROR, "failed to read COFF image header"); - } - -+ if (lh->pe_image_header.optional_header.magic != GRUB_PE32_NATIVE_MAGIC) -+ return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "non-native image not supported"); -+ - /* - * Linux kernels built for any architecture are guaranteed to support the - * LoadFile2 based initrd loading protocol if the image version is >= 1. -diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h -index 101859a..4e6e9d2 100644 ---- a/include/grub/efi/pe32.h -+++ b/include/grub/efi/pe32.h -@@ -267,6 +267,12 @@ struct grub_pe32_section_table - - #define GRUB_PE32_SIGNATURE_SIZE 4 - -+#if GRUB_TARGET_SIZEOF_VOID_P == 8 -+#define GRUB_PE32_NATIVE_MAGIC GRUB_PE32_PE64_MAGIC -+#else -+#define GRUB_PE32_NATIVE_MAGIC GRUB_PE32_PE32_MAGIC -+#endif -+ - struct grub_pe_image_header - { - /* This is always PE\0\0. */ --- -cgit v1.1 - diff --git a/user/grub/0010-fix-gcc-no-pie-specs.patch b/user/grub/0010-fix-gcc-no-pie-specs.patch index ecd59d24d..74b76f29e 100644 --- a/user/grub/0010-fix-gcc-no-pie-specs.patch +++ b/user/grub/0010-fix-gcc-no-pie-specs.patch @@ -1,7 +1,7 @@ diff -ur a/configure b/configure --- a/configure 2023-10-03 12:10:39.434444137 -0500 +++ b/configure 2023-10-03 12:10:58.731025605 -0500 -@@ -37616,7 +37616,7 @@ +@@ -37656,7 +37656,7 @@ if test x"$grub_cv_target_cc_efiemu64_link_format" = xunknown; then efiemu_excuse="no suitable link format for efiemu64 found" else diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index 82605a4c9..ecc2b60bb 100644 --- a/user/grub/APKBUILD +++ b/user/grub/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grub -pkgver=2.12_rc1 +pkgver=2.12 _pkgver=$(printf '%s' "$pkgver" | tr _ \~) -pkgrel=2 +pkgrel=0 pkgdesc="Boot loader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all" @@ -34,19 +34,12 @@ done install="$pkgname.post-upgrade" -source="https://alpha.gnu.org/gnu/$pkgname/$pkgname-$_pkgver.tar.xz +source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$_pkgver.tar.xz adelie-branding.patch grub2-accept-empty-module.patch - 0001-unmerged-usr.patch 0002-revert-gawk.patch - 0003-spcr-revision.patch - 0004-videoinfo-no-reinit.patch - 0005-vsnprintf.patch - 0006-cryptodisk-retval.patch - 0007-efi_gop-shadow.patch - 0008-efi-pure64.patch - 0009-linux-mixed-mode.patch 0010-fix-gcc-no-pie-specs.patch + xfs.patch grub-xen-host_grub.cfg default-grub update-grub @@ -81,6 +74,8 @@ _build_flavor() { } build() { + # missing from source tarball, will cause build error + printf "depends bli part_gpt\n" > "$builddir"/grub-core/extra_deps.lst f="" for f in $flavors; do case "$f" in @@ -189,19 +184,12 @@ mount() { mv "$pkgdir"/usr/bin/grub-mount "$subpkgdir"/usr/bin/ } -sha512sums="6f1fbce004b6dccf58e203bf6a6eeb771bac5ecc54b503265e56a97e9adce0221677bb3e64328144ec921f327a099f0345e7a9952be41cd8808f7635cded52cb grub-2.12~rc1.tar.xz +sha512sums="761c060a4c3da9c0e810b0ea967e3ebc66baa4ddd682a503ae3d30a83707626bccaf49359304a16b3a26fc4435fe6bea1ee90be910c84de3c2b5485a31a15be3 grub-2.12.tar.xz 4a6c909a1150b057fb0563f7a0646db33e16f84d6a8c443ef7db4003efd56c211a52f87699c5c95a6ccde65f6db46a8711a5b784f38479db804938dfe3115439 adelie-branding.patch -6e001762f7f562f2fafed56118079122e7602c731c70723241276f523e0882a3930d720fd847143d379ffd85626d2d7d3fa914590c0de1f0903a293695e71c41 grub2-accept-empty-module.patch -de798c8907ab5c3f00b42bf10a63a5666af2076932a46ec6e484c67303bef0509e7787910392f75b3e4ccb9aa17d67f2ef5f5fc1eed3dcdf96f598dc2400ade4 0001-unmerged-usr.patch -60e299ef0677dbd4e1e60623353be3dd8fbb1a795cbf24a9e1a2511f6a7322033254daf71116e95e93335d5e76a7a85488d66f357779a9f589f04119df8f0aea 0002-revert-gawk.patch -d7f22e5f02dfbebad5e9122a01a9d6e5fffd0bb4731790c97e5184c148a5e1e8f4d5d3d49b09b26a7768648b147b134c3b316649608d2ac8390ab63b7f278a07 0003-spcr-revision.patch -1daba1b4857c45f4e729d24cd800eb6f6b659ea5c8399394487f75817b4f7092e5972676fc8c28b6289e04f0fe41d4ca54dc4523db1393cdb65751d377a06d8a 0004-videoinfo-no-reinit.patch -0a69b2f9cb178b8ae4a7b96f1cb801ef6d6d7942a842346de5017b6fdb5a8bd6db1ad55fdd9cc41a6c4660be9985621008d1da1dc45510d6ffed425f0f4997d1 0005-vsnprintf.patch -9b444c596c3c7387c18f3d6747ce4000d8e1ac89a07d919f3c648b07a3492911a6b7a84764c7f953a8a7873f26dedf10549a46008bc23e38d1da3eeb6d1850e3 0006-cryptodisk-retval.patch -a16569a037b29a669d5bd68f6130b1c59870f8bb660bf98b318f0dac39bb9a0026d76e2d47298e2b22a91f75aa34c234785149b61e699dfdde27020210023e84 0007-efi_gop-shadow.patch -13a819813b82ed13752dff2bf2ddaf47e1c369f10148a988a2517d51f33c11ee187f3c6909c08a1b922440aebebe1f3178fe8f63f85055129b74893885e0db1f 0008-efi-pure64.patch -911a28fa28f966369039e14062deaf90c81818c06fb3f44add27c395a3074b8c1b858a47c1a97909e07b813a87633bf244e5ee4db23f9d429edd9a05f5b5d72a 0009-linux-mixed-mode.patch -1552f56c17c55aabae26c64beeb9ed507623331794d4b590721fa0f22b658831bbef3475dfb8c125ab05e8ec62939d5928416c32d2c968a4a2a98bee0744c1fd 0010-fix-gcc-no-pie-specs.patch +f1daae3015c84af94aeffce20de1068c3de272aff59f809e956a085cf289c371c61b64ad1d440765c98a4d674761ea67d2986cc4b1d0dfffcf71caaf94c6f600 grub2-accept-empty-module.patch +18502c79128d88154885a6e595bb42d4167f4e08e89e5bd9471234d4e4ba0d6a6ab7dc50a324e9c71ee8a92f3dee8f1a800942adf62ac8bc4041c6a154b19beb 0002-revert-gawk.patch +4b369af412a303464fb538f0f1d7c51dfba4481448409204290e7959397243cb544ecaa8bd9db096788e1eccae0c4c6fac1af9b7819c34f20d01a0eb6c5105ff 0010-fix-gcc-no-pie-specs.patch +60f884595a713e52052eb1741bd2a9f42110736b689c045d9fb23d08970fb8475f25bfdf056552040a7b5559817289774f987c825ef006e556d79f718935376f xfs.patch 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg 1cb675fa0af9a1fd8d1a868e3e9de3bfef7eada66c5df0cfef23eca33e93e676eed6e1f67c679690f3e581565b350a9f3ba01aa9b89de66c970ea61ca21bcd65 default-grub 8e5f1cf91da9fd956695438509bb26e45f38170ca90d99a996e859053d72c82b7e4b02cb8979f047fc53498036f47b5400bf54687c390793995a05ded4216d55 update-grub diff --git a/user/grub/grub2-accept-empty-module.patch b/user/grub/grub2-accept-empty-module.patch index f4f62d433..b6def4f94 100644 --- a/user/grub/grub2-accept-empty-module.patch +++ b/user/grub/grub2-accept-empty-module.patch @@ -10,7 +10,7 @@ also no relocations that's no problem (and that is checked independendly). --- grub-2.02~beta3/util/grub-module-verifierXX.c.mm 2016-02-11 10:57:41.000000000 +0000 +++ grub-2.02~beta3/util/grub-module-verifierXX.c 2016-08-31 15:26:36.000000000 +0000 -@@ -225,7 +225,8 @@ check_symbols (const struct grub_module_ +@@ -305,7 +305,8 @@ check_symbols (const struct grub_module_ s = find_section (arch, e, ".moddeps"); if (!s) diff --git a/user/grub/xfs.patch b/user/grub/xfs.patch new file mode 100644 index 000000000..922c40923 --- /dev/null +++ b/user/grub/xfs.patch @@ -0,0 +1,56 @@ +From 68dd65cfdaad08b1f8ec01b84949b0bf88bc0d8c Mon Sep 17 00:00:00 2001 +From: Jon DeVree <nuxi@vault24.org> +Date: Sun, 11 Feb 2024 10:34:58 -0500 +Subject: fs/xfs: Handle non-continuous data blocks in directory extents + +The directory extent list does not have to be a continuous list of data +blocks. When GRUB tries to read a non-existant member of the list, +grub_xfs_read_file() will return a block of zero'ed memory. Checking for +a zero'ed magic number is sufficient to skip this non-existant data block. + +Prior to commit 07318ee7e (fs/xfs: Fix XFS directory extent parsing) +this was handled as a subtle side effect of reading the (non-existant) +tail data structure. Since the block was zero'ed the computation of the +number of directory entries in the block would return 0 as well. + +Fixes: 07318ee7e (fs/xfs: Fix XFS directory extent parsing) +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2254370 + +Signed-off-by: Jon DeVree <nuxi@vault24.org> +Reviewed-By: Vladimir Serbinenko <phcoder@gmail.com> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> +--- + grub-core/fs/xfs.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index bc2224dbb..8e02ab4a3 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -902,6 +902,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, + grub_xfs_first_de(dir->data, dirblock); + int entries = -1; + char *end = dirblock + dirblk_size; ++ grub_uint32_t magic; + + numread = grub_xfs_read_file (dir, 0, 0, + blk << dirblk_log2, +@@ -912,6 +913,15 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, + return 0; + } + ++ /* ++ * If this data block isn't actually part of the extent list then ++ * grub_xfs_read_file() returns a block of zeros. So, if the magic ++ * number field is all zeros then this block should be skipped. ++ */ ++ magic = *(grub_uint32_t *)(void *) dirblock; ++ if (!magic) ++ continue; ++ + /* + * Leaf and tail information are only in the data block if the number + * of extents is 1. +-- +cgit v1.2.3-70-g09d2 + diff --git a/user/gspell/APKBUILD b/user/gspell/APKBUILD new file mode 100644 index 000000000..69599a5c1 --- /dev/null +++ b/user/gspell/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=gspell +pkgver=1.14.0 +pkgrel=0 +pkgdesc="Spelling checker library for GTK programs" +url="https://gnome.org" +arch="all" +options="!check" # does not support enchant aspell backend; see + # https://bugzilla.gnome.org/show_bug.cgi?id=772406 +license="LGPL-2.1+" +depends="" +checkdepends="aspell aspell-dict-en" +makedepends="enchant-dev glib-dev gobject-introspection-dev gtk-doc gtk+3.0-dev meson vala-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://download.gnome.org/sources/gspell/${pkgver%.*}/gspell-$pkgver.tar.xz" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + --wrap-mode=nofallback \ + . output + meson compile -C output +} + +check() { + LANG="en_US.UTF-8" meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="d2e9931f4c37170b483ece9ee50b0af8aa281cf1bde5ac009d2a0c7dd2dbfc90e591df13dd555465c04cccdc2864b788d372625be9f71d6541e6e6b0fd3c4370 gspell-1.14.0.tar.xz" diff --git a/user/gst-plugins-bad/APKBUILD b/user/gst-plugins-bad/APKBUILD index b148cc811..4a6cef267 100644 --- a/user/gst-plugins-bad/APKBUILD +++ b/user/gst-plugins-bad/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-bad -pkgver=1.20.2 -pkgrel=3 +pkgver=1.26.1 +pkgrel=0 pkgdesc="GStreamer multimedia framework - Lower-quality plugins" url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html" arch="all" +options="!check" # nvidious license="LGPL-2.1+" # rtpmanagerbad depends on rtpmanager # symptom: tests 'rtpsrc' and 'rtpsink' will fail @@ -19,12 +20,7 @@ makedepends="gst-plugins-base-dev gstreamer-dev gobject-introspection-dev meson subpackages="$pkgname-dev $pkgname-lang" ldpath="/usr/lib/gstreamer-1.0" source="https://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz - camerabin.patch curlhttpsrc.patch - mpegts.patch - fix-arm-test-alignment.patch - fix-arm-parser-alignment.patch - disable-failing-test.patch " build() { @@ -45,10 +41,5 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="3f98973dc07ead745418e0a30f9f6b5c8d328e3d126f54d92c10ab5da04271768a5c5dffc36ea24ccf8fb516b1e3733be9fb18dc0db419dea4d37d17018f8a70 gst-plugins-bad-1.20.2.tar.xz -7f6023e766895ac8213f9dabd4d8acbeb03f18c2d98fa27865e7656c439e0ea97d02f9e9f0ea98205238ddb8f6473062af524b799d1da0cbe41a3055a11df250 camerabin.patch -d4bf36560db0e6391cfca84f928d7147bb6b170431c521e78253b29f6bccf122309e1f92e241808855dfa112b9a06e17c1b6ed4363e011a0693f82e1bfe7ea3e curlhttpsrc.patch -d70f409f86b072d689d51b87db6e9fb161c0914a381eccbf66f1ffcd61b9a793f9e4087cdd071e615aaa63687c6ee476f023239920dd1ebd0d3cde346031dc86 mpegts.patch -566fbdc37c9f9fb5b671ecffa2f596a95f6431668ff8dd8b91bc827a280b5fb18a8fac3122a38f060263cb3f2d2138805af1e1c324eb619188f982c8cc575221 fix-arm-test-alignment.patch -f394b1643a5d0943e8acd7e9ee11702ce3bbfb27242f3eac140b884ce7bb5dea725ab4bb0a28cbf9d435622dcc68ea0ee0bee1c51a520787c382167dd1e43583 fix-arm-parser-alignment.patch -3c900a5cbe3ac129172f36acd4d9ede2610ceab500515c32a380dabd2d3d3f78d26be0c9521db855d13283b5be154c9407cd6bf5ec59524305170fc2db2572cb disable-failing-test.patch" +sha512sums="69c78970f0396c08fbddbd44e080142688fcd1ecdc0fa88709b934f6c546754904338469ceecd0f16c6a6b8585bf5faec3230426272b7eb2b63a21b9034d94db gst-plugins-bad-1.26.1.tar.xz +d4bf36560db0e6391cfca84f928d7147bb6b170431c521e78253b29f6bccf122309e1f92e241808855dfa112b9a06e17c1b6ed4363e011a0693f82e1bfe7ea3e curlhttpsrc.patch" diff --git a/user/gst-plugins-bad/disable-failing-test.patch b/user/gst-plugins-bad/disable-failing-test.patch deleted file mode 100644 index b650bf519..000000000 --- a/user/gst-plugins-bad/disable-failing-test.patch +++ /dev/null @@ -1,59 +0,0 @@ -This patch was modified from upstream in the following way(s): - -* Adjust paths so that it applies to this subproject. - -From 81e7bde67c7aa4de2f846db1ed619771613259da Mon Sep 17 00:00:00 2001 -From: Edward Hervey <edward@centricular.com> -Date: Thu, 5 Sep 2024 10:08:17 +0200 -Subject: [PATCH] check: Disable failing test - -Test hasn't been properly fixed for several years with modern libsoup, and it -only for the legacy adaptive demuxer. - -Fixes #3783 - -Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7454> ---- - .../gst-plugins-bad/tests/check/elements/dash_mpd.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c b/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c -index 1d347b0a54ea..91d6cc505d91 100644 ---- a/tests/check/elements/dash_mpd.c -+++ b/tests/check/elements/dash_mpd.c -@@ -5999,6 +5999,12 @@ GST_START_TEST (dash_mpdparser_maximum_segment_duration) - - GST_END_TEST; - -+#if 0 -+/* -+ * Test disabled due to failures with recent libsoup -+*/ -+ -+ - /* - * Test parsing of Perioud using @xlink:href attribute - */ -@@ -6103,6 +6109,7 @@ GST_START_TEST (dash_mpdparser_xlink_period) - - GST_END_TEST; - -+#endif - - /* - * Test parsing xsd:datetime with timezoneoffset. -@@ -6658,8 +6665,11 @@ dash_suite (void) - tcase_add_test (tc_simpleMPD, dash_mpdparser_various_duration_formats); - tcase_add_test (tc_simpleMPD, dash_mpdparser_default_presentation_delay); - -+#if 0 -+ /* Test disabled due to failure with libsoup */ - /* tests checking xlink attributes */ - tcase_add_test (tc_simpleMPD, dash_mpdparser_xlink_period); -+#endif - - /* tests checking the MPD management - * (eg. setting active streams, obtaining attributes values) --- -GitLab - diff --git a/user/gst-plugins-bad/fix-arm-parser-alignment.patch b/user/gst-plugins-bad/fix-arm-parser-alignment.patch deleted file mode 100644 index 63715380e..000000000 --- a/user/gst-plugins-bad/fix-arm-parser-alignment.patch +++ /dev/null @@ -1,32 +0,0 @@ -This patch differs from upstream in the following way(s): - - * Paths changed to accommodate 'builddir' - -From 10930661ee8ab2f43078ece482c33ca74c2440fb Mon Sep 17 00:00:00 2001 -From: Zach van Rijn <me@zv.io> -Date: Thu, 13 Jun 2024 09:11:30 -0500 -Subject: [PATCH] pcapparse: Avoid unaligned memory access - -Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3602 ---- - subprojects/gst-plugins-bad/gst/pcapparse/gstpcapparse.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/subprojects/gst-plugins-bad/gst/pcapparse/gstpcapparse.c b/subprojects/gst-plugins-bad/gst/pcapparse/gstpcapparse.c -index 53e7ef6fc25..0a9c9a6063b 100644 ---- a/gst/pcapparse/gstpcapparse.c -+++ b/gst/pcapparse/gstpcapparse.c -@@ -456,8 +456,8 @@ gst_pcap_parse_scan_frame (GstPcapParse * self, - return FALSE; - - /* ip info */ -- ip_src_addr = *((guint32 *) (buf_ip + 12)); -- ip_dst_addr = *((guint32 *) (buf_ip + 16)); -+ memcpy(&ip_src_addr, buf_ip + 12, sizeof(ip_src_addr)); -+ memcpy(&ip_dst_addr, buf_ip + 16, sizeof(ip_dst_addr)); - buf_proto = buf_ip + ip_header_size; - ip_packet_len = GUINT16_FROM_BE (*(guint16 *) (buf_ip + 2)); - --- -GitLab - diff --git a/user/gst-plugins-bad/fix-arm-test-alignment.patch b/user/gst-plugins-bad/fix-arm-test-alignment.patch deleted file mode 100644 index 1a03eafa7..000000000 --- a/user/gst-plugins-bad/fix-arm-test-alignment.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 57a1296d5913b222be87ccee1ae981b84931a7da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> -Date: Tue, 13 Jun 2023 01:29:14 +0100 -Subject: [PATCH 2/2] asfmux: fix potentially unaligned write on 32-bit ARM - -Fixes #2665 ---- - .../gst-plugins-bad/gst/asfmux/gstasfobjects.c | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/subprojects/gst-plugins-bad/gst/asfmux/gstasfobjects.c b/subprojects/gst-plugins-bad/gst/asfmux/gstasfobjects.c -index d9739826384..fa0f2849d17 100644 ---- a/gst/asfmux/gstasfobjects.c -+++ b/gst/asfmux/gstasfobjects.c -@@ -311,14 +311,10 @@ gst_asf_put_time (guint8 * buf, guint64 time) - void - gst_asf_put_guid (guint8 * buf, Guid guid) - { -- guint32 *aux32 = (guint32 *) buf; -- guint16 *aux16 = (guint16 *) & (buf[4]); -- guint64 *aux64 = (guint64 *) & (buf[8]); -- *aux32 = GUINT32_TO_LE (guid.v1); -- *aux16 = GUINT16_TO_LE (guid.v2); -- aux16 = (guint16 *) & (buf[6]); -- *aux16 = GUINT16_TO_LE (guid.v3); -- *aux64 = GUINT64_TO_BE (guid.v4); -+ GST_WRITE_UINT32_LE (buf + 0, guid.v1); -+ GST_WRITE_UINT16_LE (buf + 4, guid.v2); -+ GST_WRITE_UINT16_LE (buf + 6, guid.v3); -+ GST_WRITE_UINT64_BE (buf + 8, guid.v4); - } - - /** --- -GitLab diff --git a/user/gst-plugins-bad/mpegts.patch b/user/gst-plugins-bad/mpegts.patch deleted file mode 100644 index 1579c4e32..000000000 --- a/user/gst-plugins-bad/mpegts.patch +++ /dev/null @@ -1,120 +0,0 @@ -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1314 - ---- gst-plugins-bad-1.20.2/gst-libs/gst/mpegts/gstmpegtsdescriptor.c.old 2022-05-02 17:29:29.000000000 -0500 -+++ gst-plugins-bad-1.20.2/gst-libs/gst/mpegts/gstmpegtsdescriptor.c 2022-07-02 23:19:51.027302943 -0500 -@@ -296,7 +296,7 @@ - dvb_text_from_utf8 (const gchar * text, gsize * out_size) - { - GError *error = NULL; -- gchar *out_text; -+ gchar *out_text = NULL; - guint8 *out_buffer; - guint encoding; - GIConv giconv = (GIConv) - 1; -@@ -304,7 +304,8 @@ - /* We test character maps one-by-one. Start with the default */ - encoding = _ICONV_ISO6937; - giconv = _get_iconv (_ICONV_UTF8, encoding); -- out_text = g_convert_with_iconv (text, -1, giconv, NULL, out_size, &error); -+ if (giconv != (GIConv) - 1) -+ out_text = g_convert_with_iconv (text, -1, giconv, NULL, out_size, &error); - - if (out_text) { - GST_DEBUG ("Using default ISO6937 encoding"); ---- gst-plugins-bad-1.20.2/tests/check/libs/mpegts.c.old 2022-05-02 17:29:29.000000000 -0500 -+++ gst-plugins-bad-1.20.2/tests/check/libs/mpegts.c 2022-07-02 23:41:27.379013955 -0500 -@@ -71,6 +71,14 @@ - 0xc0, 0x00, 0xc4, 0x86, 0x56, 0xa5 - }; - -+static gboolean -+_has_iso6937_iconv (void) -+{ -+ GIConv test = (GIConv) - 1; -+ test = g_iconv_open("iso6937", "utf-8"); -+ return (test != (GIConv) - 1); -+} -+ - GST_START_TEST (test_scte_sit) - { - GstMpegtsSCTESIT *sit; -@@ -397,11 +405,12 @@ - - fail_if (data == NULL); - -- for (i = 0; i < data_size; i++) { -- if (data[i] != nit_data_check[i]) -- fail ("0x%X != 0x%X in byte %d of NIT section", data[i], -- nit_data_check[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < data_size; i++) { -+ if (data[i] != nit_data_check[i]) -+ fail ("0x%X != 0x%X in byte %d of NIT section", data[i], -+ nit_data_check[i], i); -+ } - - /* Check assertion on bad CRC. Reset parsed data, and make the CRC corrupt */ - nit_section->data[nit_section->section_length - 1]++; -@@ -486,11 +495,12 @@ - - fail_if (data == NULL); - -- for (i = 0; i < data_size; i++) { -- if (data[i] != sdt_data_check[i]) -- fail ("0x%X != 0x%X in byte %d of SDT section", data[i], -- sdt_data_check[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < data_size; i++) { -+ if (data[i] != sdt_data_check[i]) -+ fail ("0x%X != 0x%X in byte %d of SDT section", data[i], -+ sdt_data_check[i], i); -+ } - - /* Check assertion on bad CRC. Reset parsed data, and make the CRC corrupt */ - sdt_section->data[sdt_section->section_length - 1]++; -@@ -594,14 +604,15 @@ - /* Check creation of descriptor */ - desc = gst_mpegts_descriptor_from_dvb_network_name ("Name"); - fail_if (desc == NULL); -- fail_unless (desc->length == 4); -+ if (_has_iso6937_iconv()) fail_unless (desc->length == 4); - fail_unless (desc->tag == 0x40); - -- for (i = 0; i < 6; i++) { -- if (desc->data[i] != network_name_descriptor[i]) -- fail ("0x%X != 0x%X in byte %d of network name descriptor", -- desc->data[i], network_name_descriptor[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < 6; i++) { -+ if (desc->data[i] != network_name_descriptor[i]) -+ fail ("0x%X != 0x%X in byte %d of network name descriptor", -+ desc->data[i], network_name_descriptor[i], i); -+ } - - /* Check parsing of descriptor */ - ret = gst_mpegts_descriptor_parse_dvb_network_name (desc, &string); -@@ -623,14 +634,15 @@ - desc = gst_mpegts_descriptor_from_dvb_service - (GST_DVB_SERVICE_DIGITAL_TELEVISION, "Name", "Provider"); - fail_if (desc == NULL); -- fail_unless (desc->length == 15); -+ if (_has_iso6937_iconv()) fail_unless (desc->length == 15); - fail_unless (desc->tag == 0x48); - -- for (i = 0; i < 17; i++) { -- if (desc->data[i] != service_descriptor[i]) -- fail ("0x%X != 0x%X in byte %d of service descriptor", -- desc->data[i], service_descriptor[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < 17; i++) { -+ if (desc->data[i] != service_descriptor[i]) -+ fail ("0x%X != 0x%X in byte %d of service descriptor", -+ desc->data[i], service_descriptor[i], i); -+ } - - /* Check parsing of descriptor with data */ - ret = gst_mpegts_descriptor_parse_dvb_service diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD index 6a89cb469..9aa2afd80 100644 --- a/user/gst-plugins-base/APKBUILD +++ b/user/gst-plugins-base/APKBUILD @@ -1,11 +1,10 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-base -pkgver=1.20.1 -pkgrel=1 +pkgver=1.26.1 +pkgrel=0 pkgdesc="GStreamer multimedia framework - Base plugins" url="https://gstreamer.freedesktop.org/" arch="all" -options="!check" # fails overlaycomposition on ppc64 license="GPL LGPL" depends="" makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev iso-codes-dev @@ -15,27 +14,30 @@ makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev iso-codes-dev orc-compiler orc-dev pango-dev wayland-dev wayland-protocols !gst-plugins-base" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz" +source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz + endian.patch + " ldpath="/usr/lib/gstreamer-1.0" build() { - meson \ + meson setup \ --wrap-mode=nofallback \ -Dprefix=/usr \ -Dintrospection=enabled \ -Dnls=enabled \ -Dpackage-name="GStreamer Base Plugins (${DISTRO_NAME:-Adélie Linux})" \ -Dpackage-origin="${DISTRO_URL:-https://www.adelielinux.org/}" \ - _build - ninja -C _build + build + meson compile -C build } check() { - ninja -C _build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C _build install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="679a0eee1973fa9612e2e24978e2c2d9d8fdc5732e1699b4a87712881f1549d0811719a13ff4fe77b91322ca4425c39623b371703f6b3a36fb7238b977d3e541 gst-plugins-base-1.20.1.tar.xz" +sha512sums="b0c491755856af37fd8416af57b782ba04cfdf4298947a521ece90b4723fcf331199f428c74fafb37b3094a8172a0d409d20079544f7424fd6c089574313e296 gst-plugins-base-1.26.1.tar.xz +b44763d6b380bb51d246b64019078ee621a2d64a00f29f12039fd52aafd1c24e204350ea5c967c2fecb298075f6e45f62d16c3116d20aca8da557ace84ba0744 endian.patch" diff --git a/user/gst-plugins-base/endian.patch b/user/gst-plugins-base/endian.patch new file mode 100644 index 000000000..ed06e7c7f --- /dev/null +++ b/user/gst-plugins-base/endian.patch @@ -0,0 +1,40 @@ +--- gst-plugins-base-1.26.1/gst/videoconvertscale/gstvideoconvertscale.c.old 2025-04-24 14:20:14.000000000 -0500 ++++ gst-plugins-base-1.26.1/gst/videoconvertscale/gstvideoconvertscale.c 2025-05-11 14:05:05.042191384 -0500 +@@ -1407,8 +1407,13 @@ + g_return_val_if_fail (gst_value_is_fixed (from_par), othercaps); + + gst_video_convert_scale_get_fraction (from_par, &from_par_n, &from_par_d); +- gst_structure_get (ins, +- "width", G_TYPE_INT, &from_w, "height", G_TYPE_INT, &from_h, NULL); ++ { ++ gint wi = 0, hi = 0; ++ gst_structure_get (ins, ++ "width", G_TYPE_INT, &wi, "height", G_TYPE_INT, &hi, NULL); ++ from_w = wi; ++ from_h = hi; ++ } + + { + gint wi = 0, hi = 0; +--- gst-plugins-base-1.26.1/tests/check/elements/audiomixer.c.old 2025-04-24 14:20:14.000000000 -0500 ++++ gst-plugins-base-1.26.1/tests/check/elements/audiomixer.c 2025-05-11 14:06:12.944933423 -0500 +@@ -2125,12 +2125,18 @@ + gst_message_unref (msg); + } + ++#if G_BYTE_ORDER == G_LITTLE_ENDIAN ++#define AUDIO_FMT "S16LE" ++#else ++#define AUDIO_FMT "S16BE" ++#endif ++ + GST_START_TEST (test_qos_message_live) + { + GstBus *bus = gst_bus_new (); + GstHarness *h, *h2; + GstBuffer *b; +- static const char *caps_str = "audio/x-raw, format=(string)S16LE, " ++ static const char *caps_str = "audio/x-raw, format=(string)" AUDIO_FMT ", " + "rate=(int)1000, channels=(int)1, layout=(string)interleaved"; + GstMessage *msg; + GstPad *pad; diff --git a/user/gst-plugins-good/APKBUILD b/user/gst-plugins-good/APKBUILD index bc8624aa0..2570bf9df 100644 --- a/user/gst-plugins-good/APKBUILD +++ b/user/gst-plugins-good/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-good -pkgver=1.20.2 -pkgrel=2 +pkgver=1.26.1 +pkgrel=0 pkgdesc="GStreamer multimedia framework - Free, well-written plugins" url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html" arch="all" @@ -18,27 +18,26 @@ makedepends="gst-plugins-base-dev gstreamer-dev gobject-introspection-dev subpackages="$pkgname-gtk $pkgname-lang" ldpath="/usr/lib/gstreamer-1.0" source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz - drop-messages-interval-type.patch - fix-arm-test-alignment.patch + flvmux-disable-flaky-test.patch " build() { - meson \ + meson setup \ -Dprefix=/usr \ -Dnls=enabled \ -Dorc=disabled \ -Dpackage-name="GStreamer Good Plugins (${DISTRO_NAME:-Adélie Linux})" \ -Dpackage-origin="${DISTRO_URL:-https://www.adelielinux.org/}" \ - _build - ninja -C _build + build + meson compile -C build } check() { - ninja -C _build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C _build install + DESTDIR="$pkgdir" meson install -C build } gtk() { @@ -51,6 +50,5 @@ gtk() { "$subpkgdir"/usr/lib/gstreamer-1.0/ } -sha512sums="a10ea48fdfbe741e9bc63036b011748558f89968aaa525380ac99884c27463d190c0b49e2d98b4f554eee6ead8a5c5da3ba62e5b0b1fe54877598beccc68a933 gst-plugins-good-1.20.2.tar.xz -0f08a08d6f0e8303a9c899c5260f6ca2c0e0a41e1ca2a9c795c1cb1267a9003354cd0e5538022049a09784ba9000a4a60b7a0b07b38a18483ec30d9a86356e46 drop-messages-interval-type.patch -b08c5013100dff428125dca9075641a8c528ccdcdf005b66b286cfe3b8b6f80c4b04f41d768883e98112107b857e17af68e2864a331f379bd7ea5027adc641d8 fix-arm-test-alignment.patch" +sha512sums="ce096c912e6dfdec5c6e815b712e949296a18ea358cdb124997f256b1fbf8a68db9fc75c4e05a69a2cecd20de1a6bdb3fcfe4422f6d81b6f887ee484b5d1a556 gst-plugins-good-1.26.1.tar.xz +d31d0f70703efb13fbe919f008e1029a08649d3220f5689c7aa105cbbfe3c8cda4a2ae0b01bad32cb295ea202a965cb719776bd86f463a7b78d5b091b00e0348 flvmux-disable-flaky-test.patch" diff --git a/user/gst-plugins-good/drop-messages-interval-type.patch b/user/gst-plugins-good/drop-messages-interval-type.patch deleted file mode 100644 index ebf0c1e5a..000000000 --- a/user/gst-plugins-good/drop-messages-interval-type.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-URL: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3580 - -From e91ab24c5777986926bea5e9f0c832f606c9fb52 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Fri, 16 Dec 2022 01:00:46 -0600 -Subject: [PATCH] tests: Cast drop-messages-interval type properly - -The rtpjitterbuffer test drop_messages_interval uses a GstClockTime for -the message drop interval. This property is defined as a guint. On -systems with 64-bit time_t but 32-bit uint, this can cause the -g_object_set function to fail to read the arguments properly. - -Fixes: #1656 ---- - .../gst-plugins-good/tests/check/elements/rtpjitterbuffer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - - ---- gst-plugins-good-1.20.2/tests/check/elements/rtpjitterbuffer.c.old 2022-05-02 22:29:29.000000000 +0000 -+++ gst-plugins-good-1.20.2/tests/check/elements/rtpjitterbuffer.c 2022-12-16 07:04:53.663472650 +0000 -@@ -3097,7 +3097,7 @@ - guint num_sent_msg = 0; - - g_object_set (h->element, "post-drop-messages", TRUE, NULL); -- g_object_set (h->element, "drop-messages-interval", interval, NULL); -+ g_object_set (h->element, "drop-messages-interval", (guint)interval, NULL); - next_seqnum = construct_deterministic_initial_state (h, latency_ms); - - /* Create a bus to get the drop message on */ diff --git a/user/gst-plugins-good/fix-arm-test-alignment.patch b/user/gst-plugins-good/fix-arm-test-alignment.patch deleted file mode 100644 index 2b2a6a0c0..000000000 --- a/user/gst-plugins-good/fix-arm-test-alignment.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 57ced2fded938aa08d8727683a1823ae36170fc3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> -Date: Mon, 12 Jun 2023 19:24:15 +0100 -Subject: [PATCH] tests: rtpbin_buffer_list: fix possible unaligned read on - 32-bit ARM - -Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/689 ---- - .../tests/check/elements/rtpbin_buffer_list.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/subprojects/gst-plugins-good/tests/check/elements/rtpbin_buffer_list.c b/subprojects/gst-plugins-good/tests/check/elements/rtpbin_buffer_list.c -index b804744352a..1c3d5cdd3a7 100644 ---- a/tests/check/elements/rtpbin_buffer_list.c -+++ b/tests/check/elements/rtpbin_buffer_list.c -@@ -25,6 +25,12 @@ - #include <gst/rtp/gstrtpbuffer.h> - #include <gst/rtp/gstrtcpbuffer.h> - -+#if G_BYTE_ORDER == G_BIG_ENDIAN -+#define READ_UINT64(mem) GST_READ_UINT64_BE(mem) -+#else -+#define READ_UINT64(mem) GST_READ_UINT64_LE(mem) -+#endif -+ - /* UDP/IP is assumed for bandwidth calculation */ - #define UDP_IP_HEADER_OVERHEAD 28 - -@@ -236,8 +242,8 @@ check_header (GstBuffer * buffer, guint index) - * most likely be changed in gstrtpbin. - */ - fail_unless (info.data != NULL); -- fail_unless_equals_uint64 (*(guint64 *) info.data, -- *(guint64 *) rtp_header[index]); -+ fail_unless_equals_uint64 (READ_UINT64 (info.data), -+ READ_UINT64 (rtp_header[index])); - fail_unless (*(guint16 *) (info.data + 12) == - *(guint16 *) (rtp_header[index] + 12)); - --- -GitLab - diff --git a/user/gst-plugins-good/flvmux-disable-flaky-test.patch b/user/gst-plugins-good/flvmux-disable-flaky-test.patch new file mode 100644 index 000000000..ef2d3feb3 --- /dev/null +++ b/user/gst-plugins-good/flvmux-disable-flaky-test.patch @@ -0,0 +1,15 @@ +This test is known flaky and causes a timeout every time on ppc64. + +Upstream-URL: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2803 + +--- gst-plugins-good-1.26.1/tests/check/elements/flvmux.c.old 2025-04-24 14:20:14.000000000 -0500 ++++ gst-plugins-good-1.26.1/tests/check/elements/flvmux.c 2025-05-17 17:53:27.568081593 -0500 +@@ -1162,7 +1162,7 @@ + + tcase_add_test (tc_chain, test_speex_streamable); + tcase_add_test (tc_chain, test_increasing_timestamp_when_pts_none); +- tcase_add_test (tc_chain, test_video_caps_late); ++ //tcase_add_test (tc_chain, test_video_caps_late); + tcase_add_test (tc_chain, test_audio_caps_change_streamable); + tcase_add_test (tc_chain, test_video_caps_change_streamable); + tcase_add_test (tc_chain, test_audio_caps_change_streamable_single); diff --git a/user/gstreamer/APKBUILD b/user/gstreamer/APKBUILD index 94c5af1c9..7ee893c50 100644 --- a/user/gstreamer/APKBUILD +++ b/user/gstreamer/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gstreamer -pkgver=1.20.1 +pkgver=1.26.1 pkgrel=0 pkgdesc="GStreamer multimedia framework" url="https://gstreamer.freedesktop.org/" @@ -9,16 +9,12 @@ license="LGPL-2.0+" depends="" depends_dev="libxml2-dev" makedepends="$depends_dev bison flex gobject-introspection-dev glib-dev - meson ninja" + meson" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-lang" -source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz - disable-tests.patch - test-deadlock.patch - time64.patch - " +source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz" build() { - meson \ + meson setup \ -Dprefix=/usr \ -Dintrospection=enabled \ -Dpackage-name="GStreamer (${DISTRO_NAME:-Adélie Linux})" \ @@ -26,16 +22,16 @@ build() { -Dglib-asserts=disabled \ -Dnls=enabled \ -Dptp-helper-permissions=none \ - _build - ninja -C _build + build + meson compile -C build } check() { - ninja -C _build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C _build install + DESTDIR="$pkgdir" meson install -C build } dev() { @@ -55,7 +51,4 @@ tools() { mv "$pkgdir"/usr/lib/libgstcheck-1.0.so.* "$subpkgdir"/usr/lib/ } -sha512sums="d6f67cce81ba15fba3fcf70850e3c84b25e8da3e53fd56e6f2c87c7ee1701071ea44deb754a0ea371b3cb17877f26aab94d9eccb6729cbb370d6d6d5c324aa1a gstreamer-1.20.1.tar.xz -39e6bfb52ebe85beefa2550eb404f83c5bbb3546cc1733b99e757401d2d182f95d829b90df99d5f43506d7c85d4f44ac797f35653cd42a935f1dc56d0b844c02 disable-tests.patch -d7e574e8715607d3103d46eb05388b781702a9e937d78f8cfab6d8d48d04baa7fbfe547bdeb816bbfddb5a333dd1862e460b057b12ea24704351ef5653f78491 test-deadlock.patch -977a9e689cce68b151a742ef67dbb60a10a55fcfae67f086909e1f0fc4a5998026acd03aeed32068fdb0485dd884c4313f39a63e3bab5baaafa878c439531bc3 time64.patch" +sha512sums="7a5da377fbfb25cacc2d9613a57210c00ca70ee00f3ef4d108a3c98bd6a2cb703b773ca6fd6d9ac7b59b60d0bf0573cff69bdea18e07159ac56ee992613d0a78 gstreamer-1.26.1.tar.xz" diff --git a/user/gstreamer/disable-tests.patch b/user/gstreamer/disable-tests.patch deleted file mode 100644 index 7fc78e9e4..000000000 --- a/user/gstreamer/disable-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -elements_leaks: - Fails due to heavy parallelisation on ppc64. - It always succeeds when run serially. - -elements_filesink: - Seems to be disabled on other musl distros as well. - Filed at: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1194 - ---- gstreamer-1.20.1/tests/check/meson.build.old 2022-03-14 06:33:40.000000000 -0500 -+++ gstreamer-1.20.1/tests/check/meson.build 2022-05-02 01:55:00.352168066 -0500 -@@ -84,11 +84,11 @@ - [ 'elements/fakesrc.c', not gst_registry ], - # FIXME: blocked forever on Windows due to missing fcntl (.. O_NONBLOCK) - [ 'elements/fdsrc.c', not gst_registry or host_system == 'windows' ], -- [ 'elements/filesink.c', not gst_registry ], -+ [ 'elements/filesink.c', true ], - [ 'elements/filesrc.c', not gst_registry ], - [ 'elements/funnel.c', not gst_registry ], - [ 'elements/identity.c', not gst_registry or not gst_parse ], -- [ 'elements/leaks.c', not tracer_hooks or not gst_debug ], -+ [ 'elements/leaks.c', true ], - [ 'elements/multiqueue.c', not gst_registry ], - [ 'elements/selector.c', not gst_registry ], - [ 'elements/streamiddemux.c', not gst_registry ], diff --git a/user/gstreamer/test-deadlock.patch b/user/gstreamer/test-deadlock.patch deleted file mode 100644 index b506ca19f..000000000 --- a/user/gstreamer/test-deadlock.patch +++ /dev/null @@ -1,140 +0,0 @@ -From f24595e9d7952e1e957c0973de62e6c3df031c08 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Sun, 20 Feb 2022 23:26:10 +0000 -Subject: [PATCH 1/3] gstreamer: tests: make the gstbin pop message more clear - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> ---- - tests/check/gst/gstbin.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c -index e366d5fe20f..06be4c75fbb 100644 ---- a/tests/check/gst/gstbin.c -+++ b/tests/check/gst/gstbin.c -@@ -38,7 +38,7 @@ pop_async_done (GstBus * bus) - == GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE"); - - gst_message_unref (message); -- GST_DEBUG ("popped message"); -+ GST_DEBUG ("popped async-done message"); - } - - static void -@@ -46,14 +46,14 @@ pop_latency (GstBus * bus) - { - GstMessage *message; - -- GST_DEBUG ("popping async-done message"); -+ GST_DEBUG ("popping latency message"); - message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, -1); - - fail_unless (message && GST_MESSAGE_TYPE (message) - == GST_MESSAGE_LATENCY, "did not get GST_MESSAGE_LATENCY"); - - gst_message_unref (message); -- GST_DEBUG ("popped message"); -+ GST_DEBUG ("popped latency message"); - } - - static void -@@ -63,7 +63,7 @@ pop_state_changed (GstBus * bus, int count) - - int i; - -- GST_DEBUG ("popping %d messages", count); -+ GST_DEBUG ("popping %d state-changed message", count); - for (i = 0; i < count; ++i) { - message = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, -1); - -@@ -72,7 +72,7 @@ pop_state_changed (GstBus * bus, int count) - - gst_message_unref (message); - } -- GST_DEBUG ("popped %d messages", count); -+ GST_DEBUG ("popped %d state-changed messages", count); - } - - static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", --- -GitLab - - -From 2c47f61c69702572bf666ad9ecaf59710f4a342c Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Sun, 20 Feb 2022 23:28:00 +0000 -Subject: [PATCH 2/3] gstreamer: tests: add a timeout in gstbin pop functions - instaed of wait forever - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> ---- - tests/check/gst/gstbin.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c -index 06be4c75fbb..c837d0e7e8a 100644 ---- a/tests/check/gst/gstbin.c -+++ b/tests/check/gst/gstbin.c -@@ -32,7 +32,7 @@ pop_async_done (GstBus * bus) - GstMessage *message; - - GST_DEBUG ("popping async-done message"); -- message = gst_bus_poll (bus, GST_MESSAGE_ASYNC_DONE, -1); -+ message = gst_bus_poll (bus, GST_MESSAGE_ASYNC_DONE, GST_SECOND); - - fail_unless (message && GST_MESSAGE_TYPE (message) - == GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE"); -@@ -47,7 +47,7 @@ pop_latency (GstBus * bus) - GstMessage *message; - - GST_DEBUG ("popping latency message"); -- message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, -1); -+ message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, GST_SECOND); - - fail_unless (message && GST_MESSAGE_TYPE (message) - == GST_MESSAGE_LATENCY, "did not get GST_MESSAGE_LATENCY"); -@@ -65,7 +65,7 @@ pop_state_changed (GstBus * bus, int count) - - GST_DEBUG ("popping %d state-changed message", count); - for (i = 0; i < count; ++i) { -- message = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, -1); -+ message = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, GST_SECOND); - - fail_unless (message && GST_MESSAGE_TYPE (message) - == GST_MESSAGE_STATE_CHANGED, "did not get GST_MESSAGE_STATE_CHANGED"); --- -GitLab - - -From 686add28e21ae0031f9e3b07f9fb5cd4d5d19bc5 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Mon, 21 Feb 2022 23:06:07 +0000 -Subject: [PATCH 3/3] gstreamer: tests: fix gstbin deadlock - -this is a bit ugly but if the latency message is lost -the pop_latency will hang forever. - -Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778 - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> ---- - tests/check/gst/gstbin.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c -index c837d0e7e8a..5d9a09171aa 100644 ---- a/tests/check/gst/gstbin.c -+++ b/tests/check/gst/gstbin.c -@@ -741,7 +741,8 @@ GST_START_TEST (test_watch_for_state_change) - pop_state_changed (bus, 3); - if (ret == GST_STATE_CHANGE_ASYNC) { - pop_async_done (bus); -- pop_latency (bus); -+ if (gst_bus_have_pending (bus)) -+ pop_latency (bus); - } - - fail_unless (gst_bus_have_pending (bus) == FALSE, --- -GitLab - diff --git a/user/gstreamer/time64.patch b/user/gstreamer/time64.patch deleted file mode 100644 index 89c88c380..000000000 --- a/user/gstreamer/time64.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 664fc63a246cba97e202f712aa48105f46a9ff69 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> -Date: Mon, 12 Dec 2022 11:34:51 +0200 -Subject: [PATCH] systemclock: Use `futex_time64` syscall on x32 and other - platforms that always use a 32-bit `struct timespec` for the normal `futex` - syscall - -See also https://gitlab.gnome.org/GNOME/glib/-/issues/2634 ---- - gst/gstsystemclock.c | 26 +++++++++++++++++++++- - 1 file changed, 25 insertions(+), 1 deletion(-) - -diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c -index 6d0b6ec47b6..8c396d2c7b4 100644 ---- a/gst/gstsystemclock.c -+++ b/gst/gstsystemclock.c -@@ -130,7 +130,31 @@ gst_futex_cond_broadcast (guint * cond_val) - static gboolean - gst_futex_cond_wait_until (guint * cond_val, GMutex * mutex, gint64 end_time) - { -+ /* On x32 (ILP32 ABI on x86_64) and potentially sparc64, the raw futex() -+ * syscall takes a 32-bit timespan argument *regardless* of whether userspace -+ * is using 32-bit or 64-bit `struct timespec`. This means that we can’t -+ * unconditionally pass a `struct timespec` pointer into the syscall. -+ * -+ * Assume that any such platform is new enough to define the -+ * `__NR_futex_time64` workaround syscall (which accepts 64-bit timespecs, -+ * introduced in kernel 5.1), and use that to pass a 64-bit timespec instead. -+ * -+ * `clock_gettime()` on such systems will either return a 32-bit `struct -+ * timespec`, in which case the values we will get passed in here are -+ * already not y2038-safe, or `struct timespec` is using 64-bit `time_t` and -+ * everything is fine. -+ */ -+#ifdef __NR_futex_time64 -+ struct -+ { -+ gint64 tv_sec; -+ gint64 tv_nsec; -+ } end; -+ const long int futex_syscall_id = __NR_futex_time64; -+#else - struct timespec end; -+ const long int futex_syscall_id = __NR_futex; -+#endif - guint sampled; - int res; - gboolean success; -@@ -146,7 +170,7 @@ gst_futex_cond_wait_until (guint * cond_val, GMutex * mutex, gint64 end_time) - /* we use FUTEX_WAIT_BITSET_PRIVATE rather than FUTEX_WAIT_PRIVATE to be - * able to use absolute time */ - res = -- syscall (__NR_futex, cond_val, (gsize) FUTEX_WAIT_BITSET_PRIVATE, -+ syscall (futex_syscall_id, cond_val, (gsize) FUTEX_WAIT_BITSET_PRIVATE, - (gsize) sampled, &end, NULL, FUTEX_BITSET_MATCH_ANY); - success = (res < 0 && errno == ETIMEDOUT) ? FALSE : TRUE; - g_mutex_lock (mutex); --- -GitLab - diff --git a/user/gtk4/APKBUILD b/user/gtk4/APKBUILD index e1eb0ee41..1795d2107 100644 --- a/user/gtk4/APKBUILD +++ b/user/gtk4/APKBUILD @@ -1,27 +1,29 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Sile Ekaterin Liszka <sheila@vulpine.house> pkgname=gtk4 -pkgver=4.8.3 -pkgrel=1 +pkgver=4.18.5 +pkgrel=0 pkgdesc="Version 4 of the GNOME graphics toolkit" url="https://www.gtk.org" arch="all" -options="!check" # Requires X11 +options="!check" # Requires Wayland environment running license="LGPL-2.0+ AND LGPL-2.1+ AND LGPL-2.0-only AND Expat" depends="" makedepends="cairo-dev cmake cups-dev ffmpeg-dev ffmpeg-libs gdk-pixbuf-dev gi-docgen glib-dev gobject-introspection-dev graphene-dev gstreamer-dev gst-plugins-bad-dev iso-codes-dev libepoxy-dev libexecinfo-dev - libxcursor-dev libxdamage-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev - meson ninja pango-dev>=1.50.0 py3-docutils py3-jinja2 py3-markdown - py3-pygments py3-pygobject py3-toml py3-typogrify tiff-dev + librsvg-dev libxcursor-dev libxdamage-dev libxi-dev libxinerama-dev + libxkbcommon-dev libxrandr-dev meson pango-dev py3-docutils py3-jinja2 + py3-markdown py3-pygments py3-pygobject py3-toml py3-typogrify tiff-dev wayland-dev wayland-protocols" subpackages="$pkgname-dev $pkgname-doc" -source="https://download.gnome.org/sources/gtk/${pkgver%.*}/gtk-$pkgver.tar.xz" +source="https://download.gnome.org/sources/gtk/${pkgver%.*}/gtk-$pkgver.tar.xz + vulkan-nullref.patch + " builddir="$srcdir/gtk-$pkgver" build() { - meson \ + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -29,21 +31,21 @@ build() { --buildtype=release \ --wrap-mode=nofallback \ -Dc_link_args='-lexecinfo' \ - -Dgtk_doc=true \ -Dman-pages=true \ - -Ddemos=false \ -Dbuild-examples=false \ + -Dvulkan=disabled \ build - ninja -C build + meson compile -C build } check() { - ninja -C build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="56be0f5ce85a9cbbda4a5de53baeeb6b8cc527a5d34723ae5548759ec7c28f03d204b6b6758dffed02a9e226f3bfcd1f15971105c2f2f7be7cef22538be27754 gtk-4.8.3.tar.xz" +sha512sums="4a09188fdbeb532d8c2064199126eaf60d806118bb637d5182121f3d80d374acdf343568c3423effb9574c364279ded7d7cbd4e0331dc1fb647970f60c98bff0 gtk-4.18.5.tar.xz +1dca0747e2f572354c0d47e443270d64f5855d9fba592621d570be5eed49213ce8303e7d028bbe4d493cceebea9b3c90d6dc4f0671b1cae153a15384aa35d63e vulkan-nullref.patch" diff --git a/user/gtk4/vulkan-nullref.patch b/user/gtk4/vulkan-nullref.patch new file mode 100644 index 000000000..464415901 --- /dev/null +++ b/user/gtk4/vulkan-nullref.patch @@ -0,0 +1,69 @@ +From d4350c0fe535a759abd7898c7f251738242d1408 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte <otte@redhat.com> +Date: Thu, 24 Apr 2025 03:36:15 +0200 +Subject: [PATCH] vulkan: Handle not being compiled against Vulkan + +The Vulkan renderer should work and just fail to realize. +Currently it SEGVs with a NULL function call. + +Part-of: <https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/8506> +--- + gsk/gpu/gskvulkanrenderer.c | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/gsk/gpu/gskvulkanrenderer.c b/gsk/gpu/gskvulkanrenderer.c +index a5f827df839..6282c0b51c1 100644 +--- a/gsk/gpu/gskvulkanrenderer.c ++++ b/gsk/gpu/gskvulkanrenderer.c +@@ -4,6 +4,8 @@ + + #include "gskgpurendererprivate.h" + ++#include <glib/gi18n-lib.h> ++ + #ifdef GDK_RENDERING_VULKAN + + #include "gskvulkandeviceprivate.h" +@@ -143,14 +145,28 @@ gsk_vulkan_renderer_unrealize (GskRenderer *renderer) + + GSK_RENDERER_CLASS (gsk_vulkan_renderer_parent_class)->unrealize (renderer); + } +-#endif ++ ++#else /* !GDK_RENDERING_VULKAN */ ++ ++static gboolean ++gsk_vulkan_renderer_realize (GskRenderer *renderer, ++ GdkDisplay *display, ++ GdkSurface *surface, ++ GError **error) ++{ ++ g_set_error_literal (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_NOT_AVAILABLE, ++ _("Vulkan support disabled during GTK build")); ++ ++ return FALSE; ++} ++#endif /* GDK_RENDERING_VULKAN */ + + static void + gsk_vulkan_renderer_class_init (GskVulkanRendererClass *klass) + { ++ GskRendererClass *renderer_class = GSK_RENDERER_CLASS (klass); + #ifdef GDK_RENDERING_VULKAN + GskGpuRendererClass *gpu_renderer_class = GSK_GPU_RENDERER_CLASS (klass); +- GskRendererClass *renderer_class = GSK_RENDERER_CLASS (klass); + + gpu_renderer_class->frame_type = GSK_TYPE_VULKAN_FRAME; + +@@ -162,6 +178,8 @@ gsk_vulkan_renderer_class_init (GskVulkanRendererClass *klass) + gpu_renderer_class->get_backbuffer = gsk_vulkan_renderer_get_backbuffer; + + renderer_class->unrealize = gsk_vulkan_renderer_unrealize; ++#else ++ renderer_class->realize = gsk_vulkan_renderer_realize; + #endif + } + +-- +GitLab + diff --git a/user/harfbuzz/APKBUILD b/user/harfbuzz/APKBUILD index f858e0b00..be03db054 100644 --- a/user/harfbuzz/APKBUILD +++ b/user/harfbuzz/APKBUILD @@ -1,44 +1,44 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=harfbuzz -pkgver=2.6.8 -pkgrel=1 +pkgver=11.2.0 +pkgrel=0 pkgdesc="Text shaping library" url="https://www.freedesktop.org/wiki/Software/HarfBuzz" arch="all" -options="!check" # tests depend on certain freetype behaviours license="MIT" depends="" makedepends="cairo-dev freetype-dev glib-dev gobject-introspection-dev icu-dev - graphite2-dev" + graphite2-dev gtk-doc meson" checkdepends="python3" -subpackages="$pkgname-dev $pkgname-icu" +subpackages="$pkgname-dev $pkgname-doc $pkgname-icu" source="https://github.com/$pkgname/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --localstatedir=/var \ - --disable-static \ - --with-glib \ - --with-gobject \ - --with-graphite2 \ - --with-icu \ - --with-truetype - make + -Dcairo=enabled \ + -Ddocs=enabled \ + -Dfreetype=enabled \ + -Dglib=enabled \ + -Dgobject=enabled \ + -Dgraphite2=enabled \ + -Dicu=enabled \ + build + + meson compile -C build } check() { - make check + meson test -C build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } dev() { @@ -49,8 +49,9 @@ dev() { icu() { pkgdesc="Harfbuzz ICU support library" replaces="harfbuzz" + install_if="harfbuzz=$pkgver-r$pkgrel icu-libs" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/lib*icu.so.* "$subpkgdir"/usr/lib/ } -sha512sums="651b23d7d4fab6fef472ee57db39bbaebc31c2f40ea3a482c1499ad1a7b549b86a2bccbe9da191c8e9ecdf464191dd3c9a7485546b51695ad8ab3c0329732d9d harfbuzz-2.6.8.tar.xz" +sha512sums="108a164e5277f76f535bbd1c3744b1f78897e714376c2f61c1171b95d5004a0ab99179efdd92063f7677b30d5c1ab4e0a40612bf60d672af9f03bdd24b1edefa harfbuzz-11.2.0.tar.xz" diff --git a/user/horizon/APKBUILD b/user/horizon/APKBUILD index 227a9fad5..25cfc4d63 100644 --- a/user/horizon/APKBUILD +++ b/user/horizon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=horizon -pkgver=0.9.8.1 +pkgver=0.9.9.1 pkgrel=1 pkgdesc="Installation tools for Adélie Linux" url="https://horizon.adelielinux.org/" @@ -18,7 +18,7 @@ makedepends="bcnm-dev boost-dev cmake curl-dev eudev-dev libarchive-dev subpackages="$pkgname-image $pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-qt5 $pkgname-tools $pkgname-wizard $pkgname-boot" source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz - apm-disklabel.patch + ppc32-apm.patch " build() { @@ -162,5 +162,5 @@ GLOBALS "$subpkgdir"/usr/share/xsessions/horizon.desktop } -sha512sums="3a34019d50cd711f868855b120a362ce67308e9eb9b32fab0a8936d393541f93beca76efe161c7d635f215445989176a7089d2df0d6fcb071428b4c1cf1ae252 horizon-0.9.8.1.tar.xz -1d92232b3118444973a0917777a1787e3e20b6d5a8da22f0031e37d94f6c1d9df0f05aa9228d3b24c414185f6a2c9c9401534f381b4195830cd5b1469cf23f46 apm-disklabel.patch" +sha512sums="270926f74450f3250ae168fd31fd897a0bf0e444d0fb9753ebdc571157c89e873e13ed80030d93f5b470cc1876d2f9f00527ad0df2a0d15798dc6fbd4fe0641d horizon-0.9.9.1.tar.xz +f3977cf247436301a2f8975859f888ee24ac305f7389317a4642f07d3dd6e30cea7f9076392f35187d034c6fcb7d5c4575ba007b50fc5e24577c0debd3c4a410 ppc32-apm.patch" diff --git a/user/horizon/apm-disklabel.patch b/user/horizon/apm-disklabel.patch deleted file mode 100644 index 368aa8b05..000000000 --- a/user/horizon/apm-disklabel.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 5df1abdb743ac71986cabe8c76dcd9a0f75e44da Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Thu, 25 Apr 2024 23:27:30 -0500 -Subject: [PATCH] Qt UI: Fix partition count for APM disklabel - -The APM disklabel includes a meta partition for the partition map -itself. This is always counted by parted as a partition, and is *not* -considered to be a metadata partition. We therefore need to start our -partitioning at #2 on APM, not #1. - -Closes: #376 ---- - CHANGELOG.rst | 14 +++++++++++++- - ui/qt5/horizonwizard.cc | 6 ++++-- - 2 files changed, 17 insertions(+), 3 deletions(-) - -diff --git a/CHANGELOG.rst b/CHANGELOG.rst -index 7afcb34..b944410 100644 ---- a/CHANGELOG.rst -+++ b/CHANGELOG.rst -@@ -5,7 +5,19 @@ - * **A. Wilcox**, documentation writer - * **Contributors**, code - :Copyright: -- © 2019-2023 Adélie Linux and contributors. -+ © 2019-2024 Adélie Linux and contributors. -+ -+ -+ -+0.9.9 (2024-??-??) -+================== -+ -+Qt UI -+----- -+ -+* The Qt UI now counts APM partition map partitions when creating APM -+ disklabels, fixing a long-standing bug when installing to an empty disk -+ on PowerPC Macintosh systems. - - - -diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc -index 298cd15..2872eb6 100644 ---- a/ui/qt5/horizonwizard.cc -+++ b/ui/qt5/horizonwizard.cc -@@ -400,7 +400,8 @@ QString nameForPartitionOnDisk(const std::string &dev, int part) { - /*! Determine the correct disk label based on the target platform. */ - QStringList eraseDiskForArch(const std::string &raw_disk, - HorizonWizard::Arch arch, -- HorizonWizard::Subarch subarch) { -+ HorizonWizard::Subarch subarch, -+ int *start) { - const auto disk = QString::fromStdString(raw_disk); - - switch(arch) { -@@ -412,6 +413,7 @@ QStringList eraseDiskForArch(const std::string &raw_disk, - case HorizonWizard::ppc64: /* Complicated */ - switch(subarch) { - case HorizonWizard::ppc64_PowerMac: -+ (*start)++; - return {QString{"disklabel %1 apm"}.arg(disk)}; - case HorizonWizard::ppc64_PowerNV: - return {QString{"disklabel %1 gpt"}.arg(disk)}; -@@ -620,7 +622,7 @@ QString HorizonWizard::toHScript() { - int start = 1; - - if(erase) { -- lines << eraseDiskForArch(chosen_disk, arch, subarch); -+ lines << eraseDiskForArch(chosen_disk, arch, subarch, &start); - } else { - /* This branch will be taken when "use available space" is back. */ - Q_ASSERT(false); --- -2.40.0 - diff --git a/user/horizon/ppc32-apm.patch b/user/horizon/ppc32-apm.patch new file mode 100644 index 000000000..caa5d3189 --- /dev/null +++ b/user/horizon/ppc32-apm.patch @@ -0,0 +1,29 @@ +From 02bab111a473e6bc45c4c95e8f17634b42e0fba9 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Sat, 21 Dec 2024 19:18:53 -0600 +Subject: [PATCH] Qt UI: Count APM partitions correctly on PPC32 + +The fix we did in 5df1abdb74 is not complete; we use APM on 32-bit +PowerPC machines as well. We need to do the same workaround on PPC32 +that we do on PPC64 Power Macs. + +Fixes: 5df1abdb74 ("Qt UI: Fix partition count for APM disklabel") +--- + ui/qt5/horizonwizard.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc +index 81ddcdc..9cc0690 100644 +--- a/ui/qt5/horizonwizard.cc ++++ b/ui/qt5/horizonwizard.cc +@@ -409,6 +409,7 @@ QStringList eraseDiskForArch(const std::string &raw_disk, + case HorizonWizard::x86_64: /* 64-bit Intel uses GPT */ + return {QString{"disklabel %1 gpt"}.arg(disk)}; + case HorizonWizard::ppc: /* 32-bit PowerPC: we only support Power Mac */ ++ (*start)++; + return {QString{"disklabel %1 apm"}.arg(disk)}; + case HorizonWizard::ppc64: /* Complicated */ + switch(subarch) { +-- +2.40.0 + diff --git a/user/hyperfine/APKBUILD b/user/hyperfine/APKBUILD new file mode 100644 index 000000000..ee21cbd2a --- /dev/null +++ b/user/hyperfine/APKBUILD @@ -0,0 +1,376 @@ +# Contributor: Zach van Rijn <me@zv.io> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=hyperfine +pkgver=1.19.0 +pkgrel=0 +pkgdesc="A command-line benchmarking tool" +url="https://github.com/sharkdp/hyperfine" +arch="all" +license="Apache-2.0 OR MIT" +depends="" +makedepends="cargo" +subpackages="" +source="hyperfine-$pkgver.tar.gz::https://github.com/sharkdp/hyperfine/archive/refs/tags/v$pkgver.tar.gz" + +# dependencies taken from Cargo.lock +cargo_deps=" +ahash 0.7.8 +aho-corasick 1.1.3 +anstream 0.6.18 +anstyle 1.0.10 +anstyle-parse 0.2.6 +anstyle-query 1.1.2 +anstyle-wincon 3.0.6 +anyhow 1.0.93 +approx 0.5.1 +arrayvec 0.7.6 +assert_cmd 2.0.16 +autocfg 0.1.8 +autocfg 1.4.0 +bitflags 1.3.2 +bitflags 2.6.0 +bitvec 1.0.1 +borsh 1.5.2 +borsh-derive 1.5.2 +bstr 1.10.0 +bytecheck 0.6.12 +bytecheck_derive 0.6.12 +byteorder 1.5.0 +bytes 1.8.0 +cfg-if 1.0.0 +cfg_aliases 0.2.1 +clap 4.5.20 +clap_builder 4.5.20 +clap_complete 4.5.37 +clap_lex 0.7.2 +cloudabi 0.0.3 +colorchoice 1.0.3 +colored 2.1.0 +console 0.15.8 +csv 1.3.1 +csv-core 0.1.11 +difflib 0.4.0 +doc-comment 0.3.3 +encode_unicode 0.3.6 +equivalent 1.0.1 +errno 0.3.9 +fastrand 2.2.0 +float-cmp 0.9.0 +fuchsia-cprng 0.1.1 +funty 2.0.0 +getrandom 0.2.15 +hashbrown 0.12.3 +hashbrown 0.15.1 +indexmap 2.6.0 +indicatif 0.17.4 +instant 0.1.13 +is_terminal_polyfill 1.70.1 +itoa 1.0.11 +lazy_static 1.5.0 +libc 0.2.162 +linux-raw-sys 0.4.14 +memchr 2.7.4 +nix 0.29.0 +normalize-line-endings 0.3.0 +num 0.2.1 +num-bigint 0.2.6 +num-complex 0.2.4 +num-integer 0.1.46 +num-iter 0.1.45 +num-rational 0.2.4 +num-traits 0.2.19 +number_prefix 0.4.0 +once_cell 1.20.2 +portable-atomic 1.9.0 +ppv-lite86 0.2.20 +predicates 3.1.2 +predicates-core 1.0.8 +predicates-tree 1.0.11 +proc-macro-crate 3.2.0 +proc-macro2 1.0.89 +ptr_meta 0.1.4 +ptr_meta_derive 0.1.4 +quote 1.0.37 +radium 0.7.0 +rand 0.6.5 +rand 0.8.5 +rand_chacha 0.1.1 +rand_chacha 0.3.1 +rand_core 0.3.1 +rand_core 0.4.2 +rand_core 0.6.4 +rand_hc 0.1.0 +rand_isaac 0.1.1 +rand_jitter 0.1.4 +rand_os 0.1.3 +rand_pcg 0.1.2 +rand_xorshift 0.1.1 +rdrand 0.4.0 +regex 1.11.1 +regex-automata 0.4.8 +regex-syntax 0.8.5 +rend 0.4.2 +rkyv 0.7.45 +rkyv_derive 0.7.45 +rust_decimal 1.36.0 +rustix 0.38.40 +ryu 1.0.18 +seahash 4.1.0 +serde 1.0.214 +serde_derive 1.0.214 +serde_json 1.0.132 +shell-words 1.1.0 +simdutf8 0.1.5 +statistical 1.0.0 +strsim 0.11.1 +syn 1.0.109 +syn 2.0.87 +tap 1.0.1 +tempfile 3.14.0 +terminal_size 0.4.0 +termtree 0.4.1 +thiserror 2.0.3 +thiserror-impl 2.0.3 +tinyvec 1.8.0 +tinyvec_macros 0.1.1 +toml_datetime 0.6.8 +toml_edit 0.22.22 +unicode-ident 1.0.13 +unicode-width 0.1.14 +utf8parse 0.2.2 +uuid 1.11.0 +version_check 0.9.5 +wait-timeout 0.2.0 +wasi 0.11.0+wasi-snapshot-preview1 +winapi 0.3.9 +winapi-i686-pc-windows-gnu 0.4.0 +winapi-x86_64-pc-windows-gnu 0.4.0 +windows-sys 0.48.0 +windows-sys 0.52.0 +windows-sys 0.59.0 +windows-targets 0.48.5 +windows-targets 0.52.6 +windows_aarch64_gnullvm 0.48.5 +windows_aarch64_gnullvm 0.52.6 +windows_aarch64_msvc 0.48.5 +windows_aarch64_msvc 0.52.6 +windows_i686_gnu 0.48.5 +windows_i686_gnu 0.52.6 +windows_i686_gnullvm 0.52.6 +windows_i686_msvc 0.48.5 +windows_i686_msvc 0.52.6 +windows_x86_64_gnu 0.48.5 +windows_x86_64_gnu 0.52.6 +windows_x86_64_gnullvm 0.48.5 +windows_x86_64_gnullvm 0.52.6 +windows_x86_64_msvc 0.48.5 +windows_x86_64_msvc 0.52.6 +winnow 0.6.20 +wyz 0.5.1 +zerocopy 0.7.35 +zerocopy-derive 0.7.35 +" + +source="$source $(echo "$cargo_deps" | sed -E 's#^([^ ]+) ([^ ]+)$#\1-\2.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" + +prepare() { + export CARGO_HOME="$srcdir/cargo-home" + export CARGO_VENDOR="$CARGO_HOME/adelie" + + (builddir=$srcdir; default_prepare) + + mkdir -p "$CARGO_VENDOR" + cat <<- EOF > "$CARGO_HOME/config" + [source.adelie] + directory = "${CARGO_VENDOR}" + + [source.crates-io] + replace-with = "adelie" + local-registry = "/nonexistant" + EOF + + echo "$cargo_deps" | while read -r _dep _ver; do + [ -n "$_dep" ] || continue + _dep="$_dep-$_ver" + ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" + _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) + cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" + { + "package":"$_sum", + "files":{} + } + EOF + done +} + +build() { + export CARGO_HOME="$srcdir/cargo-home" + cargo build --release -j $JOBS +} + +check() { + export CARGO_HOME="$srcdir/cargo-home" + export PATH="$PATH:$srcdir/$pkgname-$pkgver/hyperfine/target/release" + cargo test -j $JOBS --release +} + +package() { + install -Dm755 target/release/hyperfine -t "$pkgdir"/usr/bin/ +} + +sha512sums="91e3b497844944bc11afaba07488dac9803b145d69259064c9a510cf76039baa2e025751743bf3230d114b31d7eb46e017c99d38506f0b6fcf2b9a3623352e8e hyperfine-1.19.0.tar.gz +63677b2001d633ecabb36c08bd92e00b5fa71f24aed1c4601d12d846ea06aeaf093c37cfe1f6642147800caa6c749e9a202aa21f9ab4799efa379ad0d952a2ee ahash-0.7.8.tar.gz +ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69 aho-corasick-1.1.3.tar.gz +5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963 anstream-0.6.18.tar.gz +621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea anstyle-1.0.10.tar.gz +e28c9818afcda0e9b84c205d9c6697ce64cb06c21df2c3666869c07d66893105d9c5e96a27fcf2410a09f6af00735252e22b5c7d8c6cb3f68c4a8f376c49d396 anstyle-parse-0.2.6.tar.gz +26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837 anstyle-query-1.1.2.tar.gz +59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5 anstyle-wincon-3.0.6.tar.gz +237b36bdefeaf8dd2f7d4c5c92d8f7627a5206ded5fa3dafd5710f2fbd3dd7d7187d4a8ae917ae03d0cf06bc8d101a7663bb7bb022507ac1ec88577a37475efc anyhow-1.0.93.tar.gz +c6d768496c974b6ff4cf7ad8e65f3fc9faf29a1957da497968ee112c6a0b9d7a0ff9a2579206e864976c0f65ed2190bc9d2b63b31a09ced7b57879e207c46407 approx-0.5.1.tar.gz +b1f320746018a7f32340a833420089446ec5cefb7f299b4506eab7423d5db49f00b72d8aa8c6600f9159b9480d5eb3ce69407d93f5c9934147860c83e4d6eca8 arrayvec-0.7.6.tar.gz +0b9167282d75169b0b1fad0b1401b42884185976ae0dd690851671aedbc1a9af26dd33f3047400eb4a1b5070216acc293aade149aded7e4f86dd5c0ef0e9a6a9 assert_cmd-2.0.16.tar.gz +d6156e0a8701f38c20b693380ed1ac5b15f84bc87c5ae0541483b9b387e6118d8673d8e5da5f4eee4d736c777e923d3fba7f61589a49c353170a708a709d8db5 autocfg-0.1.8.tar.gz +3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c autocfg-1.4.0.tar.gz +3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 bitflags-1.3.2.tar.gz +f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf bitflags-2.6.0.tar.gz +83d643c5aca020ebbe9094b5aaba6a796e7c3c509228a4348444e57a06bc3a5dd042eed57a2254d91661e73bdab2bc0d1bd02be376906acc6b6d75b5354a8d8e bitvec-1.0.1.tar.gz +3500f00806cd26cd7431f9a3d097cb0f30fb4b0fe1bf0346978cfbdd07915e31cb8bc6721426bb365351a9e89ec8b7c6397c87c966852c8f4d00862fc7b4a7ce borsh-1.5.2.tar.gz +f3a9b1d588eb7e6147a63560d71557622f6b947728b926a25aa85bd56c26a4648dc96bf60875531fffee23c13235b6b412f3386f0ab9e454f4915af7ce66773a borsh-derive-1.5.2.tar.gz +823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2 bstr-1.10.0.tar.gz +49a85f9bbfe8bccceffcd94e3eac1f4407d93159358428ea07652714e06e97fbcb41f22f72d9d10318bc9a019be8afc99727764162f18e8de01ea4069f44dda6 bytecheck-0.6.12.tar.gz +57f8480ddb76d8620095962acd203231fb7938c0caf9c216d89466f22464a6970f13adca5f4d5b10c9e1ec99d6e0b260ba7586c2bb895fad0380f8f9ac9a4fc8 bytecheck_derive-0.6.12.tar.gz +96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f byteorder-1.5.0.tar.gz +a721724e5cbfc73b79102a9c4a00fc9da520417819ca5c82b798c8cfb45af3d77b33f7035ad33d6187399c613cc2e83644236ac772aec934f521f87d4680059a bytes-1.8.0.tar.gz +0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff cfg-if-1.0.0.tar.gz +74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c cfg_aliases-0.2.1.tar.gz +e432a118a2ec15b273a404c3cb75bbe579b11034ba55def1823d4670c6553e3d8611074a24f50a0f4adc8bda184213b06106c44c68a19d267342c53e345351d4 clap-4.5.20.tar.gz +e914c8b6592f9d230b4f4290cf4b4d73d0160c12a1fa3976c74bad21ff16da532d6af792f0a33fa472166f1cd551291b5d1d71fe8b359040040418694ec52000 clap_builder-4.5.20.tar.gz +5c864ea85f0823ec91a1c9693720853dd5bc5804daee9a0607bf14e9f5fe40b536bdb3b935d1e96e535d896a272d7fa1f99eba6983ec94bb630ab0c36cefbabb clap_complete-4.5.37.tar.gz +a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380 clap_lex-0.7.2.tar.gz +691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz +fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14 colorchoice-1.0.3.tar.gz +fa70f18fb29f6870a727d8243808c96e9497f8302f5f2b1748f9d9e396031e9c53a025b8edc9c8c9a0f8cfca12e5da73250a71e382b3074e9415b85bc004769e colored-2.1.0.tar.gz +b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9 console-0.15.8.tar.gz +6b0be5e017b2b2cb926d11d7a36cdae1bf0ddb56165127f25f6fd55956f95a572ed7e054f863610e91c9c2329f5af0eee9678f9020644800587d6daa5a94755b csv-1.3.1.tar.gz +0445c8a4d4d0f90f03e5d6507c26454aaeac0b355fb39d19e1676a7cb27b4372db3541367ce838d38151862b7bfbf19750cb550e24e74ab5e07ae9bb4edeedee csv-core-0.1.11.tar.gz +fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9 difflib-0.4.0.tar.gz +e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba doc-comment-0.3.3.tar.gz +64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77 encode_unicode-0.3.6.tar.gz +b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 equivalent-1.0.1.tar.gz +777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a errno-0.3.9.tar.gz +de2835aee8d5380a6e1c0f627a876594626e1379f2f7dbd3ad0f785d7c3f3f82162c9c20a68417324506f78264cb9dbcfb2d4d5dc9ca666996150979738822e4 fastrand-2.2.0.tar.gz +f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8 float-cmp-0.9.0.tar.gz +ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz +691e1c275b648110ef42c4adece8178cf037bad40d469780280eb2ebe07aa4b0406737c5ba02c9f9f63ee57a99fec27e5e51712e2113655f7522c8678f689155 funty-2.0.0.tar.gz +04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb getrandom-0.2.15.tar.gz +b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 hashbrown-0.12.3.tar.gz +8bdd4966b336f5d5b184cf14d4a7e625d184d8f3f0782845c746f374f92425055def71e64087fb3a3770fd9b2d9ed40310fa45f60e56d298accaf9c500add841 hashbrown-0.15.1.tar.gz +c870348691f5acf97e7bff25c805e60f2e9db9e3ee7b3b939b7be45b6bcfaadee9880e6ad27adbbe2545865193655b5fa9de18487b7a1d030017b2fca48616ca indexmap-2.6.0.tar.gz +54c92f028dc5aded5e1a947afc09c33930f0439d7ee55e9dca66ccc2af6860e7b67cd8153bbdb33dff962ffd03dc0004eace2e69135c11a867331f0ef3e9bf6d indicatif-0.17.4.tar.gz +b7839431e8920c4c0841d0974eede75fc50f2bb7a9475664bd2c4ff6c558a10084e1c025e5be977c3364ae9112c365c0a6f480cb9b35ee4130ca2beebcf650a9 instant-0.1.13.tar.gz +4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1 is_terminal_polyfill-1.70.1.tar.gz +7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311 itoa-1.0.11.tar.gz +6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f lazy_static-1.5.0.tar.gz +f43e294d587e7cd9c2da9b67be83fc70801ea66c318342cf1e11556566ecc1c8a612925770d85c75af1e887b425f326fac59229b78877d2377092243ea8e6a99 libc-0.2.162.tar.gz +28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7 linux-raw-sys-0.4.14.tar.gz +8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2 memchr-2.7.4.tar.gz +86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f nix-0.29.0.tar.gz +f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea normalize-line-endings-0.3.0.tar.gz +9d094e0a29b2bb42d382d5167150418bc2ed81e8deb3c6636c99c86ca14abf5f69b82a49f1678dd110119eeaec2f476fe7a5d57e60558473a6b7c710dec7f778 num-0.2.1.tar.gz +19c1ff0ae6fdfc690ccfe4fe6008c102e50ab9bf6b1f4e4f04a348d217d4d9d538585945466b72b70713053bcfd73685d1a907e41d135265d330bde996709eb8 num-bigint-0.2.6.tar.gz +53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea num-complex-0.2.4.tar.gz +e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae num-integer-0.1.46.tar.gz +6195c7bd5f904e9f0aeee3ce17b42c0383d053f9d37954a9ce3b4ff0a048afa121c9a37aa9c74b9ace7353d7fd9f57a7d04c7a18e1456fc2c4c298d8ecfd0172 num-iter-0.1.45.tar.gz +06e55f17a1ea58fd465a232ebd687686c922669f0b561f648717164f3fcc8fe2bb43213d1e6377158d2542f633ef2e1482a7c3cef8090328c34feacf7f9bdd93 num-rational-0.2.4.tar.gz +180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956 num-traits-0.2.19.tar.gz +a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df number_prefix-0.4.0.tar.gz +bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8 once_cell-1.20.2.tar.gz +1431a4c092f6a0cb50bcc78488d603c8ba8f4ee697f77fdcfcce7002fcb371f52a321089422c76564fbf3277c48e30f889565747951c60360d95a6917bb6adeb portable-atomic-1.9.0.tar.gz +6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1 ppv-lite86-0.2.20.tar.gz +50896189f39842ef424aebc12c2633112fda83eba1bdeaa3e6f398db1e28dca0cc7838948f25e67f6fceede1a91a1b0ede5d4dc4edac6da752e48c7a07bbe3ae predicates-3.1.2.tar.gz +8cfd010b70aa694620d6c573bd8ddc50ea16ba08f6c737902ba6697307af4510b9298ffcc3068b45bdc6430103db6fb4499783c64044d87d023bea46d45d0f7c predicates-core-1.0.8.tar.gz +e1b08010f9cab65c75d82cc44cfdf64d92127acf6a72ee0ce1533e5d7d8027ccab912e1c499b7b78508b5e3cb20dc03df94de3dd520ae13736906a5f374b10cd predicates-tree-1.0.11.tar.gz +41479ec5e414a8b05dffaa0ece21122387d5165a54e60d8ee3502f8a3c0a2ac0247f56996f933d5d77f1efe41a56bffe16874e8c6a34b66100cf047e4b760863 proc-macro-crate-3.2.0.tar.gz +488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f proc-macro2-1.0.89.tar.gz +9936264dd52ae40e6afc8cef8914dbdc5767f397b91ea965d65275fe547a2d9cde7ccdcf908f787e25f84fbc23a2e30df895793fca308e09f48f2adf2e30d2bf ptr_meta-0.1.4.tar.gz +15a72b2c36e9d1761c4dd42cee1623c2d85c52eadc3c3102c8334c14c9c5db9a43d74dbbab1d14a2600d789917fcb5bc2652877b172aaa02c37a6868462ff20e ptr_meta_derive-0.1.4.tar.gz +c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05 quote-1.0.37.tar.gz +51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0 radium-0.7.0.tar.gz +2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz +8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 rand-0.8.5.tar.gz +200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz +8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 rand_chacha-0.3.1.tar.gz +5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz +f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028 rand_core-0.4.2.tar.gz +36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 rand_core-0.6.4.tar.gz +808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz +9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz +fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a rand_jitter-0.1.4.tar.gz +01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz +6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz +3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz +6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz +d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8 regex-1.11.1.tar.gz +278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f regex-automata-0.4.8.tar.gz +549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8 regex-syntax-0.8.5.tar.gz +2df17191ce710e09927f6d17fa5e3432a154d605cf3b58bdd6a3037d69cc0b017007e23c16526a8879a89cc49e3a47d38ae5f6aca8b42cd05624fd15c9dc3529 rend-0.4.2.tar.gz +bac10c6e7e7f797e505cc8103c55ae2fd4b04a76631e085fcf1c8f2b05e52c064cb14145479dadc292995b7ca5bbab5235d54d8e651bf47623a0228f936f73c9 rkyv-0.7.45.tar.gz +ec48c62251a8c2b97de67da56cf6abff15cff1a329d7f8dd3e45e1175616f0dd1b32c2a9c0998086fc57d0084e7908cfd6000fff3eaa30a1776f8abd9cb00564 rkyv_derive-0.7.45.tar.gz +9dc8dbca6249991e4b8b2179f41bb51f2513bcf6f29490351989f04aeb7f1d15b88a8f13f7cdb666761c585d5e86397150c660883a334b9d4fdd96a08fdb5526 rust_decimal-1.36.0.tar.gz +a7482682e2f0321318c08cf17f69815779515c197815a2a9f228c728af4cff3684101b4a13656a1ff98933ee492e4a847a03b7f46d697f9c71552931734b2449 rustix-0.38.40.tar.gz +a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84 ryu-1.0.18.tar.gz +4d9111dd2e491c7f6d49e0b79a3c23628c02d6603ac46e88ed137ca737830003b549ccb38087679de2cf0b02a53065b89f8d79e0ac9ddb66844d970cc6383f8b seahash-4.1.0.tar.gz +100eac65a39b9b9c32c1671d36fa9cf8aca84a2673e24c2521fdbdb3ed9f932c71548f3f1a26b1e73dd7c92a34ffa8ed1c76eb173fa20d6e85736cdf8dc9a8ee serde-1.0.214.tar.gz +70bc0a31d344cfec8d30f2034beab25097ef76ab8d89947b21753f737759e5d4e60e5596e0c7994a7cc35993bae01148120f6cdf5239be25fb243056effa27f0 serde_derive-1.0.214.tar.gz +9d157ce7d705fee8245569e7c577310782b69675a6e459f21904544b824a1ca5c9b445d17419fee438dfeb6fcc35343ba14e022043fffade0210b6d2c1b5795e serde_json-1.0.132.tar.gz +05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00 shell-words-1.1.0.tar.gz +139668c7232f533d3439986474da5036efa32d4e0d21fa72e1283e27dbd0670984283d91c238e445be61317426f67cdb8d3f13738b2fb657563f866c8b6d89d6 simdutf8-0.1.5.tar.gz +00f58a7e1b8c818336fdf55def5a46b1347c5961b4fc27d156fc03f5c197af6f53f23485eea80b2b3ca6ce2acfb304fa4846904d85c6290d1750ad4b5a635c22 statistical-1.0.0.tar.gz +0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c strsim-0.11.1.tar.gz +12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d syn-1.0.109.tar.gz +bcfff545d6dfefd81e09f8f30a86bdd85759b3a7d4093ef3365ed02718e10dbd604c52b94c9d7fa955d339fdc5b6c079940c6f345b5a48c52b5c8607794ca6f2 syn-2.0.87.tar.gz +d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995 tap-1.0.1.tar.gz +98c1ab70eb3efd2d8b16ed58c8c83f8599663af7ef269304e908a04c38334f659a4d0b1647a13dc0d1eb90a293f1b37ec8ff0b9b45ef5b7ff1b4452bbfcdcb15 tempfile-3.14.0.tar.gz +b1a66cdf4e94997b5291f3becfac1e2a838f6c3f6c068faa1ff1aa775b2a97d41be2aff5460d88928786cfd7dc8dac5e2d46a62b475d40343e1fd517c6299897 terminal_size-0.4.0.tar.gz +ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062 termtree-0.4.1.tar.gz +f6a8e8e1bb6d6e10edc07c35f3141b4b3ecb46b943b4879dd8f8bef0306feaa5446d8e47b24cffeb4cd6c57b4715b86b2bc0716b4ef7dfdaeb080ecd29646c9a thiserror-2.0.3.tar.gz +50bb722db6bff4f18975312be61fbf201b8edb29a2c6420d8a2a1f2817403aa09c6de1269e7f952c4d4583f0dd2ab1eec45b26e5391b6bd69c6450c8e42019c1 thiserror-impl-2.0.3.tar.gz +b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df tinyvec-1.8.0.tar.gz +10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e tinyvec_macros-0.1.1.tar.gz +d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f toml_datetime-0.6.8.tar.gz +0f98b371f7e27ae7f435a207c0915f942af145cc5dfabfe6d57f2b797efa3e706025401e501fccc6df70c001ce27051381556b8e7824447edd23ea25d047da4d toml_edit-0.22.22.tar.gz +5ba884f39debe9c8eb0b1d251ca713f7e2bc191d211707ed10cd81465487dbdca53914c19e131edfa1da15af132dc2c346260c3969c61e3747b63399ccb1cc51 unicode-ident-1.0.13.tar.gz +3c58a18776aa82cc13c761789a47901616cd98a30356f93d7eb05ae457314209d0a66213e2bbfa5eb8b59be6beacf62438234ce8daafa31b128dbf7d5d6fcadb unicode-width-0.1.14.tar.gz +f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266 utf8parse-0.2.2.tar.gz +0cd1b95fc2247bf4e627de6abb41e332ebaf39e5720640e52b9f235f7a0e2d451e7a486efdabb616ce00e47832d21919611683d0e6a71c86a86f290940cfda32 uuid-1.11.0.tar.gz +d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db version_check-0.9.5.tar.gz +db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066 wait-timeout-0.2.0.tar.gz +043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f wasi-0.11.0+wasi-snapshot-preview1.tar.gz +ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 winapi-0.3.9.tar.gz +a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz +bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed windows-sys-0.48.0.tar.gz +24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 windows-sys-0.52.0.tar.gz +d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061 windows-sys-0.59.0.tar.gz +e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 windows-targets-0.48.5.tar.gz +d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f windows-targets-0.52.6.tar.gz +20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 windows_aarch64_gnullvm-0.48.5.tar.gz +f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5 windows_aarch64_gnullvm-0.52.6.tar.gz +223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff windows_aarch64_msvc-0.48.5.tar.gz +a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b windows_aarch64_msvc-0.52.6.tar.gz +931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a windows_i686_gnu-0.48.5.tar.gz +a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822 windows_i686_gnu-0.52.6.tar.gz +95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f windows_i686_gnullvm-0.52.6.tar.gz +70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e windows_i686_msvc-0.48.5.tar.gz +ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96 windows_i686_msvc-0.52.6.tar.gz +1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 windows_x86_64_gnu-0.48.5.tar.gz +c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb windows_x86_64_gnu-0.52.6.tar.gz +c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa windows_x86_64_gnullvm-0.48.5.tar.gz +67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd windows_x86_64_gnullvm-0.52.6.tar.gz +fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 windows_x86_64_msvc-0.48.5.tar.gz +21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7 windows_x86_64_msvc-0.52.6.tar.gz +3347fdfb5b15ec73a40614ecd0cce60f41d3f2d083f49aaafceeaf5db52d5c677dc3eb39fcc2595999fc9f864d1fde81e180e09dc86a6f6124878e16e86e8bc8 winnow-0.6.20.tar.gz +15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9 wyz-0.5.1.tar.gz +17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c zerocopy-0.7.35.tar.gz +dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb zerocopy-derive-0.7.35.tar.gz" diff --git a/user/libglvnd/APKBUILD b/user/libglvnd/APKBUILD index 2cddb4fa4..82323eed5 100644 --- a/user/libglvnd/APKBUILD +++ b/user/libglvnd/APKBUILD @@ -6,10 +6,10 @@ pkgdesc="The GL Vendor-Neutral Dispatch library" url=" " arch="all" license="MIT AND BSD-1-Clause" -options="checkx11" +options="!check checkx11" depends="" makedepends="libx11-dev libxext-dev meson xorgproto-dev" -replaces="mesa-gl" +replaces="mesa-gl mesa-egl mesa-gles" subpackages="$pkgname-dev" source="https://gitlab.freedesktop.org/glvnd/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.bz2" builddir="$srcdir/$pkgname-v$pkgver" @@ -34,4 +34,9 @@ package() { DESTDIR="$pkgdir" meson install -C build } +dev() { + default_dev + replaces="mesa-dev" +} + sha512sums="7caef0a129527bb968bf1ced64082a56cdde881f013f5ba54c51c09989e7d559dba3071c8fdc04e535e62609d68e7622197445152f655e0afbe06890c0b7a69b libglvnd-v1.7.0.tar.bz2" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 091c94866..d1ea54a43 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.26.2 +pkgver=1.28.0 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" @@ -32,4 +32,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="51fab62e1bfb6007287e1219bf458a351806ce685e6e7ba5360062c863f0811da75acc6ec92aef7f9e0556dac0413fbe43a4744885f7449e38036130112907a6 libinput-1.26.2.tar.bz2" +sha512sums="2665fbfbf47f8ef329e387841ff9542b6191925d2fb46a19be64ef0b2e274db3b9ce8b42652ccdeb18c66e3a3c748ff576b313ecb8f7f6b4a01102bfb3e999e3 libinput-1.28.0.tar.bz2" diff --git a/user/librsvg/APKBUILD b/user/librsvg/APKBUILD index 3fa19b15b..0058e06a6 100644 --- a/user/librsvg/APKBUILD +++ b/user/librsvg/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=librsvg pkgver=2.40.21 -pkgrel=0 +pkgrel=1 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" url="https://wiki.gnome.org/action/show/Projects/LibRsvg" arch="all" @@ -19,6 +19,7 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve # - CVE-2019-20446 build() { + export CFLAGS="$CFLAGS -fno-tree-vrp" ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/user/libxcvt/APKBUILD b/user/libxcvt/APKBUILD index 9efeb5b24..1888d3ccc 100644 --- a/user/libxcvt/APKBUILD +++ b/user/libxcvt/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> -# Maintainer: Ermine <mustela@arvanta.net> +# Maintainer: Ermine <mustela@erminea.space> pkgname=libxcvt pkgver=0.1.2 pkgrel=0 diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD index ebe00d722..832b51741 100644 --- a/user/libxfce4ui/APKBUILD +++ b/user/libxfce4ui/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=libxfce4ui -pkgver=4.18.6 +pkgver=4.20.0 pkgrel=0 pkgdesc="UI library for the XFCE desktop environment" url="https://xfce.org" @@ -35,4 +35,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="1c704dd26793a304fef98c48bc3ca860248e746e9e5c39f22e984439e1a20209763e80e40e6bffcf8f0d773b323b825ebd5da4d88352582e56dfeb7c9b2ca47c libxfce4ui-4.18.6.tar.bz2" +sha512sums="33d44e57784542278941803026c9730c7fc680e3bfdebf8656fcd55fcdad3e75846c7aedc940540d8c6c6e88a00c5caec279527dd1db13731c679aa1b9cd7138 libxfce4ui-4.20.0.tar.bz2" diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD index 6e18b282b..d52dbc1ee 100644 --- a/user/libxfce4util/APKBUILD +++ b/user/libxfce4util/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=libxfce4util -pkgver=4.18.2 +pkgver=4.20.0 pkgrel=0 pkgdesc="Utility library for the XFCE desktop environment" url="https://xfce.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="94c7371bcfd4ea8dca68a2dc2fe029ce8b232b2b906247bb45a830f13a27833e80831bb6df029d634e6cd8496d4cdcbb9691b6c4344aa51292477f2ebf56bac0 libxfce4util-4.18.2.tar.bz2" +sha512sums="07edc4c8645b3418a659ebb688a48cd1de00d12d06521d30ccfa10b16c4525ce5a869f4b890c9da9b297c44c249a8a091ea1143c72c5f74702cd90337a124ca5 libxfce4util-4.20.0.tar.bz2" diff --git a/user/libxfce4windowing/APKBUILD b/user/libxfce4windowing/APKBUILD new file mode 100644 index 000000000..54dcba827 --- /dev/null +++ b/user/libxfce4windowing/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=libxfce4windowing +pkgver=4.20.0 +pkgrel=0 +pkgdesc="Windowing abstraction library for XFCE" +url="https://xfce.org" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="glib-dev gobject-introspection-dev gtk+3.0-dev gtk-doc + libdisplay-info-dev libwnck-dev xfce4-dev-tools>=${pkgver%.*}" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://archive.xfce.org/src/xfce/libxfce4windowing/4.20/libxfce4windowing-$pkgver.tar.bz2" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-gtk-doc + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="4db76eacd25200a50619839eb7b0f7fbfc901b8641b40acfc2aa34b88b449212e13b8946a8f5fd43ab89f021ba5bab67384e616163efb06b11603faf6913ba90 libxfce4windowing-4.20.0.tar.bz2" diff --git a/user/libxkbcommon/APKBUILD b/user/libxkbcommon/APKBUILD index b76281beb..a667c3ab7 100644 --- a/user/libxkbcommon/APKBUILD +++ b/user/libxkbcommon/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Ariadne Conill <ariadne@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxkbcommon -pkgver=1.7.0 +pkgver=1.8.1 pkgrel=0 pkgdesc="Keyboard handling library" -url="https://www.xkbcommon.org/" +url="https://xkbcommon.org/" arch="all" license="MIT AND X11" options="checkx11" @@ -14,7 +14,8 @@ makedepends="bison doxygen libxcb-dev meson libxml2-dev wayland-dev graphviz wayland-protocols" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-tools-doc:xkbcli_doc $pkgname-tools-bash-completion:bashcomp" -source="https://www.xkbcommon.org/download/libxkbcommon-$pkgver.tar.xz" +source="https://github.com/xkbcommon/libxkbcommon/archive/refs/tags/xkbcommon-$pkgver.tar.gz" +builddir="$srcdir/libxkbcommon-xkbcommon-$pkgver" build() { meson setup \ @@ -68,4 +69,4 @@ bashcomp() { "$subpkgdir"/usr/share/bash-completion/completions/ } -sha512sums="4b74a9f3f63e2ebc1cbdcaa963c70362e55fa527e1d89b6a1fd30d7a84a8b60c1b3dc99bcfbde85aa31890e0b2f62f0bad3c8ff8340fe6a930ee662b33448ba5 libxkbcommon-1.7.0.tar.xz" +sha512sums="a11b8563b11bd085b909753fa99e5b2129343363a05d4fac44a46b334b644dbdd57c356021926e9fdcc2bf6855b90283af93e74c471c3d5677c2ed1bf19427c2 xkbcommon-1.8.1.tar.gz" diff --git a/user/libxpresent/APKBUILD b/user/libxpresent/APKBUILD new file mode 100644 index 000000000..3dc280ea0 --- /dev/null +++ b/user/libxpresent/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=libxpresent +pkgver=1.0.1 +pkgrel=0 +pkgdesc="Library for the X Present extension" +url="https://www.x.org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxfixes-dev libxrandr-dev xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://xorg.freedesktop.org/releases/individual/lib/libXpresent-$pkgver.tar.xz" +builddir="$srcdir/libXpresent-$pkgver" + +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="a4551f49a68f4487eb70dc5b50b7f745fbc8b6842cfa60422afe3834af41c504a37bcfddb4e7e9ee084b250df256034290776c8eb7d8838e392eb626fff55d25 libXpresent-1.0.1.tar.xz" diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD index 70692ad68..73e9cdb1b 100644 --- a/user/lighttpd/APKBUILD +++ b/user/lighttpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lighttpd -pkgver=1.4.76 +pkgver=1.4.79 pkgrel=0 pkgdesc="A secure, fast, compliant and very flexible web-server" url="https://www.lighttpd.net" @@ -36,7 +36,6 @@ source="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$pkgver.t $pkgname.confd $pkgname.logrotate lighttpd.conf - mime-types.conf mod_cgi.conf mod_fastcgi.conf mod_fastcgi_fpm.conf @@ -81,7 +80,7 @@ package() { "$pkgdir"/etc/logrotate.d/lighttpd # config files - local i; for i in lighttpd.conf mime-types.conf mod_cgi.conf \ + local i; for i in lighttpd.conf mod_cgi.conf \ mod_fastcgi.conf mod_fastcgi_fpm.conf do install -m644 "$srcdir"/$i "$pkgdir"/etc/lighttpd/$i @@ -108,12 +107,11 @@ mod_webdav() { } sha512sums=" -940f00f2d84e3424c389108d09756a0af41db3559474135b6c502deccd08ad051b5184f3f7907436384964d2b05045e27dca463af98c889cee69b0ae6e202782 lighttpd-1.4.76.tar.xz +e0f1bb2cfca5e81001ea30d13f088425dfc7acbec924ecddf438eb6326ab3158a61c6c4aaee0b68a90666d1cb987ce94b1f6a48afd92485cc995db5b58265f83 lighttpd-1.4.79.tar.xz a74fb8394fb77fca2a08bdcfc79d4e13de6aca7bc4ed842b7e05f7f3a9cc85dccaa4971ba8fd0edfaa19da8d3870a743b713d9e51f1cbfe5b8e2843bb7fe5346 lighttpd.initd 9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291 lighttpd.confd 0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16 lighttpd.logrotate -f99f109178bc8e60859b01ae7ebaaa63090849fe27f203780bf1e860c2bce997a1b8e6cf4e2a40b5c2f998aac13888aa693dfbfcc8e1bd9be4442a31bcf124d0 lighttpd.conf -a3f2f5763885d7e4f510491b24164e34aaf62bb02daa12991575dc64335c12668355af5bb8d6ce191eb4e9cce95324b1f7c9ba61b323b4e7b50a1e03e021afcf mime-types.conf +ba622693023f38b7ecb6234e29494cbec9cc94786a4d9d544a293e08208aaebb038bf443e205f7c5b8780c6c723a800b7f4d6ec7aaad75ebc65ac9b4f1cf064f lighttpd.conf 27cc638d8068dcf47bd9db44943d1db6c6f4e8e6abd6b42af7cea004b1c093440068541d98c68f8bea70b956713adaf8ed59a4b642dea826ee8620a05f8cfde5 mod_cgi.conf 1d15b84c03fb648a0e67ab5c5411b85478b4454c44bc2959cc96d1700eeadd7ff429520a5f1550db6527267646622dccd3d47d3fd1258869fccaf5c22d4ad4b2 mod_fastcgi.conf f9efc4b70d825600f5356c30e57d0b6cac11c01739337f7192c09c2cfd96cb76c8328b11d818ea4c2addc1a6d253975b84700106ae75854d55d0df73e220bd2b mod_fastcgi_fpm.conf diff --git a/user/lighttpd/lighttpd.conf b/user/lighttpd/lighttpd.conf index 9c9b89c7b..e8807efaf 100644 --- a/user/lighttpd/lighttpd.conf +++ b/user/lighttpd/lighttpd.conf @@ -35,7 +35,6 @@ server.modules = ( ######## Inclusions ######## -include "mime-types.conf" # uncomment for cgi support # include "mod_cgi.conf" # uncomment for php/fastcgi support diff --git a/user/lighttpd/mime-types.conf b/user/lighttpd/mime-types.conf deleted file mode 100644 index f24d4d858..000000000 --- a/user/lighttpd/mime-types.conf +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# Default mime-types.conf for Gentoo. -# include'd from lighttpd.conf. -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mime-types.conf,v 1.4 2010/03/14 21:45:18 bangert Exp $ -############################################################################### - -# {{{ mime types -mimetype.assign = ( - ".svg" => "image/svg+xml", - ".svgz" => "image/svg+xml", - ".pdf" => "application/pdf", - ".sig" => "application/pgp-signature", - ".spl" => "application/futuresplash", - ".class" => "application/octet-stream", - ".ps" => "application/postscript", - ".torrent" => "application/x-bittorrent", - ".dvi" => "application/x-dvi", - ".gz" => "application/x-gzip", - ".pac" => "application/x-ns-proxy-autoconfig", - ".swf" => "application/x-shockwave-flash", - ".tar.gz" => "application/x-tgz", - ".tgz" => "application/x-tgz", - ".tar" => "application/x-tar", - ".zip" => "application/zip", - ".dmg" => "application/x-apple-diskimage", - ".mp3" => "audio/mpeg", - ".m3u" => "audio/x-mpegurl", - ".wma" => "audio/x-ms-wma", - ".wax" => "audio/x-ms-wax", - ".ogg" => "application/ogg", - ".wav" => "audio/x-wav", - ".gif" => "image/gif", - ".jpg" => "image/jpeg", - ".jpeg" => "image/jpeg", - ".png" => "image/png", - ".xbm" => "image/x-xbitmap", - ".xpm" => "image/x-xpixmap", - ".xwd" => "image/x-xwindowdump", - ".css" => "text/css", - ".html" => "text/html", - ".htm" => "text/html", - ".js" => "text/javascript", - ".asc" => "text/plain", - ".c" => "text/plain", - ".h" => "text/plain", - ".cc" => "text/plain", - ".cpp" => "text/plain", - ".hh" => "text/plain", - ".hpp" => "text/plain", - ".conf" => "text/plain", - ".log" => "text/plain", - ".text" => "text/plain", - ".txt" => "text/plain", - ".diff" => "text/plain", - ".patch" => "text/plain", - ".ebuild" => "text/plain", - ".eclass" => "text/plain", - ".rtf" => "application/rtf", - ".bmp" => "image/bmp", - ".tif" => "image/tiff", - ".tiff" => "image/tiff", - ".ico" => "image/x-icon", - ".dtd" => "text/xml", - ".xml" => "text/xml", - ".mpeg" => "video/mpeg", - ".mpg" => "video/mpeg", - ".mov" => "video/quicktime", - ".qt" => "video/quicktime", - ".avi" => "video/x-msvideo", - ".asf" => "video/x-ms-asf", - ".asx" => "video/x-ms-asf", - ".wmv" => "video/x-ms-wmv", - ".bz2" => "application/x-bzip", - ".tbz" => "application/x-bzip-compressed-tar", - ".tar.bz2" => "application/x-bzip-compressed-tar" - ) -# }}} - -# vim: set ft=conf foldmethod=marker et : diff --git a/user/linux-firmware/APKBUILD b/user/linux-firmware/APKBUILD new file mode 100644 index 000000000..e0b9c54d2 --- /dev/null +++ b/user/linux-firmware/APKBUILD @@ -0,0 +1,77 @@ +# Contributor: Ariadne Conill <nenolod@dereferenced.org> +# Contributor: Oliver Smith <ollieparanoid@bitmessage.ch> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=linux-firmware +pkgver=20241210 +pkgrel=2 +pkgdesc="firmware files for linux" +url="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary" +arch="all" +options="!strip !check !dbg" +license="custom:multiple" +depends="" +makedepends="rdfind" +source="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/$pkgname-$pkgver.tar.gz" +# Put /lib/firmware/* folders in subpackages +_folders="3com acenic adaptec advansys airoha amd amd-ucode amdgpu amdnpu +amdtee amlogic amphion ar3k arm ath10k ath11k ath12k ath6k ath9k_htc atmel +atusb av7110 bnx2 bnx2x brcm cadence cavium cirrus cis cnm cpia2 cxgb3 cxgb4 +cypress dabusb dpaa2 dsp56k e100 edgeport emi26 emi62 ene-ub6250 ess go7007 +i915 imx inside-secure intel isci ixp4xx kaweth keyspan keyspan_pda korg +libertas liquidio matrox mediatek mellanox meson microchip moxa mrvl mwl8k +mwlwifi myricom netronome nvidia nxp ositech powervr qca qcom qed qlogic r128 +radeon realtek rockchip rsi rtl_bt rtl_nic rtlwifi rtw88 rtw89 sb16 slicoss sun +sxg tehuti ti ti-connectivity ti-keystone tigon ttusb-budget ueagle-atm vicam +vxge wfx xe yam yamaha" +subpackages="$pkgname-other" +depends="linux-firmware-other" +for i in $_folders; do + subpackages="$pkgname-$i:folder $subpackages" + depends="$pkgname-$i $depends" +done + +package() { + make DESTDIR="${pkgdir}" FIRMWAREDIR="/lib/firmware" install-zst + make DESTDIR="${pkgdir}" FIRMWAREDIR="/lib/firmware" dedup + rm -f "${pkgdir}/usr/lib/firmware/{Makefile,README,configure,GPL-3}" +} + +folder() { + folder=${subpkgname##linux-firmware-} + pkgdesc="firmware files for linux ($folder folder)" + depends="" + + # Move /lib/firmware/$folder (case insensitive) + mkdir -p "$subpkgdir/lib/firmware" + mv "$(find "$pkgdir/lib/firmware" -iname "$folder" -type d)" \ + "$subpkgdir/lib/firmware" + + # Move related symlinks so they do not get in -other + find "$pkgdir/lib/firmware" -maxdepth 1 -ilname "$folder"/\* \ + -exec mv -- '{}' "$subpkgdir/lib/firmware" \; +} + +other() { + # Requires subfolders to be split in subpackages + leftover="" + for i in "$pkgdir"/lib/firmware/*; do + [ -d "$i" ] && leftover="$leftover $(basename $i)" + done + if [ "$leftover" != "" ]; then + error "Not all subfolders have been moved to subpackages!" + error "Fix this by adjusting _folders as follows:" + fixed="$(echo $_folders$leftover | tr " " "\n" | tr '[A-Z]' '[a-z]' | sort)" + echo "_folders=\"$(printf "$fixed" | tr "\n" " ")\"" | fold -s + return 1 + fi + + # Move /lib/firmware (which doesn't have subfolders now) + pkgdesc="firmware files for linux (uncategorized)" + depends="" + install="$subpkgname.post-upgrade" + mkdir -p "$subpkgdir"/ + mv "$pkgdir"/lib "$subpkgdir"/ +} + +sha512sums="75e2d7383e209c2f787a4369e171e2d9bd16dc9cc1cd74920874d1dc56a950df95981be942fd7aa95620ef18da3e50d0fd95886c1497c91c4e54f564fe381fc3 linux-firmware-20241210.tar.gz" diff --git a/user/linux-firmware/linux-firmware-other.post-upgrade b/user/linux-firmware/linux-firmware-other.post-upgrade new file mode 100644 index 000000000..e821b1015 --- /dev/null +++ b/user/linux-firmware/linux-firmware-other.post-upgrade @@ -0,0 +1,16 @@ +#!/bin/sh -e + +vnew="$1" +vold="$2" + +if test `apk version -t $vnew 20241210-r0` = '>' && test `apk version -t $vold 20241210-r0` != '>' ; then + echo + echo '***' + echo 'The linux-firmware package was repartitioned. Due to this, firmware' + echo 'files from go7007, mediatek, ath10k, qcom and ti folders might have' + echo 'been removed. If your hardware needs these files, please install' + echo 'relevant linux-firmware subpackage.' + echo 'If unsure, install the whole linux-firmware package.' + echo '***' + echo +fi diff --git a/user/llvm18/APKBUILD b/user/llvm18/APKBUILD index 694f8245e..bc5bb0c83 100644 --- a/user/llvm18/APKBUILD +++ b/user/llvm18/APKBUILD @@ -6,7 +6,7 @@ _pkgname=llvm pkgver=18.1.8 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver -pkgrel=0 +pkgrel=1 pkgdesc="Low Level Virtual Machine compiler system, version $_majorver" url="https://llvm.org/" arch="all" @@ -23,6 +23,7 @@ source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/l llvm-fix-build-with-musl-libc.patch disable-FileSystemTest.CreateDir-perms-assert.patch dyld-elf-ppc32.patch + dyld-elf-ppc32-2.patch hexagon.patch i586-json-test.patch m68k-endianness.patch @@ -98,28 +99,6 @@ prepare() { # RISC-V issues are uninvestigated as of yet. #1233 rm -v test/CodeGen/RISCV/rvv/combine-store-extract-crash.ll rm -v test/CodeGen/RISCV/xtheadmempair.ll - - # ExecutionEngine for PPC32 requires R_PPC_REL24 to be - # implemented in RuntimeDyld. - for _bad_orc in global-ctor-with-cast.ll \ - global-variable-alignment.ll \ - trivial-call-to-function.ll \ - trivial-call-to-internal-function.ll \ - trivial-reference-to-global-variable.ll \ - trivial-reference-to-internal-variable-nonzeroinit.ll \ - trivial-reference-to-internal-variable-zeroinit.ll \ - trivial-return-zero.ll \ - weak-comdat.ll; do - rm -v test/ExecutionEngine/Orc/$_bad_orc; - done - for _bad_ee in frem.ll mov64zext32.ll \ - test-interp-vec-arithm_float.ll \ - test-interp-vec-arithm_int.ll \ - test-interp-vec-logical.ll \ - test-interp-vec-setcond-fp.ll \ - test-interp-vec-setcond-int.ll; do - rm -v test/ExecutionEngine/$_bad_ee; - done esac #1053 @@ -337,7 +316,8 @@ _common_subpkg() { sha512sums="25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db llvm-project-18.1.8.src.tar.xz f84cd65d7042e89826ba6e8d48c4c302bf4980da369d7f19a55f217e51c00ca8ed178d453df3a3cee76598a7cecb94aed0775a6d24fe73266f82749913fc3e71 llvm-fix-build-with-musl-libc.patch d56945bb0476561028616222846257f990d66e68b4458894f8791252411038b269831f9400ed9df3b99f571a82443caaac347a8b38a5516c77c3583469118309 disable-FileSystemTest.CreateDir-perms-assert.patch -9e919d7988b18c7184d9fccd14911d70bbe2acf82d38111bfd41f1ba2976fea07e74527a43c552dad158c982a2cbaaf03f6a1e98c7a1fc02b4e75382cfe6d0b2 dyld-elf-ppc32.patch +94099a2001d38d935ece69943971e7943691e8a5471b31ae2169e1f2f2e60de8a9fe8ba718dfa942c84d22fced7492bc9b87bce84a3e801a46e549c4657f9eb5 dyld-elf-ppc32.patch +23cd4c38899bf001f6e27db9a21dfb9fa1264a81993ef423535ff3132d2a258b4706d201ff15a96624db82540ee09c14810af0392f0786262699dfdbcb47b9ba dyld-elf-ppc32-2.patch 807587a0c897d47a01a846c5c4f7cbf1f2d16437a163b66ee2381a7147e9d04b0141b2c76d022db61903d0d2841ddb267ba98c66c9e41501ca41837659743df8 hexagon.patch 22dedbbdc99ab4df6c64921186803552fc61cfc00a5cd052295a5450809e7205ac21dd07df158b7e99b960084b2ec3d8832480a8cd073fe1c2d613cd21c90b60 i586-json-test.patch b186ce027dca389cfd23dc91b03e023e688c7610745cf62d0b277b6178972bcf55abf0df08453f2a6b85dc61dba929cb565cb30633a2fe0f193a443f54025bf7 m68k-endianness.patch diff --git a/user/llvm18/dyld-elf-ppc32-2.patch b/user/llvm18/dyld-elf-ppc32-2.patch new file mode 100644 index 000000000..d424554e2 --- /dev/null +++ b/user/llvm18/dyld-elf-ppc32-2.patch @@ -0,0 +1,176 @@ +Author: Ash Logan <ash@heyquark.com> + +adds a whole bunch of ppc32 relocation types - probably only REL32 and REL24 are actually needed, or +indeed tested. +mostly copypasted from the ppc64 code with ELFv2 ABI removed. No attempt is made to support GOT/PLT +relocations, since the JIT doesn't seem to generate these. + +makes clang-repl and the ExecutionEngine testsuites pass, and allows llvmpipe to run + +diff -rup llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp +--- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp 2024-06-16 03:21:32.000000000 +1000 ++++ llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp 2025-02-26 00:10:04.114888980 +1100 +@@ -1029,6 +1029,14 @@ uint8_t *RuntimeDyldImpl::createStubFunc + writeBytesUnaligned(JrT9Instr, Addr + 24, 4); + writeBytesUnaligned(NopInstr, Addr + 28, 4); + return Addr; ++ } else if (Arch == Triple::ppc || Arch == Triple::ppcle) { ++ // The ABI docs talk endlessly of PLTs and GOTs which have special relocation types. ++ // For the generic types, just do a generic jump. ++ writeInt32BE(Addr, 0x3D800000); // lis r12, h(addr) ++ writeInt32BE(Addr+4, 0x618C0000); // ori r12, l(addr) ++ writeInt32BE(Addr+8, 0x7D8903A6); // mtctr r12 ++ writeInt32BE(Addr+12, 0x4E800420); // bctr ++ return Addr; + } else if (Arch == Triple::ppc64 || Arch == Triple::ppc64le) { + // Depending on which version of the ELF ABI is in use, we need to + // generate one of two variants of the stub. They both start with +diff -rup llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +--- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp 2024-06-16 03:21:32.000000000 +1000 ++++ llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp 2025-02-26 00:32:57.021079997 +1100 +@@ -819,7 +819,7 @@ void RuntimeDyldELF::resolvePPC32Relocat + uint8_t *LocalAddress = Section.getAddressWithOffset(Offset); + switch (Type) { + default: +- report_fatal_error("Relocation type not implemented yet!"); ++ report_fatal_error("Relocation type " + Twine(Type) + " not implemented yet!"); + break; + case ELF::R_PPC_ADDR16_LO: + writeInt16BE(LocalAddress, applyPPClo(Value + Addend)); +@@ -835,6 +835,37 @@ void RuntimeDyldELF::resolvePPC32Relocat + int64_t delta = static_cast<int64_t>(Value - FinalAddress + Addend); + writeInt32BE(LocalAddress, delta); + } break; ++ case ELF::R_PPC_REL24: { ++ uint32_t FinalAddress = Section.getLoadAddressWithOffset(Offset); ++ int64_t delta = static_cast<int64_t>(Value - FinalAddress + Addend); ++ if (SignExtend64<26>(delta) != delta) ++ llvm_unreachable("Relocation R_PPC_REL24 overflow"); ++ uint32_t Inst = readBytesUnaligned(LocalAddress, 4); ++ writeInt32BE(LocalAddress, (Inst & 0xFC000003) | (delta & 0x03FFFFFC)); ++ } break; ++ case ELF::R_PPC_ADDR32: { ++ int64_t delta = static_cast<int64_t>(Value + Addend); ++ writeInt32BE(LocalAddress, delta); ++ } break; ++ case ELF::R_PPC_ADDR30: { ++ uint32_t FinalAddress = Section.getLoadAddressWithOffset(Offset); ++ int64_t delta = static_cast<int64_t>(Value - FinalAddress + Addend); ++ uint32_t Inst = readBytesUnaligned(LocalAddress, 4); ++ writeInt32BE(LocalAddress, (Inst & 0x00000003) | (delta & 0xFFFFFFFC)); ++ } break; ++ case ELF::R_PPC_ADDR24: { ++ int64_t delta = static_cast<int64_t>(Value + Addend); ++ if (SignExtend64<26>(delta) != delta) ++ llvm_unreachable("Relocation R_PPC_ADDR24 overflow"); ++ uint32_t Inst = readBytesUnaligned(LocalAddress, 4); ++ writeInt32BE(LocalAddress, (Inst & 0xFC000003) | (delta & 0x03FFFFFC)); ++ } break; ++ case ELF::R_PPC_ADDR16: { ++ int64_t delta = static_cast<int64_t>(Value + Addend); ++ if (SignExtend64<16>(delta) != delta) ++ llvm_unreachable("Relocation R_PPC_ADDR16 overflow"); ++ writeInt16BE(LocalAddress, delta); ++ } break; + } + } + +@@ -1551,6 +1587,76 @@ RuntimeDyldELF::processRelocationRef( + processSimpleRelocation(SectionID, Offset, RelType, Value); + } + ++ } else if (Arch == Triple::ppc || Arch == Triple::ppcle) { ++ if (RelType == ELF::R_PPC_REL24) { ++ // A PPC branch relocation will need a stub function if the target is ++ // an external symbol (either Value.SymbolName is set, or SymType is ++ // Symbol::ST_Unknown) or if the target address is not within the ++ // signed 24-bits branch address. ++ SectionEntry &Section = Sections[SectionID]; ++ uint8_t *Target = Section.getAddressWithOffset(Offset); ++ bool RangeOverflow = false; ++ bool IsExtern = Value.SymbolName || SymType == SymbolRef::ST_Unknown; ++ if (!IsExtern) { ++ uint8_t *RelocTarget = ++ Sections[Value.SectionID].getAddressWithOffset(Value.Addend); ++ int64_t delta = static_cast<int64_t>(Target - RelocTarget); ++ // If it is within 26-bits branch range, just set the branch target ++ if (SignExtend64<26>(delta) != delta) { ++ RangeOverflow = true; ++ } else { ++ RelocationEntry RE(SectionID, Offset, RelType, Value.Addend); ++ addRelocationForSection(RE, Value.SectionID); ++ } ++ } ++ if (IsExtern || RangeOverflow) { ++ // It is an external symbol (either Value.SymbolName is set, or ++ // SymType is SymbolRef::ST_Unknown) or out of range. ++ StubMap::const_iterator i = Stubs.find(Value); ++ if (i != Stubs.end()) { ++ // Symbol function stub already created, just relocate to it ++ resolveRelocation(Section, Offset, ++ reinterpret_cast<uint64_t>( ++ Section.getAddressWithOffset(i->second)), ++ RelType, 0); ++ LLVM_DEBUG(dbgs() << " Stub function found\n"); ++ } else { ++ // Create a new stub function. ++ LLVM_DEBUG(dbgs() << " Create a new stub function\n"); ++ Stubs[Value] = Section.getStubOffset(); ++ uint8_t *StubTargetAddr = createStubFunction( ++ Section.getAddressWithOffset(Section.getStubOffset())); ++ ++ // The PPC32 ELF ABI doesn't really provide any guidance on the no-PLT case so let's do ++ // our best ++ uint64_t StubRelocOffset = StubTargetAddr - Section.getAddress(); ++ if (!IsTargetLittleEndian) ++ StubRelocOffset += 2; ++ ++ RelocationEntry REh(SectionID, StubRelocOffset + 0, ++ ELF::R_PPC_ADDR16_HI, Value.Addend); ++ RelocationEntry REl(SectionID, StubRelocOffset + 4, ++ ELF::R_PPC_ADDR16_LO, Value.Addend); ++ ++ if (Value.SymbolName) { ++ addRelocationForSymbol(REh, Value.SymbolName); ++ addRelocationForSymbol(REl, Value.SymbolName); ++ } else { ++ addRelocationForSection(REh, Value.SectionID); ++ addRelocationForSection(REl, Value.SectionID); ++ } ++ ++ resolveRelocation(Section, Offset, reinterpret_cast<uint64_t>( ++ Section.getAddressWithOffset( ++ Section.getStubOffset())), ++ RelType, 0); ++ Section.advanceStubOffset(getMaxStubSize()); ++ } ++ } ++ } else { ++ // Normal relocations are fine as-is probs ++ processSimpleRelocation(SectionID, Offset, RelType, Value); ++ } + } else if (Arch == Triple::ppc64 || Arch == Triple::ppc64le) { + if (RelType == ELF::R_PPC64_REL24) { + // Determine ABI variant in use for this object. +@@ -2228,6 +2334,8 @@ size_t RuntimeDyldELF::getGOTEntrySize() + case Triple::x86: + case Triple::arm: + case Triple::thumb: ++ case Triple::ppc: ++ case Triple::ppcle: + Result = sizeof(uint32_t); + break; + case Triple::mips: +diff -rup llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h +--- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h 2024-06-16 03:21:32.000000000 +1000 ++++ llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h 2025-02-25 23:51:24.830956991 +1100 +@@ -69,6 +69,8 @@ class RuntimeDyldELF : public RuntimeDyl + return 16; + else if (IsMipsN64ABI) + return 32; ++ else if (Arch == Triple::ppc || Arch == Triple::ppcle) ++ return 16; + else if (Arch == Triple::ppc64 || Arch == Triple::ppc64le) + return 44; + else if (Arch == Triple::x86_64) + diff --git a/user/llvm18/dyld-elf-ppc32.patch b/user/llvm18/dyld-elf-ppc32.patch index 7fb744169..77ff8c644 100644 --- a/user/llvm18/dyld-elf-ppc32.patch +++ b/user/llvm18/dyld-elf-ppc32.patch @@ -8,17 +8,15 @@ Needs more tests before submitting upstream, but seems to DTRT. --- llvm-14.0.6.src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp.old 2022-06-22 16:46:24.000000000 +0000 +++ llvm-14.0.6.src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp 2022-11-28 06:33:12.239921624 +0000 -@@ -830,6 +830,13 @@ +@@ -830,6 +830,11 @@ case ELF::R_PPC_ADDR16_HA: writeInt16BE(LocalAddress, applyPPCha(Value + Addend)); break; -+ case ELF::R_PPC_REL32: ++ case ELF::R_PPC_REL32: { + uint32_t FinalAddress = Section.getLoadAddressWithOffset(Offset); + int64_t delta = static_cast<int64_t>(Value - FinalAddress + Addend); -+ if (SignExtend64<32>(delta) != delta) -+ llvm_unreachable("Relocation R_PPC_REL32 overflow"); + writeInt32BE(LocalAddress, delta); -+ break; ++ } break; } } diff --git a/user/mailcap/APKBUILD b/user/mailcap/APKBUILD new file mode 100644 index 000000000..91cc3598c --- /dev/null +++ b/user/mailcap/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Ermine <mustela@erminea.space> +pkgname=mailcap +pkgver=2.1.54 +pkgrel=0 +pkgdesc="Helper application and MIME type associations for file types" +url="https://pagure.io/mailcap" +arch="noarch" +license="Public-Domain" +options="!check" # No test suite. +subpackages="$pkgname-doc" +source="https://releases.pagure.org/mailcap/mailcap-$pkgver.tar.xz" + +package() { + make install DESTDIR="$pkgdir" + rm -Rf "$pkgdir"/etc/nginx +} + +sha512sums=" +a80caba013b644111f163d8ef74fe801d7266cf4edd38ca723f98fb12a103a24e84a8fca0c569beb05ca0f407437ed1282306b30303c38327b744194c6fe80b2 mailcap-2.1.54.tar.xz +" +sha512sums="a80caba013b644111f163d8ef74fe801d7266cf4edd38ca723f98fb12a103a24e84a8fca0c569beb05ca0f407437ed1282306b30303c38327b744194c6fe80b2 mailcap-2.1.54.tar.xz" diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD index 06968019c..4ccdec0ef 100644 --- a/user/marco/APKBUILD +++ b/user/marco/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=marco pkgver=1.26.2 -pkgrel=0 +pkgrel=1 pkgdesc="Window manager for the MATE desktop environment" url="https://mate-desktop.org" arch="all" license="GPL-2.0+ AND MIT-advertising AND MIT-CMU" -depends="" +depends="mate-desktop mate-settings-daemon" makedepends="gtk+3.0-dev intltool itstool libcanberra-dev libice-dev libsm-dev libxml2-utils libxres-dev startup-notification-dev wayland-protocols zenity" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" diff --git a/user/mdbook/APKBUILD b/user/mdbook/APKBUILD new file mode 100644 index 000000000..a45e4024c --- /dev/null +++ b/user/mdbook/APKBUILD @@ -0,0 +1,623 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=mdbook +pkgver=0.4.47 +pkgrel=0 +pkgdesc="Create books from Markdown files" +url="https://rust-lang.github.io/mdBook/" +arch="all" +license="MPL-2.0" +depends="" +makedepends="cargo" +subpackages="" +source="$pkgname-$pkgver.tar.gz::https://github.com/rust-lang/mdBook/archive/v$pkgver.tar.gz" + +# dependencies taken from Cargo.lock +cargo_deps=" +addr2line 0.24.2 +adler2 2.0.0 +aho-corasick 1.1.3 +ammonia 4.0.0 +android-tzdata 0.1.1 +android_system_properties 0.1.5 +anstream 0.6.18 +anstyle 1.0.10 +anstyle-parse 0.2.6 +anstyle-query 1.1.2 +anstyle-wincon 3.0.7 +anyhow 1.0.95 +assert_cmd 2.0.16 +autocfg 1.4.0 +backtrace 0.3.74 +base64 0.21.7 +bit-set 0.5.3 +bit-vec 0.6.3 +bitflags 1.3.2 +bitflags 2.8.0 +block-buffer 0.10.4 +bstr 1.11.3 +bumpalo 3.16.0 +byteorder 1.5.0 +bytes 1.9.0 +cc 1.2.10 +cfg-if 1.0.0 +chrono 0.4.39 +clap 4.5.27 +clap_builder 4.5.27 +clap_complete 4.5.43 +clap_lex 0.7.4 +colorchoice 1.0.3 +core-foundation-sys 0.8.7 +cpufeatures 0.2.17 +crossbeam-deque 0.8.6 +crossbeam-epoch 0.9.18 +crossbeam-utils 0.8.21 +crypto-common 0.1.6 +darling 0.20.10 +darling_core 0.20.10 +darling_macro 0.20.10 +data-encoding 2.7.0 +dbus 0.9.7 +derive_builder 0.20.2 +derive_builder_core 0.20.2 +derive_builder_macro 0.20.2 +diff 0.1.13 +difflib 0.4.0 +digest 0.10.7 +displaydoc 0.2.5 +doc-comment 0.3.3 +elasticlunr-rs 3.0.2 +env_filter 0.1.3 +env_logger 0.11.6 +equivalent 1.0.1 +errno 0.3.10 +fastrand 2.3.0 +filetime 0.2.25 +float-cmp 0.10.0 +fnv 1.0.7 +form_urlencoded 1.2.1 +fsevent-sys 4.1.0 +futf 0.1.5 +futures-channel 0.3.31 +futures-core 0.3.31 +futures-macro 0.3.31 +futures-sink 0.3.31 +futures-task 0.3.31 +futures-util 0.3.31 +generic-array 0.14.7 +getrandom 0.2.15 +gimli 0.31.1 +globset 0.4.15 +h2 0.3.26 +handlebars 6.3.0 +hashbrown 0.15.2 +headers 0.3.9 +headers-core 0.2.0 +hex 0.4.3 +html5ever 0.26.0 +html5ever 0.27.0 +http 0.2.12 +http 1.2.0 +http-body 0.4.6 +httparse 1.10.0 +httpdate 1.0.3 +humantime 2.1.0 +hyper 0.14.32 +iana-time-zone 0.1.61 +iana-time-zone-haiku 0.1.2 +icu_collections 1.5.0 +icu_locid 1.5.0 +icu_locid_transform 1.5.0 +icu_locid_transform_data 1.5.0 +icu_normalizer 1.5.0 +icu_normalizer_data 1.5.0 +icu_properties 1.5.1 +icu_properties_data 1.5.0 +icu_provider 1.5.0 +icu_provider_macros 1.5.0 +ident_case 1.0.1 +idna 1.0.3 +idna_adapter 1.2.0 +ignore 0.4.23 +indexmap 2.7.1 +inotify 0.11.0 +inotify-sys 0.1.5 +is_terminal_polyfill 1.70.1 +itoa 1.0.14 +js-sys 0.3.77 +kqueue 1.0.8 +kqueue-sys 1.0.4 +libc 0.2.169 +libdbus-sys 0.2.5 +libredox 0.1.3 +linux-raw-sys 0.4.15 +litemap 0.7.4 +lock_api 0.4.12 +log 0.4.25 +mac 0.1.1 +maplit 1.0.2 +markup5ever 0.11.0 +markup5ever 0.12.1 +markup5ever_rcdom 0.2.0 +memchr 2.7.4 +mime 0.3.17 +mime_guess 2.0.5 +miniz_oxide 0.8.3 +mio 1.0.3 +new_debug_unreachable 1.0.6 +normalize-line-endings 0.3.0 +normpath 1.3.0 +notify 8.0.0 +notify-debouncer-mini 0.6.0 +notify-types 2.0.0 +num-modular 0.6.1 +num-order 1.2.0 +num-traits 0.2.19 +object 0.36.7 +once_cell 1.20.2 +opener 0.7.2 +parking_lot 0.12.3 +parking_lot_core 0.9.10 +pathdiff 0.2.3 +percent-encoding 2.3.1 +pest 2.7.15 +pest_derive 2.7.15 +pest_generator 2.7.15 +pest_meta 2.7.15 +phf 0.10.1 +phf 0.11.3 +phf_codegen 0.10.0 +phf_codegen 0.11.3 +phf_generator 0.10.0 +phf_generator 0.11.3 +phf_shared 0.10.0 +phf_shared 0.11.3 +pin-project 1.1.8 +pin-project-internal 1.1.8 +pin-project-lite 0.2.16 +pin-utils 0.1.0 +pkg-config 0.3.31 +ppv-lite86 0.2.20 +precomputed-hash 0.1.1 +predicates 3.1.3 +predicates-core 1.0.9 +predicates-tree 1.0.12 +pretty_assertions 1.4.1 +proc-macro2 1.0.93 +pulldown-cmark 0.10.3 +pulldown-cmark 0.12.2 +pulldown-cmark-escape 0.10.1 +pulldown-cmark-to-cmark 18.0.0 +quote 1.0.38 +rand 0.8.5 +rand_chacha 0.3.1 +rand_core 0.6.4 +redox_syscall 0.5.8 +regex 1.11.1 +regex-automata 0.4.9 +regex-syntax 0.8.5 +rustc-demangle 0.1.24 +rustix 0.38.44 +rustversion 1.0.19 +ryu 1.0.19 +same-file 1.0.6 +scoped-tls 1.0.1 +scopeguard 1.2.0 +select 0.6.0 +semver 1.0.25 +serde 1.0.217 +serde_derive 1.0.217 +serde_json 1.0.137 +serde_urlencoded 0.7.1 +sha1 0.10.6 +sha2 0.10.8 +shlex 1.3.0 +siphasher 0.3.11 +siphasher 1.0.1 +slab 0.4.9 +smallvec 1.13.2 +socket2 0.5.8 +stable_deref_trait 1.2.0 +string_cache 0.8.7 +string_cache_codegen 0.5.2 +strsim 0.11.1 +syn 1.0.109 +syn 2.0.96 +synstructure 0.13.1 +tempfile 3.15.0 +tendril 0.4.3 +terminal_size 0.4.1 +termtree 0.5.1 +thiserror 1.0.69 +thiserror 2.0.11 +thiserror-impl 1.0.69 +thiserror-impl 2.0.11 +tinystr 0.7.6 +tokio 1.43.0 +tokio-macros 2.5.0 +tokio-tungstenite 0.21.0 +tokio-util 0.7.13 +toml 0.5.11 +topological-sort 0.2.2 +tower-service 0.3.3 +tracing 0.1.41 +tracing-core 0.1.33 +try-lock 0.2.5 +tungstenite 0.21.0 +typenum 1.17.0 +ucd-trie 0.1.7 +unicase 2.8.1 +unicode-ident 1.0.16 +url 2.5.4 +utf-8 0.7.6 +utf16_iter 1.0.5 +utf8_iter 1.0.4 +utf8parse 0.2.2 +version_check 0.9.5 +wait-timeout 0.2.0 +walkdir 2.5.0 +want 0.3.1 +warp 0.3.7 +wasi 0.11.0+wasi-snapshot-preview1 +wasm-bindgen 0.2.100 +wasm-bindgen-backend 0.2.100 +wasm-bindgen-macro 0.2.100 +wasm-bindgen-macro-support 0.2.100 +wasm-bindgen-shared 0.2.100 +winapi 0.3.9 +winapi-i686-pc-windows-gnu 0.4.0 +winapi-util 0.1.9 +winapi-x86_64-pc-windows-gnu 0.4.0 +windows-core 0.52.0 +windows-sys 0.52.0 +windows-sys 0.59.0 +windows-targets 0.52.6 +windows_aarch64_gnullvm 0.52.6 +windows_aarch64_msvc 0.52.6 +windows_i686_gnu 0.52.6 +windows_i686_gnullvm 0.52.6 +windows_i686_msvc 0.52.6 +windows_x86_64_gnu 0.52.6 +windows_x86_64_gnullvm 0.52.6 +windows_x86_64_msvc 0.52.6 +write16 1.0.0 +writeable 0.5.5 +xml5ever 0.17.0 +yansi 1.0.1 +yoke 0.7.5 +yoke-derive 0.7.5 +zerocopy 0.7.35 +zerocopy-derive 0.7.35 +zerofrom 0.1.5 +zerofrom-derive 0.1.5 +zerovec 0.10.4 +zerovec-derive 0.10.3 +" + +source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+) ([[:graph:]]+)#\1-\2.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" +builddir="$srcdir/mdBook-$pkgver" + +prepare() { + export CARGO_HOME="$srcdir/cargo-home" + export CARGO_VENDOR="$CARGO_HOME/adelie" + + (builddir=$srcdir; default_prepare) + + mkdir -p "$CARGO_VENDOR" + cat <<- EOF > "$CARGO_HOME/config.toml" + [source.adelie] + directory = "${CARGO_VENDOR}" + + [source.crates-io] + replace-with = "adelie" + local-registry = "/nonexistant" + EOF + + for _dep in $(echo $cargo_deps | sed -E 's#([[:graph:]]+) ([[:graph:]]+)#\1-\2#g'); do + ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" + _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) + cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" + { + "package":"$_sum", + "files":{} + } + EOF + done +} + +build() { + export CARGO_HOME="$srcdir/cargo-home" + export PKG_CONFIG_ALL_DYNAMIC=1 + export RUSTONIG_SYSTEM_LIBONIG=1 + cargo build -j $JOBS --release +} + +check() { + export CARGO_HOME="$srcdir/cargo-home" + cargo test -j $JOBS --release +} + +package() { + export CARGO_HOME="$srcdir/cargo-home" + cargo install --no-track --path . --root="$pkgdir"/usr +} + +sha512sums="76fbc342503baf4bb06b6411dbd086627743e55bcb83f1553cf055a4596a47dd6b5bbd08abd078a762a91a5b2e4c4ba84d13b5ddac1ac3135dd02c0765e64d42 mdbook-0.4.47.tar.gz +39cbec3c920ffc0f37584afb55e1cfe4f182e4415319a4e9bfe842360f102f7b9315f6171c0cf71ba0337123903e604096cd573fe98698a26c8eebc2376d965b addr2line-0.24.2.tar.gz +12d12579ad617cf1a94cf95ab9d3f5db566c3b2de4bd5735eccd83c668fdad0eff134c996b73c46cbb9f932837682043878b8cc4764191625e9f93ccffcce423 adler2-2.0.0.tar.gz +ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69 aho-corasick-1.1.3.tar.gz +84f523eaf7db9d98e44c7d1198fae40e59e838dcc9fc256ca7ef3f3d243a767755f318e516411b4feba4ecb26e30e77d501e9163f996b4d113804e5f2c41a65e ammonia-4.0.0.tar.gz +4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077 android-tzdata-0.1.1.tar.gz +b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191 android_system_properties-0.1.5.tar.gz +5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963 anstream-0.6.18.tar.gz +621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea anstyle-1.0.10.tar.gz +e28c9818afcda0e9b84c205d9c6697ce64cb06c21df2c3666869c07d66893105d9c5e96a27fcf2410a09f6af00735252e22b5c7d8c6cb3f68c4a8f376c49d396 anstyle-parse-0.2.6.tar.gz +26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837 anstyle-query-1.1.2.tar.gz +782440c1093235ad481f0b854f5a3d3acb7908d2e5ddbd4143139b8bfd0faaf2f9816c1034e760d9261a233e6d645098cd5a594064f190662908eaf79972c903 anstyle-wincon-3.0.7.tar.gz +8c5c176381c3e861c3c4451f7cd3d9e2447c0a55735ececfd3199288d65d36dc5fdc4a19a0798f62a0b9d6ca2c155a616c7eab8bcd53e6ece743aed57ec3d0fa anyhow-1.0.95.tar.gz +0b9167282d75169b0b1fad0b1401b42884185976ae0dd690851671aedbc1a9af26dd33f3047400eb4a1b5070216acc293aade149aded7e4f86dd5c0ef0e9a6a9 assert_cmd-2.0.16.tar.gz +3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c autocfg-1.4.0.tar.gz +00cb2be0626f0bf6ec8b8f525bb129d3ac74c386c5e46ee0f343edb78c863222521f8132876057a5a1facacf40792dea51f2f20e986b35f3a85bca3dcf5c1520 backtrace-0.3.74.tar.gz +c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9 base64-0.21.7.tar.gz +c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6 bit-set-0.5.3.tar.gz +b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8 bit-vec-0.6.3.tar.gz +3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 bitflags-1.3.2.tar.gz +f1bc02c858432b0e1fc3b10f239c5886e51d620d55a75521bdf35c8e8f6b6cf8db97e90e08eb2e96715a2c5b28858af305eb266f1ce0c90f9d3945d6d9bdda8b bitflags-2.8.0.tar.gz +b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb block-buffer-0.10.4.tar.gz +f1082ac8f121c6f9eab4b41c5f60aafe4623696c9f800f9d59f6726efc74f86071910f7749fbcdc8f1c20c83416d58f3ff507978775f602e18ae3d1bb027944d bstr-1.11.3.tar.gz +a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1 bumpalo-3.16.0.tar.gz +96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f byteorder-1.5.0.tar.gz +e6c0681c535db6035c1fb1c0481725bb8ab341b6324acde07ac4b60cc4f490ec6ff01478bc00fae00ade2bc5420f9d14cc44438e5d156bcce91cc0f06118296b bytes-1.9.0.tar.gz +bbd8755d390ca8fd209fb22a6b998250bc4765bc8339281498f0170afac7b1112ac5843bc4c604785e734030e2681f58bc5233ebce85e1d1392e3bfc1e654e5f cc-1.2.10.tar.gz +0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff cfg-if-1.0.0.tar.gz +5b258f76bea58ab9baa0fe8fb32c41928b8b655c76bb2fbaae9300ef8380cbb881296cee6b9e9886dce62b0759c73e84f6409e374a86cf0c80e3383512f98571 chrono-0.4.39.tar.gz +e07ff5781679b1da62b0bdf25a674b3d48e1c2d2691ebb7c674562b83ec715b5fb0ece2df0867b0c0d833428d61ce1b3cca976fbeb4bb014273a007453391839 clap-4.5.27.tar.gz +77b0e968361bd348b95b5b2993d5d1a3a4f3dda5fa790598bcb5edd201e7ad487a9ed87f551d40c30343e3e0a30942273c07c7becc12b4b67ddf7395488d8265 clap_builder-4.5.27.tar.gz +0bca525e6be2a3dd95cc6587e057a724a9ac28e49183ffca13196b22ad293d80dbc52bb635cf4b90d882d94bf172479f90910a77601545bfeb701bb485ee9c48 clap_complete-4.5.43.tar.gz +a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e clap_lex-0.7.4.tar.gz +fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14 colorchoice-1.0.3.tar.gz +17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a core-foundation-sys-0.8.7.tar.gz +9ae64656a21cfdd0528d87ba95f6213860bf72ccdf866019e65ed6662633e73490f92c42c80125559b3dbb7822090b5faa8ea564c562e04041232809ec2f58a2 cpufeatures-0.2.17.tar.gz +9368c0c224c4b84356f1d422d8869a5ab4bfb36b0ff69244a9e7a7304ed51f034001cd9b2bc35849df874d36ed34285c66574943573522ea32bbdc5a05df6989 crossbeam-deque-0.8.6.tar.gz +0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2 crossbeam-epoch-0.9.18.tar.gz +6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8 crossbeam-utils-0.8.21.tar.gz +471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f crypto-common-0.1.6.tar.gz +7a14eebc20e48fd39ddf7b8376dc937a04f561d723aba864432cabd5ab46eb189706b43e5121a7f4fb0d68dbfd044353875bb479d4bd5cd96b76e3571733ce55 darling-0.20.10.tar.gz +2b971156b8c1433dd0ddb2213ee522e2fe9968a62889285d1457b5e733daa70a09c21bca9b8573d9c742026b4c06f4dd2025a6a196ec0b08b25a78d8737dff6d darling_core-0.20.10.tar.gz +565b8d535248d9d88b49a58e2a210ecc70f1cd39bfaf029ac6576a9b2eac70a6b18b4930aeca746d76d53b745c6aa82172bb341c4844b3757fc7978732fc2f52 darling_macro-0.20.10.tar.gz +4ea0901ba3b1b37006ff413b743ba56bbe73edcc0b8735ee14a7bb3e71b3f9bc42c473d17284d1efcd358264dd0518ad63926f6bf43a38e1a30ce1306ba80a8d data-encoding-2.7.0.tar.gz +c1557d8be0c5c5623ec6a3928de310c80eef2cdf976d9fcbcc00f08a532af5b8d530f8ee1eba4de12f2df0ff7cf4d21323dfad76be82eeee2f386173991681e5 dbus-0.9.7.tar.gz +75d08f4c106ee5df795ebc8be3dcf34dada037c7566b20bfb52243e16f288b440c723fd17343a654d2f170c056a4197704b9c6b69c8e0d1b250039bee43fd872 derive_builder-0.20.2.tar.gz +ab154b7f116a21984cf8c9cea538e8d33be1680663f4578af37f7d74696547431e9ded07bd8ab0265fd2c4aba5937b948f57d4f9b60b96c840f5150e8c10ce86 derive_builder_core-0.20.2.tar.gz +1a5cdd75bbd6326147f6ed726fdc21b2a4e44db9abe49576d4b1ed067b0e56871cae148ea982b647016240392194efa4eca157d615ab42248d798396612b3d9f derive_builder_macro-0.20.2.tar.gz +45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb diff-0.1.13.tar.gz +fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9 difflib-0.4.0.tar.gz +0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c digest-0.10.7.tar.gz +5ca35fa59f263162389c1180331e9df607d9374bcb056cb04bc46c98e4d87277162ddb2335ffa8a8c5f69218abc3eabccdcaa71c21b8dd9081cc4146f266b948 displaydoc-0.2.5.tar.gz +e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba doc-comment-0.3.3.tar.gz +2f65cc09ac0a9a806fe36a617fe1fd8b6eddc2fa427012ed3fa2eee2f05743089820a801063d0fcd38bf5269b70b6b5f5ad0e6d706cfd461fcf4a62a9f956361 elasticlunr-rs-3.0.2.tar.gz +94db29f1639636655e05ab02611cf14d5c2c8778be6eddddf0b6b8c21f364a71909a2ecc3acf3f4062d5d3c79a6316e9ef30b2fe042f617108af8431e198d344 env_filter-0.1.3.tar.gz +1ec41e4c4eee4ea6bea38d40e739b1f324ef236fc786553fd77c6bacf6303f13d35c1626d3408a18346d42ebf5c896869deba133ef34b8cccf3729957c72de0e env_logger-0.11.6.tar.gz +b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 equivalent-1.0.1.tar.gz +fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f errno-0.3.10.tar.gz +267fecbb7459c8840f03425733d278dd6c4e7637b85b99552877117ed5e8015e094d86aa95841f77064136b7f382276c3cb2c2bef7b2881d272f4aa57c5cf947 fastrand-2.3.0.tar.gz +90b4f3c4df29a3456c393f78f636d70f2615cba748a972dc9b937c2fcbbf4544f5b0d28c6c8fcfed5d5eda026ac670afffec18ab7d7127cee9afa2717146ccf2 filetime-0.2.25.tar.gz +024d6cce0c16f56e4f42381fecff1f3c6b9f960d62e81cdd78b1c77103dc4bbac11c5d656d44ec5fcb644edcd7b9c1a905533df3d758470137e48e3dde4633c7 float-cmp-0.10.0.tar.gz +2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 fnv-1.0.7.tar.gz +c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 form_urlencoded-1.2.1.tar.gz +e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7 fsevent-sys-4.1.0.tar.gz +4cee071c067c879742839d3d32192ca94ee2f9241468656357c3aed116cb7c656bf81722f32b67d60214b7db66858dca6443f0d52f0ff2114fc70971bdddd2d3 futf-0.1.5.tar.gz +87e49e661cb12c1e03a07d3c94ca9bf5954344a51fa11639a118f5a49877c883387343af54639ad80e7196062a77fa7c9b9aff9804fb1e6ea3d0eb09efc53c69 futures-channel-0.3.31.tar.gz +d2f4c2476c4f480f724a880ee16566fcdd545579d3cacd2f16745812eed9ac4a7a88d59d4a38b163ef466c6f6b612b9cb06308a09d52256506a8a90e358db935 futures-core-0.3.31.tar.gz +26c45dd8c037831ce3c41a326ddfd581784c2e7aa2805ca4d93b91e439f4d8c078293cd328bcd66d0283cbd5a14724bc624ec607c343d15193b00bd644b86166 futures-macro-0.3.31.tar.gz +79a57dbee5cfe98f2c003bd463d252648743f70d13e2054af072978b758c7cb8e5fb652fd2f36c760df358ad23d2893cef24ca6ae3df44def28f1d39bcf348a9 futures-sink-0.3.31.tar.gz +4872fd2f24b07c626efc6fd76c01b44d56efecb9697f972d0877307b38d3ccb06277ff029df38981470ba1f8ac5f93086123ab3af44d3c49bd9c10b6c9158a81 futures-task-0.3.31.tar.gz +429b1de584546b931b17d475aacbdb0c14824a57d960c44e615aa808e8c0f9c126473e313a7150b3de87ea91b7eebebb1041509f61b3493fee8a9cd2c75c4df3 futures-util-0.3.31.tar.gz +363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d generic-array-0.14.7.tar.gz +04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb getrandom-0.2.15.tar.gz +b9c8c11547dc7420fe936b9f32a4f5ccf3bb68d1d9f39dedffd40d631360f6e032e719d858668826f1099b8a262e8096aa7ae1f6d7d3d7aaf47934d832715949 gimli-0.31.1.tar.gz +b9281b8bf48d2e297be533aa31c701c0115978b4e580b684b78a385eb2ecb4125187605368a6858311d6cdf5caae7d733cf1406c79241b7d19e7193f5a111dad globset-0.4.15.tar.gz +3e1fb02d42d86c9fbaee6f10fec78eebd9a31a70efbead1f4ca22664ee0e96809a52b06e23a9b6f5d0646422dc8054b5ff5d82644ef65cbc0ed2b3729d849163 h2-0.3.26.tar.gz +63c80950581c99db0ae8c420c89799a41dedaac7dcc6b4de21ef79ae86a8063e8f2b73be4b82723b03d2210fd530aa4724682db4144c9c5a8b4006ee05d5cc8e handlebars-6.3.0.tar.gz +d6fc0613623f9313533dfcab1240e97f652f78f05baa21419f7edb2eff030c4a2c5f426d3eaae747923cffdd8aa9cc2648340e5fc229395b5eacc6fae087c8cd hashbrown-0.15.2.tar.gz +d7b191ce9bfe0103bb4e6ea308f4f6943c1df12bace405bd8b733ade8f0a89b3d156ef7c77aa04233c51e6d34d832a837c12ea9c2f9693fa12f2cca49c1740e1 headers-0.3.9.tar.gz +1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd headers-core-0.2.0.tar.gz +fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 hex-0.4.3.tar.gz +383a25421cddb0573e41ca93131d681cfbfaf551989337845a197e939a2580751ae90e96605bfc4e187dbd5189b6c014557cc69e3d7d2d2cdfb88eeca8896089 html5ever-0.26.0.tar.gz +8d736fc122da78e9ba8b546868d0770837ea0b4951ff027f1b5593dedeb9831c082dad1868659422fab5527711ffed18d4428d519a830a3434d4594a1af6c868 html5ever-0.27.0.tar.gz +e32dd4600aae7e26f1d530871815b30fa0b9bf95293005649bd9a7bc4df7f69a1d8de503d1b8873e67a5496e644d0a47db2a0680fa1e9058bee4dcecccebee58 http-0.2.12.tar.gz +2c8e7234ec3aa720c9dd762c0bb06367fbc39ea89446fc9d8d2e55052a4ac461559a20a8294c877879f3e94d5db06fe41e2cdbb9664ea7ab1bc8003abb038bb5 http-1.2.0.tar.gz +fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462 http-body-0.4.6.tar.gz +0ed43a15585b49064ae6b745b7c17775db1d849911115448239fa70a0b6f1d5a1fb09e654c4c04af8d533d74865966bfb215135a133aefec89eac81f136709d6 httparse-1.10.0.tar.gz +0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a httpdate-1.0.3.tar.gz +3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c humantime-2.1.0.tar.gz +d2b1d713a3ddc8a469ea344a5e7732da637bb644c2d999bed8e8b00b602742e193e553b9bc77eb58017ddccbc4217b20651e2b1698ac98568e780bfa3aa1a819 hyper-0.14.32.tar.gz +d16c67f435606334042c3a286350db46ff3409f142c0782509b136150b4069aafff0dc5c2ecfb7519dd8d105b9a2e6649df2a7bec33ee3966dc94034c9d5a1c4 iana-time-zone-0.1.61.tar.gz +448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 iana-time-zone-haiku-0.1.2.tar.gz +127f1c91101ba69405b10a2590579606df766166fcf1fe6aa9a74c4900296425cba5c47a391a53a01b02026af5581f068fce4a7a400179809f7ed9922b94c0db icu_collections-1.5.0.tar.gz +4b85f0e7cc73166a542b2e502b3ffae1f30d2a9609ab83acf98e90b0edb37fa8ae4592f61ecf48a0ae0779fdd376abeff59e1d5cb97475012eda99ce2a97da57 icu_locid-1.5.0.tar.gz +1779078e2ef9859bee2bfd5414ad7e4b0f0a40e6813f4ccf8de2bbe8c764fac7f99ef001cce22332a8b3840af22e9c7fb7cc0341cf8ba61303794ebe87071e63 icu_locid_transform-1.5.0.tar.gz +1c00fb962eb4b8c759b1120313bb890f4388d579890d7450b798d6266a7d6adcbbebc8a8dad2f267668ca6f1c059d0bd2209eafbe2a72f4558c85258eba57405 icu_locid_transform_data-1.5.0.tar.gz +22612b86a24e3ea222469392763ae9d40dcbb37191dd8b9fa1c64332463a4299a53275a1cd3deb7e0f057d137f4312d990762f9925d0ceafbc8839d67c425a13 icu_normalizer-1.5.0.tar.gz +222fbb819791fb4ec7889e45ed3032ac8d4753e2e9cdce9d0b3f79128baca5ce64157a8a58ecdf39cfddb6c2395001e3cc8828ed51803e85cae133c247cb338f icu_normalizer_data-1.5.0.tar.gz +7e347c0a02a41a3add950290bee90a339091a713546d4369c2995022e64f127f54204b0d46cbb88f396b3bccbd4cf12720a93d8551b73926f78fd5ec01829cac icu_properties-1.5.1.tar.gz +c651d0a50c229acafa648ce234a73bc1d0a85a8bf2369fdadaa62badc741c35e8a7d5392fb1bdb7b720fe2e0f883d1309c78de4ba913691969e5367a4e8bafac icu_properties_data-1.5.0.tar.gz +6c11d89c7d2b788a44757f02b0e298b558ebe174fe917664401d91109cdc7bd1aba5526b3cdcee1f066018de1b775bc9dfc294bdfb40476c53d552bd6f29d6a1 icu_provider-1.5.0.tar.gz +a0dd58d731556a010428fe4aebbc9dbcd626b46d380cf28ba5236ec8824045a20f6f2ec986e0c1e791bc8bc2b692a10306f448279f079b4c37237e4a3c3cef63 icu_provider_macros-1.5.0.tar.gz +81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9 ident_case-1.0.1.tar.gz +e75ab18297878df11d82bf3623b005a3dbf7a6fa38c8f78830c219adc7d6f4ac07dce24a5f1186de69035ec316421319e487396cfacb053674137342d72a4126 idna-1.0.3.tar.gz +1d8b54c19878645749a1bae768dacf353b07d266f2cb3bfa1071a7afb56ca68f534dc1d54cae277b777bc97e5986f297cbe2051a82e14f553ea73cd723d9da7e idna_adapter-1.2.0.tar.gz +ae354b00994ae8570751bc5c09167edd0e2891709d4c4878cf75b24619421d23a1b83e28886d54ed9d31aa427f49153e9a5fc42b5de7262abda20c1c0061b299 ignore-0.4.23.tar.gz +225703f74a734da1ad464895192f07c83068b36129f69a9e87608134f250d3a19b95fdb21dcda6c44cb0204bc4ad69bfbba24d94c83b439000ab4b9ffec74abe indexmap-2.7.1.tar.gz +bf1e133e0c3e9e4c31121b24163e5050a76408540235b9b0e9a9644871cc55aa922ccc48799f2f766a3c869ec7f9a1b2275cd8a19f33c47508dd7d061361158c inotify-0.11.0.tar.gz +dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da inotify-sys-0.1.5.tar.gz +4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1 is_terminal_polyfill-1.70.1.tar.gz +ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987 itoa-1.0.14.tar.gz +d9370ed6ea892bd51ea181630ca661c348f82d575381aa4c8b529113dfcab6687f4d19bceecad7e1b28ebaca74d405862150a5b5ee2d5d55efdaf98eed1ab255 js-sys-0.3.77.tar.gz +c8734fa2cfbf8b8f173604acf5d13ad4cc2739c879387b548a1200f8383b81a1b72315449eb73844e4b82280a4c29901d20c12cdc746d48f9047db89849985f3 kqueue-1.0.8.tar.gz +6650aef7efd7fbf4f9b6c8c6e4c1a91b79636423d46a0173dcb99de74e6f277cb02ada01cb62aa71c3f174a2c28db62a708b0aada9480fc5bde613204acb30a5 kqueue-sys-1.0.4.tar.gz +c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce libc-0.2.169.tar.gz +94ce1de7e1f1727e923b2042aed6652f9d0e68f27388c186c37f7aa2195fd71cb3c92a2bee7e8628c95f36ba2d2a38d25d9804900bf55eb13af31f790bca2847 libdbus-sys-0.2.5.tar.gz +c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49 libredox-0.1.3.tar.gz +b5c39181fb6b901abddd8b2e7b449142e2e5691cddadb8e6b74ddc3b53076b1d410522cfa45af68dd18befd24ff12313c2494cf2cb0cf142e2228bfe42014309 linux-raw-sys-0.4.15.tar.gz +5009c486a87b2f52237e15e2e772365424e4780c146776656d8e1551e52bc8e06e5c1cee8db1c59ef20d0463962fc07ba5221a46020a82df17a2f623a175f58f litemap-0.7.4.tar.gz +525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7 lock_api-0.4.12.tar.gz +b420404c82aeb04219e9f63505d60b8853cad44d1de0bec0750715baae21afae806bd4f741bb8964dd39bb5d1e0f5be41bc38d76773bdfd5e920d30533146231 log-0.4.25.tar.gz +dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a mac-0.1.1.tar.gz +917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f maplit-1.0.2.tar.gz +c9e9452f5bd43a7e578434467ce324a857ad600965fe37a24650f0f3e968fe1dc603ac8c7b9c4ebe2f624511cbdbc592ca0072b04ae094738670e199df9ad05e markup5ever-0.11.0.tar.gz +5063b6591c63897017d79f64d11cc13edce2e8e21462df8a00166d582e83af3132ea7f4e50af4f248b56b75cbd12c6f89b7433da14147c76004fb2ffeda02b92 markup5ever-0.12.1.tar.gz +bf21aee14ec41ea9ac5a5645285173394a561c34311f4b4a7f3c2e8fb32a54a777e4913c985daa2f693bb7b1aaf799d45ab9a6f359b900d2bb916b1ff376fbe4 markup5ever_rcdom-0.2.0.tar.gz +8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2 memchr-2.7.4.tar.gz +e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1 mime-0.3.17.tar.gz +433c876e28394282cfbe14bb9543616cd296879f253ed331c15ace8a7d9f3629f5b596c2d5a64823a97ca9b774acc711b65006c46d54d1e9ee0553cbf1f13b7c mime_guess-2.0.5.tar.gz +b79cd67a477851b18ed87c887bfd9f40f97059eb3fedbdc3a52eac66b5fcea42cae833eea39fd62becdb057b337f91d27f2087a407d02770feeaea934c0b1e1c miniz_oxide-0.8.3.tar.gz +2142edc7e9378fc3437110c85ba2cee9c9683e87034cd44275d2c389645979db53fbbc29fec304f1d8c8f0464ae17d2a5db1aa9215d696fa0282f5069700b1e2 mio-1.0.3.tar.gz +73a61acbc9b20b3595925360827ba8798f3338471b291fa37c72a1c9505b3ec9f688808fcaac9a2eb494e5f3ea5331d30545d5f21f89559111bec6126ac90b48 new_debug_unreachable-1.0.6.tar.gz +f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea normalize-line-endings-0.3.0.tar.gz +a3cd341d1b4ead252f25a77e42165cd5a6b1459946ef55a5319558b89301e01e445f7cdafa13231836d336284798e48cd4e17632cba53a17213badbad3ce7a6f normpath-1.3.0.tar.gz +0238ed072d632526ed6c464d69674f5f1d3744d878b59a9e1e6bc460000447c158a54a3c2504270807a68cd6a5f953deb56b05d80ae03486688d4a9153d14507 notify-8.0.0.tar.gz +f54f8e97bad11f2b278eb384dad75ac9c3dab3e7c8c9518a660e4c2b0ad12ccaf58895fda493b41862c75d14a2fca422d4036c04fc1bb657c4bba55ba7b98faf notify-debouncer-mini-0.6.0.tar.gz +2364311cb22104a661ee4f0b687777f5887c988a3760162a0b51cece66ce99838bc2224f346994687057fda1e19c01e6b1cf812eb1de8e3aad9667b229f9e5ec notify-types-2.0.0.tar.gz +33fd877231e2db400fef0367f7df3a5bfeeb74a9d801f22973501da0890590e929ae96c680dae7ad330e2fa87b80ef1844d87b5d7deec9d431be78120f9a2845 num-modular-0.6.1.tar.gz +befccdd1e2e6e7f969e8bb1274c80589ef4c41532791fc25d1c77f11c80b421406e22252cb2799547cffee7d876850cf6fe66d2f0dd32a4080982a887d3ea30d num-order-1.2.0.tar.gz +180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956 num-traits-0.2.19.tar.gz +dd69172349ecf51fd2351d32cc4453760ca1d15e854a1cf5ed99112032901a54b4645b24163b946deed11f81d3e3035e1a5afd8bff20f335dbd05eceab073478 object-0.36.7.tar.gz +bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8 once_cell-1.20.2.tar.gz +15e2c6262f887bc53e21f1ba1acf9d3a5c97f011e6b54084274f9f089e658fd747b2c16da0a55cd5f56e9b771306c8f56319939a9e503a6ab5c3b9475808191a opener-0.7.2.tar.gz +368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703 parking_lot-0.12.3.tar.gz +4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389 parking_lot_core-0.9.10.tar.gz +54938b311d4eeb49d1d7418d2ab7ffd19bd308c36419cf3ad3ae58785b971fbb2fd2d8f5907e0c47be7bf74ded98c62deeb90f509e6cb0edc6d3c1a69dce3bf7 pathdiff-0.2.3.tar.gz +5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 percent-encoding-2.3.1.tar.gz +a044c8e92bf63dca6522da1aecf714329278def96b037ebb38dd485d6063bb7b15ecf762fdfdecd2026136c42b6edd89702f624cde14b437161c372d6c3d87c3 pest-2.7.15.tar.gz +22cd53c1c9062db988dcf8645a6320f96219777fe35f9d8fe05f69df445d58a39157c029a93d5fc26781c5c44961afffb9bd959b3d4ecba2d4e17b23cc422250 pest_derive-2.7.15.tar.gz +98e0101900cb4fd0e22af2a214f380269de10b590078a7a9f03154ead159912abfec664e1f89c57aae38ca8b54a163da4302d2954713711bb133a9c2ced32f48 pest_generator-2.7.15.tar.gz +dac3e599b280f2ad9d3d6c1362ca18e27929f15047ed9195a3cea1e1ecc03bab98355cb39de1c793764affe41b24f0efcb6660ad0c81f7a6c5201f402e4c6a64 pest_meta-2.7.15.tar.gz +84568d6d1baa7c4e6faf5f3ee09133e736977286d7cb7630a59a53fc8ea15d0d41b9242f8929184667ce576cc9946da55d1e8bc06e98824f163c91c6aa05e073 phf-0.10.1.tar.gz +20a834481bc43ac8c560b00e337294d3c14d1fe359e7f78ed08166b096305e40277f4cd3c179a740911b5c241aeb4e263afa1a50d37f383ef63da113bd6270a9 phf-0.11.3.tar.gz +dab91b53c72a5b9b6c4773b9f16d2cd58f65bdd9fb975257b8d107d4509b44f5ce8b92ab59a60171207e025688cde54ef97c9973c4226a8765f10f35c4f6f1b1 phf_codegen-0.10.0.tar.gz +e86c3b73de198aa0ac67beb6eeebb88865f77d075b9d7f290eb9b73bfdd6728d9479f796d56e4f3358226ee88b877d848017cd951a14804534e4cb656eed209e phf_codegen-0.11.3.tar.gz +b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7 phf_generator-0.10.0.tar.gz +52998e20648b6ecd1eaafa407f7da4667fa829d48fe0c9f8f718377cc86a232a6261fc2f831ffc7051b62dbdb880654b1207ac314e57b23d2b70f634d07c2115 phf_generator-0.11.3.tar.gz +f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5 phf_shared-0.10.0.tar.gz +34bc3c0dff5568f0276777614d92d87882ca6be9e3d405c1e7de90ac16ec52a12acc30ea9ab2033074d0e988fa514247f37de1a21a3727de0ef43f42f477e27e phf_shared-0.11.3.tar.gz +c93706969cb1358d84a9eefea6de6ed732b87c0bd68cd5299f6874b8ec0ea16d65989f127b9ea06a766a5c0e299033a11dd9d83f361938c28e1658d546e3725c pin-project-1.1.8.tar.gz +9471d2c163bb6966203735f6815023a77c7b650adf6f0f03f439416af297e03ccab1772de040c0b2c7bf9f57b92ff6cb0dd50668f85d5a9fe766e24eab0cd1eb pin-project-internal-1.1.8.tar.gz +971adfe54cfed304647fd944c1c915e78b37eaf0de3a582fb984a5e91f1b7d4db2cf0f53a9a64b64427062d4b41c0a36baddef782411a76ae3be0f8ca45f0718 pin-project-lite-0.2.16.tar.gz +828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 pin-utils-0.1.0.tar.gz +ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4 pkg-config-0.3.31.tar.gz +6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1 ppv-lite86-0.2.20.tar.gz +a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05 precomputed-hash-0.1.1.tar.gz +0da703faeb708e3f9eb9bb8803dd8cf6a493b02d38b9b617fd1eed7ccb870ae96c5be6cfe63b7ea8855cb2a019a7ea59799faf2bd78fb490d62e640d1a7de1e2 predicates-3.1.3.tar.gz +618db56d417f44f5575159265f245fbb62399951824730546df735dd9bc9dba2200f58c0a7c7830040bf27954bb48e01fddb5fe0f4d4890d5e172cb1c586735b predicates-core-1.0.9.tar.gz +f5f6d7d0cba4ca7176a26d9adea5ded46f1a3361f9b6ceaa7dcf468ce616912cf3b764b8250f39a42a24eac71fb94e0d4d822c89361aae02472cf761ba55dfaa predicates-tree-1.0.12.tar.gz +474f77c61cc17bbe9914c56b98a80e5918450205827cd059d693c2d603ff61a0897cad25dde645cb495200e61ddc14333d15eb8bf2de090a2eb68deeb9aec8b0 pretty_assertions-1.4.1.tar.gz +1ae650e390e4f1b18d05f42d2ffcd025cabf72568a326cd85496c722600108b0aa0ab0161b39fcc931b8b302427f678650e703f4db57aa1a60f1751db881dc6c proc-macro2-1.0.93.tar.gz +ffa5d116bce2b480f495a0aeac106961c9c79a2127aaca9f75b759e2f2823d253d2bca0dcd5c1f095c16c8e952bdf421fa04a26af53d80095923a5804a274cb2 pulldown-cmark-0.10.3.tar.gz +7514c4282d3c4ef0b0f7ae65374a549c1a027d7fdd5eddad8a2de93dde49aee2e3a2eec2c5c598967b128c2edc6981fa6dc55972c8194206abc9e7a673eb9482 pulldown-cmark-0.12.2.tar.gz +4c60b4abcc385ba7c27210354769e63d5f7f387ce234d3078e7525b88cd2aecd2d62a7dfdc8a4cdde8ef10723a216ea5fb5214e96b5bf8d2fd84e28786b2b3aa pulldown-cmark-escape-0.10.1.tar.gz +04188d57ced101cb52bfc46ef5f2e2cd3b271bdb1f9f4160f9755555bcc430d3ef4534cb91495ea114a69e80867b31b025d16271e69f444e144058c7f2df70bb pulldown-cmark-to-cmark-18.0.0.tar.gz +530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af quote-1.0.38.tar.gz +8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 rand-0.8.5.tar.gz +8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 rand_chacha-0.3.1.tar.gz +36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 rand_core-0.6.4.tar.gz +5f9632f1f89f4963c36ede4da9b955c3474b673c3414d81cdbb61f46c08eff67167f703a0b06b239beeb2d720f8fa592a5493c0f7e872728b5b95f561ff11348 redox_syscall-0.5.8.tar.gz +d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8 regex-1.11.1.tar.gz +40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2 regex-automata-0.4.9.tar.gz +549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8 regex-syntax-0.8.5.tar.gz +eb897c35300b87766e6105917a907fca1c5b1f7691fc03c6c1aaf38075ac883a73d1eb54a245d13ba59c7b0f0333d6543e23fc1b1c542fbbd5c750a84660b9e8 rustc-demangle-0.1.24.tar.gz +b7e66a27c9188eff307aa9912852706f686864852a97af0696ac5fc5dccdf2e4d22a69266fa74ac71aa123e2831f24b898b7ee9121850d65cfb56e12bd647d8f rustix-0.38.44.tar.gz +45b959aea8155ee47c51aa1d87c6c344b5f4b20199a2646ca30bdabe1c2458b014be91fe0c48c29c2261ad9e5de6df7eef7ddead1682e584d4a906c17984baab rustversion-1.0.19.tar.gz +b80d07d609237e13ce1f8cbef5b16738308c540800c7ec18387aec876fb2204029754f20f1f273a0ea07f54dfbaa4595fd0a90044d09f124c1c99e46f1005a99 ryu-1.0.19.tar.gz +3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c same-file-1.0.6.tar.gz +342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25 scoped-tls-1.0.1.tar.gz +6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb scopeguard-1.2.0.tar.gz +8e5b14ee8cd2d88eb908fdf750cfd724741019ad4bbafa1fdeafde10db0b7cc6a86883d8aad7c1267e772dec63e2f138e57d52ab425b8c5a10faed9329dccdfe select-0.6.0.tar.gz +82b66a040a155ea2714a7b014840d55bb4c01fd4862b58519e5adaa5651343048e1f1b86213470cfe919290664de46ee548680bad93e9969fc44ed227c545374 semver-1.0.25.tar.gz +f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054 serde-1.0.217.tar.gz +31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76 serde_derive-1.0.217.tar.gz +25f2c1c31cf01212472f651625d9e4a1ea6bb31c79a74d85ab96dfb3ef4c052d3012a8ab8b6a261826afe90d891d35a2803b8459741d1e20ce8427807caec2a1 serde_json-1.0.137.tar.gz +b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60 serde_urlencoded-0.7.1.tar.gz +fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f sha1-0.10.6.tar.gz +3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785 sha2-0.10.8.tar.gz +5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a shlex-1.3.0.tar.gz +601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b siphasher-0.3.11.tar.gz +d230991add51a555af95b30ef104c0e5ed7011fafb92d6ac9ba0f238c8bf4d2fbd39f4b04dbbe960453f8fdd16d3768ba39f39e4877ad453562e689ec8f24a28 siphasher-1.0.1.tar.gz +b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 slab-0.4.9.tar.gz +a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679 smallvec-1.13.2.tar.gz +b7d03608a3d4cf3e2d1539b5a375412effcc96279e8f57668fa8cf67b3f0a3a6b611ea5e2e72f282460582954acbb5364320611f7798a11ec9e4833e53830b60 socket2-0.5.8.tar.gz +a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03 stable_deref_trait-1.2.0.tar.gz +03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479 string_cache-0.8.7.tar.gz +01b9b1a865878537f657adf908159fd04f3f2ba4e70f8c632b73d0ed5a8a09fe2bb9ac8ac4397dec1f50d771dec33fc5d3f9e68dbf80cc177118665b2c67e864 string_cache_codegen-0.5.2.tar.gz +0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c strsim-0.11.1.tar.gz +12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d syn-1.0.109.tar.gz +ec2e352a5b0b2aa619774c01d7a7767674a44ffe91dea45d3379bf172d13039c3d37f264e98e26b20fe1d86db6d5190f220831c842f3316469d4ae73c2bfddec syn-2.0.96.tar.gz +09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa synstructure-0.13.1.tar.gz +82636d50a29e1ea8cc61e80dc1fa28ea4cfaeb6175e5bf0558d6cd6f8da823f50a808a555ec17fc8601acfd0f504e15688fe95f64e8792feeb216bf27678807d tempfile-3.15.0.tar.gz +53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f tendril-0.4.3.tar.gz +e07bdbdf695bf9a607ea7c7c4c5b22a8637b0871877114aa305717a04d31a6b7670e2a79435810aefefe25db8c9a655e4c4ba6075d4ec76322a30cdf71ff03be terminal_size-0.4.1.tar.gz +43d92132cef6d352c6c0190ce4a688d7cffb61ee86dbc6b49ba1f4c404661f9b329331198063d913ae52b2d4c69e6a2d9f5cd62886894c468093abd8604f0125 termtree-0.5.1.tar.gz +ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899 thiserror-1.0.69.tar.gz +ba0c3c2615bb9bfb07affa66ffeb2eeda43b16a974dc9a0482165a4a5a502a376e2fd6b569a228a08647de23d291e2c301dedf89d8caa79833b965a184dd5904 thiserror-2.0.11.tar.gz +579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3 thiserror-impl-1.0.69.tar.gz +3fb76f16613064917d2b21f1bab06fd4dec9f40ad1f850aa78c5917854347cf9034a72d2091dc792ac06ce9ff9e29ed2bec3a4330b459abff379356e35c8f701 thiserror-impl-2.0.11.tar.gz +a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25 tinystr-0.7.6.tar.gz +8a2681829afc3ffa6446eaff7463d52aa3351598639ef5d9af0633dc5425e7ff222a7e661f519c3383377cb46b40969ae8c38bedc77a9da92a871ba7d1c18a63 tokio-1.43.0.tar.gz +c1d24cbb8b3f500357e39f93cf139790e4bd3ad1657dd5d695f5e4f9a2a460cd63e8c1c32a36b64d3cadd7b6467e59ee34cd5b1548a99449d8e46c2db83e9ec4 tokio-macros-2.5.0.tar.gz +2ed4baa38ed5f3e19250af71c9142412dd96d59c971f9813e9a633c9764c580f7ea2141719a82251c60c9d2a5fdb22b311fc0f7a297f9363585be4d140c1747b tokio-tungstenite-0.21.0.tar.gz +2a1e8fbdd094f81e00ee87eb5ebc4c62825945048105970e52d6d0a872769d268a41ddf91c60158c02a303ecbaa1b19795948b5416f9bbfcb079c5b27d39d51f tokio-util-0.7.13.tar.gz +eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317 toml-0.5.11.tar.gz +1334300f1022126138355ce1c4b33f60297765f9dab6888242e78be76b0df9e83560be693eabaaf10f9aea2dfdb90e248b02b0cee89dca495a1e365d9b6e87dc topological-sort-0.2.2.tar.gz +770cbca46d8500ff36fe84a9a420beb84a0e893dbeaccdd93a3970e746c893b5d32580182ef3017662f421e4b2d71f079ed2cf1727dcd5fc3443a4484f9b43fd tower-service-0.3.3.tar.gz +dffb8d3a1375f1b9d5418550a46cb7b1d92b2cc8ffbccb430a38f7731547960775bb42798074186711847d256eee30fb3e74078b69cb36f28c07d9f231dbf96c tracing-0.1.41.tar.gz +1c6f0cf3b7bd6c8f6316ed9ea0b315a619308de6cbf7e50e665a193cf8c3399b5227d4f145d83b10c7e01a2f9fbc83d16e108cf09b7fd6cef413aa5c1acf89ef tracing-core-0.1.33.tar.gz +433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08 try-lock-0.2.5.tar.gz +44a9826d68b61ec4b65bf72a12800674edd1eff8e9fae3fcb272276f6f598edffc7e1b36f2564494520414b3b426a860a32c6543c07d9f1c1404490e1c0e431e tungstenite-0.21.0.tar.gz +99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508 typenum-1.17.0.tar.gz +382a832e38654a9159ebb40a8e8bf6e7f2f3108940e5b9c388f3a1441848a241201e7e5cfb125e098f04f0b2893da231b8a0e5124270e774215374bff3c5445f ucd-trie-0.1.7.tar.gz +99a3944a5c987376bdea5fe6c0797e881bc8e6f629c56120ce811c8ebbed0a3ba24617decb74d6939699c8fc994c662eb292869ab407c0ba0ec460a32ede0190 unicase-2.8.1.tar.gz +9484a34a4e283f94e971fa9ec42528a62f2c056e702040da37dd9d9b794e16e14a408302d1ac26a850d0eadf0d0266d8ef5b80761490f7029240244a39878ec9 unicode-ident-1.0.16.tar.gz +8f1d62bfdd45f52fa12ad657a521a3478d0ab54d187346a29dd59cc66a0f140ca96d850948e09f6316f08b44b3fc68526c58bd620fed5d065b7e8528df3cd46d url-2.5.4.tar.gz +6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b utf-8-0.7.6.tar.gz +44dcbc5a7db149392fdaa31862be240f78fc5d7616f54be32cfc8f3adbee310e8681ae1bbe6edaad8a7fe6e7759dbac8ae4f69d0dbdbe5350c21dccdbbe975fa utf16_iter-1.0.5.tar.gz +a72671995b3eb295581c60dc632e4a25ba257227fb5d58a8bec322428b6d69529bba79a6f02b8e7ee6698b7779d9d6695f5badad73e07c254b00c9d6256c9090 utf8_iter-1.0.4.tar.gz +f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266 utf8parse-0.2.2.tar.gz +d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db version_check-0.9.5.tar.gz +db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066 wait-timeout-0.2.0.tar.gz +da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad walkdir-2.5.0.tar.gz +f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526 want-0.3.1.tar.gz +8dc2dcb5a64555caa5cf74617cc5fc4fe3874d55f4df1b455e6b68c855fe8791f979c622d64b7e357085e322a047cce411c4dc751ecb608c9832abf7550db5a0 warp-0.3.7.tar.gz +043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f wasi-0.11.0+wasi-snapshot-preview1.tar.gz +2a8ea7ec669efe10f5701dc3b2bf496e33afa70c31dbc65fda5191c9c28ddde54fa38bb168a41b0319a4ff0bb5ccd897ce51ccd7e523e647b3544fb390f8a4e3 wasm-bindgen-0.2.100.tar.gz +a2ee30c1185644f989af6be34e93149a791c05125de24c0ff91c320f683f6f5d939fe42b8ca09d629096388a39256469f8b96a6e35722ccfdbe8d978c9a51770 wasm-bindgen-backend-0.2.100.tar.gz +a1942f838eff5fd54406b573d81fe18f262df48a19535245b1a46cb31db2a022746e861d72e5286c632969d15d416655460d3865309c4947cd3d7965dead5c42 wasm-bindgen-macro-0.2.100.tar.gz +0d03eaeda37c9c6ae06c0fa96e872b54780c4cf545b621c730dcc113dd59a8cb6333c5e3818f51365f71913b9669d8a870a06e70729722d03c07a49cff8a4fdf wasm-bindgen-macro-support-0.2.100.tar.gz +3fca8ddd1c6b2f66f70f6608c9b341822603f1c0dd71d47d27c6be8fe3f2c88598619946627720734b48cf999cafd0c63a08af5db28ea78a1538d2165a5fba61 wasm-bindgen-shared-0.2.100.tar.gz +ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 winapi-0.3.9.tar.gz +a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9 winapi-util-0.1.9.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz +0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36 windows-core-0.52.0.tar.gz +24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 windows-sys-0.52.0.tar.gz +d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061 windows-sys-0.59.0.tar.gz +d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f windows-targets-0.52.6.tar.gz +f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5 windows_aarch64_gnullvm-0.52.6.tar.gz +a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b windows_aarch64_msvc-0.52.6.tar.gz +a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822 windows_i686_gnu-0.52.6.tar.gz +95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f windows_i686_gnullvm-0.52.6.tar.gz +ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96 windows_i686_msvc-0.52.6.tar.gz +c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb windows_x86_64_gnu-0.52.6.tar.gz +67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd windows_x86_64_gnullvm-0.52.6.tar.gz +21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7 windows_x86_64_msvc-0.52.6.tar.gz +655a207b8082bb88e462f992ecb4833cef9d590da06d6356b41d109df2862b49ee5705189c78a607b549e7343035119d158020d58fcad49608e51659357a83c1 write16-1.0.0.tar.gz +818b2546c8ec25816aeaf5e31a1ded927d197bf7256e7c5073738c2709bc58a95d382a0256eb38a99235ae83729b578701261866d42ea3357a26024906e196c1 writeable-0.5.5.tar.gz +0c67244411811a3e82fe58d341b371b938ce6e45ec1af2bd8615c0f0a9628fa662ec0eb130de2ae199d32c7778f0c2d2b80221812dc33831b93333dcde5a682e xml5ever-0.17.0.tar.gz +182c8c6c60a30a727d8f8b90bbf0527d91fa8ae9d8eb20e5414614b43ee6dc532f4b19241adbfb9299cb0004b39fe627036269b60b0c3860d9e1ea4413aca541 yansi-1.0.1.tar.gz +6bbd99671d1a5a5217890eaa267113d193b3636b265393afb6e72a313f01704d462fe017264f061405e8e84c188b590094c29e3fcf19a63c375ae165d1a0bbef yoke-0.7.5.tar.gz +e30b06b020aa283080905004295fb643c539b130d0d53bda51927b95e79ba562336aad30d8a6202d9a0c62d5b64559a01218c6f02f3faada6003d4b03c205cd6 yoke-derive-0.7.5.tar.gz +17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c zerocopy-0.7.35.tar.gz +dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb zerocopy-derive-0.7.35.tar.gz +11f16a1003967b3f30d7b32ffc8541ec05fb335690b08cf4f7554c624ad4312ee0961c83390a997e2a73aee06d8bb09a0ff4e6a5e489f8fb925141e732006544 zerofrom-0.1.5.tar.gz +75098e0f1c690bd8476f819f4ea2a7645b88237042a8876259bf4e025b070a4b105caf16ca7a824c5dd6c4690b693fcc74bed9ac0b5e6fdab05a5bed1b5cb298 zerofrom-derive-0.1.5.tar.gz +db12bba1d7476ddead92e6dfcdcc30e2e0defff4f263a740244eabee265a2cab265473a663d3dc3210f48e113b66d951da496dfab7965ce1bc792e5f2db422a0 zerovec-0.10.4.tar.gz +caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09 zerovec-derive-0.10.3.tar.gz" diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index 991f01271..2bc34d02d 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -23,7 +23,7 @@ subpackages="$pkgname-dev $pkgname-dri $pkgname-vulkan-overlay $pkgname-gbm source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz" _dri_driverdir=/usr/lib/xorg/modules/dri -_gallium_drivers="r300,r600,radeonsi,nouveau,softpipe,llvmpipe,virgl,zink" +_gallium_drivers="r300,r600,radeonsi,nouveau,softpipe,llvmpipe,virgl,zink,svga" _vulkan_drivers="amd,nouveau,swrast,virtio" case "$CARCH" in diff --git a/user/mousepad/APKBUILD b/user/mousepad/APKBUILD index ff1a44642..a42d7d874 100644 --- a/user/mousepad/APKBUILD +++ b/user/mousepad/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=mousepad -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=0 pkgdesc="Simple text editor for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" depends="" -makedepends="dbus-glib-dev glib-dev gtk+3.0-dev gtksourceview4-dev intltool - xfconf-dev" +makedepends="dbus-glib-dev glib-dev gspell-dev gtk+3.0-dev gtksourceview4-dev + intltool libxfce4ui-dev polkit-dev xfconf-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/apps/mousepad/${pkgver%.*}/mousepad-$pkgver.tar.bz2" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="086f60f6f405290ed76366f4c5195e9c8f9c5058d1892200a73e48d6378428efe47f2038e3eddb81186e22dd87d57580559a556b1b22f202b6f056c7f90b64ea mousepad-0.6.2.tar.bz2" +sha512sums="a47e9c0d5b039444ee455e80d0ab4642d5c29d6e5632ec4fccfcef061b4bf40a1709ea73b092b02e915e1796d1593ede68e59b9fe373e127302d34f82c9beae3 mousepad-0.6.3.tar.bz2" diff --git a/user/node/APKBUILD b/user/node/APKBUILD index eb3e08ad5..1c0cbe5a8 100644 --- a/user/node/APKBUILD +++ b/user/node/APKBUILD @@ -16,6 +16,7 @@ source="https://nodejs.org/download/release/v$pkgver/node-v$pkgver.tar.xz pmmx-test.patch pmmx-time64.patch zlib-version-regex.patch + ppc-fixes-for-older-models-18.patch " builddir="$srcdir/$pkgname-v$pkgver" @@ -68,4 +69,5 @@ package() { sha512sums="e41fcda469809186fd724ef4691e25f4a5bd81357ee99acf3d7faa1190a69c19cb62bd14aea199ca6f8b5cf9687af7d898cdf605ea2414d2c04db87ddb3b4dc8 node-v18.15.0.tar.xz 277e226f3906f791bae6aedd0b74b0e2c52b6154eb2dc0c568417ad94a0722078e4fbbbe15c59d4ba0b59cdb4ad45b5e9620f14d75694a15531857cd29aa044a pmmx-test.patch bf78e52c60b4567854eaa9d9433ade8a318a356cb326dded99e800df35a9f475390a0cf8b0c8e595bbdb3702838eafe91801cd646576aa7fa7966b37d794e380 pmmx-time64.patch -45d899bd62e39762fde7e9743efcc6dc032161ae087099da8eecebc84f3eaab87eecf00cbc5861f686a45332224025af172ab00ce966771dccf2e925ca48bc6a zlib-version-regex.patch" +45d899bd62e39762fde7e9743efcc6dc032161ae087099da8eecebc84f3eaab87eecf00cbc5861f686a45332224025af172ab00ce966771dccf2e925ca48bc6a zlib-version-regex.patch +64cffa3cfdced1152a41d77c344370d0077d046ccf20fb618cad7396bcb37290c14a8180b713a7e554e3b09042e481d6aa4a5f97a0a93ceb4090d0f2a510b052 ppc-fixes-for-older-models-18.patch" diff --git a/user/node/ppc-fixes-for-older-models-18.patch b/user/node/ppc-fixes-for-older-models-18.patch new file mode 100644 index 000000000..88d5bd1a0 --- /dev/null +++ b/user/node/ppc-fixes-for-older-models-18.patch @@ -0,0 +1,918 @@ +Fix PowerPC CPU detection and codegen to work with more processors. + +This patch defines the correct optional Power ISA features that the +PPC code generator needs in order to run without crashing on v2.01 +and older CPUs such as PPC 970 (G5) or NXP e6500, and to run more +efficiently on CPUs with features that weren't being used before. + +PowerPC ISA v2.01 and older CPUs don't have FP round to int instructions, +and PowerPC ISA v2.06 and older are missing support for unsigned 64-bit +to/from double, as well as integer to/from single-precision float. + +Use the current PPC_5_PLUS CPU feature to determine whether to generate +FP round to int, and use the PPC_7_PLUS feature to determine whether +to use the v2.06 ISA instructions or whether to generate an alternate +generic PPC sequence to handle the cases of 64-bit unsigned integer +to/from floating point, integers to single-precision floating point, +and loading and storing 64-bit integers with byte reversal. + +Add a new PPC_7_PLUS_NXP feature for the popcnt and ldbrx/stdbrx +opcodes added in Power ISA v2.06, which are also present in the NXP +e5500 and e6500 cores, which are otherwise missing many of the +features added since v2.01. This enables NXP cores to use a few +more features. Additionally, bring back the ISELECT feature flag, +which is also supported by NXP cores, including older ones, and +has its own AT_HWCAP2 feature flag in Linux. + +By defining a new ICACHE_SNOOP feature bit to replace the use of +PPC_6_PLUS, the meaning of the instruction cache flushing fast path, +and the CPUs that can use it, is more clearly defined. In addition, +for the other PowerPC chips, the loop to flush the data and instruction +cache blocks has been split into two loops, with a single "sync" and +"isync" after each loop, which should be more efficient, and also handles +the few CPUs with differing data and instruction cache line sizes. + +In the macro assembler methods, in addition to providing an alternate +path for FP conversion opcodes added in POWER7 (ISA v2.06), unnecessary +instructions to move sp down and then immediately back up were replaced +with negative offsets from the current sp. This should be faster, and also +sp is supposed to point to a back chain at all times (V8 may not do this). + +--- a/deps/v8/src/base/cpu.cc 2022-02-08 04:37:48.000000000 -0800 ++++ b/deps/v8/src/base/cpu.cc 2022-02-19 14:38:37.997161835 -0800 +@@ -14,15 +14,16 @@ + #if V8_OS_LINUX + #include <linux/auxvec.h> // AT_HWCAP + #endif +-#if V8_GLIBC_PREREQ(2, 16) ++#if V8_GLIBC_PREREQ(2, 16) || \ ++ (V8_OS_LINUX && (V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64)) + #include <sys/auxv.h> // getauxval() ++#if defined(PPC_FEATURE2_HAS_ISEL) && !defined(PPC_FEATURE2_ISEL) ++#define PPC_FEATURE2_ISEL PPC_FEATURE2_HAS_ISEL ++#endif + #endif + #if V8_OS_QNX + #include <sys/syspage.h> // cpuinfo + #endif +-#if V8_OS_LINUX && (V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64) +-#include <elf.h> +-#endif + #if V8_OS_AIX + #include <sys/systemcfg.h> // _system_configuration + #ifndef POWER_8 +@@ -772,56 +773,55 @@ + + #ifndef USE_SIMULATOR + #if V8_OS_LINUX +- // Read processor info from /proc/self/auxv. +- char* auxv_cpu_type = nullptr; +- FILE* fp = base::Fopen("/proc/self/auxv", "r"); +- if (fp != nullptr) { +-#if V8_TARGET_ARCH_PPC64 +- Elf64_auxv_t entry; +-#else +- Elf32_auxv_t entry; +-#endif +- for (;;) { +- size_t n = fread(&entry, sizeof(entry), 1, fp); +- if (n == 0 || entry.a_type == AT_NULL) { +- break; +- } +- switch (entry.a_type) { +- case AT_PLATFORM: +- auxv_cpu_type = reinterpret_cast<char*>(entry.a_un.a_val); +- break; +- case AT_ICACHEBSIZE: +- icache_line_size_ = entry.a_un.a_val; +- break; +- case AT_DCACHEBSIZE: +- dcache_line_size_ = entry.a_un.a_val; +- break; +- } +- } +- base::Fclose(fp); +- } +- +- part_ = -1; +- if (auxv_cpu_type) { +- if (strcmp(auxv_cpu_type, "power10") == 0) { +- part_ = kPPCPower10; +- } else if (strcmp(auxv_cpu_type, "power9") == 0) { +- part_ = kPPCPower9; +- } else if (strcmp(auxv_cpu_type, "power8") == 0) { +- part_ = kPPCPower8; +- } else if (strcmp(auxv_cpu_type, "power7") == 0) { +- part_ = kPPCPower7; +- } else if (strcmp(auxv_cpu_type, "power6") == 0) { +- part_ = kPPCPower6; +- } else if (strcmp(auxv_cpu_type, "power5") == 0) { +- part_ = kPPCPower5; +- } else if (strcmp(auxv_cpu_type, "ppc970") == 0) { +- part_ = kPPCG5; +- } else if (strcmp(auxv_cpu_type, "ppc7450") == 0) { +- part_ = kPPCG4; +- } else if (strcmp(auxv_cpu_type, "pa6t") == 0) { +- part_ = kPPCPA6T; +- } ++ // Read processor info from getauxval() (needs at least glibc 2.18 or musl). ++ icache_line_size_ = static_cast<int>(getauxval(AT_ICACHEBSIZE)); ++ dcache_line_size_ = static_cast<int>(getauxval(AT_DCACHEBSIZE)); ++ const unsigned long hwcap = getauxval(AT_HWCAP); ++ const unsigned long hwcap2 = getauxval(AT_HWCAP2); ++ const char* platform = reinterpret_cast<const char*>(getauxval(AT_PLATFORM)); ++ ++ // NOTE: AT_HWCAP ISA version bits aren't cumulative, so it's necessary ++ // to compare against a mask of all supported versions and CPUs, up to ++ // ISA v2.06, which *is* set for later CPUs. In contrast, the AT_HWCAP2 ++ // ISA version bits from v2.07 onward are set cumulatively, so POWER10 ++ // will set the ISA version bits from v2.06 (in AT_HWCAP) through v3.1. ++ ++ // i-cache coherency requires Power ISA v2.02 or later; has its own flag. ++ has_icache_snoop_ = (hwcap & PPC_FEATURE_ICACHE_SNOOP); ++ ++ // requires Power ISA v2.03 or later, or the ISEL bit (e.g. e6500). ++ has_isel_ = (hwcap & (PPC_FEATURE_POWER5_PLUS | PPC_FEATURE_ARCH_2_05 | ++ PPC_FEATURE_PA6T | PPC_FEATURE_POWER6_EXT | PPC_FEATURE_ARCH_2_06)) || ++ (hwcap2 & PPC_FEATURE2_ISEL); ++ ++ // hwcap mask for older 64-bit PPC CPUs with Altivec, e.g. G5, Cell. ++ static const unsigned long kHwcapMaskPPCG5 = ++ (PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC); ++ ++ if (hwcap2 & PPC_FEATURE2_ARCH_3_1) { ++ part_ = kPPCPower10; ++ } else if (hwcap2 & PPC_FEATURE2_ARCH_3_00) { ++ part_ = kPPCPower9; ++ } else if (hwcap2 & PPC_FEATURE2_ARCH_2_07) { ++ part_ = kPPCPower8; ++ } else if (hwcap & PPC_FEATURE_ARCH_2_06) { ++ part_ = kPPCPower7; ++ } else if (hwcap & PPC_FEATURE_ARCH_2_05) { ++ part_ = kPPCPower6; ++ } else if (hwcap & (PPC_FEATURE_POWER5 | PPC_FEATURE_POWER5_PLUS)) { ++ part_ = kPPCPower5; ++ } else if (hwcap & PPC_FEATURE_PA6T) { ++ part_ = kPPCPA6T; ++ } else if (strcmp(platform, "ppce6500") == 0) { ++ part_ = kPPCE6500; ++ } else if (strcmp(platform, "ppce5500") == 0) { ++ part_ = kPPCE5500; ++ } else if ((hwcap & kHwcapMaskPPCG5) == kHwcapMaskPPCG5) { ++ part_ = kPPCG5; ++ } else if (hwcap & PPC_FEATURE_HAS_ALTIVEC) { ++ part_ = kPPCG4; ++ } else { ++ part_ = kPPCG3; + } + + #elif V8_OS_AIX +@@ -842,9 +842,13 @@ + part_ = kPPCPower6; + break; + case POWER_5: ++ default: + part_ = kPPCPower5; + break; + } ++ ++ has_icache_snoop_ = true; ++ has_isel_ = (part_ != kPPCPower5); // isel was added in POWER5+ (v2.03) + #endif // V8_OS_AIX + #endif // !USE_SIMULATOR + #endif // V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64 +--- a/deps/v8/src/base/cpu.h 2023-03-05 09:42:53.000000000 +0300 ++++ b/deps/v8/src/base/cpu.h 2024-12-30 04:02:27.901400946 +0300 +@@ -71,9 +71,12 @@ + kPPCPower8, + kPPCPower9, + kPPCPower10, ++ kPPCG3, + kPPCG4, + kPPCG5, +- kPPCPA6T ++ kPPCPA6T, ++ kPPCE5500, ++ kPPCE6500 + }; + + // General features +@@ -127,6 +130,10 @@ + // mips features + bool is_fp64_mode() const { return is_fp64_mode_; } + bool has_msa() const { return has_msa_; } ++ ++ // PowerPC features ++ bool has_icache_snoop() const { return has_icache_snoop_; } ++ bool has_isel() const { return has_isel_; } + + // riscv features + bool has_rvv() const { return has_rvv_; } +@@ -180,6 +187,8 @@ + bool has_non_stop_time_stamp_counter_; + bool is_running_in_vm_; + bool has_msa_; ++ bool has_icache_snoop_; ++ bool has_isel_; + bool has_rvv_; + }; + +--- a/deps/v8/src/builtins/ppc/builtins-ppc.cc 2022-02-08 04:37:48.000000000 -0800 ++++ b/deps/v8/src/builtins/ppc/builtins-ppc.cc 2022-02-19 15:18:36.373031457 -0800 +@@ -2823,7 +2823,7 @@ + __ lbz(scratch, MemOperand(scratch, 0)); + __ cmpi(scratch, Operand::Zero()); + +- if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ if (CpuFeatures::IsSupported(ISELECT)) { + __ Move(scratch, thunk_ref); + __ isel(eq, scratch, function_address, scratch); + } else { +--- a/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc 2023-03-05 09:42:53.000000000 +0300 ++++ b/deps/v8/src/codegen/ppc/macro-assembler-ppc.cc 2025-01-02 18:47:19.405199075 +0300 +@@ -906,13 +906,25 @@ + + void TurboAssembler::ConvertIntToFloat(Register src, DoubleRegister dst) { + MovIntToDouble(dst, src, r0); +- fcfids(dst, dst); ++ ++ if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ fcfids(dst, dst); ++ } else { ++ fcfid(dst, dst); ++ frsp(dst, dst); ++ } + } + + void TurboAssembler::ConvertUnsignedIntToFloat(Register src, + DoubleRegister dst) { + MovUnsignedIntToDouble(dst, src, r0); +- fcfids(dst, dst); ++ ++ if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ fcfids(dst, dst); ++ } else { ++ fcfid(dst, dst); ++ frsp(dst, dst); ++ } + } + + #if V8_TARGET_ARCH_PPC64 +@@ -924,20 +936,52 @@ + + void TurboAssembler::ConvertUnsignedInt64ToFloat(Register src, + DoubleRegister double_dst) { +- MovInt64ToDouble(double_dst, src); +- fcfidus(double_dst, double_dst); ++ if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ MovInt64ToDouble(double_dst, src); ++ fcfidus(double_dst, double_dst); ++ } else { ++ ConvertUnsignedInt64ToDouble(src, double_dst); ++ frsp(double_dst, double_dst); ++ } + } + + void TurboAssembler::ConvertUnsignedInt64ToDouble(Register src, + DoubleRegister double_dst) { +- MovInt64ToDouble(double_dst, src); +- fcfidu(double_dst, double_dst); ++ if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ MovInt64ToDouble(double_dst, src); ++ fcfidu(double_dst, double_dst); ++ } else { ++ Label negative; ++ Label done; ++ cmpi(src, Operand::Zero()); ++ blt(&negative); ++ std(src, MemOperand(sp, -kDoubleSize)); ++ nop(GROUP_ENDING_NOP); // LHS/RAW optimization ++ lfd(double_dst, MemOperand(sp, -kDoubleSize)); ++ fcfid(double_dst, double_dst); ++ b(&done); ++ bind(&negative); ++ // Note: GCC saves the lowest bit, then ORs it after shifting right 1 bit, ++ // presumably for better rounding. This version only shifts right 1 bit. ++ srdi(r0, src, Operand(1)); ++ std(r0, MemOperand(sp, -kDoubleSize)); ++ nop(GROUP_ENDING_NOP); // LHS/RAW optimization ++ lfd(double_dst, MemOperand(sp, -kDoubleSize)); ++ fcfid(double_dst, double_dst); ++ fadd(double_dst, double_dst, double_dst); ++ bind(&done); ++ } + } + + void TurboAssembler::ConvertInt64ToFloat(Register src, + DoubleRegister double_dst) { + MovInt64ToDouble(double_dst, src); +- fcfids(double_dst, double_dst); ++ if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ fcfids(double_dst, double_dst); ++ } else { ++ fcfid(double_dst, double_dst); ++ frsp(double_dst, double_dst); ++ } + } + #endif + +@@ -967,15 +1011,56 @@ + void TurboAssembler::ConvertDoubleToUnsignedInt64( + const DoubleRegister double_input, const Register dst, + const DoubleRegister double_dst, FPRoundingMode rounding_mode) { +- if (rounding_mode == kRoundToZero) { +- fctiduz(double_dst, double_input); ++ if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ if (rounding_mode == kRoundToZero) { ++ fctiduz(double_dst, double_input); ++ } else { ++ SetRoundingMode(rounding_mode); ++ fctidu(double_dst, double_input); ++ ResetRoundingMode(); ++ } ++ ++ MovDoubleToInt64(dst, double_dst); + } else { +- SetRoundingMode(rounding_mode); +- fctidu(double_dst, double_input); +- ResetRoundingMode(); ++ Label safe_size; ++ Label done; ++ mov(dst, Operand(1593835520)); // bit pattern for 2^63 as a float ++ stw(dst, MemOperand(sp, -kFloatSize)); ++ nop(GROUP_ENDING_NOP); // LHS/RAW optimization ++ lfs(double_dst, MemOperand(sp, -kFloatSize)); ++ fcmpu(double_input, double_dst); ++ blt(&safe_size); ++ // Subtract 2^63, then OR the top bit of the uint64 to add back ++ fsub(double_dst, double_input, double_dst); ++ if (rounding_mode == kRoundToZero) { ++ fctidz(double_dst, double_dst); ++ } else { ++ SetRoundingMode(rounding_mode); ++ fctid(double_dst, double_dst); ++ ResetRoundingMode(); ++ } ++ // set r0 to -1, then clear all but the MSB. ++ mov(r0, Operand(-1)); ++ rldicr(r0, r0, 0, 0); ++ stfd(double_dst, MemOperand(sp, -kDoubleSize)); ++ nop(GROUP_ENDING_NOP); // LHS/RAW optimization ++ ld(dst, MemOperand(sp, -kDoubleSize)); ++ orx(dst, dst, r0); ++ b(&done); ++ // Handling for values smaller than 2^63. ++ bind(&safe_size); ++ if (rounding_mode == kRoundToZero) { ++ fctidz(double_dst, double_input); ++ } else { ++ SetRoundingMode(rounding_mode); ++ fctid(double_dst, double_input); ++ ResetRoundingMode(); ++ } ++ stfd(double_dst, MemOperand(sp, -kDoubleSize)); ++ nop(GROUP_ENDING_NOP); // LHS/RAW optimization ++ ld(dst, MemOperand(sp, -kDoubleSize)); ++ bind(&done); + } +- +- MovDoubleToInt64(dst, double_dst); + } + #endif + +@@ -2466,19 +2551,17 @@ + } + #endif + +- addi(sp, sp, Operand(-kDoubleSize)); + #if V8_TARGET_ARCH_PPC64 + mov(scratch, Operand(litVal.ival)); +- std(scratch, MemOperand(sp)); ++ std(scratch, MemOperand(sp, -kDoubleSize)); + #else + LoadIntLiteral(scratch, litVal.ival[0]); +- stw(scratch, MemOperand(sp, 0)); ++ stw(scratch, MemOperand(sp, -kDoubleSize)); + LoadIntLiteral(scratch, litVal.ival[1]); +- stw(scratch, MemOperand(sp, 4)); ++ stw(scratch, MemOperand(sp, -kDoubleSize + 4)); + #endif + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(result, MemOperand(sp, 0)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(result, MemOperand(sp, -kDoubleSize)); + } + + void TurboAssembler::MovIntToDouble(DoubleRegister dst, Register src, +@@ -2492,18 +2575,16 @@ + #endif + + DCHECK(src != scratch); +- subi(sp, sp, Operand(kDoubleSize)); + #if V8_TARGET_ARCH_PPC64 + extsw(scratch, src); +- std(scratch, MemOperand(sp, 0)); ++ std(scratch, MemOperand(sp, -kDoubleSize)); + #else + srawi(scratch, src, 31); +- stw(scratch, MemOperand(sp, Register::kExponentOffset)); +- stw(src, MemOperand(sp, Register::kMantissaOffset)); ++ stw(scratch, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); ++ stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + #endif + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(dst, MemOperand(sp, 0)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(dst, MemOperand(sp, -kDoubleSize)); + } + + void TurboAssembler::MovUnsignedIntToDouble(DoubleRegister dst, Register src, +@@ -2517,18 +2598,16 @@ + #endif + + DCHECK(src != scratch); +- subi(sp, sp, Operand(kDoubleSize)); + #if V8_TARGET_ARCH_PPC64 + clrldi(scratch, src, Operand(32)); +- std(scratch, MemOperand(sp, 0)); ++ std(scratch, MemOperand(sp, -kDoubleSize)); + #else + li(scratch, Operand::Zero()); +- stw(scratch, MemOperand(sp, Register::kExponentOffset)); +- stw(src, MemOperand(sp, Register::kMantissaOffset)); ++ stw(scratch, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); ++ stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + #endif + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(dst, MemOperand(sp, 0)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(dst, MemOperand(sp, -kDoubleSize)); + } + + void TurboAssembler::MovInt64ToDouble(DoubleRegister dst, +@@ -2543,16 +2622,14 @@ + } + #endif + +- subi(sp, sp, Operand(kDoubleSize)); + #if V8_TARGET_ARCH_PPC64 +- std(src, MemOperand(sp, 0)); ++ std(src, MemOperand(sp, -kDoubleSize)); + #else +- stw(src_hi, MemOperand(sp, Register::kExponentOffset)); +- stw(src, MemOperand(sp, Register::kMantissaOffset)); ++ stw(src_hi, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); ++ stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + #endif + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(dst, MemOperand(sp, 0)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(dst, MemOperand(sp, -kDoubleSize)); + } + + #if V8_TARGET_ARCH_PPC64 +@@ -2567,12 +2644,10 @@ + return; + } + +- subi(sp, sp, Operand(kDoubleSize)); +- stw(src_hi, MemOperand(sp, Register::kExponentOffset)); +- stw(src_lo, MemOperand(sp, Register::kMantissaOffset)); ++ stw(src_hi, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); ++ stw(src_lo, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(dst, MemOperand(sp)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(dst, MemOperand(sp, -kDoubleSize)); + } + #endif + +@@ -2587,12 +2662,10 @@ + } + #endif + +- subi(sp, sp, Operand(kDoubleSize)); +- stfd(dst, MemOperand(sp)); +- stw(src, MemOperand(sp, Register::kMantissaOffset)); ++ stfd(dst, MemOperand(sp, -kDoubleSize)); ++ stw(src, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(dst, MemOperand(sp)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(dst, MemOperand(sp, -kDoubleSize)); + } + + void TurboAssembler::InsertDoubleHigh(DoubleRegister dst, Register src, +@@ -2606,12 +2679,10 @@ + } + #endif + +- subi(sp, sp, Operand(kDoubleSize)); +- stfd(dst, MemOperand(sp)); +- stw(src, MemOperand(sp, Register::kExponentOffset)); ++ stfd(dst, MemOperand(sp, -kDoubleSize)); ++ stw(src, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lfd(dst, MemOperand(sp)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lfd(dst, MemOperand(sp, -kDoubleSize)); + } + + void TurboAssembler::MovDoubleLowToInt(Register dst, DoubleRegister src) { +@@ -2622,11 +2693,9 @@ + } + #endif + +- subi(sp, sp, Operand(kDoubleSize)); +- stfd(src, MemOperand(sp)); ++ stfd(src, MemOperand(sp, -kDoubleSize)); + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lwz(dst, MemOperand(sp, Register::kMantissaOffset)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lwz(dst, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + } + + void TurboAssembler::MovDoubleHighToInt(Register dst, DoubleRegister src) { +@@ -2638,13 +2707,10 @@ + } + #endif + +- subi(sp, sp, Operand(kDoubleSize)); +- stfd(src, MemOperand(sp)); ++ stfd(src, MemOperand(sp, -kDoubleSize)); + nop(GROUP_ENDING_NOP); // LHS/RAW optimization +- lwz(dst, MemOperand(sp, Register::kExponentOffset)); +- addi(sp, sp, Operand(kDoubleSize)); ++ lwz(dst, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); + } +- + void TurboAssembler::MovDoubleToInt64( + #if !V8_TARGET_ARCH_PPC64 + Register dst_hi, +@@ -2657,16 +2723,14 @@ + } + #endif + +- subi(sp, sp, Operand(kDoubleSize)); +- stfd(src, MemOperand(sp)); ++ stfd(src, MemOperand(sp, -kDoubleSize)); + nop(GROUP_ENDING_NOP); // LHS/RAW optimization + #if V8_TARGET_ARCH_PPC64 +- ld(dst, MemOperand(sp, 0)); ++ ld(dst, MemOperand(sp, -kDoubleSize)); + #else +- lwz(dst_hi, MemOperand(sp, Register::kExponentOffset)); +- lwz(dst, MemOperand(sp, Register::kMantissaOffset)); ++ lwz(dst_hi, MemOperand(sp, -kDoubleSize + Register::kExponentOffset)); ++ lwz(dst, MemOperand(sp, -kDoubleSize + Register::kMantissaOffset)); + #endif +- addi(sp, sp, Operand(kDoubleSize)); + } + + void TurboAssembler::MovIntToFloat(DoubleRegister dst, Register src, +@@ -3291,10 +3355,8 @@ + } + + #define MEM_LE_OP_LIST(V) \ +- V(LoadU64, ldbrx) \ + V(LoadU32, lwbrx) \ + V(LoadU16, lhbrx) \ +- V(StoreU64, stdbrx) \ + V(StoreU32, stwbrx) \ + V(StoreU16, sthbrx) + +@@ -3316,6 +3378,37 @@ + #undef MEM_LE_OP_FUNCTION + #undef MEM_LE_OP_LIST + ++void TurboAssembler::LoadU64LE(Register dst, const MemOperand& mem, ++ Register scratch) { ++#ifdef V8_TARGET_BIG_ENDIAN ++ if (CpuFeatures::IsSupported(PPC_7_PLUS_NXP)) { ++ GenerateMemoryLEOperation(dst, mem, ldbrx); ++ } else { ++ lwbrx(dst, mem); ++ lwbrx(scratch, MemOperand(mem.ra(), mem.rb(), mem.offset() + 4)); ++ rldicr(scratch, scratch, 32, 31); ++ orx(dst, dst, scratch); ++ } ++#else ++ LoadU64(dst, mem, scratch); ++#endif ++} ++ ++void TurboAssembler::StoreU64LE(Register src, const MemOperand& mem, ++ Register scratch) { ++#ifdef V8_TARGET_BIG_ENDIAN ++ if (CpuFeatures::IsSupported(PPC_7_PLUS_NXP)) { ++ GenerateMemoryLEOperation(src, mem, stdbrx); ++ } else { ++ stwbrx(src, mem); ++ rldicl(scratch, src, 32, 32); ++ stwbrx(scratch, MemOperand(mem.ra(), mem.rb(), mem.offset() + 4)); ++ } ++#else ++ StoreU64(src, mem, scratch); ++#endif ++} ++ + void TurboAssembler::LoadS32LE(Register dst, const MemOperand& mem, + Register scratch) { + #ifdef V8_TARGET_BIG_ENDIAN +--- a/deps/v8/src/codegen/cpu-features.h 2022-02-19 21:19:15.982288690 -0800 ++++ b/deps/v8/src/codegen/cpu-features.h 2022-02-19 21:22:43.071487369 -0800 +@@ -52,11 +52,15 @@ + MIPS_SIMD, // MSA instructions + + #elif V8_TARGET_ARCH_PPC || V8_TARGET_ARCH_PPC64 ++ PPC_5_PLUS, + PPC_6_PLUS, + PPC_7_PLUS, + PPC_8_PLUS, + PPC_9_PLUS, + PPC_10_PLUS, ++ ICACHE_SNOOP, // ISA v2.02 (POWER5) ++ ISELECT, // ISA v2.03 (POWER5+ and some NXP cores) ++ PPC_7_PLUS_NXP, // ISA v2.06 (POWER7 and NXP e5500/e6500) + + #elif V8_TARGET_ARCH_S390X + FPU, +--- a/deps/v8/src/compiler/backend/ppc/instruction-selector-ppc.cc 2022-02-20 23:35:21.212337639 -0800 ++++ b/deps/v8/src/compiler/backend/ppc/instruction-selector-ppc.cc 2022-02-20 23:36:20.925858840 -0800 +@@ -2702,16 +2702,26 @@ + // static + MachineOperatorBuilder::Flags + InstructionSelector::SupportedMachineOperatorFlags() { +- return MachineOperatorBuilder::kFloat32RoundDown | +- MachineOperatorBuilder::kFloat64RoundDown | +- MachineOperatorBuilder::kFloat32RoundUp | +- MachineOperatorBuilder::kFloat64RoundUp | +- MachineOperatorBuilder::kFloat32RoundTruncate | +- MachineOperatorBuilder::kFloat64RoundTruncate | +- MachineOperatorBuilder::kFloat64RoundTiesAway | +- MachineOperatorBuilder::kWord32Popcnt | +- MachineOperatorBuilder::kWord64Popcnt; ++ MachineOperatorBuilder::Flags flags = MachineOperatorBuilder::Flag::kNoFlags; ++ // FP rounding to integer instructions require Power ISA v2.02 or later. ++ if (CpuFeatures::IsSupported(PPC_5_PLUS)) { ++ flags |= MachineOperatorBuilder::kFloat32RoundDown | ++ MachineOperatorBuilder::kFloat64RoundDown | ++ MachineOperatorBuilder::kFloat32RoundUp | ++ MachineOperatorBuilder::kFloat64RoundUp | ++ MachineOperatorBuilder::kFloat32RoundTruncate | ++ MachineOperatorBuilder::kFloat64RoundTruncate | ++ MachineOperatorBuilder::kFloat64RoundTiesAway; ++ } ++ // Population count requires Power ISA v2.06, or NXP e5500/e6500. ++ if (CpuFeatures::IsSupported(PPC_7_PLUS_NXP)) { ++ flags |= MachineOperatorBuilder::kWord32Popcnt; ++#if V8_TARGET_ARCH_PPC64 ++ flags |= MachineOperatorBuilder::kWord64Popcnt; ++#endif ++ } + // We omit kWord32ShiftIsSafe as s[rl]w use 0x3F as a mask rather than 0x1F. ++ return flags; + } + + // static +--- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc 2023-03-05 09:42:53.000000000 +0300 ++++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc 2025-01-02 22:32:18.475188958 +0300 +@@ -1859,7 +1859,7 @@ + cr, static_cast<CRBit>(VXCVI % CRWIDTH)); + __ mcrfs(cr, VXCVI); // extract FPSCR field containing VXCVI into cr7 + // Handle conversion failures (such as overflow). +- if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ if (CpuFeatures::IsSupported(ISELECT)) { + if (check_conversion) { + __ li(i.OutputRegister(1), Operand(1)); + __ isel(i.OutputRegister(1), r0, i.OutputRegister(1), crbit); +@@ -1896,7 +1896,7 @@ + int crbit = v8::internal::Assembler::encode_crbit( + cr, static_cast<CRBit>(VXCVI % CRWIDTH)); + __ mcrfs(cr, VXCVI); // extract FPSCR field containing VXCVI into cr7 +- if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ if (CpuFeatures::IsSupported(ISELECT)) { + __ li(i.OutputRegister(1), Operand(1)); + __ isel(i.OutputRegister(1), r0, i.OutputRegister(1), crbit); + } else { +@@ -2173,11 +2173,66 @@ + break; + } + case kPPC_LoadByteRev64: { +- ASSEMBLE_LOAD_INTEGER_RR(ldbrx); ++ // inlined version of ASSEMBLE_LOAD_INTEGER_RR() ++ Register result = i.OutputRegister(); ++ AddressingMode mode = kMode_None; ++ MemOperand operand = i.MemoryOperand(&mode); ++ DCHECK_EQ(mode, kMode_MRR); ++ bool is_atomic = i.InputInt32(2); ++ if (CpuFeatures::IsSupported(PPC_7_PLUS_NXP)) { ++ __ ldbrx(result, operand); ++ } else { ++#ifdef V8_TARGET_BIG_ENDIAN ++ // low and high words from reversed perspective ++ MemOperand op_low = operand; ++ MemOperand op_high = MemOperand(operand.ra(), operand.rb(), ++ operand.offset() + 4); ++#else ++ // low and high words from reversed perspective ++ MemOperand op_high = operand; ++ MemOperand op_low = MemOperand(operand.ra(), operand.rb(), ++ operand.offset() + 4); ++#endif ++ Register temp1 = r0; ++ __ lwbrx(result, op_low); ++ __ lwbrx(temp1, op_high); ++ __ rldicr(temp1, temp1, 32, 31); ++ __ orx(result, result, temp1); ++ } ++ if (is_atomic) __ lwsync(); ++ DCHECK_EQ(LeaveRC, i.OutputRCBit()); + break; + } + case kPPC_StoreByteRev64: { +- ASSEMBLE_STORE_INTEGER_RR(stdbrx); ++ // inlined version of ASSEMBLE_STORE_INTEGER_RR() ++ size_t index = 0; ++ AddressingMode mode = kMode_None; ++ MemOperand operand = i.MemoryOperand(&mode, &index); ++ DCHECK_EQ(mode, kMode_MRR); ++ Register value = i.InputRegister(index); ++ bool is_atomic = i.InputInt32(3); ++ if (is_atomic) __ lwsync(); ++ if (CpuFeatures::IsSupported(PPC_7_PLUS_NXP)) { ++ __ stdbrx(value, operand); ++ } else { ++#ifdef V8_TARGET_BIG_ENDIAN ++ // low and high words from reversed perspective ++ MemOperand op_low = operand; ++ MemOperand op_high = MemOperand(operand.ra(), operand.rb(), ++ operand.offset() + 4); ++#else ++ // low and high words from reversed perspective ++ MemOperand op_high = operand; ++ MemOperand op_low = MemOperand(operand.ra(), operand.rb(), ++ operand.offset() + 4); ++#endif ++ Register temp1 = r0; ++ __ stwbrx(value, op_low); ++ __ rldicl(temp1, value, 32, 32); ++ __ stwbrx(temp1, op_high); ++ } ++ if (is_atomic) __ sync(); ++ DCHECK_EQ(LeaveRC, i.OutputRCBit()); + break; + } + case kPPC_F64x2Splat: { +@@ -3936,7 +3991,7 @@ + // Unnecessary for eq/lt & ne/ge since only FU bit will be set. + } + +- if (CpuFeatures::IsSupported(PPC_7_PLUS)) { ++ if (CpuFeatures::IsSupported(ISELECT)) { + switch (cond) { + case eq: + case lt: +@@ -3954,6 +4009,7 @@ + break; + default: + UNREACHABLE(); ++ break; + } + } else { + if (reg_value != 0) __ li(reg, Operand::Zero()); +--- a/deps/v8/src/codegen/ppc/cpu-ppc.cc 2022-02-08 04:37:48.000000000 -0800 ++++ b/deps/v8/src/codegen/ppc/cpu-ppc.cc 2022-02-20 17:02:17.900000785 -0800 +@@ -8,14 +8,12 @@ + + #include "src/codegen/cpu-features.h" + +-#define INSTR_AND_DATA_CACHE_COHERENCY PPC_6_PLUS +- + namespace v8 { + namespace internal { + + void CpuFeatures::FlushICache(void* buffer, size_t size) { + #if !defined(USE_SIMULATOR) +- if (CpuFeatures::IsSupported(INSTR_AND_DATA_CACHE_COHERENCY)) { ++ if (CpuFeatures::IsSupported(ICACHE_SNOOP)) { + __asm__ __volatile__( + "sync \n" + "icbi 0, %0 \n" +@@ -26,25 +24,33 @@ + return; + } + +- const int kCacheLineSize = CpuFeatures::icache_line_size(); +- intptr_t mask = kCacheLineSize - 1; ++ const int kInstrCacheLineSize = CpuFeatures::icache_line_size(); ++ const int kDataCacheLineSize = CpuFeatures::dcache_line_size(); ++ intptr_t ic_mask = kInstrCacheLineSize - 1; ++ intptr_t dc_mask = kDataCacheLineSize - 1; + byte* start = +- reinterpret_cast<byte*>(reinterpret_cast<intptr_t>(buffer) & ~mask); ++ reinterpret_cast<byte*>(reinterpret_cast<intptr_t>(buffer) & ~dc_mask); + byte* end = static_cast<byte*>(buffer) + size; +- for (byte* pointer = start; pointer < end; pointer += kCacheLineSize) { +- __asm__( ++ for (byte* pointer = start; pointer < end; pointer += kDataCacheLineSize) { ++ __asm__ __volatile__( + "dcbf 0, %0 \n" +- "sync \n" +- "icbi 0, %0 \n" +- "isync \n" + : /* no output */ + : "r"(pointer)); + } ++ __asm__ __volatile__("sync"); + ++ start = ++ reinterpret_cast<byte*>(reinterpret_cast<intptr_t>(buffer) & ~ic_mask); ++ for (byte* pointer = start; pointer < end; pointer += kInstrCacheLineSize) { ++ __asm__ __volatile__( ++ "icbi 0, %0 \n" ++ : /* no output */ ++ : "r"(pointer)); ++ } ++ __asm__ __volatile__("isync"); + #endif // !USE_SIMULATOR + } + } // namespace internal + } // namespace v8 + +-#undef INSTR_AND_DATA_CACHE_COHERENCY + #endif // V8_TARGET_ARCH_PPC || V8_TARGET_ARCH_PPC64 +--- ./deps/v8/src/codegen/ppc/assembler-ppc.cc.orig 2022-02-08 04:37:48.000000000 -0800 ++++ ./deps/v8/src/codegen/ppc/assembler-ppc.cc 2022-02-20 17:20:25.019591225 -0800 +@@ -65,6 +65,7 @@ + void CpuFeatures::ProbeImpl(bool cross_compile) { + supported_ |= CpuFeaturesImpliedByCompiler(); + icache_line_size_ = 128; ++ dcache_line_size_ = 128; + + // Only use statically determined features for cross compile (snapshot). + if (cross_compile) return; +@@ -73,6 +74,8 @@ + #ifdef USE_SIMULATOR + // Simulator + supported_ |= (1u << PPC_10_PLUS); ++ supported_ |= (1u << ICACHE_SNOOP); ++ supported_ |= (1u << ISELECT); + #else + base::CPU cpu; + if (cpu.part() == base::CPU::kPPCPower10) { +@@ -85,17 +88,37 @@ + supported_ |= (1u << PPC_7_PLUS); + } else if (cpu.part() == base::CPU::kPPCPower6) { + supported_ |= (1u << PPC_6_PLUS); ++ } else if (cpu.part() == base::CPU::kPPCPower5 || ++ cpu.part() == base::CPU::kPPCPA6T) { ++ supported_ |= (1u << PPC_5_PLUS); ++ } else if (cpu.part() == base::CPU::kPPCE6500 || ++ cpu.part() == base::CPU::kPPCE5500) { ++ supported_ |= (1u << PPC_7_PLUS_NXP); // NXP-supported v2.06 features ++ } ++ ++ if (cpu.has_icache_snoop()) { ++ supported_ |= (1u << ICACHE_SNOOP); ++ } ++ if (cpu.has_isel()) { ++ supported_ |= (1u << ISELECT); + } + #if V8_OS_LINUX + if (cpu.icache_line_size() != base::CPU::kUnknownCacheLineSize) { + icache_line_size_ = cpu.icache_line_size(); + } ++ if (cpu.dcache_line_size() != base::CPU::kUnknownCacheLineSize) { ++ dcache_line_size_ = cpu.dcache_line_size(); ++ } + #endif + #endif + if (supported_ & (1u << PPC_10_PLUS)) supported_ |= (1u << PPC_9_PLUS); + if (supported_ & (1u << PPC_9_PLUS)) supported_ |= (1u << PPC_8_PLUS); + if (supported_ & (1u << PPC_8_PLUS)) supported_ |= (1u << PPC_7_PLUS); +- if (supported_ & (1u << PPC_7_PLUS)) supported_ |= (1u << PPC_6_PLUS); ++ if (supported_ & (1u << PPC_7_PLUS)) { ++ supported_ |= (1u << PPC_7_PLUS_NXP); // NXP-supported v2.06 features ++ supported_ |= (1u << PPC_6_PLUS); ++ } ++ if (supported_ & (1u << PPC_6_PLUS)) supported_ |= (1u << PPC_5_PLUS); + + // Set a static value on whether Simd is supported. + // This variable is only used for certain archs to query SupportWasmSimd128() +@@ -117,11 +140,15 @@ + } + + void CpuFeatures::PrintFeatures() { ++ printf("PPC_5_PLUS=%d\n", CpuFeatures::IsSupported(PPC_5_PLUS)); + printf("PPC_6_PLUS=%d\n", CpuFeatures::IsSupported(PPC_6_PLUS)); + printf("PPC_7_PLUS=%d\n", CpuFeatures::IsSupported(PPC_7_PLUS)); + printf("PPC_8_PLUS=%d\n", CpuFeatures::IsSupported(PPC_8_PLUS)); + printf("PPC_9_PLUS=%d\n", CpuFeatures::IsSupported(PPC_9_PLUS)); + printf("PPC_10_PLUS=%d\n", CpuFeatures::IsSupported(PPC_10_PLUS)); ++ printf("ICACHE_SNOOP=%d\n", CpuFeatures::IsSupported(ICACHE_SNOOP)); ++ printf("ISELECT=%d\n", CpuFeatures::IsSupported(ISELECT)); ++ printf("PPC_7_PLUS_NXP=%d\n", CpuFeatures::IsSupported(PPC_7_PLUS_NXP)); + } + + Register ToRegister(int num) { diff --git a/user/pango/APKBUILD b/user/pango/APKBUILD index 43b8630fb..95e39984f 100644 --- a/user/pango/APKBUILD +++ b/user/pango/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=pango -pkgver=1.50.7 +pkgver=1.56.3 pkgrel=0 pkgdesc="Library for laying out and rendering text" url="https://www.pango.org/" arch="all" -options="!check" # no tests available license="LGPL-2.1+" depends="" +checkdepends="cantarell-fonts" makedepends="$depends_dev cairo-dev expat-dev fontconfig-dev freetype-dev fribidi-dev glib-dev gobject-introspection-dev harfbuzz-dev libxft-dev meson ninja" @@ -20,20 +20,33 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve # 1.42.4-r1: # - CVE-2019-1010238 -build () { - meson \ +prepare() { + default_prepare + # Test fails on ppc64 with x-position moved; upstream suggested it was + # related to rounding differences in HarfBuzz. + rm tests/layouts/valid-20.layout +} + +build() { + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ --buildtype=release \ - . output - ninja -C output + --wrap-mode=nofallback \ + -Dintrospection=enabled \ + . build + meson compile -C build +} + +check() { + meson test -C build } package() { mkdir -p "$pkgdir"/etc/pango - DESTDIR="$pkgdir" ninja -C output install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="4d754ed753fc34074c2a8751459406af7eb1eccb227c6158287f7e2921614d918cae47d078d4a2b4c098b641e40274e81bf1ec6b6a1b147efd550626665767d3 pango-1.50.7.tar.xz" +sha512sums="adb5aa66ea0c45f7bb112867a77f25d31d39bbb18fd8d41df0c1fd329714def874aa3cb8a49847561a75b0824c2abf8ce09a610d088e88d7de015c36a1536ac0 pango-1.56.3.tar.xz" diff --git a/user/rdfind/APKBUILD b/user/rdfind/APKBUILD new file mode 100644 index 000000000..593bf3cf2 --- /dev/null +++ b/user/rdfind/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=rdfind +pkgver=1.6.0 +pkgrel=0 +pkgdesc="A tool for finding duplicate files" +url="https://rdfind.pauldreik.se/" +arch="all" +license="GPL-2.0+" +depends="" +checkdepends="cmd:which" +makedepends="nettle-dev" +subpackages="$pkgname-doc" +source="https://rdfind.pauldreik.se/rdfind-$pkgver.tar.gz" + +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="21d135551bd2d71a71dfe1e4faece6e980db3df18f34433b7b0a5da9e21ccc9067337892025afa9b4b1fd6069732a144b5b7b8e0441cbc9821a71a8b934cced1 rdfind-1.6.0.tar.gz" diff --git a/user/rspamd/APKBUILD b/user/rspamd/APKBUILD index e61e4ad91..e4d36f982 100644 --- a/user/rspamd/APKBUILD +++ b/user/rspamd/APKBUILD @@ -5,11 +5,12 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=rspamd -pkgver=3.8.4 -pkgrel=1 +pkgver=3.11.1 +pkgrel=0 pkgdesc="Fast, free and open-source spam filtering system" url="https://rspamd.com/" arch="all" +options="!check" # Tests require LuaJIT's ffi module license="Apache-2.0 AND BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND LGPL-2.1+ AND LGPL-3.0-only AND MIT AND Zlib" pkgusers="rspamd" pkggroups="rspamd" @@ -21,6 +22,7 @@ makedepends=" file-dev glib-dev icu-dev + libarchive-dev libevent-dev libexecinfo-dev libgd-dev @@ -40,24 +42,29 @@ subpackages=" $pkgname-client $pkgname-libs $pkgname-utils::noarch - $pkgname-controller::noarch - $pkgname-fuzzy::noarch - $pkgname-proxy::noarch $pkgname-openrc $pkgname-dbg " +ldpath="/usr/lib/rspamd" source="$pkgname-$pkgver.tar.gz::https://github.com/rspamd/rspamd/archive/$pkgver.tar.gz $pkgname.logrotated $pkgname.initd $pkgname.confd - 10-conf-split-workers.patch " +provides=" + rspamd-controller=$pkgver-r$pkgrel + rspamd-fuzzy=$pkgver-r$pkgrel + rspamd-proxy=$pkgver-r$pkgrel + " + +replaces="rspamd-controller rspamd-fuzzy rspamd-proxy" + build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - LDFLAGS="-lexecinfo" cmake -B build \ + LDFLAGS="$LDFLAGS -lexecinfo" cmake -B build \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCONFDIR=/etc/$pkgname \ @@ -67,43 +74,34 @@ build() { -DENABLE_LUAJIT=OFF \ -DLUA_INCLUDE_DIR=/usr/include/lua5.3 \ -DLUA_LIBRARY=/usr/lib/lua5.3/liblua.so \ - -DENABLE_REDIRECTOR=ON \ -DENABLE_URL_INCLUDE=ON \ -DENABLE_BACKWARD=OFF \ -DENABLE_PCRE2=ON \ + -DENABLE_URL_INCLUDE=ON \ -DSYSTEM_ZSTD=ON \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ "$CMAKE_CROSSOPTS" . - make -C build + cmake --build build --target all } check() { - make -C build rspamd-test + cmake --build build --target run-test } package() { - make -C build DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build cd "$pkgdir" - local path=usr/bin - for b in rspamd rspamc rspamadm; - do - rm "$path"/$b - mv "$path"/$b-$pkgver "$path"/$b - done - mv "$path"/rspamd_stats "$path"/rspamd-stats - mkdir -p ./usr/sbin - mv usr/bin/rspamd usr/sbin/ - - mkdir -p usr/share/doc/$pkgname - mv usr/share/$pkgname/www/README.md \ - usr/share/doc/$pkgname/ + install -D usr/share/"$pkgname"/www/README.md \ + usr/share/doc/"$pkgname"/README.md + rm usr/share/"$pkgname"/www/README.md install -Dm 644 "$srcdir"/$pkgname.logrotated etc/logrotate.d/$pkgname install -Dm 755 "$srcdir"/$pkgname.initd etc/init.d/$pkgname install -Dm 644 "$srcdir"/$pkgname.confd etc/conf.d/$pkgname + install -d etc/"$pkgname"/local.d etc/"$pkgname"/override.d mkdir -p etc/$pkgname/local.d \ etc/$pkgname/override.d @@ -120,14 +118,14 @@ client() { pkgdesc="$pkgdesc (console client)" mkdir -p "$subpkgdir/usr/bin" - mv "$pkgdir/usr/bin/rspamc" "$subpkgdir/usr/bin/rspamc" + mv "$pkgdir"/usr/bin/rspamc* "$subpkgdir/usr/bin/" } libs() { pkgdesc="$pkgdesc (libraries)" - mkdir -p "$subpkgdir/usr/lib/$subpkgname" - mv "$pkgdir/usr/lib/$pkgname/"*.so "$subpkgdir/usr/lib/$subpkgname/" + mkdir -p "$subpkgdir/usr/lib/$pkgname" + mv "$pkgdir/usr/lib/$pkgname/"*.so "$subpkgdir/usr/lib/$pkgname/" } utils() { @@ -135,41 +133,10 @@ utils() { depends="perl" mkdir -p "$subpkgdir/usr/bin" - mv "$pkgdir/usr/bin/${pkgname}-stats" "$subpkgdir/usr/bin/" -} - -fuzzy() { - pkgdesc="$pkgdesc (local fuzzy storage)" - license="Apache-2.0" - depends="$pkgname" - - mkdir -p "$subpkgdir/etc/$pkgname/modules.d" - mv "$pkgdir/etc/$pkgname"/worker-fuzzy.* "$subpkgdir/etc/$pkgname/" - mv "$pkgdir/etc/$pkgname"/modules.d/fuzzy_* "$subpkgdir/etc/$pkgname/modules.d/" -} - -controller() { - pkgdesc="$pkgdesc (controller web interface)" - license="MIT" - depends="$pkgname" - - mkdir -p "$subpkgdir/usr/share/$pkgname" - mv "$pkgdir/usr/share/$pkgname/www" "$subpkgdir/usr/share/$pkgname/www" - mkdir -p "$subpkgdir/etc/$pkgname" - mv "$pkgdir/etc/$pkgname"/worker-controller.* "$subpkgdir/etc/$pkgname/" -} - -proxy() { - pkgdesc="$pkgdesc (milter support)" - license="Apache-2.0" - depends="$pkgname" - - mkdir -p "$subpkgdir/etc/$pkgname" - mv "$pkgdir/etc/$pkgname"/worker-proxy.* "$subpkgdir/etc/$pkgname/" + mv "$pkgdir/usr/bin/${pkgname}"_stats "$subpkgdir/usr/bin/" } -sha512sums="dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51 rspamd-3.8.4.tar.gz +sha512sums="979aad9d2cc720c12922d55f4ad742b65e18d0ca52ebb764a2432bd3d64e559461c8e1fa87f7ac52e614df71d0a776aa0362a876eaa745cd3f8c21afee52b8ab rspamd-3.11.1.tar.gz 2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb rspamd.logrotated -782e1126d32e450a1db0ac822c127b9a763f903093f200bdf603a6a0610a853671b94c89b0bb2d8ebdfb065e0cf62be51c1c7f451e8da34e25f252a276c2b0f3 rspamd.initd -a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702 rspamd.confd -0321c76b42131943f7b53efeb6bbd1c5b732fdec4f796838568af45d245066518f8b2ccd667d5a370df539ba73dda47e66d4ce0eeb211ef6fc5942e96c2e311b 10-conf-split-workers.patch" +c136126e3d3953079939b2b0b9b49f5f921af4c3aa0ad59a206632436ff963a69b5980a3b8e4eb14882d8db31d6fd96045a9e1cd6302ad111d76b8e92fab890e rspamd.initd +a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702 rspamd.confd" diff --git a/user/rspamd/rspamd.initd b/user/rspamd/rspamd.initd index aaa40428b..cf0ea79ab 100644 --- a/user/rspamd/rspamd.initd +++ b/user/rspamd/rspamd.initd @@ -13,7 +13,7 @@ description_reopen="Reopen log files" : ${cfgfile:=${RSPAMD_CONFIG:-/etc/rspamd/rspamd.conf}} : ${startuplog:=${RSPAMD_STARTUPLOG:-/dev/null}} -command="/usr/sbin/rspamd" +command="/usr/bin/rspamd" command_args="--config $cfgfile --no-fork ${command_args:-}" command_background="yes" pidfile="/run/rspamd/$RC_SVCNAME.pid" diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD index 58de23ace..cbccc10cf 100644 --- a/user/s6-dns/APKBUILD +++ b/user/s6-dns/APKBUILD @@ -1,36 +1,34 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-dns -pkgver=2.4.0.0 +pkgver=2.4.1.0 pkgrel=0 pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities" url="https://skarnet.org/software/s6-dns/" arch="all" options="!check" license="ISC" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 depends="" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6-dns.pc.in" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ --enable-shared \ --disable-allstatic \ --prefix=/usr \ - --libexecdir="/usr/lib/$pkgname" + --libexecdir="/usr/lib/$pkgname" \ + --with-pkgconfig \ + --enable-pkgconfig make } package() { make DESTDIR="$pkgdir" install mkdir -p -m 0755 "$pkgdir/usr/share/doc" - 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" } -sha512sums="6c9eb8ad4501ac20733747ae0065ed1d19abd2c61e29e98fc6d0421367ec9ece951daea287e4ec8c4301a74b6f96b8a0e376b4b3ba046cca515b8b57d69600e2 s6-dns-2.4.0.0.tar.gz -fd93571da2d2a6c2dea00219414f9ee5fe3bc09a4a6a7fd002b9251c22ff682eddfeff4bf9c6c90d8b02681fc8117328a1fd9689839ab457d354870c522bf5e7 s6-dns.pc.in" +sha512sums="48e8c6b0bf0704b674f56267ea3e4b7261bbc6344b121ec87053a9a7e2f4740e5e90ec60eaaa96a1e0fe08f82f4f8ffd8b29d4d097a1a108d9bcbaae0de3905b s6-dns-2.4.1.0.tar.gz" diff --git a/user/s6-dns/s6-dns.pc.in b/user/s6-dns/s6-dns.pc.in deleted file mode 100644 index 1edd81bca..000000000 --- a/user/s6-dns/s6-dns.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: s6-dns -Description: A DNS client library for sync+async single-threaded resolution -URL: https://skarnet.org/software/s6-dns/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -ls6dns diff --git a/user/s6-linux-utils/APKBUILD b/user/s6-linux-utils/APKBUILD index c9ca33c70..6dcd1feb8 100644 --- a/user/s6-linux-utils/APKBUILD +++ b/user/s6-linux-utils/APKBUILD @@ -1,14 +1,13 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-utils -pkgver=2.6.2.1 +pkgver=2.6.3.0 pkgrel=0 pkgdesc="skarnet.org's Linux-specific miscellaneous utilities" url="https://skarnet.org/software/s6-linux-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 depends="" makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-doc" @@ -18,7 +17,9 @@ build() { ./configure \ --disable-allstatic \ --prefix=/usr \ - --with-dynlib=/lib + --with-dynlib=/lib \ + --with-pkgconfig \ + --enable-pkgconfig make } @@ -28,4 +29,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="d3f796c1edc0de6e289b7b82e8c97ea58e80d0bcb2e4731a5c2c25cf4abfbd91318e33ab48956bc6e7b2f188c622bb33def72e96f22f9448778ede5ac829c940 s6-linux-utils-2.6.2.1.tar.gz" +sha512sums="ddd8f96d637b25d3f846d546145325a8cb78a3ba3cbf897649f924ee739c7dbe891907f886dd25f11d0354b40022fe7d16b1907044716d05720e8fd6c0171e60 s6-linux-utils-2.6.3.0.tar.gz" diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD index 75dcd1f64..b6757a898 100644 --- a/user/s6-networking/APKBUILD +++ b/user/s6-networking/APKBUILD @@ -1,23 +1,22 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-networking -pkgver=2.7.0.4 +pkgver=2.7.1.0 pkgrel=0 pkgdesc="skarnet.org's UCSPI TCP and TLS tools, access control tools, and network time management utilities." url="https://skarnet.org/software/s6-networking/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 -_execline_version=2.9.6 -_s6_version=2.13.1 -_s6dns_version=2.4.0 +_skalibs_version=2.14.4 +_execline_version=2.9.7 +_s6_version=2.13.2 +_s6dns_version=2.4.1 _bearssl_version=0.6 depends="execline" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev execline-dev>=$_execline_version s6-dev>=$_s6_version s6-dns-dev>=$_s6dns_version bearssl-dev>=$_bearssl_version" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6-networking.pc.in" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ @@ -25,17 +24,16 @@ build() { --disable-allstatic \ --prefix=/usr \ --libexecdir="/usr/lib/$pkgname" \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-ssl=bearssl make } package() { make DESTDIR="$pkgdir" install - 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" mkdir -p -m 0755 "$pkgdir/usr/share/doc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="2a789cbc2f901e78fffb959fcbddf89c71de75c0d57d3fb1a927418fa8a43f71057c2b50b03e15aa45d5d7ee6521e76b697ae57eef2b7eea760ef9295314dc9b s6-networking-2.7.0.4.tar.gz -d6a17ebe194c4ffb1c402fec7589e34961b2b73cd4b380c2ffe9e7d74667d150f4c200cfc6f2e07e44eb14fbb8c51d0e1d2f39c284553472c5b4ae1137381d9f s6-networking.pc.in" +sha512sums="33741efa5c1908f8e7396929df08c3591e25b7c58335b331a146db17a9b7e5c00b75dd3337aa46114723969b8490fb1b6754a25357003780bdfd0a2fd8e3283c s6-networking-2.7.1.0.tar.gz" diff --git a/user/s6-networking/s6-networking.pc.in b/user/s6-networking/s6-networking.pc.in deleted file mode 100644 index d0a288192..000000000 --- a/user/s6-networking/s6-networking.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: s6-networking -Description: A C interface to some rfc1413 functions -URL: https://skarnet.org/software/s6-networking/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -ls6net diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD index 9752d687c..6d0909f02 100644 --- a/user/s6-portable-utils/APKBUILD +++ b/user/s6-portable-utils/APKBUILD @@ -1,14 +1,13 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-portable-utils -pkgver=2.3.0.4 +pkgver=2.3.1.0 pkgrel=0 pkgdesc="skarnet.org's portable miscellaneous utilities" url="https://skarnet.org/software/s6-portable-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 depends="" makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-doc" @@ -18,7 +17,9 @@ build() { ./configure \ --disable-allstatic \ --prefix=/usr \ - --with-dynlib=/lib + --with-dynlib=/lib \ + --with-pkgconfig \ + --enable-pkgconfig make } @@ -28,4 +29,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="0da4fb637f414d870e0476a01c08448b021d2c20c9a4746ab1c6c700e8eeb055d57f6e8326228694463483cd307e308f8fe148a615232039f32dcf351d5060ec s6-portable-utils-2.3.0.4.tar.gz" +sha512sums="80ab6152d5c3f88449d77924ceb43ccef12a41918d2fd8042ded15423b8f65e612d582c6475d73c500380018a91f7adc48c71740c898015565a046a8fbef1cd5 s6-portable-utils-2.3.1.0.tar.gz" diff --git a/user/sdl2/APKBUILD b/user/sdl2/APKBUILD index 22026bb6c..6e380a778 100644 --- a/user/sdl2/APKBUILD +++ b/user/sdl2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sdl2 pkgver=2.0.22 -pkgrel=0 +pkgrel=1 pkgdesc="Low level audio, keyboard, mouse, joystick and graphics library" url="https://www.libsdl.org/" arch="all" @@ -15,6 +15,7 @@ makedepends="alsa-lib-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev wayland-dev wayland-protocols" subpackages="$pkgname-dev" source="https://www.libsdl.org/release/SDL2-$pkgver.tar.gz + altivec-detection.patch sdl2-soname.patch " builddir="$srcdir/SDL2-$pkgver" @@ -39,4 +40,5 @@ package() { } sha512sums="ca4b690433cd4d9d73b797da98666317128e7e817ab60e874a49d94791ea41e8a6b4fc43649593120daa0702190c0f8a6ed326c908d87375c8da9f369d994f6a SDL2-2.0.22.tar.gz +f7ca983c0450e95a760041c5c329e715bb513100efbd12c2469fd283e7ca4d3643b8180d6d5e64c66075ea03e1e88364853aa76d3db6dbcc8d22e8eb385881d6 altivec-detection.patch 81b5807cd9f2683231c14562e961467fcd7ba257140d1a266932d6a6a5103633e3af896c09b261620b2934d521809e08ed79d3287c0897f4783c6afc1c01a566 sdl2-soname.patch" diff --git a/user/sdl2/altivec-detection.patch b/user/sdl2/altivec-detection.patch new file mode 100644 index 000000000..ccb60a375 --- /dev/null +++ b/user/sdl2/altivec-detection.patch @@ -0,0 +1,22 @@ +Use getauxval on Linux if available. + +--- SDL2-2.0.22/src/cpuinfo/SDL_cpuinfo.c.old 2022-01-08 02:29:52.000000000 +0000 ++++ SDL2-2.0.22/src/cpuinfo/SDL_cpuinfo.c 2025-04-27 18:58:12.097867624 +0000 +@@ -113,7 +113,7 @@ + #define CPU_HAS_AVX512F (1 << 12) + #define CPU_HAS_ARM_SIMD (1 << 13) + +-#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__ && !__OpenBSD__ && !__FreeBSD__ ++#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__ && !__OpenBSD__ && !__FreeBSD__ && !__linux__ + /* This is the brute force way of detecting instruction sets... + the idea is borrowed from the libmpeg2 library - thanks! + */ +@@ -333,6 +333,8 @@ + elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures)); + altivec = cpufeatures & PPC_FEATURE_HAS_ALTIVEC; + return altivec; ++#elif defined(__linux__) && defined(__powerpc__) && HAVE_GETAUXVAL ++ altivec = getauxval(AT_HWCAP) & PPC_FEATURE_HAS_ALTIVEC; + #elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP + void (*handler) (int sig); + handler = signal(SIGILL, illegal_instruction); diff --git a/user/seatd/APKBUILD b/user/seatd/APKBUILD index 07391d172..f905c6029 100644 --- a/user/seatd/APKBUILD +++ b/user/seatd/APKBUILD @@ -2,15 +2,18 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=seatd pkgver=0.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="Seat management daemon and library" url="https://git.sr.ht/~kennylevinsen/seatd" arch="all" license="MIT" depends="" makedepends="cmake elogind-dev meson scdoc" -subpackages="$pkgname-dev $pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~kennylevinsen/seatd/archive/$pkgver.tar.gz" +subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" +source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~kennylevinsen/seatd/archive/$pkgver.tar.gz + $pkgname.confd + $pkgname.initd + " build() { # https://todo.sr.ht/~kennylevinsen/seatd/10 @@ -33,6 +36,10 @@ check() { package() { DESTDIR="$pkgdir" meson install -C build + install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir"/etc/init.d/seatd + install -Dm644 "$srcdir/$pkgname.confd" "$pkgdir"/etc/conf.d/seatd } -sha512sums="93b1e5c170564ce9654e4df9985af95cb505274b36e950998bb1f16803d2d46712140eded2bdd8d5e85aec62070afd9c224184276d79a0ff0813408dfc472db7 seatd-0.8.0.tar.gz" +sha512sums="93b1e5c170564ce9654e4df9985af95cb505274b36e950998bb1f16803d2d46712140eded2bdd8d5e85aec62070afd9c224184276d79a0ff0813408dfc472db7 seatd-0.8.0.tar.gz +1ee755b462455fb20ee2f56b8d1a0f3a26eb9aed34eb6126e322243f9288b23577aff40e5a2c02449f349282af79eafd232b9e77cd196daa92ee8a9fcae2ec16 seatd.confd +54e1f20a37945f95b184a26dc9ef5cfe5ddcce4445672b04394465ba16d319f87c24c1b347400a0189c4f3de9bae1ee0a95c1dee94a0d677c9c980fc238fa2df seatd.initd" diff --git a/user/seatd/seatd.confd b/user/seatd/seatd.confd new file mode 100644 index 000000000..8eac7d11e --- /dev/null +++ b/user/seatd/seatd.confd @@ -0,0 +1,12 @@ +# Configuration for /etc/init.d/seatd + +# Sets the seatd log level; one of: silent, error, info, or debug. +# Defaults to "error". +#loglevel= + +# Log messages are redirected to syslog, unless `loglevel=silent`. +# Set to empty string to disable. +#error_logger="logger -t seatd -p daemon.$loglevel >/dev/null 2>&1" + +# Uncomment to run with process supervisor. +# supervisor="supervise-daemon" diff --git a/user/seatd/seatd.initd b/user/seatd/seatd.initd new file mode 100644 index 000000000..b686052bf --- /dev/null +++ b/user/seatd/seatd.initd @@ -0,0 +1,14 @@ +#!/sbin/openrc-run + +name="seatd" +description="Seat management daemon" + +command="/usr/bin/seatd" +command_args="-g video -l ${loglevel:-error} ${command_args:-}" +command_background="yes" + +pidfile="/run/$RC_SVCNAME.pid" + +if [ "$loglevel" != 'silent' ]; then + : ${error_logger="logger -t $name -p daemon.${loglevel:-error} >/dev/null 2>&1"} +fi diff --git a/user/smtpd-starttls-proxy/APKBUILD b/user/smtpd-starttls-proxy/APKBUILD index d0e3a8a8a..7896f97e2 100644 --- a/user/smtpd-starttls-proxy/APKBUILD +++ b/user/smtpd-starttls-proxy/APKBUILD @@ -1,16 +1,15 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=smtpd-starttls-proxy -pkgver=0.0.1.5 +pkgver=0.0.2.0 pkgrel=0 pkgdesc="An SMTP proxy implementing STARTTLS" url="https://skarnet.org/software/smtpd-starttls-proxy/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 -_s6_version=2.13.1 -_s6net_version=2.7.0 +_skalibs_version=2.14.4 +_s6_version=2.13.2 +_s6net_version=2.7.1 depends="s6>=$_s6_version s6-networking>=$_s6net_version" makedepends="skalibs-dev>=$_skalibs_version s6-dev" subpackages="$pkgname-dev $pkgname-doc" @@ -19,7 +18,9 @@ source="https://skarnet.org/software/smtpd-starttls-proxy/smtpd-starttls-proxy-$ build() { ./configure \ --disable-allstatic \ - --prefix=/usr + --prefix=/usr \ + --with-pkgconfig \ + --enable-pkgconfig make } @@ -29,4 +30,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="228b4f15abdf94a814e03c57f3c6eacf604575128710e26921e8010d73c97ed2ff717185bc06b6bfd1e380f34201154a85b9864a7aef4881b3e0329948cc608e smtpd-starttls-proxy-0.0.1.5.tar.gz" +sha512sums="e13bd72c0afdbe6e6673867b1d7354aa7067f755eebd3db32ecbaef2759e3db626954cacf4cb70d8aaea8899bf7c22a997f797f9991978890399ccfcb55de483 smtpd-starttls-proxy-0.0.2.0.tar.gz" diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD index 671127e66..11d18ca49 100644 --- a/user/thunar-volman/APKBUILD +++ b/user/thunar-volman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=thunar-volman -pkgver=4.18.0 +pkgver=4.20.0 pkgrel=0 pkgdesc="Volume manager for Thunar" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="29681ede6274e999377e2aae2b157ed355d9e471416db2d4beb4432f84c60008f8c5008c87392c20da51d58fc3bd8f097d6f21764903baf1a301fb00e6166420 thunar-volman-4.18.0.tar.bz2" +sha512sums="8a25e94d2c182865c997c259fcccdf56d2e8fc4f6ace706f4ad0913061fb1337728f7101edd9fdf9ab3f1f4f47e66c5ee4273a51d081c3b106ec027b9c846c8f thunar-volman-4.20.0.tar.bz2" diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index 2de35a251..991c64f2a 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=thunar -pkgver=4.18.10 -pkgrel=0 +pkgver=4.20.0 +pkgrel=1 pkgdesc="File manager for the XFCE desktop environment" url="https://xfce.org" arch="all" license="LGPL-2.0+ AND GPL-2.0+" -depends="" +depends="gvfs" makedepends="intltool gtk+3.0-dev exo-dev libxfce4ui-dev>=${pkgver%.*} vala-dev gobject-introspection-dev libsm-dev libgudev-dev libnotify-dev libexif-dev" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f6b76db2cc69e4f14d46afb3ba602ba88d37b1d9e76e76dcf18949839ac1108c191bdd0158922a732805cfcb85780bbf6c998aedac02b502c8e1d8fcf4cfab32 thunar-4.18.10.tar.bz2" +sha512sums="fb2063676de82efe944222a6acdfa4c5ea9e4ac5123223528349ada623e37adbac40a2253f2a76b469d83a1f6791f884f1f825b86b58178fdecc5f706ee4a43f thunar-4.20.0.tar.bz2" diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD index 319eba9f3..21b415dc6 100644 --- a/user/thunderbird/APKBUILD +++ b/user/thunderbird/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=thunderbird -pkgver=128.4.0 +pkgver=128.10.1 pkgrel=0 _llvmver=18 pkgdesc="Email client from Mozilla" @@ -154,7 +154,7 @@ package() { ${pkgdir}/usr/share/applications/thunderbird.desktop } -sha512sums="ad031b3a9b738598358cead23cf8438435016222cd9a474c31892dc1b3db43d2d5d3a10c9639df770dc76eb3c0bc9db8be8beab84828d54ee50fc1e03f0da0a5 thunderbird-128.4.0esr.source.tar.xz +sha512sums="09b54450928c6e0d948cd79a56c28bdb5fe5a81d7c710470a1ec195dd295c433b872682102c74930f19b1184391c30115293dadcd7dc8a08ae8baeb12770ef9c thunderbird-128.10.1esr.source.tar.xz fec4e343db973f90a38cc86e145c8ab0c8bec8f6eed36ff47f9986b154ea44f0e72ea1b5c9862e772505b3371dc0a9265fa1a6bed59007a5845a1dc622fce4e8 mozconfig 1fff71be77aa34791ef8aa972b5dc5f131d79f4b895ebbfb59bc223078764d6f79c82a3a4e4c717a3893ecbe4907d556f27e97d2692e41f02365f06da759a71a bad-google-code.patch 5e6c3fa027052cc43ba161cf5c12016b07723e7c0b002a42431bbd5d716d512d5245ab6befbb56c37c7d244441533f810f4e7b583f83bbe965981931f1435a94 fix-mutex-build.patch @@ -170,6 +170,6 @@ c2248297df00633771da7e6b9f2caba3dd5108d93617f652fa8b2fb4e6975821e5fee866c00713f8 11f7ce86376b54281082fa5b9d3fefee8046eabe38a0ec17266764b4f62cb90f4744245c1ca93d73ed74cf81c066dab7ddcb3fe9704be8f91e0a2a4f664b203a skia-endian.patch a6a14104ee6985867efb1937a262aba1538ed4b069bba56e400d75f51d84d29363d8bbb2183ee27785758ad3a8b8ae4350e23dc854d50c92cb2147eddf83b9bb skia-unified.patch 9df89366bd51670f534591e4c169186703ad3166a493f522e58f129fb79af375d71baaf0f6b238126792118a2d3ed0f011b010e39497ab5901ee5bea63a84fa2 stackwalk-x86-ppc.patch -e1d9e30a1c8d1c6bdd3530183400d7d245e437ce18bb5b262bec1d01932b02b8eaededd892efcdd277eaccb357aede4537972382be9f00eedf1785acebbd1ca6 webrender.patch +7d6c5f3cafd29eae4e7c5433b14f49cc679eebdcb4e602af18819f685500747a6daa8d38fbb0f91878331b14ce299ca8b731f62ab013b69e579fc450b29fe743 webrender.patch ed78e15030d79b10026ebae26e44a68d16c2a8567082072b5099b0dde4f79ae217a21737e0d9c7ec6a3cc99de3ab3c9083cca7d82889d559bb18cc15fa7e6f2a without-jit.patch 95a2b1deb4f6c90750fdd2bfe8ca0a7879a5b267965091705a6beb0a0a4b1ccad75d11df7b9885543ca4232ff704e975c6946f4c11804cb71c471e06f9576001 thunderbird.desktop" diff --git a/user/thunderbird/webrender.patch b/user/thunderbird/webrender.patch index e6b145956..cfc920cfd 100644 --- a/user/thunderbird/webrender.patch +++ b/user/thunderbird/webrender.patch @@ -8,7 +8,7 @@ Bug 1716707 [s390x] Software WebRender does not support big endian --- firefox-128.0/image/imgFrame.cpp +++ firefox-128.0/image/imgFrame.cpp -@@ -372,6 +372,17 @@ mAborted = true; +@@ -382,6 +382,17 @@ mAborted = true; return NS_ERROR_OUT_OF_MEMORY; } diff --git a/user/tipidee/APKBUILD b/user/tipidee/APKBUILD index 035f0e95f..a4b9a855b 100644 --- a/user/tipidee/APKBUILD +++ b/user/tipidee/APKBUILD @@ -1,17 +1,16 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=tipidee -pkgver=0.0.5.1 +pkgver=0.0.6.0 pkgrel=0 pkgdesc="The skarnet.org web server" url="https://skarnet.org/software/tipidee/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 -_execline_version=2.9.6 -_s6_version=2.13.1 -_s6net_version=2.7.0 +_skalibs_version=2.14.4 +_execline_version=2.9.7 +_s6_version=2.13.2 +_s6net_version=2.7.1 depends="execline>=$_execline_version s6>=$_s6_version s6-networking>=$_s6net_version" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev" @@ -24,7 +23,6 @@ source=" tipidee.conf tipidee.confd tipidee.initd - tipidee.pc.in " install=" tipidee.pre-install @@ -40,6 +38,8 @@ build() { --disable-allstatic \ --prefix=/usr \ --sysconfdir=/etc \ + --with-pkgconfig \ + --enable-pkgconfig \ --libexecdir="/usr/lib/$pkgname" make } @@ -69,8 +69,6 @@ package() { install -m 0644 -D "$srcdir/tipidee.conf" "$pkgdir/etc/tipidee.conf" install -m 0644 -D "$srcdir/tipidee.confd" "$pkgdir/etc/conf.d/tipidee" install -m 0755 -D "$srcdir/tipidee.initd" "$pkgdir/etc/init.d/tipidee" - 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" } @@ -81,11 +79,10 @@ dev() { mv "$subpkgdir/usr/bin/tipidee-config" "$pkgdir/usr/bin/tipidee-config" } -sha512sums="2f0ae2b3f7c7782785e8498e482bb4cfbb58c0bbe1689b2d3a5a4970783704147e8e5b96737970e2a542ee409e2b179a199a990fbf20b3ea4083cd47d16960cf tipidee-0.0.5.1.tar.gz +sha512sums="1a8ae1f7293fc7a1db1f0f4dd0752388f58e134c3f0847a768cf56e2e5a21b7d037f71f3d9e4ff16ab986c699d39827e53b467c8b13b0b9dad41b6fd742c9a5c tipidee-0.0.6.0.tar.gz 560048b2b767053770e37ce3fd69540f2fad23236f012da115c1f985240f42d0bb7809630d8991e39169e255e3d36ebfdc85f895d16675119a95d3a6e64fd2b2 httpd.run 1c9333785c63662039580504dd36af21d05eb9972e6770af17e87e062bd7d9fa67695f4120221e241e10503ca0fb3b5347f032b6c1eef309f2ff8cd636266f2b httpsd.run b5af306fe7040f966b13da84bfb0c4b528683c03205519d08fe429ee826ffad27c9ddb32be8c8bf8b42ce7964ef15572e3c66a96494aed833ee951c769f81bd2 logger.run bb2681a3000133724bb8fd4918bc3209ea676c2e4f96ad8b298d8e7302aeebd6876341ea205f2d808f34e4c9b5c138bba032694c6069c17026b0ddf23702f9ba tipidee.conf 7a999200ad21b2b0737ce82136bc8e055d7ab4a865b7727e6dc8df0eaeea6ace11eb5756b64231ce7938d11b5ec218944173ea1df3db059d033bf3f848c9a608 tipidee.confd -5001d079b1ca7920d163cc2d58a5855e2740e72ed85df25414b4719c52133bd0f2f9e69c63c57f31645159189fc046c7d213048fc1cbd0f640336e43874e4482 tipidee.initd -21e71ed438270598de55631c46006bcb66528889477d1a09c76db4160d46651b1c657b31913393115c01aae4853afa4fe425a6fb3985ea8fa403de1d36e3f2f1 tipidee.pc.in" +5001d079b1ca7920d163cc2d58a5855e2740e72ed85df25414b4719c52133bd0f2f9e69c63c57f31645159189fc046c7d213048fc1cbd0f640336e43874e4482 tipidee.initd" diff --git a/user/tipidee/tipidee.pc.in b/user/tipidee/tipidee.pc.in deleted file mode 100644 index e200f758a..000000000 --- a/user/tipidee/tipidee.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: tipidee -Description: A C interface to some HTTP server functions -URL: https://skarnet.org/software/tipidee/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -ltipidee diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index 45b49ae6f..d7198fc2a 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=tumbler -pkgver=4.18.2 +pkgver=4.20.0 pkgrel=0 pkgdesc="Thumbnail generation service for the XFCE desktop environment" url="https://xfce.org" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="043e4e7058d1bf0eb4f037924161387042111c7a1bfbf78f8417d0b6463d6b7e72506741f395ca14d6150e2cc0b79d97b2ee3270a30e0d18a0161f639627e255 tumbler-4.18.2.tar.bz2" +sha512sums="9de43565099c61c8a5227fb69e99f432d44435e717524f71a2c8751ef67d23d0aa06ed63aec15f035fcdbb0940a9a583bb724e59d27d600814c983269b937783 tumbler-4.20.0.tar.bz2" diff --git a/user/tyrquake/APKBUILD b/user/tyrquake/APKBUILD new file mode 100644 index 000000000..84a5087f8 --- /dev/null +++ b/user/tyrquake/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: Ermine <mustela@erminea.space> +# Maintainer: Ermine <mustela@erminea.space> +pkgname=tyrquake +pkgver=0.71 +pkgrel=0 +pkgdesc="SDL port of Quake" +url="https://disenchant.net/tyrquake" +arch="all" +options="!check" # No test suite. +license="GPL-2.0-only" +makedepends="sdl2-dev imagemagick libglvnd-dev" +install="$pkgname.pre-install" +subpackages="$pkgname-openrc $pkgname-server" +source="https://disenchant.net/files/engine/tyrquake-$pkgver.tar.gz + tyrquake.initd + " + +build() { + make USE_SDL=Y USE_X86_ASM=N +} + +package() { + # no install target + install -m755 -D "$builddir"/bin/tyr-quake "$pkgdir"/usr/bin/tyr-quake + install -m755 -D "$builddir"/bin/tyr-glquake "$pkgdir"/usr/bin/tyr-glquake + install -m755 -D "$builddir"/bin/tyr-qwcl "$pkgdir"/usr/bin/tyr-qwcl + install -m755 -D "$builddir"/bin/tyr-glqwcl "$pkgdir"/usr/bin/tyr-glqwcl + install -m755 -D "$builddir"/bin/tyr-qwsv "$pkgdir"/usr/bin/tyr-qwsv + + install -m755 -D "$srcdir"/$pkgname.initd \ + "$pkgdir"/etc/init.d/$pkgname +} + +server() { + pkgdesc="$pkgdesc (QuakeWorld server)" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/tyr-qwsv "$subpkgdir"/usr/bin/ +} + +openrc() { + default_openrc + install_if="openrc $pkgname-server=$pkgver-r$pkgrel" +} + +sha512sums="ecceeecb43866c10c0669b4362ce2eda7a790c502764b3d644566e7637ffbde0548676c9dcea07963db0d91d83c248e3497603c0a3a2e1a12a1418a82c07179a tyrquake-0.71.tar.gz +eff93a1df0f6492c4063332c73382f8893c8a94f26e387ecd102e32a3f6a2f154a1abedecb26ccae7c25c1356ef77cc129508e1215b8320a94c4a55cea1d4aff tyrquake.initd" diff --git a/user/tyrquake/tyrquake.initd b/user/tyrquake/tyrquake.initd new file mode 100644 index 000000000..25231e8d2 --- /dev/null +++ b/user/tyrquake/tyrquake.initd @@ -0,0 +1,14 @@ +#!/sbin/openrc-run + +name="tyrquake" +description="TyrQuake QuakeWorld server" + +supervisor=supervise-daemon + +command="/usr/bin/tyr-qwsv" +command_user="tyrquake:tyrquake" + +depend() { + need net + after firewall +} diff --git a/user/tyrquake/tyrquake.pre-install b/user/tyrquake/tyrquake.pre-install new file mode 100644 index 000000000..73f8ebcd3 --- /dev/null +++ b/user/tyrquake/tyrquake.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +groupadd -r -- tyrquake 2>/dev/null +useradd -r -M -N -s /sbin/nologin -g tyrquake -c tyrquake -- tyrquake 2>/dev/null + +exit 0 diff --git a/user/wayland-protocols/APKBUILD b/user/wayland-protocols/APKBUILD index 3c5e8da43..b5af36542 100644 --- a/user/wayland-protocols/APKBUILD +++ b/user/wayland-protocols/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Sile Ekaterin Liszka <sheila@vulpine.house> pkgname=wayland-protocols -pkgver=1.38 +pkgver=1.42 pkgrel=0 pkgdesc="Protocols and protocol extensions complementing the Wayland core protocol" url="https://wayland.freedesktop.org" @@ -35,5 +35,5 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="43fc36d35bedb245deed0e2de246f42d2bbfa6ecafa094f2a7fb103d6df8ae28f3cc200bc5aa24745b9131a28381883c24779da0a6d9ac954753bd5ebb1405db wayland-protocols-1.38.tar.xz +sha512sums="ce85fecbe886264eaeb34c7992d4e493295f57f6213d5a2ec04b3471daee04a4225b1a7e77a27ccf39306074780553ec1383c55af30cc2c78942b40cc5777c1b wayland-protocols-1.42.tar.xz adf31ede543514317d57dbd4966034ffbd03e0745701d69c9a852d4b8388542fbb350ce3b32020192dfdbe90fe3a9a1e0ce1d472d9a8be695006652b704ab3f6 tests.patch" diff --git a/user/waypipe/0.9.2-fix-compile.patch b/user/waypipe/0.9.2-fix-compile.patch new file mode 100644 index 000000000..096e4851b --- /dev/null +++ b/user/waypipe/0.9.2-fix-compile.patch @@ -0,0 +1,11 @@ +diff '--color=auto' -Nurd waypipe-v0.9.2/src/secctx.c waypipe-v0.9.2.new/src/secctx.c +--- waypipe-v0.9.2/src/secctx.c 2024-11-18 14:29:20.000000000 -0800 ++++ waypipe-v0.9.2.new/src/secctx.c 2024-11-25 10:20:47.643421280 -0800 +@@ -2,6 +2,7 @@ + #include "util.h" + #include <sys/socket.h> + #include <sys/un.h> ++#include <string.h> + #include <unistd.h> + #include <wayland-client.h> + diff --git a/user/waypipe/APKBUILD b/user/waypipe/APKBUILD new file mode 100644 index 000000000..311c4e8c6 --- /dev/null +++ b/user/waypipe/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=waypipe +pkgver=0.9.2 +pkgrel=0 +pkgdesc="proxy for Wayland clients" +url="https://gitlab.freedesktop.org/mstoeckl/waypipe" +arch="all" +license="MIT" +depends="" +makedepends="ffmpeg-dev libdrm-dev libva-dev lz4-dev mesa-dev meson scdoc wayland-dev wayland-protocols" +subpackages="$pkgname-doc" +source="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v$pkgver/$pkgname-v$pkgver.tar.bz2 + 0.9.2-fix-compile.patch" +builddir="$srcdir/$pkgname-v$pkgver" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="0ffdb49cb5dbee717798721505e4661710fcd234a55bbfe2452888024d4a8b99a0e0e99cdce23ba0b92ee456aeb9f14324baba1c7c5724cb8cca7bb6e9c276bb waypipe-v0.9.2.tar.bz2 +30c818075c95b198d351cad94e48e3d7eb3dc18f9b38964c2090483131365bf37f7eeb12ba89f17822c8cab9dbb658e7e2efcc81f0433e79c9a2cdb8bbf92dc6 0.9.2-fix-compile.patch" diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index d99af8283..72991c3c7 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -2,7 +2,7 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=weechat -pkgver=4.2.1 +pkgver=4.5.1 pkgrel=0 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" @@ -12,7 +12,7 @@ license="GPL-3.0+" depends="" depends_dev="cmake aspell-dev curl-dev gnutls-dev libgcrypt-dev lua5.3-dev ncurses-dev perl-dev python3-dev ruby-dev tcl-dev zlib-dev guile-dev - tk-dev zstd-dev" + tk-dev zstd-dev cjson-dev" checkdepends="cpputest" makedepends="$depends_dev asciidoctor" subpackages="$pkgname-dev $pkgname-spell:_plugin $pkgname-lua:_plugin @@ -63,4 +63,4 @@ _plugin() { mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir } -sha512sums="0f26ea34480f6388c51eb18c9f08b893cc1e16a27b02c30ef2642a93806f94ca58ccc5aebd7c06711ab77d7d1693653e00873340da38bd555f60adb13557d768 weechat-4.2.1.tar.gz" +sha512sums="686eb0a57f6def4826ad88b6bfdef6d1e074375d756289f9f3a8046828d22eeb9313278398a619e6c18b16b4baa87753ae9fac82c7fff52ed4d0906570514d06 weechat-4.5.1.tar.gz" diff --git a/user/wimlib/APKBUILD b/user/wimlib/APKBUILD index 0246c8e36..a4e365ea6 100644 --- a/user/wimlib/APKBUILD +++ b/user/wimlib/APKBUILD @@ -36,5 +36,5 @@ package() { } sha512sums="f3c25ee14fe849f452f004ce8137ef040410ea048555ae71180086f010858b6ed593c8881b805bac65f9ee878bf11661a7f17677c6c24e2c77149c35ee0cd853 wimlib-1.14.4.tar.gz -811cf6db0df5efee974e4efe2f9322bef2aade2f101e3c202e2fa51dfc536663ad828e6fa037c490f8b603c8195285f44f0f9bab3220f217ac5a188e1e11d12f header.patch +25a410614b4d4a16f16149c09bb1107a5678d49b729ecb55fe5641727556f6eb8a0e3473331ae738e3747652674d78c32be0d6da57c2aa414bd9fc636c27997e header.patch e58429f3256e85e39558920be295c93645ec0584cf71282e01102c62b05b51fab1c3c1b62a8edb7be8bfc2427d2464400154ca05ad07e02548cad140f781aa7f pc-fuse3.patch" diff --git a/user/wimlib/header.patch b/user/wimlib/header.patch index cf6c32bc0..71255d446 100644 --- a/user/wimlib/header.patch +++ b/user/wimlib/header.patch @@ -1,14 +1,29 @@ -The RENAME_* flags are only exposed by <linux/fs.h> on musl systems. I have -not yet been able to triage whether this is something that should be fixed -musl-side or if this is an issue for upstream. +This patch should be removed once the following musl commit lands: ---- wimlib-1.14.4/src/mount_image.c.old 2023-07-22 18:55:59.000000000 -0500 -+++ wimlib-1.14.4/src/mount_image.c 2024-12-11 18:46:19.018387960 -0600 -@@ -52,6 +52,7 @@ - #include <sys/time.h> +https://git.musl-libc.org/cgit/musl/commit\ +/include/stdio.h?id=05ce67fea99ca09cd4b6625cff7aec9cc222dd5a + +These macros are also exposed via <linux/fs.h>. + +diff -ur a/src/mount_image.c b/src/mount_image.c +--- a/src/mount_image.c 2024-12-11 21:13:37.806412788 -0600 ++++ b/src/mount_image.c 2024-12-11 21:18:32.528640110 -0600 +@@ -53,6 +53,18 @@ #include <unistd.h> #include <utime.h> -+#include <linux/fs.h> ++#if defined(_GNU_SOURCE) ++#ifndef RENAME_NOREPLACE ++#define RENAME_NOREPLACE (1 << 0) ++#endif ++#ifndef RENAME_EXCHANGE ++#define RENAME_EXCHANGE (1 << 1) ++#endif ++#ifndef RENAME_WHITEOUT ++#define RENAME_WHITEOUT (1 << 2) ++#endif ++#endif ++ #include "wimlib/blob_table.h" #include "wimlib/dentry.h" + #include "wimlib/encoding.h" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index ece7397aa..a874bdf9e 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=wireguard-tools -pkgver=1.0.20210424 +pkgver=1.0.20210914 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -29,4 +29,4 @@ bashcomp() { mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/" } -sha512sums="b919c7ce1e8ee8660ccc1490d3dad7817f3d6f0ab79f26866e8ed10d40545a9ddca67959ff6cc84ac36a91683c1f58d274d91d47f40c0b9a7bfee4009dcbbf59 wireguard-tools-1.0.20210424.tar.xz" +sha512sums="6727ea65551dbb064457449b93a943bd6534ca93bc7fa5704c2f6826266c98688ee9ea28731fda57a5245d5f63c05f3899fcca54e40c0b6251b7c4796e957445 wireguard-tools-1.0.20210914.tar.xz" diff --git a/user/xfburn/APKBUILD b/user/xfburn/APKBUILD index c3165fee2..53d876d1a 100644 --- a/user/xfburn/APKBUILD +++ b/user/xfburn/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfburn -pkgver=0.7.0 +pkgver=0.7.2 pkgrel=0 pkgdesc="CD burning utility for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5ac679926809839d36c94d918ebc9bb409b9940127eba1cae6daf6614288f5d18181be5b7b4d249f0f0e973c2a4a22b8b3ce5709a2d23e5d4dd3b412cf5846d1 xfburn-0.7.0.tar.bz2" +sha512sums="7966fc32a71b029f3e511565bcb751b06a9b87c2b434c9d546cccc1ba43479b1d1b17c9afe743babd08192e39907e4967e755a7b5fd72df3906645cce50db9a9 xfburn-0.7.2.tar.bz2" diff --git a/user/xfce-desktop/APKBUILD b/user/xfce-desktop/APKBUILD index 3182ade61..3c74251c8 100644 --- a/user/xfce-desktop/APKBUILD +++ b/user/xfce-desktop/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce-desktop -pkgver=4.13 -pkgrel=1 +pkgver=4.20 +pkgrel=0 arch="noarch" pkgdesc="Complete XFCE desktop environment" url="https://xfce.org" diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD index 52aeb2207..34126ef9e 100644 --- a/user/xfce4-appfinder/APKBUILD +++ b/user/xfce4-appfinder/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-appfinder -pkgver=4.18.1 +pkgver=4.20.0 pkgrel=0 pkgdesc="An application finder for the XFCE desktop environment" url="https://xfce.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3ebdf1e189e3c7d8b738d9be502124ac5e05664713e53d9e9c2f758717c409d0dc50506cd488383ba7c96aa981050a5623a957e961b9da8f486e3c189899a378 xfce4-appfinder-4.18.1.tar.bz2" +sha512sums="eae593d075cfe091680fc0093236e95172fddab88a251765e1c6574688a5456fb03f3547eede1d2c6766f8b05b18f0bcbeae607e61d97ac92a927dbe2283790f xfce4-appfinder-4.20.0.tar.bz2" diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD index 7b326d63b..16e92c6af 100644 --- a/user/xfce4-cpugraph-plugin/APKBUILD +++ b/user/xfce4-cpugraph-plugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-cpugraph-plugin -pkgver=1.2.8 +pkgver=1.2.10 pkgrel=0 pkgdesc="Graphical CPU monitor plugin for the XFCE panel" url="https://xfce.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f0f4201d0572997e8c610a25fcb957ebe4dd224204421aeba4e8ca54da71bdd97fa147dd7af7097b9e09ce6e1317836622a0bcbfec9589858010942993e27940 xfce4-cpugraph-plugin-1.2.8.tar.bz2" +sha512sums="414c2a5da9576d2ed1f5478a07ff5c51c45eaa0a8432a31b6fb2408b81f5ab4485e3b10486af26cf33a18d23e2dc3afe21bf88630e4db91adcfa3e0f80468cf3 xfce4-cpugraph-plugin-1.2.10.tar.bz2" diff --git a/user/xfce4-dev-tools/APKBUILD b/user/xfce4-dev-tools/APKBUILD index 11107699d..f474b5120 100644 --- a/user/xfce4-dev-tools/APKBUILD +++ b/user/xfce4-dev-tools/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-dev-tools -pkgver=4.18.1 +pkgver=4.20.0 pkgrel=0 pkgdesc="Developer tools for XFCE" url="https://xfce.org" arch="all" license="GPL-2.0+" depends="" -makedepends="glib-dev libxslt-dev" +makedepends="glib-dev libxslt-dev meson" subpackages="$pkgname-dev $pkgname-doc" source="https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8fa65aa57450d3e65ef55bf86e8a113c06e64289a9f71875049b422da2a8bdfcdd36c3a3e94a3c0e7c602a3e9577eca14d63318489f81fd88d6743e188636304 xfce4-dev-tools-4.18.1.tar.bz2" +sha512sums="2ee8d0e4512c326ad404310f15081a8c6eec026634bcc2e76873cecc5b4356c3425d883c07f05e5a76a500c135d62809e6323f318ac6fc33d16023a9c5bd5441 xfce4-dev-tools-4.20.0.tar.bz2" diff --git a/user/xfce4-dict/APKBUILD b/user/xfce4-dict/APKBUILD index b8fe50843..32824a9f9 100644 --- a/user/xfce4-dict/APKBUILD +++ b/user/xfce4-dict/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-dict -pkgver=0.8.6 +pkgver=0.8.8 pkgrel=0 pkgdesc="Dictionary application for the XFCE desktop environment" url="https://xfce.org" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bbb5926121e31c5adbd8f4c3ceb479759ee07b902e690245087213668fade48b92f9ffc7f4cabdfaa3ee1c02db8847468dd0bbd11e240017cd3c2b9901b81485 xfce4-dict-0.8.6.tar.bz2" +sha512sums="db1919f3d29245cc02ea8e4f898e8d389c426a574f6227bcb0504f2f4506220617bf6ac4b8544e85e00c8d7818ad06a61e2daaea1883a6badf9b394d2b481398 xfce4-dict-0.8.8.tar.bz2" diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD index c4e8a8e5f..adf0a6f81 100644 --- a/user/xfce4-notifyd/APKBUILD +++ b/user/xfce4-notifyd/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-notifyd -pkgver=0.9.4 +pkgver=0.9.6 pkgrel=0 pkgdesc="Notification service for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0-only AND GPL-2.0+" depends="" -makedepends="intltool libice-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev - xfce4-panel-dev libnotify-dev dbus-glib-dev sqlite-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +makedepends="intltool gtk-layer-shell-dev gtk+3.0-dev libcanberra-dev + libice-dev libxfce4util-dev libxfce4ui-dev xfce4-panel-dev libnotify-dev + dbus-glib-dev sqlite-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-systemd" source="https://archive.xfce.org/src/apps/xfce4-notifyd/${pkgver%.*}/xfce4-notifyd-$pkgver.tar.bz2" build() { @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d3339ec3555f27e624e643b52ce4de2a0834d38f675b286976abcb4e143cbbb32665b1f36fbff23791c152e1f0616b752a7f049045fc32829c27c0a87d82df94 xfce4-notifyd-0.9.4.tar.bz2" +sha512sums="deef625fdb7828ac25a3eeb2c5e5813f285310354b33a81e1c7943024d9dee9e9b5765f94f7e7ccedd1998dab77eb2c62a2803864d56aed6f831f08b910f0071 xfce4-notifyd-0.9.6.tar.bz2" diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD index cc455a49a..b622fc195 100644 --- a/user/xfce4-panel/APKBUILD +++ b/user/xfce4-panel/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-panel -pkgver=4.18.6 +pkgver=4.20.0 pkgrel=0 pkgdesc="Panel for the XFCE desktop environment" url="https://xfce.org" arch="all" license="LGPL-2.1+ AND GPL-2.0+" depends="" -makedepends="intltool gtk+3.0-dev libice-dev libxfce4util-dev>=${pkgver%.*} - garcon-dev>=${pkgver%.*} exo-dev>=${pkgver%.*} libwnck-dev - wayland-protocols" +makedepends="intltool gobject-introspection-dev gtk-doc gtk-layer-shell-dev + gtk+3.0-dev libdbusmenu-dev libice-dev libxfce4util-dev>=${pkgver%.*} + libxfce4windowing-dev>=${pkgver%.*} garcon-dev>=${pkgver%.*} + exo-dev>=${pkgver%.*} libwnck-dev wayland-protocols vala-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/xfce/xfce4-panel/${pkgver%.*}/xfce4-panel-$pkgver.tar.bz2" @@ -21,7 +22,9 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --enable-dbusmenu-gtk3 \ + --enable-gtk-doc make } @@ -33,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a1c4597bbbb72d2f3ef90abe0082abe3404e0ea7fa6027e26ca50e31e03645464ce3e0a72f4d927e84c5775a775e3a70f70e25bd3d2e4358da869f9c474e6174 xfce4-panel-4.18.6.tar.bz2" +sha512sums="431ff1736a62bdee4a7a9a5e7b8aa9f0cf779ce5454503c33fc0ffb82b6cd4bbcbc5e1fc99c092e31f0f702f459cf31336eff914a41b618043f83d2a40c9b049 xfce4-panel-4.20.0.tar.bz2" diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD index 23839e0fe..6efc54433 100644 --- a/user/xfce4-power-manager/APKBUILD +++ b/user/xfce4-power-manager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-power-manager -pkgver=4.18.3 +pkgver=4.20.0 pkgrel=0 pkgdesc="Power management support for the XFCE desktop environment" url="https://xfce.org" @@ -9,7 +9,7 @@ arch="all" license="GPL-2.0+" depends="" makedepends="intltool gtk+3.0-dev libxfce4ui-dev libice-dev libnotify-dev - upower-dev xfce4-panel-dev" + polkit-dev upower-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/xfce/xfce4-power-manager/${pkgver%.*}/xfce4-power-manager-$pkgver.tar.bz2" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="97f198ed78c3a13c5e64f0551d49533ac2efe0c719f4360eab94736790b225411b347a8524e8a2d7e28b14e546df6133df5273c80d8e0eb5766145782e1412fb xfce4-power-manager-4.18.3.tar.bz2" +sha512sums="e61762b4ff374562fa3d70b1eb7c9928a1a7197df5b597763adf16435183fd693307267f37f0eb7dd08b573664a397d2fd22674b5db7e07ee9302089772ff6e7 xfce4-power-manager-4.20.0.tar.bz2" diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD index 27e3e473f..afe52ae23 100644 --- a/user/xfce4-pulseaudio-plugin/APKBUILD +++ b/user/xfce4-pulseaudio-plugin/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-pulseaudio-plugin -pkgver=0.4.8 +pkgver=0.4.9 pkgrel=0 pkgdesc="Pulseaudio plugin for the XFCE panel" url="https://xfce.org" arch="all" license="GPL-2.0+" depends="" -makedepends="exo-dev intltool libxfce4ui-dev xfce4-panel-dev pulseaudio-dev - keybinder-3.0-dev libnotify-dev dbus-glib-dev" +makedepends="dbus-glib-dev exo-dev intltool keybinder-3.0-dev libcanberra-dev + libnotify-dev libxfce4ui-dev pulseaudio-dev xfce4-panel-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8f6f06a65295ff53bd18a32dc302b2d12fb722bcfacd549c79dbc88e8ab6890888f158ea02ce5a21b261fa681068d68f18eb076f1dc2cb9135b7fc1e77fa7ce8 xfce4-pulseaudio-plugin-0.4.8.tar.bz2" +sha512sums="7fa29e85146e8cbbd420aed11050924fbb9c1a93657da1a4d3e207f5a7cc7fc99acdc41b467420a8948535a7f45e2a8e6d63f79df3cef228ada810566f15c263 xfce4-pulseaudio-plugin-0.4.9.tar.bz2" diff --git a/user/xfce4-screenshooter/APKBUILD b/user/xfce4-screenshooter/APKBUILD index d845da586..d1d14bc33 100644 --- a/user/xfce4-screenshooter/APKBUILD +++ b/user/xfce4-screenshooter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-screenshooter -pkgver=1.10.5 +pkgver=1.11.1 pkgrel=0 pkgdesc="Screenshot tool for the XFCE desktop environment" url="https://xfce.org" @@ -9,7 +9,7 @@ arch="all" license="GPL-2.0+" depends="" makedepends="intltool libxfce4ui-dev xfce4-panel-dev libsoup-dev exo-dev pango-dev>=1.44" -subpackages="$pkgname-doc" +subpackages="$pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/apps/xfce4-screenshooter/${pkgver%.*}/xfce4-screenshooter-$pkgver.tar.bz2" build() { @@ -28,7 +28,7 @@ check() { } package() { - make DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" install } -sha512sums="0040b28514ffc77473b2d9f182c1bc162f8ac21aac97f2e28eb2b5556255dd74f7d4545f049b4060a8db6c0d415831fe5988da581857f22894bed01136aee677 xfce4-screenshooter-1.10.5.tar.bz2" +sha512sums="aee31311faea2bb08d5e29722da190b0c7e2b37948a688a49212cd57cc4efc3f43b3c1588d9326f97eb174771412c60707cc88ae2ee0596546e9750a06112588 xfce4-screenshooter-1.11.1.tar.bz2" diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD index bbae1d1cc..b8d637ab4 100644 --- a/user/xfce4-session/APKBUILD +++ b/user/xfce4-session/APKBUILD @@ -1,15 +1,17 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-session -pkgver=4.18.3 +pkgver=4.20.0 pkgrel=0 pkgdesc="Session management for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+ AND LGPL-2.0+" depends="iceauth polkit cmd:which xdg-user-dirs" -makedepends="intltool gtk+3.0-dev libice-dev libsm-dev libxfce4util-dev>=${pkgver%.*} - libxfce4ui-dev>=${pkgver%.*} libwnck-dev iceauth dbus-glib-dev polkit-dev" +makedepends="intltool gtk-layer-shell-dev gtk+3.0-dev libice-dev libsm-dev + libxfce4util-dev>=${pkgver%.*} libxfce4ui-dev>=${pkgver%.*} + libxfce4windowing-dev>=${pkgver%.*} libwnck-dev iceauth dbus-glib-dev + polkit-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/xfce/xfce4-session/${pkgver%.*}/xfce4-session-$pkgver.tar.bz2" @@ -32,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="65314472049c973af4b7553ec969691dfe701af2addb8cb63aebb49ff1b61ddb9e1418b2969e5eac69fd32096dd3163b7bf28fefe1d8c130c46bd5dd2bfe126c xfce4-session-4.18.3.tar.bz2" +sha512sums="2e3b1280830fe3b26d39e87fcc26fd2be6df5f1328b64529c46cc51fe80abcc07b2996fd07af331ee2a502f025f40576cfb49a7ddaa9cc82b1f3cf17484f1dd6 xfce4-session-4.20.0.tar.bz2" diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD index d0cae3f1d..6da8c83e8 100644 --- a/user/xfce4-settings/APKBUILD +++ b/user/xfce4-settings/APKBUILD @@ -1,14 +1,15 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-settings -pkgver=4.18.4 +pkgver=4.20.0 pkgrel=0 pkgdesc="GUI settings application for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+ AND MIT AND LGPL-2.0+" depends="" -makedepends="intltool exo-dev>=${pkgver%.*} garcon-dev>=${pkgver%.*} libnotify-dev upower-dev +makedepends="intltool exo-dev>=${pkgver%.*} garcon-dev>=${pkgver%.*} + gtk-layer-shell-dev libnotify-dev upower-dev libxklavier-dev xf86-input-libinput-dev wayland-protocols" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/xfce/xfce4-settings/${pkgver%.*}/xfce4-settings-$pkgver.tar.bz2" @@ -26,6 +27,7 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --enable-pluggable-dialogs \ + --enable-upower-glib \ --enable-sound-settings make } @@ -38,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2f9e2de4a3a0cc59b4701b44899464532fbae8805270485d2821b65b9d78be54bb636c4cd4205de97e18c13b20912fcd1f4ca0b3baa561bf1a783829f53a06a0 xfce4-settings-4.18.4.tar.bz2" +sha512sums="ab728bfce9aefe14c59dce0f93a84d395826ffc37d3a7bafc40fce61055ce4b7d9265c65460bf7ee69e4c8f4efd7e0b88b3670d859d48d4602c17acc20556528 xfce4-settings-4.20.0.tar.bz2" diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD index b2d5bcbe5..bcbf0223a 100644 --- a/user/xfce4-taskmanager/APKBUILD +++ b/user/xfce4-taskmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfce4-taskmanager -pkgver=1.4.2 +pkgver=1.5.7 pkgrel=0 pkgdesc="Process manager for the XFCE desktop environment" url="https://xfce.org" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cd7f26c7ab0e0557be52155d58c677258da8479c2a09b0e1dd4006fe0ecb2a3c82d68ecdf72c10e8b8977eac5a158fcb606027229e973edb6ea7570d040c2444 xfce4-taskmanager-1.4.2.tar.bz2" +sha512sums="b9c8a3d088b116ba51e3db8685052f68702283509d7a7a9e7a54c079fcdfefa22b019bc0f1572546907da1c8fcd0a98ae4320f7b99a3e77f49ed1a8e86f41a80 xfce4-taskmanager-1.5.7.tar.bz2" diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index cf7a5b2bf..4ab3cebc2 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfconf -pkgver=4.18.3 +pkgver=4.20.0 pkgrel=0 pkgdesc="Configuration framework for the XFCE desktop environment" url="https://xfce.org" arch="all" -options="!check" # Tests require X11. +options="checkx11" license="LGPL-2.1+ AND GPL-2.0+" depends="dbus" makedepends="intltool gtk+3.0-dev libxfce4util-dev>=${pkgver%.*}" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-systemd" source="https://archive.xfce.org/src/xfce/xfconf/${pkgver%.*}/xfconf-$pkgver.tar.bz2" build() { @@ -39,4 +39,4 @@ perl() { mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib } -sha512sums="e1aa133f79ea584af067369f6fd059cd444c4743270ed90a8b0dfe158f7ae6fbc78af62fab67c64674060c2fd1404f06602ac8c019b0db8b70779a17fde4a327 xfconf-4.18.3.tar.bz2" +sha512sums="87ae4e9366cccb6c2f13229539e8317d26bfb3fc5333e769ec2de1b596e04348595bb2e85ca90fb63c6c64968e5108e59490700028aeb077b32b9cd03062d9e9 xfconf-4.20.0.tar.bz2" diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD index f779a326c..f01be7143 100644 --- a/user/xfdesktop/APKBUILD +++ b/user/xfdesktop/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfdesktop -pkgver=4.18.1 +pkgver=4.20.0 pkgrel=0 pkgdesc="Desktop manager for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" depends="" -makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev - exo-dev garcon-dev libnotify-dev thunar-dev>=${pkgver%.*}" +makedepends="intltool gtk-layer-shell-dev gtk+3.0-dev libwnck-dev + libxfce4util-dev libxfce4ui-dev libxfce4windowing-dev yaml-dev exo-dev + garcon-dev libnotify-dev thunar-dev>=${pkgver%.*}" subpackages="$pkgname-doc $pkgname-lang" source="https://archive.xfce.org/src/xfce/xfdesktop/${pkgver%.*}/xfdesktop-$pkgver.tar.bz2" @@ -32,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cafb1e274bbabf1704a6452532fc79657af26eaf92a58374f87a70f31c35fbf213319c6658b3d18bfca2d555b69e07e46949407d1f80e5a37f48e76bbde9dc3e xfdesktop-4.18.1.tar.bz2" +sha512sums="84b0c87c9678d3d6170af3d6edabe983282b0bd4d696e32d3a1eaaca99651d56387a9767645d5b48afdc517a18503e42fdaf0a72af9a73144475fb3b6183219c xfdesktop-4.20.0.tar.bz2" diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD index 3fec1283b..7c269a647 100644 --- a/user/xfwm4/APKBUILD +++ b/user/xfwm4/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=xfwm4 -pkgver=4.18.0 +pkgver=4.20.0 pkgrel=0 pkgdesc="Window manager for the XFCE desktop environment" url="https://xfce.org" arch="all" license="GPL-2.0+" depends="" -makedepends="intltool gtk+3.0-dev libxfce4util-dev>=${pkgver%.*} libxfce4ui-dev - libwnck-dev gobject-introspection-dev vala-dev" +makedepends="intltool gobject-introspection-dev gtk-layer-shell-dev gtk+3.0-dev + libwnck-dev libxfce4util-dev>=${pkgver%.*} libxfce4ui-dev libxi-dev + libxpresent-dev vala-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/xfce/xfwm4/${pkgver%.*}/xfwm4-$pkgver.tar.bz2" @@ -20,7 +21,9 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --enable-xi2 \ + --enable-poswin make } @@ -32,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1003bb1ca5254221a5d56ffcb51c12cdef1b17b9d252622c6b18f3d3fbcf9d6e0e66b5f61e0f6eae6601ea3e50a70be98320e60d6738b04e44879e6f4e6da34d xfwm4-4.18.0.tar.bz2" +sha512sums="1fa22d5bdf44d5907cbe362d20b7a99a610cfd38954a6cb5b7efad3481de5b450deb4fbf14ae2c1642ab5f7a39179016bb0f1558fe2941997cd931e9f8cc8dc8 xfwm4-4.20.0.tar.bz2" diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index 728d1ffe3..2c64a7c54 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-server -pkgver=21.1.13 +pkgver=21.1.16 pkgrel=0 pkgdesc="X.Org X11 server" url="https://www.X.Org/" @@ -170,6 +170,6 @@ protocol() { mv "$pkgdir"/usr/lib/xorg/protocol.txt "$subpkgdir"/usr/lib/xorg/ } -sha512sums="a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1 xorg-server-21.1.13.tar.xz +sha512sums="38fd4232a293a497d13f8b57e85e84cf6a531453a7d8d5de1a77d67ceaf8714d5770951a8a21f1b3f519e83be1fc0926dce269846e75a8b11aa1062dd507f67d xorg-server-21.1.16.tar.xz d77151bc51766e1230a121c008ac1d0695275bf889b1db4b3330c1f8ee720b0e046cc935fa14aaef40b02fdea508e84e53959b560131ace14ace14943c8eb734 autoconfig-sis.patch c68d6299928032806ade94b4848f147757d6571a2f8830922a20c9e1053fe42700e5c9e196ad58ce5e5536cf034260f973edd6e2792c9bacf4e2d70660949a4a fix-musl-arm.patch" diff --git a/user/xwayland/APKBUILD b/user/xwayland/APKBUILD index c68a6dd28..1b2959de2 100644 --- a/user/xwayland/APKBUILD +++ b/user/xwayland/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Simon Zeni <simon@bl4ckb0ne.ca> # Maintainer: Ermine <mustela@erminea.space> pkgname=xwayland -pkgver=24.1.1 +pkgver=24.1.6 pkgrel=0 pkgdesc="X11 server for Wayland" url="https://www.X.Org/" @@ -50,8 +50,4 @@ package() { rm -f "$pkgdir"/usr/lib/xorg/protocol.txt } -sha512sums=" -e44f47adab3830846360fd05fdc06d9016832133c662f2e4b0763b98de0c9b48dbfce7d757ffea5538b5fabb68170e5d1057acc1b9a086e396b147deaa750998 xwayland-24.1.1.tar.xz -42db6616a6566acedaa0c5dc125435183be0c0da5df4f542bf3857a1905ae4646d5eb311e4e00ec892c845a2dc2069f6e68f5f45ec6c499ea32b8e55d873a0f5 use-libtirpc-nokrb.patch -" -sha512sums="e44f47adab3830846360fd05fdc06d9016832133c662f2e4b0763b98de0c9b48dbfce7d757ffea5538b5fabb68170e5d1057acc1b9a086e396b147deaa750998 xwayland-24.1.1.tar.xz" +sha512sums="b6dcc87f5c4d880cb23216518171a704c2a501803ac2efd9d01760895d755a617cd82313c6516f27a888b0581c64d74e3f8db5c238e1ae0d13da6cc1a547c02f xwayland-24.1.6.tar.xz" |