diff options
2699 files changed, 33492 insertions, 24372 deletions
diff --git a/README.md b/README.md index 47284e0717f..27d11c0186c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you want to contribute, please read the and feel free to either submit a merge request on [GitLab](https://gitlab.alpinelinux.org/alpine/aports), or to submit a git patch on the Alpine aports mailing list -(~alpine/aports@lists.alpinelinux.org). (note: this mailing list is presently not functional) +([~alpine/aports@lists.alpinelinux.org](mailto:~alpine/aports@lists.alpinelinux.org)). (note: this mailing list is presently not functional) ## Repositories diff --git a/community/R/APKBUILD b/community/R/APKBUILD index d7db46fbf20..1539d0a2a34 100644 --- a/community/R/APKBUILD +++ b/community/R/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=R -pkgver=4.3.3 +pkgver=4.4.0 pkgrel=0 pkgdesc="Language and environment for statistical computing" url="https://www.r-project.org/" @@ -16,6 +16,7 @@ depends_dev=" gcc gfortran icu-dev + libdeflate-dev libjpeg-turbo libpng-dev make @@ -84,10 +85,29 @@ build() { make -C src/nmath/standalone } -# TODO: Run provided test suite. check() { - ./bin/R --version - ./bin/R --slave --vanilla -e 'print("Hello, world!")' + # Try running R (and also aid debugging). + ./bin/R --vanilla -s -e 'sessionInfo(); R_compiled_by(); str(.Machine)' + + case "$CARCH" in + # A (non-portable) numerical regression test currently (R 4.4.0) + # fails on the aarch64 and s390x runners. + # Run at least two basic test suites: + aarch64 | s390x) + make -C tests test-Examples && make -C tests test-Specific || { + tail -v -n 42 tests/*.fail; exit 1 + } + ;; + *) + make check || { + tail -v -n 42 tests/*.fail; exit 1 + } + ;; + esac + + # NOTE: EST5EDT-related differences reported for datetime.Rout are known + # (see <https://mm.icann.org/pipermail/tz/2024-March/058740.html> + # or also <https://bugs.r-project.org/show_bug.cgi?id=16843#c12>) } package() { @@ -132,5 +152,5 @@ _dev() { } sha512sums=" -26291590d935ea5678771cdcaea013a6c030897eb762b0204e42b34b0f1d33aac1ec933f36caa18d2a31a057a4456bf629222e4f5679f24bc48a7a764b1aedbe R-4.3.3.tar.gz +8f44eac49c58db7f161732135be4d1757f65b18545f3f15c463d499794735d02f4a4cb9bacff90d16e80b624ead8aa0af16899cf7654b6cb91a46868e405bd17 R-4.4.0.tar.gz " diff --git a/community/aaaaxy/APKBUILD b/community/aaaaxy/APKBUILD index 5be2fcd50bf..0c8d21920b6 100644 --- a/community/aaaaxy/APKBUILD +++ b/community/aaaaxy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rudolf Polzer <divVerent@gmail.com> # Maintainer: Rudolf Polzer <divVerent@gmail.com> pkgname=aaaaxy -pkgver=1.5.54 +pkgver=1.5.129 pkgrel=0 pkgdesc="A nonlinear puzzle platformer taking place in impossible spaces" url="https://divVerent.github.io/aaaaxy/" @@ -61,6 +61,6 @@ package() { } sha512sums=" -7bc0e1302266bb44da009330c87fbd61487d63fe423ba5b2793fa06bf2e03a7d99755fb2bb802cd5c0eb136778d3bba9a6f5f75e8e03c9f5a96516a28b101ed5 aaaaxy-1.5.54.tar.gz -7749380beafb7743eb74e684c1d69cbee28a32d406464b9fd92a9a17318c3199d59d6076fd19f8ecafa154fe76f3644588d36a2da4fff393e2ecefa841a0ba2d sdl-gamecontrollerdb-for-aaaaxy-v1.5.54.zip +448d7e62b592ce375bbb48696d22c849893a118173f6c376a4274d7bd50639809ca2c119bd7f86910026b0e58c3f1947bf931b26fcb08a5a8f3d2efa919579d6 aaaaxy-1.5.129.tar.gz +cd0134cf78f9213cc4888feffac91b27111a75079e7af978759d97eb00f5055deb528b1a34c87a1152de386061898baddc88caa1d8e350d96cd393a22d1f1dc4 sdl-gamecontrollerdb-for-aaaaxy-v1.5.129.zip " diff --git a/community/abiword/APKBUILD b/community/abiword/APKBUILD index 6aa9d51cb6b..338412b239d 100644 --- a/community/abiword/APKBUILD +++ b/community/abiword/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=abiword pkgver=3.0.5 -pkgrel=10 +pkgrel=11 pkgdesc="A fully-featured word processor" -url="https://www.abisource.com/" +url="https://gitlab.gnome.org/World/AbiWord" arch="all" options="!check" # Test suite requires valgrind, etc license="GPL-2.0-or-later" @@ -46,10 +46,10 @@ for _i in $_plugins; do subpackages="$subpackages $pkgname-plugin-$_i:_plugin" done -#source="https://www.abisource.com/downloads/abiword/$pkgver/source/abiword-$pkgver.tar.gz source="https://dev.alpinelinux.org/archive/abiword/abiword-$pkgver.tar.gz enchant.patch musl-1.2.3.patch + libxml2-2.12.patch " prepare() { @@ -104,4 +104,5 @@ sha512sums=" a2484268901ff47307c9d1f1928622e364f1006f22ce38257c585144df9411dfe3c2dea28c1f1f50a6e545e8cc579cce34117a89dfa771e20312e3ea1a9989d6 abiword-3.0.5.tar.gz 16f28eafdd1c1444dec5b3f8cbdd00f12c6178ba8db5bb94196064653cdada4cb8e4b2ac78ee9a7093c7968c0ddeb9f50a4e6209a5d5836a24b1b2f1941fb576 enchant.patch a4ee1de8df01a6570eb4d069a1b1abd38c39181020f862ce632ab5b863650a58fcaeadc4c988e7fcae3aade5841399d3d5d482d280d44a48286c24e3701e7969 musl-1.2.3.patch +0f98383e160782ccc2160e1bd9f5ba5ca02463dc14c2caeb987f225c06b4484a3618a068ff35806b6e3b6b2748e90a558c71ffb8d44c669f302fdcaebca836d4 libxml2-2.12.patch " diff --git a/community/abiword/libxml2-2.12.patch b/community/abiword/libxml2-2.12.patch new file mode 100644 index 00000000000..2c364224898 --- /dev/null +++ b/community/abiword/libxml2-2.12.patch @@ -0,0 +1,29 @@ +From 2a06be6a10a0718f8a3d8e00c317f5042c99a467 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Mon, 11 Dec 2023 01:55:53 +0100 +Subject: [PATCH] Fix build with libxml2 2.12 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +libxml 2.12.0 restructured headers so that xmlFree is no longer in the scope. +Let’s add the correct include. +--- + src/af/util/xp/ut_stringbuf.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/af/util/xp/ut_stringbuf.cpp b/src/af/util/xp/ut_stringbuf.cpp +index f1e8d9078..88488ad67 100644 +--- a/src/af/util/xp/ut_stringbuf.cpp ++++ b/src/af/util/xp/ut_stringbuf.cpp +@@ -26,6 +26,7 @@ + #include <algorithm> + + #include <libxml/uri.h> ++#include <libxml/xmlmemory.h> + + #include <glib.h> + +-- +GitLab + diff --git a/community/acme-client/APKBUILD b/community/acme-client/APKBUILD index 3dfe0aa2a98..a37b5588b9d 100644 --- a/community/acme-client/APKBUILD +++ b/community/acme-client/APKBUILD @@ -9,7 +9,8 @@ arch="all" license="GPL-2.0-only" makedepends="openssl-dev>3 byacc automake autoconf" subpackages="$pkgname-doc" -source="https://data.wolfsden.cz/sources/acme-client-$pkgver.tar.gz" +#source="https://data.wolfsden.cz/sources/acme-client-$pkgver.tar.gz" +source="https://distfiles.alpinelinux.org/distfiles/edge/acme-client-$pkgver.tar.gz" options="!check" # Tests require modifying /etc/hosts build() { diff --git a/testing/actionlint/APKBUILD b/community/actionlint/APKBUILD index ca38e6fcfaf..51fc6349e69 100644 --- a/testing/actionlint/APKBUILD +++ b/community/actionlint/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Galen Abell <galen@galenabell.com> # Maintainer: Galen Abell <galen@galenabell.com> pkgname=actionlint -pkgver=1.6.27 -pkgrel=2 +pkgver=1.7.0 +pkgrel=0 pkgdesc="Static checker for GitHub Actions workflow files" url="https://github.com/rhysd/actionlint" arch="all" @@ -34,5 +34,5 @@ package() { } sha512sums=" -53427f8f676c489cda56ba2a3fc03d3955cb96d038a2127a46bb3372de47910bf54585e643fbc90f7b3bd3cfbba1c9801b993cad023846d1815814a1108de763 actionlint-1.6.27.tar.gz +5d465c8f87c205f2a727f90a972ecd8ef345f56313990598714d07ef208a9b9cf868a6f3ba211ccc9ff102e93cb99e39109f0473bd1a33ea4961681a2dd549f5 actionlint-1.7.0.tar.gz " diff --git a/community/adbtuifm/APKBUILD b/community/adbtuifm/APKBUILD index 93029b6e85b..1c5de3f0d75 100644 --- a/community/adbtuifm/APKBUILD +++ b/community/adbtuifm/APKBUILD @@ -6,7 +6,7 @@ pkgrel=2 pkgdesc="A TUI File Manager for Android Debug Bridge (ADB)" url="https://github.com/darkhz/adbtuifm" license="MIT" -arch="all" +arch="all !loongarch64" makedepends="go" options="!check" # no test files source="$pkgname-$pkgver.tar.gz::https://github.com/darkhz/adbtuifm/archive/refs/tags/v$pkgver.tar.gz" diff --git a/community/afl++/APKBUILD b/community/afl++/APKBUILD index cce4df94df7..fa8d3a8ece1 100644 --- a/community/afl++/APKBUILD +++ b/community/afl++/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Marian <marian.buschsieweke@ovgu.de> # Maintainer: Marian <marian.buschsieweke@ovgu.de> pkgname=afl++ -pkgver=4.10c -pkgrel=2 +pkgver=4.20c +pkgrel=0 pkgdesc="Fuzzer relying on genetic algorithms instead of brute force" url="https://aflplus.plus/" # s390x: blocked by missing lld @@ -12,6 +12,11 @@ arch="all !armhf !armv7 !s390x !x86" license="Apache-2.0" # afl-cmin requires stat _llvmver=17 +# llvm LTO test fails on riscv64 +# https://github.com/AFLplusplus/AFLplusplus/issues/2064 +case "$CARCH" in + riscv64) options="$options !check";; +esac depends=" clang$_llvmver compiler-rt @@ -88,5 +93,5 @@ tools() { } sha512sums=" -688a2cb1f8eeee17456866694b605c723f3411ba43171b0b82f1618ee61a06df7940d7cd9d67dc2e6680542a7273875beb48d99cbfef3de37c019e1e952c5fd4 afl++-4.10c.tar.gz +b126b65d5a3054d1ea0a28333e81ae47e1bb2fb2f411e9b8edbe547b2962d8e58e1dbede7ea957c0572cc91d2912f3e5465f1e835e1ae072e3ccc31b33e555f5 afl++-4.20c.tar.gz " diff --git a/community/aisleriot/APKBUILD b/community/aisleriot/APKBUILD index c3a8360a395..63906baf36a 100644 --- a/community/aisleriot/APKBUILD +++ b/community/aisleriot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch> # Maintainer: pkgname=aisleriot -pkgver=3.22.31 +pkgver=3.22.32 pkgrel=0 pkgdesc="Solitaire and other card games for GNOME" url="https://wiki.gnome.org/Apps/Aisleriot" @@ -40,5 +40,5 @@ package() { } sha512sums=" -758334764743c87a601cce23165f14ac10a7b03600938f89b6a713525304045ace55b47434ed978b910616c5f4ca19fd5ebbf52bc518e3d2c37e7bf55308ff83 aisleriot-3.22.31.tar.gz +14f1df620e0d1866b8793f2ac1ad36b0bdc6504e13e2d98e804a3bc3c741fe572438969bd1c836f3752c27c22f3f119c173d2a809abf2859971a4046f7c30be5 aisleriot-3.22.32.tar.gz " diff --git a/community/akonadi-calendar-tools/APKBUILD b/community/akonadi-calendar-tools/APKBUILD index f06ec8006a5..c7b8ba6385e 100644 --- a/community/akonadi-calendar-tools/APKBUILD +++ b/community/akonadi-calendar-tools/APKBUILD @@ -8,7 +8,8 @@ pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules # ppc64le, s390x, riscv64 and armv7 blocked by akonadi-calendar -> kmailtransport -> libkgapi -> qt6-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by calendarsupport +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://kontact.kde.org/" pkgdesc="CLI tools to manage akonadi calendars" license="GPL-2.0-or-later AND GFDL-1.2-only" diff --git a/community/akonadi-calendar/APKBUILD b/community/akonadi-calendar/APKBUILD index 281b2cf3351..09ce74608e9 100644 --- a/community/akonadi-calendar/APKBUILD +++ b/community/akonadi-calendar/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 pkgdesc="Akonadi calendar integration" # armhf blocked by extra-cmake-modules # ppc64le, s390x, riscv64, armv7 blocked by kmailtransport -> libkgapi -> qt6-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by messagelib +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://community.kde.org/KDE_PIM" license="LGPL-2.0-or-later" depends_dev=" diff --git a/community/akonadi-import-wizard/APKBUILD b/community/akonadi-import-wizard/APKBUILD index a3f4aaaf714..047e993aefc 100644 --- a/community/akonadi-import-wizard/APKBUILD +++ b/community/akonadi-import-wizard/APKBUILD @@ -7,8 +7,8 @@ pkgname=akonadi-import-wizard pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules -# ppc64le, s390x, riscv64 and armv7 blocked by kmailtransport -> libkgapi -> qt6-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# ppc64le, s390x, riscv64, armv7 and loongarch64 blocked by kmailtransport -> libkgapi -> qt6-qtwebengine +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://kontact.kde.org/" pkgdesc="Import data from other mail clients to KMail" license="GPL-2.0-or-later AND LGPL-2.0-or-later AND GFDL-1.2-only" diff --git a/community/akonadi/APKBUILD b/community/akonadi/APKBUILD index a01c399f324..6133772edfd 100644 --- a/community/akonadi/APKBUILD +++ b/community/akonadi/APKBUILD @@ -5,7 +5,7 @@ # group=kde-applications pkgname=akonadi pkgver=24.02.2 -pkgrel=0 +pkgrel=1 pkgdesc="A cross-desktop storage service for PIM data and meta data providing concurrent read, write, and query access" # armhf blocked by extra-cmake-modules # ppc64le, s390x and riscv64 blocked by kaccounts-integration diff --git a/community/akonadiconsole/APKBUILD b/community/akonadiconsole/APKBUILD index 6bf4fbfe86d..cc501bde48e 100644 --- a/community/akonadiconsole/APKBUILD +++ b/community/akonadiconsole/APKBUILD @@ -8,8 +8,8 @@ pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules # s390x, ppc64le and riscv64 blocked by akonadi -# ppc64le and armv7 blocked by calendarsupport -arch="all !armhf !s390x !ppc64le !riscv64 !armv7" +# ppc64le, armv7 and loongarch64 blocked by calendarsupport +arch="all !armhf !s390x !ppc64le !riscv64 !armv7 !loongarch64" url="https://kontact.kde.org/" pkgdesc="Application for debugging Akonadi Resources" license="GPL-2.0-or-later AND GFDL-1.2-only" diff --git a/community/akregator/APKBUILD b/community/akregator/APKBUILD index 359cc5def1e..389d9582b4d 100644 --- a/community/akregator/APKBUILD +++ b/community/akregator/APKBUILD @@ -8,7 +8,8 @@ pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules # armv7, ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -arch="all !armhf !armv7 !ppc64le !s390x !riscv64" +# loongarch64 blocked by pimcommon +arch="all !armhf !armv7 !ppc64le !s390x !riscv64 !loongarch64" url="https://apps.kde.org/akregator/" pkgdesc="RSS Feed Reader" license="GPL-2.0-or-later AND LGPL-2.0-or-later" diff --git a/community/alembic/APKBUILD b/community/alembic/APKBUILD index a7a08d2d41f..ae48aceca54 100644 --- a/community/alembic/APKBUILD +++ b/community/alembic/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leon Marz <main@lmarz.org> pkgname=alembic pkgver=1.8.6 -pkgrel=0 +pkgrel=2 pkgdesc="Open framework for storing and sharing scene data" url="https://www.alembic.io/" arch="all !s390x" # alembic does not support big-endian, which s390x uses diff --git a/community/alkimia/APKBUILD b/community/alkimia/APKBUILD index f3bc167a859..77ece846f48 100644 --- a/community/alkimia/APKBUILD +++ b/community/alkimia/APKBUILD @@ -7,8 +7,8 @@ pkgname=alkimia pkgver=8.1.2 pkgrel=0 # armhf blocked by qt5-qtdeclarative -# armhf, ppc64le, riscv64, s390x blocked by qt5-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64" +# armhf, ppc64le, riscv64, s390x, loongarch64 blocked by qt5-qtwebengine +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://community.kde.org/Alkimia/libalkimia" pkgdesc="A library with common classes and functionality used by finance applications for the KDE SC" license="GPL-3.0-or-later" diff --git a/community/alpine/APKBUILD b/community/alpine/APKBUILD index 7b36127abec..a672fc25ccc 100644 --- a/community/alpine/APKBUILD +++ b/community/alpine/APKBUILD @@ -17,6 +17,11 @@ builddir="$srcdir/$pkgname-v$pkgver" # 2.23-r0: # - CVE-2020-14929 +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/althttpd/APKBUILD b/community/althttpd/APKBUILD index 8f64b2b31e8..99193b2e9ac 100644 --- a/community/althttpd/APKBUILD +++ b/community/althttpd/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Sodface <sod@sodface.com> # Maintainer: Sodface <sod@sodface.com> pkgname=althttpd -pkgver=202402211453 +pkgver=202405010759 pkgrel=0 pkgdesc="Small, simple, stand-alone HTTP server" url="https://sqlite.org/althttpd/doc/trunk/althttpd.md" arch="all" license="Public-Domain" -makedepends="openssl-dev>3" +makedepends="openssl-dev>3 sqlite-dev" options="!check" # no test suite -subpackages="$pkgname-doc $pkgname-openrc" +subpackages="$pkgname-doc $pkgname-openrc $pkgname-utils" source=" $pkgname-$pkgver.tar.gz::https://sqlite.org/althttpd/tarball?r=$pkgver 10-allow-filename-plus-sign.patch @@ -19,9 +19,8 @@ source=" builddir="$srcdir" build() { - sed -in -e 's/^CFLAGS=/CFLAGS+=/' \ - -e 's|/bin/bash|/bin/sh|' Makefile - make althttpsd + sed -in -e 's/^CFLAGS=/CFLAGS+=/' Makefile + make althttpsd logtodb } package() { @@ -31,12 +30,20 @@ package() { "$pkgdir"/etc/init.d/althttpd install -D althttpsd \ "$pkgdir"/usr/bin/althttpd + install -D logtodb \ + "$pkgdir"/usr/bin/logtodb install -Dm644 althttpd.md \ "$pkgdir"/usr/share/doc/$pkgname/althttpd.md } +utils() { + pkgdesc="$pkgname utilities" + + amove /usr/bin/logtodb +} + sha512sums=" -8a5c1df74c4c9566593fdf505c9bad1af1a7edf185bf0854105eb5cadddbfca2e650f854c87461d8d514adb1015d03a1b14f5e543e505b43997980899d5a8d89 althttpd-202402211453.tar.gz +c99bbd7cd5cb844bffa62d154c91b0275071ed7acc5f9f5021fbdd9e8fc07478dc990a8615644e1d57ab4d39250fd0ac65efdc0f7cfb70fba5a0b2fe9a2e5524 althttpd-202405010759.tar.gz ece2633a822589f1e49129bf00fb4b066e9d079e3e56f7c78e3bcba02c8aad9ae3ee75f6459360524d7c2a3a7dc7cfea4eb1652b4cbf1aff60d968e1f816b535 10-allow-filename-plus-sign.patch 41f0015f98f108067b42a4a2487c7c89653388a1c3c4a94884fedf5f704f05cdcc189ea81e7a01a8ec8408045b72ee06b6f1063e5b7cd5e67318d42b4c0add89 althttpd.confd f21867430470b836d97d60215d9dda835125140cced3bb9c856349228572f2c73ac0574d3f705d72938879fc2b5a37855768a5f7de5c29943e3aa6ead5d72d9c althttpd.initd diff --git a/community/amazfish/APKBUILD b/community/amazfish/APKBUILD index 6af99d74242..46e37dc3406 100644 --- a/community/amazfish/APKBUILD +++ b/community/amazfish/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Marco Schröder <marco.schroeder96@gmail.com> pkgname=amazfish -pkgver=2.2.4 +pkgver=2.2.8 pkgrel=0 _commit_qble="c2ecbff041b0e6416f04d1af6bf102ced1bc447c" _commit_libwatchfish="b8e2e8c0d2e2b17153823ef7ca18d5b73b0dabe3" @@ -63,7 +63,7 @@ package() { } sha512sums=" -e0adb9c222caa90a1e96ee5451d7e036278ae4d86ebccb34c0d40ec0a7cb0500a7b5b97ffd4d1c84db6bf4e6a4b71e6d0f936071ad73e7d8ed29746a97334ba6 harbour-amazfish-2.2.4.tar.gz +8acc62d7db8726ca3c47db28bf20f707c270f8c640f313b56ec94852441dbbc0cf524a649d93f971755c47f3b83101111a905d09d11bc0ce9e84d103668a1d2a harbour-amazfish-2.2.8.tar.gz ea154670e0489bacad3ddceecbc36b75838ca8d3a62372750ccfa9dfe0f951c32e95c4ff35d643b84d28df6b8d42031bbace664912a9de5a83dfcfa4a6ea4d98 qble-c2ecbff041b0e6416f04d1af6bf102ced1bc447c.tar.gz 6d2c7c644edbd7b99b34fb0f6e117ccae67935da9c067c9e73b717a3eb617b259b0184148d79d8e8636f6332fe4013427c3d0400d79622acd149bad9eef96b9d libwatchfish-b8e2e8c0d2e2b17153823ef7ca18d5b73b0dabe3.tar.gz a17c0d6578e0d6878099f9c913e54100c44dbb94cf8803f2780d5709ec08136daa832ec2ffe947fb8a91e02320f01041d0e763bcc08350270af36d89f767ca14 amazfish-launcher.sh diff --git a/community/angelfish/APKBUILD b/community/angelfish/APKBUILD index 45b67411b5e..4737aaaad73 100644 --- a/community/angelfish/APKBUILD +++ b/community/angelfish/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 pkgdesc="Small Webbrowser for Plasma Mobile" # armhf blocked by extra-cmake-modules # ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -arch="all !ppc64le !s390x !armhf !riscv64" +# loongarch64 blocked by purpose +arch="all !ppc64le !s390x !armhf !riscv64 !loongarch64" url="https://phabricator.kde.org/source/plasma-angelfish/" license="GPL-3.0-or-later" depends=" @@ -39,7 +40,7 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/angelfish-$p options="net" # net required to download Rust dependencies provides="plasma-angelfish=$pkgver-r$pkgrel" # Backwards compatibility -replaces="plasma-angelfish" # Backwards compatibility +replaces="plasma-angelfish" # Backwards compatibility build() { cmake -B build -G Ninja \ diff --git a/community/ansible-core/APKBUILD b/community/ansible-core/APKBUILD index 1d3c60b8caa..90eda5f22ad 100644 --- a/community/ansible-core/APKBUILD +++ b/community/ansible-core/APKBUILD @@ -1,8 +1,10 @@ # Contributor: Sean McAvoy <seanmcavoy@gmail.com> +# Contributor: Thomas Böhler <witcher@wiredspace.de> # Maintainer: Sean McAvoy <seanmcavoy@gmail.com> pkgname=ansible-core -pkgver=2.16.5 -pkgrel=1 +_pkgname=${pkgname/-/_} +pkgver=2.16.6 +pkgrel=0 pkgdesc="core components of ansible: A configuration-management, deployment, task-execution, and multinode orchestration framework" url="https://ansible.com" options="!check" # for now @@ -19,8 +21,9 @@ depends=" " makedepends="py3-setuptools py3-docutils" subpackages="$pkgname-doc $pkgname-pyc" -source="https://pypi.python.org/packages/source/a/ansible-core/ansible-core-$pkgver.tar.gz - " +# tarball is named "ansible_core" instead of "ansible-core" since 2.16.6 +source="$pkgname-$pkgver.tar.gz::https://pypi.python.org/packages/source/a/ansible-core/ansible_core-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" replaces="ansible-base" @@ -36,5 +39,5 @@ package() { install -Dm644 man/ansible*1 -t "$pkgdir"/usr/share/man/man1/ } sha512sums=" -dbe5d68fbc3a0ef611791d6995297bca5bba6aed1f4871964136ea81810458646bc78c2146739f887de3c2e3017cf4e6d4d09652e41c2ca046c4bc88eca6c5d8 ansible-core-2.16.5.tar.gz +cd9cc8783e13b073cbfaef889e20c8a7dfb732c91de4bae2b496a64ef47b0325c637b4ab2eadbd0c56cb004e95f5294aa1e1548675a90f06193d62defd553409 ansible-core-2.16.6.tar.gz " diff --git a/community/ansible-lint/APKBUILD b/community/ansible-lint/APKBUILD index 7768946211a..12bb2983d7e 100644 --- a/community/ansible-lint/APKBUILD +++ b/community/ansible-lint/APKBUILD @@ -2,8 +2,8 @@ # Contributor: fossdd <fossdd@pwned.life> # Maintainer: fossdd <fossdd@pwned.life> pkgname=ansible-lint -pkgver=24.2.2 -pkgrel=2 +pkgver=24.2.3 +pkgrel=1 pkgdesc="check ansible playbooks" url="https://github.com/ansible/ansible-lint" arch="noarch" @@ -42,9 +42,10 @@ checkdepends=" yamllint " subpackages="$pkgname-pyc" -source="ansible-lint-$pkgver.tar.gz::https://github.com/ansible-community/ansible-lint/archive/refs/tags/v$pkgver/ansible-lint-v$pkgver.tar.gz +source="https://pypi.io/packages/source/a/ansible-lint/ansible_lint-$pkgver.tar.gz no-version-check.patch " +builddir="$srcdir/ansible_lint-$pkgver" provides="py3-ansible-lint=$pkgver-r$pkgrel" # for backward compatibility replaces="py3-ansible-lint" # for backward compatibility @@ -65,6 +66,6 @@ package() { } sha512sums=" -e6c07336b2b202e9d541258e941ccc2076115420416f7e997b58ab69873d237c05d3fe5e8d7fd44c195aa83215eeb34d59899d9024867e6f6c8e828058c72716 ansible-lint-24.2.2.tar.gz +65d221ef0d64692d1af3fb099a65d2326f7736e8890ef8aae885f341ae6be4d9021c89332ba44b1fc65fc74a815deaaf48e2941ab988e6e464ba45dc540ac6dc ansible_lint-24.2.3.tar.gz 314fa02e0b30db8a8886824b0cce825ae4ffe227e2c5be434bc96e1c3ab8a6239548574d9ed0869def67b94c684a67abbf594f78aadbc64286fe8187502ba275 no-version-check.patch " diff --git a/community/ansible/APKBUILD b/community/ansible/APKBUILD index 61e34042659..57a1c2fdb5d 100644 --- a/community/ansible/APKBUILD +++ b/community/ansible/APKBUILD @@ -4,8 +4,8 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Sean McAvoy <seanmcavoy@gmail.com> pkgname=ansible -pkgver=9.4.0 -pkgrel=2 +pkgver=9.5.1 +pkgrel=0 pkgdesc="core components for Ansible" url="https://ansible.com/" options="!check" # TODO: enable tests @@ -38,5 +38,5 @@ package() { } sha512sums=" -4c75235a866f3f95cda8dd3b6c9d22b916ad117d54a86a30585f71c9015cd98db764afa225af5b2f6fa884af558ee488785e26c9e8b9e8be105062f069f065b2 ansible-9.4.0.tar.gz +8a95f0e41987a1ab423ebd6be8483681c30f31dfd24056d729c4e0cc870775d3a59f9790bcd0bf578538ba24752b9dc6401fe467f4f8b12acdd50878555bc8c1 ansible-9.5.1.tar.gz " diff --git a/community/anytun/APKBUILD b/community/anytun/APKBUILD index 4bcefd5c36d..2e235167843 100644 --- a/community/anytun/APKBUILD +++ b/community/anytun/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=anytun pkgver=0.3.8 -pkgrel=11 +pkgrel=12 pkgdesc="Secure anycast tunneling protocol implementation for flexible and fault-tolerant VPNs" -options="!check" # No testsuite +options="!check !fhs" # No testsuite, /var/run dirs created in package() url="https://www.anytun.org/" arch="all" license="GPL-3.0-or-later" diff --git a/community/apache-ant/APKBUILD b/community/apache-ant/APKBUILD index fa974afc253..710fd6a6806 100644 --- a/community/apache-ant/APKBUILD +++ b/community/apache-ant/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.10.14 pkgrel=0 pkgdesc="A java-based build tool" url="https://ant.apache.org/" -# riscv64 blocked by java-jdk +# riscv64 blocked by openjdk8 arch="noarch !riscv64" license="Apache-2.0" makedepends="openjdk8" diff --git a/community/apache-arrow/APKBUILD b/community/apache-arrow/APKBUILD index 71eda59d00c..636666d25bb 100644 --- a/community/apache-arrow/APKBUILD +++ b/community/apache-arrow/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Duncan Bellamy <dunk@denkimushi.com> # based on arch linux PKGBUILD pkgname=apache-arrow -pkgver=15.0.2 -pkgrel=3 +pkgver=16.0.0 +pkgrel=0 pkgdesc="multi-language toolbox for accelerated data interchange and in-memory processing" url="https://arrow.apache.org/" arch="all" @@ -213,7 +213,7 @@ lib() { } sha512sums=" -6c83e3be1e5840c30387f088315b74aca8e7c2d060793af70a156effb496a71e3e6af0693188c0f46f8a4a061a263a47095912ef04a5dc8141abd59075b14c78 apache-arrow-15.0.2.tar.gz +773f4f3eef603032c8ba0cfdc023bfd2a24bb5e41c82da354a22d7854ab153294ede1f4782cc32b27451cf1b58303f105bac61ceeb3568faea747b93e21d79e4 apache-arrow-16.0.0.tar.gz 2c31dd48fc070c3b1b25cdd1d58615accf73e3ee864d58b9a92a92c71a531174abeae42c2d0e6a70bcce47fe01c6cf43b1c17fab0636fb51524db8d035efce20 apache-arrow-arrow-testing-e81d0c6de35948b3be7984af8e00413b314cde6e.tar.gz 5bf4f1341dfab0f71d61d00ef89e2f6a49831af3e5ade1209b9f35abf61d5edcbe311bebb2bb5d8611486e16fe97bfa8c85974dc2ea11325b58fb74c1cc09e3a apache-arrow-parquet-testing-d79a0101d90dfa3bbb10337626f57a3e8c4b5363.tar.gz 4cbb62bc7f4e18bd2ccb03a3bff66615825df2533c80e93c19ea3132816ccef0d5c00b765aa950154f0752b9c88a838bbcecd02f971d430a9c1dbec84f313b91 python-options.patch diff --git a/community/apache-mod-md/APKBUILD b/community/apache-mod-md/APKBUILD index ac6a5cd4703..eaf27f01343 100644 --- a/community/apache-mod-md/APKBUILD +++ b/community/apache-mod-md/APKBUILD @@ -18,6 +18,11 @@ source="https://github.com/icing/mod_md/releases/download/v$pkgver/mod_md-$pkgve builddir="$srcdir/mod_md-$pkgver" options="!check" # TODO +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/apk-polkit-rs/0001-fix-apk-tools-sys-fix-new-apk_package-structure.patch b/community/apk-polkit-rs/0001-fix-apk-tools-sys-fix-new-apk_package-structure.patch new file mode 100644 index 00000000000..1574b0d7ddf --- /dev/null +++ b/community/apk-polkit-rs/0001-fix-apk-tools-sys-fix-new-apk_package-structure.patch @@ -0,0 +1,124 @@ +From ff8c27864df4f164a234d8cdbd92652ed35e3823 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com> +Date: Mon, 29 Apr 2024 17:15:11 +0200 +Subject: [PATCH 1/5] fix(apk-tools-sys): fix new apk_package structure + +--- + apk-tools-sys/src/mapk_package.rs | 59 ++++++++++++------------------- + 1 file changed, 23 insertions(+), 36 deletions(-) + +diff --git a/apk-tools-sys/src/mapk_package.rs b/apk-tools-sys/src/mapk_package.rs +index eded8c3..26875bc 100644 +--- a/apk-tools-sys/src/mapk_package.rs ++++ b/apk-tools-sys/src/mapk_package.rs +@@ -12,43 +12,47 @@ impl Default for apk_package { + + impl ::std::fmt::Debug for apk_package { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { +- write ! (f , "apk_package {{ hash_node: {:?}, foreach_genid: {:?}, __bindgen_anon_1: {:?}, name: {:?}, ipkg: {:?}, version: {:?}, arch: {:?}, license: {:?}, origin: {:?}, maintainer: {:?}, url: {:?}, description: {:?}, commit: {:?}, filename: {:?}, depends: {:?}, install_if: {:?}, provides: {:?}, installed_size: {:?}, size: {:?}, build_time: {:?}, provider_priority: {:?}, repos : {:?}, marked : {:?}, uninstallable : {:?}, cached_non_repository : {:?}, csum: {:?} }}" , self . hash_node , self . foreach_genid , self . __bindgen_anon_1 , self . name , self . ipkg , self . version , self . arch , self . license , self . origin , self . maintainer , self . url , self . description , self . commit , self . filename , self . depends , self . install_if , self . provides , self . installed_size , self . size , self . build_time , self . provider_priority , self . repos() , self . marked() , self . uninstallable() , self . cached_non_repository (), self . csum) ++ write ! (f , "apk_package {{ hash_node: {:?}, name: {:?}, ipkg: {:?}, depends: {:?}, install_if: {:?}, provides: {:?}, version: {:?}, installed_size: {:?}, size: {:?}, __bindgen_anon_1: {:?}, foreach_genid: {:?}, provider_priority: {:?}, repos : {:?}, filename_ndx: {:?}, seen : {:?}, marked : {:?}, uninstallable : {:?}, cached_non_repository : {:?}, csum: {:?}, build_time: {:?}, arch: {:?}, license: {:?}, origin: {:?}, maintainer: {:?}, url: {:?}, description: {:?}, commit: {:?} }}" , self . hash_node , self . name , self . ipkg , self . depends , self . install_if , self . provides , self . version , self . installed_size , self . size , self . __bindgen_anon_1 , self . foreach_genid , self . provider_priority , self . repos , self . filename_ndx , self . seen() , self . marked() , self . uninstallable() , self . cached_non_repository (), self . csum , self . build_time , self . arch , self . license , self . origin , self . maintainer , self . url , self . description , self . commit) + } + } + + // can't be auto-generated since the bitfields aren't correctly generated by bindgen# +-// (they shoul be 5 bytes big in total, bindgen makes them take up 8) ++// (they shoul be 4 bytes big in total, bindgen makes them take up 8). Is this ++// still the case?? + + #[repr(C)] + pub struct apk_package { + pub hash_node: apk_hash_node, +- pub foreach_genid: ::std::os::raw::c_uint, +- __bindgen_anon_1: apk_package__bindgen_ty_1, + pub name: *mut apk_name, + pub ipkg: *mut apk_installed_package, +- pub version: *mut apk_blob_t, +- pub arch: *mut apk_blob_t, +- pub license: *mut apk_blob_t, +- pub origin: *mut apk_blob_t, +- pub maintainer: *mut apk_blob_t, +- pub url: *mut ::std::os::raw::c_char, +- pub description: *mut ::std::os::raw::c_char, +- pub commit: *mut ::std::os::raw::c_char, +- pub filename: *mut ::std::os::raw::c_char, + pub depends: *mut apk_dependency_array, + pub install_if: *mut apk_dependency_array, + pub provides: *mut apk_dependency_array, ++ pub version: *mut apk_blob_t, + pub installed_size: usize, + pub size: usize, +- pub build_time: time_t, ++ ++ __bindgen_anon_1: apk_package__bindgen_ty_1, ++ pub foreach_genid: ::std::os::raw::c_uint, + pub provider_priority: ::std::os::raw::c_ushort, ++ pub repos: ::std::os::raw::c_ushort, ++ pub filename_ndx: ::std::os::raw::c_ushort, + bitfields: private::apk_package_bitfield, + pub csum: apk_checksum, ++ ++ pub build_time: time_t, ++ pub arch: *mut apk_blob_t, ++ pub license: *mut apk_blob_t, ++ pub origin: *mut apk_blob_t, ++ pub maintainer: *mut apk_blob_t, ++ pub url: *mut ::std::os::raw::c_char, ++ pub description: *mut ::std::os::raw::c_char, ++ pub commit: *mut ::std::os::raw::c_char, + } + + impl apk_package { +- pub fn repos(&self) -> u32 { +- self.bitfields.repos() ++ pub fn seen(&self) -> u8 { ++ self.bitfields.seen() + } + + pub fn marked(&self) -> u8 { +@@ -63,8 +67,8 @@ impl apk_package { + self.bitfields.cached_non_repository() + } + +- pub fn set_repos(&mut self, val: u32) { +- self.bitfields.set_repos(val) ++ pub fn set_seen(&mut self, val: u8) { ++ self.bitfields.set_seen(val) + } + + pub fn set_marked(&mut self, val: u8) { +@@ -85,7 +89,7 @@ mod private { + #[modular_bitfield::bitfield] + #[repr(C)] + pub struct apk_package_bitfield { +- pub repos: u32, ++ pub seen: u8, + pub marked: u8, + pub uninstallable: u8, + pub cached_non_repository: u8, +@@ -312,23 +316,6 @@ mod test { + ); + } + test_field_commit(); +- fn test_field_filename() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).filename) as usize - ptr as usize +- }, +- 112usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(filename) +- ) +- ); +- } +- test_field_filename(); + fn test_field_depends() { + assert_eq!( + unsafe { +-- +2.45.0 + diff --git a/community/apk-polkit-rs/0003-feat-apk-tools-sys-remove-custom-binding-for-apk_pac.patch b/community/apk-polkit-rs/0003-feat-apk-tools-sys-remove-custom-binding-for-apk_pac.patch new file mode 100644 index 00000000000..04838b3c080 --- /dev/null +++ b/community/apk-polkit-rs/0003-feat-apk-tools-sys-remove-custom-binding-for-apk_pac.patch @@ -0,0 +1,533 @@ +From 4d37d61f436ab0ab0956ce612bcb1cc26a8464c4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com> +Date: Tue, 30 Apr 2024 00:44:09 +0200 +Subject: [PATCH 3/5] feat(apk-tools-sys): remove custom binding for + apk_package + +Seems to be unnecessary after +https://gitlab.alpinelinux.org/alpine/apk-tools/-/commit/cf744973d456e5f039d99b3efbaca18e177d0b69 +--- + Cargo.lock | 2 +- + apk-tools-sys/Cargo.toml | 2 +- + apk-tools-sys/build.rs | 1 - + apk-tools-sys/src/lib.rs | 3 +- + apk-tools-sys/src/mapk_package.rs | 456 ------------------------------ + 5 files changed, 3 insertions(+), 461 deletions(-) + delete mode 100644 apk-tools-sys/src/mapk_package.rs + +diff --git a/Cargo.lock b/Cargo.lock +index d76caad..d173499 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -48,7 +48,7 @@ dependencies = [ + + [[package]] + name = "apk-tools-sys" +-version = "0.1.0" ++version = "0.1.1" + dependencies = [ + "bindgen", + "libc", +diff --git a/apk-tools-sys/Cargo.toml b/apk-tools-sys/Cargo.toml +index 59c7703..086a658 100644 +--- a/apk-tools-sys/Cargo.toml ++++ b/apk-tools-sys/Cargo.toml +@@ -1,6 +1,6 @@ + [package] + name = "apk-tools-sys" +-version = "0.1.0" ++version = "0.1.1" + authors = ["Rasmus Thonmsen <oss@cogitri.dev>"] + edition = "2021" + links = "apk" +diff --git a/apk-tools-sys/build.rs b/apk-tools-sys/build.rs +index 4028bd9..8a6822f 100644 +--- a/apk-tools-sys/build.rs ++++ b/apk-tools-sys/build.rs +@@ -14,7 +14,6 @@ fn generate_bindings(include_paths: &Vec<&PathBuf>) { + .size_t_is_usize(true) + .formatter(bindgen::Formatter::None) + .impl_debug(true) +- .blocklist_type("apk_package") + .blocklist_type("max_align_t") + .parse_callbacks(Box::new(bindgen::CargoCallbacks)); + +diff --git a/apk-tools-sys/src/lib.rs b/apk-tools-sys/src/lib.rs +index 0824ce3..c5f53fd 100644 +--- a/apk-tools-sys/src/lib.rs ++++ b/apk-tools-sys/src/lib.rs +@@ -10,8 +10,7 @@ + + mod arrays; + mod mapk_blob_t; +-mod mapk_package; + +-pub use crate::{arrays::*, mapk_package::apk_package}; ++pub use crate::arrays::*; + + include!(concat!(env!("OUT_DIR"), "/bindings.rs")); +diff --git a/apk-tools-sys/src/mapk_package.rs b/apk-tools-sys/src/mapk_package.rs +deleted file mode 100644 +index 26875bc..0000000 +--- a/apk-tools-sys/src/mapk_package.rs ++++ /dev/null +@@ -1,456 +0,0 @@ +-use crate::*; +- +-impl Default for apk_package { +- fn default() -> Self { +- let mut s = ::std::mem::MaybeUninit::<Self>::uninit(); +- unsafe { +- ::std::ptr::write_bytes(s.as_mut_ptr(), 0, 1); +- s.assume_init() +- } +- } +-} +- +-impl ::std::fmt::Debug for apk_package { +- fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { +- write ! (f , "apk_package {{ hash_node: {:?}, name: {:?}, ipkg: {:?}, depends: {:?}, install_if: {:?}, provides: {:?}, version: {:?}, installed_size: {:?}, size: {:?}, __bindgen_anon_1: {:?}, foreach_genid: {:?}, provider_priority: {:?}, repos : {:?}, filename_ndx: {:?}, seen : {:?}, marked : {:?}, uninstallable : {:?}, cached_non_repository : {:?}, csum: {:?}, build_time: {:?}, arch: {:?}, license: {:?}, origin: {:?}, maintainer: {:?}, url: {:?}, description: {:?}, commit: {:?} }}" , self . hash_node , self . name , self . ipkg , self . depends , self . install_if , self . provides , self . version , self . installed_size , self . size , self . __bindgen_anon_1 , self . foreach_genid , self . provider_priority , self . repos , self . filename_ndx , self . seen() , self . marked() , self . uninstallable() , self . cached_non_repository (), self . csum , self . build_time , self . arch , self . license , self . origin , self . maintainer , self . url , self . description , self . commit) +- } +-} +- +-// can't be auto-generated since the bitfields aren't correctly generated by bindgen# +-// (they shoul be 4 bytes big in total, bindgen makes them take up 8). Is this +-// still the case?? +- +-#[repr(C)] +-pub struct apk_package { +- pub hash_node: apk_hash_node, +- pub name: *mut apk_name, +- pub ipkg: *mut apk_installed_package, +- pub depends: *mut apk_dependency_array, +- pub install_if: *mut apk_dependency_array, +- pub provides: *mut apk_dependency_array, +- pub version: *mut apk_blob_t, +- pub installed_size: usize, +- pub size: usize, +- +- __bindgen_anon_1: apk_package__bindgen_ty_1, +- pub foreach_genid: ::std::os::raw::c_uint, +- pub provider_priority: ::std::os::raw::c_ushort, +- pub repos: ::std::os::raw::c_ushort, +- pub filename_ndx: ::std::os::raw::c_ushort, +- bitfields: private::apk_package_bitfield, +- pub csum: apk_checksum, +- +- pub build_time: time_t, +- pub arch: *mut apk_blob_t, +- pub license: *mut apk_blob_t, +- pub origin: *mut apk_blob_t, +- pub maintainer: *mut apk_blob_t, +- pub url: *mut ::std::os::raw::c_char, +- pub description: *mut ::std::os::raw::c_char, +- pub commit: *mut ::std::os::raw::c_char, +-} +- +-impl apk_package { +- pub fn seen(&self) -> u8 { +- self.bitfields.seen() +- } +- +- pub fn marked(&self) -> u8 { +- self.bitfields.marked() +- } +- +- pub fn uninstallable(&self) -> u8 { +- self.bitfields.uninstallable() +- } +- +- pub fn cached_non_repository(&self) -> u8 { +- self.bitfields.cached_non_repository() +- } +- +- pub fn set_seen(&mut self, val: u8) { +- self.bitfields.set_seen(val) +- } +- +- pub fn set_marked(&mut self, val: u8) { +- self.bitfields.set_marked(val) +- } +- +- pub fn set_uninstallable(&mut self, val: u8) { +- self.bitfields.set_uninstallable(val) +- } +- +- pub fn set_cached_non_repository(&mut self, val: u8) { +- self.bitfields.set_cached_non_repository(val) +- } +-} +- +-#[allow(dead_code)] +-mod private { +- #[modular_bitfield::bitfield] +- #[repr(C)] +- pub struct apk_package_bitfield { +- pub seen: u8, +- pub marked: u8, +- pub uninstallable: u8, +- pub cached_non_repository: u8, +- } +-} +- +-#[cfg(all(test, target_pointer_width = "64"))] +-mod test { +- use super::*; +- +- #[test] +- fn bindgen_test_layout_apk_package() { +- assert_eq!( +- ::std::mem::size_of::<apk_package>(), +- 200usize, +- concat!("Size of: ", stringify!(apk_package)) +- ); +- assert_eq!( +- ::std::mem::align_of::<apk_package>(), +- 8usize, +- concat!("Alignment of ", stringify!(apk_package)) +- ); +- fn test_field_hash_node() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).hash_node) as usize - ptr as usize +- }, +- 0usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(hash_node) +- ) +- ); +- } +- test_field_hash_node(); +- fn test_field_foreach_genid() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).foreach_genid) as usize - ptr as usize +- }, +- 8usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(foreach_genid) +- ) +- ); +- } +- test_field_foreach_genid(); +- fn test_field_name() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).name) as usize - ptr as usize +- }, +- 32usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(name) +- ) +- ); +- } +- test_field_name(); +- fn test_field_ipkg() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).ipkg) as usize - ptr as usize +- }, +- 40usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(ipkg) +- ) +- ); +- } +- test_field_ipkg(); +- fn test_field_version() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).version) as usize - ptr as usize +- }, +- 48usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(version) +- ) +- ); +- } +- test_field_version(); +- fn test_field_arch() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).arch) as usize - ptr as usize +- }, +- 56usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(arch) +- ) +- ); +- } +- test_field_arch(); +- fn test_field_license() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).license) as usize - ptr as usize +- }, +- 64usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(license) +- ) +- ); +- } +- test_field_license(); +- fn test_field_origin() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).origin) as usize - ptr as usize +- }, +- 72usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(origin) +- ) +- ); +- } +- test_field_origin(); +- fn test_field_maintainer() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).maintainer) as usize - ptr as usize +- }, +- 80usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(maintainer) +- ) +- ); +- } +- test_field_maintainer(); +- fn test_field_url() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).url) as usize - ptr as usize +- }, +- 88usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(url) +- ) +- ); +- } +- test_field_url(); +- fn test_field_description() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).description) as usize - ptr as usize +- }, +- 96usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(description) +- ) +- ); +- } +- test_field_description(); +- fn test_field_commit() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).commit) as usize - ptr as usize +- }, +- 104usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(commit) +- ) +- ); +- } +- test_field_commit(); +- fn test_field_depends() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).depends) as usize - ptr as usize +- }, +- 120usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(depends) +- ) +- ); +- } +- test_field_depends(); +- fn test_field_install_if() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).install_if) as usize - ptr as usize +- }, +- 128usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(install_if) +- ) +- ); +- } +- test_field_install_if(); +- fn test_field_provides() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).provides) as usize - ptr as usize +- }, +- 136usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(provides) +- ) +- ); +- } +- test_field_provides(); +- fn test_field_installed_size() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).installed_size) as usize - ptr as usize +- }, +- 144usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(installed_size) +- ) +- ); +- } +- test_field_installed_size(); +- fn test_field_size() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).size) as usize - ptr as usize +- }, +- 152usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(size) +- ) +- ); +- } +- test_field_size(); +- fn test_field_build_time() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).build_time) as usize - ptr as usize +- }, +- 160usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(build_time) +- ) +- ); +- } +- test_field_build_time(); +- fn test_field_provider_priority() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).provider_priority) as usize - ptr as usize +- }, +- 168usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(provider_priority) +- ) +- ); +- } +- test_field_provider_priority(); +- fn test_field_csum() { +- assert_eq!( +- unsafe { +- let uninit = ::std::mem::MaybeUninit::<apk_package>::uninit(); +- let ptr = uninit.as_ptr(); +- ::std::ptr::addr_of!((*ptr).csum) as usize - ptr as usize +- }, +- 177usize, +- concat!( +- "Offset of field: ", +- stringify!(apk_package), +- "::", +- stringify!(csum) +- ) +- ); +- } +- test_field_csum(); +- } +-} +-- +2.45.0 + diff --git a/community/apk-polkit-rs/0004-chore-Cargo-update-dependencies.patch b/community/apk-polkit-rs/0004-chore-Cargo-update-dependencies.patch new file mode 100644 index 00000000000..55326d0db83 --- /dev/null +++ b/community/apk-polkit-rs/0004-chore-Cargo-update-dependencies.patch @@ -0,0 +1,1896 @@ +From 61901bfa93725abeb03f7e7c98a092cab56dea22 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com> +Date: Tue, 30 Apr 2024 01:03:26 +0200 +Subject: [PATCH 4/5] chore(Cargo): update dependencies + +--- + Cargo.lock | 1071 +++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 734 insertions(+), 337 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index d173499..c4ac276 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2,11 +2,26 @@ + # It is not intended for manual editing. + version = 3 + ++[[package]] ++name = "addr2line" ++version = "0.21.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" ++ + [[package]] + name = "aho-corasick" +-version = "0.7.20" ++version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" ++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" + dependencies = [ + "memchr", + ] +@@ -63,37 +78,171 @@ version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" + dependencies = [ +- "event-listener", ++ "event-listener 2.5.3", + "futures-core", + ] + ++[[package]] ++name = "async-channel" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" ++dependencies = [ ++ "concurrent-queue", ++ "event-listener 5.3.0", ++ "event-listener-strategy 0.5.2", ++ "futures-core", ++ "pin-project-lite", ++] ++ ++[[package]] ++name = "async-io" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" ++dependencies = [ ++ "async-lock 2.8.0", ++ "autocfg", ++ "cfg-if", ++ "concurrent-queue", ++ "futures-lite 1.13.0", ++ "log", ++ "parking", ++ "polling 2.8.0", ++ "rustix 0.37.27", ++ "slab", ++ "socket2 0.4.10", ++ "waker-fn", ++] ++ ++[[package]] ++name = "async-io" ++version = "2.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" ++dependencies = [ ++ "async-lock 3.3.0", ++ "cfg-if", ++ "concurrent-queue", ++ "futures-io", ++ "futures-lite 2.3.0", ++ "parking", ++ "polling 3.7.0", ++ "rustix 0.38.34", ++ "slab", ++ "tracing", ++ "windows-sys 0.52.0", ++] ++ ++[[package]] ++name = "async-lock" ++version = "2.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" ++dependencies = [ ++ "event-listener 2.5.3", ++] ++ ++[[package]] ++name = "async-lock" ++version = "3.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" ++dependencies = [ ++ "event-listener 4.0.3", ++ "event-listener-strategy 0.4.0", ++ "pin-project-lite", ++] ++ ++[[package]] ++name = "async-process" ++version = "1.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" ++dependencies = [ ++ "async-io 1.13.0", ++ "async-lock 2.8.0", ++ "async-signal", ++ "blocking", ++ "cfg-if", ++ "event-listener 3.1.0", ++ "futures-lite 1.13.0", ++ "rustix 0.38.34", ++ "windows-sys 0.48.0", ++] ++ + [[package]] + name = "async-recursion" +-version = "1.0.4" ++version = "1.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" ++checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.15", ++ "syn 2.0.60", ++] ++ ++[[package]] ++name = "async-signal" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" ++dependencies = [ ++ "async-io 2.3.2", ++ "async-lock 3.3.0", ++ "atomic-waker", ++ "cfg-if", ++ "futures-core", ++ "futures-io", ++ "rustix 0.38.34", ++ "signal-hook-registry", ++ "slab", ++ "windows-sys 0.52.0", + ] + ++[[package]] ++name = "async-task" ++version = "4.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" ++ + [[package]] + name = "async-trait" +-version = "0.1.68" ++version = "0.1.80" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" ++checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.15", ++ "syn 2.0.60", + ] + ++[[package]] ++name = "atomic-waker" ++version = "1.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" ++ + [[package]] + name = "autocfg" +-version = "1.1.0" ++version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" ++checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" ++dependencies = [ ++ "addr2line", ++ "cc", ++ "cfg-if", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] + + [[package]] + name = "bindgen" +@@ -101,7 +250,7 @@ version = "0.65.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", +@@ -113,7 +262,7 @@ dependencies = [ + "regex", + "rustc-hash", + "shlex", +- "syn 2.0.15", ++ "syn 2.0.60", + ] + + [[package]] +@@ -122,6 +271,12 @@ version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + ++[[package]] ++name = "bitflags" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" ++ + [[package]] + name = "block" + version = "0.1.6" +@@ -137,23 +292,37 @@ dependencies = [ + "generic-array", + ] + ++[[package]] ++name = "blocking" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" ++dependencies = [ ++ "async-channel", ++ "async-lock 3.3.0", ++ "async-task", ++ "futures-io", ++ "futures-lite 2.3.0", ++ "piper", ++] ++ + [[package]] + name = "byteorder" +-version = "1.4.3" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + + [[package]] + name = "bytes" +-version = "1.4.0" ++version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" ++checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + + [[package]] + name = "cc" +-version = "1.0.79" ++version = "1.0.95" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" ++checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" + + [[package]] + name = "cexpr" +@@ -166,11 +335,12 @@ dependencies = [ + + [[package]] + name = "cfg-expr" +-version = "0.14.0" ++version = "0.15.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6" ++checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" + dependencies = [ + "smallvec", ++ "target-lexicon", + ] + + [[package]] +@@ -181,23 +351,38 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "clang-sys" +-version = "1.6.1" ++version = "1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" ++checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" + dependencies = [ + "glob", + "libc", + ] + ++[[package]] ++name = "concurrent-queue" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" ++dependencies = [ ++ "crossbeam-utils", ++] ++ + [[package]] + name = "cpufeatures" +-version = "0.2.6" ++version = "0.2.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" ++checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" + dependencies = [ + "libc", + ] + ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" ++ + [[package]] + name = "crypto-common" + version = "0.1.6" +@@ -208,6 +393,15 @@ dependencies = [ + "typenum", + ] + ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] ++ + [[package]] + name = "derivative" + version = "2.2.0" +@@ -221,39 +415,19 @@ dependencies = [ + + [[package]] + name = "digest" +-version = "0.10.6" ++version = "0.10.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" ++checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" + dependencies = [ + "block-buffer", + "crypto-common", + ] + +-[[package]] +-name = "dirs" +-version = "4.0.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +-dependencies = [ +- "dirs-sys", +-] +- +-[[package]] +-name = "dirs-sys" +-version = "0.3.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +-dependencies = [ +- "libc", +- "redox_users", +- "winapi", +-] +- + [[package]] + name = "enumflags2" +-version = "0.7.7" ++version = "0.7.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" ++checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" + dependencies = [ + "enumflags2_derive", + "serde", +@@ -261,34 +435,29 @@ dependencies = [ + + [[package]] + name = "enumflags2_derive" +-version = "0.7.7" ++version = "0.7.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" ++checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.15", ++ "syn 2.0.60", + ] + + [[package]] +-name = "errno" +-version = "0.3.1" ++name = "equivalent" ++version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +-dependencies = [ +- "errno-dragonfly", +- "libc", +- "windows-sys 0.48.0", +-] ++checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + + [[package]] +-name = "errno-dragonfly" +-version = "0.1.2" ++name = "errno" ++version = "0.3.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" ++checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" + dependencies = [ +- "cc", + "libc", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -306,6 +475,59 @@ version = "2.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + ++[[package]] ++name = "event-listener" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" ++dependencies = [ ++ "concurrent-queue", ++ "parking", ++ "pin-project-lite", ++] ++ ++[[package]] ++name = "event-listener" ++version = "4.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" ++dependencies = [ ++ "concurrent-queue", ++ "parking", ++ "pin-project-lite", ++] ++ ++[[package]] ++name = "event-listener" ++version = "5.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" ++dependencies = [ ++ "concurrent-queue", ++ "parking", ++ "pin-project-lite", ++] ++ ++[[package]] ++name = "event-listener-strategy" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" ++dependencies = [ ++ "event-listener 4.0.3", ++ "pin-project-lite", ++] ++ ++[[package]] ++name = "event-listener-strategy" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" ++dependencies = [ ++ "event-listener 5.3.0", ++ "pin-project-lite", ++] ++ + [[package]] + name = "fastrand" + version = "1.9.0" +@@ -315,6 +537,12 @@ dependencies = [ + "instant", + ] + ++[[package]] ++name = "fastrand" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" ++ + [[package]] + name = "fern" + version = "0.6.2" +@@ -327,27 +555,58 @@ dependencies = [ + + [[package]] + name = "futures-core" +-version = "0.3.28" ++version = "0.3.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" ++ ++[[package]] ++name = "futures-io" ++version = "0.3.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" ++ ++[[package]] ++name = "futures-lite" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" ++dependencies = [ ++ "fastrand 1.9.0", ++ "futures-core", ++ "futures-io", ++ "memchr", ++ "parking", ++ "pin-project-lite", ++ "waker-fn", ++] ++ ++[[package]] ++name = "futures-lite" ++version = "2.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" ++checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" ++dependencies = [ ++ "futures-core", ++ "pin-project-lite", ++] + + [[package]] + name = "futures-sink" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" ++checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + + [[package]] + name = "futures-task" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" ++checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + + [[package]] + name = "futures-util" +-version = "0.3.28" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" ++checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" + dependencies = [ + "futures-core", + "futures-sink", +@@ -369,9 +628,9 @@ dependencies = [ + + [[package]] + name = "getrandom" +-version = "0.2.9" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" ++checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" + dependencies = [ + "cfg-if", + "libc", +@@ -398,6 +657,12 @@ dependencies = [ + "temp-dir", + ] + ++[[package]] ++name = "gimli" ++version = "0.28.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" ++ + [[package]] + name = "glob" + version = "0.3.1" +@@ -406,30 +671,21 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + + [[package]] + name = "hashbrown" +-version = "0.12.3" ++version = "0.14.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" ++checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + + [[package]] + name = "heck" +-version = "0.4.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +- +-[[package]] +-name = "hermit-abi" +-version = "0.2.6" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +-dependencies = [ +- "libc", +-] ++checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + + [[package]] + name = "hermit-abi" +-version = "0.3.1" ++version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" ++checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + + [[package]] + name = "hex" +@@ -450,11 +706,11 @@ dependencies = [ + + [[package]] + name = "indexmap" +-version = "1.9.3" ++version = "2.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" ++checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" + dependencies = [ +- "autocfg", ++ "equivalent", + "hashbrown", + ] + +@@ -469,20 +725,20 @@ dependencies = [ + + [[package]] + name = "io-lifetimes" +-version = "1.0.10" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" ++checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" + dependencies = [ +- "hermit-abi 0.3.1", ++ "hermit-abi", + "libc", + "windows-sys 0.48.0", + ] + + [[package]] + name = "itoa" +-version = "1.0.6" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "lazy_static" +@@ -498,15 +754,21 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + + [[package]] + name = "libc" +-version = "0.2.141" ++version = "0.2.154" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" ++checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" + + [[package]] + name = "linux-raw-sys" +-version = "0.3.1" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" ++ ++[[package]] ++name = "linux-raw-sys" ++version = "0.4.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" ++checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + + [[package]] + name = "locale_config" +@@ -523,12 +785,9 @@ dependencies = [ + + [[package]] + name = "log" +-version = "0.4.17" ++version = "0.4.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +-dependencies = [ +- "cfg-if", +-] ++checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + + [[package]] + name = "malloc_buf" +@@ -547,9 +806,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + + [[package]] + name = "memchr" +-version = "2.5.0" ++version = "2.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" ++checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + + [[package]] + name = "memoffset" +@@ -560,22 +819,39 @@ dependencies = [ + "autocfg", + ] + ++[[package]] ++name = "memoffset" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" ++dependencies = [ ++ "autocfg", ++] ++ + [[package]] + name = "minimal-lexical" + version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + ++[[package]] ++name = "miniz_oxide" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" ++dependencies = [ ++ "adler", ++] ++ + [[package]] + name = "mio" +-version = "0.8.6" ++version = "0.8.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" ++checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" + dependencies = [ + "libc", +- "log", + "wasi", +- "windows-sys 0.45.0", ++ "windows-sys 0.48.0", + ] + + [[package]] +@@ -601,16 +877,14 @@ dependencies = [ + + [[package]] + name = "nix" +-version = "0.26.2" ++version = "0.26.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" ++checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "cfg-if", + "libc", +- "memoffset", +- "pin-utils", +- "static_assertions", ++ "memoffset 0.7.1", + ] + + [[package]] +@@ -623,21 +897,27 @@ dependencies = [ + "minimal-lexical", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num_cpus" +-version = "1.15.0" ++version = "1.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" ++checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" + dependencies = [ +- "hermit-abi 0.2.6", ++ "hermit-abi", + "libc", + ] + + [[package]] + name = "num_threads" +-version = "0.1.6" ++version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" ++checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" + dependencies = [ + "libc", + ] +@@ -671,11 +951,20 @@ dependencies = [ + "objc", + ] + ++[[package]] ++name = "object" ++version = "0.32.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" ++dependencies = [ ++ "memchr", ++] ++ + [[package]] + name = "once_cell" +-version = "1.17.1" ++version = "1.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" ++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + + [[package]] + name = "ordered-stream" +@@ -687,11 +976,17 @@ dependencies = [ + "pin-project-lite", + ] + ++[[package]] ++name = "parking" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" ++ + [[package]] + name = "paste" +-version = "1.0.12" ++version = "1.0.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" ++checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + + [[package]] + name = "peeking_take_while" +@@ -701,9 +996,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + + [[package]] + name = "pin-project-lite" +-version = "0.2.9" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" ++checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + + [[package]] + name = "pin-utils" +@@ -711,11 +1006,59 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + ++[[package]] ++name = "piper" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" ++dependencies = [ ++ "atomic-waker", ++ "fastrand 2.1.0", ++ "futures-io", ++] ++ + [[package]] + name = "pkg-config" +-version = "0.3.26" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" ++checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" ++ ++[[package]] ++name = "polling" ++version = "2.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" ++dependencies = [ ++ "autocfg", ++ "bitflags 1.3.2", ++ "cfg-if", ++ "concurrent-queue", ++ "libc", ++ "log", ++ "pin-project-lite", ++ "windows-sys 0.48.0", ++] ++ ++[[package]] ++name = "polling" ++version = "3.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" ++dependencies = [ ++ "cfg-if", ++ "concurrent-queue", ++ "hermit-abi", ++ "pin-project-lite", ++ "rustix 0.38.34", ++ "tracing", ++ "windows-sys 0.52.0", ++] ++ ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + + [[package]] + name = "ppv-lite86" +@@ -725,12 +1068,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + + [[package]] + name = "prettyplease" +-version = "0.2.4" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" ++checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" + dependencies = [ + "proc-macro2", +- "syn 2.0.15", ++ "syn 2.0.60", + ] + + [[package]] +@@ -740,23 +1083,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" + dependencies = [ + "once_cell", +- "toml_edit", ++ "toml_edit 0.19.15", + ] + + [[package]] + name = "proc-macro2" +-version = "1.0.56" ++version = "1.0.81" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" ++checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" + dependencies = [ + "unicode-ident", + ] + + [[package]] + name = "quote" +-version = "1.0.26" ++version = "1.0.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" ++checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" + dependencies = [ + "proc-macro2", + ] +@@ -792,39 +1135,22 @@ dependencies = [ + ] + + [[package]] +-name = "redox_syscall" +-version = "0.2.16" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +-dependencies = [ +- "bitflags", +-] +- +-[[package]] +-name = "redox_syscall" +-version = "0.3.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +-dependencies = [ +- "bitflags", +-] +- +-[[package]] +-name = "redox_users" +-version = "0.4.3" ++name = "regex" ++version = "1.10.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" ++checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" + dependencies = [ +- "getrandom", +- "redox_syscall 0.2.16", +- "thiserror", ++ "aho-corasick", ++ "memchr", ++ "regex-automata", ++ "regex-syntax", + ] + + [[package]] +-name = "regex" +-version = "1.7.3" ++name = "regex-automata" ++version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" ++checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" + dependencies = [ + "aho-corasick", + "memchr", +@@ -833,9 +1159,15 @@ dependencies = [ + + [[package]] + name = "regex-syntax" +-version = "0.6.29" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" ++checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + + [[package]] + name = "rustc-hash" +@@ -845,72 +1177,85 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + + [[package]] + name = "rustix" +-version = "0.37.11" ++version = "0.37.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" ++checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", +- "linux-raw-sys", ++ "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "rustix" ++version = "0.38.34" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" ++dependencies = [ ++ "bitflags 2.5.0", ++ "errno", ++ "libc", ++ "linux-raw-sys 0.4.13", ++ "windows-sys 0.52.0", ++] ++ + [[package]] + name = "serde" +-version = "1.0.160" ++version = "1.0.199" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" ++checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.160" ++version = "1.0.199" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" ++checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.15", ++ "syn 2.0.60", + ] + + [[package]] + name = "serde_repr" +-version = "0.1.12" ++version = "0.1.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" ++checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.15", ++ "syn 2.0.60", + ] + + [[package]] + name = "serde_spanned" +-version = "0.6.1" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" ++checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" + dependencies = [ + "serde", + ] + + [[package]] + name = "serde_test" +-version = "1.0.160" ++version = "1.0.176" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3c95a500e3923258f7fc3a16bf29934e403aef5ca1096e184d85e3b1926675e8" ++checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab" + dependencies = [ + "serde", + ] + + [[package]] + name = "sha1" +-version = "0.10.5" ++version = "0.10.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" ++checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" + dependencies = [ + "cfg-if", + "cpufeatures", +@@ -919,35 +1264,54 @@ dependencies = [ + + [[package]] + name = "shlex" +-version = "1.1.0" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ ++[[package]] ++name = "signal-hook-registry" ++version = "1.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" ++checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" ++dependencies = [ ++ "libc", ++] + + [[package]] + name = "slab" +-version = "0.4.8" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" ++checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" + dependencies = [ + "autocfg", + ] + + [[package]] + name = "smallvec" +-version = "1.10.0" ++version = "1.13.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" ++checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + + [[package]] + name = "socket2" +-version = "0.4.9" ++version = "0.4.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" ++checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" + dependencies = [ + "libc", + "winapi", + ] + ++[[package]] ++name = "socket2" ++version = "0.5.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" ++dependencies = [ ++ "libc", ++ "windows-sys 0.52.0", ++] ++ + [[package]] + name = "static_assertions" + version = "1.1.0" +@@ -967,9 +1331,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.15" ++version = "2.0.60" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" ++checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" + dependencies = [ + "proc-macro2", + "quote", +@@ -978,9 +1342,9 @@ dependencies = [ + + [[package]] + name = "syslog" +-version = "6.0.1" ++version = "6.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "978044cc68150ad5e40083c9f6a725e6fd02d7ba1bcf691ec2ff0d66c0b41acc" ++checksum = "dfc7e95b5b795122fafe6519e27629b5ab4232c73ebb2428f568e82b1a457ad3" + dependencies = [ + "error-chain", + "hostname", +@@ -991,9 +1355,9 @@ dependencies = [ + + [[package]] + name = "system-deps" +-version = "6.0.4" ++version = "6.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f" ++checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" + dependencies = [ + "cfg-expr", + "heck", +@@ -1003,53 +1367,41 @@ dependencies = [ + ] + + [[package]] +-name = "temp-dir" +-version = "0.1.11" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +- +-[[package]] +-name = "tempfile" +-version = "3.5.0" ++name = "target-lexicon" ++version = "0.12.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +-dependencies = [ +- "cfg-if", +- "fastrand", +- "redox_syscall 0.3.5", +- "rustix", +- "windows-sys 0.45.0", +-] ++checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + + [[package]] +-name = "thiserror" +-version = "1.0.40" ++name = "temp-dir" ++version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +-dependencies = [ +- "thiserror-impl", +-] ++checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" + + [[package]] +-name = "thiserror-impl" +-version = "1.0.40" ++name = "tempfile" ++version = "3.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" ++checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" + dependencies = [ +- "proc-macro2", +- "quote", +- "syn 2.0.15", ++ "cfg-if", ++ "fastrand 2.1.0", ++ "rustix 0.38.34", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "time" +-version = "0.3.20" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -1057,89 +1409,101 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.0" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.8" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + + [[package]] + name = "tokio" +-version = "1.27.0" ++version = "1.37.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" ++checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" + dependencies = [ +- "autocfg", ++ "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", +- "socket2", ++ "signal-hook-registry", ++ "socket2 0.5.7", + "tokio-macros", + "tracing", +- "windows-sys 0.45.0", ++ "windows-sys 0.48.0", + ] + + [[package]] + name = "tokio-macros" +-version = "2.0.0" ++version = "2.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" ++checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.15", ++ "syn 2.0.60", + ] + + [[package]] + name = "toml" +-version = "0.7.3" ++version = "0.8.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" ++checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" + dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", +- "toml_edit", ++ "toml_edit 0.22.12", + ] + + [[package]] + name = "toml_datetime" +-version = "0.6.1" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" ++checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + dependencies = [ + "serde", + ] + + [[package]] + name = "toml_edit" +-version = "0.19.8" ++version = "0.19.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" ++dependencies = [ ++ "indexmap", ++ "toml_datetime", ++ "winnow 0.5.40", ++] ++ ++[[package]] ++name = "toml_edit" ++version = "0.22.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" ++checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" + dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", +- "winnow", ++ "winnow 0.6.7", + ] + + [[package]] + name = "tracing" +-version = "0.1.37" ++version = "0.1.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" ++checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" + dependencies = [ +- "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +@@ -1147,51 +1511,52 @@ dependencies = [ + + [[package]] + name = "tracing-attributes" +-version = "0.1.23" ++version = "0.1.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" ++checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.109", ++ "syn 2.0.60", + ] + + [[package]] + name = "tracing-core" +-version = "0.1.30" ++version = "0.1.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" ++checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" + dependencies = [ + "once_cell", + ] + + [[package]] + name = "typenum" +-version = "1.16.0" ++version = "1.17.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" ++checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + + [[package]] + name = "uds_windows" +-version = "1.0.2" ++version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" ++checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" + dependencies = [ ++ "memoffset 0.9.1", + "tempfile", + "winapi", + ] + + [[package]] + name = "unicode-ident" +-version = "1.0.8" ++version = "1.0.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" ++checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + + [[package]] + name = "version-compare" +-version = "0.1.1" ++version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" ++checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + + [[package]] + name = "version_check" +@@ -1199,6 +1564,12 @@ version = "0.9.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + ++[[package]] ++name = "waker-fn" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" ++ + [[package]] + name = "wasi" + version = "0.11.0+wasi-snapshot-preview1" +@@ -1229,164 +1600,189 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] + name = "windows-sys" +-version = "0.45.0" ++version = "0.48.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" ++checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" + dependencies = [ +- "windows-targets 0.42.2", ++ "windows-targets 0.48.5", + ] + + [[package]] + name = "windows-sys" +-version = "0.48.0" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" ++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" + dependencies = [ +- "windows-targets 0.48.0", ++ "windows-targets 0.52.5", + ] + + [[package]] + name = "windows-targets" +-version = "0.42.2" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" ++checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" + dependencies = [ +- "windows_aarch64_gnullvm 0.42.2", +- "windows_aarch64_msvc 0.42.2", +- "windows_i686_gnu 0.42.2", +- "windows_i686_msvc 0.42.2", +- "windows_x86_64_gnu 0.42.2", +- "windows_x86_64_gnullvm 0.42.2", +- "windows_x86_64_msvc 0.42.2", ++ "windows_aarch64_gnullvm 0.48.5", ++ "windows_aarch64_msvc 0.48.5", ++ "windows_i686_gnu 0.48.5", ++ "windows_i686_msvc 0.48.5", ++ "windows_x86_64_gnu 0.48.5", ++ "windows_x86_64_gnullvm 0.48.5", ++ "windows_x86_64_msvc 0.48.5", + ] + + [[package]] + name = "windows-targets" +-version = "0.48.0" ++version = "0.52.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" ++checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" + dependencies = [ +- "windows_aarch64_gnullvm 0.48.0", +- "windows_aarch64_msvc 0.48.0", +- "windows_i686_gnu 0.48.0", +- "windows_i686_msvc 0.48.0", +- "windows_x86_64_gnu 0.48.0", +- "windows_x86_64_gnullvm 0.48.0", +- "windows_x86_64_msvc 0.48.0", ++ "windows_aarch64_gnullvm 0.52.5", ++ "windows_aarch64_msvc 0.52.5", ++ "windows_i686_gnu 0.52.5", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc 0.52.5", ++ "windows_x86_64_gnu 0.52.5", ++ "windows_x86_64_gnullvm 0.52.5", ++ "windows_x86_64_msvc 0.52.5", + ] + + [[package]] + name = "windows_aarch64_gnullvm" +-version = "0.42.2" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" ++checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + + [[package]] + name = "windows_aarch64_gnullvm" +-version = "0.48.0" ++version = "0.52.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" ++checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + + [[package]] + name = "windows_aarch64_msvc" +-version = "0.42.2" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" ++checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + + [[package]] + name = "windows_aarch64_msvc" +-version = "0.48.0" ++version = "0.52.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" ++checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + + [[package]] + name = "windows_i686_gnu" +-version = "0.42.2" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" ++checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + + [[package]] + name = "windows_i686_gnu" +-version = "0.48.0" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.52.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" ++checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + + [[package]] + name = "windows_i686_msvc" +-version = "0.42.2" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" ++checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + + [[package]] + name = "windows_i686_msvc" +-version = "0.48.0" ++version = "0.52.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" ++checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + + [[package]] + name = "windows_x86_64_gnu" +-version = "0.42.2" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" ++checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + + [[package]] + name = "windows_x86_64_gnu" +-version = "0.48.0" ++version = "0.52.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" ++checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + + [[package]] + name = "windows_x86_64_gnullvm" +-version = "0.42.2" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" ++checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + + [[package]] + name = "windows_x86_64_gnullvm" +-version = "0.48.0" ++version = "0.52.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" ++checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + + [[package]] + name = "windows_x86_64_msvc" +-version = "0.42.2" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" ++checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + + [[package]] + name = "windows_x86_64_msvc" +-version = "0.48.0" ++version = "0.52.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" ++checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" ++ ++[[package]] ++name = "winnow" ++version = "0.5.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" ++dependencies = [ ++ "memchr", ++] + + [[package]] + name = "winnow" +-version = "0.4.1" ++version = "0.6.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" ++checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" + dependencies = [ + "memchr", + ] + ++[[package]] ++name = "xdg-home" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ + [[package]] + name = "zbus" +-version = "3.11.1" ++version = "3.15.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3dc29e76f558b2cb94190e8605ecfe77dd40f5df8c072951714b4b71a97f5848" ++checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" + dependencies = [ + "async-broadcast", ++ "async-process", + "async-recursion", + "async-trait", + "byteorder", + "derivative", +- "dirs", + "enumflags2", +- "event-listener", ++ "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", +- "lazy_static", + "nix", + "once_cell", + "ordered-stream", +@@ -1399,6 +1795,7 @@ dependencies = [ + "tracing", + "uds_windows", + "winapi", ++ "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +@@ -1406,9 +1803,9 @@ dependencies = [ + + [[package]] + name = "zbus_macros" +-version = "3.11.1" ++version = "3.15.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62a80fd82c011cd08459eaaf1fd83d3090c1b61e6d5284360074a7475af3a85d" ++checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" + dependencies = [ + "proc-macro-crate", + "proc-macro2", +@@ -1420,9 +1817,9 @@ dependencies = [ + + [[package]] + name = "zbus_names" +-version = "2.5.0" ++version = "2.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3" ++checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" + dependencies = [ + "serde", + "static_assertions", +@@ -1431,9 +1828,9 @@ dependencies = [ + + [[package]] + name = "zbus_polkit" +-version = "3.0.0" ++version = "3.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c2641860769ea0efb55ce101362cce105f8878c62790eb84e91962e354e41589" ++checksum = "07eb69d4b17d69f78632d4f9b03500f057e80764df8e17ed327f74ac67447813" + dependencies = [ + "enumflags2", + "serde", +@@ -1445,9 +1842,9 @@ dependencies = [ + + [[package]] + name = "zvariant" +-version = "3.12.0" ++version = "3.15.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8" ++checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" + dependencies = [ + "byteorder", + "enumflags2", +@@ -1459,9 +1856,9 @@ dependencies = [ + + [[package]] + name = "zvariant_derive" +-version = "3.12.0" ++version = "3.15.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a" ++checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" + dependencies = [ + "proc-macro-crate", + "proc-macro2", +@@ -1472,9 +1869,9 @@ dependencies = [ + + [[package]] + name = "zvariant_utils" +-version = "1.0.0" ++version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" ++checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" + dependencies = [ + "proc-macro2", + "quote", +-- +2.45.0 + diff --git a/community/apk-polkit-rs/0005-chore-apk-tools-sys-update-bindgen.patch b/community/apk-polkit-rs/0005-chore-apk-tools-sys-update-bindgen.patch new file mode 100644 index 00000000000..330734b3530 --- /dev/null +++ b/community/apk-polkit-rs/0005-chore-apk-tools-sys-update-bindgen.patch @@ -0,0 +1,125 @@ +From c86b1c603d023e39707a7bbaa8fee101ee1903e6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com> +Date: Tue, 30 Apr 2024 01:10:14 +0200 +Subject: [PATCH 5/5] chore(apk-tools-sys): update bindgen + +--- + Cargo.lock | 40 +++++++++++++++++++--------------------- + apk-tools-sys/Cargo.toml | 2 +- + apk-tools-sys/build.rs | 2 +- + 3 files changed, 21 insertions(+), 23 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index c4ac276..f02cce8 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -246,17 +246,16 @@ dependencies = [ + + [[package]] + name = "bindgen" +-version = "0.65.1" ++version = "0.69.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" ++checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.5.0", + "cexpr", + "clang-sys", ++ "itertools", + "lazy_static", + "lazycell", +- "peeking_take_while", +- "prettyplease", + "proc-macro2", + "quote", + "regex", +@@ -423,6 +422,12 @@ dependencies = [ + "crypto-common", + ] + ++[[package]] ++name = "either" ++version = "1.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" ++ + [[package]] + name = "enumflags2" + version = "0.7.9" +@@ -734,6 +739,15 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "itertools" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" ++dependencies = [ ++ "either", ++] ++ + [[package]] + name = "itoa" + version = "1.0.11" +@@ -988,12 +1002,6 @@ version = "1.0.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +-[[package]] +-name = "peeking_take_while" +-version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +- + [[package]] + name = "pin-project-lite" + version = "0.2.14" +@@ -1066,16 +1074,6 @@ version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +-[[package]] +-name = "prettyplease" +-version = "0.2.19" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" +-dependencies = [ +- "proc-macro2", +- "syn 2.0.60", +-] +- + [[package]] + name = "proc-macro-crate" + version = "1.3.1" +diff --git a/apk-tools-sys/Cargo.toml b/apk-tools-sys/Cargo.toml +index 086a658..fffe024 100644 +--- a/apk-tools-sys/Cargo.toml ++++ b/apk-tools-sys/Cargo.toml +@@ -17,7 +17,7 @@ modular-bitfield = "0.11" + paste = "1.0" + + [build-dependencies] +-bindgen = { version ="0.65", default-features = false } ++bindgen = { version ="0.69", default-features = false } + system-deps = "6" + + [package.metadata.system-deps] +diff --git a/apk-tools-sys/build.rs b/apk-tools-sys/build.rs +index 8a6822f..022c222 100644 +--- a/apk-tools-sys/build.rs ++++ b/apk-tools-sys/build.rs +@@ -15,7 +15,7 @@ fn generate_bindings(include_paths: &Vec<&PathBuf>) { + .formatter(bindgen::Formatter::None) + .impl_debug(true) + .blocklist_type("max_align_t") +- .parse_callbacks(Box::new(bindgen::CargoCallbacks)); ++ .parse_callbacks(Box::new(bindgen::CargoCallbacks::new())); + + for path in include_paths { + builder = builder.clang_arg(format!("-I{}", path.to_str().unwrap())); +-- +2.45.0 + diff --git a/community/apk-polkit-rs/APKBUILD b/community/apk-polkit-rs/APKBUILD index bc1cf868a00..1bdb7fc352a 100644 --- a/community/apk-polkit-rs/APKBUILD +++ b/community/apk-polkit-rs/APKBUILD @@ -2,8 +2,11 @@ # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=apk-polkit-rs pkgver=2.1.1 -_gitlabsha=d52c3da65fe202a9e97c3d228af952c6 -pkgrel=0 +#_gitlabsha=d52c3da65fe202a9e97c3d228af952c6 +_commit=6bc6b97206ae681ab4b675c7d782ef7985b7a7f4 +# Revert once we can use releases again! +options="net" +pkgrel=1 pkgdesc="apk-polkit-rs exposes a DBus API for APK, the Alpine Package Keeper" url="https://gitlab.alpinelinux.org/Cogitri/apk-polkit-rs" arch="x86_64 armv7 armhf aarch64 x86 ppc64le riscv64" @@ -13,7 +16,14 @@ makedepends="meson cargo polkit-dev glib-dev clang-dev apk-tools-dev" checkdepends="appstream bash dbus py3-dbusmock" subpackages="$pkgname-dev $pkgname-dbg $pkgname-lang $pkgname-openrc" install="$pkgname.post-install $pkgname.post-upgrade" -source="https://gitlab.alpinelinux.org/Cogitri/apk-polkit-rs/uploads/$_gitlabsha/apk-polkit-rs-$pkgver.tar.xz" +source="$pkgname-$_commit.tar.gz::https://gitlab.alpinelinux.org/Cogitri/apk-polkit-rs/-/archive/$_commit.tar.gz + apk-tools-2-14-compat.patch + 0001-fix-apk-tools-sys-fix-new-apk_package-structure.patch + 0003-feat-apk-tools-sys-remove-custom-binding-for-apk_pac.patch + 0004-chore-Cargo-update-dependencies.patch + 0005-chore-apk-tools-sys-update-bindgen.patch +" +builddir="$srcdir/$pkgname-$_commit" prepare() { default_prepare @@ -37,5 +47,10 @@ package() { } sha512sums=" -3fee5a23041708eb6008fb0cf6cba387fe32fb57a1fe1f4becb9ad2f234f4c461dad422d968503062244b3382056337d79218c99fdb30ce065d9ae9b300ec4a6 apk-polkit-rs-2.1.1.tar.xz +75a27ba12b1ab804eca33074a1361f7c5b74e87d04b441f8378d1c2c6b830524118d55c859bbf64b18494c9fd5df000bfeda2e780f83431289511f57ac35d0b0 apk-polkit-rs-6bc6b97206ae681ab4b675c7d782ef7985b7a7f4.tar.gz +990b2dab6db4c44bb4f69382167420cb437395dde246de5a7d16e8e6f372764c745a15865256d9b49c2c436db449923079bf6b09f4c0bb76a5feb20002258bc4 apk-tools-2-14-compat.patch +fdb5b8a525955c770a98af524e3af7514614d44ab36c3ae0254d52014e7f94ec3878ccea18164e8a9ba7bdabac3e117006e70cb02114de3d20bbea4549d7c3b3 0001-fix-apk-tools-sys-fix-new-apk_package-structure.patch +b47eb5823326e903b0cc45507f03d12519389f169cb94d2afab663007773f82375f413faf5cc54df21aa0063e25d64e329bb77f1a3d8c9cd545c970a5b4b3347 0003-feat-apk-tools-sys-remove-custom-binding-for-apk_pac.patch +c7a13a0c13654b47a37af342f139e22367492dec7ba7fc934b75a88c7843e49a428d7753699b3af4d2d15515e29b5754683f482d7781624af2c3977178b27cc1 0004-chore-Cargo-update-dependencies.patch +d9c80226dd11c4e856d89006cf2225f5f7c71e0521caab2baca2e8a6ffc28f8ad991810eb5ba643732ca23691017a3a438c4517eac561471976c37ea9d722112 0005-chore-apk-tools-sys-update-bindgen.patch " diff --git a/community/apk-polkit-rs/apk-tools-2-14-compat.patch b/community/apk-polkit-rs/apk-tools-2-14-compat.patch new file mode 100644 index 00000000000..2e887dbb18f --- /dev/null +++ b/community/apk-polkit-rs/apk-tools-2-14-compat.patch @@ -0,0 +1,103 @@ +commit 3414163 +Author: Pablo Correa Gómez <ablocorrea@hotmail.com> +Date: Mon Apr 22 21:45:04 2024 +0200 + + fix(apk-tools,apk-polkit-rs): APK_SIGN_NONE has been removed + + And seems to be no way to reproduce the previous behavior, so remove + it from everything but from new to avoid breaking our API + + Ref https://gitlab.alpinelinux.org/alpine/apk-tools/-/commit/70dc66a6f2bd4a40cbd442daedbeafb4507f28c3 + +diff --git a/apk-polkit-rs/src/dbus_server.rs b/apk-polkit-rs/src/dbus_server.rs +index e13dcef..57bda79 100644 +--- a/apk-polkit-rs/src/dbus_server.rs ++++ b/apk-polkit-rs/src/dbus_server.rs +@@ -18,7 +18,6 @@ use zbus::{self, dbus_interface, Connection, MessageHeader}; + + #[derive(Default)] + pub struct DBusServer { +- allow_untrusted_repos: bool, + additional_repo_uri: Option<String>, + root: Option<String>, + } +@@ -30,12 +29,11 @@ pub struct ApkRepositoryDBus(ApkRepository); + impl DBusServer { + #[cfg(test)] + pub fn new( +- allow_untrusted_repos: bool, ++ _allow_untrusted_repos: bool, + additional_repo_uri: Option<String>, + root: Option<String>, + ) -> Self { + Self { +- allow_untrusted_repos, + additional_repo_uri, + root, + } +@@ -204,7 +202,7 @@ impl DBusServer { + ) -> error::Result<()> { + DBusServer::check_polkit_auth("UpdateRepositories", &header, connection).await?; + let mut db = self.create_database(false)?; +- db.update_repositories(self.allow_untrusted_repos)?; ++ db.update_repositories()?; + Command::new("alpine-appstream-downloader").output()?; + Ok(()) + } +diff --git a/apk-tools/src/apk_database.rs b/apk-tools/src/apk_database.rs +index c7877f4..ee50325 100644 +--- a/apk-tools/src/apk_database.rs ++++ b/apk-tools/src/apk_database.rs +@@ -577,10 +577,7 @@ impl ApkDatabase { + * Updates all available repositories. Returns `false` if updating one of the repositories + * went wrong. + */ +- pub fn update_repositories( +- &mut self, +- allow_untrusted_repositories: bool, +- ) -> Result<(), Errors> { ++ pub fn update_repositories(&mut self) -> Result<(), Errors> { + let mut err_vec = Vec::new(); + info!("Updating repositories"); + +@@ -588,7 +585,7 @@ impl ApkDatabase { + if i == APK_REPOSITORY_CACHED { + continue; + } +- if let Err(e) = self.update_repository(i, allow_untrusted_repositories) { ++ if let Err(e) = self.update_repository(i) { + err_vec.push(e); + } + } +@@ -754,29 +751,19 @@ impl ApkDatabase { + } + } + +- fn update_repository( +- &mut self, +- repo_num: u32, +- allow_untrusted_repositories: bool, +- ) -> Result<(), Error> { ++ fn update_repository(&mut self, repo_num: u32) -> Result<(), Error> { + trace!( + "Updating repository {}", + unsafe { CStr::from_ptr(self.db.repos[usize::try_from(repo_num).unwrap()].url) } + .to_str() + .unwrap(), + ); +- let apk_verify = if allow_untrusted_repositories { +- warn!("Allowing untrusted repos!"); +- APK_SIGN_NONE +- } else { +- APK_SIGN_VERIFY +- }; + let download_res = unsafe { + apk_cache_download( + self.db.as_mut(), + &mut self.db.repos[usize::try_from(repo_num).unwrap()], + null_mut(), +- i32::try_from(apk_verify)?, ++ i32::try_from(APK_SIGN_VERIFY)?, + 0, + None, + null_mut(), diff --git a/community/apptainer/APKBUILD b/community/apptainer/APKBUILD index a3e1b874028..5db959aaf91 100644 --- a/community/apptainer/APKBUILD +++ b/community/apptainer/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Oleg Titov <oleg.titov@gmail.com> # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=apptainer -pkgver=1.3.0 -pkgrel=1 +pkgver=1.3.1 +pkgrel=0 pkgdesc="Application containers for Linux" url="https://apptainer.org/" arch="all" @@ -71,5 +71,5 @@ _suid() { } sha512sums=" -600725b39fc1fc2faaf7b2a3bc231f1997ff6925622ef6bbb42b883e51367ef41d56a52f995e1e5af7722935f8d55cfe0c7dfa478aa5e79c82cbf336338b97b7 apptainer-1.3.0.tar.gz +0b22d64819817d7b8e1bf96398b2ac00d2cbd8a68fe2fc994c6cf57af9c2026fe13d87161df3857b8e93076f509aa4e6b7261458c4de1540d31d87c5acc94687 apptainer-1.3.1.tar.gz " diff --git a/community/apt/APKBUILD b/community/apt/APKBUILD index 8bf2ea8cd86..55dffffb97c 100644 --- a/community/apt/APKBUILD +++ b/community/apt/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=apt -pkgver=2.9.1 +pkgver=2.9.2 pkgrel=0 pkgdesc="APT package management tool" url="https://salsa.debian.org/apt-team/apt" @@ -54,5 +54,5 @@ package() { } sha512sums=" -378e4db426857491bf9d57b8b5cf971a85e09fc1876f1fead62320c6d7466ffc96979fa80265515791ad966fb75400ab8a745450e77be5fb6fbd0c2192e69ac4 apt-2.9.1.tar.bz2 +3df939adddbeddf6766aa29b0f729bedda8de4ccad191aef8dd9a99dc411d7e22efce09a57c1b525a07f5d5492aba1d96d295e9012568a45a507c5e027c9158d apt-2.9.2.tar.bz2 " diff --git a/community/armadillo/APKBUILD b/community/armadillo/APKBUILD index 582001bc182..022cc1eb571 100644 --- a/community/armadillo/APKBUILD +++ b/community/armadillo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=armadillo -pkgver=12.8.1 +pkgver=12.8.2 pkgrel=0 pkgdesc="C++ library for linear algebra & scientific computing" url="https://arma.sourceforge.net/" @@ -39,5 +39,5 @@ package() { } sha512sums=" -312098a36c5b6a8718b19402b7e6d6bbfb1dfe8c6d6a9ca014bbee3ccb725703d09fd17055e574423ac82ade140261380101e9f63171570cb1913a22245c244c armadillo-12.8.1.tar.xz +33bfe6f1fae2ef18ec3286742264dedd67730e47b5187568cb2fbe951286a5a8534a4b577894cc44415887241a46afb25b3fcf2b249ef15f9b71045e98fd0132 armadillo-12.8.2.tar.xz " diff --git a/community/asio/APKBUILD b/community/asio/APKBUILD index c323ea4da92..392dbd9501f 100644 --- a/community/asio/APKBUILD +++ b/community/asio/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=asio pkgver=1.28.0 -pkgrel=0 +pkgrel=1 pkgdesc="Cross-platform C++ library for network programming" url="https://think-async.com/Asio/" arch="noarch" diff --git a/community/aspcud/APKBUILD b/community/aspcud/APKBUILD index 70fe0084cc9..fb0013ddd78 100644 --- a/community/aspcud/APKBUILD +++ b/community/aspcud/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=aspcud pkgver=1.9.6 -pkgrel=8 +pkgrel=9 pkgdesc="Package dependency solver" url="https://potassco.org/aspcud/" arch="all" diff --git a/community/astyle/APKBUILD b/community/astyle/APKBUILD index a706e62fd4b..8da1a823969 100644 --- a/community/astyle/APKBUILD +++ b/community/astyle/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=astyle -pkgver=3.4.13 +pkgver=3.4.14 pkgrel=0 pkgdesc="Automatic code formatter" url="https://sourceforge.net/projects/astyle/" @@ -26,6 +26,6 @@ package() { } sha512sums=" -8fe5113e8e859377a91cf3897210e109625c2b6bf76f95bbb3c13c322dbec1909bb9911867a77d61e984cb2d6639ec9a0984abc69cec58a33800a71076922d3e astyle-3.4.13.tar.bz2 -6bfaba1437af39cb9250f292fdf1409d83f2b9b73c4bb4abf5c06b0d993b2dec050e49ed904650042c2dacd92c4bfb0a32026900a47d5a28635985aa9116833e makefile-install.patch +1e43d54889c86783720a8839ee3e949a5c9f3268ec6d281974d9037f8299d40e3be729925c71dcbe415eca70549ee8ef647a0a300c91b86634cd8db8f7c9f2ec astyle-3.4.14.tar.bz2 +92c184e6a4061a02c520b0593b74a67f3e1805c877d5799c6cdc8f1abb70b0f05a78bbbe9c6e2157a01afeee3ac2febb63a0d777e89a01d1478e206c7afb22c0 makefile-install.patch " diff --git a/community/astyle/makefile-install.patch b/community/astyle/makefile-install.patch index d29199c092d..48bf26a7509 100644 --- a/community/astyle/makefile-install.patch +++ b/community/astyle/makefile-install.patch @@ -2,6 +2,15 @@ diff --git a/Makefile b/Makefile index e232a7d..e254ad3 100644 --- a/Makefile +++ b/Makefile +@@ -36,7 +36,7 @@ + bindir = bin + objdir = obj + ipath=$(prefix)/bin +-CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c++11 ++CBASEFLAGS = -Wall -Wextra -fno-rtti -fno-exceptions -std=c++17 + JAVAINCS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux + INSTALL=install -o $(USER) -g $(USER) + @@ -151,8 +151,8 @@ libastyle.so: $(OBJs) @ mkdir -p $(bindir) $(CXX) -shared $(LDFLAGSr) -Wl,-soname,libastyle.so.$(MAJORVER) \ diff --git a/community/atkmm2.36/APKBUILD b/community/atkmm2.36/APKBUILD index d4214875c12..5070fad87aa 100644 --- a/community/atkmm2.36/APKBUILD +++ b/community/atkmm2.36/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=atkmm2.36 pkgver=2.36.3 -pkgrel=0 +pkgrel=1 pkgdesc="C++ bindings for atk" #options="!check" # No testsuite url="https://www.gtkmm.org/en/" diff --git a/community/atril/APKBUILD b/community/atril/APKBUILD index 0987ba75b78..cb2d694211c 100644 --- a/community/atril/APKBUILD +++ b/community/atril/APKBUILD @@ -5,8 +5,8 @@ pkgver=1.27.0 pkgrel=5 pkgdesc="A document viewer for MATE" url="https://github.com/mate-desktop/atril" -# ppc64le, s390x and riscv64 blocked by texlive -arch="all !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by texlive +arch="all !ppc64le !s390x !riscv64 !loongarch64" license="GPL-2.0-or-later" depends="mate-icon-theme" # make check is broken: https://github.com/mate-desktop/atril/issues/167 diff --git a/community/attica/APKBUILD b/community/attica/APKBUILD index defa6782c45..1ce65188c6e 100644 --- a/community/attica/APKBUILD +++ b/community/attica/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=attica -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Freedesktop OCS binding for Qt" url="https://www.kde.org/" @@ -40,5 +40,5 @@ package() { } sha512sums=" -25cf795e81e96065c6f25b5dbb77fea93eeb14a3475bc5b61472618d0d8703c5d913742bf7f7058dfb9ade2af414437d7ac18bd90b96c55458c727a0c4087e13 attica-6.1.0.tar.xz +40376e6c969aa1536316982fc7c85dd6ba1f3d3d75917b2a34c02867042afa8bff66ccfdb49c08090399e171a4be8017be6d09887c9e5a715d36bd72ae4685c4 attica-6.2.0.tar.xz " diff --git a/community/aubio/APKBUILD b/community/aubio/APKBUILD index c5aa8899b5d..c2a658423e8 100644 --- a/community/aubio/APKBUILD +++ b/community/aubio/APKBUILD @@ -14,31 +14,40 @@ makedepends=" libsamplerate-dev libsndfile-dev python3 + waf " subpackages="$pkgname-static $pkgname-dev" source="https://aubio.org/pub/aubio-$pkgver.tar.bz2 unversioned-python.patch - python3.11.patch + waf-2.1.0-compat.patch $pkgname-ffmpeg5.patch::https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3.patch " +prepare() { + default_prepare + + rm -rf waf waflib + ln -s /usr/bin/waf waf +} + build() { python3 waf configure --prefix=/usr + python3 waf build } check() { # The waf file does not have a check target but the tests are run during the - # package() function + # build() function : } package() { - python3 waf install --destdir="$pkgdir" + python3 waf install --destdir="$pkgdir" --notests } sha512sums=" 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130 aubio-0.4.9.tar.bz2 08ef8497caec4a6025bfada1e7718469943f71e1847d2b340731483d6b396da7d367b1a180f87d70590109bfe2e7bd74141aebc458c607f5f96fd42e618e7ea7 unversioned-python.patch -5f754d24e98c595100dcedfd3d2f789bf513c37ffc29f7b683e478adb6c5136929fe43b615bca9856c60cc6f8e0a5c7081fd1103fd19c3645001314f7d2122aa python3.11.patch +10a19f724740de1bbae3c1dcb08f0046b9096673111c2f1a3f98ec32a6b64db20040a4048bd668307cba5cb946f6385158cb34f1279a4b30bd09b5cb6e8ec8f0 waf-2.1.0-compat.patch 8ce2a1fc35f73586d92e637d76354843c8cd1bdd5cda2b8e56db6b05ddcea4d2297500f9039f53d9482bff68fc1ee9e60c9459799a900e85f373745b3258b7ef aubio-ffmpeg5.patch " diff --git a/community/aubio/python3.11.patch b/community/aubio/python3.11.patch deleted file mode 100644 index b78ac2d27af..00000000000 --- a/community/aubio/python3.11.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py -index 8212586..8142817 100644 ---- a/waflib/ConfigSet.py -+++ b/waflib/ConfigSet.py -@@ -146,7 +146,7 @@ class ConfigSet(object): - Utils.writef(filename,''.join(buf)) - def load(self,filename): - tbl=self.table -- code=Utils.readf(filename,m='rU') -+ code=Utils.readf(filename,m='r') - for m in re_imp.finditer(code): - g=m.group - tbl[g(2)]=eval(g(3)) -diff --git a/waflib/Context.py b/waflib/Context.py -index ab6b154..cbe16c1 100644 ---- a/waflib/Context.py -+++ b/waflib/Context.py -@@ -106,7 +106,7 @@ class Context(ctx): - cache[node]=True - self.pre_recurse(node) - try: -- function_code=node.read('rU',encoding) -+ function_code=node.read('r',encoding) - exec(compile(function_code,node.abspath(),'exec'),self.exec_dict) - finally: - self.post_recurse(node) -@@ -346,7 +346,7 @@ def load_module(path,encoding=None): - pass - module=imp.new_module(WSCRIPT_FILE) - try: -- code=Utils.readf(path,m='rU',encoding=encoding) -+ code=Utils.readf(path,m='r',encoding=encoding) - except EnvironmentError: - raise Errors.WafError('Could not read the file %r'%path) - module_dir=os.path.dirname(path) diff --git a/community/aubio/waf-2.1.0-compat.patch b/community/aubio/waf-2.1.0-compat.patch new file mode 100644 index 00000000000..46587cdd6b2 --- /dev/null +++ b/community/aubio/waf-2.1.0-compat.patch @@ -0,0 +1,13 @@ +waf 2.1.0 switched from optparse to argparse + +--- a/wscript ++++ b/wscript +@@ -109,7 +109,7 @@ + help_str = 'build examples (true)', + help_disable_str = 'do not build examples') + +- ctx.add_option('--with-target-platform', type='string', ++ ctx.add_option('--with-target-platform', type=str, + help='set target platform for cross-compilation', + dest='target_platform') + diff --git a/community/audacity/APKBUILD b/community/audacity/APKBUILD index b1bb636c1f3..68c5a283226 100644 --- a/community/audacity/APKBUILD +++ b/community/audacity/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=audacity -pkgver=3.3.3 -pkgrel=1 +pkgver=3.5.1 +pkgrel=0 pkgdesc="Multitrack audio editor" url="https://www.audacityteam.org/" # s390x: fails to build @@ -25,23 +25,22 @@ makedepends=" lv2-dev mpg123-dev nasm + opusfile-dev portaudio-dev portmidi-dev + rapidjson-dev samurai soundtouch-dev soxr-dev sqlite-dev suil-dev - taglib-dev vamp-sdk-dev wavpack-dev wxwidgets-dev zlib-dev " subpackages="$pkgname-doc $pkgname-lang" -source="https://github.com/audacity/audacity/releases/download/Audacity-$pkgver/audacity-sources-$pkgver.tar.gz - gettext-0.22.patch - " +source="https://github.com/audacity/audacity/releases/download/Audacity-$pkgver/audacity-sources-$pkgver.tar.gz" # no tests options="!check" ldpath="/usr/lib/audacity" @@ -99,6 +98,5 @@ package() { } sha512sums=" -5d247cce0f978af9bc45aae6e9b4dd69243c153ce8a8de159fab0c5be11fa29306e7ef7bbe54b8a648fe27a0b47cddfb0bf4156be0cd7cac1ea36d3fe5ed0e8b audacity-sources-3.3.3.tar.gz -59d1aac482226fb64ccc7e337afe33838a664fda3a55ecd33ffc2fdb30d3ccce03af1fc0efe56017eac946d5a1780f855dd67f31bad4277db07cc4c7962c1628 gettext-0.22.patch +7f1025d6c99d909a891812faf7023313f1e8af2e2d51d8e097aafdcc4e9c8ad48bd09b07560e256fc1ee91f77c2c82a8d1163fa5e37661ef9a85d7a54dccd42c audacity-sources-3.5.1.tar.gz " diff --git a/community/audacity/gettext-0.22.patch b/community/audacity/gettext-0.22.patch deleted file mode 100644 index c5b5d8c8b6c..00000000000 --- a/community/audacity/gettext-0.22.patch +++ /dev/null @@ -1,271 +0,0 @@ -Patch-Source: https://github.com/audacity/audacity/commit/e181ee115e727b4754619b04aa6e8ad872113592.patch --- -From e181ee115e727b4754619b04aa6e8ad872113592 Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Fri, 30 Jun 2023 15:35:12 +0200 -Subject: [PATCH] Replace obsolescent `%hs` printf specifier - -* `%hs` is not defined by C: - https://wiki.sei.cmu.edu/confluence/display/c/FIO47-C.+Use+valid+format+strings -* Fixes translations for gettext 0.22 - -Bug: https://bugs.gentoo.org/909201 -Closes: #4847 ---- - locale/ar.po | 2 +- - locale/be.po | 6 +++--- - locale/bg.po | 2 +- - locale/ca.po | 2 +- - locale/ca_ES@valencia.po | 2 +- - locale/fa.po | 4 ++-- - locale/gl.po | 2 +- - locale/hr.po | 2 +- - locale/hy.po | 2 +- - locale/id.po | 2 +- - locale/km.po | 4 ++-- - locale/ro.po | 2 +- - locale/sr_RS@latin.po | 2 +- - locale/ta.po | 2 +- - locale/tg.po | 4 ++-- - 15 files changed, 20 insertions(+), 20 deletions(-) - -diff --git a/locale/ar.po b/locale/ar.po -index 2abe618f516f..40f60e068074 100644 ---- a/locale/ar.po -+++ b/locale/ar.po -@@ -2304,7 +2304,7 @@ msgstr "لم أتمكن من فتح ملف: \"%s\"" - #: libraries/lib-xml/XMLFileReader.cpp - #, fuzzy, c-format - msgid "Error: %s at line %lu" --msgstr "خطأ: %hs عند خط %lu" -+msgstr "خطأ: %s عند خط %lu" - - #: libraries/lib-xml/XMLFileReader.cpp - #, c-format -diff --git a/locale/be.po b/locale/be.po -index 017d1d67ded0..4ae28b8e410b 100644 ---- a/locale/be.po -+++ b/locale/be.po -@@ -2320,7 +2320,7 @@ msgstr "Не атрымалася адкрыць файл: \"%s\"" - #: libraries/lib-xml/XMLFileReader.cpp - #, fuzzy, c-format - msgid "Error: %s at line %lu" --msgstr "Памылка: %hs у радку %lu" -+msgstr "Памылка: %s у радку %lu" - - #: libraries/lib-xml/XMLFileReader.cpp - #, c-format -@@ -4469,7 +4469,7 @@ msgstr "Больш не паказваць гэта папярэджанне" - #: src/FileFormats.cpp - #, c-format - msgid "Error (file may not have been written): %s" --msgstr "Памылка (магчыма, файл не запісаны): %hs" -+msgstr "Памылка (магчыма, файл не запісаны): %s" - - #: src/FileFormats.cpp - #, fuzzy -@@ -20925,7 +20925,7 @@ msgstr "" - #: plug-ins/eq-xml-to-txt-converter.ny - #, fuzzy, lisp-format - msgid "Error.~%File cannot be written:~%\"~a.txt\"" --msgstr "Памылка (магчыма, файл не запісаны): %hs" -+msgstr "Памылка (магчыма, файл не запісаны): %s" - - #: plug-ins/equalabel.ny - msgid "Regular Interval Labels" -diff --git a/locale/bg.po b/locale/bg.po -index e3d22e24da5b..119d386c0043 100644 ---- a/locale/bg.po -+++ b/locale/bg.po -@@ -2328,7 +2328,7 @@ msgstr "Не бе възможно да се отвори файл: „%s“" - #: libraries/lib-xml/XMLFileReader.cpp - #, fuzzy, c-format - msgid "Error: %s at line %lu" --msgstr "Грешка: %hs на ред %lu" -+msgstr "Грешка: %s на ред %lu" - - #: libraries/lib-xml/XMLFileReader.cpp - #, c-format -diff --git a/locale/ca.po b/locale/ca.po -index aefd1e0e4523..36448c453735 100644 ---- a/locale/ca.po -+++ b/locale/ca.po -@@ -2299,7 +2299,7 @@ msgstr "No s'ha pogut obrir el fitxer: «%s»" - #: libraries/lib-xml/XMLFileReader.cpp - #, fuzzy, c-format - msgid "Error: %s at line %lu" --msgstr "Error: %hs a la línia %lu" -+msgstr "Error: %s a la línia %lu" - - #: libraries/lib-xml/XMLFileReader.cpp - #, c-format -diff --git a/locale/ca_ES@valencia.po b/locale/ca_ES@valencia.po -index a498281e7780..5545ae76eefc 100644 ---- a/locale/ca_ES@valencia.po -+++ b/locale/ca_ES@valencia.po -@@ -2319,7 +2319,7 @@ msgstr "No s'ha pogut obrir el fitxer: «%s»" - #: libraries/lib-xml/XMLFileReader.cpp - #, fuzzy, c-format - msgid "Error: %s at line %lu" --msgstr "Error: %hs en la línia %lu" -+msgstr "Error: %s en la línia %lu" - - #: libraries/lib-xml/XMLFileReader.cpp - #, c-format -diff --git a/locale/fa.po b/locale/fa.po -index 0374b06ce9a8..ba9831778428 100644 ---- a/locale/fa.po -+++ b/locale/fa.po -@@ -4413,7 +4413,7 @@ msgstr "" - #: src/FileFormats.cpp - #, c-format - msgid "Error (file may not have been written): %s" --msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs" -+msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s" - - #: src/FileFormats.cpp - msgid "&Copy uncompressed files into the project (safer)" -@@ -20567,7 +20567,7 @@ msgstr "" - #: plug-ins/eq-xml-to-txt-converter.ny - #, fuzzy, lisp-format - msgid "Error.~%File cannot be written:~%\"~a.txt\"" --msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs" -+msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s" - - #: plug-ins/equalabel.ny - msgid "Regular Interval Labels" -diff --git a/locale/gl.po b/locale/gl.po -index d2869ae5e41e..c30b70b93da0 100644 ---- a/locale/gl.po -+++ b/locale/gl.po -@@ -2325,7 +2325,7 @@ msgstr "Non foi posíbel abrir o ficheiro: «%s»" - #: libraries/lib-xml/XMLFileReader.cpp - #, fuzzy, c-format - msgid "Error: %s at line %lu" --msgstr "Erro: %hs na liña %lu" -+msgstr "Erro: %s na liña %lu" - - #: libraries/lib-xml/XMLFileReader.cpp - #, c-format -diff --git a/locale/hr.po b/locale/hr.po -index 21259b91c281..7fe86224c2c2 100644 ---- a/locale/hr.po -+++ b/locale/hr.po -@@ -2333,7 +2333,7 @@ msgstr "Pogrješka pri otvaranju datoteke: \"%s\"" - #: libraries/lib-xml/XMLFileReader.cpp - #, fuzzy, c-format - msgid "Error: %s at line %lu" --msgstr "Pogrješka: %hs u retku %lu" -+msgstr "Pogrješka: %s u retku %lu" - - #: libraries/lib-xml/XMLFileReader.cpp - #, c-format -diff --git a/locale/hy.po b/locale/hy.po -index 4486bb403422..5e7f695565d2 100644 ---- a/locale/hy.po -+++ b/locale/hy.po -@@ -2323,7 +2323,7 @@ msgstr "Չի ստացվում բացել ֆայլը՝ \"%s\"" - #: libraries/lib-xml/XMLFileReader.cpp - #, fuzzy, c-format - msgid "Error: %s at line %lu" --msgstr "Սխալ՝ %hs %lu գծում" -+msgstr "Սխալ՝ %s %lu գծում" - - #: libraries/lib-xml/XMLFileReader.cpp - #, c-format -diff --git a/locale/id.po b/locale/id.po -index bf8b8b2d5bce..d7ed1b5c497e 100644 ---- a/locale/id.po -+++ b/locale/id.po -@@ -2326,7 +2326,7 @@ msgstr "Tidak bisa membuka file:\"%s\"" - #: libraries/lib-xml/XMLFileReader.cpp - #, fuzzy, c-format - msgid "Error: %s at line %lu" --msgstr "Error: %hs pada garis %lu" -+msgstr "Error: %s pada garis %lu" - - #: libraries/lib-xml/XMLFileReader.cpp - #, c-format -diff --git a/locale/km.po b/locale/km.po -index 2617d8673980..9f1b5ef629ea 100644 ---- a/locale/km.po -+++ b/locale/km.po -@@ -4432,7 +4432,7 @@ msgstr "" - #: src/FileFormats.cpp - #, fuzzy, c-format - msgid "Error (file may not have been written): %s" --msgstr "កំហុស (ឯកសារអាចមិនទាន់ត្រូវបានសរសេរ) ៖ %hs" -+msgstr "កំហុស (ឯកសារអាចមិនទាន់ត្រូវបានសរសេរ) ៖ %s" - - #: src/FileFormats.cpp - msgid "&Copy uncompressed files into the project (safer)" -@@ -20656,7 +20656,7 @@ msgstr "" - #: plug-ins/eq-xml-to-txt-converter.ny - #, fuzzy, lisp-format - msgid "Error.~%File cannot be written:~%\"~a.txt\"" --msgstr "កំហុស (ឯកសារអាចមិនទាន់ត្រូវបានសរសេរ) ៖ %hs" -+msgstr "កំហុស (ឯកសារអាចមិនទាន់ត្រូវបានសរសេរ) ៖ %s" - - #: plug-ins/equalabel.ny - msgid "Regular Interval Labels" -diff --git a/locale/ro.po b/locale/ro.po -index 4a1ef8b497d9..4207cd9c8095 100644 ---- a/locale/ro.po -+++ b/locale/ro.po -@@ -2255,7 +2255,7 @@ msgstr "Nu s-a putut deschide fișierul: „%s”" - #: libraries/lib-xml/XMLFileReader.cpp - #, fuzzy, c-format - msgid "Error: %s at line %lu" --msgstr "Eroare: %hs la linia %lu" -+msgstr "Eroare: %s la linia %lu" - - #: libraries/lib-xml/XMLFileReader.cpp - #, c-format -diff --git a/locale/sr_RS@latin.po b/locale/sr_RS@latin.po -index 2c8adc0cec38..68d2f41fd09b 100644 ---- a/locale/sr_RS@latin.po -+++ b/locale/sr_RS@latin.po -@@ -2330,7 +2330,7 @@ msgstr "Ne mogu da otvorim datoteku: „%s“" - #: libraries/lib-xml/XMLFileReader.cpp - #, fuzzy, c-format - msgid "Error: %s at line %lu" --msgstr "Greška: %hs u redu %lu" -+msgstr "Greška: %s u redu %lu" - - #: libraries/lib-xml/XMLFileReader.cpp - #, c-format -diff --git a/locale/ta.po b/locale/ta.po -index 52fc75eb9dbe..edf03a5290d7 100644 ---- a/locale/ta.po -+++ b/locale/ta.po -@@ -2308,7 +2308,7 @@ msgstr "கோப்பை திறக்க முடியவில்லை: - #: libraries/lib-xml/XMLFileReader.cpp - #, fuzzy, c-format - msgid "Error: %s at line %lu" --msgstr "பிழை: %hs வரிசை %lu" -+msgstr "பிழை: %s வரிசை %lu" - - #: libraries/lib-xml/XMLFileReader.cpp - #, c-format -diff --git a/locale/tg.po b/locale/tg.po -index a88ff86bca57..ce5d5a8b2c2c 100644 ---- a/locale/tg.po -+++ b/locale/tg.po -@@ -4422,7 +4422,7 @@ msgstr "" - #: src/FileFormats.cpp - #, fuzzy, c-format - msgid "Error (file may not have been written): %s" --msgstr "Хато (файл сабт намешавад): %hs" -+msgstr "Хато (файл сабт намешавад): %s" - - #: src/FileFormats.cpp - msgid "&Copy uncompressed files into the project (safer)" -@@ -20628,7 +20628,7 @@ msgstr "" - #: plug-ins/eq-xml-to-txt-converter.ny - #, fuzzy, lisp-format - msgid "Error.~%File cannot be written:~%\"~a.txt\"" --msgstr "Хато (файл сабт намешавад): %hs" -+msgstr "Хато (файл сабт намешавад): %s" - - #: plug-ins/equalabel.ny - msgid "Regular Interval Labels" diff --git a/community/audiotube/APKBUILD b/community/audiotube/APKBUILD index e624547da80..6243ef92ae2 100644 --- a/community/audiotube/APKBUILD +++ b/community/audiotube/APKBUILD @@ -9,8 +9,8 @@ pkgrel=0 pkgdesc="Client for YouTube Music" url="https://invent.kde.org/plasma-mobile/audiotube" # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by purpose -> qt5-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by purpose -> qt5-qtwebengine +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" license="GPL-2.0-or-later" depends=" gst-plugins-bad diff --git a/community/avro/APKBUILD b/community/avro/APKBUILD index 6c13fcf7c2f..1e6d2ecdd23 100644 --- a/community/avro/APKBUILD +++ b/community/avro/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: nu <llnu@protonmail.ch> pkgname=avro pkgver=1.11.3 -pkgrel=0 +pkgrel=1 pkgdesc="Avro, a data serialization system" url="https://avro.apache.org/docs/current/api/c/index.html" # 32-bit: fails tests diff --git a/community/aws-c-io/APKBUILD b/community/aws-c-io/APKBUILD index 288ae9b407c..bfce1e26ff0 100644 --- a/community/aws-c-io/APKBUILD +++ b/community/aws-c-io/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: pkgname=aws-c-io -pkgver=0.14.3 +pkgver=0.14.7 pkgrel=0 pkgdesc="Module for the AWS SDK for C handling all IO and TLS work for application protocols" url="https://github.com/awslabs/aws-c-io" @@ -19,7 +19,9 @@ makedepends=" samurai " subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/awslabs/aws-c-io/archive/refs/tags/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/awslabs/aws-c-io/archive/refs/tags/v$pkgver.tar.gz + disable-tests.patch + " options="net" # required for tests to make connections case "$CARCH" in @@ -59,5 +61,6 @@ dev() { } sha512sums=" -bb8666853abbd583aea2f30099fe947562809ccab36ae11708c118b5bd6a7876b8d94ef45bb988b44c4dd1dc76e6dff70adb7a20b8b5d89d2d7ea2138b3ecea8 aws-c-io-0.14.3.tar.gz +a5aaafa936855dfc636e2cc18426488995023d8db9170e361bb6cbea6a169edcecd7b8e26c2a41b1511bd844b1494898089364b0fa1fffdc74e961a87543f223 aws-c-io-0.14.7.tar.gz +7993275653fa9d234de6e2e259a79e2f54a7a600bcd457a99adf0e18cd6e2f4ac27620bcae91efd2b6f83159635f2aa11cafece91a13d79c551141fc6e6f66c2 disable-tests.patch " diff --git a/community/aws-c-io/disable-tests.patch b/community/aws-c-io/disable-tests.patch new file mode 100644 index 00000000000..265d5d86d2f --- /dev/null +++ b/community/aws-c-io/disable-tests.patch @@ -0,0 +1,28 @@ +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index e2c3902..caa18e0 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -209,10 +209,10 @@ if(NOT BYO_CRYPTO) + # Misc non-badssl tls tests + add_net_test_case(test_concurrent_cert_import) + add_net_test_case(test_duplicate_cert_import) +- add_test_case(tls_channel_echo_and_backpressure_test) ++ # add_test_case(tls_channel_echo_and_backpressure_test) + add_net_test_case(tls_client_channel_negotiation_error_socket_closed) + add_net_test_case(tls_client_channel_negotiation_success) +- add_net_test_case(tls_server_multiple_connections) ++ # add_net_test_case(tls_server_multiple_connections) + add_net_test_case(tls_server_hangup_during_negotiation) + add_net_test_case(tls_client_channel_no_verify) + add_net_test_case(test_tls_negotiation_timeout) +@@ -222,8 +222,8 @@ if(NOT BYO_CRYPTO) + + add_test_case(alpn_error_creating_handler) + add_test_case(tls_destroy_null_context) +- add_test_case(tls_channel_statistics_test) +- add_test_case(tls_certificate_chain_test) ++ # add_test_case(tls_channel_statistics_test) ++ # add_test_case(tls_certificate_chain_test) + else() + add_test_case(byo_tls_handler_test) + endif() diff --git a/community/ayatana-indicator-printers/APKBUILD b/community/ayatana-indicator-printers/APKBUILD index 0bb65208621..afd2a83fc2d 100644 --- a/community/ayatana-indicator-printers/APKBUILD +++ b/community/ayatana-indicator-printers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luca Weiss <luca@z3ntu.xyz> # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=ayatana-indicator-printers -pkgver=23.10.0 +pkgver=23.10.1 pkgrel=0 pkgdesc="Ayatana Indicator Printers Applet" url="https://github.com/AyatanaIndicators/ayatana-indicator-printers" @@ -42,5 +42,5 @@ package() { } sha512sums=" -51a0240fbdd80b0a2f80d5eec3ecfa0482b41993bd4fde834f02bcedd288903170eee9e36e8a5e21b3e405bb8bd6c1e8b513440071d35cab16119f53883d7b07 ayatana-indicator-printers-23.10.0.tar.gz +c6c6a428c6033627aec418def9f0ba8f68a981291cede511f6602c6291d430903751ea1c6296001ada83069f651143ffabb721e7e9ec496de615feb48651bab5 ayatana-indicator-printers-23.10.1.tar.gz " diff --git a/community/baloo/APKBUILD b/community/baloo/APKBUILD index 6252b31f224..152759c1fdd 100644 --- a/community/baloo/APKBUILD +++ b/community/baloo/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=baloo -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="A framework for searching and managing metadata" # armhf blocked by qt6-qtdeclarative @@ -55,5 +55,5 @@ package() { } sha512sums=" -a755a52ace391235bb2231b51a192ba6e32b682670ce761b57c858b10231cee0965c3d9657a27198e4be86a07460660b064e16e2c952c40d880f1dcc32d7eb27 baloo-6.1.0.tar.xz +9e952bf88c7cc22c3dfe7e783f4352991f00603d0cb2356b7c7be517db77b1ebf09ba073694bc4b6b001b893434f6960444eb09f5382708dc6867d5fdf0b1f28 baloo-6.2.0.tar.xz " diff --git a/community/baobab/APKBUILD b/community/baobab/APKBUILD index 405f98027ee..3e63d35f210 100644 --- a/community/baobab/APKBUILD +++ b/community/baobab/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=baobab -pkgver=45.0 +pkgver=46.0 pkgrel=0 pkgdesc="A graphical application to analyse disk usage in any Gnome environment" url="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer" @@ -31,5 +31,5 @@ package() { } sha512sums=" -cc3cae0c3ef13dbf2e09c12cc4443b5b1420a06829a4944be98099b03e875c5e88e9611242e1494e1ec85687772519c03c817b6e7d535040e2276e5d6fb902df baobab-45.0.tar.xz +a09e8d47f82c4a193ea941dfc0064e33e019599d10172034a591a19047073235a602c1d5f2fda6303aa5e4524bd5a071faaf40ba447f74c5ab9bde5cb2cdeb49 baobab-46.0.tar.xz " diff --git a/community/bcachefs-tools/APKBUILD b/community/bcachefs-tools/APKBUILD index 7d898f91702..1b1e52193a6 100644 --- a/community/bcachefs-tools/APKBUILD +++ b/community/bcachefs-tools/APKBUILD @@ -25,7 +25,7 @@ makedepends=" zlib " subpackages="$pkgname-doc" -source="https://evilpiepirate.org/git/bcachefs-tools.git/snapshot/bcachefs-tools-1.3.3.tar.zst" +source="$pkgname-$pkgver-2.tar.zst::https://evilpiepirate.org/bcachefs-tools/bcachefs-tools-$pkgver.tar.zst" build() { make PREFIX=/usr @@ -37,5 +37,5 @@ package() { } sha512sums=" -400d66342d53dac61faf8772ecb11339a33ad451698813720b2f9992901e2f19a6adb339ad4de6a2a012d64ae91d6554672186619082f7039b7fc9f837ad6fd0 bcachefs-tools-1.3.3.tar.zst +5048646d46ccc59b2ac3b4d8962f2d4c3a3ca710432971da8a8ea1530685378da84f6ac13c07092e07534c9520f76b42cf4ad885e3c63c55e457ae9f8a684d57 bcachefs-tools-1.3.3-2.tar.zst " diff --git a/community/bcc/APKBUILD b/community/bcc/APKBUILD index 45486ba6d14..74f07b604cc 100644 --- a/community/bcc/APKBUILD +++ b/community/bcc/APKBUILD @@ -37,7 +37,7 @@ subpackages=" source="$pkgname-$pkgver.tar.gz::https://github.com/iovisor/bcc/archive/v$pkgver.tar.gz" case "$CARCH" in - ppc64le | riscv64) ;; + ppc64le | riscv64 | loongarch64) ;; *) makedepends="$makedepends luajit-dev" subpackages="$subpackages $pkgname-lua:_lua" ;; diff --git a/community/bear/APKBUILD b/community/bear/APKBUILD index 61493098fe9..03889ba4875 100644 --- a/community/bear/APKBUILD +++ b/community/bear/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=bear pkgver=3.1.3 -pkgrel=3 +pkgrel=4 pkgdesc="Tool which generates a compilation database for clang tooling" url="https://github.com/rizsotto/Bear" # s390x: segfaults in check diff --git a/community/bfs/APKBUILD b/community/bfs/APKBUILD index 620f84a7564..dd82a3c9e5c 100644 --- a/community/bfs/APKBUILD +++ b/community/bfs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: dai9ah <dai9ah@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=bfs -pkgver=3.1.3 +pkgver=3.2 pkgrel=0 pkgdesc="Breadth-first variant of the UNIX find command" url="https://github.com/tavianator/bfs" @@ -24,6 +24,12 @@ subpackages="$pkgname-doc source="bfs-$pkgver.tar.gz::https://github.com/tavianator/bfs/archive/$pkgver.tar.gz" build() { + ./configure \ + --enable-release \ + --enable-libacl \ + --enable-libcap \ + --enable-liburing \ + --enable-oniguruma make } @@ -36,5 +42,5 @@ package() { } sha512sums=" -4511c809666241f1b14ef3a01b80f0dc369510b67f45c1ce3e2d4445bcec9a4b86fb01333067b8dd713e992e57be7b99328b47a21b27864e6575981287de8e36 bfs-3.1.3.tar.gz +2881a37b65d8015853a658a4f759a5213ea433a726ee9952b82bd2d6c682f92e7d014eaa7ec8f1d127b3c25b5d3b04e3b24ae61ec2549212a7a4f9335f91bf8b bfs-3.2.tar.gz " diff --git a/community/biber/APKBUILD b/community/biber/APKBUILD index 66a1f2ee2f1..9e90bfc2273 100644 --- a/community/biber/APKBUILD +++ b/community/biber/APKBUILD @@ -6,7 +6,7 @@ pkgver=2.20 pkgrel=0 pkgdesc="Backend processor for BibLaTeX" url="https://github.com/plk/biber" -arch="noarch !x86 !ppc64le !s390x !riscv64" # biblatex +arch="noarch !x86 !ppc64le !s390x !riscv64 !loongarch64" # biblatex license="GPL-2.0" depends="perl perl-module-build perl-config-autoconf perl-extutils-libbuilder perl-test-differences perl-file-which diff --git a/community/biblatex/APKBUILD b/community/biblatex/APKBUILD index 68fda534cf9..2d30b53a8ea 100644 --- a/community/biblatex/APKBUILD +++ b/community/biblatex/APKBUILD @@ -5,8 +5,8 @@ pkgver=3.20 pkgrel=0 pkgdesc="Sophisticated Bibliographies in LaTeX" url="https://www.ctan.org/pkg/biblatex" -# s390x and riscv64 blocked by texlive-luatex -arch="noarch !x86 !ppc64le !s390x !riscv64" +# s390x, riscv64 and loongarch64 blocked by texlive-luatex +arch="noarch !x86 !ppc64le !s390x !riscv64 !loongarch64" license="LPPL-1.3" depends="texlive-luatex" makedepends="bash perl" diff --git a/community/bitcoin/APKBUILD b/community/bitcoin/APKBUILD index 6ac1cd53548..b8e815be1de 100644 --- a/community/bitcoin/APKBUILD +++ b/community/bitcoin/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=bitcoin pkgver=26.1 -pkgrel=0 +pkgrel=1 pkgdesc="Decentralized P2P electronic cash system" url="https://www.bitcoincore.org/" # x86: segfault in check diff --git a/community/black/APKBUILD b/community/black/APKBUILD index 2503ca9614c..b6ceade4b1b 100644 --- a/community/black/APKBUILD +++ b/community/black/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=black -pkgver=24.3.0 -pkgrel=1 +pkgver=24.4.2 +pkgrel=0 pkgdesc="The uncompromising Python code formatter" url="https://github.com/psf/black" license="MIT" @@ -41,7 +41,7 @@ build() { } check() { - ulimit -n 2048 # prevent running out of file descriptors + ulimit -n 4096 # prevent running out of file descriptors ./venv/bin/python3 -m pytest } @@ -57,6 +57,6 @@ package() { } sha512sums=" -57e3b651009578f1d15b6e9ffb49d24be80885b2cf7ad48a68407862778ac2099d119e7ba6d58ddea4fc7fc21345435a7572a970baf882f763d9347868d5504b black-24.3.0.tar.gz +f3fb63fdbff947a217ad371939a6eaac1e818f58fb924516639f3c9469f0db6fbda8d4b207163d4a6db8a58a048fefe46fbfdb1ddf40f91348bd767208e60f35 black-24.4.2.tar.gz 3ccba63a17589e5f127ee325531022256665a26657ba59d1c505aac6cb89443f147af28d74f77e9b42dbe236b2f0fcdd744fa75b6cd1a8a37a767da6fe6d5694 remove-fancy-pypi-readme.patch " diff --git a/community/blender/APKBUILD b/community/blender/APKBUILD index dada4a1c3bb..3bf20a66e08 100644 --- a/community/blender/APKBUILD +++ b/community/blender/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leon Marz <main@lmarz.org> # Maintainer: Leon Marz <main@lmarz.org> pkgname=blender -pkgver=4.1.0 +pkgver=4.1.1 _pkgver=${pkgver%.[0-9]} pkgrel=2 _llvmver=17 @@ -151,7 +151,7 @@ python() { } sha512sums=" -abec46710e42116dc407a6c60fb59c80dd2494a2fe96e80413f878e2f398937675c6385fe0177ede51c57cf9645918e48ebcef8cb4b0190dba9ea60391e58790 blender-4.1.0.tar.xz +13ad0cdd09879b5c28554faca5a54172f43dc3dcb749d2d1723d3e89e741e6255179af3bd88309b735e058b9b350191e44f3158e882e55f1cedea70b8b21540e blender-4.1.1.tar.xz 8b0b6353d863a1854a77e10f0014a89cae91109cf52314b1bd223399cc1562e8000e5865313a21988becbde4b3fe99def9ad303ebdeb8468e6603c91598e25bd 0001-musl-fixes.patch 832103f6c1ed82a324a4324e4fb10bfb84d396cc7ec90907ecaa87e42331c93e36cb60b5be642bab9f0775f9da581529db123f5e76c2fb1c81dc73babe54a733 0002-fix-includes.patch " diff --git a/community/bluedevil/APKBUILD b/community/bluedevil/APKBUILD index 41252409d63..c0cd3fe984d 100644 --- a/community/bluedevil/APKBUILD +++ b/community/bluedevil/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=bluedevil -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Integrate the Bluetooth technology within KDE workspace and applications" # armhf blocked by qt6-qtdeclarative @@ -62,5 +62,5 @@ package() { } sha512sums=" -9b02d3148f74145c1e367e364b2aa2c99b97f293b91dcc9adf21f6d95c480a884fc3febfedf4feb4643916df105f0c1fc4d93a911440ead9272b5d778f7d812d bluedevil-6.0.3.tar.xz +7f87519d561038d2b6fc06588b25ae3df50f419a0c44bec94525a44a2b9387d12495c88af9c6e780ad607065e927e7cdb1e5d5757a20307ff6e237b87fd82b14 bluedevil-6.0.4.tar.xz " diff --git a/community/blueman/APKBUILD b/community/blueman/APKBUILD index 1ef4638e821..bfacefefbf1 100644 --- a/community/blueman/APKBUILD +++ b/community/blueman/APKBUILD @@ -1,14 +1,16 @@ # Contributor: knuxify <knuxify@gmail.com> # Maintainer: knuxify <knuxify@gmail.com> pkgname=blueman -pkgver=2.3.5 -pkgrel=3 +pkgver=2.4.1 +pkgrel=0 pkgdesc="GTK+ Bluetooth Manager" url="https://github.com/blueman-project/blueman" arch="all" license="GPL-3.0-or-later" depends="bluez dbus gtk+3.0 python3 py3-cairo py3-gobject3" makedepends=" + autoconf + automake bluez-dev cython glib-dev @@ -17,11 +19,19 @@ makedepends=" python3-dev py3-gobject3-dev " -checkdepends="networkmanager libpulse-mainloop-glib" +checkdepends="networkmanager libpulse-mainloop-glib py3-dbusmock" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-pyc" -source="https://github.com/blueman-project/blueman/releases/download/$pkgver/blueman-$pkgver.tar.xz +source="$pkgname-$pkgver.tar.gz::https://github.com/blueman-project/blueman/archive/refs/tags/$pkgver.tar.gz dont-rerun-plugin-tests.patch" +prepare() { + default_prepare + autoreconf -vfi + + # remove systemd-resolved test + rm "$builddir"/test/main/test_dns_server_provider.py +} + build() { ./configure \ --build=$CBUILD \ @@ -45,6 +55,6 @@ package() { } sha512sums=" -678261dc0a795ca79b43614f4fc6ad436b44690d0ce4dbf15f55dba4834a25a5c1956bf658d568a3318828863b3bb089689d0dc4fef8963ed2b27cf0f1144580 blueman-2.3.5.tar.xz +1fa197b3332e65a856057f41ace91d05e7d646145568cf9ef28c8e4d873c61510a0149649b0c2086dfe456639fd51da01361d382ba52867f15974dae8b59bd0d blueman-2.4.1.tar.gz a3ec5d05c0f32353c1eb933bf1acdcc1f8bede31c12132bd6b30adb46111ef88b7586f9f7c574a95b9dd4877f3977514389e2b565c1029835db920f30a01fb72 dont-rerun-plugin-tests.patch " diff --git a/community/bluez-qt/APKBUILD b/community/bluez-qt/APKBUILD index 67244b806a5..9da1c8aa09e 100644 --- a/community/bluez-qt/APKBUILD +++ b/community/bluez-qt/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=bluez-qt -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 arch="all !armhf" # armhf blocked by qt6-qtdeclarative pkgdesc="Qt wrapper for Bluez 5 DBus API" @@ -45,5 +45,5 @@ package() { } sha512sums=" -68bb245313c8394bbca5d5c0e38953f26e2afc094bc82b1c961f726cd00d9b22a3dedb9b980a9e25a128e9d227d84152a8bc8095ff763bff361aae270015b506 bluez-qt-6.1.0.tar.xz +3608ab996f0242c4706350cde84b0a68520d36da7a5d370408060e09f4c41a4a8335677b979c9805504c81b7c808d484a8102f71acf4f56d1a609703c9097d17 bluez-qt-6.2.0.tar.xz " diff --git a/community/bluez-qt5/APKBUILD b/community/bluez-qt5/APKBUILD index 93ac9e6bf2e..6bb75836d6a 100644 --- a/community/bluez-qt5/APKBUILD +++ b/community/bluez-qt5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=bluez-qt5 pkgver=5.115.0 pkgrel=0 diff --git a/community/bmake/APKBUILD b/community/bmake/APKBUILD index fd37fcd2895..91f74e10508 100644 --- a/community/bmake/APKBUILD +++ b/community/bmake/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=bmake -pkgver=20240314 +pkgver=20240508 pkgrel=0 pkgdesc="Portable version of the NetBSD make build tool" url="https://www.crufty.net/help/sjg/bmake.html" @@ -46,6 +46,6 @@ package() { } sha512sums=" -579264de51d7ad669064ccb29e886b103e1e76e863107dc5adc87487a7b1f4f602c23ffd63265cc3d5fd0dc40acc574b6eadedcfb9c9da81ffc32b3a9a29fe14 bmake-20240314.tar.gz +b2e65a8a58b1ca93f8e64403c3f408c9d0c47125597babf3090a5341e219aa9fd897313a2a21bd780351e92cb89dbf75aa34a10527b68f00f1c18cd3cf77a056 bmake-20240508.tar.gz 320a0175107ed683ef1772a6884be3e0c503ec4d46b0901ae8a9e8cec4c4a5236bec934d9f451142e56addd9e2fe2ea1bc4712b7304570141230e0e1997e7a65 separate-tests.patch " diff --git a/community/boca/APKBUILD b/community/boca/APKBUILD index 445e74bd7a3..64b8e1b3253 100644 --- a/community/boca/APKBUILD +++ b/community/boca/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=boca pkgver=1.0.7 -pkgrel=0 +pkgrel=1 arch="all" url="https://github.com/enzo1982/boca" pkgdesc="A component library used by the fre:ac audio converter" diff --git a/community/boost-build/APKBUILD b/community/boost-build/APKBUILD index a5999d40bba..25d17c8844e 100644 --- a/community/boost-build/APKBUILD +++ b/community/boost-build/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: pkgname=boost-build -pkgver=1.82.0 +pkgver=1.84.0 pkgrel=0 pkgdesc="Boost.Build makes it easy to build C++ projects, everywhere" url="https://boost.org/build" @@ -30,5 +30,5 @@ package() { } sha512sums=" -5f8d46f48e037737e3465e3562c9bdbcacb4a075305c073fe665a8e9c7381ecaa4f5b91a42a9c509cf1c2e0f2af10dbb19f9d443a06fd09edf7372c008d91204 boost-build-1.82.0.tar.gz +61540a3b2b7b6167ed8286daed4b4fde515ae9e0de81d17ef688d7972a0a6325b15afbe4e9a73ec883a81d5b86998d612cadbdc79abaf1b087a74e4e6b7cc2b5 boost-build-1.84.0.tar.gz " diff --git a/community/borgmatic/APKBUILD b/community/borgmatic/APKBUILD index d4220d691b3..099cc9ff827 100644 --- a/community/borgmatic/APKBUILD +++ b/community/borgmatic/APKBUILD @@ -1,14 +1,13 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=borgmatic -pkgver=1.8.9 -pkgrel=1 +pkgver=1.8.11 +pkgrel=0 pkgdesc="Simple, configuration-driven backup software for servers and workstations" url="https://torsion.org/borgmatic/" license="GPL-3.0-or-later" -# armhf: limited by borgbackup # s390x: tests fail -arch="noarch !armhf !s390x" +arch="noarch !s390x" depends=" borgbackup py3-colorama @@ -60,5 +59,5 @@ package() { } sha512sums=" -65109fb5ece95022cfce44c58bb38ffa63e64913f61ede13d611382b8039ecf37f07fcdb687b1d3ac7e83dba11ed0ccda4a50ff88c48c8100de50125d891a31c borgmatic-1.8.9.tar.gz +da4c7a31f8056bd254f6810941934aff541a4ff3f08b29cfc72b9d90e18d8a77fb6d195c161cfc3c7d27df3b1647fe33124372a6af6f43026a0d1c53f9b7ca54 borgmatic-1.8.11.tar.gz " diff --git a/community/breeze-grub/APKBUILD b/community/breeze-grub/APKBUILD index 6a3ba08a315..3cd7ba7043e 100644 --- a/community/breeze-grub/APKBUILD +++ b/community/breeze-grub/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=breeze-grub -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Breeze theme for GRUB" arch="noarch !s390x !armhf" # armhf blocked by extra-cmake-modules @@ -35,5 +35,5 @@ package() { cp -r breeze "$pkgdir"/usr/share/grub/themes } sha512sums=" -44476cf4ad43cd782d81ded9fe55802c0a2d0cc3b573796b4e51b00e3b587c4d2dd7618eaec1d38d18978e8953c2cde1c550df7f328ad8f4d8c52e8476a9a8fb breeze-grub-6.0.3.tar.xz +8030f8312b4d96a220575faa7b88c25b7840652d67fc38e9ea0b4e9e978c0bf66bf8175f8585d700e89897bb5822929016c34049f7f2b59bae9be6e7c12a414e breeze-grub-6.0.4.tar.xz " diff --git a/community/breeze-gtk/APKBUILD b/community/breeze-gtk/APKBUILD index 6174ddba752..9c7096cbaae 100644 --- a/community/breeze-gtk/APKBUILD +++ b/community/breeze-gtk/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=breeze-gtk -pkgver=6.0.3 +pkgver=6.0.4.1 pkgrel=0 pkgdesc="A GTK Theme Built to Match KDE's Breeze" # armhf blocked by extra-cmake-modules @@ -26,7 +26,7 @@ case "$pkgver" in *) _rel=stable;; esac _repo_url="https://invent.kde.org/plasma/breeze-gtk.git" -source="https://download.kde.org/stable/plasma/$pkgver/breeze-gtk-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/${pkgver%.*}/breeze-gtk-$pkgver.tar.xz" build() { cmake -B build -G Ninja \ @@ -44,5 +44,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -800d95d94561f8b4b48347145eb06b7291ca62a5bd4b7f1ccbc4c1f2ffad01980fe5bb20ce9ee290a569436e9c722037d36c8bd8e69f52e235823a0c966ee242 breeze-gtk-6.0.3.tar.xz +3a9fd0b9cded7e32a9acc463f00e5a7827f1754f7da44a525de4bfa6e906e2fe002aa22773dc0c9f4a7740409b3eb2a6773ac540fed152952dbef83e86c337f3 breeze-gtk-6.0.4.1.tar.xz " diff --git a/community/breeze-icons/APKBUILD b/community/breeze-icons/APKBUILD index a476322f5f9..91cc2ccd7bd 100644 --- a/community/breeze-icons/APKBUILD +++ b/community/breeze-icons/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=breeze-icons -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Breeze icon themes" arch="noarch !armhf" # armhf blocked by extra-cmake-modules @@ -50,5 +50,5 @@ package() { } sha512sums=" -9592b75d22aef6437d03f13fb242d012977b665d043b8066a5f7f49f1f4b282a921bda29b99b8b63156a3bd3a9f616b9bc1eba8423d547d595ff9156d5053d66 breeze-icons-6.1.0.tar.xz +83c9a2ee2c6229f74de3efef1659927411d198fea15c1a6f352d3a74ad53c286decf92414ef6058907b18acc298477338333ed5ee2f8bfd19a65b4b63f76a9d1 breeze-icons-6.2.0.tar.xz " diff --git a/community/breeze-plymouth/APKBUILD b/community/breeze-plymouth/APKBUILD index 946fe366a42..b1e76100b17 100644 --- a/community/breeze-plymouth/APKBUILD +++ b/community/breeze-plymouth/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=breeze-plymouth -pkgver=6.0.3 +pkgver=6.0.4.1 pkgrel=0 arch="all !armhf" # armhf blocked by extra-cmake-modules url="https://kde.org/" @@ -21,7 +21,7 @@ case "$pkgver" in *) _rel=stable;; esac _repo_url="https://invent.kde.org/plasma/breeze-plymouth.git" -source="https://download.kde.org/stable/plasma/$pkgver/breeze-plymouth-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/${pkgver%.*}/breeze-plymouth-$pkgver.tar.xz" # No tests options="!check" @@ -39,5 +39,5 @@ package() { } sha512sums=" -ce7e9dad23d0c0746d3cf769ce1456f57ba04771011ee62d1e02f05d853f9c6056fd628ae887756e5084b4a94a6fe9ed4a6a282c6075a59b5cca9fe128254ac1 breeze-plymouth-6.0.3.tar.xz +8adaee96f55544d904f16fb871bd1969e467cd892d2b15c84324a7538fa8064b3594ea858443907f27a75458c6832d48ec7ea059077c44de945f5a337b1ad110 breeze-plymouth-6.0.4.1.tar.xz " diff --git a/community/breeze/APKBUILD b/community/breeze/APKBUILD index 17606d7fc35..7228a1aa084 100644 --- a/community/breeze/APKBUILD +++ b/community/breeze/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=breeze -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Artwork, styles and assets for the Breeze visual style for the Plasma Desktop" # armhf blocked by qt6-qtdeclarative @@ -66,5 +66,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -357878afed110cf9e9de0e793e66b065ecc59357f481502d235d29c01008408ac2ae1470e9cb385f982d6f1e13c2cd031d9b46f4df56ebd887c880123d9f92ab breeze-6.0.3.tar.xz +47e7d94d4c7acbd350e1698361774534de2f0306716930fe38128fc80231f86614ed153471937eecd6cdab8df2f98f4e27747b2c2ff23d23ccb6b18aa2633b9a breeze-6.0.4.tar.xz " diff --git a/community/brillo/APKBUILD b/community/brillo/APKBUILD index 29308a04f7d..910eba54f1d 100644 --- a/community/brillo/APKBUILD +++ b/community/brillo/APKBUILD @@ -17,9 +17,9 @@ subpackages=" source="https://gitlab.com/cameronnemo/brillo/-/archive/v$pkgver/brillo-v$pkgver.tar.gz" builddir="$srcdir/brillo-v$pkgver" case "$CARCH" in - # armhf|riscv64: valgrind not available + # armhf|riscv64|loongarch64: valgrind not available # armv7|ppc64le: check fails - armhf|riscv64|armv7|ppc64le) + armhf|riscv64|armv7|ppc64le|loongarch64) options="$options !check" ;; esac diff --git a/community/buho/APKBUILD b/community/buho/APKBUILD index 08b4ecab90a..9a511bf9828 100644 --- a/community/buho/APKBUILD +++ b/community/buho/APKBUILD @@ -8,8 +8,8 @@ pkgver=3.0.2 pkgrel=0 pkgdesc="Note taking app based on MauiKit" # armhf blocked by qt5-qtdeclarative -# s390x, ppc64le and riscv64 blocked by qt5-qtwebview -arch="all !armhf !s390x !ppc64le !riscv64" +# s390x, ppc64le, riscv64 and loongarch64 blocked by qt5-qtwebview +arch="all !armhf !s390x !ppc64le !riscv64 !loongarch64" url="https://invent.kde.org/maui/buho" license="GPL-2.0-or-later" depends=" diff --git a/community/buildkit/APKBUILD b/community/buildkit/APKBUILD index 8c3804806df..13eac4916b1 100644 --- a/community/buildkit/APKBUILD +++ b/community/buildkit/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=buildkit -pkgver=0.13.1 -pkgrel=1 +pkgver=0.13.2 +pkgrel=0 pkgdesc="Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit" url="https://github.com/moby/buildkit" arch="all" @@ -59,7 +59,7 @@ buildctl() { } sha512sums=" -fb2adb6a2ae23bf8feee96f0b6a229318d21db195108b7ab292db531f417c13bd94cda521bda5ce14ebb50ca9aa860ea231617ab700897aa43aa299b6527acb2 buildkit-0.13.1.tar.gz +07e1da9ff81cbbb949bfbbb327932e8b36fb6255be26f090f86596b08e5fe3ce89017d087e6ff6632a9813c129e42edfa067a0eba8b782272af28c4cc2e92c87 buildkit-0.13.2.tar.gz 01007221e6aab7a9f9565b48d2a338b2a72508234c7874a4aeaf9fd9181a19ffebe6374560bbae0262b009643b1fb49fb51b0f8006540355ae0f42fbaad5dd59 buildkitd.initd 44efad35c5867266a84246cf49afd2c4d775a530409397c817c8026873c75686432388325cd7654d939e8bfeceeada9112f3dd814ae5d95d4470373c3aa6dc3e buildkitd.confd " diff --git a/community/cadaver/APKBUILD b/community/cadaver/APKBUILD index e08f16b77d4..15eea8fa8cd 100644 --- a/community/cadaver/APKBUILD +++ b/community/cadaver/APKBUILD @@ -8,12 +8,18 @@ options="!check" url="http://webdav.org/cadaver/" arch="all" license="GPL-2.0-or-later" -makedepends="libproxy-dev neon-dev readline-dev expat-dev" +makedepends="autoconf automake libproxy-dev neon-dev readline-dev expat-dev" subpackages="$pkgname-doc" source="https://notroj.github.io/cadaver/cadaver-$pkgver.tar.gz disable-nls.patch + newer-neon.patch " +prepare() { + default_prepare + autoreconf -fvi +} + build() { ./configure \ --build=$CBUILD \ @@ -33,4 +39,5 @@ package() { sha512sums=" 2c0131fd2f591350f6578385eedb353d81d87bae5582b2c8c96555cb51bf31fd15294898206bc7a8307b0e30e7adb1d47535e792cf28c5c1f5c2276bea0141a4 cadaver-0.24.tar.gz 58982830b63c9bf4c27455e2d0403489bfdda82e4d236841c877d49c7501865edb3438cdddfb77ef7e525c4a5edb34083d3af69824f0ba2dc7d5c3f7f69b50e5 disable-nls.patch +91e55d430e61069a2a9109cee576c235dce10865f338cb13cdbc53e6446719c030017ab80aa4b094165c81fced291cd4cede19e93429e83d80acdcf96e805144 newer-neon.patch " diff --git a/community/cadaver/newer-neon.patch b/community/cadaver/newer-neon.patch new file mode 100644 index 00000000000..f48c4817b0e --- /dev/null +++ b/community/cadaver/newer-neon.patch @@ -0,0 +1,24 @@ +Patch-Source: https://github.com/notroj/cadaver/commit/2433126db25ffd38dc11ef847614e479141cc229.patch +-- +From 2433126db25ffd38dc11ef847614e479141cc229 Mon Sep 17 00:00:00 2001 +From: Arnaud Rebillout <arnaudr@kali.org> +Date: Mon, 26 Feb 2024 10:12:22 +0700 +Subject: [PATCH] Add support for neon 33 in configure.ac + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3ca7151..a009f4a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -35,7 +35,7 @@ AS_HELP_STRING([--disable-netrc],[enable .netrc support]),, + + NEON_WITH_LIBS + +-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32]) ++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32 33]) + + dnl Don't enable zlib or ACL support in neon + NEON_WITHOUT_ZLIB diff --git a/community/calendarsupport/APKBUILD b/community/calendarsupport/APKBUILD index 016632e1b98..5e5af2abccc 100644 --- a/community/calendarsupport/APKBUILD +++ b/community/calendarsupport/APKBUILD @@ -10,7 +10,8 @@ pkgdesc="Library providing calendar support" # armhf blocked by extra-cmake-modules # ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -> akonadi # armv7 blocked by messagelib -> akonadi-calendar -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by pimcommon +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://kontact.kde.org" license="GPL-2.0-or-later AND Qt-GPL-exception-1.0 AND LGPL-2.0-or-later" depends_dev=" diff --git a/community/cantor/APKBUILD b/community/cantor/APKBUILD index 0ed1a65dcec..fde10884070 100644 --- a/community/cantor/APKBUILD +++ b/community/cantor/APKBUILD @@ -7,8 +7,8 @@ pkgname=cantor pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -arch="all !armhf !s390x !riscv64 !ppc64le" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine +arch="all !armhf !s390x !riscv64 !ppc64le !loongarch64" url="https://edu.kde.org/cantor/" pkgdesc="KDE Frontend to Mathematical Software " license="GPL-2.0-or-later" diff --git a/community/cargo-bloat/APKBUILD b/community/cargo-bloat/APKBUILD index f22e123af8d..8f9ace0c2d2 100644 --- a/community/cargo-bloat/APKBUILD +++ b/community/cargo-bloat/APKBUILD @@ -1,16 +1,14 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=cargo-bloat -pkgver=0.11.1 -pkgrel=3 +pkgver=0.12.1 +pkgrel=0 pkgdesc="Find out what takes most of the space in your Rust executable" url="https://github.com/RazrFalcon/cargo-bloat" arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # limited by rust/cargo license="MIT" depends="cargo cargo-auditable" -source="https://github.com/RazrFalcon/cargo-bloat/archive/v$pkgver/$pkgname-$pkgver.tar.gz - lfs64.patch - " +source="https://github.com/RazrFalcon/cargo-bloat/archive/v$pkgver/cargo-bloat-$pkgver.tar.gz" _cargo_opts="--frozen --features regex-filter" @@ -33,6 +31,5 @@ package() { } sha512sums=" -e6f33c99a80473123929424f91782cc7d364f5b09de7d5aca55058c1e811b6fb68db241c89f9de9ce1b8688cd6d9ebb8d7dc2077f324d31603f1a9c40fac6f5c cargo-bloat-0.11.1.tar.gz -c8bcfd8c08b36f3784c1bdc6dbdf8aecc6df66ca58ae42d448a549d812503d885a53aa0ea492802e79e903904c34534a637dcce1d7ba8afc8c8dd5ee3fd50eac lfs64.patch +cd9d196e9016d51798a9268e10fbec69472b91fe76df64fc8cdf47027914d2f15bf99902d105a80b9f86d117513c41d4b04a48275e61f34460e7d0677e816e59 cargo-bloat-0.12.1.tar.gz " diff --git a/community/cargo-bloat/lfs64.patch b/community/cargo-bloat/lfs64.patch deleted file mode 100644 index 9f23c9b4898..00000000000 --- a/community/cargo-bloat/lfs64.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 791c4c6..e72c89b 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -36,9 +36,9 @@ checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" - - [[package]] - name = "libc" --version = "0.2.126" -+version = "0.2.149" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" -+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - - [[package]] - name = "memmap2" diff --git a/community/cargo-c/APKBUILD b/community/cargo-c/APKBUILD index f648c7fdb0a..cd3b1c0e36e 100644 --- a/community/cargo-c/APKBUILD +++ b/community/cargo-c/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Oleg Titov <oleg.titov@gmail.com> # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=cargo-c -pkgver=0.9.31 +pkgver=0.9.32 pkgrel=0 pkgdesc="cargo subcommand to build and install C-ABI compatibile dynamic and static libraries" url="https://github.com/lu-zero/cargo-c" @@ -63,6 +63,6 @@ package() { } sha512sums=" -12aa5fd857ca6fdba50ffb08d120084ac063b5dfad037b54caf3e28ccaa36bfd07b43e61619ccce72c081655e1759be05f455ea93caebb0e763a63dd4246d0cf cargo-c-0.9.31.tar.gz -0366ba0c51954ee59f032aeb42a0dcc89aced5ffeb14fe5d7b2cd641009fee09eb81cc1025d3d14e4399184bba2154b0583e9045643e3af8384c72fdee32e1be cargo-c-0.9.31-Cargo.lock +fd7cb71db0189b2fe5daa872e7873a4da94deb7ca3dd552aede1c1a171fa83848184a7c6307c1dcb0e59f58fd4860ab47c365fdac9a5e2918da9468a92a3a11a cargo-c-0.9.32.tar.gz +d607854f27f098245ddaada4dc652d4bbe9e91f063058ff7639d5d7d18ed892201a879869dbc0b875241ff10afa972b9d75704935233bb35225bab43e15cf77f cargo-c-0.9.32-Cargo.lock " diff --git a/community/cargo-edit/APKBUILD b/community/cargo-edit/APKBUILD index d69cf9e5355..6c4b4dad8f6 100644 --- a/community/cargo-edit/APKBUILD +++ b/community/cargo-edit/APKBUILD @@ -6,7 +6,8 @@ pkgrel=0 pkgdesc="Managing cargo dependencies from the command line" url="https://github.com/killercup/cargo-edit" # s390x, ppc64le, riscv64: blocked by ring crate -arch="all !s390x !ppc64le !riscv64" +# x86: tests segfault +arch="all !s390x !ppc64le !riscv64 !x86" license="MIT OR Apache-2.0" makedepends=" cargo @@ -17,7 +18,9 @@ makedepends=" " subpackages="$pkgname-doc" options="net" -source="$pkgname-$pkgver.tar.gz::https://github.com/killercup/cargo-edit/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/killercup/cargo-edit/archive/v$pkgver.tar.gz + fix-tests.patch + " export LIBSSH2_SYS_USE_PKG_CONFIG=1 # use system libssh2 @@ -45,6 +48,9 @@ build() { } check() { + # Increase stack size to avoid stack overflow while compiling 'p384'. + export RUST_MIN_STACK="4194304" + cargo test $_cargo_opts } @@ -57,4 +63,5 @@ package() { sha512sums=" 91750b1129eebbbc86d9eb1e3e3ed428039b4997975a7708acee60cd537b5daa4a1de0ed64462162fa82b73a15795c1e1603aaac2f7bcc1570ec83c147f0c207 cargo-edit-0.12.2.tar.gz +f34160f70cac4ce00801768f0e1ffbb1aac308ed9300d9ed10374e9f6c412fa2e6c2c2925116d3a932d05917aefc796038930e0ce9bfb4acfb0285b88902d5fe fix-tests.patch " diff --git a/community/cargo-edit/fix-tests.patch b/community/cargo-edit/fix-tests.patch new file mode 100644 index 00000000000..e8c5f5851c4 --- /dev/null +++ b/community/cargo-edit/fix-tests.patch @@ -0,0 +1,255 @@ +recreated the stdout/stderr snapshots with Rust 1.78.0-r0 +by running `SNAPSHOTS=overwrite cargo test` + +diff --git a/tests/cargo-upgrade/alt_registry/stderr.log b/tests/cargo-upgrade/alt_registry/stderr.log +index 34c0020..b285e5b 100644 +--- a/tests/cargo-upgrade/alt_registry/stderr.log ++++ b/tests/cargo-upgrade/alt_registry/stderr.log +@@ -4 +4,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/cli_rust_version/stderr.log b/tests/cargo-upgrade/cli_rust_version/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/cli_rust_version/stderr.log ++++ b/tests/cargo-upgrade/cli_rust_version/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/exclude_dep/stderr.log b/tests/cargo-upgrade/exclude_dep/stderr.log +index 2b8798d..dcb52a0 100644 +--- a/tests/cargo-upgrade/exclude_dep/stderr.log ++++ b/tests/cargo-upgrade/exclude_dep/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/ignore_rust_version/stderr.log b/tests/cargo-upgrade/ignore_rust_version/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/ignore_rust_version/stderr.log ++++ b/tests/cargo-upgrade/ignore_rust_version/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/implicit_prerelease/stderr.log b/tests/cargo-upgrade/implicit_prerelease/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/implicit_prerelease/stderr.log ++++ b/tests/cargo-upgrade/implicit_prerelease/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/invalid_manifest/stderr.log b/tests/cargo-upgrade/invalid_manifest/stderr.log +index 2520158..6eb2c57 100644 +--- a/tests/cargo-upgrade/invalid_manifest/stderr.log ++++ b/tests/cargo-upgrade/invalid_manifest/stderr.log +@@ -1,13 +1,10 @@ + Updating '[ROOTURL]/registry' index +-Error: `cargo metadata` exited with an error: error: failed to parse manifest at `[ROOT]/case/Cargo.toml` +- +-Caused by: +- could not parse input as TOML +- +-Caused by: +- TOML parse error at line 1, column 6 +- | +- 1 | This is clearly not a valid Cargo.toml. +- | ^ +- expected `.`, `=` ++Error: `cargo metadata` exited with an error: warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` ++error: expected `.`, `=` ++ --> Cargo.toml:1:6 ++ | ++1 | This is clearly not a valid Cargo.toml. ++ | ^ ++ | + +diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log b/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log +index ff297b6..0af116d 100644 +--- a/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log ++++ b/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log +@@ -1,6 +1,3 @@ + Updating '[ROOTURL]/registry' index +-Error: `cargo metadata` exited with an error: error: failed to parse manifest at `[ROOT]/case/Cargo.toml` +- +-Caused by: +- could not parse input as TOML ++Error: `cargo metadata` exited with an error: warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` + ... +diff --git a/tests/cargo-upgrade/lockfile/stderr.log b/tests/cargo-upgrade/lockfile/stderr.log +index d3d7b1e..4b8fa20 100644 +--- a/tests/cargo-upgrade/lockfile/stderr.log ++++ b/tests/cargo-upgrade/lockfile/stderr.log +@@ -7 +7,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/optional_dep/stderr.log b/tests/cargo-upgrade/optional_dep/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/optional_dep/stderr.log ++++ b/tests/cargo-upgrade/optional_dep/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/package_rust_version/stderr.log b/tests/cargo-upgrade/package_rust_version/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/package_rust_version/stderr.log ++++ b/tests/cargo-upgrade/package_rust_version/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/pinned/stderr.log b/tests/cargo-upgrade/pinned/stderr.log +index 6b39caf..7604656 100644 +--- a/tests/cargo-upgrade/pinned/stderr.log ++++ b/tests/cargo-upgrade/pinned/stderr.log +@@ -3,2 +3,4 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + note: Re-run with `--pinned` to upgrade pinned version requirements +diff --git a/tests/cargo-upgrade/preserve_op/stderr.log b/tests/cargo-upgrade/preserve_op/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/preserve_op/stderr.log ++++ b/tests/cargo-upgrade/preserve_op/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/preserve_precision_major/stderr.log b/tests/cargo-upgrade/preserve_precision_major/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/preserve_precision_major/stderr.log ++++ b/tests/cargo-upgrade/preserve_precision_major/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/preserve_precision_minor/stderr.log b/tests/cargo-upgrade/preserve_precision_minor/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/preserve_precision_minor/stderr.log ++++ b/tests/cargo-upgrade/preserve_precision_minor/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/preserve_precision_patch/stderr.log b/tests/cargo-upgrade/preserve_precision_patch/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/preserve_precision_patch/stderr.log ++++ b/tests/cargo-upgrade/preserve_precision_patch/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/preserves_inline_table/stderr.log b/tests/cargo-upgrade/preserves_inline_table/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/preserves_inline_table/stderr.log ++++ b/tests/cargo-upgrade/preserves_inline_table/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/preserves_std_table/stderr.log b/tests/cargo-upgrade/preserves_std_table/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/preserves_std_table/stderr.log ++++ b/tests/cargo-upgrade/preserves_std_table/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/single_dep/stderr.log b/tests/cargo-upgrade/single_dep/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/single_dep/stderr.log ++++ b/tests/cargo-upgrade/single_dep/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/specified/stderr.log b/tests/cargo-upgrade/specified/stderr.log +index c21d3da..2878527 100644 +--- a/tests/cargo-upgrade/specified/stderr.log ++++ b/tests/cargo-upgrade/specified/stderr.log +@@ -3,2 +3,4 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + note: Re-run with `--verbose` to show more dependencies +diff --git a/tests/cargo-upgrade/upgrade_all/stderr.log b/tests/cargo-upgrade/upgrade_all/stderr.log +index d3d7b1e..4b8fa20 100644 +--- a/tests/cargo-upgrade/upgrade_all/stderr.log ++++ b/tests/cargo-upgrade/upgrade_all/stderr.log +@@ -7 +7,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/upgrade_everything/stderr.log b/tests/cargo-upgrade/upgrade_everything/stderr.log +index 7070c4f..bcf2ce0 100644 +--- a/tests/cargo-upgrade/upgrade_everything/stderr.log ++++ b/tests/cargo-upgrade/upgrade_everything/stderr.log +@@ -3,2 +3,4 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + note: Re-run with `--verbose` to show more dependencies +diff --git a/tests/cargo-upgrade/upgrade_renamed/stderr.log b/tests/cargo-upgrade/upgrade_renamed/stderr.log +index 017c781..bb7bff6 100644 +--- a/tests/cargo-upgrade/upgrade_renamed/stderr.log ++++ b/tests/cargo-upgrade/upgrade_renamed/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/upgrade_verbose/stderr.log b/tests/cargo-upgrade/upgrade_verbose/stderr.log +index 2b8798d..dcb52a0 100644 +--- a/tests/cargo-upgrade/upgrade_verbose/stderr.log ++++ b/tests/cargo-upgrade/upgrade_verbose/stderr.log +@@ -3 +3,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/upgrade_workspace/stderr.log b/tests/cargo-upgrade/upgrade_workspace/stderr.log +index d3d7b1e..4b8fa20 100644 +--- a/tests/cargo-upgrade/upgrade_workspace/stderr.log ++++ b/tests/cargo-upgrade/upgrade_workspace/stderr.log +@@ -7 +7,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/virtual_manifest/stderr.log b/tests/cargo-upgrade/virtual_manifest/stderr.log +index d3d7b1e..4b8fa20 100644 +--- a/tests/cargo-upgrade/virtual_manifest/stderr.log ++++ b/tests/cargo-upgrade/virtual_manifest/stderr.log +@@ -7 +7,3 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +diff --git a/tests/cargo-upgrade/workspace_inheritance/stderr.log b/tests/cargo-upgrade/workspace_inheritance/stderr.log +index cf5cb03..6214f4d 100644 +--- a/tests/cargo-upgrade/workspace_inheritance/stderr.log ++++ b/tests/cargo-upgrade/workspace_inheritance/stderr.log +@@ -7,2 +7,4 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + note: Re-run with `--verbose` to show more dependencies +diff --git a/tests/cargo-upgrade/workspace_member_cwd/stderr.log b/tests/cargo-upgrade/workspace_member_cwd/stderr.log +index 7f9c051..6f3d82d 100644 +--- a/tests/cargo-upgrade/workspace_member_cwd/stderr.log ++++ b/tests/cargo-upgrade/workspace_member_cwd/stderr.log +@@ -7,2 +7,4 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + note: Re-run with `--verbose` to show more dependencies +diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log +index 7f9c051..6f3d82d 100644 +--- a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log ++++ b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log +@@ -7,2 +7,4 @@ + Upgrading recursive dependencies ++warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ++note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` + note: Re-run with `--verbose` to show more dependencies diff --git a/community/cargo-license/APKBUILD b/community/cargo-license/APKBUILD index 415565de8fd..c5267025c09 100644 --- a/community/cargo-license/APKBUILD +++ b/community/cargo-license/APKBUILD @@ -1,7 +1,7 @@ -# Maintainer: +# Maintainer: fossdd <fossdd@pwned.life> pkgname=cargo-license pkgver=0.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Cargo subcommand to see license of dependencies" url="https://github.com/onur/cargo-license" arch="all" diff --git a/community/cargo-modules/APKBUILD b/community/cargo-modules/APKBUILD index 7a9c60badd8..2f751f4880f 100644 --- a/community/cargo-modules/APKBUILD +++ b/community/cargo-modules/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Orhun Parmaksız <orhunparmaksiz@gmail.com> # Maintainer: Orhun Parmaksız <orhunparmaksiz@gmail.com> pkgname=cargo-modules -pkgver=0.15.4 +pkgver=0.15.5 pkgrel=0 pkgdesc="A cargo plugin for showing an overview of a crate's modules" url="https://github.com/regexident/cargo-modules" @@ -36,5 +36,5 @@ package() { } sha512sums=" -110bc60b8f58e0ce41e5b1950a22b776e003761d9f3e9db58c6f3f39475eb079c5d8ab98a07fa2e867c8d9da175bb095046c8adb3a05c58f549854200f78bd6f cargo-modules-0.15.4.tar.gz +301d348c61a9d805d52e30cb8320aeab9e741e0bc91f1dc74ed683b6b3fe64276866200c4f7344a50a18e175766baad1ccb06d381ea72208a42e23312f3d65ad cargo-modules-0.15.5.tar.gz " diff --git a/community/cargo-nextest/APKBUILD b/community/cargo-nextest/APKBUILD index 05995b4e040..11bd8195caf 100644 --- a/community/cargo-nextest/APKBUILD +++ b/community/cargo-nextest/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=cargo-nextest -pkgver=0.9.68 +pkgver=0.9.70 pkgrel=0 pkgdesc="A next-generation test runner for Rust" url="https://nexte.st/" @@ -54,5 +54,5 @@ package() { } sha512sums=" -b7dfec0ddd20659a214d560bab95a2cb8cceac749c5b35213b06e134a1339468de39701e16297965437572d7dcf9d29f1af996d75e0355a2ae89317b19ab9dc7 cargo-nextest-0.9.68.tar.gz +8caf7245ccb6dab78565fba03d7124f87524e096b10f2f29134639d565662c0325501cba6f100a7a957f9f9ac56a71376e84fa2a4854e97ab93816b3515e47d9 cargo-nextest-0.9.70.tar.gz " diff --git a/community/cargo-outdated/APKBUILD b/community/cargo-outdated/APKBUILD index 0d7bc25f553..ff5d8d657c6 100644 --- a/community/cargo-outdated/APKBUILD +++ b/community/cargo-outdated/APKBUILD @@ -44,6 +44,9 @@ build() { } check() { + # Increase stack size to avoid stack overflow while compiling 'p384'. + export RUST_MIN_STACK="4194304" + cargo test --frozen } diff --git a/community/catch2-3/APKBUILD b/community/catch2-3/APKBUILD index 4ad837dd4b0..02db7a5cac9 100644 --- a/community/catch2-3/APKBUILD +++ b/community/catch2-3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: pkgname=catch2-3 -pkgver=3.5.3 +pkgver=3.6.0 pkgrel=0 arch="all" url="https://github.com/catchorg/Catch2" @@ -35,5 +35,5 @@ package() { } sha512sums=" -57c996f679cbad212cb0fde39e506bade37bd559c0e93e20f407f2a2f029e98b78661e10257f9c8e4cb5fd7d52d0ea1eae3d4a1f989c6d66fcb281e32e1688f6 catch2-v3.5.3.tar.gz +09c728a04d69b0692d6e2f7ceb5889dc69309406c27f7f2b5d383245a5357657c5540dd64a7a4a6e19388bda68105002425286468578b69b20e3a75366871ce2 catch2-v3.6.0.tar.gz " diff --git a/community/celery/APKBUILD b/community/celery/APKBUILD index b9855e52792..42e5fa5eef7 100644 --- a/community/celery/APKBUILD +++ b/community/celery/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=celery -pkgver=5.3.6 +pkgver=5.4.0 pkgrel=1 pkgdesc="An asynchronous task queue/job queue based on distributed message passing" url="http://www.celeryproject.org/" -arch="noarch !s390x" # lmited by py3-kombu +arch="noarch" license="Apache-2.0" depends=" py3-billiard @@ -21,24 +21,44 @@ depends=" python3 " makedepends="python3-dev py3-setuptools py3-gpep517 py3-wheel" +checkdepends=" + pre-commit + py3-pytest + py3-dnspython + py3-mongo + py3-pytest-celery + py3-pytest-subtests + py3-pytest-timeout + py3-pytest-click + py3-boto3 + py3-moto + py3-pyaml + py3-msgpack +" install="$pkgname.pre-install" source="https://files.pythonhosted.org/packages/source/c/celery/celery-$pkgver.tar.gz celery.confd - celery.initd" + celery.initd + " pkgusers="celery" pkggroups="celery" subpackages="$pkgname-openrc $pkgname-pyc" provides="py3-celery=$pkgver-r$pkgrel" -# TODO: requires many many many dependencies -options="!check" - build() { gpep517 build-wheel \ --wheel-dir .dist \ --output-fd 3 3>&1 >&2 } +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + # t/unit/backends/test_gcs.py: requires py3-google-cloud-storage + .testenv/bin/python3 -m pytest -v \ + --ignore=t/unit/backends/test_gcs.py +} + package() { # install scripts install -m755 -D "$srcdir"/$pkgname.initd \ @@ -50,12 +70,8 @@ package() { .dist/*.whl } -check() { - python3 setup.py test -} - sha512sums=" -169fa01c72f4d4932a255f4e7a547d1cc24f6899540414950c37e487163127bd3681b9ad741e9b1375c8a0b2b566b7467448e4523c77b34d29b3873007fb6885 celery-5.3.6.tar.gz +e59b62878f7da0af79be13df816e899c948f71f1063643baaabc1244dd44fd3114a5b3d724c010307ca8091c6b4343a4322213bc6154b843b79893b8f772476c celery-5.4.0.tar.gz c283956f8fe386ef39cb3e165a20d1cc7ff6398fbf5a922bec6b61fe4a71188519baed9feafc4e0e5b6864851545edaba54b89ba3613b2cf2ddd6426a6bf8fc2 celery.confd -3e5e2c6a55672bc0a02fca93ad334c694066c636ed62f2b55cb8f27b9301c429d68ce53667ec744b9b152ec786de7aea90cc05a143d6942cf5d2f34e51ca4089 celery.initd +a27cc3521cdf79ec60b15318c15679fe8f593c029c3ead53b162453ab9e86c05c57f7e4af843d69f17817a707db885f2c44d3b7f56337676dfc2ec0210bf38b7 celery.initd " diff --git a/community/celery/celery.initd b/community/celery/celery.initd index f4e2bf97fee..348feb3b8f3 100644 --- a/community/celery/celery.initd +++ b/community/celery/celery.initd @@ -11,6 +11,6 @@ supervise_daemon_args="-u $CELERY_USER -g $CELERY_GROUP" command=/usr/bin/celery command_args="${CELERY_OPTS}" -depends() { +depend() { use net } diff --git a/community/ceph17/APKBUILD b/community/ceph17/APKBUILD index 9fcad62ad5c..9e92749b4ff 100644 --- a/community/ceph17/APKBUILD +++ b/community/ceph17/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Duncan Bellamy <dunk@denkimushi.com> _pkgname=ceph pkgver=17.2.7 -pkgrel=5 +pkgrel=7 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver pkgdesc="Ceph is a distributed object store and file system, version $_majorver" diff --git a/community/ceph18/APKBUILD b/community/ceph18/APKBUILD index 5e12b196d2d..b0e025eb389 100644 --- a/community/ceph18/APKBUILD +++ b/community/ceph18/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Duncan Bellamy <dunk@denkimushi.com> _pkgname=ceph pkgver=18.2.2 -pkgrel=1 +pkgrel=3 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver pkgdesc="Ceph is a distributed object store and file system, version $_majorver" diff --git a/community/cereal/APKBUILD b/community/cereal/APKBUILD index 1b41ca34a1c..ba3ee25be9b 100644 --- a/community/cereal/APKBUILD +++ b/community/cereal/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adam Jensen <adam@acj.sh> pkgname=cereal pkgver=1.3.2 -pkgrel=5 +pkgrel=6 pkgdesc="A header-only C++11 library for serialization" url="https://github.com/USCiLab/cereal" arch="noarch" diff --git a/community/cgal/APKBUILD b/community/cgal/APKBUILD index 3ddce977c77..c39e665d5f3 100644 --- a/community/cgal/APKBUILD +++ b/community/cgal/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=cgal pkgver=5.6 -pkgrel=0 +pkgrel=1 pkgdesc="Efficient and reliable geometric algorithms as C++ library" url="https://www.cgal.org/" # lib is header-only since 5.0 diff --git a/community/cgmanager/APKBUILD b/community/cgmanager/APKBUILD index 8fa7e42eb68..8b43cfcf049 100644 --- a/community/cgmanager/APKBUILD +++ b/community/cgmanager/APKBUILD @@ -14,6 +14,11 @@ source="https://linuxcontainers.org/downloads/cgmanager/cgmanager-$pkgver.tar.gz cgmanager.initd cgproxy.initd" +prepare(){ + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/chatty/APKBUILD b/community/chatty/APKBUILD index 6afc3ea8f31..fa609b08af2 100644 --- a/community/chatty/APKBUILD +++ b/community/chatty/APKBUILD @@ -4,14 +4,13 @@ # Contributor: Mike Banon <mikebdp2@gmail.com> # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=chatty -pkgver=0.8.2 +pkgver=0.8.3 pkgrel=0 -_libcmatrix=702b894675f12ecd43439b3b3eee66cc74899b82 -_libgd=c7c7ff4e05d3fe82854219091cf116cce6b19de0 +_libcmatrix=6c260ee37bd2eff096ee44c29690f30718566c1c pkgdesc="XMPP and SMS messaging via libpurple and Modemmanager" # s390x: doubt anyone would use a mainframe for texting arch="all !s390x" -url="https://source.puri.sm/Librem5/chatty" +url="https://gitlab.gnome.org/World/Chatty" license="GPL-3.0-or-later" depends=" cyrus-sasl @@ -29,6 +28,7 @@ makedepends=" gspell-dev gstreamer-dev gtk4.0-dev + gtksourceview5-dev libadwaita-dev libgee-dev libphonenumber-dev @@ -40,7 +40,6 @@ makedepends=" checkdepends="appstream-glib desktop-file-utils" source="https://gitlab.gnome.org/World/Chatty/-/archive/v$pkgver/Chatty-v$pkgver.tar.gz https://source.puri.sm/Librem5/libcmatrix/-/archive/$_libcmatrix/libcmatrix-$_libcmatrix.tar.gz - https://gitlab.gnome.org/GNOME/libgd/-/archive/$_libgd/libgd-$_libgd.tar.gz " subpackages="$pkgname-lang $pkgname-bash-completion $pkgname-dbg" @@ -48,9 +47,7 @@ options="!check" # Requires running Wayland compositor builddir="$srcdir/Chatty-v$pkgver" prepare() { - rm -rf "$builddir"/subprojects/libgd rm -rf "$builddir"/subprojects/libcmatrix - mv "$srcdir"/libgd-$_libgd "$builddir"/subprojects/libgd mv "$srcdir"/libcmatrix-$_libcmatrix "$builddir"/subprojects/libcmatrix default_prepare @@ -68,7 +65,6 @@ package() { } sha512sums=" -5422fb413d7ccaa0012daa61d227f26a6f1addc48934750b82b7a269439f1219a1794c52df95a2e9f564327b62cb64fc09afa994140913920dd32e6dccf27e1d Chatty-v0.8.2.tar.gz -9fc66c3f5115c54af76cf90f191c4b7dd78d22ba160feadefefa32590deea01a51aa670fa34b1f849de35dbf95ab4a4c0dc2160db827636e89bd7a2e22b0a188 libcmatrix-702b894675f12ecd43439b3b3eee66cc74899b82.tar.gz -681cc23b5a33df88a92e3aac33d0dba1c6ebb69a2bd6f15b6ae31f0b444c108f7bfd1391e604433be58d82c0032028b112652d3d0c473abe4db02d66c55cdef3 libgd-c7c7ff4e05d3fe82854219091cf116cce6b19de0.tar.gz +efb0a0efdc275878953bda4cfba96878f0d3590362b29631b4dc05b8346f7ef91ba420be9b67b6c53ee04e75636db59637ca701e7fb0488ba6827c9e1a138c26 Chatty-v0.8.3.tar.gz +19dda48dcad027a737dae4031c5556bd42c204c45c7a870192b0ce3e61e211484cb52b3a8cce576ee757cda37c1a7cbef6746304b9d80efe103d2df7a2b199c2 libcmatrix-6c260ee37bd2eff096ee44c29690f30718566c1c.tar.gz " diff --git a/community/chez-scheme/0001-add-configuration-for-s390x-and-related-to-c-version.patch b/community/chez-scheme/0001-add-configuration-for-s390x-and-related-to-c-version.patch new file mode 100644 index 00000000000..66295fd6d6e --- /dev/null +++ b/community/chez-scheme/0001-add-configuration-for-s390x-and-related-to-c-version.patch @@ -0,0 +1,27 @@ +From 8c93b3696330a9296cdf2fc7fd7b6a1d2cdb4ae1 Mon Sep 17 00:00:00 2001 +From: Matthew Flatt <mflatt@racket-lang.org> +Date: Sun, 10 Mar 2024 08:01:33 -0600 +Subject: [PATCH] add configuration for s390x (and related) to `c/version.h` + (#815) + +This configuration enables pb mode to run on s390x. +--- + c/version.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/c/version.h b/c/version.h +index 6eed74e1..da4af287 100644 +--- a/c/version.h ++++ b/c/version.h +@@ -48,6 +48,11 @@ + # define FLUSHCACHE + #endif + ++#if defined(__s390__) || defined(__s390x__) || defined(__zarch__) ++# define PORTABLE_BYTECODE_BIGENDIAN ++# define BIG_ENDIAN_IEEE_DOUBLE ++#endif ++ + #ifdef PORTABLE_BYTECODE + # undef FLUSHCACHE + # ifdef PORTABLE_BYTECODE_BIGENDIAN diff --git a/community/chez-scheme/0002-configure-improve-inference-of-compiler-flags-for-pb.patch b/community/chez-scheme/0002-configure-improve-inference-of-compiler-flags-for-pb.patch new file mode 100644 index 00000000000..885812918b7 --- /dev/null +++ b/community/chez-scheme/0002-configure-improve-inference-of-compiler-flags-for-pb.patch @@ -0,0 +1,213 @@ +From 9f1542dc2206ebe0508f4a077991c7c226f4847e Mon Sep 17 00:00:00 2001 +From: Matthew Flatt <mflatt@racket-lang.org> +Date: Fri, 26 Apr 2024 06:08:17 -0600 +Subject: [PATCH] configure: improve inference of compiler flags for pb builds + (#829) + +When building an pb variant like `tpb64l`, and even when building for +a platform without native-code support, the "configure" script may +still be able to infer suitable C compilation and linking flags for +the kernel. Add an `--os=...` flag that can be used to override that +inference in case it's not correct (as in the case of cross +compilation). +--- + BUILDING | 8 ++++++ + c/build.zuo | 4 +-- + configure | 72 ++++++++++++++++++++++++++++++++++++++--------------- + 3 files changed, 62 insertions(+), 22 deletions(-) + +diff --git a/BUILDING b/BUILDING +index 7b3dc9c8..483f7380 100644 +--- a/BUILDING ++++ b/BUILDING +@@ -146,6 +146,14 @@ type of build and the installation location. For example, + specifies the installation root. Run `./configure --help` for + information on the supported options. + ++For platforms without support for native-code compilation in Chez ++Scheme, use a machine specification like `-m=tpb64l`, which is a ++threaded, 64-bit, little-endian build. The "configure" script will ++still attept to infer compilation and linking flags for the kernel; if ++you need to give it a hint, you can use the `--os` flag with something ++like `--os=tXle`, which indicates a threaded configuration (due to the ++leading "t") on Linux (due to the trailing "le"). ++ + The generated makefile mostly just ensures that a `zuo` executable is + built in a `bin` directory, and then it defers the actual build work + to `zuo`, which uses the "main.zuo" file. If you have `zuo` installed, +diff --git a/c/build.zuo b/c/build.zuo +index ae20d148..b6bf244b 100644 +--- a/c/build.zuo ++++ b/c/build.zuo +@@ -93,7 +93,7 @@ + kernel-srcs)) + + (define kernel-asm-files +- (if (glob-match? "*nt" (or (lookup 'defaultm) m)) ++ (if (glob-match? "*nt" (or (lookup 'flagsm) m)) + (cond + [(and msvc? + (string=? arch "a6")) +@@ -554,7 +554,7 @@ + (define (for-windows? config) + (or (is-msvc? config) + (glob-match? "*nt" (hash-ref config 'm)) +- (glob-match? "*nt" (or (hash-ref config 'defaultm #f) "")))) ++ (glob-match? "*nt" (or (hash-ref config 'flagsm #f) "")))) + + (define (lib-build-suffix config) + (if (is-msvc? config) +diff --git a/configure b/configure +index 2b4b594e..6531bca0 100755 +--- a/configure ++++ b/configure +@@ -49,8 +49,21 @@ else + cflagsset=no + fi + ++# Machine type to build: + m="" ++ ++# Working directory, defaults to $m + w="" ++ ++# Machine describing the OS that the kernel runs on, so it determines ++# default compiler and linker flags; when $m is a pb variant, then ++# this OS is inferred if not specified with `--osmachine=` ++flagsm="" ++ ++# Used to select a default $m, but in the end corresponds to ++# the target machine for boot files when built via pb ++defaultm="" ++ + pb=no + pbarch=no + threads=yes +@@ -255,6 +268,9 @@ while [ $# != 0 ] ; do + --machine=*) + m=`echo $1 | sed -e 's/^--machine=//'` + ;; ++ --os=*) ++ flagsm=`echo $1 | sed -e 's/^--os=//'` ++ ;; + --boot=*) + mboot=`echo $1 | sed -e 's/^--boot=//'` + ;; +@@ -469,15 +485,6 @@ if [ $emscripten = yes ] ; then + tm32=tpb32l + fi + +-case "$m" in +- pb) +- echo "Don't select pb using -m or --machine, because pb prefers to use the" +- echo " machine as the kernel host machine. Instead, use --pb or --pbarch" +- echo " to select a pb (portable bytecode) build." +- exit 1 +- ;; +-esac +- + if [ "$bits" = "" ] ; then + # infer default bits; this will be irrelevant if a machine is specified + if [ "$unamebits" != "" ] ; then +@@ -498,7 +505,14 @@ fi + # to the host platform's threadedness, and we want that to default + # the same way as when `--pb` is not used + if [ "$threads" = "" ] ; then +- defaultthreads=yes ++ case "$m" in ++ pb*) ++ defaultthreads=no ++ ;; ++ *) ++ defaultthreads=yes ++ ;; ++ esac + else + defaultthreads=$threads + fi +@@ -534,26 +548,33 @@ if [ "$m" = "" ] ; then + machine_supplied=no + if [ $pb = yes ] ; then + m=pb +- if [ "$threads" = yes ] ; then m=t$m ; fi +- if [ $bits = 64 ] ; then mpbhost=$m64 ; else mpbhost=$m32 ; fi +- flagsm=$mpbhost +- if [ "$mpbhost" = "" ] ; then +- flagsm=unknown ++ if [ $bits = 64 ] ; then defaultflagsm=$m64 ; else defaultflagsm=$m32 ; fi ++ if [ "$defaultflagsm" = "" ] ; then ++ defaultflagsm=unknown ++ fi ++ if [ "$threads" = yes ] ; then ++ m=t$m ++ defaultflagsm=t$defaultflagsm + fi + else + if [ "$unknownm" != "yes" ] ; then + m=$defaultm + fi +- flagsm=$defaultm +- # note that m (and flagsm) could still be "" at this point, in which ++ defaultflagsm=$defaultm ++ # note that m (and defaultflagsm) could still be "" at this point, in which + # case "No suitable machine type" will be reported further below + fi + elif [ $pb = yes ] ; then +- mpbhost=$m +- flagsm=$m ++ defaultflagsm=$m + m=pb + else +- flagsm=$m ++ case "${m}" in ++ pb*|tpb*) ++ defaultflagsm=$defaultm ++ ;; ++ *) ++ defaultflagsm=$m ++ esac + defaultm=$m + fi + +@@ -561,9 +582,14 @@ if [ $pbarch = yes ] ; then + m=pb$bits$pbendian + if [ "$defaultthreads" = yes ] ; then + m=t$m ++ defaultflagsm=t$defaultflagsm + fi + fi + ++if [ "$flagsm" = "" ] ; then ++ flagsm=$defaultflagsm ++fi ++ + if [ "$mboot" = "" ] ; then + mboot="$m" + else +@@ -615,6 +641,7 @@ if [ "$help" = "yes" ]; then + echo "Options (defaults shown in parens):" + echo " --machine=<machine type> explicitly specify machine type ($m)" + echo " -m=<machine type> same as --machine=<machine type> ($m)" ++ echo " --os=<machine type> specify OS as a machine type ($flagsm)" + echo " --threads specify threaded version ($threads)" + echo " --nothreads specify non-threaded version ($nothreads)" + echo " --32|--64 specify 32/64-bit version ($bits)" +@@ -1019,6 +1046,10 @@ else + configuringin=" in $w" + fi + ++if [ "$flagsm" != "$m" ] ; then ++ configuringin="$configuringin to run on $flagsm" ++fi ++ + if [ "$m" = "" ] ; then + enableFrompb=no + forceworkarea=no +@@ -1090,6 +1121,7 @@ srcdir=$srcdir + upsrcdir=$upsrcdir + m=$m + defaultm=$defaultm ++flagsm=$flagsm + mboot=$mboot + buildKernelOnly=$buildKernelOnly + enableFrompb=$enableFrompb diff --git a/community/chez-scheme/APKBUILD b/community/chez-scheme/APKBUILD index 4a7cdf2ce9f..4ca18db9138 100644 --- a/community/chez-scheme/APKBUILD +++ b/community/chez-scheme/APKBUILD @@ -2,39 +2,38 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=chez-scheme # XXX: Upgrades require rebuilding community/idris2 & community/idris2-stage0 -pkgver=9.6.4 +pkgver=10.0.0 _realver=${pkgver%%[a-z]} -pkgrel=0 +pkgrel=1 pkgdesc="Cisco R6RS Scheme Compiler" url="https://github.com/cisco/ChezScheme" -# upstream only supports x86/x86_64/armhf. -# aarch64: https://github.com/cisco/ChezScheme/issues/545 -# riscv64: https://github.com/cisco/ChezScheme/issues/601 -arch="x86 x86_64 armhf" +arch="all" license="Apache-2.0" makedepends="util-linux-dev ncurses-dev libx11-dev zlib-dev lz4-dev" subpackages="$pkgname-doc" source="https://github.com/cisco/ChezScheme/releases/download/v$pkgver/csv$pkgver.tar.gz - check-expected + check-expected::https://raw.githubusercontent.com/cisco/ChezScheme/v$pkgver/.github/workflows/summarytest-some-fast - disable-iconv-tests.patch - armhf-64bit-time_t.patch - x86_64bit-time_t.patch" + 0001-add-configuration-for-s390x-and-related-to-c-version.patch + 0002-configure-improve-inference-of-compiler-flags-for-pb.patch + disable-iconv-tests.patch" builddir="$srcdir"/csv$pkgver -# Only run the testsuite on x86_64. -# -# x86: https://github.com/cisco/ChezScheme/issues/695 -# armhf: doesn't seem to support test status reporting. +# upstream only seems to run the test suite on x86_64 and aarch64. +# Therefore, the expected check file from above only works on these. case "$CARCH" in -x86) options="!check" ;; -armhf) options="!check" ;; +x86_64|aarch64) ;; +*) options="!check" ;; esac case "$CARCH" in - x86) _chez_host=ti3le ;; - x86_64) _chez_host=ta6le ;; - armhf) _chez_host=arm32le ;; + x86) _chez_host=ti3le ;; + x86_64) _chez_host=ta6le ;; + arm*) _chez_host=tarm32le ;; + aarch64) _chez_host=tarm64le ;; + riscv64) _chez_host=trv64le ;; + ppc64le) _chez_host=tpb64l ;; + s390x) _chez_host=tpb64b ;; esac prepare() { @@ -45,28 +44,22 @@ prepare() { } build() { - case "$CARCH" in - x86) conf="--threads" ;; - x86_64) conf="--threads" ;; - armhf) conf="" ;; - esac - - # Use system version of zlib/lz4. - export LDFLAGS="$LDFLAGS $(pkg-config --libs zlib) $(pkg-config --libs liblz4)" - - ./configure \ + ./configure --os=tXle \ --installprefix=/usr \ + --installman=/usr/share/man \ + --nogzip-man-pages \ --temproot=$pkgdir \ + --machine=$_chez_host \ --installschemename="chez" \ --installscriptname="chez-script" \ - --machine=$_chez_host \ - $conf \ - ZLIB= LZ4= + ZLIB="$(pkg-config --libs zlib)" LZ4="$(pkg-config --libs liblz4)" make } check() { - make test + # Only run a subset of the test suite, otherwise the test + # take several hours to complete on some architectures. + make test-some-fast # The `make test` command does not exit with a non-zero exit # status when test fail (see BUILDING). For this reason, we @@ -88,9 +81,9 @@ package() { } sha512sums=" -00c33650d0f980c9d28ad4871c97da67b9f25e3fde5a3188b2bbbc9cc813e63e3c9055bc6a94addedbea52cd531cbb56bcdc5e2fda6c6ca37b30166c2797e53a csv9.6.4.tar.gz -b5dd1371683d2c5fd89d4c390eaabcc3145522527e677c532831a1d76325e4853c2179d71ee473d91f63937ae345f3ce80ecbc1bb4d2c6c3289d4d4fb18a22bb check-expected -386dbff9974991a73766f993f0054548d007bd18652e5077034dd40596152470c0822c15d2e9a7356f41e3ee6c7889f31909e15c9faee54e54b923bf954ffded disable-iconv-tests.patch -216cd2f932e99d798ab5d01bfa3f811528b79462ce546204af9a071f8288d5e0f0eab5c0da5fc2adcb45d29162f0ee7d4ddc7dd1884b2382137ebb6063380f54 armhf-64bit-time_t.patch -e3ca092032fbc17e3bb946d5a8909665916941474efdd04b9a8918d5432ce7f3340b6de55658399be24428778b916a181ba8c9d34d29afc998f804a4ff3a2e69 x86_64bit-time_t.patch +094298744bd69033366305330d660299023c5bc5776df86f28af119f9f4cddc463366fc8f955084463137b6186843fcd34026d2714b932baa4841d6522a8dd92 csv10.0.0.tar.gz +cdf845795cf06506b7af21d68325cb4d72044b6179bf2f827c658a3668657da353fe6006a576db52bc1bd737adc9e8971aa08b8ffa81a28b4e7a3df8dadc32b0 check-expected +5ae1ed10d0640f39fce71fad9dfc7d0bec67876a5c3b93f903118de0e6535ff97091d6ad523b4886755733ac165aa150f277d064eb22c7cd27577e4c362e5d3b 0001-add-configuration-for-s390x-and-related-to-c-version.patch +8979061ed307a08d8be20083e30d861da7ef60278c1de93c080bfee7326c7a32824c3ad33c40f857f673cac4bc05a9e249b6f838a37c59c7cd95dce08c7e6fd7 0002-configure-improve-inference-of-compiler-flags-for-pb.patch +c1177eedfd562593f2be664c4f0643b7cbe7d4ff0d9e994acbf226739f26f76d32f3b8f3024067e44536eb0e1edcff9a2daa3b61e05dfcd0e04b7430a3097503 disable-iconv-tests.patch " diff --git a/community/chez-scheme/armhf-64bit-time_t.patch b/community/chez-scheme/armhf-64bit-time_t.patch deleted file mode 100644 index 0a44e88dc48..00000000000 --- a/community/chez-scheme/armhf-64bit-time_t.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -upr csv9.5.8.orig/boot/arm32le/equates.h csv9.5.8/boot/arm32le/equates.h ---- csv9.5.8.orig/boot/arm32le/equates.h 2022-04-26 21:21:41.390449349 +0200 -+++ csv9.5.8/boot/arm32le/equates.h 2022-04-26 21:21:50.987106798 +0200 -@@ -630,7 +630,7 @@ typedef unsigned long long U64; - #define time_duration 0x2 - #define time_monotonic 0x3 - #define time_process 0x0 --#define time_t_bits 0x20 -+#define time_t_bits 0x40 - #define time_thread 0x1 - #define time_utc 0x4 - #define timer_interrupt_index 0x2 -Only in csv9.5.8/boot/arm32le: equates.h.orig -diff -upr csv9.5.8.orig/s/arm32le.def csv9.5.8/s/arm32le.def ---- csv9.5.8.orig/s/arm32le.def 2022-04-26 21:21:41.567115853 +0200 -+++ csv9.5.8/s/arm32le.def 2022-04-26 21:21:50.987106798 +0200 -@@ -24,7 +24,7 @@ - (define-constant size_t-bits 32) - (define-constant ptrdiff_t-bits 32) - (define-constant wchar-bits 32) --(define-constant time-t-bits 32) -+(define-constant time-t-bits 64) - (define-constant max-float-alignment 8) - (define-constant max-integer-alignment 8) - (define-constant asm-arg-reg-max 5) diff --git a/community/chez-scheme/check-expected b/community/chez-scheme/check-expected deleted file mode 100644 index d2ccad8042f..00000000000 --- a/community/chez-scheme/check-expected +++ /dev/null @@ -1,12 +0,0 @@ --------- o=0 -------- --------- o=3 -------- --------- o=0 cp0=t cl=3 -------- --------- o=3 cp0=t cl=3 -------- --------- o=0 spi=t p=t rmg=2 -------- --------- o=3 spi=t p=t rmg=2 -------- --------- o=0 eval=interpret cl=6 -------- --------- o=3 eval=interpret cl=6 -------- --------- o=0 cp0=t eval=interpret rmg=2 -------- --------- o=3 cp0=t eval=interpret rmg=2 -------- --------- o=0 hci=101 eoc=f cl=9 -------- --------- o=3 hci=101 eval=interpret rmg=2 -------- diff --git a/community/chez-scheme/disable-iconv-tests.patch b/community/chez-scheme/disable-iconv-tests.patch index 266d354894c..fd027be05b7 100644 --- a/community/chez-scheme/disable-iconv-tests.patch +++ b/community/chez-scheme/disable-iconv-tests.patch @@ -1,41 +1,17 @@ They are incompatible with musl's iconv implementation relying on encodings that are not supported by musl libc et cetera. -diff -upr csv9.6.4.orig/mats/io.ms csv9.6.4/mats/io.ms ---- csv9.6.4.orig/mats/io.ms 2023-10-22 22:37:14.797906883 +0200 -+++ csv9.6.4/mats/io.ms 2023-10-22 22:40:02.128273023 +0200 -@@ -534,7 +534,8 @@ +diff -upr csv10.0.0.orig/mats/io.ms csv10.0.0/mats/io.ms +--- csv10.0.0.orig/mats/io.ms 2024-04-13 15:51:20.280352351 +0200 ++++ csv10.0.0/mats/io.ms 2024-04-13 15:51:46.850399748 +0200 +@@ -534,9 +534,7 @@ 1) ) --(if (embedded?) -+;; Disable iconv tests on musl due to shortcoming of its iconv implementation. +-(if (case (machine-type) +- [(pb tpb) #t] +- [else (embedded?)]) +(if #t (mat iconv-codec (error? (errorf 'iconv-codec "-73 is not a string")) (error? (errorf 'transcoded-port "unsupported encoding almost certainly bogus")) -diff -upr csv9.6.4.orig/mats/root-experr-compile-0-f-f-f csv9.6.4/mats/root-experr-compile-0-f-f-f ---- csv9.6.4.orig/mats/root-experr-compile-0-f-f-f 2023-10-22 22:37:14.797906883 +0200 -+++ csv9.6.4/mats/root-experr-compile-0-f-f-f 2023-10-22 22:39:56.678263008 +0200 -@@ -6871,21 +6871,6 @@ io.mo:Expected error in mat port-operati - io.mo:Expected error in mat port-operations3: "port-file-descriptor: #<input port string> is not a file port". - io.mo:Expected error in mat iconv-codec: "iconv-codec: -73 is not a string". - io.mo:Expected error in mat iconv-codec: "transcoded-port: unsupported encoding almost certainly bogus". --io.mo:Expected error in mat iconv-codec: "display-string: iconv CP1252 codec cannot encode #\x3BB". --io.mo:Expected error in mat iconv-codec: "newline: iconv CP1252 codec cannot encode #\newline with eol-style ls". --io.mo:Expected error in mat iconv-codec: "newline: latin-1 codec cannot encode #\newline with eol-style ls". --io.mo:Expected error in mat iconv-codec: "iconv-codec: -73 is not a string". --io.mo:Expected error in mat iconv-codec: "transcoded-port: unsupported encoding almost certainly bogus". --io.mo:Expected error in mat iconv-codec: "display-string: iconv CP1252 codec cannot encode #\x3BB". --io.mo:Expected error in mat iconv-codec: "newline: iconv CP1252 codec cannot encode #\newline with eol-style ls". --io.mo:Expected error in mat iconv-codec: "newline: latin-1 codec cannot encode #\newline with eol-style ls". --io.mo:Expected error in mat iconv-codec: "iconv-codec: -73 is not a string". --io.mo:Expected error in mat iconv-codec: "transcoded-port: unsupported encoding almost certainly bogus". --io.mo:Expected error in mat iconv-codec: "close-port: iconv CP1252 codec cannot encode #\x3BB". --io.mo:Expected error in mat iconv-codec: "close-port: iconv CP1252 codec cannot encode #\newline with eol-style ls". --io.mo:Expected error in mat iconv-codec: "close-port: latin-1 codec cannot encode #\newline with eol-style ls". --io.mo:Expected error in mat iconv-codec: "iconv-codec: -73 is not a string". --io.mo:Expected error in mat iconv-codec: "transcoded-port: unsupported encoding almost certainly bogus". - io.mo:Expected error in mat iconv-codec: "close-port: iconv CP1252 codec cannot encode #\x3BB". - io.mo:Expected error in mat iconv-codec: "close-port: iconv CP1252 codec cannot encode #\newline with eol-style ls". - io.mo:Expected error in mat iconv-codec: "close-port: latin-1 codec cannot encode #\newline with eol-style ls". diff --git a/community/chez-scheme/x86_64bit-time_t.patch b/community/chez-scheme/x86_64bit-time_t.patch deleted file mode 100644 index ec91f1efc23..00000000000 --- a/community/chez-scheme/x86_64bit-time_t.patch +++ /dev/null @@ -1,30 +0,0 @@ -On musl libc, time_t is a 64-bit type. By default, ChezScheme assumes -that time_t is a 32-bit type on x86. This patch adjusts the ChezScheme -configuration files accordingly. - -See also: https://github.com/cisco/ChezScheme/issues/527 - -diff -upr csv9.5.8.orig/boot/ti3le/equates.h csv9.5.8/boot/ti3le/equates.h ---- csv9.5.8.orig/boot/ti3le/equates.h 2022-04-30 15:30:23.580730631 +0200 -+++ csv9.5.8/boot/ti3le/equates.h 2022-04-30 15:30:34.110815342 +0200 -@@ -629,7 +629,7 @@ typedef unsigned long long U64; - #define time_duration 0x2 - #define time_monotonic 0x3 - #define time_process 0x0 --#define time_t_bits 0x20 -+#define time_t_bits 0x40 - #define time_thread 0x1 - #define time_utc 0x4 - #define timer_interrupt_index 0x2 -diff -upr csv9.5.8.orig/s/ti3le.def csv9.5.8/s/ti3le.def ---- csv9.5.8.orig/s/ti3le.def 2022-04-30 15:30:23.607397512 +0200 -+++ csv9.5.8/s/ti3le.def 2022-04-30 15:30:34.107481982 +0200 -@@ -24,7 +24,7 @@ - (define-constant size_t-bits 32) - (define-constant ptrdiff_t-bits 32) - (define-constant wchar-bits 32) --(define-constant time-t-bits 32) -+(define-constant time-t-bits 64) - (define-constant max-float-alignment 4) - (define-constant max-integer-alignment 4) - (define-constant asm-arg-reg-max 1) diff --git a/community/chezmoi/APKBUILD b/community/chezmoi/APKBUILD index 9e8a8f8a7ef..e04d684b1ac 100644 --- a/community/chezmoi/APKBUILD +++ b/community/chezmoi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=chezmoi -pkgver=2.47.3 +pkgver=2.48.1 pkgrel=0 pkgdesc="Manage your dotfiles across multiple machines, securely." url="https://www.chezmoi.io/" @@ -57,6 +57,6 @@ doc() { } sha512sums=" -77b5e03ac4677b107ddd4fbcf9bb5eed00e3250b09f760624407304e8ce8edeb8f2fab88d359e7a53f20f0d36c3fdeb8bfd8a7cd8030d9d04524d527196cd6fa chezmoi-2.47.3.tar.gz +42cfefbd00abe02326c806b3dc2925be2b109fe545b969efc3ce11dc17362c9e4156f2ad506a0e2c4543d02b5f1eff5a3985d88090e4c3be66264bb0cc77a57c chezmoi-2.48.1.tar.gz 6be6a032054e5d33ac74586c31381ab9332e8a22faff8ea2ff4248c4eddc3300243890c0e7d064db2648b336355115d597bf686aa70cea13b2250710ab885c9e makefile-quote-built-by.patch " diff --git a/community/choqok/APKBUILD b/community/choqok/APKBUILD index c35b2716da2..7ee92b78ee9 100644 --- a/community/choqok/APKBUILD +++ b/community/choqok/APKBUILD @@ -9,8 +9,8 @@ pkgrel=4 pkgdesc="A micro-blogging client" url="https://choqok.kde.org/" # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> purpose -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine -> purpose +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" license="GPL-2.0-only OR GPL-3.0-only" makedepends=" extra-cmake-modules diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD index a375622234f..33bcfd6014b 100644 --- a/community/chromium/APKBUILD +++ b/community/chromium/APKBUILD @@ -3,8 +3,9 @@ # Contributor: Elly Fong-Jones <elly@elly.town> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=chromium -pkgver=123.0.6312.122 +pkgver=124.0.6367.155 pkgrel=0 +_copium_tag=124.6 # https://source.chromium.org/chromium/chromium/src/+/main:third_party/test_fonts/test_fonts.tar.gz.sha1 # (for the given version, when it changes) _testfonts=336e775eec536b2d785cc80eff6ac39051931286 @@ -46,6 +47,7 @@ makedepends=" ffmpeg-dev findutils flac-dev + flatbuffers-dev flex freetype-dev gn @@ -113,12 +115,14 @@ subpackages=" source="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver-testdata.tar.xz test_fonts-$_testfonts.tar.gz::https://chromium-fonts.storage.googleapis.com/$_testfonts + copium-$_copium_tag.tar.gz::https://codeberg.org/selfisekai/copium/archive/$_copium_tag.tar.gz chromium-launcher.sh chromium.conf google-api.keys chromium-revert-drop-of-system-java.patch compiler.patch + disable-dns_config_service.patch disable-failing-tests.patch fc-cache-version.patch fix-missing-cstdint-include-musl.patch @@ -145,10 +149,12 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/chrom system-zstd.patch temp-failure-retry.patch yes-musl.patch - disable-dns_config_service.patch + " +_copium_patches=" + cr124-iwyu-sys-select-dawn-terminal.patch + cr124-libwebp-shim-sharpyuv.patch " # chrome-sandbox can use suid when user namespaces aren't available, but uses only userns and drops privileges normally -# tests stopped building with 115 with clang16 options="suid" # backwards compat (merged into primary) @@ -490,6 +496,22 @@ upstream_version() { prepare() { default_prepare + for i in $_copium_patches; do + case "$i" in + *.patch) + msg "${i%::*}" + patch -p1 -i "$srcdir/copium/$i" || failed="$failed $i" + ;; + esac + done + if [ ! -z "$failed" ]; then + error "The following patches failed to apply:" + for i in $failed; do + printf " %s\n" "$i" >&2 + done + exit 1 + fi + mv ../test_fonts/ ./third_party/test_fonts/ # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion @@ -502,9 +524,10 @@ prepare() { ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ # reusable system library settings - # libavif - https://github.com/AOMediaCodec/libavif/commit/4d2776a3 + # libavif - https://github.com/AOMediaCodec/libavif/commit/50a541469c98009016af8dcc9f83a1be79f3a7d9 # libaom - https://aomedia.googlesource.com/aom/+/706ee36dcc82%5E%21/ - # jsoncpp, re2, snappy, swiftshader-spirv, woff2 - requires use_custom_libcxx=false + # but watch this space: https://aomedia-review.googlesource.com/c/aom/+/188606 + # jsoncpp, re2, snappy, swiftshader, woff2 - needs use_custom_libcxx=false local use_system=" brotli crc32c @@ -512,6 +535,7 @@ prepare() { double-conversion ffmpeg flac + flatbuffers fontconfig freetype harfbuzz-ng @@ -579,8 +603,8 @@ _configure() { local _google_api_key _google_default_client_id _google_default_client_secret eval "$(base64 -d < $srcdir/google-api.keys)" - export CFLAGS="${CFLAGS/-g/} -O2 -Wno-unknown-warning-option -Wno-builtin-macro-redefined -Wno-deprecated-declarations" - export CXXFLAGS="${CXXFLAGS/-g/} -O2 -Wno-unknown-warning-option -Wno-builtin-macro-redefined -Wno-deprecated-declarations" + export CFLAGS="${CFLAGS/-g/} -O2 -Wno-unknown-warning-option -Wno-builtin-macro-redefined -Wno-deprecated-declarations -Wno-shift-count-overflow -Wno-ignored-attributes" + export CXXFLAGS="${CXXFLAGS/-g/} -O2 -Wno-unknown-warning-option -Wno-builtin-macro-redefined -Wno-deprecated-declarations -Wno-invalid-constexpr" export CPPFLAGS="${CPPFLAGS/-g/} -D__DATE__= -D__TIME__= -D__TIMESTAMP__=" # breaks chromium @@ -652,6 +676,7 @@ _configure() { host_toolchain=\"//build/toolchain/linux/unbundle:default\" icu_use_data_file=false is_cfi=false + is_clang=true is_component_ffmpeg=true is_debug=false is_official_build=true @@ -667,14 +692,9 @@ _configure() { use_custom_libcxx=true use_lld=true use_pulseaudio=true - use_sysroot=false - use_system_freetype=true - use_system_harfbuzz=true - use_system_lcms2=true - use_system_libdrm=true + use_safe_libstdcxx=false use_system_libffi=true - use_system_libjpeg=true - use_system_zlib=true + use_sysroot=false use_thin_lto=false use_vaapi=$vaapi v8_enable_maglev=$maglev @@ -705,7 +725,15 @@ build() { check_base_unittests() { # TODO: fix these tests, hopefully + # https://issues.chromium.org/issues/40939315 broken="MessagePumpLibeventTest.NestedNotification*" + broken="$broken:AlternateTestParams/PartitionAllocTest.SchedulerLoopQuarantine" + broken="$broken:ClampTest.Death" + broken="$broken:OptionalTest.DereferencingNoValueCrashes" + broken="$broken:RawPtrTest.TrivialRelocability" + broken="$broken:SafeNumerics.IntMaxOperations" + broken="$broken:StringPieceTest.InvalidLengthDeath" + broken="$broken:StringPieceTest.OutOfBoundsDeath" # test-launcher-bot-mode enables parallelism and uncolored output ./out/bld/base_unittests --test-launcher-bot-mode --gtest_filter="-$broken" } @@ -847,14 +875,16 @@ swiftshader() { } sha512sums=" -23e13d1d5758aa771f4c66e1a55068438e7c4890456dcb0b7a1fc1839b750e612e29d59e744c8b773935757aad01b78a5fecc3e03057a8acbb7e997dbb98f007 chromium-123.0.6312.122.tar.xz -51d2eeb54ccaa3e936341cc1b6b8434982ba5f0dbe2f60eff3f5b8a89d59214b2acc19daae10602ff2f4ec8d75a7730e5bf645acdc88143f061c364c89f8f81f chromium-123.0.6312.122-testdata.tar.xz +632158c82c44c67b4d7e67c646f671f2ae4344d40759cca4269c024c1ad2be2740e67dbf0e4200a4da996d7234f0ef5c51a20c90433612775ddf7d5f94e1ae09 chromium-124.0.6367.155.tar.xz +4c04830cd1280011174adfc9aaa9de466ab4bb67a54fac1a19ead78c5229ea978f0c6e3078449688f475f4c7bd733a4fd1819c6be930c4a4d3abb4814c4a3de9 chromium-124.0.6367.155-testdata.tar.xz bbc928e99ebcd4d953b982688b01526cb754bad018f67be9e777a4f8ac51cdd3e01374e5a63faf55b12e7cee0d52816c88062e012b5bcc4f9bb41f28d8e0b7f7 test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz +c6293916e1780ba69686a5c629063c14b22cb1773aa207487e46ee74f4d1da61b47fffb8b9a2bc6f389d062882d5a8f9212693ed9b28f2c314364bb5e3c08e20 copium-124.6.tar.gz 1b16564f85a03f3eb934ec51289dc6159e2454202d40f48354f947d6ceffac8889e9eb4c0f4dfaafb3a15101566d54039f832bc9a8433c3c463e2d1dac2d2acc chromium-launcher.sh 9cfcb41d69c5a515b6f9fe2a629579fa499e1f48eb58a0ce4ec8e5029d450bcafb6d963019aaac9a6838244bee9f9ba7fe5ef6146a0ca6b20fcda4ab7f059476 chromium.conf 2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac google-api.keys 29bb685e03356a77df5fd347cdf55194cc8b3265c421cc76e54d64edefc329dbcb052deb26b22e8f587ce68456876c071de1b7d258dd0fcc6ee66c875ec4a020 chromium-revert-drop-of-system-java.patch -c116ad6325a79b799b6c56312891d5b3d2f0d0c1c3e2c03f339144b3f93b871db190f83fe5eadc5542303d61849cc362299932a2f93661198e11ba0c1e492e48 compiler.patch +54eb147c0af2ba096d1df375a289b339ee855ab1a9114e7c747753f0274a6bafb7212c1859b7885454c4529d9a5e3bd9559fc14e8e006f23ccd381895fa68d15 compiler.patch +4057cc78f10bfd64092bc35a373869abb1d68b880cdbca70422f39ffd78a929c19c7728d4d4c40709aaba25581148a93ae5343e724849fd35323062ed68753fa disable-dns_config_service.patch 111bc22fb704d97759988268a40d6b356c51b0bd7a8119a694e905ffe21850ff64e91566cd0dd0c9d62fcb46dca8acc821436c34eb0ba78be872ee4f7ec88a7b disable-failing-tests.patch 5fc5c012c1db6cf1ba82f38c6f3f4f5ca3a209e47ac708a74de379b018e0649b7694877c9571ef79002dde875ffc07b458a3355425f1c01867f362c66c2bc1bf fc-cache-version.patch 9200f78bad70e95c648a5e8392d50642190600f655c6baa366ff6467ebad52d3b3f305dad58f3610da67136f4b723557653b174ec5c25be8d8737ee04d9ee09f fix-missing-cstdint-include-musl.patch @@ -869,7 +899,7 @@ e75f57ae34c97ca1caf15fa4b4106c6c1e79c31ed66869cf92ed9ea0c449886c9511e455047c17c1 50c274a420bb8a7f14fcb56e40920dac8f708792a4520789b4987facea459bef88113d5a2b60fa8c57bee6e92bff3617d6b73fa305c8c44614c638971cffd440 musl-sandbox.patch e7163ac5810ac85366cef2447412287c856e3d67c6b77f219a6e5a418b1965b98e449c409424ad0704a5bded9355dd0aec3dc4585918ce5a2ab36c079707afe2 musl-tid-caching.patch 92eb002718026611f5542362ad69b67f0a398ff71b3fca5c05d55cb5c6f9f29334e5e127bb4860cfaa3fba0f0d4c901e2b98808217e7dc02e254a64a5c9521aa musl-v8-monotonic-pthread-cont_timedwait.patch -5eb0b83264e2c9213fb871838827eb7875c05131a42d901032d6d1f05eec98609fefac4772385046887a773daf4f1e0ee5a647e82c1c3d73aec3fcf76f887084 no-execinfo.patch +73bca6c6f9873f2f11cef04f3f41f71e0ae86e7e2d77e14db4298675fec390744c5081f6fdb14052e5ee2b5885be1198c3aa6068eb2b656d1a665c0c3f36e708 no-execinfo.patch 8e17101d69e23b456a9c03dc2fe95bcd56846389707ba6f4720192a9e9168406d20d9168dbebbb3a47d921ec92e478f0e390f46e6b9bb43a34dda217c6e6448b no-mallinfo.patch e4c4e5bc6f828f9c883dd418c0ba01887949c29c311f76206a1ec29f620b0c0ba0452949dc2778a9c46ea066405857536964a36436a68eecf7da7952736333cf no-res-ninit-nclose.patch 6dc4d8dc92e685dace62265a1ddb3aebc558aed54d20ff6d36b030be0c48d7e84662326c31363612492574d9a03c62653cdc21a60995b97dee1d75cae86a9f9b no-sandbox-settls.patch @@ -881,5 +911,4 @@ d4ac7f350806b4410ccb1df3b0ad7e90a7b6d724a16919761aa2d47a6f21008c7374da528b05b754 b3beb98b539fe160fbc493ba410ae0f68540cc4b6834f1f8ce9a22c3f4f59ef5d583ad48793e10549fd02a701f833a3969791ef4524322cd1e715ca5bf226bc8 system-zstd.patch e48693e6b7aeebf69a5acbf80d9a35defe4c23835121dfeb58b051ac7c527e758a41004f4d193274fe1b01c0bfb1dbc77b09cb6a404a3fdee507a2918afb0edb temp-failure-retry.patch 914ccf649d7771f19f209ab97f99c481aebc6f66174d68e8b539f6ad4a70bc8cb0fae2df6dadbf0415958ffb3574c420fe029079dcce45f5e5add4db2e903566 yes-musl.patch -4057cc78f10bfd64092bc35a373869abb1d68b880cdbca70422f39ffd78a929c19c7728d4d4c40709aaba25581148a93ae5343e724849fd35323062ed68753fa disable-dns_config_service.patch " diff --git a/community/chromium/compiler.patch b/community/chromium/compiler.patch index 2541d19992b..fedc978ae48 100644 --- a/community/chromium/compiler.patch +++ b/community/chromium/compiler.patch @@ -1,6 +1,6 @@ --- ./build/config/compiler/BUILD.gn.orig +++ ./build/config/compiler/BUILD.gn -@@ -616,24 +618,6 @@ +@@ -613,24 +613,6 @@ } } @@ -25,7 +25,7 @@ # TODO(crbug.com/1235145): Investigate why/if this should be needed. if (is_win) { cflags += [ "/clang:-ffp-contract=off" ] -@@ -1011,17 +998,6 @@ +@@ -1005,17 +987,6 @@ # `-nodefaultlibs` from the linker invocation from Rust, which would be used # to compile dylibs on Android, such as for constructing unit test APKs. "-Cdefault-linker-libraries", @@ -43,7 +43,7 @@ ] if (!is_win || force_rustc_color_output) { -@@ -1175,8 +1151,8 @@ +@@ -1182,8 +1153,8 @@ } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl && !(is_chromeos_lacros && is_chromeos_device)) { @@ -54,7 +54,7 @@ } if (!is_nacl) { cflags += [ -@@ -1190,8 +1166,8 @@ +@@ -1197,8 +1168,8 @@ } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia && !(is_chromeos_lacros && is_chromeos_device)) { @@ -65,6 +65,15 @@ } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] +@@ -1983,7 +1954,7 @@ + defines = [ "_HAS_NODISCARD" ] + } + } else { +- cflags = [ "-Wall" ] ++ cflags = [] + if (is_clang) { + # Enable extra warnings for chromium_code when we control the compiler. + cflags += [ "-Wextra" ] --- ./build/config/rust.gni.orig +++ ./build/config/rust.gni @@ -186,11 +186,11 @@ diff --git a/community/chromium/no-execinfo.patch b/community/chromium/no-execinfo.patch index 4b578976a3e..b1705f5d85f 100644 --- a/community/chromium/no-execinfo.patch +++ b/community/chromium/no-execinfo.patch @@ -37,25 +37,24 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 #define HAVE_FCNTL_H 1 --- a/base/debug/stack_trace.cc +++ b/base/debug/stack_trace.cc -@@ -251,7 +253,9 @@ +@@ -291,7 +291,7 @@ } - - void StackTrace::OutputToStream(std::ostream* os) const { + std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { + std::stringstream stream; +-#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) - OutputToStreamWithPrefix(os, nullptr); -+#endif + if (ShouldSuppressOutput()) { + return "Backtrace suppressed."; + } +@@ -301,7 +301,7 @@ } - std::string StackTrace::ToString() const { -@@ -281,7 +281,7 @@ - } - std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { - std::stringstream stream; + std::ostream& operator<<(std::ostream& os, const StackTrace& s) { -#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) - OutputToStreamWithPrefix(&stream, prefix_string); - #endif - return stream.str(); + s.OutputToStream(&os); + #else + os << "StackTrace::OutputToStream not implemented."; --- a/base/debug/stack_trace_unittest.cc +++ b/base/debug/stack_trace_unittest.cc @@ -33,7 +33,7 @@ diff --git a/community/cjose/APKBUILD b/community/cjose/APKBUILD index 2683a34f189..259b88f1c55 100644 --- a/community/cjose/APKBUILD +++ b/community/cjose/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Johan Bergström <bugs@bergstroem.nu> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=cjose -pkgver=0.6.2.2 -pkgrel=1 +pkgver=0.6.2.3 +pkgrel=0 pkgdesc="A C library implementing the Javascript Object Signing and Encryption" url="https://github.com/OpenIDC/cjose" arch="all" @@ -52,5 +52,5 @@ package() { } sha512sums=" -71a087709816f0aac060a7c5f037068e981366b1809f6ee32e39eaded02ad8be061b0e2fa5093515a8acec10c7f4aca232281004426221b4b7e5edbd203eb49c cjose-0.6.2.2.tar.gz +193434afef21fc4889902896d984bf57c64240346de27be94c229491d43e1d309bbb11905be4899fc7f3c1885323ee9480bf30499f37f3174ab9a1e282f5841f cjose-0.6.2.3.tar.gz " diff --git a/community/clamav/APKBUILD b/community/clamav/APKBUILD index 03320c0c482..2e6260f1937 100644 --- a/community/clamav/APKBUILD +++ b/community/clamav/APKBUILD @@ -19,6 +19,7 @@ install=" clamav-daemon.pre-install clamav-daemon.pre-upgrade " +checkdepends="py3-pytest" makedepends=" $depends_dev bzip2-dev diff --git a/community/clipman/APKBUILD b/community/clipman/APKBUILD index 5f8ad25329f..8c55484d3fe 100644 --- a/community/clipman/APKBUILD +++ b/community/clipman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Galen Abell <galen@galenabell.com> # Maintainer: Galen Abell <galen@galenabell.com> pkgname=clipman -pkgver=1.6.3 +pkgver=1.6.4 pkgrel=0 pkgdesc="A simple clipboard manager for Wayland" url="https://github.com/chmouel/clipman" @@ -27,5 +27,5 @@ package() { } sha512sums=" -b0446767fe4ebcce64073addb9c23bd50040c638fedb6c19d32df12438155937b71092dce889153deef0bf3329328b85f0d133479892cb117625c238d6d373d7 clipman-1.6.3.tar.gz +3501615de4320da7985493672d9107de0ef47eeb6a5fcb2d6d75ee7ac7282f5e45b735f3a88e3e946629c7d46bdb2e1740469bcbf3e6b3cdb67078ab7a8897b3 clipman-1.6.4.tar.gz " diff --git a/community/clojure/APKBUILD b/community/clojure/APKBUILD index 9eb823de4f6..99917e56aa0 100644 --- a/community/clojure/APKBUILD +++ b/community/clojure/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Daniel Fancsali <fancsali@gmail.com> # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=clojure -pkgver=1.11.2 +pkgver=1.11.3 pkgrel=0 pkgdesc="The Clojure Programming Language" url="https://clojure.org" @@ -32,6 +32,6 @@ package() { } sha512sums=" -8de77a6b434a147b7252bc9a36bde5552d063ffa8702153483c690caa231265314aa871c5409c92037ade7c5e6d1df1bf32244929cb4886cdd91e4391f249184 clojure-1.11.2.tar.gz +33d59a5c1b94902198e669ea7c4161c515d6463dd6e5ce7251adf8f5a9da493a5446d91f218e8e90ec8bf0866119f9c28d64361c2ed57265eea62baf39ca1302 clojure-1.11.3.tar.gz 763079a57001c5d53c0c3fefc1a556a60c77983ddcece12b8cb6a419df1acba19e4ec194e08b6692b1ec1261abd7aa59d06513d9cff07cc0716e3b9f412f47f4 clojure " diff --git a/community/cloudi/APKBUILD b/community/cloudi/APKBUILD index a5c17ba22a5..5ed89649c7b 100644 --- a/community/cloudi/APKBUILD +++ b/community/cloudi/APKBUILD @@ -29,10 +29,11 @@ pkgname=cloudi pkgver=2.0.7 -pkgrel=5 +pkgrel=7 pkgdesc="Cloud computing framework for efficient, scalable, and stable soft-realtime event processing." url="https://cloudi.org/" license="MIT" +# Erlang/OTP and CloudI should both support loongarch64 arch="all" depends=" erlang @@ -41,7 +42,6 @@ makedepends="autoconf automake binutils-dev boost-dev - elfutils-dev erlang-dev erlang-reltool gmp-dev @@ -96,6 +96,8 @@ esac case "$CTARGET_ARCH" in riscv*) ;; + loongarch*) + ;; *) makedepends="$makedepends ocaml ocaml-compiler-libs" _configure_args="$_configure_args --enable-ocaml-support" diff --git a/community/codeblocks/APKBUILD b/community/codeblocks/APKBUILD index 7888956f305..6cb630901c1 100644 --- a/community/codeblocks/APKBUILD +++ b/community/codeblocks/APKBUILD @@ -1,11 +1,12 @@ # Maintainer: Antoni Aloy <aaloytorrens@gmail.com> pkgname=codeblocks pkgver=20.03 -pkgrel=6 +pkgrel=7 pkgdesc="Cross-platform C/C++ and Fortran IDE" url="https://codeblocks.org" # riscv64: ftbfs -arch="all !riscv64" +#arch="all !riscv64" +arch="" license="GPL-3.0-or-later" makedepends=" autoconf @@ -157,17 +158,17 @@ bc78d166c14ef093eed600b14a5861cdb9f566151129e85f8bbf89a9e018823458628bb2152eef0f af99cd88ae857abc29a7d487d5b2b298550f825787b3d883d49e083ddc5c3747e179bb882322162355c82b3b2e34c138531eb62b5647814ce8ad0a59ce524931 gcc11.patch 651e8aa03876e6512d3c981094f41f990e9110a0157f8d9393bc62e5b8c0250ef26d1873ebaa4b8facc02da0436ae2809d951a821a3a80670c5ccd3496dc8283 make-order.patch 1515434b817ce6b222b6204a9f10a0569eca588d87db9b93427241b946991bfb40fb9855e431c2e15b5f0f19f04f07be85f96b40b498195293a25093d980e55d wxwidgets-3.2.patch -585ceadc30287dd08a367f735258a11af6f7a87934a5016b037af174ed44bd8df5890ca9126d77c2f9ffe854d4e9fd683c69a28cbc47b420aed79bbdb7ec4a27 codeblocks-wxwidgets-3.2-01.patch -21b61bf46177897d76155a5eaafc4e1ba466e39d66162b367c8ce8467e0b36c1ab5c6fe099635867dc2b2b908f5c008c5d56463e9563d71403639ed2cb74e237 codeblocks-wxwidgets-3.2-02.patch -b5764e948b84fd66492253034446cb385c9816551a776ca3946ac7e772dd2f404b1c7a490af88c2863b206aecbb1452f9b42a42792ceb30538efbc7dc6fc1e08 codeblocks-wxwidgets-3.2-03.patch -777eb06741187ec02adf03763b90e58486cbcf4d13dd11faaf35339aa776242c62813bcfbab0db63218744218afe3386489a769380706decf4cea41b6980823f codeblocks-wxwidgets-3.2-04.patch -b78f59ff0a4bf0cbd7c5efda8c53d6c40f8d703ab6e18e263b4f0dbfd694fd5a179589c716db366675031602cf3ca9232f3aabe0297c16d0e4cb1dd4a619c95b codeblocks-wxwidgets-3.2-05.patch -dbc0938fff3aea9507864d031456549fa10197e165a971184b9df1662e00952b745c49caf0848d43ea3f4c406ee4427ed5e30859bce084f17b95114381c46227 codeblocks-wxwidgets-3.2-06.patch -49ee5c43b07a7763bbe828609e1227ce03b6f2f516d741fbe4fb6c10a9632984b5b4074af85fff354a86193aaf2ff6279e6fea628f3720f2a0e1139cee5568ae codeblocks-wxwidgets-3.2-07.patch +bf78ee152c9fcff2a564c1af6a1b67f2aaeb596f4ca987551d2f65aec918678f0bc1d7b286d5e6f919378a635aae4f46fbc0ec55db9f1048396e99725329a69b codeblocks-wxwidgets-3.2-01.patch +6060b267d41392f03642fc24b9680a72ba9ea70fb8731344adbf8d97fd89e243426f405ba4331c00c7c73450977e29001a6a80ea0b7bea17087027e646645a02 codeblocks-wxwidgets-3.2-02.patch +79665bf69515e085dcdeab2a8c78c1f88eafe3cebc117f25bec7d29d17ebb175d817a731fa8f74c37ab6b85c8e6111f510255ba60dc345fe57055d8e6f5db200 codeblocks-wxwidgets-3.2-03.patch +c82a411e9d10a6042935911e9f184ff954d958921a95568f27e7636461dcf370bb8aefd4f23db198eaba48fb12a43f098d9cd8a61b5cf500a34f5b1110a5c4f5 codeblocks-wxwidgets-3.2-04.patch +34c0de6e4e208df5f7675dd4dc2283c6135d8bb9ef296ef166af6a4e184bce6bc96c039d9e2c9a6bd974f6804fe49daa09d2bfeff1a6622a5803bba718bce84a codeblocks-wxwidgets-3.2-05.patch +a2cf64f07f39b6fbc3280925b8dcc7cb13017916c28f6be0bed437cb1f71449450119400059b28b8efaf9a70591b5218bc6673b7d598fd03c31d18c1eb964f39 codeblocks-wxwidgets-3.2-06.patch +534096f9bcbb9a19732709cb54e479c73e2bbd2e70b61892c296a6d6f1b33c8e09114117824118ab96a83e075ffa203ca60fc3db47ef9a32615bb001f83017ed codeblocks-wxwidgets-3.2-07.patch 290cb5ce55ff618fd3d54328c3b04bd1e64cb58851bae6d89a15adcbd097cdb1dd9efc1fdd25fc848bc42f0b75dfea6da8281247f9eac948e6787de3f2821d41 codeblocks-wxwidgets-3.2-08.patch 4032512a4b08e8efd1d21912257dff5768847433b511904c3aaf705e870564c9e9880366da4858de5afdc2eae75819c7a0a9a5bed75670f6e00577aba02e473b codeblocks-wxwidgets-3.2-09.patch 75996bec0d7f88df33e983c14db92ca6c6e97e04c2eb4c448350d8e67d0e5db864c85fd040c40073d7e779b4b39e097da1a9e7aacabc28c4afa8c2a380e69863 codeblocks-wxwidgets-3.2-10.patch f195403d52ba53de3e55bdfb54461414bdb40c62ea9079446600377ec0cf7e739b74c9aadba23fd3a68f0e1270277a138901531b59630063c76a1fe608f1e278 codeblocks-wxwidgets-3.2-11.patch 6943970fc405bfbe1c656f117ae22fced8f80eb149befe2a1b8c3a9e906f6d1dbae1d89a80c5f2823ba60ab3c97b71a9f2d5a275e9070ddef2672ff6ed7cd821 codeblocks-wxwidgets-3.2-12.patch -32f955811960c217686ec924220b425d84eac9837fbd0930dbd0f7e966571ce34966bc4f57e8989390a2e7b0f0ac42c63a32ceada4ef48aa92aba611859ba1bc codeblocks-wxwidgets-3.2-13.patch +cc124bfad81ad1c00d6bc50b6a0a7a8daedfce75de6f321021434bde4569496068dfd6600f0ffc0c6957f739ad149f3656eef300402762f7234f2714b82a17e3 codeblocks-wxwidgets-3.2-13.patch " diff --git a/community/coeurl/APKBUILD b/community/coeurl/APKBUILD index d8836c1ebdf..3741913b705 100644 --- a/community/coeurl/APKBUILD +++ b/community/coeurl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=coeurl pkgver=0.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="Asynchronous wrapper around libcurl" url="https://nheko.im/nheko-reborn/coeurl" arch="all" diff --git a/community/cogl/APKBUILD b/community/cogl/APKBUILD index da35571845a..c6436529bb7 100644 --- a/community/cogl/APKBUILD +++ b/community/cogl/APKBUILD @@ -27,6 +27,11 @@ makedepends=" subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/cogl/${pkgver%.*}/cogl-$pkgver.tar.xz" +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/collectd/APKBUILD b/community/collectd/APKBUILD index 57fd0dc6c2f..7dc59a8043f 100644 --- a/community/collectd/APKBUILD +++ b/community/collectd/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=collectd pkgver=5.12.0 -pkgrel=19 +pkgrel=20 pkgdesc="The system statistics collection daemon" url="https://collectd.org/" arch="all" @@ -70,6 +70,7 @@ source="https://storage.googleapis.com/collectd-tarballs/collectd-$pkgver.tar.bz $pkgname-24bb9e2-2-oauth-increase-buf-size.patch::https://github.com/collectd/collectd/commit/24bb9e251969d5cf0e6eee14aad7a7e3bcc59dd8.patch $pkgname-91a6423-2-ovs_stats-fix-port-deletion.patch::https://github.com/collectd/collectd/commit/91a642385e2d068d106aa5c307de968f8b33add5.patch $pkgname-1483ef8-snmp-remove-des-support.patch::https://github.com/collectd/collectd/commit/1483ef8e03603bb8e1f89745325a17ba50fbbedf.patch + $pkgname-951faba-write_prometheus-AI_ADDRCONFIG.patch::https://github.com/collectd/collectd/commit/951fababf57087dbf77fa241e133f98ad73a7389.patch gnu_source.patch pyinclude.patch collectd.initd @@ -147,6 +148,7 @@ _plugins=" wireless write_http write_kafka + write_prometheus write_redis write_riemann write_stackdriver @@ -225,7 +227,6 @@ build() { --disable-tape \ --disable-tokyotyrant \ --disable-write_mongodb \ - --disable-write_prometheus \ --disable-xencpu \ --disable-xmms \ --disable-zone \ @@ -328,6 +329,7 @@ b8af8bb68d4da90f77cea5ed2cd751340fa2abe7e6b56e5abd52f8e79d4cd40c5a73a79cfb1e5176 37c116c5e026f8cb1c3ff6772745d8e6fafcc6683e4b5ba7f1afbef6da856b7b8a7193a009bfb8b4d5d1ff3fee14e2d281035ee530471138a2f1102aa8895c11 collectd-24bb9e2-2-oauth-increase-buf-size.patch 8ba5f533550da579fc851491efc6aaeac58436d81a4e4a09224e3e8c51b6ec90d007d58b843a7d886a58624b75ad0a79b6bc5e40176552e4dff6207f7ddd4941 collectd-91a6423-2-ovs_stats-fix-port-deletion.patch e5089707e349c10a3cfb25d6a9d52db8fdd450b404c68fe82d9a321d8f6d7bd20ba6f9ef045dd76e3251e67a2cf728cc0ac58b8c791a5fb260b74cd520608cea collectd-1483ef8-snmp-remove-des-support.patch +81773d9aa741d1320e4f32f2be4a96661dc649803d5459d4b31988fc9b1d79489d3e06d026da31acb89217c80910a423eef01939698ed34bb1c4e9223700f9ab collectd-951faba-write_prometheus-AI_ADDRCONFIG.patch 3078e43fc1aa5e5d5f7042472f465cc3b077c59f43a9867ade038e59bb210f26f53bb9a1e1e8a198ca53939a4b2e03a1f05628aa54f826746f970faa36acff6a gnu_source.patch bf1362d1bfaff1468409de815cff20c3f1446f2362282cdb7b764b736e2d8a51ca81f706a13cd13344858fe8fc34561a59a828f7a861f9723972b26452e8c682 pyinclude.patch a286c2164af196154d017658d6e5aa3cc4f76dadf90b68c3021418979d9f0377776bb990d737ae5c916c04475725365aea8b78e3bc5e2f3679d5a99f8b9af13e collectd.initd diff --git a/community/composer/APKBUILD b/community/composer/APKBUILD index 24d380fa695..1d011b11328 100644 --- a/community/composer/APKBUILD +++ b/community/composer/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Nathan Johnson <nathan@nathanjohnson.info> # Maintainer: Dave Hall <skwashd@gmail.com> pkgname=composer -pkgver=2.7.2 -pkgrel=1 +pkgver=2.7.6 +pkgrel=0 pkgdesc="Dependency manager for PHP" url="https://getcomposer.org/" arch="noarch" @@ -44,5 +44,5 @@ package() { } sha512sums=" -8d6a2c2729b8e5b1f468ec5e69bf71253c3d926cafc2808a90c9f0d6366ecba5e66a3d099bf1d8e3b5c6dbc3b3b284431d079f3dca4492dac483255493514e75 composer-2.7.2.phar +7e9b80406fa8817a136ca1ee08df56d449043a605e082a55a3e76acf8e3d27af342a6f768e0da5fd49b54a67d777c0584fc0a3d2af28538d59a5f5881394f4e7 composer-2.7.6.phar " diff --git a/community/confclerk/APKBUILD b/community/confclerk/APKBUILD index 602d0f8d7e1..7ddaac8d6f9 100644 --- a/community/confclerk/APKBUILD +++ b/community/confclerk/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=confclerk -pkgver=0.7.1 -pkgrel=1 +pkgver=0.7.2 +pkgrel=0 pkgdesc="Offline conference schedule application" url="http://www.toastfreeware.priv.at/confclerk" arch="all" @@ -26,5 +26,5 @@ package() { } sha512sums=" -643af1cc7eaabd061af4d9924e5f063cc3ec167034f5d7dd6766a2399b95367c50cdbfc964b26a05eac5dd21bdb849d017cf9882d78b4772eb20dc8f86b162cd confclerk-0.7.1.tar.gz +b09cee01cb7b91a384532ac584b0edd47ecbdc6685ba665531fc657fc5705c008088f0ec090354ce5c987a6abff244e96b97ba46666d01d800d4d65942b1073c confclerk-0.7.2.tar.gz " diff --git a/community/confy/APKBUILD b/community/confy/APKBUILD index eafa669f7f4..1eea75666de 100644 --- a/community/confy/APKBUILD +++ b/community/confy/APKBUILD @@ -1,26 +1,28 @@ # Contributor: Paper <paper@tilde.institute> # Maintainer: Paper <paper@tilde.institute> pkgname=confy -pkgver=0.6.5 -pkgrel=2 +pkgver=0.7.0 +pkgrel=0 pkgdesc="Conferences schedule viewer for GNOME" url="https://confy.kirgroup.net/" license="GPL-3.0-or-later" -arch="noarch" +# s390x: blueprint-compiler program has crashed +arch="noarch !s390x" depends=" - gtk+3.0 + gtk4.0 py3-gobject3 py3-icalendar - libhandy1 + libadwaita libnotify " +checkdepends="desktop-file-utils" makedepends=" + blueprint-compiler gettext-dev glib-dev meson " source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~fabrixxm/confy/archive/$pkgver.tar.gz" -options="!check" # no tests subpackages="$pkgname-lang $pkgname-pyc" build() { @@ -28,10 +30,14 @@ build() { meson compile -C output } +check() { + meson test --no-rebuild --print-errorlogs -C output +} + package() { DESTDIR="$pkgdir" meson install -C output } sha512sums=" -1baac4fe3467bd8aaf0f42fe9ca79fb65b2682fc8ff52e92782a6e6a28afd559218732bc5e5ae8b4b4dec294ce463f0216858ae11d0b60ee216b203e11b9b50f confy-0.6.5.tar.gz +af74b906cc6023bc0bad82a9bf653430c3a78f35b0900a876b8ceedf89c487d268c0c37926a22b7f5ea0eb06b3c81acf176817d4a26822bf8f6bc9dc5e305526 confy-0.7.0.tar.gz " diff --git a/community/containerd/APKBUILD b/community/containerd/APKBUILD index f1cb4908320..d0825f7a0fc 100644 --- a/community/containerd/APKBUILD +++ b/community/containerd/APKBUILD @@ -4,8 +4,8 @@ pkgname=containerd # NOTE: containerd's Makefile tries to get REVISION from git, but we're building from a tarball. -_commit=926c9586fe4a6236699318391cd44976a98e31f1 -pkgver=1.7.15 +_commit=83031836b2cf55637d7abf847b17134c51b38e53 +pkgver=1.7.16 pkgrel=0 pkgdesc="An open and reliable container runtime" url="https://containerd.io/" @@ -20,6 +20,7 @@ subpackages=" $pkgname-openrc " source="containerd-$pkgver.tar.gz::https://github.com/containerd/containerd/archive/v$pkgver.tar.gz + update-vendor-ebpf-to-v0.11.0.patch containerd.confd containerd.initd " @@ -72,6 +73,7 @@ export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" build() { export GO111MODULE=on + go mod tidy make SHIM_CGO_ENABLED=1 VERSION="v$pkgver" REVISION="$_commit" BUILDMODE=pie make man @@ -117,7 +119,8 @@ stress() { } sha512sums=" -84a94c7658a431cfd7a5321ac262d966f4291337ddff14211951b0d2025cd3af25a48175794d2b3a630ffc25ba03047579163546a4758a2fb5d1898cd233854f containerd-1.7.15.tar.gz +2d6aa4b11d75c1e94de90737cfb16cd34b5c802f5de6f10786856f5c57b69f70ebf6402ac935293cb977da76b142bca4bf5630658c2ee375947db72f14847a35 containerd-1.7.16.tar.gz +d06e051538b5b550fdd739bf91463c6cd0af0225ec351e080ec21d4ff1372b9e8364cab3c974207180f8eef7d85a069a4dad88bf63eed268ffe8becd1dd973b7 update-vendor-ebpf-to-v0.11.0.patch 5fb37b88554422738cc75b944b75836c123d87d418a16c6a25b9d49da023bd0e654d1aa694e60026de42c055ccf7469f5b4778a4876e94720ec2f40d618db580 containerd.confd 8315a8d58b4ba7e19ebed2cd82c7b5eaab45da630f9818a9e6cc8f3c8e88f159432474299798f79e6e465e843c91c0f50df04030083c8913c385ea1d73e81e6a containerd.initd " diff --git a/community/containerd/update-vendor-ebpf-to-v0.11.0.patch b/community/containerd/update-vendor-ebpf-to-v0.11.0.patch new file mode 100644 index 00000000000..83ef30add4c --- /dev/null +++ b/community/containerd/update-vendor-ebpf-to-v0.11.0.patch @@ -0,0 +1,54 @@ +diff --git a/go.mod b/go.mod +index 0167b67..cdb075e 100644 +--- a/go.mod ++++ b/go.mod +@@ -88,7 +88,7 @@ require ( + github.com/blang/semver/v4 v4.0.0 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect +- github.com/cilium/ebpf v0.9.1 // indirect ++ github.com/cilium/ebpf v0.11.0 // indirect + github.com/containerd/cgroups v1.1.0 // indirect + github.com/containerd/typeurl v1.0.2 // indirect + github.com/containers/ocicrypt v1.1.6 // indirect +diff --git a/go.sum b/go.sum +index 8469f2a..8f9ee0b 100644 +--- a/go.sum ++++ b/go.sum +@@ -164,8 +164,8 @@ github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX + github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= + github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= + github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= +-github.com/cilium/ebpf v0.9.1 h1:64sn2K3UKw8NbP/blsixRpF3nXuyhz/VjRlRzvlBRu4= +-github.com/cilium/ebpf v0.9.1/go.mod h1:+OhNOIXx/Fnu1IE8bJz2dzOA+VSfyTfdNUVdlQnxUFY= ++github.com/cilium/ebpf v0.11.0 h1:V8gS/bTCCjX9uUnkUFUpPsksM8n1lXBAvHcpiFk1X2Y= ++github.com/cilium/ebpf v0.11.0/go.mod h1:WE7CZAnqOL2RouJ4f1uyNhqr2P4CCvXFIqdRDUgWsVs= + github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= + github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= + github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +diff --git a/integration/client/go.mod b/integration/client/go.mod +index e6a7232..e56ca0d 100644 +--- a/integration/client/go.mod ++++ b/integration/client/go.mod +@@ -27,7 +27,7 @@ require ( + dario.cat/mergo v1.0.0 // indirect + github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect +- github.com/cilium/ebpf v0.9.1 // indirect ++ github.com/cilium/ebpf v0.11.0 // indirect + github.com/containerd/cgroups v1.1.0 // indirect + github.com/containerd/console v1.0.3 // indirect + github.com/containerd/fifo v1.1.0 // indirect +diff --git a/vendor/modules.txt b/vendor/modules.txt +index e694716..3810034 100644 +--- a/vendor/modules.txt ++++ b/vendor/modules.txt +@@ -72,7 +72,7 @@ github.com/cenkalti/backoff/v4 + # github.com/cespare/xxhash/v2 v2.2.0 + ## explicit; go 1.11 + github.com/cespare/xxhash/v2 +-# github.com/cilium/ebpf v0.9.1 ++# github.com/cilium/ebpf v0.11.0 + ## explicit; go 1.17 + github.com/cilium/ebpf + github.com/cilium/ebpf/asm diff --git a/testing/coq/APKBUILD b/community/coq/APKBUILD index a86759aef64..0b283a2d358 100644 --- a/testing/coq/APKBUILD +++ b/community/coq/APKBUILD @@ -7,10 +7,10 @@ pkgver=8.19.1 pkgrel=3 pkgdesc="Formal proof management system" url="https://coq.inria.fr" -# riscv64: ocaml +# riscv64, loongarch64: ocaml # s390x: not useful # 32-bit: huge package and nobody would use it there -arch="all !armhf !armv7 !x86 !s390x !riscv64" +arch="all !armhf !armv7 !x86 !s390x !riscv64 !loongarch64" license="LGPL-2.1-or-later" makedepends=" bash diff --git a/community/coredns/APKBUILD b/community/coredns/APKBUILD index 6f66f461396..402bdc836e3 100644 --- a/community/coredns/APKBUILD +++ b/community/coredns/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Mark Pashmfouroush <mark@markpash.me> pkgname=coredns pkgver=1.11.1 -pkgrel=5 +pkgrel=6 pkgdesc="fast and flexible DNS server" url="https://github.com/coredns/coredns" license="Apache-2.0" @@ -62,5 +62,5 @@ f8752811e9e7913311f47ae13f35c755ac86ea240572be1c1dabc1712b6c42380c60ac385fa9573c 802ac66ea27ac71001706b0994a579e0ab3f608a89d0a03f92490f4b73c4bd202745fd13b34d957122c8f1439be2709604c7931ff2a7be003c573e746c9d98b9 coredns.initd c697c08c3b1153ae224a1eeb3521f9ee594de4852bc6ef78d94dc7f6f680517659a653ab5c13ea03918deb79e6654ef11512ba4c90fe06ea4591fefbab876ece coredns.logrotated 9f2c08750b42f0901bc190a4c829a5a003e4c3aa9bd55e9a2f37f68f446cdd15b60227b7d2381d85b49674580f7c0206af76345d6dd5160401772c3efbf50ab6 ensure-cgo.patch -4c2ea139af034f1868a929e501a51ab7b8650426c250ee2e01fc1f8835b7f461a9999287aae83a43f13d6c2f7c4619979747e24a94bc47921e299e912aac43cc plugin.cfg.enabled +4cce898cfe2bd9891e4ac638c30bc04cffe560044240dd608fa64ffdf6320d488da0d0505920889db41e25f592b74b759fb01830528c46bea6adb37919eca629 plugin.cfg.enabled " diff --git a/community/coredns/plugin.cfg.enabled b/community/coredns/plugin.cfg.enabled index 4518fb29216..316d33826c5 100644 --- a/community/coredns/plugin.cfg.enabled +++ b/community/coredns/plugin.cfg.enabled @@ -73,3 +73,4 @@ git:github.com/miekg/coredns-git sign:sign unbound:github.com/coredns/unbound netbox:github.com/oz123/coredns-netbox-plugin +acme:github.com/chinzhiweiblank/coredns-acme diff --git a/community/corrosion/APKBUILD b/community/corrosion/APKBUILD index fed02af43b9..1b9119a8393 100644 --- a/community/corrosion/APKBUILD +++ b/community/corrosion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=corrosion -pkgver=0.4.7 +pkgver=0.4.9 pkgrel=0 pkgdesc="Marrying Rust and CMake - Easy Rust and C/C++ Integration!" url="https://github.com/corrosion-rs/corrosion" @@ -42,5 +42,5 @@ package() { } sha512sums=" -274baca57f7d599b304b75a73067fae9eb488eec10925fade7e195d494a192760b116a3bdf289e0cb7c291b29684909d5fd1c9404c6d37203c883cd511849bbb corrosion-0.4.7.tar.gz +6410a397364526888dd37782a464c7fe1eaece8820da0f617de9e2bd1a5a4c16a71ce45ad9a91f3fd71a6c33da130c83399b68cf5c1430a774bbb320a088ca62 corrosion-0.4.9.tar.gz " diff --git a/community/cpd/APKBUILD b/community/cpd/APKBUILD index e15449fb943..be955ec0fb7 100644 --- a/community/cpd/APKBUILD +++ b/community/cpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bradley J Chambers <brad.chambers@gmail.com> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=cpd -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 pkgdesc="C++ implementation of the Coherent Point Drift point set registration algorithm." url="https://github.com/gadomski/cpd" @@ -36,6 +36,6 @@ package() { } sha512sums=" -52b38c0cc864d165ac4a5b2a968a74982da3cc63fb00cb6a22b0029c4731b3af9481fd3eacc0c73edfcc082623398e83f6195c741d735acf1aef682b63727593 cpd-v0.5.4.tar.gz +aba4cc84f3f468d57133c200c31797573a198c75d23004b619762b8f910bf73c1334b7d7bd021159c1f15e77376751a04d7a97837daff0ae72aed52d6a1f9c6a cpd-v0.5.5.tar.gz c9fc897486d2db611946fa060d31ac7a010dd92ffd456ccc4161bad4f5225fdc1fea2410718448a88b98d65187069e22740d00501ed15b0e1798327d3b8b7e22 0001-Stop-forcing-static-builds.patch " diff --git a/community/cpprestsdk/APKBUILD b/community/cpprestsdk/APKBUILD index 71b926a37c6..f1e551498ea 100644 --- a/community/cpprestsdk/APKBUILD +++ b/community/cpprestsdk/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Simon Rupf <simon@rupf.net> pkgname=cpprestsdk pkgver=2.10.19 -pkgrel=0 +pkgrel=1 pkgdesc="C++ Microsoft REST SDK" url="https://github.com/microsoft/cpprestsdk" # s390x: broken on big endian diff --git a/community/cpulimit/APKBUILD b/community/cpulimit/APKBUILD index 4e7a894def0..ef5c97aed7e 100644 --- a/community/cpulimit/APKBUILD +++ b/community/cpulimit/APKBUILD @@ -1,13 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cpulimit pkgver=0.2 -pkgrel=2 +pkgrel=3 pkgdesc="CPU usage limiter for Linux" url="https://github.com/opsengine/cpulimit" arch="all" license="GPL-2.0-or-later" source="$pkgname-$pkgver.tar.gz::https://github.com/opsengine/cpulimit/archive/v$pkgver.tar.gz no-sysctl.patch + basename.patch + memrchr.patch " build() { @@ -22,5 +24,9 @@ package() { install -Dm755 src/cpulimit "$pkgdir"/usr/bin/cpulimit } -sha512sums="73c973f3b86cdc225054c742ddb205ce0378817695531e3e8e45053c50d2d9762f3a15adbfffc8fc2b91f96ce9c9dbf8a9ad4e7ce4cf214f349859b298683b47 cpulimit-0.2.tar.gz -13ddc48d810bdc28131babb653a06bd8ec25c6108fdbd34f2901c977d6fa6102d5e9c142e5a357711304272c97c2adb7fbf17164f0efdf4b4433ad271af9d09b no-sysctl.patch" +sha512sums=" +73c973f3b86cdc225054c742ddb205ce0378817695531e3e8e45053c50d2d9762f3a15adbfffc8fc2b91f96ce9c9dbf8a9ad4e7ce4cf214f349859b298683b47 cpulimit-0.2.tar.gz +13ddc48d810bdc28131babb653a06bd8ec25c6108fdbd34f2901c977d6fa6102d5e9c142e5a357711304272c97c2adb7fbf17164f0efdf4b4433ad271af9d09b no-sysctl.patch +9ecaa99de117032396ab4d9e35241df41a9a31ad687968708b062ed5d8823fbafbea0995c45475d9b3b288b3531e86257a1cedf2201944c985d17d91c22e960b basename.patch +c9b9fad8dd451da8e68cb79772efff2fd9a27987b42ef43a8b2ebc0e0d8703a9d5cdd0bbd62df90934b634afc03af682e5cd41e79beb935dbc7d0a559d878e31 memrchr.patch +" diff --git a/community/cpulimit/basename.patch b/community/cpulimit/basename.patch new file mode 100644 index 00000000000..40eedd532de --- /dev/null +++ b/community/cpulimit/basename.patch @@ -0,0 +1,13 @@ +See https://gitlab.alpinelinux.org/alpine/aports/-/issues/16106 + +diff -upr cpulimit-0.2.orig/src/process_group.c cpulimit-0.2/src/process_group.c +--- cpulimit-0.2.orig/src/process_group.c 2024-05-12 12:58:16.221876809 +0200 ++++ cpulimit-0.2/src/process_group.c 2024-05-12 12:58:26.731904879 +0200 +@@ -24,6 +24,7 @@ + #include <limits.h> + #include <sys/time.h> + #include <signal.h> ++#include <libgen.h> + + #include <assert.h> + diff --git a/community/cpulimit/memrchr.patch b/community/cpulimit/memrchr.patch new file mode 100644 index 00000000000..e0959aee0e9 --- /dev/null +++ b/community/cpulimit/memrchr.patch @@ -0,0 +1,17 @@ +_GNU_SOURCE is needed for the definition of memrchr. However, since it is +only added to CFLAGS using a conditional assignment operator, and we supply +our own CFLAGS, it is not added to CFLAGS and memrchr is implicitly declared. + +This patch fixes this. + +diff -upr cpulimit-0.2.orig/src/Makefile cpulimit-0.2/src/Makefile +--- cpulimit-0.2.orig/src/Makefile 2024-05-12 12:59:32.355413480 +0200 ++++ cpulimit-0.2/src/Makefile 2024-05-12 13:00:31.805572259 +0200 +@@ -1,5 +1,6 @@ + CC?=gcc +-CFLAGS?=-Wall -g -D_GNU_SOURCE ++CFLAGS?=-Wall -g ++CFLAGS+=-D_GNU_SOURCE + TARGETS=cpulimit + LIBS=list.o process_iterator.o process_group.o + diff --git a/community/cri-tools/APKBUILD b/community/cri-tools/APKBUILD index b199f1f6020..2735d055542 100644 --- a/community/cri-tools/APKBUILD +++ b/community/cri-tools/APKBUILD @@ -17,7 +17,7 @@ export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" build() { case "$CARCH" in - armv7|riscv64|s390x|x86) CGO_ENABLED=1 make all;; + armv7|riscv64|s390x|x86|loongarch64) CGO_ENABLED=1 make all;; *) make all;; esac } diff --git a/community/crun/APKBUILD b/community/crun/APKBUILD index c8d938f6ce7..0a575fd60df 100644 --- a/community/crun/APKBUILD +++ b/community/crun/APKBUILD @@ -2,15 +2,15 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=crun -pkgver=1.14.4 +pkgver=1.15 pkgrel=0 pkgdesc="Fast and lightweight fully featured OCI runtime and C library for running containers" url="https://github.com/containers/crun" license="GPL-2.0-or-later AND LGPL-2.1-or-later" arch="all" -makedepends="libcap-dev libseccomp-dev yajl-dev argp-standalone python3 go-md2man" +makedepends="libcap-dev libseccomp-dev yajl-dev argp-standalone python3 go-md2man zstd" subpackages="$pkgname-doc $pkgname-static" -source="https://github.com/containers/crun/releases/download/$pkgver/crun-$pkgver.tar.xz" +source="https://github.com/containers/crun/releases/download/$pkgver/crun-$pkgver.tar.zst" provides="oci-runtime" provider_priority=100 # highest, default provider @@ -41,5 +41,5 @@ package() { } sha512sums=" -1681ea85de3540958b4d7efadcf22c6f47c991fc4681a5028404952567c0b1b0220ad0ce0e0f0d727da27d8e63495a8bfc43a13b3511b1455106fdfec2e32e49 crun-1.14.4.tar.xz +a6e141f372817ed8ad1776c3ee272f68fa69680ef4d51b56643c0e4985016a5a6a415cc8623aa211c511916f2c61a417864c24c8d35fde594b624c666a9cca32 crun-1.15.tar.zst " diff --git a/community/crystal/APKBUILD b/community/crystal/APKBUILD index 572ad07a7d0..8a6d9c98ecd 100644 --- a/community/crystal/APKBUILD +++ b/community/crystal/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=crystal -pkgver=1.12.0 +pkgver=1.12.1 pkgrel=0 _bootver=1.11.2 _llvmver=17 @@ -127,7 +127,7 @@ package() { } sha512sums=" -69b2be677b6bda00e18054c1a18227feb3905fc7f5f235d7d70da6ce5463d0e0f3aa7cf57e7e986db6721753218235218aa3fd670cfdef3fbd71ebf43c6f25fa crystal-1.12.0.tar.gz +bd0c085d44a473b86797fa64ce9a5c66c7d3eda44bdba929faee490b635aef45bdf84b45baaa5dfea8e2b6fd218d1ae7fbdf117d3924b04b284075d4a500e55c crystal-1.12.1.tar.gz a3269baad1e5417cc22c93daf160794296a5d2a00ef3694c4ebff391d950fd6960b9c52ef34211bb0fcb359a39e396490b0fe1e3f2b4a3e1f46921d5b0da935a crystal-1.11.2-x86_64-alpine-linux-musl.tar.gz 42757038f284bf02b142510f9eeca96daa4148af33362e84105a74b6943ea1030c4039285995510b0b8014bc3c1d9a6829b0e269af3cdea0af1591a703fa14ac crystal-1.11.2-aarch64-alpine-linux-musl.tar.gz " diff --git a/community/csview/APKBUILD b/community/csview/APKBUILD index 8425f1c8e9c..2067c0bde79 100644 --- a/community/csview/APKBUILD +++ b/community/csview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=csview -pkgver=1.2.4 +pkgver=1.3.0 pkgrel=0 pkgdesc="Pretty csv viewer for cli with cjk/emoji support" url="https://github.com/wfxr/csview" @@ -40,5 +40,5 @@ package() { } sha512sums=" -58cd598ca4591906016cb32d812ec1e822617561a80170bf6066ffcb9509d1cf6f0e766573c7cee28ebc070018e32b6d047d301a3878bbca5dfaaa4e0d3effb6 csview-1.2.4.tar.gz +6ca060089a4cbf20a46a0f9e23d8f38b2366a88e0fd6054b40cd1532615164330829201c776d1e14b35f354e8bc4ca0ba8825e835ce3f62a0faae2714d3a8a18 csview-1.3.0.tar.gz " diff --git a/community/ctags/APKBUILD b/community/ctags/APKBUILD index 4d83b106e66..62d4fbb884d 100644 --- a/community/ctags/APKBUILD +++ b/community/ctags/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=ctags -pkgver=6.1.20240204.0 +pkgver=6.1.20240421.0 _realver="p$pkgver" pkgrel=0 pkgdesc="Generator of tags for all types of C/C++ languages" @@ -10,7 +10,7 @@ url="https://ctags.io/" arch="all" license="GPL-2.0-or-later" checkdepends="diffutils python3" -makedepends="autoconf automake pkgconf py3-docutils" +makedepends="autoconf automake pkgconf py3-docutils yaml-dev jansson-dev" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/universal-ctags/ctags/archive/$_realver.tar.gz" builddir="$srcdir"/$pkgname-$_realver @@ -37,7 +37,9 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --disable-external-sort + --disable-external-sort \ + --enable-json \ + --enable-yaml make } @@ -50,5 +52,5 @@ package() { } sha512sums=" -c225dab768ba8362eaf8ff614fc0df33bafb70d731630ebd08dbffe533dca0b41976c9d4979d17d64d5177a864bb40217b6ffd5b5a52fe886c5727e27b044442 ctags-6.1.20240204.0.tar.gz +eebb836a45daed5d79d7a45a7b922212000e041a82f9abc17ddd9db214572efe211d908cc40b00f7c48057f8d331be965e0b082569f289117bb0bb99bb55b3c1 ctags-6.1.20240421.0.tar.gz " diff --git a/community/ctop/APKBUILD b/community/ctop/APKBUILD index 842883a11e2..4a5055941a1 100644 --- a/community/ctop/APKBUILD +++ b/community/ctop/APKBUILD @@ -6,7 +6,7 @@ pkgrel=18 pkgdesc="Top-like interface for container metrics" url="https://ctop.sh/" license="MIT" -arch="all" +arch="all !loongarch64" makedepends="go" options="chmod-clean !check" # no test suite source="$pkgname-$pkgver.tar.gz::https://github.com/bcicen/ctop/archive/refs/tags/v$pkgver.tar.gz diff --git a/testing/cue-cli/APKBUILD b/community/cue-cli/APKBUILD index 8aa0453215f..24ba1158bbb 100644 --- a/testing/cue-cli/APKBUILD +++ b/community/cue-cli/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=cue-cli -pkgver=0.7.0 -pkgrel=2 +pkgver=0.8.2 +pkgrel=0 pkgdesc="CLI for CUE configuration and validation language" url="https://cuelang.org/" # 32-bit: value out of int range @@ -48,5 +48,5 @@ package() { } sha512sums=" -471ebc4ac81dfc0df42d8e8bd5e858b8a2f958c909ccd0b391ed4af669e7eba3908bcde63ca21973f072e35f66d307180fb3fc43627eb4de6385011bcf48aed1 cue-cli-0.7.0.tar.gz +813a578f77582ac6458fc77697a8ffb0a2accae174d9e930360f839a20b0a503de51f5fe98bec7a7e0c2093e8dd7b78bf0cc0939c6f9c038164eebc6c39b6354 cue-cli-0.8.2.tar.gz " diff --git a/community/curaengine/APKBUILD b/community/curaengine/APKBUILD index 1bd22c226d0..812f1966639 100644 --- a/community/curaengine/APKBUILD +++ b/community/curaengine/APKBUILD @@ -3,7 +3,7 @@ pkgname=curaengine # If you plan to upgrade curaengine, libarcus probably needs to be upgraded too pkgver=5.2.2 -pkgrel=7 +pkgrel=9 pkgdesc="3D slicer engine" url="https://github.com/Ultimaker/CuraEngine" license="AGPL-3.0-or-later" diff --git a/community/cyclone-stage0/APKBUILD b/community/cyclone-stage0/APKBUILD index 1aa50cd6c2f..cac994c9429 100644 --- a/community/cyclone-stage0/APKBUILD +++ b/community/cyclone-stage0/APKBUILD @@ -5,8 +5,8 @@ pkgver=0.36.0 pkgrel=0 pkgdesc="Cyclone version used to initially bootstrap the Cyclone compiler" url="https://justinethier.github.io/cyclone/" -# s390x: ck on s390x does not have ck_pr_cas_8 (used by cyclone) -arch="all !s390x" +# s390x, riscv64: ck on s390x does not have ck_pr_cas_8 (used by cyclone) +arch="all !s390x !riscv64" license="MIT" depends="!cyclone" makedepends="ck-dev" diff --git a/community/cyclone/APKBUILD b/community/cyclone/APKBUILD index 1fcbd3aea0d..33b71edb296 100644 --- a/community/cyclone/APKBUILD +++ b/community/cyclone/APKBUILD @@ -5,9 +5,9 @@ pkgver=0.36.0 pkgrel=0 pkgdesc="A compiler for application development with R7RS Scheme" url="https://justinethier.github.io/cyclone/" -# s390x: ck on s390x does not have ck_pr_cas_8 (used by cyclone) +# s390x, riscv64: ck on s390x does not have ck_pr_cas_8 (used by cyclone) # See: https://github.com/concurrencykit/ck/issues/178 -arch="all !s390x" +arch="all !s390x !riscv64" license="MIT" makedepends="ck-dev cyclone-bootstrap>=$pkgver" source="$pkgname-$pkgver.tar.gz::https://github.com/justinethier/cyclone/archive/refs/tags/v$pkgver.tar.gz" diff --git a/community/darkice/APKBUILD b/community/darkice/APKBUILD index 3d70a22bc2a..67185504135 100644 --- a/community/darkice/APKBUILD +++ b/community/darkice/APKBUILD @@ -14,6 +14,10 @@ source="https://github.com/rafael2k/darkice/releases/download/v$pkgver/darkice-$ darkice.confd gcc11.patch " +prepare() { + default_prepare + update_config_sub +} build() { ./configure \ diff --git a/community/darktable/APKBUILD b/community/darktable/APKBUILD index 66dde8c6f60..8921b0efad4 100644 --- a/community/darktable/APKBUILD +++ b/community/darktable/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=darktable pkgver=4.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Open source photography workflow application and raw developer" url="https://www.darktable.org/" # aarch64: not supported with gcc @@ -48,8 +48,9 @@ source="https://github.com/darktable-org/darktable/releases/download/release-$pk " build() { + local cmake_crossopts if [ "$CBUILD" != "$CHOST" ]; then - CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + cmake_crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -58,7 +59,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DBINARY_PACKAGE_BUILD=ON \ -DRAWSPEED_ENABLE_LTO=ON \ - $CMAKE_CROSSOPTS + $cmake_crossopts cmake --build build } diff --git a/community/datovka/APKBUILD b/community/datovka/APKBUILD index 5379c1ed101..80ea7de8e4a 100644 --- a/community/datovka/APKBUILD +++ b/community/datovka/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=datovka -pkgver=4.23.6 +pkgver=4.23.7 pkgrel=0 pkgdesc="A free graphical interface for Czech Databox" url="https://www.datovka.cz/" @@ -62,6 +62,6 @@ package() { } sha512sums=" -d6ee29914976939f79cdb5b45ec3915407dd1031b49273281d7110ad5d8eadc2e4f6dd0e0f08cec75123bbf1eb71289f70ab51db74fcfd18303afdcd1a1844d5 datovka-4.23.6.tar.xz +c4cf1f473bf9c5b8b1aba9d2caa133bb10efa7c4cf1cfbf91e6f8fa32fc8da80faa6496cc87cf0bfefd0877f1ad0fea7efa17025082b4551d223e68c7e12b722 datovka-4.23.7.tar.xz ff0d49238fa5e2bf7c6f22f09c23453bf7b39f4252285e86c8bfa140be76b4b82122d4c9548fb6ab6009a5d071b2195a64b2226b5e295ce5f8c11e83c74b4448 disable-test_crypto_pin_pwd.patch " diff --git a/community/davfs2/200-newer-neon.patch b/community/davfs2/200-newer-neon.patch new file mode 100644 index 00000000000..41f7115f90c --- /dev/null +++ b/community/davfs2/200-newer-neon.patch @@ -0,0 +1,11 @@ +--- a/configure.ac 2020-08-04 17:50:36.000000000 +0300 ++++ b/configure.ac 2021-10-24 05:03:11.871001342 +0300 +@@ -36,7 +36,7 @@ + # Checks for libraries. + AM_GNU_GETTEXT_VERSION(0.19.8) + AM_GNU_GETTEXT([external]) +-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32]) ++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32 33]) + DAV_CHECK_NEON + + # Checks for header files. diff --git a/community/davfs2/APKBUILD b/community/davfs2/APKBUILD index bd381d7a42f..163b7e36c28 100644 --- a/community/davfs2/APKBUILD +++ b/community/davfs2/APKBUILD @@ -15,6 +15,7 @@ subpackages="$pkgname-doc" source="https://download.savannah.gnu.org/releases/davfs2/davfs2-$pkgver.tar.gz 010-main_code_fix.patch 100-musl-compat.patch + 200-newer-neon.patch " prepare() { @@ -49,4 +50,5 @@ sha512sums=" 12f9eadd2049741b7cb61c5583be6c6982559e702e5cbd4767c655110187524d7afad0a6ff8ad00d457e194ad75b3ce391f5fe566fb4a0bbaed0a705caa3f163 davfs2-1.6.1.tar.gz 1d839b1435ae67209aae2501c1188880e991adece7b34b6b91d1fcba7390fd9d72d2aa7e057d03ed9f1519e682d0f0a8472c47ed64f78a25fe0f67c54a847ce3 010-main_code_fix.patch 66dd968d85a18d281d8a41e15b17f0344accfe44951fa17d1d5c9f9bb67442f4d1410adda144562fa45bd561837c486d24f98ac2a0da4800a1e7dd79126caec7 100-musl-compat.patch +6ca4e702c1778d659c4ba079252b0308a806ca607aa32c1a7390181831b7595c6633185b70639260fbfd1a13f89ddaf57e3f50c0fa69862f3fa087fc876c8651 200-newer-neon.patch " diff --git a/community/dbus-cpp/APKBUILD b/community/dbus-cpp/APKBUILD index e842fd14ee8..79020091af1 100644 --- a/community/dbus-cpp/APKBUILD +++ b/community/dbus-cpp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=dbus-cpp pkgver=5.0.3 -pkgrel=12 +pkgrel=13 pkgdesc="A header-only dbus-binding leveraging C++-11" url="https://gitlab.com/ubports/core/lib-cpp/dbus-cpp" arch="all" diff --git a/testing/delfin/APKBUILD b/community/delfin/APKBUILD index cc96f9fcf7f..0c8dc1337c2 100644 --- a/testing/delfin/APKBUILD +++ b/community/delfin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: fossdd <fossdd@pwned.life> # Maintainer: fossdd <fossdd@pwned.life> pkgname=delfin -pkgver=0.4.3 +pkgver=0.4.4 pkgrel=0 pkgdesc="Stream movies and TV shows from Jellyfin" url="https://delfin.avery.cafe/" @@ -47,6 +47,6 @@ package() { } sha512sums=" -e4f3eeb16c8c4e88b6899290764ad4cc59ba0729caef45a788ce02a3ac57319f0c3a16400438bfd2dd604c610aec68b7ef9eb97afc8d934dd14eb0d10d4071c5 delfin-0.4.3.tar.gz +6b48321bca2de86e74c3fcbb0fd072c1cdbc1d3ad9b59d323381b93ae4b3254c6c103e622e9b2452fa72a3e2ee38a0e9db00efef304f8eb201e254b82d90b2b2 delfin-0.4.4.tar.gz 2b3f51bf47e847a959545844c37921c612b4b91387f94ad6b1a146be2ce81615274ea6f245eb6b08f21c2d506a7af1f4bfd358feddeacf3623b08e087292fe63 cargo-auditable.patch " diff --git a/testing/delfin/cargo-auditable.patch b/community/delfin/cargo-auditable.patch index a1be67c6b5e..a1be67c6b5e 100644 --- a/testing/delfin/cargo-auditable.patch +++ b/community/delfin/cargo-auditable.patch diff --git a/community/deluge/APKBUILD b/community/deluge/APKBUILD index 414a01ed723..25af7e06e7f 100644 --- a/community/deluge/APKBUILD +++ b/community/deluge/APKBUILD @@ -1,9 +1,9 @@ # Contributor: August Klein <amatcoder@gmail.com> # Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch> -# Maintainer: +# Maintainer: fossdd <fossdd@pwned.life> pkgname=deluge pkgver=2.1.1 -pkgrel=9 +pkgrel=10 pkgdesc="lightweight, Free Software, cross-platform BitTorrent client" url="https://deluge-torrent.org/" arch="noarch" diff --git a/community/deno/APKBUILD b/community/deno/APKBUILD index 83e8c4ec400..9ce6018d844 100644 --- a/community/deno/APKBUILD +++ b/community/deno/APKBUILD @@ -71,7 +71,8 @@ builddir="$srcdir/deno" case "$CARCH" in # FIXME: one part of the testsuite fails to build ([smartstring 1.0.1] error[E0433]: failed to resolve: use of undeclared crate or module `alloc`) -aarch64) options="$options !check" ;; +# x86_64: deadlocks +aarch64|x86_64) options="$options !check" ;; esac # TODO: diff --git a/community/detenc/APKBUILD b/community/detenc/APKBUILD index cbb2746e91f..26bd8c03d7a 100644 --- a/community/detenc/APKBUILD +++ b/community/detenc/APKBUILD @@ -8,7 +8,9 @@ url="https://github.com/reevoo/detenc" arch="all" license="MIT" makedepends="ruby-rake ruby-minitest" -source="$pkgname-$pkgver.tar.gz::https://github.com/reevoo/$pkgname/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/reevoo/detenc/archive/v$pkgver.tar.gz + minitest.patch + " check() { make check @@ -23,4 +25,7 @@ package() { make PREFIX="$pkgdir" -C "$builddir" install } -sha512sums="b4c0dc71a699b2e30a345d641781bd58146be84a727e89dc9ef39da7ddb752659371ba8fc37b345c514b43f92723ef80c9bbe73c72a562a2729a1626ec3f53db detenc-2.0.0.tar.gz" +sha512sums=" +b4c0dc71a699b2e30a345d641781bd58146be84a727e89dc9ef39da7ddb752659371ba8fc37b345c514b43f92723ef80c9bbe73c72a562a2729a1626ec3f53db detenc-2.0.0.tar.gz +ebc1355df6b3649ca6616ee74f4423f8ad746ccc8efa54ff185fe524f6d60a4dbe6b0e72dac40abaf1e20f6e09785ab0d3041fc82dcb94594981ded107fffbcf minitest.patch +" diff --git a/community/detenc/minitest.patch b/community/detenc/minitest.patch new file mode 100644 index 00000000000..bc3b000ca45 --- /dev/null +++ b/community/detenc/minitest.patch @@ -0,0 +1,70 @@ +--- a/test/test_bom_detection.rb ++++ b/test/test_bom_detection.rb +@@ -1,6 +1,6 @@ + require_relative 'test_helper' + +-class BOMDetectionTest < MiniTest::Test ++class BOMDetectionTest < Minitest::Test + include DetencHelper + + SAMPLE = "Pâté: €3.20" +--- a/test/test_encoding_detection.rb ++++ b/test/test_encoding_detection.rb +@@ -1,6 +1,6 @@ + require_relative 'test_helper' + +-class EncodingDetectionTest < MiniTest::Test ++class EncodingDetectionTest < Minitest::Test + include DetencHelper + + SAMPLE = "Pâté: €3.20" +--- a/test/test_iso_8859_15.rb ++++ b/test/test_iso_8859_15.rb +@@ -1,6 +1,6 @@ + require_relative 'test_helper' + +-class ISO_8859_15_Test < MiniTest::Test ++class ISO_8859_15_Test < Minitest::Test + include DetencHelper + + INVALID_BYTES = (0x00..0x08).to_a + (0x0E..0x1F).to_a + (0x7F..0x9F).to_a +--- a/test/test_unknown_encoding.rb ++++ b/test/test_unknown_encoding.rb +@@ -1,6 +1,6 @@ + require_relative 'test_helper' + +-class UnknownEncodingTest < MiniTest::Test ++class UnknownEncodingTest < Minitest::Test + include DetencHelper + + def test_should_be_unknown_if_it_contains_all_bytes +--- a/test/test_us_ascii.rb ++++ b/test/test_us_ascii.rb +@@ -1,6 +1,6 @@ + require_relative 'test_helper' + +-class US_ASCII_Test < MiniTest::Test ++class US_ASCII_Test < Minitest::Test + include DetencHelper + + def test_should_be_us_ascii_if_it_contains_all_printable_bytes_under_0x7F +--- a/test/test_utf_8.rb ++++ b/test/test_utf_8.rb +@@ -1,6 +1,6 @@ + require_relative 'test_helper' + +-class UTF8StressTest < MiniTest::Test ++class UTF8StressTest < Minitest::Test + include DetencHelper + + # From Markus Kuhn's stress tests +--- a/test/test_windows_1252.rb ++++ b/test/test_windows_1252.rb +@@ -1,6 +1,6 @@ + require_relative 'test_helper' + +-class Windows1252Test < MiniTest::Test ++class Windows1252Test < Minitest::Test + include DetencHelper + + INVALID_BYTES = (0x00..0x08).to_a + (0x0E..0x1F).to_a + [0x7F, 0x81, 0x8D, 0x8F, 0x90, 0x9D] diff --git a/testing/dfu-util/APKBUILD b/community/dfu-util/APKBUILD index 3270781b3e1..3270781b3e1 100644 --- a/testing/dfu-util/APKBUILD +++ b/community/dfu-util/APKBUILD diff --git a/community/diffoscope/APKBUILD b/community/diffoscope/APKBUILD index 0064fdb2f1f..d5cb6ad1e15 100644 --- a/community/diffoscope/APKBUILD +++ b/community/diffoscope/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=diffoscope -pkgver=263 -pkgrel=1 +pkgver=266 +pkgrel=0 pkgdesc="In-depth comparison of files, archives, and directories" url="https://diffoscope.org/" arch="noarch" @@ -27,6 +27,7 @@ checkdepends=" py3-pytest py3-pytest-xdist unzip + xz " subpackages="$pkgname-pyc" source="https://salsa.debian.org/reproducible-builds/diffoscope/-/archive/$pkgver/diffoscope-$pkgver.tar.gz" @@ -55,5 +56,5 @@ package() { } sha512sums=" -e5c3372d83006eb8691f78571de8f7b0c02aa97341cbcbd81e6eaa35f603ed8ca2d28ed826ef758ce32f691846ac7016e078d8a9d9e2649b8056c7c3ed84a4b6 diffoscope-263.tar.gz +5a4e5d9f541c937d12030bfe8f002e7a72edcc71b7d4d25c08664548d589b1e97d6d8e913be2bcf17cb12b5940fb50b214a427644d5633ba564240858085eb05 diffoscope-266.tar.gz " diff --git a/community/digikam/APKBUILD b/community/digikam/APKBUILD index defbb6bd01e..d09ccd54e8d 100644 --- a/community/digikam/APKBUILD +++ b/community/digikam/APKBUILD @@ -5,12 +5,12 @@ # group=kde-other pkgname=digikam pkgver=8.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="An advanced open-source digital photo management application" url="https://www.digikam.org/" # armhf blocked by extra-cmake-modules -# riscv64, ppc64le and s390 blocked by akonadi-contacts, marble and opencv -arch="all !armhf !ppc64le !s390x !riscv64" +# riscv64, ppc64le, s390 and loongarch64 blocked by akonadi-contacts, marble and opencv +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" license="LGPL-2.1-or-later AND GPL-2.0-or-later" makedepends=" akonadi-contacts-dev diff --git a/community/dillo/APKBUILD b/community/dillo/APKBUILD index 9941f5010d6..0f7ab2cd451 100644 --- a/community/dillo/APKBUILD +++ b/community/dillo/APKBUILD @@ -1,10 +1,11 @@ # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=dillo -pkgver=3.1.0 -pkgrel=1 -pkgdesc="Very small and fast GUI web browser" -url="https://github.com/w00fpack/dilloNG" +pkgver=3.1.0_git20240506 +_gitrev=fc6a26c98fc7aa03db11cab1e3be2a52051650e4 +pkgrel=0 +pkgdesc="Fast and small graphical web browser" +url="https://github.com/dillo-browser/dillo" arch="all" license="GPL-3.0-or-later" depends="ca-certificates wget" @@ -15,17 +16,13 @@ makedepends=" libjpeg-turbo-dev libpng-dev libx11-dev - mbedtls-dev + openssl-dev zlib-dev " checkdepends="expect xvfb-run" subpackages="$pkgname-doc" -source="https://github.com/w00fpack/dilloNG/archive/refs/tags/Dillo${pkgver%.*}X/dillo-$pkgver.tar.gz - dillo.desktop - gcc-10.patch - mbedtls.patch - " -builddir="$srcdir/dilloNG-Dillo${pkgver%.*}X" +source="https://github.com/dillo-browser/dillo/archive/$_gitrev/dillo-browser-$_gitrev.tar.gz" +builddir="$srcdir/$pkgname-$_gitrev" options="net" # tests check HTTPS connectivity prepare() { @@ -46,7 +43,7 @@ build() { --enable-gif \ --enable-jpeg \ --enable-ipv6 \ - --enable-ssl \ + --enable-tls \ --with-ca-certs-dir=/etc/ssl/certs make @@ -56,19 +53,26 @@ check() { export DILLO_TESTBIN="${DILLO_TESTBIN:-"./src/dillo"}" export DILLO_TESTSITE="${DILLO_TESTSITE:-"alpinelinux.org"}" - $DILLO_TESTBIN --version + msg "Running tests for $($DILLO_TESTBIN --version)" + msg "Running Dillo HTTPS check" HOME="$srcdir" xvfb-run -a expect -f - <<-'END' set testsite $env(DILLO_TESTSITE) spawn $env(DILLO_TESTBIN) https://${testsite} set domain [lindex [split $testsite /] 0] expect { timeout { exit 1 } - -re [concat $domain {TLSv1.\d, cipher}] { + -re [concat $domain: {TLSv1.\d, cipher}] { exit 0 } } END + + msg "Running the Dillo test suite" + make check || { + cat test/html/test-suite.log + return 1 + } } package() { @@ -76,9 +80,6 @@ package() { install -Dm644 AUTHORS ChangeLog README NEWS \ -t "$pkgdir"/usr/share/doc/$pkgname/ - - install -Dm644 "$srcdir"/dillo.desktop \ - -t "$pkgdir"/usr/share/applications/ } doc() { @@ -86,13 +87,9 @@ doc() { install -dv "$pkgdir"/usr/share/doc/$pkgname mv -vt "$pkgdir"/usr/share/doc/$pkgname/ \ - "$subpkgdir"/usr/share/doc/$pkgname/db?.png \ - "$subpkgdir"/usr/share/doc/$pkgname/speeddial* + "$subpkgdir"/usr/share/doc/$pkgname/user_help.html } sha512sums=" -68a69f4fe4152bd8673ff6accfda741fa6391b188580df08513d1cf1d915a74f635de1ecdebefd0c3e6ab908150c1189114ca57dfad1f7826d1405f46bea21e4 dillo-3.1.0.tar.gz -393a749d33f78e4c8a99c0c94a9708b26d235356f0c8dfa942af4e8da7eb9aa2453911894461714986449dfd15a4b492ef9071fac6b230f52a8f2e562f1bf016 dillo.desktop -7cb0e73fd26028ad85edbf2c9ca86dd47728b6447ef10ede293fc0de11497f900d0a1f9ee90d4bf1a2e9137a4cebe96a491f3024bdb281ec7f7b68ea7a200ad6 gcc-10.patch -22a5397737a6163566dec0cd280afe77359f2c7b718ad21c9d28a37a42b88de266edfed6665053ed0ea5272920b95b76d3bfa22e0a067dc458a88a33280571af mbedtls.patch +31c468390383775b396c7dbb49db9fe430912e272de3bb1816065497b38a01913e3635ef02ed45450441241e270b01d4b061e7f7add73a8202c07f6bb85404cd dillo-browser-fc6a26c98fc7aa03db11cab1e3be2a52051650e4.tar.gz " diff --git a/community/dillo/dillo.desktop b/community/dillo/dillo.desktop deleted file mode 100644 index 83c34448cec..00000000000 --- a/community/dillo/dillo.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Dillo -GenericName=Web Browser -Comment=Very small and fast GUI web browser -Exec=dillo -Icon=dillo -Terminal=false -Type=Application -Categories=Network;GTK;WebBrowser; diff --git a/community/dillo/gcc-10.patch b/community/dillo/gcc-10.patch deleted file mode 100644 index b027a570140..00000000000 --- a/community/dillo/gcc-10.patch +++ /dev/null @@ -1,102 +0,0 @@ -Taken from Gentoo - ---- a/dpid/dpid.c -+++ b/dpid/dpid.c -@@ -41,6 +41,26 @@ - volatile sig_atomic_t caught_sigchld = 0; - char *SharedKey = NULL; - -+char *srs_name; -+ -+/*! dpid's service request socket file descriptor */ -+int srs_fd; -+ -+/*! Number of available plugins */ -+int numdpis; -+ -+/*! Number of sockets being watched */ -+int numsocks; -+ -+/*! State information for each plugin. */ -+struct dp *dpi_attr_list; -+ -+/*! service served for each plugin */ -+Dlist *services_list; -+ -+/*! Set of sockets watched for connections */ -+fd_set sock_set; -+ - /*! Remove dpid_comm_keys file. - * This avoids that dillo instances connect to a stale port after dpid - * has exited (e.g. after a reboot). ---- a/dpid/dpid.h -+++ b/dpid/dpid.h -@@ -25,10 +25,10 @@ - - /*! \TODO: Should read this from dillorc */ - #define SRS_NAME "dpid.srs" --char *srs_name; -+extern char *srs_name; - - /*! dpid's service request socket file descriptor */ --int srs_fd; -+extern int srs_fd; - - /*! plugin state information - */ -@@ -49,19 +49,19 @@ - }; - - /*! Number of available plugins */ --int numdpis; -+extern int numdpis; - - /*! Number of sockets being watched */ --int numsocks; -+extern int numsocks; - - /*! State information for each plugin. */ --struct dp *dpi_attr_list; -+extern struct dp *dpi_attr_list; - - /*! service served for each plugin */ --Dlist *services_list; -+extern Dlist *services_list; - - /*! Set of sockets watched for connections */ --fd_set sock_set; -+extern fd_set sock_set; - - /*! Set to 1 by the SIGCHLD handler dpi_sigchld */ - extern volatile sig_atomic_t caught_sigchld; ---- a/dpid/dpid_common.c -+++ b/dpid/dpid_common.c -@@ -14,6 +14,9 @@ - #include <unistd.h> - #include "dpid_common.h" - -+/*! Error codes for dpid */ -+dpi_errno_t dpi_errno; -+ - /* - * Send a verbose error message. - */ ---- a/dpid/dpid_common.h -+++ b/dpid/dpid_common.h -@@ -35,12 +35,13 @@ - #define CKD_WRITE(fd, msg) ckd_write(fd, msg, __FILE__, __LINE__) - #define CKD_CLOSE(fd) ckd_close(fd, __FILE__, __LINE__) - -- - /*! Error codes for dpid */ --enum { -+typedef enum { - no_errors, - dpid_srs_addrinuse /* dpid service request socket address already in use */ --} dpi_errno; -+} dpi_errno_t; -+ -+extern dpi_errno_t dpi_errno; - - /*! Intended for identifying dillo plugins - * and related files diff --git a/community/dillo/mbedtls.patch b/community/dillo/mbedtls.patch deleted file mode 100644 index f5d3e8a4274..00000000000 --- a/community/dillo/mbedtls.patch +++ /dev/null @@ -1,113 +0,0 @@ -Adapted from https://github.com/dillo-browser/dillo/commit/7357e0ee1e8ae1ee9259a3181e400db0d570362b - - ---- a/src/IO/tls.c -+++ b/src/IO/tls.c -@@ -49,7 +49,11 @@ - #include <mbedtls/error.h> - #include <mbedtls/oid.h> - #include <mbedtls/x509.h> -+#if MBEDTLS_VERSION_NUMBER < 0x03000000 - #include <mbedtls/net.h> /* net_send, net_recv */ -+#else -+#include <mbedtls/net_sockets.h> /* net_send, net_recv */ -+#endif - - #define CERT_STATUS_NONE 0 - #define CERT_STATUS_RECEIVING 1 -@@ -98,6 +102,9 @@ - - static void Tls_handshake_cb(int fd, void *vconnkey); - -+/* Moved to ssl_ciphersuites_internal.h in mbedtls 3.6.0 */ -+int mbedtls_ssl_ciphersuite_uses_psk(const mbedtls_ssl_ciphersuite_t *info); -+ - /* - * Compare by FD. - */ -@@ -383,6 +390,15 @@ - MBEDTLS_SSL_PRESET_DEFAULT); - mbedtls_ssl_conf_cert_profile(&ssl_conf, &prof); - -+/* -+ * TLSv1.3 brings some changes, among them, having to call -+ * psa_crypto_init(), and a new way of resuming sessions, -+ * which is not currently supported by the code here. -+ */ -+#if defined(MBEDTLS_SSL_PROTO_TLS1_3) -+ mbedtls_ssl_conf_max_tls_version(&ssl_conf, MBEDTLS_SSL_VERSION_TLS1_2); -+#endif -+ - /* - * There are security concerns surrounding session tickets -- - * wrecking forward security, for instance. -@@ -618,15 +634,23 @@ - */ - static void Tls_cert_bad_hash(const mbedtls_x509_crt *cert, Dstr *ds) - { -- const char *hash = (cert->sig_md == MBEDTLS_MD_MD5) ? "MD5" : -- (cert->sig_md == MBEDTLS_MD_MD4) ? "MD4" : -- (cert->sig_md == MBEDTLS_MD_MD2) ? "MD2" : -- (cert->sig_md == MBEDTLS_MD_SHA1) ? "SHA1" : -- (cert->sig_md == MBEDTLS_MD_SHA224) ? "SHA224" : -- (cert->sig_md == MBEDTLS_MD_RIPEMD160) ? "RIPEMD160" : -- (cert->sig_md == MBEDTLS_MD_SHA256) ? "SHA256" : -- (cert->sig_md == MBEDTLS_MD_SHA384) ? "SHA384" : -- (cert->sig_md == MBEDTLS_MD_SHA512) ? "SHA512" : -+#if MBEDTLS_VERSION_NUMBER < 0x03000000 -+ mbedtls_md_type_t md = cert->sig_md; -+#else -+ mbedtls_md_type_t md = cert->MBEDTLS_PRIVATE(sig_md); -+#endif -+ const char *hash = (md == MBEDTLS_MD_MD5) ? "MD5" : -+ (md == MBEDTLS_MD_SHA1) ? "SHA1" : -+ (md == MBEDTLS_MD_SHA224) ? "SHA224" : -+ (md == MBEDTLS_MD_RIPEMD160) ? "RIPEMD160" : -+ (md == MBEDTLS_MD_SHA256) ? "SHA256" : -+ (md == MBEDTLS_MD_SHA384) ? "SHA384" : -+ (md == MBEDTLS_MD_SHA512) ? "SHA512" : -+#if MBEDTLS_VERSION_NUMBER < 0x03000000 -+/* In version 3, these are removed: */ -+ (md == MBEDTLS_MD_MD4) ? "MD4" : -+ (md == MBEDTLS_MD_MD2) ? "MD2" : -+#endif - "Unrecognized"; - - dStr_sprintfa(ds, "This certificate's hash algorithm is not accepted " -@@ -934,7 +958,12 @@ - return; - } - -- if (conn->ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER) { -+#if MBEDTLS_VERSION_NUMBER < 0x03000000 -+ int ssl_state = conn->ssl->state; -+#else -+ int ssl_state = conn->ssl->MBEDTLS_PRIVATE(state); -+#endif -+ if (ssl_state != MBEDTLS_SSL_HANDSHAKE_OVER) { - ret = mbedtls_ssl_handshake(conn->ssl); - - if (ret == MBEDTLS_ERR_SSL_WANT_READ || -@@ -977,16 +1006,22 @@ - * soon, unless there are radical changes". It seems to be the best of - * the alternatives. - */ -+#if MBEDTLS_VERSION_NUMBER < 0x03000000 - Tls_fatal_error_msg(conn->ssl->in_msg[1]); -+#else -+ Tls_fatal_error_msg(conn->ssl->MBEDTLS_PRIVATE(in_msg[1])); -+#endif - } else if (ret == MBEDTLS_ERR_SSL_INVALID_RECORD) { - MSG("mbedtls_ssl_handshake() failed upon receiving 'an invalid " - "record'.\n"); - } else if (ret == MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE) { - MSG("mbedtls_ssl_handshake() failed: 'The requested feature is not " - "available.'\n"); -+#if MBEDTLS_VERSION_NUMBER < 0x03000000 - } else if (ret == MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE) { - MSG("mbedtls_ssl_handshake() failed: 'Processing of the " - "ServerKeyExchange handshake message failed.'\n"); -+#endif - } else if (ret == MBEDTLS_ERR_SSL_CONN_EOF) { - MSG("mbedtls_ssl_handshake() failed: Read EOF. Connection closed by " - "server.\n"); diff --git a/community/discover/APKBUILD b/community/discover/APKBUILD index daacaaec372..065a49006b0 100644 --- a/community/discover/APKBUILD +++ b/community/discover/APKBUILD @@ -4,13 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=discover -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="KDE Plasma resources management GUI" url="https://userbase.kde.org/Discover" # armhf blocked by qt5-qtdeclarative -# ppc64le, riscv64 and s390x blocked by purpose -arch="all !armhf !ppc64le !riscv64 !s390x" +# ppc64le, riscv64, loongarch64 and s390x blocked by purpose +arch="all !armhf !ppc64le !riscv64 !s390x !loongarch64" license="LGPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND GFDL-1.2-only" depends=" kirigami @@ -52,8 +52,8 @@ checkdepends="xvfb-run" # - CVE-2021-28117 case "$pkgver" in - *.90*) _rel=unstable;; - *) _rel=stable;; +*.90*) _rel=unstable ;; +*) _rel=stable ;; esac _repo_url="https://invent.kde.org/plasma/discover.git" source="https://download.kde.org/$_rel/plasma/$pkgver/discover-$pkgver.tar.xz @@ -61,17 +61,20 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/discover-$pkgver.tar.xz alpine-appstream-data.json alpine-linux-logo-icon.png " -subpackages="$pkgname-backend-flatpak:backend_flatpak $pkgname-backend-apk:backend_apk $pkgname-lang" +subpackages="$pkgname-backend-flatpak:backend_flatpak $pkgname-backend-apk:backend_apk $pkgname-lang $pkgname-dbg" case "$CARCH" in - x86|x86_64|armv7|aarch64) - makedepends="$makedepends fwupd-dev" - subpackages="$subpackages $pkgname-backend-fwupd:backend_fwupd" - ;; - *) ;; +x86|x86_64|armv7|aarch64) + makedepends="$makedepends fwupd-dev" + subpackages="$subpackages $pkgname-backend-fwupd:backend_fwupd" + ;; +*) ;; esac build() { + # -g1: doesn't have any impact on the debug symbol size in this case + export CFLAGS="$CFLAGS -g1" + export CXXFLAGS="$CXXFLAGS -g1" cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -124,14 +127,14 @@ backend_apk() { # JSON file contains placeholder for replacement - @CARCH@ sed -i "s/@CARCH@/$CARCH/g" "$srcdir"/alpine-appstream-data.json install -Dm644 "$srcdir"/alpine-appstream-data.json \ - "$subpkgdir"/usr/share/libdiscover/external-appstream-urls/alpine-appstream-data.json + "$subpkgdir"/usr/share/libdiscover/external-appstream-urls/alpine-appstream-data.json install -Dm644 -t "$subpkgdir"/usr/share/icons/hicolor/32x32/apps/ \ - "$srcdir"/alpine-linux-logo-icon.png + "$srcdir"/alpine-linux-logo-icon.png } sha512sums=" -cc9ae7bbcfcdf306a1dbea83f45167fe8ec207dfffa8eaa7bfe764fda56a6cd1f8c0b56ef78104e0df4d0183950de5810aa039e56c732830d7a0de921950c330 discover-6.0.3.tar.xz +cf63b5c1ce1d0b229765ab62bb728b0ac34dee01600a7352f83058dab5216a97c77f5d31e14ae7ba8f9211319512759d4ff603e86d16d0724db6c2d0cb677a74 discover-6.0.4.tar.xz 51bec35bcfb1330fc0eb08dc15eb7d385ca0250a5976880a2070d27d05e18d091b3081ae7f0872c234998f6209e0d375c86de9d1fc3058eea0d08c71fce38dd2 0001-apk-support.patch d9cc12a5a92df820d6d133a3698a4fbb08a97f08f00554a11d87c73c6144b42d07cecd6682bf9576d83c8e2556e35ade2fb39e77895afbbe33e2f94630441bb7 alpine-appstream-data.json 0766668630cb14f58c840ebdda8b76bd1dec98b4dd61469677d4ad6eb4966809a25dbec2a846502cad0391df5b6ca9d692bb857a6fa203b61a52e6ac044cfbf4 alpine-linux-logo-icon.png diff --git a/community/distrobox/APKBUILD b/community/distrobox/APKBUILD index 0cb9f28f96b..d7dd40426dc 100644 --- a/community/distrobox/APKBUILD +++ b/community/distrobox/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=distrobox -pkgver=1.7.0.1 +pkgver=1.7.2.0 pkgrel=0 pkgdesc="Use any Linux distribution inside your terminal" url="https://distrobox.privatedns.org/" @@ -22,5 +22,5 @@ package() { } sha512sums=" -971a3f15216d2dfa2829a1ea085c7579c4f0bf0e57678474f83df05ae8c897db8a8cd477a429d0126cad11ac0379029b9c759944cea8649971e67f20a3e18328 distrobox-1.7.0.1.tar.gz +ae5c9ef7ee63beec6b99488091cdb5bc73dfb219988a71c624af2278ea2efc775895ae2106c6bc35783a317b5b3e92fceed2fdba5be05f94028d28a7a2fb8ce1 distrobox-1.7.2.0.tar.gz " diff --git a/community/dk/APKBUILD b/community/dk/APKBUILD index 5942e727e9e..982c748e725 100644 --- a/community/dk/APKBUILD +++ b/community/dk/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Matthew T Hoare <matthew.t.hoare@gmail.com> # Maintainer: Matthew T Hoare <matthew.t.hoare@gmail.com> pkgname=dk -pkgver=2.1 -_commit=d6d5b1a74d9a +pkgver=2.2 +_commit=72dcbf6df691 pkgrel=0 pkgdesc="tiling window manager taking inspiration from dwm, bspwm, and xmonad" url="https://bitbucket.org/natemaia/dk" @@ -15,6 +15,7 @@ makedepends=" xcb-util-keysyms-dev xcb-util-wm-dev " +depends_doc="jq" # scripts use this since v2.2 options="!check" # no tests install="$pkgname.post-install" subpackages="$pkgname-doc" @@ -33,5 +34,5 @@ package() { } sha512sums=" -b695f256eacfe22fc86e1d05f3fc3f270d8bb4874b4282e778b5e2b9732d68b1fc91dc6373159e1ad2338c3ebabb6cdb33a29c65432b7f229100b6d40d696350 dk-2.1.tar.gz +3fc8a6d3ae46dbf6f802bf4f4efe274790a77aaf75858ffb32a38042e76a2846b032c0017047ad6a681a3247098fb76a12d2e9e3b4efa9c609182c1c8f5d4d81 dk-2.2.tar.gz " diff --git a/community/dnsdist/APKBUILD b/community/dnsdist/APKBUILD index 49ab9c7e432..0037e450693 100644 --- a/community/dnsdist/APKBUILD +++ b/community/dnsdist/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Peter van Dijk <peter.van.dijk@powerdns.com> pkgname=dnsdist -pkgver=1.9.3 +pkgver=1.9.4 pkgrel=0 pkgdesc="dnsdist is a highly DNS-, DoS-, and abuse-aware loadbalancer." url="https://dnsdist.org/" @@ -32,7 +32,7 @@ builddir="$srcdir/$pkgname-${pkgver//_/-}" [ "$CARCH" = "ppc64le" ] && options="!check" # failing tests case "$CARCH" in -ppc64le|riscv64) +ppc64le|riscv64|loongarch64) _luajit=OFF ;; *) @@ -42,6 +42,10 @@ ppc64le|riscv64) ;; esac +# secfixes: +# 1.9.4-r0: +# - CVE-2024-25581 + prepare() { default_prepare if [ "$_luajit" = "ON" ]; then @@ -126,5 +130,5 @@ luajit() { } sha512sums=" -26b4fa70c1ad70e21d86cc51389bffacbfecedd769e2bb39f376d1dc85491c9eddbd1aea1e4a9bd08d05fc58c2f1fc906d1ff19c8dfd653a779f4171242a546f dnsdist-1.9.3.tar.bz2 +e013fa3e582cc30d104a66ee44eec50dd1d04cb2bd0dc5b3c9dfec95f3e0e5f3da5f2a1bb9a713b50e5659908669957fe4deb5b1ca10f728e6ceaf550a3223ef dnsdist-1.9.4.tar.bz2 " diff --git a/community/dnsrecon/APKBUILD b/community/dnsrecon/APKBUILD index 81d062c7c37..60c358a9fab 100644 --- a/community/dnsrecon/APKBUILD +++ b/community/dnsrecon/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=dnsrecon -pkgver=1.1.5 -pkgrel=2 +pkgver=1.2.0 +pkgrel=0 pkgdesc="DNS Enumeration Script" url="https://github.com/darkoperator/dnsrecon" arch="noarch" @@ -37,5 +37,5 @@ package() { } sha512sums=" -c28d8865b336ac09ab4229f858cd4c1b0a248408f4f60a86e0976475c5bbb86f8d1185e08c288cad0977b777b42c7cf0d8da468a985317a2fe23cc6ca81fbff0 dnsrecon-1.1.5.tar.gz +2b178a2618f1f7b0bfd17dc3fec652df9042a219a8dc0cd157db07502e6bafad8e0971380d75a473cf3af2fde37f798ac1bcf2a1b8a512715cbb8b991ae59c9b dnsrecon-1.2.0.tar.gz " diff --git a/community/docker-cli-buildx/APKBUILD b/community/docker-cli-buildx/APKBUILD index 3e838f66cf8..1b86f10a1e5 100644 --- a/community/docker-cli-buildx/APKBUILD +++ b/community/docker-cli-buildx/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Jake Buchholz Göktürk <tomalok@gmail.com> # Maintainer: Jake Buchholz Göktürk <tomalok@gmail.com> pkgname=docker-cli-buildx -pkgver=0.13.1 -pkgrel=1 -_commit=788433953af10f2a698f5c07611dddce2e08c7a0 +pkgver=0.14.0 +pkgrel=0 +_commit=171fcbeb69d67c90ba7f44f41a9e418f6a6ec1da pkgdesc="A Docker CLI plugin for extended build capabilities" url="https://docs.docker.com/engine/reference/commandline/buildx_build" arch="all" @@ -40,5 +40,5 @@ package() { } sha512sums=" -51b1456ea76e51ed225a6d67b8abd0462950aefef781f619f676cd4a880eb6818efb98fcb89997a766ec95490a7035627e53bd56960c35ea1955345e5f743c06 buildx-0.13.1.tar.gz +bc09f29096cfd08c60efd8fca7976a1db896f0ed08d33dfc64dfca2c6487a1dc1722b3fe80b6a175ebebeacf8b460bcc214806d0c7a637f17ed5d09793d8c9d8 buildx-0.14.0.tar.gz " diff --git a/community/docker-cli-compose/APKBUILD b/community/docker-cli-compose/APKBUILD index f67f88a3125..bbbe3bbcd8a 100644 --- a/community/docker-cli-compose/APKBUILD +++ b/community/docker-cli-compose/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jake Buchholz Göktürk <tomalok@gmail.com> # Maintainer: Jake Buchholz Göktürk <tomalok@gmail.com> pkgname=docker-cli-compose -pkgver=2.26.1 +pkgver=2.27.0 pkgrel=0 pkgdesc="Docker CLI plugin for extended build capabilities" url="https://docs.docker.com/compose/cli-command" @@ -50,5 +50,5 @@ package() { } sha512sums=" -4a97326c6ed974400aca91a64e93ef0e1fa6b52f988f636b8bbcb43e14442c6702e2d42afda3e491a9da18176448f342ebae7212bf59617372295d831beb8aba docker-cli-compose-2.26.1.tar.gz +f31627a00002416be6fb4343434d6b1e2b5d275a484ede505406bdbe65c73d61b497e849bb3645900dbb4eb3b7e638976253109b01d67776deed2a95950e3630 docker-cli-compose-2.27.0.tar.gz " diff --git a/community/docker-registry/APKBUILD b/community/docker-registry/APKBUILD index 930e49cbd5b..8161a83538f 100644 --- a/community/docker-registry/APKBUILD +++ b/community/docker-registry/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Christian Kampka <christian@kampka.net> # Contributor: Jakub Jirutka <jakub@jirutka.cz> -# Maintainer: +# Maintainer: fossdd <fossdd@pwned.life> pkgname=docker-registry pkgver=2.8.3 -pkgrel=3 +pkgrel=4 pkgdesc="An implementation of the Docker Registry HTTP API V2 for use with docker 1.6+" -url="https://github.com/distribution/distribution" +url="https://distribution.github.io/distribution" # riscv64: undefined syscall arch="all !riscv64" license="Apache-2.0" @@ -46,11 +46,13 @@ build() { } check() { - ./bin/registry --version + make test } package() { install -D -m755 bin/registry "$pkgdir"/usr/bin/$pkgname + install -D -m755 bin/digest "$pkgdir"/usr/bin/$pkgname-digest + install -D -m755 bin/registry-api-descriptor-template "$pkgdir"/usr/bin/$pkgname-api-descriptor-template install -D -m640 -o $pkgusers -g $pkggroups \ cmd/registry/config-example.yml "$pkgdir"/etc/$pkgname/config.yml diff --git a/community/docker-rootless-extras/APKBUILD b/community/docker-rootless-extras/APKBUILD deleted file mode 100644 index d8a2e25467a..00000000000 --- a/community/docker-rootless-extras/APKBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Maintainer: Hugo Osvaldo Barrera <hugo@whynothugo.nl> -pkgname=docker-rootless-extras -pkgver=25.0.3 -pkgrel=0 -pkgdesc="Extras to run docker as in rootless mode" -url="https://docs.docker.com/engine/security/rootless/" -arch="noarch" -license="Apache-2.0" -depends="docker rootlesskit slirp4netns fuse-overlayfs" -source=" - dockerd-rootless-$pkgver.sh::https://raw.githubusercontent.com/moby/moby/v$pkgver/contrib/dockerd-rootless.sh - docker-rootless-extras.conf - " -options="!check" # just a script with no tests - -package() { - install -Dm755 "$srcdir/dockerd-rootless-$pkgver.sh" "$pkgdir/usr/bin/dockerd-rootless" - install -Dm644 "$srcdir/docker-rootless-extras.conf" "$pkgdir/etc/modules-load.d/docker-rootless-extras.conf" -} - -sha512sums=" -a8229bc06ca831da18d20fa653a9b8645f1b3ac83051d249b2b33ae0f7af83dd50078c45aaedf69c86813da61be37254b784776c819648d3b4db9f251f51d0a0 dockerd-rootless-25.0.3.sh -45499bbd9d607cb782b014a2d5697d7279f327ac630accf249a13785d91e15fb0ba1ae2edc10b6b42fcf40b7ce23ef160a40d8cda17b3084d68fe8c54a84b8f4 docker-rootless-extras.conf -" diff --git a/community/docker/APKBUILD b/community/docker/APKBUILD index 6d5dc1d8a95..b6551e09bcd 100644 --- a/community/docker/APKBUILD +++ b/community/docker/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Jake Buchholz Göktürk <tomalok@gmail.com> # Maintainer: Jake Buchholz Göktürk <tomalok@gmail.com> pkgname=docker -pkgver=26.0.1 -_cli_commit=d260a54c81efcc3f00fe67dee78c94b16c2f8692 # https://github.com/docker/cli/commits/v$pkgver -_moby_commit=60b9add796ae6bcd25accbb36dc1394eac973ec9 # https://github.com/moby/moby/commits/v$pkgver -pkgrel=0 +pkgver=26.1.2 +_cli_commit=211e74b2407f24fd305907c8f90430a9f465df66 # https://github.com/docker/cli/commits/v$pkgver +_moby_commit=ef1912d8b6aec9fbc049002188be1fc0792f76d5 # https://github.com/moby/moby/commits/v$pkgver +pkgrel=1 pkgdesc="Pack, ship and run any application as a lightweight container" url="https://www.docker.io/" arch="all" @@ -17,6 +17,8 @@ options="net chmod-clean" install="$pkgname-engine.pre-install" # secfixes: +# 26.0.2-r0: +# - CVE-2024-32473 # 26.0.0-r0: # - CVE-2024-29018 # 25.0.2-r0: @@ -67,6 +69,7 @@ subpackages=" $pkgname-bash-completion $pkgname-fish-completion $pkgname-zsh-completion + $pkgname-rootless-extras:rootless " source=" @@ -74,6 +77,7 @@ source=" moby-$pkgver.tar.gz::https://github.com/moby/moby/archive/v$pkgver.tar.gz docker.initd docker.confd + docker-rootless-extras.conf " builddir="$srcdir" @@ -185,9 +189,20 @@ cli_doc() { install_if="docs $pkgname-cli=$pkgver-r$pkgrel" } +rootless() { + pkgdesc="Extras to run docker as in rootless mode" + url="https://docs.docker.com/engine/security/rootless/" + arch="noarch" + depends="$pkgname rootlesskit slirp4netns fuse-overlayfs" + + install -Dm755 "$srcdir/moby-$pkgver/contrib/dockerd-rootless.sh" "$subpkgdir/usr/bin/dockerd-rootless" + install -Dm644 "$srcdir/docker-rootless-extras.conf" "$subpkgdir/etc/modules-load.d/docker-rootless-extras.conf" +} + sha512sums=" -3ec952a9ae5b0da5ba9160c07a75819a9aaf2c74c58b8f9210c9a033d046318661a2f8fc548b14fd621437d2943cfde344e0033166ee4939a1b22aebf6f30e29 cli-26.0.1.tar.gz -65ddc01539202d23924933235bcafc7c9144d408be02dde321f1dc3de125cb0d007d30dd11cf7011ef784422bc5df7fc2bd4e973466373d168c12c13f07a6b3d moby-26.0.1.tar.gz +77189faeb7d07e7e75471f5483000b864337d2e82c36ae64f3b7e85a948bbbfd7ea004eac223256bd5f3cd8b2d12d31013e7a64c7b802b6598871374bfacdf02 cli-26.1.2.tar.gz +3222c396d474dd4a400849e32757967aeac485d9da87fc7869211638d3c262df29b98967317821108067d6ddd8aa984184d0a09c52ab384fc1a7840f9387ad15 moby-26.1.2.tar.gz dd499b92058fc4d7d19e0c9030b1f390f58ac40be423442732cb7d02067ed2e43c464511772a21d4f347ec34f037ddd00cc1243dc41c8ce85151ac6142611d61 docker.initd 43432a05e5776910d45364aee9070932aa89f70eb9e69d3b7ed8e17d9a70eaed4c8c29b3524888214c7ddba592399e781a72255f7eb8fafd80c9f532a9481fac docker.confd +45499bbd9d607cb782b014a2d5697d7279f327ac630accf249a13785d91e15fb0ba1ae2edc10b6b42fcf40b7ce23ef160a40d8cda17b3084d68fe8c54a84b8f4 docker-rootless-extras.conf " diff --git a/community/docker/add-seccomp-for-loongarch64.patch b/community/docker/add-seccomp-for-loongarch64.patch new file mode 100644 index 00000000000..3b5b69d7528 --- /dev/null +++ b/community/docker/add-seccomp-for-loongarch64.patch @@ -0,0 +1,91 @@ +diff --git a/moby-26.1.0/oci/fixtures/default.json b/moby-26.1.0/oci/fixtures/default.json +index 8d4d211..b63bfc9 100644 +--- a/moby-26.1.0/oci/fixtures/default.json ++++ b/moby-26.1.0/oci/fixtures/default.json +@@ -47,6 +47,10 @@ + "subArchitectures": [ + "SCMP_ARCH_S390" + ] ++ }, ++ { ++ "architecture": "SCMP_ARCH_LOONGARCH64", ++ "subArchitectures": null + } + ], + "syscalls": [ +@@ -810,4 +814,4 @@ + "excludes": {} + } + ] +-} +\ No newline at end of file ++} +diff --git a/moby-26.1.0/profiles/seccomp/default.json b/moby-26.1.0/profiles/seccomp/default.json +index c4d9110..3501693 100644 +--- a/moby-26.1.0/profiles/seccomp/default.json ++++ b/moby-26.1.0/profiles/seccomp/default.json +@@ -52,6 +52,10 @@ + { + "architecture": "SCMP_ARCH_RISCV64", + "subArchitectures": null ++ }, ++ { ++ "architecture": "SCMP_ARCH_LOONGARCH64", ++ "subArchitectures": null + } + ], + "syscalls": [ +@@ -830,4 +834,4 @@ + } + } + ] +-} +\ No newline at end of file ++} +diff --git a/moby-26.1.0/profiles/seccomp/default_linux.go b/moby-26.1.0/profiles/seccomp/default_linux.go +index 09fb337..c0c5e31 100644 +--- a/moby-26.1.0/profiles/seccomp/default_linux.go ++++ b/moby-26.1.0/profiles/seccomp/default_linux.go +@@ -39,6 +39,10 @@ func arches() []Architecture { + Arch: specs.ArchRISCV64, + SubArches: nil, + }, ++ { ++ Arch: specs.ArchLOONGARCH64, ++ SubArches: nil, ++ }, + } + } + +diff --git a/moby-26.1.0/profiles/seccomp/seccomp_linux.go b/moby-26.1.0/profiles/seccomp/seccomp_linux.go +index 4d8fed6..9eb0741 100644 +--- a/moby-26.1.0/profiles/seccomp/seccomp_linux.go ++++ b/moby-26.1.0/profiles/seccomp/seccomp_linux.go +@@ -41,6 +41,7 @@ var nativeToSeccomp = map[string]specs.Arch{ + "ppc64le": specs.ArchPPC64LE, + "s390": specs.ArchS390, + "s390x": specs.ArchS390X, ++ "loong64": specs.ArchLOONGARCH64, + } + + // GOARCH => libseccomp string +@@ -59,6 +60,7 @@ var goToNative = map[string]string{ + "ppc64le": "ppc64le", + "s390": "s390", + "s390x": "s390x", ++ "loong64": "loong64", + } + + // inSlice tests whether a string is contained in a slice of strings or not. +diff --git a/moby-26.1.0/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go b/moby-26.1.0/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go +index 4e7717d..96e04af 100644 +--- a/moby-26.1.0/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go ++++ b/moby-26.1.0/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go +@@ -741,6 +741,7 @@ const ( + ArchPARISC Arch = "SCMP_ARCH_PARISC" + ArchPARISC64 Arch = "SCMP_ARCH_PARISC64" + ArchRISCV64 Arch = "SCMP_ARCH_RISCV64" ++ ArchLOONGARCH64 Arch = "SCMP_ARCH_LOONGARCH64" + ) + + // LinuxSeccompAction taken upon Seccomp rule match diff --git a/community/docker-rootless-extras/docker-rootless-extras.conf b/community/docker/docker-rootless-extras.conf index fc2e5be0435..fc2e5be0435 100644 --- a/community/docker-rootless-extras/docker-rootless-extras.conf +++ b/community/docker/docker-rootless-extras.conf diff --git a/community/doctl/APKBUILD b/community/doctl/APKBUILD index a1fdf715057..4de501e5132 100644 --- a/community/doctl/APKBUILD +++ b/community/doctl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Will Sinatra <wpsinatra@gmail.com> # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=doctl -pkgver=1.105.0 -pkgrel=1 +pkgver=1.106.0 +pkgrel=0 pkgdesc="Official command line interface for the DigitalOcean API" url="https://github.com/digitalocean/doctl" license="Apache-2.0" @@ -58,6 +58,6 @@ package() { } sha512sums=" -3001347390d0fdedb9c035bacf5e914b81be16c6bf0bfee6b590f25b08696a4fea0c4ea9a93c959fff81379762d35b07dc74af12e6a97097fa575d1a6a19bb90 doctl-1.105.0.tar.gz +8966fe540ee425f4b14196f01518a4168c9c2cea1002bc39d311d3552aa6de80a2edf82639c445a9bcc69c2fb08b0e8464e19d577fb4156e3e7050f1eaf6aca8 doctl-1.106.0.tar.gz 3fa9d1668136d3c24922da611f8c27f0eb69d14516c8c4e2bceef161aeadaa0d3bfe5ca562a278a7c56791dd5dbfbbaa8bc2a87235772bd5c455cd46c7654078 enable-cgo-in-tests.patch " diff --git a/community/domoticz/APKBUILD b/community/domoticz/APKBUILD index 64e6b68f893..5343fb395e9 100644 --- a/community/domoticz/APKBUILD +++ b/community/domoticz/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Johannes Heimansberg <git@jhe.dedyn.io> pkgname=domoticz pkgver=2024.4 -pkgrel=1 +pkgrel=2 pkgdesc="Open source Home Automation System" url="https://www.domoticz.com/" arch="all" diff --git a/testing/dosbox-staging/APKBUILD b/community/dosbox-staging/APKBUILD index d6f4d1d89ed..700467176ef 100644 --- a/testing/dosbox-staging/APKBUILD +++ b/community/dosbox-staging/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=dosbox-staging -pkgver=0.81.0 +pkgver=0.81.1 pkgrel=0 pkgdesc="revitalized dosbox DOS-emulator" url="https://dosbox-staging.github.io/" @@ -9,7 +9,6 @@ license="GPL-2.0-or-later" options="!check" # no test provides="dosbox" replaces="dosbox" -depends="!dosbox" # dosbox provides same binary in /usr/bin/dosbox makedepends=" cmake meson @@ -45,5 +44,5 @@ package() { } sha512sums=" -96257602b0133ec78fbc7bd5803404d91abf673172e97319067a0f3f97db8860ae6d4771bb03cff5b73e033f220cb4fa6cd778cf549a9bc63e3550def9aa8797 dosbox-staging-0.81.0.tar.gz +6856612dc45ec768cd5bb73a1e5d9a351ff779e1c74de2389675c0f5fe4276037eea4e953d1d38387d5e8c8d88f109805ec0fdeed144d0814662b0c5de2ae287 dosbox-staging-0.81.1.tar.gz " diff --git a/community/dosbox/APKBUILD b/community/dosbox/APKBUILD deleted file mode 100644 index 41dbdb48756..00000000000 --- a/community/dosbox/APKBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# Maintainer: Milan P. Stanić <mps@arvanta.net> -pkgname=dosbox -_pkgver=0.74-3 -pkgver=${_pkgver/-/\.} -pkgrel=2 -pkgdesc="DOS-emulator that uses SDL-library" -url="https://www.dosbox.com/" -arch="all !x86" # textrel issue on x86 -license="GPL-2.0-or-later" -makedepends=" - alsa-lib - expat-dev - libpng-dev - libx11-dev - libxau-dev - libxcb-dev - libdrm-dev - libxext-dev - libxfixes-dev - libxdamage-dev - libxxf86vm-dev - libxshmfence-dev - mesa-dev - sdl12-compat-dev - zlib-dev - " - -subpackages="$pkgname-doc" -source="https://downloads.sourceforge.net/dosbox/dosbox-$_pkgver.tar.gz" -builddir="$srcdir/"$pkgname-$_pkgver - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --disable-opengl - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" install -} - -sha512sums="3770f1578e71730168fba01809585f2a05cf8c4d420524687ba28791d242faad294401bb9cd268bba725798e1db853551f274dc00a4024331f5dcef9f87f8f5f dosbox-0.74-3.tar.gz" diff --git a/community/dotool/APKBUILD b/community/dotool/APKBUILD index 05d74a320e7..a57ecfc8187 100644 --- a/community/dotool/APKBUILD +++ b/community/dotool/APKBUILD @@ -1,8 +1,8 @@ # Contributor: John Gebbie <me@johngebbie.com> # Maintainer: John Gebbie <me@johngebbie.com> pkgname=dotool -pkgver=1.4 -pkgrel=2 +pkgver=1.5 +pkgrel=0 pkgdesc="Command to simulate input anywhere (X11, Wayland, TTYs)" url="https://sr.ht/~geb/dotool" arch="all" @@ -13,7 +13,7 @@ subpackages="$pkgname-doc $pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~geb/dotool/archive/$pkgver.tar.gz dotoold.initd " -options="!check" # no test suite +options="!check net" # no test suite export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -33,6 +33,6 @@ package() { } sha512sums=" -9bf735365f6b5dd41473134cca1efaecf702b8733ca5026ac1b568ff4e2168c9120d35c3da5296002d16bd5d2af9910c0011a501d3628059f77221e3de51e362 dotool-1.4.tar.gz +f37c88984c1f87c4a9220d155498a79e63db12909325da6d673aeb9e872264473a18a67a7b2ac106fe36593bc7a5d34250716f675f517154de78023061faee7f dotool-1.5.tar.gz 2d2744d75178aa57c653c5bdc6370caa205d96525f9aa6e5480c6c98c6f3528f0a4eb8997eb1d85acfadf97e790937244b017f5cc7981f2000908619b64dfed1 dotoold.initd " diff --git a/community/dovecot-fts-xapian/APKBUILD b/community/dovecot-fts-xapian/APKBUILD index 0e0340fabb4..f645d690542 100644 --- a/community/dovecot-fts-xapian/APKBUILD +++ b/community/dovecot-fts-xapian/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=dovecot-fts-xapian -pkgver=1.7.10 +pkgver=1.7.11 pkgrel=0 pkgdesc="Dovecot xapian fts plugin" url="https://github.com/grosjo/fts-xapian" @@ -9,7 +9,7 @@ arch="all" license="LGPL-2.1-or-later" depends="dovecot xapian-core" makedepends="autoconf automake chrpath dovecot-dev icu-dev libtool sqlite-dev xapian-core-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/grosjo/fts-xapian/archive/$pkgver.tar.gz" +source="$pkgname-$pkgver-1.tar.gz::https://github.com/grosjo/fts-xapian/archive/$pkgver.tar.gz" builddir="$srcdir/"fts-xapian-$pkgver prepare() { @@ -34,5 +34,5 @@ package() { } sha512sums=" -3844233fd6c0de6d1b7c13e116fc82157324dfc799fcabc766b860c270448a624263533f142566748a4bab2aa1043b3030d7f4795afd4046f10c2a41970cf250 dovecot-fts-xapian-1.7.10.tar.gz +60590be20c92997f663368c088a062d639b8251550637cdda651294ee384b9300367ad583a5ff1808c0fb954cb49f656a3ece312a9f6d69f41f32fe812e24c71 dovecot-fts-xapian-1.7.11-1.tar.gz " diff --git a/community/drawterm/APKBUILD b/community/drawterm/APKBUILD index f74168e0835..e0da23864e5 100644 --- a/community/drawterm/APKBUILD +++ b/community/drawterm/APKBUILD @@ -6,7 +6,7 @@ pkgver=0_git20240320 pkgrel=0 pkgdesc="Connect to Plan 9 CPU servers from other operating systems" url="https://git.9front.org/plan9front/drawterm" -arch="all !armhf !armv7 !s390x" +arch="all !armhf !armv7 !s390x !loongarch64" license="LPL-1.02" options="!check" # upstream does not have a test suite makedepends="linux-headers libx11-dev libxt-dev" diff --git a/community/drkonqi/APKBUILD b/community/drkonqi/APKBUILD index 7400ff61bcf..147a1c3fff7 100644 --- a/community/drkonqi/APKBUILD +++ b/community/drkonqi/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=drkonqi -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="The KDE crash handler" # armhf blocked by extra-cmake-modules @@ -70,5 +70,5 @@ package() { } sha512sums=" -32d30f332215988dd945787c53485e3068b3e69d4d004df421ade30ccf0cf10dc570fb5539ca73c68b4c60011d5f2178253d5a5b624171e60e503db0ee5a19ca drkonqi-6.0.3.tar.xz +38d6a41992e508d7779c216eb0a5538a9c860d76cebe189244796e4ab596c6e0fb21025bc5a790cd4eee3601007885abc61c62d26feac79c9b9d5065b20820f2 drkonqi-6.0.4.tar.xz " diff --git a/community/drone/APKBUILD b/community/drone/APKBUILD index 8ef6aed3b91..2e1cb69c100 100644 --- a/community/drone/APKBUILD +++ b/community/drone/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Contributor: Patrycja Rosa <alpine@ptrcnull.me> -# Maintainer: +# Maintainer: fossdd <fossdd@pwned.life> pkgname=drone -pkgver=2.22.0 -pkgrel=2 +pkgver=2.24.0 +pkgrel=0 pkgdesc="Container-Native, Continuous Delivery Platform" url="https://drone.io/" license="Apache-2.0" @@ -53,7 +53,7 @@ package() { } sha512sums=" -bdaad7073a34491c8d92ccd899c2d315a7e478b32bbf7c175a298808c65f17e2a6c5b2fca5405bd7a4a274a0231dfddcba38f931277fb651bace81bb8855f05e gitness-2.22.0.tar.gz +b93627bf9bac44f544a157989a9f6204222cca19a0b96065f64151c8f83544ba3499260922c9319f9f6fc01ceb5d101ae394cf12295e1ad5ea2cfa973751f517 gitness-2.24.0.tar.gz 6f3bf95e6b6bd978c3c2d4951676c89853bae3706098a3e609f296d36cb92c3d68a3390d1bc4b57aaf97f914d25d8d5fa88a32a0410f6d049b947c6978db773d drone.initd b2b0d6dbffe987d42292ee0f9c39f8a4e59a62249b62f6bc99369738c17ebe6a699264f13d0e9a4690ebcfd48c4f07637043878f801c1a47fba71f0ef62ca26d drone.confd a12f920b568b88a0a813cffcb8dd3dfa2c8e010e5ab0c7b53f07d8084ab68a5bc8b3b11b9fbc2d171d239f5aa775af8240f926472c1aef3c823aea010fd4ad5a drone.conf diff --git a/community/dsme/APKBUILD b/community/dsme/APKBUILD index 6d15fc0d9dd..3bc8c2a978f 100644 --- a/community/dsme/APKBUILD +++ b/community/dsme/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=dsme pkgver=0.84.0 -pkgrel=3 +pkgrel=4 _commit_dbusglib="d42176ae4763e5288ef37ea314fe58387faf2005" pkgdesc="Device State Management Entity" url="https://github.com/sailfishos/dsme" @@ -75,6 +75,6 @@ sha512sums=" 665cd6395ee0ea14086ba30188c62a72697b3f63484681e18fc7f54109c9aca162f2e33aa2fa4d45287c6c0b590e81ca310c143dac0232cd5887692cdaf51256 dbus-glib-d42176ae4763e5288ef37ea314fe58387faf2005.tar.gz 063ce9f2bd13fb2bd05ab9cd11544265eb5378562ee1fbed1cfa65d2345d092cfcff69f57589d3914005c31a00a58f3993cc13b59615ebe0f48458ba478d8772 0001-correct-paths.patch 2b18c6affaefa786358c07480968fd744370c48452c05e969cc8b26cba5307279ce51f782f42778fbd597bf29ec3d90b7b1ee4d182e8ab41675d1070be2f1954 0002-disable-werror.patch -c59a20e961f5d784958b2ed002c092e19a9245643a8554e42ac98edd8979f4cf58e198463a3015db3c1ee59de222d6c3545f3c7ea45b3eaa8488dd2ba834fea9 dsme.initd +786971b4a8f9cff0b66db658d9b8a2c4ceaaf1c5baa4b62346b9e0a2ab6f46ff3225a60678cb7ddd78e4e9e70fbe41432581e32ebccfa4174375dc79fea49a84 dsme.initd b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706 dsme.confd " diff --git a/community/dsme/dsme.initd b/community/dsme/dsme.initd index 2ccc62492fd..3e086d36c1c 100644 --- a/community/dsme/dsme.initd +++ b/community/dsme/dsme.initd @@ -6,6 +6,6 @@ description="Device State Management Entity" command=/usr/sbin/dsme command_args="-- -p /usr/lib/dsme/startup.so" -depends() { +depend() { need dbus } diff --git a/testing/dtrx/APKBUILD b/community/dtrx/APKBUILD index 243147f9f79..243147f9f79 100644 --- a/testing/dtrx/APKBUILD +++ b/community/dtrx/APKBUILD diff --git a/community/dump1090/APKBUILD b/community/dump1090/APKBUILD new file mode 100644 index 00000000000..46850273095 --- /dev/null +++ b/community/dump1090/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: fossdd <fossdd@pwned.life> +# Maintainer: fossdd <fossdd@pwned.life> +pkgname=dump1090 +pkgver=9.0 +pkgrel=0 +pkgdesc="Dump1090 is a simple Mode S decoder for RTLSDR devices" +arch="all" +url="https://github.com/flightaware/dump1090" +license="GPL-2.0-or-later" +depends=" + rtl-sdr + bladerf + " +makedepends="ncurses-dev" +source="$pkgname-$pkgver.tar.gz::https://github.com/flightaware/dump1090/archive/refs/tags/v$pkgver.tar.gz" + +build() { + make all faup1090 EXTRACFLAGS=-DHTMLPATH=\\\"/usr/share/dump1090/html\\\" +} + +check() { + make test +} + +package() { + install -D -m755 dump1090 "$pkgdir"/usr/bin/dump1090 + install -D -m755 view1090 "$pkgdir"/usr/bin/view1090 + install -D -m755 faup1090 "$pkgdir"/usr/lib/piaware/helpers/faup1090 + install -d -m755 "$pkgdir"/usr/share/dump1090/html + cp -r public_html/* "$pkgdir"/usr/share/dump1090/html +} + +sha512sums=" +07408c5680e626eccd3f74d35a6e8a7538dfffd31675f036580003dbba2a78f2487e1980d72d3ec7e44d3f94880e3f231ab1c97bd99ba1ca6cdcfa0ebf198aff dump1090-9.0.tar.gz +" diff --git a/community/dump978/APKBUILD b/community/dump978/APKBUILD new file mode 100644 index 00000000000..94a782be2a3 --- /dev/null +++ b/community/dump978/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: fossdd <fossdd@pwned.life> +# Maintainer: fossdd <fossdd@pwned.life> +pkgname=dump978 +pkgver=9.0 +pkgrel=0 +pkgdesc="FlightAware's 978MHz UAT demodulator" +arch="all" +url="https://github.com/flightaware/dump978" +license="BSD-2-Clause" +depends=" + bladerf + boost + rtl-sdr + soapy-sdr + " +makedepends=" + boost-dev + soapy-sdr-dev + " +source="$pkgname-$pkgver.tar.gz::https://github.com/flightaware/dump978/archive/refs/tags/v$pkgver.tar.gz" + +build() { + make all faup978 +} + +check() { + make fec_tests +} + +package() { + install -D -m755 dump978-fa "$pkgdir"/usr/bin/dump978-fa + install -D -m755 skyaware978 "$pkgdir"/usr/bin/skyaware978 + install -D -m755 faup978 "$pkgdir"/usr/lib/piaware/helpers/faup978 +} + +sha512sums=" +2a6effba4596a775228020c4cf3ca872179e9c5caf735126fdc4294b91e3f9447e4c6323f5ced8c92570cb6193363c796361c71b0a016ea1b1fe2b32e67a3dbc dump978-9.0.tar.gz +" diff --git a/community/dune/APKBUILD b/community/dune/APKBUILD index 2366254c84d..68857fd0043 100644 --- a/community/dune/APKBUILD +++ b/community/dune/APKBUILD @@ -2,24 +2,33 @@ # Contributor: omni <omni+alpine@hack.org> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=dune -pkgver=3.15.0 +pkgver=3.15.2 pkgrel=0 pkgdesc="A composable build system for OCaml (formerly Jbuilder)" url="https://dune.build/" -arch="all !riscv64" # limited by ocaml aport +arch="all !loongarch64" # ocaml 4+5 license="MIT" checkdepends="bash" makedepends="ocaml" provides="jbuilder=$pkgver-r$pkgrel" -subpackages="$pkgname-doc $pkgname-emacs::noarch $pkgname-configurator" +subpackages="$pkgname-doc $pkgname-emacs::noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/ocaml/dune/archive/$pkgver.tar.gz" options="!check" # FIXME requires ocaml-menhir -# 32-bit archs +# When enabling dune-configurator for riscv64, +# create an OCaml 5 variant of ocaml4-abuild-find. +_configurator="dune-configurator" + case "$CARCH" in arm*|x86) options="$options textrels" ;; + riscv64) + _configurator="" + makedepends="${makedepends//ocaml/ocaml5}" + ;; esac +subpackages="$subpackages $_configurator" + prepare() { default_prepare @@ -48,7 +57,7 @@ check() { package() { ./dune.exe install \ --destdir="$pkgdir" \ - dune dune-configurator + dune $_configurator # Duplicate of usr/share/doc/dune rm -Rf "$pkgdir"/usr/share/doc/dune-configurator @@ -74,6 +83,7 @@ prepare_py_provides() { local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + makedepends_has "ocaml5" && return 0 options_has "!tracedeps" && return 0 ocaml4-abuild-find provides \ @@ -85,11 +95,13 @@ prepare_py_provides() { scan_python3_dependency() { local controldir="$2" datadir="$3" + makedepends_has "ocaml5" && return 0 + ocaml4-abuild-find requires \ "$datadir"/usr/lib/ocaml \ "$controldir" } sha512sums=" -1a48e70157ecf697ab490d05863cd8936978d7aac71e3cf16b3bd1c0de37442c65261df0906d2daba75ad66f1b7463af26f00c7c4fb7c17a6505375505b21d13 dune-3.15.0.tar.gz +a15658e439984e0256aedd67b5107d8a347c73752566e8e76f5cf5ef807c3761747f5443bd042d0434a26f73ab18ab283eaf705f797ca31737b45530251210e6 dune-3.15.2.tar.gz " diff --git a/community/dunst/APKBUILD b/community/dunst/APKBUILD index 0ae0f9522a0..7c0147a6ea6 100644 --- a/community/dunst/APKBUILD +++ b/community/dunst/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Stefan Wagner <stw@bit-strickerei.de> # Maintainer: Stefan Wagner <stw@bit-strickerei.de> pkgname=dunst -pkgver=1.10.0 +pkgver=1.11.0 pkgrel=0 pkgdesc="Customizable and lightweight notification-daemon" url="https://dunst-project.org/" @@ -13,7 +13,13 @@ depends="dunstify" makedepends="libxscrnsaver-dev libxinerama-dev libxrandr-dev libnotify-dev dbus-dev wayland-dev perl pango-dev wayland-protocols" checkdepends="dbus librsvg bash" -subpackages="$pkgname-doc dunstify" +subpackages=" + $pkgname-doc + $pkgname-bash-completion + $pkgname-fish-completion + $pkgname-zsh-completion + dunstify + " source="$pkgname-$pkgver.tar.gz::https://github.com/dunst-project/dunst/archive/v$pkgver.tar.gz" build() { @@ -35,5 +41,5 @@ dunstify() { } sha512sums=" -e7e453c9470a063cdee4602315b22c1c8bcbf1405d3c295bccf01ae4e1b535e11b7323313b63cfc510e38ea8243117d550e6057df15924bbd4efb7e0b7f9a709 dunst-1.10.0.tar.gz +84c9edccddd183fb867233cb5377115d96735f4c1be84007194ac39dd48d913e5bb021d2952057aecdb978564c2471a8974c4ee4eeccfb188e5345527007a5c4 dunst-1.11.0.tar.gz " diff --git a/community/earlyoom/APKBUILD b/community/earlyoom/APKBUILD index d793ccab258..2f73575dba0 100644 --- a/community/earlyoom/APKBUILD +++ b/community/earlyoom/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=earlyoom -pkgver=1.7 -pkgrel=3 +pkgver=1.8.1 +pkgrel=0 pkgdesc="Early OOM Daemon for Linux" url="https://github.com/rfjakob/earlyoom" arch="all" @@ -37,7 +37,7 @@ package() { } sha512sums=" -5732632c38d9b511aaa81845b3d8f8afe737aa6498dca7e31accaf18bfcf271ba436946aa06a514a34c953f99343f9b197d8a2b8751e16d336aeb084944f3602 earlyoom-1.7.tar.gz +282669cc3ccf7a56a336e5d92e4ffd29e20a3363369ef125069a60a7a9dff3560737cd527218c85f2dcd46055113f08b4b6183395cc13c73c5e4a0e25f70fa5d earlyoom-1.8.1.tar.gz 7c1bb42c4e1bd7cdb03568bd10c79dad48d2f4cd7d58edc5669b4af49ace7cb98770ed6c5202b7b4d3b19c316f4cec3ac99a3bf8dbbdb53339f1ba23dd9302ec earlyoom.initd b04824915fd9e506f3ff0f7cbebd252c83c9dda76762a0eeeee34375af130b0dacd6f419ed5b8f3a01301abd0c7ab85aa0117041a5ef0b1babf5dce1aeb6c86c earlyoom.confd " diff --git a/community/eartag/APKBUILD b/community/eartag/APKBUILD index 018ac0d3568..397daf9f9c9 100644 --- a/community/eartag/APKBUILD +++ b/community/eartag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: knuxify <knuxify@gmail.com> # Maintainer: knuxify <knuxify@gmail.com> pkgname=eartag -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=0 pkgdesc="Small and simple music tag editor that doesn't try to manage your entire library" url="https://gitlab.gnome.org/World/eartag" @@ -16,10 +16,17 @@ depends="python3 py3-pillow py3-pyacoustid " -makedepends="meson glib-dev desktop-file-utils" +makedepends="meson blueprint-compiler glib-dev desktop-file-utils" checkdepends="appstream-glib py3-pytest" subpackages="$pkgname-doc $pkgname-lang" -source="https://gitlab.gnome.org/World/eartag/-/archive/$pkgver/eartag-$pkgver.tar.gz" +source="https://gitlab.gnome.org/World/eartag/-/archive/$pkgver/eartag-$pkgver.tar.gz + add-developer-info.patch" + +if [ "$CARCH" = "s390x" ]; then + # test failure on s390x, likely caused by py3-magic, but only for + # rarely-used .wma files + options="!check" +fi build() { abuild-meson \ @@ -37,5 +44,6 @@ package() { } sha512sums=" -3814be9d0daaab7d8bdd94b9747a37d535dfc1c1dd3a9ebca2909b6ecec4622e2d354c9f5c9d156283c0688039d165b79ff923c18a6b358a25340527a9cd6f03 eartag-0.6.0.tar.gz +446bb7216bb3a774958aebb3a047d0b90afecae3fd2095f60027d4df68d286a706212d8367dbf1ea368f5fb1009ba9650fcaf998f27d8b9d1268c501fccff440 eartag-0.6.1.tar.gz +ad248292e244ebb80610d87833ddd182bbbf407793d336cb4a7516802800e51c58466afd41990cc6a713426412626db0b253886b70f16a258542220e44eedfaa add-developer-info.patch " diff --git a/community/eartag/add-developer-info.patch b/community/eartag/add-developer-info.patch new file mode 100644 index 00000000000..888f5498450 --- /dev/null +++ b/community/eartag/add-developer-info.patch @@ -0,0 +1,29 @@ +From 0250a4f870d354b6fe9869402771fdf0c1f2dcd1 Mon Sep 17 00:00:00 2001 +From: knuxify <knuxify@gmail.com> +Date: Sat, 4 May 2024 19:57:33 +0200 +Subject: [PATCH] data: add developer info + +Flathub's appstream data requires it. +--- + data/app.drey.EarTag.metainfo.xml.in | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/data/app.drey.EarTag.metainfo.xml.in b/data/app.drey.EarTag.metainfo.xml.in +index d4b1d7e..d6adc14 100644 +--- a/data/app.drey.EarTag.metainfo.xml.in ++++ b/data/app.drey.EarTag.metainfo.xml.in +@@ -8,6 +8,11 @@ + <metadata_license>CC0-1.0</metadata_license> + <project_license>MIT</project_license> + ++ <developer_name translatable="no">knuxify</developer_name> ++ <developer id="io.github.knuxify"> ++ <name translatable="no">knuxify</name> ++ </developer> ++ + <launchable type="desktop-id">@APP_ID@.desktop</launchable> + + <translation type="gettext">app.drey.EarTag</translation> +-- +GitLab + diff --git a/community/ebook-tools/APKBUILD b/community/ebook-tools/APKBUILD index 088d5cbce3c..3ab190c1214 100644 --- a/community/ebook-tools/APKBUILD +++ b/community/ebook-tools/APKBUILD @@ -5,8 +5,8 @@ pkgver=0.2.2 pkgrel=5 pkgdesc="Tools for accessing and converting various ebook file formats." url="https://sourceforge.net/projects/ebook-tools/" -# ppc64le, s390x and riscv64 blocked by texlive -arch="all !s390x !riscv64 !ppc64le" +# ppc64le, s390x, riscv64 and loongarch64 blocked by texlive +arch="all !s390x !riscv64 !ppc64le !loongarch64" license="MIT" depends_dev=" libxml2-dev diff --git a/community/edbrowse/APKBUILD b/community/edbrowse/APKBUILD index 14f232a3894..5c6882e9134 100644 --- a/community/edbrowse/APKBUILD +++ b/community/edbrowse/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=edbrowse -pkgver=3.8.9 -pkgrel=1 +pkgver=3.8.10 +pkgrel=0 pkgdesc="Line-oriented editor, web browser, and mail client" url="https://edbrowse.org/" arch="all !s390x !ppc64le" # quickjs @@ -17,9 +17,7 @@ makedepends=" unixodbc-dev " subpackages="$pkgname-doc" -source="https://github.com/CMB/edbrowse/archive/v$pkgver/edbrowse-$pkgver.tar.gz - quickjs-shared.patch - " +source="https://github.com/CMB/edbrowse/archive/v$pkgver/edbrowse-$pkgver.tar.gz" prepare() { default_prepare @@ -31,7 +29,7 @@ prepare() { } build() { - make + make QUICKJS_INCLUDE=/usr/include/quickjs } check() { @@ -50,6 +48,5 @@ package() { } sha512sums=" -423fe10a334eadc04e5b6c550383c14ff08af062ef7fd978189e15e781da293ffb3966f056804927731c84fa6b11cdbe876dc85dba4c47a98067ca1c608ac334 edbrowse-3.8.9.tar.gz -367ed382d7e49fd49d00124c4215892f0fa56db82cffd78fe798f020354b5af3f765ba700310992e236034b1610a179543fb57e9823c45caeecfd2216b7fc6d0 quickjs-shared.patch +7fee22f316ed01135cf52e83868759a6d977effba5e3d78fbd8e19d6a5407bef43f13d618ff553dfe62c50ea3f3707eae1cb9284181e8f904b47316e4b5745a4 edbrowse-3.8.10.tar.gz " diff --git a/community/edbrowse/quickjs-shared.patch b/community/edbrowse/quickjs-shared.patch deleted file mode 100644 index 67f1c900d45..00000000000 --- a/community/edbrowse/quickjs-shared.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/makefile -+++ b/src/makefile -@@ -1,8 +1,7 @@ - # compiler and flags - CC ?= cc - PERL ?= perl --QUICKJS_INCLUDE ?= ../../quickjs --QUICKJS_LIB ?= ../../quickjs -+QUICKJS_INCLUDE ?= /usr/include/quickjs - CFLAGS += -Wall -Wno-unused -D_FILE_OFFSET_BITS=64 - ifeq ($(shell uname),Linux) - PLATFORM_CFLAGS = -DEDBROWSE_ON_LINUX -@@ -35,7 +34,7 @@ - LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm -lssl -lcrypto - - # LDFLAGS for quickjs loading. --QUICKJS_LDFLAGS = $(QUICKJS_LIB)/libquickjs.a -ldl -+QUICKJS_LDFLAGS = -lquickjs - ifeq ($(shell uname),Linux) - QUICKJS_LDFLAGS += -latomic - endif diff --git a/community/editline/APKBUILD b/community/editline/APKBUILD index cf56a8725f5..ab17b1b55a1 100644 --- a/community/editline/APKBUILD +++ b/community/editline/APKBUILD @@ -10,6 +10,11 @@ license="Spencer-94" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/troglobit/editline/releases/download/$pkgver/editline-$pkgver.tar.xz" +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/edk2/APKBUILD b/community/edk2/APKBUILD index d8aba6ac44b..9f8d924c215 100644 --- a/community/edk2/APKBUILD +++ b/community/edk2/APKBUILD @@ -6,14 +6,14 @@ pkgver=0.0.202308 _realver=edk2-stable${pkgver##*.} _sslver=3.0.9 _sfver=3e -pkgrel=0 +pkgrel=1 pkgdesc="EFI Development Kit II" url="https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/" arch="x86_64 aarch64" license="BSD-2-Clause-Patent" makedepends="bash python3 iasl nasm util-linux-dev util-linux-misc" options="!archcheck !check" # has no checks -subpackages="$pkgname-pyc" +subpackages="$pkgname-pyc $pkgname-shell:_shell" _mipisyst_commit=370b5944c046bab043dd8b133727b2135af7747a source="$pkgname-$pkgver.tar.gz::https://github.com/tianocore/edk2/archive/$_realver.tar.gz mipisyst-$_mipisyst_commit.tar.gz::https://github.com/MIPI-Alliance/public-mipi-sys-t/archive/$_mipisyst_commit.tar.gz @@ -25,19 +25,20 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/tianocore/edk2/archive/$_rea " builddir="$srcdir/$pkgname-$_realver" +PLATFORM="ShellPkg/ShellPkg.dsc" case "$CARCH" in x86) TARGET_ARCH=IA32 - PLATFORM=OvmfPkg/OvmfPkgIa32X64.dsc + PLATFORM="$PLATFORM OvmfPkg/OvmfPkgIa32X64.dsc" ;; x86_64) TARGET_ARCH=X64 - PLATFORM="OvmfPkg/OvmfPkgX64.dsc OvmfPkg/OvmfXen.dsc" + PLATFORM="$PLATFORM OvmfPkg/OvmfPkgX64.dsc OvmfPkg/OvmfXen.dsc" subpackages="$subpackages ovmf:_ovmf:noarch ovmf-xen:_xen:noarch" ;; aarch64) TARGET_ARCH=AARCH64 - PLATFORM=ArmVirtPkg/ArmVirtQemu.dsc + PLATFORM="$PLATFORM ArmVirtPkg/ArmVirtQemu.dsc" subpackages="$subpackages aavmf::noarch" ;; esac @@ -110,6 +111,22 @@ package() { done } +_shell() { + pkgdesc="EDK2 UEFI Shell" + + # taken from arch + # minimal UEFI shell, as defined in ShellPkg/Application/Shell/Shell.inf + local _min='7C04A583-9E3E-4f1c-AD65-E05268D0B4D1' + # full UEFI shell, as defined in ShellPkg/ShellPkg.dsc + local _full='EA4BB293-2D7F-4456-A681-1F22F42CD0BC' + + install -D "$builddir"/Build/Shell/"$RELEASE"_"$TOOLCHAIN"/$TARGET_ARCH/Shell_$_min.efi \ + "$subpkgdir"/usr/share/edk2-shell/Shell.efi + + install -D "$builddir"/Build/Shell/"$RELEASE"_"$TOOLCHAIN"/$TARGET_ARCH/Shell_$_full.efi \ + "$subpkgdir"/usr/share/edk2-shell/ShellFull.efi +} + _ovmf() { pkgdesc="Open Virtual Machine Firmware (OVMF) BIOS" license="BSD MIT" diff --git a/community/eigen/APKBUILD b/community/eigen/APKBUILD index 6a23ddb5d00..9d4e98808ae 100644 --- a/community/eigen/APKBUILD +++ b/community/eigen/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Bradley J Chambers <brad.chambers@gmail.com> pkgname=eigen pkgver=3.4.0 -pkgrel=9 +pkgrel=10 pkgdesc="Eigen is a C++ template library for linear algebra" url="https://eigen.tuxfamily.org/" arch="noarch" diff --git a/community/electrs/APKBUILD b/community/electrs/APKBUILD index 05f3d042f88..6dc277d5d60 100644 --- a/community/electrs/APKBUILD +++ b/community/electrs/APKBUILD @@ -8,7 +8,8 @@ url="https://github.com/romanz/electrs" license="MIT" # s390x, riscv64: limited by rust/cargo # armhf, armv7, x86: limited by rocksdb -arch="all !s390x !riscv64 !armhf !armv7 !x86" +# loongarch64: limited by llvm15 +arch="all !s390x !riscv64 !armhf !armv7 !x86 !loongarch64" makedepends=" cargo cargo-auditable diff --git a/community/eltclsh/APKBUILD b/community/eltclsh/APKBUILD index 554646bce83..92886f8933f 100644 --- a/community/eltclsh/APKBUILD +++ b/community/eltclsh/APKBUILD @@ -12,6 +12,11 @@ makedepends="libedit-dev tcl-dev tk-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-tk" source="https://www.openrobots.org/distfiles/eltclsh/eltclsh-$pkgver.tar.gz" +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/testing/emacs-async-await/APKBUILD b/community/emacs-async-await/APKBUILD index 032a0a4008e..032a0a4008e 100644 --- a/testing/emacs-async-await/APKBUILD +++ b/community/emacs-async-await/APKBUILD diff --git a/testing/emacs-async/APKBUILD b/community/emacs-async/APKBUILD index 62262b171ef..62262b171ef 100644 --- a/testing/emacs-async/APKBUILD +++ b/community/emacs-async/APKBUILD diff --git a/testing/emacs-buttercup/APKBUILD b/community/emacs-buttercup/APKBUILD index bd51a15ece0..bd51a15ece0 100644 --- a/testing/emacs-buttercup/APKBUILD +++ b/community/emacs-buttercup/APKBUILD diff --git a/testing/emacs-cangjie/APKBUILD b/community/emacs-cangjie/APKBUILD index d0461117b3d..d0461117b3d 100644 --- a/testing/emacs-cangjie/APKBUILD +++ b/community/emacs-cangjie/APKBUILD diff --git a/testing/emacs-circe/APKBUILD b/community/emacs-circe/APKBUILD index e8670c85b09..e8670c85b09 100644 --- a/testing/emacs-circe/APKBUILD +++ b/community/emacs-circe/APKBUILD diff --git a/testing/emacs-circe/fix-test-tracking.patch b/community/emacs-circe/fix-test-tracking.patch index fffb5a44156..fffb5a44156 100644 --- a/testing/emacs-circe/fix-test-tracking.patch +++ b/community/emacs-circe/fix-test-tracking.patch diff --git a/testing/emacs-compat/APKBUILD b/community/emacs-compat/APKBUILD index 936dbe3d74d..936dbe3d74d 100644 --- a/testing/emacs-compat/APKBUILD +++ b/community/emacs-compat/APKBUILD diff --git a/testing/emacs-dash/APKBUILD b/community/emacs-dash/APKBUILD index 5d389aee9ec..5d389aee9ec 100644 --- a/testing/emacs-dash/APKBUILD +++ b/community/emacs-dash/APKBUILD diff --git a/testing/emacs-deferred/APKBUILD b/community/emacs-deferred/APKBUILD index 56944927fcd..56944927fcd 100644 --- a/testing/emacs-deferred/APKBUILD +++ b/community/emacs-deferred/APKBUILD diff --git a/testing/emacs-ert-async/APKBUILD b/community/emacs-ert-async/APKBUILD index 0808d6f5017..0808d6f5017 100644 --- a/testing/emacs-ert-async/APKBUILD +++ b/community/emacs-ert-async/APKBUILD diff --git a/testing/emacs-f/APKBUILD b/community/emacs-f/APKBUILD index a7158199d65..a7158199d65 100644 --- a/testing/emacs-f/APKBUILD +++ b/community/emacs-f/APKBUILD diff --git a/testing/emacs-fsm/APKBUILD b/community/emacs-fsm/APKBUILD index 907fc0a5797..907fc0a5797 100644 --- a/testing/emacs-fsm/APKBUILD +++ b/community/emacs-fsm/APKBUILD diff --git a/testing/emacs-git-timemachine/APKBUILD b/community/emacs-git-timemachine/APKBUILD index eea8d7bcd43..932dfb6aade 100644 --- a/testing/emacs-git-timemachine/APKBUILD +++ b/community/emacs-git-timemachine/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=emacs-git-timemachine -pkgver=4.13_git20240309 -_gitrev=5ed73c3831cf6da10ba941e6abba708a86853e8f +pkgver=4.13_git20240427 +_gitrev=3780835fcd67c3703ffa768206121851e6895ece pkgrel=0 _pkgreal=git-timemachine pkgdesc="Step through Git revisions of a file" @@ -34,5 +34,5 @@ package() { } sha512sums=" -8e09f181b85249157e3c6bbce561076f02075c08c2a06a30cc60dfc23ad3448feba3ae1ca56d35dbf0c95c63ffe10f2fd179367747db8d7ef61858d610907922 emacs-git-timemachine-5ed73c3831cf6da10ba941e6abba708a86853e8f.tar.gz +84ea57ab5ae40a4a3002d70a4940b43c204e8b62809b690683143499b6a89c19d57c9fba87aaa639b8f5448ef9acae02d6751ea46c03b9ef800657924d3c43e2 emacs-git-timemachine-3780835fcd67c3703ffa768206121851e6895ece.tar.gz " diff --git a/testing/emacs-howdoyou/APKBUILD b/community/emacs-howdoyou/APKBUILD index ce80138311e..ce80138311e 100644 --- a/testing/emacs-howdoyou/APKBUILD +++ b/community/emacs-howdoyou/APKBUILD diff --git a/testing/emacs-howdoyou/dont-test-against-google.patch b/community/emacs-howdoyou/dont-test-against-google.patch index 37b6ae2fb40..37b6ae2fb40 100644 --- a/testing/emacs-howdoyou/dont-test-against-google.patch +++ b/community/emacs-howdoyou/dont-test-against-google.patch diff --git a/testing/emacs-iter2/APKBUILD b/community/emacs-iter2/APKBUILD index 3b926f8c75d..3b926f8c75d 100644 --- a/testing/emacs-iter2/APKBUILD +++ b/community/emacs-iter2/APKBUILD diff --git a/testing/emacs-jabber/APKBUILD b/community/emacs-jabber/APKBUILD index 36f85cf2f7c..36f85cf2f7c 100644 --- a/testing/emacs-jabber/APKBUILD +++ b/community/emacs-jabber/APKBUILD diff --git a/testing/emacs-lab/APKBUILD b/community/emacs-lab/APKBUILD index 182ba11ff53..182ba11ff53 100644 --- a/testing/emacs-lab/APKBUILD +++ b/community/emacs-lab/APKBUILD diff --git a/testing/emacs-liberime/APKBUILD b/community/emacs-liberime/APKBUILD index c1b3d13b3f9..c1b3d13b3f9 100644 --- a/testing/emacs-liberime/APKBUILD +++ b/community/emacs-liberime/APKBUILD diff --git a/testing/emacs-lingva/APKBUILD b/community/emacs-lingva/APKBUILD index cfedb36f32c..cfedb36f32c 100644 --- a/testing/emacs-lingva/APKBUILD +++ b/community/emacs-lingva/APKBUILD diff --git a/testing/emacs-magit/APKBUILD b/community/emacs-magit/APKBUILD index 12976ccf38c..12976ccf38c 100644 --- a/testing/emacs-magit/APKBUILD +++ b/community/emacs-magit/APKBUILD diff --git a/testing/emacs-memoize/APKBUILD b/community/emacs-memoize/APKBUILD index 79a7599fee8..79a7599fee8 100644 --- a/testing/emacs-memoize/APKBUILD +++ b/community/emacs-memoize/APKBUILD diff --git a/testing/emacs-plz-see/APKBUILD b/community/emacs-plz-see/APKBUILD index 39bbb027ca3..39bbb027ca3 100644 --- a/testing/emacs-plz-see/APKBUILD +++ b/community/emacs-plz-see/APKBUILD diff --git a/testing/emacs-plz/APKBUILD b/community/emacs-plz/APKBUILD index 8bd5507de13..f9b3e515e05 100644 --- a/testing/emacs-plz/APKBUILD +++ b/community/emacs-plz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=emacs-plz -pkgver=0.7.2 +pkgver=0.8 pkgrel=0 _pkgreal=plz pkgdesc="HTTP library with curl as backend" @@ -43,5 +43,5 @@ package() { } sha512sums=" -01951bbb0e59d6196338a806b4bab030538c411d185acf5462bc1eb4d3130b1da5d78a436e84163dd8167b3705edb6dcafdeef8d4611973521566d34f2ca5654 emacs-plz-0.7.2.tar.gz +8d5c4eaadc863a8cb356616717fa976e7785a5a1d4c91baf9fbfcf9a0c054a7afa25c26e4e3673e484b2206b140fe77047a041ee0596812802d7a0f12e3c0c45 emacs-plz-0.8.tar.gz " diff --git a/testing/emacs-popup/APKBUILD b/community/emacs-popup/APKBUILD index 617c200493a..617c200493a 100644 --- a/testing/emacs-popup/APKBUILD +++ b/community/emacs-popup/APKBUILD diff --git a/testing/emacs-posframe/APKBUILD b/community/emacs-posframe/APKBUILD index a634c2dc414..a634c2dc414 100644 --- a/testing/emacs-posframe/APKBUILD +++ b/community/emacs-posframe/APKBUILD diff --git a/testing/emacs-promise/APKBUILD b/community/emacs-promise/APKBUILD index 267fcf27eff..267fcf27eff 100644 --- a/testing/emacs-promise/APKBUILD +++ b/community/emacs-promise/APKBUILD diff --git a/testing/emacs-pyim-basedict/APKBUILD b/community/emacs-pyim-basedict/APKBUILD index 9a58b3532c6..9a58b3532c6 100644 --- a/testing/emacs-pyim-basedict/APKBUILD +++ b/community/emacs-pyim-basedict/APKBUILD diff --git a/testing/emacs-pyim-cangjiedict/APKBUILD b/community/emacs-pyim-cangjiedict/APKBUILD index 41f613e8bea..41f613e8bea 100644 --- a/testing/emacs-pyim-cangjiedict/APKBUILD +++ b/community/emacs-pyim-cangjiedict/APKBUILD diff --git a/testing/emacs-pyim-smzmdict/APKBUILD b/community/emacs-pyim-smzmdict/APKBUILD index a76772881d9..a76772881d9 100644 --- a/testing/emacs-pyim-smzmdict/APKBUILD +++ b/community/emacs-pyim-smzmdict/APKBUILD diff --git a/testing/emacs-pyim-wbdict/APKBUILD b/community/emacs-pyim-wbdict/APKBUILD index 3e5927e6cea..3e5927e6cea 100644 --- a/testing/emacs-pyim-wbdict/APKBUILD +++ b/community/emacs-pyim-wbdict/APKBUILD diff --git a/testing/emacs-pyim/APKBUILD b/community/emacs-pyim/APKBUILD index 561407d49e0..561407d49e0 100644 --- a/testing/emacs-pyim/APKBUILD +++ b/community/emacs-pyim/APKBUILD diff --git a/testing/emacs-repology/APKBUILD b/community/emacs-repology/APKBUILD index ebcf0433a6c..ebcf0433a6c 100644 --- a/testing/emacs-repology/APKBUILD +++ b/community/emacs-repology/APKBUILD diff --git a/testing/emacs-request/APKBUILD b/community/emacs-request/APKBUILD index 457819fb699..457819fb699 100644 --- a/testing/emacs-request/APKBUILD +++ b/community/emacs-request/APKBUILD diff --git a/testing/emacs-rime/APKBUILD b/community/emacs-rime/APKBUILD index 061f6555698..061f6555698 100644 --- a/testing/emacs-rime/APKBUILD +++ b/community/emacs-rime/APKBUILD diff --git a/testing/emacs-s/APKBUILD b/community/emacs-s/APKBUILD index 7ac8e9a256c..7ac8e9a256c 100644 --- a/testing/emacs-s/APKBUILD +++ b/community/emacs-s/APKBUILD diff --git a/testing/emacs-srv/APKBUILD b/community/emacs-srv/APKBUILD index 5c3e4a5f090..21c0c30471e 100644 --- a/testing/emacs-srv/APKBUILD +++ b/community/emacs-srv/APKBUILD @@ -1,8 +1,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=emacs-srv -pkgver=0.2_git20180715 -_gitrev=714387d5a5cf34d8d8cd96bdb1f9cb8ded823ff7 +pkgver=0.2 pkgrel=0 _pkgreal=srv pkgdesc="Elisp library to perform SRV DNS requests" @@ -11,10 +10,10 @@ arch="noarch" license="GPL-2.0-or-later" depends="cmd:emacs" makedepends="emacs-nox" -source="https://github.com/legoscia/srv.el/archive/$_gitrev/emacs-srv-$_gitrev.tar.gz +source="https://github.com/legoscia/srv.el/archive/$pkgver/emacs-srv-$pkgver.tar.gz optional-dns.el.patch " -builddir="$srcdir/srv.el-$_gitrev" +builddir="$srcdir/srv.el-$pkgver" options="!check" # no tests provided build() { @@ -34,6 +33,6 @@ package() { } sha512sums=" -72dc537f5db29009b2cdffc5b35d330adaa6793bba29773f49d294280f32ad082456cf5482cf773512cb85ad00113a9780c40c36ad663558ec6d772c09d0e1bc emacs-srv-714387d5a5cf34d8d8cd96bdb1f9cb8ded823ff7.tar.gz +f2378e78d241e13b857330f57031936773f0c45377898456b7ffc4fce81bcea1f8969318020f4c6b52f56cf87406cbface415d59d586cbe2b745a2edfc689ee9 emacs-srv-0.2.tar.gz 818343236430be0c1959fd62d75b636a08977632a733b3ee0f6c060621576bedf7f9e323337929ddcfac3b6ff50e64567a4eb666da7bede3561349b5236d9e04 optional-dns.el.patch " diff --git a/testing/emacs-srv/optional-dns.el.patch b/community/emacs-srv/optional-dns.el.patch index 7d4487619dd..7d4487619dd 100644 --- a/testing/emacs-srv/optional-dns.el.patch +++ b/community/emacs-srv/optional-dns.el.patch diff --git a/testing/emacs-vterm/APKBUILD b/community/emacs-vterm/APKBUILD index 3d9734df4eb..3d9734df4eb 100644 --- a/testing/emacs-vterm/APKBUILD +++ b/community/emacs-vterm/APKBUILD diff --git a/testing/emacs-with-editor/APKBUILD b/community/emacs-with-editor/APKBUILD index 53ad54ccb1f..53ad54ccb1f 100644 --- a/testing/emacs-with-editor/APKBUILD +++ b/community/emacs-with-editor/APKBUILD diff --git a/testing/emacs-xr/APKBUILD b/community/emacs-xr/APKBUILD index f1426a4233a..f1426a4233a 100644 --- a/testing/emacs-xr/APKBUILD +++ b/community/emacs-xr/APKBUILD diff --git a/community/emacs/APKBUILD b/community/emacs/APKBUILD index 3941099b61f..a957398f530 100644 --- a/community/emacs/APKBUILD +++ b/community/emacs/APKBUILD @@ -1,11 +1,13 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> # Contributor: Timo Teräs <timo.teras@iki.fi> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=emacs pkgver=29.3 -pkgrel=0 -pkgdesc="Extensible, customizable, self-documenting real-time display editor (common files)" -arch="all" +pkgrel=1 +_pkgdesc="Extensible, customizable, self-documenting real-time display editor" +pkgdesc="$_pkgdesc (common files)" url="https://www.gnu.org/software/emacs/emacs.html" +arch="all" license="GPL-3.0-or-later" makedepends=" !libexecinfo-dev @@ -201,6 +203,11 @@ package() { find usr/lib -perm -g+s,g+x ! -type d -exec chmod g-s {} \; } +doc() { + default_doc + pkgdesc="$_pkgdesc (documentation)" +} + _subpackage() { cd "$builddir/$1" make DESTDIR="$subpkgdir" install @@ -232,7 +239,7 @@ _subpackage() { } nox() { - pkgdesc="$pkgdesc - non-graphical" + pkgdesc="$_pkgdesc - non-graphical" depends=" $pkgname=$pkgver-r$pkgrel !emacs-gtk3 @@ -246,7 +253,7 @@ nox() { } x11() { - pkgdesc="$pkgdesc - with X11" + pkgdesc="$_pkgdesc - with X11" depends=" $pkgname=$pkgver-r$pkgrel !emacs-gtk3 @@ -262,7 +269,7 @@ x11() { } x11_nativecomp() { - pkgdesc="$pkgdesc - with X11 and native compilation" + pkgdesc="$_pkgdesc - with X11 and native compilation" depends=" $pkgname=$pkgver-r$pkgrel !emacs-gtk3 @@ -278,7 +285,7 @@ x11_nativecomp() { } gtk3() { - pkgdesc="$pkgdesc - with GTK3" + pkgdesc="$_pkgdesc - with GTK3" depends=" $pkgname=$pkgver-r$pkgrel !emacs-gtk3-nativecomp @@ -294,7 +301,7 @@ gtk3() { } gtk3_nativecomp() { - pkgdesc="$pkgdesc - with GTK3 and native compilation" + pkgdesc="$_pkgdesc - with GTK3 and native compilation" depends=" $pkgname=$pkgver-r$pkgrel !emacs-gtk3 @@ -310,7 +317,7 @@ gtk3_nativecomp() { } pgtk() { - pkgdesc="$pkgdesc - with pure GTK" + pkgdesc="$_pkgdesc - with pure GTK" depends=" $pkgname=$pkgver-r$pkgrel !emacs-gtk3 @@ -326,7 +333,7 @@ pgtk() { } pgtk_nativecomp() { - pkgdesc="$pkgdesc - with pure GTK and native compilation" + pkgdesc="$_pkgdesc - with pure GTK and native compilation" depends=" $pkgname=$pkgver-r$pkgrel !emacs-gtk3 diff --git a/community/emborg/APKBUILD b/community/emborg/APKBUILD index f3415bc426c..4bf2034691f 100644 --- a/community/emborg/APKBUILD +++ b/community/emborg/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Andy Hawkins <andy@gently.org.uk> # Maintainer: Andy Hawkins <andy@gently.org.uk> pkgname=emborg -pkgver=1.38 -pkgrel=1 +pkgver=1.39 +pkgrel=0 pkgdesc="Front-End to Borg Backup" url="https://emborg.readthedocs.io/" # armhf: borgbackup @@ -49,5 +49,5 @@ package() { } sha512sums=" -490523f5ec7e214b6dfe5d077c4f17390e00e5f6aacec7d49b5d4f08aa3b018546f0934e9edbcf04911673b0f6d67976501a2597617dae4f96b42d3d0d93516c emborg-v1.38.tar.gz +0b2d807d5dc90dab167cb071be84d1023ce8011a046143425cff3fd2c18c2cb10c34685370fd1122df6c708c7023c543ff1aa56376e9966668cbe4dd54d1dd3b emborg-v1.39.tar.gz " diff --git a/community/encfs/APKBUILD b/community/encfs/APKBUILD index 6dd73e02ae8..806f9a673fa 100644 --- a/community/encfs/APKBUILD +++ b/community/encfs/APKBUILD @@ -3,7 +3,7 @@ pkgname=encfs pkgver=1.9.5 _ver=${pkgver/_/-} -pkgrel=23 +pkgrel=24 pkgdesc="EncFS provides an encrypted filesystem in user-space" url="https://vgough.github.io/encfs/" arch="all" diff --git a/community/enchant2/APKBUILD b/community/enchant2/APKBUILD index ca8af6bd82d..07507335441 100644 --- a/community/enchant2/APKBUILD +++ b/community/enchant2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=enchant2 -pkgver=2.6.9 +pkgver=2.7.3 pkgrel=0 pkgdesc="wrapper library for generic spell checking (v2)" url="https://abiword.github.io/enchant/" @@ -78,5 +78,5 @@ nuspell() { } sha512sums=" -7f3efec868445e8da95023a3c8b992893649eb263ba3811d87f4d293ab8af159818ad562714ed5bb584564fb61a2db55ea4c33872f2647ca86d0a20294e679bb enchant-2.6.9.tar.gz +ca20ae45a42c1c3fec5ef81753f2bbfd1faaa33a6b0c60adc8ac77ab5eb0015be488a5b128b56cdface5f16c5bd3ea1623e9035a39d8453f7a3a713b04f392c7 enchant-2.7.3.tar.gz " diff --git a/community/ergo/APKBUILD b/community/ergo/APKBUILD index eb74d51e5c4..c40a52a8a4b 100644 --- a/community/ergo/APKBUILD +++ b/community/ergo/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kay Thomas <kaythomas@pm.me> # Maintainer: Kay Thomas <kaythomas@pm.me> pkgname=ergo -pkgver=2.13.0 -pkgrel=2 +pkgver=2.13.1 +pkgrel=0 pkgdesc="A modern IRC server (daemon/ircd) written in Go" url="https://ergo.chat" arch="all" @@ -51,7 +51,7 @@ package() { } sha512sums=" -870e852e1d4a9bbeb9485de33bcf027bfbf92f7fffa125640cbb28798441e52c334a5e14b3a5ba009094eb8f31d24f664601394b1d22fe30828116c55da28826 ergo-2.13.0.tar.gz +dcaec6e9c9f8871633862740980eca7e07f92b0d41c1d8becad09fe20f3ab9c5920a966286b577523e6fdc683018bec1938ed5237eacbe922b70cbfb19ed2bca ergo-2.13.1.tar.gz 1fd4e2a31ebbf7ade88294b18e2705a6caac4f0b0d402a3f324f929cc786d2dee104f600ec4213817f1fd7f22fa10c1303307ee342eb57968be9dfba7851e912 ergo.initd c9856c141ab4b8b2dee63996678613a787d1aae8345d8baa2df9bc4427306f00b71a8a0fd7e30fd4e7b78cece982ec189ca1e73e703f2617e353d30fbd736491 ergo.confd 79d3608fdf0c271633e1b9fcbe7a654596c4433fb0a625e26d1ecb10826aeb1357200df758bc89f46a6077c189beff3f0218510296141ff6c1b0c76e4529e636 ircd.yaml diff --git a/community/erlang/APKBUILD b/community/erlang/APKBUILD index ca3d771cb46..4cd1a5d2bed 100644 --- a/community/erlang/APKBUILD +++ b/community/erlang/APKBUILD @@ -9,7 +9,7 @@ # catch up with. If in doubt, do a test rebuild of community/elixir. pkgname=erlang -pkgver=26.2.4 +pkgver=26.2.5 pkgrel=0 pkgdesc="General-purpose programming language and runtime environment" url="https://www.erlang.org/" @@ -180,5 +180,5 @@ verifydeps() { } sha512sums=" -865561793c301c02b10b4601b3ddd332f1a3a8c163927650592abbe5e80ff7a31c501429eef53497cbaab9277cebfe70eeeb88844b2f83b048ac17e37726d64d otp_src_26.2.4.tar.gz +70bf5f70111e33686a71a769854c6f1633d6e57b406b4d72ef9aaeb6462e429065303b511668b709ca69fa0bd3bbdbc227b4bc37c4947c271510e39fb45ee1a8 otp_src_26.2.5.tar.gz " diff --git a/community/es-shell/APKBUILD b/community/es-shell/APKBUILD index 17470bf0fc3..b4c4dde77a1 100644 --- a/community/es-shell/APKBUILD +++ b/community/es-shell/APKBUILD @@ -11,7 +11,9 @@ license="Public-Domain" makedepends="autoconf automake byacc libtool readline-dev" options="!check" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/wryun/es-shell/archive/$_gitrev.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/wryun/es-shell/archive/$_gitrev.tar.gz + configure.ac.patch + " builddir="$srcdir/$pkgname-$_gitrev" prepare() { @@ -46,4 +48,5 @@ package() { sha512sums=" 20c92cc99669c2cc5ea9767545e1c749d38143d166e3e5b4b1940b8c551bc65d012bd47aa60dc8e97697c693e31ba462f0d08fc38df52adb64e76c62fc3ccc04 es-shell-0.9.2_git20220315.tar.gz +3c6a022097b9d269beef43a8cba6319c34c8711bdf67e7d24069c22a9e2924723a15eaf592a7cb7e714c4b882d2e6395673fa12e88cc7af71561d0c35b074e87 configure.ac.patch " diff --git a/community/es-shell/configure.ac.patch b/community/es-shell/configure.ac.patch new file mode 100644 index 00000000000..f93a8db2c0c --- /dev/null +++ b/community/es-shell/configure.ac.patch @@ -0,0 +1,18 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -34,6 +34,7 @@ + + dnl Checks for programs. + AC_PROG_CC ++AC_PROG_CPP + AC_PROG_INSTALL + AC_PROG_MKDIR_P + AC_PROG_YACC +@@ -89,7 +90,6 @@ + + dnl Checks for library functions. + AC_TYPE_GETGROUPS +-AC_PROG_GCC_TRADITIONAL + AC_FUNC_MMAP + + AC_FUNC_WAIT3 diff --git a/community/eventviews/APKBUILD b/community/eventviews/APKBUILD index 8e9f819c836..a2f95f7ef9e 100644 --- a/community/eventviews/APKBUILD +++ b/community/eventviews/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 pkgdesc="Library for creating events" # armhf blocked by extra-cmake-modules # ppc64le, s390x, riscv64 and armv7 blocked by qt6-qtwebengine -> akonadi -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by calendarsupport +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://kontact.kde.org/" license="GPL-2.0-or-later" depends_dev=" diff --git a/community/evolution-data-server/APKBUILD b/community/evolution-data-server/APKBUILD index 3f0f29faa82..6e4d462f57d 100644 --- a/community/evolution-data-server/APKBUILD +++ b/community/evolution-data-server/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Krassy Boykinov <kboykinov@teamcentrixx.com> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=evolution-data-server -pkgver=3.52.0 +pkgver=3.52.1 pkgrel=0 pkgdesc="data server for evolution" options="!check" # Tests fail on the builders, passes CI @@ -80,5 +80,5 @@ package() { } sha512sums=" -4fa73c6036bc15537dcacb0ab0b0b5c795ff66dee8ab23f0516a6ba9325546983d98ee88726f35284b46124c1d571ef95512ec48abf2365e35cf186b6825d268 evolution-data-server-3.52.0.tar.xz +67f08fc3c8f7393fa66dc91f6fb33aa17644eb036d6c3552c3e7b30f128756b9e232cbf2a38eab43d0451699bb8799d9a869198bd9c293c0e2456b8e00339286 evolution-data-server-3.52.1.tar.xz " diff --git a/community/evolution-ews/APKBUILD b/community/evolution-ews/APKBUILD index d0af82ea546..bb6c2e18844 100644 --- a/community/evolution-ews/APKBUILD +++ b/community/evolution-ews/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=evolution-ews -pkgver=3.52.0 +pkgver=3.52.1 pkgrel=0 pkgdesc="MS Exchange integration through Exchange Web Services" url="https://wiki.gnome.org/Apps/Evolution/EWS" @@ -41,5 +41,5 @@ package() { } sha512sums=" -96887d8a6c948ca6ded6113b45dbb43a05debe7c975153786d402c3b36d89ce9058f28cd7f57bd6e1be1c67949f040071f2e72ce797596791a4ca26acf22ca68 evolution-ews-3.52.0.tar.xz +24f964019b08261e9b330a1b6663d835e07235e817aea4399c3dab1f35bf4bfb7543f82c91f23f6df6e56e0dff45d1f9ab23362d3603f9a64f6e1c63de75c450 evolution-ews-3.52.1.tar.xz " diff --git a/community/evolution/APKBUILD b/community/evolution/APKBUILD index 7509c5d6f81..14782b665d9 100644 --- a/community/evolution/APKBUILD +++ b/community/evolution/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=evolution -pkgver=3.52.0 +pkgver=3.52.1 pkgrel=0 pkgdesc="evolution mail client" url="https://projects.gnome.org/evolution" @@ -67,5 +67,5 @@ package() { } sha512sums=" -bc18350a720997271bf6f7f10c900c564709d26b61f0a65113aab8e699554e20785c5843eed5c495c9d8e049fef2c9282220c9b88ec6571dabe8d9ec3fccf2ed evolution-3.52.0.tar.xz +3fefb1b11ab164d85cd95ef1973dea8fe60ecd26f8617097a0d6843ee40db9bfe44df92e7b6ecf3afd1da4ac8e2c1e2c3144faf439d0dcf9bf677a6f842cb043 evolution-3.52.1.tar.xz " diff --git a/community/exempi/APKBUILD b/community/exempi/APKBUILD index 4c83787594c..76e8e7abeac 100644 --- a/community/exempi/APKBUILD +++ b/community/exempi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=exempi pkgver=2.6.5 -pkgrel=0 +pkgrel=1 pkgdesc="Library to parse XMP metadata" url="https://wiki.freedesktop.org/libopenraw/Exempi/" # s390x fails to build diff --git a/community/exoscale/APKBUILD b/community/exoscale/APKBUILD index 1ce7dfcea20..74cb916d54d 100644 --- a/community/exoscale/APKBUILD +++ b/community/exoscale/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=exoscale -pkgver=1.77.0 -pkgrel=1 +pkgver=1.77.2 +pkgrel=0 pkgdesc="Command-line tool for everything at Exoscale" url="https://github.com/exoscale/cli" arch="all" @@ -28,5 +28,5 @@ package() { } sha512sums=" -fe21b9a2792046d4b64c21c3f5f5892f8550712c5c995d591d8e46592c2dd406b72100ddc172492ab7a142744cbefc67fda4f450901880eb5765d2d7a85a410b exoscale-1.77.0.tar.gz +7ca505b5f1dc974baab13b5b0ff650aafc5261b2b601f17e35a9f37198ec4d6a9179163f67da360a56d50f1bf2d5d233ef5c1836143a5a306d336a93df95f249 exoscale-1.77.2.tar.gz " diff --git a/community/extra-cmake-modules/APKBUILD b/community/extra-cmake-modules/APKBUILD index 2ccc05c7e75..f8160d28154 100644 --- a/community/extra-cmake-modules/APKBUILD +++ b/community/extra-cmake-modules/APKBUILD @@ -5,7 +5,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=extra-cmake-modules -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Extra CMake modules" url="https://invent.kde.org/frameworks/extra-cmake-modules" @@ -47,5 +47,5 @@ package() { } sha512sums=" -8e31c576e461de927b5f9ff7a0f6c368f95b66c721ef1fb810ae2f2e6ea486e0fe23766023c223c65c2a3cacc62466f0e38d6353c65cfa1db5a7f55f4e3a5820 extra-cmake-modules-6.1.0.tar.xz +519b412f3c41321d63183d57fc90ed47492e76aeb53295a708f9ea0c6a7797bb7582cfc1e5067a358d643b4f1538d913d2693ca90b5f0367fbe96912a5560d68 extra-cmake-modules-6.2.0.tar.xz " diff --git a/community/eza/APKBUILD b/community/eza/APKBUILD index e5db2fb6a54..16f2b1f7a62 100644 --- a/community/eza/APKBUILD +++ b/community/eza/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=eza -pkgver=0.18.10 +pkgver=0.18.15 pkgrel=0 pkgdesc="ls replacement written in Rust" url="https://github.com/eza-community/eza" @@ -71,6 +71,6 @@ package() { } sha512sums=" -d6add5966c94476e8eb6cdbbf713608fd956dc6af25a6b76af24bdf9ec23b094b0c4f82dc574578f3f7c37e8c226905c746011918e851a6be33ce0cbaa23c2cc eza-0.18.10.tar.gz +5eb0ffeb3238e433d4cb7fdd9246da08719d053ea637afde28e6670340babacdc5e17dd93a414d0bad90c85155a09575467a7429cae30d2a49f0faaaad95d060 eza-0.18.15.tar.gz a6d4139bc1e420ad85e88611551ed79274a6a994f1db1bb29cf833145c2c8be816d6ed540ce4f1393431c607dbb2755519f464f40ab9f163545f49cf78eeb12b completions-exa.patch " diff --git a/community/ezstream/0001-Unconditionally-include-libgen.h-for-basename-3-func.patch b/community/ezstream/0001-Unconditionally-include-libgen.h-for-basename-3-func.patch new file mode 100644 index 00000000000..159bb422eba --- /dev/null +++ b/community/ezstream/0001-Unconditionally-include-libgen.h-for-basename-3-func.patch @@ -0,0 +1,62 @@ +From f3523a90684838eb8953bc9acf4a3f6ca4a3db00 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> +Date: Thu, 9 May 2024 18:17:45 +0200 +Subject: [PATCH] Unconditionally include libgen.h for basename(3) function + prototype + +Since musl 1.2.5, musl no longer defines basename.h in string.h. This +is in accordance with POSIX, hence libgen.h must be included by ezstream +in order to use basename(3). + +See: https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 +--- + src/ezstream-cfgmigrate.c | 4 +--- + src/ezstream.h | 4 +--- + src/mdata.c | 4 +--- + 3 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/src/ezstream-cfgmigrate.c b/src/ezstream-cfgmigrate.c +index 0a3b4ff..28d5bf8 100644 +--- a/src/ezstream-cfgmigrate.c ++++ b/src/ezstream-cfgmigrate.c +@@ -20,9 +20,7 @@ + + #include "compat.h" + +-#if defined(HAVE_LIBGEN_H) && !defined(__linux__) +-# include <libgen.h> +-#endif /* HAVE_LIBGEN_H && !__linux__ */ ++#include <libgen.h> + #include <limits.h> + #include <stdio.h> + #include <string.h> +diff --git a/src/ezstream.h b/src/ezstream.h +index 1867386..a4945d0 100644 +--- a/src/ezstream.h ++++ b/src/ezstream.h +@@ -32,9 +32,7 @@ + #include <ctype.h> + #include <errno.h> + #include <fcntl.h> +-#if defined(HAVE_LIBGEN_H) && !defined(__linux__) +-# include <libgen.h> +-#endif /* HAVE_LIBGEN_H && !__linux__ */ ++#include <libgen.h> + #include <limits.h> + #ifdef HAVE_PATHS_H + # include <paths.h> +diff --git a/src/mdata.c b/src/mdata.c +index bd9c333..2d69b15 100644 +--- a/src/mdata.c ++++ b/src/mdata.c +@@ -24,9 +24,7 @@ + #include <sys/wait.h> + + #include <errno.h> +-#if defined(HAVE_LIBGEN_H) && !defined(__linux__) +-# include <libgen.h> +-#endif /* HAVE_LIBGEN_H && !__linux__ */ ++#include <libgen.h> + #include <limits.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/community/ezstream/APKBUILD b/community/ezstream/APKBUILD index 4d37a71d321..aa870fca11d 100644 --- a/community/ezstream/APKBUILD +++ b/community/ezstream/APKBUILD @@ -2,14 +2,20 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=ezstream pkgver=1.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="Ezstream is a command line source client for Icecast media streaming servers" url="https://icecast.org/ezstream/" arch="all" license="GPL-2.0" makedepends="libshout-dev libxml2-dev libvorbis-dev check-dev taglib-dev bsd-compat-headers" subpackages="$pkgname-doc" -source="https://downloads.xiph.org/releases/ezstream/ezstream-$pkgver.tar.gz" +source="https://downloads.xiph.org/releases/ezstream/ezstream-$pkgver.tar.gz + 0001-Unconditionally-include-libgen.h-for-basename-3-func.patch" + +prepare() { + default_prepare + update_config_guess +} build() { ./configure \ @@ -25,4 +31,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="54a11b6db9fd15259bbd3cfff11d95100b4c334e19a58a39b8b98f97300c57fbcaa19dabc751d93158ec3f7eb7a7101178c99d9eba193e49b7917ed5731aa48d ezstream-1.0.2.tar.gz" +sha512sums=" +54a11b6db9fd15259bbd3cfff11d95100b4c334e19a58a39b8b98f97300c57fbcaa19dabc751d93158ec3f7eb7a7101178c99d9eba193e49b7917ed5731aa48d ezstream-1.0.2.tar.gz +f0654b9634dd28657792a5b81e18ee5afe4d7d06e41fac1f8f6ca9b863a31bc387308b8211af99eee5bace12ce2da5c2b460fdcdeaae5413b79a958b9b12ab87 0001-Unconditionally-include-libgen.h-for-basename-3-func.patch +" diff --git a/testing/f3/APKBUILD b/community/f3/APKBUILD index fd57efae833..fd57efae833 100644 --- a/testing/f3/APKBUILD +++ b/community/f3/APKBUILD diff --git a/community/falkon/APKBUILD b/community/falkon/APKBUILD index f772d0c542b..360b71ea4e2 100644 --- a/community/falkon/APKBUILD +++ b/community/falkon/APKBUILD @@ -10,7 +10,8 @@ pkgdesc="Cross-platform Qt Web Browser" url="https://github.com/KDE/falkon" # armhf blocked by extra-cmake-modules # armv7, ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -arch="all !armv7 !armhf !ppc64le !s390x !riscv64" +# loongarch64 blocked by purpose +arch="all !armv7 !armhf !ppc64le !s390x !riscv64 !loongarch64" license="GPL-3.0-or-later" depends="qt6-qtbase-sqlite" makedepends=" diff --git a/community/fastfetch/APKBUILD b/community/fastfetch/APKBUILD index f7c88ff1011..70ed679e027 100644 --- a/community/fastfetch/APKBUILD +++ b/community/fastfetch/APKBUILD @@ -1,12 +1,15 @@ # Contributor: Carter Li <zhangsongcui@live.cn> # Maintainer: Carter Li <zhangsongcui@live.cn> pkgname=fastfetch -pkgver=2.9.1 +pkgver=2.12.0 pkgrel=0 pkgdesc="Like neofetch, but much faster because written mostly in C." url="https://github.com/fastfetch-cli/fastfetch" arch="all" license="MIT" +depends=" + hwdata-pci + " makedepends=" cmake samurai yyjson-dev @@ -67,5 +70,5 @@ package() { } sha512sums=" -735a95af973cfb8680cdd7c0a6eaaeaabfa394ce3708d9836f49673d0331a9f4d4779a09516add1c7e5f817a05d175d7725144a3f8f040fac17ae3fbeeadad6a fastfetch-2.9.1.tar.gz +ec249afb49066eb70138503062779612c4c45dfbb44429fdfea8b5bb5f310cd5bfadde7e0f21cba5a343007ab4dee0d7e3ddf7bac84791dc0c48be57ff645d9a fastfetch-2.12.0.tar.gz " diff --git a/community/fd/APKBUILD b/community/fd/APKBUILD index e9f08ff2cd0..c80aae27eaf 100644 --- a/community/fd/APKBUILD +++ b/community/fd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=fd -pkgver=9.0.0 +pkgver=10.0.0 pkgrel=0 pkgdesc="Simple, fast, user-friendly alternative to find" url="https://github.com/sharkdp/fd" @@ -50,5 +50,5 @@ package() { } sha512sums=" -e992db9170884c5c426d51ba06a0684b000c65df3fae392fe9ffb3555b94f1d0cfde9b5ae01da37508a1b11bc75b023534db380c992cb4ccf17084d27ec87c84 fd-9.0.0.tar.gz +d025db852874eabe992a73ad8642d1f293d29a3b3cb89ec783a809ea1c81d1b039de6efe037a0a51be5abfa4379fdaf118c1fce8d304bb938bd09dbe4c335103 fd-10.0.0.tar.gz " diff --git a/community/feedbackd-device-themes/APKBUILD b/community/feedbackd-device-themes/APKBUILD index 7a200b595f3..efb9d174e12 100644 --- a/community/feedbackd-device-themes/APKBUILD +++ b/community/feedbackd-device-themes/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Dylan Van Assche <me@dylanvanassche.be> -# Contributor: Dylan Van Assche <me@dylanvanassche.be> +# Contributor: team/phosh <me@dylanvanassche.be> pkgname=feedbackd-device-themes pkgver=0.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Feedbackd device themes for different devices" url="https://source.puri.sm/Librem5/feedbackd-device-themes" arch="all" diff --git a/community/feedbackd/APKBUILD b/community/feedbackd/APKBUILD index 603f2a59375..5b2fb02ed38 100644 --- a/community/feedbackd/APKBUILD +++ b/community/feedbackd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: team/phosh <newbyte@postmarketos.org> pkgname=feedbackd -pkgver=0.2.1 -pkgrel=1 +pkgver=0.3.0 +pkgrel=0 pkgdesc="Daemon to provide haptic, LED, and audio feedback triggered by application events" url="https://source.puri.sm/Librem5/feedbackd" arch="all" @@ -11,6 +11,7 @@ depends="dbus feedbackd-device-themes" makedepends=" gi-docgen glib-dev + gmobile-dev gobject-introspection-dev gsound-dev gtk-doc @@ -20,7 +21,7 @@ makedepends=" vala " subpackages="$pkgname-dev $pkgname-doc" -source="https://storage.puri.sm/releases/feedbackd/feedbackd-$pkgver.tar.xz" +source="https://sources.phosh.mobi/releases/feedbackd/feedbackd-$pkgver.tar.xz" install="$pkgname.pre-install $pkgname.pre-upgrade" build() { @@ -42,5 +43,5 @@ package() { } sha512sums=" -80dc8ce734e4ffd1455d1f3c4ac0e7f44e9d1588e6af90e1433d7aff8ada0e6c77cb06262ff762351bca20b3ccf2d8127ade04f58d4d3a69640429a14aefcafe feedbackd-0.2.1.tar.xz +243ee56cb96541181fc2ae614ae80be694dc1d7cf3a240927f843efb7c8736e0c4ca227af8872ed3caad68ff896c5339ea3f4148099f5327a16ca0c95346d996 feedbackd-0.3.0.tar.xz " diff --git a/community/fennel/APKBUILD b/community/fennel/APKBUILD index 4cb45e86d6a..3e3c8bf7c15 100644 --- a/community/fennel/APKBUILD +++ b/community/fennel/APKBUILD @@ -13,7 +13,7 @@ replaces="fennel" options="net" case "$CARCH" in -ppc64le|s390x|riscv64) _lua_versions="5.1 5.2 5.3 5.4" ;; +ppc64le|s390x|riscv64|loongarch64) _lua_versions="5.1 5.2 5.3 5.4" ;; *) _lua_versions="5.1 5.2 5.3 5.4 jit" ;; esac diff --git a/community/ffmpeg/APKBUILD b/community/ffmpeg/APKBUILD index ec4418f9d0b..974313324a5 100644 --- a/community/ffmpeg/APKBUILD +++ b/community/ffmpeg/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg pkgver=6.1.1 -pkgrel=6 +pkgrel=7 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="https://ffmpeg.org/" arch="all" diff --git a/community/fgt/APKBUILD b/community/fgt/APKBUILD index af110de4330..c30328ad824 100644 --- a/community/fgt/APKBUILD +++ b/community/fgt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bradley J Chambers <brad.chambers@gmail.com> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=fgt -pkgver=0.4.10 +pkgver=0.4.11 pkgrel=0 pkgdesc="C++ library for fast Gauss transforms." url="https://github.com/gadomski/fgt" @@ -32,5 +32,5 @@ package() { } sha512sums=" -ab53198aec84bea3a2941c456f225f5fb41b355f20da685a8fd0a691d269bf2d09c6b61a2c4c5a45620b29d28dbd548e91ad9fef4a23da4e881ccf6734d0707d fgt-v0.4.10.tar.gz +a0e6833485cc97d1db2d0110f2266d1aba245bbe62efb20aecb7c4033cbbd65b060ed599903ee46704c2cc951201d4becf38fb6cc0c1e0fb33c7dac8bc3ecc0c fgt-v0.4.11.tar.gz " diff --git a/community/file-roller/APKBUILD b/community/file-roller/APKBUILD index f25874f687c..ad6e6061c93 100644 --- a/community/file-roller/APKBUILD +++ b/community/file-roller/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=file-roller -pkgver=43.1 +pkgver=44.2 pkgrel=0 pkgdesc="File Roller is an archive manager for the GNOME desktop " url="https://wiki.gnome.org/Apps/FileRoller" @@ -13,12 +13,10 @@ depends_doc="yelp" makedepends=" desktop-file-utils glib-dev - gtk+3.0-dev itstool json-glib-dev + libadwaita-dev libarchive-dev - libhandy1-dev - libnotify-dev libportal-dev meson nautilus-dev @@ -50,5 +48,5 @@ nautilus() { } sha512sums=" -444467c2bf9c2aa885fad5119069232ea92872c1f08fc7cd517e2e64faef924f0b4a9195acbe042e535588ccd86b5147afa041f9ea355f480507c3743a2bb934 file-roller-43.1.tar.xz +741ec593a0df9a797fbd99fac5cc959f83bee0c21b0afb1f663a45a831105ab6f0ad23c3ee08380ba6363dca81ccfa1884c3afbc808e16ce475a33af41ab980d file-roller-44.2.tar.xz " diff --git a/community/filezilla/APKBUILD b/community/filezilla/APKBUILD index 023f2c52b89..9da54c39007 100644 --- a/community/filezilla/APKBUILD +++ b/community/filezilla/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=filezilla pkgver=3.66.5 -pkgrel=0 +pkgrel=1 pkgdesc="FTP Client" url="https://filezilla-project.org/" arch="all" diff --git a/community/firefox-esr/APKBUILD b/community/firefox-esr/APKBUILD index 5c3b8cd541f..de2f3c68e73 100644 --- a/community/firefox-esr/APKBUILD +++ b/community/firefox-esr/APKBUILD @@ -75,6 +75,8 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox ppc-webrtc.patch python-deps.patch rust-lto-thin.patch + https://dev.alpinelinux.org/archive/firefox/rust1.78-packed-to-portable_simd.patch + rust1.78-qcms-stdsimd.patch sandbox-fork.patch sandbox-largefile.patch sandbox-sched_setscheduler.patch @@ -637,6 +639,7 @@ export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection/} -g0 -O2 -Wno-deprecated-b prepare() { default_prepare + rm -rf third_party/rust/packed_simd/ cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/ _clear_vendor_checksums audio_thread_priority @@ -842,6 +845,8 @@ c0437a6753f3f350968fa12d250efdfe1bea77baf0e4c06b072b5cc9e78c774dbf4506bc53633703 6f60e83599041db1b707c21784197ea9816b2c936b89a274bfc24554a600981e6f28448fe41fab0942bd31acd49b1c00beb2eb0961149f2ffa6a4154be123ea7 ppc-webrtc.patch 4e40b34c5f77a1a21fe971a6fcd8a21b1a63423a3a7932a5a6e1c7a2779f9f06a561c806614a01931679a4b1c6afdfd8ae1f3cc6b673f259ccd368e8e54f6e90 python-deps.patch 1c6918dd6655d3a1251bfd4af2e1c561cbb00d540a883b4c1ebf7f5de530d754d9ac07b4b5f56cdab6c511d25c8910ec94043f5733e97501a67abffe1bafaeb1 rust-lto-thin.patch +e4795b88e572bb3b6f009dbacc7872b59db2f8facbe2b07f14dd4f45a77c22049783581869f18c6bb3f04d6edb3da59347278321cce2bfa629a4d35e136cda5c rust1.78-packed-to-portable_simd.patch +eae1afad93cc5fa7699b156619600ca4b41e67943b8b6e05ab972d449aece93bbf1e68a5ea1a7b1c9278633dbf7cf31503255558e3e06ddf168b3937a0e014e8 rust1.78-qcms-stdsimd.patch 2518f2fc75b5db30058e0735f47d60fdf1e7adfaeee4b33fb2afb1bd9a616ce943fd88f4404d0802d4083703f4acf1d5ad42377218d025bc768807fbaf7e1609 sandbox-fork.patch b7d0a6126bdf6c0569f80aabf5b37ed2c7a35712eb8a0404a2d85381552f5555d4f97d213ea26cec6a45dc2785f22439376ed5f8e78b4fd664ef0223307b333e sandbox-largefile.patch f8c3555ef6207933cbffbf4fc101a9b4c0d2990c0063162f0f0bde70ef0b46f86bfac42e7110695183424a87948de593f3927b2d8509ede3e4fc7bd8a1fad1ce sandbox-sched_setscheduler.patch diff --git a/community/firefox-esr/rust1.78-qcms-stdsimd.patch b/community/firefox-esr/rust1.78-qcms-stdsimd.patch new file mode 100644 index 00000000000..2c86aa14a0b --- /dev/null +++ b/community/firefox-esr/rust1.78-qcms-stdsimd.patch @@ -0,0 +1,64 @@ +Relevant bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=1882291 + + +diff --git a/Cargo.lock b/Cargo.lock +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4274,10 +4274,11 @@ + [[package]] + name = "qcms" + version = "0.2.0" + dependencies = [ + "libc", ++ "version_check", + ] + + [[package]] + name = "qlog" + version = "0.4.0" +diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml +--- a/gfx/qcms/Cargo.toml ++++ b/gfx/qcms/Cargo.toml +@@ -18,5 +18,8 @@ + iccv4-enabled = [] + cmyk = [] + + [dependencies] + libc = {version = "0.2", optional = true } ++ ++[build-dependencies] ++version_check = "0.9" +diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs +new file mode 100644 +--- /dev/null ++++ b/gfx/qcms/build.rs +@@ -0,0 +1,7 @@ ++extern crate version_check as rustc; ++ ++fn main() { ++ if rustc::is_min_version("1.78.0").unwrap_or(false) { ++ println!("cargo:rustc-cfg=stdsimd_split"); ++ } ++} +diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs +--- a/gfx/qcms/src/lib.rs ++++ b/gfx/qcms/src/lib.rs +@@ -5,13 +5,15 @@ + #![allow(non_camel_case_types)] + #![allow(non_snake_case)] + #![allow(non_upper_case_globals)] + // These are needed for the neon SIMD code and can be removed once the MSRV supports the + // instrinsics we use +-#![cfg_attr(feature = "neon", feature(stdsimd))] ++#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))] ++#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))] ++#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))] + #![cfg_attr( +- feature = "neon", ++ all(target_arch = "arm", feature = "neon"), + feature(arm_target_feature, raw_ref_op) + + )] + + /// These values match the Rendering Intent values from the ICC spec + diff --git a/community/firefox/APKBUILD b/community/firefox/APKBUILD index 99acba5fbb8..9399301cb2d 100644 --- a/community/firefox/APKBUILD +++ b/community/firefox/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=firefox -pkgver=125.0.1 -_releasedate=2024-04-02 +pkgver=125.0.3 +_releasedate=2024-04-29 pkgrel=0 pkgdesc="Firefox web browser" url="https://www.firefox.com/" @@ -752,7 +752,7 @@ intl() { } sha512sums=" -6f2f336de8b0ec9cb19ba20c909407b7b88c0319ee3b2f1f3429133516b0c45b4c7846f287985a0cdb9f34acc7d5378ed14fb48e26bef113c8ac360501a30c4d firefox-125.0.1.tar.xz +18e705a3093290311ccb5f27f01e43fe243ece94c1769a9ccc4fa53d370e32a1ec6a107cdeb531e9468b9aca1a1fe668161adb7acc1ec65fd383837882c7d484 firefox-125.0.3.tar.xz eb49b791280a8d765e6b056816ad6d7ec20a3b13723ebe648a8ecd2c086a5bc83277a3b4c127a470e7bb7105cfa4ed7611c19ac683545140190cafaa880ad515 disable-moz-stackwalk.patch 19eea840aa9c1c21e7bd1f832ec078989fe6f08fca40baa271be7e74f1cffeb5ab8d3218a93e664b8d90a41506dede524e2a5174cd47580866109bc6711ea969 fix-fortify-system-wrappers.patch cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch diff --git a/community/flare/APKBUILD b/community/flare/APKBUILD index 340378e5a54..3db895f073f 100644 --- a/community/flare/APKBUILD +++ b/community/flare/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Krassy Boykinov <kboykinov@teamcentrixx.com> pkgname=flare -pkgver=0.14.2 +pkgver=0.14.3 pkgrel=0 pkgdesc="Unofficial Signal GTK client" url="https://gitlab.com/schmiddi-on-mobile/flare" @@ -43,6 +43,6 @@ package() { } sha512sums=" -3db2765e60e27378961e7b8fe7703dd5482f4fac8a3cb5136bae45cd669dbb18ce5425fc9898ba07b293fb2dd824b1929f4b4cd2b730931dd6eb9dabf45fd36b flare-0.14.2.tar.gz +3078e951390332169ccc52218a820dd4f475ceb0ea4da31f4f5c1f8ffe9bdfb16e5054cb85e3de4669e4d816a76ebb02957f13b46358e40e19a819b1cddf9096 flare-0.14.3.tar.gz 8fbf1841edf7e0ca665592b8f70e61bd5cf95f4b5cf75c26f0ea9c73fd6e715dfc9635f9cf8c09983ba80e82f3f57593bb0a5b08baf67b1d6bc795bcea018d19 no-cargo-home.patch " diff --git a/community/flatpak-kcm/APKBUILD b/community/flatpak-kcm/APKBUILD index 9ed02461147..fdcfb07d5cc 100644 --- a/community/flatpak-kcm/APKBUILD +++ b/community/flatpak-kcm/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=flatpak-kcm -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Flatpak Permissions Management KCM" # armhf blocked by qt6-qtdeclarative @@ -55,5 +55,5 @@ package() { } sha512sums=" -05d05e515e7f250d80ab6f8582256ad6de4ff1696943a6fd790071895af7bd432f70d30928f7436fdaf81023a9b4478e8a08ac05efd69419df4bb8dd0f027811 flatpak-kcm-6.0.3.tar.xz +d07e9bf459d455079f1fd6aa71f095e5f153a828133fd09e2903b050382501f1a2df71501c0b2639e2182649e2fe552b9aadd240cceddd27f6a4d840cf1b1472 flatpak-kcm-6.0.4.tar.xz " diff --git a/community/flatpak/APKBUILD b/community/flatpak/APKBUILD index 5629e0bab9b..6c32bf0eb2e 100644 --- a/community/flatpak/APKBUILD +++ b/community/flatpak/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=flatpak # Follows GNOME versioning, MINOR (the 2nd number) must be even. -pkgver=1.14.5 -pkgrel=3 +pkgver=1.14.6 +pkgrel=1 pkgdesc="Application deployment framework for desktop apps" url="https://flatpak.org/" arch="all" @@ -59,6 +59,8 @@ source="https://github.com/flatpak/flatpak/releases/download/$pkgver/flatpak-$pk options="!check" # test environment setup requires glibc layout (locales..) # secfixes: +# 1.14.6-r1: +# - CVE-2024-32462 # 1.12.5-r0: # - CVE-2022-21682 # 1.12.3-r0: @@ -131,7 +133,7 @@ gdm() { } sha512sums=" -552deaaf3e6712a56f33698c20e6b8225c8893fe9a375af897fd99e19c487bf79b19c3e4ce3b00f3caf90020019ff67c628ca6a8f2ae1e6e01db397d2081ab2b flatpak-1.14.5.tar.xz +d858682dbf539afe1b91087b6a0e0ebeea6658a0ef02c96d68259f3d8c58d1e6d02dd8b69db1b3c55f6d5df0f4d7e41c6165f668f09763dd3f9c3beb48f8bcf5 flatpak-1.14.6.tar.xz 57d23d2778556eafc3035e6be575bf95b4032f123b35f2b1657eff5e7496de253173edc657f90531ee58e25673f4f27a5cd1cc76b14a038edb244f104a231771 modules-load.conf 665dc6003360ea65ce391fe2283344d47c1dafc8f860a5ba410641c7ef54d0c68a63c41963843aeb0364b95df567a83cb80007db282bd284a0744aacced8f1d3 fusermount3.patch 4317f1ade5999c5a4e1392b074c32dae07858f79a2769fd7f207182cb514b446fc33b480676d9e8eeaf7f26461e340342a8a17494cfdc63f156c38b58852daf4 tzdir.patch diff --git a/community/font-iosevka/APKBUILD b/community/font-iosevka/APKBUILD index 862fbf54c11..a8d3ef3c595 100644 --- a/community/font-iosevka/APKBUILD +++ b/community/font-iosevka/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=font-iosevka -pkgver=29.2.0 +pkgver=30.0.0 pkgrel=0 pkgdesc="Versatile typeface for code, from code" url="https://typeof.net/Iosevka/" @@ -72,10 +72,10 @@ curly_slab() { } sha512sums=" -1677bda3b752a64183767ef61246e8df65b7f4266291420d70baade416f8686a14073be55a68f8193b78f0ed81e288d31afd7eeb82714455aea6abb5bffd9d85 PkgTTC-Iosevka-29.2.0.zip -9008f4800a31142f22f85f94ff5ccc29581cda4067fba83843279e1f170a51c1bffca85e002384ab65aaafd6ce850e88639880012da0521c2e3ecf6397fbbdae PkgTTC-IosevkaAile-29.2.0.zip -e63d4c98de1fa4dd9cf7248c3384737738dd3fdb22f1debfe14b7482e3d08d1b59199cf952a8288f389de6d8e1f87b140cc09ae0ad6ca128a41d914cff8a9452 PkgTTC-IosevkaEtoile-29.2.0.zip -dca81e6cc00415c10a05943ed862451fc252767e510e7004e0e81a4866c2da249f88ee70fb117f73b15138f48d03589203c628757df69921588d847287a132b4 PkgTTC-IosevkaSlab-29.2.0.zip -fa1712529ee5d6cde804a1bac14cf15f5cf7d399fdf6225046e89d5f0faf9752b3833cfd7cb037f0e856fad144cbfb10d12e1ee71a96b41f8fc96ac6918b5d51 PkgTTC-SGr-IosevkaCurly-29.2.0.zip -2b74fddb2c6040af25207c90282c34b53248e46bd653c5d322727cd3b72069f8a852d1957b50a9c2f5dda8755f31eec101fb21421d273e8d7691e54c3fcaf21f PkgTTC-SGr-IosevkaCurlySlab-29.2.0.zip +48a62437651f8891f8fd720d5b816991df26c420b0fef783ce72409f5151c4cbc414d0b0da31bf706915e951d0b3eec764c6a8c15025c3eb93ff47ff56b577a4 PkgTTC-Iosevka-30.0.0.zip +4403629f7cf07fb04ad53cb923b95b9a29c1bf5ca0d85addcb8a8164531d3e14d807c54ad475f49c5e5e51ead7555a654b86ae494b2baebf24067f9aaecfcd4b PkgTTC-IosevkaAile-30.0.0.zip +a4d8f82c7e88b1c1b4a4ee4536e0cce898cfcba9852fbe65589cd61788fed8a918de534bb8801ca5af0fdb08766ddd7f5ea0d7a0331837837f090aa35cf1c830 PkgTTC-IosevkaEtoile-30.0.0.zip +0aa4fe91abbdea1a532b98cf698a147f99b364245452e32fb436b84315d5c9e6063cac942d15a9e09ece2b777c8f4a6662feddc98cc7b32a7534381f4a5f426d PkgTTC-IosevkaSlab-30.0.0.zip +2f23f3f666911b6eace73d079f7cba930a454fd9f8b009f9bc99f3c283d8c812fb69986c12bddc3eb1ffd2a756a62fb6c4a28046355ca1a59c8b9061608ab8e9 PkgTTC-SGr-IosevkaCurly-30.0.0.zip +d3e45d133304204262de8377d28698728810ab64d36d65bd598cc667e7cce59d516f76a58fa305583149b6eb20d5b907a61b255111dde99c2d182d11d5618091 PkgTTC-SGr-IosevkaCurlySlab-30.0.0.zip " diff --git a/testing/font-juliamono/APKBUILD b/community/font-juliamono/APKBUILD index ad81f54f0ff..5772a8a8b6a 100644 --- a/testing/font-juliamono/APKBUILD +++ b/community/font-juliamono/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=font-juliamono -pkgver=0.054 +pkgver=0.055 pkgrel=0 pkgdesc="Monospaced font with reasonable Unicode support" url="https://juliamono.netlify.app/" @@ -15,5 +15,5 @@ package() { } sha512sums=" -220781d859849d599ce9930a4ad0fba0bc8ab20b16d8ca664ca32ca5073f897e582d39edd669a8943dcfec2c71277b61c5e6fd0e9bc3f7e27cf8394873d1d731 font-juliamono-0.054.tar.gz +aa3be3ff2092a1ae09d94d2a8c36ba192240c080e06e5718a6ff65bd5eddaf30956cd1c61ba2858b0284612a8f11ef0cac31138d5a44d8aff8e205cc9e38bbc0 font-juliamono-0.055.tar.gz " diff --git a/testing/font-merriweather/APKBUILD b/community/font-merriweather/APKBUILD index 8dcf5950a57..8dcf5950a57 100644 --- a/testing/font-merriweather/APKBUILD +++ b/community/font-merriweather/APKBUILD diff --git a/community/font-noto-cjk/APKBUILD b/community/font-noto-cjk/APKBUILD index c091e7b38ed..f1174b6d261 100644 --- a/community/font-noto-cjk/APKBUILD +++ b/community/font-noto-cjk/APKBUILD @@ -11,7 +11,7 @@ arch="noarch" license="OFL-1.1" depends="fontconfig" subpackages="$pkgname-extra:_extra" -source="https://dev.alpinelinux.org/archive/font-noto-cjk/$pkgname-$pkgver.tar.xz" +source="https://dev.alpinelinux.org/archive/font-noto-cjk/font-noto-cjk-$pkgver.tar.xz" options="!check" # font # the git repo tarballs don't give any fonts (?), diff --git a/community/font-parisienne/APKBUILD b/community/font-parisienne/APKBUILD index 9ba895cc610..a9a6a5783d7 100644 --- a/community/font-parisienne/APKBUILD +++ b/community/font-parisienne/APKBUILD @@ -7,7 +7,8 @@ pkgdesc="Parisienne is a casual connecting script inspired by a 1960s Bra advert url="https://fonts.google.com/specimen/Parisienne" arch="noarch" license="OFL-1.1" -source="Parisienne-$pkgver.zip::https://fonts.google.com/download?family=Parisienne" +#source="Parisienne-$pkgver.zip::https://fonts.google.com/download?family=Parisienne" +source="https://distfiles.alpinelinux.org/distfiles/edge/Parisienne-$pkgver.zip" options="!check" # No code to test builddir="$srcdir/" diff --git a/testing/font-spleen/APKBUILD b/community/font-spleen/APKBUILD index dc75a3cf749..dc75a3cf749 100644 --- a/testing/font-spleen/APKBUILD +++ b/community/font-spleen/APKBUILD diff --git a/community/foot/APKBUILD b/community/foot/APKBUILD index 3d825846cee..a5ef7234dd1 100644 --- a/community/foot/APKBUILD +++ b/community/foot/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Alex McGrath <amk@amk.ie> pkgname=foot -pkgver=1.17.1 +pkgver=1.17.2 pkgrel=0 pkgdesc="Fast, lightweight and minimalistic Wayland terminal emulator" url="https://codeberg.org/dnkl/foot" @@ -75,5 +75,5 @@ _themes() { } sha512sums=" -cfc9b074e4c0ec5f7deb50f3fe7b192cf4218b087b1b77774a8b39bbe7959a8de6a03e643446fac25d857a73e16fc1233f0c4da7160af820af7a9f63dea5d487 foot-1.17.1.tar.gz +72a9fc5ec38c2cb8417b74c3089c82d7a0c0090339ab2312df3d1eafc442e5254ae79f9dcfefa50d8866e77a5776aa6fc5727a758f792986abf0cfb9b4f0658e foot-1.17.2.tar.gz " diff --git a/community/fossil/APKBUILD b/community/fossil/APKBUILD index c86206eb87f..4fe57654e1e 100644 --- a/community/fossil/APKBUILD +++ b/community/fossil/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: David Demelier <markand@malikania.fr> pkgname=fossil -pkgver=2.23 +pkgver=2.24 pkgrel=0 pkgdesc="Simple, high-reliability, distributed software configuration management" url="https://www.fossil-scm.org" @@ -11,7 +11,10 @@ license="BSD-2-Clause" makedepends="openssl-dev>3 tcl-dev zlib-dev" checkdepends="coreutils ed tcl-lib" subpackages="$pkgname-bash-completion $pkgname-zsh-completion" -source="https://www.fossil-scm.org/home/tarball/version-$pkgver/fossil-src-$pkgver.tar.gz" +source="https://www.fossil-scm.org/home/tarball/version-$pkgver/fossil-src-$pkgver.tar.gz + fix-tests.patch + " +patch_args="-p0" builddir="$srcdir/$pkgname-src-$pkgver" build() { @@ -43,5 +46,6 @@ package() { } sha512sums=" -bba67e16b26b97aa40023a4a2aa3b2abfc9393ec8d3244ec88dab5b7d2c4d46e7d6ee89b008a6bce1f18c96c351c8d41d64f02ba28c0eb3eb04d01e308f3335b fossil-src-2.23.tar.gz +7fc7de7d947b0946866df38c6cb2215f6452d31903cae6470bb4a692816b2803eb66ea372280256e5cd00759e4d02a0ae459de2f56f39af10e873579d53d33ee fossil-src-2.24.tar.gz +2ce139acca006a754616409e2b713e814d7daf3633c3171e5ac2f98778fcb990638a4bb2037e2c02e7e3e9227fd1f7e0fad33e7ed8f98cc9a0fdc2f698629ccf fix-tests.patch " diff --git a/community/fossil/fix-tests.patch b/community/fossil/fix-tests.patch new file mode 100644 index 00000000000..4c58e062724 --- /dev/null +++ b/community/fossil/fix-tests.patch @@ -0,0 +1,274 @@ +Patch-Source: https://fossil-scm.org/home/vpatch?from=merge-in:17c01c549e73c6b8&to=17c01c549e73c6b8 +-- +Index: test/amend.test +================================================================== +--- test/amend.test ++++ test/amend.test +@@ -313,10 +313,11 @@ + } + foreach res [lsort -nocase $result] { + append t2exp "sym-$res*" + } + eval fossil amend $HASH $tags ++ set t1exp [string trimleft $t1exp ,] + test amend-tag-$tc.1 {[string match "*hash:*$HASH*tags:*$t1exp*" $RESULT]} + fossil tag ls --raw $HASH + test amend-tag-$tc.2 {[string match $t2exp $RESULT]} + fossil timeline -n 1 + test amend-tag-$tc.3 {[string match $t3exp $RESULT]} + +Index: test/json.test +================================================================== +--- test/json.test ++++ test/json.test +@@ -107,11 +107,11 @@ + set request [subst {POST $url HTTP/1.0\r + Host: localhost\r + User-Agent: Fossil-Test\r + Cookie: $cookie\r + Content-Type: application/json +-Content-Length $len ++Content-Length: $len + \r + $data}] + } else { + set request [subst {GET $url HTTP/1.0\r + Host: localhost\r + +Index: test/merge5.test +================================================================== +--- test/merge5.test ++++ test/merge5.test +@@ -23,11 +23,11 @@ + } + protOut { + fossil sqlite3 --no-repository reacts badly to SQL dumped from + repositories created from fossil older than version 2.0. + } +-test merge5-sqlite3-issue false knownBug ++#test merge5-sqlite3-issue false knownBug + test_cleanup_then_return + + # Verify the results of a check-out + # + proc checkout-test {testid expected_content} { + +Index: test/stash.test +================================================================== +--- test/stash.test ++++ test/stash.test +@@ -168,14 +168,14 @@ + + ######## + # fossil stash show|cat ?STASHID? ?DIFF-OPTIONS? + # fossil stash [g]diff ?STASHID? ?DIFF-OPTIONS? + +-fossil stash show +-test stash-1-show {[normalize_result] eq $diff_stash_1} +-fossil stash diff +-test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug ++#fossil stash show ++#test stash-1-show {[normalize_result] eq $diff_stash_1} ++#fossil stash diff ++#test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug + + ######## + # fossil stash pop + + stash-test 2 pop { +@@ -206,16 +206,16 @@ + # fossil: ./src/delta.c:231: checksum: Assertion '...' failed. + # Should be triggered by this stash-WY-1 test. + fossil checkout --force c1 + fossil clean + fossil mv --soft f1 f1new +-stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} { +- REVERT f1 +- DELETE f1new +-} -changes { +-} -addremove { +-} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result} ++#stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} { ++# REVERT f1 ++# DELETE f1new ++#} -changes { ++#} -addremove { ++#} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result} + # TODO: add tests that verify the saved stash is sensible. Possibly + # by applying it and checking results. But until the SQLITE_CONSTRAINT + # error is fixed, there is nothing stashed to test. + + +@@ -296,16 +296,17 @@ + }] -changes { + RENAMED f2 -> f2n + } -addremove { + } -exists {f1 f2n} -notexists {f2} + +-stash-test 3-2 {save -m f2n} { +- REVERT f2 +- DELETE f2n +-} -exists {f1 f2} -notexists {f2n} -knownbugs {-result} ++fossil stash save -m f2n ++#stash-test 3-2 {save -m f2n} { ++# REVERT f2 ++# DELETE f2n ++#} -exists {f1 f2} -notexists {f2n} -knownbugs {-result} + fossil stash show +-test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug ++#test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug + test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]} + stash-test 3-2-pop {pop} { + UPDATE f1 + UPDATE f2n + } -changes { + +Index: test/tester.tcl +================================================================== +--- test/tester.tcl ++++ test/tester.tcl +@@ -308,10 +308,11 @@ + comment-format \ + crlf-glob \ + crnl-glob \ + default-csp \ + default-perms \ ++ default-skin \ + diff-binary \ + diff-command \ + dont-commit \ + dont-push \ + dotfiles \ + +Index: test/utf.test +================================================================== +--- test/utf.test ++++ test/utf.test +@@ -35,11 +35,11 @@ + set i 1 + foreach {fileName result} $args { + set fileName [file join $tempPath $fileName] + fossil test-looks-like-utf $fileName + set result [string map [list %TEMP% $tempPath \r\n \n] $result] +- # if {$::RESULT ne $result} {puts stdout $::RESULT} ++ # if {$::RESULT ne $result} {puts stdout $::RESULT; exit} + test utf-check-$testname.$i {$::RESULT eq $result} + incr i + } + } + +@@ -17609,25 +17609,25 @@ + Has flag LOOK_LONG: no + Has flag LOOK_INVALID: no + Has flag LOOK_ODD: no + Has flag LOOK_SHORT: no} + +-utf-check 1179 utf-check-1179-2-129-1.jnk \ +-{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes. +-Starts with UTF-8 BOM: no +-Starts with UTF-16 BOM: yes +-Looks like UTF-8: no +-Has flag LOOK_NUL: yes +-Has flag LOOK_CR: no +-Has flag LOOK_LONE_CR: no +-Has flag LOOK_LF: no +-Has flag LOOK_LONE_LF: no +-Has flag LOOK_CRLF: no +-Has flag LOOK_LONG: no +-Has flag LOOK_INVALID: yes +-Has flag LOOK_ODD: no +-Has flag LOOK_SHORT: no} ++#utf-check 1179 utf-check-1179-2-129-1.jnk \ ++#{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes. ++#Starts with UTF-8 BOM: no ++#Starts with UTF-16 BOM: yes ++#Looks like UTF-8: yes ++#Has flag LOOK_NUL: no ++#Has flag LOOK_CR: no ++#Has flag LOOK_LONE_CR: no ++#Has flag LOOK_LF: no ++#Has flag LOOK_LONE_LF: no ++#Has flag LOOK_CRLF: no ++#Has flag LOOK_LONG: no ++#Has flag LOOK_INVALID: yes ++#Has flag LOOK_ODD: no ++#Has flag LOOK_SHORT: no} + + utf-check 1180 utf-check-1180-2-130-0.jnk \ + {File "%TEMP%/utf-check-1180-2-130-0.jnk" has 4 bytes. + Starts with UTF-8 BOM: no + Starts with UTF-16 BOM: yes +@@ -24121,41 +24121,41 @@ + Has flag LOOK_LONG: no + Has flag LOOK_INVALID: yes + Has flag LOOK_ODD: no + Has flag LOOK_SHORT: no} + +-utf-check 1586 utf-check-1586-3-128-0.jnk \ +-{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes. +-Starts with UTF-8 BOM: no +-Starts with UTF-16 BOM: no +-Looks like UTF-8: no +-Has flag LOOK_NUL: yes +-Has flag LOOK_CR: no +-Has flag LOOK_LONE_CR: no +-Has flag LOOK_LF: no +-Has flag LOOK_LONE_LF: no +-Has flag LOOK_CRLF: no +-Has flag LOOK_LONG: no +-Has flag LOOK_INVALID: yes +-Has flag LOOK_ODD: no +-Has flag LOOK_SHORT: no} +- +-utf-check 1587 utf-check-1587-3-128-1.jnk \ +-{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes. +-Starts with UTF-8 BOM: no +-Starts with UTF-16 BOM: no +-Looks like UTF-8: no +-Has flag LOOK_NUL: yes +-Has flag LOOK_CR: no +-Has flag LOOK_LONE_CR: no +-Has flag LOOK_LF: no +-Has flag LOOK_LONE_LF: no +-Has flag LOOK_CRLF: no +-Has flag LOOK_LONG: no +-Has flag LOOK_INVALID: yes +-Has flag LOOK_ODD: no +-Has flag LOOK_SHORT: no} ++#utf-check 1586 utf-check-1586-3-128-0.jnk \ ++#{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes. ++#Starts with UTF-8 BOM: no ++#Starts with UTF-16 BOM: reversed ++#Looks like UTF-16: no ++#Has flag LOOK_NUL: yes ++#Has flag LOOK_CR: no ++#Has flag LOOK_LONE_CR: no ++#Has flag LOOK_LF: no ++#Has flag LOOK_LONE_LF: no ++#Has flag LOOK_CRLF: no ++#Has flag LOOK_LONG: no ++#Has flag LOOK_INVALID: no ++#Has flag LOOK_ODD: no ++#Has flag LOOK_SHORT: no} ++ ++#utf-check 1587 utf-check-1587-3-128-1.jnk \ ++#{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes. ++#Starts with UTF-8 BOM: no ++#Starts with UTF-16 BOM: reversed ++#Looks like UTF-8: no ++#Has flag LOOK_NUL: yes ++#Has flag LOOK_CR: no ++#Has flag LOOK_LONE_CR: no ++#Has flag LOOK_LF: no ++#Has flag LOOK_LONE_LF: no ++#Has flag LOOK_CRLF: no ++#Has flag LOOK_LONG: no ++#Has flag LOOK_INVALID: yes ++#Has flag LOOK_ODD: no ++#Has flag LOOK_SHORT: no} + + utf-check 1588 utf-check-1588-3-129-0.jnk \ + {File "%TEMP%/utf-check-1588-3-129-0.jnk" has 6 bytes. + Starts with UTF-8 BOM: no + Starts with UTF-16 BOM: no + diff --git a/community/fractal/APKBUILD b/community/fractal/APKBUILD index 22b8f516645..89e1bfecf80 100644 --- a/community/fractal/APKBUILD +++ b/community/fractal/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fractal -pkgver=6 +pkgver=7 pkgrel=0 pkgdesc="Matrix group messaging app" url="https://wiki.gnome.org/Apps/Fractal" @@ -55,5 +55,5 @@ package() { } sha512sums=" -4a57aedba9cd6e79999457837d2932ddbe5b62a2cb7d22dc8afd15c509c30484a663697cec91c2f5b40ab5153aadb0fac65a3d2ce59f444ff6ffe1f566d566ab fractal-6.tar.gz +389d9c51068fbfe5b1f2ee3591a3fead4e94cf8a525d262ad89701c023d21ff8621d055ab07ffd785bcfd77df05234536e0d0848866da979f5a7a1cb875cdf4a fractal-7.tar.gz " diff --git a/community/fragments/0001-Use-cargo-auditable-build-instead-of-cargo-build.patch b/community/fragments/0001-Use-cargo-auditable-build-instead-of-cargo-build.patch new file mode 100644 index 00000000000..c4d47942346 --- /dev/null +++ b/community/fragments/0001-Use-cargo-auditable-build-instead-of-cargo-build.patch @@ -0,0 +1,15 @@ +diff --git a/src/meson.build b/src/meson.build +index 96f692d..ee77d26 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -49,9 +49,9 @@ cargo_release = custom_target( + command: [ + 'env', + cargo_env, +- cargo, 'build', ++ cargo, 'auditable', 'build', + cargo_options, + '&&', + 'cp', 'target' / rust_target / meson.project_name(), '@OUTPUT@', + ] + diff --git a/testing/fragments/no-cargo-home.patch b/community/fragments/0002-Remove-cargo-home.patch index f6530ce9128..17e76ddb4af 100644 --- a/testing/fragments/no-cargo-home.patch +++ b/community/fragments/0002-Remove-cargo-home.patch @@ -1,13 +1,13 @@ diff --git a/src/meson.build b/src/meson.build -index bf2da60..8c1069d 100644 +index ee77d26..f9bb03e 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -55,8 +55,6 @@ cargo_release = custom_target( +@@ -47,8 +47,6 @@ cargo_release = custom_target( install: true, - install_dir: get_option('bindir'), + install_dir: bindir, command: [ - 'env', - cargo_env, - cargo, 'build', + cargo, 'auditable', 'build', cargo_options, '&&', diff --git a/testing/fragments/APKBUILD b/community/fragments/APKBUILD index 0d575cfc50c..2c0a789af6a 100644 --- a/testing/fragments/APKBUILD +++ b/community/fragments/APKBUILD @@ -1,8 +1,8 @@ # Contributor: NekoCWD <nekodevelopper@gmail.com> # Maintainer: NekoCWD <nekodevelopper@gmail.com> pkgname=fragments -pkgver=2.1.1 -pkgrel=0 +pkgver=3.0.0 +pkgrel=1 pkgdesc="A BitTorrent Client" url="https://gitlab.gnome.org/World/Fragments" # s390x fails to build @@ -12,6 +12,7 @@ license="GPL-3.0-or-later" depends="transmission-daemon" makedepends=" cargo + cargo-auditable dbus-dev desktop-file-utils libadwaita-dev @@ -22,7 +23,8 @@ makedepends=" subpackages="$pkgname-lang" source=" https://gitlab.gnome.org/World/Fragments/-/archive/$pkgver/Fragments-$pkgver.tar.gz - no-cargo-home.patch + 0001-Use-cargo-auditable-build-instead-of-cargo-build.patch + 0002-Remove-cargo-home.patch " options="net" # needed for downloading dependencies builddir="$srcdir/Fragments-$pkgver" # Name starts with capital letter @@ -50,6 +52,7 @@ package() { } sha512sums=" -c4455f7f12a9abaaf42feb74ff07f49d5a91b0d50d1d80cc7980b8e6147146dd8784e766a36d5503ade6c663c3d42fc19573ff9a54da34f614549bc1ad91a003 Fragments-2.1.1.tar.gz -2c4b7433f27b18bbb428bdc2053cda53f10e958a2045499ab7af6102df9610822cf36a82636cd5b9501ba4e204aeddc18fcdb79aff773657a9a5a3c1aeba8e95 no-cargo-home.patch +bb0f30249bcba9c8bec2245443faf91acccca47af755383e339d9e22b2a4e8ea4173b3596c7c202226724dfefb806ec125e5b74903041aa599507bdaac5e0060 Fragments-3.0.0.tar.gz +56d76e2d50a20472e26aed22db48b9bcf5ea001e237976dd9b39900e409591a085fae8205162ed0f1cc63f9c37b59bf7af10a156755a0c067d42fcaab8e3c589 0001-Use-cargo-auditable-build-instead-of-cargo-build.patch +c79144a2139129a8b67838d308c7fb552fe56baa3c63ee0fcdaa95dd9bdeca76089a66e7c8b584848b3bb6b2dc1394ea7123ab8e2412bd3f389819ae6fdd9924 0002-Remove-cargo-home.patch " diff --git a/community/frameworkintegration/APKBUILD b/community/frameworkintegration/APKBUILD index b81ed69d7dd..3f561945fe5 100644 --- a/community/frameworkintegration/APKBUILD +++ b/community/frameworkintegration/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=frameworkintegration -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace" # armhf blocked by extra-cmake-modules @@ -49,5 +49,5 @@ package() { } sha512sums=" -2f16528997b54ebb95e2fde1fe94133d672e72ef91bb2e607887b733fef128ea9c3e57b1f3f8cbf0ba74835dab6e145729725746918eaac98b643446a0cb3391 frameworkintegration-6.1.0.tar.xz +cf1c3659e603bf52c4a45a5c7533022f5969900ced43725fbe0e86c47c278266b2d78cf86f7afcc69e912d4d85849a28c240d40b18379a6304a297928cabb3d9 frameworkintegration-6.2.0.tar.xz " diff --git a/community/freeciv/APKBUILD b/community/freeciv/APKBUILD index 3431ce6e55a..9ec49347686 100644 --- a/community/freeciv/APKBUILD +++ b/community/freeciv/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Maxim Karasev <begs@disroot.org> # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=freeciv -pkgver=3.1.0 +pkgver=3.1.1 pkgrel=0 pkgdesc="Free and Open Source empire-building strategy game (meta package)" url="http://www.freeciv.org" @@ -212,5 +212,5 @@ server() { } sha512sums=" -5d3f8df3defc4737be718ed371b41048f0cbdb25b83901009e4572b3910773a2bd33727bec0bc25169a3066b74152545c5bf813efeb5c9cf5429c85a20ccf594 freeciv-3.1.0.tar.xz +4ee39408aa843f2e63e9059a55c67b4374e4daddfc903519be611c9e026aea3a2755f80d18dd2179459700f18b59d21ada585e77dfe24769bf3f9c466654fe68 freeciv-3.1.1.tar.xz " diff --git a/community/frp/APKBUILD b/community/frp/APKBUILD index 64e257a91d8..6485f94cbd2 100644 --- a/community/frp/APKBUILD +++ b/community/frp/APKBUILD @@ -1,11 +1,11 @@ # Contributor: wener <wenermail@gmail.com> # Maintainer: wener <wenermail@gmail.com> pkgname=frp -pkgver=0.57.0 +pkgver=0.58.0 pkgrel=0 pkgdesc="A fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet." url="https://github.com/fatedier/frp" -arch="all" +arch="all !loongarch64" license="Apache-2.0" makedepends="go" subpackages="$pkgname-openrc" @@ -44,7 +44,7 @@ package() { } sha512sums=" -624378e6015277010419e55d911a92903578309810fa626c4349792668aa2b1f790229d10b1d68dd2bd59a4c91bcede6e41fdc48428534bee0097e5c844fc8b1 frp-0.57.0.tar.gz +7b9309268f04da30b4c7f594dfb582a0ad08afc25fcc99b733bc9fc91ef90cbb35c985e3e13dcd0765dff1154ce12b3487742553f6a9982d27c261c29b744ccb frp-0.58.0.tar.gz abb4c2ae463750e4d1a1f22d8bb7ad5a37190c1664aeae471b06474f47158ecfdc7ce53141f82baacfac5ee601353600277e5b71079956d0f20dbc03ef38da00 enable-cgo.patch a424d59a223c7bf675d20352da7a80436214d779f2ff7b284cbf8a40272b773e87954c081bc0c2a99bad999814a68f8ec2f79b31314fb375457395100125ef98 frpc.initd ec6298b39a3804deee2e97b879f00c65f6cc6891e969fec7f8440decbba75451e97b54a8f8325b36ea2e5cff9a5d43f2cbdd994dcff5df91e45e13269133d4de frpc.confd diff --git a/community/frr/APKBUILD b/community/frr/APKBUILD index 6c4316cfa61..c44f26c7a6c 100644 --- a/community/frr/APKBUILD +++ b/community/frr/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=frr pkgver=10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Free Range Routing is a fork of Quagga" pkgusers="frr" pkggroups="frr frrvty" @@ -42,7 +42,10 @@ subpackages="$pkgname-dbg " source="https://github.com/FRRouting/frr/archive/frr-$pkgver.tar.gz frr.initd + allow-invalid-nlri-attributes.patch + fix-basename.patch + fix-py-syntaxwarning.patch " builddir="$srcdir/frr-frr-$pkgver" @@ -149,4 +152,6 @@ sha512sums=" f02fe672d3ab7382752f83a8ae1e6198e6b906b4ad31063aad18b803c8756b40fa1f280c5dafe872dea505bcc882fbb8392802411f9fac0ab0bd45dac8b3ed28 frr-10.0.tar.gz f86bdf8f6dd89ba69d03a69bbe645b3b752d3fbb38913c5155536b8043b0493901ab078b7acb6ac463d3473c6492900d8a695582f66610955246052b19c0d70c frr.initd 5b2d735da13ea469c07b254d870fa67f36edb8ccf9eb7073f8858a830e5ec6356a6a9ebe304523ced475ad49beadf09666212eedb65b41edde2d12043ff4b900 allow-invalid-nlri-attributes.patch +6ae23e78930a9361f591619d36ca71682c926b070431ecbb58955a0ec1560f003608b235ca5b6a256610d2f72eeb361f4738c6d5dcaaa9812e43366c8b7faa5a fix-basename.patch +31552271c2661549f0f040921ad5b7df7570965d6e16fa41d28e84744bc8e0a17a7ad1a90cb0cb949e5898b6bf03ec3cfef8e39a57cac49bcccacdddb36d4a47 fix-py-syntaxwarning.patch " diff --git a/community/frr/fix-basename.patch b/community/frr/fix-basename.patch new file mode 100644 index 00000000000..1873a29ca5c --- /dev/null +++ b/community/frr/fix-basename.patch @@ -0,0 +1,12 @@ +--- a/zebra/zebra_netns_notify.c ++++ b/zebra/zebra_netns_notify.c +@@ -34,6 +34,9 @@ + + #ifdef HAVE_NETLINK + ++#define basename(path) \ ++ (strrchr((path),'/') ? strrchr((path),'/')+1 : (path)) ++ + /* upon creation of folder under /var/run/netns, + * wait that netns context is bound to + * that folder 10 seconds diff --git a/community/frr/fix-py-syntaxwarning.patch b/community/frr/fix-py-syntaxwarning.patch new file mode 100644 index 00000000000..d5f06c7210d --- /dev/null +++ b/community/frr/fix-py-syntaxwarning.patch @@ -0,0 +1,42 @@ +--- a/doc/manpages/conf.py ++++ b/doc/manpages/conf.py +@@ -91,7 +91,7 @@ + + # extract version information, installation location, other stuff we need to + # use when building final documents +-val = re.compile('^S\["([^"]+)"\]="(.*)"$') ++val = re.compile(r'^S\["([^"]+)"\]="(.*)"$') + try: + with open("../../config.status", "r") as cfgstatus: + for ln in cfgstatus.readlines(): +--- a/doc/user/conf.py ++++ b/doc/user/conf.py +@@ -94,7 +94,7 @@ + + # extract version information, installation location, other stuff we need to + # use when building final documents +-val = re.compile('^S\["([^"]+)"\]="(.*)"$') ++val = re.compile(r'^S\["([^"]+)"\]="(.*)"$') + try: + with open("../../config.status", "r") as cfgstatus: + for ln in cfgstatus.readlines(): +--- a/python/makefile.py ++++ b/python/makefile.py +@@ -52,7 +52,7 @@ + "grep", + "-l", + "-P", +- "^#\s*include.*_clippy.c", ++ "^#\\s*include.*_clippy.c", + "--", + "**.c", + ] +@@ -91,7 +91,7 @@ + autoderp = "#AUTODERP# " + out_lines = [] + bcdeps = [] +-make_rule_re = re.compile("^([^:\s]+):\s*([^:\s]+)\s*($|\n)") ++make_rule_re = re.compile(r"^([^:\s]+):\s*([^:\s]+)\s*($|\n)") + + while lines: + line = lines.pop(0) diff --git a/community/fscrypt/APKBUILD b/community/fscrypt/APKBUILD index 6c56e537cab..27a0d8d0a6f 100644 --- a/community/fscrypt/APKBUILD +++ b/community/fscrypt/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Dermot Bradley <dermot_bradley@yahoo.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=fscrypt -pkgver=0.3.4 -pkgrel=9 +pkgver=0.3.5 +pkgrel=0 pkgdesc="Manage Linux native filesystem encryption" url="https://github.com/google/fscrypt" # Tests fail on ppc64le with SIGSEGV and memory lock errors @@ -46,5 +46,5 @@ package() { } sha512sums=" -e99ade63092281f3db948564458ddd259420bb7295c6ad896fb5e22697405aa471725c929cf98631e91c05615141c9715bce3eb1b37cbe7c07a7c7c248117b06 fscrypt-0.3.4.tar.gz +1d3dcd3bfa651a6a70709d58f2da07160646e779ebb65ce5213e257ba49b87123ad78428a1e3b5ed022386340ea1ba492bd43b148fb2f28b2b4bda971beed193 fscrypt-0.3.5.tar.gz " diff --git a/community/fuzzel/APKBUILD b/community/fuzzel/APKBUILD index b7196e3e3a5..a03c2fc8f86 100644 --- a/community/fuzzel/APKBUILD +++ b/community/fuzzel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=fuzzel -pkgver=1.9.2 +pkgver=1.10.2 pkgrel=0 pkgdesc="Application launcher for wlroots-based Wayland compositors" url="https://codeberg.org/dnkl/fuzzel" @@ -50,6 +50,6 @@ package() { } sha512sums=" -a92f0b6eb9470aa099651c2f5d095986347565bbd7366bffe0719801dbb1ae4f7e413460c59872d40e910bb1d3bc8195e9d9038a73c2de835bcda77f9372b393 fuzzel-1.9.2.tar.gz +bc2a3780838ae4a68f23cd9c5e240576cb79c8c29fe5a2069628f3763670139d9c19695b55fbc10cf16affcf8527bedcef0524e374d406e698be8c4afb7a2579 fuzzel-1.10.2.tar.gz 59fb7099a959b00542e938643b0e04ccaf414fa7d281a8cf362fb28aa1061d452d1a8e594fd9008de492d0fdeb5708bef94713de2438b3a933e837e30d6ff483 no-werror.patch " diff --git a/community/fwup/APKBUILD b/community/fwup/APKBUILD index ac9003b0bac..1e3410151ea 100644 --- a/community/fwup/APKBUILD +++ b/community/fwup/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Frank Hunleth <fhunleth@troodon-software.com> # Maintainer: Frank Hunleth <fhunleth@troodon-software.com> pkgname=fwup -pkgver=1.10.1 +pkgver=1.10.2 pkgrel=0 pkgdesc="Configurable embedded Linux firmware update creator and runner" url="https://github.com/fwup-home/fwup" @@ -11,6 +11,11 @@ makedepends="linux-headers confuse-dev libarchive-dev help2man dosfstools mtools subpackages="$pkgname-doc $pkgname-bash-completion" source="$pkgname-$pkgver.tar.gz::https://github.com/fwup-home/fwup/releases/download/v$pkgver/fwup-$pkgver.tar.gz" +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ @@ -36,5 +41,5 @@ package() { } sha512sums=" -edcb5cb7b4cb6a7742a20faa89ccee542b6d0d8f092976a970166ccd8821f7936477a14e792972d3df5f99137a91b1192fdeeaa8217660ed8d5af8d62f3e1a70 fwup-1.10.1.tar.gz +a350cc0cb4e05fe7f5fb3eed12e893318ecd646f392da66b48b16511bb3f0ad24db528b9632e54a2de72a01cca5546ec4a41da1541b6592bdcd3badf1bbd7295 fwup-1.10.2.tar.gz " diff --git a/community/fwupd/APKBUILD b/community/fwupd/APKBUILD index ccd469b80c8..c977085ef59 100644 --- a/community/fwupd/APKBUILD +++ b/community/fwupd/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=fwupd -pkgver=1.9.16 +pkgver=1.9.19 pkgrel=0 pkgdesc="Firmware update daemon" url="https://fwupd.org/" -# armhf, ppc64le and s390x blocked by gnu-efi/fwupd-efi -arch="all !armhf !ppc64le !s390x !riscv64" +# armhf, ppc64le, loongarch64 and s390x blocked by gnu-efi/fwupd-efi +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" license="LGPL-2.1-or-later" depends="dbus" makedepends=" @@ -123,7 +123,7 @@ package() { } sha512sums=" -e373f17a8d946b07d6f299353949dfc503138c4198a87272018524a39598f3fbd8c381dd13d74469e296a143071cc9e739b3774d9eda8ae9557760fef0a02bb5 fwupd-1.9.16.tar.xz +e20f16aa2cf528ecc6262a5c343287aef64fb37667f8d3972daa70f96364041daa0b23149acbd20cbeff059f6428c6c2a317973bc1dd40a39e239350b0eb011e fwupd-1.9.19.tar.xz 2c34891ec273aa1a4d105602cd5e99add5a17d6e240fa93a015d5bb2e11e54937b04781de2a854c472be376524b50fc5bb48edf7b875afb54e3ca07dcda117b0 fwupd.initd 0bf773a2c52b0306e99e5192d259f38cce8a25487e95a41b6e0200a1ed629235971795a1f9ba12a633cd902671d888610695658f2cc2c750e2afca70f87ee589 fwupd.confd " diff --git a/community/fzf/APKBUILD b/community/fzf/APKBUILD index d1b828d6e09..99ff54abf62 100644 --- a/community/fzf/APKBUILD +++ b/community/fzf/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=fzf -pkgver=0.49.0 -pkgrel=1 +pkgver=0.52.0 +pkgrel=0 pkgdesc="A command-line fuzzy finder" url="https://github.com/junegunn/fzf" arch="all" @@ -45,8 +45,7 @@ check() { package() { install -Dm0755 fzf "$pkgdir"/usr/bin/fzf - install -D man/man1/fzf.1 "$pkgdir"/usr/share/man/man1/fzf.1 - install -D man/man1/fzf-tmux.1 "$pkgdir"/usr/share/man/man1/fzf-tmux.1 + install -Dm0644 -t "$pkgdir"/usr/share/man/man1 man/man1/*.1 } tmux() { @@ -127,7 +126,7 @@ nvim() { } sha512sums=" -fe9d380e1fba460a45ce70a3b44681454833243881a133108f9087a204b1adaafae7bc13e083d25bc783eedb7d4998d5f2301c87f981c0368d081f7f60107fe8 fzf-0.49.0.tar.gz +9ad2fd1178d195a6a9cb70d0069522d5393ab2ce63f7e123fc7c86cdc37346549b2f835d5dd90e1d059a53c369a5351a2c64f04a11639be82eada63b3d8cee79 fzf-0.52.0.tar.gz a13ba25c08fe5b54231508be8d2f0a9f4d342630e6c31f2524cc6b8b99cead5b80daa2e2e37a581198f9ce79df2b00fdf81acf84fe1ad8043ee96e4db0870ee6 fzf.plugin.sh 4ea4a5511704ef6fe57e7d3187739ba501ddb80d249738310d773edd9e2d08c26d27ec0c8976320e979aa8688984fe591b63a63b3c8589d5b80190e7d85d1c8b fzf.plugin.zsh " diff --git a/community/g++-cross-embedded/APKBUILD b/community/g++-cross-embedded/APKBUILD index 847948852b6..1f0c54e7cda 100644 --- a/community/g++-cross-embedded/APKBUILD +++ b/community/g++-cross-embedded/APKBUILD @@ -6,7 +6,7 @@ # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com> # Contributor: Martin Schmölzer <mschmoelzer@gmail.com> pkgname=g++-cross-embedded -pkgver=13.2.0 +pkgver=14.1.0 pkgrel=0 pkgdesc="C++ compilers from the GNU Compiler Collection for embedded targets" url="https://gcc.gnu.org/" @@ -212,6 +212,6 @@ _install_subpkg() { } sha512sums=" -d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2 gcc-13.2.0.tar.xz +e9e224f2b26646fcf038d28dfa08b94c623bc57941f99894a321d01c600f7c68aff6b8837fd25e73e540de1f8de5606e98694a62cdcdfb525ce768b3ef6879ea gcc-14.1.0.tar.xz 52e45ba12be74ce6f740eff3a79e3da87c80b06275fd00b2a1193b052fd0891e7c4c09fd6a9c204a82178c135318d69db3e250f12c37eca72edb1e3c0b0be2db newlib-getentropy.patch " diff --git a/community/galera/APKBUILD b/community/galera/APKBUILD index 6f7d3a9fbc5..a13486c601d 100644 --- a/community/galera/APKBUILD +++ b/community/galera/APKBUILD @@ -17,6 +17,7 @@ source=" https://github.com/codership/galera/archive/release_$pkgver.tar.gz https://github.com/codership/wsrep-API/archive/$_wsrep_commit.tar.gz fix_gcomm-test-check_evs2.patch + generate-cert-for-tests.patch musl-page-size.patch musl-sched_param.patch musl-wordsize.patch @@ -65,6 +66,7 @@ sha512sums=" 34bd8eecf45efe8237256672eb164060ef4f8b9548b0da4392d6c45507f215d85272bf9fe883ec365ae8541051edc4c1a8b9f2d4bd9158100264bd824cc6cc61 release_26.4.13.tar.gz 4bf11c9ea43263cddebfebe115ea4118a1d5573f30f160a7fc7db9ae7faa4d1f11c5f0988ce4d4878d49431635b9e1b0c9ec3bfe0f8cda7c3b6d1d6c7265a391 694d6ca47f5eec7873be99b7d6babccf633d1231.tar.gz 7e3835046be86bcf36e08de85e3577dc9e56d19b89c0cb9270158d793576428f3d19ff420556a7bc6ddeb0721f6032e23e68952f903e15415e16cf524164663c fix_gcomm-test-check_evs2.patch +964880ac75bd4a973f82fd87eea6b9f5333a63352968d40086ab62f856d1d30f2e1ab3b797b14286432af7e376ed62ca0d64e232942ef9ff601a51b501501224 generate-cert-for-tests.patch 196bae14790d6dad46617d107b5ddac6f01694468fb7a049736c6a21c9857b490863eec66be774eeb01300c0dbf4d9871a1b89da6847d92d67473b3aa80dbd3e musl-page-size.patch de08e34bf52cb39353a72a3608053d9204edcddd24f2f7babe2e5eb753d91bd0ca5909ee07a4d6c7ad54e37fba37ad2866403f1805401dcb68b9958514e17ac2 musl-sched_param.patch 2baf88a6c16360ba1ac2ddf7a87a33f84b3039ca9819d84cfdd96b702da1a6050be1b4ac1f3fe6eff7f539158cdb6369906c4821545b1292d98899ec6e13b249 musl-wordsize.patch diff --git a/community/galera/generate-cert-for-tests.patch b/community/galera/generate-cert-for-tests.patch new file mode 100644 index 00000000000..9215382c2f4 --- /dev/null +++ b/community/galera/generate-cert-for-tests.patch @@ -0,0 +1,369 @@ +Patch-Source: https://github.com/codership/galera/commit/462998ca28e97a95e98e0acb6e6c13cafb95083b.patch +-- +From 462998ca28e97a95e98e0acb6e6c13cafb95083b Mon Sep 17 00:00:00 2001 +From: Teemu Ollakka <teemu.ollakka@galeracluster.com> +Date: Mon, 2 Oct 2023 20:31:37 +0300 +Subject: [PATCH] codership/galera#647 Generate keys and certificates for SSL + tests + +Relying on static certificates causes several problems: +- Certificates eventually expire, which causes surprises + when tests suddenly stop passing without prior warning. +- Standards change, a certificate created on different + platform long time ago may not be usable on some more + modern platform. +- Lack of fine grained control on test scenarios without + generating and storing several certificates in source + repository. + +In order to work around the problems above, generate +certificates programmatically before the tests are run. +The generated certificates use the same versioning and +extensions as the original ones under tests/conf. +--- + .gitignore | 1 + + galerautils/tests/CMakeLists.txt | 4 +- + galerautils/tests/gu_asio_test.cpp | 269 ++++++++++++++++++++++++++++- + 3 files changed, 266 insertions(+), 8 deletions(-) + +diff --git a/.gitignore b/.gitignore +index eb06eb9be..6176a35c5 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -18,6 +18,7 @@ galera/tests/galera_check + galera/tests/galera_check.passed + galerautils/src/gu_fnv_bench + galerautils/tests/gu_tests ++galerautils/tests/certs + galerautils/tests/gu_tests++ + galerautils/tests/gu_tests++.passed + galerautils/tests/gu_tests.passed +diff --git a/galerautils/tests/CMakeLists.txt b/galerautils/tests/CMakeLists.txt +index f863ce66b..a44b2d6b3 100644 +--- a/galerautils/tests/CMakeLists.txt ++++ b/galerautils/tests/CMakeLists.txt +@@ -47,7 +47,6 @@ add_test( + # + # C++ galerautils tests. + # +- + add_executable(gu_tests++ + gu_atomic_test.cpp + gu_gtid_test.cpp +@@ -75,7 +74,7 @@ add_executable(gu_tests++ + + target_compile_definitions(gu_tests++ + PRIVATE +- -DGU_ASIO_TEST_CERT_DIR="${PROJECT_SOURCE_DIR}/tests/conf") ++ -DGU_ASIO_TEST_CERT_DIR="${CMAKE_CURRENT_BINARY_DIR}/certs") + + # TODO: These should be eventually fixed. + target_compile_options(gu_tests++ +@@ -93,7 +92,6 @@ add_test( + NAME gu_tests++ + COMMAND gu_tests++ + ) +- + # + # Deqmap micro benchmark. + # +diff --git a/galerautils/tests/gu_asio_test.cpp b/galerautils/tests/gu_asio_test.cpp +index c4c948bda..616902eb1 100644 +--- a/galerautils/tests/gu_asio_test.cpp ++++ b/galerautils/tests/gu_asio_test.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2019-2020 Codership Oy <info@codership.com> ++ * Copyright (C) 2019-2023 Codership Oy <info@codership.com> + */ + + +@@ -920,18 +920,276 @@ END_TEST + + #ifdef GALERA_HAVE_SSL + ++#include <openssl/bn.h> ++#include <openssl/conf.h> ++#include <openssl/engine.h> ++#include <openssl/pem.h> ++#include <openssl/x509v3.h> ++#include <sys/stat.h> ++#include <sys/types.h> ++#include <dirent.h> + #include <signal.h> + +-// +-// SSL +-// ++#include <vector> + + static std::string get_cert_dir() + { +- // This will be set by CMake/preprocessor. ++ static_assert(::strlen(GU_ASIO_TEST_CERT_DIR) > 0); ++ const std::string ret{ GU_ASIO_TEST_CERT_DIR }; ++ auto* dir = opendir(ret.c_str()); ++ if (!dir) ++ { ++ if (mkdir(ret.c_str(), S_IRWXU)) ++ { ++ const auto* errstr = ::strerror(errno); ++ gu_throw_fatal << "Could not create dir " << ret << ": " << errstr; ++ } ++ } ++ else ++ { ++ closedir(dir); ++ } + return GU_ASIO_TEST_CERT_DIR; + } + ++static int password_cb(char*, int, int, void*) { return 0; } ++ ++static void throw_error(const char* msg) ++{ ++ gu_throw_fatal << msg << ": " << ERR_error_string(ERR_get_error(), nullptr); ++} ++ ++static EVP_PKEY* create_key() ++{ ++#if OPENSSL_VERSION_MAJOR < 3 ++ auto* bn = BN_new(); ++ if (!bn) ++ { ++ throw_error("could not create BN"); ++ } ++ BN_set_word(bn, 0x10001); ++ auto* rsa = RSA_new(); ++ if (!rsa) ++ { ++ BN_free(bn); ++ throw_error("could not create RSA"); ++ } ++ RSA_generate_key_ex(rsa, 2048, bn, nullptr); ++ auto* pkey = EVP_PKEY_new(); ++ if (!pkey) ++ { ++ BN_free(bn); ++ RSA_free(rsa); ++ throw_error("could not create PKEY"); ++ } ++ EVP_PKEY_set1_RSA(pkey, rsa); ++ RSA_free(rsa); ++ BN_free(bn); ++ return pkey; ++#else ++ auto* ret = EVP_RSA_gen(2048); ++ if (!ret) ++ { ++ throw_error("could not create RSA"); ++ } ++ return ret; ++#endif /* OPENSSL_VERSION_MAJOR < 3 */ ++} ++ ++static FILE* open_file(const std::string& path, const char* mode) ++{ ++ auto* ret = fopen(path.c_str(), mode); ++ if (!ret) ++ { ++ const auto* errstr = ::strerror(errno); ++ gu_throw_fatal << "Could not open file " << path << ": " ++ << errstr; ++ } ++ return ret; ++} ++ ++static void write_key(EVP_PKEY* pkey, const std::string& filename) ++{ ++ const std::string cert_dir = get_cert_dir(); ++ const std::string key_file_path = cert_dir + "/" + filename; ++ auto* key_file = open_file(key_file_path, "wb"); ++ if (!PEM_write_PrivateKey(key_file, pkey, nullptr, nullptr, 0, password_cb, ++ nullptr)) ++ { ++ throw_error("Could not write key"); ++ } ++ fclose(key_file); ++} ++ ++static void set_x509v3_extensions(X509* x509, X509* issuer) ++{ ++ auto* conf_bio = BIO_new(BIO_s_mem()); ++ std::string ext{ "[extensions]\n" ++ "authorityKeyIdentifier=keyid,issuer\n" ++ "subjectKeyIdentifier=hash\n" }; ++ if (!issuer) ++ { ++ ext += "basicConstraints=critical,CA:TRUE\n"; ++ } ++ else ++ { ++ ext += "keyUsage=digitalSignature,keyEncipherment\n"; ++ ext += "basicConstraints=CA:FALSE\n"; ++ } ++ BIO_printf(conf_bio, "%s", ext.c_str()); ++ auto* conf = NCONF_new(nullptr); ++ long errorline = -1; ++ int err; ++ if ((err = NCONF_load_bio(conf, conf_bio, &errorline)) <= 0) ++ { ++ gu_throw_fatal << "Could not load conf: " << err; ++ } ++ if (errorline != -1) ++ { ++ gu_throw_fatal << "Could not load conf, errorline: " << errorline; ++ } ++ // TODO: V3 extensions ++ X509V3_CTX ctx; ++ X509V3_set_ctx(&ctx, issuer ? issuer : x509, x509, nullptr, nullptr, 0); ++ X509V3_set_nconf(&ctx, conf); ++ if (!X509V3_EXT_add_nconf(conf, &ctx, "extensions", x509)) ++ { ++ throw_error("Could not add extension"); ++ } ++ NCONF_free(conf); ++ BIO_free(conf_bio); ++} ++ ++static X509* create_x509(EVP_PKEY* pkey, X509* issuer, const char* cn) ++{ ++ auto* x509 = X509_new(); ++ /* According to standard, value 2 means version 3. */ ++ X509_set_version(x509, 2); ++ ASN1_INTEGER_set(X509_get_serialNumber(x509), 1); ++ X509_gmtime_adj(X509_get_notBefore(x509), 0); ++ X509_gmtime_adj(X509_get_notAfter(x509), 31536000L); ++ X509_set_pubkey(x509, pkey); ++ ++ auto* name = X509_get_subject_name(x509); ++ X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, (unsigned char*)"FI", ++ -1, -1, 0); ++ X509_NAME_add_entry_by_txt(name, "ST", MBSTRING_ASC, ++ (unsigned char*)"Uusimaa", -1, -1, 0); ++ X509_NAME_add_entry_by_txt(name, "L", MBSTRING_ASC, ++ (unsigned char*)"Helsinki", -1, -1, 0); ++ X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, ++ (unsigned char*)"Codership", -1, -1, 0); ++ X509_NAME_add_entry_by_txt(name, "OU", MBSTRING_ASC, ++ (unsigned char*)"Galera Devel", -1, -1, 0); ++ X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, (unsigned char*)cn, -1, ++ -1, 0); ++ if (!issuer) ++ { ++ /* Self signed */ ++ X509_set_issuer_name(x509, name); ++ } ++ else ++ { ++ X509_set_issuer_name(x509, X509_get_subject_name(issuer)); ++ } ++ ++ set_x509v3_extensions(x509, issuer); ++ ++ X509_sign(x509, pkey, EVP_sha256()); ++ ++ return x509; ++} ++ ++static void write_x509(X509* x509, const std::string& filename) ++{ ++ const std::string cert_dir = get_cert_dir(); ++ const std::string file_path = cert_dir + "/" + filename; ++ auto* file = open_file(file_path, "wb"); ++ if (!PEM_write_X509(file, x509)) ++ { ++ throw_error("Could not write x509"); ++ } ++ fclose(file); ++} ++ ++static void write_x509_list(const std::vector<X509*>& certs, ++ const std::string& filename) ++{ ++ const std::string cert_dir = get_cert_dir(); ++ const std::string file_path = cert_dir + "/" + filename; ++ auto* file = open_file(file_path, "wb"); ++ for (auto* x509 : certs) ++ { ++ if (!PEM_write_X509(file, x509)) ++ { ++ throw_error("Could not write x509"); ++ } ++ } ++ fclose(file); ++} ++ ++/* Self signed CA + certificate */ ++static void generate_self_signed() ++{ ++ auto* pkey = create_key(); ++ write_key(pkey, "galera_key.pem"); ++ auto* ca = create_x509(pkey, nullptr, "Galera Root"); ++ write_x509(ca, "galera_ca.pem"); ++ ++ auto* cert = create_x509(pkey, ca, "Galera Cert"); ++ write_x509(cert, "galera_cert.pem"); ++ X509_free(cert); ++ X509_free(ca); ++ EVP_PKEY_free(pkey); ++} ++ ++/* ++ ---- Server cert 1 ++ / ++ Root CA - Intermediate CA ++ \---- Server cert 2 ++ ++ Two bundles consisting of intermediate CA and server certificate ++ are created for servers 1 and 2. ++ */ ++static void generate_chains() ++{ ++ auto* root_ca_key = create_key(); ++ auto* root_ca = create_x509(root_ca_key, nullptr, "Galera Root CA"); ++ auto* int_ca_key = create_key(); ++ auto* int_ca = create_x509(int_ca_key, root_ca, "Galera Intermediate CA"); ++ ++ auto* server_1_key = create_key(); ++ auto* server_1_cert = create_x509(server_1_key, int_ca, "Galera Server 1"); ++ auto* server_2_key = create_key(); ++ auto* server_2_cert = create_x509(server_2_key, int_ca, "Galera Server 2"); ++ ++ write_x509(root_ca, "galera-ca.pem"); ++ write_key(server_1_key, "galera-server-1.key"); ++ write_x509_list({ server_1_cert, int_ca }, "bundle-galera-server-1.pem"); ++ write_key(server_2_key, "galera-server-2.key"); ++ write_x509_list({ server_2_cert, int_ca }, "bundle-galera-server-2.pem"); ++ ++ X509_free(server_2_cert); ++ EVP_PKEY_free(server_2_key); ++ X509_free(server_1_cert); ++ EVP_PKEY_free(server_1_key); ++ X509_free(int_ca); ++ EVP_PKEY_free(int_ca_key); ++ X509_free(root_ca); ++ EVP_PKEY_free(root_ca_key); ++} ++ ++static void generate_certificates() ++{ ++ generate_self_signed(); ++ generate_chains(); ++} ++ ++// ++// SSL ++// ++ + static gu::Config get_ssl_config() + { + gu::Config ret; +@@ -2173,6 +2431,7 @@ Suite* gu_asio_suite() + // + // SSL + // ++ generate_certificates(); + + tc = tcase_create("test_ssl_io_service"); + tcase_add_test(tc, test_ssl_io_service); diff --git a/community/gallery-dl/APKBUILD b/community/gallery-dl/APKBUILD index 021d2c35d11..a9869009e23 100644 --- a/community/gallery-dl/APKBUILD +++ b/community/gallery-dl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Hoang Nguyen <folliekazetani@protonmail.com> # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=gallery-dl -pkgver=1.26.8 -pkgrel=1 +pkgver=1.26.9 +pkgrel=0 pkgdesc="CLI tool to download image galleries" url="https://github.com/mikf/gallery-dl" arch="noarch" @@ -39,6 +39,6 @@ package() { } sha512sums=" -f8093d8e51c815333a182d1cdf5134d2e54d10b44067a0130943993d63e49d4e51d5bb9eb1704b7999639e73ae8ab4cadb6a8d0fb444abbe26ffdc445e5cdb5f gallery-dl-1.26.8.tar.gz +54c2a86a67c53b7d5c62e6c23c549fd89503386549dc9d2f9c7de058b52ecb60b5089555e97dd0b63d33686e1bd08a3be940152715a6d26647e6949e641df9cb gallery-dl-1.26.9.tar.gz 2c5117d7c15900744ead754f165933da7e7968a6adc4290e4f41284f75825354590fee09dc7d006d2f5b7ed3e755e76c5623054439dbbd4376b1edd9ed37188c disable-type-error-test.patch " diff --git a/community/gammaray/APKBUILD b/community/gammaray/APKBUILD index f93686bcff7..3a54babf5aa 100644 --- a/community/gammaray/APKBUILD +++ b/community/gammaray/APKBUILD @@ -5,9 +5,9 @@ pkgver=3.0.0 pkgrel=0 pkgdesc="A tool for examining the internals of a Qt application and to some extent also manipulate it" url="https://www.kdab.com/development-resources/qt-tools/gammaray/" -# ppc64le, s390x, armhf and riscv64 blocked by qt5-qtwebengine +# ppc64le, s390x, armhf, riscv64 and loongarch64 blocked by qt5-qtwebengine # x86 blocked by lldb -arch="all !ppc64le !s390x !armhf !riscv64 !x86" +arch="all !ppc64le !s390x !armhf !riscv64 !x86 !loongarch64" license="GPL-2.0-or-later" depends="lldb" makedepends=" diff --git a/community/garage/APKBUILD b/community/garage/APKBUILD index 3913b149335..bef5cd5e4fc 100644 --- a/community/garage/APKBUILD +++ b/community/garage/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=garage -pkgver=0.9.3 -pkgrel=1 +pkgver=1.0.0 +pkgrel=0 pkgdesc="Lightweight S3-compatible distributed object store" url="https://garagehq.deuxfleurs.fr" # armhf,armv7,x86: fails to build (std::bad_alloc) @@ -21,10 +21,13 @@ makedepends=" checkdepends="openssl-dev" pkgusers="garage" pkggroups="garage" -install="$pkgname.pre-install $pkgname.pre-upgrade" +install=" + $pkgname.pre-install + $pkgname.pre-upgrade + $pkgname.post-upgrade + " subpackages="$pkgname-openrc" source="https://github.com/deuxfleurs-org/garage/archive/v$pkgver/garage-$pkgver.tar.gz - syslog-support.patch garage.toml $pkgname.initd $pkgname.confd @@ -35,8 +38,8 @@ case "$CARCH" in ppc64le | s390x) options="!check";; esac -# Disable bundled-libs, metrics, sqlite, sled, k2v -_cargo_opts="--frozen --no-default-features --features lmdb,system-libs" +# Disable bundled-libs, sqlite, k2v +_cargo_opts="--frozen --no-default-features --features lmdb,metrics,system-libs,syslog" export CARGO_PROFILE_RELEASE_OPT_LEVEL=2 @@ -62,15 +65,16 @@ package() { install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname - install -D -m640 -o garage -g garage "$srcdir"/garage.toml -t "$pkgdir"/etc/ + + install -d -m755 "$pkgdir"/etc/garage + install -D -m640 -o garage -g garage "$srcdir"/garage.toml -t "$pkgdir"/etc/garage/ install -d -m700 -o garage -g garage "$pkgdir"/var/lib/$pkgname } sha512sums=" -614dc3f6321a9cce6fc07f468c04b97cd19884e8bc4c670e1b09a9e90b097621fbe930e70848f6f392835c31e364b6a3cd2087a66e92e3ec8cbfaaf50a7a4f34 garage-0.9.3.tar.gz -e59399ab8a16b591498be0d6510054adf14ff5c4ec15ddfdf69b046119fa036c8abef10173aa29f832ff64d1b0c46b51d17051a450d85b61bd99eb91b8c64ed5 syslog-support.patch -0c559befe22d38509af1a8c8da2c9405ee1d226b26729e472ad8f57d71d24ed6a557f658e9588a37f9141a24d3807169ffc43305ce98756d6b30f7c46ac94c25 garage.toml -a2130fa81ed2c8af266ed1e86d0c72e3aae6995599347e4488c6cd4cc83217fbb65ea9121415985f8cdcd15aaee9b28886b1ccf24755571b3ddf2fc5d8dd5b3a garage.initd -f31bb5bde3ff41dc5fa6832c8ff24e1f1027b34513ab5e5c008df13495b53a569d3cb5adefed93cf780f5e488ff760603097785d85e1a884538e802e415205bd garage.confd +305ddc7379304b539baf480e0a2dd31c3b516643d27a91a2a820ec674ca2f9edfab1eb56e66c758b79c7e221ae0ffb14f128edcdd70f7b806a34fb445f3a18a2 garage-1.0.0.tar.gz +bb8009a0fa7ff4a3203b7db97f09c1e08fb7b0f30288b9cd05dfb7ed97cc4c8dac427a5bd7887877cb2f38fc33b01392cc69014abd22d9a5cd1f90ba3c38a903 garage.toml +0f20ce973c49de9bd526a35d094d4024cd51ca36210b4c14196448fb59f594555c561c5858152d1df603ba87a284ff63e9cf914f21687de2f1842efc50aea2ec garage.initd +668c1fc719bcd54ec966ef00fedda94048867f429a7f373a270e18fbd54435f17c19dd75a2a79467751dfcd3cce2391e9c7ea377910d8dd2c853551a04aebe5d garage.confd " diff --git a/community/garage/garage.confd b/community/garage/garage.confd index 459b601ee69..4db1c2b8c64 100644 --- a/community/garage/garage.confd +++ b/community/garage/garage.confd @@ -1,7 +1,7 @@ # Configuration for /etc/init.d/garage # Path to the configuration file. -#cfgfile="/etc/$RC_SVCNAME.toml" +#cfgfile="/etc/garage/garage.toml" # Log to syslog instead of stderr. If you want to log into file instead, # set this to "no" and declare 'error_log=/var/log/garage.log'. diff --git a/community/garage/garage.initd b/community/garage/garage.initd index 3f6341662c5..7ccc4c1048d 100644 --- a/community/garage/garage.initd +++ b/community/garage/garage.initd @@ -3,7 +3,7 @@ name="Garage" description="Lightweight S3-compatible distributed object store" -: ${cfgfile:="/etc/$RC_SVCNAME.toml"} +: ${cfgfile:="/etc/garage/garage.toml"} : ${log_syslog="yes"} : ${log_level="warn"} : ${command_user:="garage"} @@ -16,8 +16,6 @@ pidfile="/run/$RC_SVCNAME.pid" required_files="$cfgfile" -_rpc_secret_placeholder='rpc_secret = "change-me"' - depend() { need localmount net after firewall @@ -26,20 +24,16 @@ depend() { start_pre() { export RUST_LOG=${RUST_LOG:-"netapp=$log_level,garage=$log_level"} - # NOTE: Logging to syslog is not supported by upstream (yet), this is - # done by Alpine's patch for now. - yesno "$log_syslog" && export GARAGE_SYSLOG=1 - - if ! [ -f "$cfgfile.apk-new" ] && grep -qFx "$_rpc_secret_placeholder" "$cfgfile"; then - if [ -w "$cfgfile" ]; then - einfo "Replacing rpc_secret in $cfgfile with a random string..." + yesno "$log_syslog" && export GARAGE_LOG_TO_SYSLOG=1 - local pass=$(head /dev/urandom | tr -dc a-f0-9 | head -c 64) - sed -i "s/^$_rpc_secret_placeholder/rpc_secret = \"$pass\"/" "$cfgfile" - else - ewarn "Change rpc_secret in $cfgfile to a random password!" - fi + local rpc_secret_file="$(sed -En 's/^rpc_secret_file\s*=\s*"([^"]+)"/\1/p' "$cfgfile")" + if [ "$rpc_secret_file" ] && ! [ -f "$rpc_secret_file" ] ; then + einfo "Generating $rpc_secret_file with a random key..." + local pass="$(head /dev/urandom | tr -dc a-f0-9 | head -c 64)" + ( umask 077; echo "$pass" > "$rpc_secret_file" ) + chown "$command_user" "$rpc_secret_file" fi + if [ "${error_log:-}" ]; then checkpath -f -m 640 -o "$command_user" "$error_log" || return 1 fi diff --git a/community/garage/garage.post-upgrade b/community/garage/garage.post-upgrade new file mode 100644 index 00000000000..7cd5f2ef8fa --- /dev/null +++ b/community/garage/garage.post-upgrade @@ -0,0 +1,15 @@ +#!/bin/sh + +ver_old="$2" + +if [ "$(apk version -t "$ver_old" '1.0.0-r0')" = '<' ] && [ -f /etc/garage.toml ]; then + cat >&2 <<-EOF + * + * Configuration file /etc/garage.toml was moved to /etc/garage/garage.toml. + * + EOF + # We've already copied it to /etc/garage/garage.toml in the pre-upgrade script. + rm -f /etc/garage.toml +fi + +exit 0 diff --git a/community/garage/garage.pre-upgrade b/community/garage/garage.pre-upgrade index 55f4dde44bb..367152c1422 100644 --- a/community/garage/garage.pre-upgrade +++ b/community/garage/garage.pre-upgrade @@ -2,7 +2,7 @@ old_ver="$2" -if [ "$(apk version -t "$old_ver" '2.9.0-r0')" = '<' ]; then +if [ "$(apk version -t "$old_ver" '1.0.0-r0')" = '<' ]; then if rc-service -q garage status 2>/dev/null; then # if running cat >&2 <<-EOF *! @@ -37,6 +37,12 @@ if [ "$(apk version -t "$old_ver" '2.9.0-r0')" = '<' ]; then fi echo '*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*' >&2 fi + + # Copy /etc/garage.toml to /etc/garage/garage.toml *if* it was modified by user. + if ! [ -e /etc/garage/garage.toml ] && apk audit -q /etc | grep -qx etc/garage.toml; then + mkdir -p /etc/garage + cp -a /etc/garage.toml /etc/garage/garage.toml + fi fi exit 0 diff --git a/community/garage/garage.toml b/community/garage/garage.toml index a7ee4c0f756..5bd32fc0439 100644 --- a/community/garage/garage.toml +++ b/community/garage/garage.toml @@ -21,40 +21,58 @@ data_dir = "/var/lib/garage/data" # saved to disk. #data_fsync = false +# Whether to automatically run a scrub of the data directory approximately once +# per month. If you are already scrubbing at the filesystem level, you can set +# this option to true to disable automatic scrub. +#disable_scrub = false + # Garage is only built with "lmdb" on Alpine Linux since v3.19! If you're still # using "sled", migrate it using 'garage-convert-db' package from Alpine v3.18. #db_engine = "lmdb" # The block size for stored objects. -#block_size = 1048576 +#block_size = "1M" + +# A limit on the total size of data blocks kept in RAM by S3 API nodes awaiting +# to be sent to storage nodes asynchronously. +#block_ram_buffer_max = "256MiB" # The map size used by LMDB, which is the size of the virtual memory region # used for mapping the database file. It's not bound by the physical RAM size # of the machine running Garage. #lmdb_map_size = "1T" -# Refer to the reference manual. -replication_mode = "none" +# This can be any positive integer smaller or equal the node count in your +# cluster. It must be the same in the configuration files of all nodes! +# If you're running a cluster of Garage nodes, change this to at least 2! +replication_factor = 1 + +# This determines the read and write behaviour of your cluster. Read the +# reference manual before changing! +#consistency_mode = "consistent" # Zstd compression level to use for storing blocks. Defaults to 1. -compression_level = 1 +#compression_level = 1 # The address and port on which to bind for inter-cluster communications. # Hint: Change to 127.0.0.1:3901 if running a single node cluster. rpc_bind_addr = "[::]:3901" +# If enabled, pre-bind all sockets for outgoing connections to the same IP +# address used for listening (rpc_bind_addr) before trying to connect to remote +# nodes. +#rpc_bind_outgoing = false + # The address and port that other nodes need to use to contact this node for # RPC calls. # rpc_public_addr = "127.0.0.1:3901" -# The secret key that is shared between all nodes of the cluster in order to -# identify these nodes and allow them to communicate together. This key should -# be specified here in the form of a 32-byte hex-encoded random string. -# NOTE: The init script will automatically replace "change-me" value with -# a random string on the service start. -rpc_secret = "change-me" -# or read it from the file. -#rpc_secret_file = "" +# The secret key file that is shared between all nodes of the cluster in order +# to identify these nodes and allow them to communicate together. The key is a +# 32-byte hex-encoded random string. +# If this file doesn't exist, it will be automatically created with a random +# string on the service start. +rpc_secret_file = "/etc/garage/rpc_secret" # A list of peer identifiers on which to contact other Garage peers of this # cluster. Format: <node public key>@<node public IP or hostname>:<port>. @@ -90,10 +108,10 @@ root_domain = "" # If not set, access to these endpoints is disabled entirely. #admin_token = "" # or read it from the file. -#admin_token_file = "" +# admin_token_file = "/etc/garage/admin_token" # The token for accessing the Metrics endpoint. If not set, the Metrics # endpoint can be accessed without access control! #metrics_token = "" # or read it from the file. -#metrics_token_file = "" +# metrics_token_file = "/etc/garage/metrics_token" diff --git a/community/garage/syslog-support.patch b/community/garage/syslog-support.patch deleted file mode 100644 index a60f3960d3e..00000000000 --- a/community/garage/syslog-support.patch +++ /dev/null @@ -1,89 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Sun, 07 May 2023 00:08:59 +0200 -Subject: [PATCH] Add support for logging into syslog and don't output - ANSI sequences (colours) - -This is more a quick&dirty approach, not meant to be upstreamed as-is. - ---- a/src/garage/main.rs -+++ b/src/garage/main.rs -@@ -156,10 +156,36 @@ - }; - std::env::set_var("RUST_LOG", default_log) - } -- tracing_subscriber::fmt() -- .with_writer(std::io::stderr) -- .with_env_filter(tracing_subscriber::filter::EnvFilter::from_default_env()) -- .init(); -+ -+ let env_filter = tracing_subscriber::filter::EnvFilter::from_default_env(); -+ -+ if std::env::var("GARAGE_SYSLOG").is_ok() { -+ use std::ffi::CStr; -+ use syslog_tracing::{Facility, Options, Syslog}; -+ -+ let syslog = Syslog::new( -+ CStr::from_bytes_with_nul(b"garage\0").unwrap(), -+ Options::LOG_PID | Options::LOG_PERROR, -+ Facility::Daemon, -+ ).expect("Unable to init syslog"); -+ -+ tracing_subscriber::fmt() -+ .with_writer(syslog) -+ .with_env_filter(env_filter) -+ .with_ansi(false) // disable ANSI escape sequences (colours) -+ .with_file(false) -+ .with_level(false) -+ .without_time() -+ .compact() -+ .init(); -+ } else { -+ tracing_subscriber::fmt() -+ .with_writer(std::io::stderr) -+ .with_env_filter(env_filter) -+ .with_ansi(false) // disable ANSI escape sequences (colours) -+ .init(); -+ } -+ - sodiumoxide::init().expect("Unable to init sodiumoxide"); - - let res = match opt.cmd { ---- a/src/garage/Cargo.toml -+++ b/src/garage/Cargo.toml -@@ -58,6 +58,8 @@ - opentelemetry-otlp = { version = "0.10", optional = true } - prometheus = { version = "0.13", optional = true } - -+syslog-tracing = "0.1.0" -+ - [dev-dependencies] - aws-sdk-s3 = "0.19" - chrono = "0.4" ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1113,6 +1113,7 @@ - "sha2 0.10.6", - "static_init", - "structopt", -+ "syslog-tracing", - "timeago", - "tokio", - "toml", -@@ -3559,6 +3560,17 @@ - "quote", - "syn", - "unicode-xid", -+] -+ -+[[package]] -+name = "syslog-tracing" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4cf9ff1f9f8e5ba220a58bbccb0375f4cabd785f96a8683b31389cefd91be747" -+dependencies = [ -+ "libc", -+ "tracing-core", -+ "tracing-subscriber", - ] - - [[package]] diff --git a/community/gcc-avr/APKBUILD b/community/gcc-avr/APKBUILD index 9b44ddd572a..941ada6790a 100644 --- a/community/gcc-avr/APKBUILD +++ b/community/gcc-avr/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Pedro Filipe <xpecex@outlook.com> # Contributor: Stefan Wagner <stw@bit-strickerei.de> -# Maintainer: Stefan Wagner <stw@bit-strickerei.de> +# Maintainer: Marian Buschsieweke <marian.buschsieweke@posteo.net> pkgname=gcc-avr -pkgver=12.2.0 -pkgrel=4 +pkgver=14.1.0 +pkgrel=1 pkgdesc="The GNU Compiler Collection for AVR targets" url="https://gcc.gnu.org/" depends="binutils-avr" @@ -13,6 +13,7 @@ license="GPL-3.0-or-later" subpackages="$pkgname-doc" source=" https://mirrors.kernel.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz + fix-no-system-headers.patch " @@ -66,6 +67,6 @@ package() { } sha512sums=" -e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 gcc-12.2.0.tar.xz -358cb41e6a8612f5c96f27ed573354a909253565caa200af8959d90cf21e0ddbee219f6281fc3917ead1f85c5ec7111162f9b075c3e478df56a2fad505bce5f1 fix-no-system-headers.patch +e9e224f2b26646fcf038d28dfa08b94c623bc57941f99894a321d01c600f7c68aff6b8837fd25e73e540de1f8de5606e98694a62cdcdfb525ce768b3ef6879ea gcc-14.1.0.tar.xz +99bbe52c3c411e5a5af47a2539524f036190ab34de2eff762554c65936ee9ed713b91fc605bcbc5f11e740580356748d40c520d915687a77ea81ae3ef31bfb0d fix-no-system-headers.patch " diff --git a/community/gcc-avr/fix-no-system-headers.patch b/community/gcc-avr/fix-no-system-headers.patch index c007858fbfb..62dcb1d56e2 100644 --- a/community/gcc-avr/fix-no-system-headers.patch +++ b/community/gcc-avr/fix-no-system-headers.patch @@ -6,18 +6,24 @@ The normal process of building a cross compilation toolchain is: 4. rebuild the standard C lib with the new GCC But for AVR, GCC can be build successfully without (a provisionally version of) -the standard C headers available - likely due to the lack of libstdc++ support +the standard C headers available - due to the lack of libstdc++ support for AVR. But we still need to remove the check to allow for this. ---- gcc-10.2.0.orig/gcc/Makefile.in -+++ gcc-10.2.0/gcc/Makefile.in -@@ -3156,13 +3156,6 @@ +diff --color -rupN a/gcc/Makefile.in b/gcc/Makefile.in +--- a/gcc/Makefile.in 2024-05-07 08:51:37.000000000 +0200 ++++ b/gcc/Makefile.in 2024-05-09 11:55:59.115578602 +0200 +@@ -3415,18 +3415,6 @@ stmp-fixinc: gsyslimits.h macro_list fix sysroot_headers_suffix=`echo $${ml} | sed -e 's/;.*$$//'`; \ multi_dir=`echo $${ml} | sed -e 's/^[^;]*;//'`; \ fix_dir=include-fixed$${multi_dir}; \ - if ! $(inhibit_libc) && test ! -d ${BUILD_SYSTEM_HEADER_DIR}; then \ -- echo The directory that should contain system headers does not exist: >&2 ; \ +- echo "The directory (BUILD_SYSTEM_HEADER_DIR) that should contain system headers does not exist:" >&2 ; \ - echo " ${BUILD_SYSTEM_HEADER_DIR}" >&2 ; \ +- case ${build_os} in \ +- darwin*) \ +- echo "(on Darwin this usually means you need to pass the --with-sysroot= flag to point to a valid MacOS SDK)" >&2; \ +- ;; \ +- esac; \ - tooldir_sysinc=`echo "${gcc_tooldir}/sys-include" | sed -e :a -e "s,[^/]*/\.\.\/,," -e ta`; \ - if test "x${BUILD_SYSTEM_HEADER_DIR}" = "x$${tooldir_sysinc}"; \ - then sleep 1; else exit 1; fi; \ diff --git a/community/gcc-cross-embedded/APKBUILD b/community/gcc-cross-embedded/APKBUILD index 2d4bdc20876..00539399e89 100644 --- a/community/gcc-cross-embedded/APKBUILD +++ b/community/gcc-cross-embedded/APKBUILD @@ -6,7 +6,7 @@ # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com> # Contributor: Martin Schmölzer <mschmoelzer@gmail.com> pkgname=gcc-cross-embedded -pkgver=13.2.0 +pkgver=14.1.0 pkgrel=0 pkgdesc="C compilers from the GNU Compiler Collection for embedded targets" url="https://gcc.gnu.org/" @@ -172,6 +172,6 @@ _install_subpkg() { } sha512sums=" -d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2 gcc-13.2.0.tar.xz +e9e224f2b26646fcf038d28dfa08b94c623bc57941f99894a321d01c600f7c68aff6b8837fd25e73e540de1f8de5606e98694a62cdcdfb525ce768b3ef6879ea gcc-14.1.0.tar.xz 52e45ba12be74ce6f740eff3a79e3da87c80b06275fd00b2a1193b052fd0891e7c4c09fd6a9c204a82178c135318d69db3e250f12c37eca72edb1e3c0b0be2db newlib-getentropy.patch " diff --git a/community/gcovr/APKBUILD b/community/gcovr/APKBUILD index 7dcd8d33824..99ce283f84b 100644 --- a/community/gcovr/APKBUILD +++ b/community/gcovr/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=gcovr pkgver=7.2 -pkgrel=1 +pkgrel=2 pkgdesc="Generates a simple report that summarizes the gcc code coverage" url="http://gcovr.com/" arch="noarch" license="BSD-3-Clause" -depends="python3 py3-setuptools py3-lxml py3-jinja2 py3-pygments" +depends="python3 py3-setuptools py3-lxml py3-jinja2 py3-pygments py3-colorlog" checkdepends="py3-pytest py3-pyutilib cmake" subpackages="$pkgname-pyc" source="gcovr-$pkgver.tar.gz::https://github.com/gcovr/gcovr/archive/$pkgver.tar.gz" diff --git a/community/gcr/APKBUILD b/community/gcr/APKBUILD index da0420ab89d..a7fada0fc0f 100644 --- a/community/gcr/APKBUILD +++ b/community/gcr/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gcr pkgver=3.41.2 -pkgrel=0 +pkgrel=1 pkgdesc="library for bits of crypto UI and parsing" url="https://wiki.gnome.org/Projects/CryptoGlue" arch="all" @@ -10,26 +10,34 @@ license="LGPL-2.0-or-later" makedepends=" glib-dev gobject-introspection-dev + gtk-doc gtk+3.0-dev libgcrypt-dev libsecret-dev libxslt - meson gtk-doc + meson openssh-client p11-kit-dev vala " -checkdepends="xvfb-run dbus-x11" +checkdepends=" + bash + gpg + gpg-agent + dbus-x11 + xvfb-run + " subpackages=" $pkgname-dev $pkgname-lang $pkgname-base - $pkgname-ssh-agent:ssh " source="https://download.gnome.org/sources/gcr/${pkgver%.*}/gcr-$pkgver.tar.xz fix-64-bit-time_t-32-bit.patch " -options="!check" # testsuite requires community/xvfb-run +# test failure in gcr:gcr-base / gnupg-collection +# https://gitlab.gnome.org/GNOME/gcr/-/issues/114 +options="!check" build() { # getpass @@ -39,6 +47,7 @@ build() { -Dgtk_doc=false \ -Dgpg_path=/usr/bin/gpg2 \ -Dsystemd=disabled \ + -Dssh_agent=false \ output meson compile -C output } @@ -48,7 +57,6 @@ check() { } package() { - depends="$pkgname-ssh-agent=$pkgver-r$pkgrel" DESTDIR="$pkgdir" meson install --no-rebuild -C output } @@ -56,14 +64,7 @@ base() { pkgdesc="$pkgdesc (base libraries)" depends="" - amove usr/lib/libgck-1.so.* - amove usr/lib/libgcr-base-3.so.* -} - -ssh() { - pkgdesc="$pkgdesc (ssh agent daemon)" - - amove usr/libexec/gcr-ssh-agent + amove usr/lib } sha512sums=" diff --git a/community/gcr4/30-gcr-ssh-agent.sh b/community/gcr4/30-gcr-ssh-agent.sh new file mode 100644 index 00000000000..c25031e5a97 --- /dev/null +++ b/community/gcr4/30-gcr-ssh-agent.sh @@ -0,0 +1,4 @@ +# Set SSH_AUTH_SOCK for gcr-ssh-agent. +if [ ! "$SSH_AUTH_SOCK" ]; then + export SSH_AUTH_SOCK="/run/user/$(id -u)/gcr/ssh" +fi diff --git a/community/gcr4/APKBUILD b/community/gcr4/APKBUILD index 1f63d9edfa3..407c5d0a8ca 100644 --- a/community/gcr4/APKBUILD +++ b/community/gcr4/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Newbyte <newbyte@postmarketos.org> pkgname=gcr4 -pkgver=4.2.0 +pkgver=4.3.0 pkgrel=0 pkgdesc="Library for bits of crypto UI and parsing" url="https://wiki.gnome.org/Projects/CryptoGlue" @@ -30,8 +30,12 @@ subpackages=" $pkgname-dev $pkgname-lang $pkgname-base + gcr-ssh-agent:ssh " -source="https://download.gnome.org/sources/gcr/${pkgver%.*}/gcr-$pkgver.tar.xz" +source="https://download.gnome.org/sources/gcr/${pkgver%.*}/gcr-$pkgver.tar.xz + gcr-ssh-agent-wrapper + gcr-ssh-agent.desktop + 30-gcr-ssh-agent.sh" builddir="$srcdir/gcr-$pkgver" options="!check" # fix later after p11-kit fixes @@ -53,10 +57,7 @@ check() { } package() { - depends="gcr-ssh-agent" DESTDIR="$pkgdir" meson install --no-rebuild -C output - - rm "$pkgdir"/usr/libexec/gcr-ssh-agent } base() { @@ -66,6 +67,24 @@ base() { amove usr/lib } +ssh() { + pkgdesc="$pkgdesc (ssh agent daemon)" + depends="gcr4" # for gcr4-ssh-askpass + + amove usr/libexec/gcr-ssh-agent + + # Install wrapper used for gcr-ssh-agent autostart + install -Dm755 "$srcdir"/gcr-ssh-agent-wrapper \ + "$subpkgdir"/usr/libexec/gcr-ssh-agent-wrapper + install -Dm644 "$srcdir"/gcr-ssh-agent.desktop \ + "$subpkgdir"/etc/xdg/autostart/gcr-ssh-agent.desktop + install -Dm644 "$srcdir"/30-gcr-ssh-agent.sh \ + "$subpkgdir"/etc/profile.d/30-gcr-ssh-agent.sh +} + sha512sums=" -81e688d2adf256bd3f1eb24b32e6f6709ce48bf2159617c3a39c03ae71385941ac2bac75cf23060d7582dbb4a934d924bda20dc3d524c3d359f2e46cd202ad88 gcr-4.2.0.tar.xz +3f252de55e07d47a49c03b714e323ceb00d82e010fe1bb606073e3188bf8bef84359a322ed6fe843620fa5d108e825dd7e9a60136c8a0e802b8f2178aa87b164 gcr-4.3.0.tar.xz +907371c4c4adf8fb3731fe509329d1f7f83633aa1d82d76f6249b2f116c76418b67f7060a74054957e0e03f3ab106d85b77508191895ea7b6ffbad2e6f92bfee gcr-ssh-agent-wrapper +90eefba939cc52b4251b4682dc8702d9a7f87ca2abd77b0caccd8fb0707692bc9fee9c23703388cb5336c1047731a4c6175423a03b05b1cf644c73040d0e244a gcr-ssh-agent.desktop +f92d098db8146bdcacb7cc47b9ad5e9151cd1b26e786dfc164fe8c2941ded4f540e6458aedb0189ce52d49c46f7058bab86b9e02aae35962a487332503fb60ff 30-gcr-ssh-agent.sh " diff --git a/community/gcr4/gcr-ssh-agent-wrapper b/community/gcr4/gcr-ssh-agent-wrapper new file mode 100755 index 00000000000..60550e4f168 --- /dev/null +++ b/community/gcr4/gcr-ssh-agent-wrapper @@ -0,0 +1,14 @@ +#!/bin/sh + +UID="$(id -u)" +if [ ! "$UID" ]; then exit 1; fi + +# Create base directory for the ssh-agent socket. +GCR_BASE_DIR="/run/user/$UID/gcr" +if [ -e "$GCR_BASE_DIR" ]; then + rm -rf "$GCR_BASE_DIR" +fi +mkdir -p "$GCR_BASE_DIR" + +/usr/libexec/gcr-ssh-agent --base-dir "$GCR_BASE_DIR" $* +exit $? diff --git a/community/gcr4/gcr-ssh-agent.desktop b/community/gcr4/gcr-ssh-agent.desktop new file mode 100644 index 00000000000..30145047d79 --- /dev/null +++ b/community/gcr4/gcr-ssh-agent.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=GCR SSH Agent +Exec=/usr/libexec/gcr-ssh-agent-wrapper +NoDisplay=true +Terminal=false diff --git a/community/gdal/APKBUILD b/community/gdal/APKBUILD index d0d92d666b4..5ff1d5642c5 100644 --- a/community/gdal/APKBUILD +++ b/community/gdal/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=gdal pkgver=3.8.5 -pkgrel=1 +pkgrel=4 pkgdesc="A translator library for raster and vector geospatial data formats" url="https://gdal.org/" arch="all" @@ -151,11 +151,11 @@ case "$CARCH" in makedepends="$makedepends apache-ant java-jdk" subpackages="$subpackages java-$pkgname:_java" _with_java="ON" - JAVA_HOME="/usr/lib/jvm/default-jvm" - JAVA_INCLUDE_PATH="$JAVA_HOME/include" - JAVA_INCLUDE_PATH2="$JAVA_HOME/include/linux" - JAVA_AWT_LIBRARY="$JAVA_HOME/lib/libjawt.so" - JAVA_JVM_LIBRARY="$JAVA_HOME/lib/server/libjvm.so" + _java_home="/usr/lib/jvm/default-jvm" + _java_include_path="$_java_home/include" + _java_include_path2="$_java_home/include/linux" + _java_awt_library="$_java_home/lib/libjawt.so" + _java_jvm_library="$_java_home/lib/server/libjvm.so" ;; esac @@ -210,8 +210,9 @@ if [ "$_with_tiledb" = "ON" ]; then fi build() { + local cmake_crossopts if [ "$CBUILD" != "$CHOST" ]; then - CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + cmake_crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi cmake -B build -G Ninja \ @@ -293,16 +294,16 @@ build() { -DBUILD_PYTHON_BINDINGS=ON \ -DBUILD_CSHARP_BINDINGS=OFF \ -DBUILD_JAVA_BINDINGS=$_with_java \ - -DJAVA_HOME="$JAVA_HOME" \ - -DJAVA_INCLUDE_PATH="$JAVA_INCLUDE_PATH" \ - -DJAVA_INCLUDE_PATH2="$JAVA_INCLUDE_PATH2" \ - -DJAVA_AWT_LIBRARY="$JAVA_AWT_LIBRARY" \ - -DJAVA_JVM_LIBRARY="$JAVA_JVM_LIBRARY" \ + -DJAVA_HOME="$_java_home" \ + -DJAVA_INCLUDE_PATH="$_java_include_path" \ + -DJAVA_INCLUDE_PATH2="$_java_include_path2" \ + -DJAVA_AWT_LIBRARY="$_java_awt_library" \ + -DJAVA_JVM_LIBRARY="$_java_jvm_library" \ -DGDAL_USE_TIFF_INTERNAL=ON \ -DGDAL_USE_GEOTIFF_INTERNAL=ON \ -DIconv_INCLUDE_DIR=/usr/include/gnu-libiconv \ -DIconv_LIBRARY=/usr/lib/libiconv.so \ - $CMAKE_CROSSOPTS + $cmake_crossopts cmake --build build } diff --git a/community/gdu/APKBUILD b/community/gdu/APKBUILD index b115492c732..64a6a3b1ffc 100644 --- a/community/gdu/APKBUILD +++ b/community/gdu/APKBUILD @@ -1,16 +1,18 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=gdu -pkgver=5.27.0 +pkgver=5.28.0 _majorver=${pkgver%%.*} -pkgrel=2 +pkgrel=1 pkgdesc="Fast disk usage calculator with console interface" url="https://github.com/dundee/gdu" arch="all" license="MIT" makedepends="go gzip" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/dundee/gdu/archive/refs/tags/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/dundee/gdu/archive/refs/tags/v$pkgver.tar.gz + ash.patch + " export GOFLAGS="$GOFLAGS -modcacherw" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" @@ -56,5 +58,6 @@ package() { } sha512sums=" -f13605c78bd4f17d1eea2c9ee1ed832073a25da52031135aeeb4a41d0721d0b7938aff820724175d6e00c86f0110b73c19276f40dddef6bb058992ac848bf8e5 gdu-5.27.0.tar.gz +cb7b71553fccbe40d294259e649ecb6b258c283375dadb565da857b277aba4d6c5e773418adf4077e9319d25f61f0f5e1d50ce9633734010d88a16064af68768 gdu-5.28.0.tar.gz +6b19ef6f63670fcca6e893fb713a96635d850b0b5063dfe96427e9f29875e314c91f1bbdcbfe156314005e3b953346f814a6dd53702f026b2242a3b73734f8bb ash.patch " diff --git a/community/gdu/ash.patch b/community/gdu/ash.patch new file mode 100644 index 00000000000..331a556dd53 --- /dev/null +++ b/community/gdu/ash.patch @@ -0,0 +1,13 @@ +diff --git a/tui/exec_other.go b/tui/exec_other.go +index 6fd0b91..04b938d 100644 +--- a/tui/exec_other.go ++++ b/tui/exec_other.go +@@ -11,7 +11,7 @@ import ( + func getShellBin() string {
+ shellbin, ok := os.LookupEnv("SHELL")
+ if !ok {
+- shellbin = "/bin/bash"
++ shellbin = "/bin/ash"
+ }
+ return shellbin
+ }
diff --git a/community/geopard/APKBUILD b/community/geopard/APKBUILD index c17dffe2d0b..ca55af1c57e 100644 --- a/community/geopard/APKBUILD +++ b/community/geopard/APKBUILD @@ -1,7 +1,7 @@ # Contributor: knuxify <knuxify@gmail.com> # Maintainer: knuxify <knuxify@gmail.com> pkgname=geopard -pkgver=1.4.0 +pkgver=1.5.0 pkgrel=0 pkgdesc="Colorful, adaptive gemini browser" url="https://ranfdev.com/projects/geopard/" @@ -17,6 +17,7 @@ makedepends=" meson openssl-dev>3 " +subpackages="$pkgname-lang" source="$pkgname-$pkgver.tar.xz::https://github.com/ranfdev/Geopard/releases/download/v$pkgver/com.ranfdev.Geopard.tar.xz" options="!check" # no test suite @@ -40,5 +41,5 @@ package() { } sha512sums=" -7b08d4e1551b2fb4642388ab2aeb157fce551a75357ed626798eb640b3560221d9b215b026aa70384eff9eb109d717deb3406a307c044facd838a4a160e415bc geopard-1.4.0.tar.xz +cd7c53211e9c4873bca6adc8c04c2820f3b969dbe2deaed15ceb8d076eca32d832cf4105285ebac3ac6487b7e75dfbfa9dcb9947cb4dc75412047659d991f4e7 geopard-1.5.0.tar.xz " diff --git a/community/gerbera/APKBUILD b/community/gerbera/APKBUILD index 186f5b20f87..75aa251af78 100644 --- a/community/gerbera/APKBUILD +++ b/community/gerbera/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Mike Crute <mike@crute.us> pkgname=gerbera pkgver=1.12.1 -pkgrel=4 +pkgrel=5 pkgdesc="A UPnP Media Server" url="https://gerbera.io/" # it fails endianness ip-range comparison tests, on code inside the actual diff --git a/community/geth/APKBUILD b/community/geth/APKBUILD index bd684d4f860..dcdc509576a 100644 --- a/community/geth/APKBUILD +++ b/community/geth/APKBUILD @@ -1,8 +1,8 @@ # Contributor: André Klitzing <aklitzing@gmail.com> # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=geth -pkgver=1.13.14 -pkgrel=2 +pkgver=1.14.3 +pkgrel=0 pkgdesc="Official Go implementation of the Ethereum protocol" url="https://geth.ethereum.org/" arch="all" @@ -36,5 +36,5 @@ package() { } sha512sums=" -80a410dbeb06e8a46bd5b4e962fcf030fa8787eef192dbcd01c3d98bf31e822a8c3b92c35251876e122eac3fad707faf95b5e5c0baed8e29aa024c856b6f54bc geth-1.13.14.tar.gz +bb59e375ab0b6d52d4f0034d6c1e992c8046e6a18168cd6ab93bcc60e45e69c87660b977c481824e700072871116bb5fe03f07aa0f6c9ae7e336cd76b8665545 geth-1.14.3.tar.gz " diff --git a/community/ghc/0001-Fix-IPE-test.patch b/community/ghc/0001-Fix-IPE-test.patch new file mode 100644 index 00000000000..9ae83ac1448 --- /dev/null +++ b/community/ghc/0001-Fix-IPE-test.patch @@ -0,0 +1,39 @@ +From 3e606230e904482f900a43a25aa4584567f25d87 Mon Sep 17 00:00:00 2001 +From: Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> +Date: Wed, 15 Nov 2023 16:58:27 +0100 +Subject: [PATCH] Fix IPE test + +A helper function was defined in a different module than used. +To reproduce: ./hadrian/build test --test-root-dirs=testsuite/tests/rts/ipe +--- + testsuite/tests/rts/all.T | 4 ---- + testsuite/tests/rts/ipe/all.T | 4 ++++ + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T +index eb0f0b81d1..cc0995b5b3 100644 +--- a/testsuite/tests/rts/all.T ++++ b/testsuite/tests/rts/all.T +@@ -216,10 +216,6 @@ test('EventlogOutput_IPE', + ], + makefile_test, ['EventlogOutput_IPE']) + +-# Remove the capability prefix from IPE event log lines. +-def noCapabilityOutputFilter(s): +- return re.sub(r'[a-f0-9]+: IPE:', 'IPE:', s) +- + test('T4059', req_c, makefile_test, ['T4059']) + + # Test for #4274 +diff --git a/testsuite/tests/rts/ipe/all.T b/testsuite/tests/rts/ipe/all.T +index acb7e1f3b9..57a6cadc93 100644 +--- a/testsuite/tests/rts/ipe/all.T ++++ b/testsuite/tests/rts/ipe/all.T +@@ -1,3 +1,7 @@ ++# Remove the capability prefix from IPE event log lines. ++def noCapabilityOutputFilter(s): ++ return re.sub(r'[a-f0-9]+: IPE:', 'IPE:', s) ++ + test('ipeMap', [extra_files(['ipe_lib.c', 'ipe_lib.h']), c_src, omit_ghci], compile_and_run, ['ipe_lib.c']) + + # Manually create IPE entries and dump them to event log (stderr). diff --git a/community/ghc/APKBUILD b/community/ghc/APKBUILD index 88466b457dc..810620bbb44 100644 --- a/community/ghc/APKBUILD +++ b/community/ghc/APKBUILD @@ -46,6 +46,7 @@ options="!strip ldpath-recursive" # we strip it manually in build() source="https://downloads.haskell.org/~ghc/$_urlprefix/$_pkgprefix-src.tar.xz https://downloads.haskell.org/~ghc/$_urlprefix/$_pkgprefix-testsuite.tar.xz $pkgname-$pkgver-hadrian-ghc-$_bootstrapver.tar.gz::https://dev.alpinelinux.org/archive/ghc-hadrian/ghc-$pkgver/ghc-$_bootstrapver-hadrian-bootstrap-source.tar.gz + 0001-Fix-IPE-test.patch ghc-self-bootstrap.patch fix-T21035.patch @@ -177,6 +178,7 @@ sha512sums=" 9b677d5ead5ebb5df7bc960055a76ef00e68ed8102844997b12154bf71bdbfafdfff9ca31edce86b3df759242a7c98f52a464887973b53985f54ecd9fc4b4627 ghc-9.8.2-src.tar.xz e7766fcd98b4f70400d94ec33b39e633c2f6ab788f3b3e8431bb75e1f2a62081fc4c77e8d39b624702662168c3b5f7715d9b7866835f78d766dfa244feafe9d1 ghc-9.8.2-testsuite.tar.xz e5961b6de84ebe5095ad77c8c94ab328a8ab652b8acf3b832e8ab3beaf11cd7b869da56231206ec7a279e4f511b991a2fab7079e34e9f7bbe0ac66001031597a ghc-9.8.2-hadrian-ghc-9.8.2.tar.gz +ec2b6a470dc62af789a9071543a406b33d55c293fdf78c551e7615143b66d9c82a89117c625e82c24b2c1bffa49a9aebcd4baec62364ebb6adceaed32f7c898e 0001-Fix-IPE-test.patch 1a97002ec396d532af881e712377d80748fa9f6693931d961634524cab1ef681141b0f69ef007c0c8cd404c4e673c08b254880a581eac34dcfc49daaddb97f9f ghc-self-bootstrap.patch be5a8639b151b7828ad50b0f63775d34411d971aae73b0fe5c0226e4c70d1ee8353545b1d04c8de7825730b6d73a2e75f855757348b5ffa2d620d20d7e57f8c6 fix-T21035.patch 28433f5e86b571ef591ee61153c804eb4a540fda120b7a7aa14f39af46eda6917361d0cd41127356e20f24cf5b9d493ae404023eae31b863c2485fb8cffa0c6a fix-T7060.patch diff --git a/community/ghex/APKBUILD b/community/ghex/APKBUILD index 6efdf0c4161..37f12371304 100644 --- a/community/ghex/APKBUILD +++ b/community/ghex/APKBUILD @@ -1,7 +1,7 @@ # Contributor: August Klein <amatcoder@gmail.com> # Maintainer: August Klein <amatcoder@gmail.com> pkgname=ghex -pkgver=45.1 +pkgver=46.0 _pkgver=${pkgver%.*} pkgrel=0 pkgdesc="A hex editor for GNOME" @@ -35,5 +35,5 @@ package() { } sha512sums=" -308e1dbcdab1a3277b7808f3e0f09af4609e69b263fc7b02ae7a7d71fd47f7c66f7838281b14dd8f3175ec3449dc074a17286961220216374769b790e800a92f ghex-45.1.tar.xz +7f6c26b0644c1a253eef6eded0265ffaf882fb2400d1c4c40e9cefd9291d412b1425452930269d35c110fc88e6cf994f33a0ca9e937a419885f3c1820003220d ghex-46.0.tar.xz " diff --git a/community/gifski/APKBUILD b/community/gifski/APKBUILD index 29f7f2c1ad6..6d21065eea2 100644 --- a/community/gifski/APKBUILD +++ b/community/gifski/APKBUILD @@ -2,13 +2,15 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=gifski pkgver=1.13.0 -pkgrel=0 +pkgrel=1 pkgdesc="Highest-quality GIF encoder based on pngquant" url="https://gif.ski/" license="AGPL-3.0-or-later" arch="all" makedepends="cargo clang16-dev ffmpeg-dev cargo-auditable" -source="https://github.com/ImageOptim/gifski/archive/$pkgver/gifski-$pkgver.tar.gz" +source="https://github.com/ImageOptim/gifski/archive/$pkgver/gifski-$pkgver.tar.gz + bump-ffmpeg-sys-next.patch + " options="net" # fetch dependencies _features="--features=video" @@ -33,4 +35,5 @@ package() { sha512sums=" 0dec90461ce4182e30d0da061bf691b17aad873ed9f3ea68356bc4b36fd4c80b2aa8694cd539024830afd371716f6a99daeacc09094119ce8cb2d9044820d3a3 gifski-1.13.0.tar.gz +707b355d3a76158f70736d36b7e46bf4f49f3d1f57ba7e29d91f6b127b9547f4b3081363b24090b1ee1b1d3a6e12ee5d963d472d1286e7cb452bc4c807883add bump-ffmpeg-sys-next.patch " diff --git a/community/gifski/bump-ffmpeg-sys-next.patch b/community/gifski/bump-ffmpeg-sys-next.patch new file mode 100644 index 00000000000..a1167bdf54c --- /dev/null +++ b/community/gifski/bump-ffmpeg-sys-next.patch @@ -0,0 +1,33 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -264,9 +264,9 @@ + + [[package]] + name = "ffmpeg-next" +-version = "6.0.0" ++version = "6.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8af03c47ad26832ab3aabc4cdbf210af3d3b878783edd5a7ba044ba33aab7a60" ++checksum = "4e72c72e8dcf638fb0fb03f033a954691662b5dabeaa3f85a6607d101569fccd" + dependencies = [ + "bitflags", + "ffmpeg-sys-next", +@@ -275,8 +275,8 @@ + + [[package]] + name = "ffmpeg-sys-next" +-version = "6.0.1" +-source = "git+https://github.com/kornelski/rust-ffmpeg-sys-1?rev=94d5496d88900bdc0cad66733138134d0ea3cf31#94d5496d88900bdc0cad66733138134d0ea3cf31" ++version = "6.1.0" ++source = "git+https://github.com/kornelski/rust-ffmpeg-sys-1?rev=fd5784d645df2ebe022a204ac36582074da1edf7#fd5784d645df2ebe022a204ac36582074da1edf7" + dependencies = [ + "bindgen", + "cc", +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -98,4 +98,4 @@ + + [patch.crates-io] + # ffmpeg-sys-next does not support cross-compilation, which I use to produce binaries https://github.com/zmwangx/rust-ffmpeg-sys/pull/30 +-ffmpeg-sys-next = { rev = "94d5496d88900bdc0cad66733138134d0ea3cf31", git = "https://github.com/kornelski/rust-ffmpeg-sys-1"} ++ffmpeg-sys-next = { rev = "fd5784d645df2ebe022a204ac36582074da1edf7", git = "https://github.com/kornelski/rust-ffmpeg-sys-1"} diff --git a/community/gimp/APKBUILD b/community/gimp/APKBUILD index d74011955c0..f7b7ccff42d 100644 --- a/community/gimp/APKBUILD +++ b/community/gimp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gimp -pkgver=2.10.36 +pkgver=2.10.38 pkgrel=1 pkgdesc="GNU Image Manipulation Program" url="https://www.gimp.org/" @@ -84,5 +84,5 @@ dev() { } sha512sums=" -dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66 gimp-2.10.36.tar.bz2 +343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa gimp-2.10.38.tar.bz2 " diff --git a/community/ginkgo/APKBUILD b/community/ginkgo/APKBUILD index acb1e4d7052..7485408e96f 100644 --- a/community/ginkgo/APKBUILD +++ b/community/ginkgo/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=ginkgo -pkgver=2.16.0 -pkgrel=1 +pkgver=2.17.2 +pkgrel=0 pkgdesc="Modern Testing Framework for Go" url="https://onsi.github.io/ginkgo/" license="MIT" @@ -11,6 +11,7 @@ makedepends="go" source="https://github.com/onsi/ginkgo/archive/v$pkgver/ginkgo-$pkgver.tar.gz tests.patch " +options="net" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -33,6 +34,6 @@ package() { } sha512sums=" -13e760884b181c016ab600cd7ab06d86de841063a0530d8d4b83b7f52cbf248d1749b59c133b180f9fdbb5a4db85cec3a31a54c59b384f45a79b243f8b553122 ginkgo-2.16.0.tar.gz +0aa480d500b35b60f8aa67f13ee897e8b11ba37c1aba59a9b8b8547ac20da718a157a2963037c855dff4d40a5635867397eab7a7010733c7f7ae69beb51a8745 ginkgo-2.17.2.tar.gz 2fe515438583a51dbd92912a761063882788b3d001d37073986d81b9d4076e0381ee1981623cbf603fb70b59efb60bf941d577ecb8d5af97027d1877c7e164cc tests.patch " diff --git a/community/gir-to-d/APKBUILD b/community/gir-to-d/APKBUILD index 4084e37597a..87043c74247 100644 --- a/community/gir-to-d/APKBUILD +++ b/community/gir-to-d/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gir-to-d -pkgver=0.23.1 -pkgrel=4 +pkgver=0.23.2 +pkgrel=0 pkgdesc="Create D bindings from GObject introspection files" url="https://github.com/gtkd-developers/gir-to-d" # limited by ldc @@ -24,5 +24,5 @@ package() { } sha512sums=" -d1cfb906cd094acdf134a9a748fbd71fdbd4a26ce4d1696be356eb0c1c12edf4a96c73b7ca79da46c36f7e0ee15645991364b2bb2e1cbc46e8023233d4327060 gir-to-d-0.23.1.tar.gz +14a2f1da71d1c48e6e2dfcf91937d546db56c7ca1bf1a3d0f52b76d9bc4bd8f1b26d227a7d736ec3e53998ccde0a9129a9c596e2c5f71cd54726bf006619e89d gir-to-d-0.23.2.tar.gz " diff --git a/community/girara/APKBUILD b/community/girara/APKBUILD index d8f3a662207..7e9c73b87a1 100644 --- a/community/girara/APKBUILD +++ b/community/girara/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch> # Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch> pkgname=girara -pkgver=0.4.3 +pkgver=0.4.4 pkgrel=0 pkgdesc="girara - gtk user interface that focuses on simplicity and minimalism" url="https://git.pwmt.org/pwmt/girara" @@ -20,7 +20,7 @@ makedepends=" " checkdepends="xvfb-run" subpackages="$pkgname-doc $pkgname-dev $pkgname-lang" -source="https://git.pwmt.org/pwmt/girara/-/archive/$pkgver/girara-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/pwmt/girara/archive/refs/tags/$pkgver.tar.gz" build() { abuild-meson . build @@ -43,5 +43,5 @@ doc() { } sha512sums=" -0dcde66101f5779c879f5847e8cb9d5777c6fa803733b6fe9c05e17385b608cc02f2e119d456aa4810f623290057e9344bbcc6a64b4b36b4733b60b7e8d885b6 girara-0.4.3.tar.gz +4c106c2156ff397caad2c173cbfb5f2dc8f4574a59c70e7d04e941fd5273948c7e2cc4662b91a489dc689e6537b72bdb1771849cf7775d6afa167f2616a3d4c7 girara-0.4.4.tar.gz " diff --git a/community/git-annex/APKBUILD b/community/git-annex/APKBUILD index f24d920a1c1..37331bfd872 100644 --- a/community/git-annex/APKBUILD +++ b/community/git-annex/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=git-annex -pkgver=10.20240227 +pkgver=10.20240430 pkgrel=0 pkgdesc="Manage files with git, without checking their contents into git" url="http://git-annex.branchable.com" @@ -32,68 +32,51 @@ source=" https://git.joeyh.name/index.cgi/git-annex.git/snapshot/git-annex-$pkgver.tar.gz https://lab.ilot.io/mirrors/git-annex/-/releases/$pkgver/downloads/config/git-annex-$pkgver-edge.config fix-makefile.patch + ghc-9.8.patch " subpackages="$pkgname-doc $pkgname-bash-completion $pkgname-fish-completion $pkgname-zsh-completion" -# Add / remove '-' between "-f" and "FeatureName" to adjust feature build -_feature_flags=" - -fAssistant \ - -fWebApp \ - -fPairing \ - -fProduction \ - -fTorrentParser \ - -fMagicMime \ - -fBenchmark \ - -f-DebugLocks \ - -fDbus \ - -fNetworkBSD \ - -fGitLfs \ - -fHttpClientRestricted \ - " -_cabal_home="$srcdir/dist" - -cabal_update() { - default_prepare - msg "Freezing $pkgname dependencies" +_feature_flags="+assistant +webapp +pairing +production +torrentparser +magicmime +benchmark -debuglocks +dbus +networkbsd +gitlfs +httpclientrestricted" - # Resolve deps and generate fresh cabal.config with version constraints. - HOME="$_cabal_home" cabal update - cd "$srcdir/git-annex"* - HOME="$_cabal_home" cabal v1-freeze --shadow-installed-packages +# Cabal seems to be built without sandbox, moving the cabal-dir into src +export CABAL_DIR="$srcdir/.cabal" - mv "cabal.config" "$startdir/git-annex-$pkgver.config" - cd "$startdir" +cabal_update() { + cd "$builddir" + cabal update + ( + cabal v2-freeze \ + --strong-flags \ + --shadow-installed-packages \ + --flags="$_feature_flags" - if ! abuild checksum; then - die "Failed to update checksum, run 'abuild checksum' manually" - fi + mv cabal.project.freeze "$startdir/git-annex-$pkgver.config" + ) } prepare() { default_prepare - - ln -sf "$srcdir"/git-annex-*.config cabal.config - - # ghc version path - export PATH="$PATH:/usr/lib/llvm14/bin" - - # problematic depend install - HOME="$_cabal_home" cabal update + ln -sf "$srcdir"/git-annex-*.config "$builddir"/cabal.project.freeze } build() { # ghc version path - export PATH="$PATH:/usr/lib/llvm14/bin" + export PATH="$PATH:/usr/lib/llvm15/bin" + + cabal v2-update + cabal v2-build git-annex:exes \ + --jobs=${JOBS:-1} \ + --prefix=/usr \ + --docdir=/usr/share/doc/$pkgname \ + --sysconfdir=/etc \ + --flags="$_feature_flags" + + # Avoid invoking ghc(1) in install() function. + make mans Build/InstallDesktopFile - msg "Building git-annex-$pkgver" - HOME="$_cabal_home" cabal update - HOME="$_cabal_home" cabal v1-install \ - --only-dependencies \ - --allow-newer=feed:base-compat \ - $_feature_flags - HOME="$_cabal_home" cabal v1-configure $_feature_flags - HOME="$_cabal_home" cabal v1-build -j - mv dist/build/git-annex/git-annex . + # Prepare executable for the tests and make install. + local executable="$(cabal list-bin git-annex:exes)" + cp "$executable" . ln -s git-annex git-annex-shell } @@ -102,11 +85,12 @@ check() { } package() { - HOME="$_cabal_home" make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } sha512sums=" -3889c6fc8a99026c36a4e639524f9a717b6094d4703605e31e918347adc09f61b372e6db89b011f741731bc2367115ba28d65f82ef203e4e3a2049ba0e20cee5 git-annex-10.20240227.tar.gz -9454be16f0b0436b082e4fa2648c905cb5fe950fc64bff0c173f5df001469a0266696e091cfb24ded603524193b79af9a538dbbc1fb8b7813716cd3434bfcaa7 git-annex-10.20240227-edge.config -9300f883746d8726f47be6d194b5ac9550e2894669097f3202eca944221665bd3087a81b3f97b21f013eccaa6b5b1fb050e253ac18999c136db20056fadf2ed8 fix-makefile.patch +55b414637cd33928cd4f3ce3f0caaa7a7fa6b12318f449b63ca665ffcb5c2a2c3c80baeeb9c308a449dc81a6ff196d5bd6988f4c145dd58aa1e83dabb45052dc git-annex-10.20240430.tar.gz +152c2e421b77f836fe391a4e6a42ba6e9c8b3237646ddc14e3ae16d05ddecd31e096e41c9e57286f5e70a270882262c5b11210237e30937438c63f336a48c54c git-annex-10.20240430-edge.config +506defaff82b044069f4e0bf215a6be9f8d9d95f865ba41f156aaae2b5a61a87c77c471374422e08985ab4e4772e812d5f99cb9d139cc5949e0f44cb9dc48e13 fix-makefile.patch +05b2f7248ebe3244e7a89a889bc6b6acf91114aa72b8b8e63c742483f7bd94e2ba8b16e917a091954893ba57a6ab0b0a9ccc23c219f2fd626d78d06b9fa106f1 ghc-9.8.patch " diff --git a/community/git-annex/fix-makefile.patch b/community/git-annex/fix-makefile.patch index 25c8a5f378f..f4930412ae3 100644 --- a/community/git-annex/fix-makefile.patch +++ b/community/git-annex/fix-makefile.patch @@ -1,8 +1,15 @@ -diff --git a/Makefile b/Makefile -index 5688430..54fe3c8 100644 ---- a/Makefile -+++ b/Makefile -@@ -87,16 +87,16 @@ install-docs: docs install-mans +--- git-annex-10.20240227.orig/Makefile ++++ git-annex-10.20240227/Makefile +@@ -5,7 +5,7 @@ + ifeq ($(BUILDER),stack) + GHC?=stack ghc -- + else +-GHC?=ghc ++GHC?=cabal exec ghc -- + endif + + PREFIX?=/usr +@@ -86,16 +86,16 @@ rsync -a --delete html/ $(DESTDIR)$(PREFIX)/$(SHAREDIR)/doc/git-annex/html/; \ fi diff --git a/community/git-annex/ghc-9.8.patch b/community/git-annex/ghc-9.8.patch new file mode 100644 index 00000000000..85796d787da --- /dev/null +++ b/community/git-annex/ghc-9.8.patch @@ -0,0 +1,18 @@ +Support ghc-9.8 by widening a lot of constraints. + +This patch can be removed once upstream supports ghc 9.8 offically. + +diff -uprN git-annex-10.20240227.orig/cabal.project git-annex-10.20240227/cabal.project +--- git-annex-10.20240227.orig/cabal.project 1970-01-01 01:00:00.000000000 +0100 ++++ git-annex-10.20240227/cabal.project 2024-04-28 13:30:14.061706299 +0200 +@@ -0,0 +1,10 @@ ++packages: *.cabal ++ ++allow-newer: dav ++allow-newer: haskeline:filepath ++allow-newer: haskeline:directory ++allow-newer: xml-hamlet ++allow-newer: aws:filepath ++allow-newer: dbus:network ++allow-newer: dbus:filepath ++allow-newer: microstache:filepath diff --git a/community/git-branchless/APKBUILD b/community/git-branchless/APKBUILD index 1c900397820..5ea6c7d6034 100644 --- a/community/git-branchless/APKBUILD +++ b/community/git-branchless/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=git-branchless pkgver=0.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="Suite of tools to help you visualize, navigate, manipulate, and repair your commit graph" url="https://github.com/arxanas/git-branchless" # riscv64: test fails @@ -23,6 +23,8 @@ checkdepends=" " source="https://github.com/arxanas/git-branchless/archive/v$pkgver/git-branchless-$pkgver.tar.gz unbundle-sqlite.patch + fix-git-2.44-auto_merge.patch + fix-tests-git-2.42.patch " options="net" @@ -69,4 +71,6 @@ package() { sha512sums=" ad3435948ffabe256fff2f7b0fe654818fc280049fea0df845ce593ccd713faf5988c843062cfae28c10641c84ed15abaeb0ae774d21e88364f83c0c82852964 git-branchless-0.8.0.tar.gz a6edb671e188bb53cbe43c760c922233ed9e2e7cfdc3d2a32a020dfb847cff413a0c30333d03e76acf920459c438672cd2b975d515b57bfddd1ecc1bbceb1de4 unbundle-sqlite.patch +d4a259751283137034b662b29de66203f54caf72be8549e2bde5e65b5c7dc193feb5b3b5f3e9b91d7bda7b2bfab9c4fc28e3f58ee859308835beeb429d527e13 fix-git-2.44-auto_merge.patch +055e3f3559b0d5eefc1a43e2fde0cfadff631ec4bf28de720dc7f6ba502687be94748afe63cf5698288d34d843b92b3b7bef174e12f61914e9945d782e9f4eda fix-tests-git-2.42.patch " diff --git a/community/git-branchless/fix-git-2.44-auto_merge.patch b/community/git-branchless/fix-git-2.44-auto_merge.patch new file mode 100644 index 00000000000..deefa050797 --- /dev/null +++ b/community/git-branchless/fix-git-2.44-auto_merge.patch @@ -0,0 +1,165 @@ +Patch-Source: https://github.com/arxanas/git-branchless/commit/8b1ae8b29f2abf10e5585d48cea4bd85862a529b +-- +From 8b1ae8b29f2abf10e5585d48cea4bd85862a529b Mon Sep 17 00:00:00 2001 +From: Waleed Khan <me@waleedkhan.name> +Date: Sun, 18 Feb 2024 16:36:55 -0800 +Subject: [PATCH] tests: Try to fix failing `git-next` tests + +--- + git-branchless-lib/src/core/eventlog.rs | 8 +++++++- + git-branchless-lib/src/testing.rs | 7 +++++++ + git-branchless-lib/tests/test_eventlog.rs | 4 ++++ + git-branchless/tests/test_bug_report.rs | 2 +- + git-branchless/tests/test_eventlog.rs | 2 +- + git-branchless/tests/test_hooks.rs | 2 +- + git-branchless/tests/test_undo.rs | 8 ++++++-- + git-branchless/tests/test_wrap.rs | 5 +++-- + 8 files changed, 30 insertions(+), 8 deletions(-) + +diff --git a/git-branchless-lib/src/core/eventlog.rs b/git-branchless-lib/src/core/eventlog.rs +index 31fce007d..bcdc214d1 100644 +--- a/git-branchless-lib/src/core/eventlog.rs ++++ b/git-branchless-lib/src/core/eventlog.rs +@@ -710,7 +710,13 @@ pub fn should_ignore_ref_updates(reference_name: &ReferenceName) -> bool { + + matches!( + reference_name.as_str(), +- "ORIG_HEAD" | "CHERRY_PICK" | "REBASE_HEAD" | "CHERRY_PICK_HEAD" | "FETCH_HEAD" ++ "ORIG_HEAD" ++ | "CHERRY_PICK" ++ | "REBASE_HEAD" ++ | "CHERRY_PICK_HEAD" ++ // From Git's `is_special_ref` in `refs.c`: ++ | "AUTO_MERGE" ++ | "FETCH_HEAD" + ) + } + +diff --git a/git-branchless-lib/src/testing.rs b/git-branchless-lib/src/testing.rs +index 6799bc5f8..d1cea37a6 100644 +--- a/git-branchless-lib/src/testing.rs ++++ b/git-branchless-lib/src/testing.rs +@@ -654,6 +654,13 @@ then you can only run tests in the main `git-branchless` and \ + Ok(version >= GitVersion(2, 27, 0)) + } + ++ /// Git v2.44 produces `AUTO_MERGE` refs as part of some operations, which ++ /// changes the event log according to the `reference-transaction` hook. ++ pub fn produces_auto_merge_refs(&self) -> eyre::Result<bool> { ++ let version = self.get_version()?; ++ Ok(version >= GitVersion(2, 44, 0)) ++ } ++ + /// Resolve a file during a merge or rebase conflict with the provided + /// contents. + #[instrument] +diff --git a/git-branchless-lib/tests/test_eventlog.rs b/git-branchless-lib/tests/test_eventlog.rs +index 461019b70..e69e44fb6 100644 +--- a/git-branchless-lib/tests/test_eventlog.rs ++++ b/git-branchless-lib/tests/test_eventlog.rs +@@ -46,6 +46,10 @@ fn test_drop_non_meaningful_events() -> eyre::Result<()> { + fn test_different_event_transaction_ids() -> eyre::Result<()> { + let git = make_git()?; + ++ if git.produces_auto_merge_refs()? { ++ return Ok(()); ++ } ++ + git.init_repo()?; + git.commit_file("test1", 1)?; + git.branchless("hide", &["--no-delete-branches", "HEAD"])?; +diff --git a/git-branchless/tests/test_bug_report.rs b/git-branchless/tests/test_bug_report.rs +index 5788024eb..0cc1596c3 100644 +--- a/git-branchless/tests/test_bug_report.rs ++++ b/git-branchless/tests/test_bug_report.rs +@@ -16,7 +16,7 @@ fn redact_timestamp(str: String) -> String { + fn test_bug_report() -> eyre::Result<()> { + let git = make_git()?; + +- if !git.supports_reference_transactions()? { ++ if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? { + return Ok(()); + } + git.init_repo()?; +diff --git a/git-branchless/tests/test_eventlog.rs b/git-branchless/tests/test_eventlog.rs +index cc2cbf9e6..21b51fd6a 100644 +--- a/git-branchless/tests/test_eventlog.rs ++++ b/git-branchless/tests/test_eventlog.rs +@@ -8,7 +8,7 @@ use lib::testing::make_git; + fn test_git_v2_31_events() -> eyre::Result<()> { + let git = make_git()?; + +- if !git.supports_reference_transactions()? { ++ if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? { + return Ok(()); + } + +diff --git a/git-branchless/tests/test_hooks.rs b/git-branchless/tests/test_hooks.rs +index 57fc5d4b7..7acb6e278 100644 +--- a/git-branchless/tests/test_hooks.rs ++++ b/git-branchless/tests/test_hooks.rs +@@ -222,7 +222,7 @@ fn test_pre_auto_gc() -> eyre::Result<()> { + fn test_merge_commit_recorded() -> eyre::Result<()> { + let git = make_git()?; + +- if !git.supports_reference_transactions()? { ++ if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? { + return Ok(()); + } + +diff --git a/git-branchless/tests/test_undo.rs b/git-branchless/tests/test_undo.rs +index 8cd289427..9bf46e7f1 100644 +--- a/git-branchless/tests/test_undo.rs ++++ b/git-branchless/tests/test_undo.rs +@@ -136,7 +136,7 @@ fn test_undo_help() -> eyre::Result<()> { + fn test_undo_navigate() -> eyre::Result<()> { + let git = make_git()?; + +- if !git.supports_reference_transactions()? { ++ if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? { + return Ok(()); + } + +@@ -225,7 +225,7 @@ fn test_undo_navigate() -> eyre::Result<()> { + fn test_go_to_event() -> eyre::Result<()> { + let git = make_git()?; + +- if !git.supports_reference_transactions()? { ++ if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? { + return Ok(()); + } + +@@ -433,6 +433,10 @@ fn test_undo_move_refs() -> eyre::Result<()> { + fn test_historical_smartlog_visibility() -> eyre::Result<()> { + let git = make_git()?; + ++ if git.produces_auto_merge_refs()? { ++ return Ok(()); ++ } ++ + git.init_repo()?; + git.detach_head()?; + git.commit_file("test1", 1)?; +diff --git a/git-branchless/tests/test_wrap.rs b/git-branchless/tests/test_wrap.rs +index fb78e369a..3223bd18f 100644 +--- a/git-branchless/tests/test_wrap.rs ++++ b/git-branchless/tests/test_wrap.rs +@@ -9,7 +9,7 @@ use lib::testing::{make_git, GitRunOptions}; + fn test_wrap_rebase_in_transaction() -> eyre::Result<()> { + let git = make_git()?; + +- if !git.supports_reference_transactions()? { ++ if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? { + return Ok(()); + } + +@@ -28,7 +28,8 @@ fn test_wrap_rebase_in_transaction() -> eyre::Result<()> { + let event_replayer = EventReplayer::from_event_log_db(&effects, &repo, &event_log_db)?; + let events: Vec<Event> = get_event_replayer_events(&event_replayer) + .iter() +- .map(|event| redact_event_timestamp(event.clone())) ++ .cloned() ++ .map(redact_event_timestamp) + .collect(); + + // Bug fixed in Git v2.35: https://github.com/git/git/commit/4866a64508465938b7661eb31afbde305d83e234 diff --git a/community/git-branchless/fix-tests-git-2.42.patch b/community/git-branchless/fix-tests-git-2.42.patch new file mode 100644 index 00000000000..e04236fb862 --- /dev/null +++ b/community/git-branchless/fix-tests-git-2.42.patch @@ -0,0 +1,28 @@ +Patch-Source: https://github.com/arxanas/git-branchless/commit/dbbaed74a6dc9a3aa098375845cbfab74b380ae6 +-- +From dbbaed74a6dc9a3aa098375845cbfab74b380ae6 Mon Sep 17 00:00:00 2001 +From: Waleed Khan <me@waleedkhan.name> +Date: Sat, 23 Dec 2023 17:44:05 -0600 +Subject: [PATCH] fix(undo): fix `test_git_bisect_produces_empty_event` + +Broken on the Git `next` branch. Probably broken by https://github.com/git/git/commit/3460e3d6676870713ef17b300b03f70ee8f3cc44 or a commit slightly before that. +--- + git-branchless/tests/test_undo.rs | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/git-branchless/tests/test_undo.rs b/git-branchless/tests/test_undo.rs +index 1ee81acca..8cd289427 100644 +--- a/git-branchless/tests/test_undo.rs ++++ b/git-branchless/tests/test_undo.rs +@@ -660,6 +660,11 @@ fn test_git_bisect_produces_empty_event() -> eyre::Result<()> { + if !git.supports_reference_transactions()? { + return Ok(()); + } ++ if git.get_version()? >= GitVersion(2, 42, 0) { ++ // Later versions of Git write `BISECT_EXPECTED_REV` to the filesystem ++ // as well, causing the below test to fail. ++ return Ok(()); ++ } + git.init_repo()?; + + git.commit_file("test1", 1)?; diff --git a/community/git-cliff/APKBUILD b/community/git-cliff/APKBUILD index 6a7b9089825..d3fb5702826 100644 --- a/community/git-cliff/APKBUILD +++ b/community/git-cliff/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Orhun Parmaksız <orhunparmaksiz@gmail.com> # Maintainer: Orhun Parmaksız <orhunparmaksiz@gmail.com> pkgname=git-cliff -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=0 pkgdesc="A highly customizable changelog generator" url="https://github.com/orhun/git-cliff" @@ -47,7 +47,7 @@ build() { } check() { - cargo test --frozen -- --skip "git_log" --skip "git_tags" --skip "git_upstream_remote" + cargo test --frozen -- --skip "repo::test" } package() { @@ -61,5 +61,5 @@ package() { } sha512sums=" -3bdfcb735e055b0499352618c869b4316519feefafde525fdeab579a53559ec69a939fcc04059b20ec11b81cb64a88bffbd1dd6730865ca1b1105d6476187eb4 git-cliff-2.2.1.tar.gz +f9b21fe188a7bf729e82d4b1828649e938f10eaaee5a164963a8a109fdeaeb5f6148fe0e8cadf0c59e4cfb18759eb7a2c74cb4c7a7a84a2d730c1f9a2eb97f41 git-cliff-2.2.2.tar.gz " diff --git a/community/git-interactive-rebase-tool/0001-Fix-lint-warning-to-avoid-linting-failure-with-rust-.patch b/community/git-interactive-rebase-tool/0001-Fix-lint-warning-to-avoid-linting-failure-with-rust-.patch new file mode 100644 index 00000000000..efffa88e4d4 --- /dev/null +++ b/community/git-interactive-rebase-tool/0001-Fix-lint-warning-to-avoid-linting-failure-with-rust-.patch @@ -0,0 +1,163 @@ +From 5659c6886d26dfd48d50c4508f607aaf28715f92 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> +Date: Sun, 5 May 2024 07:57:10 +0200 +Subject: [PATCH] Fix lint warning to avoid linting failure with rust 1.77.0 + +See https://github.com/MitMaro/git-interactive-rebase-tool/issues/906 +--- + scripts/data/lints.rs | 2 +- + src/config/src/lib.rs | 2 +- + src/core/src/lib.rs | 2 +- + src/display/src/lib.rs | 2 +- + src/git/src/lib.rs | 2 +- + src/input/src/lib.rs | 2 +- + src/main.rs | 2 +- + src/runtime/src/lib.rs | 2 +- + src/testutils/src/lib.rs | 2 +- + src/todo_file/src/lib.rs | 2 +- + src/view/src/lib.rs | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/scripts/data/lints.rs b/scripts/data/lints.rs +index b33c70f..2e2b25d 100644 +--- a/scripts/data/lints.rs ++++ b/scripts/data/lints.rs +@@ -47,7 +47,7 @@ + unused_macro_rules, + unused_qualifications, + unused_results, +- unused_tuple_struct_fields, ++ dead_code, + variant_size_differences + )] + // enable all of Clippy's lints +diff --git a/src/config/src/lib.rs b/src/config/src/lib.rs +index 8c02d74..dc0237f 100644 +--- a/src/config/src/lib.rs ++++ b/src/config/src/lib.rs +@@ -48,7 +48,7 @@ + unused_macro_rules, + unused_qualifications, + unused_results, +- unused_tuple_struct_fields, ++ dead_code, + variant_size_differences + )] + // enable all of Clippy's lints +diff --git a/src/core/src/lib.rs b/src/core/src/lib.rs +index cdf4ad7..9bea4d5 100644 +--- a/src/core/src/lib.rs ++++ b/src/core/src/lib.rs +@@ -48,7 +48,7 @@ + unused_macro_rules, + unused_qualifications, + unused_results, +- unused_tuple_struct_fields, ++ dead_code, + variant_size_differences + )] + // enable all of Clippy's lints +diff --git a/src/display/src/lib.rs b/src/display/src/lib.rs +index 741d562..45a82a8 100644 +--- a/src/display/src/lib.rs ++++ b/src/display/src/lib.rs +@@ -48,7 +48,7 @@ + unused_macro_rules, + unused_qualifications, + unused_results, +- unused_tuple_struct_fields, ++ dead_code, + variant_size_differences + )] + // enable all of Clippy's lints +diff --git a/src/git/src/lib.rs b/src/git/src/lib.rs +index bcbb18a..74a05f3 100644 +--- a/src/git/src/lib.rs ++++ b/src/git/src/lib.rs +@@ -48,7 +48,7 @@ + unused_macro_rules, + unused_qualifications, + unused_results, +- unused_tuple_struct_fields, ++ dead_code, + variant_size_differences + )] + // enable all of Clippy's lints +diff --git a/src/input/src/lib.rs b/src/input/src/lib.rs +index d0b11d2..4c216bf 100644 +--- a/src/input/src/lib.rs ++++ b/src/input/src/lib.rs +@@ -48,7 +48,7 @@ + unused_macro_rules, + unused_qualifications, + unused_results, +- unused_tuple_struct_fields, ++ dead_code, + variant_size_differences + )] + // enable all of Clippy's lints +diff --git a/src/main.rs b/src/main.rs +index 99ff1a6..6d6a28e 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -48,7 +48,7 @@ + unused_macro_rules, + unused_qualifications, + unused_results, +- unused_tuple_struct_fields, ++ dead_code, + variant_size_differences + )] + // enable all of Clippy's lints +diff --git a/src/runtime/src/lib.rs b/src/runtime/src/lib.rs +index a7197d6..7d7dfef 100644 +--- a/src/runtime/src/lib.rs ++++ b/src/runtime/src/lib.rs +@@ -48,7 +48,7 @@ + unused_macro_rules, + unused_qualifications, + unused_results, +- unused_tuple_struct_fields, ++ dead_code, + variant_size_differences + )] + // enable all of Clippy's lints +diff --git a/src/testutils/src/lib.rs b/src/testutils/src/lib.rs +index 38bf351..6143506 100644 +--- a/src/testutils/src/lib.rs ++++ b/src/testutils/src/lib.rs +@@ -48,7 +48,7 @@ + unused_macro_rules, + unused_qualifications, + unused_results, +- unused_tuple_struct_fields, ++ dead_code, + variant_size_differences + )] + // enable all of Clippy's lints +diff --git a/src/todo_file/src/lib.rs b/src/todo_file/src/lib.rs +index 782ff4a..4051027 100644 +--- a/src/todo_file/src/lib.rs ++++ b/src/todo_file/src/lib.rs +@@ -48,7 +48,7 @@ + unused_macro_rules, + unused_qualifications, + unused_results, +- unused_tuple_struct_fields, ++ dead_code, + variant_size_differences + )] + // enable all of Clippy's lints +diff --git a/src/view/src/lib.rs b/src/view/src/lib.rs +index 74af3da..c441909 100644 +--- a/src/view/src/lib.rs ++++ b/src/view/src/lib.rs +@@ -48,7 +48,7 @@ + unused_macro_rules, + unused_qualifications, + unused_results, +- unused_tuple_struct_fields, ++ dead_code, + variant_size_differences + )] + // enable all of Clippy's lints diff --git a/community/git-interactive-rebase-tool/APKBUILD b/community/git-interactive-rebase-tool/APKBUILD index e4a3fd15e6b..aa0dfe812eb 100644 --- a/community/git-interactive-rebase-tool/APKBUILD +++ b/community/git-interactive-rebase-tool/APKBUILD @@ -9,7 +9,8 @@ arch="all" license="GPL-3.0-or-later" makedepends="cargo libgit2-dev zlib-dev cargo-auditable" subpackages="$pkgname-doc" -source="https://github.com/MitMaro/git-interactive-rebase-tool/archive/$pkgver/git-interactive-rebase-tool-$pkgver.tar.gz" +source="https://github.com/MitMaro/git-interactive-rebase-tool/archive/$pkgver/git-interactive-rebase-tool-$pkgver.tar.gz + 0001-Fix-lint-warning-to-avoid-linting-failure-with-rust-.patch" options="net" export CARGO_PROFILE_RELEASE_OPT_LEVEL="z" @@ -50,4 +51,5 @@ package() { sha512sums=" 11d4be71bf6f55f541046ea607b965ffd0f044e525ed3dfbfc37c8d986cda6819c1838d2852e7d6468f43f9482766a3cddb5b8305d09a0d6fd5596b85d6671af git-interactive-rebase-tool-2.3.0.tar.gz +284d01290776e193adb837f3cb0c062aa7ea6c7d5d89b729bbbcaa7a63b487742e535e795db3ce62b7440e3f456bfadf034cff6c1cbb43ef6921e8701128f9c6 0001-Fix-lint-warning-to-avoid-linting-failure-with-rust-.patch " diff --git a/community/git-machete/APKBUILD b/community/git-machete/APKBUILD index 4baa349988c..9065dfe64e1 100644 --- a/community/git-machete/APKBUILD +++ b/community/git-machete/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=git-machete -pkgver=3.23.2 -pkgrel=1 +pkgver=3.25.2 +pkgrel=0 pkgdesc="git repository organizer & rebase/merge workflow automation tool" url="https://github.com/VirtusLab/git-machete" arch="noarch" @@ -43,5 +43,5 @@ package() { } sha512sums=" -0df9f9a47dd03c856677ca77666b3e0fca9938672fd3ba240e7338d9c3ee7f954b813dda5c496f2a2f9f0aa21f8875f10aa8d7284afb7d5272ce8e9796f6a7d6 git-machete-3.23.2.tar.gz +0d928823d2440a46105eb8d4caa84ef828f4a01e793530151c484958b34f4209da3efa9d874dfb48a32de424cd2defc4ae3634b68e0dec7bcaf9fe82b15e68c8 git-machete-3.25.2.tar.gz " diff --git a/community/git-warp-time/APKBUILD b/community/git-warp-time/APKBUILD index 963babd2d80..79250066d30 100644 --- a/community/git-warp-time/APKBUILD +++ b/community/git-warp-time/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=git-warp-time -pkgver=0.7.2 +pkgver=0.7.6 pkgrel=0 pkgdesc="Reset timestamps of Git repository files to the time of the last modifying commit" url="https://github.com/alerque/git-warp-time" @@ -46,5 +46,5 @@ package() { } sha512sums=" -250230aef6ad74decaabbaf7f757a5abea44f2d5bbf4c240273244dfc84395c47d31af27a7dedecacda206e44805a6023cca9d770e1e2e4485d34901d8a4c8f9 git-warp-time-0.7.2.tar.gz +da5e13e9aa539e29fd246e3b08f2ab9539c14cd16515a3d152881c0999a2496b558e11876f7615c7e147c6096b3c7185c3330cd6e8374a1093d595cc8f5d7fdb git-warp-time-0.7.6.tar.gz " diff --git a/community/github-cli/APKBUILD b/community/github-cli/APKBUILD index f19704189b3..f2185e1f3b8 100644 --- a/community/github-cli/APKBUILD +++ b/community/github-cli/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Contributor: Celeste <cielesti@protonmail.com> -# Contributor: Andrei Jiroh Eugenio Halili <ajhalili2006@gmail.com> -# Maintainer: Andrei Jiroh Eugenio Halili <ajhalili2006@gmail.com> +# Contributor: Andrei Jiroh Eugenio Halili <ajhalili2006@andreijiroh.xyz> +# Maintainer: Andrei Jiroh Eugenio Halili <ajhalili2006@andreijiroh.xyz> pkgname=github-cli pkgver=2.47.0 -pkgrel=0 +pkgrel=1 pkgdesc="CLI for dealing with GitHub" options="net" # Need to fetch modules url="https://cli.github.com" diff --git a/community/gitlab-runner/APKBUILD b/community/gitlab-runner/APKBUILD index d8a7bde2dc4..691ea5320db 100644 --- a/community/gitlab-runner/APKBUILD +++ b/community/gitlab-runner/APKBUILD @@ -2,18 +2,19 @@ # Contributor: Rasmus Thomsen <oss@cogitir.dev> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=gitlab-runner -pkgver=16.10.0 -pkgrel=2 +pkgver=16.11.1 +pkgrel=0 pkgdesc="GitLab runner for CI/CD jobs" url="https://docs.gitlab.com/runner/" arch="all" license="MIT" -makedepends="curl go jq" +makedepends="go jq" install="$pkgname.pre-install $pkgname.pre-upgrade" pkgusers="gitlab-runner" pkggroups="gitlab-runner" subpackages="$pkgname-helper $pkgname-openrc" source="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$pkgver/gitlab-runner-v$pkgver.tar.gz + $pkgname-$pkgver-tags.json::https://gitlab.com/api/v4/projects/gitlab-org%2Fgitlab-runner/repository/tags/v$pkgver syslog-log-format.patch use-logrus-syslog-hook.patch $pkgname.initd @@ -37,15 +38,14 @@ build() { # This is used to determine what version of # https://hub.docker.com/r/gitlab/gitlab-runner-helper/tags to use. local gitrev - gitrev="$(curl -fsSL "https://gitlab.com/api/v4/projects/gitlab-org%2F$pkgname/repository/tags/v$pkgver" \ - | jq -r '.commit.short_id')" + gitrev="$(jq -r '.commit.short_id' "$srcdir/$pkgname-$pkgver-tags.json")" echo "Tag v$pkgver resolved to SHA $gitrev" >&2 local ldflags=" -X gitlab.com/gitlab-org/$pkgname/common.NAME=$pkgname -X gitlab.com/gitlab-org/$pkgname/common.VERSION=$pkgver -X gitlab.com/gitlab-org/$pkgname/common.REVISION=$gitrev - -X gitlab.com/gitlab-org/$pkgname/common.BUILT=$(date -u +%Y-%m-%dT%H:%M:%S%z) + -X gitlab.com/gitlab-org/$pkgname/common.BUILT=$(date -d @"$SOURCE_DATE_EPOCH" -u +%Y-%m-%dT%H:%M:%S%z) -X gitlab.com/gitlab-org/$pkgname/common.BRANCH=master " # required for github.com/docker/docker @@ -73,7 +73,8 @@ helper() { } sha512sums=" -e67b2cceb8b3de16fcda99751dbe0419f74d72ec235cf6f1d42f15577eea2c1303dfefe68a9aef0d286539b8c7c828d2b6d2ac599b91b008f7d5151c9bf73d11 gitlab-runner-v16.10.0.tar.gz +91276b4555a9c55a06c2cd09e83f9055ba0d171a83827632d3245ea4730f91b23f8e854d07c9200898fc78bfb2e2d1256685ed95dba459918c2bacc492c94b75 gitlab-runner-v16.11.1.tar.gz +d9c8096c7577fd06543968663c88b6063186b4a143203965e4da05ac3b1f57f75ef29dc5b13c3a9b6d30469442df178d8142c0cf89d843f769ef98744f66848f gitlab-runner-16.11.1-tags.json c2e2d36714d1f8fc49ed2de6b411a879183b40356af366e9e89e0ee246d0b5400ebbfc598f747e30dec813c8d89399d80a1e8218890baed525136a734e1ca626 syslog-log-format.patch 30726c362476b9f93b44c44435cd04e8210f04b25f878302c7edeca387094a616af7aa20ece6eb6dcf329a2702ef2079dcc002779deef09d78ecb447253f87bf use-logrus-syslog-hook.patch 8cdcea1e07b30b720d0e18a12f06fff69f2a7804d0038b2bfd6a880a5c99eb4b2b06dd8ccd21edc501a2205d89decb176b725211a03253068fa45b6861e75f11 gitlab-runner.initd diff --git a/community/gjs/APKBUILD b/community/gjs/APKBUILD index 855099cbace..1ab8a809eb3 100644 --- a/community/gjs/APKBUILD +++ b/community/gjs/APKBUILD @@ -36,7 +36,7 @@ esac build() { case "$CARCH" in - aarch64|arm*|riscv64) + aarch64|arm*|riscv64|loongarch64) # not supported by clang here export CFLAGS="${CFLAGS/-fstack-clash-protection}" export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection}" diff --git a/community/glab/APKBUILD b/community/glab/APKBUILD index a880d6a30d0..ecd2b302181 100644 --- a/community/glab/APKBUILD +++ b/community/glab/APKBUILD @@ -1,7 +1,7 @@ # Contributor: solidnerd <niclas@mietz.io> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=glab -pkgver=1.38.0 +pkgver=1.40.0 pkgrel=0 pkgdesc="Open source GitLab CLI tool written in Go" url="https://gitlab.com/gitlab-org/cli" @@ -51,5 +51,5 @@ package() { } sha512sums=" -2bdd3c9cd453e1a39020fcbaaf13165d884febecc1dd05377f597979e9dbebc1050d7546efc3b27431459b56166bd168719f28692dec33b0849e210fc7d25618 glab-1.38.0.tar.gz +1523f18c6d247572de60a60997651fed8bc2ba0b1426ae12f54758294dfca4dd53095f39b2a62bb806eacbdef978e820bab3c87fea5344efeac6ecf1f6f98b12 glab-1.40.0.tar.gz " diff --git a/community/glew/APKBUILD b/community/glew/APKBUILD index 35cbb1dec6c..4e6845646c8 100644 --- a/community/glew/APKBUILD +++ b/community/glew/APKBUILD @@ -17,6 +17,11 @@ source="https://downloads.sourceforge.net/glew/glew-$pkgver.tgz " replaces="mesa-dev" +prepare() { + default_prepare + update_config_guess +} + build() { make \ STRIP= \ diff --git a/community/glibd/APKBUILD b/community/glibd/APKBUILD index 4a4c5acf145..57b0bca5bef 100644 --- a/community/glibd/APKBUILD +++ b/community/glibd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glibd -pkgver=2.4.2 -pkgrel=4 +pkgver=2.4.3 +pkgrel=0 pkgdesc="D bindings for the GLib C Utility Library" url="https://github.com/gtkd-developers/GlibD" arch="x86_64 aarch64" # ldc @@ -10,7 +10,8 @@ license="GPL-3.0-or-later" makedepends="meson gobject-introspection-dev glib-dev ldc gir-to-d" subpackages="$pkgname-dev $pkgname-dbg" source="https://github.com/gtkd-developers/GlibD/archive/v$pkgver/glibd-$pkgver.tar.gz - Trivial-fix-for-Glib-2.78.patch" + link-gthread.patch + " builddir="$srcdir/GlibD-$pkgver" build() { @@ -27,6 +28,6 @@ package() { } sha512sums=" -6db52b29cf90a5d8f6ddb43c1ddcd5bcc6ed5b2b6cd575711beffff74b8592c07aa3c6a1047954305cbcd515ef6ea814c162a91c12e9580d5938228ecc7a6d49 glibd-2.4.2.tar.gz -7bcbf68b9a069860e81232da4ece4ea3e8f766afcefbb6dcff060e897bdd6dc00c8f045eb5b1547a981b08990b678eb54f22d620e375f1ee469caeb09331e2f7 Trivial-fix-for-Glib-2.78.patch +7ceb415cad9aa3ea325d561932586b730af7ce123d4f1e69339eb2f007774abfa126d783af898ef7f8c17bde0f337383ba1630fd039f9a22a3c34a98ac8dd539 glibd-2.4.3.tar.gz +3fb514e6a7afcf596a09e80defbf51d43995624fcaac38b75e555462740ee1d9688e02680c1194cd03e77f5b1c2aae6aad97527d66f6971188f3074ae6826f22 link-gthread.patch " diff --git a/community/glibd/Trivial-fix-for-Glib-2.78.patch b/community/glibd/Trivial-fix-for-Glib-2.78.patch deleted file mode 100644 index 9eabe262789..00000000000 --- a/community/glibd/Trivial-fix-for-Glib-2.78.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ef3b70be9de8e1c798db47b627b465b0a257e693 Mon Sep 17 00:00:00 2001 -From: Jan Beich <jbeich@FreeBSD.org> -Date: Thu, 21 Sep 2023 20:56:50 +0200 -Subject: [PATCH] Trivial fix for GLib 2.78 - -generated/glib/StringG.d(137): Error: constructor `glib.StringG.StringG.this(string init)` conflicts with previous declaration at generated/glib/StringG.d(78) ---- - src/APILookupGLib.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/APILookupGLib.txt b/src/APILookupGLib.txt -index d037f7a..f66969d 100644 ---- a/src/APILookupGLib.txt -+++ b/src/APILookupGLib.txt -@@ -1313,6 +1313,7 @@ code: end - - struct: String - class: StringG -+version 2.78: noCode: new_take - - struct: Thread - noCode: new diff --git a/community/glibd/link-gthread.patch b/community/glibd/link-gthread.patch new file mode 100644 index 00000000000..8eec8d59262 --- /dev/null +++ b/community/glibd/link-gthread.patch @@ -0,0 +1,32 @@ +Fix errors found while running tests: +Error relocating libglibd-2.0.so.0: g_thread_init: symbol not found +Error relocating libglibd-2.0.so.0: g_thread_init_with_errorcheck_mutexes: symbol not found + +--- a/meson.build ++++ b/meson.build +@@ -20,6 +20,7 @@ + gmodule_dep = dependency('gmodule-2.0') + gobject_dep = dependency('gobject-2.0') + gio_dep = dependency('gio-2.0') ++gthread_dep = dependency('gthread-2.0') + # The Glib gir files are part of the gobject introspection package. + introspection_dep = dependency('gobject-introspection-1.0') + +@@ -47,7 +48,7 @@ + glibd = library('glibd-2.0', + [gir_binding_sources], + include_directories: [gir_bind_dir], +- dependencies: [glib_dep, gmodule_dep, gobject_dep, gio_dep], ++ dependencies: [glib_dep, gmodule_dep, gobject_dep, gio_dep, gthread_dep], + install: true, + soversion: project_soversion, + version: meson.project_version()) +@@ -61,7 +62,7 @@ + name: 'glibd-2.0', + subdirs: 'd/glibd-2', + version: meson.project_version(), +- requires: [glib_dep, gmodule_dep, gio_dep, gobject_dep], ++ requires: [glib_dep, gmodule_dep, gio_dep, gobject_dep, gthread_dep], + description: 'D bindings for the GLib C Utility Library.') + + # for use by others which embed this as subproject diff --git a/community/glibmm/APKBUILD b/community/glibmm/APKBUILD index 5b0dc8778aa..3f3f782477b 100644 --- a/community/glibmm/APKBUILD +++ b/community/glibmm/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glibmm -pkgver=2.66.6 -pkgrel=1 +pkgver=2.66.7 +pkgrel=0 pkgdesc="C++ wrapper for the GLib toolkit" url="https://www.gtkmm.org/" arch="all" @@ -31,5 +31,5 @@ dev() { } sha512sums=" -64d5ee1904ac645ee5a470889b928a24ab012bb0c310a94631bd725df9d5b7a5c0d2129f114017677db922b724ad12ab33698f1d27cae4aaeccd199b0e883099 glibmm-2.66.6.tar.xz +09b99622c051afd264d7a9b23025ee28ec870c6d23a5084ef7192f67b96fb8f16be5dbb2e8a4ff8a1d4ff873d3e73b4e25dee122049266687f471dcd3989b5bb glibmm-2.66.7.tar.xz " diff --git a/community/glibmm2.68/APKBUILD b/community/glibmm2.68/APKBUILD index d7399c2d599..beff5022e8e 100644 --- a/community/glibmm2.68/APKBUILD +++ b/community/glibmm2.68/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glibmm2.68 -pkgver=2.78.0 +pkgver=2.80.0 pkgrel=1 pkgdesc="C++ wrapper for the GLib toolkit" url="https://www.gtkmm.org/" @@ -36,5 +36,5 @@ check() { } sha512sums=" -b93575983860101d793725e08c13987914465e4daf280defb4a96b2f842b9e1a99c9320b05f2a6af9e3f7a2a384855b6710b982f9015a6469e37f3c257d9d811 glibmm-2.78.0.tar.xz +66adf63343fac3862fa0adcdaad7aa42b51ac1eef2ee8068e651824636d51eadd7fb2f70d912be9c06ac1b7d9b16c972f46a4e4da5e9225df274e2964308ae72 glibmm-2.80.0.tar.xz " diff --git a/community/glycin-loaders/APKBUILD b/community/glycin-loaders/APKBUILD index a40feda77d1..80c46436b9b 100644 --- a/community/glycin-loaders/APKBUILD +++ b/community/glycin-loaders/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=glycin-loaders pkgver=1.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="Sandboxed and extendable image decoding" url="https://gitlab.gnome.org/sophie-h/glycin" # s390x: https://github.com/nix-rust/nix/issues/1968 diff --git a/community/gmnisrv/APKBUILD b/community/gmnisrv/APKBUILD index 81a412a2f0a..b4677a27cfb 100644 --- a/community/gmnisrv/APKBUILD +++ b/community/gmnisrv/APKBUILD @@ -1,7 +1,7 @@ -# Maintainer: +# Maintainer: fossdd <fossdd@pwned.life> pkgname=gmnisrv pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="simple Gemini protocol server" url="gemini://drewdevault.com/gmnisrv.gmi" arch="all" diff --git a/testing/gmobile/APKBUILD b/community/gmobile/APKBUILD index 485a5f8a706..610dc5b4cd2 100644 --- a/testing/gmobile/APKBUILD +++ b/community/gmobile/APKBUILD @@ -1,6 +1,6 @@ -# Maintainer: fossdd <fossdd@pwned.life> +# Maintainer: team/phosh <fossdd@pwned.life> pkgname=gmobile -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=0 pkgdesc="Functions useful in mobile related, glib based projects" url="https://gitlab.gnome.org/World/Phosh/gmobile" @@ -29,5 +29,5 @@ package() { } sha512sums=" -eb17d0b39d5dbe197a2502fe974af37076317094c4759bbc4924d951fdb1bdb1fe8f13a85419dad756954c165bbd6dfca4ce555f6e3f5a3def4bac8bc913ab1a gmobile-0.1.0.tar.xz +81c828a656965edb64118984f99ee81aa3649ba1841c70be078eb170f8380e708689e067e70241d30bc3052b842a8f957895658719c480115d1e712c88b5aae1 gmobile-0.2.0.tar.xz " diff --git a/community/gnome-authenticator/APKBUILD b/community/gnome-authenticator/APKBUILD index 7c6bf02f254..15736847109 100644 --- a/community/gnome-authenticator/APKBUILD +++ b/community/gnome-authenticator/APKBUILD @@ -35,6 +35,11 @@ build() { } check() { + # Compile tests before running them with Meson to avoid timeout + CARGO_TARGET_DIR="$builddir"/output/target \ + CARGO_HOME="$CARGO_TARGET_DIR"/cargo-home \ + cargo test --no-run --bin authenticator + meson test --no-rebuild --print-errorlogs -C output } diff --git a/community/gnome-builder/APKBUILD b/community/gnome-builder/APKBUILD index 6ee5b1b90d5..7fd2f9c8cfb 100644 --- a/community/gnome-builder/APKBUILD +++ b/community/gnome-builder/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <newbyte@postmarketos.org> pkgname=gnome-builder -pkgver=46.0 -pkgrel=2 +pkgver=46.2 +pkgrel=0 pkgdesc="Develop software for GNOME" url="https://wiki.gnome.org/Apps/Builder" # limited by polkit -> flatpak @@ -72,5 +72,5 @@ package() { } sha512sums=" -50993e61193c86cc2d18a9c20c4ebb0bd1c41df8e15a1a82a86cde8f69e99cedebf440ee717b4ddae8e03cc69881c872804cb04ea361c4905eef16dbc03fec65 gnome-builder-46.0.tar.xz +2a8e6a876244fd584260fd4adf995ef5b450883577ad6305f375978b46a0fea28e5961050af61c505e558e3fbacbac686fc973bcbc7b7e865ba1e11d5549e7ca gnome-builder-46.2.tar.xz " diff --git a/community/gnome-calendar/APKBUILD b/community/gnome-calendar/APKBUILD index d576cac0331..1833b8a7288 100644 --- a/community/gnome-calendar/APKBUILD +++ b/community/gnome-calendar/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-calendar -pkgver=46.0 +pkgver=46.1 pkgrel=0 pkgdesc="Calendar application for GNOME" url="https://gitlab.gnome.org/GNOME/gnome-calendar" @@ -36,5 +36,5 @@ package() { } sha512sums=" -4ee6bde4077c460620609f22c5ac873bedeb0ef29a7907587a7810a264d42b756ec3d8459fa9853587aad0ea379f7e9c9c61856a23954bbced6501337c84a0c5 gnome-calendar-46.0.tar.xz +79e863d7bd1e31eab16b5da77cac956886be10ded99de97875e118641a8582c245cb30e9872fb7abde2f434e4b559f43e18a5ecf6d52cdce5d7de84f6f9e06b8 gnome-calendar-46.1.tar.xz " diff --git a/community/gnome-clocks/0001-invoke-waked-when-an-alarm-changes.patch b/community/gnome-clocks/0001-waked-support.patch index bfdb9af7a90..748c1793093 100644 --- a/community/gnome-clocks/0001-invoke-waked-when-an-alarm-changes.patch +++ b/community/gnome-clocks/0001-waked-support.patch @@ -1,120 +1,106 @@ -From a5f37373d2199f95ddc966b2426101bef62b4b93 Mon Sep 17 00:00:00 2001 -From: Robin Westermann <gitlab@seath.de> -Date: Sat, 27 Feb 2021 14:41:22 +0100 -Subject: [PATCH] invoke waked when an alarm changes +From bf30260ed3bf6fdf14fd25f3b760f7c60500571c Mon Sep 17 00:00:00 2001 +From: Egor Shestakov <ved@altlinux.org> +Date: Fri, 26 Apr 2024 20:33:24 +0700 +Subject: [PATCH] alarm: Waked support patch -When an alarm is deleted, created, edited or rearmed the service -waked is notified about the update. So waked can wake the system -from suspend when an alarm is fired. - -Fixes #100 - -Co-Authored-By: pcworld <0188801@gmail.com> +Add buildtime option that enables waked support. +Since many distibutions use waked for a long +time it could be upstreamed. This solution may +be considered as universal because it requires +only running the waked daemon and it is suitable +for both systems with or without systemd. --- build-aux/flatpak/org.gnome.clocks.json | 1 + - src/alarm-face.vala | 2 + - src/alarm-item.vala | 10 +++++ - src/alarm-setup-dialog.vala | 1 + - src/meson.build | 1 + + meson_options.txt | 4 +- + src/alarm-face.vala | 6 +++ + src/alarm-item.vala | 13 ++++++ + src/meson.build | 5 +++ src/waked-utils.vala | 53 +++++++++++++++++++++++++ - 6 files changed, 68 insertions(+) + 6 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 src/waked-utils.vala diff --git a/build-aux/flatpak/org.gnome.clocks.json b/build-aux/flatpak/org.gnome.clocks.json -index a58ffcb..b009378 100644 +index d0a5a730..04afb90b 100644 --- a/build-aux/flatpak/org.gnome.clocks.json +++ b/build-aux/flatpak/org.gnome.clocks.json -@@ -11,6 +11,7 @@ - "--socket=fallback-x11", +@@ -15,6 +15,7 @@ "--socket=wayland", "--socket=pulseaudio", -+ "--system-talk-name=de.seath.Waked", "--share=network", ++ "--system-talk-name=de.seath.Waked", "--env=G_MESSAGES_DEBUG=org.gnome.ClocksDevel" ], + "build-options": { +diff --git a/meson_options.txt b/meson_options.txt +index 12ff40dc..928e8a39 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -9,4 +9,6 @@ option( + description: 'The build profile for Clock. One of "default" or "development".' + ) + +-option('docs', type : 'boolean', value : false) +\ No newline at end of file ++option('docs', type : 'boolean', value : false) ++ ++option('waked', type : 'boolean', value : false) diff --git a/src/alarm-face.vala b/src/alarm-face.vala -index 58950d5..edcc796 100644 +index b7625350..5de1efb0 100644 --- a/src/alarm-face.vala +++ b/src/alarm-face.vala -@@ -73,6 +73,7 @@ public class Face : Adw.Bin, Clocks.Clock { - item.notify["active"].connect (save); +@@ -84,6 +84,9 @@ public class Face : Adw.Bin, Clocks.Clock { + }); row.remove_alarm.connect (() => { ++#if HAVE_WAKED + WakedUtils.remove_timer (((Item) item).id); ++#endif alarms.delete_item ((Item) item); - save (); - }); -@@ -129,6 +130,7 @@ public class Face : Adw.Bin, Clocks.Clock { - ((SetupDialog) dialog).apply_to_alarm (alarm); + if (ring_time_toast != null && item == ring_time_toast_alarm) { + ring_time_toast_alarm = null; +@@ -187,6 +190,9 @@ public class Face : Adw.Bin, Clocks.Clock { + alarm.active = true; save (); } else if (response == DELETE_ALARM) { ++#if HAVE_WAKED + WakedUtils.remove_timer (alarm.id); ++#endif alarms.delete_item (alarm); save (); } diff --git a/src/alarm-item.vala b/src/alarm-item.vala -index 263248b..ce7678d 100644 +index 27968f75..34e6b256 100644 --- a/src/alarm-item.vala +++ b/src/alarm-item.vala -@@ -20,6 +20,7 @@ - namespace Clocks { - namespace Alarm { - +@@ -87,6 +87,14 @@ private class Item : Object, ContentItem { + notify_property ("active"); + } + notify_property ("ring-time"); + - private struct AlarmTime { - public int hour; - public int minute; -@@ -98,6 +99,9 @@ private class Item : Object, ContentItem { - _active = value; - - reset (); -+ if (!active) { -+ WakedUtils.remove_timer (id); -+ } - if (!active && state == State.RINGING) { - stop (); - } -@@ -161,6 +165,10 @@ private class Item : Object, ContentItem { ++#if HAVE_WAKED ++ if (value == null) { ++ WakedUtils.remove_timer (id); ++ } else { ++ WakedUtils.update_timer (id, ring_time); ++ } ++#endif } - - alarm_time = dt; -+ -+ if (active) { -+ WakedUtils.update_timer (id, alarm_time); -+ } - } - - private void update_snooze_time (GLib.DateTime start_time) { -@@ -183,6 +191,7 @@ private class Item : Object, ContentItem { - public void snooze () { - bell.stop (); - state = State.SNOOZING; -+ WakedUtils.update_timer (id, snooze_time); } - public void stop () { -@@ -232,6 +241,7 @@ private class Item : Object, ContentItem { - update_alarm_time (); // reschedule for the next repeat - } - -+ - return state != last_state; +@@ -186,6 +194,11 @@ private class Item : Object, ContentItem { + var guid = id != null ? (string) id : GLib.DBus.generate_guid (); + Object (id: guid); } ++ ~Item () { ++#if HAVE_WAKED ++ WakedUtils.remove_timer (id); ++#endif ++ } -diff --git a/src/alarm-setup-dialog.vala b/src/alarm-setup-dialog.vala -index 5d122cd..b6f66e9 100644 ---- a/src/alarm-setup-dialog.vala -+++ b/src/alarm-setup-dialog.vala -@@ -264,6 +264,7 @@ private class SetupDialog : Gtk.Dialog { - - private void avoid_duplicate_alarm () { - var alarm = new Item (); -+ alarm.editing = true; - apply_to_alarm (alarm); - - var duplicate = alarm.check_duplicate_alarm (other_alarms); + private void setup_bell () { + bell = new Utils.Bell (GLib.File.new_for_uri ("resource://org/gnome/clocks/sounds/alarm-clock-elapsed.oga")); diff --git a/src/meson.build b/src/meson.build -index dfc7d34..ab9de1c 100644 +index 344781c8..9f42855c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -24,6 +24,7 @@ clocks_vala_sources = files( @@ -125,9 +111,20 @@ index dfc7d34..ab9de1c 100644 'widgets.vala', 'window.vala', 'world-face.vala', +@@ -47,6 +48,10 @@ clocks_sources = [ + resources + ] + ++if get_option('waked') ++ add_project_arguments('-D', 'HAVE_WAKED', language: 'vala') ++endif ++ + clocks_vala_args = [ + '--target-glib', '2.72', + '--vapidir', meson.current_source_dir(), diff --git a/src/waked-utils.vala b/src/waked-utils.vala new file mode 100644 -index 0000000..9b8fa4a +index 00000000..9b8fa4ad --- /dev/null +++ b/src/waked-utils.vala @@ -0,0 +1,53 @@ @@ -185,5 +182,5 @@ index 0000000..9b8fa4a +} +} -- -2.37.2 +GitLab diff --git a/community/gnome-clocks/APKBUILD b/community/gnome-clocks/APKBUILD index 0e3d7db0a9c..09907d8694c 100644 --- a/community/gnome-clocks/APKBUILD +++ b/community/gnome-clocks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-clocks -pkgver=45.0 +pkgver=46.0 pkgrel=0 pkgdesc="Clock application designed for GNOME 3" url="https://wiki.gnome.org/Apps/Clocks" @@ -26,7 +26,7 @@ makedepends=" checkdepends="appstream-glib" subpackages="$pkgname-lang $pkgname-doc" source="https://download.gnome.org/sources/gnome-clocks/${pkgver%.*}/gnome-clocks-$pkgver.tar.xz - 0001-invoke-waked-when-an-alarm-changes.patch + 0001-waked-support.patch 0002-Add-argument-to-start-initial-instance-in-the-backgr.patch gnome-clocks.desktop " @@ -48,8 +48,8 @@ package() { } sha512sums=" -c030947bbba03ed3815a2ed62356a8aa54ec130bf8a7fe17e028af3b27fa8c6f02d365267e466867fea6e4daa36907193e0fb07c04ce0c390f20e01d4a6e716f gnome-clocks-45.0.tar.xz -22404c6fffc79adda9fb35dbfe1308ff9b32afbdac0d1078d6e52376ca0e1cf63a8b00acf19aa7a5340039af35b87222892971d8bb3bb1d2ea070c2fc4ea1c5f 0001-invoke-waked-when-an-alarm-changes.patch +37e91c6355d21be94386f5ad7266998c87f138ab5d4274d5caf08a9941499944d8c3ee2d44fb6654a227cb48665ad9ee2ed0f919cb03a1122d7c1ed935cfc353 gnome-clocks-46.0.tar.xz +3d15cbb38c749fc9d2731043346f450f7829244704157a02f5c0fb7131a9aaf90b57fab5a35dba0023bc1b774d2cb109629cb7c3fef25fe554a94162178bb4a9 0001-waked-support.patch ffb93c5e5ff4f888c3e1308142af332f15293b84018b262398f7a41216bc1b91eb1c02bd551db079b4e35cca184c70462d8fa900a94f3afeadb033ff41046b55 0002-Add-argument-to-start-initial-instance-in-the-backgr.patch 49126e7428054e87d861468aa714637f2034b620f34aba6b898c7c187524ee5057596bbcebec9bdec471336e8df1edbf48c2ef594898d0e6c559b1f19af39510 gnome-clocks.desktop " diff --git a/community/gnome-control-center/APKBUILD b/community/gnome-control-center/APKBUILD index eb4b6f67c0e..dc761a5abc9 100644 --- a/community/gnome-control-center/APKBUILD +++ b/community/gnome-control-center/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Pablo Correa Gomez <ablocorrea@hotmail.com> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-control-center -pkgver=46.0 -pkgrel=0 +pkgver=46.1 +pkgrel=1 pkgdesc="GNOME control center" url="https://gitlab.gnome.org/GNOME/gnome-control-center" arch="all !s390x" # no gnome-bluetooth-dev @@ -65,6 +65,7 @@ build() { abuild-meson \ -Db_lto=true \ -Dibus=true \ + -Dlocation-services=enabled \ . output meson compile -C output @@ -85,6 +86,6 @@ package() { } sha512sums=" -681d1c7744af4a6a55f400b098c4622de5bc8ecec9ae591c289203b30b275f518193436d27df79e23b9e7883f811c4231d0896dbeab50f52d074bafd960f7b1e gnome-control-center-46.0.tar.xz +feafc375b3ae52688a40c5b4c665f93ed6391bc36b673e6faeb622f97c57f202a057ff0f10614502cb60336dccb1d3c52a63e303171e2dcb0f3841818c31ed18 gnome-control-center-46.1.tar.xz 350aa443149c71851ad4de0976c7fc5cb626ba0c57a8d41e6ef80da1c65ed84a4dfa2483ae92630a3b611c4bfa9360ded82b55e8cd0e3907294c025e4f6b1671 README.alpine " diff --git a/community/gnome-firmware/APKBUILD b/community/gnome-firmware/APKBUILD index 27050c1133e..bc57f4b03ae 100644 --- a/community/gnome-firmware/APKBUILD +++ b/community/gnome-firmware/APKBUILD @@ -5,7 +5,7 @@ pkgver=46.0 pkgrel=0 pkgdesc="Install firmware on devices" url="https://gitlab.gnome.org/World/gnome-firmware" -arch="all !armhf !ppc64le !s390x !riscv64" # limited by fwupd +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" # limited by fwupd license="GPL-2.0-only" makedepends=" elogind-dev diff --git a/community/gnome-keyring/APKBUILD b/community/gnome-keyring/APKBUILD index 5926674d36e..2e5c0cc8e65 100644 --- a/community/gnome-keyring/APKBUILD +++ b/community/gnome-keyring/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-keyring pkgver=46.1 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME keyring" url="https://wiki.gnome.org//Projects/GnomeKeyring" arch="all" diff --git a/community/gnome-maps/APKBUILD b/community/gnome-maps/APKBUILD index 77a11f680fe..10670cbf8ce 100644 --- a/community/gnome-maps/APKBUILD +++ b/community/gnome-maps/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-maps -pkgver=46.0 +pkgver=46.10 pkgrel=0 pkgdesc="simple map client" url="https://wiki.gnome.org/Apps/Maps" @@ -54,5 +54,5 @@ package() { } sha512sums=" -79dc2233b9b62ee6167f1938c30eafe2d5c7c44bdf4a7ec492c33dfb76f7791360ffcdee8d5781b01b4cd80d7975d263bebf4ca7d5b6958172d72b01cc331788 gnome-maps-46.0.tar.xz +14e20c9d644308d4847616f0390b7460001d472395a18be08745074fcc01752eab39b5588403ba4cd648c2d72a1c45a6e24ff578519527f9021fbd7632cc1fcb gnome-maps-46.10.tar.xz " diff --git a/community/gnome-online-accounts/APKBUILD b/community/gnome-online-accounts/APKBUILD index 8eac61416d0..11623dce9b2 100644 --- a/community/gnome-online-accounts/APKBUILD +++ b/community/gnome-online-accounts/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: team/gnome <ncopa@alpinelinux.org> pkgname=gnome-online-accounts -pkgver=3.50.0 -pkgrel=0 +pkgver=3.50.1 +pkgrel=1 pkgdesc="Single sign-on framework for GNOME" url="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" arch="all" @@ -52,5 +52,5 @@ dev() { } sha512sums=" -8492f2a517b56b7aeabc4867d48801a25d54881bb36f1c81f3bd430fdcd34f4a49fd69af3216b9a7ee94ce6a2aca779bd8192c2d8a2930d1808540eccdfb953b gnome-online-accounts-3.50.0.tar.xz +02865985439cc3df97f51960799b45ad7e6331dd8c82885da77b25296a0c6565a166a49f43eecbde5de2b008685eaba3ea23fd2c195a9e44fc11237c5d39a2c0 gnome-online-accounts-3.50.1.tar.xz " diff --git a/community/gnome-podcasts/APKBUILD b/community/gnome-podcasts/APKBUILD index 35905e394cb..70f8f98632e 100644 --- a/community/gnome-podcasts/APKBUILD +++ b/community/gnome-podcasts/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnome-podcasts -pkgver=0.6.1 -pkgrel=1 +pkgver=0.7.1 +pkgrel=0 pkgdesc="Podcast app for GNOME" url="https://wiki.gnome.org/Apps/Podcasts" # armv7 blocked by failing test @@ -29,14 +29,13 @@ checkdepends=" " options="!check" # needs the thing to be installed first subpackages="$pkgname-lang" -source="https://gitlab.gnome.org/World/podcasts/uploads/7f5cb601b1eea22cc473077e8c0dcfad/gnome-podcasts-$pkgver.tar.xz - " - +source="https://gitlab.gnome.org/World/podcasts/-/archive/$pkgver/podcasts-$pkgver.tar.gz" +builddir="$srcdir/podcasts-$pkgver" prepare() { default_prepare - sed 's| /usr/bin/sh|/bin/sh|' -i scripts/test.sh + sed 's| /bin/bash|/bin/sh|' -i scripts/test.sh } build() { @@ -53,5 +52,5 @@ package() { } sha512sums=" -59342a02314ed8062138c61c4d762756169307460d425c2f16110fcbfb3ea2dd33386ec968d7982f324c239180f515fc524ffd49f9d41e2b13691aa15134a737 gnome-podcasts-0.6.1.tar.xz +93fcc7b26675ddc19d753c97fc7b34f8438072611abbb5686984a03a7498e51124e09c81988a7a2ad0bf06da9585866eb01705576f0663fb203522fd1276f959 podcasts-0.7.1.tar.gz " diff --git a/community/gnome-remote-desktop/APKBUILD b/community/gnome-remote-desktop/APKBUILD index 38d566e6fd8..e5d9605aba9 100644 --- a/community/gnome-remote-desktop/APKBUILD +++ b/community/gnome-remote-desktop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-remote-desktop pkgver=45.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Remote Desktop - remote desktop server" url="https://gitlab.gnome.org/GNOME/gnome-remote-desktop" arch="all !s390x" # blocked by pipewire @@ -29,6 +29,10 @@ makedepends=" meson pipewire-dev tpm2-tss-dev + tpm2-tss-esys + tpm2-tss-mu + tpm2-tss-rc + tpm2-tss-tctildr " checkdepends=" adwaita-icon-theme diff --git a/community/gnome-session/APKBUILD b/community/gnome-session/APKBUILD index 58446162a3e..07f45f63f30 100644 --- a/community/gnome-session/APKBUILD +++ b/community/gnome-session/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-session -pkgver=45.0 -pkgrel=2 +pkgver=46.0 +pkgrel=0 pkgdesc="GNOME session manager" url="https://gitlab.gnome.org/GNOME/gnome-session" arch="all" @@ -37,8 +37,6 @@ source="https://download.gnome.org/sources/gnome-session/${pkgver%%.*}/gnome-ses build() { abuild-meson \ -Db_lto=true \ - -Dsystemd_journal=true \ - -Dsystemd_session=disable \ -Dsystemduserunitdir=/DELETEME \ . output meson compile -C output @@ -53,6 +51,6 @@ package() { rm -rf "$pkgdir"/DELETEME } sha512sums=" -3eb3b4b9fcab2ec35bb61bac6257b254f142167250bbc1eb71d46aed350372f8942601c9d5ca5856e8686b53b70321f914cb55f1639daecfe6c61d84cb6d8aba gnome-session-45.0.tar.xz +2187b8ae4ac4ec728283c5dc03edba6472864a704f6c6cd7a3e962515a3925d3a8438f7f89855dd082d2c013868da81e16da280c70b0e07537c8e431301b4bd8 gnome-session-46.0.tar.xz b606c906d2d1b8d34cff2c5a3653ef14c0897a49cecc74c604fddd7d95c4bb181f1027c2fc259d4e3df99278e5f66cd2cc088efbc5f9925d24eb73a7805b144b gnome-session-bash-login.patch " diff --git a/community/gnome-shell-extensions/APKBUILD b/community/gnome-shell-extensions/APKBUILD index 4def00d7b2c..4bb3d00c564 100644 --- a/community/gnome-shell-extensions/APKBUILD +++ b/community/gnome-shell-extensions/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-shell-extensions -pkgver=46.0 +pkgver=46.1 pkgrel=0 pkgdesc="collection of extensions for GNOME Shell" url="https://apps.gnome.org/Extensions" @@ -33,5 +33,5 @@ package() { } sha512sums=" -1188495684a45919fd191dd866d61dba29ae453d2cfa7ea36e283150e3e2aa45fc5be7407a6858dc592575cd679eaae214b6144912a2453e278d20ecf3c737a3 gnome-shell-extensions-46.0.tar.xz +0eaa314a57679a45ceb205ba728856143b563b97a03e20455d7ffff54e3db24e53b5ce349e18ee4720dcdd79e13f5e7659624f3d23d06e249cb6213c960b281d gnome-shell-extensions-46.1.tar.xz " diff --git a/community/gnome-shell/APKBUILD b/community/gnome-shell/APKBUILD index a7e838d25ad..96944d5b091 100644 --- a/community/gnome-shell/APKBUILD +++ b/community/gnome-shell/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-shell -pkgver=46.0 -pkgrel=1 +pkgver=46.1 +pkgrel=0 pkgdesc="GNOME shell" url="https://gitlab.gnome.org/GNOME/gnome-shell" # gjs -> mozjs @@ -118,6 +118,6 @@ schemas() { } sha512sums=" -e07d44ff7a3d2570834f814555ada706958055a1358825207f5168c26b402fd4912672d05c7902b788bb76bf4e2ef729ae0eb55d44dd3807f46094a04a8b12d3 gnome-shell-46.0.tar.xz +2700b4187e5f6cc52d8a04704fb68aa7847bc70d5200819c4462729d2d15fd8b4f1fe67bfc83e643b8edf247511e40cf20a6561ff5a901c998a95d935ce4217c gnome-shell-46.1.tar.xz ae4ac679bacd35948b44068e5a70407f473bd96986ee126abb1bdf066db5cbc2087a3ffae0b390286689cacbe8325870fd43663ba39f4f7543216e02bf083934 gsh.patch " diff --git a/community/gnome-sudoku/APKBUILD b/community/gnome-sudoku/APKBUILD index aaa8c98d345..476a6348015 100644 --- a/community/gnome-sudoku/APKBUILD +++ b/community/gnome-sudoku/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Erwan Rouchet <lucidiot@brainshit.fr> # Maintainer: Erwan Rouchet <lucidiot@brainshit.fr> pkgname=gnome-sudoku -pkgver=46.0 +pkgver=46.1 pkgrel=0 arch="all" url="https://wiki.gnome.org/Apps/Sudoku" @@ -23,6 +23,7 @@ check() { package() { DESTDIR="$pkgdir" meson install -C build } + sha512sums=" -2b42d29ceff9a8d2abd953423bbae1d9f19032dc7e025e55f919099845f147e731f4128f7a2f1462f9f8da97af74cdbc52beddaf930803f712352c63c50dd440 gnome-sudoku-46.0.tar.xz +58d2f19e23dd7a020d997022b2ccd39c690e88a22adb01933b363b87418704ea2fb99171651135b3805854c43c7d447dc2233248d26e1177e45942343be147ef gnome-sudoku-46.1.tar.xz " diff --git a/community/gnome-system-monitor/APKBUILD b/community/gnome-system-monitor/APKBUILD index ebfed04c2ef..ffb9d529a82 100644 --- a/community/gnome-system-monitor/APKBUILD +++ b/community/gnome-system-monitor/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-system-monitor pkgver=46.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME system monitor" url="https://www.gnome.org/" arch="all" diff --git a/community/gnome-user-docs/APKBUILD b/community/gnome-user-docs/APKBUILD index 887f6d18731..4481176595a 100644 --- a/community/gnome-user-docs/APKBUILD +++ b/community/gnome-user-docs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-user-docs -pkgver=46.0 +pkgver=46.1 pkgrel=0 pkgdesc="GNOME User Documentation" url="https://gitlab.gnome.org/GNOME/gnome-user-docs" @@ -27,5 +27,5 @@ package() { } sha512sums=" -67f15ceb611f8efb2783ae7a830aac406e41d6b464d09242b4c9c8ff9f55f9a583019e6d18f25b08f32fe6b29822626191b9cf2d4676bd037bfc5be2624ab223 gnome-user-docs-46.0.tar.xz +2520714e46e93ae834a6f1b1ca910f61a56b7b9361af2b16883fe78db441b7fbd616e359b99cbcf300576501cf9c6500578c8fc1040261f02349cdd67c2ceabb gnome-user-docs-46.1.tar.xz " diff --git a/community/gnome/APKBUILD b/community/gnome/APKBUILD index c63ef5bc7dd..4736055d8ae 100644 --- a/community/gnome/APKBUILD +++ b/community/gnome/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/gnome <newbyte@postmarketos.org> pkgname=gnome pkgver=46.0 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME Base - meta package" url="https://www.gnome.org/" arch="all !armhf !s390x" # GNOME isn't available on all arches yet @@ -11,6 +11,7 @@ license="GPL-3.0-or-later" depends=" bolt dbus-x11 + gcr-ssh-agent gdm gnome-backgrounds gnome-browser-connector diff --git a/community/gnote/APKBUILD b/community/gnote/APKBUILD index 71e911e9f76..171e0642dd6 100644 --- a/community/gnote/APKBUILD +++ b/community/gnote/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnote pkgver=46.0 -pkgrel=1 +pkgrel=2 pkgdesc="Gnote is a port of Tomboy to C++" url="https://wiki.gnome.org/Apps/Gnote" arch="all" diff --git a/community/gnunet-gtk/APKBUILD b/community/gnunet-gtk/APKBUILD index 2c28e7d9d52..27655d92af4 100644 --- a/community/gnunet-gtk/APKBUILD +++ b/community/gnunet-gtk/APKBUILD @@ -5,8 +5,8 @@ pkgver=0.21.0 pkgrel=0 pkgdesc="Graphical user interface for GNUnet" url="https://gnunet.org" -# s390x, riscv64, and ppc64le blocked by luatek -> texlive -> gnunet -arch="all !s390x !ppc64le !riscv64" +# s390x, riscv64, loongarch64 and ppc64le blocked by luatek -> texlive -> gnunet +arch="all !s390x !ppc64le !riscv64 !loongarch64" license="GPL-3.0-only" makedepends="gnunet-dev gtk+3.0-dev glade-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" diff --git a/community/gnunet/APKBUILD b/community/gnunet/APKBUILD index b423ca71b00..45a78ffa0c8 100644 --- a/community/gnunet/APKBUILD +++ b/community/gnunet/APKBUILD @@ -6,8 +6,8 @@ pkgver=0.21.1 pkgrel=0 pkgdesc="A framework for secure and privacy enhancing peer-to-peer networking" url="https://gnunet.org" -# ppc64le, s390x, and riscv64 blocked by luatex -> texlive -arch="all !s390x !ppc64le !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by luatex -> texlive +arch="all !s390x !ppc64le !riscv64 !loongarch64" license="AGPL-3.0-only" depends="gnutls-utils bash which iptables coreutils runit" depends_dev="libgpg-error-dev libgcrypt-dev nettle-dev unbound-dev gnutls-dev diff --git a/community/gnuradio/APKBUILD b/community/gnuradio/APKBUILD index fe38cf90d76..47fc59b1836 100644 --- a/community/gnuradio/APKBUILD +++ b/community/gnuradio/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=gnuradio pkgver=3.10.9.2 -pkgrel=4 +pkgrel=7 pkgdesc="General purpose DSP and SDR toolkit" url="https://www.gnuradio.org" # libvolk only supports armv7, aarch64, x86_64. diff --git a/community/go-sendxmpp/APKBUILD b/community/go-sendxmpp/APKBUILD index 17b67dc9703..4a31de36454 100644 --- a/community/go-sendxmpp/APKBUILD +++ b/community/go-sendxmpp/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Anjandev Momi <anjan@momi.ca> # Maintainer: Anjandev Momi <anjan@momi.ca> pkgname=go-sendxmpp -pkgver=0.8.2 -pkgrel=2 +pkgver=0.10.0 +pkgrel=0 pkgdesc="Tool to send messages to an XMPP contact or MUC" url="https://salsa.debian.org/mdosch/go-sendxmpp" arch="all" @@ -28,5 +28,5 @@ package() { } sha512sums=" -4a8450b58c98dfae9cdd57e19f36e65403b5131ab634b152e2a4fc841dae26a01e32d7cd9a3551340f1535e8838a769e9f5dbbc47c25e1e65c918e1eaec08b32 go-sendxmpp-v0.8.2.tar.gz +0844a3be4a07fb684975af7bd0f4de0df30a19798fd7d1e5ecbbe51e5eb67da4a632e1fd741400cfd47907622cc29a0e89791b0caef8061ac3ba8380f3533182 go-sendxmpp-v0.10.0.tar.gz " diff --git a/community/go-task/APKBUILD b/community/go-task/APKBUILD index 6ae9605aa02..74305ceeb51 100644 --- a/community/go-task/APKBUILD +++ b/community/go-task/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=go-task -pkgver=3.36.0 +pkgver=3.37.2 pkgrel=0 pkgdesc="Task runner written in Go, installed as go-task" url="https://taskfile.dev/" @@ -56,6 +56,6 @@ task() { } sha512sums=" -7ab561cb3b5d26d6eda494d37f49d997eef6ac2fb1c8ff6aaa8540495e45640201bd2473bd52a0146283b34f2a9d6a199e8d97ddf6b1786d46566bb6f950879c go-task-3.36.0.tar.gz -47b0d4270046bfba1871d37af4ebb6e38d2b1c7486085f2baeb7d3a8ee8b19f27f6366d436a41ed13215280e1e39bb8f8ac40d8ac7a6636fb20cd8c4d54ad187 completion-rename-to-go-task.patch +5cee01efd12215afafd2c0e30b67a7554648e69ddcc6d8a0477e825a65d084785969d6cc83afdf90975f9e7e7d6797777d3a919da7c092da0ddb4b7641122ef1 go-task-3.37.2.tar.gz +6b0be68bc8ab4e5761f09d5928cdc7f85228c5b6f59e6fdccd29dcfbca096a82387f568931f2dc023ce8f2127ac1797b8f02364399a6768b482d45e0794bada1 completion-rename-to-go-task.patch " diff --git a/community/go-task/completion-rename-to-go-task.patch b/community/go-task/completion-rename-to-go-task.patch index 13337b87346..54812669103 100644 --- a/community/go-task/completion-rename-to-go-task.patch +++ b/community/go-task/completion-rename-to-go-task.patch @@ -1,11 +1,15 @@ +diff --git a/completion/bash/task.bash b/completion/bash/task.bash +index de93e4c..2151df9 100644 --- a/completion/bash/task.bash +++ b/completion/bash/task.bash -@@ -52,4 +52,4 @@ +@@ -52,4 +52,4 @@ function _task() __ltrim_colon_completions "$cur" } -complete -F _task task +complete -F _task go-task +diff --git a/completion/fish/task.fish b/completion/fish/task.fish +index ee2d0a5..303de4a 100644 --- a/completion/fish/task.fish +++ b/completion/fish/task.fish @@ -1,4 +1,4 @@ @@ -14,14 +18,16 @@ function __task_get_tasks --description "Prints all available tasks with their description" # Read the list of tasks (and potential errors) +diff --git a/completion/zsh/_task b/completion/zsh/_task +index 56f2736..442a581 100755 --- a/completion/zsh/_task +++ b/completion/zsh/_task -@@ -11,7 +11,7 @@ +@@ -11,7 +11,7 @@ function __task_list() { local -i enabled=0 local taskfile item task desc - cmd=(task) + cmd=(go-task) - taskfile="${(v)opt_args[(i)-t|--taskfile]}" + taskfile=${(Qv)opt_args[(i)-t|--taskfile]} + taskfile=${taskfile//\~/$HOME} - if [[ -n "$taskfile" && -f "$taskfile" ]]; then diff --git a/community/go2rtc/APKBUILD b/community/go2rtc/APKBUILD index 15392e4d1cb..ef5df3db2d6 100644 --- a/community/go2rtc/APKBUILD +++ b/community/go2rtc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Magnus Sandin <magnus.sandin@gmail.com> # Maintainer: Magnus Sandin <magnus.sandin@gmail.com> pkgname=go2rtc -pkgver=1.8.5 -pkgrel=3 +pkgver=1.9.1 +pkgrel=0 pkgdesc="Ultimate camera streaming application" url="https://github.com/AlexxIT/go2rtc" arch="all" @@ -36,7 +36,7 @@ package() { } sha512sums=" -bd6292d3ce2e06271bc21456ed38904de90bd9be6822e3e1fe659aa3e152ec1862506d3f6e963422ff87a1bd331b2e32ab0d8644e44032c68818cedb90471796 go2rtc-1.8.5.tar.gz +9d8dbd12eb1a5575d2e6bd3fc4729d5847e9cf49365da5fae6c5b2b97b0d429cb5165614f30735ae8b5c9c34bcc30a583de897902b6535a04e1b9ef19fa6c264 go2rtc-1.9.1.tar.gz b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706 go2rtc.confd bdbc15a16426455ff3bec1e9dbdbcb63f932bd85d634be96e7d46bddd55c63e8636303f39d5a069c62305d76b58d496cca7404f58913a1053553e1a675459733 go2rtc.initd 9fac59cdeb6f48c07fe6169e68e208c648b56cbe9841f0e6896908c55d494a2313f34f2f6902f1f21d33ebb030295d01098601245b5b7f61a4429c1d72678483 go2rtc.logrotate diff --git a/community/goimapnotify/APKBUILD b/community/goimapnotify/APKBUILD index 9534468c8be..f09ef0fa694 100644 --- a/community/goimapnotify/APKBUILD +++ b/community/goimapnotify/APKBUILD @@ -16,6 +16,13 @@ export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" +prepare() { + default_prepare + go get -u golang.org/x/sys@v0.6.0 + go get -u golang.org/x/net@v0.6.0 + go mod tidy +} + build() { export CGO_CPPFLAGS="$CPPFLAGS" export CGO_CFLAGS="$CFLAGS" @@ -23,11 +30,6 @@ build() { export CGO_LDFLAGS="$LDFLAGS" export GOFLAGS="$GOFLAGS -trimpath -mod=readonly -modcacherw" - # Fix build on riscv64 - go mod edit -replace \ - golang.org/x/sys=golang.org/x/sys@v0.0.0-20210630005230-0f9fa26af87c - go mod download golang.org/x/sys - go build -ldflags "-linkmode=external \"-extldflags=$LDFLAGS\"" } diff --git a/community/golangci-lint/APKBUILD b/community/golangci-lint/APKBUILD index 88dba6a29e0..9cc8d995b67 100644 --- a/community/golangci-lint/APKBUILD +++ b/community/golangci-lint/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=golangci-lint -pkgver=1.56.2 -pkgrel=2 +pkgver=1.57.2 +pkgrel=0 pkgdesc="Fast linters runner for Go" url="https://golangci-lint.run/" arch="all" license="GPL-3.0-or-later" makedepends="go" +options="net" subpackages=" $pkgname-bash-completion $pkgname-zsh-completion @@ -14,6 +15,9 @@ subpackages=" " source="$pkgname-$pkgver.tar.gz::https://github.com/golangci/golangci-lint/archive/refs/tags/v$pkgver.tar.gz" +# multiple linter tests timeout +[ "$CARCH" = "riscv64" ] && options="$options !check" + export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" @@ -51,5 +55,5 @@ package() { } sha512sums=" -ab768d58f0888cbda2728c90ac9063f4f15b4fd0e13eefc23a0af4994801860ce9ed9585903678f0e917381f56d8db3941af59c32b287b5e0e58177bff29f4d1 golangci-lint-1.56.2.tar.gz +dafac93157543740fbc3b647de05344444488c7ae0fee906709013f3821849ebe4eaf0fbf40dfe4e7c1cddd246b11507009abf4386d6c81b2b9d60f560a9053f golangci-lint-1.57.2.tar.gz " diff --git a/community/google-cloud-cpp/APKBUILD b/community/google-cloud-cpp/APKBUILD index 432a70b1db0..3bf274a39dd 100644 --- a/community/google-cloud-cpp/APKBUILD +++ b/community/google-cloud-cpp/APKBUILD @@ -3,7 +3,7 @@ pkgname=google-cloud-cpp pkgver=2.18.0 _googleapis_commit_sha=4a94b9e4403f958f65077f43863302c4ba4597da -pkgrel=0 +pkgrel=1 pkgdesc="C++ Client Libraries for Google Cloud Services" url="https://cloud.google.com/sdk" arch="all" diff --git a/community/got/APKBUILD b/community/got/APKBUILD index cd551cbb744..7bdc30ca251 100644 --- a/community/got/APKBUILD +++ b/community/got/APKBUILD @@ -2,13 +2,20 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=got _pkgname=got-portable -pkgver=0.97 +pkgver=0.99 pkgrel=0 pkgdesc="A VCS which prioritizes ease of use and simplicity over flexibility" url="https://gameoftrees.org/" arch="all" license="ISC" -makedepends="libbsd-dev libevent-dev util-linux-dev zlib-dev ncurses-dev" +makedepends=" + libbsd-dev + libevent-dev + libretls-dev + ncurses-dev + util-linux-dev + zlib-dev + " options="!check" subpackages="$pkgname-doc" source="https://gameoftrees.org/releases/portable/got-portable-$pkgver.tar.gz" @@ -29,5 +36,5 @@ package() { } sha512sums=" -7d1b47b9dfbde7bce60fd7448e1cd81d19c0d576238642f17bb735a6183a31a590d573cbe329e7ab4b67f29ead1b62a67c173d7e57a0282d89f9cac70f60bdd0 got-portable-0.97.tar.gz +59504e9d0fe507f255a51aa0e565f69b190d7e94147c0848066919a932f44ff0724d841ba872c3ad34383e65adc1bffd30927a13add9314975bb613d2aa6b5f1 got-portable-0.99.tar.gz " diff --git a/community/gotosocial/APKBUILD b/community/gotosocial/APKBUILD index 9d803adec37..0e935636a09 100644 --- a/community/gotosocial/APKBUILD +++ b/community/gotosocial/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Alex McGrath <amk@amk.ie> pkgname=gotosocial pkgver=0.15.0 -pkgrel=0 +pkgrel=1 pkgdesc="An ActivityPub social network server" url="https://github.com/superseriousbusiness/gotosocial" arch="all" @@ -61,6 +61,6 @@ package() { sha512sums=" de1f17892b3eeb62751ab61a782f74728fc36d80eb9ec27bec7ebdd3317a586850dc78d0be9862d561e9da07b1228ca57223af0f5caaf6ad811e10e0677f3f6a gotosocial-0.15.0-source-code.tar.gz -231908db00d0975ed10518a96760f401f90cdbb8475189446a8a7a95b889784ab4ee1d082010f379cb0b7994401dbed4a574b2fe9a316c2efdf4427202c971ee gotosocial.initd +b84bbd5e00d886d018311898a3e212c9d800c1688a5bd27f159e08a224a3c774513236f67288a7d77f22c4b55b75322972909b545d243f033812ab757ec2fd4b gotosocial.initd e1030586395c7bcca2bf348f764bb51de75e503a29c163e95f155b2192e213db61376f0b15e957813be917ba7f5d28abc8c4e944971ea6db64088424add97874 10-config.patch " diff --git a/community/gotosocial/gotosocial.initd b/community/gotosocial/gotosocial.initd index d67faa5dbad..32a9769cba4 100644 --- a/community/gotosocial/gotosocial.initd +++ b/community/gotosocial/gotosocial.initd @@ -6,6 +6,8 @@ command_args="server start --config-path=/etc/gotosocial/gotosocial.yml" command_background=true pidfile="/run/${RC_SVCNAME}.pid" error_log="/var/log/gotosocial.log" +output_log="/var/log/gotosocial.log" + command_user="gotosocial:gotosocial" start_pre() { diff --git a/community/gource/APKBUILD b/community/gource/APKBUILD index 6d25e1912bb..36254527e36 100644 --- a/community/gource/APKBUILD +++ b/community/gource/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=gource pkgver=0.54 -pkgrel=1 +pkgrel=2 pkgdesc="Software version control visualization" url="https://gource.io/" arch="all !s390x" diff --git a/community/govc/APKBUILD b/community/govc/APKBUILD index 4441d44d6aa..25565e8e19e 100644 --- a/community/govc/APKBUILD +++ b/community/govc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=govc -pkgver=0.36.3 -pkgrel=1 +pkgver=0.37.1 +pkgrel=0 pkgdesc="vSphere CLI built on top of govmomi" url="https://github.com/vmware/govmomi/blob/main/govc/README.md" arch="all" @@ -27,5 +27,5 @@ package() { } sha512sums=" -742c37be81fde603e78d862c2401d6be8efaaaa8929193379ad13651f9ba0b0792571742a2c4bed28d19af9056f3e45c67ad22cc6913c823ee78e807afd874e2 govc-0.36.3.tar.gz +b191c043a596ba8a0528c3f1761736d8ed50a4129e37db58dd16ecbfa1f78f175168ed273e920c1d74377244687a6d10feb7a10683b2f516899156febef9e11c govc-0.37.1.tar.gz " diff --git a/community/gparted/APKBUILD b/community/gparted/APKBUILD index 3088e12650e..d3608a134ce 100644 --- a/community/gparted/APKBUILD +++ b/community/gparted/APKBUILD @@ -19,6 +19,11 @@ makedepends=" subpackages="$pkgname-doc $pkgname-lang" source="https://downloads.sourceforge.net/project/gparted/gparted/gparted-$pkgver/gparted-$pkgver.tar.gz" +prepare(){ + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/gpaste/APKBUILD b/community/gpaste/APKBUILD index 0f5b193fda3..bce21bdae74 100644 --- a/community/gpaste/APKBUILD +++ b/community/gpaste/APKBUILD @@ -29,7 +29,7 @@ subpackages=" $pkgname-zsh-completion:zshcomp " source="gpaste-$pkgver.tar.gz::https://github.com/Keruspe/GPaste/archive/v$pkgver.tar.gz - mutter-clutter-13.patch + mutter-clutter-14.patch " builddir="$srcdir/GPaste-$pkgver" @@ -61,5 +61,5 @@ _gnome() { sha512sums=" 50cf65b1f89415d6bef8e2c7bcde5d775b2b3c05e9e296df23a2913efd13fa678adb543393d536ee9e7682dc604498f943babc840d821a6c8fbebbdcc6c2d39a gpaste-44.1.tar.gz -fb1406a2794500a48250311ad8a2ceb9ff54c10949c6b1f52cc043ba424142ec280fb01ffc6fda7ef503d69e2825d9a816babcdd19aa3ef2f3fe5bd2063f7b1c mutter-clutter-13.patch +1042e122febb75ef65c4d6ad97b5c0640f43ac97a9a827e0cd224c8639495598f6487e3c7d73b1d363503fae8bd20e8b0f508f98f50e0380f082ee81f0adfd0f mutter-clutter-14.patch " diff --git a/community/gpaste/mutter-clutter-13.patch b/community/gpaste/mutter-clutter-14.patch index 160dfafd33e..264c92fde8a 100644 --- a/community/gpaste/mutter-clutter-13.patch +++ b/community/gpaste/mutter-clutter-14.patch @@ -5,7 +5,7 @@ if get_option('gnome-shell') gjs_dep = dependency('gjs-1.0', version: gjs_req) - mutter_clutter_dep = dependency('mutter-clutter-12') -+ mutter_clutter_dep = dependency('mutter-clutter-13') ++ mutter_clutter_dep = dependency('mutter-clutter-14') pango_dep = dependency('pango') endif diff --git a/community/gpick/APKBUILD b/community/gpick/APKBUILD index 8a22dbc11c4..fdc9c8cb4ce 100644 --- a/community/gpick/APKBUILD +++ b/community/gpick/APKBUILD @@ -1,14 +1,14 @@ # Contributor: knuxify <knuxify@gmail.com> -# Maintainer: knuxify <knuxify@gmail.com> +# Maintainer: pkgname=gpick pkgver=0.3 -pkgrel=5 +pkgrel=6 pkgdesc="Advanced color picker written in C++ using GTK+ toolkit" url="http://gpick.org" arch="all" license="BSD-3-Clause" _luaver=5.4 -makedepends="cmake ragel gtk+3.0-dev boost-dev lua$_luaver-dev lua$_luaver-libs +makedepends="cmake ragel gtk+3.0-dev boost1.82-dev lua$_luaver-dev lua$_luaver-libs expat-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://github.com/thezbyg/gpick/releases/download/v$pkgver/gpick-$pkgver.tar.gz diff --git a/community/gping/APKBUILD b/community/gping/APKBUILD index c4f9eb1f467..ff9aeb9ed66 100644 --- a/community/gping/APKBUILD +++ b/community/gping/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=gping -pkgver=1.16.0 +pkgver=1.16.1 pkgrel=0 pkgdesc="Ping, but with a graph" url="https://github.com/orf/gping" @@ -31,5 +31,5 @@ package() { } sha512sums=" -54b1f4a18cb3a3ad51d3dec0f1b0f8eaacaa084d1be6d4d70a2e5224b26a1032eacceb49c6755580d1370bc30a8248557c06ee3f51c5d6cf1b381cee448b8eae gping-1.16.0.tar.gz +848f714beb692ae859e2eb99c78671830c46f2d8775a47163d5c61d040c3d9856ec07b35c613f6c4e4edc99b71c494ee482d5bf044e83abd9f1843fea123b880 gping-1.16.1.tar.gz " diff --git a/community/gpodder-adaptive/0001-Replace-the-removed-imp-module-with-importlib.patch b/community/gpodder-adaptive/0001-Replace-the-removed-imp-module-with-importlib.patch new file mode 100644 index 00000000000..46ccd7159f0 --- /dev/null +++ b/community/gpodder-adaptive/0001-Replace-the-removed-imp-module-with-importlib.patch @@ -0,0 +1,47 @@ +From dd9b594d24a541c0f1d3b096e47b6d7f1c11ca7e Mon Sep 17 00:00:00 2001 +From: auouymous <au@qzx.com> +Date: Fri, 20 Oct 2023 03:03:01 -0600 +Subject: [PATCH] Replace the removed imp module with importlib. + +--- + src/gpodder/extensions.py | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/gpodder/extensions.py b/src/gpodder/extensions.py +index 8f50ff31..44fc35d5 100644 +--- a/src/gpodder/extensions.py ++++ b/src/gpodder/extensions.py +@@ -31,7 +31,7 @@ For an example extension see share/gpodder/examples/extensions.py + + import functools + import glob +-import imp ++import importlib + import logging + import os + import re +@@ -291,15 +291,16 @@ class ExtensionContainer(object): + self.name, self.metadata.only_for) + return + +- basename, extension = os.path.splitext(os.path.basename(self.filename)) +- fp = open(self.filename, 'r') ++ basename, _ = os.path.splitext(os.path.basename(self.filename)) + try: +- module_file = imp.load_module(basename, fp, self.filename, +- (extension, 'r', imp.PY_SOURCE)) ++ # from load_source() on https://docs.python.org/dev/whatsnew/3.12.html ++ loader = importlib.machinery.SourceFileLoader(basename, self.filename) ++ spec = importlib.util.spec_from_file_location(basename, self.filename, loader=loader) ++ module_file = importlib.util.module_from_spec(spec) ++ loader.exec_module(module_file) + finally: + # Remove the .pyc file if it was created during import + util.delete_file(self.filename + 'c') +- fp.close() + + self.default_config = getattr(module_file, 'DefaultConfig', {}) + if self.default_config: +-- +2.45.0 + diff --git a/community/gpodder-adaptive/APKBUILD b/community/gpodder-adaptive/APKBUILD index f9e35d976d4..15f2d1fa302 100644 --- a/community/gpodder-adaptive/APKBUILD +++ b/community/gpodder-adaptive/APKBUILD @@ -3,7 +3,7 @@ pkgname=gpodder-adaptive pkgver=3.11.4 _plusver=1 -pkgrel=1 +pkgrel=2 pkgdesc="Podcast aggregator (adaptive version)" url="https://github.com/gpodder/gpodder/tree/adaptive" arch="all !s390x !riscv64" # blocked by adwaita-icon-theme @@ -24,7 +24,8 @@ depends=" makedepends="py3-setuptools intltool help2man" checkdepends="py3-pytest py3-pytest-httpserver py3-pytest-cov py3-minimock desktop-file-utils" subpackages="$pkgname-doc $pkgname-lang $pkgname-pyc" -source="gpodder-adaptive-$pkgver+$_plusver.tar.gz::https://github.com/gpodder/gpodder/archive/refs/tags/adaptive/$pkgver+$_plusver.tar.gz" +source="gpodder-adaptive-$pkgver+$_plusver.tar.gz::https://github.com/gpodder/gpodder/archive/refs/tags/adaptive/$pkgver+$_plusver.tar.gz + 0001-Replace-the-removed-imp-module-with-importlib.patch" builddir="$srcdir/gpodder-adaptive-$pkgver-$_plusver" check() { @@ -40,4 +41,5 @@ package() { sha512sums=" c5920a74abd8deecdbf0a643cdf9ff818e3f5c220195d6a658627ff1856fc4a7c7bcac98fe4dd2efa576388219d0dd3a37bf1156f33d39a13eab96bccf321dee gpodder-adaptive-3.11.4+1.tar.gz +ae5383aaed6e67f582d9dff2e2aaba3735022578bc6b7de525fec7cc456d67ad01197ed41a4f5046d3774d5bc3b884ab65f066c7f3a78fd7e023106176f32870 0001-Replace-the-removed-imp-module-with-importlib.patch " diff --git a/community/gpodder/0001-Replace-the-removed-imp-module-with-importlib.patch b/community/gpodder/0001-Replace-the-removed-imp-module-with-importlib.patch new file mode 100644 index 00000000000..46ccd7159f0 --- /dev/null +++ b/community/gpodder/0001-Replace-the-removed-imp-module-with-importlib.patch @@ -0,0 +1,47 @@ +From dd9b594d24a541c0f1d3b096e47b6d7f1c11ca7e Mon Sep 17 00:00:00 2001 +From: auouymous <au@qzx.com> +Date: Fri, 20 Oct 2023 03:03:01 -0600 +Subject: [PATCH] Replace the removed imp module with importlib. + +--- + src/gpodder/extensions.py | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/gpodder/extensions.py b/src/gpodder/extensions.py +index 8f50ff31..44fc35d5 100644 +--- a/src/gpodder/extensions.py ++++ b/src/gpodder/extensions.py +@@ -31,7 +31,7 @@ For an example extension see share/gpodder/examples/extensions.py + + import functools + import glob +-import imp ++import importlib + import logging + import os + import re +@@ -291,15 +291,16 @@ class ExtensionContainer(object): + self.name, self.metadata.only_for) + return + +- basename, extension = os.path.splitext(os.path.basename(self.filename)) +- fp = open(self.filename, 'r') ++ basename, _ = os.path.splitext(os.path.basename(self.filename)) + try: +- module_file = imp.load_module(basename, fp, self.filename, +- (extension, 'r', imp.PY_SOURCE)) ++ # from load_source() on https://docs.python.org/dev/whatsnew/3.12.html ++ loader = importlib.machinery.SourceFileLoader(basename, self.filename) ++ spec = importlib.util.spec_from_file_location(basename, self.filename, loader=loader) ++ module_file = importlib.util.module_from_spec(spec) ++ loader.exec_module(module_file) + finally: + # Remove the .pyc file if it was created during import + util.delete_file(self.filename + 'c') +- fp.close() + + self.default_config = getattr(module_file, 'DefaultConfig', {}) + if self.default_config: +-- +2.45.0 + diff --git a/community/gpodder/APKBUILD b/community/gpodder/APKBUILD index 145e2e22792..e37c5ce218d 100644 --- a/community/gpodder/APKBUILD +++ b/community/gpodder/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org> pkgname=gpodder pkgver=3.11.4 -pkgrel=1 +pkgrel=2 pkgdesc="Podcast aggregator" url="https://gpodder.org" arch="noarch !s390x !riscv64" # blocked by adwaita-icon-theme @@ -21,7 +21,8 @@ depends=" makedepends="py3-setuptools intltool help2man" checkdepends="py3-pytest py3-pytest-httpserver py3-pytest-cov py3-minimock desktop-file-utils" subpackages="$pkgname-doc $pkgname-lang $pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://github.com/gpodder/gpodder/archive/refs/tags/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/gpodder/gpodder/archive/refs/tags/$pkgver.tar.gz + 0001-Replace-the-removed-imp-module-with-importlib.patch" check() { make unittest @@ -36,4 +37,5 @@ package() { sha512sums=" f60e2e04abec7d9713d169f9eccb431325bcfe40303e14d0cb42c3b5b4696d7435b86eb1c69b430ef99f81a6b71f89dffafec84d1f1c51118af59e57dcfa0d2d gpodder-3.11.4.tar.gz +ae5383aaed6e67f582d9dff2e2aaba3735022578bc6b7de525fec7cc456d67ad01197ed41a4f5046d3774d5bc3b884ab65f066c7f3a78fd7e023106176f32870 0001-Replace-the-removed-imp-module-with-importlib.patch " diff --git a/community/gqrx/APKBUILD b/community/gqrx/APKBUILD index f59cd5b49b8..ea36bd1747e 100644 --- a/community/gqrx/APKBUILD +++ b/community/gqrx/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Oleg Titov <oleg.titov@gmail.com> # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=gqrx -pkgver=2.17.4 -pkgrel=3 +pkgver=2.17.5 +pkgrel=0 pkgdesc="Interactive SDR receiver waterfall for many devices" url="https://gqrx.dk/" -arch="aarch64 x86_64" # limited by availability of gr-osmosdr +arch="aarch64 armv7 x86_64" # limited by availability of gr-osmosdr license="GPL-3.0-or-later" options="!check" # No test suite from upstream makedepends=" @@ -34,5 +34,5 @@ package() { } sha512sums=" -1a059757036f311667705eadd5651c72b7b3d7b863b39c2cd404bc6d1886949807e394914f34520347581447d446f5575db91f177087dab28e1121388d920497 gqrx-2.17.4.tar.gz +40cf87329b2b8da5bcd7ded62551601a7b45ee0f791d1fa6f872a1fdf03b61e24a26f85c2d304c6d4ccd9a1b4b7aad7da94b488b539026aa93757669eece9bad gqrx-2.17.5.tar.gz " diff --git a/community/gr-funcube/APKBUILD b/community/gr-funcube/APKBUILD index 1f88f8b0647..26a459d4834 100644 --- a/community/gr-funcube/APKBUILD +++ b/community/gr-funcube/APKBUILD @@ -3,7 +3,7 @@ pkgname=gr-funcube # the releases are 'prerelease' but these are the releases pkgver=3.10.0_rc3 _pkgver=${pkgver/_/.} -pkgrel=7 +pkgrel=8 pkgdesc="Module for gnuradio for a funcube dongle" url="https://github.com/dl1ksv/gr-funcube" # same as gr-osmosdr diff --git a/community/gr-osmosdr/APKBUILD b/community/gr-osmosdr/APKBUILD index 61bed93d4d7..97e0ed8a2be 100644 --- a/community/gr-osmosdr/APKBUILD +++ b/community/gr-osmosdr/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=gr-osmosdr pkgver=0.2.5 -pkgrel=3 +pkgrel=5 pkgdesc="osmocom Gnu Radio Blocks" url="https://osmocom.org/projects/gr-osmosdr/wiki" arch="armv7 x86_64 aarch64" # limited by libvolk and gnuradio diff --git a/community/grantlee-editor/APKBUILD b/community/grantlee-editor/APKBUILD index 4db92f0deec..7b7d7901465 100644 --- a/community/grantlee-editor/APKBUILD +++ b/community/grantlee-editor/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 pkgdesc="Utilities and tools to manage themes in KDE PIM applications " # armhf blocked by extra-cmake-modules # armv7, ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -arch="all !armv7 !armhf !ppc64le !s390x !riscv64" +# loongarch64 blocked by pimcommon +arch="all !armv7 !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kontact.kde.org/" license="GPL-2.0-or-later AND GFDL-1.2-only" makedepends=" diff --git a/community/grass-gis/APKBUILD b/community/grass-gis/APKBUILD index 95d0a0f5b10..3a1c345ff2b 100644 --- a/community/grass-gis/APKBUILD +++ b/community/grass-gis/APKBUILD @@ -3,7 +3,7 @@ pkgname=grass-gis pkgver=8.3.2 _shortver=${pkgver%.*}; _shortver=${_shortver/./} -pkgrel=1 +pkgrel=2 pkgdesc="Geographic Resources Analysis Support System" url="https://grass.osgeo.org" arch="all !s390x" # s390x: tests fail diff --git a/community/greenbone-feed-sync/APKBUILD b/community/greenbone-feed-sync/APKBUILD index ff7e6d98108..6363bb956cd 100644 --- a/community/greenbone-feed-sync/APKBUILD +++ b/community/greenbone-feed-sync/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=greenbone-feed-sync # follow the same version of gvm-tools -pkgver=23.10.0 -pkgrel=1 +pkgver=24.3.0 +pkgrel=0 pkgdesc="New script for syncing the Greenbone Community Feed" url="https://github.com/greenbone/greenbone-feed-sync" arch="noarch" @@ -22,6 +22,7 @@ makedepends=" checkdepends=" py3-pontos py3-pytest + py3-shtab " subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/greenbone-feed-sync/archive/refs/tags/v$pkgver.tar.gz" @@ -44,5 +45,5 @@ package() { } sha512sums=" -fe5864c4e650f17a072cd6e4153779ea33ad8f0ac28e92114b40c465a04b70791b603ccbe82934dcdad13fce2003e2d9786cec75854efecf8aefa74c7ce178f4 greenbone-feed-sync-23.10.0.tar.gz +ac1ce1f0a2898997e5a330e9a186b6203b7593e5b847d23202c28e7b3b7be1556001cc6d8ba5abd7077d1b51e0f21640728f78659ecf9a60eede28ea483344b4 greenbone-feed-sync-24.3.0.tar.gz " diff --git a/community/greetd/APKBUILD b/community/greetd/APKBUILD index 7f88ebe3b8e..e4f84a9d14e 100644 --- a/community/greetd/APKBUILD +++ b/community/greetd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sean McAvoy <seanmcavoy@gmail.com> # Maintainer: Sean McAvoy <seanmcavoy@gmail.com> pkgname=greetd -pkgver=0.9.0 -pkgrel=3 +pkgver=0.10.0 +pkgrel=1 pkgdesc="Minimal and flexible login manager daemon" url="https://git.sr.ht/~kennylevinsen/greetd" # riscv64: blocked by cargo @@ -46,7 +46,7 @@ build() { } check() { - cargo check --frozen + cargo test --frozen } package() { @@ -70,7 +70,7 @@ agreety() { } sha512sums=" -3ea8022e68384fc61417eec50f172ed2f4c1865d00c86816c5efc25c5d21572c3013d472a7c532846cb1a90f79171d44383b844f03eeab50ffc869947b2fac78 greetd-0.9.0.tar.gz +b2bfbbd4d9fca94ccc623f4f4fc2c3f9518319c96641ecc2c2f10bb6aa8f2b41633b651ed439626971b50c5ad5af5fb8ab5906a46dab158a37395f3cc67a3a21 greetd-0.10.0.tar.gz 896adb033162ffc97cd94cd9f34094600d2789e44e943b8c5d5822dcdbefa063e58f1d00fc07386d1f9eefbbd874996cf75f2bdaf624df8dd057b6676e0f3caf greetd.pam 425d2cda12d272fd3bf9f03b960cfd421d4391594ddc6220786d45e6c5c563b3aa01644eee01b3078b8a816b34c516f14fe84a4f72cfd94f608d4f5d52310d29 greetd.initd 4e955bc8ba9df6db48f6e86a84af352b550520f39a3945e1fae4a53064bed96b001cf34437199ae03780f72be4125dc65e3ff65704fc67b4addfb738f03c4811 greetd.confd diff --git a/community/gsad/APKBUILD b/community/gsad/APKBUILD index c5c053251c4..70fc1f72768 100644 --- a/community/gsad/APKBUILD +++ b/community/gsad/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=gsad -pkgver=22.9.0 +pkgver=22.9.1 pkgrel=0 pkgdesc="Greenbone Security Assistant HTTP Server - The server talking to the Greenbone Vulnerability Management (GVM) deamon" url="https://www.openvas.org/" @@ -57,7 +57,7 @@ package() { } sha512sums=" -ffe146a0dc87d2d95835dfa9b8eaeb2825a24aabe0f97e2ebd525235f96b23907476154fa52789c1d30d53daaf256743a4723db06e94bf6d4db98aaa57f08004 gsad-22.9.0.tar.gz +25592b7e07357ff41f142cf926132491af20757a404773f3d532bafbf6e75d98b259103860920f657512d16a120351478767d347b01bef122ea1177c685d0d5b gsad-22.9.1.tar.gz 2004f92b395695684ea827afbee7d5177980491ae516f449630a848c9145cbffeb882836860e3d70944f34699a38a3e6739f926073d81284e29b2cb2f4ad861b fix-bin-path.patch 70db1ef2b79dba7e13dd8d24acd0432828387e313fce4e922873cb95a958e7071c4731d32abd63453c4a7b397ea7433a1c52c478a893f99e3c14304dccfd6042 gsad.initd ae2e030a4e0a6cb3022706d64d65990ee8fafb36dbff2e76478e68748a2c1deca1679408ea029140f08e0d32cf8060475f9c763a263252cff80a86047101dab0 gsad.logrotate diff --git a/community/gsoap/APKBUILD b/community/gsoap/APKBUILD index ac946ccd29d..79c312d5ce5 100644 --- a/community/gsoap/APKBUILD +++ b/community/gsoap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: <xmingske@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gsoap -pkgver=2.8.132 +pkgver=2.8.134 pkgrel=0 arch="all" pkgdesc="Cross-platform C and C++ SDK for SOAP/XML Web services" @@ -49,7 +49,7 @@ tools() { } sha512sums=" -d3dc2a8b5cf2d9dd21f98bdda2b2786f8a37934681e015d1ba11028a01a3a3be96e487405883c17f89e778a1bc432878e42362278834212ce9bac4ebed392629 gsoap_2.8.132.zip +d30cb69398544abfd6823baca8d565f85cf40336494d1eacc508ef5d8cc77d868cb2d9659a74a376954a1b6d00c99397b1de536d3f6471f3bba9282f031bded7 gsoap_2.8.134.zip 079bb9191f7c756d8e3d87a48f412ff60ef1190b6a1353cdd7ef54b6ade270152bd628b102332a2fdf7b8bbeeb9c7c387c6741c23d10d4024e691c3b260a9ef4 gsoap-libtool.patch 7184083c2e0dd6975b1272b3fa0426167feb1a5f4fbc8e1ade4212f51097695c2af3b2d585ebe71a6dc35d8a27861a355ec9c000ffbecb87b2e06c36d0826248 musl-fixes.patch " diff --git a/community/gst-editing-services/APKBUILD b/community/gst-editing-services/APKBUILD index a6bd5702a07..d305c702bd0 100644 --- a/community/gst-editing-services/APKBUILD +++ b/community/gst-editing-services/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-editing-services -pkgver=1.22.11 -pkgrel=1 +pkgver=1.24.3 +pkgrel=0 pkgdesc="GStreamer Editing Services Library" url="https://gstreamer.freedesktop.org" # s390x blocked by 7 failing tests @@ -46,5 +46,5 @@ package() { } sha512sums=" -87f1240c3c18d1530ace3f15ad50acef90dab2808198658b5f9da54a5cfe2ee2c040e7bdd766550e566c5e86a1509b12a473b6063f3a7e471ee18b163b40873d gst-editing-services-1.22.11.tar.xz +4b658303ea7619d2feb099491b8fcfa366db8c7437d59fb3187d4f574cb26f9dd30376e1eb45ed23e4528044cdb7c56ff9765e14bffb2ffcbe622e68ec754379 gst-editing-services-1.24.3.tar.xz " diff --git a/community/gst-libav/APKBUILD b/community/gst-libav/APKBUILD index 4bc5048b523..92c400c39af 100644 --- a/community/gst-libav/APKBUILD +++ b/community/gst-libav/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-libav -pkgver=1.22.11 +pkgver=1.24.3 pkgrel=0 pkgdesc="GStreamer streaming media framework libav plugin" url="https://gstreamer.freedesktop.org" @@ -45,6 +45,6 @@ doc() { } sha512sums=" -808e5659130ed608960bddb68f4ab678149a21e1fb45ebe85d82f47166a254756d615ed37eb83e2aaba349e93279bf2dc43a73daa5c33833aba26d3d8e115362 gst-libav-1.22.11.tar.xz +21cd138eb6de79edf10c45fb41847c38449e3936490bafc5fef51705f218f25399b4ec021fc9612df2296614b458ed3b1b626a0a307877636ee555a787bf79cf gst-libav-1.24.3.tar.xz b6ea595d0875c22b69fb7c32ce3e03e187ce8c76ad5992fd709500507fc89e021f6f53fc951a61b5edf0312963bf7d313542a3970bbab27e335887e5db34d26b flaky.patch " diff --git a/community/gst-plugins-bad/APKBUILD b/community/gst-plugins-bad/APKBUILD index 16ecf56509f..3d10fe64dae 100644 --- a/community/gst-plugins-bad/APKBUILD +++ b/community/gst-plugins-bad/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-bad -pkgver=1.22.11 +pkgver=1.24.3 pkgrel=0 pkgdesc="GStreamer streaming media framework bad plug-ins" url="https://gstreamer.freedesktop.org/" @@ -127,5 +127,5 @@ package() { } sha512sums=" -cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70 gst-plugins-bad-1.22.11.tar.xz +fb4c53ea1837ab03480a2c1f9d2bf8dbdd1d7064b3f7ce4ff3eb5f8ec2f915f36442734b94332c867c3f8f815940f1c2a6e0763a62c4afb55324a8eb69bbf14b gst-plugins-bad-1.24.3.tar.xz " diff --git a/community/gst-plugins-good/6804.patch b/community/gst-plugins-good/6804.patch new file mode 100644 index 00000000000..2645dafe2ef --- /dev/null +++ b/community/gst-plugins-good/6804.patch @@ -0,0 +1,40 @@ +From 1c702187b067f1a2378bc236023d7e2b1f368be6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> +Date: Sun, 5 May 2024 18:29:39 +0300 +Subject: [PATCH] qtdemux: Use `G_GUINT64_CONSTANT` when creating test caps + +Otherwise this fails on 32 bit platforms. + +Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3521 +--- + .../gst-plugins-good/tests/check/elements/qtdemux.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/check/elements/qtdemux.c b/tests/check/elements/qtdemux.c +index dd7b30e3233..1e067e02cbe 100644 +--- a/tests/check/elements/qtdemux.c ++++ b/tests/check/elements/qtdemux.c +@@ -1085,8 +1085,8 @@ GST_START_TEST (test_qtdemux_compensate_data_offset) + "channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 48000, NULL); + caps = + gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING, +- "mss-fragmented", "timescale", G_TYPE_UINT64, 10000000, "media-caps", +- GST_TYPE_CAPS, mediacaps, NULL); ++ "mss-fragmented", "timescale", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000), ++ "media-caps", GST_TYPE_CAPS, mediacaps, NULL); + + /* Send segment event* */ + event = gst_event_new_caps (caps); +@@ -1165,8 +1165,8 @@ GST_START_TEST (test_qtdemux_mss_fragment) + "channels", G_TYPE_INT, 2, "rate", G_TYPE_INT, 48000, NULL); + caps = + gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING, +- "mss-fragmented", "timescale", G_TYPE_UINT64, 10000000, "media-caps", +- GST_TYPE_CAPS, mediacaps, NULL); ++ "mss-fragmented", "timescale", G_TYPE_UINT64, G_GUINT64_CONSTANT (10000000), ++ "media-caps", GST_TYPE_CAPS, mediacaps, NULL); + + /* Send segment event* */ + event = gst_event_new_caps (caps); +-- +GitLab diff --git a/community/gst-plugins-good/APKBUILD b/community/gst-plugins-good/APKBUILD index d5f99cda1fd..c7274163e4f 100644 --- a/community/gst-plugins-good/APKBUILD +++ b/community/gst-plugins-good/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-good -pkgver=1.22.11 +pkgver=1.24.3 pkgrel=0 pkgdesc="GStreamer streaming media framework good plug-ins" url="https://gstreamer.freedesktop.org" @@ -38,6 +38,7 @@ makedepends=" meson mpg123-dev nasm + opencore-amr-dev orc-compiler orc-dev pulseaudio-dev @@ -55,18 +56,9 @@ makedepends=" ldpath="/usr/lib/gstreamer-1.0" source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz flaky-test.patch - tests-fix-memory-corruption.patch + 6804.patch " -case "$CARCH" in -armhf|s390x|ppc64le) - # really flaky tests - options="$options !check" - ;; -*) - ;; -esac - # secfixes: # 1.22.4-r0: # - CVE-2023-37327 @@ -93,6 +85,13 @@ esac # - CVE-2016-10199 build() { + local qt_x11="enabled" + case "$CTARGET_ARCH" in + arm*|aarch64) + qt_x11="disabled" + ;; + esac + # MPG123_NO_LARGENAME: fix undefined reference to # `mpg123_decode_frame_64' in function # `gst_mpg123_audio_dec_handle_frame' @@ -105,6 +104,9 @@ build() { -Dpackage-origin="https://alpinelinux.org" \ -Dpackage-name="GStreamer good plug-ins (Alpine Linux)" \ -Dtests="$(want_check && echo enabled || echo disabled)" \ + -Damrnb=enabled \ + -Damrwbdec=enabled \ + -Dqt-x11=$qt_x11 \ . output meson compile -C output } @@ -140,9 +142,8 @@ gtk() { fi done } - sha512sums=" -e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb gst-plugins-good-1.22.11.tar.xz +338469b7c7ed1a1570b3e734107332998b3e8eb96a1275cddc3ba92b0050e35d9e9902d0668653593cf74d14f4bb23f2eabdc61f0248df5d9cfee3e76c6cab0c gst-plugins-good-1.24.3.tar.xz e471a892c511c501fdd336cd1729df4e955e266a395260db50665b4ee717d881a007ae84873c57e386931c042ce08ee8f3ab8e102ba251632f724e167b5af913 flaky-test.patch -7779f0eee4dda158c88e19e4d0534afd5cdde393d269f88a521cda0f2106afc2a0b386cc7b13242fed8ce7f71e4d9400507e5bef19bc0374eadc81a0a5e3a14b tests-fix-memory-corruption.patch +ab6161070e19f9b7aca7fe69f5651b94bfb43af528569e9d9f4f0c3dde511c4459ca6dbc5141933c395ef308d530b06644984edfd99ce7e53c95f5b4a0dc4cfd 6804.patch " diff --git a/community/gst-plugins-good/tests-fix-memory-corruption.patch b/community/gst-plugins-good/tests-fix-memory-corruption.patch deleted file mode 100644 index 313feaba2ab..00000000000 --- a/community/gst-plugins-good/tests-fix-memory-corruption.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f6f3c1527fa799042fb0906ac221c2d01ce88d2b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> -Date: Thu, 28 Mar 2024 19:49:46 +0000 -Subject: [PATCH] tests: rtpred: fix out-of-bound writes - -Don't write more data to the buffer than we allocated -space for. - -Fixes #3312 ---- - subprojects/gst-plugins-good/tests/check/elements/rtpred.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/subprojects/gst-plugins-good/tests/check/elements/rtpred.c b/subprojects/gst-plugins-good/tests/check/elements/rtpred.c -index 99b08fdd7a0..80dd2715f56 100644 ---- a/tests/check/elements/rtpred.c -+++ b/tests/check/elements/rtpred.c -@@ -398,7 +398,7 @@ GST_START_TEST (rtpreddec_invalid) - bufinp = - _new_rtp_buffer (FALSE, 0, PT_RED, 1, TIMESTAMP_NTH (1), 0xabe2b0b, 1); - fail_unless (gst_rtp_buffer_map (bufinp, GST_MAP_WRITE, &rtp)); -- memcpy (gst_rtp_buffer_get_payload (&rtp), &data, sizeof (data)); -+ memcpy (gst_rtp_buffer_get_payload (&rtp), &data, 1); - gst_rtp_buffer_unmap (&rtp); - _push_and_check_didnt_go_through (h, bufinp); - -@@ -406,7 +406,7 @@ GST_START_TEST (rtpreddec_invalid) - bufinp = - _new_rtp_buffer (FALSE, 0, PT_RED, 2, TIMESTAMP_NTH (2), 0xabe2b0b, 4); - fail_unless (gst_rtp_buffer_map (bufinp, GST_MAP_WRITE, &rtp)); -- memcpy (gst_rtp_buffer_get_payload (&rtp), &data, sizeof (data)); -+ memcpy (gst_rtp_buffer_get_payload (&rtp), &data, 4); - gst_rtp_buffer_unmap (&rtp); - _push_and_check_didnt_go_through (h, bufinp); - --- -GitLab - diff --git a/community/gst-plugins-ugly/APKBUILD b/community/gst-plugins-ugly/APKBUILD index d1a68a0a9d1..0bb66a75c36 100644 --- a/community/gst-plugins-ugly/APKBUILD +++ b/community/gst-plugins-ugly/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-ugly -pkgver=1.22.11 +pkgver=1.24.3 pkgrel=0 pkgdesc="GStreamer streaming media framework ugly plug-ins" url="https://gstreamer.freedesktop.org" @@ -16,7 +16,6 @@ makedepends=" libdvdread-dev libmpeg2-dev meson - opencore-amr-dev orc-dev x264-dev " @@ -44,8 +43,6 @@ build() { -Db_lto=true \ -Dpackage-origin="https://alpinelinux.org" \ -Dpackage-name="GStreamer ugly plug-ins (Alpine Linux)" \ - -Damrnb=enabled \ - -Damrwbdec=enabled \ -Dgpl=enabled \ -Dcdio=disabled \ -Ddvdread=disabled \ @@ -68,6 +65,6 @@ doc() { } sha512sums=" -767e80c1d15ec79ff196c4c4ad6128bc17502b490201c1a3799341a2784848f639392310de7dabc922d022acb5156bd25e4191ba2409c17b3a23a278f7722c5c gst-plugins-ugly-1.22.11.tar.xz +1964549fdb46210c2f8a918d0fd597d302e431c8585efd7824ab2fddd7c75dc0eed288436c8bc1afcdebb89610c5859fd5901495defb3a2cb6cf823a5d08cbff gst-plugins-ugly-1.24.3.tar.xz 730a88a20534f77d10ed1543f6e7fcc8825e75c4bba007de02017fc89569f9e5dfd3d383d3479448f687825bb27b19335c0957c360846e5e3e33735b7a7d3bf6 x264_tests.patch " diff --git a/community/gst-vaapi/APKBUILD b/community/gst-vaapi/APKBUILD index 748dc19c2d0..f4142df1c1d 100644 --- a/community/gst-vaapi/APKBUILD +++ b/community/gst-vaapi/APKBUILD @@ -3,7 +3,7 @@ pkgname=gst-vaapi # NOTE: Upgrade only to even-numbered minor versions (e.g. 1.20.x, 1.22.x)! # Odd versions are unstable development releases. -pkgver=1.22.11 +pkgver=1.24.3 pkgrel=0 pkgdesc="GStreamer streaming media framework VA API plug-ins" url="https://gstreamer.freedesktop.org/" @@ -45,5 +45,5 @@ package() { } sha512sums=" -939b748fea88c94ad59c1d4610a872a794b383382096a8f5f011a21d4c8fb041c28e1aa9a8d54f519fb3e48a69ed79622b0d45be01d2d5a900738a7928401563 gstreamer-vaapi-1.22.11.tar.xz +3f7fde68468003cc8e83abf3ad81281e475bf83dbbc7c14006bee18d6d66dfa9e7745d049aa8fa1d3147787ea7d9d47145507d9ebb2b7f576ee5e0f849edb043 gstreamer-vaapi-1.24.3.tar.xz " diff --git a/community/gthumb/APKBUILD b/community/gthumb/APKBUILD index dfde2bc7288..7690b43301a 100644 --- a/community/gthumb/APKBUILD +++ b/community/gthumb/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=gthumb pkgver=3.12.6 -pkgrel=0 +pkgrel=1 pkgdesc="Image viewer and browser from GNOME" url="https://gitlab.gnome.org/GNOME/gthumb" # optional libjxl, but nobody uses this on s390x diff --git a/community/gtk4.0/APKBUILD b/community/gtk4.0/APKBUILD index 3c097ef5ae3..6739acd0216 100644 --- a/community/gtk4.0/APKBUILD +++ b/community/gtk4.0/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Pablo Correa Gomez <ablocorrea@hotmail.com> pkgname=gtk4.0 -pkgver=4.14.2 +pkgver=4.14.4 pkgrel=0 pkgdesc="The GTK Toolkit (v4)" url="https://www.gtk.org/" @@ -121,5 +121,5 @@ lang() { } sha512sums=" -bd4a27091a56f35d294d1dc0700f9b2af8e11c6b7a8cd3dcbb72b6bce388877b3354582e19889e2612e6717d4cf2bf9aae30c4a393c1614582dfa2ef2b6842c9 gtk-4.14.2.tar.xz +33a983f4ebac9088eaf9d3794a171d1619632bbcb27d9f46d894305dc15f83615a18443598b3c62a553b9596438b58226560ba17c41e539c76c3ee8a2b62c651 gtk-4.14.4.tar.xz " diff --git a/community/gtkmm4/APKBUILD b/community/gtkmm4/APKBUILD index 25f75028325..1709cc0453a 100644 --- a/community/gtkmm4/APKBUILD +++ b/community/gtkmm4/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=gtkmm4 pkgver=4.14.0 -pkgrel=0 +pkgrel=1 pkgdesc="C++ wrappers for GTK 4" url="https://www.gtkmm.org/" arch="all" diff --git a/community/gucharmap/APKBUILD b/community/gucharmap/APKBUILD index a90af44c062..7da52e15b0c 100644 --- a/community/gucharmap/APKBUILD +++ b/community/gucharmap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gucharmap -pkgver=15.1.3 +pkgver=15.1.4 pkgrel=0 pkgdesc="GNOME Unicode Charmap" url="https://wiki.gnome.org/Apps/Gucharmap" @@ -41,5 +41,5 @@ package() { } sha512sums=" -e07ee839b9635de7296ab40f6524a4e2d66203266ea39726e7fa1e917e75672a6e9497ba331ac184306ac43081fbacd2872aad442005718a71bff2723ba9f4ff gucharmap-15.1.3.tar.gz +3427041f57fa10b445f5965eb890d27637bdde726728e8a3ad9529772a023d6067bd77a37073f8a9f5f434b811875b10ba31364ffbf6f88a6b87a357db37fa53 gucharmap-15.1.4.tar.gz " diff --git a/community/guile-git/APKBUILD b/community/guile-git/APKBUILD index 2eeca59dfce..80bc57dfc62 100644 --- a/community/guile-git/APKBUILD +++ b/community/guile-git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=guile-git -pkgver=0.6.0 +pkgver=0.7.0 pkgrel=0 pkgdesc="Guile bindings of libgit2" url="https://gitlab.com/guile-git/guile-git" @@ -41,5 +41,5 @@ package() { } sha512sums=" -519b5dafd83b5967403929e347fa2b81fcec97136459722fdc95357cbeba9d519807b8863b17a85fc426e53e8f78f5d3979f96bbb32548bcf598827f3f228219 guile-git-v0.6.0.tar.bz2 +6207464bc48de8e33fde0365c198e42c21719e5ffb27e30ab3277f88d04ccc4a2fe4964c0019333be8f047d3ddc76f1c98e6e060311ce6b2a13ac670c0663226 guile-git-v0.7.0.tar.bz2 " diff --git a/community/guile-lzlib/APKBUILD b/community/guile-lzlib/APKBUILD index dafe99b7de9..2ef0b75ba5c 100644 --- a/community/guile-lzlib/APKBUILD +++ b/community/guile-lzlib/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=guile-lzlib -pkgver=0.0.2 +pkgver=0.3.0 pkgrel=0 pkgdesc="Guile bindings for lzlib" url="https://notabug.org/guile-lzlib/guile-lzlib" @@ -38,5 +38,5 @@ package() { } sha512sums=" -1cede0d0194b2a8839979600ce680850e6cc2405912dcc84265b1f920c4069e94a85e79de3d61e5e7ccabc8ad8719d3759e28b45c16e70cc7c696af40e09cf1a guile-lzlib-0.0.2.tar.gz +267801940f0cd8931fc2ce81b21a206dcf7dc278ea8e2dc896a65fb1537248a3359b7df63b332810e6eba853021a34cec9a9f7f829cd775557b4f0d3761b3bc2 guile-lzlib-0.3.0.tar.gz " diff --git a/community/gum/APKBUILD b/community/gum/APKBUILD index bf1a166f8fb..bb045464787 100644 --- a/community/gum/APKBUILD +++ b/community/gum/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Grigory Kirillov <txgk@bk.ru> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=gum -pkgver=0.13.0 -pkgrel=2 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Highly configurable utilities for writing interactive shell scripts" url="https://github.com/charmbracelet/gum" arch="all" @@ -15,6 +15,7 @@ subpackages=" " makedepends="go" source="https://github.com/charmbracelet/gum/archive/v$pkgver/gum-v$pkgver.tar.gz" +options="net" # downloading dependencies export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" @@ -47,5 +48,5 @@ package() { } sha512sums=" -e101ddb3fd6d29bfe6e1ce08aa0f4d829e3e8547a41da3ea7e901f0b234ec2f60655be0f34ed77ab23eaf853840dbc77ed08c8f7336b51f1b129165537cfb1af gum-v0.13.0.tar.gz +600014a5f1215dbbe8045a02feda00335e8007875dedc25cbb0e48ecbc4bc23ffa0e584bb515dd79c83fccc9bffc1fe37973299fda663d9475a9ecd8978eccf0 gum-v0.14.0.tar.gz " diff --git a/community/gvm-libs/APKBUILD b/community/gvm-libs/APKBUILD index 1bf149fef2f..b31ff5ba636 100644 --- a/community/gvm-libs/APKBUILD +++ b/community/gvm-libs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=gvm-libs -pkgver=22.8.0 +pkgver=22.9.1 pkgrel=0 pkgdesc="Greenbone Vulnerability Management Libraries" url="https://www.openvas.org/" @@ -72,9 +72,9 @@ package() { } sha512sums=" -5daa9157399fc8cf52cdfbdfeffe5e10a282cbe2f7b8eb6a3fefb202984f9df3bca91ef80d1d9d1bf37307cc475bd41d4b64b4f1ad0644975b295b6f32b294a6 gvm-libs-22.8.0.tar.gz +b06c21ced89dc9f14dd19b256b57af910f4d7e585bf9c90fb7e3c3497bb429294e3ffb64dc6ee710e8b3beeb4ca9ac6aecb9d5e4b25f0f9761fa0c9f18a8dfd1 gvm-libs-22.9.1.tar.gz c0fe0add24cb4336f0ce313197042e60a3aba3eeb983f31b243e665a488e520ffa260ab9a3feb852500310a9df66f2eaf82ac4294d7980b983a78454b30eb9f9 glib-include-path.patch -b10f2b6a8e126a184c65c91bdd18a21e4ee16cbc442775288a11c2768c8e5c1db4ce3749025e7cc3f360c7c1011b79dca836fee742fb9f06034ca0a986f718b5 strptime.patch +7e98eb91143b00c35bde99e2576562c40be614f04f030b0bbc633ec987860e63771f8d61d76a5da901ac11f09a9d1fde0398eaad0ff676f3abacd2c80ef8dc69 strptime.patch 1641f2c728eecf318850446a53d6a7baf53efd33caebd1de27007a227cf48ad8d7d8ef3183d519aade2167dc9cfab3a0e33c6f37ec83b21808742f201f11e781 use-posix-addr-struct.patch 9d528ad802f0f945f96d22c5abcc3b716abd9f3f7827a745868cff5ee19dedc6ba54f9471881b2d3cd3d2d22b2e368a8280d8c49bdba0804ba86581f34f571e3 strip-whitespace.patch 33e222d9bfe05eb3c0e6a4ed706573d3c4989dc84634d4ad505a2fc7c052f5ec5919ca6613c72ef496e95046a9208a1450af47227e220ca11b93a9fb115dd6db 32-bit-fix.patch diff --git a/community/gvm-libs/strptime.patch b/community/gvm-libs/strptime.patch index d2c98d51078..fa7b7e9499f 100644 --- a/community/gvm-libs/strptime.patch +++ b/community/gvm-libs/strptime.patch @@ -1,32 +1,17 @@ diff --git a/base/nvti.c b/base/nvti.c -index 97f1ec63..f1f36cc7 100644 +index 5a9df61..6c8a59b 100644 --- a/base/nvti.c +++ b/base/nvti.c -@@ -192,22 +192,19 @@ parse_nvt_timestamp (const gchar *str_time) - /* $Date: 2012-02-17 16:05:26 +0100 (Fr, 17. Feb 2012) $ */ - /* $Date: Fri, 11 Nov 2011 14:42:28 +0100 $ */ +@@ -307,10 +307,10 @@ parse_nvt_timestamp (const gchar *str_time) + + /* 2011-08-09 08:20:34 +0200 (Tue, 09 Aug 2011) */ memset (&tm, 0, sizeof (struct tm)); - if (strptime ((char *) str_time, "%F %T %z", &tm) == NULL) + if (strptime ((char *) str_time, "%Y-%m-%d %T +%H%M", &tm) == NULL && strptime ((char *) str_time, "%Y-%m-%d %T -%H%M", &tm) == NULL) { memset (&tm, 0, sizeof (struct tm)); -- if (strptime ((char *) str_time, "$Date: %F %T %z", &tm) == NULL) -+ if (strptime ((char *) str_time, "$Date: %Y-%m-%d %T +%H%M", &tm) == NULL && strptime ((char *) str_time, "$Date: %Y-%m-%d %T -%H%M", &tm) == NULL) +- if (strptime ((char *) str_time, "%a %b %d %T %Y %z", &tm) == NULL) ++ if (strptime ((char *) str_time, "%Y-%m-%d %T +%H%M", &tm) == NULL && strptime ((char *) str_time, "%Y-%m-%d %T -%H%M", &tm) == NULL) { - memset (&tm, 0, sizeof (struct tm)); -- if (strptime ((char *) str_time, "%a %b %d %T %Y %z", &tm) == NULL) -+ if (strptime ((char *) str_time, "%a %b %d %T %Y +%H%M", &tm) == NULL && strptime ((char *) str_time, "%a %b %d %T %Y -%H%M", &tm) == NULL) - { - memset (&tm, 0, sizeof (struct tm)); -- if (strptime ((char *) str_time, "$Date: %a, %d %b %Y %T %z", &tm) -- == NULL) -+ if (strptime ((char *) str_time, "$Date: %a, %d %b %Y %T +%H%M", &tm) == NULL && strptime ((char *) str_time, "$Date: %a, %d %b %Y %T -%H%M", &tm) == NULL) - { - memset (&tm, 0, sizeof (struct tm)); -- if (strptime ((char *) str_time, "$Date: %a %b %d %T %Y %z", -- &tm) -- == NULL) -+ if (strptime ((char *) str_time, "$Date: %a %b %d %T %Y +%H%M", &tm) == NULL && strptime ((char *) str_time, "$Date: %a %b %d %T %Y -%H%M", &tm) == NULL) - { - g_warning ("%s: Failed to parse time: %s", __FUNCTION__, - str_time); + g_warning ("%s: Failed to parse time: %s", __func__, str_time); + return 0; diff --git a/community/gvm-tools/APKBUILD b/community/gvm-tools/APKBUILD index 4e0294173ce..e198a03db87 100644 --- a/community/gvm-tools/APKBUILD +++ b/community/gvm-tools/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=gvm-tools # follow the same version of py3-gvm -pkgver=24.1.0 -pkgrel=1 +pkgver=24.3.0 +pkgrel=0 pkgdesc="Collection of tools for remote controlling a OpenVAS / Greenbone" url="https://github.com/greenbone/gvm-tools" arch="noarch" @@ -35,5 +35,5 @@ package() { } sha512sums=" -6138c6c85421c7b011b73c2c857e9481cd46622ad3627a8d85c50563ebbd3c6d5cae80f43118ec85ef243fb965dcbe1cd7c1df29326f1d81b21c56ad117bef28 gvm-tools-24.1.0.tar.gz +bf482a9bfdb9a65851ecf0ad2b66d773cb3dd3b5a0bace1b8ac7d52add4042134f83d95f41d275a426016d3bf21d2b64d42fcaa1ac84aa87ab6f73a5b0a1237f gvm-tools-24.3.0.tar.gz " diff --git a/community/gvmd/APKBUILD b/community/gvmd/APKBUILD index 6f4a12698b8..b4b43c53913 100644 --- a/community/gvmd/APKBUILD +++ b/community/gvmd/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=gvmd -pkgver=23.4.0 +pkgver=23.6.2 #PostgreSQL version _pgver=16 # match postgres clang @@ -10,7 +10,8 @@ _llvmver=15 pkgrel=0 pkgdesc="Greenbone Vulnerability Manager" url="https://www.openvas.org/" -arch="all" +# loongarch64 blocked by llvm15 +arch="all !loongarch64" license="AGPL-3.0" pkgusers="gvm" pkggroups="gvm" @@ -89,7 +90,7 @@ EOF } sha512sums=" -0c5b0d933444d25253e234f387e9063ebbeb379d330cab9ca4eaaddc0effe6fbda312b8de51b5f9784141d149f83b6f0069d7e1f72674857b8d041ab9bff6dfd gvmd-23.4.0.tar.gz +935af9a842d7b82a8467ccbb9edf1c9e8ea05c4f8a4e263c3692a2d8993209312af3d760943e32c77f8c12d2220771b9731b10dba59c89d2570682a3e363767d gvmd-23.6.2.tar.gz 02c8acb54a765d840747156a58a126bdc2d2c7f587c71109d83404100a5b81300ca68ed8b2f7e4637581fa9bbe3016809c70f1dc5fc5099a2f173ddb0299a72f gvmd.initd 7c5520be5d2efdb6f9b6a4d80d00accd45d6663c184b2200f84d9394d11782f17b273037c8a42c1be8508b86c4478db0e634bf03e86054f45af70d77690f80b3 gvmd.logrotate 4fda7d5051f9d1ca069becbcc0e82b20d76fd9f7c7abf4a4f05ab55c17fba54dbe269607ee6360b034e8a1674a38680775e2ffc4120b12c7b679564ba4c87ed4 greenbone-certdata-sync.conf diff --git a/community/gwenview/APKBUILD b/community/gwenview/APKBUILD index 2dd12ee55dd..93ceb98daf3 100644 --- a/community/gwenview/APKBUILD +++ b/community/gwenview/APKBUILD @@ -7,8 +7,8 @@ pkgname=gwenview pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -> purpose -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt6-qtwebengine -> purpose +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kde.org/applications/graphics/org.kde.gwenview" pkgdesc="Fast and easy to use image viewer by KDE" license="GPL-2.0-only" diff --git a/community/halloy/APKBUILD b/community/halloy/APKBUILD index 987db264cbe..02999561912 100644 --- a/community/halloy/APKBUILD +++ b/community/halloy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=halloy -pkgver=2024.6 +pkgver=2024.7 pkgrel=0 pkgdesc="Rust graphical IRC client supporting IRCv3.2 capabilities" url="https://github.com/squidowl/halloy" @@ -47,5 +47,5 @@ package() { } sha512sums=" -69786924eaf2bca2ed7323446d9573806bf6537274a9c9491825cbfd251f12bc989c69caea36355e31d26bdb4d43da204cc9f9aaacdc267096ac6cd2d9369f14 halloy-2024.6.tar.gz +a3c178764ca1d9e80dd010eb5f1730a956f55dcde4b7498eb379db3c553666c20e70cccfe0461936a3206864a58000f4c3d6cad46f4818a89172d5ed0097ba0f halloy-2024.7.tar.gz " diff --git a/community/hare-ev/APKBUILD b/community/hare-ev/APKBUILD index 9573a6fca06..659dba0184a 100644 --- a/community/hare-ev/APKBUILD +++ b/community/hare-ev/APKBUILD @@ -5,7 +5,7 @@ _commit=736ab9bb17257ee5eba3bc96f6650fc4a14608ea pkgrel=0 pkgdesc="Event loop for Hare" url="https://git.sr.ht/~sircmpwn/hare-ev" -arch="noarch !armhf !ppc64le !s390x !armv7 !x86" # hare +arch="noarch !armhf !ppc64le !s390x !armv7 !x86 !loongarch64" # hare license="MPL-2.0" makedepends="hare" source=" diff --git a/community/hare-json/APKBUILD b/community/hare-json/APKBUILD index e659e671aed..d86059460b0 100644 --- a/community/hare-json/APKBUILD +++ b/community/hare-json/APKBUILD @@ -5,7 +5,7 @@ _commit=88256102a9fec62d494628e32cb406574e49e5e1 pkgrel=0 pkgdesc="JSON support for Hare" url="https://sr.ht/~sircmpwn/hare-json" -arch="noarch !armhf !ppc64le !s390x !armv7 !x86" # hare +arch="noarch !armhf !ppc64le !s390x !armv7 !x86 !loongarch64" # hare license="MPL-2.0" makedepends="hare" source=" diff --git a/community/hare-ssh/APKBUILD b/community/hare-ssh/APKBUILD index 9cf088602a7..813a8834282 100644 --- a/community/hare-ssh/APKBUILD +++ b/community/hare-ssh/APKBUILD @@ -5,7 +5,7 @@ _commit=e127e44cdce948b062edfe754776c3daa7ad8204 pkgrel=2 pkgdesc="SSH support for Hare" url="https://sr.ht/~sircmpwn/hare-ssh" -arch="noarch !armhf !armv7 !ppc64le !s390x !x86" #hare +arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" #hare license="MPL-2.0" makedepends="hare" source=" diff --git a/community/hare/APKBUILD b/community/hare/APKBUILD index d1fe995a85a..a3a6589d535 100644 --- a/community/hare/APKBUILD +++ b/community/hare/APKBUILD @@ -12,8 +12,8 @@ checkdepends="tzdata" subpackages="$pkgname-doc" source=" $pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/hare/archive/$pkgver.tar.gz - $pkgname-rv64-fix.patch::https://git.sr.ht/~sircmpwn/hare/commit/80e45e4d931a6e90d999846b86471cac00d2a6d5.patch -" + $pkgname-rv64-fix.patch + " build() { cp configs/linux.mk config.mk @@ -30,5 +30,5 @@ package() { sha512sums=" d7b96bc031d432e0ca0a9186a043d4cd4af4d4b57be5ce4b913d6acd26cdb708d8c9ad8e2c64c78c192a11a96977d3e916985a548238591b3c4d177b9cc811d9 hare-0.24.0.tar.gz -6e38375cc4b7c6d316e6d42deb285d2245256307aaafb3dad985be1bbeaa82ecadc9bdcc99505156fb4f398f96123ca48e136cbd23c6f39a539cd684c1fff97a hare-rv64-fix.patch +8982c00cab8449220c0871b60c603e50aaf7b5a2c3015a4ea6d2fad57bcd944203db15e536725f322bcbdf4494fdf39d586d6ddf3c7e11f2c8e0c6461986b974 hare-rv64-fix.patch " diff --git a/community/hare/hare-rv64-fix.patch b/community/hare/hare-rv64-fix.patch new file mode 100644 index 00000000000..19fceb51d85 --- /dev/null +++ b/community/hare/hare-rv64-fix.patch @@ -0,0 +1,25 @@ +From 80e45e4d931a6e90d999846b86471cac00d2a6d5 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@suse.de> +Date: Wed, 21 Feb 2024 22:05:02 +0100 +Subject: [PATCH] debug+riscv: use correct comment syntax + +Signed-off-by: Andreas Schwab <schwab@suse.de> +--- + debug/+riscv64/getfp.s | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/debug/+riscv64/getfp.s b/debug/+riscv64/getfp.s +index 9c3698af..b822036a 100644 +--- a/debug/+riscv64/getfp.s ++++ b/debug/+riscv64/getfp.s +@@ -1,5 +1,5 @@ +-// SPDX-License-Identifier: MPL-2.0 +-// (c) Hare authors <https://harelang.org> ++# SPDX-License-Identifier: MPL-2.0 ++# (c) Hare authors <https://harelang.org> + + .section ".text.debug.getfp","ax" + .global debug.getfp +-- +2.43.0 + diff --git a/community/haruna/APKBUILD b/community/haruna/APKBUILD index 2887741818d..6b8b80fc172 100644 --- a/community/haruna/APKBUILD +++ b/community/haruna/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-other pkgname=haruna -pkgver=1.0.2 +pkgver=1.1.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -55,5 +55,5 @@ package() { } sha512sums=" -d87b4ac8dc4ad0d63d9e3941e7f9c9bae5a2678f8b25711e98d29440a9ea295a949c8005dd94077363340156ba550144984cb81051f69d3995bbf593883a14f5 haruna-1.0.2.tar.xz +8ded69235b2243644a396825cf5fbe497b1c6c96fa28a3948771efba12f22d3bb88076099b0b4d330bb7c3b4ad7846b759f50cb49111dbe71c6638741fd3bb2a haruna-1.1.0.tar.xz " diff --git a/community/hashcash/APKBUILD b/community/hashcash/APKBUILD index 4e28ef2a8d1..aa0671b78d2 100644 --- a/community/hashcash/APKBUILD +++ b/community/hashcash/APKBUILD @@ -9,7 +9,6 @@ arch="all" license="Public-Domain" subpackages="$pkgname-doc" source="http://www.hashcash.org/source/hashcash-$pkgver.tgz" -builddir="$srcdir/hashcash-$pkgver" build() { make diff --git a/community/havn/APKBUILD b/community/havn/APKBUILD new file mode 100644 index 00000000000..f956a6920dc --- /dev/null +++ b/community/havn/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Jakub Jirutka <jakub@jirutka.cz> +pkgname=havn +pkgver=0.1.10 +pkgrel=0 +pkgdesc="A fast configurable port scanner with reasonable defaults" +url="https://github.com/mrjackwills/havn" +arch="all" +license="MIT" +makedepends=" + cargo + cargo-auditable + " +source="https://github.com/mrjackwills/havn/archive/v$pkgver/havn-$pkgver.tar.gz" + +prepare() { + default_prepare + + cargo fetch --target="$CTARGET" --locked +} + +build() { + cargo auditable build --frozen --release +} + +check() { + # Disabled tests require extra permissions. + cargo test --frozen -- \ + --skip scanner::tests::test_scanner_1000_80_443 \ + --skip scanner::tests::test_scanner_1000_empty \ + --skip scanner::tests::test_scanner_all_80 \ + --skip scanner::tests::test_scanner_port_80 \ + --skip terminal::print::tests::test_terminal_monochrome_false +} + +package() { + install -D -m755 target/release/$pkgname -t "$pkgdir"/usr/bin/ +} + +sha512sums=" +5f9b44e3f36d5ad14863e919819822671151a39dcf6b2a8a40ab589326e8a890be4161d9b60ebfbc2e4a17a72be41175522d8793e252bbe990ad15c2c2e88617 havn-0.1.10.tar.gz +" diff --git a/community/hdf5/10-version.patch b/community/hdf5/10-version.patch new file mode 100644 index 00000000000..7f6b35fc3fb --- /dev/null +++ b/community/hdf5/10-version.patch @@ -0,0 +1,120 @@ +Author: Holger Jaekel <holger.jaekel@gmx.de> +Summary: use major.minor.patch version number pattern, + parsers from other packages depend on that. +---- + +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,7 @@ + ## NOTE: Do not forget to change the version number here when we do a + ## release!!! + ## +-AC_INIT([HDF5], [1.14.4-2], [help@hdfgroup.org]) ++AC_INIT([HDF5], [1.14.4], [help@hdfgroup.org]) + + AC_CONFIG_SRCDIR([src/H5.c]) + AC_CONFIG_HEADERS([src/H5config.h]) +--- a/src/H5public.h ++++ b/src/H5public.h +@@ -91,7 +91,7 @@ + /** + * Full version string + */ +-#define H5_VERS_INFO "HDF5 library version: 1.14.4-2" ++#define H5_VERS_INFO "HDF5 library version: 1.14.4" + + #define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE) + +--- a/configure ++++ b/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.71 for HDF5 1.14.4-2. ++# Generated by GNU Autoconf 2.71 for HDF5 1.14.4. + # + # Report bugs to <help@hdfgroup.org>. + # +@@ -629,8 +629,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='HDF5' + PACKAGE_TARNAME='hdf5' +-PACKAGE_VERSION='1.14.4-2' +-PACKAGE_STRING='HDF5 1.14.4-2' ++PACKAGE_VERSION='1.14.4' ++PACKAGE_STRING='HDF5 1.14.4' + PACKAGE_BUGREPORT='help@hdfgroup.org' + PACKAGE_URL='' + +@@ -1716,7 +1716,7 @@ if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +-\`configure' configures HDF5 1.14.4-2 to adapt to many kinds of systems. ++\`configure' configures HDF5 1.14.4 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1787,7 +1787,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of HDF5 1.14.4-2:";; ++ short | recursive ) echo "Configuration of HDF5 1.14.4:";; + esac + cat <<\_ACEOF + +@@ -2110,7 +2110,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-HDF5 configure 1.14.4-2 ++HDF5 configure 1.14.4 + generated by GNU Autoconf 2.71 + + Copyright (C) 2021 Free Software Foundation, Inc. +@@ -2922,7 +2922,7 @@ cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + +-It was created by HDF5 $as_me 1.14.4-2, which was ++It was created by HDF5 $as_me 1.14.4, which was + generated by GNU Autoconf 2.71. Invocation command line was + + $ $0$ac_configure_args_raw +@@ -4422,7 +4422,7 @@ fi + + # Define the identity of the package. + PACKAGE='hdf5' +- VERSION='1.14.4-2' ++ VERSION='1.14.4' + + + printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h +@@ -36065,7 +36065,7 @@ Usage: $0 [OPTIONS] + Report bugs to <bug-libtool@gnu.org>." + + lt_cl_version="\ +-HDF5 config.lt 1.14.4-2 ++HDF5 config.lt 1.14.4 + configured by $0, generated by GNU Autoconf 2.71. + + Copyright (C) 2011 Free Software Foundation, Inc. +@@ -38161,7 +38161,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" +-This file was extended by HDF5 $as_me 1.14.4-2, which was ++This file was extended by HDF5 $as_me 1.14.4, which was + generated by GNU Autoconf 2.71. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -38233,7 +38233,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config='$ac_cs_config_escaped' + ac_cs_version="\\ +-HDF5 config.status 1.14.4-2 ++HDF5 config.status 1.14.4 + configured by $0, generated by GNU Autoconf 2.71, + with options \\"\$ac_cs_config\\" + diff --git a/community/hdf5/APKBUILD b/community/hdf5/APKBUILD index 8ba01ff5480..c3018462ca9 100644 --- a/community/hdf5/APKBUILD +++ b/community/hdf5/APKBUILD @@ -10,8 +10,9 @@ # builds, due to inadequate locking. pkgname=hdf5 -pkgver=1.14.3 -_pkgver=${pkgver/_p/-} +_basepkgver=1.14.4 +_suffixpkgver=2 +pkgver=$_basepkgver.$_suffixpkgver pkgrel=0 pkgdesc="HDF5 is a data model, library, and file format for storing and managing data" url="https://www.hdfgroup.org/solutions/hdf5/" @@ -21,8 +22,9 @@ depends_dev="zlib-dev" makedepends="cmake $depends_dev gfortran libaec-dev perl" checkdepends="diffutils" subpackages="$pkgname-tools $pkgname-fortran $pkgname-cpp $pkgname-hl $pkgname-hl-fortran:hl_fortran $pkgname-hl-cpp:hl_cpp $pkgname-static $pkgname-doc $pkgname-dev" -source="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${pkgver%.*}/hdf5-${pkgver%_*}/src/hdf5-$_pkgver.tar.bz2" -builddir=$srcdir/$pkgname-$_pkgver +source="https://github.com/HDFGroup/hdf5/releases/download/hdf5_$pkgver/hdf5-$_basepkgver-$_suffixpkgver.tar.gz + 10-version.patch" +builddir=$srcdir/$pkgname-$_basepkgver-$_suffixpkgver # Optional dependency java-jdk is not available on riscv64 # Tests fail on s390x and x86 @@ -110,11 +112,11 @@ check() { # Without this, checks are failing with messages like # "error while loading shared libraries: libhdf5.so.101: cannot open shared object file: No such file or directory" export LD_LIBRARY_PATH="$srcdir"/$pkgname-${pkgver/_/-}/src/.libs/ - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$srcdir"/$pkgname-${pkgver/_/-}/c++/src/.libs/ - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$srcdir"/$pkgname-${pkgver/_/-}/fortran/src/.libs/ - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$srcdir"/$pkgname-${pkgver/_/-}/hl/src/.libs/ - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$srcdir"/$pkgname-${pkgver/_/-}/hl/c++/src/.libs/ - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$srcdir"/$pkgname-${pkgver/_/-}/hl/fortran/src/.libs/ + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$builddir/c++/src/.libs/" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$builddir/fortran/src/.libs/" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$builddir/hl/src/.libs/" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$builddir/hl/c++/src/.libs/" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$builddir/hl/fortran/src/.libs/" make check } @@ -160,8 +162,8 @@ java() { pkgdesc="Java bindings for HDF5 library" mkdir -p "$subpkgdir"/usr/share/java/ mkdir -p "$subpkgdir"/usr/lib/jni/ - mv "$pkgdir"/usr/lib/jarhdf5-$_pkgver.jar "$subpkgdir"/usr/share/java/ - ln -s jarhdf5-$_pkgver.jar "$subpkgdir"/usr/share/java/jarhdf5.jar + mv "$pkgdir"/usr/lib/jarhdf5-$_basepkgver.jar "$subpkgdir"/usr/share/java/ + ln -s jarhdf5-$_basepkgver.jar "$subpkgdir"/usr/share/java/jarhdf5.jar mv "$pkgdir"/usr/lib/libhdf5_java.so "$subpkgdir"/usr/lib/jni/ } @@ -171,5 +173,6 @@ dev() { } sha512sums=" -06d51638a56f387f6d0ef484b72e182509c15ab639315052be9821adeed6ad08551c50d7fe84d2b550b64211f68484cf3022a4660c8004cd0afd90eaa83c1bb1 hdf5-1.14.3.tar.bz2 +f1714b7999468d580b7cae2e575d3d7f31cea2fb81bfa4e37abd248d7223476b2351d1714197ace04eee970b451cf1f6971f5a291fd7426398737b8d7eb26924 hdf5-1.14.4-2.tar.gz +4648fea26aebc3fe34befd99ce58adbef5f22bac96cda68f1154bb09b8a2d5bca07023e884615235741767927cf051340544df6a35e33b2d09cfd5e7c5540389 10-version.patch " diff --git a/community/headlines/APKBUILD b/community/headlines/APKBUILD index 033d7b4be6f..38d54f11659 100644 --- a/community/headlines/APKBUILD +++ b/community/headlines/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adam Plumb <adamplumb@gmail.com> pkgname=headlines pkgver=0.7.2 -pkgrel=5 +pkgrel=7 pkgdesc="GTK4 Reddit client written in C++" url="https://gitlab.com/caveman250/Headlines" arch="all !s390x !riscv64" diff --git a/community/helix/APKBUILD b/community/helix/APKBUILD index 5f3c0bd6f56..77558dda99d 100644 --- a/community/helix/APKBUILD +++ b/community/helix/APKBUILD @@ -16,6 +16,7 @@ _tsrust_ver="0.20.4" source="https://github.com/helix-editor/helix/archive/$pkgver/helix-$pkgver.tar.gz https://github.com/tree-sitter/tree-sitter-rust/archive/v$_tsrust_ver/tree-sitter-rust-$_tsrust_ver.tar.gz runtime-dir-fhs-location.patch + tests-fix-pretty-print-and-textobject-tests.patch " # Don't build tree-sitter languages, we provide them in standalone aports. @@ -70,4 +71,5 @@ sha512sums=" d9815e4dbcc897b4f6cd394a1e9060ed56832f18b2cf9542aa03b78f4d49213b2d74d748197b25df3d459dbeefb68915f67511b402504185d64908c10eb9377e helix-24.03.tar.gz f1b2e9537286921056eda4e96faa9f61131b9ca5684e7ab8aa7bd07e46d91e5eab18e6e292cfad7cdcb7ba195e80f7f1e35f04992cb8011bbd29dd2d95116f9d tree-sitter-rust-0.20.4.tar.gz 0d72f5528106df006764a201caf7fefa860e67646198818fd744257050ac566082569b289f0a1815dd14f0b1364e344f8841e3c6757377d8452d8ebd5b022d29 runtime-dir-fhs-location.patch +7e7b8ef4685b8458a5390b1e5a83d06e43a62404ce752f1ac191ee51db112e30c419689155ef4cfff91619ea05c084261554a3ba977dbbc6b5ca23b975e06f1e tests-fix-pretty-print-and-textobject-tests.patch " diff --git a/community/helix/tests-fix-pretty-print-and-textobject-tests.patch b/community/helix/tests-fix-pretty-print-and-textobject-tests.patch new file mode 100644 index 00000000000..89c64c51b25 --- /dev/null +++ b/community/helix/tests-fix-pretty-print-and-textobject-tests.patch @@ -0,0 +1,79 @@ +Url: https://github.com/helix-editor/helix/commit/0546273570710b97e9eebfff84298afbbb372f02 + +From 0546273570710b97e9eebfff84298afbbb372f02 Mon Sep 17 00:00:00 2001 +From: Pedro Fedricci <pedromfedricci@gmail.com> +Date: Mon, 15 Apr 2024 13:07:15 -0300 +Subject: [PATCH] chore: update tree-sitter-rust to v0.21.0 (#10365) + +* chore: update tree-sitter-rust to 0.21.0 + +* fix: pretty print and textobject tests +--- + helix-core/src/syntax.rs | 11 ++++++----- + languages.toml | 2 +- + runtime/queries/rust/highlights.scm | 2 +- + 3 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs +index 78abc0b0a740..3cf818f60d6f 100644 +--- a/helix-core/src/syntax.rs ++++ b/helix-core/src/syntax.rs +@@ -2765,10 +2765,10 @@ mod test { + ) + }; + +- test("quantified_nodes", 1..36); ++ test("quantified_nodes", 1..37); + // NOTE: Enable after implementing proper node group capturing +- // test("quantified_nodes_grouped", 1..36); +- // test("multiple_nodes_grouped", 1..36); ++ // test("quantified_nodes_grouped", 1..37); ++ // test("multiple_nodes_grouped", 1..37); + } + + #[test] +@@ -2939,7 +2939,7 @@ mod test { + + #[test] + fn test_pretty_print() { +- let source = r#"/// Hello"#; ++ let source = r#"// Hello"#; + assert_pretty_print("rust", source, "(line_comment)", 0, source.len()); + + // A large tree should be indented with fields: +@@ -2958,7 +2958,8 @@ mod test { + " (macro_invocation\n", + " macro: (identifier)\n", + " (token_tree\n", +- " (string_literal))))))", ++ " (string_literal\n", ++ " (string_content)))))))", + ), + 0, + source.len(), +diff --git a/languages.toml b/languages.toml +index 1a345add9ae1..ea1607d84fe9 100644 +--- a/languages.toml ++++ b/languages.toml +@@ -250,7 +250,7 @@ args = { attachCommands = [ "platform select remote-gdb-server", "platform conne + + [[grammar]] + name = "rust" +-source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9" } ++source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "473634230435c18033384bebaa6d6a17c2523281" } + + [[language]] + name = "sway" +diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm +index 09068b4f54f5..1c0f799b1fed 100644 +--- a/runtime/queries/rust/highlights.scm ++++ b/runtime/queries/rust/highlights.scm +@@ -51,7 +51,7 @@ + (lifetime + "'" @label + (identifier) @label) +-(loop_label ++(label + "'" @label + (identifier) @label) + diff --git a/testing/heplify-server/APKBUILD b/community/heplify-server/APKBUILD index 276505c4081..698bb7187b0 100644 --- a/testing/heplify-server/APKBUILD +++ b/community/heplify-server/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=heplify-server pkgver=1.59.7 -pkgrel=0 +pkgrel=3 pkgdesc="HEP Capture Server & Switch in Go" url="http://sipcapture.io" -arch="all !riscv64 !ppc64le" # FTBFS +arch="all !riscv64 !ppc64le !loongarch64" # FTBFS license="AGPL-3.0-or-later" makedepends="go" install="$pkgname.pre-install" @@ -15,7 +15,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/sipcapture/heplify-server/ar " case $CARCH in - ppc64le|riscv64) + ppc64le|riscv64|loongarch64) makedepends="$makedepends lua5.1-dev" export GOFLAGS="$GOFLAGS -tags=llua" ;; @@ -55,11 +55,11 @@ check() { package() { install -D -m755 heplify-server "$pkgdir"/usr/bin/heplify-server install -D -m644 example/homer7_config/heplify-server.toml \ - "$pkgdir"/etc/homer/heplify-server.toml + "$pkgdir"/etc/heplify-server/heplify-server.toml install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } sha512sums=" 3da594d16977ac967d2c52316f5634fbfb0a7464e44426eb1c8e55d0a47a3a4eea28964f12c53f4ac33deb88476816049544cf95973762ba99554ef368adea39 heplify-server-1.59.7.tar.gz -72527dd11ee03923e9dbddf10929b3cb3b768d96aa33a7e04dae211d2198539f4d93303790bd2dcf8957c0fcc75afb45b03f6d2a40caabde616dc561e15c84ef heplify-server.initd +f090147fa00fa3c12bce3dd7dffbe97fe0eb5ab61cfccac996921ea36c957ffc55ce53f45e4d1f1b8e0bcc7b4ac7eb3bf362ab6d65b46f2619336d3c18197a11 heplify-server.initd " diff --git a/testing/heplify-server/heplify-server.initd b/community/heplify-server/heplify-server.initd index 3f31a3b7a40..a9ac2e5be44 100644 --- a/testing/heplify-server/heplify-server.initd +++ b/community/heplify-server/heplify-server.initd @@ -2,12 +2,13 @@ description="HEP Capture Server & Switch" command=/usr/bin/heplify-server -command_args="-config /etc/homer/heplify-server.toml" +command_args="-config ${CONFIG_FILE:-/etc/heplify-server/heplify-server.toml} -logstd false -logsys true" command_background=yes -command_user=homer -command_group=homer -pidfile="/run/homer/${RC_SVCNAME}.pid" +command_user="${USER:-homer}" +command_group="${GROUP:-homer}" +pidfile="/run/heplify-server/${RC_SVCNAME}.pid" extra_started_commands=reload +start_stop_daemon_args="--stderr /var/log/heplify-server/heplify-server.log" depend() { need net @@ -15,7 +16,7 @@ depend() { } start_pre() { - checkpath --directory --owner $command_user:$command_group ${pidfile%/*} + checkpath --directory --owner $command_user:$command_group ${pidfile%/*} /var/log/heplify-server } reload() { @@ -23,4 +24,3 @@ reload() { start-stop-daemon --signal HUP --pidfile "${pidfile}" eend $? } - diff --git a/testing/heplify-server/heplify-server.pre-install b/community/heplify-server/heplify-server.pre-install index aa6784b877b..aa6784b877b 100644 --- a/testing/heplify-server/heplify-server.pre-install +++ b/community/heplify-server/heplify-server.pre-install diff --git a/testing/heplify/APKBUILD b/community/heplify/APKBUILD index 02f3aaa65f9..59f5a896d12 100644 --- a/testing/heplify/APKBUILD +++ b/community/heplify/APKBUILD @@ -1,19 +1,18 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=heplify pkgver=1.66.2 -pkgrel=0 +pkgrel=1 pkgdesc="Multi-Protocol Go HEP Capture Agent made Simple" url="http://sipcapture.io" -arch="all !riscv64 !ppc64le" # FTBFS, luajit +arch="all !riscv64 !ppc64le !loongarch64" # FTBFS, luajit license="AGPL-3.0-or-later" makedepends="go libpcap-dev linux-headers luajit-dev" subpackages="$pkgname-openrc" +options="net !check" #https://github.com/sipcapture/heplify/issues/286 source="$pkgname-$pkgver.tar.gz::https://github.com/sipcapture/heplify/archive/refs/tags/v$pkgver.tar.gz $pkgname.initd $pkgname.confd " -# net required to download Go dependencies -options="net !check" #several tests failing export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -22,6 +21,8 @@ export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" prepare() { default_prepare go mod download + # required for tests + go get -t github.com/sipcapture/heplify/ip6defrag } build() { @@ -29,7 +30,7 @@ build() { } check() { - go test -v ./... + go test -v -skip "sniffer" ./... } package() { @@ -45,6 +46,6 @@ cleanup_srcdir() { sha512sums=" 1ddc412c2a596e0b546681882dccf904d7b2958e71a3cc268dfdc75744f6c3917a811cfac4268bcc810b7c39fe63144940137acc0963756ebd6356e4fb3ed63a heplify-1.66.2.tar.gz -0caa79fb124971bf68cd96336d127975ea8427962eed8d9e6fb68d4aa26ed635aa03746b6fcae4932a38c105beb6e267e96c7d41d495c799436cb91005405eee heplify.initd -da89419e17acd25cca30af13cca1a9278283cbe258de30da747fafa41bd567e3337992a8f1773cdc2eb64848ec35c30a132f81a10dada5d4dae431ef29d391f0 heplify.confd +d71005c23c156526ece1bece54e432f6e35748caba756adaee195ed6873a303ae5926e693bd5cfbe0560e3ecd74d3b66f8319869bfc5997541a6dab52ea71c01 heplify.initd +9fc9e65e2bd83f52f78759c1aff2a45326deb1ccc66423957ca024b4c648c8c0430af0ab423020d4a4da67b27b1411999d756d3b82ec1b3ddc802ee8b38c1ac7 heplify.confd " diff --git a/testing/heplify/heplify.confd b/community/heplify/heplify.confd index 5a716c01962..c2128da6540 100644 --- a/testing/heplify/heplify.confd +++ b/community/heplify/heplify.confd @@ -17,4 +17,4 @@ # -d Enable certain debug selectors [fragment,layer,payload,rtp,rtcp,sdp] # Default -# CMD_OPTS="-i lo" +# HEPLIFY_OPTS="-i lo" diff --git a/community/heplify/heplify.initd b/community/heplify/heplify.initd new file mode 100644 index 00000000000..e5c97c7a6e3 --- /dev/null +++ b/community/heplify/heplify.initd @@ -0,0 +1,18 @@ +#!/sbin/openrc-run + +: ${HEPLIFY_OPTS:="-i lo"} + +description="Multi-Protocol Go HEP Capture Agent" +command=/usr/bin/heplify +command_args="$HEPLIFY_OPTS -p /var/log/heplify" +command_background=yes +pidfile="/run/heplify/${RC_SVCNAME}.pid" + +depend() { + need net + after firewall +} + +start_pre() { + checkpath --directory --owner $command_user:$command_group ${pidfile%/*} /var/log/heplify +} diff --git a/community/hermes/APKBUILD b/community/hermes/APKBUILD index 1c1f2d729e1..a8318ffb372 100644 --- a/community/hermes/APKBUILD +++ b/community/hermes/APKBUILD @@ -9,7 +9,8 @@ arch="all" license="GPL-2.0-only" makedepends="libspf2-dev sqlite-dev perl gettext-dev openssl-dev>3 doxygen" subpackages="$pkgname-doc" -source="https://hermes-project.com/files/hermes-$pkgver.tar.bz2 +#source="https://hermes-project.com/files/hermes-$pkgver.tar.bz2 +source="https://distfiles.alpinelinux.org/distfiles/edge/hermes-$pkgver.tar.bz2 Utils.cpp.patch openssl-1.1.patch fix-string-declares-ppc64le.patch diff --git a/community/hfsfuse/APKBUILD b/community/hfsfuse/APKBUILD index ce84965e248..6fc4d18257c 100644 --- a/community/hfsfuse/APKBUILD +++ b/community/hfsfuse/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=hfsfuse -pkgver=0.199 +pkgver=0.214 pkgrel=0 pkgdesc="FUSE driver for HFS+ filesystems" url="https://github.com/0x09/hfsfuse" @@ -11,6 +11,7 @@ makedepends=" fuse-dev linux-headers utf8proc-dev + zlib-dev " source="https://github.com/0x09/hfsfuse/releases/download/$pkgver/hfsfuse-$pkgver.tar.gz" options="!check" # no tests provided @@ -31,5 +32,5 @@ package() { } sha512sums=" -ca2c39b9d6778988e15d62fe0c8e326e34f24a0447034cec803baae44f9ccf4df62fe78e121010f930e49c2f87ebd70f9737f5db849e97b28d926a3e0afab2dd hfsfuse-0.199.tar.gz +1c15600bfdd7bf67c8d7fd22077d61d8fbc4d0314a68602a2f7e6b069bcb28a889df0f2f7d40080bd23f2d77f7b5283ce01cdf9464bb57fbeee47e90c09c6a6b hfsfuse-0.214.tar.gz " diff --git a/community/highscore/APKBUILD b/community/highscore/APKBUILD index b79aa54dfde..0195c2ce561 100644 --- a/community/highscore/APKBUILD +++ b/community/highscore/APKBUILD @@ -23,7 +23,8 @@ makedepends=" vala " subpackages="$pkgname-lang" -source="https://gitlab.gnome.org/World/highscore/-/archive/$pkgver/highscore-$pkgver.tar.gz +#source="https://gitlab.gnome.org/World/highscore/-/archive/$pkgver/highscore-$pkgver.tar.gz +source="https://distfiles.alpinelinux.org/distfiles/edge/highscore-$pkgver.tar.gz 0001-merge-file.patch 0002-use-tracker-3.0.patch libsoup3.patch diff --git a/community/highway/APKBUILD b/community/highway/APKBUILD index 42523c7208f..b8859a2d6f9 100644 --- a/community/highway/APKBUILD +++ b/community/highway/APKBUILD @@ -16,8 +16,9 @@ subpackages=" source="https://github.com/google/highway/archive/$pkgver/highway-$pkgver.tar.gz" case "$CARCH" in -# ppc64le: detects PPC9 as baseline on the builder cpu, even though actually PPC8 -ppc64le) options="$options !check" ;; + # ppc64le: detects PPC9 as baseline on the builder cpu, even though actually PPC8 + # riscv64: https://github.com/google/highway/issues/2125 + ppc64le|riscv64) options="$options !check" ;; esac build() { diff --git a/community/himalaya/APKBUILD b/community/himalaya/APKBUILD index ba6c428f1f6..fb63a10b5a1 100644 --- a/community/himalaya/APKBUILD +++ b/community/himalaya/APKBUILD @@ -51,6 +51,9 @@ build() { } check() { + # Increase stack size to avoid stack overflow while compiling 'p384'. + export RUST_MIN_STACK="4194304" + # skip imap backend e2e test cargo test --frozen $_features -- \ --skip test_imap_backend diff --git a/community/hinsightd/APKBUILD b/community/hinsightd/APKBUILD index 591b6d20529..b6e0bdc64aa 100644 --- a/community/hinsightd/APKBUILD +++ b/community/hinsightd/APKBUILD @@ -13,7 +13,7 @@ pkggroups="$pkgname" subpackages="$pkgname-dbg $pkgname-openrc" source=" https://gitlab.com/tiotags/hin9/-/archive/v$pkgver/hin9-v$pkgver.tar.gz - fix-implicit.patch + fix-statx-redefinition.patch " builddir="$srcdir"/hin9-v$pkgver # no test suite @@ -67,5 +67,5 @@ package() { sha512sums=" 7a4d7d7824b787156e7c87d76e97c2fb5129eb50ecf5ea33a7d1ea2e76718ef81a44f49d3161d2cc131ad6d0f27e61b480a2538651d428c19565d2a58cedc25b hin9-v0.9.20.tar.gz -98d62ed8746a410570adb8d449bda65b0fa2e43e8c24775a6d47b87f6d145ae3cd33e5df3788466f5c55276521c4a7f80f4476c40976682f0d75e7a066d60888 fix-implicit.patch +fe6645d0df91011076dc9dea323ae7824d58d9e3dcf1bbd5599151fe53e3b8b7f05d2e993c06f6c3728eb2e7fb5641f150abd4b41b8b8bd4c09b96e3a5614bb8 fix-statx-redefinition.patch " diff --git a/community/hinsightd/fix-implicit.patch b/community/hinsightd/fix-implicit.patch deleted file mode 100644 index a16ddcf7ef3..00000000000 --- a/community/hinsightd/fix-implicit.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/netcode/uring.c b/src/netcode/uring.c -index 417ec78..c30deeb 100644 ---- a/src/netcode/uring.c -+++ b/src/netcode/uring.c -@@ -15,6 +15,9 @@ - #include "hin_internal.h" - #include "conf.h" - -+int statx(int dirfd, const char *restrict pathname, int flags, -+ unsigned int mask, struct statx *restrict statxbuf); -+ - #if HIN_URING_REDUCE_SYSCALLS - #define io_uring_submit1(x) - #else diff --git a/community/hinsightd/fix-statx-redefinition.patch b/community/hinsightd/fix-statx-redefinition.patch new file mode 100644 index 00000000000..85871518204 --- /dev/null +++ b/community/hinsightd/fix-statx-redefinition.patch @@ -0,0 +1,11 @@ +--- a/src/netcode/uring.c ++++ b/src/netcode/uring.c +@@ -9,8 +9,6 @@ + #include <unistd.h> + #include <fcntl.h> + +-#include <linux/stat.h> +- + #include <basic_vfs.h> // needed for musl + + #include "hin.h" diff --git a/testing/hiredict/APKBUILD b/community/hiredict/APKBUILD index 9c574f9bc92..9c574f9bc92 100644 --- a/testing/hiredict/APKBUILD +++ b/community/hiredict/APKBUILD diff --git a/community/hledger-iadd/APKBUILD b/community/hledger-iadd/APKBUILD index bad4a94631f..e5f51bd078d 100644 --- a/community/hledger-iadd/APKBUILD +++ b/community/hledger-iadd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Dhruvin Gandhi <contact@dhruvin.dev> # Maintainer: Dhruvin Gandhi <contact@dhruvin.dev> pkgname=hledger-iadd -pkgver=1.3.20 -pkgrel=1 +pkgver=1.3.21 +pkgrel=0 pkgdesc="A terminal UI as drop-in replacement for hledger add" url="https://github.com/hpdeifel/hledger-iadd#readme" arch="aarch64 x86_64" # limited by ghc @@ -17,7 +17,6 @@ makedepends=" _llvmver=15 options="net" source="https://hackage.haskell.org/package/hledger-iadd-$pkgver/hledger-iadd-$pkgver.tar.gz - ghc-9.8.patch cabal.project.freeze" export CABAL_DIR="$srcdir"/cabal @@ -49,7 +48,6 @@ package() { } sha512sums=" -0f59a39194eb0af1f9091518af48bbd5782882d65e0d7f567422473d686a663702f27027d443a007d95e690d7b155817667790533683e26d6a7dd11375efdd96 hledger-iadd-1.3.20.tar.gz -f1f99fd95f9d2f20e20dd9bd06536f8ad6f9bc0bbd755f57e7bdadb5fadc413dfa15c61757dc8308ec22f22db0319ad51e8e58db4d86bbe206c81f212d8dafbd ghc-9.8.patch -8277639b63fe41b29e907f2a03121932fe814825a1442f0f749ad83afa0740d0b7a93c7d29463fbcbeb06e3dc9bc5a140b63e950bea47012e76d74a810e13bd7 cabal.project.freeze +26bf43b3c0cfbf9ddbaf1828247a5345efbb8d8d05773adaecec30d54f2122bdc005b745614da7bb58822a7cbb9da1305b70bac890d087dc69038b95eb4bf1d6 hledger-iadd-1.3.21.tar.gz +53342054ee977897698125a61b8e25af1799fa262f664926a156da926fc32d98d1a4d447e4fdc6ac7f90f237782a4b8f0d3a9ac76966274cf581877278f732e9 cabal.project.freeze " diff --git a/community/hledger-iadd/cabal.project.freeze b/community/hledger-iadd/cabal.project.freeze index a00ba906794..3b6207638de 100644 --- a/community/hledger-iadd/cabal.project.freeze +++ b/community/hledger-iadd/cabal.project.freeze @@ -13,7 +13,7 @@ constraints: any.Cabal ==3.10.3.0, aeson +ordered-keymap, any.aeson-pretty ==0.8.10, aeson-pretty -lib-only, - any.ansi-terminal ==1.1, + any.ansi-terminal ==1.1.1, ansi-terminal -example, any.ansi-terminal-types ==1.1, any.array ==0.5.6.0, @@ -41,8 +41,7 @@ constraints: any.Cabal ==3.10.3.0, any.cabal-doctest ==1.0.9, any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, - any.cassava ==0.5.3.0, - cassava -bytestring--lt-0_10_4, + any.cassava ==0.5.3.1, any.cassava-megaparsec ==2.1.1, cassava-megaparsec -dev, any.clock ==0.8.4, @@ -68,7 +67,7 @@ constraints: any.Cabal ==3.10.3.0, any.data-default-instances-old-locale ==0.0.1, any.data-fix ==0.3.2, any.deepseq ==1.5.0.0, - any.directory ==1.3.8.3, + any.directory ==1.3.8.4, directory +os-string, any.distributive ==0.6.2.1, distributive +semigroups +tagged, @@ -91,12 +90,12 @@ constraints: any.Cabal ==3.10.3.0, any.hashtables ==1.3.1, hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks, any.haskell-lexer ==1.1.1, - any.hledger-lib ==1.32.3, + any.hledger-lib ==1.33, any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, - any.hspec ==2.11.7, - any.hspec-core ==2.11.7, - any.hspec-discover ==2.11.7, + any.hspec ==2.11.8, + any.hspec-core ==2.11.8, + any.hspec-discover ==2.11.8, any.hspec-expectations ==0.8.4, any.html ==1.0.1.2, any.indexed-traversable ==0.1.3, @@ -108,13 +107,14 @@ constraints: any.Cabal ==3.10.3.0, megaparsec -dev, any.microlens ==0.4.13.1, any.microlens-mtl ==0.2.0.3, - any.microlens-th ==0.4.3.14, + any.microlens-th ==0.4.3.15, any.mono-traversable ==1.0.17.0, any.mtl ==2.3.1, - any.network ==3.1.4.0, + any.network ==3.2.0.0, network -devel, any.network-uri ==2.6.4.2, any.old-locale ==1.0.0.7, + any.old-time ==1.1.0.4, any.optparse-applicative ==0.18.1.0, optparse-applicative +process, any.os-string ==2.0.2, @@ -129,8 +129,10 @@ constraints: any.Cabal ==3.10.3.0, prettyprinter -buildreadme +text, any.prettyprinter-ansi-terminal ==1.1.3, any.primitive ==0.9.0.0, - any.process ==1.6.18.0, + any.process ==1.6.19.0, any.profunctors ==5.6.2, + any.quickcheck-instances ==0.3.30, + quickcheck-instances -bytestring-builder, any.quickcheck-io ==0.2.0, any.quote-quot ==0.2.1.0, any.random ==1.2.1.2, @@ -184,7 +186,7 @@ constraints: any.Cabal ==3.10.3.0, transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, any.typed-process ==0.2.11.1, any.uglymemo ==0.1.0.1, - any.unix ==2.8.5.0, + any.unix ==2.8.5.1, unix +os-string, any.unix-compat ==0.7.1, unix-compat -old-time, @@ -205,6 +207,6 @@ constraints: any.Cabal ==3.10.3.0, any.witherable ==0.4.2, any.word-wrap ==0.5, any.xdg-basedir ==0.2.2, - any.zlib ==0.7.0.0, + any.zlib ==0.7.1.0, zlib -bundled-c-zlib +non-blocking-ffi +pkg-config -index-state: hackage.haskell.org 2024-04-07T19:49:15Z +index-state: hackage.haskell.org 2024-04-24T23:42:07Z diff --git a/community/hledger-iadd/ghc-9.8.patch b/community/hledger-iadd/ghc-9.8.patch deleted file mode 100644 index fdbcbc2fab0..00000000000 --- a/community/hledger-iadd/ghc-9.8.patch +++ /dev/null @@ -1,13 +0,0 @@ -This patch can be removed once the issue referenced below is resolved. - -diff -uNr hledger-iadd-1.3.20.orig/cabal.project hledger-iadd-1.3.20/cabal.project ---- hledger-iadd-1.3.20.orig/cabal.project 1970-01-01 01:00:00.000000000 +0100 -+++ hledger-iadd-1.3.20/cabal.project 2024-04-08 19:32:40.738079452 +0200 -@@ -0,0 +1,7 @@ -+packages: *.cabal -+ -+-- The most recent hledger release doesn't offically support GHC 9.X yet. -+-- We can work around that by allowing a newer base version for hledger-lib. -+-- -+-- See: https://github.com/simonmichael/hledger/issues/2149 -+allow-newer: hledger-lib:base diff --git a/community/hledger-stockquotes/APKBUILD b/community/hledger-stockquotes/APKBUILD index 31cb120f22b..b9faabfa4df 100644 --- a/community/hledger-stockquotes/APKBUILD +++ b/community/hledger-stockquotes/APKBUILD @@ -5,7 +5,8 @@ pkgver=0.1.2.2 pkgrel=2 pkgdesc="hledger addon that pulls historical stock prices for commodities" url="https://github.com/prikhi/hledger-stockquotes" -arch="x86_64" # limited by GHC +# temp disable due to it fails to build from source +#arch="x86_64" # limited by GHC license="BSD-3-Clause" makedepends="ghc cabal libffi-dev ncurses-dev zlib-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/prikhi/hledger-stockquotes/archive/refs/tags/$pkgver.tar.gz diff --git a/community/hledger/0001-cabal-update-cabal-files.patch b/community/hledger/0001-cabal-update-cabal-files.patch deleted file mode 100644 index b0312665129..00000000000 --- a/community/hledger/0001-cabal-update-cabal-files.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- a/hledger-lib/hledger-lib.cabal -+++ b/hledger-lib/hledger-lib.cabal -@@ -113,7 +113,7 @@ - , aeson-pretty - , ansi-terminal >=0.9 - , array -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , base-compat - , blaze-markup >=0.5.1 - , bytestring -@@ -171,7 +171,7 @@ - , aeson-pretty - , ansi-terminal >=0.9 - , array -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , base-compat - , blaze-markup >=0.5.1 - , bytestring -@@ -232,7 +232,7 @@ - , aeson-pretty - , ansi-terminal >=0.9 - , array -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , base-compat - , blaze-markup >=0.5.1 - , bytestring ---- a/hledger-ui/hledger-ui.cabal -+++ b/hledger-ui/hledger-ui.cabal -@@ -72,7 +72,7 @@ - build-depends: - ansi-terminal >=0.9 - , async -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , brick >=2.1.1 && <2.4 - , cmdargs >=0.8 - , containers >=0.5.9 -@@ -115,7 +115,7 @@ - ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind - cpp-options: -DVERSION="1.32.3" - build-depends: -- base >=4.14 && <4.19 -+ base >=4.14 && <4.20 - , hledger-ui - default-language: Haskell2010 - if flag(threaded) ---- a/hledger-web/hledger-web.cabal -+++ b/hledger-web/hledger-web.cabal -@@ -155,7 +155,7 @@ - build-depends: - Decimal >=0.5.1 - , aeson >=1 && <2.3 -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , base64 - , blaze-html - , blaze-markup -@@ -215,7 +215,7 @@ - ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns - cpp-options: -DVERSION="1.32.3" - build-depends: -- base >=4.14 && <4.19 -+ base >=4.14 && <4.20 - , hledger-web - default-language: Haskell2010 - if (flag(dev)) || (flag(library-only)) -@@ -235,7 +235,7 @@ - ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns - cpp-options: -DVERSION="1.32.3" - build-depends: -- base >=4.14 && <4.19 -+ base >=4.14 && <4.20 - , hledger-web - default-language: Haskell2010 - if (flag(dev)) || (flag(library-only)) ---- a/hledger/hledger.cabal -+++ b/hledger/hledger.cabal -@@ -142,7 +142,7 @@ - , Diff >=0.2 - , aeson >=1 && <2.3 - , ansi-terminal >=0.9 -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , bytestring - , cmdargs >=0.10 - , containers >=0.5.9 -@@ -193,7 +193,7 @@ - Decimal >=0.5.1 - , aeson >=1 && <2.3 - , ansi-terminal >=0.9 -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , bytestring - , cmdargs >=0.10 - , containers >=0.5.9 -@@ -244,7 +244,7 @@ - Decimal >=0.5.1 - , aeson >=1 && <2.3 - , ansi-terminal >=0.9 -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , bytestring - , cmdargs >=0.10 - , containers >=0.5.9 -@@ -292,7 +292,7 @@ - Decimal >=0.5.1 - , aeson >=1 && <2.3 - , ansi-terminal >=0.9 -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , bytestring - , cmdargs >=0.10 - , containers >=0.5.9 diff --git a/community/hledger/0002-fix-imp-stack-build-with-ghc-9.8-latest-stackage-nig.patch b/community/hledger/0002-fix-imp-stack-build-with-ghc-9.8-latest-stackage-nig.patch deleted file mode 100644 index c06d0bf00b4..00000000000 --- a/community/hledger/0002-fix-imp-stack-build-with-ghc-9.8-latest-stackage-nig.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0effd653e83dcd691fa69580a511168a126efd59 Mon Sep 17 00:00:00 2001 -From: Simon Michael <simon@joyful.com> -Date: Thu, 4 Jan 2024 07:58:25 -1000 -Subject: [PATCH] fix:imp:stack: build with ghc 9.8, latest stackage nightly - (part 2) - -Fix the build with GHC < 9.8. - -This reapplies commit 87600e5dd, this time with the correct description. ---- - hledger/Hledger/Cli/Script.hs | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/hledger/Hledger/Cli/Script.hs b/hledger/Hledger/Cli/Script.hs -index e708a1fbd..a4e17145c 100644 ---- a/hledger/Hledger/Cli/Script.hs -+++ b/hledger/Hledger/Cli/Script.hs -@@ -3,6 +3,7 @@ A convenient module to import in hledger scripts, - aiming to provide the most useful imports and reduce boilerplate. - |-} - -+{-# LANGUAGE CPP #-} - {-# LANGUAGE PackageImports #-} - - module Hledger.Cli.Script -@@ -15,7 +16,12 @@ import Control.Concurrent as M - import Control.Monad as M - import Data.Char as M - import Data.Either as M -+ - import Data.Functor as M -+#if MIN_VERSION_base(4,19,0) -+ hiding (unzip) -+#endif -+ - import Data.List as M - import Data.Maybe as M - import Data.Ord as M diff --git a/community/hledger/0003-Workaround-incompatibility-with-base64-and-GHC-9.8.patch b/community/hledger/0003-Workaround-incompatibility-with-base64-and-GHC-9.8.patch deleted file mode 100644 index 0d7f030cc1b..00000000000 --- a/community/hledger/0003-Workaround-incompatibility-with-base64-and-GHC-9.8.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6ad88112a2a8218ab3dc28d3022be3f68dbb8353 Mon Sep 17 00:00:00 2001 -From: Simon Michael <simon@joyful.com> -Date: Sun, 18 Feb 2024 15:17:39 -1000 -Subject: [PATCH] Workaround incompatibility with base64 and GHC 9.8 - -See https://github.com/simonmichael/hledger/issues/2166 ---- - hledger-web/cabal.project | 2 ++ - hledger-web/hledger-web.cabal | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - create mode 100644 hledger-web/cabal.project - -diff --git a/hledger-web/cabal.project b/hledger-web/cabal.project -new file mode 100644 -index 000000000..f16921ad5 ---- /dev/null -+++ b/hledger-web/cabal.project -@@ -0,0 +1,2 @@ -+packages: *.cabal -+allow-newer: base64:base -diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal -index 0a7db4add..4810a51f2 100644 ---- a/hledger-web/hledger-web.cabal -+++ b/hledger-web/hledger-web.cabal -@@ -156,7 +156,7 @@ library - Decimal >=0.5.1 - , aeson >=1 && <2.3 - , base >=4.14 && <4.20 -- , base64 -+ , base64 <1 - , blaze-html - , blaze-markup - , bytestring diff --git a/community/hledger/0004-fix-Hide-ambiguous-instance-for.patch b/community/hledger/0004-fix-Hide-ambiguous-instance-for.patch deleted file mode 100644 index a539c9634af..00000000000 --- a/community/hledger/0004-fix-Hide-ambiguous-instance-for.patch +++ /dev/null @@ -1,50 +0,0 @@ -From de3209a2fbe50093236b95ec525eaea654e9dcb3 Mon Sep 17 00:00:00 2001 -From: Vekhir <134215107+Vekhir@users.noreply.github.com> -Date: Sun, 18 Feb 2024 23:53:29 +0100 -Subject: [PATCH] fix: Hide ambiguous instance for (!?) - -base 4.19.0.0 introduces Data.List.!? which clashes with Data.Vector.!?, the latter of which is needed for vector operations. ---- - hledger-ui/Hledger/UI/AccountsScreen.hs | 5 +++++ - hledger-ui/Hledger/UI/RegisterScreen.hs | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git a/hledger-ui/Hledger/UI/AccountsScreen.hs b/hledger-ui/Hledger/UI/AccountsScreen.hs -index af5dd99bb..28361cce5 100644 ---- a/hledger-ui/Hledger/UI/AccountsScreen.hs -+++ b/hledger-ui/Hledger/UI/AccountsScreen.hs -@@ -1,5 +1,6 @@ - -- The accounts screen, showing accounts and balances like the CLI balance command. - -+{-# LANGUAGE CPP #-} - {-# LANGUAGE OverloadedStrings #-} - {-# LANGUAGE RecordWildCards #-} - {-# LANGUAGE TupleSections #-} -@@ -23,7 +24,11 @@ import Brick.Widgets.List - import Brick.Widgets.Edit - import Control.Monad - import Control.Monad.IO.Class (liftIO) -+#if MIN_VERSION_base(4,19,0) -+import Data.List hiding (reverse, (!?)) -+#else - import Data.List hiding (reverse) -+#endif - import Data.Maybe - import qualified Data.Text as T - import Data.Time.Calendar (Day) -diff --git a/hledger-ui/Hledger/UI/RegisterScreen.hs b/hledger-ui/Hledger/UI/RegisterScreen.hs -index d55d22d82..92c2d7cae 100644 ---- a/hledger-ui/Hledger/UI/RegisterScreen.hs -+++ b/hledger-ui/Hledger/UI/RegisterScreen.hs -@@ -19,7 +19,11 @@ where - import Control.Monad - import Control.Monad.IO.Class (liftIO) - import Data.Bifunctor (bimap, Bifunctor (second)) -+#if MIN_VERSION_base(4,19,0) -+import Data.List hiding ((!?)) -+#else - import Data.List -+#endif - import Data.Maybe - import qualified Data.Text as T - import qualified Data.Vector as V diff --git a/community/hledger/APKBUILD b/community/hledger/APKBUILD index 24d589507d5..2be6ca23816 100644 --- a/community/hledger/APKBUILD +++ b/community/hledger/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dhruvin Gandhi <contact@dhruvin.dev> # Maintainer: Dhruvin Gandhi <contact@dhruvin.dev> pkgname=hledger -pkgver=1.32.3 +pkgver=1.33 pkgrel=0 pkgdesc="Command-line interface for the hledger accounting system" _uipkgdesc="Curses-style terminal interface for the hledger accounting system" @@ -29,11 +29,6 @@ subpackages=" $pkgname-web-openrc:webopenrc " source="https://github.com/simonmichael/hledger/archive/refs/tags/$pkgver/hledger-$pkgver.tar.gz - 0001-cabal-update-cabal-files.patch - 0002-fix-imp-stack-build-with-ghc-9.8-latest-stackage-nig.patch - 0003-Workaround-incompatibility-with-base64-and-GHC-9.8.patch - 0004-fix-Hide-ambiguous-instance-for.patch - cabal.project.freeze hledger-web.initd hledger-web.pre-install" @@ -128,12 +123,8 @@ webopenrc() { } sha512sums=" -c586df4cdc95cf5048809cf7eee3deae7fa5f5ea8be4a8738b2fa8d3cbcf7c46236a39b091d5a7cf13c13194098fee07a0babb8af45dac2bad9fc7b3e97599e4 hledger-1.32.3.tar.gz -b91b61ea724de07eb831fcf1a7a953cdc794b5c1830ce37177bc27497376483b3461e06445743646605322aea0083dbfd3519c13c1ffb1899f5e62abd13ea5ee 0001-cabal-update-cabal-files.patch -2e97255b98dab0fbb24fba69cee0c273710a3b1a23f65d8b28b60529da6aa64ca7375ec1c5225be31993cc0fff1e62cab6e7c3bf62948ee245e03a8bb6d7e95e 0002-fix-imp-stack-build-with-ghc-9.8-latest-stackage-nig.patch -4a9df71f109322d362db1a26f4efb952b9823a134eb941ad6443ff533b210cbe4dd76e96c384f02305fa6f0ebeb70f102bd9f7423d600913556fbca6281a44fe 0003-Workaround-incompatibility-with-base64-and-GHC-9.8.patch -f06fd362dac184d48e4fe678bed00ed5240ba5da47cebba683f5c040bd34d51f558cb5d094142acfa162a66b456b4a526507eae954f070b359647629b128aea3 0004-fix-Hide-ambiguous-instance-for.patch -e73608921c31ef4b812caaf51f745775209ee03955e124369a2d4527108b88dc6ae970c0745a90ef6886e8c9dac27dafbd7a84bf22409647d62eff4e38f404f3 cabal.project.freeze +bb8968a64a90ab725249e800feab96ffc30b019c8ee8471f475b8492645c5ce9afc0f5f0eae851517450b6043ce341fb204151967a504120d2331ac1c1e279b7 hledger-1.33.tar.gz +d7c41b3c84708ce93ed66f21d41e19f81b7c9909986b56f701bafb1f61a7c5dec0b4e07d6aaf1a9ed62c63287e55ff6a1cbfdb70b84b9e999d3cf19303435f92 cabal.project.freeze 4fd0898b29736c1d7f5b41b1ccca8734f38999e5ba88656e092724a7ce4ed346b4f86d627c99be77934eaa7cd86e33ce20a33a60650f1ad8a527c57387179365 hledger-web.initd 9049869dc413c840928b6868547b0de87c624401eeebbd56a7626744634e6e65f6375ca3cf42e8d307fcc8653fbeaf231dde2b597c482176bbb0ba4034cb2c27 hledger-web.pre-install " diff --git a/community/hledger/cabal.project.freeze b/community/hledger/cabal.project.freeze index a4f54f2b834..58d367dba86 100644 --- a/community/hledger/cabal.project.freeze +++ b/community/hledger/cabal.project.freeze @@ -1,5 +1,5 @@ active-repositories: hackage.haskell.org:merge -constraints: any.Cabal ==3.10.2.0, +constraints: any.Cabal ==3.10.3.0, any.Cabal-syntax ==3.10.2.0, any.Decimal ==0.5.2, any.Diff ==0.5, @@ -72,7 +72,6 @@ constraints: any.Cabal ==3.10.2.0, clock -llvm, any.cmdargs ==0.10.22, cmdargs +quotation -testprog, - any.code-page ==0.2.1, any.colour ==2.3.6, any.comonad ==5.0.8, comonad +containers +distributive +indexed-traversable, @@ -113,7 +112,6 @@ constraints: any.Cabal ==3.10.2.0, any.dlist ==1.0, dlist -werror, any.doclayout ==0.4.0.1, - any.doctest ==0.22.2, any.easy-file ==0.2.5, any.email-validate ==2.3.2.20, any.emojis ==0.1.3, @@ -126,14 +124,9 @@ constraints: any.Cabal ==3.10.2.0, any.filepath ==1.4.200.1, any.fsnotify ==0.4.1.0, any.generically ==0.1.1, - any.ghc ==9.8.2, any.ghc-bignum ==1.3, - any.ghc-boot ==9.8.2, any.ghc-boot-th ==9.8.2, - any.ghc-heap ==9.8.2, - any.ghc-paths ==0.1.0.12, any.ghc-prim ==0.11.0, - any.ghci ==9.8.2, any.githash ==0.1.7.0, any.half ==0.3.1, any.happy ==1.20.1.1, @@ -142,6 +135,7 @@ constraints: any.Cabal ==3.10.2.0, any.hashtables ==1.3.1, hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks, any.haskeline ==0.8.2.1, + haskeline +examples +terminfo, any.haskell-lexer ==1.1.1, any.hinotify ==0.4.1, any.hjsmin ==0.2.1, @@ -149,7 +143,6 @@ constraints: any.Cabal ==3.10.2.0, hledger-ui +threaded, hledger-web -dev -library-only +threaded, any.hourglass ==0.2.12, - any.hpc ==0.7.0.0, any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, any.hspec ==2.11.7, @@ -190,10 +183,10 @@ constraints: any.Cabal ==3.10.2.0, any.memory ==0.18.0, memory +support_bytestring +support_deepseq, any.microlens ==0.4.13.1, - any.microlens-ghc ==0.4.14.2, + any.microlens-ghc ==0.4.14.3, any.microlens-mtl ==0.2.0.3, any.microlens-platform ==0.4.3.5, - any.microlens-th ==0.4.3.14, + any.microlens-th ==0.4.3.15, any.mime-types ==0.1.2.0, any.mmorph ==1.2.0, any.monad-control ==1.0.3.1, @@ -228,7 +221,7 @@ constraints: any.Cabal ==3.10.2.0, prettyprinter -buildreadme +text, any.prettyprinter-ansi-terminal ==1.1.3, any.primitive ==0.9.0.0, - any.process ==1.6.18.0, + any.process ==1.6.19.0, any.psqueues ==0.2.8.0, any.quickcheck-io ==0.2.0, any.quote-quot ==0.2.1.0, @@ -244,7 +237,6 @@ constraints: any.Cabal ==3.10.2.0, any.safe-exceptions ==0.1.7.4, any.scientific ==0.3.7.0, scientific -bytestring-builder -integer-simple, - any.semaphore-compat ==1.0.0, any.semialign ==1.3, semialign +semigroupoids, any.semigroupoids ==6.0.0.1, @@ -268,7 +260,6 @@ constraints: any.Cabal ==3.10.2.0, any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, any.strict ==0.5, - any.syb ==0.7.2.4, any.tabular ==0.2.2.8, any.tagged ==0.8.8, tagged +deepseq +transformers, @@ -298,7 +289,7 @@ constraints: any.Cabal ==3.10.2.0, time-compat -old-locale, any.time-manager ==0.0.1, any.timeit ==2.0, - any.tls ==2.0.2, + any.tls ==2.0.3, tls -devel, any.transformers ==0.6.1.0, any.transformers-base ==0.4.6, @@ -357,4 +348,4 @@ constraints: any.Cabal ==3.10.2.0, any.yesod-test ==1.6.16, any.zlib ==0.7.0.0, zlib -bundled-c-zlib +non-blocking-ffi +pkg-config -index-state: hackage.haskell.org 2024-04-16T08:37:42Z +index-state: hackage.haskell.org 2024-04-19T07:51:41Z diff --git a/testing/homer-app/0001-change-web-and-config-paths.patch b/community/homer-app/0001-change-web-and-config-paths.patch index ff41ded7d33..ff41ded7d33 100644 --- a/testing/homer-app/0001-change-web-and-config-paths.patch +++ b/community/homer-app/0001-change-web-and-config-paths.patch diff --git a/testing/homer-app/APKBUILD b/community/homer-app/APKBUILD index 921656ae190..13bd8692025 100644 --- a/testing/homer-app/APKBUILD +++ b/community/homer-app/APKBUILD @@ -1,17 +1,17 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=homer-app pkgver=1.4.59 -pkgrel=3 +pkgrel=8 pkgdesc="HOMER 7.x Front-End and API Server" url="http://sipcapture.io" -arch="x86_64" +arch="all" license="AGPL-3.0-or-later" makedepends="go" install="$pkgname.pre-install" options="net" subpackages="$pkgname-doc $pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://github.com/sipcapture/homer-app/archive/refs/tags/$pkgver.tar.gz - https://github.com/sipcapture/homer-app/releases/download/$pkgver/homer-ui-$pkgver.tgz + homer-ui-$pkgver-2.tgz::https://github.com/sipcapture/homer-app/releases/download/$pkgver/homer-ui-$pkgver.tgz $pkgname.initd 0001-change-web-and-config-paths.patch @@ -27,16 +27,15 @@ prepare() { } build() { - make modules - make all + go build -a -o homer-app } check() { - "release/homer-app_linux_amd64/homer-app" --version + "$builddir"/homer-app -version } package() { - install -D -m755 release/homer-app_linux_amd64/homer-app "$pkgdir"/usr/bin/homer-app + install -D -m755 "$builddir"/homer-app "$pkgdir"/usr/bin/homer-app install -D -m644 etc/webapp_config.json "$pkgdir"/etc/homer/webapp_config.json mkdir -p "$pkgdir"/usr/share/webapps/homer \ "$pkgdir"/usr/share/licenses/$pkgname @@ -48,7 +47,7 @@ package() { sha512sums=" b62ded15ff9ad2651b4e58ecf497b10208cc0a9075eca01a62328c71402c14a7a12b5903a4ea1ce86d38f38052fbbcdda3f498f120fee77a2fd271b87a41fe3c homer-app-1.4.59.tar.gz -561f858f72a620abe041d0bff8632e57c25fcfa5f13053fa416471deb4d9d766a4c90602b7a6b0987165d2ba61ccbcf66a567e53a99be63c704b341350258c87 homer-ui-1.4.59.tgz -0eaace71fe329bead88d7180aa5ad80f6924f1e0b3426cfa45811121ff4e907b32a4b08d6db995ae77b9b9ddbdbfc66411c03c2eea9c0393f6b9ed12ad851a77 homer-app.initd +1b53b4598b4296fd1a256a2a9af077ab4fb6942df61a5ca321eea66cccb0daec0cc1daffbc999876fe624a738a0f57ac0f003fcadb52f7b540e3fd630575ffec homer-ui-1.4.59-2.tgz +05bb7d5d0ddb09dd15c8ed21b2fbb2aa6ae3b17be808d64cd6c863c8e72a20d63f0ee4b8419c006ae0c3348c64c1946ab8d4fedf2e4570fccd8ad6fccd6f9377 homer-app.initd f4073ebe4dda4d94a62a810179b707b5245a15e80473576253b992fd1c0a5ba3dbc2645c56ad10ce63c12ab494a9d9da5fe172b68f1b5594e28b45c18df99fe9 0001-change-web-and-config-paths.patch " diff --git a/testing/homer-app/homer-app.initd b/community/homer-app/homer-app.initd index 88309124111..73f5917880a 100644 --- a/testing/homer-app/homer-app.initd +++ b/community/homer-app/homer-app.initd @@ -2,10 +2,10 @@ description="HOMER App and UI" command=/usr/bin/homer-app -command_args="-webapp-config-path=/etc/homer -webapp-log-path /var/log/homer" +command_args="-webapp-config-path=${CONFIG_PATH:-/etc/homer} -webapp-log-path /var/log/homer" command_background=yes -command_user=homer -command_group=homer +command_user="${USER:-homer}" +command_group="${GROUP:-homer}" pidfile="/run/homer/${RC_SVCNAME}.pid" depend() { diff --git a/testing/homer-app/homer-app.pre-install b/community/homer-app/homer-app.pre-install index 2daa2cbad59..2daa2cbad59 100644 --- a/testing/homer-app/homer-app.pre-install +++ b/community/homer-app/homer-app.pre-install diff --git a/testing/hplip/APKBUILD b/community/hplip/APKBUILD index 3f5a0b72ebf..3f5a0b72ebf 100644 --- a/testing/hplip/APKBUILD +++ b/community/hplip/APKBUILD diff --git a/testing/hplip/disable_upgrade.patch b/community/hplip/disable_upgrade.patch index b6d657d079a..b6d657d079a 100644 --- a/testing/hplip/disable_upgrade.patch +++ b/community/hplip/disable_upgrade.patch diff --git a/testing/hplip/fix-memmove.patch b/community/hplip/fix-memmove.patch index a7e791ff9d4..a7e791ff9d4 100644 --- a/testing/hplip/fix-memmove.patch +++ b/community/hplip/fix-memmove.patch diff --git a/testing/hplip/more-imageprocessor-removes.patch b/community/hplip/more-imageprocessor-removes.patch index e4ea2090629..e4ea2090629 100644 --- a/testing/hplip/more-imageprocessor-removes.patch +++ b/community/hplip/more-imageprocessor-removes.patch diff --git a/testing/hplip/no-empty-glob.patch b/community/hplip/no-empty-glob.patch index 49dd78f841f..49dd78f841f 100644 --- a/testing/hplip/no-empty-glob.patch +++ b/community/hplip/no-empty-glob.patch diff --git a/testing/hplip/types-musl.patch b/community/hplip/types-musl.patch index 96a43690ec6..96a43690ec6 100644 --- a/testing/hplip/types-musl.patch +++ b/community/hplip/types-musl.patch diff --git a/community/httm/APKBUILD b/community/httm/APKBUILD index ae531ad2503..64b255f59ab 100644 --- a/community/httm/APKBUILD +++ b/community/httm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=httm -pkgver=0.37.9 +pkgver=0.38.1 pkgrel=0 pkgdesc="Interactive, file-level Time Machine-like tool for ZFS/btrfs" url="https://github.com/kimono-koans/httm" @@ -30,5 +30,5 @@ package() { } sha512sums=" -f148e9fc0c0f78a6d3fc7237694d9aaf07add6704d2559b9d47b9169516c608dd875a853f15ea2ee85f48c71fcfbb4b2d6862327e8f9bfb42e2151928fc2d626 httm-0.37.9.tar.gz +e8fb0c5ca61cfc4dcc7597441713de8e0c882f934ade8ab9c149dc31dae988ae544cc67348ae340e1ad34d21858d3e5bdc5a1a78a5c3d7aec01bc1812bdc994b httm-0.38.1.tar.gz " diff --git a/community/hugo/APKBUILD b/community/hugo/APKBUILD index e1744427806..91560c253a9 100644 --- a/community/hugo/APKBUILD +++ b/community/hugo/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Thomas Boerger <thomas@webhippie.de> pkgname=hugo -pkgver=0.124.1 +pkgver=0.125.4 pkgrel=0 pkgdesc="Fast and flexible static site generator written in Go" url="https://gohugo.io/" @@ -49,6 +49,6 @@ package() { } sha512sums=" -29f51a08f9e757a716c2f7845efc08b1ca3b0bf8e70fd06491735a123ca7da8e169116fa003c147be08d2d5f9752473e9a569085728ec0a9ed7850bd57ba8f93 hugo-0.124.1.tar.gz +f76b85e0cb119fa35b8c253ddb05c9f8156aba004b1ec37e0b04d89afa6dec3771417c843594d076c81b1663d0a7677912f9b37ab3ef89ae13824973e6496097 hugo-0.125.4.tar.gz 6ba192d8cb67f115f7ce596c297a55fc64713a4cdb0077cfbb7e45051c7560f5b668da88f513d4f34d8e0eeb4a9d991c5312d62e454c85e95960d8a33f0f8f69 skip-para-test.patch " diff --git a/community/hut/APKBUILD b/community/hut/APKBUILD index 9d5461cbd27..8ac54ea4a3a 100644 --- a/community/hut/APKBUILD +++ b/community/hut/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Maxim Karasev <mxkrsv@disroot.org> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=hut -pkgver=0.4.0 -pkgrel=2 +pkgver=0.5.0 +pkgrel=0 pkgdesc="command-line tool for sr.ht" url="https://sr.ht/~emersion/hut" arch="all" @@ -34,5 +34,5 @@ package() { } sha512sums=" -447fd59d9213aad89e30e50c1a4499b9fb71b5815d524a9a36256f4f03acd3c9a7f3c08382e4bc4cf7fb6a1b55a190252b2597ac1c2309bdb3a333fc77b459dc hut-0.4.0.tar.gz +f24a0bfcb96f1643d1f6c741c101f54b9a522f3fde6fcd7fc65f27bbec0303e304dc2430cafec0a17aa471ec78e37b2c65cdf401cc5034480cd82f27ed3166d3 hut-0.5.0.tar.gz " diff --git a/community/i2pd/APKBUILD b/community/i2pd/APKBUILD index 7f6b61297b6..cc0d7b6bd48 100644 --- a/community/i2pd/APKBUILD +++ b/community/i2pd/APKBUILD @@ -2,7 +2,7 @@ # Contributor: l-n-s <supervillain@riseup.net> pkgname=i2pd pkgver=2.50.2 -pkgrel=0 +pkgrel=1 pkgdesc="I2P Router written in C++" url="https://i2pd.website" arch="all" diff --git a/community/ibmswtpm2/APKBUILD b/community/ibmswtpm2/APKBUILD index 72d88dd1ceb..d32cbc30f21 100644 --- a/community/ibmswtpm2/APKBUILD +++ b/community/ibmswtpm2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Olliver Schinagl <oliver@schinagl.nl> pkgname=ibmswtpm2 pkgver=1682 -pkgrel=1 +pkgrel=2 pkgdesc="Software implementation of the TCG TPM 2.0 specification by IBM" url="https://ibmswtpm.sourceforge.net/ibmswtpm2.html" arch="all" @@ -10,7 +10,7 @@ license="MIT" makedepends="musl-dev openssl-dev>3" options="!check" # No selftest available source="https://downloads.sourceforge.net/project/ibmswtpm2/ibmtpm$pkgver.tar.gz - openssl-3.1.patch + openssl-3.3.patch " builddir="$srcdir/src" @@ -25,5 +25,5 @@ package() { sha512sums=" 564c2154e5459cbbf4ec052bea7909d1eaff0aa07b291c7de44b1204ecfda3c4156fa18da4499e4202b8772b54ae30d0c7c89bd12cd415f3882d17c8d340686d ibmtpm1682.tar.gz -a815b71ae92e7375ef3d63e4a0b3efa4130a5c6a2371e175f2c7ac865073509e1936ce44aa22e8d2ef6a21018406599245bf99cc536771f24de10c8dc8ef73fe openssl-3.1.patch +4371a2ae1c966ace28fbdf49f1abb96ce71e0b9bc46a75645df108199ab540722ddf57184ad67760e5dda63c350cbfb0ab45098aef8ff54be2c2b70f4c32f2ff openssl-3.3.patch " diff --git a/community/ibmswtpm2/openssl-3.1.patch b/community/ibmswtpm2/openssl-3.3.patch index fee79df34a4..31a890c75fa 100644 --- a/community/ibmswtpm2/openssl-3.1.patch +++ b/community/ibmswtpm2/openssl-3.3.patch @@ -1,7 +1,21 @@ -Patch-Source: https://sourceforge.net/p/ibmswtpm2/tpm2/ci/15501bf4973d334ca9420fa2fb0f0fe1800871e0 --- ---- a/TpmToOsslMath.h -+++ b/TpmToOsslMath.h +The source code comment regarding supported OpenSSL versions states: + + Check the bignum_st definition in crypto/bn/bn_lcl.h or + crypto/bn/bn_local.h and either update the version check or + provide the new definition for this version. + +The definition of bignum_st has not changed in OpenSSL 3.1, 3.2 or 3.3. +Hence, we can update the version string to support OpenSSL 3.3. +Support for OpenSSL 3.2 is already included in the upstream Git as well. + +See: + +* https://sourceforge.net/p/ibmswtpm2/tpm2/ci/15501bf4973d334ca9420fa2fb0f0fe1800871e0 +* https://sourceforge.net/p/ibmswtpm2/tpm2/ci/ebe82ac82fef97feddc558f3c3ad16baf67e6921 + +diff -upr b/TpmToOsslMath.h a/TpmToOsslMath.h +--- b/TpmToOsslMath.h 2024-04-28 13:16:12.446802752 +0200 ++++ a/TpmToOsslMath.h 2024-04-28 13:16:43.116886262 +0200 @@ -54,7 +54,7 @@ /* arising in any way out of use or reliance upon this specification or any */ /* information herein. */ @@ -11,7 +25,7 @@ Patch-Source: https://sourceforge.net/p/ibmswtpm2/tpm2/ci/15501bf4973d334ca9420f /* */ /********************************************************************************/ -@@ -72,16 +72,20 @@ +@@ -72,10 +72,14 @@ #define SYMMETRIC_ALIGNMENT RADIX_BYTES @@ -20,18 +34,12 @@ Patch-Source: https://sourceforge.net/p/ibmswtpm2/tpm2/ci/15501bf4973d334ca9420f + * As of release 3.0.0, OPENSSL_VERSION_NUMBER is a combination of the + * major (M), minor (NN) and patch (PP) version into a single integer 0xMNN00PP0L + */ -+#if OPENSSL_VERSION_NUMBER > 0x30100ff0L ++#if OPENSSL_VERSION_NUMBER > 0x30300ff0L // Check the bignum_st definition in crypto/bn/bn_lcl.h or crypto/bn/bn_local.h and either update // the version check or provide the new definition for this version. -// Currently safe for all 3.0.n.a -+// Currently safe for all 3.1.x ++// Currently safe for all 3.3.x # error Untested OpenSSL version #elif OPENSSL_VERSION_NUMBER >= 0x10100000L // from crypto/bn/bn_lcl.h - struct bignum_st { - BN_ULONG *d; -- int top; -+ int top; - - int dmax; - int neg; +Only in a: TpmToOsslMath.h.orig diff --git a/testing/ibus-libpinyin/APKBUILD b/community/ibus-libpinyin/APKBUILD index 1ce9211f34f..1ce9211f34f 100644 --- a/testing/ibus-libpinyin/APKBUILD +++ b/community/ibus-libpinyin/APKBUILD diff --git a/community/icinga2/APKBUILD b/community/icinga2/APKBUILD index ffbb9ace1b1..5d2596bb007 100644 --- a/community/icinga2/APKBUILD +++ b/community/icinga2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=icinga2 pkgver=2.14.2 -pkgrel=0 +pkgrel=1 pkgdesc="An open source host, service and network monitoring program" url="https://icinga.com" arch="all !armhf !armv7 !s390x" diff --git a/community/idris2-stage0/APKBUILD b/community/idris2-stage0/APKBUILD index e95e8fe9467..b54a8b5a922 100644 --- a/community/idris2-stage0/APKBUILD +++ b/community/idris2-stage0/APKBUILD @@ -2,10 +2,12 @@ # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=idris2-stage0 pkgver=0.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="Idris 2 version used to bootstrap the Idris 2 compiler" url="https://www.idris-lang.org" -arch="x86 x86_64" # limited by chez-scheme +# idris2 requires chez-scheme's foreign function interface. +# This doesn't seem to be supported on portable bytecode targets (ppc64le, s390x). +arch="all !ppc64le !s390x" license="BSD-3-Clause" depends="chez-scheme gmp-dev" makedepends="bash" @@ -18,8 +20,13 @@ builddir="$srcdir/Idris2-$pkgver" provides="idris2-bootstrap=$pkgver" provider_priority=1 # lowest +# Only run tests on x86_64, upstream doesn't seem to support +# and test the test suite on any other architecture. +# +# See: https://github.com/idris-lang/Idris2/issues/1617 case "$CARCH" in -x86) options="!check" ;; # XXX: https://github.com/idris-lang/Idris2/issues/1617 +x86_64) ;; +*) options="!check" ;; esac build() { diff --git a/community/idris2/APKBUILD b/community/idris2/APKBUILD index e095075ab9e..a234dfe81c9 100644 --- a/community/idris2/APKBUILD +++ b/community/idris2/APKBUILD @@ -4,10 +4,10 @@ pkgname=idris2 pkgver=0.7.0 # XXX: For chez-scheme rebuilds, re-bootstrap from -stage0 and # afterwards self-host by depending on idris2-bootstrap again. -pkgrel=2 +pkgrel=4 pkgdesc="Purely functional programming language with first class types" url="https://www.idris-lang.org" -arch="x86 x86_64" # limited by chez-scheme +arch="all !ppc64le !s390x" # limited by idris2-stage0 license="BSD-3-Clause" depends="chez-scheme gmp-dev" makedepends="idris2-bootstrap>=$pkgver bash py3-sphinx py3-sphinx_rtd_theme" @@ -25,8 +25,13 @@ builddir="$srcdir/Idris2-$pkgver" provides="idris2-bootstrap=$pkgver" provider_priority=100 # highest +# Only run tests on x86_64, upstream doesn't seem to support +# and test the test suite on any other architecture. +# +# See: https://github.com/idris-lang/Idris2/issues/1617 case "$CARCH" in -x86) options="!check" ;; # XXX: https://github.com/idris-lang/Idris2/issues/1617 +x86_64) ;; +*) options="!check" ;; esac # TODO: Install idris libs to /usr/lib/idris-$pkgver instead of /usr/idris-$pkgver diff --git a/community/ifstate/APKBUILD b/community/ifstate/APKBUILD index d19da33a51d..d703a2fbc12 100644 --- a/community/ifstate/APKBUILD +++ b/community/ifstate/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Thomas Liske <thomas@fiasko-nw.net> pkgname=ifstate -pkgver=1.11.8 -pkgrel=1 +pkgver=1.11.9 +pkgrel=0 pkgdesc="Manage host interface settings in a declarative manner" url="https://ifstate.net/" arch="noarch" @@ -34,7 +34,7 @@ package() { } sha512sums=" -737acd5f41695d463138c7b0c4cf81d90445838ede4cc602647658b0af6fe1ccd896c635640c10a3be5743b202d28f901cb18f4bce898ad02b8be4884d5ac789 ifstate-1.11.8.tar.gz +d0da60cf00b4125ddfae2258539b8e89cf6b960d8faa5b1462365dc928d8e975ccf18ab61a0b58a349148f93c2fdf84cfa55110c7e8a9a02d1af69f5f5e20d05 ifstate-1.11.9.tar.gz dfc31dc7452c63ec18d368803ffb3bef1cd96d98345d0c5ef1baeb8b2819130b504d3e6e82d99ee86fa18d4576b7927d0b80d6d79f9f20e388e07faa09a87285 ifstate.conf e583c764c65dbf00ce6a4269cef5d8a78c2ec47851671cc25bbebd2d6095c42f0a10eccfd021728e05b3b67d8b950f9e4359da63226da551b8dc5ebd5d8aa0ef ifstate.initd " diff --git a/testing/iir1/APKBUILD b/community/iir1/APKBUILD index eb055b0414b..eb055b0414b 100644 --- a/testing/iir1/APKBUILD +++ b/community/iir1/APKBUILD diff --git a/community/imagemagick/APKBUILD b/community/imagemagick/APKBUILD index a18c239a870..5839a455651 100644 --- a/community/imagemagick/APKBUILD +++ b/community/imagemagick/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick _pkgname=ImageMagick -pkgver=7.1.1.29 -pkgrel=0 +pkgver=7.1.1.32 +pkgrel=1 _pkgver=${pkgver%.*}-${pkgver##*.} _abiver=7 pkgdesc="Collection of tools and libraries for many image formats" @@ -190,7 +190,7 @@ build() { --with-heic \ --with-modules \ --with-perl \ - --with-perl-options="PREFIX=/usr INSTALLDIRS=vendor" \ + --with-perl-options="INSTALL_BASE=/usr INSTALLDIRS=vendor" \ --with-png \ --with-rsvg \ --with-threads \ @@ -297,5 +297,5 @@ _perlmagick_doc() { } sha512sums=" -ed250188fae8225e8d32a2f4ed12d6fb3e0891fbb3ccf77c2bc027d28918c10e628c9eec0c8b83e530fe4387d2123e1b0eb576604d3b5ad6436f3cf4d1938cef ImageMagick-7.1.1-29.tar.xz +bbf9e3daa8f0687719aad93221682cae57afab3b9adaf47ef6ec62d26b0e40f7204f04ad9e052b6119ce16cdf3d2141d17f03396fef79ed18bd94e1e9943273e ImageMagick-7.1.1-32.tar.xz " diff --git a/community/imath/APKBUILD b/community/imath/APKBUILD index 7f51d9836c9..1c8326908de 100644 --- a/community/imath/APKBUILD +++ b/community/imath/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Krassy Boykinov <kboykinov@teamcentrixx.com> pkgname=imath pkgver=3.1.11 -pkgrel=1 +pkgrel=2 pkgdesc="C++ and python library of 2D and 3D vector, matrix, and math operations for computer graphics" url="https://github.com/AcademySoftwareFoundation/Imath" arch="all" diff --git a/community/incidenceeditor/APKBUILD b/community/incidenceeditor/APKBUILD index 8a974e405e6..9d54fefd15d 100644 --- a/community/incidenceeditor/APKBUILD +++ b/community/incidenceeditor/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 pkgdesc="KDE PIM incidence editor" # armhf blocked by extra-cmake-modules # ppc64le, s390x, riscv64 and armv7 blocked by qt6-qtwebengine -> akonadi -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by calendarsupport +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://kontact.kde.org/" license="LGPL-2.0-or-later AND GPL-2.0-or-later" depends_dev=" diff --git a/testing/indi-3rdparty/APKBUILD b/community/indi-3rdparty/APKBUILD index 61b118390c0..61b118390c0 100644 --- a/testing/indi-3rdparty/APKBUILD +++ b/community/indi-3rdparty/APKBUILD diff --git a/community/inkscape/APKBUILD b/community/inkscape/APKBUILD index bafa1b55515..d3bdb33cb85 100644 --- a/community/inkscape/APKBUILD +++ b/community/inkscape/APKBUILD @@ -3,7 +3,7 @@ pkgname=inkscape pkgver=1.3.2 _pkgdate=2023-11-25 _pkgcommit=091e20ef0f -pkgrel=5 +pkgrel=6 pkgdesc="Vector-based drawing program - svg compliant" url="https://inkscape.org/" arch="all" diff --git a/community/innoextract/APKBUILD b/community/innoextract/APKBUILD index 16273ed3770..6ec3f54b810 100644 --- a/community/innoextract/APKBUILD +++ b/community/innoextract/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Koloberdin <koloberdin@gmail.com> pkgname=innoextract pkgver=1.9 -pkgrel=9 +pkgrel=10 pkgdesc="A tool to extract installers created by Inno Setup" url="https://constexpr.org/innoextract/" arch="all" diff --git a/community/ipython/APKBUILD b/community/ipython/APKBUILD index 563dfeab955..d6e363e633d 100644 --- a/community/ipython/APKBUILD +++ b/community/ipython/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=ipython -pkgver=8.22.2 -pkgrel=1 +pkgver=8.24.0 +pkgrel=0 pkgdesc="A rich toolkit to help you make the most of using Python interactively" url="https://ipython.org/" arch="noarch" @@ -55,5 +55,5 @@ package() { } sha512sums=" -b1313637db7fda77b05e776f1bd87cd3c029eda7b3aea084961a0ae11a6b95f44ae29bbc9879854075eda246339c9afb2447451d7ead2a9c4acba5807fa0b63e ipython-8.22.2.tar.gz +9ade60bf12164c45ac15b1e5fd6dfcb0da713a19cd964179646cb8e693051b7f21788e5955ee4fc1b66aa54fd5b552925bdd9b06d3c5ffe3952e15ac5586d908 ipython-8.24.0.tar.gz " diff --git a/community/isa-l/APKBUILD b/community/isa-l/APKBUILD index 3bdbb1a24f3..ca9322fc704 100644 --- a/community/isa-l/APKBUILD +++ b/community/isa-l/APKBUILD @@ -14,10 +14,16 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc" makedepends="autoconf automake help2man libtool linux-headers nasm" case $CARCH in - ppc64le|riscv64|s390x) - ;; + ppc64le|riscv64|s390x|loongarch64) ;; *) - makedepends="$makedepends texlive doxygen texmf-dist-latexextra" + makedepends="$makedepends + doxygen + texlive + texmf-dist-fontsrecommended + texmf-dist-lang + texmf-dist-latexextra + texmf-dist-plaingeneric + " ;; esac @@ -29,9 +35,12 @@ prepare() { build() { ./configure --build=$CBUILD --host=$CHOST make - if [ "$CARCH" != "ppc64le" ] && [ "$CARCH" != "riscv64" ] && [ "$CARCH" != "s390x" ]; then + case "$CARCH" in + ppc64le|riscv64|s390x|loongarch64) ;; + *) make doc - fi + ;; + esac } check() { @@ -40,10 +49,14 @@ check() { doc() { default_doc - if [ "$CARCH" != "ppc64le" ] && [ "$CARCH" != "riscv64" ] && [ "$CARCH" != "s390x" ]; then + + case "$CARCH" in + ppc64le|riscv64|s390x|loongarch64) ;; + *) mkdir -p "$subpkgdir"/usr/share/doc/$pkgname mv "$builddir"/${pkgname}_api_$pkgver.pdf "$subpkgdir"/usr/share/doc/$pkgname/ - fi + ;; + esac } package() { diff --git a/community/jasper/APKBUILD b/community/jasper/APKBUILD index cc33fbb21e1..346368e9d16 100644 --- a/community/jasper/APKBUILD +++ b/community/jasper/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=jasper -pkgver=4.2.3 +pkgver=4.2.4 pkgrel=0 pkgdesc="Software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard" url="https://www.ece.uvic.ca/~mdadams/jasper/" @@ -38,5 +38,5 @@ package() { } sha512sums=" -d7edb67fe607f42645997e246c15887b84f75fa48229fba218c7e2efb14b24e8b50c45cc5d61441b3bb692a6f28fbbefe04de5cfc19c500f8cdb2fd3f4950bf5 jasper-4.2.3.tar.gz +54af8813afddafffdddc7bd8b8eb5ac90ff73fb28aa4b8d77e4d5e1231fd05e4052f843912c4b3dac6e8ab286e97248d900e8541577642016e2a0049eb707ec9 jasper-4.2.4.tar.gz " diff --git a/community/java-libsignal-client/APKBUILD b/community/java-libsignal-client/APKBUILD index 7813eb76d3a..704b11de5a9 100644 --- a/community/java-libsignal-client/APKBUILD +++ b/community/java-libsignal-client/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Simon Frankenberger <simon-alpine@fraho.eu> # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu> pkgname=java-libsignal-client -pkgver=0.40.0 +pkgver=0.45.0 pkgrel=0 pkgdesc="libsignal-client contains platform-agnostic APIs useful for Signal client apps" url="https://github.com/signalapp/libsignal" @@ -12,9 +12,10 @@ url="https://github.com/signalapp/libsignal" arch="all !armhf !armv7 !x86 !ppc64le !s390x !riscv64" license="AGPL-3.0-or-later" depends="java-jre-headless" -makedepends="bash cargo clang-dev cmake openjdk11-jdk protoc rust zip" +makedepends="bash cargo clang-dev cmake openjdk17-jdk protoc rust zip" source=" $pkgname-$pkgver.tar.gz::https://github.com/signalapp/libsignal/archive/v$pkgver.tar.gz + upgrade-gradle-fix-sigsegv-aarch64.patch " install="$pkgname.post-install $pkgname.post-upgrade" builddir="$srcdir/libsignal-$pkgver" @@ -41,5 +42,6 @@ package() { } sha512sums=" -91568cdf3373c1502fc9ee93cb0a30e33c81b5bc0d563cd5aff1fa29d2233e5872cfac076a1028eea00bd34553701a2d4b8092de49def2ec6477f8e41b61bc82 java-libsignal-client-0.40.0.tar.gz +70f2cb7d05e019235cd044c401bcf072a934fdfea4a161ef5be988d2e3932ba5233110b4b06525e6f33ea9cad036def442e70adad15eab883903d9246969896e java-libsignal-client-0.45.0.tar.gz +acfa6c1595691885b45785b8cb274fef24fea512ba86a06c99da5e278fb03b23866de079a4a5b43d593071d103baeb7e720d33797185a3c4f4a29004a7ce3d78 upgrade-gradle-fix-sigsegv-aarch64.patch " diff --git a/community/java-libsignal-client/upgrade-gradle-fix-sigsegv-aarch64.patch b/community/java-libsignal-client/upgrade-gradle-fix-sigsegv-aarch64.patch new file mode 100644 index 00000000000..c940a323f79 --- /dev/null +++ b/community/java-libsignal-client/upgrade-gradle-fix-sigsegv-aarch64.patch @@ -0,0 +1,13 @@ +diff -ur old/java/gradle/wrapper/gradle-wrapper.properties new/java/gradle/wrapper/gradle-wrapper.properties +--- old/java/gradle/wrapper/gradle-wrapper.properties 2024-04-20 00:15:20.000000000 +0200 ++++ new/java/gradle/wrapper/gradle-wrapper.properties 2024-04-23 05:32:39.009711553 +0200 +@@ -1,7 +1,7 @@ + # Note: Check https://gradle.org/release-checksums/ before updating wrapper or distribution + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists +-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae +-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip ++distributionSha256Sum=dda356e8df554a54f25ba0a2938e11060bc545b7a92f7b443c55d811498b156a ++distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.8-20240411013326+0000-bin.zip + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists diff --git a/community/java-lz4/0003-openjdk21-compatibility.patch b/community/java-lz4/0003-openjdk21-compatibility.patch new file mode 100644 index 00000000000..dde2d72c88a --- /dev/null +++ b/community/java-lz4/0003-openjdk21-compatibility.patch @@ -0,0 +1,35 @@ +From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org> +Date: Sun, 05 May 2024 17:21:00 +0000 +Subject: [PATCH] OpenJDK 21 compatibility + + - Update -source/-target to 8, as OpenJDK 21 + has removed support for 7. + + - Upgrade mvel to 2.5.2, which fixes the + "java.lang.ClassNotFoundException: java.lang.Compiler" error + due to OpenJDK 21 removing that class. + +--- + +--- a/build.xml ++++ b/build.xml +@@ -25,8 +25,8 @@ + <property name="dist" location="dist"/> + <property name="lib" location="lib" /> + +- <property name="javac.source" value="1.7" /> +- <property name="javac.target" value="1.7" /> ++ <property name="javac.source" value="1.8" /> ++ <property name="javac.target" value="1.8" /> + + <property name="ivy.jar.version" value="2.5.0"/> + <property name="ivy.jar.name" value="ivy-${ivy.jar.version}.jar"/> +@@ -131,7 +131,7 @@ + </target> + + <target name="generate-sources" depends="init"> +- <ivy:cachepath organisation="org.mvel" module="mvel2" revision="2.3.2.Final" ++ <ivy:cachepath organisation="org.mvel" module="mvel2" revision="2.5.2.Final" + inline="true" conf="default" transitive="true" pathid="mvel.classpath"/> + <mkdir dir="${build}/java" /> + <java diff --git a/community/java-lz4/APKBUILD b/community/java-lz4/APKBUILD index a53511344c8..bfa02b2cc3b 100644 --- a/community/java-lz4/APKBUILD +++ b/community/java-lz4/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=java-lz4 pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="LZ4 compression for Java" url="https://github.com/lz4/lz4-java" # aarch64, ppc64le: hangs during build @@ -15,6 +15,7 @@ subpackages="$pkgname-native" source="https://github.com/lz4/lz4-java/archive/$pkgver/lz4-java-$pkgver.tar.gz 0001-ivy-location.patch 0002-dont-bundle-natives.patch + 0003-openjdk21-compatibility.patch " builddir="$srcdir/lz4-java-$pkgver" @@ -43,4 +44,5 @@ sha512sums=" ae78748d984d2ede18018d5e9ae6aee0d5fe6ac8b56d717f863968cfad6e9f85b62305692345ba16002bee68278e87a0364aa98aeb92e2af6dc169e5d5b612d4 lz4-java-1.8.0.tar.gz bd80cac3454db4cd95fab162d0031d4866cc7a9f9822f1231d5f9c766aa550398b9e27fad48c8150c0c8a538673ca3ad7de95edff9bd790d3351ba318ea44c49 0001-ivy-location.patch 9d435cd35af15988d8844b38d7d00ad423062680323e9d5d395f431e736668ee10148bc3a0147a430cea522983a4ca54e57557d7330c42347bd71c2c9a06d622 0002-dont-bundle-natives.patch +74d5a77fdbebcd9f92c44dd7053bfc76f6944b2702245c0ff3e2644babaa16a97cd5cdf7630882bd852f7cb636892f7d2e4cb61160d17ad617174ec1d0056b1c 0003-openjdk21-compatibility.patch " diff --git a/community/java-netty-transport-native/APKBUILD b/community/java-netty-transport-native/APKBUILD index a96c8476422..bbf75fdc6bf 100644 --- a/community/java-netty-transport-native/APKBUILD +++ b/community/java-netty-transport-native/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=java-netty-transport-native _jarname=netty-transport-native-epoll -pkgver=4.1.108 +pkgver=4.1.109 _pkgver="$pkgver.Final" pkgrel=0 pkgdesc="Native Netty transport for Linux" @@ -20,9 +20,7 @@ makedepends=" linux-headers maven " -source="https://github.com/netty/netty/archive/netty-$_pkgver/netty-$pkgver.tar.gz - musl-compat.patch - " +source="https://github.com/netty/netty/archive/netty-$_pkgver/netty-$pkgver.tar.gz" builddir="$srcdir/netty-netty-$_pkgver/transport-native-epoll" # net: fetches dependencies from Maven repos # !check: EpollDatagramUnicast tests fail (TODO) @@ -51,6 +49,5 @@ package() { } sha512sums=" -9bfaffadb28eda14ef1b0af28e8c9f816b918bd97621395f611a4ec7352922f1915ad1b886f4a163bc7c9ae4fd0596020eaae11415ad037ae209bb89f3d42301 netty-4.1.108.tar.gz -7ed0550d8a49e8f1605d5e8fd7e4b9635861b546cc8fc86475024b36ced4bdcb22cd1f9de24e95874ddef1b7063d502d617a6321606d8a2cf75f5e4337614e2f musl-compat.patch +feee290d1bf182f850446f016bd564fc0ca6a622d11c1fa9ae8bf7de6d70542bb52366704e85e98c00d2f9d2fd17ae5c699db2722f5764108f60a0e7c487bdd3 netty-4.1.109.tar.gz " diff --git a/community/java-netty-transport-native/musl-compat.patch b/community/java-netty-transport-native/musl-compat.patch deleted file mode 100644 index b015016d521..00000000000 --- a/community/java-netty-transport-native/musl-compat.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/main/c/netty_epoll_native.c -+++ b/src/main/c/netty_epoll_native.c -@@ -86,7 +86,7 @@ - extern int epoll_create1(int flags) __attribute__((weak)); - extern int epoll_pwait2(int epfd, struct epoll_event *events, int maxevents, const struct timespec *timeout, const sigset_t *sigmask) __attribute__((weak)); - --#ifndef __USE_GNU -+#ifndef _GNU_SOURCE - struct mmsghdr { - struct msghdr msg_hdr; /* Message header */ - unsigned int msg_len; /* Number of bytes transmitted */ ---- a/src/main/c/netty_epoll_linuxsocket.c -+++ b/src/main/c/netty_epoll_linuxsocket.c -@@ -26,6 +26,7 @@ - #include <errno.h> - #include <netinet/in.h> - #include <netinet/udp.h> // SOL_UDP -+#include <sys/types.h> - #include <sys/sendfile.h> - #include <linux/tcp.h> // TCP_NOTSENT_LOWAT is a linux specific define - #include "netty_epoll_linuxsocket.h" diff --git a/community/jdtls/APKBUILD b/community/jdtls/APKBUILD index 9833b3edb06..8c76b70c40c 100644 --- a/community/jdtls/APKBUILD +++ b/community/jdtls/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Krassy Boykinov <kboykinov@teamcentrixx.com> # Maintainer: Krassy Boykinov <kboykinov@teamcentrixx.com> pkgname=jdtls -pkgver=1.34.0 +pkgver=1.35.0 pkgrel=0 pkgdesc="Eclipse Java language server" url="https://github.com/eclipse/eclipse.jdt.ls" @@ -33,5 +33,5 @@ package() { } sha512sums=" -5f7f65d123988b5ba9f590da8cb05ec1619b076460be9064ca773da8bfabc83cab3d340d57dd3a24099105249d9586a4c5b5b479f0a8936302425206de262ea1 jdtls-1.34.0.tar.gz +9d659a7a36b9bc1b662470883cf13c27144161302df514db2ada7dd3864aafd323dadd12571fffa01c7a0574d74d0f81f38cd28809d590cfb9ccef2b08bf3d7d jdtls-1.35.0.tar.gz " diff --git a/community/jellyfin-web/APKBUILD b/community/jellyfin-web/APKBUILD index 0022a194dba..c3e65d38496 100644 --- a/community/jellyfin-web/APKBUILD +++ b/community/jellyfin-web/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Simon Zeni <simon@bl4ckb0ne.ca> pkgname=jellyfin-web -pkgver=10.8.13 +pkgver=10.9.0 pkgrel=0 pkgdesc="Web Client for Jellyfin" url="https://jellyfin.org/" @@ -13,16 +13,22 @@ depends="jellyfin" makedepends="npm" source="$pkgname-$pkgver.tar.gz::https://github.com/jellyfin/jellyfin-web/archive/refs/tags/v$pkgver.tar.gz" -build() { +prepare() { + default_prepare + npm ci --no-audit } +build() { + npm run build:production +} + package() { - mkdir -p "$pkgdir"/usr/lib/jellyfin/jellyfin-web + mkdir -p "$pkgdir"/usr/share/webapps/jellyfin-web - cp -r "$builddir"/dist/* "$pkgdir"/usr/lib/jellyfin/jellyfin-web + cp -r "$builddir"/dist/* "$pkgdir"/usr/share/webapps/jellyfin-web } sha512sums=" -e91f18379cff6001945704580633a5ea0d7e91013fbaaea17f811fcac0513b98f37ab9caf82d53c4b25ae964cdf2d5f8313b8666f576e02d889f6538c19eafd7 jellyfin-web-10.8.13.tar.gz +305d97ae15cd1e8d7ca436778f3ea2d0a3e7db3d940c461ddbbac7147d22f1994a430e12d1dcf0184fe6390bad5e534092797a1d2b79a152446c0b9c59bdbe13 jellyfin-web-10.9.0.tar.gz " diff --git a/community/jellyfin/APKBUILD b/community/jellyfin/APKBUILD index 5cc74cf489d..1932bec426f 100644 --- a/community/jellyfin/APKBUILD +++ b/community/jellyfin/APKBUILD @@ -1,54 +1,37 @@ # Maintainer: Simon Zeni <simon@bl4ckb0ne.ca> +# Contributor: Fabricio Silva <hi@fabricio.dev> pkgname=jellyfin -pkgver=10.8.13 -pkgrel=0 +pkgver=10.9.0 +pkgrel=1 pkgdesc="The Free Software Media System" -pkgusers="$pkgname" -pkggroups="$pkgname" install="$pkgname.pre-install" url="https://jellyfin.org/" arch="x86_64 armv7 aarch64" license="GPL-2.0-only" -makedepends="dotnet6-sdk" -depends="aspnetcore6-runtime ffmpeg" +makedepends="dotnet8-sdk" +depends="aspnetcore8-runtime ffmpeg" subpackages="$pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://github.com/jellyfin/jellyfin/archive/refs/tags/v$pkgver.tar.gz $pkgname.initd $pkgname.confd" -case $CARCH in - x86_64) _dotnet_arch=x64;; - aarch64) _dotnet_arch=arm64;; - armv7|armhf) _dotnet_arch=arm;; -esac - -# parses RID from /etc/os-release depending on if edge or production release -# to set _runtime_id -# shellcheck disable=SC2034 -. /etc/os-release -[ -n "${VERSION_ID//[^_]}" ] && _runtime_id="alpine.${VERSION_ID%_*}-$_dotnet_arch" || _runtime_id="alpine.${VERSION_ID%.*}-$_dotnet_arch" - build() { - dotnet build --configuration Release Jellyfin.Server --no-self-contained --runtime $_runtime_id - dotnet publish --configuration Release Jellyfin.Server --no-self-contained --output publish --runtime $_runtime_id + dotnet publish Jellyfin.Server \ + --configuration Release \ + --no-self-contained \ + --use-current-runtime \ + --output publish } check() { - # check on aarch64 is broken for dotnet6-sdk v6.0.1xx due to - # https://github.com/microsoft/vstest/issues/2566 - if [ "$CARCH" = "aarch64" ]; then - return - fi - - dotnet test --runtime $_runtime_id + dotnet test --no-restore } package() { - mkdir -p "$pkgdir"/usr/lib - cp -dr publish "$pkgdir"/usr/lib/jellyfin + mkdir -p "$pkgdir"/usr/lib "$pkgdir"/usr/bin - mkdir -p "$pkgdir"/usr/bin - ln -s /usr/lib/jellyfin/jellyfin "$pkgdir"/usr/bin/jellyfin + cp -a publish "$pkgdir"/usr/lib/jellyfin + ln -s ../lib/jellyfin/jellyfin "$pkgdir"/usr/bin/jellyfin install -Dm755 "$srcdir"/$pkgname.initd \ "$pkgdir"/etc/init.d/$pkgname @@ -57,7 +40,7 @@ package() { } sha512sums=" -aeba7144c3dfbbc9285cc02e8cac223f10f44f5ed8c7b0bdd94bd869e182981d78b0e2d67d33f2db9dae5cbc3a9bed29408860844744c8e2691845c0095cb0ca jellyfin-10.8.13.tar.gz -364a70a953d921048a249fd370642c1782e434c850334cd55e35bbb10d1bb93482d37faa1c11da5d7acba96a084d9832e5db212b65b0fa9907c7d3afe553aaf9 jellyfin.initd -d35eb07d11d711b8ad35c7726e151a8096609712fee3bfea00c9adeff8e56660e3cde3d9b0b2dc8a847514af4d2b32340e2b29b77facfab4f8921ba15ba671b0 jellyfin.confd +9ab8062cf28205748aaf324a6315d28051cdd9505e2dcd9e8e12ae2247cb5e5233050f01c63544255723534aff2c5775b17155ff2cad57e6b8229e8585a798b7 jellyfin-10.9.0.tar.gz +bfd2f909fee25d1009ebd0b37d18ac0e9779a7310e5249b9ed4e1a4ef97ce620fe35df171a2e22d02171f88727838ab7b6a21822b80d86c957d87af6b717020b jellyfin.initd +53bd2ab90cd2023765f763cf66cfd09ccc641508cad9339dedc07275afc8a4e39b8c992ec14c082b0396abdfdf63bab388567bb9c4e2bc5e477e714cc1ab9607 jellyfin.confd " diff --git a/community/jellyfin/jellyfin.confd b/community/jellyfin/jellyfin.confd index 6cd891ce6d9..db636cb1d83 100644 --- a/community/jellyfin/jellyfin.confd +++ b/community/jellyfin/jellyfin.confd @@ -2,4 +2,5 @@ supervisor=supervise-daemon datadir="/var/lib/jellyfin" cachedir="/var/cache/jellyfin" logdir="/var/log/jellyfin" +webdir="/usr/share/webapps/jellyfin-web" opts="--nowebclient" diff --git a/community/jellyfin/jellyfin.initd b/community/jellyfin/jellyfin.initd index 278d79dddae..921c51b6f03 100644 --- a/community/jellyfin/jellyfin.initd +++ b/community/jellyfin/jellyfin.initd @@ -5,7 +5,7 @@ description="The Free Software Media System" command=/usr/bin/jellyfin command_user=jellyfin:jellyfin -command_args="--datadir ${datadir} --cachedir ${cachedir} --logdir ${logdir} ${opts}" +command_args="--webdir ${webdir} --datadir ${datadir} --cachedir ${cachedir} --logdir ${logdir} ${opts}" depend() { use logger dns diff --git a/community/jool-modules-lts/APKBUILD b/community/jool-modules-lts/APKBUILD index da2e8a219d3..a877c3f18a5 100644 --- a/community/jool-modules-lts/APKBUILD +++ b/community/jool-modules-lts/APKBUILD @@ -22,7 +22,7 @@ fi # Keep in sync with main/linux-lts! # When changing _kver make sure _krel=0 & _rel=0 _kpkg=linux-$_flavor -_kver=6.6.27 +_kver=6.6.30 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/community/jool-modules-rpi/APKBUILD b/community/jool-modules-rpi/APKBUILD index 53f7c830f94..d0a7d8fadac 100644 --- a/community/jool-modules-rpi/APKBUILD +++ b/community/jool-modules-rpi/APKBUILD @@ -18,7 +18,7 @@ fi # Kernel version # Keep in sync with main/linux-rpi! _kpkg=linux-$_flavor -_kver=6.6.21 +_kver=6.6.29 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/community/jool-tools/APKBUILD b/community/jool-tools/APKBUILD index dada6f214b9..d0c3136e71b 100644 --- a/community/jool-tools/APKBUILD +++ b/community/jool-tools/APKBUILD @@ -4,7 +4,7 @@ _projname=jool pkgname=jool-tools # Keep in sync with _ver in community/jool-modules-{rpi,vanilla}! pkgver=4.1.11 -pkgrel=0 +pkgrel=1 pkgdesc="Userspace control tools for SIIT / NAT64 Jool" url="https://nicmx.github.io/Jool/" arch="all" @@ -70,6 +70,6 @@ a0e4890b74d0020e0059d94de3462308de1975a13df71f2ceb2fce8154d086d3c02a2113a3f67e4e 4ae4c20fde75a0fdaed1c7c46ab5078297846b0734d31c7053575ff549984617a5486727c98f442125c6abfe8b170cde23ae4c24a4d6ff14b2ce31490bd46633 jool.conf a48c84c49c24dd6639b86393fa7870b91fa700ba1e561e2440db1f4a94f3393171407a3cc683f4fc7a26a591578ec732dd3f708c1b4c45787a6e7ec038576357 jool_siit.conf 15758922ba83219f7edf34d93d825fcafb354b551a79f9b70e486faebcb154f55a52806aca6f7b9ec0d8277caa64a06a2525829be41c538cb3c678a78112b5e9 joold.conf -2eefae657e75d264838b435be38178cb3fe98f429f2367cf7cd08646c637f4a8ad3e226b4d7f7d460b28b81b8def9a5f5fd2617e2dd1c0c11889775e25951b21 jool.initd +a7453495393975cafb270331262296c5cba929a3631d26e683f4613a97486582b5a009e6f8852f0e8f4d0de77a9eadaed349952207595d766b1fc9fc89940fff jool.initd 5c9547b2546b0e360b4d1b1bd824edbc533d3b5f469724192ef164a28f8fa243972f54b3e028d9b27ec972fba5d5fc48d87c472333bbc1142a5a64241f1a32e2 joold.initd " diff --git a/community/jool-tools/jool.initd b/community/jool-tools/jool.initd index e666c457297..7b7c7d54c24 100644 --- a/community/jool-tools/jool.initd +++ b/community/jool-tools/jool.initd @@ -19,7 +19,7 @@ esac required_files="$cfgfile" -depends() { +depend() { need net } diff --git a/community/jql/APKBUILD b/community/jql/APKBUILD index ee462820e09..443e705817e 100644 --- a/community/jql/APKBUILD +++ b/community/jql/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=jql -pkgver=7.1.7 +pkgver=7.1.8 pkgrel=0 pkgdesc="A JSON Query Language CLI tool" url="https://github.com/yamafaktory/jql" @@ -33,5 +33,5 @@ package() { } sha512sums=" -208a1c11e71198a9ce7cc88038402d69c7cf30e90fba9c39ee5a998b6aa6740cf7e8e4f776f01b102dd6c861c34c546416f048b82bb46ff06fe794faaa7394be jql-v7.1.7.tar.gz +4687f1924292d4030a9d50b28cff27ecfaab70d7466fb296b8aa7d9f0ed295ab6e23e614ff01ff276b43b7d6d550d481d8580266aaa1073c1dfb40caea5022ea jql-v7.1.8.tar.gz " diff --git a/community/jujutsu/APKBUILD b/community/jujutsu/APKBUILD index d6a6b0cd08a..ba9d45feacb 100644 --- a/community/jujutsu/APKBUILD +++ b/community/jujutsu/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=jujutsu -pkgver=0.16.0 -pkgrel=0 +pkgver=0.17.1 +pkgrel=1 pkgdesc="Git-compatible distributed version control system" url="https://github.com/martinvonz/jj" # armhf, armv7, x86: tests fail @@ -16,6 +16,7 @@ makedepends=" openssl-dev zstd-dev " +checkdepends="openssh-keygen" subpackages=" $pkgname-doc $pkgname-bash-completion @@ -25,22 +26,13 @@ subpackages=" source="https://github.com/martinvonz/jj/archive/v$pkgver/jujutsu-$pkgver.tar.gz" builddir="$srcdir/jj-$pkgver" +export LIBGIT2_NO_VENDOR=1 export LIBSSH2_SYS_USE_PKG_CONFIG=1 export ZSTD_SYS_USE_PKG_CONFIG=1 prepare() { default_prepare - # Rust target triple. - local target=$(rustc -vV | sed -n 's/host: //p') - - # Build against system-provided libs - mkdir -p .cargo - cat >> .cargo/config.toml <<-EOF - [target.$target] - git2 = { rustc-link-lib = ["git2"] } - EOF - cargo fetch --target="$CTARGET" --locked } @@ -48,22 +40,21 @@ build() { cargo auditable build --frozen --release --bin jj for shell in bash fish zsh; do - ./target/release/jj util completion --$shell > jj.$shell + ./target/release/jj util completion $shell > jj.$shell done ./target/release/jj util mangen > jj.1 } check() { - # test_gc: flaky on s390x, test_ssh_signing: no such file/directory - if [ "$CARCH" = "s390x" ]; then - cargo test --frozen --workspace -- \ - --skip test_git_backend::test_gc \ - --skip test_ssh_signing - else - cargo test --frozen --workspace -- \ - --skip test_ssh_signing - fi + # test_gc: flaky on s390x + case "$CARCH" in + s390x) + _test_args="-- --skip test_git_backend::test_gc" + ;; + esac + + cargo test --frozen $_test_args } package() { @@ -82,5 +73,5 @@ package() { } sha512sums=" -eb6052492bfdae4aa77b54da1e91e5aef92794f9c65ac07d7e92ceabdfce79e5d5cd3b34a9c239c4b4ad326f3a59606cee42278a8c945105a4e813104fae290e jujutsu-0.16.0.tar.gz +5a3b90b8a608903483fa0b26c341b8d5b60df3ac6959c0d34fd7d7d5b509f044dfb1eb123d37a84a887b3ab9ff37a3d719be308969cd99837f4d32c6efff6067 jujutsu-0.17.1.tar.gz " diff --git a/community/jupyter-nbclient/APKBUILD b/community/jupyter-nbclient/APKBUILD index 78c27ae52ad..4de54c93df4 100644 --- a/community/jupyter-nbclient/APKBUILD +++ b/community/jupyter-nbclient/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=jupyter-nbclient -pkgver=0.8.0 -pkgrel=1 +pkgver=0.10.0 +pkgrel=0 pkgdesc="Client library for executing notebooks" url="https://github.com/jupyter/nbclient" arch="noarch" @@ -37,5 +37,5 @@ package() { } sha512sums=" -f77ecba2f03a8886e8a2335e1d345fcc1d3a1726b458d151a8c78b85c621017cd96f1ef30e4532bf61b89c92aea128a364f5e9677858951f5d070c6206a01816 jupyter-nbclient-0.8.0.tar.gz +5dce724477c81fd02299a36786aa18e7fc19ccd64a40ae5cb48fce889300ce6eea303194cd35a66201579d3ce6aa201b57378bd9855ed3da4e720246711f3226 jupyter-nbclient-0.10.0.tar.gz " diff --git a/community/jupyter-nbformat/APKBUILD b/community/jupyter-nbformat/APKBUILD index ea669518ff4..efb3fecdee7 100644 --- a/community/jupyter-nbformat/APKBUILD +++ b/community/jupyter-nbformat/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=jupyter-nbformat -pkgver=5.9.2 -pkgrel=1 +pkgver=5.10.4 +pkgrel=0 pkgdesc="Reference implemtnation of the jupyter notebook format" url="https://github.com/jupyter/nbformat" arch="noarch" @@ -23,7 +23,9 @@ build() { check() { python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest -p no:warnings + # https://github.com/jupyter/nbformat/issues/232 + .testenv/bin/python3 -m pytest -p no:warnings \ + --ignore tests/test_validator.py } package() { @@ -32,5 +34,5 @@ package() { } sha512sums=" -a345413fbb2e9920c484be9591622df62a9c28f5cec0494a03a941363f58437b075028d5fe4bbac8a6933f1737596780b8bb004fa0736240a497a2093bef8011 jupyter-nbformat-5.9.2.tar.gz +efea58449a0aaf6d6531e5c94460ca67dcb0289bbfc0db0f0bb1898d13c1f161a289f856a858f8d9c0d3ae40e054fa3676eba73fac10d802d3e40fb2d10016eb jupyter-nbformat-5.10.4.tar.gz " diff --git a/community/jupyter-notebook-shim/APKBUILD b/community/jupyter-notebook-shim/APKBUILD index 020dc9c4c9f..ef9247d0aa7 100644 --- a/community/jupyter-notebook-shim/APKBUILD +++ b/community/jupyter-notebook-shim/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=jupyter-notebook-shim -pkgver=0.2.3 -pkgrel=1 +pkgver=0.2.4 +pkgrel=0 pkgdesc="Shim layer for notebook traits and config" url="https://github.com/jupyter/notebook_shim" # s390x, ppc64le: no jupyter-server @@ -31,5 +31,5 @@ package() { } sha512sums=" -2471f5f2ecf229463aaa898a94c3d9bf8614c208c2de37e4b604ed44b244fa4aabb849cd40243c688174ff3699aaaf74d61a9bcd18e6a15a8cef396a79d563b9 jupyter-notebook-shim-0.2.3.tar.gz +2baa4e5931ab69b69c63cb1febd67aff9032a9d0cad50c5d467122027ffa767dff84e4436c7aad599c361f8a32bb241bfde06532a4abe243044c98ff9fb4b65f jupyter-notebook-shim-0.2.4.tar.gz " diff --git a/community/jupyter-server-terminals/APKBUILD b/community/jupyter-server-terminals/APKBUILD index ab9b0f5d564..56d0e85213b 100644 --- a/community/jupyter-server-terminals/APKBUILD +++ b/community/jupyter-server-terminals/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=jupyter-server-terminals -pkgver=0.4.4 -pkgrel=2 +pkgver=0.5.3 +pkgrel=0 pkgdesc="Jupyter server extension for terminals" url="https://github.com/jupyter-server/jupyter_server_terminals" arch="noarch" @@ -31,5 +31,5 @@ package() { } sha512sums=" -51a160a4a3fe42e4f7c3cc9553ccfa5813e5195c6c332876483e42d8f0d724836e57af31085d9fe8381f084b859d1fc54c71802429b8c0793505970d7dc0f197 jupyter-server-terminals-0.4.4.tar.gz +e772488e93984fe6a8537d09e28cee68e2f623831d9e2eca576de1421c194777975b00dadf241eb99918e1905c46a9bf616e2de2655bca0dbaf25cac42edea16 jupyter-server-terminals-0.5.3.tar.gz " diff --git a/community/jupyter-server/APKBUILD b/community/jupyter-server/APKBUILD index 4df3aa1cb6b..dbfc6d217c9 100644 --- a/community/jupyter-server/APKBUILD +++ b/community/jupyter-server/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=jupyter-server -pkgver=2.7.3 -pkgrel=1 +pkgver=2.9.1 +pkgrel=0 pkgdesc="Backend for Jupyter web applications" url="https://github.com/jupyter-server/jupyter_server" # s390x: no py3-argon2-cffi @@ -69,6 +69,7 @@ check() { # test_delete_non_empty_folder not raising HTTPError on x86 & x86_64 builders # test_api 500 errors under certain builder state repeatedly (why?) # test_restart_kernel fails on x86 with a 1!=0 assert + # test_gateway_request_with_expiring_cookies fails on riscv64: TypeError: argument of type 'NoneType' is not iterable pytest \ --disable-warnings \ -W ignore::DeprecationWarning \ @@ -79,8 +80,8 @@ check() { --deselect tests/services/contents/test_manager.py::test_copy_big_dir \ --deselect tests/services/contents/test_manager.py::test_delete_non_empty_folder \ --deselect tests/services/contents/test_api.py \ - --deselect tests/services/sessions/test_api.py::test_restart_kernel - + --deselect tests/services/sessions/test_api.py::test_restart_kernel \ + --deselect tests/test_gateway.py::test_gateway_request_with_expiring_cookies } package() { @@ -89,5 +90,5 @@ package() { } sha512sums=" -ad9be38208ef4196417561355a62889e34d657f3114b710f13f974f4b453b465b7d473ced46eba873ee980d631d2648e0d4b29267011ed444247a33325f959e9 jupyter-server-2.7.3.tar.gz +148c3eaa4b6ca1147961c1188e0016a634e5adae350e762903bdde000acde7ab62507e71dbe1278c2b9358ce2cf1c28c17ea8b184f3d4a2d59277910b5b44965 jupyter-server-2.9.1.tar.gz " diff --git a/community/just/APKBUILD b/community/just/APKBUILD index 946d8498ae9..ee571795782 100644 --- a/community/just/APKBUILD +++ b/community/just/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=just -pkgver=1.25.2 +pkgver=1.26.0 pkgrel=0 pkgdesc="Just a command runner" url="https://github.com/casey/just" @@ -53,5 +53,5 @@ package() { } sha512sums=" -651e132d98160ace78f1e6aa55fe7e697709322eac3aad37630d41eda8381652c876a69ec82663f174390c1bc1dfcfd734b052660e625919e6c78922ae74ce4e just-1.25.2.tar.gz +3d0970ce2ee303af246bbcad57e7c403736fed0405cf83f5365fc7ce4442a83c28b6768112887f1602dd3c422d906af9b29970a71211e59f364038e7d91c3ad7 just-1.26.0.tar.gz " diff --git a/community/k3s/APKBUILD b/community/k3s/APKBUILD index 4059dbd93f9..f80f437c750 100644 --- a/community/k3s/APKBUILD +++ b/community/k3s/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Oleg Titov <oleg.titov@gmail.com> # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=k3s -_pkgver=1.29.3+k3s1 +_pkgver=1.29.4+k3s1 pkgver=${_pkgver/+k3s/.} -pkgrel=1 +pkgrel=0 pkgdesc="Lightweight Kubernetes. 5 less than k8s" url="https://k3s.io" arch="all !riscv64" # https://github.com/marten-seemann/tcp/pull/1 @@ -119,7 +119,7 @@ package() { } sha512sums=" -9b363703658b1367d03e8752723f1756ad6783d102047503be992b7708fd8184af0b490d818a8293efd17be9e744f2375af81f09cddf796931b8c68b25b59487 k3s-1.29.3.1.tar.gz +dcf6fc6550399dd87ca841f0629a4bf765b0cf8204cc6cb4ea673d8e6ac0c724a40bdf722f832319148f71fcad6cc494a62ad183440bcd0e7aac15db6fee9599 k3s-1.29.4.1.tar.gz f03221efceb4ce2305c41c4c9e6d02ee5b799ed0cdfb1fc5018f8696e4d05575ae63b7c87596d765c5aa76c4a3bacf7c205e3eb61465e26886081a5d0da013ea k3s.confd 1015ee6ce5c69595df3150d7bbdfe528cf20305dac299831faa9cce00a454daf5548e78b1db79dcb8da300edc54553dfda0b95aed5e7bee27c1c726aef640350 k3s.initd 018a5e9b417a937c17f0a4a9e08eed434f06186207626ad038aec22ee667aba4cefa6e9e2a222e2c430d2cbb88c8663648f5bab0e76926a0edd13b8bdfd2673a k3s.logrotate diff --git a/community/kactivities5/APKBUILD b/community/kactivities5/APKBUILD index 6307e04b809..b52ed8eab9f 100644 --- a/community/kactivities5/APKBUILD +++ b/community/kactivities5/APKBUILD @@ -5,7 +5,7 @@ # group=kde-frameworks-old pkgname=kactivities5 pkgver=5.115.0 -pkgrel=0 +pkgrel=2 # armhf blocked by qt5-qtdeclarative arch="all !armhf" pkgdesc="Core components for the KDE's Activities" diff --git a/community/kactivitymanagerd/APKBUILD b/community/kactivitymanagerd/APKBUILD index eade469293f..2843004038a 100644 --- a/community/kactivitymanagerd/APKBUILD +++ b/community/kactivitymanagerd/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kactivitymanagerd -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="System service to manage user's activities and track the usage patterns" # armhf blocked by qt6-qtdeclarative @@ -54,5 +54,5 @@ package() { rm -r "$pkgdir"/usr/lib/systemd } sha512sums=" -be60efc9727d68f732534157724d413c473dad009700049931b2b2c0bfaeec2f8d31a03ea357f3870b0166851333379e1669b0cfd25563159af038c3cbbb7af6 kactivitymanagerd-6.0.3.tar.xz +10a945a70f4c4ab2b28a9731771c0a79aef9ce99b6c179544c85e1c7935554893284d3718c9653eff3a2c2534149a8f337b92dbc9c43c9336988961b8201a295 kactivitymanagerd-6.0.4.tar.xz " diff --git a/community/kaddressbook/APKBUILD b/community/kaddressbook/APKBUILD index e174e8df93e..a15d2189407 100644 --- a/community/kaddressbook/APKBUILD +++ b/community/kaddressbook/APKBUILD @@ -8,7 +8,8 @@ pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules # ppc64le, s390x, riscv64 and armv7 blocked by qt6-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by pimcommon +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://apps.kde.org/kaddressbook/" pkgdesc="Address Book application to manage your contacts" license="GPL-2.0-or-later AND LGPL-2.0-or-later" @@ -39,7 +40,7 @@ _repo_url="https://invent.kde.org/pim/kaddressbook.git" source="https://download.kde.org/stable/release-service/$pkgver/src/kaddressbook-$pkgver.tar.xz" build() { - cmake -B build -G Ninja\ + cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib diff --git a/community/kaidan/APKBUILD b/community/kaidan/APKBUILD index bf97208e965..7f62d61f1df 100644 --- a/community/kaidan/APKBUILD +++ b/community/kaidan/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=kaidan pkgver=0.9.1 -pkgrel=4 +pkgrel=5 pkgdesc="Kaidan, a simple and user-friendly Jabber/XMPP client for every device and platform" arch="all !armhf" # armhf blocked by qt5-qtdeclarative url="https://invent.kde.org/network/kaidan" license="GPL-3.0-or-later-with-openssl-exception AND GPL-3.0-or-later AND MIT AND AND Apache-2.0 AND CC-BY-SA-4.0 AND CC-BY-SA-3.0" depends=" - kirigami-addons + kirigami-addons5 kirigami2 kquickimageeditor qt5-qtbase-sqlite @@ -17,7 +17,7 @@ depends=" makedepends=" extra-cmake-modules kio5-dev - kirigami-addons-dev + kirigami-addons5-dev kirigami2-dev knotifications5-dev kquickimageeditor-dev diff --git a/community/kakoune/0001-fix-CXXFLAGS.patch b/community/kakoune/0001-fix-CXXFLAGS.patch index 54299cb252d..e0b64700b82 100644 --- a/community/kakoune/0001-fix-CXXFLAGS.patch +++ b/community/kakoune/0001-fix-CXXFLAGS.patch @@ -9,17 +9,14 @@ Subject: [PATCH] fix CXXFLAGS diff --git a/src/Makefile b/src/Makefile index 63bf1833..abea58aa 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -16,7 +16,7 @@ ifeq ($(debug),yes) - suffix := .debug - else - ifeq ($(debug),no) -- CXXFLAGS += -O3 -+ # CXXFLAGS += -O3 - suffix := .opt - else - $(error debug should be either yes or no) --- -2.34.1 - +--- a/Makefile ++++ b/Makefile +@@ -16,7 +16,7 @@ CPPFLAGS-debug-yes = -DKAK_DEBUG + CXXFLAGS-debug-yes = -O0 -g3 + tag-debug-yes = .debug + +-CXXFLAGS-debug-no = -O3 -g3 ++# CXXFLAGS-debug-no = -O3 -g3 + tag-debug-no = .opt + + CXXFLAGS-sanitize-address = -fsanitize=address diff --git a/community/kakoune/APKBUILD b/community/kakoune/APKBUILD index 1982ba80cf3..bd029e8e384 100644 --- a/community/kakoune/APKBUILD +++ b/community/kakoune/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Willow Barraco <contact@willowbarraco.fr> pkgname=kakoune -pkgver=2023.08.05 +pkgver=2024.05.09 pkgrel=0 pkgdesc="Code editor heavily inspired by Vim, but with less keystrokes" url="https://kakoune.org" arch="all" license="Unlicense" -makedepends="asciidoc" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/mawww/kakoune/archive/v$pkgver.tar.gz alpine-linux.kak 0001-fix-CXXFLAGS.patch constexpr.patch + fix-tests.patch " build() { @@ -24,13 +24,15 @@ check() { } package() { - make PREFIX="/usr" DESTDIR="$pkgdir/" debug=no install - install -Dm644 $srcdir/alpine-linux.kak $pkgdir/usr/share/kak/autoload/filetype/ + make -j1 PREFIX="/usr" DESTDIR="$pkgdir/" debug=no install + install -Dm644 "$srcdir"/alpine-linux.kak \ + -t "$pkgdir"/usr/share/kak/autoload/filetype/ } sha512sums=" -2a7cd029ccebad9be9c8ba3bbde47528e7c98bffd2bdb24456641226ae9977381aff58176d2e2e961e8205a17a4708cde8cf1829c573b0e1a8288eb9748e4c0d kakoune-2023.08.05.tar.gz +e510b01574d505aa99e1927b2ef43c52ef866163fcc59a334951159c63f21ce671e475aba7fcf79a284105ff8bebf76f8e987799cb415e1503dbe1d1dd4fe2c4 kakoune-2024.05.09.tar.gz c5b11dc28adf785b4e83637fe1d5c9db334616d2d3f6c667823745e273f739c57d0d408b9bec8a65210e3c7ccb80a5b488ebbb3c0c5de8bdec13e1b4b4d02b77 alpine-linux.kak -23d05861de3c23c8193b1b6d7ca0d2b5b33548c0ae9a317186ccca6533b51daffb9064d3ab9e7ac0a0a794e119633089ca34673b6d9dd56041e2f9046b38b87b 0001-fix-CXXFLAGS.patch +83295606d1191ae66339ccd813b5f123ab49b22bafcdd578b109ea367dae52c5de7f6b8e44119579163befb349e3b76b4b9e4b20f951466dc2c270c38e64ceb1 0001-fix-CXXFLAGS.patch aa5df7a115e7b7ecaba85794ea56961fd1c638f4590300474fa72c8900ecb36742d7c8075ebc48151f40ba2dc427c4d8bcca9c844793768a1d0c4e66f22d328c constexpr.patch +3ad545cbbc23f0273032543a24e380236e149dfed540da7b51c073b3c07107d3c7a4f0ff17c739fc45c41e0d52e2b6608979f5e1d1d1f60e774994a330027fa1 fix-tests.patch " diff --git a/community/kakoune/fix-tests.patch b/community/kakoune/fix-tests.patch new file mode 100644 index 00000000000..3933e8572c0 --- /dev/null +++ b/community/kakoune/fix-tests.patch @@ -0,0 +1,120 @@ +Patch-Source: https://github.com/mawww/kakoune/commit/8c2775f665fd4aae603b423362cf0d4d917fc0df +-- +From 8c2775f665fd4aae603b423362cf0d4d917fc0df Mon Sep 17 00:00:00 2001 +From: Maxime Coste <mawww@kakoune.org> +Date: Fri, 10 May 2024 12:04:27 +1000 +Subject: [PATCH] Fix tests that were failing on alpine + +Ensure perl exists for git blame tests, replace timing sensitive +`ui_out -ignore ...` with `ui_out -until '...'` +--- + test/commands/edit-fifo-noscroll/script | 13 ++++++------- + test/run | 6 ++++++ + test/tools/git/blame-in-diff/enabled | 2 +- + test/tools/git/blame-in-diff/script | 7 +++---- + test/tools/git/blame-jump-message/enabled | 2 +- + test/tools/git/blame-jump-message/script | 7 +++---- + 6 files changed, 20 insertions(+), 17 deletions(-) + +diff --git a/test/commands/edit-fifo-noscroll/script b/test/commands/edit-fifo-noscroll/script +index f64e1a778a..3a719e6a36 100644 +--- a/test/commands/edit-fifo-noscroll/script ++++ b/test/commands/edit-fifo-noscroll/script +@@ -1,19 +1,18 @@ +-ui_out -ignore 7 ++ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }' + exec 5>fifo +-ui_out '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }' + + echo '* line1' >&5 + ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "underline": "default", "attributes": [] }, "contents": "*" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " line1\u000a" }]], { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }] }' +-ui_out -ignore 2 ++ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }' + + echo '* line2' >&5 + ui_out '{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "underline": "default", "attributes": [] }, "contents": "*" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " line1\u000a" }], [{ "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "* line2\u000a" }]], { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }] }' +-ui_out -ignore 2 ++ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }' + + dd if=/dev/zero bs=2049 count=1 2>/dev/null | sed s/././g >&5 +-ui_out -ignore 3 ++ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }' + ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "gjxH|wc -c | tr -d \" \"<ret>" ] }' +-ui_out -ignore 6 ++ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }' + + exec 5>&- +-ui_out '{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "*fifo* 3:4 " }, { "face": { "fg": "black", "bg": "yellow", "underline": "default", "attributes": [] }, "contents": "[scratch]" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "underline": "default", "attributes": [] }] }' ++ui_out -until '{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "*fifo* 3:4 " }, { "face": { "fg": "black", "bg": "yellow", "underline": "default", "attributes": [] }, "contents": "[scratch]" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "underline": "default", "attributes": [] }] }' +diff --git a/test/run b/test/run +index 95f71a9e94..e26aea054e 100755 +--- a/test/run ++++ b/test/run +@@ -190,6 +190,12 @@ ui_out() { + skip_count=$(( skip_count - 1 )) + done + ;; ++ -until) ++ shift ++ while read -r event <&4; do ++ [ "$event" == "$1" ] && break ++ done ++ ;; + -until-grep) + shift + while +diff --git a/test/tools/git/blame-in-diff/enabled b/test/tools/git/blame-in-diff/enabled +index a041a9b460..b5b8908197 100755 +--- a/test/tools/git/blame-in-diff/enabled ++++ b/test/tools/git/blame-in-diff/enabled +@@ -1,2 +1,2 @@ + #!/bin/sh +-command -v git >/dev/null ++command -v git >/dev/null && command -v perl >/dev/null +diff --git a/test/tools/git/blame-in-diff/script b/test/tools/git/blame-in-diff/script +index e5ca34b2f5..6adda9225f 100644 +--- a/test/tools/git/blame-in-diff/script ++++ b/test/tools/git/blame-in-diff/script +@@ -1,11 +1,10 @@ +-ui_out -ignore 7 +-ui_out -ignore 11 ++ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }' + + # We've jumped to the new version of line 2. Move to the old version so we + # can annotate the old file. + ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "k:git blame<ret>" ] }' +-ui_out -ignore 11 ++ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }' + + # We should have jumped to the old version of line 2, assert on kak_selection. + ui_in '{ "jsonrpc": "2.0", "method": "keys", "params": [ "x" ] }' +-ui_out -ignore 5 ++ui_out -until '{ "jsonrpc": "2.0", "method": "refresh", "params": [false] }' +diff --git a/test/tools/git/blame-jump-message/enabled b/test/tools/git/blame-jump-message/enabled +index a041a9b460..b5b8908197 100755 +--- a/test/tools/git/blame-jump-message/enabled ++++ b/test/tools/git/blame-jump-message/enabled +@@ -1,2 +1,2 @@ + #!/bin/sh +-command -v git >/dev/null ++command -v git >/dev/null && command -v perl >/dev/null +diff --git a/test/tools/git/blame-jump-message/script b/test/tools/git/blame-jump-message/script +index 67834a40d8..9f6fb6e0f1 100644 +--- a/test/tools/git/blame-jump-message/script ++++ b/test/tools/git/blame-jump-message/script +@@ -1,6 +1,5 @@ +-while ! ui_out -until-grep draw_status | grep -v '\[fifo\]' >/dev/null; +-do +- : ++while true; do ++ ui_out -until-grep draw_status | grep -v '\[fifo\]' >/dev/null && break + done + actual_draw_status=$(ui_out -until-grep draw_status) + +@@ -11,5 +10,5 @@ EOF + expected_subject_json=\"$(printf '%s' "$expected_subject" | sed 's/"/\\"/g')\" + expected_draw_status='{ "jsonrpc": "2.0", "method": "draw_status", "params": [[{ "face": { "fg": "black", "bg": "yellow", "underline": "default", "attributes": [] }, "contents": '"$expected_subject_json"' }], [{ "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": "*git* 13:2 " }, { "face": { "fg": "black", "bg": "yellow", "underline": "default", "attributes": [] }, "contents": "[scratch]" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "underline": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "underline": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "underline": "default", "attributes": [] }] }' + +-assert_eq "$actual_draw_status" "$expected_draw_status" ++assert_eq "$expected_draw_status" "$actual_draw_status" + ui_out -ignore 2 diff --git a/community/kalarm/APKBUILD b/community/kalarm/APKBUILD index 8961d3d64d7..5c1972098b1 100644 --- a/community/kalarm/APKBUILD +++ b/community/kalarm/APKBUILD @@ -10,7 +10,8 @@ pkgdesc="Personal alarm scheduler" url="https://kontact.kde.org/" # armhf blocked by extra-cmake-modules # ppc64le, s390x, riscv64 and armv7 blocked by qt6-qtwebengine -> akonadi -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by pimcommon +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" license="GPL-2.0-or-later AND GFDL-1.2-only" depends="kdepim-runtime" makedepends=" @@ -63,7 +64,7 @@ _repo_url="https://invent.kde.org/pim/kalarm.git" source="https://download.kde.org/stable/release-service/$pkgver/src/kalarm-$pkgver.tar.xz" build() { - cmake -B build -G Ninja\ + cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib diff --git a/community/kamoso/APKBUILD b/community/kamoso/APKBUILD index 0375b44add2..32e7113b3a3 100644 --- a/community/kamoso/APKBUILD +++ b/community/kamoso/APKBUILD @@ -5,10 +5,10 @@ # group=kde-applications pkgname=kamoso pkgver=24.02.2 -pkgrel=0 +pkgrel=2 # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> purpose -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine -> purpose +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kde.org/applications/multimedia/org.kde.kamoso" pkgdesc="An application to take pictures and videos out of your webcam" license="GPL-2.0-or-later AND LGPL-2.1-only" @@ -16,6 +16,7 @@ depends=" gst-plugins-bad gst-plugins-good kirigami2 + purpose5 " makedepends=" extra-cmake-modules diff --git a/community/kanshi/APKBUILD b/community/kanshi/APKBUILD index cf5a2aa3145..2f60e6f05b0 100644 --- a/community/kanshi/APKBUILD +++ b/community/kanshi/APKBUILD @@ -2,14 +2,14 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=kanshi -pkgver=1.5.1 +pkgver=1.6.0 pkgrel=0 pkgdesc="Dynamic display configuration for Wayland" url="https://wayland.emersion.fr/kanshi/" license="MIT" arch="all" options="!check" # no test suite -makedepends="meson varlink-dev wayland-dev scdoc" +makedepends="meson libscfg-dev varlink-dev wayland-dev scdoc" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~emersion/kanshi/archive/v$pkgver.tar.gz" builddir="$srcdir/$pkgname-v$pkgver" @@ -24,5 +24,5 @@ package() { } sha512sums=" -0fe5fa584febe29b80eb8e896cc87734de83a7a5021e027bb864a9da9b8b333db3584f83885c2870907f4a1ec5ef8bb386356a037b7560643c4badec811bb1aa kanshi-1.5.1.tar.gz +0202cf7e9e4f1c9bb456b8e5452fe5a7d4a7f8f37ee6a3809d165238b95c71b6f278ece7dc2b323e2788e41248fc3e4752aaac6728810faccd34fdeb147e6143 kanshi-1.6.0.tar.gz " diff --git a/community/kapidox/APKBUILD b/community/kapidox/APKBUILD index 9130a99e0d3..066790c73fb 100644 --- a/community/kapidox/APKBUILD +++ b/community/kapidox/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kapidox -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 arch="noarch !armhf" # armhf blocked by extra-cmake-modules pkgdesc="Scripts and data for building API documentation (dox) in a standard format and style" @@ -42,5 +42,5 @@ package() { } sha512sums=" -457ccd628cd05c37c7c10c0243516d48c1464f5609d43a36e0a6810250be31b168259afbcadece7c99b7fb0a0627aa901920b9c6ff25f2eed52d04be4777fbbc kapidox-6.1.0.tar.xz +8606000abe7a28133f0ac55f89ca1944ce0d7707b97937d5bf5ea350c5c31a154ddebdae39b0fd1981adbb07578608b537de226ef28770b58815455b3401895a kapidox-6.2.0.tar.xz " diff --git a/community/karchive/APKBUILD b/community/karchive/APKBUILD index af4eda44c73..ae40a29052c 100644 --- a/community/karchive/APKBUILD +++ b/community/karchive/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=karchive -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Qt addon providing access to numerous types of archives" # armhf blocked by extra-cmake-modules @@ -45,5 +45,5 @@ package() { } sha512sums=" -14af2a3335de1ef320f838a8dc4176cfea9fc861576ea6ba3e8d072d422432b08d5e01fa2c681b26e11798da4970749516785d7dbaf5f4137c2b2bcb45f62f12 karchive-6.1.0.tar.xz +80af1f2374d32045c428a17ce82f8953a1bc9a1777a70810836c28ab12ecca5ec5d1ee2e556af7a273f45589236a03eedf35b728e2dfb5beec6505f3ce602bbf karchive-6.2.0.tar.xz " diff --git a/community/kauth/APKBUILD b/community/kauth/APKBUILD index 78d626e24e0..4fed9cc2ddf 100644 --- a/community/kauth/APKBUILD +++ b/community/kauth/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kauth -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Abstraction to system policy and authentication features" # armhf blocked by extra-cmake-modules @@ -47,5 +47,5 @@ package() { } sha512sums=" -c9c13280cada75ec2f8b2e6add95ab2afe8086b16b3a8d464722202ea97c86e107395abfaac690fa77934fdf2e98eab9c60c31d000ecb7f1c62636af9abe0e6d kauth-6.1.0.tar.xz +e4d1251fe41d0f8f3c995ade90709e8277d8b5211c16b09fb8ba47c4724d0dfe288305a591e32f43fdb0ff31cdc6aa011c7050a71ff56e7a1d743f371a761eb5 kauth-6.2.0.tar.xz " diff --git a/community/kbookmarks/APKBUILD b/community/kbookmarks/APKBUILD index 6070ff984b1..3aaafb0df8a 100644 --- a/community/kbookmarks/APKBUILD +++ b/community/kbookmarks/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kbookmarks -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Support for bookmarks and the XBEL format" # armhf blocked by extra-cmake-modules @@ -49,5 +49,5 @@ package() { } sha512sums=" -4d70b78149e515a4e03f7ef4e1349d1fba5792527bad0a1521e436689e4b059c194a4846a79fe135b44e4d707e30ad10b28cd6f52a52c5e19c09ebe654d5393a kbookmarks-6.1.0.tar.xz +b22fca55cc49f5c5cdc6b1455f68984092764432fab53ca60bda09aefee5d0633fb58764fdbd22257b10a872918ed0bbd894d940197cbec4fbf4b98b386bdeaf kbookmarks-6.2.0.tar.xz " diff --git a/community/kcalendarcore/APKBUILD b/community/kcalendarcore/APKBUILD index b6088162cca..6de1f2e6ab1 100644 --- a/community/kcalendarcore/APKBUILD +++ b/community/kcalendarcore/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kcalendarcore -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="The KDE calendar access library" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -50,5 +50,5 @@ package() { } sha512sums=" -f7390829497719d7a3be9fadb24807bbc510856bf5aefcf50bd44e90031b9889e5aeb275bc7787f0889a0404ebf3c00819116c1403b54188f739050011a35e85 kcalendarcore-6.1.0.tar.xz +654a90837da7967f2ee4bfcc1b4187f403d1d31aea06ebd39f6c4051de222a4c64befe620994f79e2b7903d7d452e3fcb1b997f0f45ff8bcb334d04c1b9f97b3 kcalendarcore-6.2.0.tar.xz " diff --git a/community/kcalendarcore5/APKBUILD b/community/kcalendarcore5/APKBUILD index 80825eba114..06acdfc62df 100644 --- a/community/kcalendarcore5/APKBUILD +++ b/community/kcalendarcore5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=kcalendarcore5 pkgver=5.115.0 pkgrel=1 diff --git a/community/kcmutils/APKBUILD b/community/kcmutils/APKBUILD index 75bd614c10b..90ed4572c66 100644 --- a/community/kcmutils/APKBUILD +++ b/community/kcmutils/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kcmutils -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Utilities for interacting with KCModules" # armhf blocked by extra-cmake-modules @@ -53,5 +53,5 @@ package() { } sha512sums=" -676724395781a44a57d224b55a36b9afa450ce502b0a6bd24127d5e638dbfcfc3165ebe7ccf10bf40460fde80d189058cd9f5fa17527b07d573ef97984ccf7a6 kcmutils-6.1.0.tar.xz +ea3dbf36fe0b18157e49398c4e0b42930c8a1e8c5668452dceec9643fc6a93c9d3001bfe5bdacb7eeef72dbb155d4dfecbf0f0c94f027155ba2311abf2003697 kcmutils-6.2.0.tar.xz " diff --git a/community/kcodecs/APKBUILD b/community/kcodecs/APKBUILD index 30bd1312290..e0dea731118 100644 --- a/community/kcodecs/APKBUILD +++ b/community/kcodecs/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kcodecs -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Provide a collection of methods to manipulate strings using various encodings" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -41,5 +41,5 @@ package() { } sha512sums=" -a2eb61b15849270df76ea78bbf289ca32792b6fc9b6710cd146a09eff36e7d4ff4dc1540a2baef59f29c1949cd5a5887064d9d070754c4987a6aa3ed0d4d5451 kcodecs-6.1.0.tar.xz +b5632868be6ae5279303f29cfa5e85d241c21545b282bf6fbd560d7c178cf047ce9c5f59c7555a52b7fe02ee145b56edbe0040bd5ce23f767d1fb3487a08103d kcodecs-6.2.0.tar.xz " diff --git a/community/kcolorscheme/APKBUILD b/community/kcolorscheme/APKBUILD index 8405291d1f2..22a157a4a6f 100644 --- a/community/kcolorscheme/APKBUILD +++ b/community/kcolorscheme/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kcolorscheme -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Classes to read and interact with KColorScheme" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -43,5 +43,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -0a23e54f0575fe6bd353b8559869683e273288413bcc0549915ae29572390780f7c2b1eacb39df08d80601669b380a07f126b5be909b1d8a6f8fe20e391a31f8 kcolorscheme-6.1.0.tar.xz +6dbf8ae7704e2d8507f0ea3d7a4eb8f696d0723361f73c34c064a96f3047f00aa787fee259d755abf99f6ad752709e1abfb0cfbafabb20edc7dab53b02e77309 kcolorscheme-6.2.0.tar.xz " diff --git a/community/kcompletion/APKBUILD b/community/kcompletion/APKBUILD index dbdd0e5b116..aca0fdc2965 100644 --- a/community/kcompletion/APKBUILD +++ b/community/kcompletion/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kcompletion -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Text completion helpers and widgets" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { } sha512sums=" -a9732b69a85cad3b300219b08020a1701b6cfb44a841e8474204bf4b30b5f254ccffa5fa14646641e675b9f2a60fb2b8d0533130b83b8db932ef5e3f3bff92c0 kcompletion-6.1.0.tar.xz +d56f452309daa527f2abeb548800f3589a7c9cebafef35ee21e49b7e905958e67f5ee009310ad9d0dbc5c0fbd040ceca7a7a0ae8a627e4fc957c44a12a2561f9 kcompletion-6.2.0.tar.xz " diff --git a/community/kconfig/APKBUILD b/community/kconfig/APKBUILD index ad3cd70584b..b419321c5dc 100644 --- a/community/kconfig/APKBUILD +++ b/community/kconfig/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kconfig -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Configuration system" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -28,7 +28,8 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_QCH=ON + -DBUILD_QCH=ON \ + -DBUILD_TESTING=OFF # Broken compilation cmake --build build } @@ -47,5 +48,5 @@ package() { } sha512sums=" -e7eafb0d66e93a4aa20dfc3a006cafdea2cbd5815eb8fe83fa7ebf3e9fb891621bc4b1063bd2904b1443889706ca9505cf2bf40ae0d87e1b95e5ca4dbdad15c5 kconfig-6.1.0.tar.xz +06490f43e9200810a2d8daa9bc225a4d32befb6bae1c6937b76ad2ff315fb5974301c2e0123701dc1ed46cf83e7fefbf2ca4d240834cdb953a553783a148a165 kconfig-6.2.0.tar.xz " diff --git a/community/kconfigwidgets/APKBUILD b/community/kconfigwidgets/APKBUILD index 1071b51f1bd..99f38130d1e 100644 --- a/community/kconfigwidgets/APKBUILD +++ b/community/kconfigwidgets/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kconfigwidgets -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Widgets for KConfig" # armhf blocked by extra-cmake-modules @@ -52,5 +52,5 @@ package() { } sha512sums=" -546c4399537d6b65a58c4fe302bd7d3186161b10fe38b008b42b344c57455941e0d007d7a51fa4cec93fc9e404e2bfce39121b6810d6c45e8ac2c83751c1661a kconfigwidgets-6.1.0.tar.xz +14b53b60b33a03c7bb0590a2dc8335180968993b2d6f33b10bfcc3176d4b67efb8ab39c171a8aa654855c8fe48f3cd3e5fd098dea7d5f5cf41b696d92536d8b6 kconfigwidgets-6.2.0.tar.xz " diff --git a/community/kcontacts/APKBUILD b/community/kcontacts/APKBUILD index c4d8f720c52..7d46e77ddb5 100644 --- a/community/kcontacts/APKBUILD +++ b/community/kcontacts/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kcontacts -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Address book API for KDE" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -53,5 +53,5 @@ package() { } sha512sums=" -3173f9bb6cd55fb5e0035c6fd828a9ab26dbfeb7df54c215c45f60674a12005e15c4597e7a0365b964df5797c9cb430a489e8e08559510a4e1242663a2dd9c00 kcontacts-6.1.0.tar.xz +b4f6e6ae693f0eb54ed889b8acfb4afdf2758f3e99fc11b363fc665077d8c1ec0528521668318090368c14afe7dc0111372891f89e5039e4e04df1d98b4e53ab kcontacts-6.2.0.tar.xz " diff --git a/community/kcoreaddons/APKBUILD b/community/kcoreaddons/APKBUILD index 79d85a8612b..80be59b3a25 100644 --- a/community/kcoreaddons/APKBUILD +++ b/community/kcoreaddons/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kcoreaddons -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Addons to QtCore" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -58,5 +58,5 @@ icons() { } sha512sums=" -1f9aa728898ed9e1e3bbff96b300a895022065d51fd21a15e68e7a71eb09c1b507e69c6723511ce66a8e6cdac29b8839535226764e819cc3541ee0b675cc064a kcoreaddons-6.1.0.tar.xz +f4134611de25c2e30f22d6d807ea16e83211a856255265fc94b9e767053475fe500f027be720283b85b8d10218443e528f249d4d95cefabb45b30177223810cc kcoreaddons-6.2.0.tar.xz " diff --git a/community/kcrash/APKBUILD b/community/kcrash/APKBUILD index 286683619bd..8b8fc60ea42 100644 --- a/community/kcrash/APKBUILD +++ b/community/kcrash/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kcrash -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Support for application crash analysis and bug report from apps" arch="all !armhf" @@ -44,5 +44,5 @@ package() { } sha512sums=" -6334c6924e5f78f97cd433ea1d41f82db51fb3abc9205320d5c3ffd4034383d9bb2c1810cc71c7d3639e53294a819be2b96a53469d826d132f6faf2d49ed97a4 kcrash-6.1.0.tar.xz +fb388570be51867341558df8fe0da0e8444b3d6005167a4537981a254e7180565bde1d088cbbe53a833806ad111937c14ca1237cf8b6f8e69e21fb97cfeaafb0 kcrash-6.2.0.tar.xz " diff --git a/community/kdav/APKBUILD b/community/kdav/APKBUILD index 173bfba68f3..507c19508b9 100644 --- a/community/kdav/APKBUILD +++ b/community/kdav/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kdav -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="A DAV protocol implementation with KJobs" url="https://community.kde.org/Frameworks" @@ -47,5 +47,5 @@ package() { } sha512sums=" -f7e37640f7048d0da6a4377d1eabc3a4d817dd9c22ab7df8fbb1cf22f641fadbd2cc34014948341261fc8c5782586b01d9526526657fd2ef818898218254c4d7 kdav-6.1.0.tar.xz +e5f42655738b2a0e62beefe9ffde8fd872825d10c251e3eb851f1a8f0f14f708757b1481da4fedf9e563dff12a47aaaa95be7480c2f6f7cabd8c0735977c1735 kdav-6.2.0.tar.xz " diff --git a/community/kdbusaddons/APKBUILD b/community/kdbusaddons/APKBUILD index a1a7b1f340f..4d8bcf182f8 100644 --- a/community/kdbusaddons/APKBUILD +++ b/community/kdbusaddons/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kdbusaddons -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Addons to QtDBus" # armhf blocked by extra-cmake-modules @@ -42,5 +42,5 @@ package() { } sha512sums=" -924d21179c624fdeed9de230c22b12d4682980b8578e81a8473bb95a1d251a104d5d6dd7e999e01caf5652a60a6b78ad2baf07e98d1d1d60c5ed2c4c7e6a844d kdbusaddons-6.1.0.tar.xz +4690dbef2a9de8753ed8c28bdc04faa9d2e064cfcb7dc8423315111ec285ca0a98e58b3e5882b1474ef057db543636853cf8b8b0a331f122434373349b347a17 kdbusaddons-6.2.0.tar.xz " diff --git a/community/kde-cli-tools/APKBUILD b/community/kde-cli-tools/APKBUILD index 850112e29fe..e06d4338b4e 100644 --- a/community/kde-cli-tools/APKBUILD +++ b/community/kde-cli-tools/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kde-cli-tools -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Tools based on KDE Frameworks 5 to better interact with the system" # armhf blocked by extra-cmake-modules @@ -57,5 +57,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -1090267afd99929ddf7eeeb17f9f39cb6bba0e8ef441d22a9c64301b9ff623a23bf5d2410fdec184408b8ed7d83622cee909c6e7b23299ad95ac58eae7fc0cf5 kde-cli-tools-6.0.3.tar.xz +ad2fc4440eddf9f4fbc732e43373838aa2f137a891acaf9cb49b2383ea27855f7bab667c53d9071111fcf11e6f149c926ebebaa6ddf29c74f2bedecebb42e1c5 kde-cli-tools-6.0.4.tar.xz " diff --git a/community/kde-gtk-config/APKBUILD b/community/kde-gtk-config/APKBUILD index 5e62419255e..f274e1e90ca 100644 --- a/community/kde-gtk-config/APKBUILD +++ b/community/kde-gtk-config/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kde-gtk-config -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="GTK2 and GTK3 Configurator for KDE" # armhf blocked by qt6-qtdeclarative @@ -55,5 +55,5 @@ package() { } sha512sums=" -4f73cda6915cc8f2b6b0b7e0607fade360fd3929ddeb10d97b1dfbc95954a425c7226eef2ffe24c94a3208d83a13c39d7a2769bf953206b2951036212cb33d68 kde-gtk-config-6.0.3.tar.xz +a6d1bc7b75e0b0d6659be91b22b779af3d50b6ca6590523ea169f92e7d373cdc6940a4a9f49136f3aab009b7da6a2a5d9130798d44bc5a8f045da12be31018b8 kde-gtk-config-6.0.4.tar.xz " diff --git a/community/kdeclarative/APKBUILD b/community/kdeclarative/APKBUILD index 362f56ef1e7..fd73f8cb839 100644 --- a/community/kdeclarative/APKBUILD +++ b/community/kdeclarative/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kdeclarative -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Provides integration of QML and KDE Frameworks" # armhf blocked by qt6-qtdeclarative @@ -54,5 +54,5 @@ package() { } sha512sums=" -cba39ef2f03f80a1ef739b53fe2c8843574b4a67ab2ed185033295a2e6c04a76d9769a207f333d5e95944c311c73ae72bf1855cda5288a2d3f6491d6ec60c74b kdeclarative-6.1.0.tar.xz +420a8a011e0895b597440c3b448e789ebcf8c88a21635f4e6b175e258d53b0c4027b6d679abcda380a84148b90495f0d38fde53d3050a4f589b0a2f21ba05ded kdeclarative-6.2.0.tar.xz " diff --git a/community/kdecoration/APKBUILD b/community/kdecoration/APKBUILD index 04905f57b71..3591f14927b 100644 --- a/community/kdecoration/APKBUILD +++ b/community/kdecoration/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kdecoration -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Plugin based library to create window decorations" arch="all !armhf" @@ -46,5 +46,5 @@ package() { } sha512sums=" -955f943384ad551cf77af1e1848fb732e9612dafb104f5c4f14c8d54ae3ac7a17327c811053d4e741cd71cf4387145721585f45721c3faaeb354eecd1e60dae3 kdecoration-6.0.3.tar.xz +a27f97b5bdec32702e9aee66b81d11da340dcd12048a1a193f35419e45032bffbffc5e49bd65648314db6b0513e041b29c18941bf117474c72698fd45a60fbfc kdecoration-6.0.4.tar.xz " diff --git a/community/kded/APKBUILD b/community/kded/APKBUILD index 2089c7930ef..1a114f73763 100644 --- a/community/kded/APKBUILD +++ b/community/kded/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kded -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Extensible deamon for providing system level services" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -47,5 +47,5 @@ package() { } sha512sums=" -d0832122f3d81ffb79079881cd735230b9d3e4cbaef2b2cc5cc35bfec872145e8ba85b29d7ac3eda3f2966256d1a3c8a8d7df50c3c096094dc3344e432b6408e kded-6.1.0.tar.xz +59a171761ae0971706c6d04da04f27a75a4d139be8e597e4c7f211d4bf8e1c6397193104d878ee1af62f1b8b99ae0c124a585d0304ff18223e845bd5c7f43a93 kded-6.2.0.tar.xz " diff --git a/community/kdenlive/APKBUILD b/community/kdenlive/APKBUILD index cfbf13d40af..3714a4abed8 100644 --- a/community/kdenlive/APKBUILD +++ b/community/kdenlive/APKBUILD @@ -5,17 +5,18 @@ # group=kde-applications pkgname=kdenlive pkgver=24.02.2 -pkgrel=0 +pkgrel=1 # ppc64le mlt uses 64bit long double while libgcc uses 128bit long double -# ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -> purpose +# ppc64le, s390x, loongarch64 and riscv64 blocked by qt6-qtwebengine -> purpose # aarch64 and armv7 blocked by OpenGL -arch="all !armhf !ppc64le !s390x !riscv64 !aarch64 !armv7" +arch="all !armhf !ppc64le !s390x !riscv64 !aarch64 !armv7 !loongarch64" url="https://kdenlive.org" pkgdesc="An intuitive and powerful multi-track video editor, including most recent video technologies" license="GPL-2.0-or-later" depends=" ffmpeg frei0r-plugins + qqc2-desktop-style " makedepends=" extra-cmake-modules diff --git a/community/kdepim-addons/APKBUILD b/community/kdepim-addons/APKBUILD index 067da2497b7..c30b1e29b72 100644 --- a/community/kdepim-addons/APKBUILD +++ b/community/kdepim-addons/APKBUILD @@ -8,7 +8,8 @@ pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules # armv7, ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -arch="all !armhf !armv7 !ppc64le !s390x !riscv64" +# loongarch64 blocked by pimcommon +arch="all !armhf !armv7 !ppc64le !s390x !riscv64 !loongarch64" url="https://kontact.kde.org/" pkgdesc="Addons for KDE PIM applications" license="GPL-2.0-or-later AND LGPL-2.0-or-later" diff --git a/community/kdepim-runtime/APKBUILD b/community/kdepim-runtime/APKBUILD index dc1b18a15ba..30014e0dc55 100644 --- a/community/kdepim-runtime/APKBUILD +++ b/community/kdepim-runtime/APKBUILD @@ -10,7 +10,8 @@ pkgdesc="Extends the functionality of kdepim" url="https://kontact.kde.org/" # armhf blocked by extra-cmake-modules # ppc64le, s390x, riscv64 and armv7 blocked by qt6-qtwebengine -> akonadi -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by pimcommon +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" license="LGPL-2.0-or-later" makedepends=" akonadi-calendar-dev diff --git a/community/kdeplasma-addons/APKBUILD b/community/kdeplasma-addons/APKBUILD index ae3734924a0..d3419deb6d1 100644 --- a/community/kdeplasma-addons/APKBUILD +++ b/community/kdeplasma-addons/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kdeplasma-addons -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="All kind of addons to improve your Plasma experience" # armhf blocked by qt6-qtdeclarative # ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64" +# loongarch64 blocked by purpose +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kde.org/plasma-desktop/" license="LGPL-2.0-only AND GPL-2.0-or-later" depends="purpose" @@ -45,8 +46,8 @@ makedepends="$depends_dev checkdepends="xvfb-run" case "$pkgver" in - *.90*) _rel=unstable;; - *) _rel=stable;; +*.90*) _rel=unstable ;; +*) _rel=stable ;; esac subpackages="$pkgname-dev $pkgname-lang" _repo_url="https://invent.kde.org/plasma/kdeplasma-addons.git" @@ -71,5 +72,5 @@ package() { } sha512sums=" -65b721b5e722cc0b1c08b00ca5abb9a5cdc45c71e65d9e147daeb24d457e7946cf51f8232d6aa1518c2c5466b9e9c9576a65132584eacb8395b0d5d8c5d8eb3a kdeplasma-addons-6.0.3.tar.xz +f3f9ac1ab0d95ad09e7f79fda0b2eae781750670d26dd552b23984fd9449f8d269df85d437054b41f39651add9515cd685b2bfe1720235cc22b6bc8f4cbdbdcf kdeplasma-addons-6.0.4.tar.xz " diff --git a/community/kdesu/APKBUILD b/community/kdesu/APKBUILD index fa41938997a..36d783f54d6 100644 --- a/community/kdesu/APKBUILD +++ b/community/kdesu/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kdesu -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Integration with su for elevated privileges" # armhf blocked by extra-cmake-modules @@ -50,5 +50,5 @@ package() { } sha512sums=" -6ea4e6ae3f648915e8ad63d605e56fd504954138e8c663e0d41fbe1a2bd9da738f5b9024e1be631171fb38b1af7eff1af2db11cd5418a8602862a81a2da5ed2d kdesu-6.1.0.tar.xz +0856d28c7e853edbaf450229499982cef3793558309db1de72092a2422cfd273325a089e9e00ea2a5ad941b15b4d992ea2feb5c495c0884d4d512c19f602c756 kdesu-6.2.0.tar.xz " diff --git a/community/kdesu5/APKBUILD b/community/kdesu5/APKBUILD index 8bfebae2331..c3ad58cb1bc 100644 --- a/community/kdesu5/APKBUILD +++ b/community/kdesu5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=kdesu5 pkgver=5.115.0 pkgrel=1 diff --git a/community/kdevelop/APKBUILD b/community/kdevelop/APKBUILD index 697a0a8a78f..10ac23efe37 100644 --- a/community/kdevelop/APKBUILD +++ b/community/kdevelop/APKBUILD @@ -5,9 +5,9 @@ # group=kde-applications pkgname=kdevelop pkgver=24.02.2 -pkgrel=0 +pkgrel=1 # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine # Currently all arches are blocked till KDE 6 is done building arch="" url="https://www.kdevelop.org/" diff --git a/community/kdiff3/APKBUILD b/community/kdiff3/APKBUILD index ca62c0d5eb4..c9177dc2f98 100644 --- a/community/kdiff3/APKBUILD +++ b/community/kdiff3/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-other pkgname=kdiff3 -pkgver=1.10.7 +pkgver=1.11.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -26,7 +26,7 @@ makedepends=" " checkdepends="xvfb-run" _repo_url="https://invent.kde.org/sdk/kdiff3.git" -source="https://download.kde.org/stable/kdiff3/kdiff3-$pkgver.tar.xz" +source="$pkgname-$pkgver-1.tar.xz::https://download.kde.org/stable/kdiff3/kdiff3-$pkgver.tar.xz" subpackages="$pkgname-doc $pkgname-lang" build() { @@ -46,5 +46,5 @@ package() { } sha512sums=" -ab7ce8312014de200bcc613be1a28b384289f96be08d7f2e1e640b202cede3bbfeffa7b3e53b605f8edf9be2368d2aa6c6b5ee4501577ed8560ca1c4704802db kdiff3-1.10.7.tar.xz +960a134df0898c2fbe0478b1966c864009c6d4249922884c366038284ccf3ab902d329c171daee30b45f4105bc4fdd37d5fe60406d83c7f9d00b0bc564976d42 kdiff3-1.11.0-1.tar.xz " diff --git a/community/kdnssd/APKBUILD b/community/kdnssd/APKBUILD index c64f183598b..39c154a2866 100644 --- a/community/kdnssd/APKBUILD +++ b/community/kdnssd/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kdnssd -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 arch="all !armhf" # armhf blocked by extra-cmake-modules pkgdesc="Network service discovery using Zeroconf" @@ -43,5 +43,5 @@ package() { } sha512sums=" -8d20f5b481872e52746a1605194354f4d0a56fefe091679c07e39e7d96330ab67b49b424c8568e74a027c028f8c01064311bdce6be8fe87fb81558a29326fb9f kdnssd-6.1.0.tar.xz +31563f785573c07ecd2f91706316b0601c96995e99776668d0b4da340d974abbb17111a1fdefdfaa59a5f045883ec05d6635b35b844d96bd0f5533a74545d9f4 kdnssd-6.2.0.tar.xz " diff --git a/community/kdnssd5/APKBUILD b/community/kdnssd5/APKBUILD index 701cedd7a88..2399f7ace50 100644 --- a/community/kdnssd5/APKBUILD +++ b/community/kdnssd5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=kdnssd5 pkgver=5.115.0 pkgrel=1 diff --git a/community/kdoctools/APKBUILD b/community/kdoctools/APKBUILD index fdf1d30b8ed..0c8815d08fb 100644 --- a/community/kdoctools/APKBUILD +++ b/community/kdoctools/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kdoctools -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Documentation generation from docbook" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -52,5 +52,5 @@ package() { } sha512sums=" -51ea89b116502aa07ddc848d952247112d8aed0ff2d6f4b401a9b2d4ff2da65517f4cf1d973382b55428502ba5f1b2383b26aab878d5784764785779f72d42bf kdoctools-6.1.0.tar.xz +8bdc956301d6ea0c3095c5170040b43d33fee4e9fcde1a4b907d7eb9baa7a5100b8c37287d181b331488926d2370a31ed6c51c4e5e3428a02a2a13e7a213d5fd kdoctools-6.2.0.tar.xz " diff --git a/community/kealib/APKBUILD b/community/kealib/APKBUILD index 7b9e213a3ae..82dccd2f91f 100644 --- a/community/kealib/APKBUILD +++ b/community/kealib/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=kealib pkgver=1.5.3 -pkgrel=0 +pkgrel=1 pkgdesc="KEA is an image file format that provides a full implementation of the GDAL data model" url="http://www.kealib.org/" arch="all" diff --git a/community/keepassxc/APKBUILD b/community/keepassxc/APKBUILD index 2794c5f62b3..41f5ce2255a 100644 --- a/community/keepassxc/APKBUILD +++ b/community/keepassxc/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=keepassxc pkgver=2.7.7 -pkgrel=1 +pkgrel=2 pkgdesc="Community-driven port of the Windows application Keepass Password Safe" url="https://keepassxc.org/" arch="all" @@ -68,7 +68,22 @@ build() { check() { cd build - CTEST_OUTPUT_ON_FAILURE=TRUE xvfb-run -a ctest -E 'testcli' -j1 # v2.7.4 testcli fails + case "$CARCH" in + riscv64) + CTEST_OUTPUT_ON_FAILURE=TRUE xvfb-run -a ctest \ + -E '(testcli|testautotype|testentrysearcher|testpasskeys)' -j1 + # QWARN : TestAutoType::testGlobalAutoTypeWithOneMatch() Maximum depth of replacement has been reached. Entry uuid: {00000000-0000-0000-0000-000000000000} + # QFATAL : TestAutoType::testGlobalAutoTypeWithOneMatch() Received signal 4 + # FAIL! : TestEntrySearcher::testAndConcatenationInSearch() Compared values are not the same + # QFATAL : TestEntrySearcher::testSearch() Received signal 11 + # QWARN : TestPasskeys::testEntry() QObject::connect(MainWindow, BrowserService): invalid nullptr parameter + # QFATAL : TestPasskeys::testIsDomain() Received signal 11 + ;; + *) + CTEST_OUTPUT_ON_FAILURE=TRUE xvfb-run -a ctest \ + -E 'testcli' -j1 # v2.7.4 testcli fails + ;; + esac } package() { diff --git a/community/kexec-tools/APKBUILD b/community/kexec-tools/APKBUILD index edd3531265b..1fb0b3167bd 100644 --- a/community/kexec-tools/APKBUILD +++ b/community/kexec-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=kexec-tools pkgver=2.0.28 -pkgrel=0 +pkgrel=1 pkgdesc="Directly boot into a new kernel over a currently running one" url="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/" arch="all !riscv64" # not supported on riscv64 yet @@ -10,7 +10,9 @@ license="GPL-2.0-only" makedepends="zlib-dev xz-dev linux-headers" subpackages="$pkgname-doc" source="https://www.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-$pkgver.tar.xz + fix-basename.patch fix-build-on-Alpine-linux.patch + fix-build-with-binutils-2.41.patch " options="!check" @@ -33,5 +35,7 @@ package() { sha512sums=" 889a7bf1d26bb309e4ff7ce1c8dbcf48c01e47221ea3acf1c4ef2a98a652c496e31bddcdb627d3adebd85f7541d1fb9122c60e741e10b3726e31a9733cadc753 kexec-tools-2.0.28.tar.xz +0a58a3919cca937657d5f768103b6c7197a662401c2d892c8a4b9e0cfbcdebc8b1f20f9613dff651df88e467a6c3872f743908e13afb1b6ec8c8c1009e5534f4 fix-basename.patch 228166102bfc48f81c04f3b13fbf29d6edf2e66918a967f243c8d2652f40c27af565f1db6b1a58783bd12d67184a70e6b00b1ab82e0f0d195dd51009260c3329 fix-build-on-Alpine-linux.patch +ecf09e3e64dd29bfc2cd201ee51c5e587f2b3963b41d4b838f64f6772d82cc9d24fc3e9838ad5f7729ef75b871e45eaa0cefa434fdd241a5850e46641cfd2fdb fix-build-with-binutils-2.41.patch " diff --git a/community/kexec-tools/fix-basename.patch b/community/kexec-tools/fix-basename.patch new file mode 100644 index 00000000000..0da50e22faf --- /dev/null +++ b/community/kexec-tools/fix-basename.patch @@ -0,0 +1,12 @@ +--- a/kexec/arch/i386/x86-linux-setup.c ++++ b/kexec/arch/i386/x86-linux-setup.c +@@ -42,6 +42,9 @@ + #define VIDEO_CAPABILITY_64BIT_BASE (1 << 1) /* Frame buffer base is 64-bit */ + #endif + ++#define basename(dev) \ ++ (strrchr((dev),'/') ? strrchr((dev),'/')+1 : (dev)) ++ + void init_linux_parameters(struct x86_linux_param_header *real_mode) + { + /* Fill in the values that are usually provided by the kernel. */ diff --git a/community/kexec-tools/fix-build-with-binutils-2.41.patch b/community/kexec-tools/fix-build-with-binutils-2.41.patch new file mode 100644 index 00000000000..3025eafcb63 --- /dev/null +++ b/community/kexec-tools/fix-build-with-binutils-2.41.patch @@ -0,0 +1,94 @@ +Patch-Source: https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=328de8e00e298f00d7ba6b25dc3950147e9642e6 +-- +From 328de8e00e298f00d7ba6b25dc3950147e9642e6 Mon Sep 17 00:00:00 2001 +From: Michel Lind <salimma@fedoraproject.org> +Date: Tue, 30 Jan 2024 04:14:31 -0600 +Subject: Fix building on x86_64 with binutils 2.41 + +Newer versions of the GNU assembler (observed with binutils 2.41) will +complain about the ".arch i386" in files assembled with "as --64", +with the message "Error: 64bit mode not supported on 'i386'". + +Fix by moving ".arch i386" below the relevant ".code32" directive, so +that the assembler is no longer expecting 64-bit instructions to be used +by the time that the ".arch i386" directive is encountered. + +Based on similar iPXE fix: +https://github.com/ipxe/ipxe/commit/6ca597eee + +Signed-off-by: Michel Lind <michel@michel-slm.name> +Signed-off-by: Simon Horman <horms@kernel.org> +--- + purgatory/arch/i386/entry32-16-debug.S | 2 +- + purgatory/arch/i386/entry32-16.S | 2 +- + purgatory/arch/i386/entry32.S | 2 +- + purgatory/arch/i386/setup-x86.S | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S +index 5167944d..12e11649 100644 +--- a/purgatory/arch/i386/entry32-16-debug.S ++++ b/purgatory/arch/i386/entry32-16-debug.S +@@ -25,10 +25,10 @@ + .globl entry16_debug_pre32 + .globl entry16_debug_first32 + .globl entry16_debug_old_first32 +- .arch i386 + .balign 16 + entry16_debug: + .code32 ++ .arch i386 + /* Compute where I am running at (assumes esp valid) */ + call 1f + 1: popl %ebx +diff --git a/purgatory/arch/i386/entry32-16.S b/purgatory/arch/i386/entry32-16.S +index c051aab0..eace0958 100644 +--- a/purgatory/arch/i386/entry32-16.S ++++ b/purgatory/arch/i386/entry32-16.S +@@ -20,10 +20,10 @@ + #undef i386 + .text + .globl entry16, entry16_regs +- .arch i386 + .balign 16 + entry16: + .code32 ++ .arch i386 + /* Compute where I am running at (assumes esp valid) */ + call 1f + 1: popl %ebx +diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S +index f7a494f1..8ce9e316 100644 +--- a/purgatory/arch/i386/entry32.S ++++ b/purgatory/arch/i386/entry32.S +@@ -20,10 +20,10 @@ + #undef i386 + + .text +- .arch i386 + .globl entry32, entry32_regs + entry32: + .code32 ++ .arch i386 + + /* Setup a gdt that should that is generally usefully */ + lgdt %cs:gdt +diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S +index 201bb2cb..a212eed4 100644 +--- a/purgatory/arch/i386/setup-x86.S ++++ b/purgatory/arch/i386/setup-x86.S +@@ -21,10 +21,10 @@ + #undef i386 + + .text +- .arch i386 + .globl purgatory_start + purgatory_start: + .code32 ++ .arch i386 + + /* Load a gdt so I know what the segment registers are */ + lgdt %cs:gdt +-- +cgit 1.2.3-korg + diff --git a/community/keycloak/APKBUILD b/community/keycloak/APKBUILD index 5efbbb7af14..ae4cba9bd1a 100644 --- a/community/keycloak/APKBUILD +++ b/community/keycloak/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=keycloak -pkgver=24.0.2 +pkgver=24.0.3 pkgrel=0 pkgdesc="Open source identity and access management for modern applications and services" url="https://www.keycloak.org" @@ -28,7 +28,7 @@ subpackages=" $pkgname-bash-completion $pkgname-zsh-completion " -source="https://github.com/keycloak/keycloak/archive/$pkgver/$pkgname-$pkgver.tar.gz +source="https://github.com/keycloak/keycloak/archive/$pkgver/keycloak-$pkgver.tar.gz support-for-readonly-usr-share.patch remove-deps.patch keycloak.conf @@ -113,7 +113,7 @@ package() { } sha512sums=" -d02a197e6520d87455906cb67788753cf80f8ae5f5d67c30b438e4384eb9787d68638e75f7e00b5ca08dfd1d3cb095ea3e84510b492233562bf982d364387404 keycloak-24.0.2.tar.gz +c0c65acceccff1805f9748b61e42e4383db95969ef7ba27e5684143d4a35967b042ac93400cec393580d364ca3de7b6c8d9e1b6dfc635e938d514af64158d54d keycloak-24.0.3.tar.gz 6f75deab3c4c7a415f4d00335aad5aa8a8d1d5f064b16a2270cf7c7b6c0a52b016c2c3f8ba5fe38702f37e896a170e98eb4332713fa20183d432df9bf4a0294e support-for-readonly-usr-share.patch 934998230c109a8fbf84b6967c93203f45d0d6d1fdcaf2b7302a57d70143aa1394deb20f898347a21dc2e4df95f189758baf94f8cacd527576ee2d19917ed761 remove-deps.patch 2fc1a25796fa2077a253b72e8f9900ab33cb4ab652f8c1ecc8450c79a6efb6398a6000adc57a45148abd9497a766f811cf7a12997956fbb3e1c76b8e6f2bdb7e keycloak.conf diff --git a/community/kfilemetadata/APKBUILD b/community/kfilemetadata/APKBUILD index e7009ccf0a8..c18af687f5a 100644 --- a/community/kfilemetadata/APKBUILD +++ b/community/kfilemetadata/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kfilemetadata -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="A library for extracting file metadata" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -62,5 +62,5 @@ package() { } sha512sums=" -afeee8f47c202906d12a48153f325dc694e929d634ec785d6bf1db36c23dca913c3e0d4cd39947b1f4cf6aa62b5f3fa4e543590ec81b736e666335e62182dbd2 kfilemetadata-6.1.0.tar.xz +d51165011fd5818e8c5fc326c900ae95fb1dc3b6821a000cbbf4f8bc5b7130e87196cde67a1c1147c710b8fae97209b659b426fa81c872f1c5936cacc3fddfdb kfilemetadata-6.2.0.tar.xz " diff --git a/community/kfilemetadata5/APKBUILD b/community/kfilemetadata5/APKBUILD index 3aee353750e..6e0537cb473 100644 --- a/community/kfilemetadata5/APKBUILD +++ b/community/kfilemetadata5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=kfilemetadata5 pkgver=5.115.0 pkgrel=1 diff --git a/community/kgamma/APKBUILD b/community/kgamma/APKBUILD index e1a157efdfe..c23a7222c9b 100644 --- a/community/kgamma/APKBUILD +++ b/community/kgamma/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kgamma -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Adjust your monitor's gamma settings" # armhf blocked by extra-cmake-modules @@ -50,5 +50,5 @@ package() { } sha512sums=" -39dbc2279f1ece8c099b7051af327a1dcdd2c335839f19389d85518d4e66c68ea5b631acb0eec3a85dc69d789924324c499a89cb2b400808bf52e9e382d24849 kgamma-6.0.3.tar.xz +824c603948729a103a5d45422913c05d1227cc8e84f4ffaa9b23c4a7e16a9a11e85b45b63fe1a3f4e532138a74cfbaba239a0664388dcb7eae077c410f619b88 kgamma-6.0.4.tar.xz " diff --git a/community/kgeotag/APKBUILD b/community/kgeotag/APKBUILD index 5214c1f2c89..7e688dbad0b 100644 --- a/community/kgeotag/APKBUILD +++ b/community/kgeotag/APKBUILD @@ -7,8 +7,8 @@ pkgname=kgeotag pkgver=1.5.0 pkgrel=1 # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> marble -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine -> marble +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://apps.kde.org/kgeotag/" pkgdesc="Photo geotagging program" license="GPL-3.0-or-later" diff --git a/community/kglobalaccel/APKBUILD b/community/kglobalaccel/APKBUILD index 91b3b926f34..e3f0aaa9740 100644 --- a/community/kglobalaccel/APKBUILD +++ b/community/kglobalaccel/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kglobalaccel -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Add support for global workspace shortcuts" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -49,5 +49,5 @@ package() { } sha512sums=" -6ff600d6fa0431458b81d8023ec2fcc3366722f3194bc110133958d8565629c6c6689d4b8f535bc40f8871b15c2d404c32331a36d7132f5511be2271abfb4f74 kglobalaccel-6.1.0.tar.xz +e54713565d32893ce8ffd5fc57b765d28bcacb775f7147cb4a21f2f6a332157ef9de886b8e2652edebcdd6d8d31895ef0659154b6b94644d0f9bb0c21c2c5cd0 kglobalaccel-6.2.0.tar.xz " diff --git a/community/kglobalacceld/APKBUILD b/community/kglobalacceld/APKBUILD index c1914d16c10..91fe2c30986 100644 --- a/community/kglobalacceld/APKBUILD +++ b/community/kglobalacceld/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kglobalacceld -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Daemon providing Global Keyboard Shortcut (Accelerator) functionality" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -51,5 +51,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -953d9fcca02b70d7f857b032d91be533a064ee36ab4e6f49bc8f21c7ccaa79b29d3384e6c633d83c04ad442c2e1f9f555be84c7b1f31d57b50a9f96d70da6976 kglobalacceld-6.0.3.tar.xz +54c281bb284d32b2785766c1e0c779b3f354e7534505f73dd3e477463b40ad86f8561546f3c2fa4bcb95bfd3c274e0d52e683ebd1b20fc535d5c06b10da9a963 kglobalacceld-6.0.4.tar.xz " diff --git a/community/kgpg/APKBUILD b/community/kgpg/APKBUILD index 5153caf0e28..803981e066a 100644 --- a/community/kgpg/APKBUILD +++ b/community/kgpg/APKBUILD @@ -7,8 +7,8 @@ pkgname=kgpg pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> akonadi-contacts -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine -> akonadi-contacts +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kde.org/applications/utilities/org.kde.kgpg" pkgdesc="A simple interface for GnuPG, a powerful encryption utility" license="GPL-2.0-or-later" diff --git a/community/kguiaddons/APKBUILD b/community/kguiaddons/APKBUILD index 505fd9be312..7fcd0b0aa75 100644 --- a/community/kguiaddons/APKBUILD +++ b/community/kguiaddons/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this apkbuild by some scripts for automation # group=kde-frameworks pkgname=kguiaddons -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Addons to QtGui" # armhf blocked by extra-cmake-modules @@ -51,5 +51,5 @@ bin() { } sha512sums=" -e4413c692099cc946c260917777fd57e0ffac9bb3a251b70653f7557c64889558a3565896b4c79643504549b29a8b87b28b8cd98bf7762cb4c7056c5e563b869 kguiaddons-6.1.0.tar.xz +dc94ac60f0b189e6da11fb2bfec9183f466894c21b94368c248bb3fd5393d648139e2f9ca95cd172a539e005a335012ed2c5d7900698ced4e45721deedcb7c61 kguiaddons-6.2.0.tar.xz " diff --git a/community/kholidays/APKBUILD b/community/kholidays/APKBUILD index 3e8ce7cc5e5..f5b9d9ca486 100644 --- a/community/kholidays/APKBUILD +++ b/community/kholidays/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kholidays -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Support for icon themes" arch="all !armhf" # armhf blocked by qt6-qtdeclarative @@ -42,5 +42,5 @@ package() { } sha512sums=" -d2f3f5c3039f2ee55292edc427da863b0dfb364c57f74aeebcb6c8a85664c58aedbc810f1daec08e905decc3037d373607b0cc40929347030c2d2fef504663ff kholidays-6.1.0.tar.xz +43ba89b66660cdb8c8fa73d64ed00b6b454ee252f70fd18b35ced817621bda60d8323e2e8d03883a629abdcae4247d94bc823cf073af2492fc05bd87da6fa110 kholidays-6.2.0.tar.xz " diff --git a/community/kholidays5/APKBUILD b/community/kholidays5/APKBUILD index 4679706bd18..8afe5253db4 100644 --- a/community/kholidays5/APKBUILD +++ b/community/kholidays5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=kholidays5 pkgver=5.115.0 pkgrel=1 diff --git a/community/ki18n/APKBUILD b/community/ki18n/APKBUILD index 01254486c49..470ec2cb5e5 100644 --- a/community/ki18n/APKBUILD +++ b/community/ki18n/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=ki18n -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Advanced internationalization framework" # armhf blocked by qt6-qtdeclarative @@ -46,5 +46,5 @@ package() { } sha512sums=" -2f748d813a5b185b0f14932b589be6926b456c693d80e6f6dac1b15b91f5160001f426df833bac67147b9796874b723bf224206960d228561ff6bfd0a9b04cac ki18n-6.1.0.tar.xz +92eb1e0bc705b26dbe9acc5ad9f6c56909e5acc01cb71a86edf204802afed4c35af5c117754dd7b0ffe7390557d3a3f541c275d171a9b46ca750ba51a6b2c5b2 ki18n-6.2.0.tar.xz " diff --git a/community/kicad/APKBUILD b/community/kicad/APKBUILD index 1bbff36fcf8..0108194fd45 100644 --- a/community/kicad/APKBUILD +++ b/community/kicad/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=kicad pkgver=8.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Cross Platform and Open Source Electronics Design Automation Suite" url="https://www.kicad.org/" # No support for s390x/riscv64 in libcontext (shipped with kicad) diff --git a/community/kiconthemes/APKBUILD b/community/kiconthemes/APKBUILD index d91ffef94f3..c0f0b214518 100644 --- a/community/kiconthemes/APKBUILD +++ b/community/kiconthemes/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks-old +# group=kde-frameworks pkgname=kiconthemes -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Support for icon themes" # armhf blocked by extra-cmake-module @@ -52,5 +52,5 @@ package() { } sha512sums=" -a0f0210be8e464518770762f99d072c688872d2b9f324fa12830bdee78c9cf9439514b83ce87a6e526815dd7fbeaa76b6027a0c5cff6119052ccbac8ec8635c2 kiconthemes-6.1.0.tar.xz +6525a43146949ff97e3ccfa8b71298ea5c4ea911093e5b29f2d34ed843fbdc653e18bb3fa23ea2ae251cf6e477fa0115eedccca65867021cee1d4c90f511ea01 kiconthemes-6.2.0.tar.xz " diff --git a/community/kiconthemes5/APKBUILD b/community/kiconthemes5/APKBUILD index 1fcc12c351c..48dd5d54f3c 100644 --- a/community/kiconthemes5/APKBUILD +++ b/community/kiconthemes5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=kiconthemes5 pkgver=5.115.0 pkgrel=0 diff --git a/community/kidletime/APKBUILD b/community/kidletime/APKBUILD index 5d1aaeeab11..f8f6961612f 100644 --- a/community/kidletime/APKBUILD +++ b/community/kidletime/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kidletime -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Monitoring user activity" # armhf blocked by extra-cmake-modules @@ -44,5 +44,5 @@ package() { } sha512sums=" -9a958ccfb6a0b4bb32b481279b9ca0f96ab84a9400ed68da7c3712fefec070983d9c00e29ed9f6a53409796f73db4e32c41ebe275dd51ece21b6b00044f94828 kidletime-6.1.0.tar.xz +ae16fbca9e7e050d28d7ca068ed6c17365e2444456e669e8b96850f613dc5382b1a1fb5963fb3a585e57a3c361b446572892179970c292917c15b5120cd06269 kidletime-6.2.0.tar.xz " diff --git a/community/kidletime5/APKBUILD b/community/kidletime5/APKBUILD index 665eaac8da0..53990d273d6 100644 --- a/community/kidletime5/APKBUILD +++ b/community/kidletime5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=kidletime5 pkgver=5.115.0 pkgrel=1 diff --git a/community/kimageformats/APKBUILD b/community/kimageformats/APKBUILD index 1a3b67e97c3..9d8db0278bb 100644 --- a/community/kimageformats/APKBUILD +++ b/community/kimageformats/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kimageformats -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Image format plugins for Qt" # armhf blocked by extra-cmake-modules @@ -55,5 +55,5 @@ package() { } sha512sums=" -99bf723b4a250d5d0c45cc5f77d2149e900f75a65fb70b2b2cd3cf61b60ba62ab7b17251a9a9f9c033681261f7ef4a5a4d5298d15a83d7327395884849ced157 kimageformats-6.1.0.tar.xz +eae751e34a2d465b126c4829b5de500fc3ef83c85aa011bd95e5d2e8a4c3f6d144f2e138cd37dac9c51839820834d30c3e6393c61959f0f5c4618f0a7c719124 kimageformats-6.2.0.tar.xz " diff --git a/community/kinfocenter/APKBUILD b/community/kinfocenter/APKBUILD index cce00a29521..fc9f83b8253 100644 --- a/community/kinfocenter/APKBUILD +++ b/community/kinfocenter/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kinfocenter -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="A utility that provides information about a computer system" # armhf blocked by extra-cmake-modules @@ -64,5 +64,5 @@ package() { } sha512sums=" -e34736aeae47de1814bfcbf073cd8814016c9d1dda1de440be14918e9dd44e0d8d00ec8a589a1ddb7d10e31421a27159b4bf05634bba2597f11e6f7d76ac3ef3 kinfocenter-6.0.3.tar.xz +1c3214d844576a4bcfff49e05d316031688fb76355e302097e68140ffbf20feb33d47b0c3a1db067dc63bf0944e5d49b8f3cafd9cbf6e43aaf8fc9ace81b38a4 kinfocenter-6.0.4.tar.xz " diff --git a/community/kio-gdrive/APKBUILD b/community/kio-gdrive/APKBUILD index 62b89dfdb42..a23426c368a 100644 --- a/community/kio-gdrive/APKBUILD +++ b/community/kio-gdrive/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 # armhf blocked by extra-cmake-modules # ppc64le, s390x, riscv64 and armv7 blocked by qt6-qtwebengine -> libkgapi # x86 blocked by signon-ui -arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !x86" +# loongarch64 blocked by purpose +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !x86 !loongarch64" url="https://community.kde.org/KIO_GDrive" pkgdesc="KIO Slave to access Google Drive" license="GPL-2.0-or-later" diff --git a/community/kio/APKBUILD b/community/kio/APKBUILD index 50fa1298fb1..c0523b9915c 100644 --- a/community/kio/APKBUILD +++ b/community/kio/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kio -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Resource and network access abstraction" # armhf blocked by extra-cmake-modules @@ -73,5 +73,5 @@ kwallet() { } sha512sums=" -dcdd0a13d7e44c75ddd19d6d03e6c57b90c2b47f1141b6dc23054dc029a11358bb9748b8bb2115129cc1ab3769034728b3dd35507772807542376b3ef7b47707 kio-6.1.0.tar.xz +36f0311ad9ee44562ebf40da1746cf9945d0284bd5153b92b9703cefefb947032265330152f4bd7a17672d15f83d5dbf1d4087ea278b18c76c057608ae881463 kio-6.2.0.tar.xz " diff --git a/community/kirigami-addons5/APKBUILD b/community/kirigami-addons5/APKBUILD new file mode 100644 index 00000000000..745a837af05 --- /dev/null +++ b/community/kirigami-addons5/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: Bart Ribbers <bribbers@disroot.org> +# Maintainer: team/kde <bribbers@disroot.org> + +# The group tag is just to easily find this APKBUILD by some scripts for automation +# group=kde-other +pkgname=kirigami-addons5 +pkgver=0.11.0 +pkgrel=0 +pkgdesc="Add-ons for the Kirigami framework" +url="https://invent.kde.org/libraries/kirigami-addons" +# armhf blocked by extra-cmake-modules +arch="all !armhf" +license="LGPL-2.0-or-later AND GPL-2.0-or-later" +depends=" + kirigami2 + qt5-qtmultimedia + " +makedepends=" + extra-cmake-modules + ki18n5-dev + kirigami2-dev + samurai + " +checkdepends="xvfb-run" +subpackages="$pkgname-dev $pkgname-lang" +_repo_url="https://invent.kde.org/libraries/kirigami-addons.git" +source="https://download.kde.org/stable/kirigami-addons/kirigami-addons-$pkgver.tar.xz" +builddir="$srcdir/kirigami-addons-$pkgver" + +build() { + cmake -B build -G Ninja \ + -DCMAKE_BUILD_TYPE=MinSizeRel \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_QCH=ON + cmake --build build +} + +check() { + # tst_sounds.qml is broken + xvfb-run ctest --test-dir build --output-on-failure -E "tst_(sounds|avatar|album_(qmllist|abstractlist|qmlqobject)model).qml" +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} + +sha512sums=" +f5a721eee6d0ebd37e67cdb5f89aba81136eb4ac23bc042b7d9bedd6a33f96f913353e1d83ec91e6997a8eea5e2834d9203eb7cd286eed1157149ecedeab6b89 kirigami-addons-0.11.0.tar.xz +" diff --git a/community/kirigami/APKBUILD b/community/kirigami/APKBUILD index 9fa09db74f2..96d306ebe1d 100644 --- a/community/kirigami/APKBUILD +++ b/community/kirigami/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kirigami -pkgver=6.1.0 +pkgver=6.2.1 pkgrel=0 pkgdesc="A QtQuick based components set" arch="all !armhf" # armhf blocked by qt6-qtdeclarative @@ -45,5 +45,5 @@ package() { } sha512sums=" -2a75af0bc010120913f092f14760817c197298da4f6fc4780f5ab222de8e385864f4c88b9907acf4b03fea53759f1e2a39a2b62bcd78b8c2c1bc52129c04d207 kirigami-6.1.0.tar.xz +57e7f6facede8764ee792ebd41f24bf2b53651cc2bfae7c2c58e3e821a27c2021c8f2161ddc76b2b20a26d310a48045335405a753487f98c46c050df8dc0f9e0 kirigami-6.2.1.tar.xz " diff --git a/community/kitemmodels/APKBUILD b/community/kitemmodels/APKBUILD index 75373fe963e..c474fa49971 100644 --- a/community/kitemmodels/APKBUILD +++ b/community/kitemmodels/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kitemmodels -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Models for Qt Model/View system" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -44,5 +44,5 @@ package() { } sha512sums=" -d256ed99a6d1e7780650f4720da0b25f46b0caa7c42600e9eb62e91b4ba03a5baaaf28cfe9aa0f76e33bc248567065ebd874d16b41f7a0930c6e0985b932225c kitemmodels-6.1.0.tar.xz +f163816c5bf771e489d35b8ae22e87cab0967d93230c2bcf54a0538a0af5f30cc281aad243255c865fdaff2a6ce4c81b0c5bcecc559e2e36812b8d0af252105b kitemmodels-6.2.0.tar.xz " diff --git a/community/kitemviews/APKBUILD b/community/kitemviews/APKBUILD index fdcfe4eb129..ec00e339086 100644 --- a/community/kitemviews/APKBUILD +++ b/community/kitemviews/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kitemviews -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Widget addons for Qt Model/View" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -41,5 +41,5 @@ package() { } sha512sums=" -f663f3bb11d062ce1847ce74d05934278dfd380eeed98fb890d7b9563894dffd4f11c8a1a80ed8e03cd7ecf19014d88b79cb436c8409c376e7f039d1e3f20d17 kitemviews-6.1.0.tar.xz +7fa483a07003c2492e4d1cf6baf38724f57f758de69beb06b619251d24cc57f675b084c0cde1e3cf4b5e7e4b7f2264845e03dcb4d1e69b51b49803d41dfeca19 kitemviews-6.2.0.tar.xz " diff --git a/community/kiwix-desktop/contentmanager.patch b/community/kiwix-desktop/1b322d8f01c787846546a6473f153cf1daa41e65.patch index 37a74c84220..668e38ca83e 100644 --- a/community/kiwix-desktop/contentmanager.patch +++ b/community/kiwix-desktop/1b322d8f01c787846546a6473f153cf1daa41e65.patch @@ -1,5 +1,3 @@ -Patch-Source: https://github.com/kiwix/kiwix-desktop/commit/1b322d8f01c787846546a6473f153cf1daa41e65.patch --- From 1b322d8f01c787846546a6473f153cf1daa41e65 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier <mgautier@kymeria.fr> Date: Thu, 9 Feb 2023 09:47:47 +0100 diff --git a/community/kiwix-desktop/238bd534a4f99ee331823e8ec2766c21999098c4.patch b/community/kiwix-desktop/238bd534a4f99ee331823e8ec2766c21999098c4.patch new file mode 100644 index 00000000000..2525f7ca460 --- /dev/null +++ b/community/kiwix-desktop/238bd534a4f99ee331823e8ec2766c21999098c4.patch @@ -0,0 +1,31 @@ +From 238bd534a4f99ee331823e8ec2766c21999098c4 Mon Sep 17 00:00:00 2001 +From: Matthieu Gautier <mgautier@kymeria.fr> +Date: Tue, 19 Sep 2023 16:38:58 +0200 +Subject: [PATCH] SearchRenderer now take the NameMapper on the getHtml method. + +--- + src/urlschemehandler.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/urlschemehandler.cpp b/src/urlschemehandler.cpp +index 8a6dd3d3..956c8840 100644 +--- a/src/urlschemehandler.cpp ++++ b/src/urlschemehandler.cpp +@@ -133,7 +133,6 @@ UrlSchemeHandler::handleSearchRequest(QWebEngineUrlRequestJob* request) + } + kiwix::SearchRenderer renderer( + search->getResults(start, pageLength), +- std::make_shared<IdNameMapper>(), + search->getEstimatedMatches(), + start); + renderer.setSearchPattern(searchQuery); +@@ -141,7 +140,8 @@ UrlSchemeHandler::handleSearchRequest(QWebEngineUrlRequestJob* request) + renderer.setProtocolPrefix("zim://"); + renderer.setSearchProtocolPrefix("zim://" + host.toStdString() + "/"); + renderer.setPageLength(pageLength); +- auto content = renderer.getHtml(); ++ IdNameMapper mapper; ++ auto content = renderer.getHtml(mapper, nullptr); + QBuffer *buffer = new QBuffer; + buffer->setData(content.data(), content.size()); + connect(request, &QObject::destroyed, buffer, &QObject::deleteLater); diff --git a/community/kiwix-desktop/APKBUILD b/community/kiwix-desktop/APKBUILD index c17d242c6a1..9a618fc0870 100644 --- a/community/kiwix-desktop/APKBUILD +++ b/community/kiwix-desktop/APKBUILD @@ -2,21 +2,24 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=kiwix-desktop pkgver=2.3.1 -pkgrel=3 +pkgrel=4 pkgdesc="Offline Wikipedia reader" url="https://github.com/kiwix/kiwix-desktop" -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" license="GPL-3.0-or-later" makedepends=" qt5-qtbase-dev qt5-qtwebengine-dev qt5-qtsvg-dev qt5-qtimageformats - libkiwix-dev + libkiwix-dev>=13.0 " source="https://github.com/kiwix/kiwix-desktop/archive/$pkgver/kiwix-desktop-$pkgver.tar.gz - contentmanager.patch + 1b322d8f01c787846546a6473f153cf1daa41e65.patch + ab80463b58a40f035555810d79bd60d67f0f1ee3-backported.patch + 238bd534a4f99ee331823e8ec2766c21999098c4.patch + a01ab015f9c7da3342fd9f31c201cbdb34e8c5a9.patch " options="!check" # no test suite @@ -31,5 +34,8 @@ package() { sha512sums=" 09d4c2293fc36ac0b03c815474f5f60881093552fd7d1d0940858254c16d7b6021bd05f4f985b32401328705082f07fbd72e92f79bb1365650f5dd75d455f0b8 kiwix-desktop-2.3.1.tar.gz -2815fd1d30033e5ae46560420bf070816908ed32604dee696f8b869141f6c73f42d81e9d00dfb3af4ffe0e56bc49844c7a1b0b14e496d5332d6ae8ca233268b1 contentmanager.patch +7422a08e1a68ae9e907bdd02d3c22162cd14acfdc7e2d04a57efff22a909e0bb552b45f37efbe22801f30119bc0a7a999f37384d78e4280f1897ae9a62ca361f 1b322d8f01c787846546a6473f153cf1daa41e65.patch +3a411c1218626b04b3279978a925f2c722b20b0e692adbc3e62b705337eebb8bc83a1148ff1d40f89b2a04452bad164e4cc1e6c598e2d87ed43cc6f621a633ae ab80463b58a40f035555810d79bd60d67f0f1ee3-backported.patch +bca1b6cd2171377bd874464bf8fd6292af24b46328c9b2fb61c702e54a4794cdd6dd4c5243e4101acbd15b1272c43fb1f4118a2cf6cf301d9d8126d50f2ae754 238bd534a4f99ee331823e8ec2766c21999098c4.patch +7a6ebcdb9f66c75b1d224b1c70426e4e4f55acd83b1063b64410a4da8c4136d4b1e2f95c9f1d0422a83c2c06af8d87b85598ce5fb7d5c5aca5a9d5634ec090c3 a01ab015f9c7da3342fd9f31c201cbdb34e8c5a9.patch " diff --git a/community/kiwix-desktop/a01ab015f9c7da3342fd9f31c201cbdb34e8c5a9.patch b/community/kiwix-desktop/a01ab015f9c7da3342fd9f31c201cbdb34e8c5a9.patch new file mode 100644 index 00000000000..5675e08ac35 --- /dev/null +++ b/community/kiwix-desktop/a01ab015f9c7da3342fd9f31c201cbdb34e8c5a9.patch @@ -0,0 +1,25 @@ +From a01ab015f9c7da3342fd9f31c201cbdb34e8c5a9 Mon Sep 17 00:00:00 2001 +From: sgourdas <jim31700@gmail.com> +Date: Wed, 20 Mar 2024 23:20:18 +0200 +Subject: [PATCH] Fixing part of issue #988. Results were never shown in + fulltext search. Instead a "No results were found ..." message was shown. + +--- + src/urlschemehandler.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/urlschemehandler.cpp b/src/urlschemehandler.cpp +index 956c8840..0e3515cb 100644 +--- a/src/urlschemehandler.cpp ++++ b/src/urlschemehandler.cpp +@@ -133,8 +133,8 @@ UrlSchemeHandler::handleSearchRequest(QWebEngineUrlRequestJob* request) + } + kiwix::SearchRenderer renderer( + search->getResults(start, pageLength), +- search->getEstimatedMatches(), +- start); ++ start, ++ search->getEstimatedMatches()); + renderer.setSearchPattern(searchQuery); + renderer.setSearchBookQuery("content="+bookId.toStdString()); + renderer.setProtocolPrefix("zim://"); diff --git a/community/kiwix-desktop/ab80463b58a40f035555810d79bd60d67f0f1ee3-backported.patch b/community/kiwix-desktop/ab80463b58a40f035555810d79bd60d67f0f1ee3-backported.patch new file mode 100644 index 00000000000..07d27671ff1 --- /dev/null +++ b/community/kiwix-desktop/ab80463b58a40f035555810d79bd60d67f0f1ee3-backported.patch @@ -0,0 +1,306 @@ +Original Patch-Source: https://github.com/kiwix/kiwix-desktop/commit/ab80463b58a40f035555810d79bd60d67f0f1ee3.patch + +Backported to be compatible with version 2.3.1 + +--- a/src/library.cpp 2024-04-30 22:57:36.971771232 +0200 ++++ b/src/library.cpp 2024-04-30 23:17:53.570595481 +0200 +@@ -11,26 +11,26 @@ + class LibraryManipulator: public kiwix::LibraryManipulator { + public: + LibraryManipulator(Library* p_library) +- : kiwix::LibraryManipulator(&p_library->getKiwixLibrary()) ++ : kiwix::LibraryManipulator(p_library->getKiwixLibrary()) + , mp_library(p_library) + {} + virtual ~LibraryManipulator() {} + bool addBookToLibrary(kiwix::Book book) { +- auto ret = mp_library->m_library.addBook(book); ++ auto ret = mp_library->mp_library->addBook(book); + emit(mp_library->booksChanged()); + return ret; + } + void addBookmarkToLibrary(kiwix::Bookmark bookmark) { +- mp_library->m_library.addBookmark(bookmark); ++ mp_library->mp_library->addBookmark(bookmark); + } + Library* mp_library; + }; + + Library::Library(const QString& libraryDirectory) +- : m_libraryDirectory(libraryDirectory) ++ : mp_library(kiwix::Library::create()), ++ m_libraryDirectory(libraryDirectory) + { +- auto manipulator = LibraryManipulator(this); +- auto manager = kiwix::Manager(&manipulator); ++ auto manager = kiwix::Manager(LibraryManipulator(this)); + manager.readFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(),"library.xml"), false); + manager.readBookmarkFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(),"library.bookmarks.xml")); + emit(booksChanged()); +@@ -44,11 +44,11 @@ Library::~Library() + QString Library::openBookFromPath(const QString &zimPath) + { + try { +- auto& book = m_library.getBookByPath(zimPath.toStdString()); ++ auto& book = mp_library->getBookByPath(zimPath.toStdString()); + return QString::fromStdString(book.getId()); + } catch(std::out_of_range& e) { } + +- kiwix::Manager manager(&m_library); ++ kiwix::Manager manager(mp_library); + auto id = manager.addBookFromPathAndGetId(zimPath.toStdString()); + if (id == "") { + throw std::invalid_argument("invalid zim file"); +@@ -60,18 +60,18 @@ QString Library::openBookFromPath(const + + std::shared_ptr<zim::Archive> Library::getArchive(const QString &zimId) + { +- return m_library.getArchiveById(zimId.toStdString()); ++ return mp_library->getArchiveById(zimId.toStdString()); + } + + std::shared_ptr<zim::Searcher> Library::getSearcher(const QString &zimId) + { +- return m_library.getSearcherById(zimId.toStdString()); ++ return mp_library->getSearcherById(zimId.toStdString()); + } + + QStringList Library::getBookIds() const + { + QStringList list; +- for(auto& id: m_library.getBooksIds()) { ++ for(auto& id: mp_library->getBooksIds()) { + list.append(QString::fromStdString(id)); + } + return list; +@@ -80,8 +80,8 @@ QStringList Library::getBookIds() const + QStringList Library::listBookIds(const kiwix::Filter& filter, kiwix::supportedListSortBy sortBy, bool ascending) const + { + QStringList list; +- auto bookIds = m_library.filter(filter); +- m_library.sort(bookIds, sortBy, ascending); ++ auto bookIds = mp_library->filter(filter); ++ mp_library->sort(bookIds, sortBy, ascending); + for(auto& id: bookIds) { + list.append(QString::fromStdString(id)); + } +@@ -90,29 +90,29 @@ QStringList Library::listBookIds(const k + + void Library::addBookToLibrary(kiwix::Book &book) + { +- m_library.addBook(book); ++ mp_library->addBook(book); + } + + void Library::removeBookFromLibraryById(const QString& id) { +- m_library.removeBookById(id.toStdString()); ++ mp_library->removeBookById(id.toStdString()); + } + + void Library::addBookmark(kiwix::Bookmark &bookmark) + { +- m_library.addBookmark(bookmark); ++ mp_library->addBookmark(bookmark); + emit bookmarksChanged(); + } + + void Library::removeBookmark(const QString &zimId, const QString &url) + { +- m_library.removeBookmark(zimId.toStdString(), url.toStdString()); ++ mp_library->removeBookmark(zimId.toStdString(), url.toStdString()); + emit bookmarksChanged(); + } + + void Library::save() + { +- m_library.writeToFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(),"library.xml")); +- m_library.writeBookmarksToFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(), "library.bookmarks.xml")); ++ mp_library->writeToFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(),"library.xml")); ++ mp_library->writeBookmarksToFile(kiwix::appendToDirectory(m_libraryDirectory.toStdString(), "library.bookmarks.xml")); + } + + void Library::setMonitorDirZims(QStringList zimList) +@@ -153,14 +153,13 @@ void Library::loadMonitorDir(QString mon + #endif + QStringList addedZims = (newDir - oldDir).values(); + QStringList removedZims = (oldDir - newDir).values(); +- auto manipulator = LibraryManipulator(this); +- auto manager = kiwix::Manager(&manipulator); ++ auto manager = kiwix::Manager(LibraryManipulator(this)); + bool needsRefresh = !removedZims.empty(); + for (auto book : addedZims) { + needsRefresh |= manager.addBookFromPath(book.toStdString()); + } + for (auto bookPath : removedZims) { +- removeBookFromLibraryById(QString::fromStdString(m_library.getBookByPath(bookPath.toStdString()).getId())); ++ removeBookFromLibraryById(QString::fromStdString(mp_library->getBookByPath(bookPath.toStdString()).getId())); + } + if (needsRefresh) { + setMonitorDirZims(newDir.values()); +@@ -177,5 +176,5 @@ void Library::asyncLoadMonitorDir(QStrin + + const kiwix::Book &Library::getBookById(QString id) const + { +- return m_library.getBookById(id.toStdString()); ++ return mp_library->getBookById(id.toStdString()); + } +--- a/src/kiwixapp.cpp 2024-04-30 22:57:03.749186828 +0200 ++++ b/src/kiwixapp.cpp 2024-04-30 23:08:16.727216255 +0200 +@@ -32,8 +32,8 @@ KiwixApp::KiwixApp(int& argc, char *argv + mp_downloader(nullptr), + mp_manager(nullptr), + mp_mainWindow(nullptr), +- m_nameMapper(m_library.getKiwixLibrary(), false), +- m_server(&m_library.getKiwixLibrary(), &m_nameMapper) ++ mp_nameMapper(std::make_shared<kiwix::UpdatableNameMapper>(m_library.getKiwixLibrary(), false)), ++ m_server(m_library.getKiwixLibrary(), mp_nameMapper) + { + try { + m_translation.setTranslation(QLocale()); +@@ -453,7 +453,7 @@ void KiwixApp::disableItemsOnLibraryPage + + void KiwixApp::updateNameMapper() + { +- m_nameMapper.update(); ++ mp_nameMapper->update(); + } + + void KiwixApp::printVersions(std::ostream& out) { +--- a/src/contentmanager.cpp 2024-04-30 22:56:41.133029992 +0200 ++++ b/src/contentmanager.cpp 2024-04-30 23:05:56.243697297 +0200 +@@ -15,6 +15,7 @@ + ContentManager::ContentManager(Library* library, kiwix::Downloader* downloader, QObject *parent) + : QObject(parent), + mp_library(library), ++ mp_remoteLibrary(kiwix::Library::create()), + mp_downloader(downloader), + m_remoteLibraryManager() + { +@@ -179,7 +180,7 @@ QStringList ContentManager::updateDownlo + } catch(...) { + kiwix::Book bCopy(b); + bCopy.setDownloadId(""); +- mp_library->getKiwixLibrary().addOrUpdateBook(bCopy); ++ mp_library->getKiwixLibrary()->addOrUpdateBook(bCopy); + mp_library->save(); + emit(mp_library->booksChanged()); + return values; +@@ -194,7 +195,7 @@ QStringList ContentManager::updateDownlo + bCopy.setPathValid(true); + // removing book url so that download link in kiwix-serve is not displayed. + bCopy.setUrl(""); +- mp_library->getKiwixLibrary().addOrUpdateBook(bCopy); ++ mp_library->getKiwixLibrary()->addOrUpdateBook(bCopy); + mp_library->save(); + mp_library->bookmarksChanged(); + if (!m_local) { +@@ -407,8 +408,8 @@ void ContentManager::updateLibrary() { + + #define CATALOG_URL "library.kiwix.org" + void ContentManager::updateRemoteLibrary(const QString& content) { +- m_remoteLibrary = kiwix::Library(); +- kiwix::Manager manager(&m_remoteLibrary); ++ mp_remoteLibrary = kiwix::Library::create(); ++ kiwix::Manager manager(mp_remoteLibrary); + manager.readOpds(content.toStdString(), CATALOG_URL); + emit(this->booksChanged()); + emit(this->pendingRequest(false)); +@@ -457,8 +458,8 @@ QStringList ContentManager::getBookIds() + return mp_library->listBookIds(filter, m_sortBy, m_sortOrderAsc); + } else { + filter.remote(true); +- auto bookIds = m_remoteLibrary.filter(filter); +- m_remoteLibrary.sort(bookIds, m_sortBy, m_sortOrderAsc); ++ auto bookIds = mp_remoteLibrary->filter(filter); ++ mp_remoteLibrary->sort(bookIds, m_sortBy, m_sortOrderAsc); + QStringList list; + for(auto& bookId:bookIds) { + list.append(QString::fromStdString(bookId)); +--- a/src/library.h 2024-04-30 22:57:46.914880421 +0200 ++++ b/src/library.h 2024-04-30 23:19:24.705232459 +0200 +@@ -32,7 +32,7 @@ public: + std::shared_ptr<zim::Searcher> getSearcher(const QString& zimId); + QStringList getBookIds() const; + QStringList listBookIds(const kiwix::Filter& filter, kiwix::supportedListSortBy sortBy, bool ascending) const; +- const std::vector<kiwix::Bookmark> getBookmarks(bool onlyValidBookmarks = false) const { return m_library.getBookmarks(onlyValidBookmarks); } ++ const std::vector<kiwix::Bookmark> getBookmarks(bool onlyValidBookmarks = false) const { return mp_library->getBookmarks(onlyValidBookmarks); } + QStringList getLibraryZimsFromDir(QString dir) const; + void setMonitorDirZims(QStringList zimList); + void addBookToLibrary(kiwix::Book& book); +@@ -42,7 +42,7 @@ public: + void save(); + void loadMonitorDir(QString dir); + void asyncLoadMonitorDir(QString dir); +- kiwix::Library& getKiwixLibrary() { return m_library; } ++ kiwix::LibraryPtr getKiwixLibrary() { return mp_library; } + public slots: + const kiwix::Book& getBookById(QString id) const; + +@@ -51,7 +51,7 @@ signals: + void bookmarksChanged(); + + private: +- kiwix::Library m_library; ++ kiwix::LibraryPtr mp_library; + QString m_libraryDirectory; + QStringList m_monitorDirZims; + friend class LibraryManipulator; +--- a/src/urlschemehandler.cpp 2024-04-30 22:58:08.491057431 +0200 ++++ b/src/urlschemehandler.cpp 2024-04-30 23:20:24.990551663 +0200 +@@ -131,9 +131,11 @@ UrlSchemeHandler::handleSearchRequest(QW + request->fail(QWebEngineUrlRequestJob::UrlInvalid); + return; + } +- IdNameMapper nameMapper; +- kiwix::SearchRenderer renderer(search->getResults(start, pageLength), &nameMapper, search->getEstimatedMatches(), +- start); ++ kiwix::SearchRenderer renderer( ++ search->getResults(start, pageLength), ++ std::make_shared<IdNameMapper>(), ++ search->getEstimatedMatches(), ++ start); + renderer.setSearchPattern(searchQuery); + renderer.setSearchBookQuery("content="+bookId.toStdString()); + renderer.setProtocolPrefix("zim://"); +--- a/src/kiwixapp.h 2024-04-30 22:57:22.872089078 +0200 ++++ b/src/kiwixapp.h 2024-04-30 23:08:48.819832250 +0200 +@@ -108,7 +108,7 @@ private: + ContentManager* mp_manager; + MainWindow* mp_mainWindow; + QErrorMessage* mp_errorDialog; +- kiwix::UpdatableNameMapper m_nameMapper; ++ std::shared_ptr<kiwix::UpdatableNameMapper> mp_nameMapper; + kiwix::Server m_server; + Translation m_translation; + QFileSystemWatcher m_watcher; +--- a/src/contentmanager.h 2024-04-30 22:56:51.276134675 +0200 ++++ b/src/contentmanager.h 2024-04-30 23:06:58.762292289 +0200 +@@ -29,7 +29,7 @@ public: + + private: + Library* mp_library; +- kiwix::Library m_remoteLibrary; ++ kiwix::LibraryPtr mp_remoteLibrary; + kiwix::Downloader* mp_downloader; + OpdsRequestManager m_remoteLibraryManager; + ContentManagerView* mp_view; +--- a/src/contentmanager.cpp 2024-04-30 23:30:47.066633267 +0200 ++++ b/src/contentmanager.cpp 2024-04-30 23:30:38.910148206 +0200 +@@ -57,7 +57,7 @@ QStringList ContentManager::getBookInfos + return &mp_library->getBookById(id); + } catch (...) { + try { +- return &m_remoteLibrary.getBookById(id.toStdString()); ++ return &mp_remoteLibrary->getBookById(id.toStdString()); + } catch(...) { return nullptr; } + } + }(); +@@ -256,7 +256,7 @@ QString ContentManager::downloadBook(con + return ""; + const auto& book = [&]()->const kiwix::Book& { + try { +- return m_remoteLibrary.getBookById(id.toStdString()); ++ return mp_remoteLibrary->getBookById(id.toStdString()); + } catch (...) { + return mp_library->getBookById(id); + } diff --git a/community/kiwix-tools/APKBUILD b/community/kiwix-tools/APKBUILD index 4c9201b2029..1840b54d762 100644 --- a/community/kiwix-tools/APKBUILD +++ b/community/kiwix-tools/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Thomas Kienlen <kommander@laposte.net> # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=kiwix-tools -pkgver=3.5.0 -pkgrel=2 +pkgver=3.7.0 +pkgrel=0 pkgdesc="Kiwix command line tools" url="https://github.com/kiwix/kiwix-tools" arch="all" @@ -25,5 +25,5 @@ package() { } sha512sums=" -9cb1aa4fee26016575bd8bda3bf1b928d3f5ca5d8a290f377f13bb9bfb4a03805e1befdd4168dc91456b012928665d9f632eb7224621687b628552148edcca0b kiwix-tools-3.5.0.tar.gz +934407e0ffb270806cb82e3ca57fd9a136fc7982f360beaac94dfa0aed7b97b9a47b950f49e0011d73cace3c1df706e5f58ffb15585ee4ce82ef042aca63b316 kiwix-tools-3.7.0.tar.gz " diff --git a/community/kjobwidgets/APKBUILD b/community/kjobwidgets/APKBUILD index 1e3954777dd..5124e695c5d 100644 --- a/community/kjobwidgets/APKBUILD +++ b/community/kjobwidgets/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kjobwidgets -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Widgets for tracking KJob instances" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -44,5 +44,5 @@ package() { } sha512sums=" -914be906818c54a4a4bd7932131f609f7eb4869c574908c39c212f11c793b978ec7dc7886a582d87e67bca154bc0efbd33f8af0b4922194374bf5050f0429f80 kjobwidgets-6.1.0.tar.xz +33dafd91c30f055c62e34d18db7ec236b4b5d00b18994aeeae22693291b4fd0a409c7d3ce63d31e3d715d267e05e459999b3429336d2d7bf897acc1d9753defc kjobwidgets-6.2.0.tar.xz " diff --git a/community/kleopatra/APKBUILD b/community/kleopatra/APKBUILD index 57d7ee83049..32354b69891 100644 --- a/community/kleopatra/APKBUILD +++ b/community/kleopatra/APKBUILD @@ -5,7 +5,7 @@ # group=kde-applications pkgname=kleopatra pkgver=24.02.2 -pkgrel=0 +pkgrel=1 arch="all !armhf !s390x" url="https://www.kde.org/applications/utilities/kleopatra/" pkgdesc="Certificate Manager and Unified Crypto GUI" diff --git a/community/kmail-account-wizard/APKBUILD b/community/kmail-account-wizard/APKBUILD index 5b027e5a1cf..ea22d831769 100644 --- a/community/kmail-account-wizard/APKBUILD +++ b/community/kmail-account-wizard/APKBUILD @@ -8,7 +8,8 @@ pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules # ppc64le, s390x, riscv64 and armv7 blocked by qt6-qtwebengine -> kmailtransport -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by pimcommon +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://kontact.kde.org/" pkgdesc="KMail account wizard" license="GPL-2.0-or-later AND LGPL-2.0-or-later AND GFDL-1.2-only" diff --git a/community/kmail/APKBUILD b/community/kmail/APKBUILD index a53835a973a..efe11a80ffe 100644 --- a/community/kmail/APKBUILD +++ b/community/kmail/APKBUILD @@ -8,7 +8,8 @@ pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules # ppc64le, s390x, riscv64 and armv7 blocked by qt6-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by pimcommon +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://kontact.kde.org/components/kmail/" pkgdesc="Email client, supporting POP3 and IMAP mailboxes" license="GPL-2.0-or-later" diff --git a/community/kmenuedit/APKBUILD b/community/kmenuedit/APKBUILD index d68ebeed16e..966e7eee216 100644 --- a/community/kmenuedit/APKBUILD +++ b/community/kmenuedit/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kmenuedit -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="KDE menu editor" # armhf blocked by qt6-qtdeclarative @@ -51,5 +51,5 @@ package() { } sha512sums=" -a7656eb1be94df526fa90eb2a32a0403d7cf113cee1ed8b82b2fe28dd0a0e980e0f901a5aaa48ad8e4c6c2875fdf8edc666f014739f1409d35fe28b496c975d6 kmenuedit-6.0.3.tar.xz +2b3bf5ce0eaa9cfd43dd79732bb24cb59f1ecf2efec81f4d53c189daebdde6796ea35ea237da83d85c03b91312c3a00053b1fbe3cc7b8b396ff3b5924f247c21 kmenuedit-6.0.4.tar.xz " diff --git a/community/kmymoney/APKBUILD b/community/kmymoney/APKBUILD index c657566549b..358f4f3966f 100644 --- a/community/kmymoney/APKBUILD +++ b/community/kmymoney/APKBUILD @@ -7,8 +7,8 @@ pkgname=kmymoney pkgver=5.1.3 pkgrel=6 # armhf blocked by extra-cmake-modules -# armhf, ppc64le, s390x, riscv64 blocked by qt5-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64" +# armhf, ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kmymoney.org/" pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" license="GPL-2.0-or-later" diff --git a/community/knewstuff/APKBUILD b/community/knewstuff/APKBUILD index 2fd5a741fe6..cd3aa9dc64e 100644 --- a/community/knewstuff/APKBUILD +++ b/community/knewstuff/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=knewstuff -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Framework for downloading and sharing additional application data" # armhf blocked by qt6-qtdeclarative @@ -66,5 +66,5 @@ package() { } sha512sums=" -1ec44c82f156da74b9db64840908b472a81a9bdaac1f47d4fb76e3749306f21668791582e6a8c9190af6f621f3e3fa2e461c0d3321e3dde10960c891d6c8709b knewstuff-6.1.0.tar.xz +a63406dd93fbf9f3f9c83ad71df2158bd447b99ccda5f1cfcace7cbbf88c62279cdcd615125b77123a31cea3ae191b6fe070ec7ae2f10b21c548e4ba27dd7e92 knewstuff-6.2.0.tar.xz " diff --git a/community/knot-resolver/APKBUILD b/community/knot-resolver/APKBUILD index 9f7faa8d1c6..6e6aab25ad9 100644 --- a/community/knot-resolver/APKBUILD +++ b/community/knot-resolver/APKBUILD @@ -8,8 +8,8 @@ pkgdesc="Minimalistic caching DNS resolver implementation" url="https://www.knot-resolver.cz/" # x86, armhf and armv7 blocked by knot # s390x some problem with luajit -# ppc64le, riscv64 blocked by luajit -arch="all !x86 !armhf !armv7 !ppc64le !riscv64 !s390x" +# ppc64le, riscv64, loongarch64 blocked by luajit +arch="all !x86 !armhf !armv7 !ppc64le !riscv64 !s390x !loongarch64" license="GPL-3.0-or-later" pkgusers="kresd" pkggroups="kresd" diff --git a/community/knotes/APKBUILD b/community/knotes/APKBUILD index 359cf62ef91..ffbfa46df45 100644 --- a/community/knotes/APKBUILD +++ b/community/knotes/APKBUILD @@ -8,7 +8,8 @@ pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules # ppc64le, s390x, riscv64 and armv7 blocked by kdepim-runtime -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by pimcommon +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://kontact.kde.org/" pkgdesc="Popup notes" license="GPL-2.0-or-later AND LGPL-2.0-or-later AND GFDL-1.2-only" diff --git a/community/knotifications/APKBUILD b/community/knotifications/APKBUILD index 5c7b7f2807a..13bfad42795 100644 --- a/community/knotifications/APKBUILD +++ b/community/knotifications/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=knotifications -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Abstraction for system notifications" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -47,5 +47,5 @@ package() { } sha512sums=" -158706e38320b620153f048cf1075063fb46692e165663222631ca05fbb99953f679bb4a888d06d61ce2671134605b88a767c875eee9c85a042b46a7820b3df1 knotifications-6.1.0.tar.xz +4a2ebe75c8bddf8fd8bf607a6946e31bbdd86413b0962aaed5576c9c5c758d4cf73193134ba8102774f54aaa1682ab9519abf07d75d2e527321cfd5c38929462 knotifications-6.2.0.tar.xz " diff --git a/community/knotifyconfig/APKBUILD b/community/knotifyconfig/APKBUILD index ddf8beab62d..d50bca3c49c 100644 --- a/community/knotifyconfig/APKBUILD +++ b/community/knotifyconfig/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=knotifyconfig -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Configuration system for KNotify" # armhf blocked by extra-cmake-modules @@ -45,5 +45,5 @@ package() { } sha512sums=" -4ea2164ae7da248a8f50a43b6593227286a52ed3b20937d3b911ddd1b6f72cbda85a638635fcd0e33b80a729ea5a29b02d031aa5e1047f638bf48197ec23c44e knotifyconfig-6.1.0.tar.xz +858ae9f7b76e24981c380f82ecac9372462c3d80127959c295ac95a0934b8ffc3e79fb44957704328f5a1ffeb516c65ede78446c3d20fe02af4545b8010e0f1e knotifyconfig-6.2.0.tar.xz " diff --git a/community/kodi/APKBUILD b/community/kodi/APKBUILD index a64ef6cbf55..658544b9d50 100644 --- a/community/kodi/APKBUILD +++ b/community/kodi/APKBUILD @@ -3,7 +3,7 @@ pkgname=kodi pkgver=20.5 _realname=Nexus -pkgrel=2 +pkgrel=3 _libdvdcss="1.4.3-Next-Nexus-Alpha2-2" _libdvdnav="6.1.1-Next-Nexus-Alpha2-2" _libdvdread="6.1.3-Next-Nexus-Alpha2-2" diff --git a/community/koko/APKBUILD b/community/koko/APKBUILD index 83af69e706e..6c00bc59c83 100644 --- a/community/koko/APKBUILD +++ b/community/koko/APKBUILD @@ -10,8 +10,8 @@ _geonames_pkgver=24.02.0 pkgdesc="Image gallery application for Plasma Mobile" url="https://invent.kde.org/graphics/koko" # armhf blocked by qt6-qtdeclarative -# ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -> purpose -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt6-qtwebengine -> purpose +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" license="LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND LicenseRef-KDE-Accepted-GPL" depends=" kdeclarative diff --git a/community/kontact/APKBUILD b/community/kontact/APKBUILD index 36b4325a113..50e763b7002 100644 --- a/community/kontact/APKBUILD +++ b/community/kontact/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 # armhf blocked by extra-cmake-modules # armv7, ppc64le, s390x and riscv64 blocked by qt6-qtwebengine # riscv64 disabled due to missing rust in recursive dependency -arch="all !armv7 !armhf !ppc64le !s390x !riscv64" +# loongarch64 blocked by pimcommon +arch="all !armv7 !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kontact.kde.org/" pkgdesc="Container application to unify several major PIM applications within one application" license="GPL-2.0-or-later" diff --git a/community/korganizer/APKBUILD b/community/korganizer/APKBUILD index d99569a6e1a..5165488c58a 100644 --- a/community/korganizer/APKBUILD +++ b/community/korganizer/APKBUILD @@ -8,7 +8,8 @@ pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules # ppc64le, s390x, riscv64 and armv7 blocked by qt6-qtwebengine -> kmailtransport -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by pimcommon +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://apps.kde.org/korganizer/" pkgdesc="The calendar and scheduling component of Kontact" license="GPL-2.0-or-later" diff --git a/community/kpackage/APKBUILD b/community/kpackage/APKBUILD index 7eead4b0b00..b5ec8c307c2 100644 --- a/community/kpackage/APKBUILD +++ b/community/kpackage/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kpackage -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Framework that lets applications manage user installable packages of non-binary assets" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -45,5 +45,5 @@ package() { } sha512sums=" -b000774c559f9fa961687fdde59c74e8b8a2c357ad1710c75018e03d33ee91fae582f17e7090712d2aba4c61aa968dedbb52b502a1aa67da745df4913bde591b kpackage-6.1.0.tar.xz +6bc5c18118c61fed489787dee8950fb8ad25d28ad0b38917897edecf3cf01f5eca6dcc2e6e87dcc71fd201fc48a2141d145ccde5275cbf0ad38bb58fab7b1d75 kpackage-6.2.0.tar.xz " diff --git a/community/kparts/APKBUILD b/community/kparts/APKBUILD index f673a3110e8..57dad9a3c46 100644 --- a/community/kparts/APKBUILD +++ b/community/kparts/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kparts -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Document centric plugin system" # armhf blocked by extra-cmake-modules @@ -53,5 +53,5 @@ package() { } sha512sums=" -178f919af09d1e8219eefcd1ab6583e788fb6b09f4ef022721d4856b84c772571ebb0b66b45d3a8191b30ba781040e49a97740035b0441dcba5a7af895b87106 kparts-6.1.0.tar.xz +fd4ca3db0aeb173dd6a794e0cde769d4160ca8450b73b8d4a0905f242bfcd14ab0923a4a10aaea67ef91ff1a872ffefb341e40636b5bfc55f6e0387afe734f1e kparts-6.2.0.tar.xz " diff --git a/community/kpeople/APKBUILD b/community/kpeople/APKBUILD index 278ce1d10d9..96ac62ddc95 100644 --- a/community/kpeople/APKBUILD +++ b/community/kpeople/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kpeople -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="A library that provides access to all contacts and the people who hold them" arch="all !armhf" # armhf blocked by qt6-qtdeclarative @@ -49,5 +49,5 @@ package() { } sha512sums=" -de745c3d9dcd80dfdb16eeb12dacdad5d77252f3de2ae7957c0635bd39359c39b17d12bb69812a152cfa4ec9e801c0199b1b81cef5ffc3a2586953adf9f56028 kpeople-6.1.0.tar.xz +28a55b599ee200709a25559953726ab906b585353c60b3d6dc8a8f5c6fc3fea281b352066decb08f7690dc86d8c995f1896d27e6e9a75541c549949eb481e059 kpeople-6.2.0.tar.xz " diff --git a/community/kphotoalbum/APKBUILD b/community/kphotoalbum/APKBUILD index cdc56ed0355..c0cdb08ffeb 100644 --- a/community/kphotoalbum/APKBUILD +++ b/community/kphotoalbum/APKBUILD @@ -9,8 +9,8 @@ pkgrel=0 pkgdesc="KDE Photo Album, picture collection manager" url="https://kphotoalbum.org" # armhf blocked my extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> purpose -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine -> purpose +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" license="GPL-2.0-or-later" makedepends=" exiv2-dev diff --git a/community/kpipewire/APKBUILD b/community/kpipewire/APKBUILD index db363c1c959..12395769612 100644 --- a/community/kpipewire/APKBUILD +++ b/community/kpipewire/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kpipewire -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Components relating to pipewire use in Plasma" # armhf blocked by extra-cmake-modules @@ -61,5 +61,5 @@ package() { } sha512sums=" -5207bedf1b2ff534273daecb33685c7dbdaee1f585a02900c8919b6f946ea3c862471c0851486196624158e4e30be12617ebb8a3cd5e9598f8038bab8541fdd7 kpipewire-6.0.3.tar.xz +c4c3accfb99e5bb588cb31ea6163de8f8c75bfd920e8309683b25ad1a92a9eed6bd8dd0ae229e11057eb0c368dd7a3374197a97ed1b5a1620ec6b6e5b7555f33 kpipewire-6.0.4.tar.xz " diff --git a/community/kplotting/APKBUILD b/community/kplotting/APKBUILD index 869fe7c7b71..c3f72c84920 100644 --- a/community/kplotting/APKBUILD +++ b/community/kplotting/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kplotting -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Lightweight plotting framework" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -40,5 +40,5 @@ package() { } sha512sums=" -10af7aa2397185fcdc7a4f7c6eb2c2a8925f3da15fa6878501d1f3100c3e30849fd227e6412eb419f7382add97dad59115ca72e00f69d8cdc2fc00d76bece00d kplotting-6.1.0.tar.xz +4eb58e6018248124c5b050239877700e8da85cbdf3609f2af025fccbdd0e0aa031db003e8a8c0e34323290615de9a767299a80cab93b09587c96fa24c36b1808 kplotting-6.2.0.tar.xz " diff --git a/community/kpty/APKBUILD b/community/kpty/APKBUILD index 614e5a68e14..3fed0905d7f 100644 --- a/community/kpty/APKBUILD +++ b/community/kpty/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kpty -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Pty abstraction" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -44,5 +44,5 @@ package() { } sha512sums=" -bf369464be4d7d4391a48d5880752a36bf74f885678557d435f29749a7135c1bf47a5e97390436da4d44d78a65632be6cd34f50ce0c8c6c6a9cc68c8be02f958 kpty-6.1.0.tar.xz +6f00313e07dc80e4f2749af20e7873f901b538c3884b9b02bc2cfd8aff11abd430f001df53d8f782917ca1864ccb32cf2b4d3a72c5345b53aa24a0537110fd30 kpty-6.2.0.tar.xz " diff --git a/community/kpty5/APKBUILD b/community/kpty5/APKBUILD index ae410175e64..7c384fed3f9 100644 --- a/community/kpty5/APKBUILD +++ b/community/kpty5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=kpty5 pkgver=5.115.0 pkgrel=1 diff --git a/community/kquickcharts/APKBUILD b/community/kquickcharts/APKBUILD index b23a7f545c0..415e0e52210 100644 --- a/community/kquickcharts/APKBUILD +++ b/community/kquickcharts/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kquickcharts -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="A QtQuick plugin providing high-performance charts" arch="all !armhf" # armhf blocked by qt6-qtdeclarative @@ -42,5 +42,5 @@ package() { } sha512sums=" -a3f25ff4ad0324b04d5bd2496e3bb3dc6cfcebdab52ccb1dcf52d0e36ae2d699c6c19651d2f399bac54236cceb696c0b64cca4f697582a75e7cc3b572c02df48 kquickcharts-6.1.0.tar.xz +bfa806b81c327b3a252efddd113e53ae3f89e7b0ebc440bc279064dcca15d66e9c089551f99d1d0768dcfef3dedf874bf6e5b1b8e1e6bb6100bc598f3793def1 kquickcharts-6.2.0.tar.xz " diff --git a/community/krita/20-sip-6.8.patch b/community/krita/20-sip-6.8.patch new file mode 100644 index 00000000000..d57fb1d0e3e --- /dev/null +++ b/community/krita/20-sip-6.8.patch @@ -0,0 +1,12 @@ +Fix compilation with py3-sip >= 6.8.x +--- a/cmake/modules/pyproject.toml.in ++++ b/cmake/modules/pyproject.toml.in +@@ -9,7 +9,7 @@ name = "@module_name_toml@" + sip-module = "@sip_name@" + sip-include-dirs = @sip_include_dirs@ + sip-files-dir = "@module_srcs@" +-abi-version = "12" ++abi-version = "12.8" + + [tool.sip.bindings.@module_name_toml@] + tags = @module_tags@ diff --git a/community/krita/APKBUILD b/community/krita/APKBUILD index b98b479d434..d5cfa4d2b45 100644 --- a/community/krita/APKBUILD +++ b/community/krita/APKBUILD @@ -2,10 +2,11 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=krita pkgver=5.2.2 -pkgrel=1 +pkgrel=3 # armhf blocked by build failures # s390x: nobody is using an art tool there -arch="all !s390x !armhf" +# riscv64: fails to build from source +arch="all !s390x !armhf !riscv64" url="https://krita.org/" pkgdesc="Free digital painting application. Digital Painting, Creative Freedom!" license="GPL-2.0-or-later" @@ -60,6 +61,7 @@ checkdepends="xvfb-run" source="https://download.kde.org/stable/krita/$pkgver/krita-$pkgver.tar.xz 0001-fftw-use-pkgconfig.patch 10-jxl.patch + 20-sip-6.8.patch " # -python subpackage temporarily removed due to incompatibilities with Python 3.12 subpackages="$pkgname-dev $pkgname-lang" @@ -101,4 +103,5 @@ sha512sums=" d2e55d9a6c7be79f5b6661a1bd605cdf1ce20ec78cdaab1ba19a4acca5397afa0c0e8bc1cbf60120993b156aef65ed35fde2de756841342d18221c82ea81a1eb krita-5.2.2.tar.xz 246d632e1afa28fbb1ef0abe1a62433694465e2f3918f8d110a7ad6ff99b27d94a7d91dbf061eccd6ecfa72d8dbff87c1b2696effcb482045aaf3f89169e9a0e 0001-fftw-use-pkgconfig.patch b4932c1d9c6136203d8cff92a7ed65089cf5b6bd3f80ccf093d524d39fd3ddac408793fb7ae3287ce78d5574c34440bc849a5a90b618c39638854ea6f5fd3205 10-jxl.patch +2c5635550a397b57b3fb1d009bee41af78a0ab1bc77acdd6339933f44f9da4eee7d657efb1ba253238ac94cad99330b245b03c90af9f46fc269c43cde0691b8a 20-sip-6.8.patch " diff --git a/community/krunner/APKBUILD b/community/krunner/APKBUILD index 2c89bea6592..912774a3848 100644 --- a/community/krunner/APKBUILD +++ b/community/krunner/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=krunner -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Framework for providing different actions given a string query" # armhf blocked by extra-cmake-modules @@ -54,5 +54,5 @@ package() { } sha512sums=" -f9009333f860dd00fa5b67ab0f2bd6411828177ba6e8fd537eda6d21ee540dc0b6c3e15b543f260011e21c5f6092a84e2fe9349f3a0d6e88901abe18714e0fb5 krunner-6.1.0.tar.xz +c1e9306c1d5a16f61d1ad9d7af08d6b16c1123919f028b12e30f50118b3ab79e549eb0297e49a8e71378da0ea0b5622a54f7a7a6a43b63470394ad2867bba38e krunner-6.2.0.tar.xz " diff --git a/community/krunner5/APKBUILD b/community/krunner5/APKBUILD index e4476a0e315..4e9eace8088 100644 --- a/community/krunner5/APKBUILD +++ b/community/krunner5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=krunner5 pkgver=5.115.0 pkgrel=1 diff --git a/community/kscreen/APKBUILD b/community/kscreen/APKBUILD index 36687e06226..f2be77f1307 100644 --- a/community/kscreen/APKBUILD +++ b/community/kscreen/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kscreen -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="KDE's screen management software" # armhf blocked by qt6-qtdeclarative @@ -64,5 +64,5 @@ package() { } sha512sums=" -71882aaf7df45013f64212720f9b116e3bc55f0fac58923e28968d4733ee2cfc90fa7160d3a033ff18532fdbb625e51600b680f72f911c8cc3bb44bdde1d1bf1 kscreen-6.0.3.tar.xz +541b3bda55590cc599c36f9c37cbd4439bb93e3156c57d66aa5350d0b7f35dcc52ae40e9dd93e0b07baf01bb223b2332346bae9a615d81be3668583f783e6343 kscreen-6.0.4.tar.xz " diff --git a/community/kscreenlocker/APKBUILD b/community/kscreenlocker/APKBUILD index 37a523e43ae..66dbdbbcc40 100644 --- a/community/kscreenlocker/APKBUILD +++ b/community/kscreenlocker/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kscreenlocker -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Library and components for secure lock screen architecture" # armhf blocked by extra-cmake-modules @@ -79,7 +79,7 @@ package() { } sha512sums=" -9f4aac85e958fdbca268e14fc60b766968d0b0ae7a657a9b07270177e6c48820910a086bb8ee03d77d09018b7e7a08580e6f2a16ea561e77d540178d4214e21b kscreenlocker-6.0.3.tar.xz +a5f01c8d1c976584546dacdb9d0f18ee8b59bf3e00caf01a6de294d1998eaf0806e551650d0528a3b3d4f65954fc7edadd808ba75b5b7d7060646058ab8d34cf kscreenlocker-6.0.4.tar.xz cdbc45fb74a3c43fb2302fe09bf2f9f644ca93693e0110cf748c403762236aaeea8284a8d21fc495014c69b6d5fe4789aaff7687ce9f03dda270490fa5042e2b kde.pam fe2f244b73b5cccf4b7125b9e3cac0a35566840e4ba2f69937fd8053aa56af71ee43dcbfa9c0f79de9ebe31f656e98a5d38955f77560be5c3535b08215ad8789 kde-fingerprint.pam 2ae866d25224ba345ea9d5ddb2fce668de5c51d1cfbb4d7a048c50107ccd6cffc3231a46855599c0ba3d62ff002a26e45b69d9029f88f4ab42661465a5e526c5 kde-smartcard.pam diff --git a/community/kservice/APKBUILD b/community/kservice/APKBUILD index f527110593e..a66392b836e 100644 --- a/community/kservice/APKBUILD +++ b/community/kservice/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kservice -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Advanced plugin and service introspection" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -62,5 +62,5 @@ package() { } sha512sums=" -cba417080332f7eb5c5b1cc69ef0414a9885624085d7313f2b703d7c7cee992ceea80fe107a0903f5674763565e5ed6eb7a2007edb84e1180670d438251e0115 kservice-6.1.0.tar.xz +7949e21913dd00ae636588352ba08b2f15f100ec7e2e4e3379f8d79a35d4b671d9013fa7a61af004ee8657d8f007208c750eadb3d5e88cd7203d827d794bdf8d kservice-6.2.0.tar.xz " diff --git a/community/ksshaskpass/APKBUILD b/community/ksshaskpass/APKBUILD index a51a851feef..ff24dd44e65 100644 --- a/community/ksshaskpass/APKBUILD +++ b/community/ksshaskpass/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=ksshaskpass -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="ssh-add helper that uses kwallet and kpassworddialog" # armhf blocked by qt6-qtdeclarative @@ -47,5 +47,5 @@ package() { } sha512sums=" -7d665cb47b762515007d6251534d1d60a54fc26fdc32f8849de36d55d604417682242f8acbb9395d0831ced784a8a0368188fee9b0201dbb9bf2d2f21a03db43 ksshaskpass-6.0.3.tar.xz +a0dc562f0fa7cb8cc17e84745b29f82e96828e8a093e5b2a89a13924685649ecd62b41d937a3a39c9a9309db90ee427c5b4bea94a2b79e564d065d13e4ebe6b4 ksshaskpass-6.0.4.tar.xz " diff --git a/testing/kstars/APKBUILD b/community/kstars/APKBUILD index 0ba9fa13cfa..0ba9fa13cfa 100644 --- a/testing/kstars/APKBUILD +++ b/community/kstars/APKBUILD diff --git a/testing/kstars/tests-disable-ngc4535-autofocus3.patch b/community/kstars/tests-disable-ngc4535-autofocus3.patch index 08311f54af2..08311f54af2 100644 --- a/testing/kstars/tests-disable-ngc4535-autofocus3.patch +++ b/community/kstars/tests-disable-ngc4535-autofocus3.patch diff --git a/community/kstatusnotifieritem/APKBUILD b/community/kstatusnotifieritem/APKBUILD index c41995952d0..a3a04bd0eb2 100644 --- a/community/kstatusnotifieritem/APKBUILD +++ b/community/kstatusnotifieritem/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kstatusnotifieritem -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Implementation of Status Notifier Items" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -40,5 +40,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -453933b9a62dcb6150567162c3afb4a5384d827179c8a0b65e8cfceba309a699ade35c28d910251edfa913a230a3e70415f4a4838f1021da206c25e00f19891a kstatusnotifieritem-6.1.0.tar.xz +926f7e05e5745d592cda2a7d30de73d4ff49304aa2e46721320849214f7da059fe3a2c8aac4e19056bea1d14da57c6e4ab148d7e5cae97667019f2724895dbca kstatusnotifieritem-6.2.0.tar.xz " diff --git a/community/ksvg/APKBUILD b/community/ksvg/APKBUILD index a3b2789788d..db75a1a74f7 100644 --- a/community/ksvg/APKBUILD +++ b/community/ksvg/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=ksvg -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Configuration system" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -7000c407875682df8d847222ce0fc0ef87425562e844da98f0954829db53547f1a84382c5119446bf973aa71c841f58a40b478236413f5c3a04b45841563d05f ksvg-6.1.0.tar.xz +7df2f5e3fdbd5b828e0747c5bd4e369410e0b5be746588f93fcef8b5e47119794505ddc57f9c0723e004a00a8d2634f339214a8d08dbc502d7f9d497ffb67e2e ksvg-6.2.0.tar.xz " diff --git a/community/ksystemstats/APKBUILD b/community/ksystemstats/APKBUILD index 95bce1bc062..c6842754006 100644 --- a/community/ksystemstats/APKBUILD +++ b/community/ksystemstats/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=ksystemstats -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="A plugin based system monitoring daemon" # armhf blocked by extra-cmake-modules @@ -54,5 +54,5 @@ package() { } sha512sums=" -8181f7246551588405c38643d3cb6ccc5be1541148a8e441c280f8501ab8c861f757ec313e2edac61d50bc0b2bc8a62ac582edece1dd3ed315352346ec5a8de5 ksystemstats-6.0.3.tar.xz +b8487f6e7dc989b5c7546d36734b6fbf1dd9a8aa8949ad0f8261eabcb78349cdb1372f6aa284a9dfd0aeaba4c183146fd3caca15e72dae32a143f417bf6ff470 ksystemstats-6.0.4.tar.xz " diff --git a/community/ktexteditor/APKBUILD b/community/ktexteditor/APKBUILD index 341d431b19b..6648ef12d91 100644 --- a/community/ktexteditor/APKBUILD +++ b/community/ktexteditor/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=ktexteditor -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Advanced embeddable text editor" # armhf blocked by extra-cmake-modules @@ -78,5 +78,5 @@ package() { } sha512sums=" -c178822fdbce8738c41853b3ee2b5ee961c29efbc486ee4f3f9f073110c1c77abf9fd0310c4d68461f09e9b3d0ca47662b4e950be8d358e0be7d2141836fafd2 ktexteditor-6.1.0.tar.xz +72102d90c411ff6a417e750dee12419045d1fc4af1739276506a2df18ec74fecaea8500b44b7f5d37fa0cdf227afcf2773fc0a2dff7ef79444cf9121ee52f988 ktexteditor-6.2.0.tar.xz " diff --git a/community/ktexttemplate/APKBUILD b/community/ktexttemplate/APKBUILD index 5cc58fa06a9..f7681e203c6 100644 --- a/community/ktexttemplate/APKBUILD +++ b/community/ktexttemplate/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=ktexttemplate -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Library to allow application developers to separate the structure of documents from the data they contain" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -40,5 +40,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -6d0ffd3437f2f427a23719fca752687e7ab781cfac935ed7957d553883485a33ebeedc067ba874f713f475482e83dae2927c88554fec3a5ed9e3d1650782dd5f ktexttemplate-6.1.0.tar.xz +2fdeaffa25145d132165bf8c89d89efae412dc67b0163d987f4f624694d4888cf3cc055d0cdee11996ea67871e41f9f38d843576d86b8131e7c8ffad5210c4be ktexttemplate-6.2.0.tar.xz " diff --git a/community/ktextwidgets/APKBUILD b/community/ktextwidgets/APKBUILD index cc22a10e2b2..14540957433 100644 --- a/community/ktextwidgets/APKBUILD +++ b/community/ktextwidgets/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=ktextwidgets -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Advanced text editing widgets" # armhf blocked by extra-cmake-modules @@ -51,5 +51,5 @@ package() { } sha512sums=" -9c032a6f1f186381594c1843414d02fba8eb69df417aae49e3abb6e005a7504664419531f1e7ac41dfd04f4c64429dba11eeca96d5b9370453575609b2d20489 ktextwidgets-6.1.0.tar.xz +ac86e092460b04f2e5138cdabecc8e1839858016b6dc3af921e50469b37b839fbf8d2396b82270e578069cc7f074c753c13bffc01bceb4d11bb92534ee8bb401 ktextwidgets-6.2.0.tar.xz " diff --git a/community/ktistec/APKBUILD b/community/ktistec/APKBUILD index f1abb9570b9..638ed9deee4 100644 --- a/community/ktistec/APKBUILD +++ b/community/ktistec/APKBUILD @@ -2,7 +2,7 @@ # Contributor: qaqland <qaq@qaq.land> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=ktistec -_pkgver=2.0.0-10 +_pkgver=2.0.0-11 pkgver=${_pkgver/-/.} pkgrel=0 pkgdesc="Single-user ActivityPub server written in Crystal" @@ -60,7 +60,7 @@ package() { } sha512sums=" -7ad7c36f58ef698adb12c874a8d20b6cccbd4d9f884ea1075c7ad266ecb6e58876fa69f909847725f3a9de769e94e343c065025b944f975f3b2c8784372f5481 ktistec-2.0.0-10.tar.gz +49c6a10d9a60280023089ae70e60f5357974d0ab478eacbbf8e738a5fa7de1890b34f0bae9acb27a58b1af429467aa9c5682f68381a8d74e74076cd76fbd6925 ktistec-2.0.0-11.tar.gz f2520a9306daf544fec456e739abf1bb1e1a188992bbd8ef4a3ce3915a342209521ceedef8fc871c659d12ca57914825a8dcebc04e0114147fe32fc7de1dcabb ktistec.initd b8971fe3a504df6173015a33a8edd64d74144128a1247328067fe82bee796d5faa55fa00de01690fedd7a027fb55e584b98b20277faa4140b913f52e4ec094e3 ktistec.confd " diff --git a/community/ktorrent/APKBUILD b/community/ktorrent/APKBUILD index 599d83ea402..1f43f71acc5 100644 --- a/community/ktorrent/APKBUILD +++ b/community/ktorrent/APKBUILD @@ -5,10 +5,10 @@ # group=kde-applications pkgname=ktorrent pkgver=24.02.2 -pkgrel=0 +pkgrel=1 # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kde.org/applications/internet/org.kde.ktorrent" pkgdesc="A powerful BitTorrent client for KDE" license="GPL-2.0-or-later" diff --git a/community/kubo/APKBUILD b/community/kubo/APKBUILD index 6423b009b01..700de782dba 100644 --- a/community/kubo/APKBUILD +++ b/community/kubo/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Oleg Titov <oleg.titov@gmail.com> # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=kubo -pkgver=0.27.0 -pkgrel=2 +pkgver=0.28.0 +pkgrel=0 _migration=fs-repo-14-to-15/v1.0.0 pkgdesc="Inter Platnetary File System (IPFS), a peer-to-peer hypermedia distribution protocol" url="https://ipfs.tech/" @@ -23,6 +23,8 @@ provides="go-ipfs=$pkgver-r$pkgrel" replaces="go-ipfs" # secfixes: +# 0.28.0-r0: +# - CVE-2024-22189 # 0.8.0-r0: # - CVE-2020-26279 # - CVE-2020-26283 @@ -70,7 +72,7 @@ migration() { } sha512sums=" -f20ba9b19ee342fb2e444bab7aed24ee6461aaf10915f48337ab5c89fab3e489882bc7c975fab72b59345bad283cc49e36eb2526d6ffd26543034870f5dc622c kubo-0.27.0.tar.gz +00ff668aa75367b41aa8ede567e8adf85db4807317ca5ee6d74aee9633f4a97abeaf2cad29d21c88d0c9e9ad1e603709b3b752894702fc5bcaf01f259eca9f4d kubo-0.28.0.tar.gz db7ba261e0062e2bf11e9a5ef9b20cc18dbfc59686d7bc1ba18600270a136ba9f99424fba70aed28336de61d090dc254791a2493c4376f4d277b8a9f22da9cb4 kubo-migration-fs-repo-14-to-15-v1.0.0.tar.gz 3e51e9a3dca1b991e8549f8354f7c2cfd1bb9b73d7a59557878d5c9ab4189988676d789172af3ba1fd57193ec48ca9125919507b0de7d0400ce0d6166622e556 ipfs.initd c55afeb3efe381d18258ddf00f58325b77156375cf223fb2daa049df056efe22e9139cce0f81dc4c73759dad5097af5f3201414beb5950bd894df9ae8c7c4ed1 ipfs.confd diff --git a/community/kunitconversion/APKBUILD b/community/kunitconversion/APKBUILD index 13605d42237..140102dc8e5 100644 --- a/community/kunitconversion/APKBUILD +++ b/community/kunitconversion/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kunitconversion -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Support for unit conversion" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -43,5 +43,5 @@ package() { } sha512sums=" -160904d00ebe4db5f672fe425f356c2589cf1da2b141a750c3d1c576a71b0bce0d414f72fa7559e13bc159d20ed4f4dc050552f88eba61df10f5ecaa9da2ff59 kunitconversion-6.1.0.tar.xz +8542d256b669a3e7b7146c991d19cfc94c76031880e9930240c0f18eaea20b40baa1c6db00b85817c606fc3eebde17d2be611113d1e2b5be3680701e5bce370d kunitconversion-6.2.0.tar.xz " diff --git a/community/kuserfeedback/APKBUILD b/community/kuserfeedback/APKBUILD index 46977fbe193..08bbd40c0de 100644 --- a/community/kuserfeedback/APKBUILD +++ b/community/kuserfeedback/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kuserfeedback -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Framework for collecting user feedback for applications via telemetry and surveys" url="https://kde.org/products/frameworks/" @@ -43,5 +43,5 @@ package() { } sha512sums=" -144b1576dccb9334405c6b92c58f0748f67f36b967aacdee9a15d0b758789133fe0dfccb2b4686b234ff167408ca68bc7961fa37fd8ca9cde6a59db95e00d5a0 kuserfeedback-6.1.0.tar.xz +e1318bc7131205443bb9a18dca708c47ab011106bc9413436c0b50defe33e2970397d42852b3ea6a3b4e01efe64825c13962c89c7bb8666643457cd884eade6d kuserfeedback-6.2.0.tar.xz " diff --git a/community/kvantum/APKBUILD b/community/kvantum/APKBUILD index 82b12c2940a..f967c1bb4a6 100644 --- a/community/kvantum/APKBUILD +++ b/community/kvantum/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: knuxify <knuxify@gmail.com> pkgname=kvantum -pkgver=1.0.10 -pkgrel=1 +pkgver=1.1.0 +pkgrel=0 pkgdesc="SVG-based theme engine for Qt" options="!check" # No testsuite url="https://github.com/tsujan/Kvantum" @@ -11,6 +11,7 @@ license="GPL-2.0-or-later" depends="hicolor-icon-theme" makedepends=" cmake + kwindowsystem-dev kwindowsystem5-dev libx11-dev libxext-dev @@ -37,6 +38,7 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DENABLE_QT4=OFF \ + -DENABLE_QT5=ON \ $CMAKE_CROSSOPTS cmake --build build-qt5 @@ -90,5 +92,5 @@ themes() { } sha512sums=" -fb31f424a16c37eafaaa0a1cdddde165bcaa58ed6ea3ef76e77d689c2b8b47e516a651d066712eaf14b1344e4b30955ce6c955367caf25d51f2aaa2c8970b0fd kvantum-1.0.10.tar.gz +dc6bc3cb44d3a050a7e43196f7c0ab69d5f33c5fa645cdf191631164384aed8d8130093a4da4367b061c33d0d844dc57f91352d96a9368dd9abd6694a404d7f6 kvantum-1.1.0.tar.gz " diff --git a/community/kwallet-pam/APKBUILD b/community/kwallet-pam/APKBUILD index 5a3e0a2949e..384288f28b5 100644 --- a/community/kwallet-pam/APKBUILD +++ b/community/kwallet-pam/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kwallet-pam -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="KWallet PAM integration" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { } sha512sums=" -bdef907847de6a9aeef46e3e00488643f9f965b91cec547e6d14e948558aded1738fcf3f84da6de137375945fb67fb5913da5fbaebe0a08e2e313bbabb8e93ed kwallet-pam-6.0.3.tar.xz +af186165fe2e2ada5e1dd8359b41980af36e18b5266048fd3dbeeb4e2815ec158a1d1079d0c25ea427dc4c43414bf985c8eea828eafe54d9c58bc4b3c59255c6 kwallet-pam-6.0.4.tar.xz " diff --git a/community/kwallet/APKBUILD b/community/kwallet/APKBUILD index c9b307861d7..1aaa9ae5f6a 100644 --- a/community/kwallet/APKBUILD +++ b/community/kwallet/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kwallet -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Secure and unified container for user passwords" # armhf blocked by extra-cmake-modules @@ -75,5 +75,5 @@ bin() { } sha512sums=" -fb0428a76788d556ffc6c18a649f5e4de96b57234931e2e878ea660c612384c9778367db26089d73f0499b0d5d5cffcc9b193ca97a03aa3504180b483170c88b kwallet-6.1.0.tar.xz +6a884727ceaa935cb6bc8eea550fd38828801526291b95dc5bac8ea8a03187edefe7667b1e0345f0a48eeadcb96850be4aaec796d04d0a79883d35d89200cf6c kwallet-6.2.0.tar.xz " diff --git a/community/kwayland-integration/APKBUILD b/community/kwayland-integration/APKBUILD index ab4ec165113..3a8f29b35d8 100644 --- a/community/kwayland-integration/APKBUILD +++ b/community/kwayland-integration/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kwayland-integration -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="KWayland integration" url="https://kde.org/plasma-desktop/" @@ -43,5 +43,5 @@ package() { } sha512sums=" -0caf516444afb9fa5b148461f1301fb865c691ad39f120c3919194be643492721210a2c1a584f8bcacef9ad2fd2f04a563eb18e3b388bb4322574fd0f2d590af kwayland-integration-6.0.3.tar.xz +2fac1bf44212a0c70f89625bdf7169551e26d252299e740a3c0ee4c87a3172ed69549856c7cc0f2cb27b09c5b72fe4de14a186e2d513436708d839e95503157a kwayland-integration-6.0.4.tar.xz " diff --git a/community/kwayland/APKBUILD b/community/kwayland/APKBUILD index 4913dbf5570..4bc0ec12fbc 100644 --- a/community/kwayland/APKBUILD +++ b/community/kwayland/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kwayland -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Qt-style Client and Server library wrapper for the Wayland libraries" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -50,5 +50,5 @@ package() { } sha512sums=" -8df9296ae9d06935b21c4c255f0d45722b504e6ab095c5c1beaba33a010652ab98d82e318119da3633daf56d8b8ef0343fdcf8c56a931bd6171afa1e98e13a04 kwayland-6.0.3.tar.xz +12db8acbd24716ee3321d2e8b47315dfa645dc447224eba7db80095d9f5eb41d61f7d3d8422f38a6d066313d0cc6994085b4bc9bb974e427b574a1aafd20a653 kwayland-6.0.4.tar.xz " diff --git a/community/kwidgetsaddons/APKBUILD b/community/kwidgetsaddons/APKBUILD index 4dccdea25e6..641d328e60e 100644 --- a/community/kwidgetsaddons/APKBUILD +++ b/community/kwidgetsaddons/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kwidgetsaddons -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Addons to QtWidgets" # armhf blocked by extra-cmake-modules @@ -45,5 +45,5 @@ package() { } sha512sums=" -60281acbd06c6652ac8e35784f5e372335f91b991449550a35756ca736cfbcad0abf1d69139e242ffe03c93b901b0b7be801ce606ff3584a2dc8fed472b0db1a kwidgetsaddons-6.1.0.tar.xz +8ef2fcab984a91c0f299253c58714f73686e8a3fd042b6d798eed8eadf95a08721dc5c36e6d6b09b27595e1a548258ae1b617b7e5e33449821016c8ae065952f kwidgetsaddons-6.2.0.tar.xz " diff --git a/community/kwin/0001-kwin-Fix-building-of-tests.patch b/community/kwin/0001-kwin-Fix-building-of-tests.patch new file mode 100644 index 00000000000..852e65c25c5 --- /dev/null +++ b/community/kwin/0001-kwin-Fix-building-of-tests.patch @@ -0,0 +1,26 @@ +From a879c59a082707e0e7dfa8ebeb7b239551ec9c71 Mon Sep 17 00:00:00 2001 +From: Bart Ribbers <bribbers@disroot.org> +Date: Thu, 11 Jan 2024 16:58:52 +0100 +Subject: [PATCH] Fix building of tests on Musl by making sure to include + sys/select.h + +Required for access to fd_set +--- + tests/waylandservertest.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/waylandservertest.cpp b/tests/waylandservertest.cpp +index d6210be3735..1447152306b 100644 +--- a/tests/waylandservertest.cpp ++++ b/tests/waylandservertest.cpp +@@ -16,6 +16,7 @@ + #include <private/qeventdispatcher_glib_p.h> + + #include <iostream> ++#include <sys/select.h> + #include <unistd.h> + + static int startXServer() +-- +GitLab + diff --git a/community/kwin/APKBUILD b/community/kwin/APKBUILD index 20fbeba5313..6a894c70953 100644 --- a/community/kwin/APKBUILD +++ b/community/kwin/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kwin -pkgver=6.0.3.1 +pkgver=6.0.4.1 pkgrel=0 pkgdesc="An easy to use, but flexible, composited Window Manager" # armhf blocked by qt6-qtdeclarative @@ -88,7 +88,7 @@ esac subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang" _repo_url="https://invent.kde.org/plasma/kwin.git" source="https://download.kde.org/stable/plasma/${pkgver%.*}/kwin-$pkgver.tar.xz - 0001-$pkgname-Fix-building-of-tests.patch::https://invent.kde.org/plasma/kwin/-/commit/a879c59a082707e0e7dfa8ebeb7b239551ec9c71.patch + 0001-kwin-Fix-building-of-tests.patch " # Broken, fails to setup due to missing or invalid XDG_RUNTIME_DIR? options="!check" @@ -121,6 +121,6 @@ package() { } sha512sums=" -e4a7610fbefcd0903fcc3b68466d085981adb5678cd00a5eae546dd281e601eb07df50c190e5858dd0df42848ae2841ac8c0efdd1b765892cbe1aeb4f52eaab0 kwin-6.0.3.1.tar.xz +a38605dea13a225220544b77f835bff5bb191861ad34dd5ea6de06069921bc6db1f2683cb361d421ab3f7a82c58d2ff914512074a17e8e554bac3e5303f19ab5 kwin-6.0.4.1.tar.xz 14c4ddceca2ef51a139319bdd64bc84d7a1df7c6419e86bdbb04572be3212ca46f5c25cd61fa3b511d7644046f92a07408e472e41d95aab93ec494138a09c1a9 0001-kwin-Fix-building-of-tests.patch " diff --git a/community/kwindowsystem/APKBUILD b/community/kwindowsystem/APKBUILD index 94d99d806f2..2016205f721 100644 --- a/community/kwindowsystem/APKBUILD +++ b/community/kwindowsystem/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kwindowsystem -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Access to the windowing system" # armhf blocked by extra-cmake-modules @@ -66,5 +66,5 @@ package() { } sha512sums=" -b538c39c14a5bc11b599e9297cf553830f7eec832cb42c77ab2008f3a9f02fc7ccc18ea0d5d0de9f31d38d900367e1518f2dbc8fc85957458cddee6c9c191071 kwindowsystem-6.1.0.tar.xz +370b8cdd8e4aa74a9beeb6d95727aba6825812f81bd0ae87de829972364edd3015570581c9e00b8d84e2b4207a62c87647b80360ae1ad82302b9524529531734 kwindowsystem-6.2.0.tar.xz " diff --git a/community/kwrited/APKBUILD b/community/kwrited/APKBUILD index 33e01304077..eae4cea58ec 100644 --- a/community/kwrited/APKBUILD +++ b/community/kwrited/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kwrited -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="KDE daemon listening for wall and write messages" arch="all !armhf" # qt6-qtdeclarative-dev unavilable on armhf @@ -43,5 +43,5 @@ package() { } sha512sums=" -736521989b7163b50e657dfcbeabb0ab23566ee15446a609013c1cfde7852d19c7b45baf881ef0745089bd13d530ab9a5689cd1782f238297a5f6abbbc85945e kwrited-6.0.3.tar.xz +6a6b178b3bfa9c3bcbb59caac35e78119d78d522494eb3f4af20d1a50288797b292689c7de7ece1c895f526b800e989b54d9a7ea815aa77d22a642f82419a633 kwrited-6.0.4.tar.xz " diff --git a/community/kxmlgui/APKBUILD b/community/kxmlgui/APKBUILD index 1d33b24b3d8..5f8e3f800ce 100644 --- a/community/kxmlgui/APKBUILD +++ b/community/kxmlgui/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=kxmlgui -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="User configurable main windows" # armhf blocked by extra-cmake-modules @@ -57,5 +57,5 @@ package() { } sha512sums=" -a646db1858d39596a9171c9976972a02f31f02cf656806534436960c4771a082a80ea9d47422e313a0f4e93ed53756f441af3c092ebdc5f8f84004329332a0fc kxmlgui-6.1.0.tar.xz +026d3620ebd7e3bebd7de0c12f6ded0d59e924166b8d9adf929a2bb89b4ad668734c279c806d369716a77c20e32acab44e361feec022c9015bf2c54cb47fba65 kxmlgui-6.2.0.tar.xz " diff --git a/community/kxmlgui5/APKBUILD b/community/kxmlgui5/APKBUILD index 1474323f4a0..883cca95033 100644 --- a/community/kxmlgui5/APKBUILD +++ b/community/kxmlgui5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=kxmlgui5 pkgver=5.115.0 pkgrel=0 diff --git a/community/labwc/APKBUILD b/community/labwc/APKBUILD index d09302b939a..9c9f8d767ec 100644 --- a/community/labwc/APKBUILD +++ b/community/labwc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=labwc -pkgver=0.7.1 +pkgver=0.7.2 pkgrel=0 pkgdesc="Wayland stacking compositor" url="https://github.com/labwc/labwc" @@ -39,6 +39,6 @@ package() { } sha512sums=" -2fb307887ae210bc7f0025b2ae9046345de9d1a8dfa0aac3817d7aa4fdbffc7cbc176ec3a859e2328404cd97910d434e9897f7b614fc55d8eab729f0a5007e97 labwc-0.7.1.tar.gz +3d30586de37aadce9d30496b89c4fcc69a25c352982135a8299e699ff49fdbd17005e2efb1f52bebc0fba9f7743a63be8d2c9882644765ae3f752cd274194f86 labwc-0.7.2.tar.gz 08b1c7f45eda434400b61b8cad1d0e800c8f4ecd9e3f93fc42b10f4e8e0e599ed61a7a7e363dfa0acb45b174269278c136a244ec87940e84cc2362cdda5f5ef6 remove-aports-git-version.patch " diff --git a/community/lager/APKBUILD b/community/lager/APKBUILD index 1f70c74e075..58d906451e3 100644 --- a/community/lager/APKBUILD +++ b/community/lager/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=lager pkgver=0.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="C++ library for value-oriented design using the unidirectional data-flow architecture" url="https://sinusoid.es/lager" arch="noarch" diff --git a/community/lapce/APKBUILD b/community/lapce/APKBUILD index aa09e0e7cdb..cde2222ea10 100644 --- a/community/lapce/APKBUILD +++ b/community/lapce/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=lapce -pkgver=0.3.1 +pkgver=0.4.0 pkgrel=0 pkgdesc="Lightning-fast and Powerful Code Editor written in Rust" url="https://lapce.dev" @@ -79,7 +79,7 @@ proxy() { } sha512sums=" -d7fbb5b75ff31f8ab760315fca045c1e1d7bfbcb91a4251b881a565fc6306656a2d8c63328f0cc4b2e8bb84774942b4ceb92f18ad02d245f1a44c2e6c6283dcb lapce-0.3.1.tar.gz -b140ff385e71a0579fff1d8727b6af89cd9c66e3166359b32ecde0d5133fb9247e431f3e3337779f84cac1405409c1292e30606a746b6e96f75cf53d734d6815 use-system-libs.patch -df3bbb931e8c8d79754fd28ca82342177e3bcaaabd00333245f33fbfb37730de13cd73057c4582866498ef113461bb5ceda347ccaba4aee40bdf6eefaa655856 cargo.lock.patch +27b8a492cda8dfd5111b9eff12ac02781051f30319e6c83b81af5a31df8a44dd57beb2dd1af2414a95b0cc726de4701ea5876f3b79455dc08b0f4baa84b89bdd lapce-0.4.0.tar.gz +be07e7af48cf4ac67f9a0ef8fcda382450b89e4e449c9c966c70e00b34a752c7355fd4eb9206ff1f72bee8f37bc13ac13d833ac69396d2187e452ca2f233fbda use-system-libs.patch +b84269b9cf81987b6e3ec4e7486032574cc1f717808e57e74448e82acac8d81b75f8e0fb023d32ba16116fea5bc9d32630a2d7d9d3afb93c0e291089caaacdb9 cargo.lock.patch " diff --git a/community/lapce/cargo.lock.patch b/community/lapce/cargo.lock.patch index 608847ad8ae..15089f9d9c9 100644 --- a/community/lapce/cargo.lock.patch +++ b/community/lapce/cargo.lock.patch @@ -1,30 +1,30 @@ --- a/Cargo.lock +++ b/Cargo.lock -@@ -3672,15 +3672,6 @@ +@@ -3739,15 +3739,6 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] -name = "openssl-src" --version = "111.22.0+1.1.1q" +-version = "300.2.3+3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +-checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" -dependencies = [ - "cc", -] - -[[package]] name = "openssl-sys" - version = "0.9.76" + version = "0.9.99" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -3689,7 +3680,6 @@ - "autocfg", +@@ -3755,7 +3746,6 @@ + dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] -@@ -7460,6 +7450,7 @@ +@@ -7250,6 +7240,7 @@ dependencies = [ "cc", "libc", diff --git a/community/lapce/use-system-libs.patch b/community/lapce/use-system-libs.patch index 2e86463fce6..03f12b210aa 100644 --- a/community/lapce/use-system-libs.patch +++ b/community/lapce/use-system-libs.patch @@ -1,8 +1,8 @@ --- a/lapce-proxy/Cargo.toml +++ b/lapce-proxy/Cargo.toml -@@ -41 +41 @@ --zstd = "0.11.2" # follow same version wasmtime-cache in lockfile +@@ -45 +45 @@ +-zstd = "0.11.2" # follow same version wasmtime-cache in lockfile +zstd = { version = "0.11.2", features = ["pkg-config"] } # follow same version wasmtime-cache in lockfile -@@ -51 +51 @@ --git2 = { version = "0.18.1", features = ["vendored-openssl"] } -+git2 = { version = "0.18.1" } +@@ -54 +54 @@ +-git2 = { version = "0.18.2", features = ["vendored-openssl"] } ++git2 = { version = "0.18.2" } diff --git a/community/layer-shell-qt/APKBUILD b/community/layer-shell-qt/APKBUILD index fa46c6f509b..f8c4cbbb1ea 100644 --- a/community/layer-shell-qt/APKBUILD +++ b/community/layer-shell-qt/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=layer-shell-qt -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Qt component to allow applications to make use of the Wayland wl-layer-shell protocol" # armhf blocked by extra-cmake-modules @@ -47,5 +47,5 @@ package() { } sha512sums=" -df7d5e4768d8b24948b99833b66c2b3be91a125779ececf2dc706d5b641853209acecb84cba1e977b0951eb8b11fe667f017f95f71a12c8db06f9fb7236093c2 layer-shell-qt-6.0.3.tar.xz +0eaa28103023c63d9df2c1d9ebd221c2ac1a0198f45923cfd521a3107eaf9498b9d6c0b3a98e15fa2aec229de92b1aa2760c6a35a813511d2b7befe22a73f51f layer-shell-qt-6.0.4.tar.xz " diff --git a/testing/lcov/APKBUILD b/community/lcov/APKBUILD index b0d15b007ae..b0d15b007ae 100644 --- a/testing/lcov/APKBUILD +++ b/community/lcov/APKBUILD diff --git a/community/ldc/APKBUILD b/community/ldc/APKBUILD index f949525012c..613f436bd55 100644 --- a/community/ldc/APKBUILD +++ b/community/ldc/APKBUILD @@ -122,7 +122,7 @@ check() { # Link: https://github.com/ldc-developers/druntime/blob/8e135b4e978975b24536e2a938801a29b39dc9f6/src/rt/lifetime.d#L1250 # However this unittest is AFAICS unrelated to the two tests, # and either succeed or isn't run on its own. - ctest --output-on-failure -E "std.datetime.timezone*|dmd-testsuite|lit-tests|druntime-test-exceptions|druntime-test-shared|druntime-test-stdcpp|druntime-test-cycles|druntime-test-gc$_tests_ignore" + ctest --output-on-failure -E "std.datetime.timezone*|dmd-testsuite|lit-tests|druntime-test-exceptions|druntime-test-shared|druntime-test-stdcpp|druntime-test-cycles|druntime-test-gc|std.file|std.file-shared$_tests_ignore" } package() { diff --git a/community/ledger/APKBUILD b/community/ledger/APKBUILD index 3cc2196f6f4..5e73340264d 100644 --- a/community/ledger/APKBUILD +++ b/community/ledger/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Apo Apangona <apo@apangona.de> pkgname=ledger pkgver=3.3.2 -pkgrel=0 +pkgrel=2 pkgdesc="Double-entry accounting system with a command-line reporting interface" url="https://www.ledger-cli.org/" arch="all" @@ -20,9 +20,7 @@ makedepends=" " subpackages="$pkgname-doc" options="!check" # FIXME: some tests are failing -source="$pkgname-$pkgver.tar.gz::https://github.com/ledger/ledger/archive/v$pkgver.tar.gz - boost-176.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/ledger/ledger/archive/v$pkgver.tar.gz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -46,5 +44,4 @@ package() { sha512sums=" d5d7058f0e9a02ad1d46e6780675d446070824b321f0f4c1ea6ac0c3dd4f11f259113bc36cbc796e4bb6d0a7898d6a68a25cce639e27a2b2434eec11a612ecb0 ledger-3.3.2.tar.gz -56079e10de6e0384863c9c7e56436274eaf83587636aafeed1af32002d35bf66c10adaca59d40a25d7ffad4468bb019d306c2fa047c9c251c2db0930c0c7fb6b boost-176.patch " diff --git a/community/ledger/boost-176.patch b/community/ledger/boost-176.patch deleted file mode 100644 index 8032625b242..00000000000 --- a/community/ledger/boost-176.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/expr.cc b/src/expr.cc -index c8945d3..ad2589a 100644 ---- a/src/expr.cc -+++ b/src/expr.cc -@@ -278,7 +278,7 @@ value_t expr_value(expr_t::ptr_op_t op) - value_t source_command(call_scope_t& args) - { - std::istream * in = NULL; -- scoped_ptr<ifstream> stream; -+ std::unique_ptr<ifstream> stream; - string pathname; - - if (args.has(0)) { -diff --git a/src/format.h b/src/format.h -index 15431cf..57f3650 100644 ---- a/src/format.h -+++ b/src/format.h -@@ -65,7 +65,7 @@ class format_t : public expr_base_t<string>, public noncopyable - std::size_t min_width; - std::size_t max_width; - variant<string, expr_t> data; -- scoped_ptr<struct element_t> next; -+ std::unique_ptr<struct element_t> next; - - element_t() throw() - : supports_flags<>(), type(STRING), min_width(0), max_width(0) { -@@ -103,7 +103,7 @@ class format_t : public expr_base_t<string>, public noncopyable - void dump(std::ostream& out) const; - }; - -- scoped_ptr<element_t> elements; -+ std::unique_ptr<element_t> elements; - - public: - static enum elision_style_t { diff --git a/community/lib2geom/APKBUILD b/community/lib2geom/APKBUILD index 1ccefb4b197..78805b460e5 100644 --- a/community/lib2geom/APKBUILD +++ b/community/lib2geom/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=lib2geom pkgver=1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Easy to use 2D geometry library for c++" url="https://gitlab.com/inkscape/lib2geom" arch="all" diff --git a/community/libaec/APKBUILD b/community/libaec/APKBUILD index 44459f0cba6..7aa5feb9190 100644 --- a/community/libaec/APKBUILD +++ b/community/libaec/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=libaec -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=0 pkgdesc="Adaptive Entropy Coding library" url="https://gitlab.dkrz.de/k202009/libaec" @@ -21,7 +21,7 @@ builddir=$srcdir/$pkgname-v$pkgver build() { if [ "$CBUILD" != "$CHOST" ]; then - CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + local crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -29,7 +29,7 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_C_FLAGS="$CFLAGS" \ - $CMAKE_CROSSOPTS + $crossopts cmake --build build } @@ -57,5 +57,5 @@ libsz() { } sha512sums=" -9fa83f8bb9d2ec70a87800cf900918cdef73a91b0a484ba929c3ec58a553100a034b4ff26e0a8c4646ae17ac4439af6a5178f634e8cce11ff5a038d4b8cf77ea libaec-1.1.2.tar.gz +6f317d08ad7d003bc6664da147321eb87c924978f32bd28780a8ebf015e251019046b0cb16b78e776cd1957a7701215667f64686efb8e5c6bae7c08528cede56 libaec-1.1.3.tar.gz " diff --git a/community/libapk-qt/APKBUILD b/community/libapk-qt/APKBUILD index 0aa2f14ca1e..e11f845716e 100644 --- a/community/libapk-qt/APKBUILD +++ b/community/libapk-qt/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Alexey Minnekhanov <alexeymin@postmarketos.org> pkgname=libapk-qt -pkgver=0.4.5 +pkgver=0.4.6 pkgrel=0 pkgdesc="Alpine Package Keeper (apk) Qt bindings" url="https://gitlab.com/postmarketOS/libapk-qt" @@ -35,5 +35,5 @@ package() { } sha512sums=" -ac1ef0d5f8fd9d7499bc556b9078af9df37824695cc4d03e897f47fe84a92a55305972f84b023e2fbfaee65869481d16360ef8da801e0579e0d2549c04b764c6 libapk-qt-v0.4.5.tar.gz +51f5748e24a15da11a6904f30ba940cfb03aa5ff12662e3481bffe6e0d2f40fee5ab3c714444de1907ebf6c5ca42210584f223bf2fc6a7da6f28edb4d18ede52 libapk-qt-v0.4.6.tar.gz " diff --git a/community/libcamera/APKBUILD b/community/libcamera/APKBUILD index 443b423c565..a4579b5a921 100644 --- a/community/libcamera/APKBUILD +++ b/community/libcamera/APKBUILD @@ -55,7 +55,7 @@ arm*|aarch64) esac case "$CARCH" in -ppc64le|s390x|riscv64) +ppc64le|s390x|riscv64|loongarch64) # doesn't install any ipa ;; *) diff --git a/community/libcdio/APKBUILD b/community/libcdio/APKBUILD index 606dce59dbf..d627e38aa06 100644 --- a/community/libcdio/APKBUILD +++ b/community/libcdio/APKBUILD @@ -15,6 +15,11 @@ source="https://ftp.gnu.org/gnu/libcdio/libcdio-$pkgver.tar.bz2 format-security.patch " +prepare(){ + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/libcdr/APKBUILD b/community/libcdr/APKBUILD index 449e66db3ac..df4d76dc3a3 100644 --- a/community/libcdr/APKBUILD +++ b/community/libcdr/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libcdr pkgver=0.1.7 -pkgrel=12 +pkgrel=13 pkgdesc="Import filter and tools for Corel DRAW files" url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" arch="all" diff --git a/community/libcmis/APKBUILD b/community/libcmis/APKBUILD index 4b7fdc04e90..f771774e791 100644 --- a/community/libcmis/APKBUILD +++ b/community/libcmis/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libcmis pkgver=0.5.2 -pkgrel=11 +pkgrel=12 pkgdesc="CMIS protocol client library" url="https://github.com/tdf/libcmis" arch="all" diff --git a/community/libdovi/APKBUILD b/community/libdovi/APKBUILD index 2c34a9e86be..951f524e354 100644 --- a/community/libdovi/APKBUILD +++ b/community/libdovi/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Krassy Boykinov <kboykinov@teamcentrixx.com> pkgname=libdovi -pkgver=3.2.0 -pkgrel=1 +pkgver=3.3.0 +pkgrel=0 pkgdesc="Library to read & write Dolby Vision metadata" url="https://github.com/quietvoid/dovi_tool" arch="all" @@ -11,7 +11,7 @@ makedepends=" cargo-auditable cargo-c " -subpackages="$pkgname-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/quietvoid/dovi_tool/archive/refs/tags/libdovi-$pkgver.tar.gz" builddir="$srcdir/dovi_tool-libdovi-$pkgver" options="net" # cargo @@ -43,8 +43,10 @@ package() { --destdir "$pkgdir" \ --library-type cdylib \ --manifest-path dolby_vision/Cargo.toml + + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } sha512sums=" -9388a076e1396fb11aea4382eb9f28bf0ee4c0bc0ce9cc857a3ae138b8169c3d60657f128ee0261570d5de680af2b92dcde25442407a5c4580c51c2cce7ba47b libdovi-3.2.0.tar.gz +f4d183305aee54aeaf2226b7f2848a81c0f99fe0368dcae09eb92b65dd85496b05ffb6d44ce16e04fab03a7a408de8f53c4654f67b286260c2c574f2d5afb579 libdovi-3.3.0.tar.gz " diff --git a/community/libdvdnav/APKBUILD b/community/libdvdnav/APKBUILD index 812d22afa49..5630175a27d 100644 --- a/community/libdvdnav/APKBUILD +++ b/community/libdvdnav/APKBUILD @@ -11,6 +11,11 @@ makedepends="libdvdread-dev>=5.0.3" subpackages="$pkgname-dev $pkgname-doc" source="https://download.videolan.org/pub/videolan/libdvdnav/$pkgver/libdvdnav-$pkgver.tar.bz2" +prepare(){ + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/libe-book/APKBUILD b/community/libe-book/APKBUILD index 1664ebaf76f..fe8f0869de9 100644 --- a/community/libe-book/APKBUILD +++ b/community/libe-book/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libe-book pkgver=0.1.3 -pkgrel=23 +pkgrel=24 pkgdesc="Import filter and tools for various ebook formats" url="https://sourceforge.net/projects/libebook/" arch="all" diff --git a/community/libei/APKBUILD b/community/libei/APKBUILD index ae36578fa64..2eae36003fe 100644 --- a/community/libei/APKBUILD +++ b/community/libei/APKBUILD @@ -30,6 +30,7 @@ subpackages=" " source="https://gitlab.freedesktop.org/libinput/libei/-/archive/$pkgver/libei-$pkgver.tar.bz2 munit-$_munit.tar.gz::https://github.com/nemequ/munit/archive/$_munit.tar.gz + test-Raise-SIGALARM-interval-to-50.patch " prepare() { @@ -71,4 +72,5 @@ utils() { sha512sums=" ac8e32a381b9555a6b9becab9217a323d79aeba4b3f11e1dbba9f876d566f232f41d0f299f8cb8e5de6707d0dd91e93872edd81532c971e35d1cf33f9f9063b4 libei-1.2.1.tar.bz2 26b5599fd12be627a692823ebf496fa446be7ed04a1233fb42e0667c05109b0f804f76646e289ac660fc815baf45f77ec8caf0ff2ea7fb0b4f87f0038a2b971c munit-fbbdf1467eb0d04a6ee465def2e529e4c87f2118.tar.gz +56a0f1fb0a71a547f131d6daf4d092212b6f5d8458e122472d41196603baefa0a7c544a9d0625bf12ca8dd874c7355842b41ecad0bd968f4d4761b7b869f4890 test-Raise-SIGALARM-interval-to-50.patch " diff --git a/community/libei/test-Raise-SIGALARM-interval-to-50.patch b/community/libei/test-Raise-SIGALARM-interval-to-50.patch new file mode 100644 index 00000000000..7ba68184893 --- /dev/null +++ b/community/libei/test-Raise-SIGALARM-interval-to-50.patch @@ -0,0 +1,41 @@ +From 33b4a6199535868dba8446e5191223e83ea3fe0f Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Mon, 8 Apr 2024 12:14:00 -0400 +Subject: [PATCH] =?UTF-8?q?test:=20Raise=20SIGALRM=20interval=20to=2050?= + =?UTF-8?q?=C2=B5s?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On some platforms, an interval of 5µs is short enough that the test +spends its time almost exclusively processing SIGALRMs and never +progresses otherwise. Raising the interval to 50µs allows the test to +pass in a fraction of a second. + +Bug: https://bugs.gentoo.org/916777 +Closes: https://gitlab.freedesktop.org/libinput/libei/-/issues/50 +--- + test/eierpecken.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/eierpecken.c b/test/eierpecken.c +index 2f2e225d..7eb60ce1 100644 +--- a/test/eierpecken.c ++++ b/test/eierpecken.c +@@ -521,11 +521,11 @@ new_context(enum peck_ei_mode ei_mode) + struct itimerval timer = { + .it_interval = { + .tv_sec = 0, +- .tv_usec = 5, ++ .tv_usec = 50, + }, + .it_value = { + .tv_sec = 0, +- .tv_usec = 5, ++ .tv_usec = 50, + } + }; + rc = xerrno(setitimer(ITIMER_REAL, &timer, 0)); +-- +GitLab + diff --git a/community/libetonyek/APKBUILD b/community/libetonyek/APKBUILD index de621b37f89..d35b2a6591f 100644 --- a/community/libetonyek/APKBUILD +++ b/community/libetonyek/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libetonyek pkgver=0.1.10 -pkgrel=9 +pkgrel=10 pkgdesc="Import filter and tools for Apple Keynote presentations" url="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek" arch="all" diff --git a/community/libfprint/APKBUILD b/community/libfprint/APKBUILD index 762914bb7a2..9c37ac6c213 100644 --- a/community/libfprint/APKBUILD +++ b/community/libfprint/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libfprint -pkgver=1.94.6 +pkgver=1.94.7 pkgrel=0 pkgdesc="Library for fingerprint readers" url="https://fprint.freedesktop.org/" @@ -25,7 +25,6 @@ checkdepends=" " subpackages="$pkgname-dev" source="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v$pkgver/libfprint-v$pkgver.tar.gz - tests-mktemp-compat.patch hack-generate-rules-instead-of-hwdb.patch " builddir="$srcdir/$pkgname-v$pkgver" @@ -56,7 +55,6 @@ package() { } sha512sums=" -99cfce5828d7df771bfc1fd92ad357b76c265bc96443af3398c415d2bb54a931fa3018811c59ceb62b43ef416b430db4acf324aa1dca4f374eaef1f1595a154a libfprint-v1.94.6.tar.gz -7c9eb1dd3b1de5549b5b178f0b3251d5cbe253f2c71c86071c9fcdea0358478bb6ab0fd1488466434021c52d7df746af135b837b965faf4b7d2e245b9d773e2d tests-mktemp-compat.patch +5e7afc8424862d2caaba9d6c2dbd0a339639497ddb7b096f1073464ebdfd9acec1b84470297bd51761dae4770d4113e336096536bb5f8700da2673a2685856b6 libfprint-v1.94.7.tar.gz 5997cb0e3bfc0f625a0803d2d59fa55ce34baf7aee7c4fb3d82c74ea680d916a4e1294bbaf97a4567053672f1115d51f2a8b887927af063e2750e6a0e40d8d64 hack-generate-rules-instead-of-hwdb.patch " diff --git a/community/libfprint/tests-mktemp-compat.patch b/community/libfprint/tests-mktemp-compat.patch deleted file mode 100644 index 0c8422f2da7..00000000000 --- a/community/libfprint/tests-mktemp-compat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tests/test-generated-hwdb.sh -+++ b/tests/test-generated-hwdb.sh -@@ -4,7 +4,7 @@ - [ -x "$UDEV_HWDB" ] || exit 1 - - if [ "$UDEV_HWDB_CHECK_CONTENTS" == 1 ]; then -- generated_rules=$(mktemp "${TMPDIR:-/tmp}/libfprint-XXXXXX.hwdb") -+ generated_rules=$(mktemp "${TMPDIR:-/tmp}/libfprint.hwdb.XXXXXX") - else - generated_rules=/dev/null - fi diff --git a/community/libgbinder/APKBUILD b/community/libgbinder/APKBUILD index a11bcdf51ee..05bad69597b 100644 --- a/community/libgbinder/APKBUILD +++ b/community/libgbinder/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=libgbinder -pkgver=1.1.38 +pkgver=1.1.39 pkgrel=0 pkgdesc="GLib-style interface to binder" url="https://github.com/mer-hybris/libgbinder" @@ -40,5 +40,5 @@ tools() { } sha512sums=" -610dbe962287278de0e3549b4f7d15f6af0017afa0da356f6a72550c8d5c9925960527a30fd4d4e66c64f9cfd63915ba60b990220e350fee935bef5bf5a17710 libgbinder-1.1.38.tar.gz +ce6b1ec2c18a0d3da3f6a2e76acdf879163a8123207c1814362b8e5c0c8c592a1e9f9d378c44f3b29d6feaf4671dce3b37d06dd1c64b9ec9198a579e131146c5 libgbinder-1.1.39.tar.gz " diff --git a/community/libgeotiff/APKBUILD b/community/libgeotiff/APKBUILD index 6911f71afe0..e85f938c856 100644 --- a/community/libgeotiff/APKBUILD +++ b/community/libgeotiff/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bradley J Chambers <brad.chambers@gmail.com> pkgname=libgeotiff pkgver=1.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="TIFF based interchange format for georeferenced raster imagery" url="https://trac.osgeo.org/geotiff" arch="all" diff --git a/community/libglibutil/APKBUILD b/community/libglibutil/APKBUILD index 2a69597aa3a..9f2777631e5 100644 --- a/community/libglibutil/APKBUILD +++ b/community/libglibutil/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Danct12 <danct12@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=libglibutil -pkgver=1.0.77 +pkgver=1.0.79 pkgrel=0 pkgdesc="Library of glib utilities" url="https://github.com/sailfishos/libglibutil" @@ -25,5 +25,5 @@ package() { } sha512sums=" -3532a484e7c1ddd9b3ec8cb54a9c6d2fb6db0a413841c90139583a7ec9b873af1c4fc276a3f786042804f0f2159418ac213350dae7a1ed5a23cc31cb47e2dcd8 libglibutil-1.0.77.tar.gz +ee0b72d859702c142d86a3147fe5fca48ea0296c5aaf63f355fd7f46eaae027481ad1de3a6ebb7c41205ea1a586f0ccfd8fe41b6d3bf6111fa613df69173e3dc libglibutil-1.0.79.tar.gz " diff --git a/community/libgnt/APKBUILD b/community/libgnt/APKBUILD index 37aa57da196..d5b1fd6f6bb 100644 --- a/community/libgnt/APKBUILD +++ b/community/libgnt/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=libgnt -pkgver=2.14.3 -pkgrel=3 +pkgver=2.14.4 +pkgrel=0 pkgdesc="glib ncurses toolkit" url="https://keep.imfreedom.org/libgnt/libgnt" arch="all" license="GPL-2.0-or-later" makedepends="meson glib-dev libxml2-dev ncurses-dev gtk-doc" subpackages="$pkgname-dev $pkgname-doc" -source="https://downloads.sourceforge.net/project/pidgin/libgnt/$pkgver/libgnt-$pkgver.tar.xz" +source="https://downloads.sourceforge.net/project/pidgin/libgnt/$pkgver/libgnt-$pkgver-dev.tar.xz" +builddir="$srcdir/$pkgname-$pkgver-dev" build() { abuild-meson -Dpython2=false . output @@ -25,5 +26,5 @@ package() { } sha512sums=" -7131834cfe585177865bebf26167de08a04fced3da4e9a072d9b09b3becd1194914757b1a1fc8f129ae6c8fefe3ec1ce0d80d6c50cb624a5698b66ee2e06c6c8 libgnt-2.14.3.tar.xz +2ed27d47adf3939fdba1cfe7cb80b3895f66dd5ee2aec81b6dc66ed23cf5a045fbf20b5e01af3964332621f4f2f172b4c2bc06db2907ac786d2ec32920bcf175 libgnt-2.14.4-dev.tar.xz " diff --git a/community/libgravatar/APKBUILD b/community/libgravatar/APKBUILD index f7ba94292b5..1d632d848d1 100644 --- a/community/libgravatar/APKBUILD +++ b/community/libgravatar/APKBUILD @@ -8,8 +8,8 @@ pkgver=24.02.2 pkgrel=0 pkgdesc="KDE PIM library providing Gravatar support" # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -> pimcommon -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt6-qtwebengine -> pimcommon +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kontact.kde.org/" license="LGPL-2.0-or-later" depends_dev=" diff --git a/community/libgusb/APKBUILD b/community/libgusb/APKBUILD index a525513a8fc..0498dd5bc6d 100644 --- a/community/libgusb/APKBUILD +++ b/community/libgusb/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=libgusb -pkgver=0.4.8 -pkgrel=1 +pkgver=0.4.9 +pkgrel=0 pkgdesc="GLib wrapper around libusb" url="https://github.com/hughsie/libgusb" arch="all" @@ -46,5 +46,5 @@ utils() { } sha512sums=" -c88b407dfb58c8df7a4f7913869388d9065955bce355b5035ef61cc44ee5ef85a102b4018093a3d83b602b82065b8af1022fae74048fd246503ffcd70f2181d9 libgusb-0.4.8.tar.gz +22cce771c488963ea078cf2914b4e731afa9a7babb94570c9412147e6a3af142deac41b9a7a80cdf74960f9001bb30312923d53e0f96eb15bf99e96207b047d4 libgusb-0.4.9.tar.gz " diff --git a/community/libhandy/APKBUILD b/community/libhandy/APKBUILD deleted file mode 100644 index 18219918404..00000000000 --- a/community/libhandy/APKBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Contributor: Rasmus Thomsen <oss@cogitri.dev> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=libhandy -pkgver=0.0.13 -pkgrel=6 -pkgdesc="Library full of GTK+ widgets for mobile phones" -url="https://source.puri.sm/Librem5/libhandy" -arch="all" -license="LGPL-2.0-or-later" -makedepends="meson glib-dev gtk+3.0-dev vala py3-setuptools gobject-introspection-dev" -checkdepends="xvfb-run ibus" -subpackages="$pkgname-dev" -source="https://source.puri.sm/Librem5/libhandy/-/archive/v$pkgver/libhandy-v$pkgver.tar.gz - skip-test.patch - " -builddir="$srcdir/$pkgname-v$pkgver" - -build() { - abuild-meson \ - -Dexamples=true \ - . output - meson compile -C output -} - -check() { - xvfb-run meson test --no-rebuild --print-errorlogs -C output -} - -package() { - DESTDIR="$pkgdir" meson install --no-rebuild -C output -} - -dev() { - default_dev - - mkdir -p "$subpkgdir"/usr - mv "$pkgdir"/usr/bin "$subpkgdir"/usr -} - -sha512sums=" -b9eaef775a93c200aa3f526b627827ed4530ff2a4c826ab24abdbd944075c0939232bd2c3388b8b8e34c6729cb11017a7af2bd3ff9eec78fbdc7e7dd9f11d24b libhandy-v0.0.13.tar.gz -699b17da5aa1a0bff9bbaf962d84edcc80fba21130cf9f12cff004d84c6cd182a44c462acebf9ce4cddf26da61484f85985a94eb7812fe2d3639625182f41bb4 skip-test.patch -" diff --git a/community/libhandy/skip-test.patch b/community/libhandy/skip-test.patch deleted file mode 100644 index 370905f8dda..00000000000 --- a/community/libhandy/skip-test.patch +++ /dev/null @@ -1,20 +0,0 @@ -Skip test that uses IBus, since it tries to access /var/lib/dbus/machine-id which doesn't exist on the system. - -diff --git a/tests/meson.build b/tests/meson.build -index b814d59..bf30b96 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -28,13 +28,10 @@ test_names = [ - 'test-expander-row', - 'test-header-bar', - 'test-header-group', -- 'test-keypad', - 'test-paginator', - 'test-preferences-group', - 'test-preferences-page', - 'test-preferences-row', -- 'test-preferences-window', -- 'test-search-bar', - 'test-squeezer', - 'test-string-utf8', - 'test-swipe-group', diff --git a/community/libharu/APKBUILD b/community/libharu/APKBUILD index f8f22644a39..d6f4ef9bc88 100644 --- a/community/libharu/APKBUILD +++ b/community/libharu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=libharu -pkgver=2.4.3 +pkgver=2.4.4 pkgrel=0 pkgdesc="C library for generating PDF documents" url="https://github.com/libharu/libharu" @@ -10,9 +10,7 @@ license="custom" depends_dev="libpng-dev" makedepends="$depends_dev cmake samurai" subpackages="$pkgname-dev $pkgname-doc" -source="https://github.com/libharu/libharu/archive/v$pkgver/libharu-$pkgver.tar.gz - soversion.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/libharu/libharu/archive/refs/tags/v$pkgver.tar.gz" options="!check" # no tests build() { @@ -34,6 +32,5 @@ package() { } sha512sums=" -4b01dd0d23bdcaec6f69fe5f059902e7f49eafdf19d53d4cce8b4d52a54b2057b764de29390f4da9e75aeb32cb6af8606b23478b04edf9f7dcb1e4b769c5fff2 libharu-2.4.3.tar.gz -8e65e377c17a6c2471c1302ff3be9f1e685ae5a63e202aff16006e2560046603e770a640f4b0f25046573e54e75142b7546393bd0cfa4e9da38e9aa3053f848d soversion.patch +422210b09f89643cb25808559aeea109db5cce8a71c779d51f87222cdd50434f4f0f92322ebe429fca8f85ad73592bcabb14c3e36cd0bea19b6ec4c729220522 libharu-2.4.4.tar.gz " diff --git a/community/libharu/soversion.patch b/community/libharu/soversion.patch deleted file mode 100644 index 6ce3864ff02..00000000000 --- a/community/libharu/soversion.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b87af66..b919df9 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -73,6 +73,10 @@ set( - # create hpdf library - # ======================================================================= - add_library(hpdf ${LIBHPDF_SRCS}) -+set_target_properties(hpdf PROPERTIES -+ VERSION ${CMAKE_PROJECT_VERSION} -+ SOVERSION ${CMAKE_PROJECT_VERSION} -+) - if (PNG_FOUND) - include_directories (${PNG_INCLUDE_DIRS}) - target_link_libraries (hpdf ${PNG_LIBRARIES}) diff --git a/community/libhtp/APKBUILD b/community/libhtp/APKBUILD index 9cac2bb9931..09d925bb4b1 100644 --- a/community/libhtp/APKBUILD +++ b/community/libhtp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Steve McMaster <code@mcmaster.io> # Maintainer: Steve McMaster <code@mcmaster.io> pkgname=libhtp -pkgver=0.5.47 +pkgver=0.5.48 pkgrel=0 pkgdesc="HTTP normalizer and parser library" url="https://github.com/OISF/libhtp" @@ -38,5 +38,5 @@ check() { } sha512sums=" -b7f942eee7125d6874bedb1c347a97b856f4f8f318553959e52500b16c7f3c0e22c3369419a7318aaf7f55bfe05efe9ea652009e7ac1548a759c7c41ca0af546 libhtp-0.5.47.tar.gz +1270d560bcb03493afebbb9198cef669d03d347f4878635119ee845dc734cec28789ea4385ca5903b2545e250152d0278ea077641702ae0973005593f241776b libhtp-0.5.48.tar.gz " diff --git a/testing/libindi/0001-explicitly-include-sockets.h.patch b/community/libindi/0001-explicitly-include-sockets.h.patch index 9737b23ef0d..9737b23ef0d 100644 --- a/testing/libindi/0001-explicitly-include-sockets.h.patch +++ b/community/libindi/0001-explicitly-include-sockets.h.patch diff --git a/testing/libindi/APKBUILD b/community/libindi/APKBUILD index 3dea02406d0..3dea02406d0 100644 --- a/testing/libindi/APKBUILD +++ b/community/libindi/APKBUILD diff --git a/community/libixion/APKBUILD b/community/libixion/APKBUILD index 2135a8b73ef..e8ce50f0af8 100644 --- a/community/libixion/APKBUILD +++ b/community/libixion/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libixion pkgver=0.19.0 -pkgrel=0 +pkgrel=1 pkgdesc="A general purpose formula parser & interpreter" url="https://gitlab.com/ixion/ixion" arch="all" diff --git a/community/libjxl/APKBUILD b/community/libjxl/APKBUILD index 0d49e76f0a0..86eee0aff61 100644 --- a/community/libjxl/APKBUILD +++ b/community/libjxl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Alex Xu (Hello71) <alex_y_xu@yahoo.ca> pkgname=libjxl -pkgver=0.9.1 +pkgver=0.10.2 pkgrel=0 _testdata_commit=873045a9c42ed60721756e26e2a6b32e17415205 pkgdesc="JPEG XL image format reference implementation" @@ -51,8 +51,8 @@ build() { ;; *) # fails on riscv - CFLAGS="$CFLAGS -flto=thin" - CXXFLAGS="$CXXFLAGS -flto=thin" + export CFLAGS="$CFLAGS -flto=thin" + export CXXFLAGS="$CXXFLAGS -flto=thin" export CC=clang export CXX=clang++ export LDFLAGS="$LDFLAGS -fuse-ld=lld" @@ -76,8 +76,6 @@ build() { -DJPEGXL_FORCE_SYSTEM_GTEST=ON \ -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \ -DJPEGXL_FORCE_SYSTEM_HWY=ON - # workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25526 - mkdir build/lib/CMakeFiles/jxl_export.dir cmake --build build } @@ -105,7 +103,7 @@ loader() { } sha512sums=" -a3169dac40b297617075a49cc5cdfa25e793a34b5dfe95db9c2560bdc967743882f0014d1d0fd508b8d2ea02cb3766d2f295af7a2cf9def8f5370f97b24aa16f libjxl-v0.9.1.tar.gz +1d19f30c0ae94e212326a15dc128612bce207e619c55c2a020401a27d01a933de71bb35e907521dc8fd853dd5578d74d74f7a5a282f0083fd22cf9cb07ccb96e libjxl-v0.10.2.tar.gz 31bfccc8421e98cb80cea111ead0ea7d14016c77ad10fd804d783419e61892257688e1fcf89f956166e3242b522349ad22da985b96a9d3129c66be2aa60793b6 libjxl-testdata-873045a9c42ed60721756e26e2a6b32e17415205.tar.gz 93911a350d1515d9ea9a3c2ee1e1f4c6a6daa702ebd551c1a193bda1f8dea70cbe3ecfd1bdee2fc812cb2ea1c10195870ed0e447f557dc09e7c8a55466199646 no-werror.patch " diff --git a/community/libkiwix/APKBUILD b/community/libkiwix/APKBUILD index 1a9f55944d5..cff8775c39a 100644 --- a/community/libkiwix/APKBUILD +++ b/community/libkiwix/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Thomas Kienlen <kommander@laposte.net> # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=libkiwix -pkgver=12.1.0 -pkgrel=3 +pkgver=13.1.0 +pkgrel=0 pkgdesc="Common code base for all Kiwix ports" url="https://github.com/kiwix/libkiwix" license="GPL-3.0-or-later" @@ -21,9 +21,7 @@ makedepends=" samurai xapian-core-dev " -source="$pkgname-$pkgver.tar.gz::https://github.com/kiwix/libkiwix/archive/$pkgver.tar.gz - fix-build.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/kiwix/libkiwix/archive/$pkgver.tar.gz" subpackages="$pkgname-dev $pkgname-doc" replaces="kiwix-lib" # for backward compatibility provides="kiwix-lib=$pkgver-r$pkgrel" # for backward compatibility @@ -42,6 +40,5 @@ package() { } sha512sums=" -9d4df7e46693a5aec545087ce37a2e83dfa3173a98e9d64cbbf364e1fd31143c30e856973cf12b0a2f608661d78a9453d8b748680c01f48e1df375c7b2b909d5 libkiwix-12.1.0.tar.gz -428c1865dcb35d572b34187b63234bc1ee72672259218a8d7e19b60a96953e1ef5392fd3d106f2bbf77bc405fb13106794acb8ce566695744f826a9b0fef8450 fix-build.patch +f1ecd14117e6805011dbcc3ec682ea330194433587224f2cc0874d6c9534d948fa1514d9c6c311c022372ab43456e3f5f1bdbf0fb0ef562fcfcfe20696048ade libkiwix-13.1.0.tar.gz " diff --git a/community/libkiwix/fix-build.patch b/community/libkiwix/fix-build.patch deleted file mode 100644 index 3f876a4cdf3..00000000000 --- a/community/libkiwix/fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index d3927e4..cbb936f 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,7 +1,7 @@ - project('libkiwix', 'cpp', - version : '12.0.0', - license : 'GPLv3+', -- default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true']) -+ default_options : ['c_std=c11', 'cpp_std=c++14']) - - compiler = meson.get_compiler('cpp') - diff --git a/community/libkleo/APKBUILD b/community/libkleo/APKBUILD index 733b477d3c7..16471518d39 100644 --- a/community/libkleo/APKBUILD +++ b/community/libkleo/APKBUILD @@ -5,7 +5,7 @@ # group=kde-applications pkgname=libkleo pkgver=24.02.2 -pkgrel=0 +pkgrel=1 pkgdesc="KDE PIM cryptographic library" # armhf blocked by extra-cmake-modules arch="all !armhf" diff --git a/community/libkml/APKBUILD b/community/libkml/APKBUILD index 337360a88c2..d9679d764e8 100644 --- a/community/libkml/APKBUILD +++ b/community/libkml/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=libkml pkgver=1.3.0 -pkgrel=8 +pkgrel=10 pkgdesc="Reference implementation of OGC KML 2.2" url="https://github.com/libkml/libkml" arch="all" diff --git a/community/libkscreen/APKBUILD b/community/libkscreen/APKBUILD index 9fd6c4c2ed0..7f5eea77be1 100644 --- a/community/libkscreen/APKBUILD +++ b/community/libkscreen/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=libkscreen -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="KDE screen management software" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -58,5 +58,5 @@ package() { } sha512sums=" -b1736b7fce203a577d12a2b3172f9793bc6e59782e1dfc61c24a52091ef902f7334d7bfd652fb15f3135e568914488ea7ba2bb165e35ead3e193813b6373a0b9 libkscreen-6.0.3.tar.xz +c448307cd2fdf01b594232675e45feb3bd8722e3c17fca012af0152a82f0fe6a5a5a30c1b4b5cf94aa821a029d5e6f88c76d9606418306a30b3d2660e494e584 libkscreen-6.0.4.tar.xz " diff --git a/community/libksieve/APKBUILD b/community/libksieve/APKBUILD index 4eeea057112..ee5d38eebb6 100644 --- a/community/libksieve/APKBUILD +++ b/community/libksieve/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 pkgdesc="KDE PIM library for managing sieves" # armhf blocked by extra-cmake-modules # armv7, ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -arch="all !armv7 !armhf !ppc64le !s390x !riscv64" +# loongarch64 blocked by pimcommon +arch="all !armv7 !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kontact.kde.org/" license="GPL-2.0-only" depends_dev=" diff --git a/community/libksysguard/APKBUILD b/community/libksysguard/APKBUILD index ed415c143e2..45349eabddc 100644 --- a/community/libksysguard/APKBUILD +++ b/community/libksysguard/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=libksysguard -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="KDE system monitor library" # armhf blocked by extra-cmake-modules @@ -67,5 +67,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -fa8dc56a5708a45edcb0be958eeac4f5153ef0c58d00e5a545574f8bd7cf428754becd724dbac61ad0cd8089d26769e9386bc40493edc4fd2776e6f895773f6d libksysguard-6.0.3.tar.xz +eda6a98679fe607c0593c6cf19da451e3f051f82a18982fe5f70ff79aa25c0c47f1af661fe385b71730d8f46fa4ae91f717865f3123cd8e4ba4efa6c664e2b7c libksysguard-6.0.4.tar.xz " diff --git a/community/libktorrent/APKBUILD b/community/libktorrent/APKBUILD index 4f723c9f11f..d518e435ec8 100644 --- a/community/libktorrent/APKBUILD +++ b/community/libktorrent/APKBUILD @@ -5,7 +5,7 @@ # group=kde-applications pkgname=libktorrent pkgver=24.02.2 -pkgrel=0 +pkgrel=1 # armhf blocked by extra-cmake-modules arch="all !armhf" url="https://kde.org/applications/internet/org.kde.ktorrent" diff --git a/community/libmarisa/0001-Fix-detection-of-MARISA_WORD_SIZE.patch b/community/libmarisa/0001-Fix-detection-of-MARISA_WORD_SIZE.patch new file mode 100644 index 00000000000..344d9146710 --- /dev/null +++ b/community/libmarisa/0001-Fix-detection-of-MARISA_WORD_SIZE.patch @@ -0,0 +1,51 @@ +From 1e167755c04c4816b7c19a985301df81a5b511ca Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 24 Apr 2024 11:17:09 +0200 +Subject: [PATCH] Fix detection of MARISA_WORD_SIZE + +Detect the MARISA_WORD_SIZE independent of architecture. + +Fixes: https://github.com/s-yata/marisa-trie/issues/40 +Fixes: https://github.com/s-yata/marisa-trie/issues/57 +Fixes: https://github.com/s-yata/marisa-trie/pull/44 +Fixes: https://github.com/s-yata/marisa-trie/pull/46 +Fixes: https://github.com/s-yata/marisa-trie/pull/56 +--- + include/marisa/base.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/include/marisa/base.h b/include/marisa/base.h +index ffcdc5b..f8c0e1c 100644 +--- a/include/marisa/base.h ++++ b/include/marisa/base.h +@@ -1,6 +1,7 @@ + #ifndef MARISA_BASE_H_ + #define MARISA_BASE_H_ + ++#include <limits.h> + // Old Visual C++ does not provide stdint.h. + #ifndef _MSC_VER + #include <stdint.h> +@@ -28,14 +29,13 @@ typedef uint32_t marisa_uint32; + typedef uint64_t marisa_uint64; + #endif // _MSC_VER + +-#if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || \ +- defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || \ +- defined(__sparc64__) || defined(__mips64__) || defined(__aarch64__) || \ +- defined(__s390x__) ++#if (ULONG_MAX == 0xffffffffffffffff) + #define MARISA_WORD_SIZE 64 +-#else // defined(_WIN64), etc. ++#elif (ULONG_MAX == 0xffffffff) + #define MARISA_WORD_SIZE 32 +-#endif // defined(_WIN64), etc. ++#else ++ #error Failed to detect MARISA_WORD_SIZE ++#endif + + //#define MARISA_WORD_SIZE (sizeof(void *) * 8) + +-- +2.44.0 + diff --git a/community/libmarisa/APKBUILD b/community/libmarisa/APKBUILD index b557b4151a8..d3363d359b0 100644 --- a/community/libmarisa/APKBUILD +++ b/community/libmarisa/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Eric Tian <thxdaemon+gitlab.alpine@gmail.com> pkgname=libmarisa pkgver=0.2.6 -pkgrel=6 +pkgrel=7 pkgdesc="MARISA: Matching Algorithm with Recursively Implemented StorAge" url="https://github.com/s-yata/marisa-trie" arch="all" @@ -11,6 +11,7 @@ makedepends="autoconf automake libtool python3-dev swig py3-setuptools" subpackages="$pkgname-dev py3-marisa-pyc py3-marisa:py" source="$pkgname-$pkgver.tar.gz::https://github.com/s-yata/marisa-trie/archive/v$pkgver.tar.gz format-sec.patch + 0001-Fix-detection-of-MARISA_WORD_SIZE.patch " builddir="$srcdir/marisa-trie-$pkgver" @@ -61,4 +62,5 @@ py() { sha512sums=" c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d libmarisa-0.2.6.tar.gz 778486421fcda6fbbfb4c61b48ed64f1166ab937361098b405a798b88ce27ad2169c7a5be9d2e66de042bf5a65b5a332183a32a42fd31fbeecb679671c4ab929 format-sec.patch +0a65d6a9ee906be9cc8cefc160e7908280388490c66468e048e3d60f261b8787718a36f95d0d543731236c5c64b3985119cc4ba6e9deab28f0cf1492a3549d70 0001-Fix-detection-of-MARISA_WORD_SIZE.patch " diff --git a/community/libmediainfo/APKBUILD b/community/libmediainfo/APKBUILD index 1f27afab1f5..dc5ee0b64b1 100644 --- a/community/libmediainfo/APKBUILD +++ b/community/libmediainfo/APKBUILD @@ -15,7 +15,7 @@ # tfsxml | unknown | Source/ThirdParty/tfsxml pkgname=libmediainfo -pkgver=24.03 +pkgver=24.04 pkgrel=0 pkgdesc="Shared library for mediainfo" url="https://github.com/MediaArea/MediaInfoLib" @@ -57,5 +57,5 @@ package() { } sha512sums=" -d1a8b68f5c487a02e82f8363a0364f6d627b79d0ef03f86032d8e6e7f9d0ea77f16325b5148220282edcdded928c634c3c014912adb7901ebf95b87e7c93d26a libmediainfo_24.03.tar.xz +33b9f187571486f0d28eae932f7db0294f89bf2dfb3a9d4a5928502398b0b50bd3d9ce27dba5b5472d63839e844adfbb031ecff2f36e583975f2d2884af768b6 libmediainfo_24.04.tar.xz " diff --git a/community/libmspub/APKBUILD b/community/libmspub/APKBUILD index 2122b238c6f..d43497edb01 100644 --- a/community/libmspub/APKBUILD +++ b/community/libmspub/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libmspub pkgver=0.1.4 -pkgrel=20 +pkgrel=21 pkgdesc="Import filter and tools for MS Publisher files" url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub" arch="all" diff --git a/community/libmusicbrainz/APKBUILD b/community/libmusicbrainz/APKBUILD index f039a6a1769..b38d8bf2cb5 100644 --- a/community/libmusicbrainz/APKBUILD +++ b/community/libmusicbrainz/APKBUILD @@ -10,7 +10,9 @@ license="LGPL-2.1-or-later" makedepends="cmake neon-dev libxml2-dev" options="!check" # no tests subpackages="$pkgname-dev" -source="https://github.com/metabrainz/libmusicbrainz/releases/download/release-$pkgver/libmusicbrainz-$pkgver.tar.gz" +source="https://github.com/metabrainz/libmusicbrainz/releases/download/release-$pkgver/libmusicbrainz-$pkgver.tar.gz + libxml2.12.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -31,4 +33,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03 libmusicbrainz-5.1.0.tar.gz" +sha512sums=" +daa7ccb94e517e90f7d88a0659c84b00f04c6a73ef7771b7e3bd9101fa6569b1935a68a3689502ed0cc8c0d71ba9d2d0ebd9c074dd5eed9f75a3db390b222e03 libmusicbrainz-5.1.0.tar.gz +2e0c1abfac00e6712d8f6f0539a49ac6a8266c97cfe2570f84735986808020f5b3cd8ba42dd9e2b7743adaf672b11e0112e219fb0a44850d41dbc559a24ed40a libxml2.12.patch +" diff --git a/community/libmusicbrainz/libxml2.12.patch b/community/libmusicbrainz/libxml2.12.patch new file mode 100644 index 00000000000..211fdd3e5e5 --- /dev/null +++ b/community/libmusicbrainz/libxml2.12.patch @@ -0,0 +1,66 @@ +Patch-Source: https://github.com/metabrainz/libmusicbrainz/commit/4655b571a70d73d41467091f59c518517c956198.patch +-- +From 9ba00067a15479a52262a5126bcb6889da5884b7 Mon Sep 17 00:00:00 2001 +From: Christopher Degawa <ccom@randomderp.com> +Date: Sun, 8 Oct 2023 11:41:30 -0500 +Subject: [PATCH 1/2] libxml: include parser.h + +libxml2 removed the inclusion of global.h in a few of its include files, +so we can no longer rely on transitive includes. + +This applies to functions like xmlParseFile. + +Signed-off-by: Christopher Degawa <ccom@randomderp.com> +--- + src/xmlParser.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/xmlParser.cc b/src/xmlParser.cc +index e63df55..53dec25 100644 +--- a/src/xmlParser.cc ++++ b/src/xmlParser.cc +@@ -30,6 +30,7 @@ + + #include <cstring> + #include <libxml/tree.h> ++#include <libxml/parser.h> + + XMLResults::XMLResults() + : line(0), + +From 558c9ba0e6d702d5c877f75be98176f57abf1b02 Mon Sep 17 00:00:00 2001 +From: Christopher Degawa <ccom@randomderp.com> +Date: Sun, 8 Oct 2023 11:42:55 -0500 +Subject: [PATCH 2/2] libxml: constify the storage of xmlGetLastError() + +libxml2 recently made it a const return. +Since nothing is being modified of it, this should have no real effect +past satisfying the compiler. + +Signed-off-by: Christopher Degawa <ccom@randomderp.com> +--- + src/xmlParser.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/xmlParser.cc b/src/xmlParser.cc +index 53dec25..fee684c 100644 +--- a/src/xmlParser.cc ++++ b/src/xmlParser.cc +@@ -57,7 +57,7 @@ XMLNode *XMLRootNode::parseFile(const std::string &filename, XMLResults* results + + doc = xmlParseFile(filename.c_str()); + if ((doc == NULL) && (results != NULL)) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + results->message = error->message; + results->line = error->line; + results->code = error->code; +@@ -72,7 +72,7 @@ XMLNode *XMLRootNode::parseString(const std::string &xml, XMLResults* results) + + doc = xmlParseMemory(xml.c_str(), xml.length()); + if ((doc == NULL) && (results != NULL)) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + results->message = error->message; + results->line = error->line; + results->code = error->code; diff --git a/testing/libnova/0001-support-for-linux-musl.patch b/community/libnova/0001-support-for-linux-musl.patch index e3725c4d57c..e3725c4d57c 100644 --- a/testing/libnova/0001-support-for-linux-musl.patch +++ b/community/libnova/0001-support-for-linux-musl.patch diff --git a/testing/libnova/APKBUILD b/community/libnova/APKBUILD index 80ecd3013dd..80ecd3013dd 100644 --- a/testing/libnova/APKBUILD +++ b/community/libnova/APKBUILD diff --git a/community/libnpupnp/APKBUILD b/community/libnpupnp/APKBUILD index 4d17b263d5b..d0dd89a60a1 100644 --- a/community/libnpupnp/APKBUILD +++ b/community/libnpupnp/APKBUILD @@ -1,35 +1,31 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Sodface <sod@sodface.com> pkgname=libnpupnp -pkgver=6.1.1 +pkgver=6.1.2 pkgrel=0 pkgdesc="UPnP library based on libupnp, but extensively rewritten" url="https://www.lesbonscomptes.com/upmpdcli/npupnp-doc/libnpupnp.html" arch="all" +options="!check" # no test suite license="BSD-3-Clause" -makedepends="expat-dev curl-dev libmicrohttpd-dev" +makedepends=" + curl-dev + expat-dev + libmicrohttpd-dev + meson + " subpackages="$pkgname-dev" source="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-$pkgver.tar.gz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make -} - -check() { - make check + abuild-meson . output + meson compile -C output } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install --no-rebuild -C output } sha512sums=" -905c0dfc7f018a80380406682550271893d795a1964bb5e7c4a56c6934ce06b9b6e29a2c5a7a9c4bf1a5a2348637ad6af3fd99cd38d7bba9d935fdbec6a6dce5 libnpupnp-6.1.1.tar.gz +4ca4e56f896e21cd1a47de95e28b2b298b71c385c6ce9841d85c09ce3dd0387742b01ec11d65701ddeeee1f7b2cc9ed30127b53496910601a273f9c7663741b2 libnpupnp-6.1.2.tar.gz " diff --git a/community/libodfgen/APKBUILD b/community/libodfgen/APKBUILD index 158afc4e4ac..be0d5e8717a 100644 --- a/community/libodfgen/APKBUILD +++ b/community/libodfgen/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libodfgen pkgver=0.1.8 -pkgrel=7 +pkgrel=8 pkgdesc="Import filter and tools for Open Document Format" url="https://sourceforge.net/projects/libwpd/" arch="all" diff --git a/community/libodiosacd/APKBUILD b/community/libodiosacd/APKBUILD index c50e6f190a2..7aa1d0f8c58 100644 --- a/community/libodiosacd/APKBUILD +++ b/community/libodiosacd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sodface <sod@sodface.com> # Maintainer: Sodface <sod@sodface.com> pkgname=libodiosacd -pkgver=23.11.1 +pkgver=24.5.1 pkgrel=0 pkgdesc="SACD decoder library" url="https://tari.in/www/software/libodiosacd/" @@ -24,5 +24,5 @@ package() { } sha512sums=" -08279b4ea4509663cfb2f08042e63a2fb557f595728f0aa8b1c9696b7c8be3a684cc347d07d7cfda0cefe35ed87646c61b9239dddf3f6a00f65975329016209f libodiosacd-23.11.1.tar.gz +6ed8c81a0a0eb10f3af9d3fddc1243f377f442cc85ec667dc0c0909cbd28b7426a26da8a84280ea6480d040396c0943efc09cfda8e3c3d058e319a364dbf3086 libodiosacd-24.5.1.tar.gz " diff --git a/community/libopenraw/APKBUILD b/community/libopenraw/APKBUILD index 95510085f4a..2d54b5b9719 100644 --- a/community/libopenraw/APKBUILD +++ b/community/libopenraw/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Saijin-Naib <Saijin-Naib_package-maintenance@outlook.com> pkgname=libopenraw pkgver=0.3.7 -pkgrel=0 +pkgrel=1 pkgdesc="Desktop agnostic effort to support digital camera RAW files" url="https://libopenraw.freedesktop.org/" arch="all" @@ -26,7 +26,9 @@ prepare() { update_config_sub cd lib/mp4 - cargo vendor --config net.offline=false --locked + mv -v .cargo/config.toml .cargo/config.toml.temp + cargo vendor --locked + mv -v .cargo/config.toml.temp .cargo/config.toml } build() { diff --git a/community/liborcus/APKBUILD b/community/liborcus/APKBUILD index 85f3d36952b..8ee22ffdc2a 100644 --- a/community/liborcus/APKBUILD +++ b/community/liborcus/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=liborcus pkgver=0.19.1 -pkgrel=0 +pkgrel=1 pkgdesc="Library for processing spreadsheet documents" url="https://gitlab.com/orcus/orcus" arch="all" diff --git a/community/libosmium/APKBUILD b/community/libosmium/APKBUILD index e8f39a2f29f..31c3efa78ba 100644 --- a/community/libosmium/APKBUILD +++ b/community/libosmium/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sascha Brawer <sascha@brawer.ch> pkgname=libosmium pkgver=2.20.0 -pkgrel=0 +pkgrel=1 pkgdesc="Fast and flexible C++ library for working with OpenStreetMap data" url="https://github.com/osmcode/libosmium" arch="noarch" diff --git a/community/libpagemaker/APKBUILD b/community/libpagemaker/APKBUILD index cbaf69e2b65..14f26b52e42 100644 --- a/community/libpagemaker/APKBUILD +++ b/community/libpagemaker/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libpagemaker pkgver=0.0.4 -pkgrel=8 +pkgrel=9 pkgdesc="Import filter and tools for PageMaker" url="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker" arch="all" diff --git a/community/libphonenumber/APKBUILD b/community/libphonenumber/APKBUILD index 8d5ec175320..ead1b542227 100644 --- a/community/libphonenumber/APKBUILD +++ b/community/libphonenumber/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bhushan Shah <bshah@kde.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=libphonenumber -pkgver=8.13.32 +pkgver=8.13.36 pkgrel=0 pkgdesc="Library for parsing, formatting, and validating international phone numbers." url="https://github.com/google/libphonenumber" @@ -51,6 +51,6 @@ libgeocoding() { } sha512sums=" -91c8bba4750f4d2bc94b403e176a5ae5e40f8a9e4d6906b095eedb15c30671fcacd94df9c21e9ef0929ea21488f21f9e8011cf6386439ea556f5052a31f46fa9 libphonenumber-v8.13.32.tar.gz +1cbc5db517df1728afa6776dc9d0ee46cdb048405356d37f748054fb4844da083121233befa68aa7a87b496b82996efe33f20911815b449009a89e8741dce482 libphonenumber-v8.13.36.tar.gz 03c1eb32208a868bcacf92eb42b1f3f009bcc898fa6446594a3e79baadbef5fb53bbe829adfb7d0c8ebebdd37898c6686ff837320d258cd47ef5de7a6bf341bc system-abseil.patch " diff --git a/community/libplasma/APKBUILD b/community/libplasma/APKBUILD index c2dd99ac602..7be7170d702 100644 --- a/community/libplasma/APKBUILD +++ b/community/libplasma/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=libplasma -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Plasma library and runtime components based upon KDE Frameworks and Qt" # armhf blocked by qt6-qtdeclarative @@ -78,5 +78,5 @@ package() { } sha512sums=" -42a9d4637115a294f6783cecd23c5eba0a5b96215db37cf0d1a6f72862939b4c892fe688a0824220621345d80ccc665fce2a67076233e9a082e810c95000f8ef libplasma-6.0.3.tar.xz +afc4555b57fda20299a3a46560271590af69370eb11831d1246196c0f115215664181694efdf80cb5c0496385a9354bb3d6c4a68814d0235dee4afaaa468bd31 libplasma-6.0.4.tar.xz " diff --git a/community/libproxy/APKBUILD b/community/libproxy/APKBUILD index 6ba02e69a12..d7fbcae42d4 100644 --- a/community/libproxy/APKBUILD +++ b/community/libproxy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libproxy -pkgver=0.5.5 +pkgver=0.5.6 pkgrel=0 pkgdesc="Library handling all the details of proxy configuration" url="https://github.com/libproxy/libproxy" @@ -76,5 +76,5 @@ pacrunner() { } sha512sums=" -101139fe6972c9b8b46a8bc5f5cea807649ad21e201a9cd7d532d2145c34eadc861d8039fc8a2bf129f364ddc99ffb1324ab8f19bb0b4b9e52eb0f6bd703c8a8 libproxy-0.5.5.tar.gz +265272871d1d5de2f6b788cec796083856c5274b55c822a969c0d9ae1b1b9f4a6339648831979726416535271ddabc63348b6e8e6cbfe709069911985cb104bf libproxy-0.5.6.tar.gz " diff --git a/community/libquotient/APKBUILD b/community/libquotient/APKBUILD index baeb08eb93d..036fdcccaaf 100644 --- a/community/libquotient/APKBUILD +++ b/community/libquotient/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=libquotient -pkgver=0.8.1.2 +pkgver=0.8.2 pkgrel=0 pkgdesc="Qt library for cross-platform clients for Matrix" url="https://github.com/quotient-im/libQuotient" @@ -73,5 +73,5 @@ qt6() { } sha512sums=" -ff11f1e9093004461425179fcab630237bf1d28f6e5abe6486d657b455b560884047715fccff5b31f26275ffd423df787014aaac35c556eddb1842e8e68841ce libquotient-0.8.1.2.tar.gz +3d971439f8a89609930ca1648f6cf1bdb59f3ad492af1a15a7f8a13d06c81bd5bfffa1dd732ef5156fab8a9ea2ba3e98376bf76511db17bdeee17641a772b762 libquotient-0.8.2.tar.gz " diff --git a/community/libraw/APKBUILD b/community/libraw/APKBUILD index b60ec66e30c..196e3fcc86a 100644 --- a/community/libraw/APKBUILD +++ b/community/libraw/APKBUILD @@ -39,6 +39,11 @@ options="!check" # no tests # - CVE-2017-13735 # - CVE-2017-14265 +prepare(){ + default_prepare + update_config_sub +} + build() { # trading size for more speed CFLAGS="$CFLAGS -O3 -flto=auto" \ diff --git a/community/librdkafka/APKBUILD b/community/librdkafka/APKBUILD index a2183e63ab7..74846c4f172 100644 --- a/community/librdkafka/APKBUILD +++ b/community/librdkafka/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Mike Milner <milner@blissisland.ca> # Maintainer: John Anthony <john@jo.hnanthony.com> pkgname=librdkafka -pkgver=2.3.0 -pkgrel=1 +pkgver=2.4.0 +pkgrel=0 pkgdesc="The Apache Kafka C/C++ library" url="https://github.com/edenhill/librdkafka" arch="all" @@ -43,5 +43,5 @@ package() { } sha512sums=" -a68b7382ec5a9afc0eb8513e97d8563c599021d774f7790a61af80565600678a497e4957dcdd823f8b9a426a19b9c5392cacd42d02d70493d993319f3343fe96 librdkafka-2.3.0.tar.gz +26e8c4ca6c759109a69e4df8cbf35b24ce3d98a8bb10ff517a9045e8b94e1069126212ab0d6e92a6d47dd302ff9829822210ca20956bfd68233294fccc3a74af librdkafka-2.4.0.tar.gz " diff --git a/community/librem-ec/AKMBUILD b/community/librem-ec/AKMBUILD index 91cd633eb45..a23d93c7a81 100644 --- a/community/librem-ec/AKMBUILD +++ b/community/librem-ec/AKMBUILD @@ -1,5 +1,5 @@ modname=librem-ec-acpi -modver=0.91 +modver=0.92 built_modules='librem_ec_acpi.ko' build() { diff --git a/community/librem-ec/APKBUILD b/community/librem-ec/APKBUILD index bef56008ed2..7d8d6a20370 100644 --- a/community/librem-ec/APKBUILD +++ b/community/librem-ec/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=librem-ec -pkgver=0.9.1 -pkgrel=1 +pkgver=0.9.2 +pkgrel=0 pkgdesc="Librem laptop EC kernel module, with AKMS" url="https://source.puri.sm/nicole.faerber/librem-ec-acpi-dkms" arch="noarch" @@ -23,6 +23,6 @@ package() { } sha512sums=" -93ee26917eddbef9aa9c0eb83007452ebf57c279f41c3061ee52756bb1f748c72935067b19c3417ed7b8a9795990b0f060241c0b7f2348d7f8ec01e9f88dcd3c librem-ec-acpi-dkms-v0.9.1.tar.gz -ad3a7b3493e72b850092d540e57d541ba1fdf5f72f101fabc22e6790515ddfb95cdb3e7efa81fcdeffb2c0f0ecf412d28f509681ebd260aeeab22ee2b99cf32f AKMBUILD +b5d10fcf34a8b424138f9db1b06e916d809462ea55c7ca2565f13154da4fa49736ac95fb1b131c27ee49aa5f170f3e8a1a9c9a61c69e0364bcee37669759e8f6 librem-ec-acpi-dkms-v0.9.2.tar.gz +98278d791c5640be0c0e0d915f46a3136a386dcf2d4534c6c0d1b0315c40553e7a81a1a3f87ec954ea2f4c8747e3e77454ac4d3a6111cf9493327f8b3a93437e AKMBUILD " diff --git a/community/libreoffice/APKBUILD b/community/libreoffice/APKBUILD index 1f67a93c5c7..34c5201c45a 100644 --- a/community/libreoffice/APKBUILD +++ b/community/libreoffice/APKBUILD @@ -6,7 +6,7 @@ pkgname=libreoffice # supported for 6 months and fresh works perfectly okay for that, while being # more up to date and needing fewer dependency workarounds. pkgver=7.6.4.1 -pkgrel=3 +pkgrel=4 pkgdesc="LibreOffice - Meta package for the full office suite" url="https://www.libreoffice.org/" # missing openjdk17 on riscv64 diff --git a/community/libressl/APKBUILD b/community/libressl/APKBUILD index e2477ee647f..79292b87ed3 100644 --- a/community/libressl/APKBUILD +++ b/community/libressl/APKBUILD @@ -14,7 +14,7 @@ # - CVE-2017-8301 # pkgname=libressl -pkgver=3.8.2 +pkgver=3.8.4 _namever=${pkgname}${pkgver%.*} pkgrel=0 pkgdesc="Version of the TLS/crypto stack forked from OpenSSL" @@ -100,6 +100,6 @@ _libs() { } sha512sums=" -81765174fdd60223529182fab96249a28978c1d02b5894313d9b0b3aa365a1da2f7e5906403ab368114bdcba2fa861d1ad69b752f8344e6ea61d44666b483122 libressl-3.8.2.tar.gz +b8986a9e2c0a1f912770d2e55ed39b3ca0c072b8c98ecf2d22a3d36768c36b6f4588698dd248d8b585db1bd0a74f8995cc09a0ca3e707e680d87d4fa169f8941 libressl-3.8.4.tar.gz aefa5dc99345462a93f97061fdee6b5b148eed30c4bf7a7097ade8cef9dd890d8d7100558d5e1ebe6790372261c76ce04a874526cb521dea068ec1439259a035 0001-libressl.cnf.patch " diff --git a/community/libreswan/APKBUILD b/community/libreswan/APKBUILD index fd58ce65872..e8c60b55fba 100644 --- a/community/libreswan/APKBUILD +++ b/community/libreswan/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Will Sinatra <wpsinatra@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libreswan -pkgver=4.12 +pkgver=5.0 pkgrel=0 pkgdesc="IPsec implementation for Linux" url="https://libreswan.org/" @@ -34,6 +34,9 @@ source="https://download.libreswan.org/libreswan-$pkgver.tar.gz " # secfixes: +# 4.15-r0: +# - CVE-2024-2357 +# - CVE-2024-3652 # 4.12-r0: # - CVE-2023-38710 # - CVE-2023-38711 @@ -53,23 +56,23 @@ build() { INITDIR_DEFAULT=/etc/init.d \ PREFIX=/usr \ FINALBINDIR=/usr/libexec/ipsec \ - FINALLIBEXECDIR=/usr/libexec/ipsec \ + LIBEXECDIR=/usr/libexec/ipsec \ programs } package() { - make FINALMANDIR=share/man \ + make MANDIR=share/man \ INITDIR_DEFAULT=/etc/init.d \ PREFIX=/usr \ DESTDIR="$pkgdir" \ INSTCONFFLAGS=-m644 \ FINALBINDIR=/usr/libexec/ipsec \ - FINALLIBEXECDIR=/usr/libexec/ipsec \ + LIBEXECDIR=/usr/libexec/ipsec \ install } sha512sums=" -3a7f5ea5d97da357a8979a8807694a316d42ccc5f9c7b5867041abf2b9316ff8428f24cf307b6b6073c191896c0417f137abf78f9903aecde5e1ee1182577ce0 libreswan-4.12.tar.gz +b1c7cebe1ffc21aeaae76f2562764195d535ff5d51fb6ad570046678df19387df68f2d52586eb290844019cbdc17e6192773f9110531a26cf1583e2c016289c6 libreswan-5.0.tar.gz 50bba031d0342695727f520840d3e3650bd9ffae918374f03b122573152d08399128e9fb04e6a52321801f3d5dc7c9eab96364ae581f3e673c947dc283e45c04 initd-runscript.patch 50ca2cdbb2007ce4fb883794110545d68d4dc31d70605a646e9980ef874cdb468eb5d661766fe15a11f6f1b42626c01c8f551c8799e550f0abeb5fd6a4b10119 pam-rules.patch 94bcde573fc320450864394f3824bfe23e6ac8528a7b0b8a7d97d02a3883b6f47951f8a89a2c46cc394c65c5b3f9788b644f7f911f90ac78540e6479715e0a11 Makefile.inc.local diff --git a/community/librevenge/APKBUILD b/community/librevenge/APKBUILD index 40ea85c96b4..6670a7d3f05 100644 --- a/community/librevenge/APKBUILD +++ b/community/librevenge/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=librevenge pkgver=0.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="Base library for writing document import filters" url="https://sourceforge.net/projects/libwpd/" arch="all" diff --git a/community/librime/APKBUILD b/community/librime/APKBUILD index b8178e16d1b..83d1cf36fa6 100644 --- a/community/librime/APKBUILD +++ b/community/librime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alex Yam <alex@alexyam.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=librime -pkgver=1.11.0 +pkgver=1.11.2 pkgrel=0 pkgdesc="Rime input method engine" url="https://github.com/rime/librime" @@ -79,5 +79,5 @@ nolog() { } sha512sums=" -a1a7fb7fa265bf9dbf2e8d0c9c5afa693995025b10951cc70fcd5499ee79ffd06633440dd684cd7bd92679e59ef72cb5feeefe54d2133a946ffa84cc3f6b08fe librime-1.11.0.tar.gz +7b8ba708489d4d6bd6f71618f3c3270d07e088aae5ecdfcba5128a456dc49d3799e335b3ba386a1894ee01f5c5a51993e0a1821ff46d8addb02d0c8c4aacf5f3 librime-1.11.2.tar.gz " diff --git a/community/librsvg/APKBUILD b/community/librsvg/APKBUILD index a9d6e805a05..9615b940e99 100644 --- a/community/librsvg/APKBUILD +++ b/community/librsvg/APKBUILD @@ -31,7 +31,9 @@ subpackages=" rsvg-convert:_convert rsvg-convert-doc:_convert_doc:noarch " -source="https://download.gnome.org/sources/librsvg/${pkgver%.*}/librsvg-$pkgver.tar.xz" +source="https://download.gnome.org/sources/librsvg/${pkgver%.*}/librsvg-$pkgver.tar.xz + Cargo-update.patch + " # tests are very dependent on versions of pango/cairo/freetype options="!check net" @@ -91,4 +93,5 @@ _convert_doc() { sha512sums=" 56bf2b1b9b524142b4b79fe6f289cb33f334ab8a714f9898dacecc9461fbea8248477c29929446503e7a8d8cd16152ee3b7b7807279e436b6d079cfa6a4b1151 librsvg-2.58.0.tar.xz +1b82a29129cfcf424ecce9c479d48fb2de2aa65815cd55bac5184ec22845047b252deccdc2df23ab6a2aebc0cdcbccd6a1da10fe436e1177c8d03a04b2088345 Cargo-update.patch " diff --git a/community/librsvg/Cargo-update.patch b/community/librsvg/Cargo-update.patch new file mode 100644 index 00000000000..c55a3cb391b --- /dev/null +++ b/community/librsvg/Cargo-update.patch @@ -0,0 +1,17 @@ +# Fix build on loongarch64 +diff --git a/Cargo.lock b/Cargo.lock +index bf56cd0..09c9ea7 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1010,9 +1010,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.154" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" + + [[package]] + name = "libloading" diff --git a/community/libscfg/APKBUILD b/community/libscfg/APKBUILD new file mode 100644 index 00000000000..b2dd7dcd7fc --- /dev/null +++ b/community/libscfg/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Hannes Braun <hannes@hannesbraun.net> +# Maintainer: Hannes Braun <hannes@hannesbraun.net> +pkgname=libscfg +pkgver=0.1.1 +pkgrel=0 +pkgdesc="C library for scfg" +url="https://sr.ht/~emersion/libscfg" +arch="all" +license="MIT" +makedepends="meson" +subpackages="$pkgname-dev $pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~emersion/libscfg/archive/v$pkgver.tar.gz + set-so-version.patch + " +builddir="$srcdir/$pkgname-v$pkgver" + +build() { + abuild-meson . output + meson compile -C output +} + +check() { + meson test --no-rebuild --print-errorlogs -C output +} + +package() { + DESTDIR="$pkgdir" meson install --no-rebuild -C output + + install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/ +} + +sha512sums=" +8f4821d22cd26509c40d77d2a5585fb891259618aeb03611b5f2e3b620a88b7f24cc9bf05b6ad3f99c3c35f855e2ba8a1df13460ff2fe53152d78d03fd8dd6ce libscfg-0.1.1.tar.gz +6c4b47c04f25e65e3a3f0c6ab589b46b99fcc50280adc0e30a38cbdfcfd627d420c69e8b53080ee13c3ed3cb2938e7fe1652dd2108ce1ca41143f3c6ec69f85e set-so-version.patch +" diff --git a/community/libscfg/set-so-version.patch b/community/libscfg/set-so-version.patch new file mode 100644 index 00000000000..02e2ba10aa0 --- /dev/null +++ b/community/libscfg/set-so-version.patch @@ -0,0 +1,37 @@ +From 3bdba8c2bc3c3625d9751501ab42b047ec01addf Mon Sep 17 00:00:00 2001 +From: Simon Ser <contact@emersion.fr> +Date: Wed, 6 Mar 2024 19:22:45 +0100 +Subject: [PATCH] build: set library version and soversion + +--- + meson.build | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/meson.build b/meson.build +index f426e0c..8877259 100644 +--- a/meson.build ++++ b/meson.build +@@ -11,6 +11,11 @@ project( + ], + ) + ++version = meson.project_version() ++version_major = version.split('.')[0] ++version_minor = version.split('.')[1] ++assert(version_major == '0') ++ + cc = meson.get_compiler('c') + + add_project_arguments(cc.get_supported_arguments([ +@@ -28,6 +33,8 @@ scfg_lib = library( + files('scfg.c'), + include_directories: scfg_inc, + install: true, ++ version: version, ++ soversion: version_minor, + ) + + scfg = declare_dependency( +-- +2.45.0 + diff --git a/community/libsecp256k1/APKBUILD b/community/libsecp256k1/APKBUILD index 95aec14061f..41ea6c05229 100644 --- a/community/libsecp256k1/APKBUILD +++ b/community/libsecp256k1/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Michał Adamski <michal@ert.pl> pkgname=libsecp256k1 -pkgver=0.3.2 +pkgver=0.5.0 pkgrel=0 pkgdesc="Optimized C library for EC operations on curve secp256k1" url="https://github.com/bitcoin-core/secp256k1" @@ -40,5 +40,5 @@ package() { } sha512sums=" -18104b72dd5d1f5e776d72c31c36247e450736437b453b59cf6ec86f84fedeafcf231e266c1ddad727befd9864c65a779000d01e6cef4b9a6485850afebc8a81 secp256k1-v0.3.2.tar.gz +b8511b0d8b581d371ee48f2c8a5a72930e7a0686a860200e56e83e2f58a63f2d781af75829d922e98f6648d361e20efde29abcf52c086b77647457c6c3586e78 secp256k1-v0.5.0.tar.gz " diff --git a/community/libshumate/236.patch b/community/libshumate/236.patch new file mode 100644 index 00000000000..bc902bd8896 --- /dev/null +++ b/community/libshumate/236.patch @@ -0,0 +1,215 @@ +From 852615b0df2252ea67f4f82e9ace2fc2794467b3 Mon Sep 17 00:00:00 2001 +From: Marcus Lundblad <ml@dfupdate.se> +Date: Thu, 7 Mar 2024 23:34:01 +0100 +Subject: [PATCH] tests: Explicitly enable assertion macros + +To allow building with G_DISABLE_ASSERT we need to explicitly +undefine it when building the tests, otherwise g_test_init() turns +into an abort since GLib 2.58. + +See: https://gitlab.freedesktop.org/dbus/dbus-glib/-/merge_requests/4 +--- + tests/coordinate.c | 2 ++ + tests/data-source-request.c | 2 ++ + tests/file-cache.c | 3 ++- + tests/license.c | 2 ++ + tests/location.c | 2 ++ + tests/map.c | 2 ++ + tests/marker-layer.c | 2 ++ + tests/marker.c | 2 ++ + tests/memory-cache.c | 2 ++ + tests/vector-expression.c | 3 ++- + tests/vector-index.c | 2 ++ + tests/vector-reader.c | 2 ++ + tests/vector-renderer.c | 2 ++ + tests/vector-sprite-sheet.c | 3 ++- + tests/vector-style.c | 2 ++ + tests/vector-value.c | 2 ++ + tests/viewport.c | 2 ++ + 17 files changed, 34 insertions(+), 3 deletions(-) + +diff --git a/tests/coordinate.c b/tests/coordinate.c +index aeff8978..3c847f58 100644 +--- a/tests/coordinate.c ++++ b/tests/coordinate.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <gtk/gtk.h> + #include <shumate/shumate.h> + +diff --git a/tests/data-source-request.c b/tests/data-source-request.c +index 785ec857..60ce7bfe 100644 +--- a/tests/data-source-request.c ++++ b/tests/data-source-request.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <gtk/gtk.h> + #include <shumate/shumate.h> + +diff --git a/tests/file-cache.c b/tests/file-cache.c +index 721133a0..9b981dcd 100644 +--- a/tests/file-cache.c ++++ b/tests/file-cache.c +@@ -1,5 +1,6 @@ +-#include <shumate/shumate.h> ++#undef G_DISABLE_ASSERT + ++#include <shumate/shumate.h> + + #define TEST_ETAG "0123456789ABCDEFG" + #define TEST_DATA "The quick brown fox \0 jumps over the lazy dog" +diff --git a/tests/license.c b/tests/license.c +index 4b7caded..1bd677a3 100644 +--- a/tests/license.c ++++ b/tests/license.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <gtk/gtk.h> + #include <shumate/shumate.h> + +diff --git a/tests/location.c b/tests/location.c +index 6c288724..0dc67993 100644 +--- a/tests/location.c ++++ b/tests/location.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <shumate/shumate.h> + + void +diff --git a/tests/map.c b/tests/map.c +index 32d962ca..925c1f4e 100644 +--- a/tests/map.c ++++ b/tests/map.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <gtk/gtk.h> + #include <shumate/shumate.h> + +diff --git a/tests/marker-layer.c b/tests/marker-layer.c +index f075c134..793e2045 100644 +--- a/tests/marker-layer.c ++++ b/tests/marker-layer.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <gtk/gtk.h> + #include <shumate/shumate.h> + +diff --git a/tests/marker.c b/tests/marker.c +index 94e68615..0fc3b3b4 100644 +--- a/tests/marker.c ++++ b/tests/marker.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <gtk/gtk.h> + #include <shumate/shumate.h> + +diff --git a/tests/memory-cache.c b/tests/memory-cache.c +index 7e96933e..550db59f 100644 +--- a/tests/memory-cache.c ++++ b/tests/memory-cache.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <shumate/shumate.h> + #include "shumate/shumate-memory-cache-private.h" + +diff --git a/tests/vector-expression.c b/tests/vector-expression.c +index f4437dad..9e258fbb 100644 +--- a/tests/vector-expression.c ++++ b/tests/vector-expression.c +@@ -1,9 +1,10 @@ ++#undef G_DISABLE_ASSERT ++ + #include <gtk/gtk.h> + #include <shumate/shumate.h> + #include "shumate/vector/shumate-vector-expression-interpolate-private.h" + #include "shumate/vector/shumate-vector-expression-filter-private.h" + +- + static void + test_vector_expression_parse (void) + { +diff --git a/tests/vector-index.c b/tests/vector-index.c +index f6c1bc47..a9ab3035 100644 +--- a/tests/vector-index.c ++++ b/tests/vector-index.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <shumate/shumate.h> + #include "shumate/vector/shumate-vector-index-private.h" + #include "shumate/vector/shumate-vector-render-scope-private.h" +diff --git a/tests/vector-reader.c b/tests/vector-reader.c +index 03dedd7d..81c221b3 100644 +--- a/tests/vector-reader.c ++++ b/tests/vector-reader.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <shumate/shumate.h> + #include "shumate/vector/vector_tile.pb-c.h" + +diff --git a/tests/vector-renderer.c b/tests/vector-renderer.c +index bb6a3a68..c8bea344 100644 +--- a/tests/vector-renderer.c ++++ b/tests/vector-renderer.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <glib-object.h> + #include <shumate/shumate.h> + #include "shumate/shumate-tile-private.h" +diff --git a/tests/vector-sprite-sheet.c b/tests/vector-sprite-sheet.c +index 58f11f4c..ad93e339 100644 +--- a/tests/vector-sprite-sheet.c ++++ b/tests/vector-sprite-sheet.c +@@ -1,7 +1,8 @@ ++#undef G_DISABLE_ASSERT ++ + #include <shumate/shumate.h> + #include "shumate/shumate-vector-sprite-sheet.h" + +- + static void + test_vector_sprite_sheet (void) + { +diff --git a/tests/vector-style.c b/tests/vector-style.c +index c99ea9c5..af00df48 100644 +--- a/tests/vector-style.c ++++ b/tests/vector-style.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <gtk/gtk.h> + #include <shumate/shumate.h> + +diff --git a/tests/vector-value.c b/tests/vector-value.c +index 1a5880c4..fe132603 100644 +--- a/tests/vector-value.c ++++ b/tests/vector-value.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <gtk/gtk.h> + #include <shumate/shumate.h> + #include "shumate/vector/shumate-vector-value-private.h" +diff --git a/tests/viewport.c b/tests/viewport.c +index b38dbb7e..9de66e7f 100644 +--- a/tests/viewport.c ++++ b/tests/viewport.c +@@ -1,3 +1,5 @@ ++#undef G_DISABLE_ASSERT ++ + #include <gtk/gtk.h> + #include <shumate/shumate.h> + +-- +GitLab + diff --git a/community/libshumate/APKBUILD b/community/libshumate/APKBUILD index 9406fc78a08..b954c0bcddb 100644 --- a/community/libshumate/APKBUILD +++ b/community/libshumate/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=libshumate pkgver=1.2.0 -pkgrel=0 +pkgrel=1 pkgdesc="GTK4 widget to display maps" url="https://gitlab.gnome.org/GNOME/libshumate" arch="all" @@ -18,8 +18,9 @@ makedepends=" " checkdepends="dbus mesa-dri-gallium xvfb-run" subpackages="$pkgname-dev $pkgname-lang" -source="https://gitlab.gnome.org/GNOME/libshumate/-/archive/$pkgver/libshumate-$pkgver.tar.gz" -options="!check" +source="https://gitlab.gnome.org/GNOME/libshumate/-/archive/$pkgver/libshumate-$pkgver.tar.gz + 236.patch + " build() { abuild-meson \ @@ -42,4 +43,5 @@ package() { sha512sums=" 7a3ba38e9be05c806d8ba65f51bc739839b3845398b6bf73a8f841bb43652225b5053ba4bf66b0e7aa8edf48f8efc6867d6f5b6917bafae06868d6a68523f38e libshumate-1.2.0.tar.gz +af67625ec244ece2486d12f3e09d123a3f6673b844882058dfe0d47bb443d019fe22686d1f1e7794c8e3d60e3eb98741d98631b310d1e72fd3787867297860d5 236.patch " diff --git a/community/libsigc++3/APKBUILD b/community/libsigc++3/APKBUILD index e3f9143bd81..487200cbde4 100644 --- a/community/libsigc++3/APKBUILD +++ b/community/libsigc++3/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=libsigc++3 pkgver=3.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="Typesafe callback system for standard C++" url="https://github.com/libsigcplusplus/libsigcplusplus" arch="all" diff --git a/community/libspatialite/APKBUILD b/community/libspatialite/APKBUILD index 513371cf5a1..ddf23f60169 100644 --- a/community/libspatialite/APKBUILD +++ b/community/libspatialite/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=libspatialite pkgver=5.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="SpatiaLite extends the SQLite core to support fully fledged Spatial SQL capabilities." url="https://www.gaia-gis.it/fossil/libspatialite/index" arch="all" diff --git a/community/libssc/APKBUILD b/community/libssc/APKBUILD index 51ba94fea95..0a2b6c3dec4 100644 --- a/community/libssc/APKBUILD +++ b/community/libssc/APKBUILD @@ -32,7 +32,6 @@ package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output } - sha512sums=" -92af4c468a9cbe22c10278e2c7b334da6edb1eed4472f4df23afdd4f27f65499774f4f3d29329adcf9851a0b44fcefa953510e295651a861bd3fa584c09f0124 libssc-0.1.4.tar.gz +ac5a602c366ef1c188b5600fce82cb913f702a33cdc5430ceb25c75ddf40461293da59d6e24cd120646905530b881501f2e42da1b0ed76ffbe3941bf5dce225a libssc-0.1.4.tar.gz " diff --git a/community/libstaroffice/APKBUILD b/community/libstaroffice/APKBUILD index 5d4987db827..591731b91d4 100644 --- a/community/libstaroffice/APKBUILD +++ b/community/libstaroffice/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libstaroffice pkgver=0.0.7 -pkgrel=7 +pkgrel=8 pkgdesc="Import filter for StarOffice documents" url="https://github.com/fosnola/libstaroffice" arch="all" diff --git a/community/libsurvive/APKBUILD b/community/libsurvive/APKBUILD index 70a18ff9317..85558034ee8 100644 --- a/community/libsurvive/APKBUILD +++ b/community/libsurvive/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=libsurvive pkgver=1.01 -pkgrel=4 +pkgrel=5 pkgdesc="Open Source Lighthouse Tracking System" url="https://github.com/cntools/libsurvive" arch="all" @@ -22,6 +22,7 @@ makedepends="$depends_dev subpackages="$pkgname-static $pkgname-dev $pkgname-bash-completion $pkgname-web::noarch" source="https://github.com/cntools/libsurvive/releases/download/v$pkgver/libsurvive-v$pkgver-source.zip off64_t.patch + sciplot-0.3.0.patch " options="!check" # Requires live test data builddir="$srcdir/$pkgname" @@ -56,4 +57,5 @@ web() { sha512sums=" 6033d2524581bdefb0e1ed6e27c8044ba6ff32aa997845124c0b29d1a5a3f082a50605b2b654a642051ad0f22c6c8ad4ea8ca98888e28443d52ab68eb566effc libsurvive-v1.01-source.zip 35ec5f53027fcf69ce335794f5b3e01421bb9d2ffbfec571703cdd136216f3f85794774b788cccd844ca9a803a605b5d6d7124b9d49767ea0614c6b2c869791b off64_t.patch +c838efca5cdaabac903b435a50859232903723cc30a992755029e4c2fac3a2793f6eb866a1c95650c075c1da0ba9def917cffddb7ce10948aa213ed1cb79d8ac sciplot-0.3.0.patch " diff --git a/community/libsurvive/sciplot-0.3.0.patch b/community/libsurvive/sciplot-0.3.0.patch new file mode 100644 index 00000000000..0bed0c22868 --- /dev/null +++ b/community/libsurvive/sciplot-0.3.0.patch @@ -0,0 +1,42 @@ +diff -upr libsurvive.orig/libs/cnkalman/include/cnkalman/ModelPlot.h libsurvive/libs/cnkalman/include/cnkalman/ModelPlot.h +--- libsurvive.orig/libs/cnkalman/include/cnkalman/ModelPlot.h 2024-05-04 23:56:53.101787459 +0200 ++++ libsurvive/libs/cnkalman/include/cnkalman/ModelPlot.h 2024-05-04 23:57:03.865002250 +0200 +@@ -13,8 +13,8 @@ namespace cnkalman { + std::string name; + int cnt = 0; + #ifdef HAS_SCIPLOT +- sciplot::Plot plot; +- sciplot::Plot map; ++ sciplot::Plot2D plot; ++ sciplot::Plot2D map; + #endif + ModelPlot(const std::string &name = "plot", bool show = false); + +diff -upr libsurvive.orig/libs/cnkalman/src/ModelPlot.cc libsurvive/libs/cnkalman/src/ModelPlot.cc +--- libsurvive.orig/libs/cnkalman/src/ModelPlot.cc 2024-05-04 23:56:53.105123856 +0200 ++++ libsurvive/libs/cnkalman/src/ModelPlot.cc 2024-05-04 23:58:30.067476028 +0200 +@@ -62,13 +62,19 @@ namespace cnkalman { + map.xrange(range[0], range[1]); + map.yrange(range[2], range[3]); + ++ sciplot::Figure plot_fig = {{plot}}; ++ sciplot::Canvas plot_canvas = {{plot_fig}}; ++ sciplot::Figure map_fig = {{map}}; ++ sciplot::Canvas map_canvas = {{map_fig}}; ++ + if (show) { +- plot.show(); +- map.show(); ++ plot_canvas.show(); ++ map_canvas.show(); + } +- plot.save(name + "-plot.svg"); +- map.save(name + ".svg"); +- map.save(name + ".png"); ++ ++ plot_canvas.save(name + "-plot.svg"); ++ map_canvas.save(name + ".svg"); ++ map_canvas.save(name + ".png"); + #endif + } + diff --git a/testing/libsv/APKBUILD b/community/libsv/APKBUILD index ddd84151698..ddd84151698 100644 --- a/testing/libsv/APKBUILD +++ b/community/libsv/APKBUILD diff --git a/testing/libtbox/APKBUILD b/community/libtbox/APKBUILD index 353a63965ae..353a63965ae 100644 --- a/testing/libtbox/APKBUILD +++ b/community/libtbox/APKBUILD diff --git a/testing/libtbox/libtbox.pc b/community/libtbox/libtbox.pc index 9d78fb84203..9d78fb84203 100644 --- a/testing/libtbox/libtbox.pc +++ b/community/libtbox/libtbox.pc diff --git a/community/libtorrent-rasterbar/APKBUILD b/community/libtorrent-rasterbar/APKBUILD index 202d8f5530a..255ff87eb6d 100644 --- a/community/libtorrent-rasterbar/APKBUILD +++ b/community/libtorrent-rasterbar/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=libtorrent-rasterbar pkgver=2.0.10 -pkgrel=1 +pkgrel=2 pkgdesc="Feature complete C++ bittorrent implementation" url="https://www.rasterbar.com/products/libtorrent" arch="all" diff --git a/community/libupnpp/APKBUILD b/community/libupnpp/APKBUILD index 1052cb665b8..07a19cfdcde 100644 --- a/community/libupnpp/APKBUILD +++ b/community/libupnpp/APKBUILD @@ -1,29 +1,31 @@ # Contributor: Marvin Preuss <marvin@xsteadfastx.org> # Maintainer: Marvin Preuss <marvin@xsteadfastx.org> pkgname=libupnpp -pkgver=0.26.3 +pkgver=0.26.4 pkgrel=0 pkgdesc="C++ wrapper for libupnp" url="https://framagit.org/medoc92/libupnpp" arch="all" license="LGPL-2.0-or-later" -options="!check" -makedepends="curl-dev expat-dev libnpupnp-dev" +options="!check" # no test suite +makedepends=" + curl-dev + expat-dev + libnpupnp-dev + meson + " subpackages="$pkgname-dev" source="libupnpp-$pkgver.tar.gz::https://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-$pkgver.tar.gz" build() { - ./configure \ - --prefix=/usr \ - --build=$CBUILD \ - --host=$CHOST - make + abuild-meson . output + meson compile -C output } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install --no-rebuild -C output } sha512sums=" -78f9f3fabfbe3f79dc75153e95dc12e6a45064ee853ba19d8e0354baa37e7a2f673d4bc27b73196d91053f976fca7d5837b60de485a48150f6d20217ecedfc78 libupnpp-0.26.3.tar.gz +081fbe87ddf9b2a98114fe0e9e235e80a250b1e0087e029b18df1c333724c243a39c66c1f4a30edd1c476e24f9f83212824e781773d7d926943fa06e092eba80 libupnpp-0.26.4.tar.gz " diff --git a/community/libvirt/APKBUILD b/community/libvirt/APKBUILD index 0841af0dd0a..97f60f9d959 100644 --- a/community/libvirt/APKBUILD +++ b/community/libvirt/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=libvirt -pkgver=10.2.0 +pkgver=10.3.0 _ver="${pkgver/_rc/-rc}" pkgrel=0 pkgdesc="Virtualization API for several hypervisor and container systems" @@ -211,7 +211,7 @@ _common_drivers() { } sha512sums=" -65faf2346e66bdba606ba99b9e4da2be8bd94ef42ac49c2801f9e9253ceea10f5fe772d5c7ada59f48aa34ff528726719b690c3acfd3e63a5c3580db17b023ae libvirt-10.2.0.tar.xz +dd2b151a19877e57e11b582b1c11542319f8b7b7cd3d7d51304442aa7d5eb1a8490d2887d340191c3ecc561320ea453773763083364579de0a40ada9c244fc59 libvirt-10.3.0.tar.xz c3647366e589f2134599baefcbd7ec480cbc0830c71f95cd903cacb28e463d4cd8d972fbd1db81aa17eef81c1f701bd3937c9b8eb71d56ee630e1ed8b89887e9 libvirt.confd 4e28dc733a5db0e102ed529f3215d44c52ce0495dc109e2ef53465a0e205e2ba6f5f0ff56cc6e27318572ca560d778dd24a3faf092e7ab7819674c42876aa764 libvirt.initd 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc libvirt-guests.confd diff --git a/community/libvolk/APKBUILD b/community/libvolk/APKBUILD index a17d096e7b4..3bfd1fdb063 100644 --- a/community/libvolk/APKBUILD +++ b/community/libvolk/APKBUILD @@ -3,7 +3,7 @@ pkgname=libvolk pkgver=3.1.2 _cpufeaturesver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="Vector-Optimized Library of Kernels" url="https://www.libvolk.org/" # libvolk provides hand-written SIMD code. Hence, support needs to be manually diff --git a/community/libwacom/APKBUILD b/community/libwacom/APKBUILD index 8833f31fd1f..ce7b7c4856f 100644 --- a/community/libwacom/APKBUILD +++ b/community/libwacom/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ivan Tham <pickfire@riseup.net> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=libwacom -pkgver=2.10.0 +pkgver=2.11.0 pkgrel=0 pkgdesc="Library to help implement Wacom tablet settings" url="https://github.com/linuxwacom/libwacom/wiki" @@ -42,6 +42,6 @@ package() { } sha512sums=" -45bf65d5ac500214b638593e058cf2259d0c0ca955fc279d777054de9145ecc25121408a77486e2588c142d4308da8664571f305f9f4e900eefd0e5a4a695cff libwacom-2.10.0.tar.gz +05a617361957abde0239aafe46cc225b8b53d6afd895c57d27f1dd3c08c6ba752fa62cd67759eb6dc68c8bdcf6a63a923325607d5121bc2b40237e0d9430da4f libwacom-2.11.0.tar.gz f1dd2376782584a71e84fedb83f6c3633e8b27977c6f65b3dc9db20dd0c8b761df44645d40049aef005f6ee6d7ce7496f5971306b9af778c36e59a4823235869 0001-udevadm.patch " diff --git a/community/libwmf/APKBUILD b/community/libwmf/APKBUILD index 0bf5cdeffc9..5d4a8603879 100644 --- a/community/libwmf/APKBUILD +++ b/community/libwmf/APKBUILD @@ -1,12 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libwmf pkgver=0.2.13 -pkgrel=0 +pkgrel=1 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)." url="https://wvware.sourceforge.net/libwmf.html" arch="all" license="LGPL-2.0-or-later" -depends="ghostscript-fonts" makedepends=" autoconf automake @@ -16,8 +15,13 @@ makedepends=" libpng-dev libtool " -subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/caolanm/libwmf/archive/v$pkgver.tar.gz" +subpackages=" + $pkgname-dev + libwmflite:_lite + " +source="$pkgname-$pkgver.tar.gz::https://github.com/caolanm/libwmf/archive/v$pkgver.tar.gz + Fix-font-installation-dir.patch + " prepare() { default_prepare @@ -38,10 +42,14 @@ build() { package() { make -j1 DESTDIR="$pkgdir" install - # Remove fonts, these are in ghostscript-fonts - rm -rf "$pkgdir/usr/share/fonts" +} + +_lite() { + pkgdesc="A library for parsing Windows MetaFile vector graphics (WMF)." + amove usr/lib/libwmflite* } sha512sums=" f45a936c9bc98fc1a5f2b0808b497119e4dcd3c132615fdddb7583e5719c7d1d7f85c16ebf313cad453e5b7ae3508bf6b80c4ed2b42322b7dec295d8f4eb86ce libwmf-0.2.13.tar.gz +9330dce774ac70a1c70a5c4bc54a5a597fee5ab6c702464d6fd6ee204c4160798ae7ec9a107a61328d7b7b5d41898ac27f3fa152343f707f7bfe2a21291d7843 Fix-font-installation-dir.patch " diff --git a/community/libwmf/Fix-font-installation-dir.patch b/community/libwmf/Fix-font-installation-dir.patch new file mode 100644 index 00000000000..44f2c53b25a --- /dev/null +++ b/community/libwmf/Fix-font-installation-dir.patch @@ -0,0 +1,20 @@ +From 857810491414b91e12aa07388c98b788326b0995 Mon Sep 17 00:00:00 2001 +From: Sertonix <sertonix@posteo.net> +Date: Sat, 13 Apr 2024 17:08:29 +0200 +Subject: [PATCH] Fix font installation dir + +Fixes 56422489d51 +--- + fonts/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fonts/Makefile.am b/fonts/Makefile.am +index c035bff..7cd3249 100644 +--- a/fonts/Makefile.am ++++ b/fonts/Makefile.am +@@ -1,4 +1,4 @@ +-fontdir = $(datadir)/libwmf/fonts/ ++fontdir = @WMF_FONTDIR@ + + bin_SCRIPTS = libwmf-fontmap + diff --git a/testing/libxisf/APKBUILD b/community/libxisf/APKBUILD index dd7a614317a..dd7a614317a 100644 --- a/testing/libxisf/APKBUILD +++ b/community/libxisf/APKBUILD diff --git a/community/libxmlb/APKBUILD b/community/libxmlb/APKBUILD index d82ad60ab2e..ffb0ac87453 100644 --- a/community/libxmlb/APKBUILD +++ b/community/libxmlb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Pablo Correa Gomez <ablocorrea@hotmail.com> pkgname=libxmlb -pkgver=0.3.18 +pkgver=0.3.19 pkgrel=0 pkgdesc="Library to help create and query binary XML blobs" url="https://github.com/hughsie/libxmlb" @@ -39,5 +39,5 @@ _dev() { } sha512sums=" -2576aca6b7651cf484694ad157914982ef1e3949ea641b4181966e5d5292b3d8c16318fe61b14d8c7e6d0e0d184ed30d498f874f5ada196f0ca69c6180d9061f libxmlb-0.3.18.tar.gz +07db2e99b2f78f6e99cccbf5ca250978955d5a9bf18aaa675b2292d1df438fc3f98a5d0e8ddcfa41e686782f35947fe92b54b520b4e6e278d6e5c871e7491271 libxmlb-0.3.19.tar.gz " diff --git a/community/libxspf/APKBUILD b/community/libxspf/APKBUILD index 40fd6404680..5081ea922f5 100644 --- a/community/libxspf/APKBUILD +++ b/community/libxspf/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com> pkgname=libxspf pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Brings XSPF playlist reading and writing support to C++ application" url="https://libspiff.sourceforge.net/" arch="all" diff --git a/community/libzmf/APKBUILD b/community/libzmf/APKBUILD index 149514f2eb3..139b083f449 100644 --- a/community/libzmf/APKBUILD +++ b/community/libzmf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=libzmf pkgver=0.0.2 -pkgrel=18 +pkgrel=19 pkgdesc="Import filter and tools for Zoner Callisto/Draw documents" url="https://wiki.documentfoundation.org/DLP/Libraries/libzmf" arch="all" diff --git a/community/lightdm-mobile-greeter/APKBUILD b/community/lightdm-mobile-greeter/APKBUILD index 9f8fd331977..5e33bf355d6 100644 --- a/community/lightdm-mobile-greeter/APKBUILD +++ b/community/lightdm-mobile-greeter/APKBUILD @@ -4,7 +4,8 @@ pkgver=6 pkgrel=2 pkgdesc="A simple lightdm greeter for mobile" url="https://git.raatty.club/raatty/lightdm-mobile-greeter" -arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # thats all rust is build for +#arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # thats all rust is build for +arch="" # libhandy-dev is now in testing/ license="MIT" makedepends="cargo libhandy-dev lightdm-dev cargo-auditable" source="$pkgname-$pkgver-2.tar.gz::https://git.raatty.club/raatty/lightdm-mobile-greeter/archive/$pkgver.tar.gz diff --git a/testing/lightdm-settings/APKBUILD b/community/lightdm-settings/APKBUILD index 0281759f2c6..0281759f2c6 100644 --- a/testing/lightdm-settings/APKBUILD +++ b/community/lightdm-settings/APKBUILD diff --git a/community/lilypond/APKBUILD b/community/lilypond/APKBUILD index 5558e740d3d..8551e028e31 100644 --- a/community/lilypond/APKBUILD +++ b/community/lilypond/APKBUILD @@ -5,9 +5,9 @@ pkgver=2.24.3 pkgrel=0 pkgdesc="Music engraving program" url="https://lilypond.org" -# ppc64le, s390x, riscv64: texlive +# ppc64le, s390x, riscv64, loongarch64: texlive # x86: hangs on build forever -arch="all !ppc64le !s390x !riscv64 !x86" +arch="all !ppc64le !s390x !riscv64 !x86 !loongarch64" license="GPL-3.0-or-later" depends=" ghostscript @@ -31,6 +31,7 @@ makedepends=" texinfo texlive-dev texmf-dist-langcyrillic + texmf-dist-most " subpackages=" $pkgname-doc diff --git a/community/limine/APKBUILD b/community/limine/APKBUILD index a85a6591640..585085321ef 100644 --- a/community/limine/APKBUILD +++ b/community/limine/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: streaksu <streaksu@member.fsf.org> pkgname=limine -pkgver=7.3.1 +pkgver=7.5.1 pkgrel=0 pkgdesc="Advanced, portable, multiprotocol bootloader" url="https://limine-bootloader.org" @@ -136,7 +136,7 @@ updater() { } sha512sums=" -3f17d949fb5d59407e949c5a6630f8138481eeae376f1ff788bdb777c2f7a31b329434a676822164a28a2ea2ab41ec3e0d99700be342ce0860f57249dfdc2dd6 limine-7.3.1.tar.gz +5ec4ff75f76fddfa39af77447cbdb84fc1dabb2b1221b7b5e381b311c4b07d74f4be55e62790202074237570c4be9ce7e5037a43480d2d3e3d0217ec5e701996 limine-7.5.1.tar.gz e4a92c519e5a17bae16ec31dcdc7faeefbbaf12531744839e4ce5335a347a15c3955ac2c36ddf848abc33651b2e9536d298356dac8f2c6a54f9a8dff34a69a0d limine-efi-updater.sh 394c5067b850eb7b8b236c172471c6b9d152a4ef823d2f6b71396199fbe798638ef4031e60402fdfdfc9425aed0b7e119d15625fc0007622d35fbfadf9457cf8 limine-efi.conf " diff --git a/community/linux-edge/APKBUILD b/community/linux-edge/APKBUILD index dde1cf2a15e..97ebc4ccde0 100644 --- a/community/linux-edge/APKBUILD +++ b/community/linux-edge/APKBUILD @@ -4,7 +4,7 @@ _flavor=edge pkgname=linux-${_flavor} # NOTE: this kernel is intended for testing # please resist urge to upgrade it blindly -pkgver=6.8.6 +pkgver=6.8.9 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -266,9 +266,9 @@ _doc() { sha512sums=" 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068 linux-6.8.tar.xz -92ce796b5c66c532072d000e9b01882ed1729b0f29dc5587029505cbdd6f398dad71023aaa8ab1d6e268431868d93230a5a5532621ce00296d9567ad744c0d77 patch-6.8.6.xz -cebf11a76ffe41b3cfb10a8bc9716165aedfc20394668da13b3ede1a409ebdf488f6949469883cda510365b82982143ba9a8f964a5840365e23e6adcd4faa4dc config-edge.aarch64 -71f07a19eab9e0997385546b2eb1e6fcbced770db316a6a053b0f683ae57d4e698a8f5bb7d2c4c9a1e7cdb8453bfe7eb7ea4ce829819fa3bd626383e3010caa1 config-edge.armv7 -2211c95463c2f761634635bbc5fcb658f20c89739b2075e316aedb1363fa18b02a52fb18ab60ea24638e706acd2e8dd8ba213271ca289cf1f81bb351ad600d51 config-edge.x86_64 -cd3cf86c4ef6e5fdb7710dbe706afef61e7a5af36db55681b1230b167f36a7e08341ff3b7cb131e86ea4a503115ba09c91c7d10dba7f436b0c045bed37d89b8b config-edge.riscv64 +89c036fac161c5df8c594d62ccc7c841ae2ea19b9e0c66cdb2a4404101e39bef765c0ccc774bd81a281ab160cdff83f3a64beac7b616eb337cdef908de10ad65 patch-6.8.9.xz +5ec0058f94b2587cb6b435718f9a07c929c353c37d059ca99d65a1e6a2feafbeb2a7a5419336bf78c0eed0a7b27226c19bdc33acbacf973a4932f67ddd58aa0d config-edge.aarch64 +822887510ec25d56feba0e41ad94309fcb3c8f7679cb03437c209dce855b0a02cd0214dd2cedc07f5cab40689d78e940332f26877e6d5445b60974fac6bb1302 config-edge.armv7 +262d8fb19036f2cb0bd98d8206c4030455f03552e7edbf8853b5c22520045c24f75b1ce41908cdec4a483a7a03ceea6ebbc2fe4169bffb77911696e6df25a56b config-edge.x86_64 +ab95f9c88cc69dbe1e08cd0b1a94250ca09a4c154e199f7de53f47e5ce081bea5cfa7ac9d823933d1941f34345928a6a3dc46faeb0dbd2ca37e55e9712d3b8d2 config-edge.riscv64 " diff --git a/community/linux-edge/config-edge.aarch64 b/community/linux-edge/config-edge.aarch64 index eec42a7177e..a0d2d23f15e 100644 --- a/community/linux-edge/config-edge.aarch64 +++ b/community/linux-edge/config-edge.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.8.6 Kernel Configuration +# Linux/arm64 6.8.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" CONFIG_CC_IS_GCC=y @@ -123,7 +123,8 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -# CONFIG_PSI is not set +CONFIG_PSI=y +CONFIG_PSI_DEFAULT_DISABLED=y # end of CPU/Task time and stats accounting CONFIG_CPU_ISOLATION=y @@ -686,6 +687,7 @@ CONFIG_KVM_GENERIC_MMU_NOTIFIER=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y # CONFIG_NVHE_EL2_DEBUG is not set +CONFIG_CPU_MITIGATIONS=y # # General architecture-dependent options diff --git a/community/linux-edge/config-edge.armv7 b/community/linux-edge/config-edge.armv7 index d9469495828..725f44efc95 100644 --- a/community/linux-edge/config-edge.armv7 +++ b/community/linux-edge/config-edge.armv7 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.8.6 Kernel Configuration +# Linux/arm 6.8.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" CONFIG_CC_IS_GCC=y @@ -127,7 +127,8 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -# CONFIG_PSI is not set +CONFIG_PSI=y +CONFIG_PSI_DEFAULT_DISABLED=y # end of CPU/Task time and stats accounting CONFIG_CPU_ISOLATION=y @@ -749,6 +750,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y # end of Power management options CONFIG_AS_VFP_VMRS_FPINST=y +CONFIG_CPU_MITIGATIONS=y # # General architecture-dependent options diff --git a/community/linux-edge/config-edge.riscv64 b/community/linux-edge/config-edge.riscv64 index dca1d654f55..96f2721306e 100644 --- a/community/linux-edge/config-edge.riscv64 +++ b/community/linux-edge/config-edge.riscv64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.8.6 Kernel Configuration +# Linux/riscv 6.8.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" CONFIG_CC_IS_GCC=y @@ -117,7 +117,8 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -# CONFIG_PSI is not set +CONFIG_PSI=y +CONFIG_PSI_DEFAULT_DISABLED=y # end of CPU/Task time and stats accounting CONFIG_CPU_ISOLATION=y @@ -465,6 +466,7 @@ CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_ARCH_SUPPORTS_ACPI=y # CONFIG_ACPI is not set +CONFIG_CPU_MITIGATIONS=y # # General architecture-dependent options diff --git a/community/linux-edge/config-edge.x86_64 b/community/linux-edge/config-edge.x86_64 index 5f5876f0ff1..4a630c8b43d 100644 --- a/community/linux-edge/config-edge.x86_64 +++ b/community/linux-edge/config-edge.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.8.6 Kernel Configuration +# Linux/x86_64 6.8.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" CONFIG_CC_IS_GCC=y @@ -144,7 +144,8 @@ CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -# CONFIG_PSI is not set +CONFIG_PSI=y +CONFIG_PSI_DEFAULT_DISABLED=y # end of CPU/Task time and stats accounting CONFIG_CPU_ISOLATION=y @@ -508,7 +509,7 @@ CONFIG_CC_HAS_RETURN_THUNK=y CONFIG_CC_HAS_ENTRY_PADDING=y CONFIG_FUNCTION_PADDING_CFI=11 CONFIG_FUNCTION_PADDING_BYTES=16 -CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_CPU_MITIGATIONS=y CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_RETPOLINE=y # CONFIG_RETHUNK is not set @@ -517,9 +518,7 @@ CONFIG_CPU_IBRS_ENTRY=y CONFIG_SLS=y # CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_MITIGATION_RFDS=y -CONFIG_SPECTRE_BHI_ON=y -# CONFIG_SPECTRE_BHI_OFF is not set -# CONFIG_SPECTRE_BHI_AUTO is not set +CONFIG_MITIGATION_SPECTRE_BHI=y CONFIG_ARCH_HAS_ADD_PAGES=y # @@ -724,6 +723,7 @@ CONFIG_AS_SHA256_NI=y CONFIG_AS_TPAUSE=y CONFIG_AS_GFNI=y CONFIG_AS_WRUSS=y +CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y # # General architecture-dependent options diff --git a/community/litecli/APKBUILD b/community/litecli/APKBUILD index 763fd88cd7b..ab25a28605a 100644 --- a/community/litecli/APKBUILD +++ b/community/litecli/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=litecli -pkgver=1.10.0 -pkgrel=1 +pkgver=1.11.0 +pkgrel=0 pkgdesc="CLI for SQLite Databases with auto-completion and syntax highlighting" url="https://litecli.com/" arch="noarch" @@ -35,5 +35,5 @@ package() { } sha512sums=" -aa497fe050f4e1135f2c63f4c0cbab736400158c546a0391f3eca956b38132349ad2eb46505beb52651f74bc5ff1a2ba9b0254e7a6a86d79e461fdd0508fb412 litecli-1.10.0.tar.gz +31a97d412d5749b6e8d32b88d8b41fde79d8ca9657da9885f39dc92cb0ad00ac6ab98f931ab57806be05ba9249580f1ea5ff25849d86c2f044dc40f437b6a52e litecli-1.11.0.tar.gz " diff --git a/community/lld15/APKBUILD b/community/lld15/APKBUILD deleted file mode 100644 index ad92581d932..00000000000 --- a/community/lld15/APKBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# Contributor: Eric Molitor <eric@molitor.org> -# Contributor: Jakub Jirutka <jakub@jirutka.cz> -# Contributor: Rasmus Thomsen <oss@cogitri.dev> -# Maintainer: -# this is a temp hack package for zig that depends on lld15-libs -pkgname=lld15 -pkgver=15.0.7 -pkgrel=5 -pkgdesc="The LLVM Linker" -url="https://llvm.org/" -# for zig only -# and firefox -arch="aarch64 armv7 ppc64le x86 x86_64 riscv64" -license="Apache-2.0" -makedepends=" - cmake - compiler-rt - libedit-dev - llvm15-dev - llvm15-static - llvm-libunwind-dev - patchelf - samurai - zlib-dev - " -subpackages="$pkgname-libs $pkgname-dev" -source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/lld-$pkgver.src.tar.xz - https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/cmake-$pkgver.src.tar.xz - cxx17.patch - " -builddir="$srcdir/lld-$pkgver.src" -# already works, temp package for zig only -options="!check" - -replaces="lld-libs" - -case "$CARCH" in -armhf) - # for some reason they hang forever, but the actual linker works fine - options="$options !check" - ;; -esac - -build() { - cmake -B build -G Ninja -Wno-dev \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_MODULE_PATH="$srcdir/cmake-$pkgver.src/Modules" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_INSTALL_RPATH=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DLLVM_INCLUDE_TESTS=OFF \ - -DLLD_BUILT_STANDALONE=ON - cmake --build build -} - -package() { - depends="!lld" - DESTDIR="$pkgdir" cmake --install build - - # see main/lld - case "$CARCH" in - riscv64) - ;; - *) - patchelf --add-needed libscudo.so "$pkgdir"/usr/bin/lld - ;; - esac -} - -sha512sums=" -5dc0690c1eb3c37ee29c4add65a08f7b93ce1363cf9099243c9dc1124d1ca77fe19bbf24dad3984de4553eda716f706d49dff63461b709bec6645272e67f0178 lld-15.0.7.src.tar.xz -85097a6eaee0df004567905f7e5ce8ca02e3b46c6fc66fa552fe99734642e6ee61685de4e5e6e8b505963334d7b91d98ecd9c5870e6bdd3f0018ee5b963ffa96 cmake-15.0.7.src.tar.xz -731077024624650bfb62341bdc380bc98ccfb690a462436cdfa272f90f590dfb75c06d066baa9a256438716eda1d5996c2d0b66c3fc95f151131aa1a843245e8 cxx17.patch -" diff --git a/community/lld15/cxx17.patch b/community/lld15/cxx17.patch deleted file mode 100644 index 038d414169f..00000000000 --- a/community/lld15/cxx17.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dcc6496..48924c0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,7 +11,7 @@ endif() - include(GNUInstallDirs) - - if(LLD_BUILT_STANDALONE) -- set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") -+ set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to") - set(CMAKE_CXX_STANDARD_REQUIRED YES) - set(CMAKE_CXX_EXTENSIONS NO) - diff --git a/community/lld16/9010-lld-Pass-random.randint-stop-parameter-as-int.patch b/community/lld16/9010-lld-Pass-random.randint-stop-parameter-as-int.patch deleted file mode 100644 index 26a6ee1f237..00000000000 --- a/community/lld16/9010-lld-Pass-random.randint-stop-parameter-as-int.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c1d184c5f055a5aa447285080c465c3a05f8c2d4 Mon Sep 17 00:00:00 2001 -From: Jacek Caban <jacek@codeweavers.com> -Date: Fri, 10 Mar 2023 21:54:14 -0500 -Subject: [PATCH 10/10] [lld] Pass random.randint stop parameter as int. - -It's required by Python 3.12, from https://docs.python.org/3.12/library/random.html "Changed in version 3.12: Automatic conversion of non-integer types is no longer supported." - -Reviewed By: #lld-macho, int3 - -Differential Revision: https://reviews.llvm.org/D145826 - -Gentoo-Component: lld ---- - lld/test/MachO/tools/generate-cfi-funcs.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lld/test/MachO/tools/generate-cfi-funcs.py b/lld/test/MachO/tools/generate-cfi-funcs.py -index 3f22008349f4..e2b75d0cd9a5 100755 ---- a/test/MachO/tools/generate-cfi-funcs.py -+++ b/test/MachO/tools/generate-cfi-funcs.py -@@ -23,7 +23,7 @@ def print_function(name): - global lsda_odds - have_lsda = (random.random() < lsda_odds) - frame_size = random.randint(4, 64) * 16 -- frame_offset = -random.randint(0, (frame_size/16 - 4)) * 16 -+ frame_offset = -random.randint(0, int(frame_size/16 - 4)) * 16 - global func_size_low, func_size_high - func_size = random.randint(func_size_low, func_size_high) * 0x10 - func_size_high += 1 --- -2.41.0 - diff --git a/community/lld16/9013-lld-RISCV-Handle-relaxation-reductions-of-more-than-65536-bytes.patch b/community/lld16/9013-lld-RISCV-Handle-relaxation-reductions-of-more-than-65536-bytes.patch deleted file mode 100644 index 6a1d22f633e..00000000000 --- a/community/lld16/9013-lld-RISCV-Handle-relaxation-reductions-of-more-than-65536-bytes.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 9d37ea95df1b84cca9b5e954d8964c976a5e303e Mon Sep 17 00:00:00 2001 -From: Roland McGrath <mcgrathr@google.com> -Date: Tue, 16 May 2023 13:35:35 -0700 -Subject: [PATCH] [lld][RISCV] Handle relaxation reductions of more than 65536 - bytes - -In a real-world case with functions that have many, many -R_RISCV_CALL_PLT relocations due to asan and ubsan -instrumentation, all these can be relaxed by an instruction and -the net result is more than 65536 bytes of reduction in the -output .text section that totals about 1.2MiB in final size. - -This changes InputSection to use a 32-bit field for bytesDropped. -The RISCV relaxation keeps track in a 64-bit field and detects -32-bit overflow as it previously detected 16-bit overflow. It -doesn't seem likely that 32-bit overflow will arise, but it's not -inconceivable and it's cheap enough to detect it. - -This unfortunately increases the size of InputSection on 64-bit -hosts by a word, but that seems hard to avoid. - -Reviewed By: MaskRay - -Differential Revision: https://reviews.llvm.org/D150722 ---- - lld/ELF/Arch/RISCV.cpp | 6 +++--- - lld/ELF/InputSection.h | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lld/ELF/Arch/RISCV.cpp b/lld/ELF/Arch/RISCV.cpp -index aa67617a5be25..018da8a6e247d 100644 ---- a/ELF/Arch/RISCV.cpp -+++ b/ELF/Arch/RISCV.cpp -@@ -621,7 +621,7 @@ static bool relax(InputSection &sec) { - // iteration. - DenseMap<const Defined *, uint64_t> valueDelta; - ArrayRef<SymbolAnchor> sa = ArrayRef(aux.anchors); -- uint32_t delta = 0; -+ uint64_t delta = 0; - for (auto [i, r] : llvm::enumerate(sec.relocs())) { - for (; sa.size() && sa[0].offset <= r.offset; sa = sa.slice(1)) - if (!sa[0].end) -@@ -688,8 +688,8 @@ static bool relax(InputSection &sec) { - a.d->value -= delta - valueDelta.find(a.d)->second; - } - // Inform assignAddresses that the size has changed. -- if (!isUInt<16>(delta)) -- fatal("section size decrease is too large"); -+ if (!isUInt<32>(delta)) -+ fatal("section size decrease is too large: " + Twine(delta)); - sec.bytesDropped = delta; - return changed; - } -diff --git a/lld/ELF/InputSection.h b/lld/ELF/InputSection.h -index 356ccda2d7436..143384b3ba7bc 100644 ---- a/ELF/InputSection.h -+++ b/ELF/InputSection.h -@@ -137,7 +137,7 @@ class InputSectionBase : public SectionBase { - // Used by --optimize-bb-jumps and RISC-V linker relaxation temporarily to - // indicate the number of bytes which is not counted in the size. This should - // be reset to zero after uses. -- uint16_t bytesDropped = 0; -+ uint32_t bytesDropped = 0; - - mutable bool compressed = false; - -@@ -401,7 +401,7 @@ class InputSection : public InputSectionBase { - template <class ELFT> void copyShtGroup(uint8_t *buf); - }; - --static_assert(sizeof(InputSection) <= 152, "InputSection is too big"); -+static_assert(sizeof(InputSection) <= 160, "InputSection is too big"); - - class SyntheticSection : public InputSection { - public: diff --git a/community/lld16/APKBUILD b/community/lld16/APKBUILD deleted file mode 100644 index a33340d4761..00000000000 --- a/community/lld16/APKBUILD +++ /dev/null @@ -1,87 +0,0 @@ -# Contributor: Eric Molitor <eric@molitor.org> -# Contributor: Jakub Jirutka <jakub@jirutka.cz> -# Contributor: Rasmus Thomsen <oss@cogitri.dev> -# Maintainer: Patrycja Rosa <alpine@ptrcnull.me> -# this is a temp hack package for zig that depends on lld16-libs -pkgname=lld16 -pkgver=16.0.6 -pkgrel=1 -_llvmver=${pkgver%%.*} -pkgdesc="The LLVM Linker" -url="https://llvm.org/" -# cannot link anything and fails -# ld.lld: error: unknown emulation: elf64_s390 -# ld.lld: error: src/gn/gn_main.o: could not infer e_machine -# from bitcode target triple s390x-alpine-linux-musl -# also fails hundreds of tests -arch="all !s390x" -license="Apache-2.0" -depends_dev="$pkgname=$pkgver-r$pkgrel" -makedepends=" - clang - cmake - compiler-rt - libedit-dev - llvm$_llvmver-dev - llvm$_llvmver-static - llvm$_llvmver-test-utils - llvm-libunwind-dev - patchelf - samurai - scudo-malloc - zlib-dev - " -checkdepends="gtest-dev bash llvm$_llvmver-test-utils" -subpackages="$pkgname-dbg $pkgname-libs $pkgname-dev $pkgname-doc" -source="https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver//_/-}/lld-${pkgver//_/}.src.tar.xz - https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver//_/-}/cmake-${pkgver//_/}.src.tar.xz - riscv-attributes.patch - 9010-lld-Pass-random.randint-stop-parameter-as-int.patch - 9013-lld-RISCV-Handle-relaxation-reductions-of-more-than-65536-bytes.patch - " -builddir="$srcdir/lld-${pkgver//_/}.src" -# already works, temp package for zig only -options="!check" - -prepare() { - default_prepare - mv "$srcdir"/cmake-${pkgver//_/}.src "$srcdir"/cmake - # modified with patch, but off by a few bytes when read for readelf; actual functionality works - rm test/ELF/riscv-attributes.s -} - -build() { - CFLAGS="$CFLAGS -O2 -DNDEBUG -g1" \ - CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -g1" \ - CC=clang CXX=clang++ \ - cmake -B build -G Ninja -Wno-dev \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_INSTALL_RPATH=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DLLVM_INCLUDE_TESTS="$(want_check && echo ON || echo ON)" \ - -DLLVM_EXTERNAL_LIT=/usr/bin/lit \ - -DLLD_BUILT_STANDALONE=ON - cmake --build build -} - -check() { - ninja -C build check-lld -} - -package() { - DESTDIR="$pkgdir" cmake --install build - install -Dm644 "$builddir"/docs/ld.lld.1 -t "$pkgdir"/usr/share/man/man1/ - - # we have the scudo allocator available, so link lld to it to - # significantly improve performance, especially in LTO contexts - patchelf --add-needed libscudo.so "$pkgdir"/usr/bin/lld -} - -sha512sums=" -8df248785cd77e683f3daf9cab76a4a230305b881a7a844ef644b6a55fee366d5fcca23593ca09945ba8ddae0ae119042afe3f43547c106571e98004dbc7f1e6 lld-16.0.6.src.tar.xz -52ecd941d2d85a5b668caa5d0d40480cb6a97b3bf1174e634c2a93e9ef6d03670ca7e96abb0a60cb33ba537b93d5788754dab1f2f45c1f623f788162717d088b cmake-16.0.6.src.tar.xz -008f3395c6b70c9a69e5fd1a12b42c1f01992ef7ee5382fca520cf4ed54594706a2ca39b73872e2719818f81d4832686e92244768a98e29c2b462b700c641d2e riscv-attributes.patch -7c5145c70f958252be60f5ca9e7c4d5b7ab77a7e4c6c2cad528644fa6ecc1d348b4d29c6f968c26cb948caad2372c807afc3ea886600ab7e804ec6935b4dab39 9010-lld-Pass-random.randint-stop-parameter-as-int.patch -1f0527a77d6b147a5d1d809f1a3c4d11d38de13f0cbcdd084328c90f7240e9018e727ead370b24f477ee2de9e3cc7ecaee1dc27d29e1f67778d30830c37dbf3c 9013-lld-RISCV-Handle-relaxation-reductions-of-more-than-65536-bytes.patch -" diff --git a/community/lld16/riscv-attributes.patch b/community/lld16/riscv-attributes.patch deleted file mode 100644 index 14599f6e37a..00000000000 --- a/community/lld16/riscv-attributes.patch +++ /dev/null @@ -1,43 +0,0 @@ -fixes then stripping/objcopy with gbinutils -https://reviews.llvm.org/D152065 --- -diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp ---- a/ELF/Writer.cpp -+++ b/ELF/Writer.cpp -@@ -2035,6 +2035,8 @@ - addPhdrForSection(part, SHT_MIPS_OPTIONS, PT_MIPS_OPTIONS, PF_R); - addPhdrForSection(part, SHT_MIPS_ABIFLAGS, PT_MIPS_ABIFLAGS, PF_R); - } -+ if (config->emachine == EM_RISCV) -+ addPhdrForSection(part, SHT_RISCV_ATTRIBUTES, PT_RISCV_ATTRIBUTES, PF_R); - } - Out::programHeaders->size = sizeof(Elf_Phdr) * mainPart->phdrs.size(); - -diff --git a/lld/test/ELF/riscv-attributes.s b/lld/test/ELF/riscv-attributes.s ---- a/test/ELF/riscv-attributes.s -+++ b/test/ELF/riscv-attributes.s -@@ -3,7 +3,7 @@ - # RUN: rm -rf %t && split-file %s %t && cd %t - # RUN: llvm-mc -filetype=obj -triple=riscv64 a.s -o a.o - # RUN: ld.lld -e 0 a.o -o out 2>&1 | count 0 --# RUN: llvm-readobj --arch-specific out | FileCheck %s -+# RUN: llvm-readelf -S -l --arch-specific out | FileCheck %s --check-prefixes=HDR,CHECK - # RUN: ld.lld -e 0 a.o a.o -o out1 2>&1 | count 0 - # RUN: llvm-readobj --arch-specific out1 | FileCheck %s - # RUN: ld.lld -r a.o a.o -o out1 2>&1 | count 0 -@@ -63,6 +63,14 @@ - # UNKNOWN22-COUNT-2: warning: unknown22.o:(.riscv.attributes): invalid tag 0x16 at offset 0x10 - # UNKNOWN22: warning: unknown22a.o:(.riscv.attributes): invalid tag 0x16 at offset 0x10 - -+# HDR: Name Type Address Off Size ES Flg Lk Inf Al -+# HDR: .riscv.attributes RISCV_ATTRIBUTES 0000000000000000 000158 00003e 00 0 0 1{{$}} -+ -+# HDR: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align -+# HDR: LOAD 0x000000 0x0000000000010000 0x0000000000010000 0x000158 0x000158 R 0x1000 -+# HDR-NEXT: GNU_STACK 0x000000 0x0000000000000000 0x0000000000000000 0x000000 0x000000 RW 0 -+# HDR-NEXT: ATTRIBUTES 0x000158 0x0000000000000000 0x0000000000000000 0x00003e 0x00003e R 0x1{{$}} -+ - # CHECK: BuildAttributes { - # CHECK-NEXT: FormatVersion: 0x41 - # CHECK-NEXT: Section 1 { - diff --git a/community/llhttp/APKBUILD b/community/llhttp/APKBUILD index 05af8d55308..438fbbd9181 100644 --- a/community/llhttp/APKBUILD +++ b/community/llhttp/APKBUILD @@ -10,7 +10,7 @@ arch="all" makedepends="cmake clang npm" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/nodejs/llhttp/archive/v$pkgver/llhttp-$pkgver.tar.gz - $pkgname-sed.patch::https://github.com/nodejs/llhttp/commit/553ae7d1bda0b97a43af6b57ea2fd7ce04b6630d.patch + $pkgname-sed.patch " prepare() { diff --git a/community/llhttp/llhttp-sed.patch b/community/llhttp/llhttp-sed.patch new file mode 100644 index 00000000000..1c4fc5b9755 --- /dev/null +++ b/community/llhttp/llhttp-sed.patch @@ -0,0 +1,24 @@ +From 553ae7d1bda0b97a43af6b57ea2fd7ce04b6630d Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" <code@musicinmybrain.net> +Date: Tue, 27 Jun 2023 18:27:17 -0400 +Subject: [PATCH] Do not assume a particular sed implementation + +Make the release target in the Makefile more portable. +--- + Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 5b941b3..d9c6d35 100644 +--- a/Makefile ++++ b/Makefile +@@ -52,8 +52,7 @@ release: clean generate + cp -rf src/native/*.c release/src/ + cp -rf src/llhttp.gyp release/ + cp -rf src/common.gypi release/ +- cp -rf CMakeLists.txt release/ +- sed -i '' s/_RELEASE_/$(RELEASE)/ release/CMakeLists.txt ++ sed s/_RELEASE_/$(RELEASE)/ CMakeLists.txt > release/CMakeLists.txt + cp -rf libllhttp.pc.in release/ + cp -rf README.md release/ + cp -rf LICENSE-MIT release/ diff --git a/community/lnav/APKBUILD b/community/lnav/APKBUILD index e25205d93c3..1acbd9c1c70 100644 --- a/community/lnav/APKBUILD +++ b/community/lnav/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Heiko Bernloehr <Heiko.Bernloehr@FreeIT.de> pkgname=lnav -pkgver=0.12.1 +pkgver=0.12.2 pkgrel=0 pkgdesc="advanced log file navigator and viewer" url="https://lnav.org" @@ -45,5 +45,5 @@ package() { } sha512sums=" -a8ab31df10cdfe17e96b2c3fa73fc5c2d0be92c5e8ffe721336b8f13ef48ebe73ac2f0da3f708a741420fee2ca1cd40972c507c13acc7bd0c10abe49208f6648 lnav-0.12.1.tar.gz +20cc31ed8c69e4ba0971d581b9e8629d415b1025713200eec0b70070991dbd288af449775a6cb5cb239d3a20aee3f4adbcc7420c5d017ae3bf62587925af49f7 lnav-0.12.2.tar.gz " diff --git a/community/logstalgia/APKBUILD b/community/logstalgia/APKBUILD index 215ee7ea9f0..d3a590fc714 100644 --- a/community/logstalgia/APKBUILD +++ b/community/logstalgia/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=logstalgia pkgver=1.1.4 -pkgrel=1 +pkgrel=2 pkgdesc="A website access log visualisation tool" url="https://logstalgia.io/" arch="all" diff --git a/community/loupe/APKBUILD b/community/loupe/APKBUILD index abe739e4f8d..199c8b9d28d 100644 --- a/community/loupe/APKBUILD +++ b/community/loupe/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Newbyte <newbyte@postmarketos.org> # Maintainer: team/gnome <newbyte@postmarketos.org> pkgname=loupe -pkgver=46.0 -pkgrel=2 +pkgver=46.2 +pkgrel=0 pkgdesc="Image viewer application written with GTK 4 and Rust" url="https://gitlab.gnome.org/GNOME/loupe" # s390x: Multple definitions in Cargo dependency Nix 0.26.2 @@ -23,8 +23,7 @@ makedepends=" " checkdepends="appstream-glib desktop-file-utils" subpackages="$pkgname-lang" -source="https://gitlab.gnome.org/GNOME/loupe/-/archive/$pkgver/loupe-$pkgver.tar.gz - glycin-1.0.1.patch" +source="https://gitlab.gnome.org/GNOME/loupe/-/archive/$pkgver/loupe-$pkgver.tar.gz" build() { abuild-meson . output @@ -40,6 +39,5 @@ package() { } sha512sums=" -41f07b5356059439b0f83612621fff0e8e6fd755f34ff5b7259c9adfd88e2703ed2be4302217cfb9fcfc87978ad3b5263fd49f68f90eeea94e3fb29ec5e02b5f loupe-46.0.tar.gz -995e7cfa5babcbea360ed63490cf073813b7e3756ad0c384ff50026723bc49b65de1ee198667a926cd4869187bb8ab74380b784e65e6ec4461da901d0ae85e62 glycin-1.0.1.patch +1f5e662b59362fbc97c108433cd91832f3e0b95652d41b3c4ee3753cab40ff8c6fb63fe90b2a5c1f8492e3ba86cdb16ef85bc972c19af45a322bc0b915848eea loupe-46.2.tar.gz " diff --git a/community/loupe/glycin-1.0.1.patch b/community/loupe/glycin-1.0.1.patch deleted file mode 100644 index 5d0d4d7d30c..00000000000 --- a/community/loupe/glycin-1.0.1.patch +++ /dev/null @@ -1,53 +0,0 @@ -Bump glycin dependency to 1.0.1 - ---- - Cargo.lock | 9 +++++---- - Cargo.toml | 2 +- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index fa1f3e9..96c29ae 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -989,9 +989,9 @@ dependencies = [ - - [[package]] - name = "glycin" --version = "1.0.0" -+version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6ebfac2819e7c4538c6567742a88d684ac5020f7e6de3d5e3f8578a72b4fbc5c" -+checksum = "eac2fbe27c908ba9e2849ce2693eeacfc21c678477b5c2b44c61136a79ad32bb" - dependencies = [ - "async-fs", - "async-global-executor", -@@ -1014,10 +1014,11 @@ dependencies = [ - - [[package]] - name = "glycin-utils" --version = "1.0.0" -+version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "135d59b585e3f5df5d5f81b6a2e77b681071c4ef6b06f7828b46b8f5944b6c37" -+checksum = "f2aa726e46a6e1d2c29bb69411e607e111466bc6a691e5a0c7944b780b46d69f" - dependencies = [ -+ "libc", - "libseccomp", - "memmap2", - "serde", -diff --git a/Cargo.toml b/Cargo.toml -index 4176867..fa976cb 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -14,7 +14,7 @@ disable-glycin-sandbox = [] - x11 = ["ashpd/gtk4_x11"] - - [dependencies] --glycin = { version = "1.0.0" } -+glycin = { version = "1.0.1" } - anyhow = { version = "1.0.66", features = ["backtrace"] } - arc-swap = "1.6.0" - async-channel = "2.1.0" --- -2.44.0 - diff --git a/community/love/APKBUILD b/community/love/APKBUILD index 4c4081a8178..bc8cfa86a4e 100644 --- a/community/love/APKBUILD +++ b/community/love/APKBUILD @@ -6,8 +6,8 @@ pkgrel=0 pkgdesc="A Lua 2D Graphics Library" url="https://love2d.org" # s390x: build failures on big endian -# ppc64le, riscv64 missing luajit -arch="all !ppc64le !s390x !riscv64" +# ppc64le, riscv64, loongarch64 missing luajit +arch="all !ppc64le !s390x !riscv64 !loongarch64" license="Zlib" makedepends=" freetype-dev diff --git a/community/lsscsi/APKBUILD b/community/lsscsi/APKBUILD index c24bf2bc23a..63da16f2906 100644 --- a/community/lsscsi/APKBUILD +++ b/community/lsscsi/APKBUILD @@ -10,6 +10,11 @@ makedepends="linux-headers" subpackages="$pkgname-doc" source="http://sg.danny.cz/scsi/lsscsi-$pkgver.tar.xz" +prepare(){ + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/lua-basexx/APKBUILD b/community/lua-basexx/APKBUILD index 8fc8649875f..d26179f416a 100644 --- a/community/lua-basexx/APKBUILD +++ b/community/lua-basexx/APKBUILD @@ -13,7 +13,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/aiq/$_pkgname/archive/v$pkgv builddir="$srcdir/$_pkgname-$pkgver" case "$CARCH" in -ppc64le|riscv64) _luajit="" ;; +ppc64le|riscv64|loongarch64) _luajit="" ;; *) checkdepends="$checkdepends luajit"; _luajit="jit" ;; esac diff --git a/community/lua-binaryheap/APKBUILD b/community/lua-binaryheap/APKBUILD index be50ca46d38..cb63b3c8d2e 100644 --- a/community/lua-binaryheap/APKBUILD +++ b/community/lua-binaryheap/APKBUILD @@ -20,9 +20,9 @@ for _v in $_luaversions; do provides="$provides lua$_v-${pkgname#lua-}=$pkgver-r$pkgrel" done -# XXX: luajit is not available on ppc64le and riscv64. +# XXX: luajit is not available on ppc64le, riscv64 and loongarch64. case "$CARCH" in -ppc64le|riscv64) ;; +ppc64le|riscv64|loongarch64) ;; *) checkdepends="$checkdepends luajit" _luaversions="$_luaversions jit" diff --git a/community/lua-brieflz/APKBUILD b/community/lua-brieflz/APKBUILD index c5ea2d90d33..a7202b2f0a9 100644 --- a/community/lua-brieflz/APKBUILD +++ b/community/lua-brieflz/APKBUILD @@ -13,7 +13,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/jirutka/$_pkgname/archive/v$ builddir="$srcdir/$_pkgname-$pkgver" case "$CARCH" in -ppc64le|riscv64) _luajit="";; +ppc64le|riscv64|loongarch64) _luajit="";; *) checkdepends="$checkdepends luajit" _luajit="jit";; esac diff --git a/community/lua-copas/APKBUILD b/community/lua-copas/APKBUILD index 0e40aef50c6..c7396e4295e 100644 --- a/community/lua-copas/APKBUILD +++ b/community/lua-copas/APKBUILD @@ -22,7 +22,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/keplerproject/$_rockname/arc builddir="$srcdir/$_rockname-$_pkgver" case "$CARCH" in - ppc64le|riscv64) _luajit="";; + ppc64le|riscv64|loongarch64) _luajit="";; *) checkdepends="$checkdepends luajit"; _luajit="jit";; esac diff --git a/community/lua-date/APKBUILD b/community/lua-date/APKBUILD index 23636773f7a..2c880ae7e4a 100644 --- a/community/lua-date/APKBUILD +++ b/community/lua-date/APKBUILD @@ -19,7 +19,7 @@ for _v in $_luaversions; do done case "$CARCH" in -ppc64le|riscv64) _luajit="" ;; +ppc64le|riscv64|loongarch64) _luajit="" ;; *) checkdepends="$checkdepends luajit"; _luajit="jit" ;; esac diff --git a/community/lua-dromozoa-utf8/APKBUILD b/community/lua-dromozoa-utf8/APKBUILD index a28cdc5f7a3..97de13b9b8b 100644 --- a/community/lua-dromozoa-utf8/APKBUILD +++ b/community/lua-dromozoa-utf8/APKBUILD @@ -14,7 +14,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/dromozoa/$_rockname/archive/ builddir="$srcdir/$_rockname-$pkgver" case "$CARCH" in - ppc64le|riscv64) checkdepends=""; _luajit="";; + ppc64le|riscv64|loongarch64) checkdepends=""; _luajit="";; *) checkdepends="luajit"; _luajit="jit";; esac diff --git a/community/lua-etlua/APKBUILD b/community/lua-etlua/APKBUILD index a81b129153a..fa6cd5a3246 100644 --- a/community/lua-etlua/APKBUILD +++ b/community/lua-etlua/APKBUILD @@ -7,7 +7,7 @@ pkgrel=4 pkgdesc="Embedded Lua templates" url="https://github.com/leafo/etlua" license="MIT" -arch="noarch !ppc64le !riscv64" +arch="noarch !ppc64le !riscv64 !loongarch64" makedepends="luarocks" checkdepends="lua-busted luajit moonscript" source="$_rockname-$pkgver.tar.gz::https://github.com/leafo/$_rockname/archive/v$pkgver.tar.gz diff --git a/community/lua-fifo/APKBUILD b/community/lua-fifo/APKBUILD index 1f27e6f0b36..68dea1db107 100644 --- a/community/lua-fifo/APKBUILD +++ b/community/lua-fifo/APKBUILD @@ -14,7 +14,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/daurnimator/$_pkgname/archiv builddir="$srcdir/$_pkgname-$pkgver" case "$CARCH" in -ppc64le|riscv64) _luajit="" ;; +ppc64le|riscv64|loongarch64) _luajit="" ;; *) checkdepends="$checkdepends luajit"; _luajit="jit" ;; esac diff --git a/community/lua-fun/APKBUILD b/community/lua-fun/APKBUILD index fb2635d00f4..8ed94ae5152 100644 --- a/community/lua-fun/APKBUILD +++ b/community/lua-fun/APKBUILD @@ -14,7 +14,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/rtsisyk/$_pkgname/archive/$p builddir="$srcdir/$_pkgname-$pkgver" case "$CARCH" in -ppc64le|riscv64) _luajit="" ;; +ppc64le|riscv64|loongarch64) _luajit="" ;; *) checkdepends="$checkdepends luajit"; _luajit="jit" ;; esac diff --git a/community/lua-glob-pattern/APKBUILD b/community/lua-glob-pattern/APKBUILD index 87e628504e5..09c9920dd94 100644 --- a/community/lua-glob-pattern/APKBUILD +++ b/community/lua-glob-pattern/APKBUILD @@ -18,7 +18,7 @@ for _v in $_luaversions; do done case "$CARCH" in -ppc64le|riscv64) _luajit="" ;; +ppc64le|riscv64|loongarch64) _luajit="" ;; *) checkdepends="$checkdepends luajit"; _luajit="jit" ;; esac diff --git a/community/lua-http/APKBUILD b/community/lua-http/APKBUILD index a1cbc148945..ddb932f6b0a 100644 --- a/community/lua-http/APKBUILD +++ b/community/lua-http/APKBUILD @@ -13,6 +13,7 @@ checkdepends="lua-busted lua5.1-compat53 lua5.2-compat53 lua5.1-bit32 luajit" source="$pkgname-$pkgver.tar.gz::https://github.com/daurnimator/lua-http/archive/v$pkgver.tar.gz fix-cookie-spec-test.patch $pkgname-fix-tls-test.patch::https://github.com/daurnimator/lua-http/commit/169c1a7586d39be1bf0d98b69934e8e8b08a87cd.patch + fix-tests-key-too-small.patch fix-request-spec.patch CVE-2023-4540.patch " @@ -23,8 +24,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/daurnimator/lua-http/archive case "$CARCH" in # FIXME: Some tests fail with "Address not available". - # ppc64le hangs, riscv64 doesn't have luajit - aarch64|arm*|ppc64le|riscv64) options="!check";; + # ppc64le hangs, riscv64, loongarch64 doesn't have luajit + aarch64|arm*|ppc64le|riscv64|loongarch64) options="!check";; esac _luaversions="5.1 5.2 5.3" @@ -70,6 +71,7 @@ sha512sums=" 3933c36e2d439c81ba4506d3ab1dd53a85ba3cd641abbd945210bdc6b6edb3e01516adb473cf59c5c194d9f45e7de9196e31265318d01c5b7684bb5e87dbd26a lua-http-0.4.tar.gz 32208d4389d4f1930a2e3b73868ab3070940e4e4819624556050356624718bbcb71b2da4fd9334ed2171eb14c3ed134d2ce201600948fd2372afca09ea2104b5 fix-cookie-spec-test.patch 01d558cb2f900bf751557652c04f651326cb352d975c4be1aaeff9126d2c4aebebf61b89327f3508f90df66ba8086a4704ba63000a1ea5a854bb1e08853b94dd lua-http-fix-tls-test.patch +28e7b37d272664fa4ce49ea815444d4b6668279005ea5f0d97c9b841ff6ea505c7dd778d4c531e7839b27c0e6a8c6f0151d26d534146dd59ac4c07d7474a3a8e fix-tests-key-too-small.patch a9f98c2428dc595a595beb522a2d725696c8080331cb6326da07ad79148a5482c725a22a753752eab94121e62e4647f3fe9b99ebc5954e142ccedaf631c38673 fix-request-spec.patch 6cc7b0c63f508e141492c2d72e49cc6e91f0a2efb16d3616d03f8ae56a1d1a9a97d68c837a6215505b191c70e5f6c5247946bffaafee85d7d09c895bc1feafe3 CVE-2023-4540.patch " diff --git a/community/lua-http/fix-tests-key-too-small.patch b/community/lua-http/fix-tests-key-too-small.patch new file mode 100644 index 00000000000..d8300f0ddf8 --- /dev/null +++ b/community/lua-http/fix-tests-key-too-small.patch @@ -0,0 +1,43 @@ +Patch-Source: https://github.com/daurnimator/lua-http/commit/3c3ed077aea497dadcf94188c30c147eba5e4327 +-- +From 3c3ed077aea497dadcf94188c30c147eba5e4327 Mon Sep 17 00:00:00 2001 +From: daurnimator <quae@daurnimator.com> +Date: Sun, 20 Jun 2021 00:27:22 +1000 +Subject: [PATCH] spec/: use 2048 bit RSA keys for tests + +Some OpenSSL libraries have smaller key sizes disabled. +Failure looks like: +``` +ssl.context:setCertificate: ssl_rsa.c:310:error:140AB18F:SSL routines:SSL_CTX_use_certificate:ee key too small +``` +--- + spec/client_spec.lua | 2 +- + spec/tls_spec.lua | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/spec/client_spec.lua b/spec/client_spec.lua +index daae1e9c..923d6763 100644 +--- a/spec/client_spec.lua ++++ b/spec/client_spec.lua +@@ -52,7 +52,7 @@ describe("http.client module", function() + s:close() + end + local function new_server_ctx() +- local key = openssl_pkey.new() ++ local key = openssl_pkey.new({type="RSA", bits=2048}) + local crt = openssl_x509.new() + crt:setPublicKey(key) + crt:sign(key) +diff --git a/spec/tls_spec.lua b/spec/tls_spec.lua +index 3be66733..73982fa6 100644 +--- a/spec/tls_spec.lua ++++ b/spec/tls_spec.lua +@@ -28,7 +28,7 @@ describe("http.tls module", function() + ctx:setCipherList(banned_cipher_list) + ctx:setEphemeralKey(openssl_pkey.new{ type = "EC", curve = "prime256v1" }) + local crt = openssl_x509.new() +- local key = openssl_pkey.new() ++ local key = openssl_pkey.new({type="RSA", bits=2048}) + crt:setPublicKey(key) + crt:sign(key) + assert(ctx:setPrivateKey(key)) diff --git a/community/lua-lapis-annotate/APKBUILD b/community/lua-lapis-annotate/APKBUILD index c637d10b0fe..6ef6aaffe7f 100644 --- a/community/lua-lapis-annotate/APKBUILD +++ b/community/lua-lapis-annotate/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.2.1 pkgrel=1 pkgdesc="A Lapis extension that lets you annotate your model files with their schema." url="https://github.com/leafo/lapis-annotate" -arch="noarch !ppc64le !riscv64" #blocked by lua-lapis, which requires lua-etlua +arch="noarch !ppc64le !riscv64 !loongarch64" #blocked by lua-lapis, which requires lua-etlua license="MIT" makedepends="luarocks" source="$pkgname-$pkgver.tar.gz::https://github.com/leafo/$_rockname/archive/v$pkgver.tar.gz diff --git a/community/lua-lapis-bayes/APKBUILD b/community/lua-lapis-bayes/APKBUILD index 04699a7bee4..c568a895b04 100644 --- a/community/lua-lapis-bayes/APKBUILD +++ b/community/lua-lapis-bayes/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.3.0 pkgrel=0 pkgdesc="a Naive Bayes classifier for use in Lua." url="https://github.com/leafo/lapis-bayes" -arch="noarch !ppc64le !riscv64" #blocked by lua-lapis, which requires lua-etlua +arch="noarch !ppc64le !riscv64 !loongarch64" #blocked by lua-lapis, which requires lua-etlua license="MIT" makedepends="luarocks" source="$pkgname-$pkgver.tar.gz::https://github.com/leafo/$_rockname/archive/v$pkgver.tar.gz diff --git a/community/lua-lapis-console/APKBUILD b/community/lua-lapis-console/APKBUILD index 9fd72ae8ec7..7e203016c9e 100644 --- a/community/lua-lapis-console/APKBUILD +++ b/community/lua-lapis-console/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.2.0 pkgrel=1 pkgdesc="An interactive console for the Lapis web framework." url="https://github.com/leafo/lapis-console" -arch="noarch !ppc64le !riscv64" #blocked by lua-lapis, which requires lua-etlua +arch="noarch !ppc64le !riscv64 !loongarch64" #blocked by lua-lapis, which requires lua-etlua license="MIT" makedepends="luarocks" source="$pkgname-$pkgver.tar.gz::https://github.com/leafo/$_rockname/archive/v$pkgver.tar.gz diff --git a/community/lua-lapis-eswidget/APKBUILD b/community/lua-lapis-eswidget/APKBUILD index 793beffb9e2..665d1f25222 100644 --- a/community/lua-lapis-eswidget/APKBUILD +++ b/community/lua-lapis-eswidget/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.4.0 pkgrel=1 pkgdesc="Lapis widget class library" url="https://github.com/leafo/lapis-eswidget" -arch="noarch !ppc64le !riscv64" #blocked by lua-lapis, which requires lua-etlua +arch="noarch !ppc64le !riscv64 !loongarch64" #blocked by lua-lapis, which requires lua-etlua license="MIT" makedepends="luarocks" source="$pkgname-$pkgver.tar.gz::https://github.com/leafo/$_rockname/archive/v$pkgver.tar.gz diff --git a/community/lua-lapis-exceptions/APKBUILD b/community/lua-lapis-exceptions/APKBUILD index c67313005dd..10584b8d524 100644 --- a/community/lua-lapis-exceptions/APKBUILD +++ b/community/lua-lapis-exceptions/APKBUILD @@ -6,7 +6,7 @@ pkgver=2.4.0 pkgrel=1 pkgdesc="This module makes the error handler in Lapis save the errors to database. Optionally you can make it email you the exceptions." url="https://github.com/leafo/lapis-exceptions" -arch="noarch !ppc64le !riscv64" #blocked by lua-lapis, which requires lua-etlua +arch="noarch !ppc64le !riscv64 !loongarch64" #blocked by lua-lapis, which requires lua-etlua license="MIT" makedepends="luarocks" source="$pkgname-$pkgver.tar.gz::https://github.com/leafo/$_rockname/archive/v$pkgver.tar.gz diff --git a/community/lua-lapis/APKBUILD b/community/lua-lapis/APKBUILD index cd6cf7ed1b5..e7f583f06b4 100644 --- a/community/lua-lapis/APKBUILD +++ b/community/lua-lapis/APKBUILD @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="A web framework for Lua/MoonScript supporting OpenResty or http.server" url="https://leafo.net/lapis/" license="MIT" -arch="noarch !ppc64le !riscv64" # blocked by lua-etlua, which requires luajit +arch="noarch !ppc64le !riscv64 !loongarch64" # blocked by lua-etlua, which requires luajit depends=" lua lua-ansicolors diff --git a/community/lua-lsqlite3/APKBUILD b/community/lua-lsqlite3/APKBUILD index 0ed3fa99554..356c3401d8e 100644 --- a/community/lua-lsqlite3/APKBUILD +++ b/community/lua-lsqlite3/APKBUILD @@ -73,6 +73,7 @@ _subpackage() { mkdir -p "$rockdir" echo 'rock_manifest = {}' > "$rockdir"/rock_manifest } + sha512sums=" -ad4ff9ed9a30e2dd8a5db5c02aff259ae523702875e276d4f98ab389c62dd415a45f49f9c25b9e12d136ee147beaa27d5cd616795468f371f7cdd98c5fce0962 lsqlite3-0.9.6.zip +c90081879f3f094fa86b7fe5894c8fa937d98188b677da68678b3938b7630b9232d831f2d6c64fe63f676a7f1a1a9ae84ce7d8bc74cec6e74150e126a68c2c92 lsqlite3-0.9.6.zip " diff --git a/community/lua-luv/APKBUILD b/community/lua-luv/APKBUILD index 430b511d926..7bedd054431 100644 --- a/community/lua-luv/APKBUILD +++ b/community/lua-luv/APKBUILD @@ -27,7 +27,7 @@ source="https://github.com/luvit/luv/archive/$_pkgver/lua-luv-$_pkgver.tar.gz builddir="$srcdir/luv-$_pkgver" case "$CARCH" in -ppc64le|riscv64) +ppc64le|riscv64|loongarch64) _luajit="" ;; *) diff --git a/testing/lua-mimetypes/APKBUILD b/community/lua-mimetypes/APKBUILD index fdcf5acd5a3..fdcf5acd5a3 100644 --- a/testing/lua-mimetypes/APKBUILD +++ b/community/lua-mimetypes/APKBUILD diff --git a/community/lua-mmdb/APKBUILD b/community/lua-mmdb/APKBUILD index b624ea72d78..4dcd6fe0e3c 100644 --- a/community/lua-mmdb/APKBUILD +++ b/community/lua-mmdb/APKBUILD @@ -24,7 +24,7 @@ for _v in $_luaversions; do done case "$CARCH" in - ppc64le|riscv64) _luajit="" ;; + ppc64le|riscv64|loongarch64) _luajit="" ;; *) checkdepends="$checkdepends luajit"; _luajit="jit" ;; esac diff --git a/community/lua-rapidjson/APKBUILD b/community/lua-rapidjson/APKBUILD index d5d53f3877e..5ecafe2aa1a 100644 --- a/community/lua-rapidjson/APKBUILD +++ b/community/lua-rapidjson/APKBUILD @@ -16,7 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/xpol/lua-rapidjson/archive/v " case "$CARCH" in -ppc64le|riscv64) _luajit="" ;; +ppc64le|riscv64|loongarch64) _luajit="" ;; *) checkdepends="$checkdepends luajit"; _luajit="jit" ;; esac diff --git a/community/lua-resty-hmac/APKBUILD b/community/lua-resty-hmac/APKBUILD index 5a9aa81458a..be7a49e7a89 100644 --- a/community/lua-resty-hmac/APKBUILD +++ b/community/lua-resty-hmac/APKBUILD @@ -3,20 +3,21 @@ pkgname=lua-resty-hmac pkgver=0.06 _pkgver=$pkgver-1 -pkgrel=0 +pkgrel=1 pkgdesc="HMAC functions for OpenResty" url="https://github.com/jkeys089/lua-resty-hmac" -# ppc64le, riscv64 blocked by luajit -> nginx-mod-http-lua -arch="noarch !ppc64le !riscv64" +# ppc64le, riscv64, loongarch64 blocked by luajit -> nginx-mod-http-lua +arch="noarch !ppc64le !riscv64 !loongarch64" license="BSD-2-Clause" depends="nginx-mod-http-lua lua-resty-string" checkdepends="perl-utils perl-test-nginx" -source="$pkgname-$_pkgver.tar.gz::https://github.com/jkeys089/lua-resty-hmac/archive/refs/tags/$_pkgver.tar.gz" +source="$pkgname-$_pkgver.tar.gz::https://github.com/jkeys089/lua-resty-hmac/archive/refs/tags/$_pkgver.tar.gz + make-install-without-string.lua.patch + " builddir="$srcdir/$pkgname-$_pkgver" package() { make DESTDIR="$pkgdir" LUA_LIB_DIR="/usr/share/lua/common" install - rm "$pkgdir/usr/share/lua/common/resty/string.lua" } check() { @@ -29,4 +30,5 @@ check() { sha512sums=" 7cc5a84f8a8d4cd8e9fce13e98db39c5c96a734e236fe17dd0c663bd4fa506efadacf12bc8f416954b4d4fdea8b67a4339152f06a51b43858963bb3135e5becc lua-resty-hmac-0.06-1.tar.gz +37698af7034df76352cf721b6e5e4d3ba074619e3a00b14314c9e56532cc0dc6b3984d132a15df985c6647a1d4832daeea6218f0bb68a07939cc0b5b902a7723 make-install-without-string.lua.patch " diff --git a/community/lua-resty-hmac/make-install-without-string.lua.patch b/community/lua-resty-hmac/make-install-without-string.lua.patch new file mode 100644 index 00000000000..ebd0df44c1a --- /dev/null +++ b/community/lua-resty-hmac/make-install-without-string.lua.patch @@ -0,0 +1,13 @@ +--- a/Makefile ++++ b/Makefile +@@ -11,9 +11,8 @@ + @$(INSTALL) -d resty_modules/lualib/resty + @test -f resty_modules/lualib/resty/string.lua || curl -s -o resty_modules/lualib/resty/string.lua https://raw.githubusercontent.com/openresty/lua-resty-string/master/lib/resty/string.lua + +-install: all ++install: + $(INSTALL) -d $(DESTDIR)$(LUA_LIB_DIR)/resty +- $(INSTALL) resty_modules/lualib/resty/*.lua $(DESTDIR)$(LUA_LIB_DIR)/resty + $(INSTALL) lib/resty/*.lua $(DESTDIR)$(LUA_LIB_DIR)/resty + + test: install diff --git a/community/lua-resty-jwt/APKBUILD b/community/lua-resty-jwt/APKBUILD index f2ddf88c872..841ae4457d9 100644 --- a/community/lua-resty-jwt/APKBUILD +++ b/community/lua-resty-jwt/APKBUILD @@ -5,8 +5,8 @@ pkgver=0.2.3 pkgrel=1 pkgdesc="JSON Web Token library for OpenResty" url="https://github.com/cdbattags/lua-resty-jwt" -# ppc64le, riscv64 blocked by luajit -> lua-resty-hmac -arch="noarch !ppc64le !riscv64" +# ppc64le, riscv64, loongarch64 blocked by luajit -> lua-resty-hmac +arch="noarch !ppc64le !riscv64 !loongarch64" license="Apache-2.0" depends="lua-resty-hmac" source="$pkgname-$pkgver.tar.gz::https://github.com/cdbattags/$pkgname/archive/v$pkgver.tar.gz" diff --git a/community/lua-resty-openidc/APKBUILD b/community/lua-resty-openidc/APKBUILD index c7e7b2e090f..4390bc84d3b 100644 --- a/community/lua-resty-openidc/APKBUILD +++ b/community/lua-resty-openidc/APKBUILD @@ -5,8 +5,8 @@ pkgver=1.7.5 pkgrel=1 pkgdesc="OpenID Connect library for the nginx lua module" url="https://github.com/zmartzone/$pkgname" -# ppc64le, riscv64 blocked by luajit -> lua-resty-string -arch="noarch !ppc64le !riscv64" +# ppc64le, riscv64, loongarch64 blocked by luajit -> lua-resty-string +arch="noarch !ppc64le !riscv64 !loongarch64" license="BSD-2-Clause" source="$pkgname-$pkgver.tar.gz::https://github.com/zmartzone/$pkgname/archive/v$pkgver.tar.gz add-support-form-post-response.patch" diff --git a/community/lua-timerwheel/APKBUILD b/community/lua-timerwheel/APKBUILD index 8004b1cc4c6..08547fe20cd 100644 --- a/community/lua-timerwheel/APKBUILD +++ b/community/lua-timerwheel/APKBUILD @@ -17,7 +17,7 @@ source="https://github.com/Tieske/timerwheel.lua/archive/$pkgver/timerwheel.lua- builddir="$srcdir/timerwheel.lua-$pkgver" case "$CARCH" in - ppc64le|riscv64) _luajit="";; + ppc64le|riscv64|loongarch64) _luajit="";; *) checkdepends="$checkdepends luajit"; _luajit="jit";; esac diff --git a/community/lua-turbo/APKBUILD b/community/lua-turbo/APKBUILD index e716eb23bfa..ce3292b0e44 100644 --- a/community/lua-turbo/APKBUILD +++ b/community/lua-turbo/APKBUILD @@ -5,8 +5,8 @@ pkgver=2.1.3 pkgrel=10 pkgdesc="framework built for LuaJIT 2 and Linux" url="https://github.com/kernelsauce/turbo" -# ppc64le, riscv64 blocked by luajit -arch="all !ppc64le !riscv64" +# ppc64le, riscv64, loongarch64 blocked by luajit +arch="all !ppc64le !riscv64 !loongarch64" license="Apache-2.0" depends="luajit lua5.1-cjson lua5.1-sec ca-certificates" subpackages="$pkgname-openrc" diff --git a/community/luakit/APKBUILD b/community/luakit/APKBUILD index 0ff23a25812..63e596836c3 100644 --- a/community/luakit/APKBUILD +++ b/community/luakit/APKBUILD @@ -7,8 +7,8 @@ pkgdesc="Fast, small, webkit based browser framework extensible by Lua" url="https://luakit.github.io/" # armv7: fails to build # s390x: install fails -# ppc64le, riscv64: no luajit -arch="all !armv7 !ppc64le !s390x !riscv64" +# ppc64le, riscv64, loongarch64: no luajit +arch="all !armv7 !ppc64le !s390x !riscv64 !loongarch64" license="GPL-3.0-or-later" depends=" gsettings-desktop-schemas diff --git a/community/luau/APKBUILD b/community/luau/APKBUILD index 95bf48838a6..9590d2d72bb 100644 --- a/community/luau/APKBUILD +++ b/community/luau/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rob Blanckaert <basicer@gmail.com> # Maintainer: Rob Blanckaert <basicer@gmail.com> pkgname=luau -pkgver=0.612 +pkgver=0.621 pkgrel=0 pkgdesc="A fast, small, safe, gradually typed embeddable scripting language derived from Lua" url="https://github.com/roblox/luau" @@ -10,7 +10,6 @@ license="MIT" makedepends="cmake linux-headers samurai" source=" $pkgname-$pkgver.tar.gz::https://github.com/luau-lang/luau/archive/refs/tags/$pkgver.tar.gz -weak-unwind.patch " build() { @@ -36,6 +35,5 @@ package() { } sha512sums=" -442c1528e119e9ad8b58b76cafdca5b59240be04852851f3bb3566276e2ee8b13f65b0225b3db6ef3f8e459b3d3ff7f665a7684c7bef7d588dd9f7f493b13389 luau-0.612.tar.gz -7589340a874cd99d26d5eced8015b52fa4e151c4801e60ddd98fd948486a25c21372120fa02abc610d5aa157eeb9dd008835f81da04be0be3f319841405129f8 weak-unwind.patch +be96a6dc2e1092fe4fd4ad215978bbf4341ff6ddde08763b03467edebf8b7610fb580b8f7b09220846d64245ef27502316e1b35826c581e5eae7329c99d7a84f luau-0.621.tar.gz " diff --git a/community/luau/weak-unwind.patch b/community/luau/weak-unwind.patch deleted file mode 100644 index d24c338c28b..00000000000 --- a/community/luau/weak-unwind.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- base/CodeGen/src/CodeBlockUnwind.cpp -+++ luau-0.610/CodeGen/src/CodeBlockUnwind.cpp -@@ -20,8 +20,8 @@ - #elif defined(__linux__) || defined(__APPLE__) - - // Defined in unwind.h which may not be easily discoverable on various platforms --extern "C" void __register_frame(const void*); --extern "C" void __deregister_frame(const void*); -+extern "C" void __register_frame(const void*) __attribute__((weak)); -+extern "C" void __deregister_frame(const void*) __attribute__((weak)); - - extern "C" void __unw_add_dynamic_fde() __attribute__((weak)); - #endif diff --git a/community/lucene++/APKBUILD b/community/lucene++/APKBUILD index f28fdc5ded1..f8dd1c5cee2 100644 --- a/community/lucene++/APKBUILD +++ b/community/lucene++/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lucene++ pkgver=3.0.8 -pkgrel=10 +pkgrel=11 pkgdesc="C++ port of the popular Java Lucene library" url="https://github.com/luceneplusplus/LucenePlusPlus" arch="all" diff --git a/community/lxdm/APKBUILD b/community/lxdm/APKBUILD index f563304f24a..731f1616a7e 100644 --- a/community/lxdm/APKBUILD +++ b/community/lxdm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lxdm pkgver=0.5.3 -pkgrel=6 +pkgrel=7 pkgdesc="LXDE desktop login manager" url="https://sourceforge.net/projects/lxdm/" arch="all" @@ -63,6 +63,6 @@ sha512sums=" b66d47a3c026f84c76fb6ae0701ff69d2736a2c0fdf898191836c0c5e2b0d624c7a7846cd38596ee800fab53ebcd843c26779c56c0f655df1659ecc5b251b576 execinfo.patch 1eaf438e64901168a557d3e278de4dd7eb4e580594175a26f9c8d27bd8de2dae81467ebd3a96f0a4dfb5f19c2257ce1ee5608e753e8d9d53c2e4ba488f798b0e fix-msghdr-usage.patch c8ec8a4db3399263d32e2e1b2cc6ee9e8db380a794b0307197681c266989111254191256eb61527923960da2f377e27f9eda023f6a2e98919ae65f118b35c43d background.png -2136ab2429b0c65969c5c614660efab237bb5da39bc60bebf976b96f6fbffdd73cdd7fd299a004b5100852ce6e93a0c9218b3a39863693da670154503bc53e9f lxdm.initd +c00a901e48ea2ec04ee5e4bdf6d8e8af68576785d16f655bdfff130bdea77ef7edecf5ef01b58dba14b869f7e1c2488b0aa5c02aed249856fd6bb1dadeb0245a lxdm.initd 1374daa94bde0fb71056cebc8524da32b57c241a8af97501daa930c43dc087aa3fec2d79f10ceab5a73a4dcf9cce478fb77575d7019cafd54ad9731c9e9dd55f index.theme.alpine " diff --git a/community/lxdm/lxdm.initd b/community/lxdm/lxdm.initd index eb10452133b..606ab969cb4 100644 --- a/community/lxdm/lxdm.initd +++ b/community/lxdm/lxdm.initd @@ -6,7 +6,7 @@ description="Lightweight Display Manager from LXDM" command=/usr/sbin/lxdm -depends() { +depend() { provide display-manager - needs localmount + need localmount } diff --git a/community/lyx/APKBUILD b/community/lyx/APKBUILD index 78b6969c8ad..b12e6c3a2c8 100644 --- a/community/lyx/APKBUILD +++ b/community/lyx/APKBUILD @@ -3,7 +3,7 @@ pkgname=lyx _pkgver=2.3.7-1 pkgver=${_pkgver/-/.} -pkgrel=2 +pkgrel=3 pkgdesc="Advanced WYSIWYM document processor & LaTeX front-end" url="https://www.lyx.org" arch="all" diff --git a/community/m1n1/APKBUILD b/community/m1n1/APKBUILD index 22e3b53a3b7..84796c9cbe8 100644 --- a/community/m1n1/APKBUILD +++ b/community/m1n1/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=m1n1 -pkgver=1.4.11 +pkgver=1.4.12 _artwork_commitid=8f94d09964c00678ed01b24de9b75350735ec486 pkgrel=0 pkgdesc="bootloader and experimentation playground for Apple Silicon" @@ -31,6 +31,6 @@ package() { } sha512sums=" -38a7c7d3b11e8543a9f89afaca008ed711152f6d91f2ab20e6ce4023fa90cf1ba0b406bcf0ba033b500caaefcfe6aa35cbcdf9cbcbf976e642f7b1689187d8bb m1n1-1.4.11.tar.gz -60b5215fcf3d6b64e21553ddb87d0fad0588ce16ee8ba76e676233a6c91ca97373a0258b7a352f4f7028d1887d7c5a996de6aac1989d6e595e9b18477a25d2fb artwork-1.4.11.tar.gz +2537c06523e133c169cd8a21cce0f644d004c8d9aa25ea08a8c5f0781851f68f832b4ac44011f5541ad6ab61271ece7c9d7337fa252f068673850090622659f3 m1n1-1.4.12.tar.gz +60b5215fcf3d6b64e21553ddb87d0fad0588ce16ee8ba76e676233a6c91ca97373a0258b7a352f4f7028d1887d7c5a996de6aac1989d6e595e9b18477a25d2fb artwork-1.4.12.tar.gz " diff --git a/community/mailcommon/APKBUILD b/community/mailcommon/APKBUILD index 02c11e76b39..c86624f6e8e 100644 --- a/community/mailcommon/APKBUILD +++ b/community/mailcommon/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 pkgdesc="KDE PIM library providing support for mail applications" # riscv64 disabled due to missing rust in recursive dependency # ppc64le, s390x, armhf, riscv64 and armv7 blocked by messagelib -> qt6-qtwebengine -arch="all !ppc64le !s390x !armhf !riscv64 !armv7" +# loongarch64 blocked by mailimporter +arch="all !ppc64le !s390x !armhf !riscv64 !armv7 !loongarch64" url="https://kontact.kde.org/" license="GPL-2.0-or-later" # TODO: Consider replacing gnupg with specific gnupg subpackages that mailcommon really needs. diff --git a/community/mailimporter/APKBUILD b/community/mailimporter/APKBUILD index 4e2437c414a..775b218b7fb 100644 --- a/community/mailimporter/APKBUILD +++ b/community/mailimporter/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 pkgdesc="KDE PIM library providing support for mail applications" # armhf blocked by extra-cmake-modules # ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -> akonadi -arch="all !armhf !ppc64le !s390x !riscv64" +# loongarch64 blocked by pimcommon +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kontact.kde.org/" license="GPL-2.0-or-later" depends_dev=" diff --git a/community/marble/APKBUILD b/community/marble/APKBUILD index 344aa028c83..7bf0824063f 100644 --- a/community/marble/APKBUILD +++ b/community/marble/APKBUILD @@ -8,8 +8,8 @@ pkgver=24.02.2 pkgrel=0 pkgdesc="A Virtual Globe and World Atlas that you can use to learn more about Earth" # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt6-qtwebengine +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url='https://marble.kde.org' license="LGPL-2.1-or-later AND GPL-3.0-or-later" depends_dev=" diff --git a/community/massif-visualizer/APKBUILD b/community/massif-visualizer/APKBUILD index 2c4fe3e2566..992bb3bddb1 100644 --- a/community/massif-visualizer/APKBUILD +++ b/community/massif-visualizer/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-other pkgname=massif-visualizer -pkgver=0.7.0 -pkgrel=3 +pkgver=0.8.0 +pkgrel=0 pkgdesc="Visualizer for Valgrind Massif data files" # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -13,16 +13,15 @@ url="https://kde.org/applications/development/org.kde.massif-visualizer" license="GPL-2.0-or-later" makedepends=" extra-cmake-modules - karchive5-dev - kconfig5-dev - kcoreaddons5-dev + karchive-dev + kconfig-dev + kcoreaddons-dev kdiagram-dev - ki18n5-dev - kio5-dev - kparts5-dev - qt5-qtbase-dev - qt5-qtsvg-dev - qt5-qtxmlpatterns-dev + ki18n-dev + kio-dev + kparts-dev + qt6-qtbase-dev + qt6-qtsvg-dev samurai " checkdepends="xvfb-run" @@ -30,12 +29,10 @@ source="https://download.kde.org/stable/massif-visualizer/$pkgver/src/massif-vis subpackages="$pkgname-lang" build() { - # The infowidget plugin is disabled due to an incompatibility with musl cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DENABLE_INFOWIDGET_PLUGIN=FALSE + -DCMAKE_INSTALL_LIBDIR=lib cmake --build build } @@ -47,4 +44,6 @@ package() { DESTDIR="$pkgdir" cmake --install build } -sha512sums="058412e34c0899a34fb4080a602cb0c70a9ac707f27b72a79fb412ea35a6e8c66ce06df15b3153fdc1a70a27232f98b508c7441b657eb73466962b33f9b2f561 massif-visualizer-0.7.0.tar.xz" +sha512sums=" +e5bbcb7e5e0ac073ec292fffe397242b94c98895f3abb28ccf2f9c9727c52e3c6ae333a447b3131daa3164e9409d1dcb6c9852ab48a24985d07b1e32943045ae massif-visualizer-0.8.0.tar.xz +" diff --git a/community/mate-icon-theme/APKBUILD b/community/mate-icon-theme/APKBUILD index 615400c06c4..cb2aa4733f1 100644 --- a/community/mate-icon-theme/APKBUILD +++ b/community/mate-icon-theme/APKBUILD @@ -11,6 +11,11 @@ depends="mate-common" makedepends="icon-naming-utils intltool" source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-icon-theme-$pkgver.tar.xz" +prepare(){ + default_prepare + update_config_sub +} + build() { DATADIRNAME=share ./configure \ --build=$CBUILD \ diff --git a/community/mautrix-whatsapp/APKBUILD b/community/mautrix-whatsapp/APKBUILD index 8d1bbe1963e..ef290912ed7 100644 --- a/community/mautrix-whatsapp/APKBUILD +++ b/community/mautrix-whatsapp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=mautrix-whatsapp pkgver=0.10.7 -pkgrel=0 +pkgrel=1 pkgdesc="Matrix-WhatsApp puppeting bridge" url="https://maunium.net/go/mautrix-whatsapp" arch="all" @@ -51,7 +51,7 @@ package() { sha512sums=" b0d3d572bbd29e5b4391662fd3fa1e6849d9f51a094257072883ec2797972defbfc3e22ab6fa0354b634045974bbe8a6d090699330c3ace1021f944757a766f3 mautrix-whatsapp-0.10.7.tar.gz -428253b07200b66c8ac364d9238665b7e93de1797f0f49b4a9b2513445613e7b0f06716b1c91f883c51a1e9115a2cf8f716364e61fea0a416faa78cfb86783aa mautrix-whatsapp.initd +320ec426f033e93297bb3dd2ebe6996a9a677c53e76e8eb6d4b6f2bb24c1c756ef8d38d2dbb0d038369507fd9bf4864e73ab86783be3f6bbca150fe46a669841 mautrix-whatsapp.initd 9349b660273c63d2973f1b99ddbd98469dddc098157380603210159f17d3cb1eb55e71dbd21550b20d40831f4da320225e7c03441667e2750e30a2e1fa03acfe mautrix-whatsapp.confd d5b66b40dde25f24986788669b91dfafe2f35f901b87ff30bfe8c8ab663ebbbe9bd10ac974f73115abd935eb0f27d5645fcbe641a6c6925c24eaa8c7fa9ab6b7 default-log-dir.patch " diff --git a/community/mautrix-whatsapp/mautrix-whatsapp.initd b/community/mautrix-whatsapp/mautrix-whatsapp.initd index f7bf332ea67..a3657cb5fdc 100644 --- a/community/mautrix-whatsapp/mautrix-whatsapp.initd +++ b/community/mautrix-whatsapp/mautrix-whatsapp.initd @@ -10,7 +10,7 @@ description="Daemon for Mautrix-Whatsapp, a Matrix-WhatsApp puppeting bridge" command="/usr/bin/mautrix-whatsapp" command_args="-c $config $command_args" -depends() { +depend() { need net } diff --git a/community/mbedtls2/APKBUILD b/community/mbedtls2/APKBUILD index e3446c08f86..5d4719e1a0f 100644 --- a/community/mbedtls2/APKBUILD +++ b/community/mbedtls2/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mbedtls2 pkgver=2.28.8 # long-time support branch -pkgrel=0 +pkgrel=1 pkgdesc="Light-weight cryptographic and SSL/TLS library" url="https://www.trustedfirmware.org/projects/mbed-tls/" arch="all" @@ -13,9 +13,6 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-utils" source="mbedtls-$pkgver.tar.gz::https://github.com/ARMmbed/mbedtls/archive/v$pkgver.tar.gz" builddir="$srcdir/mbedtls-$pkgver" -replaces="mbedtls" -provides="mbedtls=$pkgver-r$pkgrel" - # Track security issues # https://tls.mbed.org/security @@ -70,9 +67,8 @@ build() { } check() { - cd build # tests break in parallel - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -j1 + ctest -j1 --test-dir build --output-on-failure } package() { @@ -81,16 +77,17 @@ package() { utils() { pkgdesc="Utilities for mbedtls (including gen_key / cert_write)" + replaces="mbedtls-utils" + provides="mbedtls-utils=$pkgver-r$pkgrel" + - mkdir -p "$subpkgdir"/usr - mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ + amove usr/bin } static() { pkgdesc="Static files for mbedtls" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/ + amove usr/lib/*.a chmod -x "$subpkgdir"/usr/lib/*.a } diff --git a/community/mdds/APKBUILD b/community/mdds/APKBUILD index f11bba29497..82b83a3d444 100644 --- a/community/mdds/APKBUILD +++ b/community/mdds/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=mdds pkgver=2.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="Multi-dimensional data index algorithm" url="https://gitlab.com/mdds/mdds" arch="noarch" diff --git a/community/mediainfo/APKBUILD b/community/mediainfo/APKBUILD index d5a4454ed3a..f6f92025694 100644 --- a/community/mediainfo/APKBUILD +++ b/community/mediainfo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=mediainfo -pkgver=24.03 +pkgver=24.04 pkgrel=0 pkgdesc="Supplies technical and tag information about media files" url="https://mediaarea.net/en/MediaInfo" @@ -80,5 +80,5 @@ gui() { } sha512sums=" -18937646156515356c2d9baab61cd21142ce86982ab9107afa4967d79d3b30437fa52b47a67ff26a99d457d9887bc3b4378e594f1f7ce95a29a851d3671c3d63 mediainfo_24.03.tar.xz +8e3ee394786c142ec837a94f803f02da7f897bd22d20dc8c2d83c724338fb2d3120d00c2740640feb05313b08bf07c282ed6c562d15efad6dc95f9d4db42a40e mediainfo_24.04.tar.xz " diff --git a/community/megapixels/0001-Don-t-pass-length-parameter-for-TIFFSetField-TIFFTAG.patch b/community/megapixels/0001-Don-t-pass-length-parameter-for-TIFFSetField-TIFFTAG.patch new file mode 100644 index 00000000000..a9c1edb2959 --- /dev/null +++ b/community/megapixels/0001-Don-t-pass-length-parameter-for-TIFFSetField-TIFFTAG.patch @@ -0,0 +1,48 @@ +From 3aecdcdaa95398999c57b9a379921b52b64280f4 Mon Sep 17 00:00:00 2001 +From: Arnav Singh <me@arnavion.dev> +Date: Fri, 26 Apr 2024 08:53:55 -0700 +Subject: [PATCH] Don't pass length parameter for + TIFFSetField(TIFFTAG_CFAREPEATPATTERNDIM) + +libtiff broke its API again and now requires the original +three-parameter way of setting TIFFTAG_CFAREPEATPATTERNDIM instead of +the new four-parameter way. It has possibly been like this since v4.5.1. + +Megapixels upstream is considering a more permanent way to become immune to +these breakages (switching from libtiff to libdng), but for now this commit +makes the existing release work. + +Ref: https://gitlab.com/megapixels-org/Megapixels/-/issues/4 +--- + src/process_pipeline.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/src/process_pipeline.c b/src/process_pipeline.c +index e6520e6..af6c563 100644 +--- a/src/process_pipeline.c ++++ b/src/process_pipeline.c +@@ -693,21 +693,12 @@ process_image_for_capture(const uint8_t *image, int count) + TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1); + TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); + +-#if (TIFFLIB_VERSION > 20230000) +- static const short cfapatterndim[] = { 2, 2 }; +- TIFFSetField(tif, TIFFTAG_CFAREPEATPATTERNDIM, 2, cfapatterndim); +- TIFFSetField(tif, +- DNGTAG_CFAPATTERN, +- 4, +- mp_pixel_format_cfa_pattern(mode.pixel_format)); +-#else + static const short cfapatterndim[] = { 2, 2 }; + TIFFSetField(tif, TIFFTAG_CFAREPEATPATTERNDIM, cfapatterndim); + TIFFSetField(tif, + DNGTAG_CFAPATTERN, + 4, + mp_pixel_format_cfa_pattern(mode.pixel_format)); +-#endif + + printf("TIFF version %d\n", TIFFLIB_VERSION); + int whitelevel = camera->whitelevel; +-- +2.44.0 + diff --git a/community/megapixels/APKBUILD b/community/megapixels/APKBUILD index 32dec6d043e..c8ee53e3736 100644 --- a/community/megapixels/APKBUILD +++ b/community/megapixels/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Martijn Braam <martijn@brixit.nl> # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org> pkgname=megapixels -pkgver=1.8.0 +pkgver=1.8.2 pkgrel=0 pkgdesc="GTK+4 camera app for mobile devices" url="https://gitlab.com/megapixels-org/Megapixels" @@ -17,11 +17,13 @@ makedepends=" gtk4.0-dev libxrandr-dev meson - tiff-dev + tiff-dev>=4.6.0t zbar-dev " subpackages="$pkgname-tools" -source="https://gitlab.com/megapixels-org/Megapixels/-/archive/$pkgver/Megapixels-$pkgver.tar.bz2" +source="https://gitlab.com/megapixels-org/Megapixels/-/archive/$pkgver/Megapixels-$pkgver.tar.bz2 + 0001-Don-t-pass-length-parameter-for-TIFFSetField-TIFFTAG.patch + " options="!check" # There's no testsuite builddir="$srcdir/Megapixels-$pkgver" @@ -43,5 +45,6 @@ tools() { } sha512sums=" -e2fb7c3535c81412862a8ec0734d25f89ac2d605b305dd476a9ab01ab2d5923dd00dfd7f5ff79c1723f482c33fd3993e70d13fcbb9020e40d775ec161abd9636 Megapixels-1.8.0.tar.bz2 +cbcb76a70f153faaf5ad5cca10947243a0d9b7370ecd1e16b7690b4ee9dd59cfd96eda2cb67a52e2b719748b8e49be94dbe227ddbf6035426ca3d5f2a8212c11 Megapixels-1.8.2.tar.bz2 +bfaa5b1729642f2eeb5b9e6b0c3b8b6152ecd8c3510301588719efb303d27d64b27aebe0773bf7b71f6481ee4508204cbb68b5cc4b2856fb3bda60bd306f9751 0001-Don-t-pass-length-parameter-for-TIFFSetField-TIFFTAG.patch " diff --git a/community/mercurial/APKBUILD b/community/mercurial/APKBUILD index b1dd432f04a..e8db8ce4067 100644 --- a/community/mercurial/APKBUILD +++ b/community/mercurial/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mercurial -pkgver=6.7.2 -pkgrel=1 +pkgver=6.7.3 +pkgrel=0 pkgdesc="Scalable distributed SCM tool" url="https://www.mercurial-scm.org/" arch="all" @@ -45,6 +45,7 @@ aarch64|armhf) ;; esac case "$CARCH" in +*) ;; # https://github.com/dgrunwald/rust-cpython/issues/294 x86_64|armv7|armhf|aarch64|x86|ppc64le) # Oxidation, limited by Rust export HGWITHRUSTEXT=cpython @@ -127,6 +128,6 @@ lang() { } sha512sums=" -cb64daf885451d606ad34c408fbefc900be0fab7c0e0c2fc63dda32676de1c77a9d194c8c4974a608020a0f09e326682443537769eaa97acaf89ad7e385e0ce5 mercurial-6.7.2.tar.gz +40a8f085904d4974160a875ab30f3cec6ebee514ca11fbc821df258196e304c173393b1ed6f2724ddcfc775f8be89dda9a1297879d0e4b5804ddf958f79fe19c mercurial-6.7.3.tar.gz b24e1b79ca36ac1d78a5af4e35eb87581f209255838327a7d9315c17175d41bfa4b7f98c66be078cfa1e7d27a41c1a12bba265fa6d3d30edb4e2ba599fe0ed18 blacklist.txt " diff --git a/community/merkuro/APKBUILD b/community/merkuro/APKBUILD index cae27e716e5..ece41b4d9a9 100644 --- a/community/merkuro/APKBUILD +++ b/community/merkuro/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 pkgdesc="A calendar application using Akonadi to sync with external services (NextCloud, GMail, ...)" # armhf blocked by qt6-qtdeclarative # ppc64le, s390x, riscv64 and armv7 blocked by qt6-qtwebengine -> akonadi -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# loongarch64 blocked by kdepim-runtime +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://invent.kde.org/pim/kalendar" license="GPL-3.0-or-later AND BSD-2-Clause" depends=" diff --git a/community/messagelib/APKBUILD b/community/messagelib/APKBUILD index 480d2ddefda..d21839de811 100644 --- a/community/messagelib/APKBUILD +++ b/community/messagelib/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 pkgdesc="KDE PIM messaging library" # armhf blocked by extra-cmake-modules # armv7, ppc64le, s390x, riscv64 blocked by qt6-qtwebengine -arch="all !armv7 !armhf !ppc64le !s390x !riscv64" +# loongarch64 blocked by pimcommon +arch="all !armv7 !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kontact.kde.org/" license="LGPL-2.0-only OR LGPL-3.0-only AND GPL-2.0-or-later" depends_dev=" diff --git a/community/milou/APKBUILD b/community/milou/APKBUILD index 484e9840f25..4d371f033e0 100644 --- a/community/milou/APKBUILD +++ b/community/milou/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=milou -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="A dedicated search application built on top of Baloo" # armhf blocked by qt6-qtdeclarative @@ -50,5 +50,5 @@ package() { } sha512sums=" -34fdc623566dfc30c66142351ea6f0a8d1bda14c6cf5965cb62f0bb27ed509fb19af5c2889debd65dbc2cd5d8c53677b71e244f26dea9129dadfa9e4bc328605 milou-6.0.3.tar.xz +8a95186eb0933236f03e846d8cc2ab886882e44a13de98de4aefdd915955f5f3f7d4fb0c358449869324dd7deca772c78172c90a2203828e30e9c39fb70d8c71 milou-6.0.4.tar.xz " diff --git a/community/minetest-mineclone2/APKBUILD b/community/minetest-mineclone2/APKBUILD index 3da9b9587cb..5871b5ec8bb 100644 --- a/community/minetest-mineclone2/APKBUILD +++ b/community/minetest-mineclone2/APKBUILD @@ -6,8 +6,8 @@ pkgver=0.77.0 pkgrel=0 pkgdesc="Voxel-based sandbox game for Minetest" url="https://git.minetest.land/MineClone2/MineClone2" -# riscv64 blocked by luajit -> minetest -arch="noarch !riscv64 !ppc64le" +# riscv64, loongarch64 blocked by luajit -> minetest +arch="noarch !riscv64 !ppc64le !loongarch64" license="GPL-3.0-or-later" depends="minetest-common" source="$pkgname-$pkgver.tar.gz::https://git.minetest.land/MineClone2/MineClone2/archive/$pkgver.tar.gz" diff --git a/community/minetest-monitoring/APKBUILD b/community/minetest-monitoring/APKBUILD index 78ea47cb78a..508c08eabd8 100644 --- a/community/minetest-monitoring/APKBUILD +++ b/community/minetest-monitoring/APKBUILD @@ -6,8 +6,8 @@ pkgver=1.04 pkgrel=0 pkgdesc="Monitoring mod for minetest server owners" url="https://github.com/minetest-monitoring/monitoring" -# pcc64le, riscv64 blocked by luajit -> minetest -arch="noarch !ppc64le !riscv64" +# pcc64le, riscv64, loongarch64 blocked by luajit -> minetest +arch="noarch !ppc64le !riscv64 !loongarch64" license="MIT" depends="minetest-common" source="https://github.com/minetest-monitoring/monitoring/archive/$pkgver/minetest-monitoring-$pkgver.tar.gz" diff --git a/community/minetest/APKBUILD b/community/minetest/APKBUILD index 5c1673e3b49..15a63f1db0c 100644 --- a/community/minetest/APKBUILD +++ b/community/minetest/APKBUILD @@ -7,8 +7,8 @@ pkgver=5.8.0 pkgrel=1 pkgdesc="An infinite-world block sandbox game and a game engine" url="https://www.minetest.net/" -# ppc64le, riscv64 blocked by luajit -arch="all !ppc64le !riscv64" +# ppc64le, riscv64, loongarch64 blocked by luajit +arch="all !ppc64le !riscv64 !loongarch64" license="LGPL-2.1-or-later AND CC-BY-SA-3.0" pkgusers="minetest" pkggroups="minetest" diff --git a/community/miniflux/0001-api-tests-use-intSize-agnostic-random-integers.patch b/community/miniflux/0001-api-tests-use-intSize-agnostic-random-integers.patch deleted file mode 100644 index 8d756d5f4d0..00000000000 --- a/community/miniflux/0001-api-tests-use-intSize-agnostic-random-integers.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bb88c75c4dbc3f79b1498a96e9184596d510884e Mon Sep 17 00:00:00 2001 -From: Thomas J Faughnan Jr <thomas@faughnan.net> -Date: Sun, 31 Mar 2024 01:43:10 -0400 -Subject: [PATCH] api tests: use intSize-agnostic random integers - -rand.Intn(math.MaxInt64) causes tests to fail on 32-bit architectures. -Use the simpler rand.Int() instead, which still provides plenty of room -for generating pseudo-random test usernames. ---- - internal/api/api_integration_test.go | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/internal/api/api_integration_test.go b/internal/api/api_integration_test.go -index 141dcf64..9259b590 100644 ---- a/internal/api/api_integration_test.go -+++ b/internal/api/api_integration_test.go -@@ -8,7 +8,6 @@ import ( - "errors" - "fmt" - "io" -- "math" - "math/rand" - "os" - "strings" -@@ -58,7 +57,7 @@ func (c *integrationTestConfig) isConfigured() bool { - } - - func (c *integrationTestConfig) genRandomUsername() string { -- return fmt.Sprintf("%s_%10d", c.testRegularUsername, rand.Intn(math.MaxInt64)) -+ return fmt.Sprintf("%s_%10d", c.testRegularUsername, rand.Int()) - } - - func TestIncorrectEndpoint(t *testing.T) { --- -2.43.0 - diff --git a/community/miniflux/APKBUILD b/community/miniflux/APKBUILD index bf9b76e5abf..f9fbd438dcd 100644 --- a/community/miniflux/APKBUILD +++ b/community/miniflux/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Frédéric Guillot <fred@miniflux.net> # Maintainer: Thomas J Faughnan Jr <thomas@faughnan.net> pkgname=miniflux -pkgver=2.1.2 -pkgrel=1 +pkgver=2.1.3 +pkgrel=0 pkgdesc="Minimalist and opionated feed reader" url="https://miniflux.app/" arch="all" @@ -18,7 +18,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/miniflux/v2/archive/$pkgver. miniflux.confd miniflux.conf miniflux.logrotate - 0001-api-tests-use-intSize-agnostic-random-integers.patch " pkggroups="miniflux" builddir="$srcdir/v2-$pkgver" @@ -49,10 +48,9 @@ package() { } sha512sums=" -8966d99b2d48ccecf962655de98d6ca9014a3d604678d5e37313182443cfa26fab9426ef56b14ec4483a7856fa3430bb763cb404aaee4d6351babe56489e6d88 miniflux-2.1.2.tar.gz +93f9c91edfdbdd47aaaafa2a45ba4d0af08351465e84231b9f9f0886042897b0649932e02adc6680fc4952828415edcda8b634224dc21015f053c25d0e24f9cb miniflux-2.1.3.tar.gz 9314019c1ecb1d7b1420742f41ae5c7697e4a1a76ee05119c1cd524dedc1cd8b8825d0cf93976f284024eff5cf879fbd3d97c5d7f8015381ffc7f10661f8f89b miniflux.initd 073bdaa3eaad2db14dc728ee9072b6ae01cd2265d61ac0cc61e3ed7db4b97ae1da8f83e1ce3aed038f97c6f5d31e91aa621753e8fad018d9d88def7fcab3ee16 miniflux.confd fc0084e0d31a4ce29fc0110411dba8f9fd60c16af08a3364b3f828558981a308a5f9871908594753d868cdf9faf86f84f95e0134afdff8983da2b179ebdd24c1 miniflux.conf f9d594df6ea267b6d1f060090d39825998a03af02751ee5af446e84c84794ae01d16617c2737f00c3af5325fb27f26aa680b4ba1747dcf16acb22dbc23477e7d miniflux.logrotate -d498ec92b748a1215bb715a3294f2cae9c5d5ca559d8360c27592c4b024004ee5808e953c0f07f188e984b934e1a297ae8ede52886da4d8b8a608a64792c7c90 0001-api-tests-use-intSize-agnostic-random-integers.patch " diff --git a/community/minify/APKBUILD b/community/minify/APKBUILD index 17cd6c9d2a6..7aa10e2d890 100644 --- a/community/minify/APKBUILD +++ b/community/minify/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Wesley van Tilburg <justwesley@protonmail.com> pkgname=minify -pkgver=2.20.19 -pkgrel=1 +pkgver=2.20.20 +pkgrel=0 pkgdesc="Minifier CLI for HTML, CSS, JS, JSON, SVG and XML" url="https://github.com/tdewolff/minify" arch="all" @@ -30,5 +30,5 @@ package() { } sha512sums=" -33479f2c62a3d5df501138240f56b80f653813ca4539cd977d782561a7ac2dd6b7a57a38a0b12d7ba22d0e983a7366f154292e2053d2312a0bf1574efd3c49a0 minify-2.20.19.tar.gz +608aec858bd468b6606e0112bbda4c6c3007ee0a96bc7d718de036258c233f46f65b4edea274114eb11c28d4b89283658a975509f57220986b9b1fa91949d72a minify-2.20.20.tar.gz " diff --git a/community/minio-client/APKBUILD b/community/minio-client/APKBUILD index 095741025b6..c2611453810 100644 --- a/community/minio-client/APKBUILD +++ b/community/minio-client/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Hoang Nguyen <folliekazetani@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=minio-client -pkgver=0.20240330.152952 +pkgver=0.20240509.170424 # 0.20230323.200304 -> 2023-03-23T20-03-04Z _pkgver="${pkgver:2:4}-${pkgver:6:2}-${pkgver:8:2}T${pkgver:11:2}-${pkgver:13:2}-${pkgver:15:2}Z" -pkgrel=1 +pkgrel=0 pkgdesc="The MinIO Client" url="https://min.io/" arch="all" @@ -47,5 +47,5 @@ package() { } sha512sums=" -9bfffa3b16dd5fe0dc6ab6c822b11f85f833ec7de7f0dcecb7bb1c509e128410ce75473b17434b5c23c6a7e16d988e3549759978196693bf99df62d4f7d2e6b5 minio-client-0.20240330.152952.tar.gz +4ea813760ea03b822887ad5fe1108e37badc61091a2458d82c053ba01e7c1f6e79029f327f5ed17db83adeb3e4c7f8bf8171982e986464e200b735d4c231469c minio-client-0.20240509.170424.tar.gz " diff --git a/community/minio/APKBUILD b/community/minio/APKBUILD index e5cea48707b..89674646ec5 100644 --- a/community/minio/APKBUILD +++ b/community/minio/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=minio -pkgver=0.20240406.052602 +pkgver=0.20240510.014138 # 0.20230324.214123 -> 2023-03-24T21-41-23Z _pkgver="${pkgver:2:4}-${pkgver:6:2}-${pkgver:8:2}T${pkgver:11:2}-${pkgver:13:2}-${pkgver:15:2}Z" pkgrel=0 @@ -77,7 +77,7 @@ cleanup_srcdir() { } sha512sums=" -57035ef629c4cea92db27e29c79677b3824017e13efa5c8b19b465964fac079e35747f4cb162937216b7a666bc844b56d29511f80955b0069e64728ba9ef93fb minio-0.20240406.052602.tar.gz +ccd298972637ef705d219d3d1541652de95ea3dd97af50e8ea4c0c9336ae4888e172823f6d92d3b2f6be305ab0596e9415647a919b8b539312f79c714ebc33ee minio-0.20240510.014138.tar.gz 084373e2f0fd35e0c2c86abbcac3e7611a9931608b3aaf9a76677bc5d2f70944917ae8ad6ec401f989eccf8a5e82891764bb5882624bb48857f85c0ba53ffb83 minio.initd 4710b19471af3d84405b543776d88bf48c9276dd676417f9b6e915e866d934b8e64546aaa5cbfc2a3c23243ec5e4959a1a5b62ba850759b1029f99baa27cbefe minio.confd 9c6c0f1041989d999b9ff567e8ece29a91e32c98cce9ee6471a7044cce2d8b7b02459753dd593ed6d7eb8bf308abc219c3eb87177e855addd04b286cb60e657f minio.logrotate diff --git a/testing/minipeg/APKBUILD b/community/minipeg/APKBUILD index 2c04752b043..2c04752b043 100644 --- a/testing/minipeg/APKBUILD +++ b/community/minipeg/APKBUILD diff --git a/community/miniupnpc/APKBUILD b/community/miniupnpc/APKBUILD index a81ffadf849..38122e86b98 100644 --- a/community/miniupnpc/APKBUILD +++ b/community/miniupnpc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=miniupnpc -pkgver=2.2.5 -pkgrel=1 +pkgver=2.2.7 +pkgrel=0 pkgdesc="Library and tool to control NAT in UPnP-enabled routers" url="http://miniupnp.free.fr" arch="all" @@ -32,5 +32,5 @@ _py3() { } sha512sums=" -32d362c43cf5c9f6c1546d85c2dd780f9701f3137bc78471b3670c4c0862b7fc4f081e6cb6fd14e5c0d3ec0602714756959491688998335c8a7b324e6c53aa2f miniupnpc-2.2.5.tar.gz +d24e653c2f7bfed4485342c5ec8d18b4dd4c3430975b5fae392d3534f38bb3fb59e6638e76d57847f49045e22f3afd6cac128d7d9d10ef05bd6ad24ef38303b6 miniupnpc-2.2.7.tar.gz " diff --git a/community/mise/APKBUILD b/community/mise/APKBUILD index 1d5bc27c931..4072e8d1394 100644 --- a/community/mise/APKBUILD +++ b/community/mise/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Jeff Dickey <alpine@mise.jdx.dev> pkgname=mise -pkgver=2024.4.3 +pkgver=2024.5.15 pkgrel=0 pkgdesc="Polyglot runtime and dev tool version manager" url="https://mise.jdx.dev" @@ -33,5 +33,5 @@ package() { } sha512sums=" -d166f9d350bd53f2fac7ae7239e0d24cc74ddd62f6c670ef62355e2c4a484fa6d9c73e5f9c0c186a79d68ee55aa2c28140bd7226b270e7fb3af0b3f9ba6f3a11 mise-2024.4.3.tar.gz +b71dfd3b1ca7ece389526c181f03a36dd76b44265d56aa7aad2956be1f05472aea3e961e0e7bfc67d881a1e0917cf34c4879c2a3b3597581dc91ce3950cdbceb mise-2024.5.15.tar.gz " diff --git a/community/mkvtoolnix/APKBUILD b/community/mkvtoolnix/APKBUILD index f3e71d0c1f5..755f6195557 100644 --- a/community/mkvtoolnix/APKBUILD +++ b/community/mkvtoolnix/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=mkvtoolnix -pkgver=83.0 +pkgver=84.0 pkgrel=0 pkgdesc="Set of tools to create, edit and inspect Matroska files" url="https://mkvtoolnix.download/index.html" @@ -67,5 +67,5 @@ gui() { } sha512sums=" -e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d mkvtoolnix-83.0.tar.xz +3a73bb2497a227fd2e0a65d58e72bf479662828a7b4201b37b7bfdd7f88d294a6690aee024661d8b5615036f64a4ce1c2ba64d7b24ebd352f8f5ce3ffdac543a mkvtoolnix-84.0.tar.xz " diff --git a/community/mlmym/APKBUILD b/community/mlmym/APKBUILD index 08e419d3942..e1ad8bf48e5 100644 --- a/community/mlmym/APKBUILD +++ b/community/mlmym/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=mlmym -pkgver=0.0.40 -pkgrel=2 +pkgver=0.0.44 +pkgrel=0 pkgdesc="Lemmy frontend offering a familiar desktop experience" url="https://mlmym.org/" arch="all" @@ -39,7 +39,7 @@ package() { } sha512sums=" -e0f0f263583943ea5b166527500a4d783cdf9f4e409a3281973a7f21a7584fc74d187563618c4890e6803d2527f8c12ad186122f39d292fc79fb33ca5ea62e3c mlmym-0.0.40.tar.gz +5aade5dc692f56f729f2dfcf3c443156714194dd9ec0d84149e98f4fe9e42645f7506c81e20700ffd74772a0c90f2def882543e93e2f7e338de2e6c005bb186e mlmym-0.0.44.tar.gz 0550e887d54352ad57ed3e3229fc5177b7c85903f93bfb98fb9c719727e7586b61eff4dbc604fca18a11b20362c14b83aafd9513d1bea567ff338df911a01eca mlmym.confd b1e12a9544507db312084ab652ed7572f03c3be3a92b32003b62ad8dbe04f67aae73e18c0aa3e6a6614bacb99a2a1a5254b1ecb196b69a1165db752526351bd8 mlmym.initd f0e5069f0f082a4b6e5af98aada1c90395c3d63571d36e332f4a96294146b48f52b0dc31963a757bea90215d1c449160e29a23c536172a65a5ccbd5a42402e35 dont-get-version-from-git.patch diff --git a/community/mlt/APKBUILD b/community/mlt/APKBUILD index 69bc4b1cf25..d55fd8432eb 100644 --- a/community/mlt/APKBUILD +++ b/community/mlt/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=mlt -pkgver=7.22.0 -pkgrel=4 +pkgver=7.24.0 +pkgrel=0 pkgdesc="MLT Multimedia Framework" url="https://www.mltframework.org/" arch="all" @@ -77,5 +77,5 @@ py3() { } sha512sums=" -84763e1cb8495be9476637d2474aa492906b904990905f9283faffff75829553cf87b097166fe6d382acc043422e6da45014ca4ba281c7fc68f10ebe3cec4fee mlt-7.22.0.tar.gz +a9e7fd5dc04152e523456bad244416b4fdeb5961ee7cadb816dd1393277d1d801200db595dcd28e520d76e6b2caca17e65c39b0256beb7c42a58ef241b85471d mlt-7.24.0.tar.gz " diff --git a/community/moarvm/APKBUILD b/community/moarvm/APKBUILD index c0741f0c4d2..85eaabc2ee9 100644 --- a/community/moarvm/APKBUILD +++ b/community/moarvm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Curt Tilmes <Curt.Tilmes@nasa.gov> # Maintainer: Curt Tilmes <Curt.Tilmes@nasa.gov> pkgname=moarvm -pkgver=2024.03 +pkgver=2024.04 pkgrel=0 pkgdesc="VM with adaptive optimization and JIT compilation, built for Rakudo" url="https://moarvm.org/" @@ -38,5 +38,5 @@ dev() { } sha512sums=" -ef570363d04f28af63ef550e5b5e98d5dc4584dac504fd53ffe733ebd4cb1050f3770f58c53e5d2032e693fc4e2687b29f24298784641bb753ecfe42805ae585 moarvm-2024.03.tar.gz +874b22347fce3018884733ef734db0f09faae89191c2d37d7a15a897f8ce88ed9fbbd69768267492e6d1f019035ad224eef844b75e0fc1634cffd4b059314af1 moarvm-2024.04.tar.gz " diff --git a/community/mobile-broadband-provider-info/APKBUILD b/community/mobile-broadband-provider-info/APKBUILD index 7cf5cdb525b..ec28714b57d 100644 --- a/community/mobile-broadband-provider-info/APKBUILD +++ b/community/mobile-broadband-provider-info/APKBUILD @@ -1,31 +1,28 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mobile-broadband-provider-info -pkgver=20230416 +pkgver=20240407 pkgrel=0 pkgdesc="Mobile broadband settings for various service providers" url="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/" arch="noarch" license="CC-PDDC" -makedepends="autoconf automake libxml2-utils libxslt" +makedepends="libxml2-utils libxslt meson" source="https://download.gnome.org/sources/mobile-broadband-provider-info/$pkgver/mobile-broadband-provider-info-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr - make + abuild-meson . output + meson compile -C output } check() { - make check + meson test -C output } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install --no-rebuild -C output } sha512sums=" -fd6be1387284b31fa300fe59244a5d2d65c9851037f78b540d8d907c9bedd1ec24a8d23bf66403a30995ddb4791b7cb746952d9438c08c846906f6825c44dd9b mobile-broadband-provider-info-20230416.tar.xz +988d6a2b455580d16dd60f19f0057f440e5f9e57ea84723440c515039b23e1d76d77f18c0316ea5ca43eb2ed291c44c290c83b1e965df09ed75176c8df9728cd mobile-broadband-provider-info-20240407.tar.xz " diff --git a/community/modemmanager-qt/APKBUILD b/community/modemmanager-qt/APKBUILD index 0f1373abe81..2b7bd873fd6 100644 --- a/community/modemmanager-qt/APKBUILD +++ b/community/modemmanager-qt/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=modemmanager-qt -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Qt wrapper for ModemManager DBus API" # armhf blocked by extra-cmake-modules @@ -45,5 +45,5 @@ package() { } sha512sums=" -d31d97802ad2f9068509e15430113c8e98803592ce801360222377b39a808055929292eaf76773253e5894813851fe0957fdd5c35743d481fc7caea1acd59648 modemmanager-qt-6.1.0.tar.xz +6d48cd1f1d311305f0d40b83b424e2b9bef48c644d679ec524f9d25941566d4bd6daca4aca54e0853ea6111fe09f7b7fc565d4aa1d311cbf1aac4060a514f965 modemmanager-qt-6.2.0.tar.xz " diff --git a/community/mold/APKBUILD b/community/mold/APKBUILD index b14198f1471..f63f873b940 100644 --- a/community/mold/APKBUILD +++ b/community/mold/APKBUILD @@ -28,8 +28,8 @@ checkdepends=" " subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/rui314/mold/archive/refs/tags/v$pkgver.tar.gz - $pkgname-test-fix.patch::https://github.com/rui314/mold/commit/11c9376a50cbff5821388ab9489fe0e47607671f.patch - $pkgname-ppc64le-test-skip.patch::https://github.com/rui314/mold/commit/6e5ae45c1a810b2d1903b3739d9d4c7f160d0f33.patch + $pkgname-test-fix.patch + $pkgname-ppc64le-test-skip.patch xxhash.patch " @@ -73,6 +73,6 @@ package() { sha512sums=" 7cfba4f0fb332799ad267d3eafb8e2f0057af4484467b3e3fbaf8044220163a2c7e26cd1786510f250844c8b57e30c15167c8dd9688af1773abc580c5605abf3 mold-2.30.0.tar.gz 956997757fad80e01cb70dfb927477dbceac2c46874156fddbf32519ef2ee1f73e3ee9179a74f4c5bb02031ee4685f4dd92993a8f35637d0d99098036ebccd06 mold-test-fix.patch -98a2ac96a125f6639ac1158a8a12bbd33161454494144875664ca376ed613b2a7cf20751e8b79d18864405a954e4fd66e669e0eaad63677f3724508fbf890b8c mold-ppc64le-test-skip.patch +07039b0126cc5471fd91363c83a979d7e906b001928215e23afe4ff659914c21979038353d15320ad53cbfdb2e71d185cd584774c86051c3bcf0b91f36db7f5d mold-ppc64le-test-skip.patch 9a54c572df99c79e501806ad08cf5e0f5ef7a91f02c973c6e9a86980b1e1fadb0f028746f160bcf89933453a1854e481136ee2fbfb2dbde7f0f53b16e215bd71 xxhash.patch " diff --git a/community/mold/mold-ppc64le-test-skip.patch b/community/mold/mold-ppc64le-test-skip.patch new file mode 100644 index 00000000000..05a689fa234 --- /dev/null +++ b/community/mold/mold-ppc64le-test-skip.patch @@ -0,0 +1,22 @@ +From 6e5ae45c1a810b2d1903b3739d9d4c7f160d0f33 Mon Sep 17 00:00:00 2001 +From: Rui Ueyama <ruiu@cs.stanford.edu> +Date: Wed, 27 Mar 2024 16:23:02 +0900 +Subject: [PATCH] Disable test on ppc64le + +Fixes https://github.com/rui314/mold/issues/1221 +--- + test/elf/execute-only.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/elf/execute-only.sh b/test/elf/execute-only.sh +index 7af00395b..ecfe2700a 100755 +--- a/test/elf/execute-only.sh ++++ b/test/elf/execute-only.sh +@@ -6,6 +6,7 @@ + + # GCC emits data to .text for PPC64, so PPC64 is not compatible with -execute-only + [ $MACHINE = ppc64 ] && skip ++[ $MACHINE = ppc64le ] && skip + + cat <<EOF | $CC -o $t/a.o -c -xc - + #include <stdio.h> diff --git a/community/mold/mold-test-fix.patch b/community/mold/mold-test-fix.patch new file mode 100644 index 00000000000..46723d00c7c --- /dev/null +++ b/community/mold/mold-test-fix.patch @@ -0,0 +1,34 @@ +From 11c9376a50cbff5821388ab9489fe0e47607671f Mon Sep 17 00:00:00 2001 +From: Rui Ueyama <ruiu@cs.stanford.edu> +Date: Wed, 27 Mar 2024 16:14:04 +0900 +Subject: [PATCH] Fix tests for musl libc-based systems + +Fixes https://github.com/rui314/mold/issues/1221 +--- + test/elf/common.inc | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/test/elf/common.inc b/test/elf/common.inc +index 5a8f8fd38..cd33d45db 100644 +--- a/test/elf/common.inc ++++ b/test/elf/common.inc +@@ -69,13 +69,14 @@ test_cflags() { + echo 'int main() {}' | $CC "$@" -o /dev/null -xc - >& /dev/null + } + +-supports_ifunc() { +- echo 'void x() __attribute__((ifunc("y"))); void *y() { return 0; }' | \ +- $CC -c -o /dev/null -xc - >& /dev/null ++is_musl() { ++ ldd --version 2>&1 | grep -q musl + } + +-is_musl() { +- ldd --help 2>&1 | grep -q musl ++supports_ifunc() { ++ ! is_musl && \ ++ echo 'void x() __attribute__((ifunc("y"))); void *y() { return 0; }' | \ ++ $CC -c -o /dev/null -xc - >& /dev/null + } + + supports_tlsdesc() { diff --git a/community/monero/APKBUILD b/community/monero/APKBUILD index c8bcabd6180..2155591a364 100644 --- a/community/monero/APKBUILD +++ b/community/monero/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=monero pkgver=0.18.3.3 -pkgrel=0 +pkgrel=1 _ver_randomx=102f8acf90a7649ada410de5499a7ec62e49e1da _ver_supercop=633500ad8c8759995049ccd022107d1fa8a1bbc9 pkgdesc="Secure, private, untraceable cryptocurrency" diff --git a/community/mongo-c-driver/APKBUILD b/community/mongo-c-driver/APKBUILD index ec03b298372..327bedf48ce 100644 --- a/community/mongo-c-driver/APKBUILD +++ b/community/mongo-c-driver/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=mongo-c-driver -pkgver=1.26.2 +pkgver=1.27.0 pkgrel=0 pkgdesc="Client library written in C for MongoDB" url="https://github.com/mongodb/mongo-c-driver" @@ -131,5 +131,5 @@ _dev() { } sha512sums=" -78da2fc51515b3b81214246665685680e9821b641cb6d3b821b23bdb3a8290df9d8b27b9aebce1d809454ae0b5619d758e8cb9699ac1096a7cc828994bad8f88 mongo-c-driver-1.26.2.tar.gz +547caacbff9ff43788c658743825ee16ae13e75f9322b0fcd8e107985f9d043a3cb133893ea870c2e5e2c92bc13a9cb69d9a102603f8fa3deb3f2fe26a6f8432 mongo-c-driver-1.27.0.tar.gz " diff --git a/community/mongo-php-library/APKBUILD b/community/mongo-php-library/APKBUILD index 935e185bc78..8a7b0f63499 100644 --- a/community/mongo-php-library/APKBUILD +++ b/community/mongo-php-library/APKBUILD @@ -2,8 +2,8 @@ _php=php82 pkgname=mongo-php-library -pkgver=1.13.0 -pkgrel=1 +pkgver=1.18.0 +pkgrel=0 pkgdesc="High-level abstraction around the lower-level drivers for PHP" url="https://github.com/mongodb/mongo-php-library" arch="noarch" @@ -20,11 +20,9 @@ package() { mkdir -p "$pkgdir"/usr/share/doc/mongo-$_php-library/docs mkdir -p "$pkgdir"/usr/lib/$_php/vendor/mongodb/mongodb mv src/* "$pkgdir"/usr/lib/$_php/vendor/mongodb/mongodb - mv tests "$pkgdir"/usr/lib/$_php/vendor/mongodb/mongodb/ - mv docs/* "$pkgdir"/usr/share/doc/mongo-$_php-library/docs - mv LICENSE README.md "$pkgdir"/usr/share/doc/mongo-$_php-library + mv LICENSE "$pkgdir"/usr/share/doc/mongo-$_php-library } sha512sums=" -ebf8d98ca0f4b8a1947574eb6742c829b0ebbb9488be7a190a8254afa3f4f4033ae76bae77c3eb0d5afe09e2d664e16bf515b7436faa61a160cf98c730e3dabf mongo-php-library-1.13.0.tar.gz +db618bff13fe7a9697f773127e19a3db2be1ae6e133116e9064e8fd49a1158357294714caafe527902bdd2409ccc367eda8e7d1a5e146b3f66de35a732492e50 mongo-php-library-1.18.0.tar.gz " diff --git a/community/mongooseim/APKBUILD b/community/mongooseim/APKBUILD index a5b7285f84f..3fd14476785 100644 --- a/community/mongooseim/APKBUILD +++ b/community/mongooseim/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=mongooseim pkgver=6.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="Robust, scalable and efficient XMPP server aimed at large installations" url="https://www.erlang-solutions.com/products/mongooseim.html" arch="all" @@ -16,7 +16,9 @@ makedepends=" unixodbc-dev zlib-dev " -options="!check" # tests require a running server +# !check: tests require a running server +# !fhs: /var/lock/mongooseim/ctl is used by mongooseimctl +options="!check !fhs" install="$pkgname.pre-install" pkgusers="mongooseim" pkggroups="mongooseim" diff --git a/community/mopidy/APKBUILD b/community/mopidy/APKBUILD index 59823936acc..de1391587f9 100644 --- a/community/mopidy/APKBUILD +++ b/community/mopidy/APKBUILD @@ -49,8 +49,11 @@ build() { } check() { - # gets wrong length for song - pytest --ignore tests/stream/test_playback.py \ + # test_help: circular import + # test_playback: gets wrong length for song + pytest \ + --ignore tests/test_help.py \ + --ignore tests/stream/test_playback.py \ -k 'not test_duration_is_set' } diff --git a/community/mpd/APKBUILD b/community/mpd/APKBUILD index c0ac31c26da..c1b018503f6 100644 --- a/community/mpd/APKBUILD +++ b/community/mpd/APKBUILD @@ -9,7 +9,7 @@ case $pkgver in *.*.*) _branch=${pkgver%.*};; *.*) _branch=$pkgver;; esac -pkgrel=1 +pkgrel=2 pkgdesc="Music daemon that plays MP3, FLAC, Ogg Vorbis files and Audio CDs" url="https://musicpd.org/" pkgusers="mpd" diff --git a/community/mpdscribble/APKBUILD b/community/mpdscribble/APKBUILD index 3672ddcc515..1460da22c56 100644 --- a/community/mpdscribble/APKBUILD +++ b/community/mpdscribble/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=mpdscribble pkgver=0.25 -pkgrel=0 +pkgrel=1 pkgdesc="last.fm client for mpd" options="!check" # No test target url="https://github.com/MusicPlayerDaemon/mpdscribble" diff --git a/community/mpv/APKBUILD b/community/mpv/APKBUILD index 951032801ec..65dc55f5b6a 100644 --- a/community/mpv/APKBUILD +++ b/community/mpv/APKBUILD @@ -8,9 +8,9 @@ pkgname=mpv # https://github.com/mpv-player/mpv#release-cycle # the stable releases are just arbitrary git, so we can update more often. # it's the same stability policy regardless -pkgver=0.37.0 -pkgrel=2 -_gitrev=818ce7c51a6b9179307950e919983e0909942098 +pkgver=0.38.0 +pkgrel=0 +_gitrev=02254b92dd237f03aa0a151c2a68778c4ea848f9 pkgdesc="Video player based on MPlayer/mplayer2" url="https://mpv.io/" license="GPL-2.0-or-later" @@ -64,7 +64,7 @@ meson-libcaca-version.patch" builddir="$srcdir/mpv-$_gitrev" case "$CARCH" in -ppc64le|riscv64) +ppc64le|riscv64|loongarch64) makedepends="$makedepends lua5.2-dev" ;; *) @@ -133,6 +133,6 @@ package() { } sha512sums=" -cebe57e874acec8e4d484cc4735fdba2dfa866b1535a0ae12ce4474744018e21c837ed6dda5775adf672f781cb0c02e4ddd0da2f08c8fd489565e2940a315002 mpv-818ce7c51a6b9179307950e919983e0909942098.tar.gz +bacd7b0da1a82d1999556c0c4f8515f5c2e922ac2920d4b3dae85dc77f7c20475273f3e7772078cb77b2ec863a874047bcdf6e52f3dc43a5a2c8b16bacd19d3a mpv-02254b92dd237f03aa0a151c2a68778c4ea848f9.tar.gz 4ff107b15c7d124a22547f73b10fa7cbaf247be27717474d875fa5db9652ae3b19b6801a069b066eb9566e66a4882257e09b9424f9fe95a477bd2deffa72c890 meson-libcaca-version.patch " diff --git a/community/msgpack-cxx/APKBUILD b/community/msgpack-cxx/APKBUILD index 8395ae22053..01bad289869 100644 --- a/community/msgpack-cxx/APKBUILD +++ b/community/msgpack-cxx/APKBUILD @@ -3,7 +3,7 @@ pkgname=msgpack-cxx # When bumping, rebuild all aports with msgpack-cxx-dev in makedepends. pkgver=6.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="An efficient object serialization library for C++" url="https://msgpack.org" arch="all" diff --git a/community/msmtp/APKBUILD b/community/msmtp/APKBUILD index 31177326224..2d6f63966d1 100644 --- a/community/msmtp/APKBUILD +++ b/community/msmtp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=msmtp -pkgver=1.8.25 +pkgver=1.8.26 pkgrel=0 pkgdesc="SMTP client with a sendmail compatible interface" url="https://marlam.de/msmtp/" @@ -49,7 +49,7 @@ vim() { } sha512sums=" -7d9808b095b222f2283fb42395cb6560f776c9f92f9f467ea2245196b5dc8a85c359ff8c2ea68440e7eada8333a5da78aff921c2ef2b41cfde9d90c396425e72 msmtp-1.8.25.tar.xz +36fa4a571079b0e1141e645f2a565f3c7699e1899f6ece66e3539bed595473488bdf147ed6ff1bff103c6240e484b2c357122292d5eae65ac4c0f74215eb556c msmtp-1.8.26.tar.xz 3839d7e8400cf897830c674f59563e225096d9755121d1ac14f3b493ab4cc0672228a9b14b9d9620d566593e2ae27d322a78c46791c6b5166ab82275d25dc0d3 msmtp.confd 0e1b32b07ccac6f5a174a1e317390815b459a4a7ca4f15672456ac0a30c89edb93001a8047c38d1f8da65b9f07a7b17b3270a0a07248a6be248500cd42773cef msmtp.initd " diff --git a/community/mtkclient/APKBUILD b/community/mtkclient/APKBUILD index b850a5c5b9c..d51cc085d89 100644 --- a/community/mtkclient/APKBUILD +++ b/community/mtkclient/APKBUILD @@ -5,7 +5,8 @@ pkgver=1.63 pkgrel=2 pkgdesc="Unofficial MTK reverse engineering and flash tool" url="https://github.com/bkerler/mtkclient" -arch="noarch" +# riscv64: pyside6 disabled +arch="noarch !riscv64" license="GPL-3.0-only" depends=" android-udev-rules diff --git a/testing/mtm/APKBUILD b/community/mtm/APKBUILD index e718a46de10..e718a46de10 100644 --- a/testing/mtm/APKBUILD +++ b/community/mtm/APKBUILD diff --git a/community/mtxclient/APKBUILD b/community/mtxclient/APKBUILD index 776284fc147..13b46f5a64d 100644 --- a/community/mtxclient/APKBUILD +++ b/community/mtxclient/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=mtxclient pkgver=0.9.2 -pkgrel=6 +pkgrel=8 pkgdesc="Client API library for Matrix, built on top of Boost.Asio" url="https://github.com/nheko-reborn/mtxclient" arch="all" diff --git a/community/mu/APKBUILD b/community/mu/APKBUILD index f01b3493639..5f6e70494bd 100644 --- a/community/mu/APKBUILD +++ b/community/mu/APKBUILD @@ -5,7 +5,7 @@ # Contributor: Justin Berthault <justin.berthault@zaclys.net> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=mu -pkgver=1.12.4 +pkgver=1.12.5 pkgrel=0 pkgdesc="A collection of utilities for indexing and searching Maildirs" url="https://www.djcbsoftware.nl/code/mu/" @@ -37,20 +37,20 @@ build() { } check() { - meson test -C build + meson test --no-rebuild --print-errorlogs -C build } package() { - DESTDIR=$pkgdir meson install -C build + DESTDIR="$pkgdir" meson install --no-rebuild -C build } mu4e() { pkgdesc="Emacs-based e-mail client which uses mu as its back-end" depends="$pkgname=$pkgver-r$pkgrel cmd:emacs" - amove usr/share + amove usr/share/emacs } sha512sums=" -270eb5d98699315e6b2ad6b7605429358ca6296a85c1c019d77a96c9bcb184d5d7abae0d64f8704e6d25166710ba38d57a2d4b0dd8875ca07089610207d03352 mu-1.12.4.tar.gz +2a879f0ebb955729f3ba5c30615df3752d0d3a5909647bf98f05e666c71fb74beeb2ecdd7f86db93f6739befdeca2b67cb7d4d1e6e2bd35028191a7ac86b435e mu-1.12.5.tar.gz " diff --git a/community/mugshot/APKBUILD b/community/mugshot/APKBUILD index a18dd66ed8d..092106944df 100644 --- a/community/mugshot/APKBUILD +++ b/community/mugshot/APKBUILD @@ -1,8 +1,8 @@ # Contributor: knuxify <knuxify@gmail.com> -# Maintainer: knuxify <knuxify@gmail.com> +# Maintainer: pkgname=mugshot pkgver=0.4.3 -pkgrel=5 +pkgrel=6 pkgdesc="Lightweight user configuration utility" url="https://github.com/bluesabre/mugshot" arch="all" diff --git a/community/mumble/APKBUILD b/community/mumble/APKBUILD index b84fc21582b..dfbca6fc34b 100644 --- a/community/mumble/APKBUILD +++ b/community/mumble/APKBUILD @@ -4,7 +4,7 @@ pkgname=mumble pkgver=1.4.287 _libver=1.4.0 -pkgrel=10 +pkgrel=11 pkgdesc="Low-latency, high quality voice chat software" url="https://wiki.mumble.info/" arch="all !x86" # since v1.4.274 fail to build on 32bit x86 diff --git a/community/mupdf/APKBUILD b/community/mupdf/APKBUILD index 795594c8cdc..1220f371ca0 100644 --- a/community/mupdf/APKBUILD +++ b/community/mupdf/APKBUILD @@ -6,7 +6,7 @@ pkgname=mupdf # XXX: even non-breaking changes require rebuilds against revdeps, # upstream does not provide ABI stability and no versioned .so files. -pkgver=1.24.1 +pkgver=1.24.2 pkgrel=0 pkgdesc="Lightweight PDF and XPS viewer" url="https://mupdf.com" @@ -141,7 +141,7 @@ _tools() { } sha512sums=" -9d6fbd3388173f06c5db4a27753e69afd21ed32d93f263d4448c3be60a3be747b61102edd5430459f0dbe7ae4df2019689a2f3a582acec77ff322b6d41066fba mupdf-1.24.1.tar.gz +718c4ba8fbbf408ca525fa7f1813e815ad2b831b2d3abd8a9a5b79a233197d75923bf50901cd44bfefc6d847030cef07d529ce1b30769fc053e1c9e88ffd63b8 mupdf-1.24.2.tar.gz 0158ce75ca6f3195ba31455803478235bea145c2442593cde4cf982ea0faa3cc497d7ab39bebce725cb07ef35266034dbafe4c16f44598db746769608eac9bd8 respect-cflags.patch 3135f8736fd9e7127a860967c83731af417f96133f8d0fd8ba7ae65985445dc095b84dc91d4a612eae017aefdc60608ca9e1f69867249f9ffa6896e996749d63 mupdf.pc.in 13eb39b20bf1c2bba4af010336aaa168ac9a643e7c78dda5de0d908174f930706ba22fee1c2a2a2d245487027b125abe268ae74810a82a3c8aa182d3f1485f9c mupdf.desktop diff --git a/community/mupen64plus/APKBUILD b/community/mupen64plus/APKBUILD index 5e69d6d6ca1..933055454eb 100644 --- a/community/mupen64plus/APKBUILD +++ b/community/mupen64plus/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Alex McGrath <amk@amk.ie> pkgname=mupen64plus pkgver=2.5.9 -pkgrel=2 +pkgrel=3 pkgdesc="Mupen64Plus is a cross-platform plugin-based N64 emulator." url="https://mupen64plus.org/" # build fails or is not officially supported for this release for all but x86_64 diff --git a/community/mustach/APKBUILD b/community/mustach/APKBUILD index b9b8d01f6b4..66f7e0edcf2 100644 --- a/community/mustach/APKBUILD +++ b/community/mustach/APKBUILD @@ -2,12 +2,12 @@ # Contributor: qaqland <qaq@qaq.land> # Maintainer: Lucas Ramage <lucas.ramage@infinite-omicron.com> pkgname=mustach -pkgver=1.2.7 +pkgver=1.2.8 pkgrel=0 pkgdesc="C implementation of the mustache template specification" url="https://gitlab.com/jobol/mustach" arch="all" -license="ISC" +license="0BSD" checkdepends="valgrind" subpackages="$pkgname-doc lib$pkgname-core:split lib$pkgname-core-dev:core_dev" source="https://gitlab.com/jobol/mustach/-/archive/$pkgver/mustach-$pkgver.tar.bz2 @@ -21,16 +21,11 @@ for _j in $_jsonlibs; do done # armv7: Segmentation fault (valgrind error #15759) -# armhf,riscv64: doesn't have valgrind +# armhf,riscv64,loongarch64: doesn't have valgrind case "$CARCH" in -armv7|armhf|riscv64) checkdepends=""; export NOVALGRIND=1 +armv7|armhf|riscv64|loongarch64) checkdepends=""; export NOVALGRIND=1 esac -prepare() { - default_prepare - sed -i 's/which -s valgrind/which -a valgrind/g' Makefile -} - build() { make tool=jsonc libs=split } @@ -70,6 +65,6 @@ json_dev() { } sha512sums=" -333d641cd78bca1ec7a594f550ee22f99057f7da417aeb2aa31ccfc21fd06ab5a83ab66bad6b8e92d625cb15e7286649792428ec8c7eda8a999b4cc0608857c4 mustach-1.2.7.tar.bz2 +01262e4ef4e1e372b41852a312c2992770295759274958dcb18a142693e789b726721f969c4af7b84ab0557ce1ae4388832696bc344235bee1c488ac00fac3fb mustach-1.2.8.tar.bz2 b0f36d46e04d5deb8b7d3f1801c0805f34dc609366b77bcd7ae3c55a3bc7a9d6da97c692b17393d465dece7271259fe513bd73eab7384a4d47003e52a7faeb50 01-pkg-config.patch " diff --git a/community/mutter/APKBUILD b/community/mutter/APKBUILD index 565a401d451..ef8f6b82387 100644 --- a/community/mutter/APKBUILD +++ b/community/mutter/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=mutter -pkgver=46.0 -pkgrel=1 +pkgver=46.1 +pkgrel=0 pkgdesc="clutter-based window manager and compositor" url="https://wiki.gnome.org/Projects/Mutter/" arch="all !s390x" # no libei-dev for s390x @@ -67,7 +67,6 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang $pkgname-schem source="https://download.gnome.org/sources/mutter/${pkgver%.*}/mutter-$pkgver.tar.xz fixudev-req.patch pcversion.patch - fix-startup-on-32-bits.patch " build() { @@ -98,8 +97,7 @@ package() { } sha512sums=" -0314183f763b609105f42233f19507eed14f9a8fab4b0985e966ab208d03a22b600e7a4ab3f6a190a5704abcea663ae1a0cf2394eb42a6c076b7a558ef51eacc mutter-46.0.tar.xz +bb360db020c31e71ae9e247d871130dd737b180a0a48eebcafee6a3b4b5e704fe9828e12caec13e81a03d6b61bfac389c5865e747786cf154ff363ab108a003f mutter-46.1.tar.xz 3e5dd59f2f2fd80edde13f64d70d52a023dec303fd8dbfa3ded0d77faf7643179f2ad74d4acd3450decb67deaf6ac85a7af5146fa96f33917b4363f884413af9 fixudev-req.patch 670927a5528f9fec4801b7dab8a377b7280c239acb1f7a9077647deef71119738deb958a94d4ce0a99d39b29eeab3b2505698f7d19b880bbcec9f5260202d3a6 pcversion.patch -ecf05cc65746af58c9bd9c95c620fa29d7fc424f4180d7b77a3f3a2405d06f06175a3a5fe4b8c9b69d057b89e3029da957f271f75824c8d8e1cd760f79dfeb61 fix-startup-on-32-bits.patch " diff --git a/community/mutter/fix-startup-on-32-bits.patch b/community/mutter/fix-startup-on-32-bits.patch deleted file mode 100644 index 23b7af2a01c..00000000000 --- a/community/mutter/fix-startup-on-32-bits.patch +++ /dev/null @@ -1,162 +0,0 @@ -Patch-Source: https://gitlab.gnome.org/GNOME/mutter/-/commit/260a8d92dca02994f4c77d03267a779c830caa66.patch -From 260a8d92dca02994f4c77d03267a779c830caa66 Mon Sep 17 00:00:00 2001 -From: Bilal Elmoussaoui <belmouss@redhat.com> -Date: Wed, 3 Apr 2024 15:08:34 +0200 -Subject: [PATCH] cogl: Use uint64_t for size params - -As we are using a GParamSpecUint64 for that property -which makes it fail under 32bits platforms - -Fixes: 6efd4a228 ("cogl/cleanup: Use construct-only properties for -CoglBuffer") -Closes https://gitlab.gnome.org/GNOME/mutter/-/issues/3408 - -Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3683> ---- - cogl/cogl/cogl-attribute-buffer.c | 8 ++++---- - cogl/cogl/cogl-attribute-buffer.h | 6 +++--- - cogl/cogl/cogl-index-buffer.c | 5 +++-- - cogl/cogl/cogl-index-buffer.h | 2 +- - cogl/cogl/cogl-pixel-buffer.c | 12 ++++++------ - cogl/cogl/cogl-pixel-buffer.h | 4 ++-- - 6 files changed, 19 insertions(+), 18 deletions(-) - -diff --git a/cogl/cogl/cogl-attribute-buffer.c b/cogl/cogl/cogl-attribute-buffer.c -index 55e296dd3e2..ee89e500ab3 100644 ---- a/cogl/cogl/cogl-attribute-buffer.c -+++ b/cogl/cogl/cogl-attribute-buffer.c -@@ -51,13 +51,13 @@ cogl_attribute_buffer_init (CoglAttributeBuffer *buffer) - - CoglAttributeBuffer * - cogl_attribute_buffer_new_with_size (CoglContext *context, -- size_t bytes) -+ size_t bytes) - { - CoglAttributeBuffer *buffer; - - buffer = g_object_new (COGL_TYPE_ATTRIBUTE_BUFFER, - "context", context, -- "size", bytes, -+ "size", (uint64_t) bytes, - "default-target", COGL_BUFFER_BIND_TARGET_ATTRIBUTE_BUFFER, - "update-hint", COGL_BUFFER_UPDATE_HINT_STATIC, - NULL); -@@ -67,8 +67,8 @@ cogl_attribute_buffer_new_with_size (CoglContext *context, - - CoglAttributeBuffer * - cogl_attribute_buffer_new (CoglContext *context, -- size_t bytes, -- const void *data) -+ size_t bytes, -+ const void *data) - { - CoglAttributeBuffer *buffer; - -diff --git a/cogl/cogl/cogl-attribute-buffer.h b/cogl/cogl/cogl-attribute-buffer.h -index 45040f7d9cd..59876a112de 100644 ---- a/cogl/cogl/cogl-attribute-buffer.h -+++ b/cogl/cogl/cogl-attribute-buffer.h -@@ -92,7 +92,7 @@ GType cogl_attribute_buffer_get_type (void) G_GNUC_CONST; - */ - COGL_EXPORT CoglAttributeBuffer * - cogl_attribute_buffer_new_with_size (CoglContext *context, -- size_t bytes); -+ size_t bytes); - - /** - * cogl_attribute_buffer_new: -@@ -122,7 +122,7 @@ cogl_attribute_buffer_new_with_size (CoglContext *context, - */ - COGL_EXPORT CoglAttributeBuffer * - cogl_attribute_buffer_new (CoglContext *context, -- size_t bytes, -- const void *data); -+ size_t bytes, -+ const void *data); - - G_END_DECLS -diff --git a/cogl/cogl/cogl-index-buffer.c b/cogl/cogl/cogl-index-buffer.c -index 4de5205d3bf..1e4309436e0 100644 ---- a/cogl/cogl/cogl-index-buffer.c -+++ b/cogl/cogl/cogl-index-buffer.c -@@ -53,13 +53,14 @@ cogl_index_buffer_init (CoglIndexBuffer *buffer) - * indices buffer should be able to contain multiple ranges of indices - * which the wiki design doesn't currently consider. */ - CoglIndexBuffer * --cogl_index_buffer_new (CoglContext *context, size_t bytes) -+cogl_index_buffer_new (CoglContext *context, -+ size_t bytes) - { - CoglIndexBuffer *indices; - - indices = g_object_new (COGL_TYPE_INDEX_BUFFER, - "context", context, -- "size", bytes, -+ "size", (uint64_t) bytes, - "default-target", COGL_BUFFER_BIND_TARGET_INDEX_BUFFER, - "update-hint", COGL_BUFFER_UPDATE_HINT_STATIC, - NULL); -diff --git a/cogl/cogl/cogl-index-buffer.h b/cogl/cogl/cogl-index-buffer.h -index 23b75d837e1..ec741831800 100644 ---- a/cogl/cogl/cogl-index-buffer.h -+++ b/cogl/cogl/cogl-index-buffer.h -@@ -78,6 +78,6 @@ GType cogl_index_buffer_get_type (void) G_GNUC_CONST; - */ - COGL_EXPORT CoglIndexBuffer * - cogl_index_buffer_new (CoglContext *context, -- size_t bytes); -+ size_t bytes); - - G_END_DECLS -diff --git a/cogl/cogl/cogl-pixel-buffer.c b/cogl/cogl/cogl-pixel-buffer.c -index fc238580a98..39246093340 100644 ---- a/cogl/cogl/cogl-pixel-buffer.c -+++ b/cogl/cogl/cogl-pixel-buffer.c -@@ -63,15 +63,15 @@ cogl_pixel_buffer_init (CoglPixelBuffer *buffer) - - static CoglPixelBuffer * - _cogl_pixel_buffer_new (CoglContext *context, -- size_t size, -- const void *data, -- GError **error) -+ size_t size, -+ const void *data, -+ GError **error) - { - CoglPixelBuffer *pixel_buffer; - - pixel_buffer = g_object_new (COGL_TYPE_PIXEL_BUFFER, - "context", context, -- "size", size, -+ "size", (uint64_t) size, - "default-target", COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK, - "update-hint", COGL_BUFFER_UPDATE_HINT_STATIC, - NULL); -@@ -94,8 +94,8 @@ _cogl_pixel_buffer_new (CoglContext *context, - - CoglPixelBuffer * - cogl_pixel_buffer_new (CoglContext *context, -- size_t size, -- const void *data) -+ size_t size, -+ const void *data) - { - GError *ignore_error = NULL; - CoglPixelBuffer *buffer = -diff --git a/cogl/cogl/cogl-pixel-buffer.h b/cogl/cogl/cogl-pixel-buffer.h -index e7abe08883a..cf26a61b292 100644 ---- a/cogl/cogl/cogl-pixel-buffer.h -+++ b/cogl/cogl/cogl-pixel-buffer.h -@@ -87,7 +87,7 @@ GType cogl_pixel_buffer_get_type (void) G_GNUC_CONST; - */ - COGL_EXPORT CoglPixelBuffer * - cogl_pixel_buffer_new (CoglContext *context, -- size_t size, -- const void *data); -+ size_t size, -+ const void *data); - - G_END_DECLS --- -GitLab - diff --git a/community/mycroft-gui/APKBUILD b/community/mycroft-gui/APKBUILD index a8d066f77d7..355f96286e0 100644 --- a/community/mycroft-gui/APKBUILD +++ b/community/mycroft-gui/APKBUILD @@ -8,9 +8,9 @@ pkgrel=0 pkgdesc="The Graphical User Interface used by the Mycroft Mark II and more" url="https://mycroft.ai" # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> qt5-qtwebview +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine -> qt5-qtwebview # armv7: tests segfault -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" license="Apache-2.0" depends="kirigami2" makedepends=" diff --git a/community/mycroft-plasmoid/APKBUILD b/community/mycroft-plasmoid/APKBUILD index 530c2ce46ce..85036938aa7 100644 --- a/community/mycroft-plasmoid/APKBUILD +++ b/community/mycroft-plasmoid/APKBUILD @@ -6,8 +6,8 @@ pkgrel=1 _commit="18f1acca356f8b8ca64a6b10ab89f91f93341a97" pkgdesc="Plasma integration of different Mycroft AI services" url="https://invent.kde.org/utilities/mycroft-plasmoid" -# ppc64le, s390x, riscv64, armhf and armv7 blocked by mycroft-gui -arch="all !ppc64le !s390x !armhf !riscv64 !armv7" +# ppc64le, s390x, riscv64, armhf, armv7 and loongarch64 blocked by mycroft-gui +arch="all !ppc64le !s390x !armhf !riscv64 !armv7 !loongarch64" license="Apache-2.0 AND LGPL-2.0-or-later AND LicenseRef-KDE-Accepted-GPL" depends="mycroft-gui" makedepends=" diff --git a/community/mygui/APKBUILD b/community/mygui/APKBUILD index 2dfc835dfa6..188892c5ce5 100644 --- a/community/mygui/APKBUILD +++ b/community/mygui/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=mygui pkgver=3.4.1 -pkgrel=6 +pkgrel=7 pkgdesc="A multilayer and overlappable GUI System" # Note: only tested on the following archs, may work on others too but not # adding them until this has been confirmed diff --git a/community/nautilus/APKBUILD b/community/nautilus/APKBUILD index c9704506951..b6ad5e551c7 100644 --- a/community/nautilus/APKBUILD +++ b/community/nautilus/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=nautilus -pkgver=45.2.1 +pkgver=46.1 pkgrel=0 pkgdesc="GNOME file manager" url="https://wiki.gnome.org/Apps/Nautilus" @@ -78,6 +78,6 @@ package() { } sha512sums=" -c1e26e9f802f62ccb7a7d60f895575a1b31d8071f6a60206472fe79f70d64717b9abe97a5c5c0c87349994ff6f144dfe97c7bd448a05a9da00ff9918884e65fa nautilus-45.2.1.tar.xz +5f1fadad67fc77f45be98c857ff51bcfe3471c215ee8f3d603c3b1135667a1d0c7f6c877700ec5162043d8c65b0f3152f08ef1e86ce96a1f4d63689521226f74 nautilus-46.1.tar.xz d08c6833343b8ed89515d12063938e7236cb37d15b7115de50a43bd9a049a09a5a2fc907f52675ba85abecef9bae82c7848249872908eeb39c5c49a744cbf9d1 meson-fix-mixed-list.patch " diff --git a/community/navidrome/webpack-hash.diff b/community/navidrome/webpack-hash.diff deleted file mode 100644 index 59adb8fb8bd..00000000000 --- a/community/navidrome/webpack-hash.diff +++ /dev/null @@ -1,144 +0,0 @@ -diff --git a/ui/node_modules/babel-loader/lib/cache.js b/ui/node_modules/babel-loader/lib/cache.js -index 34dcc0a..2fef7b1 100644 ---- a/ui/node_modules/babel-loader/lib/cache.js -+++ b/ui/node_modules/babel-loader/lib/cache.js -@@ -91,7 +91,7 @@ function () { - - - const filename = function (source, identifier, options) { -- const hash = crypto.createHash("md4"); -+ const hash = crypto.createHash("sha256"); - const contents = JSON.stringify({ - source, - options, -@@ -219,4 +219,4 @@ function () { - return function (_x8) { - return _ref4.apply(this, arguments); - }; --}(); -\ No newline at end of file -+}(); -diff --git a/ui/node_modules/loader-utils/lib/getHashDigest.js b/ui/node_modules/loader-utils/lib/getHashDigest.js -index 45e340e..fb49630 100644 ---- a/ui/node_modules/loader-utils/lib/getHashDigest.js -+++ b/ui/node_modules/loader-utils/lib/getHashDigest.js -@@ -40,7 +40,7 @@ function encodeBufferToBase(buffer, base) { - } - - function getHashDigest(buffer, hashType, digestType, maxLength) { -- hashType = hashType || 'md4'; -+ hashType = hashType || 'sha256'; - maxLength = maxLength || 9999; - - const hash = require('crypto').createHash(hashType); -diff --git a/ui/node_modules/webpack/lib/HashedModuleIdsPlugin.js b/ui/node_modules/webpack/lib/HashedModuleIdsPlugin.js -index 7a860f7..047ae54 100644 ---- a/ui/node_modules/webpack/lib/ids/HashedModuleIdsPlugin.js -+++ b/ui/node_modules/webpack/lib/ids/HashedModuleIdsPlugin.js -@@ -23,7 +23,7 @@ class HashedModuleIdsPlugin { - this.options = Object.assign( - { - context: null, -- hashFunction: "md4", -+ hashFunction: "sha256", - hashDigest: "base64", - hashDigestLength: 4 - }, -diff --git a/ui/node_modules/webpack/lib/ModuleFilenameHelpers.js b/ui/node_modules/webpack/lib/ModuleFilenameHelpers.js -index bd0742b..3c3eba8 100644 ---- a/ui/node_modules/webpack/lib/ModuleFilenameHelpers.js -+++ b/ui/node_modules/webpack/lib/ModuleFilenameHelpers.js -@@ -42,7 +42,7 @@ const getBefore = (str, token) => { - }; - - const getHash = str => { -- const hash = createHash("md4"); -+ const hash = createHash("sha256"); - hash.update(str); - const digest = /** @type {string} */ (hash.digest("hex")); - return digest.substr(0, 4); -diff --git a/ui/node_modules/webpack/lib/NamedModulesPlugin.js b/ui/node_modules/webpack/lib/NamedModulesPlugin.js -index 2d84aaf..fe35290 100644 ---- a/ui/node_modules/webpack/lib/NamedModulesPlugin.js -+++ b/ui/node_modules/webpack/lib/NamedModulesPlugin.js -@@ -8,7 +8,7 @@ const createHash = require("./util/createHash"); - const RequestShortener = require("./RequestShortener"); - - const getHash = str => { -- const hash = createHash("md4"); -+ const hash = createHash("sha256"); - hash.update(str); - const digest = /** @type {string} */ (hash.digest("hex")); - return digest.substr(0, 4); -diff --git a/ui/node_modules/webpack/lib/SourceMapDevToolPlugin.js b/ui/node_modules/webpack/lib/SourceMapDevToolPlugin.js -index 3018eb2..bb37fd6 100644 ---- a/ui/node_modules/webpack/lib/SourceMapDevToolPlugin.js -+++ b/ui/node_modules/webpack/lib/SourceMapDevToolPlugin.js -@@ -346,7 +346,7 @@ class SourceMapDevToolPlugin { - : filename, - query, - basename: basename(filename), -- contentHash: createHash("md4") -+ contentHash: createHash("sha256") - .update(sourceMapString) - .digest("hex") - }; -diff --git a/ui/node_modules/webpack/lib/WebpackOptionsDefaulter.js b/ui/node_modules/webpack/lib/WebpackOptionsDefaulter.js -index cb5541e..a2fbf83 100644 ---- a/ui/node_modules/webpack/lib/WebpackOptionsDefaulter.js -+++ b/ui/node_modules/webpack/lib/WebpackOptionsDefaulter.js -@@ -159,7 +159,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter { - this.set("output.crossOriginLoading", false); - this.set("output.jsonpScriptType", false); - this.set("output.chunkLoadTimeout", 120000); -- this.set("output.hashFunction", "md4"); -+ this.set("output.hashFunction", "sha256"); - this.set("output.hashDigest", "hex"); - this.set("output.hashDigestLength", 20); - this.set("output.devtoolLineToLine", false); -diff --git a/ui/node_modules/webpack/lib/optimize/ConcatenatedModule.js b/ui/node_modules/webpack/lib/optimize/ConcatenatedModule.js -index df4d216..03711c4 100644 ---- a/ui/node_modules/webpack/lib/optimize/ConcatenatedModule.js -+++ b/ui/node_modules/webpack/lib/optimize/ConcatenatedModule.js -@@ -560,7 +560,7 @@ class ConcatenatedModule extends Module { - orderedConcatenationListIdentifiers += " "; - } - } -- const hash = createHash("md4"); -+ const hash = createHash("sha256"); - hash.update(orderedConcatenationListIdentifiers); - return this.rootModule.identifier() + " " + hash.digest("hex"); - } -diff --git a/ui/node_modules/webpack/lib/optimize/SplitChunksPlugin.js b/ui/node_modules/webpack/lib/optimize/SplitChunksPlugin.js -index 439e407..8fab46a 100644 ---- a/ui/node_modules/webpack/lib/optimize/SplitChunksPlugin.js -+++ b/ui/node_modules/webpack/lib/optimize/SplitChunksPlugin.js -@@ -22,7 +22,7 @@ const deterministicGroupingForModules = /** @type {function(DeterministicGroupin - - const hashFilename = name => { - return crypto -- .createHash("md4") -+ .createHash("sha256") - .update(name) - .digest("hex") - .slice(0, 8); -diff --git a/ui/node_modules/webpack/node_modules/terser-webpack-plugin/dist/index.js b/ui/node_modules/webpack/node_modules/terser-webpack-plugin/dist/index.js -index 6268f6b..51d1ee0 100644 ---- a/ui/node_modules/webpack/node_modules/terser-webpack-plugin/dist/index.js -+++ b/ui/node_modules/webpack/node_modules/terser-webpack-plugin/dist/index.js -@@ -214,7 +214,7 @@ class TerserPlugin { - // eslint-disable-next-line global-require - 'terser-webpack-plugin': require('../package.json').version, - 'terser-webpack-plugin-options': this.options, -- hash: _crypto.default.createHash('md4').update(input).digest('hex') -+ hash: _crypto.default.createHash('sha256').update(input).digest('hex') - }; - task.cacheKeys = this.options.cacheKeys(defaultCacheKeys, file); - } -@@ -353,4 +353,4 @@ class TerserPlugin { - } - - var _default = TerserPlugin; --exports.default = _default; -\ No newline at end of file -+exports.default = _default; diff --git a/community/ncmpcpp/APKBUILD b/community/ncmpcpp/APKBUILD index e9ecfd7f773..80ab1852ec6 100644 --- a/community/ncmpcpp/APKBUILD +++ b/community/ncmpcpp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Matthieu Monnier <matthieu.monnier@enalean.com> pkgname=ncmpcpp pkgver=0.9.2 -pkgrel=15 +pkgrel=16 pkgdesc="Ncurses based MPD client inspired by ncmpc" url="http://rybczak.net/ncmpcpp" arch="all" diff --git a/community/ncpamixer/APKBUILD b/community/ncpamixer/APKBUILD index ae7754b3465..07eefc32d39 100644 --- a/community/ncpamixer/APKBUILD +++ b/community/ncpamixer/APKBUILD @@ -12,6 +12,9 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/fulhax/ncpamixer/archive/$pk options="!check" # no tests build() { + # src/ui/tab.cpp accesses struct tagITEM which has been made opaque + export CXXFLAGS="$CXXFLAGS -DNCURSES_INTERNALS" + cmake "$builddir"/src \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr diff --git a/community/ncspot/APKBUILD b/community/ncspot/APKBUILD index 836569f7ce5..058a617c2ed 100644 --- a/community/ncspot/APKBUILD +++ b/community/ncspot/APKBUILD @@ -7,7 +7,8 @@ pkgdesc="Cross-platform ncurses Spotify client inspired by ncmpc and the likes" url="https://github.com/hrkfdn/ncspot" # riscv64: takes eternity to build # s390x: fails to build nix crate -arch="all !riscv64 !s390x" +# ppc64le: fails to build notify-rust crate +arch="all !riscv64 !s390x !ppc64le" license="BSD-2-Clause" makedepends=" cargo diff --git a/community/neatvi/APKBUILD b/community/neatvi/APKBUILD index b3956e67102..f1ea0bf8dc7 100644 --- a/community/neatvi/APKBUILD +++ b/community/neatvi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=neatvi -pkgver=14 +pkgver=15 pkgrel=0 pkgdesc="vi/ex editor with support for bidirectional UTF-8 text, syntax highlight and infinite undo/redo" url="https://github.com/aligrudi/neatvi" @@ -25,6 +25,6 @@ package() { } sha512sums=" -b904132b435c1d95980ad993dc4673641f77ea6654a1257b3e8cd598cb9246f587fc51b868dcab647771aa43970aa1f886b80552973d9c3365fe3833dbe95cf4 neatvi-14.tar.gz +d738a3b22f4887be08e8681d4901d3b5e76484d7bf5d89a7b912ec5fc1c52e9bfb64b97f73dc2916c3e3e2cc262e147ca5274d6c625db8c4b44a64a00b6742f2 neatvi-15.tar.gz c8d0bf442ea27c04649cd40446a7e3c43aa76e4901bbf853f0307bf3cedf7f253371b967cfe559e027dd2ccc47e00462e7016b47b6ff6f13d855ae7613f4290f conf.patch " diff --git a/community/nemo-qml-plugin-configuration/APKBUILD b/community/nemo-qml-plugin-configuration/APKBUILD index d09a1bd1e68..4d335420e4a 100644 --- a/community/nemo-qml-plugin-configuration/APKBUILD +++ b/community/nemo-qml-plugin-configuration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=nemo-qml-plugin-configuration -pkgver=0.2.6 +pkgver=0.2.8 pkgrel=0 pkgdesc="Nemo QML configuration plugin" url="https://github.com/sailfishos/nemo-qml-plugin-configuration" @@ -28,5 +28,5 @@ package() { } sha512sums=" -6d7ab135fe7e1686abbc073e945bb5f02aa867fda503b89bb0bbd2bcf9b062b9df6cedb4ba15d1fc2f0ef9dedac68b1f75f2473160754777e7f9ec0ea8bf1d0e nemo-qml-plugin-configuration-0.2.6.tar.gz +cc2985a004fda5e541f1ca9854d82b18e534aad5efc52f345e066f05893866384e66f30955b07d5247d9a3a6b98666388b23fa6117842bc57d8d99e130defcf6 nemo-qml-plugin-configuration-0.2.8.tar.gz " diff --git a/community/neo4j/APKBUILD b/community/neo4j/APKBUILD index 5f68287d2e8..63d077213bc 100644 --- a/community/neo4j/APKBUILD +++ b/community/neo4j/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=neo4j -pkgver=4.4.29 +pkgver=4.4.32 pkgrel=0 pkgdesc="Neo4j Community Edition LTS" url="https://neo4j.com" @@ -48,6 +48,11 @@ source="https://github.com/neo4j/neo4j/archive/refs/tags/$pkgver/neo4j-$pkgver.t # check: needs ulimit -n 40000 options="net !check" +# Ensure Neo4j is built with JDK11 if multiple JDKs are installed +# to prevent this error: https://github.com/neo4j/neo4j/issues/12933 +export JAVA_HOME="/usr/lib/jvm/java-11-openjdk" +export PATH="$JAVA_HOME/bin:$PATH" + # NOTE: Maven 3 dropped support for the M2_HOME variable. export MAVEN_ARGS="--batch-mode -Duser.home=$srcdir/.home -Dcheckstyle.skip=true -Dlicensing.skip=true" export MAVEN_OPTS="-Xmx2048m" @@ -144,7 +149,7 @@ _jar_version() { } sha512sums=" -5871fe4e2b6d58b787d42eb2478d7dc5287d0c4f7cc535453e8d8d77185ae8a17e622552e2a142dc6051acdaab7bf2e2e0efde7d37cfbb2df930e23ed9e1316d neo4j-4.4.29.tar.gz +2dbed1fe8aaf467df6d8290611bd3bb0442f36f407c2170d38c8b9ddfc24f5bc2a8c696f3a9c6c1b406b94aec9ec26ab6cca85a1e580b6a843bc53be142efaf8 neo4j-4.4.32.tar.gz 1967594563adf1aa1c0c9809b0cc9fbefe042c933e556f5cb6d01f6ce0d40efcc054533c784d4e12b8fc5ebdd169fd276f2caeb8921eece634fa918219199706 system-jars.patch 6810dfe781aa46882dab971f97aefa8a22e68ed6956754bcb824c28839c7229469316ebe6695819a4bb6b701bea18848d467bd9863bf6dc2a2c01b3f55406202 conf.patch a1b6f509228dd9925420591803595c67653924ea592c38894f7d3d26e24b40bbc9b35e8b4e67611df9e06a7f0921b13e3f2f1bb54102049c3b1f9c6a2656939d wrapper.sh diff --git a/community/neomutt/APKBUILD b/community/neomutt/APKBUILD index 1e89b017627..70155afd4f1 100644 --- a/community/neomutt/APKBUILD +++ b/community/neomutt/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Alex Denes <caskd@redxen.eu> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=neomutt -pkgver=20231221 +pkgver=20240425 pkgrel=0 pkgdesc="Mutt with miscellaneous fixes and feature patches" url="https://neomutt.org/" @@ -53,7 +53,7 @@ package() { } sha512sums=" -a0670d3a6de6664aefa85718194d14d703b08f38e7b633c9827e6d7ef627c6b242c7279498e98dabe8e76976d79fb207ce6d1fef674462c5939c06b8fa0f0138 neomutt-20231221.tar.gz +bb47aba1aa8ecc824d9d0a8f6be23f2d39f0aac06739920ee349ff96bc27cbe39b6cfa797f648eb683fe49f01fa1873805a3ed2e7cbf4124dae12517591c02c9 neomutt-20240425.tar.gz 8c98a34c50e87a0b671b49b256dbd83034104fdfa93cde423adc102aebd9c3741942364addadc7c7c2a8a71cbca1850d6c03ff12c2238efac2d106da65f8c296 neomutt-test-files-1569b826a56c39fd09f7c6dd5fc1163ff5a356a2.tar.gz -aafcb43db1510317781e170885f0b7ea66db6fdfcebe8f79d928544334f0e222688f4cad38e964fa036dab511849cbc7ccd3fa4dd6522847cfec8a80a864b989 disable-failing-test.patch +090c58d67ab071df7406cce6720974b9fecca084a093b8a40b84a581ba741273d1524e186da7433501436717cc87e1315e9726b44a29a4287535ad53aca7d228 disable-failing-test.patch " diff --git a/community/neomutt/disable-failing-test.patch b/community/neomutt/disable-failing-test.patch index 07260c6f8b9..6d5fe81de6e 100644 --- a/community/neomutt/disable-failing-test.patch +++ b/community/neomutt/disable-failing-test.patch @@ -1,8 +1,16 @@ -mutt_path_to_absolute.c:99: Check test_check_str_eq... failed +mutt_path_to_absolute.c:102: Check test_check_str_eq... failed --- a/test/Makefile.autosetup +++ b/test/Makefile.autosetup -@@ -452,8 +452,7 @@ +@@ -88,7 +88,6 @@ + test/buffer/buf_new.o \ + test/buffer/buf_printf.o \ + test/buffer/buf_reset.o \ +- test/buffer/buf_rfind.o \ + test/buffer/buf_seek.o \ + test/buffer/buf_startswith.o \ + test/buffer/buf_strcpy.o \ +@@ -507,8 +506,7 @@ test/path/mutt_path_tidy.o \ test/path/mutt_path_tidy_dotdot.o \ test/path/mutt_path_tidy_slash.o \ @@ -14,7 +22,15 @@ mutt_path_to_absolute.c:99: Check test_check_str_eq... failed test/pattern/comp.o \ --- a/test/main.c +++ b/test/main.c -@@ -496,7 +496,6 @@ +@@ -131,7 +131,6 @@ + NEOMUTT_TEST_ITEM(test_buf_pool_release) \ + NEOMUTT_TEST_ITEM(test_buf_printf) \ + NEOMUTT_TEST_ITEM(test_buf_reset) \ +- NEOMUTT_TEST_ITEM(test_buf_rfind) \ + NEOMUTT_TEST_ITEM(test_buf_seek) \ + NEOMUTT_TEST_ITEM(test_buf_startswith) \ + NEOMUTT_TEST_ITEM(test_buf_strcpy) \ +@@ -555,7 +554,6 @@ NEOMUTT_TEST_ITEM(test_mutt_path_tidy_dotdot) \ NEOMUTT_TEST_ITEM(test_mutt_path_tidy_slash) \ NEOMUTT_TEST_ITEM(test_mutt_path_tilde) \ diff --git a/community/neovim/APKBUILD b/community/neovim/APKBUILD index c6d8922e4d8..1005a65a9ca 100644 --- a/community/neovim/APKBUILD +++ b/community/neovim/APKBUILD @@ -27,7 +27,7 @@ makedepends=" # Build neovim with lua instead of luajit on s390x # See https://github.com/neovim/neovim/issues/7879 case "$CARCH" in - ppc64le | riscv64 | s390x) makedepends="$makedepends lua5.1-dev lua5.1-bitop" ;; + ppc64le | riscv64 | s390x | loongarch64) makedepends="$makedepends lua5.1-dev lua5.1-bitop" ;; *) makedepends="$makedepends luajit-dev" ;; esac subpackages="$pkgname-lang $pkgname-doc" diff --git a/community/nerd-fonts/APKBUILD b/community/nerd-fonts/APKBUILD index 1ed05efb25f..aa96cadb313 100644 --- a/community/nerd-fonts/APKBUILD +++ b/community/nerd-fonts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=nerd-fonts -pkgver=3.1.1 +pkgver=3.2.1 pkgrel=0 pkgdesc="Patched developer targeted fonts with a high number of glyphs" url="https://nerdfonts.com" @@ -116,36 +116,36 @@ _all() { } sha512sums=" -0a9eeeff86458463e78f8157014ffd87214ba62a38139f9cff1ef41d6b1006fb64997ffe86e458f75ef699b2794a33d4f328ee1de01cd0ec69b10be74fa634a4 nerd-fonts-symbols-3.1.1.tar.xz -b9703fb721a6b12054954a33338bca6afec5a89f306284ae195aea9812f0091ba908513fc0b867feb8c243ad24015c6aea73b9835f34c8fd39ff2dcbbf25f026 10-nerd-font-symbols-3.1.1.conf -853ab55c94582014154a5ebfc7214bffd901f1b197b07052b578aeb9585e17164626d2609d77ce6e28d50bc7b05f03f18804cfd30a399994288effb06a6ad5d9 font-anonymous-pro-nerd-3.1.1.tar.xz -ba328c53ad3fb4d8bfaca8a7354debff465580ed3b043624865b6165fe95e3550425e2e06dc440818d2285d33bfbfe4d874be3192883984b37fa619aab644c92 font-arimo-nerd-3.1.1.tar.xz -88f0c1e61692342bce4ca16abe57cc09594520171e3276ae6a1907d960ae231389e9817809fa482473a3606ade93ea0118dbd31815baaa2742b43a2f63886549 font-bitstrom-wera-sans-mono-nerd-3.1.1.tar.xz -e89bee382b6d5dbed4996c36281979cfc999f112701c636cbc0a99ebaf7547b5c7e78b5de99d45a55a0caa4674cc20422c637f0ddff460d322373080dfcf345e font-cascadia-code-nerd-3.1.1.tar.xz -388fe06d1cc1cfbd677712f13921f5570b30a2d0ffcda575d9deb3aedee6ba9276c8ce8eac48bbe6bda951ffe8fda1704d9cd93d9a8e5a63bd3aa727d6af7406 font-comic-shanns-mono-nerd-3.1.1.tar.xz -d119deb13a827898d2e2810a76fea9a63ba5d5777ba179b8dfbdf0a1dbc1e3f3cace42948327a737d28e0fc5061ddc6c86e79b22e049086ea26cc32d213f210b font-dejavu-sans-mono-nerd-3.1.1.tar.xz -a20f5bccab9af3151ff224dec571d678fb79b90f6e6ceaca6881fc7c2b8ae010c2b290f1973f0628039f2e79063749c72a31d1715d5ce7aa77c914ec8bc076cb font-droid-sans-mono-nerd-3.1.1.tar.xz -f2fe9eb51e02638ac1fde9bcf6f33914c43fb83ab7027ff1331fe5d98dd0b07aeac027af61f7731a13521db5600eb0fceb56b10d91419f8e30aa8120641d949c font-fira-code-nerd-3.1.1.tar.xz -6ffd169ba6ceaa761fd799ff0bb40b35f03653ff0527832afa955487058286985d8b39cce7c150e395b7cca9e123253f7a0acb7a28322000971d21c61cddd148 font-fira-mono-nerd-3.1.1.tar.xz -d717984a4c2b54981b74a91c84a59d39eb01b27791e08593af4794d46889b992ea35f13a6bc665afda485bbb1f3101d6b99fb82db17887f4c1268a9b6c53d96b font-go-mono-nerd-3.1.1.tar.xz -f519605d751df61ca32afc1fa027c05d94c132920acb895acae8afbd524ba0d973a342224e576b78d02ccbf5d409bd8f92e2a952e771880c136c77fb10ee037d font-hack-nerd-3.1.1.tar.xz -2e7768a66f43c258420029de533f02c7618d43baa091c2dc8a1e364b3ae7b209ef73f1aee87cb6582656c567e814ace275ea2fdc0a5906f3bc6d0dc60188a6bd font-hasklig-nerd-3.1.1.tar.xz -9aef21e4f4b6db36c2d7c3cb9d33da4f370f0218562f44fdbc2ea7ce07a71157bf9e75994b2638395f6e2460c941156620b0166a6b82efbe1537407f8417dbba font-hermit-nerd-3.1.1.tar.xz -a0fe57e6071922a92d234b3160e4268b09ce87c966a94d2d2345160c4c54d02b5b1fd83ac80baf5b2a5d304fe4b4e8b15a722edb907b1ec9b889ebe88c739083 font-ia-writer-nerd-3.1.1.tar.xz -5535f2027e8da6d0d5d9ed3d0413e758067457ffa42d7a3f4d569e035c9d6ed1464a1657c510bf97b4e038f30271f2743f318a950bf3ee2b6fe8ab2a26ef7635 font-ibm-plex-mono-nerd-3.1.1.tar.xz -06b478c436222a173bbb569ec9d97e97ceff9fba4111f75c8caf15d40fa77ec1839d08473c171fc95b2fd1f9f853cefa9741afc7d3f0de3e955a0bf862c34669 font-inconsolata-nerd-3.1.1.tar.xz -d0642d40ef5bb6843f789722eb1e9cc8aa8ac55f49516166e37e37b9b626eda842f60e37fc16ff0cc99d98b0a8aedab8870a99355fb3c31749f00fe09d4f589c font-jetbrains-mono-nerd-3.1.1.tar.xz -a8051ba068a3c1a4ef7726f6eefb173261368fe56232cf5085ca72b0fbafb71e6a5800ae426f06d8d075a673accd4cadf1b7676c4448ab60e642ff2b32f57416 font-liberation-mono-nerd-3.1.1.tar.xz -27614d1fedc652102cbfb400e4a5f662d40d323c3fd514636c84de641f18bd212676efdd8095ade9d6fd6af52694bc455d0cc83421ed00a371493cba930ca493 font-meslo-nerd-3.1.1.tar.xz -e1be74e4d749f424e364a2fda54bd9268c02b36e1ab92ac5efbb3edf9ee0c4277e23c69c4cc85f617994f4bdc5e01d12940d0d4e30a7510d32a734a8ed394a90 font-monofur-nerd-3.1.1.tar.xz -7ed1a582a2a19c83d2f6cc3e8fbed736efd4f0e727564102ce2912df80519cd0d27b5f173ac6e11555832a1748cd384c8a5bf7b1adb9e76eea934035b3c12bc2 font-mononoki-nerd-3.1.1.tar.xz -d626f499e3c4d06dca4224f3b83a37dc6a3e4eb5a9f0aee7a82da5107c30540195a9da0904bb313234f834ce245fdb84c6476c846b87494e23b4540be23dd114 font-overpass-nerd-3.1.1.tar.xz -938916e716b7776c4afd5c002c9ceec629d5b1653d2b6b17e54c2b1ae146bb8d205c74062e23c7a273b7cd4742b13f4359c177a4532481013710cf66ba9f6453 font-share-tech-mono-nerd-3.1.1.tar.xz -eb19120d24daf1e5b47d4e92d32344eab0882a7ee89583ead29a8550a18ae28706aef63ac399d0d2779a3345f7287a83d415956b3888f5859c4c3a26c80d944e font-source-code-pro-nerd-3.1.1.tar.xz -80757c1f6302c66c635f5860b697b147b4363544957da572e1f815623b96a76b465f35c549f05e7f2ca1170ea78799d305fdc19ddcf9f683af90b4fff93632ff font-space-mono-nerd-3.1.1.tar.xz -23f1170a887ba7cc7e07dd7715c075e4af7e0ac304a4988694bfd0ac0357c05b4a42f81c772873fb051f62ca77b6a2d36a1fa4d2bf1bd002730f33bcc4ca2e30 font-terminus-nerd-3.1.1.tar.xz -eac42fee6026a178913ff17a0c099bc56012291e997e57d0863f3ceb6319bd735c9e3a513935df92d7c0254afeaa91c977e70ffbd1aab6edd74377cf3fb599f2 font-tinos-nerd-3.1.1.tar.xz -c63ed8d1348cc3752c4d2810fef0ee32b6ed4a3e725b183f21e522a9745f31e5bd9a5fefb969ac4960b63d3a95bc1ee30980de30a826eac1f572c24fb28c48df font-ubuntu-nerd-3.1.1.tar.xz -326e16008b7ae650ec45f5bb1167362874c2dded0399f7152a50747e4fd09dc135fcae0aa2852e63bf8d956d79a75ab1a4402d57c46711305ad2940f468ee3a5 font-ubuntu-mono-nerd-3.1.1.tar.xz -38fb000374f7ed5e5daf745e29399b481bd0783eb870c59e717054f091e407993d42ffbdb824adff9d6c3c43bcf81c62c75c7bbb0ee361cf996ab28a173b7b45 font-victor-mono-nerd-3.1.1.tar.xz +ac61c1d4153049f1a3009fb6ec4f89073770a09d70b7236b9e0eca07da593e57c14afe2a0c9d7bfb315389c878afcdfdb23c1c19a23c3950e7de52a8ce3099de nerd-fonts-symbols-3.2.1.tar.xz +cede5368ea6014b3e6e4cc7207ffd6cd0765803debc735c5bdef456ae1f938f94d3fbb7c4bcfec9d5cc422a76b7cb12c3f22d54b4c4610adc14807c5a80ae134 10-nerd-font-symbols-3.2.1.conf +4c89a879a455395d31848b0d1181a1768ff5cfa3384a8a2a89e7f50cfc602e2efe35f893a5b445f0750ff4d9277eae702477bf14717e74886c7485e1c5a2eed2 font-anonymous-pro-nerd-3.2.1.tar.xz +d6aca4dc2d5f8d01f2f44a625eb671107e3d11f3e317198eaa226aed91e027509e81f3eee1e97299a3f53472043f2a9517f7ad653d439c8d8410e0c401f218d2 font-arimo-nerd-3.2.1.tar.xz +7b5a7d24af09004b0a67eabaf29bcdb0ca8e171fcfdbb632ffe3dfca7cfe5b43c773a467d079869d4ddd7824475e65233eac49092967f5e26b3a45dee9132b18 font-bitstrom-wera-sans-mono-nerd-3.2.1.tar.xz +4bcf50c1a1f30abef930b092bff02c4e5e74633d723aae04012e2c217afb4bae9c7cf91f4204e6cd7d554b8ff342e3dc32ec231bce71f33064592d96c08deab0 font-cascadia-code-nerd-3.2.1.tar.xz +e704d3fbd7fcacdd0695bad0329604ebffa86747cd41f7071101204b3e661911fe893c577fb62d038ec8d71d6f6671ac521bbf6b43966b332f41bb6ed06fd30a font-comic-shanns-mono-nerd-3.2.1.tar.xz +4bf5fa45d1f57ab785655c0574ba236750b7688f30266e328179d2804e5fb2e764f1b915d1c35c9fb63db73ed8812257920bc758a926f6de3d61b2327720a94b font-dejavu-sans-mono-nerd-3.2.1.tar.xz +2c883477543ae94eb627f25e885f52233867f67326055e02460e120e8b444d27d07c8d1d7d292b3b9ed5c8475b2297675a4d132c06fd8caf858ae015671bb75d font-droid-sans-mono-nerd-3.2.1.tar.xz +b8261cf2df5a9195fa106e3d17d91499a7099762e6d2c013e1ac292388a639e96268e289319964b7da5d68a873fe460f44002c246bed560f6a97dcd853511831 font-fira-code-nerd-3.2.1.tar.xz +00d1a03ce3c97fc504b1c3b2ae2a6a6e8b5241a83771e1c5c19739c0f6421a6b107fa20f7d776fffecb160039e52c340f4f74922072169928db9b357c64e1e01 font-fira-mono-nerd-3.2.1.tar.xz +aa450f425533b7b69612805b17867ef99aa8de9dd0e47133a2adbb383efa8a1868421309c24cc8335912742b29d7c25733666e9dbe0f293d9007a9981d9e72a8 font-go-mono-nerd-3.2.1.tar.xz +ee9ce9dc1c41de11f092fd36f85ec23ce1dbb870f38103e393750b08b85407a7135ad1022e9db01abe64245f1557646c3e95700124ef9d0a66d2b9d5368aac10 font-hack-nerd-3.2.1.tar.xz +e7625a28bffdb73e96aef21c47186bf75b7c7884aadba37e0b5beca5f34b6f25d0f458907e4ddccb6bf33080a5e13dc85520ab3a9f19daf168091c9dc5b9335d font-hasklig-nerd-3.2.1.tar.xz +3718d56c185a7d245f314f753272c7a0a747351b09d24da474f0f443fc759fb631f673403ce4d4b2cd289293b04253ccdf4917a4d1f15368296f733937d80e2a font-hermit-nerd-3.2.1.tar.xz +2e4368f8285531fa0b27e2d55bd079126aeb54371ffc5623d8980f9f3ef6ca479f6f3709b58a62682e6bce04eaaba1a29cff39a4a85b47e9a1c6fff966b64527 font-ia-writer-nerd-3.2.1.tar.xz +ac465368f72f93e7ce44c43b6fccca3f434245ab11b7f4f4cf75bd0330c1ab008017adac1278f620a1342eb3d9188a45f18fcaf3b47d5eff65c9682a9477fe93 font-ibm-plex-mono-nerd-3.2.1.tar.xz +a47ee99edd1490319bd9e19860b326b4d9b2a7c05e63917d99ca1817f58964545f935b1531c79f3179e95caf32d073ad899591dfc11278e0361cf1345fde2ffc font-inconsolata-nerd-3.2.1.tar.xz +b4eb3d2e95881de683d655d5b4f40d681d138a08450a366bd5778ea1103d29153b7ddabe320c44ff569c10bed4f825531ac2ce2c44235c0e488713828d143c27 font-jetbrains-mono-nerd-3.2.1.tar.xz +5b9bb855e1b98adab1b65e02ccb4593f692248c6ebc64f0976e0380c09b7a2c0140f0867d852f070643b3cc5a4a17e0811c3162613a6380cc9ff19e594a02d2d font-liberation-mono-nerd-3.2.1.tar.xz +5364b31502e54884e4dc0dac61e19c026cfac5b1f9a02053d57ecdba2ec249851e2766f252952ff3afdf51ca59bc705422715f6942836312333f6b2000e3402a font-meslo-nerd-3.2.1.tar.xz +d50f5765a4a2baf7d0c76df729c3b828f87dcd25cbbd99fc731d2e760e9a0a02a01ae70439a288f24f9522584077d2983ef23ca6d5c8fd7bc5f199fd82c289af font-monofur-nerd-3.2.1.tar.xz +d85536d84a94b5703d215e89a12e596c7431db9cda067ce68f24be11e81a349a63a58a09519521e3995fc4fd1833f39541e76b2d3e00612cad66ef3992069f04 font-mononoki-nerd-3.2.1.tar.xz +35f92d6b270e8cab600a5bedf03bb92f9c8ea53ef05468ba312f4ac9aa92c355a67433eeebdc8936e6162c1901d8ef469a447ef8e8aa438d4a39e773b3a5a711 font-overpass-nerd-3.2.1.tar.xz +0f109de045b33bb9726d33934ae36b61281fa169784d6998b3db2d7331e92709b3ff9afcf8714dc0c71da81817f2f260087a21000dd451baab11e121a5c5d720 font-share-tech-mono-nerd-3.2.1.tar.xz +ffa831caaaa252427a227e5a9efd9360b01f12d7d15adb3dcee1af2f3a9acc9685aed9a08d5a99a15e343c3cb7f3d6cb4544cedabbdfe3a6531982ea6a1835ae font-source-code-pro-nerd-3.2.1.tar.xz +21eb46b35754a923048ee1fc8ffbf1c38bbb0f6b1ad7c7b4d4582f4a6655b3c9bc8334810ceaddc3d1e7409132226cd86c1125d5667b4f911686ca3b56ff6f62 font-space-mono-nerd-3.2.1.tar.xz +fa2ebd49e20b28bb9820caa7ca04d96958b260d64345789dc2d9d85984e84cd6dd84dc45c8f9dc50b5dbd622764b70b9a3afeb4f98a3316bf6960d4c8fa9b04a font-terminus-nerd-3.2.1.tar.xz +0ab19ef4b08b6768beca0e75bc8e1ab53368adf1159b1236083bb1ef91607b40176da75ea419329ad023486370ed238df23d66c6ca86bdda1c68a30f3529bbe9 font-tinos-nerd-3.2.1.tar.xz +9d385f9683f4803547c1048cf90bc97cab2e38d5c52bc6183b4ac3767173dd8ba34c92fe99bb9718db51fef9622042aed55b8e84b9227196ec055cd793f0e626 font-ubuntu-nerd-3.2.1.tar.xz +dc3e5c1d86aca54049a1d175c33453715baa37e58e04671b051690c616115ea7fe3fdefb96714751cadb20eee48c96b614017fbb3e93692498e783619dd919fd font-ubuntu-mono-nerd-3.2.1.tar.xz +a81db43ea05061111f7e87eb8ef0df45b46ef2a5256911e05aa130472f00bdb141d996d095c9b6a2cc83e11bf477fa3195b151f011305497ed5d26f52c346d83 font-victor-mono-nerd-3.2.1.tar.xz " diff --git a/community/nerdctl/APKBUILD b/community/nerdctl/APKBUILD index 1c4664ebfff..5acb0c1692b 100644 --- a/community/nerdctl/APKBUILD +++ b/community/nerdctl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=nerdctl -pkgver=1.7.5 -pkgrel=1 +pkgver=1.7.6 +pkgrel=0 pkgdesc="Docker-compatible CLI for containerd" url="https://github.com/containerd/nerdctl/" arch="all" @@ -53,5 +53,5 @@ package() { } sha512sums=" -3e35c5e3c68c675d23c1a106d267f62c2e36cd8026308ac6237fa5aa2f3ebaea0f47888e6702290f40c26f543e90bca91d76cae28b74732e8fb351f6ef2441f9 nerdctl-1.7.5.tar.gz +8fd8a393c25206b7213fa7a95f4d6c76ed68aad82cfc6c8968d134e7d31304f4b7c20e6fa8b6d825c5398ccf5f08f3af94a3e3f7b30ebdf2ac7aa2066120bc50 nerdctl-1.7.6.tar.gz " diff --git a/community/net-cpp/APKBUILD b/community/net-cpp/APKBUILD index c9614e0c224..bbf8971063f 100644 --- a/community/net-cpp/APKBUILD +++ b/community/net-cpp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=net-cpp pkgver=3.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="A simple yet beautiful networking API for C++11" url="https://gitlab.com/ubports/core/lib-cpp/net-cpp" arch="all" diff --git a/community/netcdf/APKBUILD b/community/netcdf/APKBUILD index 56eff94a8bf..16c13dcbc7a 100644 --- a/community/netcdf/APKBUILD +++ b/community/netcdf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=netcdf pkgver=4.9.2 -pkgrel=2 +pkgrel=3 pkgdesc="Libraries for the Unidata network Common Data Format" url="https://www.unidata.ucar.edu/software/netcdf/" # disabled on s390x because of https://github.com/Unidata/netcdf-c/issues/1987 diff --git a/community/netdata-go-plugins/0001-fix-go.d.plugin-pulsar-tests-17093.patch b/community/netdata-go-plugins/0001-fix-go.d.plugin-pulsar-tests-17093.patch deleted file mode 100644 index 3bd56d10bd7..00000000000 --- a/community/netdata-go-plugins/0001-fix-go.d.plugin-pulsar-tests-17093.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d28d1f71c7e0093662d5e5917685b430759848af Mon Sep 17 00:00:00 2001 -From: Ilya Mashchenko <ilya@netdata.cloud> -Date: Mon, 4 Mar 2024 10:36:02 +0200 -Subject: [PATCH] fix go.d.plugin/pulsar tests (#17093) - ---- - src/go/collectors/go.d.plugin/modules/pulsar/charts.go | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/go/collectors/go.d.plugin/modules/pulsar/charts.go b/src/go/collectors/go.d.plugin/modules/pulsar/charts.go -index a0599dc8d..3ddff66f6 100644 ---- a/modules/pulsar/charts.go -+++ b/modules/pulsar/charts.go -@@ -269,6 +269,7 @@ var namespaceCharts = Charts{ - } - - func toNamespaceChart(chart Chart) Chart { -+ chart = *chart.Copy() - if chart.ID == sumBrokerComponentsChart.ID { - _ = chart.RemoveDim("pulsar_namespaces_count") - } --- -2.44.0 - diff --git a/community/netdata-go-plugins/APKBUILD b/community/netdata-go-plugins/APKBUILD deleted file mode 100644 index 33dccead138..00000000000 --- a/community/netdata-go-plugins/APKBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Contributor: Henrik Riomar <henrik.riomar@gmail.com> -# Maintainer: Henrik Riomar <henrik.riomar@gmail.com> -pkgname=netdata-go-plugins -pkgver=0.58.1 -pkgrel=1 -pkgdesc="netdata go.d.plugin" -url="https://github.com/netdata/go.d.plugin" -arch="all !x86 !armv7 !armhf" # checks fail -license="GPL-3.0-or-later" -depends="netdata" -makedepends="go" -source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/netdata/go.d.plugin/tar.gz/refs/tags/v$pkgver - 0001-fix-go.d.plugin-pulsar-tests-17093.patch - " -builddir="$srcdir/go.d.plugin-$pkgver" - -export GOFLAGS="$GOFLAGS -modcacherw" -export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" -export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" -export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" - -build() { - go build -v -o go.d.plugin ./cmd/godplugin -} - -check() { - go test ./... -} - -package() { - mkdir -p "$pkgdir/usr/lib/netdata/conf.d" - cp -r "$builddir/config/go.d.conf" "$builddir/config/go.d" "$pkgdir/usr/lib/netdata/conf.d/" - - mkdir -p "$pkgdir/usr/libexec/netdata/plugins.d/" - install -D -m755 -t "$pkgdir/usr/libexec/netdata/plugins.d" "$builddir/go.d.plugin" -} - -sha512sums=" -acbfd7ee4a72cee0587936bd2d4e27a2b58894ee72a2218b96643c1fe0866990f9d6bfe1f754cda5f5443bc75e1406a6511300ea265a81e4be89f7f97b17664c netdata-go-plugins-0.58.1.tar.gz -7b7e6599cdd87f8640ab21323f2fe7b419b6371538f46554c5b272a7ef47f94b32f27abe7c37429aeeeef038be57fce0b75a52de15890b1dbfb96e6f6f9e6300 0001-fix-go.d.plugin-pulsar-tests-17093.patch -" diff --git a/community/netdata/APKBUILD b/community/netdata/APKBUILD index df07df626cc..b479a9e1246 100644 --- a/community/netdata/APKBUILD +++ b/community/netdata/APKBUILD @@ -1,23 +1,31 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=netdata -pkgver=1.44.3 +pkgver=1.45.4 pkgrel=0 pkgdesc="Real-time performance monitoring" url="https://www.netdata.cloud/" license="GPL-3.0-or-later" arch="all" -depends="bash" +depends="bash coreutils" makedepends=" abseil-cpp-dev - autoconf - automake + brotli-dev + cmake + cups-dev e2fsprogs-dev + elfutils-dev + go json-c-dev + judy-dev libcap-dev + libmnl-dev + libnetfilter_acct-dev + libuuid libuv-dev linux-headers lz4-dev + samurai openssl-dev>3 protobuf-dev yaml-dev @@ -26,32 +34,41 @@ makedepends=" checkdepends="cmocka-dev" pkgusers="netdata" pkggroups="netdata" -subpackages="$pkgname-openrc $pkgname-python::noarch" +subpackages="$pkgname-openrc $pkgname-python::noarch $pkgname-go-plugins:go" install="$pkgname.pre-install" -options="!check" # Broken tests +options="!check" # tests require installation to / _aclk_schemas_commit=83c661c0dcddb9526814ebbd0668fbc3e281f03f _ml_dlib_commit=021cbbb1c2ddec39d8dd4cb6abfbbafdf1cf4482 -_mqtt_websockets_commit=6664789ccf57c95451638364f544d1679efd910e # This _h2o_commit fixes CVE-2023-44487, and does not follow upstream _h2o_commit=094a6f90f76eeb280a430200cba47bde39b0b8e8 -_c_rbuf_commit=51485be511f8c1d592b699f09f7c783aa2270375 -_c_rhash_commit=f6c21836b921535ab818c7f72b77346d25f60d8e +_fluentbit_commit=b19e9ce674de872640c00a697fa545b66df0628a + source="$pkgname-$pkgver.tar.gz::https://github.com/netdata/netdata/archive/v$pkgver.tar.gz aclk-schemas-$_aclk_schemas_commit.tar.gz::https://github.com/netdata/aclk-schemas/archive/$_aclk_schemas_commit.tar.gz dlib-$_ml_dlib_commit.tar.gz::https://github.com/davisking/dlib/archive/$_ml_dlib_commit.tar.gz - mqtt_websockets-$_mqtt_websockets_commit.tar.gz::https://github.com/underhood/mqtt_websockets/archive/$_mqtt_websockets_commit.tar.gz h2o-$_h2o_commit.tar.gz::https://github.com/h2o/h2o/archive/$_h2o_commit.tar.gz - c-rbuf-$_c_rbuf_commit.tar.gz::https://github.com/underhood/c-rbuf/archive/$_c_rbuf_commit.tar.gz - c_rhash-$_c_rhash_commit.tar.gz::https://github.com/underhood/c_rhash/archive/$_c_rhash_commit.tar.gz - cxx17-2.patch + fluent-bit-$_fluentbit_commit.tar.gz::https://github.com/fluent/fluent-bit/archive/$_fluentbit_commit.tar.gz + + openrc-pidfile-not-writable-by-user.patch + protobuf-23.patch - $pkgname.initd - $pkgname.confd + build-enable-cgo.patch " # secfixes: # 1.43.2-r1: # - CVE-2023-44487 +# 0: +# - CVE-2024-32019 + +_freeipmi=False +case $CARCH in + ppc64le) ;; # no freeipmi + *) + makedepends="$makedepends freeipmi-dev" + _freeipmi=True + ;; +esac copy_submodule() { local name=$1 @@ -65,79 +82,94 @@ copy_submodule() { } prepare() { - copy_submodule aclk-schemas "$_aclk_schemas_commit" aclk/aclk-schemas - copy_submodule dlib "$_ml_dlib_commit" ml/dlib - copy_submodule mqtt_websockets "$_mqtt_websockets_commit" mqtt_websockets - copy_submodule h2o "$_h2o_commit" web/server/h2o/libh2o - copy_submodule c-rbuf "$_c_rbuf_commit" mqtt_websockets/c-rbuf - copy_submodule c_rhash "$_c_rhash_commit" mqtt_websockets/c_rhash + copy_submodule aclk-schemas "$_aclk_schemas_commit" src/aclk/aclk-schemas + copy_submodule dlib "$_ml_dlib_commit" src/ml/dlib + copy_submodule h2o "$_h2o_commit" src/web/server/h2o/libh2o + copy_submodule fluent-bit "$_fluentbit_commit" src/fluent-bit default_prepare - autoreconf -i } build() { - CXXFLAGS="$CXXFLAGS -std=c++17" \ - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-zlib \ - --with-math \ - --enable-https \ - --with-webdir=/usr/share/webapps/netdata \ - --with-user=netdata - make -} + local cmake_crossopts + if [ "$CBUILD" != "$CHOST" ]; then + cmake_crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi -check() { - msg "check" - make check + # ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE: snappy not found due to lack of + # pkgconf + # ENABLE_PLUGIN_EBPF: include files missing + # ENABLE_LOGS_MANAGEMENT_TESTS: tries to assign read-only stdout/stderr + cmake -G Ninja -B build \ + -DCMAKE_INSTALL_PREFIX=/ \ + -DCMAKE_BUILD_TYPE=Release \ + -DWEB_DIR=/usr/share/webapps/netdata \ + -DENABLE_PLUGIN_SYSTEMD_JOURNAL=False \ + -DENABLE_PLUGIN_XENSTAT=False \ + -DENABLE_PLUGIN_CUPS=False \ + -DENABLE_PLUGIN_EBPF=False \ + -DENABLE_PLUGIN_GO=True \ + -DENABLE_PLUGIN_FREEIPMI=$_freeipmi \ + -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=False \ + -DENABLE_EXPORTER_MONGODB=False \ + -DENABLE_LOGS_MANAGEMENT_TESTS=False \ + $cmake_crossopts + cmake --build build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build chgrp -R $pkggroups "$pkgdir"/usr/share/webapps/netdata - install -Dm755 $srcdir/$pkgname.initd $pkgdir/etc/init.d/$pkgname - install -Dm644 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/$pkgname + install -Dm755 build/system/openrc/init.d/netdata -t $pkgdir/etc/init.d/ + install -Dm644 build/system/openrc/conf.d/netdata -t $pkgdir/etc/conf.d/ install -Dm644 ./system/netdata.conf $pkgdir/etc/netdata/netdata.conf - install -d -m0750 -o netdata -g netdata \ + # auxilary files for various systems, but not installed at the correct + # location + rm -r "$pkgdir"/usr/lib/netdata/system + + # Fix permissions + chown -R netdata: \ + "$pkgdir"/var/cache/netdata \ "$pkgdir"/var/lib/netdata \ - "$pkgdir"/var/log/netdata \ - "$pkgdir"/var/cache/netdata + "$pkgdir"/var/log/netdata + chmod 0750 "$pkgdir"/var/cache/netdata + chmod 0750 "$pkgdir"/var/lib/netdata + + # rundir in /run + rmdir "$pkgdir"/var/run + install -dm0755 "$pkgdir"/run/netdata } python() { pkgdesc="$pkgdesc (python3 support)" depends="$pkgname python3" - mkdir -p "$subpkgdir"/etc/netdata - mkdir -p "$subpkgdir"/usr/libexec/netdata/plugins.d - mkdir -p "$subpkgdir"/usr/lib/netdata/conf.d - - mv $pkgdir/usr/libexec/netdata/python.d \ - "$subpkgdir"/usr/libexec/netdata - mv $pkgdir/usr/libexec/netdata/plugins.d/python.d.plugin \ - "$subpkgdir"/usr/libexec/netdata/plugins.d - mv $pkgdir/etc/netdata/python.d \ - $subpkgdir/etc/netdata/ - mv $pkgdir/usr/lib/netdata/conf.d/python.d \ - $subpkgdir/usr/lib/netdata/conf.d - mv $pkgdir/usr/lib/netdata/conf.d/python.d.conf \ - $subpkgdir/usr/lib/netdata/conf.d + amove usr/libexec/netdata/python.d + amove usr/libexec/netdata/plugins.d/python.d.plugin + amove etc/netdata/python.d + amove usr/lib/netdata/conf.d/python.d + amove usr/lib/netdata/conf.d/python.d.conf +} + +go() { + pkgdesc="$pkgdesc (go plugins)" + depends="$pkgname" + + amove usr/libexec/netdata/plugins.d/go.d.plugin + amove usr/lib/netdata/conf.d/go.d.conf + amove usr/lib/netdata/conf.d/go.d + amove usr/lib/netdata/conf.d/health.d/go.d.plugin.conf + amove etc/netdata/go.d } sha512sums=" -783d9de4ff108197c3b081c8945eae8f5faee5cb4c717f1bfa27e3c9efca517c60794960005ee332eb24c672389f87ed4084348f7f5deec8a067bc25ad8e7ab0 netdata-1.44.3.tar.gz +440ba2ea11480a265507db17d09fabb8864d2a6c87bda98a13457994c95bf393fee099ff430dcd18053e4ef31c9e8d9b01d1eed0c6a433214296953b6c186399 netdata-1.45.4.tar.gz 9687ede999002e73563c118fb604cbf8957670f8fac8f7c51d637c1518c00c1919e3b66bf055f152cda766695fc625a751db19a91174f487c0cc2752d47afb52 aclk-schemas-83c661c0dcddb9526814ebbd0668fbc3e281f03f.tar.gz 814e3ee5811b43349a218c2b6595e53c1daf5db2c9346b2ec0ff6475cc83b1803adad3f3210f51e219d6523fcf839543087b94eb18501ee144128fb169bd9c0b dlib-021cbbb1c2ddec39d8dd4cb6abfbbafdf1cf4482.tar.gz -26dc950804887982fe4472a6c5ce78e36ec89b75fb5e94a8ad9eac3abb7558e2e151cd10652e159910af78da13de054011f266a4cec22becb6f488154ee5737b mqtt_websockets-6664789ccf57c95451638364f544d1679efd910e.tar.gz f494a2bf75fe7a6c97bf64ae8d2a4eabe6bcc5c1a4a038cb27c23b478a65a543f9c2dcc8223b0e05ebe2ee811baa06876d13d5abb344c1bc51bdf5e3e8d3a75b h2o-094a6f90f76eeb280a430200cba47bde39b0b8e8.tar.gz -c65c3c72c60654ef575f485b45c0389198a91b307f39ce984baa4d2fc519c62d645fd226f076b2ec059a97599be8892a8270ffb57bba575c0390181244aff228 c-rbuf-51485be511f8c1d592b699f09f7c783aa2270375.tar.gz -2082de803895a1499006e683f3173205b5033c9f788f1d5a5944463c1da5bc8d8661a187e7a0ec23f9f0e0251557741f72d54a7732a3ad010930e16fa04a0853 c_rhash-f6c21836b921535ab818c7f72b77346d25f60d8e.tar.gz -39cc473fbfff28862a9c3dbbfe59005c57ccee6664bb328924c2124a8f1faeb5e6247a6405a7e498c01a975e826582c28e66b7dd4552b8923ded446bf42609cd cxx17-2.patch -cfe712c6038f483fd276633330bb0cfc92c2779585e1855295da0d54e7f380d4a201a8bd25b939b69df65a8fe5a1dfa6debbcd9f4e8ca88c1caad3869fcc55a0 protobuf-23.patch -89d5e31a9ff05678bd42b79777069137bb7cb140079fb3c8a8ca52ffdcad0f800eef7a458c065a2ef10fbdd01e96ce5321b59a3d57a7528aa874a49d5a88a8b8 netdata.initd -990ea3f485d9d5ffda50e5f6169704a209d51d18a5d75f97de742b8539c764745f9f59489007d5d1091cdf9f25e8e46519c32fc43cfe527fe2fc8426b0344612 netdata.confd +e2cc42781b668a102ca73c49790e652b5daf42999ae7c711e2fffc59b6e556bee2d0008dafbc1746b7a7cebe00ce4b8ee30b7327b5cc58df2575919f76daa442 fluent-bit-b19e9ce674de872640c00a697fa545b66df0628a.tar.gz +bfa455511b582497c358be5a9408f066495edfade229b7971c5de1a85a8b7a5a503b474c9341eb8f367dc1f70be9663186c978ecc85280096f928941c002671d openrc-pidfile-not-writable-by-user.patch +c42a973ad1c7bb7b16a0c0d20580ac168071d37c06ad6b3336388ba7c5d59dd8b90795ea9a7f501d01755062d0a9a405a61b49f05a940c942c2154400d2721ee protobuf-23.patch +2f7b5f6a91fac0bd0a9a0a8ed4a53eb74db8f296332e35ca293f5a916fa6e58f2ebc32fd6621d41de68d61d31d1c85b5567c2b0800c7a484aed03cf1b89472eb build-enable-cgo.patch " diff --git a/community/netdata/build-enable-cgo.patch b/community/netdata/build-enable-cgo.patch new file mode 100644 index 00000000000..4a1d1853e42 --- /dev/null +++ b/community/netdata/build-enable-cgo.patch @@ -0,0 +1,15 @@ +Description: enable CGO because buildmode=pie requries external linking +Upstream: no +diff --git a/packaging/cmake/Modules/NetdataGoTools.cmake b/packaging/cmake/Modules/NetdataGoTools.cmake +index 9bb09cd..90ee6b9 100644 +--- a/packaging/cmake/Modules/NetdataGoTools.cmake ++++ b/packaging/cmake/Modules/NetdataGoTools.cmake +@@ -33,7 +33,7 @@ macro(add_go_target target output build_src build_dir) + + add_custom_command( + OUTPUT ${output} +- COMMAND "${CMAKE_COMMAND}" -E env CGO_ENABLED=0 "${GO_EXECUTABLE}" build -buildvcs=false -ldflags "${GO_LDFLAGS}" -o "${CMAKE_BINARY_DIR}/${output}" "./${build_dir}" ++ COMMAND "${CMAKE_COMMAND}" -E env CGO_ENABLED=1 "${GO_EXECUTABLE}" build -buildvcs=false -ldflags "${GO_LDFLAGS}" -o "${CMAKE_BINARY_DIR}/${output}" "./${build_dir}" + DEPENDS ${${target}_DEPS} + COMMENT "Building Go component ${output}" + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/${build_src}" diff --git a/community/netdata/netdata.confd b/community/netdata/netdata.confd deleted file mode 100644 index 88dc20e878c..00000000000 --- a/community/netdata/netdata.confd +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration for /etc/init.d/netdata - -# Options to pass to netdata daemon. -#command_args= - -# Run with process supervisor. -supervisor=supervise-daemon diff --git a/community/netdata/netdata.initd b/community/netdata/netdata.initd deleted file mode 100644 index 9b08ef6f7cc..00000000000 --- a/community/netdata/netdata.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run - -name="Netdata" -description="Real-time performance monitoring" -command="/usr/sbin/netdata" -command_args_foreground="-D" - -# Needed for disk I/O utilization reporting. -# (This is supported since OpenRC 0.45) -capabilities="^cap_dac_read_search,^cap_sys_ptrace" - -depend() { - need net - after apache2 squid nginx mysql named opensips hostapd postfix lm_sensors -} - -start_pre() { - checkpath --directory --owner netdata:netdata --mode 0750 /var/log/netdata - checkpath --directory --owner netdata:netdata --mode 0750 /var/cache/netdata -} diff --git a/community/netdata/openrc-pidfile-not-writable-by-user.patch b/community/netdata/openrc-pidfile-not-writable-by-user.patch new file mode 100644 index 00000000000..034b6d1f48b --- /dev/null +++ b/community/netdata/openrc-pidfile-not-writable-by-user.patch @@ -0,0 +1,44 @@ +diff --git a/system/openrc/conf.d/netdata.in b/system/openrc/conf.d/netdata.in +index 92f8826..b07972b 100644 +--- a/system/openrc/conf.d/netdata.in ++++ b/system/openrc/conf.d/netdata.in +@@ -15,10 +15,6 @@ NETDATA_FORCE_EXIT=0 + # work around issues. + #NETDATA_USE_NETDATACLI=1 + +-# Specify the path to the pidfile to be used when running in the +-# background. +-NETDATA_PIDFILE="@localstatedir_POST@/run/netdata/netdata.pid" +- + # Uncomment the below line to run Netdata under OpenRC's native process + # supervision. + #supervisor="supervise-daemon" +diff --git a/system/openrc/init.d/netdata.in b/system/openrc/init.d/netdata.in +index 23d1a56..4912297 100644 +--- a/system/openrc/init.d/netdata.in ++++ b/system/openrc/init.d/netdata.in +@@ -12,8 +12,8 @@ description_rotate="Reopen log files." + + command_prefix="@sbindir_POST@" + command="${command_prefix}/netdata" +-command_args="-P ${NETDATA_PIDFILE} ${NETDATA_EXTRA_ARGS}" ++command_args="${NETDATA_EXTRA_ARGS}" + command_args_foreground="-D" + + depend() { + use logger +@@ -22,10 +23,11 @@ depend() { + } + + start_pre() { +- checkpath -o ${NETDATA_OWNER} -d @localstatedir_POST@/run/netdata ++ checkpath -o root -d @CMAKE_INSTALL_PREFIX@/run/netdata +- + if [ -z "${supervisor}" ]; then +- pidfile="${NETDATA_PIDFILE}" ++ command_args="$command_args -D" ++ command_background=true ++ pidfile="@CMAKE_INSTALL_PREFIX@/run/netdata/netdata.pid" + fi + } + diff --git a/community/netdata/protobuf-23.patch b/community/netdata/protobuf-23.patch index f78527c5f1e..20f1c0ef82e 100644 --- a/community/netdata/protobuf-23.patch +++ b/community/netdata/protobuf-23.patch @@ -1,9 +1,9 @@ Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/netdata/-/blob/548041264400be8349055d05c76a76391dba3e43/protobuf-23.patch -- -diff --git a/aclk/schema-wrappers/alarm_stream.cc b/aclk/schema-wrappers/alarm_stream.cc -index 11b9284f5..9e34b78a2 100644 ---- a/aclk/schema-wrappers/alarm_stream.cc -+++ b/aclk/schema-wrappers/alarm_stream.cc +diff --git a/src/aclk/schema-wrappers/alarm_stream.cc b/src/aclk/schema-wrappers/alarm_stream.cc +index 29d80e3..7a51185 100644 +--- a/src/aclk/schema-wrappers/alarm_stream.cc ++++ b/src/aclk/schema-wrappers/alarm_stream.cc @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-3.0-or-later @@ -18,10 +18,10 @@ index 11b9284f5..9e34b78a2 100644 #include "schema_wrapper_utils.h" using namespace alarms::v1; -diff --git a/aclk/schema-wrappers/schema_wrapper_utils.h b/aclk/schema-wrappers/schema_wrapper_utils.h -index 2815d0f20..751caa324 100644 ---- a/aclk/schema-wrappers/schema_wrapper_utils.h -+++ b/aclk/schema-wrappers/schema_wrapper_utils.h +diff --git a/src/aclk/schema-wrappers/schema_wrapper_utils.h b/src/aclk/schema-wrappers/schema_wrapper_utils.h +index 693a4ce..63bc11c 100644 +--- a/src/aclk/schema-wrappers/schema_wrapper_utils.h ++++ b/src/aclk/schema-wrappers/schema_wrapper_utils.h @@ -3,11 +3,12 @@ #ifndef SCHEMA_WRAPPER_UTILS_H #define SCHEMA_WRAPPER_UTILS_H @@ -36,4 +36,4 @@ index 2815d0f20..751caa324 100644 -#include <google/protobuf/map.h> #if GOOGLE_PROTOBUF_VERSION < 3001000 - #define PROTO_COMPAT_MSG_SIZE(msg) (size_t)msg.ByteSize(); + #define PROTO_COMPAT_MSG_SIZE(msg) (size_t)msg.ByteSize() diff --git a/community/netdata/submodule_commits.sh b/community/netdata/submodule_commits.sh index 0c4c593ad4f..699392e2204 100755 --- a/community/netdata/submodule_commits.sh +++ b/community/netdata/submodule_commits.sh @@ -6,6 +6,11 @@ set -eu -o pipefail version=${1?Please provide a version} +case $version in + v*) ;; + *) echo "Version should start with 'v'"; exit 1;; +esac + req() { local request="$1" curl \ @@ -21,12 +26,7 @@ submodule_commit() { netdata_submodules="$(req netdata/netdata/git/trees/"${version}"\?recursive=true | jq '.tree[] | select(.type == "commit")')" -websockets_commit="$(echo "$netdata_submodules" | submodule_commit mqtt_websockets)" -websockets_submodules="$(req underhood/mqtt_websockets/git/trees/"${websockets_commit}"\?recursive=true | jq '.tree[] | select(.type == "commit")')" - -printf "_aclk_schemas_commit=%s\n" "$(echo "$netdata_submodules" | submodule_commit aclk/aclk-schemas)" -printf "_ml_dlib_commit=%s\n" "$(echo "$netdata_submodules" | submodule_commit ml/dlib)" -printf "_mqtt_websockets_commit=%s\n" "$(echo "$netdata_submodules" | submodule_commit mqtt_websockets)" -printf "_h2o_commit=%s\n" "$(echo "$netdata_submodules" | submodule_commit web/server/h2o/libh2o)" -printf "_c_rbuf_commit=%s\n" "$(echo "$websockets_submodules" | submodule_commit c-rbuf)" -printf "_c_rhash_commit=%s\n" "$(echo "$websockets_submodules" | submodule_commit c_rhash)" +printf "_aclk_schemas_commit=%s\n" "$(echo "$netdata_submodules" | submodule_commit src/aclk/aclk-schemas)" +printf "_ml_dlib_commit=%s\n" "$(echo "$netdata_submodules" | submodule_commit src/ml/dlib)" +printf "_h2o_commit=%s\n" "$(echo "$netdata_submodules" | submodule_commit src/web/server/h2o/libh2o)" +printf "_fluentbit_commit=%s\n" "$(echo "$netdata_submodules" | submodule_commit src/fluent-bit)" diff --git a/community/netpbm/APKBUILD b/community/netpbm/APKBUILD index 8d1587855ea..c46320eabe5 100644 --- a/community/netpbm/APKBUILD +++ b/community/netpbm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sodface <sod@sodface.com> pkgname=netpbm pkgver=11.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Toolkit for manipulation of graphic images" url="https://netpbm.sourceforge.net/" arch="all" @@ -44,7 +44,13 @@ check() { -e '/^pnmindex.test/d' \ "$builddir"/test/Test-Order - make check pkgdir="$PWD/pkgdir" + # Some tests sporadically fail, try to repeat 3 times before failing. + local i; for i in $(seq 0 3); do + [ $i -eq 0 ] || msg "Retrying ($i/3)..." + make check pkgdir="$PWD/pkgdir" && return 0 + sleep 1 + done + return 1 } package() { diff --git a/community/network-manager-applet/APKBUILD b/community/network-manager-applet/APKBUILD index 2348de3b1a5..b220b1ce2f2 100644 --- a/community/network-manager-applet/APKBUILD +++ b/community/network-manager-applet/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=network-manager-applet -pkgver=1.32.0 -pkgrel=2 +pkgver=1.36.0 +pkgrel=0 pkgdesc="GTK network manager applet" url="https://wiki.gnome.org/Projects/NetworkManager" arch="all" @@ -43,5 +43,5 @@ package() { } sha512sums=" -a7abe55c88fa95406e62fb442c068f95325fca748438aa037e0bd5b23add6454c3bc27ac54afe520746d32845bc7403f228f9bfde8e70c7442c906a8227ebe6c network-manager-applet-1.32.0.tar.xz +081cb1f219b0ea44ff15b9ebb3696d976463530317244ce25b18cdc292d453fccd2619cc42ea07798604ed1e5f7c5295bcb7ba148f1ed3312bf8f80d8647e30a network-manager-applet-1.36.0.tar.xz " diff --git a/community/networkmanager-qt/APKBUILD b/community/networkmanager-qt/APKBUILD index 0752b235aed..a22d6feabf0 100644 --- a/community/networkmanager-qt/APKBUILD +++ b/community/networkmanager-qt/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=networkmanager-qt -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Qt wrapper for NetworkManager API" # armhf blocked by extra-cmake-modules @@ -42,5 +42,5 @@ package() { } sha512sums=" -a07f0c301ba1f4a21aa82b3ae91c6f49252346512d75a60a71710452bada24d082de57666d8164f42a92ca3944eeb3a7800379162bb260ecb922f0720b7128d2 networkmanager-qt-6.1.0.tar.xz +8f3479dc552abd7f1e585d7775bf7f13dd489c8d236164e0074db3a9dd2994a91d265cdf036517abfb82dd88b98813e8ad1fb3a3773c06dad0545404eb9e25ae networkmanager-qt-6.2.0.tar.xz " diff --git a/community/networkmanager-qt5/APKBUILD b/community/networkmanager-qt5/APKBUILD index c3017925772..6346c350aff 100644 --- a/community/networkmanager-qt5/APKBUILD +++ b/community/networkmanager-qt5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=networkmanager-qt5 pkgver=5.115.0 pkgrel=0 diff --git a/community/newlib/0002-or1k-missing-include.patch b/community/newlib/0002-or1k-missing-include.patch new file mode 100644 index 00000000000..9cbe902e3ac --- /dev/null +++ b/community/newlib/0002-or1k-missing-include.patch @@ -0,0 +1,13 @@ +mlock.c calls into a function from libgloss without including the header. +We add the relative path to the header here instead of adding the libgloss +includes to include paths to keep the patch short. +--- a/newlib/libc/sys/or1k/mlock.c 2023-12-31 18:00:18.000000000 +0100 ++++ b/newlib/libc/sys/or1k/mlock.c 2024-05-09 13:26:08.523124156 +0200 +@@ -17,6 +17,7 @@ + + #include <reent.h> + #include <stdint.h> ++#include "../../../../libgloss/or1k/include/or1k-support.h" + + /* Lock calls from different cores, but allows recursive calls from the same + * core. The lock is not only atomic to other cores calling malloc, but also diff --git a/community/newlib/0003-or1k-fix-uart-irq-handler-signature.patch b/community/newlib/0003-or1k-fix-uart-irq-handler-signature.patch new file mode 100644 index 00000000000..eeaa40d99a0 --- /dev/null +++ b/community/newlib/0003-or1k-fix-uart-irq-handler-signature.patch @@ -0,0 +1,24 @@ +The IRQ handler signature does not match the expected signature, so let's +fix that. The data argument is unused anyway. +--- a/libgloss/or1k/or1k_uart.c 2024-05-09 13:34:05.290587255 +0200 ++++ b/libgloss/or1k/or1k_uart.c 2024-05-09 13:33:36.794072659 +0200 +@@ -90,7 +90,7 @@ void (*_or1k_uart_read_cb)(char c); + * This is the interrupt handler that is registered for the callback + * function. + */ +-void _or1k_uart_interrupt_handler(uint32_t data) ++void _or1k_uart_interrupt_handler(void *data) + { + uint8_t iir = REG8(IIR); + +--- a/libgloss/or1k/or1k_uart.h 2024-05-09 13:34:40.180397343 +0200 ++++ b/libgloss/or1k/or1k_uart.h 2024-05-09 13:33:36.794072659 +0200 +@@ -30,7 +30,7 @@ extern void (*_or1k_uart_read_cb)(char c + /** + * The UART interrupt handler + */ +-void _or1k_uart_interrupt_handler(uint32_t data); ++void _or1k_uart_interrupt_handler(void *data); + + /** + * Initialize UART diff --git a/community/newlib/0004-or1k-drop-invalid-cast.patch b/community/newlib/0004-or1k-drop-invalid-cast.patch new file mode 100644 index 00000000000..79c8a63e138 --- /dev/null +++ b/community/newlib/0004-or1k-drop-invalid-cast.patch @@ -0,0 +1,17 @@ +Storing a void pointer into a void pointer variable does not need an +intermediate cast to uint32_t and is frowned upon by modern C compilers. +--- a/libgloss/or1k/interrupts.c 2024-05-09 13:37:00.289629242 +0200 ++++ b/libgloss/or1k/interrupts.c 2024-05-09 13:35:29.896791467 +0200 +@@ -35,10 +35,10 @@ void or1k_interrupt_handler_add(uint32_t + { + #ifdef __OR1K_MULTICORE__ + _or1k_interrupt_handler_table[or1k_coreid()][id] = handler; +- _or1k_interrupt_handler_data_ptr_table[or1k_coreid()][id] = (uint32_t) data_ptr; ++ _or1k_interrupt_handler_data_ptr_table[or1k_coreid()][id] = data_ptr; + #else + _or1k_interrupt_handler_table[id] = handler; +- _or1k_interrupt_handler_data_ptr_table[id] = (uint32_t) data_ptr; ++ _or1k_interrupt_handler_data_ptr_table[id] = data_ptr; + #endif + } + diff --git a/community/newlib/0005-or1k-add-missing-cast.patch b/community/newlib/0005-or1k-add-missing-cast.patch new file mode 100644 index 00000000000..881cb23e193 --- /dev/null +++ b/community/newlib/0005-or1k-add-missing-cast.patch @@ -0,0 +1,13 @@ +This adds a missing cast. uintptr_t would have been better here than uint32_t, +but the code is not intended to be portable anyway. +--- a/libgloss/or1k/sbrk.c 2024-05-09 13:38:08.089257549 +0200 ++++ b/libgloss/or1k/sbrk.c 2024-05-09 13:35:29.896791467 +0200 +@@ -20,7 +20,7 @@ + #include "include/or1k-support.h" + + extern uint32_t end; /* Set by linker. */ +-uint32_t _or1k_heap_start = &end; ++uint32_t _or1k_heap_start = (uint32_t)&end; + uint32_t _or1k_heap_end; + + void * diff --git a/community/newlib/APKBUILD b/community/newlib/APKBUILD index 220d71083e5..b9be94f1d8c 100644 --- a/community/newlib/APKBUILD +++ b/community/newlib/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=newlib -pkgver=4.3.0.20230120 -pkgrel=3 +pkgver=4.4.0.20231231 +pkgrel=0 pkgdesc="C standard library implementation intended for use on embedded systems" url="https://www.sourceware.org/newlib/" makedepends="texinfo" @@ -12,6 +12,10 @@ source=" msp430-elf-nano.specs 0001-msp430-enable-syscalls.patch + 0002-or1k-missing-include.patch + 0003-or1k-fix-uart-irq-handler-signature.patch + 0004-or1k-drop-invalid-cast.patch + 0005-or1k-add-missing-cast.patch " options="!check" @@ -40,8 +44,7 @@ x86_64|aarch64) esac for target in $_targets; do - targetnorm="${target//-/_}" - subpackages="newlib-$target:$targetnorm $subpackages" + subpackages="newlib-$target:_install_subpkg $subpackages" # here only makedepends. The depends to binutils-$target and gcc-$target # will be set in the subpkg newlib-$target makedepends="binutils-$target gcc-$target $makedepends" @@ -65,7 +68,8 @@ build() { cd "$builddir/build-$target-nano" export CFLAGS_FOR_TARGET="-Os -ffunction-sections -fdata-sections -fshort-wchar" "$builddir"/configure \ - --target=$target \ + --host="$CHOST" \ + --target="$target" \ --prefix=/usr/ \ --infodir=/deleteme/info \ --mandir=/deleteme/man \ @@ -99,8 +103,8 @@ build() { cd "$builddir/build-$target" export CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" "$builddir"/configure \ - --host=$CHOST \ - --target=$target \ + --host="$CHOST" \ + --target="$target" \ --prefix=/usr \ --infodir=/deleteme/info \ --mandir=/deleteme/man \ @@ -134,6 +138,7 @@ package() { } _install_subpkg() { + local target target="${subpkgname#newlib-}" pkgdesc="A C standard library implementation intended for $target" depends="binutils-$target gcc-$target $depends" @@ -162,32 +167,12 @@ _install_subpkg() { fi } -arm_none_eabi() { - _install_subpkg -} - -mips_mti_elf() { - _install_subpkg -} - -msp430_elf() { - _install_subpkg -} - -or1k_elf() { - _install_subpkg -} - -riscv_none_elf() { - _install_subpkg -} - -aarch64_none_elf() { - _install_subpkg -} - sha512sums=" -4a06309d36c2255fef8fc8f2d133cafa850f1ed2eddfb27b5d45f5d16af69e0fca829a0b4c9b34af4ed3a28c6fcc929761e0ee823a4229f35c2853d432b5e7ef newlib-4.3.0.20230120.tar.gz +ea3baa0b7c9175aae024f0b7d272be092ef2c07483239a99329203e18a44bc23093d29e0ffcbe14bc591f610f0829eacd646cabb06d1c34aa23239cb1b814b46 newlib-4.4.0.20231231.tar.gz 647b79e3cc6f3bb98b1263ebbf4b3efa4a4692fddc0df6491c726de2fa0ee46b05ab2ddf96c2c8c785f3cd6a442135ec97bf8df93a8f371d479ea46d03aa8a08 msp430-elf-nano.specs 268c44f8056067e03ee9914d04e8cfa2bb22764bb294b7d16dbfdd51c2e5ef0ad221037a86caafd20ab755b16b38519d61e27ffcd13239cbdbbfad421fa8cb60 0001-msp430-enable-syscalls.patch +f48058084d25d59edf4d4bd4ffc23428a4a89e00c9f6ed7588315ddb5bafcc68e2b63945b135e3ba0128d108d410ec042e27f32c79dbd3a0bcc9b21c2ba236f7 0002-or1k-missing-include.patch +780d4c8e3b90f875044891a03f8215a7ea857601c908434d31691c47da09af967e264a0f350e165a7b3c674fb7b49421bde96acd9a8a7936a549e53ae79e8acd 0003-or1k-fix-uart-irq-handler-signature.patch +0a8b9ea27998baab7f499f45fe8b3e537919142e1372055fef7ed221428c2e02fc00ec21470c8820115ea65f20d23050ae3f0639094aed1368d1447d293f8382 0004-or1k-drop-invalid-cast.patch +997fcf0dc49d0f92e49c8148959e9979a7721b2da1defa0ffc67379b028ef66a454b7582f06b9965280fe9c58cf65b8f4f4127490cb7e6cd209be3b244bb65ae 0005-or1k-add-missing-cast.patch " diff --git a/community/newsboat/APKBUILD b/community/newsboat/APKBUILD index 4bc8984e615..5cb4ae652ed 100644 --- a/community/newsboat/APKBUILD +++ b/community/newsboat/APKBUILD @@ -14,6 +14,7 @@ subpackages="$pkgname-doc $pkgname-lang" source=" https://newsboat.org/releases/$pkgver/newsboat-$pkgver.tar.xz fix-version-number.patch + Cargo-update.patch newsboat.desktop " options="net" # cargo fetch @@ -47,5 +48,6 @@ package() { sha512sums=" a73e0cc44117aa9a19449eb5f2c0833cf9417d32e5909901cbe86fdd34bcc7c8c612b17291e435fe0c93d4c44c976f3860d3658472a8e55fb3aa28ac875f3a82 newsboat-2.35.tar.xz 6ed838525a41e21a179f23f4f9728daea248a523a51db93c0c44e66cdc4258f5e1ee2f55bb561ac967884ce93178a1b12969fb8e6de0b0f3356e0ef85d6d170c fix-version-number.patch +5f5a72ee91c3eca44bae70f0a96ba4924ccbabba786717a59cfbf0aeb3262ff2eac552b6862a16955df6ec82750be6c3506012587d3a935209ed062ebbb36d9f Cargo-update.patch 47383e96fadb26db8c505add42efa354ec099abb0b2fbe366e6f860ba12cec864c7ec0e2ce274bec478eb623c62e8f0796029aed4132a365ff1707f537c2d272 newsboat.desktop " diff --git a/community/newsboat/Cargo-update.patch b/community/newsboat/Cargo-update.patch new file mode 100644 index 00000000000..b99ea3191ac --- /dev/null +++ b/community/newsboat/Cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index f407637..f82226d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -322,9 +322,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.154" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" + + [[package]] + name = "libm" diff --git a/community/nextcloud-client/APKBUILD b/community/nextcloud-client/APKBUILD index 6ba3e010deb..438e04e46da 100644 --- a/community/nextcloud-client/APKBUILD +++ b/community/nextcloud-client/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=nextcloud-client -pkgver=3.12.3 +pkgver=3.13.0 pkgrel=0 pkgdesc="Nextcloud Desktop Client" url="https://github.com/nextcloud/desktop" -# s390x, ppc64le and riscv64 blocked by qt5-qtwebengine +# s390x, ppc64le, riscv64 and loongarch64 blocked by qt5-qtwebengine # armhf blocked by extra-cmake-modules -arch="all !s390x !ppc64le !armhf !riscv64" +arch="all !s390x !ppc64le !armhf !riscv64 !loongarch64" license="GPL-2.0-only" depends="dbus:org.freedesktop.Secrets qt5-qtquickcontrols" makedepends=" @@ -75,7 +75,7 @@ dolphin() { } sha512sums=" -e333354b70102fd596c4fe18f69860c5c9313348359579cd552297a7e67dbb8a6ba7a9f09e9676e96298649f75fb649f2a9aa10d524ebedcf4b6aa244877fd62 nextcloud-client-3.12.3.tgz +bf41a63a92e7e970e0b85d6df6e53e6ed8cd2c70fdfdfc86b144b01f82759a05f4bb016fd3009516bb405a589f26f84a8c6cf54191dc906a37d3dddf20dbcfbb nextcloud-client-3.13.0.tgz eb530ce62da1c4983ef7d0500d93fd02d55139607109689dc8fea80049a75a5f9b3a7e4e529af886f92312419c6c0f163621e4def82d3ef919431c84ce91930e lfs64.patch 28faf643e3ba22f3e1f45a96acfba1b3c53c49d4e923974e58e5ad2fdda612f52300608f0e0219e61d3478403fe3c59a9a2c70c3db1c93fbccda1e0638ecbc22 Nextcloud.conf " diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD index 96cafe651c1..3c25bf278f7 100644 --- a/community/nextcloud/APKBUILD +++ b/community/nextcloud/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=nextcloud -pkgver=28.0.4 +pkgver=28.0.5 pkgrel=0 _replaced_ver=27 pkgdesc="A safe home for all your data" @@ -254,7 +254,7 @@ _package_app() { } sha512sums=" -bb26831d9143ab5ea06ffdf9f2c98c5851c26c23002c6124c9443cd2636d7a102e5da053e0fbd0e7ed6da634d292deeaa0219038b6def4bf302e922b48135fb2 nextcloud-28.0.4.tar.bz2 +a6f25e6ddced8087366537793c28869a6bbda0d165aa4d99858745fdfab7679a717e82cab17f72b73105bbeca917d58ff5a9e19ec820b688b5f85397de76457f nextcloud-28.0.5.tar.bz2 aea0adb2c3a48ec6af2958c6ccfe13adff86316a56084e763b7e6df9e21aa3435b13305b7c15cc2b795e83c9388b05006862f6465c29e3dc2c1fbd8eb8befcb9 nextcloud-dont-chmod.patch aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch ccee7b4d2520653dc4584e364f082c7d2c2ebce12642db47ad31bba3aa13fabeb0954876640f6a2854fdf8395b0a305b64b7ef668887a9326a8be0611ebfe008 disable-integrity-check-as-default.patch diff --git a/community/nfpm/APKBUILD b/community/nfpm/APKBUILD index 8592092175d..c5d05fc2c8b 100644 --- a/community/nfpm/APKBUILD +++ b/community/nfpm/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=nfpm -pkgver=2.36.1 -pkgrel=1 +pkgver=2.37.1 +pkgrel=0 pkgdesc="a simple apk, Deb and RPM packager without external dependencies" url="https://nfpm.goreleaser.com/" arch="all !riscv64" @@ -32,5 +32,5 @@ package() { } sha512sums=" -233f6c7cc27906728755b06a755e09c5a89fff0ffcf0eb32517d32b5f8799722a18c5d398e5cc35523c1a4ad406c84d2d9c1dad2846d25fa27e58ce0842d5494 nfpm-2.36.1.tar.gz +e8003e1cd4370de1b6ec0e8ef2b936d76dd60c3ed91b62366b072beb6f5d8cb54e67d115d26dbdb091a9336192301935b0c1ad364ec72619f1180c5b19bd4f09 nfpm-2.37.1.tar.gz " diff --git a/community/nheko/APKBUILD b/community/nheko/APKBUILD index bea19b88841..b5773d4a97e 100644 --- a/community/nheko/APKBUILD +++ b/community/nheko/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=nheko pkgver=0.11.3 -pkgrel=8 +pkgrel=10 pkgdesc="Qt5-based client for Matrix protocol" url="https://github.com/Nheko-Reborn/nheko" # armhf blocked by qt5-qtmultimedia diff --git a/community/niaaml-gui/APKBUILD b/community/niaaml-gui/APKBUILD index c7d90191b14..97719a18c69 100644 --- a/community/niaaml-gui/APKBUILD +++ b/community/niaaml-gui/APKBUILD @@ -2,17 +2,17 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=niaaml-gui _pkgorig=NiaAML-GUI -pkgver=0.2.2 -pkgrel=1 +pkgver=0.3.0 +pkgrel=0 pkgdesc="GUI for NiaAML Python package" -url="https://github.com/lukapecnik/NiaAML-GUI" +url="https://github.com/firefly-cpp/NiaAML-GUI" arch="noarch" license="MIT" depends="python3 py3-niapy py3-niaaml py3-qtawesome py3-qt6" checkdepends="py3-pytest" makedepends="py3-poetry-core py3-gpep517" subpackages="$pkgname-doc $pkgname-pyc" -source="https://github.com/lukapecnik/NiaAML-GUI/archive/$pkgver/$_pkgorig-$pkgver.tar.gz" +source="https://github.com/firefly-cpp/NiaAML-GUI/archive/$pkgver/$_pkgorig-$pkgver.tar.gz" builddir="$srcdir/NiaAML-GUI-$pkgver" build() { @@ -31,12 +31,12 @@ package() { python3 -m installer -d "$pkgdir" \ .dist/niaaml_gui-$pkgver-py3-none-any.whl - install -Dm644 AppData/io.github.lukapecnik.niaaml_gui.desktop "$pkgdir"/usr/share/applications/niaaml_gui.desktop + install -Dm644 AppData/io.github.firefly-cpp.niaaml_gui.desktop "$pkgdir"/usr/share/applications/niaaml_gui.desktop install -Dm644 AppData/niaaml-gui.png "$pkgdir"/usr/share/icons/hicolor/256x256/apps/niaaml-gui.png install -Dm644 CITATION.cff -t "$pkgdir"/usr/share/doc/$pkgname } sha512sums=" -b8fca7d9c85483e294d6516f06ba7ae73bb93611644242be66606efca7aa55015dc648173b1f646c72c5b4aa97d74949a8cf00ac7a1765fa7bac356adf598405 NiaAML-GUI-0.2.2.tar.gz +7a4fffcea349bdf67beae18eb7b404ba1062dd8cc3bd5a24f882fb683891b1099d2e1dc50cdadb1830cf584e40c16353ce80e450644c20e8c1e65f6b1e8e4e26 NiaAML-GUI-0.3.0.tar.gz " diff --git a/community/nihtest/APKBUILD b/community/nihtest/APKBUILD index c86626abda2..9dbce00e219 100644 --- a/community/nihtest/APKBUILD +++ b/community/nihtest/APKBUILD @@ -1,11 +1,12 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=nihtest pkgver=1.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="Testing tool for command line utilities" url="https://github.com/nih-at/nihtest" arch="noarch" license="BSD-3-Clause" +depends="py3-dateutil" makedepends=" py3-gpep517 py3-setuptools diff --git a/community/nim/APKBUILD b/community/nim/APKBUILD index 819e1e48300..a60ef8eed2e 100644 --- a/community/nim/APKBUILD +++ b/community/nim/APKBUILD @@ -4,7 +4,7 @@ # # WARNING: There may be breakages! pkgname=nim -pkgver=2.0.2 +pkgver=2.0.4 pkgrel=0 pkgdesc="A systems and applications programming language" url="https://nim-lang.org/" @@ -36,9 +36,9 @@ source="https://nim-lang.org/download/nim-$pkgver.tar.xz # Don't run tests on armhf and ppc64le, it'd take eternity... # Can't run tests on riscv64, no nodejs... -# Temporarily allow textrels on riscv64 +# riscv64, loongarch64: no valgrind case "$CARCH" in - armhf | ppc64le | riscv64) options="!check";; + armhf | ppc64le | riscv64 | loongarch64) options="!check";; esac export NIMFLAGS="${NIMFLAGS-} ${JOBS:+"--parallelBuild:$JOBS"}" @@ -123,7 +123,7 @@ nimsuggest() { } sha512sums=" -76b612b364dde0a23915f8d6fd979594a33e3d43c1ed09bf0bc4861f7b38061832375aa8fc3f858062b354dc08cd1c994fe1ef95c211233afc5bd8bdb5c54310 nim-2.0.2.tar.xz +1918b3d4a4fc02714677b2ca5051dc69e1d1daead2cf4dcc9b997076540d07d58ee4fe3049de86a37faa3143de1d3b95bedfa31f31d8463987bb267107459793 nim-2.0.4.tar.xz 26eb35cdaae908c96c20889b3561d0fb7ef3f6bdfe0c582eaa6122c7982a032a3e50174175dfb67b919b9e38691849d87966a9c093677774491e32b49eed3c6b niminst-fix-paths.patch 7667963a1f3370a7625c1ee6575239f20ea501b0ba8342f8dcea6020692411fc177e7f101edd81a48bb3885e1d1cbece2d6ecd1a4d7640f0f78de109a97eeea9 nim-config-fix-paths.patch 4f94829c0e0692b5563f871779b53d3639ffe0926aaacfc54a346fbc56fdad999ddbbeda894f54a243ff21c05dbc29668b3ae93c01b319f573d1b585116e2334 nim-gdb-fix-posix-and-sysroot.patch diff --git a/community/ninja-build/APKBUILD b/community/ninja-build/APKBUILD index d50d4d67009..9ac8709bed8 100644 --- a/community/ninja-build/APKBUILD +++ b/community/ninja-build/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Simon Zeni <simon@bl4ckb0ne.ca> pkgname=ninja-build -pkgver=1.12.0 +pkgver=1.12.1 pkgrel=0 pkgdesc="a small build system with a focus on speed" url="https://ninja-build.org/" @@ -50,5 +50,5 @@ reallyreally() { } sha512sums=" -167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875 ninja-build-1.12.0.tar.gz +d6e6f0e89a4844a69069ff0c7cefc07704a41c7b0c062a57534de87decdde63e27928147b321111b806aa7efa1061f031a1319b074391db61b0cbdccf096954c ninja-build-1.12.1.tar.gz " diff --git a/community/nitrokey-app2/APKBUILD b/community/nitrokey-app2/APKBUILD index d4566b049fc..ebc13640549 100644 --- a/community/nitrokey-app2/APKBUILD +++ b/community/nitrokey-app2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=nitrokey-app2 -pkgver=2.2.2 -pkgrel=1 +pkgver=2.3.0 +pkgrel=0 pkgdesc="Nitrokey management application" url="https://github.com/Nitrokey/nitrokey-app2" # blocked by py3-spsdk -> py3-pynitrokey @@ -37,5 +37,5 @@ package() { } sha512sums=" -689ce21ba2fed3e4866fa806c65f89f5782b7de82f1402f86ce8248653d2db4c2532963c90c46409fd71efd6ec8d1ba7114128ac46277a6b03066cf5407afe17 nitrokey-app2-2.2.2.tar.gz +d1cfb2f32d57d9c8a8a62aab6d5daa9d89491063babf79a830c9e49589fe328ce29605ee138d2f3a0a15e714ab5a0d134e53e943f6c2aaf9b81ef9c05cf9e12d nitrokey-app2-2.3.0.tar.gz " diff --git a/community/nix/APKBUILD b/community/nix/APKBUILD index d3f1479942c..a954704b0c5 100644 --- a/community/nix/APKBUILD +++ b/community/nix/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=nix -pkgver=2.21.1 +pkgver=2.22.0 pkgrel=0 pkgdesc="The purely functional package manager" url="https://nixos.org/nix/" @@ -151,7 +151,7 @@ manual() { } sha512sums=" -e5a893c0bd22d088a834fd8c5437b1b825d9c1c78d498076d45e90509c6d350ffb9e75952ca5d49e7451fea30a36d7522c4539da5ffaf0e778058dfe0e2320b5 nix-2.21.1.tar.gz +dbbd4b9306ad6d60dad927bdee7ca7d10dcbb09bd87432430a9bfa0511374990e1e77f8fd5d4d533f33c46daca6356788db311847aecc924f2112ecb553edb7c nix-2.22.0.tar.gz f6a8d67003a6f0cd54dc4dc26051e9f3d18d9c1c1d66c99324e3db017891a6fdd88d7be53de05ab21fa8f7635164a093069416a89cf322ea6f6888df066ea60b README.alpine ad02313f026fe3286c7c2271f26bf074ba2966c12777d7109275555f1a616bf0f99c8f5e45a57161f383091867f1dfd4d84cfae7a6d8a075312608456975dc81 nix-remote.sh 9e4568db987fbae5097f7bb086e8ad51742c2d229703104fb7e6f240ffb0ca72e57dc305fb238bcee4ec8002d780007af60f241b1f32b6aa413dd579d9c59e75 nix-daemon.initd diff --git a/community/njs/APKBUILD b/community/njs/APKBUILD index 1967f2be876..8ea618bae85 100644 --- a/community/njs/APKBUILD +++ b/community/njs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=njs # Keep it in sync with njs in main/nginx. -pkgver=0.8.3 +pkgver=0.8.4 pkgrel=0 pkgdesc="njs scripting language CLI utility" url="https://nginx.org/en/docs/njs/" @@ -59,7 +59,7 @@ debug() { } sha512sums=" -1cec9a322c40aa2b4ec6eb5bea78d7442880b0cff3a41ad171a3dc3157a6990baec6c8b9eda99ee02a9e51c0b933f13ef17431079a5ff409aaf84b912c7f4df7 njs-0.8.3.tar.gz +f2e897d82c1e1ecccd310032f0166ec907e61f3d0756c2231d1f042b25e356effcce5d59bbcfdc3f8d51c30639675987a44f363370dfc7215342f1a498de1169 njs-0.8.4.tar.gz 4db527d663dbe9e8b503c3cbaa4eae34b45990a5359b3bb98ce970c705faefcac98de49439f2557756a2be8e2e06acc67f98942de01674c498832d80c3cb90c3 mktemp-busybox-compat.patch b8ed822bf0d2ac99682cdecde5ce0136ac46cc9e6077be1369c631ac4caf22f22750f39fced061233f44e3e290e8ca6135da5d121bd53551cbd460419bc90662 no-werror.patch " diff --git a/community/nodeinfo/APKBUILD b/community/nodeinfo/APKBUILD index 99fd110f41b..a77a6b2a58e 100644 --- a/community/nodeinfo/APKBUILD +++ b/community/nodeinfo/APKBUILD @@ -1,8 +1,8 @@ # Contributor: 6543 <6543@obermui.de> # Maintainer: 6543 <6543@obermui.de> pkgname=nodeinfo -pkgver=0.3.1 -pkgrel=3 +pkgver=0.3.2 +pkgrel=0 pkgdesc="A command line tool to query nodeinfo based on a given domain" url="https://codeberg.org/thefederationinfo/nodeinfo-go" license="MIT" @@ -26,5 +26,5 @@ package() { } sha512sums=" -eef41264f749a6127401e568398e75baa44a734b8dbf4895ba73ed9e5286020d32f59a4bf6352155bcd9053a40e51c2fa8220690c23b63bce4fa01f5b8a86f48 nodeinfo-0.3.1.tar.gz +03875cc116ed6918387f026bcc60ef6ed1c20b144f60badc937d6b6eaec599a9644997aef160797254b6d06c4820d8d2029e1d3b4eeec52df98022e950016d6b nodeinfo-0.3.2.tar.gz " diff --git a/community/nodejs-current/APKBUILD b/community/nodejs-current/APKBUILD index 7776c42af2f..6143a253db9 100644 --- a/community/nodejs-current/APKBUILD +++ b/community/nodejs-current/APKBUILD @@ -75,7 +75,7 @@ pkgname=nodejs-current # The current stable version, i.e. non-LTS. -pkgver=21.7.2 +pkgver=21.7.3 pkgrel=0 pkgdesc="JavaScript runtime built on V8 engine - current stable version" url="https://nodejs.org/" @@ -149,7 +149,7 @@ package() { } sha512sums=" -b8861ee12930ce26f658ac76d12c3a3c14a484ee782ee9397c9aa9d20ff7ae8ff958841b8b72b50b91988123b5c84f1c891235899a65743cdb9ce43d1d691c22 node-v21.7.2.tar.xz +1686947e0c03fa238c98bd47d96867a9cfa087eb79baa60828d600f04ca1e58fec02076bc2fdc06717b4f4ee67a74179dcc52b7eacc7d25a3743fb944d69b95c node-v21.7.3.tar.xz 411a3b07ba90c51fb913419e71615a6eb33a938d5026bb4a43b5f385457d2d14405eaddc3b68a21534e3a1b398e45148dc648dad23bc7755491a5cf777e2646c dont-run-gyp-files-for-bundled-deps.patch e6f2907bdf2082097841f44ac9380d5b1bc65eca39be7153da081266940c6a10d2932e16a2e15bdcf12fec61c45549d009d1a07e5e1633603172968b5f6fdb77 elf.patch d8f1092a92f7a168755020b3e40fe72b743f9150de6d18f7664074dadaef866ecb4fa8252fa891fd7cf34b3dc183455af8d5570d7b3f1883464c2b6e3a9f2789 unbundle-uv.patch diff --git a/community/nomacs/APKBUILD b/community/nomacs/APKBUILD index 025a39fe888..4d29a503498 100644 --- a/community/nomacs/APKBUILD +++ b/community/nomacs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=nomacs pkgver=3.17.2295 -pkgrel=0 +pkgrel=1 _pluginsver=3.16 pkgdesc="Cross platform image viewer" url="https://nomacs.org/" diff --git a/community/nota/APKBUILD b/community/nota/APKBUILD index ba8583c9f8f..b7517239625 100644 --- a/community/nota/APKBUILD +++ b/community/nota/APKBUILD @@ -12,8 +12,8 @@ pkgver=3.0.2 pkgrel=0 pkgdesc="Nota is a simple and convergent text editor" # armhf blocked by qt5-qtdeclarative -# s390x, ppc64le and riscv64 blocked by qt5-qtwebengine -arch="all !armhf !s390x !ppc64le !riscv64" +# s390x, ppc64le, riscv64 and loongarch64 blocked by qt5-qtwebengine +arch="all !armhf !s390x !ppc64le !riscv64 !loongarch64" url="https://invent.kde.org/maui/nota" license="GPL-2.0-or-later" depends=" diff --git a/community/notus-scanner/APKBUILD b/community/notus-scanner/APKBUILD index ae7a711370b..05fd4e701ea 100644 --- a/community/notus-scanner/APKBUILD +++ b/community/notus-scanner/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=notus-scanner -pkgver=22.6.2 -pkgrel=1 +pkgver=22.6.3 +pkgrel=0 pkgdesc="Notus is a vulnerability scanner for creating results from local security checks " url="https://github.com/greenbone/notus-scanner" arch="noarch" @@ -23,6 +23,8 @@ subpackages="$pkgname-openrc $pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/notus-scanner/archive/refs/tags/v$pkgver.tar.gz notus-scanner.initd " +# fhs: /run/notus-scanner created in package() and referenced in config.py +options="!fhs" build() { gpep517 build-wheel \ @@ -45,6 +47,6 @@ package() { } sha512sums=" -ecbbb79950908641c2b83d379d141b189b8e0e27cac17753cbb381a5f4ebf28d7100f60bd24fc284c2681abc889f6fee36a64f469ac0b37323940eaeae7e7522 notus-scanner-22.6.2.tar.gz +fc3a05a3a9d61dd0b7a9913cfbbf507fec9dd3797a42a82283d14ab7fa8090fbc847487cf3a1d064f49572dda9acadba4bd7d30003fd32a179f572e327254546 notus-scanner-22.6.3.tar.gz d5d6adb9ecdb074cefcc1575e277918bbbde83ddf75997c23bd53609147b434ef7f41ae08090625593616d0829059c141c4ec7f2e567167a40a2e2b3fcf3e903 notus-scanner.initd " diff --git a/community/npm/APKBUILD b/community/npm/APKBUILD index da4d5a78fad..eca37c47d24 100644 --- a/community/npm/APKBUILD +++ b/community/npm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=npm -pkgver=10.5.1 +pkgver=10.7.0 pkgrel=0 pkgdesc="The package manager for JavaScript" url="https://www.npmjs.com/" @@ -103,7 +103,7 @@ doc() { } sha512sums=" -468cd9b86b966db843336b1184e48b2116f70cbca87fa4d1122d135b96f7c54101ae8a43843a841efd22023035cec2305ca81f22447c1af40c778a1e28a83d79 npm-10.5.1.tgz -6b174bbf8eecdd62ec3b7fec646ec0ff84d371f18194fe482b4ed37ae3642f4d0992609152608ad068e4d1bb72be22ff44d96a28709f870d84b4b62737cb6238 dont-check-for-last-version.patch +157ca5c98497363817c7797cd814fc45242f0a818843787c61d44518a36fa373effdb2ac70ae29756931fe89f04e91c3a86c3ea1e2dfe11c659fd595cb103195 npm-10.7.0.tgz +bf1362f6ad18738f54f30976e13da066293e21d0d3d81a5c2802f1064e49fa9bc7693b7e73e58f6c8f7fa545edcbb2dbac4b9c69165a9efc69f32fbc1e676597 dont-check-for-last-version.patch 6d0ce425061ffff1c5d7a42c9908f3382cd77abf81a9c30a62ff6fff1f0d02ff633b2bb090814aa619f7d2a51237b3da7f85d97d0f584e037639b60ccfaf0e96 npmrc " diff --git a/community/npm/dont-check-for-last-version.patch b/community/npm/dont-check-for-last-version.patch index 652314edcb7..e372cda8991 100644 --- a/community/npm/dont-check-for-last-version.patch +++ b/community/npm/dont-check-for-last-version.patch @@ -2,10 +2,8 @@ Don't check for last version Patch based on https://sources.debian.org/src/npm/7.5.2+ds-2/debian/patches/dont-check-for-last-version.patch -diff --git a/lib/utils/update-notifier.js b/lib/utils/update-notifier.js -index 2c839bf..5616195 100644 ---- a/lib/utils/update-notifier.js -+++ b/lib/utils/update-notifier.js +--- a/lib/cli/update-notifier.js ++++ b/lib/cli/update-notifier.js @@ -76,6 +76,8 @@ const updateCheck = async (npm, spec, version, current) => { } diff --git a/community/nqp/APKBUILD b/community/nqp/APKBUILD index 66607514305..f05ba60cd8b 100644 --- a/community/nqp/APKBUILD +++ b/community/nqp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Curt Tilmes <Curt.Tilmes@nasa.gov> # Maintainer: Curt Tilmes <Curt.Tilmes@nasa.gov> pkgname=nqp -pkgver=2024.03 +pkgver=2024.04 pkgrel=0 pkgdesc="Not Quite Perl" url="https://github.com/Raku/nqp" @@ -43,5 +43,5 @@ package() { } sha512sums=" -e35b388b8546d4a02522e18fe03964475ec7128e3703aa8f0a56225f67c8301391287a218d903ff67176cbbf56055607468c9365837800dbb631bbcb46a9652a nqp-2024.03.tar.gz +988518e5db2d7bdee6ed55bb337e640d091f404d6cc2b2687e9b542cc91ea755add415b40e8b3ac9ef501e150d2026867d0f1f1bfa32f1767e01ec30ae050dd0 nqp-2024.04.tar.gz " diff --git a/testing/nvchecker/APKBUILD b/community/nvchecker/APKBUILD index 7d03179c4df..eec960662c0 100644 --- a/testing/nvchecker/APKBUILD +++ b/community/nvchecker/APKBUILD @@ -1,7 +1,7 @@ # Contributor: fossdd <fossdd@pwned.life> # Maintainer: fossdd <fossdd@pwned.life> pkgname=nvchecker -pkgver=2.13.1 +pkgver=2.14.1 pkgrel=1 pkgdesc="New version checker for software releases" url="https://github.com/lilydjwg/nvchecker" @@ -31,6 +31,7 @@ checkdepends=" py3-pytest-httpbin pytest " +install="$pkgname.post-install" subpackages="$pkgname-pyc $pkgname-doc $pkgname-bash-completion" source="$pkgname-$pkgver.tar.gz::https://github.com/lilydjwg/nvchecker/archive/refs/tags/v$pkgver.tar.gz" options="!check" # tests fail @@ -55,5 +56,5 @@ package() { install -Dm644 docs/_build/man/nvchecker.1 -t "$pkgdir"/usr/share/man/man1/ } sha512sums=" -df1af3f4d260a6aa8b4e0a71eb22c8d93844ac885ad13da77a15ac9a09c91040b8981cd82225f9279bfb73493a9df70ea69950c0d4633204c997b1edf029380d nvchecker-2.13.1.tar.gz +104fd03aaefe343028ab97ca35680b3d87a7a72dba743c33fd49bc7be1731f8e31bcc5487f7257d89c167091486ea3df63c974dd68c5bae812b2e82911bf832d nvchecker-2.14.1.tar.gz " diff --git a/community/nvchecker/nvchecker.post-install b/community/nvchecker/nvchecker.post-install new file mode 100644 index 00000000000..cd10c052470 --- /dev/null +++ b/community/nvchecker/nvchecker.post-install @@ -0,0 +1,16 @@ +#!bin/sh + +cat >&2 <<-EOF +* This package does not contain any optional dependencies. +* For certain functionality, please install additionally: +* +* py3-awesomeversion: for using "sort_version_key = awesomeversion" in configuration files +* py3-lxml: for the htmlparser source +* py3-packaging: for the pypi source +* py3-toml: for nvchecker-ini2toml script +* git: for the git source +* py3-gobject3: for nvchecker-notify +* libnotify: for nvchecker-notify +EOF + +exit 0 diff --git a/community/nvui/APKBUILD b/community/nvui/APKBUILD index 473c6a79f75..cc79fdedf6e 100644 --- a/community/nvui/APKBUILD +++ b/community/nvui/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=nvui pkgver=0.3.1 -pkgrel=7 +pkgrel=8 pkgdesc="A modern frontend for Neovim" url="https://github.com/rohit-px2/nvui" # riscv64: blocked by neovim diff --git a/community/nx-libs/APKBUILD b/community/nx-libs/APKBUILD index 1bd798c5a04..4ff4bf0b5b7 100644 --- a/community/nx-libs/APKBUILD +++ b/community/nx-libs/APKBUILD @@ -19,7 +19,9 @@ makedepends="libx11-dev zlib-dev libjpeg-turbo-dev libxinerama-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz - xf86bigfont.patch" + xf86bigfont.patch + Add-support-for-new-arch-Loongarch.patch + " prepare() { # Every Makefile has /usr/local as PREFIX, so replace that @@ -58,4 +60,5 @@ package() { sha512sums=" bfba1eea6f4debe90fa020276079027c3716daaff91bded72297ecab2a8c9f56d07630ca8bc9084c319d2c674304ad80131190ec1272c161c05221d6f19089d0 nx-libs-3.5.99.27.tar.gz 904aadbf0200cb8d96e5512bcbccf7da21af553f292ce4af56df035fa33e7e4b98fcf385a281a316d0c533bc2917cc7fde523b8212c8de7f4e825d776a43c576 xf86bigfont.patch +a1908db1133f7a499263a98ef209c84078264d3b535e4caeb4066e8957e310ef9b0d543785e84e248c41fd893ce73ded92432d19d2352a5fa875d2b2a4cd50ea Add-support-for-new-arch-Loongarch.patch " diff --git a/community/nx-libs/Add-support-for-new-arch-Loongarch.patch b/community/nx-libs/Add-support-for-new-arch-Loongarch.patch new file mode 100644 index 00000000000..d8101c0065c --- /dev/null +++ b/community/nx-libs/Add-support-for-new-arch-Loongarch.patch @@ -0,0 +1,79 @@ +From 2e0db45fd9bc19132c2bb7212166d27588da31a8 Mon Sep 17 00:00:00 2001 +From: YalingFang <fangyaling@loongson.cn> +Date: Fri, 25 Aug 2023 11:52:13 +0800 +Subject: [PATCH] Add support for new arch Loongarch + +--- + nx-X11/config/cf/Imake.cf | 12 ++++++++++++ + nx-X11/config/cf/Imake.tmpl | 2 ++ + nx-X11/config/cf/linux.cf | 18 ++++++++++++++++++ + 3 files changed, 32 insertions(+) + +diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf +index ce33e420..cdf4d4a0 100644 +--- a/nx-X11/config/cf/Imake.cf ++++ b/nx-X11/config/cf/Imake.cf +@@ -893,6 +893,18 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 + # endif + # undef __sparc__ + # endif ++# if defined(__loongarch__) ++# undef __loongarch__ ++# if __loongarch_grlen == 64 ++# undef __loongarch_grlen ++# undef __loongarch_lp64 ++# define LoongArch64Architecture ++# endif ++# if __loongarch_grlen == 32 ++# undef __loongarch_grlen ++# define LoongArch32Architecture ++# endif ++# endif + # ifdef ia64 + # define ia64Architecture + # undef ia64 +diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl +index 266be8c5..48509aa0 100644 +--- a/nx-X11/config/cf/Imake.tmpl ++++ b/nx-X11/config/cf/Imake.tmpl +@@ -517,6 +517,8 @@ XCOMM the platform-specific parameters - edit site.def to change + #define ByteOrder X_LITTLE_ENDIAN + #elif defined(SuperHebArchitecture) + #define ByteOrder X_BIG_ENDIAN ++#elif defined(LoongArch64Architecture) || defined(LoongArch32Architecture) ++#define ByteOrder X_LITTLE_ENDIAN + #endif + #endif /* ByteOrder */ + X_BYTE_ORDER = ByteOrder +diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf +index 283c0a00..c71d436f 100644 +--- a/nx-X11/config/cf/linux.cf ++++ b/nx-X11/config/cf/linux.cf +@@ -857,6 +857,24 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) + # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 + #endif /* AMD64Architecture */ + ++#ifdef LoongArch64Architecture ++# ifndef OptimizedCDebugFlags ++# define OptimizedCDebugFlags -O2 GccAliasingArgs ++# endif ++# define LinuxMachineDefines -D__loongarch__ -D__loongarch_grlen=64 -D__loongarch_lp64 ++# define ServerOSDefines XFree86ServerOSDefines ++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 ++#endif /* LoongArch64Architecture */ ++ ++#ifdef LoongArch32Architecture ++# ifndef OptimizedCDebugFlags ++# define OptimizedCDebugFlags -O2 GccAliasingArgs ++# endif ++# define LinuxMachineDefines -D__loongarch__ -D__loongarch_grlen=32 ++# define ServerOSDefines XFree86ServerOSDefines ++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines ++#endif /* LoongArch32Architecture */ ++ + #ifndef StandardDefines + # ifdef __linux__ + # define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines +-- +2.45.0 + diff --git a/community/obexd-enhanced/APKBUILD b/community/obexd-enhanced/APKBUILD index 45661cbc2fb..14300bcd92e 100644 --- a/community/obexd-enhanced/APKBUILD +++ b/community/obexd-enhanced/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dylan Van Assche <me@dylanvanassche.be> # Maintainer: Dylan Van Assche <me@dylanvanassche.be> pkgname=obexd-enhanced -pkgver=5.73 +pkgver=5.75 pkgrel=0 pkgdesc="OBEXD with enhanced capabilities such as PBAP" url="https://www.bluez.org/" @@ -40,7 +40,9 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz disable-lock-test.patch fix-endianness.patch test-mesh-crypto.patch + disable-test-vcp.patch " + builddir="$srcdir/bluez-$pkgver" case "$CARCH" in @@ -49,7 +51,7 @@ case "$CARCH" in esac provides="obexd=$pkgver-r$pkgrel" -replaces="obex-capalities<=0.2.1-r4" +replaces="obex-capabilities<=0.2.1-r4" # secfixes: # 5.54-r0: @@ -93,7 +95,7 @@ package() { } sha512sums=" -20090da036d3d614706b14a757b02acf138859d8f0476aa7f68d57635dfb3632ce7d8bb3456320904d72333d1314a5fe14dcb8ece307e6d31ce6d2d516de25e8 bluez-5.73.tar.xz +f5fdad3824ed094d944d33f3d116c045e69d593a2b4dae5e57feeb5625a13e024e2433a3178921d2f8e1bd8261794ecdfc25ff3e52672e6e8d42e85b33a735a4 bluez-5.75.tar.xz 6b53966522df8405f4cfb794874dc2f126abded53fddf1fd559126afc039faab9d51421852dba8abf53700fd79388db16897d590151fe6a43f97676f868d08ee org.bluez.obex.service 73202915fda01d420b2864da77b1c25af5a55c815e9be6546400a0940bfb6097d83322790bc22a80ec0fcd557144fdd1877e243a79285a7f040ff96ba3600b94 001-bcm43xx-Add-bcm43xx-3wire-variant.patch d5fd1c962bd846eaa6fff879bab85f753eb367d514f82d133b5d3242e1da989af5eddd942c60a87d5b67783e060f91bfa0f74fb1e8e6699cdee6e5bbe6a431ea 002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch @@ -103,4 +105,5 @@ ac635f9bca0e983835940572eb1b96ad70cf60fb84d5b0fde38c76ea6d1b13ef7d9adf81468b9fed 04c4889372c8e790bb338dde7ffa76dc32fcf7370025c71b9184fcf17fd01ade4a6613d84d648303af3bbc54043ad489f29fc0cd4679ec8c9029dcb846d7e026 disable-lock-test.patch 2f54da5e77893d1d8b7164ddac5561a9e536c2b93b1d33dcbd97e74c0fd45588f1f50dc1d9d8519297871e3a376948082a2e45e27d823ec81cdedecd8dba3f0c fix-endianness.patch b5d6f7d2df755a9b8cffaeef13d232ba1bab27544bc59e2299bbd6a8017768cf7781f3ca65e430a149a26f0b30ae74b8510529ce161705bb6f41ae512cc2dbac test-mesh-crypto.patch +e7a07f26d92caaf11a457a8504219973da0aa80f2c97b36af2135aa36f7f4b52978f632c9c5123d66d71b4b65a780710dea802ca0dcaabc5c051f7b7d21763cf disable-test-vcp.patch " diff --git a/community/obexd-enhanced/disable-test-vcp.patch b/community/obexd-enhanced/disable-test-vcp.patch new file mode 100644 index 00000000000..ffbdbddea17 --- /dev/null +++ b/community/obexd-enhanced/disable-test-vcp.patch @@ -0,0 +1,24 @@ +From 1d5a2ec8eb96e9186aeb2826927057ddc7a9d0a6 Mon Sep 17 00:00:00 2001 +From: macmpi <16296055+macmpi@users.noreply.github.com> +Date: Wed, 17 Jan 2024 09:34:28 +0100 +Subject: [PATCH] disable test_aics_unit_testcases + +fails on x86-64 +https://github.com/bluez/bluez/issues/726 +--- + unit/test-vcp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unit/test-vcp.c b/unit/test-vcp.c +index 6a61ea2c44..3886177758 100644 +--- a/unit/test-vcp.c ++++ b/unit/test-vcp.c +@@ -2754,7 +2754,7 @@ int main(int argc, char *argv[]) + tester_init(&argc, &argv); + + test_vocs_unit_testcases(); +- test_aics_unit_testcases(); ++// test_aics_unit_testcases(); test fails on x86-64 + + return tester_run(); + } diff --git a/community/objfw/APKBUILD b/community/objfw/APKBUILD index c94467027c2..d94c90381b5 100644 --- a/community/objfw/APKBUILD +++ b/community/objfw/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jonathan Schleifer <js@nil.im> # Maintainer: Jonathan Schleifer <js@nil.im> pkgname=objfw -pkgver=1.1.1 +pkgver=1.1.3 pkgrel=0 pkgdesc="Portable, lightweight framework for the Objective-C language" url="https://objfw.nil.im/" @@ -11,8 +11,7 @@ makedepends="clang17 openssl-dev doxygen autoconf automake" subpackages="$pkgname-dev $pkgname-doc libobjfw1:_libobjfw libobjfwrt1:_libobjfwrt libobjfwtls1:_libobjfwtls ofarc:_ofarc ofdns:_ofdns ofhash:_ofhash ofhttp:_ofhttp" -source="$pkgname-$pkgver.tar.gz::https://objfw.nil.im/downloads/objfw-$pkgver.tar.gz - tr-workaround.patch" +source="https://objfw.nil.im/downloads/objfw-$pkgver.tar.gz" prepare() { default_prepare @@ -107,6 +106,5 @@ _ofhttp() { } sha512sums=" -ee0e390e8fc6af8f98b9f91d3197bafad1612924c94b52f432e143dd58d84b0897c1a184466d3c3b18ef21334b02192f759aaa3c121d7e8949730574d012c2af objfw-1.1.1.tar.gz -396ec11a05cee6023455fc1bc4c288fcb2ffe8008bdb40bb537c508e3f9d4e98c1e6b0728dc4db6644a8330829001766b101c99a1ad8ece2d6493c514d67e9f7 tr-workaround.patch +c5372451f02ad7a8c1090a9ab9a8df8d106dbc789f2e9857b0543317d5be2f3f321c70ce55ac7179333134e31b24be4e2810a6a4024274ae72def882b63f5132 objfw-1.1.3.tar.gz " diff --git a/community/objfw/tr-workaround.patch b/community/objfw/tr-workaround.patch deleted file mode 100644 index fe371aef0dc..00000000000 --- a/community/objfw/tr-workaround.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: configure.ac -================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -151,10 +151,11 @@ - ;; - esac - AC_PROG_OBJC($potential_compilers) - AC_PROG_OBJCPP - AC_PROG_EGREP -+AC_PROG_SED - AC_PROG_LN_S - - BUILDSYS_CHECK_IOS - - AC_ARG_WITH(wii, -@@ -596,19 +597,19 @@ - } @finally { - foo(); - } - ]) - ], [ -- AS_IF([tr -dc "[[:print:]]" <conftest.$ac_objext | \ -+ AS_IF([$SED 's/[[^[:print:]]]//g' <conftest.$ac_objext | \ - $EGREP __gnu_objc_personality_v0 >/dev/null], [ - exception_type="DWARF" - ]) -- AS_IF([tr -dc "[[:print:]]" <conftest.$ac_objext | \ -+ AS_IF([$SED 's/[[^[:print:]]]//g' <conftest.$ac_objext | \ - $EGREP __gnu_objc_personality_sj0 >/dev/null], [ - exception_type="SjLj" - ]) -- AS_IF([tr -dc "[[:print:]]" <conftest.$ac_objext | \ -+ AS_IF([$SED 's/[[^[:print:]]]//g' <conftest.$ac_objext | \ - $EGREP __gnu_objc_personality_seh0 >/dev/null], [ - exception_type="SEH" - ]) - - case "$exception_type" in -@@ -816,18 +817,18 @@ - AC_COMPILE_IFELSE([ - AC_LANG_SOURCE([ - double endianess = 2.993700760838795055656993580068609688772747263874402942272934826871811872228512759832626847251963763755836687759498519784550143745834860002945223766052808125982053455555265216112722718870586961456110693379343178124592311441022662940307099598578775368547768968914916965731708568179631324904813506101190853720749196062963892799499230635163056742330563321122389331703618066046034494287335316842529021563862331183541255013987734473643350285400060357711238514186776429325214739886098119655678483017894951556639821088508565036657794343031121375178126860889964700274558728491825977274341798997758923017217660272136611938897932105874133412726223468780517578125e-259; - ]) - ], [ -- AS_IF([tr -dc "[[:print:]]" <conftest.$ac_objext | \ -+ AS_IF([$SED 's/[[^[:print:]]]//g' <conftest.$ac_objext | \ - $EGREP BigEnd >/dev/null], [ - AC_DEFINE(OF_FLOAT_BIG_ENDIAN, 1, - [Whether floats are big endian]) - fp_endianess="big endian" - ], [ -- AS_IF([tr -dc "[[:print:]]" <conftest.$ac_objext | \ -- $EGREP dnEgiB >/dev/null], [ -+ AS_IF([$SED 's/[[^[:print:]]]//g' \ -+ <conftest.$ac_objext | $EGREP dnEgiB >/dev/null], [ - fp_endianess="little endian" - ]) - ]) - ]) - ], [ - diff --git a/community/obs-studio/APKBUILD b/community/obs-studio/APKBUILD index 8acdfc0e80b..556ef1fe408 100644 --- a/community/obs-studio/APKBUILD +++ b/community/obs-studio/APKBUILD @@ -5,7 +5,7 @@ pkgver=29.1.3 pkgrel=3 pkgdesc="Free and open source software for live streaming and screen recording" url="https://obsproject.com/" -arch="all !ppc64le !riscv64" # luajit +arch="all !ppc64le !riscv64 !loongarch64" # luajit license="GPL-2.0-or-later" options="!check" makedepends=" diff --git a/community/ocaml-camlp4/APKBUILD b/community/ocaml-camlp4/APKBUILD index 40012b0e9b7..1b913532d38 100644 --- a/community/ocaml-camlp4/APKBUILD +++ b/community/ocaml-camlp4/APKBUILD @@ -11,7 +11,7 @@ _ocamlver=${pkgver%.*} pkgrel=3 pkgdesc="Caml preprocessor and pretty-printer" url="https://github.com/camlp4/camlp4" -arch="all !riscv64" # ocaml +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception" depends="ocaml-runtime~$_ocamlver ocaml-ocamlbuild" depends_dev="$pkgname=$pkgver-r$pkgrel" diff --git a/community/ocaml-cppo/APKBUILD b/community/ocaml-cppo/APKBUILD index 2ae537d0d1a..d707c6a46b1 100644 --- a/community/ocaml-cppo/APKBUILD +++ b/community/ocaml-cppo/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.6.9 pkgrel=5 pkgdesc="C-style preprocessor for OCaml" url="https://github.com/ocaml-community/cppo" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" makedepends="dune ocaml ocaml-ocamlbuild" subpackages="$pkgname-doc $pkgname-ocamlbuild" diff --git a/community/ocaml-csexp/APKBUILD b/community/ocaml-csexp/APKBUILD index 689670caff4..4c8b3ddd36a 100644 --- a/community/ocaml-csexp/APKBUILD +++ b/community/ocaml-csexp/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.5.1 pkgrel=3 pkgdesc="Parsing and printing of S-expressions in Canonical form" url="https://github.com/ocaml-dune/csexp" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends="ocaml-runtime" depends_dev="$pkgname=$pkgver-r$pkgrel" diff --git a/community/ocaml-findlib/APKBUILD b/community/ocaml-findlib/APKBUILD index 53711eca58c..2f8c590a4da 100644 --- a/community/ocaml-findlib/APKBUILD +++ b/community/ocaml-findlib/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.9.6 pkgrel=4 pkgdesc="OCaml package manager" url="http://projects.camlcity.org/projects/findlib.html" -arch="all !riscv64" # ocaml +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends="ocaml-runtime" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml" diff --git a/community/ocaml-perl-bridge/APKBUILD b/community/ocaml-perl-bridge/APKBUILD index e95e1f4fee6..7d806d56b3e 100644 --- a/community/ocaml-perl-bridge/APKBUILD +++ b/community/ocaml-perl-bridge/APKBUILD @@ -6,7 +6,7 @@ pkgrel=4 _gitrev=611f632429f4e70508db4a921fea4b13b8e57161 pkgdesc="Perl embedded in OCaml" url="https://github.com/stevan/ocaml-perl-bridge" -arch="all !riscv64" # restricted by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.0-or-later" depends="ocaml-runtime" depends_dev="$pkgname=$pkgver-r$pkgrel" diff --git a/testing/ocaml-zarith/APKBUILD b/community/ocaml-zarith/APKBUILD index fd47963eac2..5f850668e43 100644 --- a/testing/ocaml-zarith/APKBUILD +++ b/community/ocaml-zarith/APKBUILD @@ -1,11 +1,11 @@ # Contributor: River Dillon <oss@outerpassage.net> -# Maintainer: River Dillon <oss@outerpassage.net> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=ocaml-zarith pkgver=1.12 pkgrel=5 -pkgdesc="library implementing arithmetic and logical operations" +pkgdesc="Arithmetic and logical operations over arbitrary-precision integers" url="https://github.com/ocaml/Zarith" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.0-only WITH OCaml-LGPL-linking-exception" depends="gmp-dev" # zarith is not split into a -dev subpackage makedepends=" @@ -18,9 +18,9 @@ subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/ocaml/Zarith/archive/refs/tags/release-$pkgver.tar.gz" builddir="$srcdir/Zarith-release-$pkgver" -# 32bit archs +# 32-bit archs case "$CARCH" in -armv7|armhf|x86) options="$options textrels" ;; + arm*|x86) options="$options textrels" ;; esac build() { @@ -36,6 +36,7 @@ check() { package() { mkdir -p "$pkgdir"/usr/lib/ocaml "$pkgdir"/usr/lib/ocaml/stublibs OCAMLFIND_LDCONF=ignore make install + install -Dm644 README.md -t "$pkgdir"/usr/share/doc/$pkgname/ install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/ } diff --git a/community/ocaml/APKBUILD b/community/ocaml/APKBUILD index cb3254faea4..51cbf6e66fc 100644 --- a/community/ocaml/APKBUILD +++ b/community/ocaml/APKBUILD @@ -6,7 +6,9 @@ pkgver=4.14.2 pkgrel=1 pkgdesc="Main implementation of the Caml programming language" url="https://ocaml.org/" -arch="all !riscv64" # hangs forever at final build step +# riscv64: hangs forever at final build step +# loongarch64: no upstream support +arch="all !riscv64 !loongarch64" license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" depends="$pkgname-runtime=$pkgver-r$pkgrel gcc" makedepends="gdbm-dev libc-dev ncurses-dev zlib-dev binutils-dev rpm-scripts" diff --git a/testing/ocaml5/APKBUILD b/community/ocaml5/APKBUILD index 1cbd7d7e085..9d1baab3a01 100644 --- a/testing/ocaml5/APKBUILD +++ b/community/ocaml5/APKBUILD @@ -3,12 +3,12 @@ # Contributor: omni <omni+alpine@hack.org> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=ocaml5 -provides=ocaml -pkgver=5.1.1 +pkgver=5.2.0 pkgrel=0 pkgdesc="Main implementation of the Caml programming language" url="https://ocaml.org/" -arch="all" +# loongarch64: no upstream support +arch="all !loongarch64" license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" depends="$pkgname-runtime=$pkgver-r$pkgrel gcc" checkdepends="parallel" @@ -21,34 +21,41 @@ subpackages=" source="https://caml.inria.fr/pub/distrib/ocaml-${pkgver%.*}/ocaml-$pkgver.tar.xz" builddir="$srcdir/ocaml-$pkgver" -# The s390x native compiler is newly added in 5.1.x and still needs some work +# Current native compiler support in 5.2.x case "$CARCH" in -s390x) - options="$options textrels !check" - export LDFLAGS="$LDFLAGS -Wl,-z,notext" +x86_64|aarch64|s390x|ppc64le) + _native_compiler=true + ;; +# Disabling native compiler on riscv64 as it fails to build otherlibs & debugger +*) + _native_compiler=false ;; esac build() { - local _make _conf - case "$CARCH" in - # Current native compiler support in 5.1.x - # Disabling riscv64 here as it segfaults while building dynlink - aarch64|s390x|x86_64) - _make="world.opt" - _conf="--enable-native-compiler \ - --enable-native-toplevel \ - --disable-installing-bytecode-programs" + local make_target extra_conf_opts + if $_native_compiler; then + make_target="world.opt" + extra_conf_opts=" + --enable-native-compiler + --enable-native-toplevel + --disable-installing-bytecode-programs + " msg "Building native compiler for $CARCH" - ;; - *) - _make="world" - _conf="--disable-native-compiler \ - --disable-native-toplevel \ - --enable-installing-bytecode-programs" + else + make_target="world" + extra_conf_opts=" + --disable-native-compiler + --disable-native-toplevel + --enable-installing-bytecode-programs + " msg "Building bytecode compiler for $CARCH" - ;; - esac + fi + + want_check && extra_conf_opts=" + $extra_conf_opts + --enable-ocamltest + " ./configure \ --prefix /usr \ @@ -57,11 +64,11 @@ build() { --mandir /usr/share/man \ --docdir /usr/share/doc/$pkgname \ --disable-installing-source-artifacts \ - $_conf \ + $extra_conf_opts \ CC="${CC:-gcc}" \ AS="${CC:-gcc} -c" \ ASPP="${CC:-gcc} -c" - make $_make + make $make_target } check() { @@ -109,5 +116,5 @@ runtime() { } sha512sums=" -e534881eec10b79141b6598ba6d3f59e32ed46a2c64b90c226bbec199c73cdb70e6e5bfa555c34c385d3d83c15e5115f0ea9a182fdda6547db7bbb416f8ed98f ocaml-5.1.1.tar.xz +6c2376777f0ec567fc414d534cba65e5f2120f7c766de25f36bbf80260e882f5d1c94c2ce8e12f2b2982097089c6e8f928f26dbc0b559a0463e7dcdd8baf20fe ocaml-5.2.0.tar.xz " diff --git a/community/ocamlbuild/APKBUILD b/community/ocamlbuild/APKBUILD index 37fdb3b08dc..de41b4aa0aa 100644 --- a/community/ocamlbuild/APKBUILD +++ b/community/ocamlbuild/APKBUILD @@ -7,7 +7,7 @@ pkgver=0.14.1 pkgrel=3 pkgdesc="Generic build tool with built-in rules for building OCaml library and programs" url="https://github.com/ocaml/ocamlbuild" -arch="all !riscv64" +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception" checkdepends="ocaml-compiler-libs ocaml-findlib" depends="ocaml-$pkgname=$pkgver-r$pkgrel cmd:tput" diff --git a/community/ocean-sound-theme/APKBUILD b/community/ocean-sound-theme/APKBUILD index 36bfeb9790c..43ad4ca17ed 100644 --- a/community/ocean-sound-theme/APKBUILD +++ b/community/ocean-sound-theme/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=ocean-sound-theme -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Ocean Sound Theme for Plasma" # armhf blocked by extra-cmake-modules @@ -36,5 +36,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -85f3b8e533e7b9d456c1c582319968de8b0126653602457aa142060f538903396f39a88a9925370a01e832146f783dde54bb1b37140d8eba095c21d7d9ac9f14 ocean-sound-theme-6.0.3.tar.xz +c3683b71ca672aa20c4a20b23689ef2f868fae15758fac9116cb6ae40afa56cd5db540c8a1e5b7745446ae6d8c76a45e522e21882d0a5bcfd6aaa9804a1814f3 ocean-sound-theme-6.0.4.tar.xz " diff --git a/community/oci-cli/APKBUILD b/community/oci-cli/APKBUILD index e8e8bb826aa..b072e7d7543 100644 --- a/community/oci-cli/APKBUILD +++ b/community/oci-cli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Adam Bruce <adam@adambruce.net> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=oci-cli -pkgver=3.39.0 +pkgver=3.40.1 pkgrel=0 pkgdesc="Oracle Cloud Infrastructure CLI" url="https://docs.oracle.com/en-us/iaas/Content/API/Concepts/cliconcepts.htm" @@ -47,5 +47,5 @@ package() { } sha512sums=" -38b7bed627796ceb596a9fc53df977f7b5565092f6d59bee6cc2fa077bc4e5b2cc7597aebfad30b935b309ef4621f0240f2093f6ef2548f9b5bb896aae65f595 oci-cli-3.39.0.tar.gz +133cfe8c3697a6a100b3f73427246228721bc68558f1033ac4d2796ceb5ecc627e211f749b209be4fc01550d48bf70c9be2b8eb3bc0b5602202fbd7b1857feea oci-cli-3.40.1.tar.gz " diff --git a/community/ocrmypdf/APKBUILD b/community/ocrmypdf/APKBUILD index ac71490ba2d..17b4cd43e1d 100644 --- a/community/ocrmypdf/APKBUILD +++ b/community/ocrmypdf/APKBUILD @@ -6,7 +6,8 @@ pkgrel=0 pkgdesc="Add OCR text layer to scanned PDF files" url="https://github.com/ocrmypdf/OCRmyPDF" # s390x, armhf, x86, ppc64le: tesseract-ocr -arch="noarch !s390x !armhf !x86 !ppc64le" +# riscv64: tests fails +arch="noarch !s390x !armhf !x86 !ppc64le !riscv64" license="MIT" depends=" ghostscript diff --git a/community/octave/APKBUILD b/community/octave/APKBUILD index 53227fda6dc..7466521f06b 100644 --- a/community/octave/APKBUILD +++ b/community/octave/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=octave pkgver=9.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A high-level language, primarily intended for numerical computations" url="https://www.gnu.org/software/octave/" # ppc64le, s390x missing texlive diff --git a/community/okular/APKBUILD b/community/okular/APKBUILD index 9fb300c7261..7d621d8f07e 100644 --- a/community/okular/APKBUILD +++ b/community/okular/APKBUILD @@ -7,8 +7,8 @@ pkgname=okular pkgver=24.02.2 pkgrel=0 # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> purpose -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine -> purpose +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://okular.kde.org/" pkgdesc="A universal document viewer" license="GPL-2.0-or-later AND LGPL-2.0-or-later" diff --git a/community/omxplayer/APKBUILD b/community/omxplayer/APKBUILD index b397ed181f9..12bd02f6dd0 100644 --- a/community/omxplayer/APKBUILD +++ b/community/omxplayer/APKBUILD @@ -2,7 +2,7 @@ pkgname=omxplayer pkgver=0.20190102 _commitid=f06235cc9690a6d58187514452df8cf8fcdaacec -pkgrel=10 +pkgrel=11 pkgdesc="Commandline OMX player for Raspberry Pi" url="https://github.com/popcornmix/omxplayer" arch="armhf armv7" diff --git a/community/onefetch/APKBUILD b/community/onefetch/APKBUILD index 53c83035647..ed58569854a 100644 --- a/community/onefetch/APKBUILD +++ b/community/onefetch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: omni <omni+alpine@hack.org> pkgname=onefetch -pkgver=2.20.0 +pkgver=2.21.0 pkgrel=0 pkgdesc="Git repository summary on your terminal" url="https://github.com/o2sh/onefetch" @@ -25,6 +25,15 @@ subpackages=" source="$pkgname-$pkgver.tar.gz::https://crates.io/api/v1/crates/onefetch/$pkgver/download" options="net" +case "$CARCH" in +riscv64) + options="$options !check" + # didn't manage to disable the test with + # cargo test --frozen -- --skip test_repo + # maybe some other test is failing? + ;; +esac + # Reduce binary size export CARGO_PROFILE_RELEASE_OPT_LEVEL="z" @@ -53,14 +62,7 @@ build() { } check() { - case "$CARCH" in - riscv64) - cargo test --frozen -- --skip test_repo - ;; - *) - cargo test --frozen - ;; - esac + cargo test --frozen } package() { @@ -72,5 +74,5 @@ package() { } sha512sums=" -f6639058dca7b1222b5e0f3695847b3d82642e2f4857cd7f656e4cbb80eb1688ffc0894a45f71eae8f919f9bb79d8717d68596cb639060266821b1bd89fed41a onefetch-2.20.0.tar.gz +bdcdc922c5d5912a6e2b5cb87d43fb7d69a7f489199857578c29c60247aefe97b4ff20e2f1a28ed2e53d1d613d921b525c009c96c59bc354b89a420d92ff38b0 onefetch-2.21.0.tar.gz " diff --git a/community/onevpl/APKBUILD b/community/onevpl/APKBUILD index acf561c6680..b836ae5ca20 100644 --- a/community/onevpl/APKBUILD +++ b/community/onevpl/APKBUILD @@ -9,7 +9,7 @@ license="MIT" makedepends="cmake samurai" subpackages="$pkgname-doc $pkgname-libs $pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$pkgver.tar.gz" -builddir="$srcdir/oneVPL-$pkgver" +builddir="$srcdir/libvpl-$pkgver" build() { CXXFLAGS="$CXXFLAGS -flto=auto" \ @@ -42,5 +42,5 @@ dev() { } sha512sums=" -1e8cc143f33438d3a4e1d65aa57dca4e0ebc1a47741b7a124a273cc609cc4ce789c0e230db3244010f5f1ca54f42cdd2e17d132b2c904af41607a2a0527c38ed onevpl-2023.3.1.tar.gz +a555a7c589e22fdf6c52a33ef524864f26d7d21548b03c2c6199cfab8e5ab565f84567348bb3fe50392354677e020429712351e8595c2e610d0e0c403851b8dc onevpl-2023.3.1.tar.gz " diff --git a/community/opam/APKBUILD b/community/opam/APKBUILD index 4a428b63dac..2a9f1d73a8e 100644 --- a/community/opam/APKBUILD +++ b/community/opam/APKBUILD @@ -5,10 +5,10 @@ # Maintainer: Kate <kit.ty.kate@disroot.org> pkgname=opam pkgver=2.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="OCaml Package Manager" url="https://opam.ocaml.org" -arch="all !riscv64" # ocaml +arch="all !loongarch64" # ocaml 4+5 license="LGPL-2.1-only WITH OCaml-LGPL-linking-exception" depends="curl patch unzip coreutils bubblewrap" options="!check" # The tests use bubblewrap which cannot be run inside docker @@ -20,6 +20,12 @@ source="https://github.com/ocaml/opam/releases/download/$pkgver/opam-full-$pkgve subpackages="$pkgname-doc" builddir="$srcdir/opam-full-$pkgver" +case "$CARCH" in + riscv64) + makedepends="${makedepends//ocaml/ocaml5}" + ;; +esac + build() { ./configure \ --build=$CBUILD \ diff --git a/community/opencascade/APKBUILD b/community/opencascade/APKBUILD index 513a3d95d59..ab57fd05410 100644 --- a/community/opencascade/APKBUILD +++ b/community/opencascade/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> # Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=opencascade -pkgver=7.8.0 +pkgver=7.8.1 pkgrel=0 pkgdesc="SDK for development of applications dealing with 3D CAD data" url="https://dev.opencascade.org/" @@ -49,7 +49,7 @@ build() { -DUSE_RAPIDJSON=ON \ -DUSE_TBB=OFF \ -DUSE_VTK=ON \ - -D3RDPARTY_VTK_INCLUDE_DIR=/usr/include/vtk-9.2/ + -D3RDPARTY_VTK_INCLUDE_DIR=/usr/include/vtk-9.3/ cmake --build build } @@ -62,7 +62,7 @@ package() { } sha512sums=" -af176cbd105c49949282c16bb6e30f69167bc6c00a50e0ae69aea555815d47ac3c4540c233e596c5add7cb846c2b33d7be267d8e02472286e758b662b4a652ab opencascade-7.8.0-updatecache.tar.gz +807c1f8732926cfdabcfbdf8d6a0e76b8dba1a1e614afe084a467ffb4cfd80623f5e3afa7e9905b1ac96667c93e01b5f98ceaa8948a576a1093d98df98cc8f81 opencascade-7.8.1-updatecache.tar.gz e04cb898ec16c57ea5f2e9e79f6616153b7f6e4ddcad815f5d28898a692e26e1054a8f3321e6ee8616a915b10d45927f5e596c4f096c5333be910eaea751cce3 no_mallinfo.patch b039b8fce696bfd0f53309a72adab4065780bf1755da6208040157e9383deb0061ad8927a6f160730f431cbebe3fdd1eaa7967b38da4a245a8d9306042d97629 no_feenableexcept.patch 86dceb6e8309e18f5ea72ce2e3524ff08dc761ffe76557d62a1a4f2824ca0e2f9dfc194cae22164aaaf5ad9a15a6ec0f1fef443241aa2ccb0a2140de217c8a90 no_backtrace.patch diff --git a/community/opencl/APKBUILD b/community/opencl/APKBUILD index 9a028189330..1eed5f6aa38 100644 --- a/community/opencl/APKBUILD +++ b/community/opencl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leon Marz <main@lmarz.org> # Maintainer: Leon Marz <main@lmarz.org> pkgname=opencl -pkgver=2023.12.14 +pkgver=2024.05.08 pkgrel=0 pkgdesc="OpenCL ICD Loader" url="https://khronos.org/opencl" @@ -48,5 +48,5 @@ info() { } sha512sums=" -f00dc71adba8c2e4aad917663250b9adec4aa3ef23596d15c5a1ecb1a99468cc1a3c80817ef30012ed2e553113894815123ed5616fc5e93ce2126ef1da0c96c1 OpenCL-SDK-v2023.12.14-Source.tar.gz +53d3a5f0086a192b20062ada9fdff9a49375dea954961fdb17fc7e8c174c3dc791a903b38fa9021eb680d854a9835fc1777dc5475974c37cb79ed07d722583ea OpenCL-SDK-v2024.05.08-Source.tar.gz " diff --git a/community/opendmarc/APKBUILD b/community/opendmarc/APKBUILD index af1b52bd142..0b9b11fe7f3 100644 --- a/community/opendmarc/APKBUILD +++ b/community/opendmarc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=opendmarc pkgver=1.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="A free open source implementation of the DMARC specification" url="https://github.com/trusteddomainproject/OpenDMARC" arch="all" @@ -70,6 +70,6 @@ sha512sums=" a8585104490d42ecb2acce40df2e36fc5ed6155fecb16a9de5606703b1b3f5fc7f84f2933350fa3ff8f7da133bc251f30dc33b9c1310bc64e801179de68df026 dmarcfail-fix-shebang.patch 0c663a3f1341707bf2e83e6d418b2696b461afdc64cfe94d5bb6013d2832d48e8347524a942d2c56743e3fd0075f2d0481df032de38b220dfacefb16349b6a3f fix-importstats-ignores-HistoryFile-path.patch 6854cbd0357f444f596658bf55ba00534ffb87aebe872ac7ae4329c8e0132be1c12bed528741ecb3561621fc3b9c747eb094e0a90f53efe70f78aa4d2e515e16 config-defaults.patch -d3ddde80f609c6d4d7be547d7285bab3775284c05102b36a243a7389461e6304a0e1658a46ec0785195daa3ce89a939eab05203cd35e3a080fd04ccbfdd9e07a opendmarc.initd +ad8f87898ef93006d7179aceb9bb144cc78a2541b94a44c2f1a9cc6292b285a86990bae2f1473ca632415606b318107b58dbc448dd173e9ccc21c5c4e4993e36 opendmarc.initd 325a16efdd66e49fc15583d9ced38d70032601707fb82569e5967745a11d1fa216e720b3122929614ab0a322468a22a0bdd9cab9110fe24da231ef5a337177df opendmarc.confd " diff --git a/community/opendmarc/opendmarc.initd b/community/opendmarc/opendmarc.initd index 6058c632c95..bbc4407dfe2 100644 --- a/community/opendmarc/opendmarc.initd +++ b/community/opendmarc/opendmarc.initd @@ -13,7 +13,7 @@ pidfile="/run/opendmarc/$RC_SVCNAME.pid" required_files="$cfgfile" -depends() { +depend() { use dns logger net before mta } diff --git a/community/openexr/APKBUILD b/community/openexr/APKBUILD index 32f862d167b..9810a785a4c 100644 --- a/community/openexr/APKBUILD +++ b/community/openexr/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Mark Riedesel <mark+alpine@klowner.com> pkgname=openexr pkgver=3.1.13 -pkgrel=0 +pkgrel=1 pkgdesc="High dynamic-range image file format library" url="https://www.openexr.com/" arch="all" diff --git a/community/openfst/APKBUILD b/community/openfst/APKBUILD index a89340941d1..80fb662bd19 100644 --- a/community/openfst/APKBUILD +++ b/community/openfst/APKBUILD @@ -1,8 +1,8 @@ # Contributor: John Gebbie <me@johngebbie.com> # Maintainer: John Gebbie <me@johngebbie.com> pkgname=openfst -pkgver=1.8.2 -pkgrel=5 +pkgver=1.8.3 +pkgrel=0 pkgdesc="Finite-state transducers library" url="https://www.openfst.org" # doesn't build on other arches @@ -83,6 +83,6 @@ libfstngram() { } sha512sums=" -ca7f9f19e24141e1f1d0bbabf43795e6e278bce3887c14261d9ce204a0e01b1588eaf982755a9105247510a19f67da2f566e9b14b1d869497148f95b55606d5c openfst-1.8.2.tar.gz +26717ee019a05412d29ea611af651a443823999aab4e9834d2da7ce67d9aa1434ccacbcd19c0247386129272ddaec286f608be4d118ebef68d74c29a3b861d54 openfst-1.8.3.tar.gz 8826567c4a2627e7115ca2269ddaaca5bab4430a8cb3b163106e524023c55983ba1da490ccba0f1379266f42b87dfcdeb0cbb627cf5183e07a7e5fe84d08ed68 fix-check.patch " diff --git a/community/openimageio/APKBUILD b/community/openimageio/APKBUILD index 2b86bcf4202..4a872eada78 100644 --- a/community/openimageio/APKBUILD +++ b/community/openimageio/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Damian Kurek <starfire24680@gmail.com> # Maintainer: Leon Marz <main@lmarz.org> pkgname=openimageio -pkgver=2.5.10.1 -pkgrel=1 +pkgver=2.5.11.0 +pkgrel=0 pkgdesc="Image I/O library supporting a multitude of image formats" options="!check" # more than 10% of all tests fail url="https://sites.google.com/site/openimageio/" @@ -85,5 +85,5 @@ _python() { } sha512sums=" -82b05040dada8c83d4c1c1d95b01decbbe1f33e006f7b356da1a1c1c4a99b81ba8fdc506ca2a5052d9f06f92dafca24242c49588e59b23b980fa525b53e380a3 openimageio-2.5.10.1.tar.gz +e21c4f14aef031cebc9f4af98f19241d7cc87f568aea35a823cd793b0eaaff08e91f6e59a04bda644ce5b3900314bc24c362bd4df6f385f92216438cb5fba3b0 openimageio-2.5.11.0.tar.gz " diff --git a/community/openipmi/APKBUILD b/community/openipmi/APKBUILD index d33c372cc1f..53b5639b0ee 100644 --- a/community/openipmi/APKBUILD +++ b/community/openipmi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openipmi -pkgver=2.0.34 +pkgver=2.0.35 pkgrel=0 pkgdesc="IPMI (Intelligent Platform Management Interface) library and tools" url="https://sourceforge.net/projects/openipmi/" @@ -48,5 +48,5 @@ lanserv() { } sha512sums=" -25402019a4ee243effca30b7e0bfd4934f2e505a25009ea6330c4c9317299fde937ab3640f2dcb48aaabc9919d3a8f064807c368c0c0e6bca341e3c19ec82edd OpenIPMI-2.0.34.tar.gz +95a662fbdc5f799b37ce2987cad9305160032f566164032de0495fd9bafe80a423d18b4dcf91937155f853fece1d71fcc3f7eef52f6c48d2eceb68d020ca79f2 OpenIPMI-2.0.35.tar.gz " diff --git a/community/openjdk11/APKBUILD b/community/openjdk11/APKBUILD index a6762020177..1786398b97a 100644 --- a/community/openjdk11/APKBUILD +++ b/community/openjdk11/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Simon Frankenberger <simon-alpine@fraho.eu> # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu> pkgname=openjdk11 -pkgver=11.0.22_p7 +pkgver=11.0.23_p9 _pkgver=${pkgver%_p*}-ga pkgrel=0 pkgdesc="Oracle OpenJDK 11" @@ -74,6 +74,12 @@ case "$CARCH" in esac # secfixes: +# 11.0.23_p9-r0: +# - CVE-2024-21085 +# - CVE-2024-21011 +# - CVE-2024-21068 +# - CVE-2024-21094 +# - CVE-2024-21012 # 11.0.22_p7-r0: # - CVE-2024-20918 # - CVE-2024-20952 @@ -459,7 +465,7 @@ _jdk() { } sha512sums=" -b88d0db9750d8201dfb4b027045de4023be766e42cca7a3ff5e0cb28db4c6da3f146a57819a6b81cb33e5837726986bcc3780ecf88bf525f445c2cd35a3993d8 jdk-11.0.22-ga.tar.gz +3851063289042ed467a9cb636eba7170a0feeaa3e5d19bda6c30a186ea624e4ae1b308006652acb9c9820c2065382bd719ee130b7a1a0524fe25ecd639f8a51d jdk-11.0.23-ga.tar.gz 438c6c4c760b7aece90a8e09d5edce842286071195cffe8d417208f3dfdef0953eb68fb8282d44cbd7ac8eeaee637cdb040c06ffa5381c36f47ffd48b5e6d938 lfs64.patch e8d2213b5995bc0811f9a0036a9794150568ff9de4e202674e218ece7996553b1f222cff43dd21222c378f4f95a1471da25859b5a82ee496ed64df85f34ff199 ppc64le.patch b0963e5b6dc4d6cec0670827e0a0691d65e44587a8912ac9110aeb36d7f2d07a8afe9e155ea1568fe1534c09ef3277aeca8a66bbf155354b5cdc6e2b9636b5b4 JDK-8267908.patch diff --git a/community/openjdk17/APKBUILD b/community/openjdk17/APKBUILD index 973d7452b19..ca216352b93 100644 --- a/community/openjdk17/APKBUILD +++ b/community/openjdk17/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Simon Frankenberger <simon-alpine@fraho.eu> # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu> pkgname=openjdk17 -pkgver=17.0.10_p7 +pkgver=17.0.11_p9 _pkgver=${pkgver%_p*}-ga pkgrel=0 pkgdesc="Oracle OpenJDK 17" @@ -67,7 +67,21 @@ if [ $_run_jtreg -ne 0 ]; then checkdepends="$checkdepends font-freefont xvfb-run" fi +_jvm_variants=server +case $CTARGET_ARCH in +loongarch64) _jvm_variants=zero ;; +*) _jvm_variants=server ;; +esac + # secfixes: +# 17.0.11_p9-r0: +# - CVE-2024-21892 +# - CVE-2024-20954 +# - CVE-2024-21098 +# - CVE-2024-21011 +# - CVE-2024-21068 +# - CVE-2024-21094 +# - CVE-2024-21012 # 17.0.10_p7-r0: # - CVE-2023-5072 # - CVE-2024-20932 @@ -208,7 +222,7 @@ build() { --disable-warnings-as-errors \ --disable-precompiled-headers \ --enable-dtrace=no \ - --with-jvm-variants=server \ + --with-jvm-variants=$_jvm_variants \ --with-debug-level=release \ --with-version-pre= \ --with-version-opt="alpine-r$pkgrel" \ @@ -251,7 +265,7 @@ package() { mkdir -p "$pkgdir/$_java_home/$libstaticdir" - cd build/linux-*-server-release/images/ + cd build/linux-*-$_jvm_variants-release/images/ cp -r jdk/* "$pkgdir/$_java_home" cp -r static-libs/lib/* "$pkgdir/$_java_home/$libstaticdir" } @@ -360,7 +374,7 @@ _jre_headless() { } _jdk() { - pkgdesc="Oracle OpenJDK 17 (JDK)" + pkgdesc="Oracle OpenJDK 17 (JDK) ($_jvm_variants variant)" depends="$pkgname-jre $pkgname-jmods" provides=java-jdk _fromroot="$pkgdir/$_java_home" @@ -373,7 +387,7 @@ _jdk() { } sha512sums=" -c2dfd66debdce488de044efcfc3f57cc9eb07ead2cfb7dd6e28e5748d48ec89f0c326a4c3f4a5c740019b8e5a02b858d93dd74a0c6626de445144b9840d3a426 jdk-17.0.10-ga.tar.gz +77baa3ec3ff2d06b28121342357311d1d5ca2ddd9ac7982b1aa5fc745b49519d2f95d14226ad4ac413d9a0ecf0e49d15078cabbba0b2897d0c6883b92ef0b5e9 jdk-17.0.11-ga.tar.gz e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 gtest-1.8.1.tar.gz 007e643039af096e77e491ccba821596c7e96b80d9821a7fbe4a78ca3f013c5e771956461d82505c26b0ca3ab06699877f398833db459e2442c0c51f71fee361 ppc64le.patch " diff --git a/community/openjdk21/APKBUILD b/community/openjdk21/APKBUILD index 6071bdd0b1e..bc7ca0b9a22 100644 --- a/community/openjdk21/APKBUILD +++ b/community/openjdk21/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Simon Frankenberger <simon-alpine@fraho.eu> # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu> pkgname=openjdk21 -pkgver=21.0.2_p13 +pkgver=21.0.3_p9 _pkgver=${pkgver%_p*}-ga -pkgrel=2 +pkgrel=0 pkgdesc="Oracle OpenJDK 21" provider_priority=21 url="https://github.com/openjdk/jdk21u" @@ -71,7 +71,21 @@ if [ $_run_jtreg -ne 0 ]; then checkdepends="$checkdepends ttf-freefont xvfb-run" fi +_jvm_variants=server +case $CTARGET_ARCH in +loongarch64) _jvm_variants=zero ;; +*) _jvm_variants=server ;; +esac + # secfixes: +# 21.0.3_p9-r0: +# - CVE-2024-21892 +# - CVE-2024-20954 +# - CVE-2024-21098 +# - CVE-2024-21011 +# - CVE-2024-21068 +# - CVE-2024-21094 +# - CVE-2024-21012 # 21.0.2_p13-r0: # - CVE-2023-44487 # - CVE-2023-45143 @@ -133,7 +147,7 @@ build() { --disable-warnings-as-errors \ --disable-precompiled-headers \ --enable-dtrace=no \ - --with-jvm-variants=server \ + --with-jvm-variants=$_jvm_variants \ --with-debug-level=release \ --with-version-pre= \ --with-version-opt="alpine-r$pkgrel" \ @@ -176,7 +190,7 @@ package() { mkdir -p "$pkgdir/$_java_home/$libstaticdir" - cd build/linux-*-server-release/images/ + cd build/linux-*-$_jvm_variants-release/images/ cp -r jdk/* "$pkgdir/$_java_home" cp -r static-libs/lib/* "$pkgdir/$_java_home/$libstaticdir" } @@ -286,7 +300,7 @@ _jre_headless() { } _jdk() { - pkgdesc="Oracle OpenJDK 21 (JDK)" + pkgdesc="Oracle OpenJDK 21 (JDK) ($_jvm_variants variant)" depends="$pkgname-jre $pkgname-jmods" provides=java-jdk _fromroot="$pkgdir/$_java_home" @@ -299,7 +313,7 @@ _jdk() { } sha512sums=" -01a2f57dc432ea31f64d79092ae722f752e7ff111291cb5fb874046079a0fee985ede9d3aac991d946c9c6e712854827dd45284ff4cf39592add3629dbb94ace jdk-21.0.2-ga.tar.gz +efc2d03a7e7afed62a2cdc9f7707d056ed62d63f513394d7e3c6bbe11980ac492a2cad144021cea4180f4c93f1a481bdd65cb61156023a3f14ba596fd9c0eb60 jdk-21.0.3-ga.tar.gz 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e gtest-1.13.0.tar.gz 49128238737587dda2b170b20245bddf5e70d9644d9cc5b8e76d6e5e17102a10808d0a8f863e9dd9a68c4033beaa226ae95e8f6742a11960ca7ac5e59c1704ea ppc64le.patch 73c8aeb77e2b1f105c62d1739a19f973cb34a16380fbff142605ee7e93cbc388613fa693d96b779ce73e82cd5fc4e46ffb09c3e3a522a8d459088dd47388ac23 riscv64.patch diff --git a/community/openmw/APKBUILD b/community/openmw/APKBUILD index 09af7be2cfb..962157c9a25 100644 --- a/community/openmw/APKBUILD +++ b/community/openmw/APKBUILD @@ -3,7 +3,7 @@ pkgname=openmw # 0.48 is broken https://gitlab.com/OpenMW/openmw/-/issues/7500 pkgver=0.47.0 -pkgrel=12 +pkgrel=13 pkgdesc="Open-source engine reimplementation for the role-playing game Morrowind" # Note: only tested on the following archs, may work on others too but not # adding them until this has been confirmed diff --git a/community/openrct2/APKBUILD b/community/openrct2/APKBUILD index b83a129a9e9..e89ba6c0d0c 100644 --- a/community/openrct2/APKBUILD +++ b/community/openrct2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=openrct2 -pkgver=0.4.9 -_pkgver_objects=1.4.0 +pkgver=0.4.11 +_pkgver_objects=1.4.4 _pkgver_title_sequences=0.4.6 _pkgver_replays=0.0.79 _pkgver_opensfx=1.0.5 @@ -123,9 +123,9 @@ cli() { amove usr/bin/openrct2-cli } sha512sums=" -711254007f8ed7377d6ceedcedf6e75d5a07033844dba891cc5c1f457d60a45ae4430d57f17624a5dce6d157d7ed269d235c53eedd46d58c433791d749953d85 openrct2-0.4.9.tar.gz +820b0aaccdde433bf3da8a45e5893882e7a0bb1b0084fa6130ceab91489584a9d10b1ef18bac718e3f9ea910bdbcd878b7a3ca4f9361663a9fb496bb62a0ca80 openrct2-0.4.11.tar.gz bd7d0f25047540572be75a4a8886e8dabdceb7a3e11fdeb5473b66fe804d829acdb763d34ec7cfa656df9bc527268a3e0e7ca09c699995804b22ff2a529ad5da openrct2-0.4.6-title_sequences.zip -996cd4f6b5a3df1acd8258c68a123968e436b41e667e0d1f3a3e5b53d9f1788d1f8b3b87b4e8bbe3b1aff856449eca3bf04916e6a2bdca497e0de89807b90b3b openrct2-1.4.0-objects.zip +602057c184970fa15e7f40804262fca55d21709d403d85b89d6c264144dc4251b9aa058b4ef37b5723c4ea39d6a317f0304fe41f1a9734766a75d1cab1170e75 openrct2-1.4.4-objects.zip 04acde4d60c8fa949b298dd15e38fe0421659357fa214dffb0577574e0b0ac218a01ce998f4e12e3ab13a88fbbba8096392462fda29c68a6215bc0875aaae9b2 openrct2-0.0.79-replays.zip fc46ffb3f6243b3d783a280481ce373a8ddc8cf1fd28bfeceecf6223b72b38f1d49d0c95eea3376308a61a77c50c7a06252b6d72248cfecc493b63b65bd6512a openrct2-1.0.5-opensfx.zip 55d4afb854eaa5a69c42e7f0b26669c8fb58b2eba3e2892c655e76d8fab82e2734f39981d7f5ac69e11dc87d06c89795da2468feac3bc53ef6cfdd992e3924f3 openrct2-1.5-openmsx.zip diff --git a/community/openresty/APKBUILD b/community/openresty/APKBUILD index fc528c4cc8d..a3294f7528d 100644 --- a/community/openresty/APKBUILD +++ b/community/openresty/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.25.3.1 pkgrel=0 pkgdesc="Scalable Web Platform by Extending NGINX with Lua" url="https://openresty.org/" -arch="all !ppc64le !riscv64" # blocked by luajit +arch="all !ppc64le !riscv64 !loongarch64" # blocked by luajit license="BSD-2-Clause" options="!check" # tests environment not available provides="nginx" diff --git a/community/opensc/APKBUILD b/community/opensc/APKBUILD index f2b387fc690..3e87d6a61a8 100644 --- a/community/opensc/APKBUILD +++ b/community/opensc/APKBUILD @@ -3,7 +3,7 @@ pkgname=opensc _realname=OpenSC pkgver=0.25.1 -pkgrel=0 +pkgrel=1 pkgdesc="Open source smart card tools and middleware" url="https://github.com/OpenSC/OpenSC" arch="all" @@ -89,6 +89,11 @@ package() { -t "$pkgdir"/etc/xdg/autostart/ } +dev() { + default_dev + amove usr/lib/pkcs11 +} + bashcomp() { depends="" pkgdesc="Bash completions for $pkgname" diff --git a/community/openscad/APKBUILD b/community/openscad/APKBUILD index c16ebd26432..4b2640d686e 100644 --- a/community/openscad/APKBUILD +++ b/community/openscad/APKBUILD @@ -1,11 +1,13 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=openscad pkgver=2021.01 -pkgrel=13 +pkgrel=14 pkgdesc="The programmers solid 3D CAD modeller" url="http://openscad.org/" # Glew and GLES on ARM don't play well with each other -arch="all !armv7 !aarch64 !armhf" +# tests fails on s390x +# tests hangs on riscv64 +arch="all !armv7 !aarch64 !armhf !s390x !riscv64" license="GPL-2.0-only" subpackages="$pkgname-doc" makedepends=" diff --git a/community/opentofu/APKBUILD b/community/opentofu/APKBUILD index b869aa9ca75..8afb5bf0c30 100644 --- a/community/opentofu/APKBUILD +++ b/community/opentofu/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=opentofu -pkgver=1.6.2 -pkgrel=2 +pkgver=1.7.1 +pkgrel=0 pkgdesc="OpenTofu lets you declaratively manage your cloud infrastructure" url="https://opentofu.org" arch="all" @@ -29,5 +29,5 @@ package() { } sha512sums=" -25fac0e6837f2d125d35f780c3091139819a00ae3f96c2e62a1c3c544e425a60c9880c84b4e1aa6727771c5523c81e8dbab38d5151b854bbc470d7819746567c opentofu-1.6.2.tar.gz +11573449cf73e44352124463bb2dfe890688fc0bb1a232fb57a16872612c562e0fe08ed926635fc21063118d83a120febd156073c23d8dc3294e00035c660ad6 opentofu-1.7.1.tar.gz " diff --git a/community/openvas-scanner/APKBUILD b/community/openvas-scanner/APKBUILD index b6c1ec68361..283275d05d3 100644 --- a/community/openvas-scanner/APKBUILD +++ b/community/openvas-scanner/APKBUILD @@ -2,11 +2,11 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=openvas-scanner -pkgver=22.7.9 +pkgver=23.2.0 pkgrel=0 pkgdesc="Open Vulnerability Assessment Scanner" url="https://openvas.org/" -arch="all !x86 !armhf !armv7" # Fails to build, see #12616 +arch="all" license="GPL-2.0-only" depends="redis nmap coreutils openssl util-linux rsync" install="$pkgname.post-install" @@ -16,6 +16,7 @@ checkdepends="cppcheck" makedepends=" bison cmake + curl-dev doxygen glib-dev glibmm-dev @@ -39,7 +40,7 @@ x86|x86_64) makedepends="$makedepends openvas-smb-dev";; esac subpackages="$pkgname-doc $pkgname-config::noarch" -source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/openvas/archive/v$pkgver.tar.gz +source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/openvas-scanner/archive/v$pkgver.tar.gz tcp_mss_include.patch fix-redis-dbpath.patch makefile-cflags-musl.patch @@ -83,7 +84,7 @@ config() { } sha512sums=" -279a781fe698496fb88efd28c0ee6ede66a0180237b60c4d7b083fe10c7b7ac054ec04b08c9b33e6dd142f60529faedfef4441421cc04e95eaa08865e47b58dd openvas-scanner-22.7.9.tar.gz +9bd1570468b2d6f0e3e8f2b38a494c0953fe24ec811ce0f857463b1dc847cd6981e164a1471e6f85a25a09ff5cf1ca6e59f8047e518daf06e9d47ff14bd58623 openvas-scanner-23.2.0.tar.gz 7eeb50374d7812aef6651517f79ce8f4dd3769a64feaf3e6a1e29089d22ae10033ddedd38b7f7671b83421d354104effeeefd44df2811e07075fe3450f02954c tcp_mss_include.patch 1cb7c12bf23af7c5938834feb109e4d2858f57be68fb31c69df8bece44abe5f7b64fa4a5cfc1dac1c990c87e38db306ce3b8bef0dc9e247b40dae8afbd8c0c16 fix-redis-dbpath.patch d1d81c957b385fd096b30e68bf31d06a77309b35c7cbe2d55f54569753f1b3c3b3f772e25665c2f87521495c5d881ee6a2b52a59489ca2231badb48fb0d6baaa makefile-cflags-musl.patch diff --git a/community/openvas-smb/APKBUILD b/community/openvas-smb/APKBUILD index e8b4b4e0f53..c0ec6f93583 100644 --- a/community/openvas-smb/APKBUILD +++ b/community/openvas-smb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=openvas-smb -pkgver=22.5.3 +pkgver=22.5.6 pkgrel=0 pkgdesc="SMB module for OpenVAS Scanner" url="https://github.com/greenbone/openvas-smb" @@ -47,7 +47,7 @@ package() { } sha512sums=" -bf934ea387047d249202d31ff55ea135c8a4b3b16555afef6ee090284f293254abdaf63b4e7f8fd26374623c6699cdd90995588b7b6d49420d595fc13ed9d012 openvas-smb-22.5.3.tar.gz +00905ed3b723e5f7b4366209777a621902e63aac4eb493bef85e50392a3273fff6e2308d30ae4e59dfaff777f3fbfb3aba2b5b2c33566ee67a1bc026b7a80256 openvas-smb-22.5.6.tar.gz 126d522efcf7341680ba88e3545cee1da70b44bd2b9618d1f4324941ac38c9159eef8449a34acd71d9c0a2ccb8b98fa98a3bd1fc66608d99bd19365eceb6f3eb fix-missing-includes-path.patch 96b81bb378d0a70b1d31c19c646a95b96056ca3f85c02edc221bc17093b5403ba1fcdf9f3175e455aa32b7399e58a1c9cda525985c09c8b7dee8068bf3643a14 comparison_fn_t.patch 6a5f67177ca74ce051d190a81727b94938addf538c52831b5af3394f4d8d2ea990bcd58e3dc92570c7c4b0719deea49e2aa2fa549297c6e36ec4f8fa3f0a5270 disable-backtrace.patch diff --git a/community/openvdb/APKBUILD b/community/openvdb/APKBUILD index 42a1a74173d..92762cce812 100644 --- a/community/openvdb/APKBUILD +++ b/community/openvdb/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leon Marz <main@lmarz.org> pkgname=openvdb pkgver=11.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Sparse volume data structure and tools" url="https://www.openvdb.org/" arch="aarch64 x86_64" # tests fail on all other arches diff --git a/community/openxr/APKBUILD b/community/openxr/APKBUILD index ae043089819..525c73bbde0 100644 --- a/community/openxr/APKBUILD +++ b/community/openxr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leon Marz <main@lmarz.org> # Maintainer: Leon Marz <main@lmarz.org> pkgname=openxr -pkgver=1.0.34 +pkgver=1.1.36 pkgrel=0 pkgdesc="OpenXR loader library" url="https://khronos.org/openxr" @@ -31,5 +31,5 @@ package() { } sha512sums=" -cfcabbd130f89d1d46899f3a9a34e9b5d9b21903b6d0fc48c62e233401cf200107a9fa8da926fc0036937a9ed647a2376bee58db925654c41acc7580f8f3a053 openxr-1.0.34.tar.gz +88b2c903991723634ab9bcf71e4c7856397427048db6b710332f43d8185a8aa2c22a9769f2fc7c7d5c6ab5c5b31b3e9c6d1302b9b8935293cef3a1029a80c888 openxr-1.1.36.tar.gz " diff --git a/community/openzwave/APKBUILD b/community/openzwave/APKBUILD index 1dc091dd462..3d70a2f37b6 100644 --- a/community/openzwave/APKBUILD +++ b/community/openzwave/APKBUILD @@ -12,7 +12,8 @@ makedepends="$depends_dev linux-headers coreutils libxml2-utils" checkdepends="perl-xml-simple" options="!check" # FIXME tests failing subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" -source="http://old.openzwave.com/downloads/openzwave-$pkgver.tar.gz +#source="http://old.openzwave.com/downloads/openzwave-$pkgver.tar.gz +source="https://distfiles.alpinelinux.org/distfiles/edge/openzwave-$pkgver.tar.gz 0001-fix-build-on-ppc64le.patch fix-nullptr-check.patch 0002-fix-format.patch diff --git a/community/opustags/APKBUILD b/community/opustags/APKBUILD index 792d62dc577..d21cfacf52d 100644 --- a/community/opustags/APKBUILD +++ b/community/opustags/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alexey Yerin <yyp@disroot.org> # Maintainer: Alexey Yerin <yyp@disroot.org> pkgname=opustags -pkgver=1.9.0 +pkgver=1.10.0 pkgrel=0 pkgdesc="Ogg Opus tags editor" url="https://github.com/fmang/opustags" @@ -32,5 +32,5 @@ package() { } sha512sums=" -cd3ce0bb41c566e47acb0a4736deca5aa9c975b64afc13848dd29a48032bd1abc26fc3889006f1a18bece0c1b90f84f86170166fa3c9fd5d007073d15b4da20d opustags-1.9.0.tar.gz +55b682755746ed8ec9b41d8a3afe5d39242b3b7e7eddcf43cd9bdcb8c19d2a7a5272b437eb38a9b4a9dbdcb3c8dfedf49f954ced8bc6b4fe6d85696b79211deb opustags-1.10.0.tar.gz " diff --git a/community/oscam/APKBUILD b/community/oscam/APKBUILD index 6a82d22f0b7..453fe904141 100644 --- a/community/oscam/APKBUILD +++ b/community/oscam/APKBUILD @@ -20,7 +20,8 @@ pkgusers="$pkgname" subpackages="$pkgname-dbg $pkgname-list-smargo:list_smargo $pkgname-doc $pkgname-openrc " -source="oscam-$pkgver.zip::https://trac.streamboard.tv/oscam/browser/trunk?rev=${_rev}&format=zip +#source="oscam-$pkgver.zip::https://trac.streamboard.tv/oscam/browser/trunk?rev=${_rev}&format=zip +source="https://distfiles.alpinelinux.org/distfiles/edge/oscam-$pkgver.zip $pkgname.initd $pkgname.confd $pkgname.conf diff --git a/community/osl/APKBUILD b/community/osl/APKBUILD index f4b671c1d7c..bf94680d6a7 100644 --- a/community/osl/APKBUILD +++ b/community/osl/APKBUILD @@ -2,12 +2,13 @@ # Maintainer: Leon Marz <main@lmarz.org> pkgname=osl pkgver=1.12.14.0 -pkgrel=2 +pkgrel=3 pkgdesc="Advanced shading language for production GI renderers" options="!check" # All tests fail url="https://opensource.imageworks.com/osl.html" # riscv64 and s390x blocked by openimageio -arch="all !riscv64 !s390x" +# loongarch64: blocked by llvm15 +arch="all !riscv64 !s390x !loongarch64" license="BSD-3-Clause" _llvmver=15 makedepends="cmake diff --git a/community/osmin/APKBUILD b/community/osmin/APKBUILD index 8ae2cdd14fe..72c90e82ade 100644 --- a/community/osmin/APKBUILD +++ b/community/osmin/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Eloi Torrents <eloitor@disroot.org> # Maintainer: Eloi Torrents <eloitor@disroot.org> pkgname=osmin -pkgver=1.9.7 +pkgver=1.12.2 pkgrel=0 -_libosmscout_version=1.9-20230212 pkgdesc="GPS Navigator On-Road/Off-Road" url="https://github.com/janbar/osmin" arch="all !armhf !s390x" @@ -13,6 +12,7 @@ license="GPL-3.0-only" makedepends=" clang cmake + doxygen gnu-libiconv-dev libmarisa-dev libxml2-dev @@ -29,14 +29,13 @@ makedepends=" " options="!check" # no test suite source="$pkgname-$pkgver.tar.gz::https://github.com/janbar/osmin/archive/refs/tags/$pkgver.tar.gz - $pkgname-osmscout-$pkgver.tar.gz::https://github.com/janbar/libosmscout/archive/refs/tags/osmin-$_libosmscout_version.tar.gz + $pkgname-osmscout-$pkgver.tar.gz::https://github.com/janbar/libosmscout/archive/refs/tags/osmin-$pkgver.tar.gz system-libmarisa.patch - cpp-locale.patch " prepare() { rmdir backend/libosmscout - mv -v ../libosmscout-$pkgname-$_libosmscout_version backend/libosmscout + mv -v ../libosmscout-$pkgname-$pkgver backend/libosmscout default_prepare } @@ -49,7 +48,8 @@ build() { -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_DEPENDENCIES=OFF + -DBUILD_DEPENDENCIES=OFF \ + -DBUILD_DEVICEMOBILE=ON cmake --build build } @@ -58,8 +58,7 @@ package() { } sha512sums=" -facfb9fe3a437842be5a3d2b332549b0df6608717be98051a24e95e59e024276f853716bc6479e93abfbb868997bde97fd558943a8227dfc870b001dd40803da osmin-1.9.7.tar.gz -f4a8628a7e8a267b5c81e3b9e92219538515add64ed343d6795e6d9b23947c560a3e151c5ecbb241052f20eda02d32b08ce85793038b651180339c6bf2e6af60 osmin-osmscout-1.9.7.tar.gz +c0b8ff9072ec634664e7c309b496e3ca1ce3320e48aa86bbd293d2f6d0fcef63b40222410b5d8565f49eb5620e55dbb92116c774548ce7e854c7511e0311dce8 osmin-1.12.2.tar.gz +55f5eb4d2e1fd61532b79ba037ca39274354988e71dae82c101466e1f6e030b32a438da12d20d9bedbd7e0427b1982db979ee63929a7820cc93cb1990f5f39b6 osmin-osmscout-1.12.2.tar.gz 034ac53631e1ba1dc8e6af4727664584e4adb015573ae632aaf12d73ea2b0eab1526b93a25c63cda497aec91486ec4cfe6ba0e9aa97227b59a168411b7dee5c7 system-libmarisa.patch -9b80f943701d790b8b6ad012234c4e36f3a76b0ccb2ed34c62082fa81488cab9d737de97062cdc59d1a74ed6a9064347bc7115af2362111f73f64505640c04a2 cpp-locale.patch " diff --git a/community/osmin/cpp-locale.patch b/community/osmin/cpp-locale.patch deleted file mode 100644 index 383827be515..00000000000 --- a/community/osmin/cpp-locale.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/backend/libosmscout/libosmscout/include/osmscout/util/Locale.h -+++ b/backend/libosmscout/libosmscout/include/osmscout/util/Locale.h -@@ -102,7 +102,7 @@ - } - - public: -- static Locale ByEnvironment(std::locale locale = std::locale("")); -+ static Locale ByEnvironment(std::locale locale = std::locale()); - }; - } - diff --git a/community/osmscout-server/APKBUILD b/community/osmscout-server/APKBUILD index fa74f83bf55..044747456e1 100644 --- a/community/osmscout-server/APKBUILD +++ b/community/osmscout-server/APKBUILD @@ -6,8 +6,8 @@ pkgrel=0 pkgdesc="Maps server providing tiles, geocoder, and router" url="https://rinigus.github.io/osmscout-server" # armhf blocked by kirigami2 -# ppc64le, s390x and riscv64 blocked by luajit -> valhalla -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by luajit -> valhalla +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" license="GPL-3.0-or-later" depends=" kirigami2 diff --git a/community/ospd-openvas/APKBUILD b/community/ospd-openvas/APKBUILD index d3c1299a892..b7c10af1371 100644 --- a/community/ospd-openvas/APKBUILD +++ b/community/ospd-openvas/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=ospd-openvas -pkgver=22.6.2 -pkgrel=1 +pkgver=22.7.1 +pkgrel=0 pkgdesc="ospd-openvas is an OSP server implementation to allow GVM to remotely control an OpenVAS Scanner" url="https://github.com/greenbone/ospd-openvas" arch="noarch" @@ -30,6 +30,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/ospd-openvas/archi ospd.conf fix-test-unlink.patch " +# !fhs: /run/ospd referenced in /etc/openvas/ospd.conf +options="!fhs" build() { gpep517 build-wheel \ @@ -56,7 +58,7 @@ package() { } sha512sums=" -a405779b9ea89b1300122c39553f8f9bf079b8610dc61ec6244affa9c9273725234a4a556df05e3013045681678646226cf12af66f051def8b042b84bb639ffe ospd-openvas-22.6.2.tar.gz +ae7fe56a2b825efc33d9e29f2a51ab1034155ee70a5790d98f3b811a29f4b35830afabc27abd14593d74e1bcc5dac0ea1cd33ed46cc3ca459256a4b452e10552 ospd-openvas-22.7.1.tar.gz 264aa78a9909011de6800cf2839d2729bde4c2a8689d7a550c573d2d489c39dc224d7dc52d59210518aa1e2a9ae6a94beac978126f573bd87f378b6fa57511cf ospd-openvas.initd 2f571f41b34599cc0fb772203f69c781f9c6b043d1451fbd0f930d8040a6888dd832578ac8afdba3015db926b51c7ada56dd435e72f9fa4fffb99d2e769d74aa ospd.conf d266ad2cfdcf869cdbe8cfd06a0fa354e583cc2dfa4c3aaf2b478b5af3524a2a39d53ae08ac4816881bbca264262258ed08d077dc0e5a344a9ad091cbc1a656e fix-test-unlink.patch diff --git a/community/oxipng/APKBUILD b/community/oxipng/APKBUILD index 1f666d38af4..b3d99a3fc45 100644 --- a/community/oxipng/APKBUILD +++ b/community/oxipng/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Maxim Karasev <mxkrsv@disroot.org> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=oxipng -pkgver=9.0.0 +pkgver=9.1.1 pkgrel=0 pkgdesc="Multithreaded PNG optimizer written in Rust" url="https://github.com/shssoichiro/oxipng" @@ -10,6 +10,7 @@ arch="all !armhf" license="MIT" makedepends="cargo cargo-auditable" source="https://github.com/shssoichiro/oxipng/archive/v$pkgver/oxipng-$pkgver.tar.gz" +options="net" # required for cargo fetch prepare() { default_prepare @@ -33,5 +34,5 @@ package() { } sha512sums=" -ac12b1e823c748b5a3d58081b86d5be69b970788fb3f2d4acc1db1f790455bd35b8b897203b1157674be83b9172bb4cb3ec1d6401538270f42a5f35f92a62f5a oxipng-9.0.0.tar.gz +3d941f991b5ae82364e088a845919b5d88a335e56853044a835007d903844e4800f166c8d649413c97252ec7f70a28f93f633ecec81e6df2194cd87bc0c13297 oxipng-9.1.1.tar.gz " diff --git a/community/oxygen-sounds/APKBUILD b/community/oxygen-sounds/APKBUILD index bce52ac676b..3f44365af8e 100644 --- a/community/oxygen-sounds/APKBUILD +++ b/community/oxygen-sounds/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=oxygen-sounds -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="The Oxygen Sound Theme" # armhf blocked by extra-cmake-modules @@ -41,5 +41,5 @@ package() { } sha512sums=" -f41686a2bec8021cf3ca0ea175946daa62e61e75a35b995347a8f11f42b00e3b64ead09f97543b3937e9a364575cd43bbf97b317936cb5f19f6e5de7863c6b2a oxygen-sounds-6.0.3.tar.xz +3181e648f062e166b40e85a6611336eccc7a83c2b81ead0eb7010285c3b5219d9066267035d605cc39e89e0641f91e100dd2cd304e835a23a98c94b19fe06b9c oxygen-sounds-6.0.4.tar.xz " diff --git a/community/oxygen/APKBUILD b/community/oxygen/APKBUILD index 823ddea4dae..a6b2bc24a2c 100644 --- a/community/oxygen/APKBUILD +++ b/community/oxygen/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=oxygen -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Artwork, styles and assets for the Oxygen visual style for the Plasma Desktop" # armhf blocked by extra-cmake-modules @@ -55,5 +55,5 @@ package() { } sha512sums=" -50672c63e3fbd847f909fd601fc55e21b1458f2164238a8676023e5f411a0779e7186790136df2fc70a8c4a471d2367f0c1925bdefb5a0c1357659031364973e oxygen-6.0.3.tar.xz +9cfc66e10c155aac24afaa02633768a5ed9b61aae79bcb40010d138e19b83b15d56fd330e21c7ff424da526ee7f5a5f0d2671491205da5de4f9c562fe33d06f9 oxygen-6.0.4.tar.xz " diff --git a/community/pangomm2.48/APKBUILD b/community/pangomm2.48/APKBUILD index 76356f1a644..9b322202c5c 100644 --- a/community/pangomm2.48/APKBUILD +++ b/community/pangomm2.48/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pangomm2.48 pkgver=2.50.1 -pkgrel=2 +pkgrel=3 pkgdesc="C++ bindings for pango" #options="!check" # No testsuite url="https://www.gtkmm.org/" diff --git a/community/pass-git-helper/APKBUILD b/community/pass-git-helper/APKBUILD index 0873de27384..7f6707e812e 100644 --- a/community/pass-git-helper/APKBUILD +++ b/community/pass-git-helper/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Galen Abell <galen@galenabell.com> # Maintainer: Galen Abell <galen@galenabell.com> pkgname=pass-git-helper -pkgver=1.4.0 -pkgrel=2 +pkgver=2.0.0 +pkgrel=0 pkgdesc="git credential helper interfacing with pass, the standard unix password manager." url="https://github.com/languitar/pass-git-helper" arch="noarch" @@ -34,5 +34,5 @@ package() { } sha512sums=" -a4f16dd73bd2d4e2070691aa7cff98ca8ebb73d981401873c6aca4654f475958cf7a51c6f2bdb1f7f030ae41ddad28055d82dab3f6fe220ed467f68408fc6c77 pass-git-helper-1.4.0.tar.gz +919ae048a34f50a374c39d8b00f04f0607fab604a5d66481f3d28c1246f0de6f4ca0fc9b2300547c3cb90b4e7a3084f680f4540869773dd2ebd0e4b1e93f95b0 pass-git-helper-2.0.0.tar.gz " diff --git a/community/passt/APKBUILD b/community/passt/APKBUILD new file mode 100644 index 00000000000..0514e5f0e1c --- /dev/null +++ b/community/passt/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: Hoang Nguyen <folliekazetani@protonmail.com> +# Maintainer: omni <omni+alpine@hack.org> +pkgname=passt +pkgver=2024.05.10 +_commit=7288448 +_tag=${pkgver//./_}.$_commit +pkgrel=0 +pkgdesc="Plug A Simple Socket Transport" +url="https://passt.top/" +arch="all" +license="BSD-3-Clause AND GPL-2.0-or-later" +makedepends="coreutils-fmt linux-headers" +subpackages="$pkgname-doc" +source="https://passt.top/passt/snapshot/passt-$_tag.tar.gz + basename.patch" +builddir="$srcdir/$pkgname-$_tag" +# complicated test setup, requires qemu and a lot of VM images +options="!check" + +build() { + make +} + +package() { + make DESTDIR="$pkgdir" prefix=/usr install + install -Dm644 LICENSES/*.txt -t "$pkgdir"/usr/share/licenses/$pkgname/ +} + +sha512sums=" +6661fa94be85f062b8a39a554d0f99e8edbbcca03656d190adae13ccd5589fda871f6bad94c42e66d7325164763d0d739d42590494aed5b240173b5ad39e5cf4 passt-2024_05_10.7288448.tar.gz +d1493bb72fc07ed18986b1d5bbe69e3f30fe3fd229005e4a4ab5ef7ef0dfc0e39612758779f97bcd28331d8800e1c73a11a34fb598244b43e5aeedc96c1873b0 basename.patch +" diff --git a/community/passt/basename.patch b/community/passt/basename.patch new file mode 100644 index 00000000000..84f278a6ee0 --- /dev/null +++ b/community/passt/basename.patch @@ -0,0 +1,13 @@ +See https://gitlab.alpinelinux.org/alpine/aports/-/issues/16106 + +diff -upr passt-2024_04_26.d03c4e2.orig/passt.c passt-2024_04_26.d03c4e2/passt.c +--- passt-2024_04_26.d03c4e2.orig/passt.c 2024-05-12 12:56:04.698201835 +0200 ++++ passt-2024_04_26.d03c4e2/passt.c 2024-05-12 12:56:20.668243303 +0200 +@@ -35,6 +35,7 @@ + #include <syslog.h> + #include <sys/prctl.h> + #include <netinet/if_ether.h> ++#include <libgen.h> + #ifdef HAS_GETRANDOM + #include <sys/random.h> + #endif diff --git a/community/pdal/APKBUILD b/community/pdal/APKBUILD index 79597e013b4..edebb2c9d9e 100644 --- a/community/pdal/APKBUILD +++ b/community/pdal/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=pdal pkgver=2.7.1 -pkgrel=1 +pkgrel=3 pkgdesc="PDAL is a C++ BSD library for translating and manipulating point cloud data." url="https://pdal.io/" arch="all" diff --git a/community/pdfgrep/APKBUILD b/community/pdfgrep/APKBUILD index 4c8447aaf05..63e0c51d5ab 100644 --- a/community/pdfgrep/APKBUILD +++ b/community/pdfgrep/APKBUILD @@ -2,8 +2,8 @@ # Contributor: André Klitzing <aklitzing@gmail.com> # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=pdfgrep -pkgver=2.1.2 -pkgrel=9 +pkgver=2.2.0 +pkgrel=0 pkgdesc="Commandline utility to search text in PDF files" url="https://pdfgrep.org/" arch="all" @@ -13,15 +13,9 @@ checkdepends="dejagnu texlive" subpackages="$pkgname-doc $pkgname-zsh-completion:zshcomp:noarch $pkgname-bash-completion:bashcomp:noarch" -source="https://pdfgrep.org/download/$pkgname-$pkgver.tar.gz - no-locale.patch" +source="https://pdfgrep.org/download/$pkgname-$pkgver.tar.gz" options="!check" # multiple failures -prepare() { - default_prepare - update_config_sub -} - build() { ./configure \ --build=$CBUILD \ @@ -61,5 +55,6 @@ zshcomp() { "$subpkgdir"/usr/share/zsh/site-functions } -sha512sums="27bc4741e5203b2fd265815a22ad8d702b3455b2ae932641b040fc9ce615bc9ff0abef221eb2ec8aa59c79cb139d31184261d076f9731177129a473d62aa4e5c pdfgrep-2.1.2.tar.gz -0908a622202e7955d529befbbb87e2c521693e150bd3911ea459ce0f870ddea737afd0504a60038c3f2c71630fdb92d64e6401ae6e70e756583fb99c18aedb64 no-locale.patch" +sha512sums=" +de39ccb266f30b32ec71083759553979a31f7220b4923a4c3c74e1001c2f2c0dbef17c00f8139ffe88eec2031c48a13f18a057c7523ad363689b0f5b004c420f pdfgrep-2.2.0.tar.gz +" diff --git a/community/pdfgrep/no-locale.patch b/community/pdfgrep/no-locale.patch deleted file mode 100644 index d450055abe5..00000000000 --- a/community/pdfgrep/no-locale.patch +++ /dev/null @@ -1,31 +0,0 @@ -Don't set locale explicitly. musl supports UTF-8 by default. - -With this change pdfgrep fails with: - - terminate called after throwing an instance of 'std::runtime_error' - what(): locale::facet::_S_create_c_locale name not valid - Aborted - -Unless LANG is set explicitly. - -Alternative solutions: - - * Use the "C" lang instead of the "" lang? - * Catch the error and ignore it? - -diff -upr pdfgrep-2.1.2.orig/src/pdfgrep.cc pdfgrep-2.1.2/src/pdfgrep.cc ---- pdfgrep-2.1.2.orig/src/pdfgrep.cc 2020-09-29 12:33:50.018014326 +0200 -+++ pdfgrep-2.1.2/src/pdfgrep.cc 2020-09-29 12:36:39.827698175 +0200 -@@ -457,10 +457,12 @@ int main(int argc, char** argv) - Options options; - init_colors(options.outconf.colors); - -+#if 0 - // Set locale to user-preference. If this locale is an UTF-8 locale, the - // regex-functions regcomp/regexec become unicode aware, which means - // e.g. that '.' will match a unicode character, not a single byte. - locale::global(locale("")); -+#endif - - enum re_engine_type { - RE_POSIX = 0, diff --git a/community/pdns-recursor/APKBUILD b/community/pdns-recursor/APKBUILD index f13c31f5eea..cf105f49fcb 100644 --- a/community/pdns-recursor/APKBUILD +++ b/community/pdns-recursor/APKBUILD @@ -1,27 +1,36 @@ # Maintainer: Peter van Dijk <peter.van.dijk@powerdns.com> -_pkgname=pdns-recursor # upstream package name pkgname=pdns-recursor -pkgver=5.0.3 +pkgver=5.0.5 pkgrel=0 pkgdesc="PowerDNS Recursive Server" url="https://www.powerdns.com/" arch="all !s390x" # broken context license="GPL-2.0-only WITH OpenSSL-Exception" depends="$pkgname-common" -makedepends="autoconf automake libtool boost-dev openssl-dev>3 libsodium-dev lua5.4-dev - net-snmp-dev curl curl-dev cargo" +makedepends="autoconf + automake + boost-dev + cargo + curl + curl-dev + libtool + libsodium-dev + lua5.4-dev + net-snmp-dev + openssl-dev>3 + " install="$pkgname-common.pre-install" subpackages="$pkgname-common::noarch $pkgname-doc $pkgname-openrc" pkgusers="recursor" pkggroups="recursor" -source="https://downloads.powerdns.com/releases/$_pkgname-${pkgver//_/-}.tar.bz2 - $_pkgname.initd +source="https://downloads.powerdns.com/releases/pdns-recursor-${pkgver//_/-}.tar.bz2 + $pkgname.initd recursor.conf " -builddir="$srcdir/$_pkgname-${pkgver//_/-}" +builddir="$srcdir/$pkgname-${pkgver//_/-}" case "$CARCH" in -ppc64le|riscv64) +loongarch64|ppc64le|riscv64) _luajit=OFF ;; *) @@ -32,6 +41,8 @@ ppc64le|riscv64) esac # secfixes: +# 5.0.4-r0: +# - CVE-2024-25583 # 5.0.2-r0: # - CVE-2023-50387 # - CVE-2023-50868 @@ -92,7 +103,8 @@ _configure() { --libdir=/usr/lib/pdns \ --enable-dns-over-tls \ --enable-unit-tests \ - --with-lua=$lua + --with-lua=$lua \ + --with-libcrypto=/usr } build() { @@ -105,18 +117,24 @@ build() { make } +_cat_found_file() { + local _rc="$?" + find . -name "$1" -type f -print -exec cat {} \; + return "$_rc" +} + check() { - make check + make check || _cat_found_file 'test-suite.log' if cd "$builddir-jit"; then - make check + make check || _cat_found_file 'test-suite.log' fi } package() { make DESTDIR="$pkgdir" install - install -m755 -D "$srcdir/$_pkgname.initd" \ + install -m755 -D "$srcdir/$pkgname.initd" \ "$pkgdir/etc/init.d/$pkgname" } @@ -142,7 +160,7 @@ luajit() { } sha512sums=" -9e7ece25e05729e4e46023c5b7e524f46e9806cd6546bcdde9c01c038f6d53380184423e3f4c9239eaba94157d5fc53c3376225e75b4136d508dafdc1ad4e04b pdns-recursor-5.0.3.tar.bz2 +52bed3516a8dfbe4be5e5ddd81920955c1c4c66d1996afc9f61d361e06ec11cc5aba7afe4c49f8f69b1554b6564cb619ee5572c066d6d6f2733a0f07bc6945c0 pdns-recursor-5.0.5.tar.bz2 71f7be51d3a9a78f22f3946e95534d4f5b37b3bcbd1891ad3a17095be545fdb0eaf239d58c9f40ccc642542150c0b35ed025bf69acabfa779c0ab10c67a5e796 pdns-recursor.initd abda278d29b21e9635fb154c8685e5d346f47889498f075a8dd2e486f8ea4dcc2ccd20f4245783e4d55534fed88c49825b22fd3d1c55d8645522ce45cc53d661 recursor.conf " diff --git a/community/pdns/APKBUILD b/community/pdns/APKBUILD index 09f27276a6f..d002684697e 100644 --- a/community/pdns/APKBUILD +++ b/community/pdns/APKBUILD @@ -7,19 +7,33 @@ # Maintainer: Peter van Dijk <peter.van.dijk@powerdns.com> pkgname=pdns pkgver=4.9.0 -pkgrel=1 +pkgrel=3 pkgdesc="PowerDNS Authoritative Server" url="https://www.powerdns.com/" # s390x blocked by failing testsuite -# ppc64le, riscv64: luajit arch="all !s390x" license="GPL-2.0-only WITH OpenSSL-Exception" checkdepends="findutils" makedepends="$depends_dev - boost-dev curl curl-dev geoip-dev krb5-dev openssl-dev>3 - libsodium-dev mariadb-connector-c-dev openldap-dev - libpq-dev protobuf-dev sqlite-dev unixodbc-dev - yaml-cpp-dev zeromq-dev mariadb-dev libmaxminddb-dev lmdb-dev" + boost-dev + curl + curl-dev + geoip-dev + krb5-dev + libmaxminddb-dev + libpq-dev + libsodium-dev + lmdb-dev + mariadb-connector-c-dev + mariadb-dev + openldap-dev + openssl-dev>3 + protobuf-dev + sqlite-dev + unixodbc-dev + yaml-cpp-dev + zeromq-dev + " install="$pkgname.pre-install $pkgname-backend-pgsql.post-upgrade" subpackages="$pkgname-doc $pkgname-openrc $pkgname-tools $pkgname-backend-bind:backend_bind @@ -43,7 +57,7 @@ source="https://downloads.powerdns.com/releases/pdns-${pkgver//_/-}.tar.bz2 builddir="$srcdir/$pkgname-${pkgver//_/-}" case "$CARCH" in -ppc64le|riscv64) +loongarch64|ppc64le|riscv64) # these don't have luajit makedepends="$makedepends lua5.3-dev" ;; @@ -84,7 +98,8 @@ build() { --enable-tools \ --enable-unit-tests \ --disable-static \ - --enable-remotebackend-zeromq + --enable-remotebackend-zeromq \ + --with-libcrypto=/usr make } diff --git a/community/pdns/disable-test_generic_signers.patch b/community/pdns/disable-test_generic_signers.patch new file mode 100644 index 00000000000..89c0460ff4a --- /dev/null +++ b/community/pdns/disable-test_generic_signers.patch @@ -0,0 +1,44 @@ +test failing with: + + 235 unknown location(0): ^[[4;31;49mfatal error: in "test_signers/test_generic_signers": std::runtime_error: Asked to create (C)DS record of unknown digest type 4: Request to create key object fo +r unknown algorithm number 14^[[0;39;49m + 236 test-signers.cc(425): ^[[1;36;49mlast checkpoint^[[0;39;49m + 237 ^[[1;36;49mTest case test_packetcache_cc/test_QueryCacheClean did not check any assertions^[[0;39;49m + 238 + 239 ^[[1;31;49m*** 1 failure is detected in the test module "Master Test Suite" + 240 ^[[0;39;49mFAIL testrunner (exit status: 201) + +--- a/pdns/test-signers.cc ++++ b/pdns/test-signers.cc +@@ -453,31 +453,6 @@ static void test_generic_signer(std::sha + } + + // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables,readability-identifier-length): Boost stuff. +-BOOST_FIXTURE_TEST_CASE(test_generic_signers, Fixture) +-{ +- for (const auto& algoSignerPair : signerParams) { +- auto signer = algoSignerPair.second; +- +- DNSKEYRecordContent drc; +- auto dcke = std::shared_ptr<DNSCryptoKeyEngine>(DNSCryptoKeyEngine::makeFromISCString(drc, signer.iscMap)); +- test_generic_signer(dcke, drc, signer, message); +- +- DNSKEYRecordContent pemDRC; +- shared_ptr<DNSCryptoKeyEngine> pemKey{DNSCryptoKeyEngine::makeFromPEMString(pemDRC, signer.algorithm, signer.pem)}; +- +- BOOST_CHECK_EQUAL(pemKey->convertToISC(), dcke->convertToISC()); +- +- test_generic_signer(pemKey, pemDRC, signer, message); +- +- auto dckePEMOutput = dcke->convertToPEMString(); +- BOOST_CHECK_EQUAL(dckePEMOutput, signer.pem); +- +- auto pemKeyOutput = pemKey->convertToPEMString(); +- BOOST_CHECK_EQUAL(pemKeyOutput, signer.pem); +- } +-} +- +-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables,readability-identifier-length): Boost stuff. + BOOST_AUTO_TEST_CASE(test_hash_qname_with_salt) + { + { diff --git a/community/perl-anyevent-i3/APKBUILD b/community/perl-anyevent-i3/APKBUILD index be4c4d1ff24..8be3c40db0e 100644 --- a/community/perl-anyevent-i3/APKBUILD +++ b/community/perl-anyevent-i3/APKBUILD @@ -1,25 +1,28 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Taner Tas <taner76@gmail.com> # Maintainer: Taner Tas <taner76@gmail.com> pkgname=perl-anyevent-i3 +pkgver=0.19 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=AnyEvent-I3 -pkgver=0.17 -pkgrel=4 pkgdesc="Communicate with the i3 window manager" url="https://metacpan.org/release/AnyEvent-I3/" arch="noarch" -license="Artistic-1.0 GPL-1.0-only" +license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl perl-anyevent perl-json-xs i3wm" -makedepends="perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/M/MS/MSTPLBG/AnyEvent-I3-$pkgver.tar.gz - disable-tests-fail-with-insecure-path.patch" + disable-tests-fail-with-insecure-path.patch + " builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -30,8 +33,9 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="e8b0ccb89be27d5e952e5cb819e1f462ad5c558879a88fb5087d72517424316c0053b081ed9763d701a017c1d838fa694b49f40886335a23a68ebb091714b259 AnyEvent-I3-0.17.tar.gz -6885a5fa8c0edc75c4dcbfae80126920398f3b99529ac2ac6a74b3b6218104a9ab9e9119119bc71581a866e4dbbd1140dda51edce54c976dd7ef08e9b9c9c312 disable-tests-fail-with-insecure-path.patch" +sha512sums=" +4258a382987c01072d53087d3c004517f3c27781bd5f82dd35c059b4efe8a3f9ef34a4590ea6b4b47e86f53e0602134a8b6c7d2d616cc7b736b26e26ed26bdc5 AnyEvent-I3-0.19.tar.gz +6885a5fa8c0edc75c4dcbfae80126920398f3b99529ac2ac6a74b3b6218104a9ab9e9119119bc71581a866e4dbbd1140dda51edce54c976dd7ef08e9b9c9c312 disable-tests-fail-with-insecure-path.patch +" diff --git a/community/perl-app-cpm/APKBUILD b/community/perl-app-cpm/APKBUILD index e1c10e94e5a..39a2aa49da1 100644 --- a/community/perl-app-cpm/APKBUILD +++ b/community/perl-app-cpm/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-app-cpm +pkgver=0.997017 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=App-cpm -pkgver=0.997015 -pkgrel=0 pkgdesc="Fast CPAN module installer" url="https://metacpan.org/release/App-cpm/" arch="noarch" @@ -26,7 +26,9 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - perl Build.PL --installdirs=vendor + perl Build.PL \ + --installdirs=vendor \ + --create_packlist=0 ./Build } @@ -36,9 +38,8 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -9b734fb15d4f9ac2b493441b82738dd137cc2c15008e75dabd668b590b0c959dde362f6319536cdbdd572a6b336dcec7d46a1d8e88276011eb3c3b14b1258dd2 App-cpm-0.997015.tar.gz +819fdf2e49131ea8c76fcb69737263525dc71ddc9c26afa60dc1e2e8cb20778e3f92f3c2fd021efc4c6ea1d3e1540aa6b17266bb9dea0fcf2a98b9051063d6d8 App-cpm-0.997017.tar.gz " diff --git a/community/perl-business-isbn-data/APKBUILD b/community/perl-business-isbn-data/APKBUILD index 3b060cda214..30253b1d26e 100644 --- a/community/perl-business-isbn-data/APKBUILD +++ b/community/perl-business-isbn-data/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=perl-business-isbn-data -pkgver=20240413.001 +pkgver=20240509.001 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Business-ISBN-Data @@ -34,5 +34,5 @@ package() { } sha512sums=" -a1f52b72240b45a85687b27ed7380e4d6f34342852355f4d1a92b66844d8943924857f2d2ab4141fbe3eef4e8699c41dd15db9a485329d08af4617ed32459898 Business-ISBN-Data-20240413.001.tar.gz +64158b148729ef6201984aee178fd102abbe65df5b11f638ec2a52f0bf927db929670124e4bfc2175062b0fecfe9c9056e8a90e41408d91a27c9ef07c0b18705 Business-ISBN-Data-20240509.001.tar.gz " diff --git a/community/perl-curses/APKBUILD b/community/perl-curses/APKBUILD index 9c968e7f75a..0cbb20d9cba 100644 --- a/community/perl-curses/APKBUILD +++ b/community/perl-curses/APKBUILD @@ -1,41 +1,39 @@ -# Automatically generated by apkbuild-cpan, template 2 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=perl-curses +pkgver=1.45 +pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Curses -pkgver=1.44 -pkgrel=1 pkgdesc="terminal screen handling and optimization" url="https://metacpan.org/release/Curses/" arch="all" -license="GPL-1.0-only" +license="GPL-1.0-or-later OR Artistic-1.0-Perl" +depends="perl" makedepends="perl-dev ncurses-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/G/GI/GIRAFFED/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/G/GI/GIRAFFED/Curses-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - default_prepare - - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor -} - build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } -package() { - make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete -} - check() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') make test } +package() { + make DESTDIR="$pkgdir" install +} + sha512sums=" -2c7f9ad9971c1afe6c1bee59581466f848ab1128e546effccd2118cb7bce1962ec7f6a8da60be3cdd1405f6b0a44f7c29c5f7900cbc436940592b1075fbfb6f7 Curses-1.44.tar.gz +91b55022505948609a3dff4bb7a5b0c27089b31201093e74d5c899a1ecb82cc8d59cca17cf5bb1c132c268a7151bda5d35572e85635bec0d2228ce56ff957be6 Curses-1.45.tar.gz " diff --git a/community/perl-devel-cover/APKBUILD b/community/perl-devel-cover/APKBUILD index 6473b3da605..db83cff7821 100644 --- a/community/perl-devel-cover/APKBUILD +++ b/community/perl-devel-cover/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Timothy Legge <timlegge@gmail.com> # Maintainer: Timothy Legge <timlegge@gmail.com> pkgname=perl-devel-cover +pkgver=1.42 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Devel-Cover -pkgver=1.40 -pkgrel=1 pkgdesc="Code coverage metrics for Perl" url="https://metacpan.org/release/Devel-Cover/" arch="all" @@ -19,7 +19,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -30,9 +33,15 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +doc() { + local file; find "$pkgdir" -name "*.pod" | while read -r file; do + amove "${file#"$pkgdir"}" + done + default_doc } sha512sums=" -47aa19947372b9c4978fc995ffe9d2a8b0cb87b14885002085302f36784e6c9f193d80dfb1d020ef3b938620fbaf5ed0d8963a624fedd8fb5eafd19ed4038076 Devel-Cover-1.40.tar.gz +dd2f3c998fcf9b82bda18af66b413a3459261ba3a254ac202266742d262566aa1b101c55bf61a5e438857a1912c382599f1f8666d1940ec371379762310b39b6 Devel-Cover-1.42.tar.gz " diff --git a/community/perl-email-mime/APKBUILD b/community/perl-email-mime/APKBUILD index 10b25c463b1..e45c8937082 100644 --- a/community/perl-email-mime/APKBUILD +++ b/community/perl-email-mime/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=perl-email-mime +pkgver=1.954 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Email-MIME -pkgver=1.953 -pkgrel=1 pkgdesc="easy MIME message handling" url="https://metacpan.org/release/Email-MIME/" arch="noarch" @@ -14,14 +14,20 @@ depends=" perl perl-email-mime-contenttype perl-email-mime-encodings perl-email-simple perl-email-messageid perl-mime-types perl-email-address-xs perl-module-runtime " -makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-MIME-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" +# secfixes: +# 1.954-r0: +# - CVE-2024-4140 + build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -32,9 +38,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -d88704c7f0173198f94180da81beacaad6ea675e3fcd525f92df7c06a85df8664295c63f71ad6aa14ec517f101f23449e6c3818bbd951c1257b8d0080530c5f7 Email-MIME-1.953.tar.gz +2f144796ba716cec199e17b19f1d93ec9571f922c7d3b9c6939b81e0e91e315de8558d2a28c9a879b41ee9cd959452cfec74b1d7843110a5f23bc27cba482f22 Email-MIME-1.954.tar.gz " diff --git a/community/perl-file-mimeinfo/APKBUILD b/community/perl-file-mimeinfo/APKBUILD index e2dc6b5d9a6..0fed2374af2 100644 --- a/community/perl-file-mimeinfo/APKBUILD +++ b/community/perl-file-mimeinfo/APKBUILD @@ -1,10 +1,10 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-file-mimeinfo +pkgver=0.35 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=File-MimeInfo -pkgver=0.34 -pkgrel=0 pkgdesc="Determine file types" url="https://metacpan.org/release/File-MimeInfo/" arch="noarch" @@ -22,7 +22,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -33,9 +36,15 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +doc() { + local file; find "$pkgdir" -name "*.pod" | while read -r file; do + amove "${file#"$pkgdir"}" + done + default_doc } sha512sums=" -5ce15976aa5ed59563ae64339aeefed426e97aa22448005e0dd50b8fee32237faafc59308cdad9d7eea6c3e3b58c41032d1f4fa670bc17d4ad58ca07743d015f File-MimeInfo-0.34.tar.gz +ed2ae7d978d6813a002f6d1cd01ac44e1aab33102c4864ef448b49f5719fc4c9894f6f7fb82d034a50843e08419336c5320fa75c6081e9e842cb5266a05c3576 File-MimeInfo-0.35.tar.gz " diff --git a/community/perl-json-xs/APKBUILD b/community/perl-json-xs/APKBUILD index 0ef7766de34..335349ab230 100644 --- a/community/perl-json-xs/APKBUILD +++ b/community/perl-json-xs/APKBUILD @@ -1,16 +1,16 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-json-xs +pkgver=4.03 +pkgrel=4 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=JSON-XS -pkgver=4.03 -pkgrel=3 -pkgdesc="Perl module for JSON-XS" +pkgdesc="Fast JSON serialising/deserialising" url="https://metacpan.org/release/JSON-XS/" arch="all" license="GPL-1.0-or-later OR Artistic-1.0-Perl" -depends="perl perl-types-serialiser perl-common-sense" +depends="perl perl-common-sense perl-types-serialiser" makedepends="perl-dev perl-canary-stability" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz" @@ -18,7 +18,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -29,7 +32,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="7d2c20302b0f98bd69e692b61d272b58c13a79741f3e2e44ee0530e21dd239526477f8b02e4afbfe41ee83cb69ab1c5247bf0be355f3f09e9cfe31b2ea4a5155 JSON-XS-4.03.tar.gz" +sha512sums=" +7d2c20302b0f98bd69e692b61d272b58c13a79741f3e2e44ee0530e21dd239526477f8b02e4afbfe41ee83cb69ab1c5247bf0be355f3f09e9cfe31b2ea4a5155 JSON-XS-4.03.tar.gz +" diff --git a/community/perl-mail-sendmail/APKBUILD b/community/perl-mail-sendmail/APKBUILD index 1e003905845..d2b0c73fa09 100644 --- a/community/perl-mail-sendmail/APKBUILD +++ b/community/perl-mail-sendmail/APKBUILD @@ -1,35 +1,36 @@ -# Automatically generated by apkbuild-cpan, template 1 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-mail-sendmail -_pkgreal=Mail-Sendmail pkgver=0.80 -pkgrel=5 +pkgrel=6 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Mail-Sendmail pkgdesc="Simple platform independent mailer" url="https://metacpan.org/release/Mail-Sendmail/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl" -checkdepends="python3" +checkdepends="python3 python3-tests" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/$_pkgreal-$pkgver.tar.gz +source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Mail-Sendmail-$pkgver.tar.gz test-localhost.patch - fake-smtp.py" + fake-smtp.py + " builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - default_prepare - - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } check() { + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') + # run dummy smtp server python3 "$srcdir"/fake-smtp.py & local pid=$! @@ -43,9 +44,10 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="848ec471938d679645dfb4e032a33d35e49655a336dc6ff3a24ffa35606bff77e73162af672d1a60ad3a7bf571113e802fc42d6cb9a072cdca0d89f707f54a08 Mail-Sendmail-0.80.tar.gz +sha512sums=" +848ec471938d679645dfb4e032a33d35e49655a336dc6ff3a24ffa35606bff77e73162af672d1a60ad3a7bf571113e802fc42d6cb9a072cdca0d89f707f54a08 Mail-Sendmail-0.80.tar.gz 2592c4aafd9f58d9e4f8c0f78e8d87e7e6160b4a53aa73b929ad12d26d677f8a7baec540a57a8edabbba6f05bd33c9e2dc5ee707cfaaccd14837a6ddc681d742 test-localhost.patch -dbff85dc3924274c2f640e0f6ea4d782c0221e841763fb122c9942ef8e2c5d7a0c73aa2cfd1f7b59708fe27a392a000dcfbc2a04ad7e7e8885d21a27df339410 fake-smtp.py" +22dbe3e35c9112fd61024b1636c30c3a2a9803f63ba0017a43ec13cfdaa3e80c99ee6b3b154fac64d8e2e170655e4235e369c3189c8938362cbb6ed1687fe033 fake-smtp.py +" diff --git a/community/perl-mail-sendmail/fake-smtp.py b/community/perl-mail-sendmail/fake-smtp.py index 25929d9b8a6..2f9b9176755 100644 --- a/community/perl-mail-sendmail/fake-smtp.py +++ b/community/perl-mail-sendmail/fake-smtp.py @@ -1,5 +1,5 @@ -import smtpd -import asyncore +from test.support import smtpd +from test.support import asyncore class FakeSMTPServer(smtpd.SMTPServer): """A Fake smtp server""" diff --git a/testing/perl-memory-process/APKBUILD b/community/perl-memory-process/APKBUILD index 9aebe0fb730..6c1b7ae4606 100644 --- a/testing/perl-memory-process/APKBUILD +++ b/community/perl-memory-process/APKBUILD @@ -1,10 +1,10 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-memory-process -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Memory-Process pkgver=0.06 pkgrel=3 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Memory-Process pkgdesc="Determine actual memory usage of a Perl program" url="https://metacpan.org/release/Memory-Process/" arch="noarch" @@ -17,7 +17,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -28,7 +31,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/testing/perl-memory-usage/APKBUILD b/community/perl-memory-usage/APKBUILD index 7e4ce80c18f..ae88b737281 100644 --- a/testing/perl-memory-usage/APKBUILD +++ b/community/perl-memory-usage/APKBUILD @@ -1,10 +1,10 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-memory-usage -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Memory-Usage pkgver=0.201 pkgrel=3 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Memory-Usage pkgdesc="Tools to determine actual memory usage" url="https://metacpan.org/release/Memory-Usage/" arch="noarch" @@ -16,7 +16,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -27,7 +30,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/community/perl-mojolicious/APKBUILD b/community/perl-mojolicious/APKBUILD index a8c6e1d8500..d6cea6d23a8 100644 --- a/community/perl-mojolicious/APKBUILD +++ b/community/perl-mojolicious/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=perl-mojolicious -pkgver=9.36 +pkgver=9.37 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Mojolicious @@ -41,5 +41,5 @@ doc() { } sha512sums=" -88a157f0a9b0bc6f4add49adf2d1f0ef4b612b1feac2b46304e35b528fba9fce7534d641d9262019855be922ce50453cb3a8f3ad6ec2c7db23ded121fefeed06 Mojolicious-9.36.tar.gz +1cedde9f4e695b710abda9e92df4aadd67594b37e0080e1f44ddf786278b947fbe1e37ae3bdf3ebcf10cf41264e933de115f62209c51dbf5b84d5d75af7f0cd7 Mojolicious-9.37.tar.gz " diff --git a/community/perl-net-dns-sec/APKBUILD b/community/perl-net-dns-sec/APKBUILD index 07e1c2cf1a3..2c4ed7e46e9 100644 --- a/community/perl-net-dns-sec/APKBUILD +++ b/community/perl-net-dns-sec/APKBUILD @@ -1,10 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 1 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=perl-net-dns-sec -_pkgreal=Net-DNS-SEC -pkgver=1.23 +pkgver=1.24 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Net-DNS-SEC pkgdesc="DNSSEC extensions to Net::DNS" url="https://metacpan.org/pod/Net::DNS::SEC" arch="all" @@ -15,27 +16,24 @@ subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-SEC-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - default_prepare - - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } check() { + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') make test } package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -b024d41cedcc8e6712f01334e5a6928d905f4ae841b619a35ba829af8b4bcb8d6e2d12d5478b65dfe617f4a913620e66e9ec1051b8f2c6cbcef924062c384982 Net-DNS-SEC-1.23.tar.gz +8814f8093cffd975910905a8152b764e049f60f7c531bcec1875cd3a1efc4186bf2633c268ace57dea9f6a9e019b2750f5f7a22b53595925196896a9556dadad Net-DNS-SEC-1.24.tar.gz " diff --git a/community/perl-parse-pmfile/APKBUILD b/community/perl-parse-pmfile/APKBUILD index d845e3fa2ab..9f337c5e302 100644 --- a/community/perl-parse-pmfile/APKBUILD +++ b/community/perl-parse-pmfile/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-parse-pmfile -pkgver=0.46 +pkgver=0.47 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Parse-PMFile @@ -35,5 +35,5 @@ package() { } sha512sums=" -9a4171f01a8600085f06f38e92126a51b8c3c09d160675bac746125458fdfcde1ca6130a7669ff3e575fcd400e73d470e76efb66d8b4cfb5dbb71c363c4da8f9 Parse-PMFile-0.46.tar.gz +a273c1e52d1f4e6249af2af9a1d96b5d97424a934efcf1d9da5ccaea86a519714b148f172b764503911a380603522745ccc1c59f9d37122b053d692a68e3cf43 Parse-PMFile-0.47.tar.gz " diff --git a/community/perl-sys-cpu/APKBUILD b/community/perl-sys-cpu/APKBUILD index aaa92a5df70..7dde5b3c620 100644 --- a/community/perl-sys-cpu/APKBUILD +++ b/community/perl-sys-cpu/APKBUILD @@ -12,15 +12,14 @@ makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/M/MZ/MZSANFORD/Sys-CPU-$pkgver.tar.gz unistd.patch + Sys-CPU.t " builddir="$srcdir/Sys-CPU-$pkgver" -case "$CARCH" in -aarch64) - # fails when cpu type can't be detected - options="$options !check" - ;; -esac +prepare() { + default_prepare + cp -v "$srcdir"/Sys-CPU.t t/ +} build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') @@ -41,4 +40,5 @@ package() { sha512sums=" 391e113c87d9044cd43c47f9f78a782fab65566a32c028c01f7f3335a5065b6755586ea3143356510c8d28a7d1ad572cc6203ec189eaaa379967bdbd0a0bd7bc Sys-CPU-0.61.tar.gz 9ae2b76b389e65fdd4331bb97be3e2d7409fa217d53114c8ee00c258d6dde194b1d13981fce0cd0b6d6b7e6fefce9b9527128b75eac043de200e0671e4b6f34a unistd.patch +6572ee86b9d11a520466cd178c973d16e99eff3c8c750d54ccf09454a61cb53e617c7d5520ba55094437ef350cf63c695f7875f4971df951c87c8e0f6cba9f99 Sys-CPU.t " diff --git a/community/perl-sys-cpu/Sys-CPU.t b/community/perl-sys-cpu/Sys-CPU.t new file mode 100644 index 00000000000..049b0673d10 --- /dev/null +++ b/community/perl-sys-cpu/Sys-CPU.t @@ -0,0 +1,22 @@ +#!/usr/bin/perl + +# Taken from https://sources.debian.org/patches/libsys-cpu-perl/0.61-3/Test-More.patch/ + +use Test::More tests => 4; + +BEGIN { use_ok('Sys::CPU'); } + +$number = &Sys::CPU::cpu_count(); +ok( defined($number), "CPU Count: $number" ); + +TODO: { + local $TODO = "/proc/cpuinfo doesn't always report 'cpu MHz' or 'clock' or 'bogomips' ..."; + $speed = &Sys::CPU::cpu_clock(); + ok( defined($speed), "CPU Speed: $speed" ); +} + +TODO: { + local $TODO = "/proc/cpuinfo doesn't always report 'model name' or 'machine' ..."; + $type = &Sys::CPU::cpu_type(); + ok( defined($type), "CPU Type: $type" ); +} diff --git a/community/perl-sys-syslog/APKBUILD b/community/perl-sys-syslog/APKBUILD index d446ac2df5b..442d8f4882c 100644 --- a/community/perl-sys-syslog/APKBUILD +++ b/community/perl-sys-syslog/APKBUILD @@ -17,6 +17,8 @@ source="https://cpan.metacpan.org/authors/id/S/SA/SAPER/Sys-Syslog-$pkgver.tar.g builddir="$srcdir/$_pkgreal-$pkgver" prepare() { + default_prepare + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } @@ -38,4 +40,6 @@ doc() { replaces="perl-doc" } -sha512sums="6480dce76863e57cb90d981c20ecd7b9946cf076c3eed73aeabf7f4236a4b6d3ebeab52b1d04f0f7cfaee01602829a013d4660d5f2cdfa501f43c2c59160777a Sys-Syslog-0.36.tar.gz" +sha512sums=" +6480dce76863e57cb90d981c20ecd7b9946cf076c3eed73aeabf7f4236a4b6d3ebeab52b1d04f0f7cfaee01602829a013d4660d5f2cdfa501f43c2c59160777a Sys-Syslog-0.36.tar.gz +" diff --git a/community/perl-text-csv_xs/APKBUILD b/community/perl-text-csv_xs/APKBUILD index 7adb3a42b30..46d3ca9df0c 100644 --- a/community/perl-text-csv_xs/APKBUILD +++ b/community/perl-text-csv_xs/APKBUILD @@ -1,42 +1,39 @@ -# Automatically generated by apkbuild-cpan, template 1 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=perl-text-csv_xs -_pkgreal=Text-CSV_XS -pkgver=1.53 +pkgver=1.54 pkgrel=0 -pkgdesc="Perl module for Text-CSV_XS" -url="https://metacpan.org/release/Text-CSV_XS" +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Text-CSV_XS +pkgdesc="Comma-Separated Values manipulation routines" +url="https://metacpan.org/release/Text-CSV_XS/" arch="all" license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl" makedepends="perl-dev" -checkdepends="perl-test-pod perl-test-pod-coverage" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-$pkgver.tgz" builddir="$srcdir/$_pkgreal-$pkgver" -check() { - make test -} - -prepare() { - default_prepare - +build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 + make } -build() { +check() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - make + make test } package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -49c4d52b10d7414def2269881bcdfcdc01b3f64bebb53f5f104e1c87ee23c32baae84c9e209e3e6955201b9c89409f0a9083934c870302e407892971def0e8f4 Text-CSV_XS-1.53.tgz +a4170ba518aeffe3eeb21092f8514b8a658c051d66a7112b11220bd9e4341acd5197335661c56dd7a72b76391346c7c393457a51c8f5eeb2872b55f429684bfc Text-CSV_XS-1.54.tgz " diff --git a/community/perl-tidy/APKBUILD b/community/perl-tidy/APKBUILD index e11bc3a60e3..480ee7dea18 100644 --- a/community/perl-tidy/APKBUILD +++ b/community/perl-tidy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=perl-tidy -pkgver=20240202 +pkgver=20240511 pkgrel=0 pkgdesc="Parses and beautifies perl source" url="https://metacpan.org/dist/Perl-Tidy" @@ -14,7 +14,10 @@ builddir="$srcdir/Perl-Tidy-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -25,9 +28,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -33d912152285f2ccb304bf7df4f2e055c5f8b3049b9556c7efe5bd2d80123316f9014e8e5f17c9698545394f466f381e306f431450a04e74d767150db43028f5 Perl-Tidy-20240202.tar.gz +39bc383d645092d121a623b90d8b6a7981e2f2ef44dbb41a34ec77e4285fa80f1223d4290363b2ab429b101bb080d738b26d0577068600d78a696948a03bc513 Perl-Tidy-20240511.tar.gz " diff --git a/community/perl-urn-oasis-saml2/APKBUILD b/community/perl-urn-oasis-saml2/APKBUILD index 3b82d7f3b5d..9f94c430048 100644 --- a/community/perl-urn-oasis-saml2/APKBUILD +++ b/community/perl-urn-oasis-saml2/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Timothy Legge <timlegge@gmail.com> # Maintainer: Timothy Legge <timlegge@gmail.com> pkgname=perl-urn-oasis-saml2 +pkgver=0.005 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=URN-OASIS-SAML2 -pkgver=0.003 -pkgrel=1 pkgdesc="Constants for urn:oasis SAML2 implementations" url="https://metacpan.org/release/URN-OASIS-SAML2/" arch="noarch" @@ -18,7 +18,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -29,9 +32,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -de331857e77c66c7705563e8dd98e372193ca18306738ced34e216fbfd9c74878728bfd1c2942a4e5cfc2a58b7b8df2586951293d77116ad8e7a1f46e1897364 URN-OASIS-SAML2-0.003.tar.gz +fad74c91097d2dcde81ffa346cf7f77e4d48818f063b4412c1c55c9c60407354b4c9fcba1229ae2b15bd1339b92d5aec353f5b8957b2fb16227943d3bc502b39 URN-OASIS-SAML2-0.005.tar.gz " diff --git a/community/perl-webservice-musicbrainz/APKBUILD b/community/perl-webservice-musicbrainz/APKBUILD index f993d8562b6..42b728ddb56 100644 --- a/community/perl-webservice-musicbrainz/APKBUILD +++ b/community/perl-webservice-musicbrainz/APKBUILD @@ -13,7 +13,9 @@ license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl perl-io-socket-ssl" makedepends="perl-dev perl-mojolicious perl-module-build" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/B/BF/BFAIST/WebService-MusicBrainz-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/B/BF/BFAIST/WebService-MusicBrainz-$pkgver.tar.gz + artist-test.patch + " builddir="$srcdir/$_pkgreal-$pkgver" build() { @@ -33,4 +35,5 @@ package() { sha512sums=" b9cb8a4873c0a32575afbeaa57068a2b533dd3213d747b3577a378da2844b325e9b50477ccb3c5461b34a319078a59cf802be93f1cc094cb6f12c13c92c9611a WebService-MusicBrainz-1.0.6.tar.gz +1e53ab62260762973a6234bcc6de8d152829dd6cb6325e03bef8054bd238fdc00358aee8bd0a0862a7523bf095458552091e343efc5eecb877f6883df4663a1c artist-test.patch " diff --git a/community/perl-webservice-musicbrainz/artist-test.patch b/community/perl-webservice-musicbrainz/artist-test.patch new file mode 100644 index 00000000000..f82afc006a4 --- /dev/null +++ b/community/perl-webservice-musicbrainz/artist-test.patch @@ -0,0 +1,24 @@ +Patch-Source: https://github.com/bfaist/webservice-musicbrainz/pull/15.patch +-- +From d858eff52da7e6409eef088eb41207f87ec0c313 Mon Sep 17 00:00:00 2001 +From: gregor herrmann <gregoa@debian.org> +Date: Tue, 27 Feb 2024 18:08:56 +0100 +Subject: [PATCH] Fix t/Artist.t: Van Halen is not unique any more. + +--- + t/Artist.t | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/Artist.t b/t/Artist.t +index c33b393..73d92a0 100644 +--- a/t/Artist.t ++++ b/t/Artist.t +@@ -55,7 +55,7 @@ sleep(1); + + my $s6_res = $ws->search(artist => { artist => 'Van Halen', type => 'group' }); + exit_if_mb_busy($s6_res); +-ok($s6_res->{count} == 1); ++ok($s6_res->{count} >= 1); + ok($s6_res->{artists}->[0]->{type} eq 'Group'); + ok($s6_res->{artists}->[0]->{id} eq 'b665b768-0d83-4363-950c-31ed39317c15'); + sleep(1); diff --git a/community/perl-xml-libxslt/APKBUILD b/community/perl-xml-libxslt/APKBUILD index 941c89d17ce..32f884d085d 100644 --- a/community/perl-xml-libxslt/APKBUILD +++ b/community/perl-xml-libxslt/APKBUILD @@ -1,24 +1,33 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-xml-libxslt +pkgver=2.002001 +pkgrel=3 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=XML-LibXSLT -pkgver=2.002001 -pkgrel=2 pkgdesc="Interface to GNOME libxslt library" url="https://metacpan.org/release/XML-LibXSLT/" arch="all" license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl perl-xml-libxml" -makedepends="perl-dev libxml2-dev libxslt-dev libgcrypt-dev libgpg-error-dev" +makedepends=" + perl-dev + libgcrypt-dev + libgpg-error-dev + libxml2-dev + libxslt-dev + " subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -29,7 +38,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/community/peruse/APKBUILD b/community/peruse/APKBUILD index 844de5fdcd5..d542540da57 100644 --- a/community/peruse/APKBUILD +++ b/community/peruse/APKBUILD @@ -9,8 +9,8 @@ pkgrel=3 pkgdesc="A comic book viewer based on Frameworks 5, for use on multiple form factors" # armhf blocked by extra-cmake-modules # s390x blocked by kdeclarative -# ppc64le and riscv64 blocked by okular -arch="all !armhf !s390x !riscv64 !ppc64le" +# ppc64le, riscv64 and loongarch64 blocked by okular +arch="all !armhf !s390x !riscv64 !ppc64le !loongarch64" url="https://invent.kde.org/graphics/peruse" license="LGPL-2.1-or-later AND LicenseRef-KDE-Accepted-LGPL" depends=" diff --git a/community/pg_activity/APKBUILD b/community/pg_activity/APKBUILD index 74853099511..43c4cae2cac 100644 --- a/community/pg_activity/APKBUILD +++ b/community/pg_activity/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=pg_activity -pkgver=3.5.0 -pkgrel=1 +pkgver=3.5.1 +pkgrel=0 pkgdesc="Top like application for PostgreSQL server activity monitoring" url="https://github.com/dalibo/pg_activity" arch="noarch" @@ -49,5 +49,5 @@ package() { } sha512sums=" -f635edc9a3595651d9990a3493c2fb5e5f17b3981a2075fbd1c67d0536cee94d374005cc8c1ad5cb75b5e7add3f4168b67f6c37b21491f71364583f7885afcbf pg_activity-3.5.0.tar.gz +f44f1ca08a250e35c056441f11c19e3618fba82a36f367df211ceb5787983ff76d2637a155de80c998680f9c0f79d66fcb38873d1b04368e73b5a06e650789c5 pg_activity-3.5.1.tar.gz " diff --git a/community/pg_probackup/APKBUILD b/community/pg_probackup/APKBUILD index 10cc3c03c97..f071ba8c293 100644 --- a/community/pg_probackup/APKBUILD +++ b/community/pg_probackup/APKBUILD @@ -6,7 +6,7 @@ _pgsqlverm="${_pgsqlver%%.[0-9]*}" pkgrel=0 pkgdesc="Backup and recovery manager for PostgreSQL" url="https://github.com/postgrespro/pg_probackup" -arch="all" +arch="all !riscv64 !loongarch64" # blocked by postgresql15 license="PostgreSQL" makedepends="postgresql$_pgsqlverm postgresql$_pgsqlverm-dev zlib-dev readline-dev libxml2-utils libxslt" source="pg_probackup-$pkgver.tar.gz::https://github.com/postgrespro/pg_probackup/archive/refs/tags/$pkgver.tar.gz diff --git a/community/pgcli/APKBUILD b/community/pgcli/APKBUILD index a21af256a30..12935be63f0 100644 --- a/community/pgcli/APKBUILD +++ b/community/pgcli/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Thomas Boerger <thomas@webhippie.de> # Maintainer: omni <omni+alpine@hack.org> pkgname=pgcli -pkgver=4.0.1 -pkgrel=1 +pkgver=4.1.0 +pkgrel=0 pkgdesc="Postgres CLI with autocompletion and syntax highlighting" url="https://www.pgcli.com" arch="noarch" @@ -27,7 +27,7 @@ depends="python3 checkdepends="pytest py3-mock" makedepends="python3-dev" subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/p/pgcli/pgcli-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/p/pgcli/pgcli-$pkgver.tar.gz" build() { gpep517 build-wheel \ @@ -48,5 +48,5 @@ package() { } sha512sums=" -27281f97a5666e81cb70249d40350f3809819ab5305dd792747db16827e8444268427f8fa07ab50cafde8530587f34125ef875516e0b39d0b80d5b8e0f2a8380 pgcli-4.0.1.tar.gz +aa2cf018a9fd17ca1178984a84170a0a3eefff84901779be6ea5ce2b124a99ee7bfd0e70987b4b1476c5a7c67008e8fe55b3053a85065291407825ef3e273bf7 pgcli-4.1.0.tar.gz " diff --git a/community/pgexporter/APKBUILD b/community/pgexporter/APKBUILD index c34734f1dbe..cc95ef97584 100644 --- a/community/pgexporter/APKBUILD +++ b/community/pgexporter/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=pgexporter pkgver=0.5.0 -pkgrel=0 +pkgrel=1 pkgdesc="Prometheus exporter for PostgreSQL" url="https://pgexporter.github.io" arch="all" @@ -26,6 +26,7 @@ subpackages=" $pkgname-zsh-completion " source="https://github.com/pgexporter/pgexporter/releases/download/$pkgver/pgexporter-$pkgver.tar.gz + fix-stdout-buffering.patch default-config.patch $pkgname.initd $pkgname.confd @@ -77,6 +78,7 @@ package() { sha512sums=" 234cdb8f724321a8bbfefcc2e9f665d43295a23bfaec97e0158aabfa112f77d2611b69bdbff3d3a1e6102d84df2fef61741b8c8836d30797d4c38b5bd05216dd pgexporter-0.5.0.tar.gz +d5f0179e50a0eb8aa778ec5a487d9fd6db7c5782385e82b48cc644fd175c28c07942c03e185c6ab526b02c3a5a5778d12a32ea138055b4bae799e0f4ec164a79 fix-stdout-buffering.patch fe9a787be2c20d691a9faec5e993ff374a1d2b9081669e54782ad02b702df3325cf1cfeb57a041fbeb5f7e260d506495f8d30be2f276f3976fc64fb599cbbe64 default-config.patch acf0cde661cc11c1b5903d2ceb8bd88f155495c1d053ea28c14a026f2aba29e6fce90371bf829216375bc34a027b61ca4049724d292e1207901589254ef9786d pgexporter.initd 5195f0a77d3e194cfb2c52aeea70ee327efc16ac55ae613b0b44e90241d2327dfc4056ee209972608063ae3634595af21b41bb1e5b901b1d48f26467e05ecc2d pgexporter.confd diff --git a/community/pgexporter/fix-stdout-buffering.patch b/community/pgexporter/fix-stdout-buffering.patch new file mode 100644 index 00000000000..aa7c6493728 --- /dev/null +++ b/community/pgexporter/fix-stdout-buffering.patch @@ -0,0 +1,42 @@ +Patch-Source: https://github.com/pgexporter/pgexporter/pull/134 +-- +From 5a3fccaf71f1d9a31b0958d08a9ccc6b5b50ff6d Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Fri, 26 Apr 2024 00:09:16 +0200 +Subject: [PATCH] Fix prompts not being printed by disabling stdout buffering + +When built against musl libc, prompts like "Master key:", "Username:" etc. +are not printed to console because of stdout buffering. +--- + src/admin.c | 3 +++ + src/cli.c | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/src/admin.c b/src/admin.c +index 1a192a8..c5b8cd9 100644 +--- a/src/admin.c ++++ b/src/admin.c +@@ -118,6 +118,9 @@ main(int argc, char** argv) + int option_index = 0; + int32_t action = ACTION_UNKNOWN; + ++ // Disable stdout buffering (i.e. write to stdout immediatelly). ++ setbuf(stdout, NULL); ++ + while (1) + { + static struct option long_options[] = +diff --git a/src/cli.c b/src/cli.c +index 353e1ce..0b52f17 100644 +--- a/src/cli.c ++++ b/src/cli.c +@@ -134,6 +134,9 @@ main(int argc, char** argv) + char un[MAX_USERNAME_LENGTH]; + configuration_t* config = NULL; + ++ // Disable stdout buffering (i.e. write to stdout immediatelly). ++ setbuf(stdout, NULL); ++ + while (1) + { + static struct option long_options[] = diff --git a/community/pgimportdoc/APKBUILD b/community/pgimportdoc/APKBUILD index 999b262cac5..2d7974bd7bd 100644 --- a/community/pgimportdoc/APKBUILD +++ b/community/pgimportdoc/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=pgimportdoc -pkgver=0.1.3 -pkgrel=5 +pkgver=0.1.4 +pkgrel=0 pkgdesc="CLI tool for import XML, TEXT and BYTEA documents to PostgreSQL" url="https://github.com/okbob/pgimportdoc" arch="all" license="BSD-2-Clause" makedepends="readline-dev libxml2-dev postgresql-dev zlib-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/okbob/$pkgname/archive/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/okbob/pgimportdoc/archive/$pkgver.tar.gz" build() { make USE_PGXS=1 all @@ -22,4 +22,6 @@ package() { make USE_PGXS=1 DESTDIR="$pkgdir" install } -sha512sums="86da2296de6a6be7663dc40b8bd56c74b334830d97fb78e23e7dc9caf7c88303cd24958587db8afab29aafc7dcd7d131e64237fb675afb7e06ab7d8c66da0d40 pgimportdoc-0.1.3.tar.gz" +sha512sums=" +99f4af48304476a4d666e85024095c4c25bb131793fe16ca5f57bd5f99baeacd3802a549d4619c7b1e500550e50ef38a22e7b7e4176d59d64f5f80aeb4b6254d pgimportdoc-0.1.4.tar.gz +" diff --git a/community/phoc/APKBUILD b/community/phoc/APKBUILD index 8b4bab73d5b..a61839ecfae 100644 --- a/community/phoc/APKBUILD +++ b/community/phoc/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Danct12 <danct12@disroot.org> # Contributor: Clayton Craft <clayton@craftyguy.net> # Contributor: Rasmus Thomsen <oss@cogitri.dev> -# Maintainer: Newbyte <newbie13xd@gmail.com> +# Maintainer: team/phosh <newbie13xd@gmail.com> pkgname=phoc pkgver=0.38.0 -pkgrel=0 +pkgrel=1 pkgdesc="wlroots based Phone compositor for the Phosh shell" arch="all !s390x" # blocked by gnome-desktop url="https://gitlab.gnome.org/World/Phosh/phoc" diff --git a/community/phosh-antispam/0001-fix-tests.patch b/community/phosh-antispam/0001-fix-tests.patch deleted file mode 100644 index ec983a92b7f..00000000000 --- a/community/phosh-antispam/0001-fix-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a7399955ecc6e3d2f2a6d9c1534c6f839c0a0477 Mon Sep 17 00:00:00 2001 -From: Chris Talbot <chris@talbothome.com> -Date: Thu, 22 Feb 2024 20:28:16 -0700 -Subject: [PATCH] test-util: remove config.h - -config.h has G_DISABLE_ASSERT which throws an error with g_test_init (). -It's best to remove it. ---- - unit/test-util.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/unit/test-util.c b/unit/test-util.c -index 6b00126..5748668 100644 ---- a/unit/test-util.c -+++ b/unit/test-util.c -@@ -19,10 +19,6 @@ - * - */ - --#ifdef HAVE_CONFIG_H --#include <config.h> --#endif -- - #include <stdio.h> - #include <fcntl.h> - #include <unistd.h> --- -GitLab diff --git a/community/phosh-antispam/APKBUILD b/community/phosh-antispam/APKBUILD index 6f79047ef8a..0ef25f63a5f 100644 --- a/community/phosh-antispam/APKBUILD +++ b/community/phosh-antispam/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=phosh-antispam -pkgver=3.4 +pkgver=3.5 pkgrel=0 pkgdesc="monitors Gnome Calls and manages phone calls from unidentified/unknown callers" url="https://gitlab.com/kop316/phosh-antispam" @@ -15,9 +15,7 @@ makedepends=" libadwaita-dev meson " -source="https://gitlab.com/kop316/phosh-antispam/-/archive/$pkgver/phosh-antispam-$pkgver.tar.gz - 0001-fix-tests.patch -" +source="https://gitlab.com/kop316/phosh-antispam/-/archive/$pkgver/phosh-antispam-$pkgver.tar.gz" build() { abuild-meson . output @@ -33,6 +31,5 @@ package() { } sha512sums=" -e301e3c3ac08926dc3340c1af86be21f26a1761ac31971c8dab5ce7610c6f879c32bdb753634b58b4dba9ed3e479a191701a3d9cc4ea2c66c1530b24c358d41e phosh-antispam-3.4.tar.gz -3e292ce91896b847b25fd133292151e46e7fdf69ead1ab6e19a868ef71da2a2993b6f9e2249a38c53fb7f344c1e1e1ef3021fb304bc63015abb8679bc373d8ec 0001-fix-tests.patch +56dec6b719dcee27ef8a77dab63b377a64e436e18499607c7d51d703074041271e32bc5805e10b997e50521899220de1f2475e4104e500fd582d426e2b3a21de phosh-antispam-3.5.tar.gz " diff --git a/community/phosh-mobile-settings/APKBUILD b/community/phosh-mobile-settings/APKBUILD index f81322b1858..9195705413b 100644 --- a/community/phosh-mobile-settings/APKBUILD +++ b/community/phosh-mobile-settings/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Newbyte <newbie13xd@gmail.com> -# Maintainer: Newbyte <newbie13xd@gmail.com> +# Maintainer: team/phosh <newbie13xd@gmail.com> pkgname=phosh-mobile-settings pkgver=0.38.0 -pkgrel=1 +pkgrel=2 pkgdesc="Settings app for mobile specific things" url="https://gitlab.gnome.org/guidog/phosh-mobile-settings" # blocked by phosh diff --git a/community/phosh-osk-stub/APKBUILD b/community/phosh-osk-stub/APKBUILD index 1fc55cfb13c..3e60e2bb7f4 100644 --- a/community/phosh-osk-stub/APKBUILD +++ b/community/phosh-osk-stub/APKBUILD @@ -1,8 +1,8 @@ # Contributor: jane400 <alpine@j4ne.de> -# Maintainer: Newbyte <newbyte@postmarketos.org> +# Maintainer: team/phosh <newbyte@postmarketos.org> pkgname=phosh-osk-stub pkgver=0.38.0 -pkgrel=0 +pkgrel=1 pkgdesc="OSK experiment and helper to debug input related issues with phosh" arch="all" url="https://gitlab.gnome.org/guidog/phosh-osk-stub" diff --git a/community/phosh/APKBUILD b/community/phosh/APKBUILD index 8bd866c9054..2003a5a1492 100644 --- a/community/phosh/APKBUILD +++ b/community/phosh/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Danct12 <danct12@disroot.org> # Contributor: Newbyte <newbyte@disroot.org> # Contributor: Rasmus Thomsen <oss@cogitri.dev> -# Maintainer: Newbyte <newbyte@postmarketos.org> +# Maintainer: team/phosh <newbyte@postmarketos.org> pkgname=phosh pkgver=0.38.0 -pkgrel=0 +pkgrel=4 pkgdesc="Wayland shell for GNOME on mobile devices" # armhf: blocked by gnome-shell-schemas # Blocked on s390x by gnome-session, gnome-settings-daemon, squeekboard and libhandy @@ -59,6 +59,7 @@ makedepends=" checkdepends="xvfb-run" subpackages="$pkgname-dbg $pkgname-lang $pkgname-dev $pkgname-doc $pkgname-portalsconf" source="https://download.gnome.org/sources/phosh/${pkgver%.*}/phosh-$pkgver.tar.xz + remove-gnome-session-fallback-support.patch phosh.desktop " @@ -67,7 +68,6 @@ build() { abuild-meson \ -Db_lto=true \ -Dphoc_tests=disabled \ - -Dsystemd=false \ -Dman=true \ . output meson compile -C output @@ -82,6 +82,9 @@ package() { install -D -m644 "$srcdir"/phosh.desktop \ "$pkgdir"/usr/share/wayland-sessions/phosh.desktop + + # https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/64741#note_402279 + rm -r "$pkgdir"/usr/lib/systemd } portalsconf() { @@ -91,5 +94,6 @@ portalsconf() { sha512sums=" dfde54b64ea6edba2b66dfe2f5ff0f4b3edbb192b1a37fbc8c98d9365bdedc5d19ddb1464673e516cb8e436a6c0ea00c84087cc6431b6c1862019f90e02b73ce phosh-0.38.0.tar.xz +8e3144b82516af14a61aa5d760e7abdd5fc03457aea51ef6daeb1780ae9903b2d01e3e9386d48d7d4a1fa2ee950cb58ee7618a8f0e817da2cf64c579b576bc2d remove-gnome-session-fallback-support.patch 8ca4893a751311de326e198314669f5a276092ade99c6353c4c9ce070713fb1a5b1615e7fecb93b428dc79fd4001a9af43d24eafaf2545d7db464963fda25330 phosh.desktop " diff --git a/community/phosh/remove-gnome-session-fallback-support.patch b/community/phosh/remove-gnome-session-fallback-support.patch new file mode 100644 index 00000000000..ff6dfbc4010 --- /dev/null +++ b/community/phosh/remove-gnome-session-fallback-support.patch @@ -0,0 +1,132 @@ +From fa1ba129b07bb5306e0fd43772f7ff5c9a3dd91d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> +Date: Sat, 30 Mar 2024 20:42:27 +0100 +Subject: [PATCH] treewide: Drop support for --builtin session fallback +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Always use systemd as gnome 46's gnome-session doesn't support anything +else. + +Thanks dhjg2000 for figuring this out + +Signed-off-by: Guido Günther <agx@sigxcpu.org> +--- + data/meson.build | 11 ----------- + data/phosh-session.in | 12 +----------- + data/sm.puri.Phosh.desktop.in.in | 2 +- + data/systemd/meson.build | 3 --- + meson.build | 1 - + meson_options.txt | 4 ---- + 7 files changed, 3 insertions(+), 32 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index d76391f4f..5bcf7d31b 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -26,11 +26,6 @@ desktopconf = configuration_data() + desktopconf.set('bindir', bindir) + desktopconf.set('libexecdir', libexecdir) + desktopconf.set('required_components', ';'.join(desktop_required_components) + ';') +-if get_option('systemd') +- desktopconf.set('hidden_under_systemd', 'X-GNOME-HiddenUnderSystemd=true') +-else +- desktopconf.set('hidden_under_systemd', '') +-endif + + desktop_utils = find_program('desktop-file-validate', required: false) + desktop_files = { +@@ -85,12 +80,6 @@ runconf.set('version', meson.project_version()) + runconf.set('wlrootsdir', join_paths(libexecdir, 'wlroots')) + runconf.set('compositor', get_option('compositor')) + +-if get_option('systemd') +- runconf.set('session_manager', '--systemd') +-else +- runconf.set('session_manager', '--builtin') +-endif +- + configure_file( + input: 'phosh-session.in', + output: 'phosh-session', +diff --git a/data/phosh-session.in b/data/phosh-session.in +index f0a532f10..f346c02ad 100755 +--- a/data/phosh-session.in ++++ b/data/phosh-session.in +@@ -46,18 +46,8 @@ if [ -f "$HOME/.phoshdebug" ]; then + . "$HOME/.phoshdebug" + fi + +-SESSION_MANAGER= +-# old gnome-session: Pass --builtin or --systemd +-if gnome-session --help | grep -qs '\-\-builtin'; then +- SESSION_MANAGER=@session_manager@ +-# gnome-session >= 46 doesn't support builtin +-elif [ "@session_manager@" = "--builtin" ]; then +- echo "ERR: gnome-session only supports systemd, session cannot start" 1>&2 +- exit 1 +-fi +- + # Run gnome-session through a login shell so it picks + # variables from /etc/profile.d (XDG_*) + [ -n "$WLR_BACKENDS" ] || WLR_BACKENDS=drm,libinput + export WLR_BACKENDS +-exec "${COMPOSITOR}" -S -C "${PHOC_INI}" -E "bash -lc 'exec ${GNOME_SESSION} --disable-acceleration-check --session=phosh ${SESSION_MANAGER}'" ++exec "${COMPOSITOR}" -S -C "${PHOC_INI}" -E "bash -lc 'exec ${GNOME_SESSION} --disable-acceleration-check --session=phosh'" +diff --git a/data/sm.puri.Phosh.desktop.in.in b/data/sm.puri.Phosh.desktop.in.in +index d777bcccd..51d8a7841 100644 +--- a/data/sm.puri.Phosh.desktop.in.in ++++ b/data/sm.puri.Phosh.desktop.in.in +@@ -11,5 +11,5 @@ X-GNOME-Autostart-Phase=DisplayServer + X-GNOME-Provides=panel;windowmanager; + X-GNOME-Autostart-Notify=true + X-GNOME-AutoRestart=true ++X-GNOME-HiddenUnderSystemd=true + X-Phosh-UsesFeedback=true +-@hidden_under_systemd@ +diff --git a/data/systemd/meson.build b/data/systemd/meson.build +index 5a11df87e..bc3c47388 100644 +--- a/data/systemd/meson.build ++++ b/data/systemd/meson.build +@@ -1,5 +1,3 @@ +-if get_option('systemd') +- + gsd_wants = '' + foreach component : gsd_required_components + gsd_wants += 'Wants=' + component + '.target\n' +@@ -34,4 +32,3 @@ configure_file( + + install_data('sm.puri.Phosh.target', install_dir: systemduserdir) + +-endif +diff --git a/meson.build b/meson.build +index befb7c8c1..75f454360 100644 +--- a/meson.build ++++ b/meson.build +@@ -267,7 +267,6 @@ summary({ + + summary({ + 'Compositor:': get_option('compositor'), +- 'Systemd for session': get_option('systemd'), + }, + bool_yn: true, + section: 'Runtime', +diff --git a/meson_options.txt b/meson_options.txt +index 8c2fbc921..8c267a777 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -14,10 +14,6 @@ option('man', + type: 'boolean', value : false, + description : 'generate man pages (requires rst2man)') + +-option('systemd', +- type: 'boolean', value: true, +- description: 'Whether to generate systemd user units') +- + option('compositor', + type: 'string', value: '/usr/bin/phoc', + description: 'Path to the Phoc compositor for use in the launcher script') +-- +GitLab + diff --git a/community/php82-pecl-couchbase/APKBUILD b/community/php82-pecl-couchbase/APKBUILD index f94b35b3ed7..2c52c8f1116 100644 --- a/community/php82-pecl-couchbase/APKBUILD +++ b/community/php82-pecl-couchbase/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php82-pecl-couchbase _extname=couchbase -pkgver=4.2.0 +pkgver=4.2.1 pkgrel=0 pkgdesc="PHP 8.2 extension for Couchbase - PECL" url="https://pecl.php.net/package/couchbase" @@ -35,5 +35,5 @@ package() { } sha512sums=" -4e5f26d5181aad5df3162b172bda9776b2c564d5f3c0dd8aaa087091eaf3c3ebcff9044e0ccb122f34d55265f94923eb0fb37efe6a7e66c752e47ead6bde23b3 php-pecl-couchbase-4.2.0.tgz +92ab3170cb231a4c6663daf15d8749386a84e3fa31fb19b3bda39dfa28eaf50365df9c2eab229b69c630b511af8015598e4babea79d70ba4f9c721821727eb03 php-pecl-couchbase-4.2.1.tgz " diff --git a/community/php82-pecl-imagick/APKBUILD b/community/php82-pecl-imagick/APKBUILD index a4ca708e4c9..735a7ceabb0 100644 --- a/community/php82-pecl-imagick/APKBUILD +++ b/community/php82-pecl-imagick/APKBUILD @@ -17,7 +17,9 @@ checkdepends="ghostscript-fonts " makedepends="$_php-dev imagemagick-dev" subpackages="$pkgname-dev" -source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz" +source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz + tests-316_Imagick_getImageKurtosis.patch + " builddir="$srcdir/$_extname-$pkgver" install_if="php-$_extname php$_phpv" @@ -46,4 +48,5 @@ package() { sha512sums=" c84408e4e4a0c46d979240e06d58d264c6bb21f3b95e3d434c8a21cd808f6c495fd453ef9c07b5c44dac81c6f205b6697f8ecaf1a65a86ce4e9052328a389ebe php-pecl-imagick-3.7.0.tgz +24ad7801e70c0a68a190a1adfdfafcfd3f957afbe5813a8cf459e55658413070b794cee31808415ca2d229e2bb942fad260571657018fec141d7a59c215380a3 tests-316_Imagick_getImageKurtosis.patch " diff --git a/community/php82-pecl-imagick/tests-316_Imagick_getImageKurtosis.patch b/community/php82-pecl-imagick/tests-316_Imagick_getImageKurtosis.patch new file mode 100644 index 00000000000..20184eefea9 --- /dev/null +++ b/community/php82-pecl-imagick/tests-316_Imagick_getImageKurtosis.patch @@ -0,0 +1,91 @@ +Patch-Source: https://github.com/Imagick/imagick/commit/944b67fce68bcb5835999a149f917670555b6fcb.patch +-- +From 944b67fce68bcb5835999a149f917670555b6fcb Mon Sep 17 00:00:00 2001 +From: Danack <Danack@basereality.com> +Date: Fri, 9 Feb 2024 13:59:39 +0000 +Subject: [PATCH] Improve test so that is passes. + +The underlying maths for some statistics changed: https://github.com/ImageMagick/ImageMagick/issues/6924 so the tests need to pass on both before and after maths. +--- + +diff --git a/tests/316_Imagick_getImageKurtosis.phpt b/tests/316_Imagick_getImageKurtosis.phpt +index 2618924a..61370b57 100644 +--- a/tests/316_Imagick_getImageKurtosis.phpt ++++ b/tests/316_Imagick_getImageKurtosis.phpt +@@ -14,8 +14,16 @@ function getImageKurtosis() { + $imagick = new \Imagick(__DIR__ . '/Biter_500.jpg'); + $values = $imagick->getImageKurtosis(); + +- check_value($values, "kurtosis", -0.9379261035010518); +- check_value($values, "skewness", 0.4562517200972045); ++ check_value_posibilities( ++ $values, ++ "kurtosis", ++ [-0.9379261035010518, -0.70925995674921] ++ ); ++ check_value_posibilities( ++ $values, ++ "skewness", ++ [0.4562517200972045, 0.56839010636614] ++ ); + } + + getImageKurtosis() ; +diff --git a/tests/functions.inc b/tests/functions.inc +index bbd60ac0..11012864 100644 +--- a/tests/functions.inc ++++ b/tests/functions.inc +@@ -111,7 +111,10 @@ function setFontForImagickDraw(\ImagickDraw $imagickDraw) + $imagickDraw->setFont($font); + } + +- ++/** ++ * Checks that a named value exists in an array and it matches ++ * an expected value. ++ */ + function check_value(array $values, $name, $expected_value) + { + if (array_key_exists($name, $values) !== true) { +@@ -136,6 +139,41 @@ function check_value(array $values, $name, $expected_value) + } + + ++/** ++ * Checks that a named value exists in an array and it matches ++ * one of a number of expected values. ++ * This function exists because the expected values for Kurtosis can ++ * change when the underlying maths changes: https://github.com/ImageMagick/ImageMagick/issues/6924 ++ */ ++function check_value_posibilities(array $values, $name, array $expected_values) ++{ ++ if (array_key_exists($name, $values) !== true) { ++ ++ $message = "Expected key '$name' not set. Array contains:\n"; ++ $message .= var_export($values, true); ++ ++ throw new \Exception($message); ++ } ++ ++ ++ $value = $values[$name]; ++ ++ $epsilon = 0.01; ++ ++ foreach ($expected_values as $expected_value) { ++ if (($value > $expected_value - $epsilon) && ($value < $expected_value + $epsilon)) { ++ echo "Value for '$name' is $value which is close enough to expected $expected_value\n"; ++ return; ++ } ++ } ++ ++ $expected_string = implode(", ", $expected_values); ++ ++ $message = "Value for $name doesn't match expected possibilities. Expected one of: $expected_string, actual: $value"; ++ throw new \Exception($message); ++} ++ ++ + function check_value_with_epsilon(array $values, $name, $expected_value, $epsilon) + { + if (array_key_exists($name, $values) !== true) { diff --git a/community/php82-pecl-mongodb/APKBUILD b/community/php82-pecl-mongodb/APKBUILD index c2f281af46a..7a15ae3f60d 100644 --- a/community/php82-pecl-mongodb/APKBUILD +++ b/community/php82-pecl-mongodb/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php82-pecl-mongodb _extname=mongodb -pkgver=1.18.1 +pkgver=1.19.0 pkgrel=0 pkgdesc="PHP 8.2 MongoDB driver - PECL" url="https://pecl.php.net/package/mongodb" @@ -37,5 +37,5 @@ package() { } sha512sums=" -3224ea4efac1063bea58c55c2defbb149982b88387917a1301e08b65c2bbb070d962a17bc84d187abeed8950a52e5e5d24e5517524d8bf0892ecd3f6c9f815f0 php-pecl-mongodb-1.18.1.tgz +178fb501c36b1fc0a4859f3ce7feab42e4841ef64433c2760ea60af2e0e523cd767c6380ce9c3406b3fea640ae4e45aed20f22046071b3bd0b9d84105dacdb9b php-pecl-mongodb-1.19.0.tgz " diff --git a/community/php82-pecl-opentelemetry/APKBUILD b/community/php82-pecl-opentelemetry/APKBUILD index eeff354264b..55d11129e48 100644 --- a/community/php82-pecl-opentelemetry/APKBUILD +++ b/community/php82-pecl-opentelemetry/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php82-pecl-opentelemetry _extname=opentelemetry -pkgver=1.0.2 +pkgver=1.0.3 _pkgver=${pkgver/_/} pkgrel=0 pkgdesc="PHP 8.2 extension for OpenTelemetry auto-instrumentation support - PECL" @@ -34,5 +34,5 @@ package() { } sha512sums=" -98f3b9ccd8296bcab79af3f1554abc6e60d89aa9fac80775496a09e7a85eae7c8be44bcfa9a35a91157675b58c02dbd1fbdfc55ab96b05852d33232b8aa44e81 php-pecl-opentelemetry-1.0.2.tgz +3873bb118116ec3cecfea825f20656144b999dd8cd140f82694562de95da64d4ea7959a749a7e07478149c1b9c2787b235e9000614ba360dea8c76c40e5ad2a9 php-pecl-opentelemetry-1.0.3.tgz " diff --git a/community/php82-pecl-swoole/APKBUILD b/community/php82-pecl-swoole/APKBUILD index 1d653b4244c..a84a026a73c 100644 --- a/community/php82-pecl-swoole/APKBUILD +++ b/community/php82-pecl-swoole/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php82-pecl-swoole _extname=swoole -pkgver=5.1.1 +pkgver=5.1.2 pkgrel=0 pkgdesc="Event-driven asynchronous and concurrent networking engine with high performance for PHP 8.2 - PECL" url="https://pecl.php.net/package/swoole" @@ -58,5 +58,5 @@ package() { } sha512sums=" -ac5f6a737a42123417de33219f56c1ce95b7217d1e66d5021cb6f0126c9fead7917aa38f577330e3391e7780e3a2117b53dff72069680c1c3d0780b52d8d1f61 php-pecl-swoole-5.1.1.tgz +211a39c40ac9f4a58daf38a99723a21b5ad972f9aeb83f0b9fa1c5c58f78fa9c38e4ead3207b77c319436d702a9c294275289287cd121d66469c02c669cc6f2a php-pecl-swoole-5.1.2.tgz " diff --git a/community/php82-pecl-vips/APKBUILD b/community/php82-pecl-vips/APKBUILD index 8ef6c446886..9957d2925a5 100644 --- a/community/php82-pecl-vips/APKBUILD +++ b/community/php82-pecl-vips/APKBUILD @@ -22,7 +22,7 @@ build() { } check() { - make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 SKIP_ONLINE_TESTS=1 test + make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 SKIP_ONLINE_TESTS=1 VIPS_CONCURRENCY="${JOBS:-$(nproc)}" test $_php -dextension=modules/$_extname.so --ri $_extname } diff --git a/community/php82/APKBUILD b/community/php82/APKBUILD index a578f0e93e2..9ba35a51ea1 100644 --- a/community/php82/APKBUILD +++ b/community/php82/APKBUILD @@ -26,7 +26,7 @@ pkgname=php82 _pkgreal=php -pkgver=8.2.18 +pkgver=8.2.19 pkgrel=0 _apiver=20220829 _suffix=${pkgname#php} @@ -112,8 +112,8 @@ source="php-$pkgver.tar.xz::https://php.net/distributions/$_pkgreal-$pkgver.tar. $pkgname-fpm-version-suffix.patch fix-tests-devserver.patch phpinfo-avif.patch - fix-lfs64-2.patch fix-icu74.patch + loongarch64-support-for-fibers.patch " builddir="$srcdir/$_pkgreal-$pkgver" @@ -246,7 +246,7 @@ _build() { [ "$CARCH" = "s390x" ] && without_pcre_jit="--without-pcre-jit" case "$CARCH" in - arm*|aarch64|riscv64) + arm*|aarch64|riscv64|loongarch64) export CFLAGS="${CFLAGS/-fstack-clash-protection}" export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection}" ;; @@ -632,11 +632,11 @@ _extensions_by_load_order() { } sha512sums=" -8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f php-8.2.18.tar.xz +5ba7ab4317f7880a6cea93bf6d3a48d62db6bfcb5682be7e13a6a6f7bd1fef96ca813c2cf95f6b5020756f03b298995d1722367adb2580c1db221a2f9e311038 php-8.2.19.tar.xz f8662f7f5fcf286ba138d735538b62c0611df7941f3b398e6d2128077555f0ce133b6428f2607d3102c2e7323f2c58a4501727493584383a863e2f4e83057e7a php82-fpm.initd 29dc69d06c25ecc194b617e9af7c42fbdbe634a8312a5c6a1ab8e2d582cb64ed2f53308eeaa45dcf71b7f5618e6ef3e9d8a9d6932685e0d8af86203f43481bd9 php82-fpm.logrotate 504f0e4aca2dfd36f428006fe6442557e99f8608f683467ae95519b5219208951bf3ba7223af69728a4e055110f5e491ea4b484db2f696410ce35f4999a8481a php82-module.conf -18a142c2c5d54a258a99c54962e7feaebf6189274bae6735912b1611afd4419b92dde0114d809c86b63e6dfd253dc84290c2b6539e3a7296d761294beba79dcc disabled-tests.list +9e407b4fff13dad933974374ff237d9cb3c778e0780a43a7c12ce04153d47e37fb823d62cf84362c427ce586d200e721555235945faf91f2343028d2caa4216c disabled-tests.list 4818e0247d8efa2f58a38c563e7bcb9a5d3cd1e668d489d341dfc293230c4608a5587200f9bdfe73fdd854443a30a5a862ff4975aefda7b77ed09871d1148ee1 disabled-tests.x86.list 30cba10c11f800d23e013c7f92cadb7e2a9ac5e89e5466445c77761369e7f3b8daba7ae64e23967329139b01f37f187acd2f1f1e3dfb0bca2e900a7d7e1afd07 disabled-tests.ppc64le.list 54930246f22034e6a73020aa95915d14b2a2fcfe121df57eb17fdc663aceeb94c5c4b1800347149a8fb4eaa0edda4224a11133bdb7e0cd34a2065a2de121db0d disabled-tests.s390x.list @@ -646,6 +646,6 @@ f93c6544fe7cc630b72c2315b312e327b39d7a46e9bcd0d00d37d92863dd44c06f96f74539f0ef93 804f376d3a58318edc792ab0f898bf9f2f719dd56c16dbac21e0ea020b32556ef3283a7c14ea5a2791594af0c1b96ae99906033fc947feea340ab04b95626c68 php82-fpm-version-suffix.patch 1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch 8833c5c6f5225f5e85a9cd842274e4e6b2f55dc572a13bdb3066c624f82c9f39fa07cb2f8f242092ff814f61f0cb8abaa792b1f93c16ad341f1a8dec05a6ca2d phpinfo-avif.patch -6f90c6b80a1fd72094877d52e2d6a26712a3d54ee83c8d4d75cad5505a2225cbca576085acf82c08b91220550b8a3527323e1a9f4a821e4e159b5c03efc083c6 fix-lfs64-2.patch b376af772b4b92ce50f955a9becff47784383b4d453419d8c06ae4e712ccaabeea4898ca6a6ab6c3bbf1fdcc720ccf3fa85a8c0e538c914ea667ab58d0ba396c fix-icu74.patch +517441fdf14b7855b1843bd0d1c86126017af7a340fbf7177202db7c9e67912332abdb62e7477f45e7922c910672396ba4f953eb7dc052ed06624c682bd12791 loongarch64-support-for-fibers.patch " diff --git a/community/php82/disabled-tests.list b/community/php82/disabled-tests.list index 47b08ba85ad..6289a6afa5f 100644 --- a/community/php82/disabled-tests.list +++ b/community/php82/disabled-tests.list @@ -174,3 +174,7 @@ ext/openssl/tests/openssl_error_string_basic.phpt ext/openssl/tests/openssl_error_string_basic_openssl3.phpt ext/openssl/tests/openssl_private_decrypt_basic.phpt ext/openssl/tests/openssl_x509_parse_basic.phpt + +# openssl 3.3.0 +ext/openssl/tests/bug74341.phpt +ext/openssl/tests/gh10495.phpt diff --git a/community/php82/fix-lfs64-2.patch b/community/php82/fix-lfs64-2.patch deleted file mode 100644 index 21cb2ba2387..00000000000 --- a/community/php82/fix-lfs64-2.patch +++ /dev/null @@ -1,39 +0,0 @@ -Patch-Source: https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc -From 577b8ae4226368e66fee7a9b5c58f9e2428372fc Mon Sep 17 00:00:00 2001 -From: Arnaud Le Blanc <arnaud.lb@gmail.com> -Date: Mon, 8 Apr 2024 14:58:12 +0200 -Subject: [PATCH] Fix cookie_seek_function_t signature under musl (#13890) - -Fixes GH-11678 ---- - main/streams/cast.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/main/streams/cast.c b/main/streams/cast.c -index 3bad65fbac1f5..8d9f4a9d2d54b 100644 ---- a/main/streams/cast.c -+++ b/main/streams/cast.c -@@ -104,6 +104,9 @@ static ssize_t stream_cookie_writer(void *cookie, const char *buffer, size_t siz - - # ifdef COOKIE_SEEKER_USES_OFF64_T - static int stream_cookie_seeker(void *cookie, off64_t *position, int whence) -+# else -+static int stream_cookie_seeker(void *cookie, off_t *position, int whence) -+# endif - { - - *position = php_stream_seek((php_stream *)cookie, (zend_off_t)*position, whence); -@@ -113,13 +116,6 @@ static int stream_cookie_seeker(void *cookie, off64_t *position, int whence) - } - return 0; - } --# else --static int stream_cookie_seeker(void *cookie, zend_off_t position, int whence) --{ -- -- return php_stream_seek((php_stream *)cookie, position, whence); --} --# endif - - static int stream_cookie_closer(void *cookie) - { diff --git a/community/php82/loongarch64-support-for-fibers.patch b/community/php82/loongarch64-support-for-fibers.patch new file mode 100644 index 00000000000..cb39daa6151 --- /dev/null +++ b/community/php82/loongarch64-support-for-fibers.patch @@ -0,0 +1,246 @@ +Patch-Source: https://github.com/php/php-src/commit/0766ac6e357282eafb51cbdc5383345e7487260b +From 0766ac6e357282eafb51cbdc5383345e7487260b Mon Sep 17 00:00:00 2001 +From: qiangxuhui <qiangxuhui@loongson.cn> +Date: Mon, 1 Apr 2024 07:16:47 +0000 +Subject: [PATCH] loongarch64 support for fibers + +Add loongarch64 assembly files from Boost, needed for fibers support, +and hook up loongarch64 fibers support during configure. + +Close GH-13914 +--- + Zend/asm/jump_loongarch64_sysv_elf_gas.S | 121 +++++++++++++++++++++++ + Zend/asm/make_loongarch64_sysv_elf_gas.S | 72 ++++++++++++++ + configure.ac | 2 + + 3 files changed, 195 insertions(+) + create mode 100644 Zend/asm/jump_loongarch64_sysv_elf_gas.S + create mode 100644 Zend/asm/make_loongarch64_sysv_elf_gas.S + +diff --git a/Zend/asm/jump_loongarch64_sysv_elf_gas.S b/Zend/asm/jump_loongarch64_sysv_elf_gas.S +new file mode 100644 +index 0000000000..74c081e07f +--- /dev/null ++++ b/Zend/asm/jump_loongarch64_sysv_elf_gas.S +@@ -0,0 +1,121 @@ ++/******************************************************* ++ * * ++ * ------------------------------------------------- * ++ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * ++ * ------------------------------------------------- * ++ * | 0 | 8 | 16 | 24 | * ++ * ------------------------------------------------- * ++ * | FS0 | FS1 | FS2 | FS3 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * ++ * ------------------------------------------------- * ++ * | 32 | 40 | 48 | 56 | * ++ * ------------------------------------------------- * ++ * | FS4 | FS5 | FS6 | FS7 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | * ++ * ------------------------------------------------- * ++ * | 64 | 72 | 80 | 88 | * ++ * ------------------------------------------------- * ++ * | S0 | S1 | S2 | S3 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | * ++ * ------------------------------------------------- * ++ * | 96 | 100 | 104 | 108 | 112 | 116 | 120 | 124 | * ++ * ------------------------------------------------- * ++ * | S4 | S5 | S6 | S7 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | * ++ * ------------------------------------------------- * ++ * | 128 | 132 | 136 | 140 | 144 | 148 | 152 | 156 | * ++ * ------------------------------------------------- * ++ * | S8 | FP | RA | PC | * ++ * ------------------------------------------------- * ++ * * ++ * *****************************************************/ ++ ++.file "jump_loongarch64_sysv_elf_gas.S" ++.text ++.globl jump_fcontext ++.align 2 ++.type jump_fcontext,@function ++jump_fcontext: ++ # reserve space on stack ++ addi.d $sp, $sp, -160 ++ ++ # save fs0 - fs7 ++ fst.d $fs0, $sp, 0 ++ fst.d $fs1, $sp, 8 ++ fst.d $fs2, $sp, 16 ++ fst.d $fs3, $sp, 24 ++ fst.d $fs4, $sp, 32 ++ fst.d $fs5, $sp, 40 ++ fst.d $fs6, $sp, 48 ++ fst.d $fs7, $sp, 56 ++ ++ # save s0 - s8, fp, ra ++ st.d $s0, $sp, 64 ++ st.d $s1, $sp, 72 ++ st.d $s2, $sp, 80 ++ st.d $s3, $sp, 88 ++ st.d $s4, $sp, 96 ++ st.d $s5, $sp, 104 ++ st.d $s6, $sp, 112 ++ st.d $s7, $sp, 120 ++ st.d $s8, $sp, 128 ++ st.d $fp, $sp, 136 ++ st.d $ra, $sp, 144 ++ ++ # save RA as PC ++ st.d $ra, $sp, 152 ++ ++ # store SP (pointing to context-data) in A2 ++ move $a2, $sp ++ ++ # restore SP (pointing to context-data) from A0 ++ move $sp, $a0 ++ ++ # load fs0 - fs7 ++ fld.d $fs0, $sp, 0 ++ fld.d $fs1, $sp, 8 ++ fld.d $fs2, $sp, 16 ++ fld.d $fs3, $sp, 24 ++ fld.d $fs4, $sp, 32 ++ fld.d $fs5, $sp, 40 ++ fld.d $fs6, $sp, 48 ++ fld.d $fs7, $sp, 56 ++ ++ #load s0 - s7 ++ ld.d $s0, $sp, 64 ++ ld.d $s1, $sp, 72 ++ ld.d $s2, $sp, 80 ++ ld.d $s3, $sp, 88 ++ ld.d $s4, $sp, 96 ++ ld.d $s5, $sp, 104 ++ ld.d $s6, $sp, 112 ++ ld.d $s7, $sp, 120 ++ ld.d $s8, $sp, 128 ++ ld.d $fp, $sp, 136 ++ ld.d $ra, $sp, 144 ++ ++ # return transfer_t from jump ++ # pass transfer_t as first arg in context function ++ # a0 == FCTX, a1 == DATA ++ move $a0, $a2 ++ ++ # load PC ++ ld.d $a2, $sp, 152 ++ ++ # restore stack ++ addi.d $sp, $sp, 160 ++ ++ # jump to context ++ jr $a2 ++.size jump_fcontext, .-jump_fcontext ++ ++/* Mark that we don't need executable stack. */ ++.section .note.GNU-stack,"",%progbits +diff --git a/Zend/asm/make_loongarch64_sysv_elf_gas.S b/Zend/asm/make_loongarch64_sysv_elf_gas.S +new file mode 100644 +index 0000000000..55062702f1 +--- /dev/null ++++ b/Zend/asm/make_loongarch64_sysv_elf_gas.S +@@ -0,0 +1,72 @@ ++/******************************************************* ++ * * ++ * ------------------------------------------------- * ++ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * ++ * ------------------------------------------------- * ++ * | 0 | 8 | 16 | 24 | * ++ * ------------------------------------------------- * ++ * | FS0 | FS1 | FS2 | FS3 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * ++ * ------------------------------------------------- * ++ * | 32 | 40 | 48 | 56 | * ++ * ------------------------------------------------- * ++ * | FS4 | FS5 | FS6 | FS7 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | * ++ * ------------------------------------------------- * ++ * | 64 | 72 | 80 | 88 | * ++ * ------------------------------------------------- * ++ * | S0 | S1 | S2 | S3 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | * ++ * ------------------------------------------------- * ++ * | 96 | 100 | 104 | 108 | 112 | 116 | 120 | 124 | * ++ * ------------------------------------------------- * ++ * | S4 | S5 | S6 | S7 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | * ++ * ------------------------------------------------- * ++ * | 128 | 132 | 136 | 140 | 144 | 148 | 152 | 156 | * ++ * ------------------------------------------------- * ++ * | S8 | FP | RA | PC | * ++ * ------------------------------------------------- * ++ * * ++ * *****************************************************/ ++ ++.file "make_loongarch64_sysv_elf_gas.S" ++.text ++.globl make_fcontext ++.align 2 ++.type make_fcontext,@function ++make_fcontext: ++ # shift address in A0 to lower 16 byte boundary ++ bstrins.d $a0, $zero, 3, 0 ++ ++ # reserve space for context-data on context-stack ++ addi.d $a0, $a0, -160 ++ ++ # third arg of make_fcontext() == address of context-function ++ st.d $a2, $a0, 152 ++ ++ # save address of finish as return-address for context-function ++ # will be entered after context-function returns ++ la.local $a4, finish ++ st.d $a4, $a0, 144 ++ ++ # return pointer to context-data ++ jr $ra ++ ++finish: ++ # exit code is zero ++ li.d $a0, 0 ++ # call _exit(0) ++ b %plt(_exit) ++ ++.size make_fcontext, .-make_fcontext ++/* Mark that we don't need executable stack. */ ++.section .note.GNU-stack,"",%progbits +diff --git a/configure.ac b/configure.ac +index 2bf60c434d..da646ac69f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1253,6 +1253,7 @@ AS_CASE([$host_cpu], + [riscv64*], [fiber_cpu="riscv64"], + [sparc64], [fiber_cpu="sparc64"], + [s390x*], [fiber_cpu="s390x"], ++ [loongarch64*], [fiber_cpu="loongarch64"], + [mips64*], [fiber_cpu="mips64"], + [mips*], [fiber_cpu="mips32"], + [fiber_cpu="unknown"] +@@ -1275,6 +1276,7 @@ AS_CASE([$fiber_cpu], + [riscv64], [fiber_asm_file_prefix="riscv64_sysv"], + [sparc64], [fiber_asm_file_prefix="sparc64_sysv"], + [s390x], [fiber_asm_file_prefix="s390x_sysv"], ++ [loongarch64], [fiber_asm_file_prefix="loongarch64_sysv"], + [mips64], [fiber_asm_file_prefix="mips64_n64"], + [mips32], [fiber_asm_file_prefix="mips32_o32"], + [fiber_asm_file_prefix="unknown"] +-- +2.44.0 + diff --git a/community/php83-pecl-couchbase/APKBUILD b/community/php83-pecl-couchbase/APKBUILD index 1fec0966be3..3982323acb1 100644 --- a/community/php83-pecl-couchbase/APKBUILD +++ b/community/php83-pecl-couchbase/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php83-pecl-couchbase _extname=couchbase -pkgver=4.2.0 +pkgver=4.2.1 pkgrel=0 pkgdesc="PHP 8.3 extension for Couchbase - PECL" url="https://pecl.php.net/package/couchbase" @@ -35,5 +35,5 @@ package() { } sha512sums=" -4e5f26d5181aad5df3162b172bda9776b2c564d5f3c0dd8aaa087091eaf3c3ebcff9044e0ccb122f34d55265f94923eb0fb37efe6a7e66c752e47ead6bde23b3 php-pecl-couchbase-4.2.0.tgz +92ab3170cb231a4c6663daf15d8749386a84e3fa31fb19b3bda39dfa28eaf50365df9c2eab229b69c630b511af8015598e4babea79d70ba4f9c721821727eb03 php-pecl-couchbase-4.2.1.tgz " diff --git a/community/php83-pecl-imagick/APKBUILD b/community/php83-pecl-imagick/APKBUILD index e658ab3206f..cbef63c40c2 100644 --- a/community/php83-pecl-imagick/APKBUILD +++ b/community/php83-pecl-imagick/APKBUILD @@ -17,7 +17,9 @@ checkdepends="ghostscript-fonts " makedepends="$_php-dev imagemagick-dev" subpackages="$pkgname-dev" -source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz" +source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz + tests-316_Imagick_getImageKurtosis.patch + " builddir="$srcdir/$_extname-$pkgver" install_if="php-$_extname php$_phpv" @@ -46,4 +48,5 @@ package() { sha512sums=" c84408e4e4a0c46d979240e06d58d264c6bb21f3b95e3d434c8a21cd808f6c495fd453ef9c07b5c44dac81c6f205b6697f8ecaf1a65a86ce4e9052328a389ebe php-pecl-imagick-3.7.0.tgz +24ad7801e70c0a68a190a1adfdfafcfd3f957afbe5813a8cf459e55658413070b794cee31808415ca2d229e2bb942fad260571657018fec141d7a59c215380a3 tests-316_Imagick_getImageKurtosis.patch " diff --git a/community/php83-pecl-imagick/tests-316_Imagick_getImageKurtosis.patch b/community/php83-pecl-imagick/tests-316_Imagick_getImageKurtosis.patch new file mode 100644 index 00000000000..20184eefea9 --- /dev/null +++ b/community/php83-pecl-imagick/tests-316_Imagick_getImageKurtosis.patch @@ -0,0 +1,91 @@ +Patch-Source: https://github.com/Imagick/imagick/commit/944b67fce68bcb5835999a149f917670555b6fcb.patch +-- +From 944b67fce68bcb5835999a149f917670555b6fcb Mon Sep 17 00:00:00 2001 +From: Danack <Danack@basereality.com> +Date: Fri, 9 Feb 2024 13:59:39 +0000 +Subject: [PATCH] Improve test so that is passes. + +The underlying maths for some statistics changed: https://github.com/ImageMagick/ImageMagick/issues/6924 so the tests need to pass on both before and after maths. +--- + +diff --git a/tests/316_Imagick_getImageKurtosis.phpt b/tests/316_Imagick_getImageKurtosis.phpt +index 2618924a..61370b57 100644 +--- a/tests/316_Imagick_getImageKurtosis.phpt ++++ b/tests/316_Imagick_getImageKurtosis.phpt +@@ -14,8 +14,16 @@ function getImageKurtosis() { + $imagick = new \Imagick(__DIR__ . '/Biter_500.jpg'); + $values = $imagick->getImageKurtosis(); + +- check_value($values, "kurtosis", -0.9379261035010518); +- check_value($values, "skewness", 0.4562517200972045); ++ check_value_posibilities( ++ $values, ++ "kurtosis", ++ [-0.9379261035010518, -0.70925995674921] ++ ); ++ check_value_posibilities( ++ $values, ++ "skewness", ++ [0.4562517200972045, 0.56839010636614] ++ ); + } + + getImageKurtosis() ; +diff --git a/tests/functions.inc b/tests/functions.inc +index bbd60ac0..11012864 100644 +--- a/tests/functions.inc ++++ b/tests/functions.inc +@@ -111,7 +111,10 @@ function setFontForImagickDraw(\ImagickDraw $imagickDraw) + $imagickDraw->setFont($font); + } + +- ++/** ++ * Checks that a named value exists in an array and it matches ++ * an expected value. ++ */ + function check_value(array $values, $name, $expected_value) + { + if (array_key_exists($name, $values) !== true) { +@@ -136,6 +139,41 @@ function check_value(array $values, $name, $expected_value) + } + + ++/** ++ * Checks that a named value exists in an array and it matches ++ * one of a number of expected values. ++ * This function exists because the expected values for Kurtosis can ++ * change when the underlying maths changes: https://github.com/ImageMagick/ImageMagick/issues/6924 ++ */ ++function check_value_posibilities(array $values, $name, array $expected_values) ++{ ++ if (array_key_exists($name, $values) !== true) { ++ ++ $message = "Expected key '$name' not set. Array contains:\n"; ++ $message .= var_export($values, true); ++ ++ throw new \Exception($message); ++ } ++ ++ ++ $value = $values[$name]; ++ ++ $epsilon = 0.01; ++ ++ foreach ($expected_values as $expected_value) { ++ if (($value > $expected_value - $epsilon) && ($value < $expected_value + $epsilon)) { ++ echo "Value for '$name' is $value which is close enough to expected $expected_value\n"; ++ return; ++ } ++ } ++ ++ $expected_string = implode(", ", $expected_values); ++ ++ $message = "Value for $name doesn't match expected possibilities. Expected one of: $expected_string, actual: $value"; ++ throw new \Exception($message); ++} ++ ++ + function check_value_with_epsilon(array $values, $name, $expected_value, $epsilon) + { + if (array_key_exists($name, $values) !== true) { diff --git a/community/php83-pecl-mongodb/APKBUILD b/community/php83-pecl-mongodb/APKBUILD index 83e1d50de59..45b29f140b8 100644 --- a/community/php83-pecl-mongodb/APKBUILD +++ b/community/php83-pecl-mongodb/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php83-pecl-mongodb _extname=mongodb -pkgver=1.18.1 +pkgver=1.19.0 pkgrel=0 pkgdesc="PHP 8.3 MongoDB driver - PECL" url="https://pecl.php.net/package/mongodb" @@ -37,5 +37,5 @@ package() { } sha512sums=" -3224ea4efac1063bea58c55c2defbb149982b88387917a1301e08b65c2bbb070d962a17bc84d187abeed8950a52e5e5d24e5517524d8bf0892ecd3f6c9f815f0 php-pecl-mongodb-1.18.1.tgz +178fb501c36b1fc0a4859f3ce7feab42e4841ef64433c2760ea60af2e0e523cd767c6380ce9c3406b3fea640ae4e45aed20f22046071b3bd0b9d84105dacdb9b php-pecl-mongodb-1.19.0.tgz " diff --git a/community/php83-pecl-opentelemetry/APKBUILD b/community/php83-pecl-opentelemetry/APKBUILD index c01fff50322..d1c70493111 100644 --- a/community/php83-pecl-opentelemetry/APKBUILD +++ b/community/php83-pecl-opentelemetry/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php83-pecl-opentelemetry _extname=opentelemetry -pkgver=1.0.2 +pkgver=1.0.3 _pkgver=${pkgver/_/} pkgrel=0 pkgdesc="PHP 8.3 extension for OpenTelemetry auto-instrumentation support - PECL" @@ -34,5 +34,5 @@ package() { } sha512sums=" -98f3b9ccd8296bcab79af3f1554abc6e60d89aa9fac80775496a09e7a85eae7c8be44bcfa9a35a91157675b58c02dbd1fbdfc55ab96b05852d33232b8aa44e81 php-pecl-opentelemetry-1.0.2.tgz +3873bb118116ec3cecfea825f20656144b999dd8cd140f82694562de95da64d4ea7959a749a7e07478149c1b9c2787b235e9000614ba360dea8c76c40e5ad2a9 php-pecl-opentelemetry-1.0.3.tgz " diff --git a/community/php83-pecl-swoole/APKBUILD b/community/php83-pecl-swoole/APKBUILD index f6e2d404837..cab39bdbd0e 100644 --- a/community/php83-pecl-swoole/APKBUILD +++ b/community/php83-pecl-swoole/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php83-pecl-swoole _extname=swoole -pkgver=5.1.1 +pkgver=5.1.2 pkgrel=0 pkgdesc="Event-driven asynchronous and concurrent networking engine with high performance for PHP 8.3 - PECL" url="https://pecl.php.net/package/swoole" @@ -58,5 +58,5 @@ package() { } sha512sums=" -ac5f6a737a42123417de33219f56c1ce95b7217d1e66d5021cb6f0126c9fead7917aa38f577330e3391e7780e3a2117b53dff72069680c1c3d0780b52d8d1f61 php-pecl-swoole-5.1.1.tgz +211a39c40ac9f4a58daf38a99723a21b5ad972f9aeb83f0b9fa1c5c58f78fa9c38e4ead3207b77c319436d702a9c294275289287cd121d66469c02c669cc6f2a php-pecl-swoole-5.1.2.tgz " diff --git a/community/php83-pecl-vips/APKBUILD b/community/php83-pecl-vips/APKBUILD index 7c9e026c062..fd981eb03ff 100644 --- a/community/php83-pecl-vips/APKBUILD +++ b/community/php83-pecl-vips/APKBUILD @@ -22,7 +22,7 @@ build() { } check() { - make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 SKIP_ONLINE_TESTS=1 test + make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 SKIP_ONLINE_TESTS=1 VIPS_CONCURRENCY="${JOBS:-$(nproc)}" test $_php -dextension=modules/$_extname.so --ri $_extname } diff --git a/community/php83/APKBUILD b/community/php83/APKBUILD index 86e7e5e31eb..7899d8905e5 100644 --- a/community/php83/APKBUILD +++ b/community/php83/APKBUILD @@ -25,7 +25,7 @@ # json | https://wiki.php.net/rfc/always_enable_json pkgname=php83 -pkgver=8.3.6 +pkgver=8.3.7 pkgrel=0 _apiver=20230831 _suffix=${pkgname#php} @@ -112,7 +112,7 @@ source="php-$pkgver.tar.xz::https://php.net/distributions/php-$pkgver.tar.xz $pkgname-fpm-version-suffix.patch fix-tests-devserver.patch phpinfo-avif.patch - fix-lfs64-2.patch + loongarch64-support-for-fibers.patch " builddir="$srcdir/php-$pkgver" @@ -237,7 +237,7 @@ _build() { [ "$CARCH" = "s390x" ] && without_pcre_jit="--without-pcre-jit" case "$CARCH" in - arm*|aarch64|riscv64) + arm*|aarch64|riscv64|loongarch64) export CFLAGS="${CFLAGS/-fstack-clash-protection}" export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection}" ;; @@ -619,11 +619,11 @@ _extensions_by_load_order() { } sha512sums=" -fa0b6734e34af90b67bdb991726faa02f7ddd7f31adf73d0b96762452a652690ef5fbae2f6cb941fbd41533b1d6870a78192433e78d5a16a8b5f55b3a5fdf44a php-8.3.6.tar.xz +ff2c16a5cc08b1a59a61eee9df75c4c9a6dda7054d48198b75d104c194e934109fed3665005ba798eeca3d7294d7dc81df3a14e63a527baf9f196e229068d9a3 php-8.3.7.tar.xz 39be7f05f71656107f730818d6abcb4065e550e5b2e2c7021b3490d329c967064012dbeb63ee790ecb65a8e0f7a0f59148de2c692d7879d773acee21fe412bee php83-fpm.initd 1b177644e92be37b28ccc3f8a583aeaf636293d45517d6225c0d6e1c7639d33f734e5f671b5e703b8be00c936422de4a1845039b0eff0e60df5e70cde13186b7 php83-fpm.logrotate 283716161585c68b41be2540312414f028dfee9fcd63fde34662379dd3f05709136e9bd2dc1ba843e8832fdde643eba202d024623d1d46300f9fbf3bebdbf0d2 php83-module.conf -c7f3c21ea33ad979a61a2875f0461dc6c685ece4713db9ca293b37f09ff37941e9eedd18b90cec66287e617c55c8b9ee9fa332e875b6355814b5504191f41a5c disabled-tests.list +0d41b38ee4d8cea3be95ef4ce977373b3f28d5252d64eced00a3b2846bdcad211a9e6396e416d6a60dd4638ad9598b8f04498b6581ea905d43690727c821e437 disabled-tests.list f47bbf2a424b950dba80b87fb12240cd216918820d457c062c4158034a07b52b9ae3425c008a16ec243a5244872a24e28a309a543f07f6f4d06c41ae9b78f631 disabled-tests.x86.list 30cba10c11f800d23e013c7f92cadb7e2a9ac5e89e5466445c77761369e7f3b8daba7ae64e23967329139b01f37f187acd2f1f1e3dfb0bca2e900a7d7e1afd07 disabled-tests.ppc64le.list 5bac2df0d2dc3e147f7452e1f23aaf057b9da918d8bf6118b2fd037e10959b268a83753cc7b669154e4a02c92e3c02250891baa2033901a7fcdce7f9062a9dea disabled-tests.s390x.list @@ -633,5 +633,5 @@ ec206639d076ddac6c2d1db697a5428ed3be979157db39417af7fbe6ab837e8dc00315ae0e55aea4 7bcc2d278fb91b369a8e2af4522d55406d785da713edb9868d6ccd2af8ace3acadf0cec0b72040485c8b1cc1280ca86c2743f207f1de2f8cef63d1d2092a22d2 php83-fpm-version-suffix.patch 1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch 8833c5c6f5225f5e85a9cd842274e4e6b2f55dc572a13bdb3066c624f82c9f39fa07cb2f8f242092ff814f61f0cb8abaa792b1f93c16ad341f1a8dec05a6ca2d phpinfo-avif.patch -6f90c6b80a1fd72094877d52e2d6a26712a3d54ee83c8d4d75cad5505a2225cbca576085acf82c08b91220550b8a3527323e1a9f4a821e4e159b5c03efc083c6 fix-lfs64-2.patch +517441fdf14b7855b1843bd0d1c86126017af7a340fbf7177202db7c9e67912332abdb62e7477f45e7922c910672396ba4f953eb7dc052ed06624c682bd12791 loongarch64-support-for-fibers.patch " diff --git a/community/php83/disabled-tests.list b/community/php83/disabled-tests.list index 77e838e76fc..54cc2beb64c 100644 --- a/community/php83/disabled-tests.list +++ b/community/php83/disabled-tests.list @@ -173,3 +173,6 @@ ext/openssl/tests/openssl_error_string_basic.phpt ext/openssl/tests/openssl_error_string_basic_openssl3.phpt ext/openssl/tests/openssl_private_decrypt_basic.phpt ext/openssl/tests/openssl_x509_parse_basic.phpt + +# openssl 3.3.0 +ext/openssl/tests/bug74341.phpt diff --git a/community/php83/fix-lfs64-2.patch b/community/php83/fix-lfs64-2.patch deleted file mode 100644 index 21cb2ba2387..00000000000 --- a/community/php83/fix-lfs64-2.patch +++ /dev/null @@ -1,39 +0,0 @@ -Patch-Source: https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc -From 577b8ae4226368e66fee7a9b5c58f9e2428372fc Mon Sep 17 00:00:00 2001 -From: Arnaud Le Blanc <arnaud.lb@gmail.com> -Date: Mon, 8 Apr 2024 14:58:12 +0200 -Subject: [PATCH] Fix cookie_seek_function_t signature under musl (#13890) - -Fixes GH-11678 ---- - main/streams/cast.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/main/streams/cast.c b/main/streams/cast.c -index 3bad65fbac1f5..8d9f4a9d2d54b 100644 ---- a/main/streams/cast.c -+++ b/main/streams/cast.c -@@ -104,6 +104,9 @@ static ssize_t stream_cookie_writer(void *cookie, const char *buffer, size_t siz - - # ifdef COOKIE_SEEKER_USES_OFF64_T - static int stream_cookie_seeker(void *cookie, off64_t *position, int whence) -+# else -+static int stream_cookie_seeker(void *cookie, off_t *position, int whence) -+# endif - { - - *position = php_stream_seek((php_stream *)cookie, (zend_off_t)*position, whence); -@@ -113,13 +116,6 @@ static int stream_cookie_seeker(void *cookie, off64_t *position, int whence) - } - return 0; - } --# else --static int stream_cookie_seeker(void *cookie, zend_off_t position, int whence) --{ -- -- return php_stream_seek((php_stream *)cookie, position, whence); --} --# endif - - static int stream_cookie_closer(void *cookie) - { diff --git a/community/php83/loongarch64-support-for-fibers.patch b/community/php83/loongarch64-support-for-fibers.patch new file mode 100644 index 00000000000..cb39daa6151 --- /dev/null +++ b/community/php83/loongarch64-support-for-fibers.patch @@ -0,0 +1,246 @@ +Patch-Source: https://github.com/php/php-src/commit/0766ac6e357282eafb51cbdc5383345e7487260b +From 0766ac6e357282eafb51cbdc5383345e7487260b Mon Sep 17 00:00:00 2001 +From: qiangxuhui <qiangxuhui@loongson.cn> +Date: Mon, 1 Apr 2024 07:16:47 +0000 +Subject: [PATCH] loongarch64 support for fibers + +Add loongarch64 assembly files from Boost, needed for fibers support, +and hook up loongarch64 fibers support during configure. + +Close GH-13914 +--- + Zend/asm/jump_loongarch64_sysv_elf_gas.S | 121 +++++++++++++++++++++++ + Zend/asm/make_loongarch64_sysv_elf_gas.S | 72 ++++++++++++++ + configure.ac | 2 + + 3 files changed, 195 insertions(+) + create mode 100644 Zend/asm/jump_loongarch64_sysv_elf_gas.S + create mode 100644 Zend/asm/make_loongarch64_sysv_elf_gas.S + +diff --git a/Zend/asm/jump_loongarch64_sysv_elf_gas.S b/Zend/asm/jump_loongarch64_sysv_elf_gas.S +new file mode 100644 +index 0000000000..74c081e07f +--- /dev/null ++++ b/Zend/asm/jump_loongarch64_sysv_elf_gas.S +@@ -0,0 +1,121 @@ ++/******************************************************* ++ * * ++ * ------------------------------------------------- * ++ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * ++ * ------------------------------------------------- * ++ * | 0 | 8 | 16 | 24 | * ++ * ------------------------------------------------- * ++ * | FS0 | FS1 | FS2 | FS3 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * ++ * ------------------------------------------------- * ++ * | 32 | 40 | 48 | 56 | * ++ * ------------------------------------------------- * ++ * | FS4 | FS5 | FS6 | FS7 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | * ++ * ------------------------------------------------- * ++ * | 64 | 72 | 80 | 88 | * ++ * ------------------------------------------------- * ++ * | S0 | S1 | S2 | S3 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | * ++ * ------------------------------------------------- * ++ * | 96 | 100 | 104 | 108 | 112 | 116 | 120 | 124 | * ++ * ------------------------------------------------- * ++ * | S4 | S5 | S6 | S7 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | * ++ * ------------------------------------------------- * ++ * | 128 | 132 | 136 | 140 | 144 | 148 | 152 | 156 | * ++ * ------------------------------------------------- * ++ * | S8 | FP | RA | PC | * ++ * ------------------------------------------------- * ++ * * ++ * *****************************************************/ ++ ++.file "jump_loongarch64_sysv_elf_gas.S" ++.text ++.globl jump_fcontext ++.align 2 ++.type jump_fcontext,@function ++jump_fcontext: ++ # reserve space on stack ++ addi.d $sp, $sp, -160 ++ ++ # save fs0 - fs7 ++ fst.d $fs0, $sp, 0 ++ fst.d $fs1, $sp, 8 ++ fst.d $fs2, $sp, 16 ++ fst.d $fs3, $sp, 24 ++ fst.d $fs4, $sp, 32 ++ fst.d $fs5, $sp, 40 ++ fst.d $fs6, $sp, 48 ++ fst.d $fs7, $sp, 56 ++ ++ # save s0 - s8, fp, ra ++ st.d $s0, $sp, 64 ++ st.d $s1, $sp, 72 ++ st.d $s2, $sp, 80 ++ st.d $s3, $sp, 88 ++ st.d $s4, $sp, 96 ++ st.d $s5, $sp, 104 ++ st.d $s6, $sp, 112 ++ st.d $s7, $sp, 120 ++ st.d $s8, $sp, 128 ++ st.d $fp, $sp, 136 ++ st.d $ra, $sp, 144 ++ ++ # save RA as PC ++ st.d $ra, $sp, 152 ++ ++ # store SP (pointing to context-data) in A2 ++ move $a2, $sp ++ ++ # restore SP (pointing to context-data) from A0 ++ move $sp, $a0 ++ ++ # load fs0 - fs7 ++ fld.d $fs0, $sp, 0 ++ fld.d $fs1, $sp, 8 ++ fld.d $fs2, $sp, 16 ++ fld.d $fs3, $sp, 24 ++ fld.d $fs4, $sp, 32 ++ fld.d $fs5, $sp, 40 ++ fld.d $fs6, $sp, 48 ++ fld.d $fs7, $sp, 56 ++ ++ #load s0 - s7 ++ ld.d $s0, $sp, 64 ++ ld.d $s1, $sp, 72 ++ ld.d $s2, $sp, 80 ++ ld.d $s3, $sp, 88 ++ ld.d $s4, $sp, 96 ++ ld.d $s5, $sp, 104 ++ ld.d $s6, $sp, 112 ++ ld.d $s7, $sp, 120 ++ ld.d $s8, $sp, 128 ++ ld.d $fp, $sp, 136 ++ ld.d $ra, $sp, 144 ++ ++ # return transfer_t from jump ++ # pass transfer_t as first arg in context function ++ # a0 == FCTX, a1 == DATA ++ move $a0, $a2 ++ ++ # load PC ++ ld.d $a2, $sp, 152 ++ ++ # restore stack ++ addi.d $sp, $sp, 160 ++ ++ # jump to context ++ jr $a2 ++.size jump_fcontext, .-jump_fcontext ++ ++/* Mark that we don't need executable stack. */ ++.section .note.GNU-stack,"",%progbits +diff --git a/Zend/asm/make_loongarch64_sysv_elf_gas.S b/Zend/asm/make_loongarch64_sysv_elf_gas.S +new file mode 100644 +index 0000000000..55062702f1 +--- /dev/null ++++ b/Zend/asm/make_loongarch64_sysv_elf_gas.S +@@ -0,0 +1,72 @@ ++/******************************************************* ++ * * ++ * ------------------------------------------------- * ++ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * ++ * ------------------------------------------------- * ++ * | 0 | 8 | 16 | 24 | * ++ * ------------------------------------------------- * ++ * | FS0 | FS1 | FS2 | FS3 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * ++ * ------------------------------------------------- * ++ * | 32 | 40 | 48 | 56 | * ++ * ------------------------------------------------- * ++ * | FS4 | FS5 | FS6 | FS7 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | * ++ * ------------------------------------------------- * ++ * | 64 | 72 | 80 | 88 | * ++ * ------------------------------------------------- * ++ * | S0 | S1 | S2 | S3 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | * ++ * ------------------------------------------------- * ++ * | 96 | 100 | 104 | 108 | 112 | 116 | 120 | 124 | * ++ * ------------------------------------------------- * ++ * | S4 | S5 | S6 | S7 | * ++ * ------------------------------------------------- * ++ * ------------------------------------------------- * ++ * | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | * ++ * ------------------------------------------------- * ++ * | 128 | 132 | 136 | 140 | 144 | 148 | 152 | 156 | * ++ * ------------------------------------------------- * ++ * | S8 | FP | RA | PC | * ++ * ------------------------------------------------- * ++ * * ++ * *****************************************************/ ++ ++.file "make_loongarch64_sysv_elf_gas.S" ++.text ++.globl make_fcontext ++.align 2 ++.type make_fcontext,@function ++make_fcontext: ++ # shift address in A0 to lower 16 byte boundary ++ bstrins.d $a0, $zero, 3, 0 ++ ++ # reserve space for context-data on context-stack ++ addi.d $a0, $a0, -160 ++ ++ # third arg of make_fcontext() == address of context-function ++ st.d $a2, $a0, 152 ++ ++ # save address of finish as return-address for context-function ++ # will be entered after context-function returns ++ la.local $a4, finish ++ st.d $a4, $a0, 144 ++ ++ # return pointer to context-data ++ jr $ra ++ ++finish: ++ # exit code is zero ++ li.d $a0, 0 ++ # call _exit(0) ++ b %plt(_exit) ++ ++.size make_fcontext, .-make_fcontext ++/* Mark that we don't need executable stack. */ ++.section .note.GNU-stack,"",%progbits +diff --git a/configure.ac b/configure.ac +index 2bf60c434d..da646ac69f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1253,6 +1253,7 @@ AS_CASE([$host_cpu], + [riscv64*], [fiber_cpu="riscv64"], + [sparc64], [fiber_cpu="sparc64"], + [s390x*], [fiber_cpu="s390x"], ++ [loongarch64*], [fiber_cpu="loongarch64"], + [mips64*], [fiber_cpu="mips64"], + [mips*], [fiber_cpu="mips32"], + [fiber_cpu="unknown"] +@@ -1275,6 +1276,7 @@ AS_CASE([$fiber_cpu], + [riscv64], [fiber_asm_file_prefix="riscv64_sysv"], + [sparc64], [fiber_asm_file_prefix="sparc64_sysv"], + [s390x], [fiber_asm_file_prefix="s390x_sysv"], ++ [loongarch64], [fiber_asm_file_prefix="loongarch64_sysv"], + [mips64], [fiber_asm_file_prefix="mips64_n64"], + [mips32], [fiber_asm_file_prefix="mips32_o32"], + [fiber_asm_file_prefix="unknown"] +-- +2.44.0 + diff --git a/community/picat/APKBUILD b/community/picat/APKBUILD index 4de01d7f7a0..bd0f6ebd25a 100644 --- a/community/picat/APKBUILD +++ b/community/picat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: rubicon <rubicon@mailo.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=picat -pkgver=3.6 +pkgver=3.6.6 _pkgver="${pkgver//./}" pkgrel=0 pkgdesc="Logic-based multi-paradigm programming language" @@ -39,6 +39,6 @@ package() { } sha512sums=" -20d99b4865801d484af14a79a056c52baf55a50045a96392e08a3a328c66086797576f3f2858ac26f9be0eefb7c4f0617d65d105416734a969661362e37e501e picat-3.6.tar.gz +d8548ee12719c6886e09ba1734d2348a289b154d1dd49d8e2549ac0280874b4aff674c8262e975451fdd6441bc0dd0aead7ebc719c1d094bba0b28f7c93a485e picat-3.6.6.tar.gz 2dba3365496fd363159adae5a320ee876475bdc02d04b4edb18ceb4bc5fffb5a145ad9bc07c6c17e928e50fa57b6324feb3993a751a1647542a55baf054f1cdf fix-fileno-usage.patch " diff --git a/community/picolibc/APKBUILD b/community/picolibc/APKBUILD index 0c9982a7076..db2ab509884 100644 --- a/community/picolibc/APKBUILD +++ b/community/picolibc/APKBUILD @@ -6,8 +6,8 @@ _targets=" " pkgname=picolibc pkgver=1.8.6 -_gccver=13.2.0 -pkgrel=0 +_gccver=14.1.0 +pkgrel=1 pkgdesc="A C standard library based on newlib with focus on compact size" url="https://github.com/picolibc/picolibc" makedepends="meson" diff --git a/community/pike/APKBUILD b/community/pike/APKBUILD index 3d419dfd152..9c9ee9c2da5 100644 --- a/community/pike/APKBUILD +++ b/community/pike/APKBUILD @@ -2,7 +2,7 @@ # Contributor: rubicon <rubicon@mailo.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=pike -pkgver=8.0.1898 +pkgver=8.0.1910 pkgrel=0 pkgdesc="Pike programming language" url="https://pike.lysator.liu.se/" @@ -174,5 +174,5 @@ full() { } sha512sums=" -3e4ecd04c6a429e520f3c5f8b6ec9d86c3a4e8920a03f07d51660f39b26863ccec93089d9f2f88886cc1ac7ebd4a772f12dd09e14ef14a90c5885e54c40bfcd8 pike-8.0.1898.tar.gz +a6f5d53dd715479c3bb1494ea184cc9a8b48fbc3e895157d5dd071e361b52986507a07c5b9a3c71dfaae42595bf11c1f9333ef5563d31097b2753dd1302abb7d pike-8.0.1910.tar.gz " diff --git a/community/pimcommon/APKBUILD b/community/pimcommon/APKBUILD index 9f421ed37f8..0b0c712527f 100644 --- a/community/pimcommon/APKBUILD +++ b/community/pimcommon/APKBUILD @@ -9,7 +9,8 @@ pkgrel=0 pkgdesc="Common lib for KDEPim" # armhf blocked by extra-cmake-modules # ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -> akonadi -arch="all !armhf !ppc64le !s390x !riscv64" +# loongarch64 blocked by purpose +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url='https://community.kde.org/KDE_PIM' license="GPL-2.0-or-later" depends_dev=" diff --git a/community/pinentry-ui/APKBUILD b/community/pinentry-ui/APKBUILD index 559a9aa626d..95d8521c5f6 100644 --- a/community/pinentry-ui/APKBUILD +++ b/community/pinentry-ui/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pinentry-ui pkgver=1.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Graphical UI's for Pinentry" url="https://www.gnupg.org/aegypten2/" arch="all" diff --git a/community/pingus/APKBUILD b/community/pingus/APKBUILD index 0de45ec7e21..47052c5e0e7 100644 --- a/community/pingus/APKBUILD +++ b/community/pingus/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Antoni Aloy <aaloytorrens@gmail.com> pkgname=pingus pkgver=0.7.6 -pkgrel=11 +pkgrel=12 pkgdesc="Free Lemmings(TM) clone" url="https://pingus.seul.org/" arch="all" diff --git a/community/pinta/APKBUILD b/community/pinta/APKBUILD index d47d28feaa3..1dc3415c841 100644 --- a/community/pinta/APKBUILD +++ b/community/pinta/APKBUILD @@ -1,8 +1,8 @@ # Contributor: knuxify <knuxify@gmail.com> -# Maintainer: knuxify <knuxify@gmail.com> +# Maintainer: pkgname=pinta -pkgver=2.1.1 -pkgrel=3 +pkgver=2.1.2 +pkgrel=1 pkgdesc="Simple GTK# paint program" url="https://www.pinta-project.com/" arch="x86_64 aarch64 armv7" @@ -16,8 +16,6 @@ prepare() { default_prepare # Packaging fails without this sed -i '/^PINTA_BUILD_OPTS/ s/$/ -maxcpucount:1/' Makefile.in - # Patch to build with dotnet8, maybe can remove in next release - sed -i 's/DOTNET_TARGET_FRAMEWORK=net7.0/DOTNET_TARGET_FRAMEWORK=net8.0/' configure } build() { @@ -40,5 +38,5 @@ package() { } sha512sums=" -1ec3437aa75c9b4de71a118222b93a37af8fe3b660b9e705004866af15f864b9f3f623a4c8840b6dfe481c615d47d1a8131c7c881d50fd06ca7c4ff1440f3fd6 pinta-2.1.1.tar.gz +68b23a1ed9aef3794edd3410d2f7d92ce58ecbd96ec15a20bb263fca397ddd0a850ace32d3fcc291f4f3ab9147c5f40e7d7af249dc9c6fa9304417740fbad798 pinta-2.1.2.tar.gz " diff --git a/community/pipewire/APKBUILD b/community/pipewire/APKBUILD index aecab6a895d..b80fca3d918 100644 --- a/community/pipewire/APKBUILD +++ b/community/pipewire/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/alpine-desktop <bribbers@disroot.org> pkgname=pipewire -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 _so_ver=0.3 pkgdesc="Multimedia processing graphs" @@ -242,7 +242,7 @@ libs() { } sha512sums=" -4ef85f17b0364fe1ef994bf58fe9232fb201002b9fd6644542f58f91595cca48dc70a6a17b50713809c618998626b18e7f1436a090fea826a80b41df9418e2bf pipewire-1.0.4.tar.gz +ed561154b2b5182c94142e03b1147a90a98e788cb5f455a5202ee8c79c1f41e19c2235b3e06ca7af68f2c76320f7c2f8c71db147c9f15f82bef50fccb8ef985f pipewire-1.0.5.tar.gz d5d8bc64e42715aa94296e3e26e740142bff7f638c7eb4fecc0301e46d55636d889bdc0c0399c1eb523271b20f7c48cc03f6ce3c072e0e8576c821ed1ea0e3dd pipewire.desktop e46939b8f903fe6b7421cd42d0746e669402d76afe3326401c186fefeb725e3c126a00ba9f315067d2535991134a24afd855752d757e9e52c20191b5d388f99b pipewire-launcher.sh " diff --git a/community/plantuml/APKBUILD b/community/plantuml/APKBUILD index 5e41ba506bc..26fb3e8d698 100644 --- a/community/plantuml/APKBUILD +++ b/community/plantuml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Krassy Boykinov <kboykinov@teamcentrixx.com> # Maintainer: Krystian Chachuła <krystian@krystianch.com> pkgname=plantuml -pkgver=1.2024.1 +pkgver=1.2024.4 pkgrel=0 pkgdesc="Draw UML diagrams, using a simple and human readable text description" url="https://plantuml.com/" @@ -51,6 +51,6 @@ package() { } sha512sums=" -54c587ffe888d720565179b2392958951acd8012745bd0c5c2197a51e4d9eef736ddde7014c6a45817ee5f291c3151b824f5490fad397946e1fea4390c45dedd plantuml-1.2024.1.tar.gz +cb51e44691eb0a206de3f23e0bf1ba08f8a9d111d838c8b5f2ef2e7b7bae61294deb935bd0c0f2798fdc51d7a0a3e54d40d201075964e109a7f0781010933e91 plantuml-1.2024.4.tar.gz 4b2be5783dffd9aeb4e49c4c192f24e182cc55e39dae45a34f7cf42a0174c22aa0ada60230d6714e473f316ec230d0abec09cfdbeae27e3de0f26861a9814f8e plantuml.run " diff --git a/community/plasma-activities-stats/APKBUILD b/community/plasma-activities-stats/APKBUILD index 3a740572755..f85db631400 100644 --- a/community/plasma-activities-stats/APKBUILD +++ b/community/plasma-activities-stats/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-activities-stats -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 arch="all !armhf" # armhf blocked by qt6-qtdeclarative pkgdesc="A library for accessing the usage data collected by the activities system" @@ -46,5 +46,5 @@ package() { } sha512sums=" -7f80fe50914aae5e30af07f4a8bf77fe405aba8c9cf4e4a12e83be632a026f64ba15079940dea3945a472da853c51e3c002ec91a1457f2197210469fa271b9b7 plasma-activities-stats-6.0.3.tar.xz +676deda84eab9cde73b4498694913deafb60be041106e945c61431552e3e61e9b71e3dd07fc40282e67d2a2cbfa4318704fbc702f7bc123ea24137bcbf351a0c plasma-activities-stats-6.0.4.tar.xz " diff --git a/community/plasma-activities/APKBUILD b/community/plasma-activities/APKBUILD index cedde4884c8..e269040dd46 100644 --- a/community/plasma-activities/APKBUILD +++ b/community/plasma-activities/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-activities -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -47,5 +47,5 @@ package() { } sha512sums=" -e3bfb2b9f7813db85d34ea43eb3cefd65d6f22d3ca5e52a7b0b26b19f58522570952a544a6fac699905b0362a9b33086ff77a2697da0f5e99b31275453f9fed5 plasma-activities-6.0.3.tar.xz +e9f6cc4fdd0b64860218091a8112cedd8d0c22e767bcb4939100ea2f64e5aefc05150e822204090be333d2d9bba70b7bcc56d217b00fde000647f7ffb53078ad plasma-activities-6.0.4.tar.xz " diff --git a/community/plasma-browser-integration/APKBUILD b/community/plasma-browser-integration/APKBUILD index b74fce62d6b..d2d10185814 100644 --- a/community/plasma-browser-integration/APKBUILD +++ b/community/plasma-browser-integration/APKBUILD @@ -4,12 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-browser-integration -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Components necessary to integrate browsers into the Plasma Desktop" # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -> purpose -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt6-qtwebengine -> purpose +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://community.kde.org/Plasma/Browser_Integration" license="GPL-3.0-or-later" makedepends=" @@ -30,8 +30,8 @@ makedepends=" " case "$pkgver" in - *.90*) _rel=unstable;; - *) _rel=stable;; +*.90*) _rel=unstable ;; +*) _rel=stable ;; esac subpackages="$pkgname-lang" _repo_url="https://invent.kde.org/plasma/plasma-browser-integration.git" @@ -54,5 +54,5 @@ package() { } sha512sums=" -5305aeeaec34a9fb88871aff8ebdd9561ffd7518fff94ad286a60c9b23d3ed8a6b3d9a23249734c9387f5c04ff2fbd20f9397513191abdf8a6b6a57956187458 plasma-browser-integration-6.0.3.tar.xz +2df6308b73f7195ce948c57cc86651d2e3fae6d8b414d1afd75feba04a117a7c3887a958bd019eb819a417811ed4f1f73cc62f12010c19db5c87c1b6f4f104b6 plasma-browser-integration-6.0.4.tar.xz " diff --git a/community/plasma-desktop-meta/APKBUILD b/community/plasma-desktop-meta/APKBUILD index 971b832a2f9..8e88c757ad4 100644 --- a/community/plasma-desktop-meta/APKBUILD +++ b/community/plasma-desktop-meta/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-desktop-meta -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Plasma (Base) meta package" url="https://kde.org/plasma-desktop" # riscv64, ppc64le, s390x and armhf blocked by qt6-qtwebengine -> plasma-desktop -arch="noarch !s390x !ppc64le !armhf !riscv64" +# loongarch64 blocked by discover +arch="noarch !s390x !ppc64le !armhf !riscv64 !loongarch64" license="GPL-3.0-or-later" depends=" bluedevil diff --git a/community/plasma-desktop/APKBUILD b/community/plasma-desktop/APKBUILD index b818e4faa40..15be5dd5282 100644 --- a/community/plasma-desktop/APKBUILD +++ b/community/plasma-desktop/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-desktop -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="KDE Plasma Desktop" # armhf blocked by qt6-qtdeclarative @@ -17,6 +17,7 @@ depends=" font-noto-emoji ibus-emoji kirigami + kirigami-addons plasma-workspace qqc2-desktop-style setxkbmap @@ -89,7 +90,7 @@ build() { check() { # kcm-keyboard-keyboard_memory_persister_test is broken - dbus-run-session -- xvfb-run -a ctest --test-dir build --output-on-failure -E "(positioner|kcm-keyboard-keyboard_memory_persister_)test" + dbus-run-session -- xvfb-run ctest --test-dir build --output-on-failure -E "(positioner|kcm-keyboard-keyboard_memory_persister_)test" } package() { @@ -105,5 +106,5 @@ knetattach() { } sha512sums=" -c5dfdf2a406793b99844a556ad218727dd4f589fb4038fba801b488c77d8a0ac0bac6f5937b8acdd265e7a923fe7c9ce24228126313c0299bf8e3d3e8f9f2dc3 plasma-desktop-6.0.3.tar.xz +6e682e2ff91bda05331f581a36afbf1ea571c8855a27280d871e0ae1cd570373f5bb781d078c010d8cf74da0f062deabd9186b161a08a3178304ea6c50816860 plasma-desktop-6.0.4.tar.xz " diff --git a/community/plasma-dialer/APKBUILD b/community/plasma-dialer/APKBUILD index e76889752d2..d08a9daacad 100644 --- a/community/plasma-dialer/APKBUILD +++ b/community/plasma-dialer/APKBUILD @@ -5,14 +5,14 @@ # group=kde-mobile pkgname=plasma-dialer pkgver=23.01.0 -pkgrel=8 +pkgrel=9 pkgdesc="A dialer for Plasma Mobile" # armhf blocked by extra-cmake-modules arch="all !armhf" url="https://invent.kde.org/plasma-mobile/plasma-dialer" license="GPL-2.0-or-later" depends=" - kirigami-addons + kirigami-addons5 kirigami2 oxygen-sounds " @@ -24,7 +24,7 @@ makedepends=" kdbusaddons5-dev ki18n5-dev kio5-dev - kirigami-addons-dev + kirigami-addons5-dev knotifications5-dev kpeople5-dev libphonenumber-dev diff --git a/community/plasma-disks/APKBUILD b/community/plasma-disks/APKBUILD index 14d7c8ed51b..3a6195496cd 100644 --- a/community/plasma-disks/APKBUILD +++ b/community/plasma-disks/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-disks -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Monitors S.M.A.R.T. capable devices for imminent failure" # armhf blocked by qt6-qtdeclarative @@ -57,5 +57,5 @@ package() { } sha512sums=" -35f240415f7468f5d8f2e6056316e3166ab0c67425aaf3bfeea22bcb7fe62335ba2f8406d1d2b61d42ca7bcc22c9d15a15befe30048a06ffdeeb5f66829d851c plasma-disks-6.0.3.tar.xz +50205d7f14ce7dc2cb05755205087efc25b356946b68526807c884b8f599501fb2fb0c312782bfaa0b936d93fe77d77b78a5d802547d39096ea93ebf4d9e57df plasma-disks-6.0.4.tar.xz " diff --git a/community/plasma-firewall/APKBUILD b/community/plasma-firewall/APKBUILD index 5ab369a0d4d..7c1a54df649 100644 --- a/community/plasma-firewall/APKBUILD +++ b/community/plasma-firewall/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-firewall -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Control Panel for your system firewall" # armhf blocked by qt6-qtdeclarative @@ -50,5 +50,5 @@ package() { } sha512sums=" -b2e202c736e46e2260538f7ed960e2b9a5c3cf8b59c0516c67bec04173a42d367e35d59cb68269e1a9a53909aa349f6b749e689eaf1f1cbccd3838531c713feb plasma-firewall-6.0.3.tar.xz +70b914f1dbe011e10a250f4a3ca84a0e324798ba5d74cd3f89adddb61e92a53b7fca95cee63f6065c84dc36a81f45cb091ed51156b23564f62fba89625340a7c plasma-firewall-6.0.4.tar.xz " diff --git a/community/plasma-integration/APKBUILD b/community/plasma-integration/APKBUILD index ed5aeeb97c7..33bb4c00345 100644 --- a/community/plasma-integration/APKBUILD +++ b/community/plasma-integration/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-integration -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Qt Platform Theme integration plugins for the Plasma workspace" # armhf blocked by qt6-qtdeclarative @@ -63,5 +63,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -cc8de168240b45fef9056fb9bc58d4471f510b47c1d572e063abdd1830d8a2f61e93c39cd3603f1ef9a09fae627791d2d9eff456b2cb94de7ee3467af6d8c5f0 plasma-integration-6.0.3.tar.xz +80bd8d44ceb920109d971027f71eafbdc682972d7b0eb737504c840befd47ccd6dc1536e67e173d1df11b38bb91bd493351159de853fdd2b5035800846004833 plasma-integration-6.0.4.tar.xz " diff --git a/community/plasma-mobile/APKBUILD b/community/plasma-mobile/APKBUILD index d30b024f948..d719e72ce71 100644 --- a/community/plasma-mobile/APKBUILD +++ b/community/plasma-mobile/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-mobile -pkgver=6.0.3.1 +pkgver=6.0.4 pkgrel=0 pkgdesc="Modules providing phone functionality for Plasma" # armhf blocked by extra-cmake-modules @@ -74,7 +74,7 @@ case "$pkgver" in *) _rel=stable;; esac _repo_url="https://invent.kde.org/plasma/plasma-mobile.git" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-mobile-$pkgver.tar.xz +source="https://download.kde.org/stable/plasma/$pkgver/plasma-mobile-$pkgver.tar.xz 99-flashlight.rules " @@ -97,6 +97,6 @@ package() { } sha512sums=" -51ec95a499c8c14183e90b4e9f5e977935c3cd4e10952af870a54afdd03ffe3016f8e901fd7a6d2225d82a692da0ae9ee50ba5f411897df033a2d26486c8c85e plasma-mobile-6.0.3.1.tar.xz +179ee8d029311a9e8328dbbce22d33bd3b929082d553931443b5dc6f0ae2dbbc54320a9dea1c23b956b3da4504b74322200402062912cc620b23c4d8cc4f418e plasma-mobile-6.0.4.tar.xz 4badc25cbb7dc84d6af54cff5f3c09dcc37da86b7e930bdcab6d75f8dd90ef0dd9c8a3837ab696b1f4de9cad82d5e64ddd44904640a92e910a8f45524542be95 99-flashlight.rules " diff --git a/community/plasma-nano/APKBUILD b/community/plasma-nano/APKBUILD index 41e63549c49..963d2cc2ab7 100644 --- a/community/plasma-nano/APKBUILD +++ b/community/plasma-nano/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-nano -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="A minimal Plasma shell package intended for embedded devices" # armhf blocked by extra-cmake-modules @@ -47,5 +47,5 @@ package() { } sha512sums=" -62ac5b715f4160f060391e2bbf57934cfade4a44cefdcf96da224fe50846ab912f2e3114dbc43497753344c3f445311e24234685d131d22dd3f90e0aaefa2790 plasma-nano-6.0.3.tar.xz +c1a15c1ac5d2001f5edc8d4806ae76102003291ea948ba3a2582c5396922ff905c0218f58c91c0eaed504dcd5f9f6fd9809197dc41331039d85c62547eef4e9e plasma-nano-6.0.4.tar.xz " diff --git a/community/plasma-nm/APKBUILD b/community/plasma-nm/APKBUILD index 60655a74251..e6469983b9a 100644 --- a/community/plasma-nm/APKBUILD +++ b/community/plasma-nm/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-nm -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Plasma applet written in QML for managing network connections" # armhf blocked by qt6-qtdeclarative @@ -78,5 +78,5 @@ mobile() { } sha512sums=" -1103b6b0c4b89e1c7ce835e748026324e38c0a807db3cb42107a3f20f5374706eac6e55adf5ae71864ed3bd41dd0468d167bd0645892e689b24b843a276024ea plasma-nm-6.0.3.tar.xz +df2fdb51f3e78ca123ac9c206c2a99ef3e52e7b05a8d8b2d638da675dacefcfb6b13b71ca9f951ab9e4dabea301eb1a1ab7019dbedd1dde4fec0f64bc6558c35 plasma-nm-6.0.4.tar.xz " diff --git a/community/plasma-pa/APKBUILD b/community/plasma-pa/APKBUILD index 45fede5c7e7..f2ae8e16d13 100644 --- a/community/plasma-pa/APKBUILD +++ b/community/plasma-pa/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-pa -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Plasma applet for audio volume management using PulseAudio" # armhf blocked by qt6-qtdeclarative @@ -63,5 +63,5 @@ package() { } sha512sums=" -93685e732ce9b7c3c4fadc475f71859ba5d4a849c6f8a04c65ed00c6b135140a9ef1f953669a0056849c9b02611eb8708a28a939feba8159ff876a81c8ee33fb plasma-pa-6.0.3.tar.xz +a911574ad84ca67caa32b0f038abe687ad1073bbda691ecf5f4b79274ca9f7914284ca96f4ebf4088ed2d69c6eb5190cea0fe7bcbdf2406ce97ea09e7b845300 plasma-pa-6.0.4.tar.xz " diff --git a/community/plasma-sdk/APKBUILD b/community/plasma-sdk/APKBUILD index d7c133d7fc2..e436330b62b 100644 --- a/community/plasma-sdk/APKBUILD +++ b/community/plasma-sdk/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-sdk -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Applications useful for Plasma Development" # armhf blocked by qt6-qtdeclarative @@ -66,5 +66,5 @@ package() { } sha512sums=" -094f5fb9f806b97aaccdc9471d16ccd4817250d04576e5c8c93e2f919a39e9aca8a962de01c0a743f4feb1b35b44645045c6fb022a79c63ebbc996ca2e586023 plasma-sdk-6.0.3.tar.xz +ca150c1985950831fff091306281cf2aa7a6a60b75329af3187955532452a42bcb8baef3c2f7f736c32ef2a83e9a12fb49173571f3395154a4a34e7ed8b64442 plasma-sdk-6.0.4.tar.xz " diff --git a/community/plasma-systemmonitor/APKBUILD b/community/plasma-systemmonitor/APKBUILD index aa2a7c6fbde..d5fdbfbe320 100644 --- a/community/plasma-systemmonitor/APKBUILD +++ b/community/plasma-systemmonitor/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-systemmonitor -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="An application for monitoring system resources" # armhf blocked by extra-cmake-modules @@ -59,5 +59,5 @@ package() { } sha512sums=" -3e4b7f8178c7c774eae0fe9daff7f1fe346a242af32e245676d36ab4bb46d557d5806d3255beeda8e4c7ba60dd697ec43188fac82903a65cd2ca2de75baa4c48 plasma-systemmonitor-6.0.3.tar.xz +1e8269412c6bc8ce32f48fbc9bb7a847884926fcdd8231ab468b1bdc1824733d05d48b69f7fcce1fea92694d4b0bb0caf1f6819eb287dc2b2c0f6fc0bbadc004 plasma-systemmonitor-6.0.4.tar.xz " diff --git a/community/plasma-thunderbolt/APKBUILD b/community/plasma-thunderbolt/APKBUILD index 663e17c0dc2..139c437368e 100644 --- a/community/plasma-thunderbolt/APKBUILD +++ b/community/plasma-thunderbolt/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-thunderbolt -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -54,5 +54,5 @@ package() { } sha512sums=" -9c6e991a7af13bae04af77bf5d3cd85be7b210e107c499ae19f22dd32c8e6e07b99bc7948044548ee33bb4e9535ef33dfb9c70d5ebfe364d57aee1651b0f0fa8 plasma-thunderbolt-6.0.3.tar.xz +119f6af9088dc108ccee9e0ba83d2a357f25a561f774f7ac88282fc8716594fa38d7d2b125cb19fbff9055498b4187f7c7ea7dcf146e8d2103109652df63a936 plasma-thunderbolt-6.0.4.tar.xz " diff --git a/community/plasma-vault/APKBUILD b/community/plasma-vault/APKBUILD index 6703890c804..4516a8730f4 100644 --- a/community/plasma-vault/APKBUILD +++ b/community/plasma-vault/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-vault -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Plasma applet and services for creating encrypted vaults" # armhf blocked by extra-cmake-modules @@ -52,5 +52,5 @@ package() { } sha512sums=" -1ed6e6d644c0d2b3b2cbb05ba471c002955026913e6e1891e9d1f0cac3e4939b99e4dd8a93804f743ebaaa9cc24a489389ef8109275025983dcf15f8cba9aa08 plasma-vault-6.0.3.tar.xz +1f3dadf69a4f1803eb8bc3e6f5b3c147c38761df67d3d121e1226191d8e0ea7b1ccc0a736b5276648d3c98d5a456e59c2df3ac9a80470e8c43e8e659a543c42b plasma-vault-6.0.4.tar.xz " diff --git a/community/plasma-welcome/APKBUILD b/community/plasma-welcome/APKBUILD index e82aadff666..7ff6bc8eec3 100644 --- a/community/plasma-welcome/APKBUILD +++ b/community/plasma-welcome/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-welcome -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="A friendly onboarding wizard for Plasma" # armhf blocked by qt6-qtdeclarative @@ -62,5 +62,5 @@ package() { } sha512sums=" -6ba343dc3153da489c0ac13bfea45be055e1095cde09c5714dc57c32960f0cf92aea6269930477482358c6c84739d01ac0b41eda12ab16f1526e830328306942 plasma-welcome-6.0.3.tar.xz +865c4c84dfeede20f6e1d740833bda009af3be5202321e14a74c3dda9a5086e685361a4d75bb5a3ded85e827d0bd0fae59ec4f5d11799fce34c1061aeec90651 plasma-welcome-6.0.4.tar.xz " diff --git a/community/plasma-workspace-wallpapers/APKBUILD b/community/plasma-workspace-wallpapers/APKBUILD index 3caf72e698d..ae8038ab7ca 100644 --- a/community/plasma-workspace-wallpapers/APKBUILD +++ b/community/plasma-workspace-wallpapers/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-workspace-wallpapers -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Wallpapers for the Plasma Workspace" # armhf blocked by extra-cmake-modules @@ -39,5 +39,5 @@ package() { } sha512sums=" -44a2433f20241f0e745bc72ab8c9bc6f5ddb0160eee4c6bbdcde089b51b891edd4d2917c4e25f4e2e93ded3ccd0712025d0d51954bed245f6a2684771303137a plasma-workspace-wallpapers-6.0.3.tar.xz +8a6233319e9a6d480f025a4d92b2289820e62417df69b22ccaa911790eefbf14e98de844d27aa498d3a099f309fc1d70e9fb3bd11721d781f58cefc82238bfab plasma-workspace-wallpapers-6.0.4.tar.xz " diff --git a/community/plasma-workspace/APKBUILD b/community/plasma-workspace/APKBUILD index b6944c059d8..effdf79c171 100644 --- a/community/plasma-workspace/APKBUILD +++ b/community/plasma-workspace/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma-workspace -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="KDE Plasma Workspace" # armhf blocked by extra-cmake-modules @@ -179,6 +179,6 @@ sddm_breeze() { } sha512sums=" -cd24ba67497b93017b4c49a14fa359858b0960375718b6871c381e9e8bf7b13b537c0f1ea5646140ab168f790b108927208b3ef960b3f822d6083511a5db13fd plasma-workspace-6.0.3.tar.xz +d55cd7232b2d4da4172e813cdaa432e9582f3d16a7f38055303617a0c66f67511c6e20cc19bfb8bff68e06515c445783040dd212fbb686b2993f469ec6757466 plasma-workspace-6.0.4.tar.xz affbeec6d236bf09ae95b7bf478015ead9b5eabcffa8291107e34463bc3f7563c01d4e444e035b7eb575700e64c4da9f5079950b254b8c24b305845f031eb17f sddm.conf " diff --git a/community/plasma5support/APKBUILD b/community/plasma5support/APKBUILD index 6453737493d..c1ee02640f0 100644 --- a/community/plasma5support/APKBUILD +++ b/community/plasma5support/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plasma5support -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Support components for porting from KF5/Qt5 to KF6/Qt6" # armhf blocked by extra-cmake-modules @@ -53,5 +53,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -c2abda2ccb0538a962df9faf342eea0880541a9e461196aa55b046b7c9668199cb1468325d0bb3e25f863a8011056b287601bebe1e890028b4444f0d03e8a2fd plasma5support-6.0.3.tar.xz +db501ad90331871a46450a3e051830970d4da2e0a90f7ee4b8d97efca7f1b2e9995418bc124b1378fa3af94dcfcdb9c46f376eb44d27c54036b2e22469867763 plasma5support-6.0.4.tar.xz " diff --git a/community/plocate/APKBUILD b/community/plocate/APKBUILD index e03162bcbfa..456ee7442f5 100644 --- a/community/plocate/APKBUILD +++ b/community/plocate/APKBUILD @@ -20,6 +20,8 @@ subpackages="$pkgname-doc" source="https://plocate.sesse.net/download/plocate-$pkgver.tar.gz plocate.cron updatedb.conf + + fix-statx.patch " # no tests # plocate is g+s @@ -48,4 +50,5 @@ sha512sums=" c26ea85f4cc7249f1af7450cfd07f59a03ea98b970f4be67222282fda7789bf9a8fe3d24835f6f3f6068d54802c1fe1e2b9a487e04d568965a23df34845178c1 plocate-1.1.22.tar.gz 4f3f1ef1016abe0488fe0b61eec03fa6ce340d4abe59b4d371d0085934244cffe3af67669505ded2427f03a026857806de0479050d4e023817cae58390a7cb88 plocate.cron 863d8687bc1c520cc262ade3a7ce8a02b6930d7cbbc588c36d23f81a4a4c5432f4d9234a5498632b767a352e3996cf4da1c9e98d1b699b9d973cd9a9313d9557 updatedb.conf +c25d3c8b255458184a1824e4fe87244b2cb73e0c5c08f8656fea3518a4c3b6afafa28da9fd29fdd68cf3f034dbb7846e673d92993719340b03a1027270a4e5d7 fix-statx.patch " diff --git a/community/plocate/fix-statx.patch b/community/plocate/fix-statx.patch new file mode 100644 index 00000000000..5254b02b1b0 --- /dev/null +++ b/community/plocate/fix-statx.patch @@ -0,0 +1,41 @@ +Patch-Source: https://git.openembedded.org/meta-openembedded/plain/meta-oe/recipes-extended/plocate/plocate/0001-Include-linux-stat.h-only-when-sys-stat.h-is-not-inc.patch +-- +From 1d2197c195e19f1414afef75186bdd4c27b3ee5a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 23 Mar 2024 18:16:19 -0700 +Subject: [PATCH] Include linux/stat.h only when sys/stat.h is not included + +This ends up providing certain functions from both headers e.g. +statx and statx_timestamp since liburing.h forcefully defines _GNU_SOURCE +to help musl compile liburing, however, this define then causes these +two files to conflict in plocate, it seems this file is redundant here +when sys/stat.h is included anyway, mark it for conditional include + +Fixes +| In file included from ../plocate-1.1.22/plocate.cpp:5: +| In file included from ../plocate-1.1.22/io_uring_engine.h:14: +| In file included from /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/plocate/1.1.22/recipe-sysroot/usr/include/liburing.h:14: +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/plocate/1.1.22/recipe-sysroot/usr/include/sys/stat.h:124:8: error: redefinition of 'statx_timestamp' +| 124 | struct statx_timestamp { +| | ^ +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/plocate/1.1.22/recipe-sysroot/usr/include/linux/stat.h:56:8: note: previous definition is here | 56 | struct statx_timestamp { | | ^ | In file included from ../plocate-1.1.22/plocate.cpp:5: | In file included from ../plocate-1.1.22/io_uring_engine.h:14: | In file included from /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/plocate/1.1.22/recipe-sysroot/usr/include/liburing.h:14: | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/plocate/1.1.22/recipe-sysroot/usr/include/sys/stat.h:129:8: error: redefinition of 'statx' | 129 | struct statx { | | ^ | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/plocate/1.1.22/recipe-sysroot/usr/include/linux/stat.h:99:8: note: previous definition is here +| 99 | struct statx { +| | ^ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + io_uring_engine.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/io_uring_engine.h ++++ b/io_uring_engine.h +@@ -7,7 +7,6 @@ + #include <string_view> + #include <sys/socket.h> + #include <sys/types.h> +-#include <linux/stat.h> + + struct io_uring_sqe; + #ifndef WITHOUT_URING diff --git a/community/plymouth-kcm/APKBUILD b/community/plymouth-kcm/APKBUILD index 6a623430f0d..bcc26786d55 100644 --- a/community/plymouth-kcm/APKBUILD +++ b/community/plymouth-kcm/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=plymouth-kcm -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -52,5 +52,5 @@ package() { } sha512sums=" -98cb633c52ef88392b96dd03799b609e3a5533bb6c79d30c626d39babae2b58fa2fc520ac9c662012d37fc3e4856ec9e0ee67c29e49ec83ee71ada4628fb92c5 plymouth-kcm-6.0.3.tar.xz +b9e4865a79d99b72203a3e6088eb65ac6eb4291de771746439c5984c7b13aa9cdb7b3a858867e122f35151e9cb18358de100fbde8590262f4e2966c06098ae48 plymouth-kcm-6.0.4.tar.xz " diff --git a/community/pngcrush/APKBUILD b/community/pngcrush/APKBUILD index 4049f7509c3..b9af4329a2a 100644 --- a/community/pngcrush/APKBUILD +++ b/community/pngcrush/APKBUILD @@ -8,7 +8,9 @@ url="https://pmt.sourceforge.net/pngcrush/" arch="all" license="Zlib" makedepends="zlib-dev libpng-dev" -source="https://downloads.sourceforge.net/pmt/pngcrush-$pkgver-nolib.tar.xz" +source="https://downloads.sourceforge.net/pmt/pngcrush-$pkgver-nolib.tar.xz + add-adler32-check.patch + " builddir="$srcdir/$pkgname-$pkgver-nolib" build() { @@ -21,4 +23,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e pngcrush-1.8.13-nolib.tar.xz" +sha512sums=" +c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e pngcrush-1.8.13-nolib.tar.xz +449b0cae18f2445ab7785c089749b4ef996bf12015f20c641dd0f46646b2cd1cf10cf1d680a04a45ec1c69a6f42ea8b39cd16a737acd555068e99ad2d0bc661f add-adler32-check.patch +" diff --git a/community/pngcrush/add-adler32-check.patch b/community/pngcrush/add-adler32-check.patch new file mode 100644 index 00000000000..d719c5aea2f --- /dev/null +++ b/community/pngcrush/add-adler32-check.patch @@ -0,0 +1,30 @@ +Patch-Source: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181aa56d715851ed0cd750a1c503ff26826766ca +-- +From 181aa56d715851ed0cd750a1c503ff26826766ca Mon Sep 17 00:00:00 2001 +From: Marek Szuba <marecki@gentoo.org> +Date: Tue, 30 Jan 2024 11:07:29 +0000 +Subject: media-gfx/pngcrush: only use PNG_IGNORE_ADLER32 if supported + +Since libpng-1.6.41 support for PNG_IGNORE_ADLER32 is optional, disabled +by default owing to its use of an undocumented zlib function, and not +presently enabled in Gentoo. + +Funnily enough there are *two* places in pngcrush code where this option +is used and one of them has already used an ifdef guard. + +Closes: https://bugs.gentoo.org/923023 + + +--- a/pngcrush.c ++++ b/pngcrush.c +@@ -5520,8 +5520,10 @@ + * they were already checked in the pngcrush_measure_idat + * function + */ ++# ifdef PNG_IGNORE_ADLER32 + png_set_option(read_ptr, PNG_IGNORE_ADLER32, + PNG_OPTION_ON); ++# endif + png_set_crc_action(read_ptr, PNG_CRC_QUIET_USE, + PNG_CRC_QUIET_USE); + } diff --git a/community/podman-compose/APKBUILD b/community/podman-compose/APKBUILD new file mode 100644 index 00000000000..796c9ee539f --- /dev/null +++ b/community/podman-compose/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: TBK <alpine@jjtc.eu> +# Maintainer: omni <omni+alpine@hack.org> +pkgname=podman-compose +pkgver=1.1.0 +pkgrel=0 +pkgdesc="Script to run docker-compose.yml using podman" +url="https://github.com/containers/podman-compose" +# podman (netavark & aardvark-dns -> nix crate) +arch="noarch !s390x" +license="GPL-2.0-or-later" +options="!check" # Requires running docker env +depends="podman py3-dotenv py3-yaml" +makedepends="py3-gpep517 py3-setuptools py3-wheel" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/containers/podman-compose/archive/v$pkgver.tar.gz" + +build() { + gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2 +} + +package() { + python3 -m installer -d "$pkgdir" .dist/*.whl +} + +sha512sums=" +27d732f7e92cff7cc6149982b7b55998467118b2db6a24f588919c747f6e97369d8a24a0198e19179de3baf504220f81d7a1246b12f7c0b1959191cf877e8f14 podman-compose-1.1.0.tar.gz +" diff --git a/community/podman-tui/APKBUILD b/community/podman-tui/APKBUILD index 846b4eda432..c45a64d2408 100644 --- a/community/podman-tui/APKBUILD +++ b/community/podman-tui/APKBUILD @@ -1,8 +1,8 @@ # Contributor: omni <omni+alpine@hack.org> # Maintainer: omni <omni+alpine@hack.org> pkgname=podman-tui -pkgver=1.0.0 -pkgrel=1 +pkgver=1.0.1 +pkgrel=0 pkgdesc="Terminal user interface for Podman v4" url="https://github.com/containers/podman-tui" license="Apache-2.0" @@ -31,5 +31,5 @@ package() { } sha512sums=" -918b3efb823a543a439ae0f56c59ee2689961ac6e39a40054a7971ddf02056ca50c7c681ca03c45590e9fdfce1822f406bbf90f9b25563a0ef9ae75b88235a8c podman-tui-1.0.0.tar.gz +3c5ff5a77e885a0518a16e8d7fd0581a80b16650b546d2c736c50503c250797be1b8cb1a2da68ee1eed5a7a1dcdbcfa8344f37d0c6724c341470d05446a0591e podman-tui-1.0.1.tar.gz " diff --git a/community/podman/APKBUILD b/community/podman/APKBUILD index 75a99d1e441..844046da846 100644 --- a/community/podman/APKBUILD +++ b/community/podman/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=podman -pkgver=4.9.3 -pkgrel=2 +pkgver=4.9.4 +pkgrel=0 pkgdesc="Simple management tool for pods, containers and images" url="https://podman.io/" license="Apache-2.0" @@ -51,6 +51,8 @@ source="https://github.com/containers/podman/archive/v$pkgver/podman-$pkgver.tar " # secfixes: +# 4.9.4-r0: +# - CVE-2024-1753 # 4.9.2-r0: # - CVE-2024-23651 # - CVE-2024-23652 @@ -140,8 +142,8 @@ docker_doc() { } sha512sums=" -395014bbe70923f1444d2f33440013a16e9c339b70be5e6a9c7026617a40795a1c0e410c08a52fba46b9f5e853d853ce4133db36167a3c5ace7d325f8b3a3327 podman-4.9.3.tar.gz -bc0c8d110f72c50d04b214bb2339e1a0ee55cd4c7be10de2819a406fb92422b9f1513a96c12815c6007093196472d110cfc02f7d12cebf9ff8978bfc3159889a no-quadlet.patch +7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b podman-4.9.4.tar.gz +4eb688c35634c0986231c9723667e1fac034573b0bc778bf078c3e797120653e7013965e59c63075eb9db9685aae8ddd79a899288b674f460a06aa4410ba4499 no-quadlet.patch f8941dc3f8c6b08b288e3347ef2d782140f6e46809da0353f3695338a2de75a971b312e57d09b0a0ea51557568d888b367e3b234be550aea8386321878f4a22f podman.initd ec6e6d3f72d0ab6c90a30b2cca5152c0d0f1e402ae671289263d7bf3b5141de9d67c3593f20b6075cedd214b7fb1506e69ff7b4f9691b43b391389343ab9b9b1 podman.confd " diff --git a/community/podman/no-quadlet.patch b/community/podman/no-quadlet.patch index be942d498a9..3a54cc007f1 100644 --- a/community/podman/no-quadlet.patch +++ b/community/podman/no-quadlet.patch @@ -2,7 +2,7 @@ diff --git a/Makefile b/Makefile index 8e701c3..e20799b 100644 --- a/Makefile +++ b/Makefile -@@ -219,7 +219,7 @@ binaries: podman podman-remote ## Build podman and podman-remote binaries +@@ -232,7 +232,7 @@ binaries: podman podman-remote ## Build podman and podman-remote binaries else ifneq (, $(findstring $(GOOS),darwin windows)) binaries: podman-remote ## Build podman-remote (client) only binaries else @@ -11,7 +11,7 @@ index 8e701c3..e20799b 100644 endif # Extract text following double-# for targets, as their description for -@@ -829,11 +829,8 @@ install.bin: +@@ -834,11 +834,8 @@ install.bin: ifneq ($(shell uname -s),FreeBSD) install ${SELINUXOPT} -m 755 bin/rootlessport $(DESTDIR)$(LIBEXECPODMAN)/rootlessport test -z "${SELINUXOPT}" || chcon --verbose --reference=$(DESTDIR)$(LIBEXECPODMAN)/rootlessport bin/rootlessport diff --git a/community/poedit/APKBUILD b/community/poedit/APKBUILD index ae7b460fa75..c4f9fc2269e 100644 --- a/community/poedit/APKBUILD +++ b/community/poedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=poedit -pkgver=3.4.2 +pkgver=3.4.3 pkgrel=0 pkgdesc="cross-platform translations editor" url="https://www.poedit.net" @@ -45,6 +45,6 @@ package() { } sha512sums=" -2b12b4cdeda99e1074767d2fab3e8f1b2c281024a03e0c504878cceeba454f471192c98ea0634df1e26fd9bd403944b24ccd0ffc0f94d1f2f5e85fc45bcc09ea poedit-3.4.2.tar.gz +98dff841ad5f4efad752e5d58ee83fb2a501bbcf7ca11860c1f9a5f7e5a989288f624041c9b6f70d64fe1ee547349b0b1b89690abcfa23cbb50ebbfced8e125f poedit-3.4.3.tar.gz fe8b946aaa12d3c6c989f9cd8182c4e7e0ebb81fd7d6efa0b8e0a2284c41691dfc3b8267cde81f62c4478df188350af79dc9ba669059e8ca68f939e61e5f1648 include-ctime.patch " diff --git a/community/polari/APKBUILD b/community/polari/APKBUILD index 6f6dc24106e..8dd047bafbf 100644 --- a/community/polari/APKBUILD +++ b/community/polari/APKBUILD @@ -1,32 +1,28 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=polari -pkgver=45.0 +pkgver=46.0 pkgrel=1 -pkgdesc="Polari is a simple IRC Client that is designed to integrate seamlessly with GNOME 3" +pkgdesc="Polari is a simple IRC Client that is designed to integrate seamlessly with the GNOME graphical environment" url="https://wiki.gnome.org/Apps/Polari" arch="all !armhf !s390x" # limited by gjs license="GPL-2.0-or-later" -depends=" - telepathy-logger - telepathy-idle - telepathy-mission-control - libadwaita - libsecret - libsoup3 - " +# gtk+3.0 needed by thumbnailer, see https://gitlab.gnome.org/GNOME/polari/-/issues/223 +# drop once that's handled +depends="libsecret libsoup3 gtk+3.0 dbus-glib telepathy-mission-control telepathy-idle" makedepends=" desktop-file-utils gjs-dev gobject-introspection-dev - gtk+3.0-dev itstool + libadwaita-dev meson telepathy-glib-dev + tracker-dev " -checkdepends="appstream-glib" +checkdepends="appstream-glib tracker-testutils" subpackages="$pkgname-lang $pkgname-doc" -source="https://download.gnome.org/sources/polari/${pkgver%.*}/polari-$pkgver.tar.xz" +source="https://gitlab.gnome.org/GNOME/polari/-/archive/$pkgver/polari-$pkgver.tar.gz" build() { abuild-meson -Db_lto=true . output @@ -44,5 +40,5 @@ package() { } sha512sums=" -33a3a0ef6960d2ac11fc312efc859a5ea75198c4ae8e74ff0885f9d0aa04f4e59d84be1495db3f498486b595aac66a91ec63d121a92557d9386dfbaed60bb409 polari-45.0.tar.xz +2888adab7c8c696bcdd8cfd200475f2b0310c03dae91a63206e9492ef10316f3abf2d7233eff9f2355975b3d5e46db639a223b6fea8483258f7a18eb76cbd757 polari-46.0.tar.gz " diff --git a/community/polkit-kde-agent-1/APKBUILD b/community/polkit-kde-agent-1/APKBUILD index 14618187cd7..31701632078 100644 --- a/community/polkit-kde-agent-1/APKBUILD +++ b/community/polkit-kde-agent-1/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=polkit-kde-agent-1 -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Daemon providing a polkit authentication UI for KDE" # armhf blocked by extra-cmake-modules @@ -52,5 +52,5 @@ package() { } sha512sums=" -cce4d9c3e09ef38da6e0c5c5d11ecd1b12d71cbee853dbe7e31ddfc90a99fe1ccb1ce87087d20cefd8e1092596d9aaa34fb24db912c7d63847c7a72cf3bf81cb polkit-kde-agent-1-6.0.3.tar.xz +7f5a3c0f3283caf6b669a237980d5cec8774d0fcbc5512b37981c146b5da19aec97374e6288ceffe5f257021bc0765562f84c57bf2de9c0940413a3b06182c91 polkit-kde-agent-1-6.0.4.tar.xz " diff --git a/community/poppler-qt5/APKBUILD b/community/poppler-qt5/APKBUILD index e79718b5013..1a00b121e19 100644 --- a/community/poppler-qt5/APKBUILD +++ b/community/poppler-qt5/APKBUILD @@ -6,7 +6,7 @@ pkgname=poppler-qt5 _pkgname=poppler pkgver=24.02.0 -pkgrel=0 +pkgrel=1 pkgdesc="PDF rendering library based on xpdf 3.0" url="https://poppler.freedesktop.org/" arch="all" diff --git a/community/postgis/APKBUILD b/community/postgis/APKBUILD index a6bec50969d..22fd3721b43 100644 --- a/community/postgis/APKBUILD +++ b/community/postgis/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=postgis pkgver=3.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="spatial database extender for PostgreSQL object-relational database" url="https://postgis.net/" arch="all" diff --git a/community/postgresql-citus/APKBUILD b/community/postgresql-citus/APKBUILD index ccbdb07ae8d..0ad744618c6 100644 --- a/community/postgresql-citus/APKBUILD +++ b/community/postgresql-citus/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Pirogov <vbnet.ru@gmail.com> pkgname=postgresql-citus _projname=citus -pkgver=12.1.2 +pkgver=12.1.3 pkgrel=0 pkgdesc="Scalable PostgreSQL for multi-tenant and real-time analytics workloads" url="https://github.com/citusdata/citus" @@ -55,5 +55,5 @@ bitcode() { } sha512sums=" -00ca6d7053c91671c894bb2afec25ba2a38aae50b6f363a1e63e08e4f3016e43739c9a48b20d93afecb5cc0f2d886fd12318dd8f54f67c052baca2d421882828 citus-12.1.2.tar.gz +2bcd5fa83e4fa56b90a3a3873229d3c5a294a0483d031d04ebd9602132883dc54485ca0907b867cd545f9b131a5f8cdeecb2e7e500b46d87f01aa5d5a34ff16f citus-12.1.3.tar.gz " diff --git a/community/postgresql-orafce/APKBUILD b/community/postgresql-orafce/APKBUILD index 5e2e04b3fc3..5f47808446f 100644 --- a/community/postgresql-orafce/APKBUILD +++ b/community/postgresql-orafce/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=postgresql-orafce _pkgname=orafce -pkgver=4.9.3 +pkgver=4.10.0 _pkgver=VERSION_${pkgver//./_} pkgrel=0 pkgdesc="Oracle's compatibility functions and packages for PostgreSQL" @@ -44,5 +44,5 @@ bitcode() { } sha512sums=" -de80c984cc9426be7bf85965705022b38747b39d89dd5c1f58e78740714e8fd184135b7f0547f9265f77d4e6ea7c088b2dadcb8defc065727fa1a9088228de38 postgresql-orafce-4.9.3.tar.gz +7a9724beba4d861106d6055dd6a2a1fef49b6d92134bcbacf68bc2b9b0624353151a012eb38f1f6e63935d01562d57d715faf4eaba0c5523d0aab72b8a122aa4 postgresql-orafce-4.10.0.tar.gz " diff --git a/community/postgresql-pgvector/APKBUILD b/community/postgresql-pgvector/APKBUILD index c3a7a769034..e6ac71e4dde 100644 --- a/community/postgresql-pgvector/APKBUILD +++ b/community/postgresql-pgvector/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=postgresql-pgvector _projname=pgvector -pkgver=0.5.1 -pkgrel=2 +pkgver=0.6.2 +pkgrel=0 pkgdesc="Open-source vector similarity search for PostgreSQL" url="https://github.com/pgvector/pgvector" arch="all" @@ -34,5 +34,5 @@ bitcode() { } sha512sums=" -1de14bbe8237ab3759a6f5d1d160f9f63bee2f60079ca31c310514475cbdfbd376188ec98af54ae98a22b9a82c4462907f5fc65ca42215cf1468c166021c2154 pgvector-0.5.1.tar.gz +745ec77d6540a01a867e0b44964c583ff17b78749ea2b2c8555d7f5605d4f0956d68b921e99a03317e1c30fb4ba5f1b4426a8a06fa7e28f1b6ae365d8a41a661 pgvector-0.6.2.tar.gz " diff --git a/community/postgresql-pllua/APKBUILD b/community/postgresql-pllua/APKBUILD index bcb3d9bdbeb..066bf8f0539 100644 --- a/community/postgresql-pllua/APKBUILD +++ b/community/postgresql-pllua/APKBUILD @@ -7,9 +7,9 @@ _pkgver="REL_${pkgver//./_}" pkgrel=1 pkgdesc="Procedural language for PostgreSQL using Lua" url="https://github.com/RhodiumToad/pllua-ng" -# ppc64le, riscv64: limited by luajit +# ppc64le, riscv64, loongarch64: limited by luajit # s390x: fails to build -arch="all !ppc64le !riscv64 !s390x" +arch="all !ppc64le !riscv64 !s390x !loongarch64" license="MIT" makedepends="postgresql-dev postgresql luajit-dev" options="!check" # tests require running PostgreSQL diff --git a/community/postgresql-timescaledb/APKBUILD b/community/postgresql-timescaledb/APKBUILD index fa4b43dbfca..df686eec452 100644 --- a/community/postgresql-timescaledb/APKBUILD +++ b/community/postgresql-timescaledb/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: wener <wenermail@gmail.com> pkgname=postgresql-timescaledb -pkgver=2.14.1 +pkgver=2.14.2 pkgrel=0 pkgdesc="PostgreSQL extension for time‑series data" url="https://github.com/timescale/timescaledb" @@ -42,7 +42,8 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DREGRESS_CHECKS=OFF \ + -DREGRESS_CHECKS="$(want_check && echo ON || echo OFF)" \ + -DTAP_CHECKS="$(want_check && echo ON || echo OFF)" \ -DAPACHE_ONLY=ON cmake --build build } @@ -58,6 +59,6 @@ package() { } sha512sums=" -c9e4e55068b191694f8341e2452e2b8a79fc6aa8ea6d818a2b464a156bf7357471616c2de13aa7dd29d6b6c34eb58763f8835af38102b1372695f559334bd359 postgresql-timescaledb-2.14.1.tar.gz +5a7ab4df5d89b83d423be5d6770098ab0303b22e29166afd3ab91ac2199571df20e33ec9f40bfa90ddf44829571fe696f311d81d27b46d569f2d75e75970e4f9 postgresql-timescaledb-2.14.2.tar.gz fe542830c3aad330c6c1da6e83cc308d749787f7ef7bb23eec7e834f1264aa2ca93b9e272f34c92b42dbb5ca9ea93e311831dd5910d6ac8e9afbc92725439eaf fix-build.patch " diff --git a/community/postgresql-uint/APKBUILD b/community/postgresql-uint/APKBUILD index 2a602ec9fba..ef80111aaee 100644 --- a/community/postgresql-uint/APKBUILD +++ b/community/postgresql-uint/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Patrick Gansterer <paroga@paroga.com> pkgname=postgresql-uint _pkgname=pguint -pkgver=1.20220601 -pkgrel=1 +pkgver=1.20231206 +pkgrel=0 pkgdesc="Unsigned and other extra integer types for PostgreSQL" url="https://github.com/petere/pguint" arch="all" @@ -32,5 +32,5 @@ bitcode() { } sha512sums=" -5ffb7b62e0427ba025f1368930e8ebd6b616fec2d6498b5e9988ea24cc73cca05c47f58b6720750bad84bb030cb25c1911fe5a139718d8f072fef32ac16eecf0 postgresql-uint-1.20220601.tar.gz +1f39cd60111b3348ee80e87409cafcfb83b020d67c3538ee3ba2001fde7004bf71da887d881744c32ca03678f96df90d16dc0420d585d35c3ab91604648cc016 postgresql-uint-1.20231206.tar.gz " diff --git a/community/postgresql13/APKBUILD b/community/postgresql13/APKBUILD deleted file mode 100644 index 8df9754abf3..00000000000 --- a/community/postgresql13/APKBUILD +++ /dev/null @@ -1,510 +0,0 @@ -# Maintainer: Jakub Jirutka <jakub@jirutka.cz> -# Contributor: G.J.R. Timmer <gjr.timmer@gmail.com> -# Contributor: Jakub Jirutka <jakub@jirutka.cz> -_pkgname=postgresql -pkgver=13.14 -pkgrel=1 -_majorver=${pkgver%%.*} -# Should this aport provide libpq* and libecpg*? true/false -# Exactly one postgresql aport must be the default one! -_default_ver=false -pkgname=$_pkgname$_majorver -pkgdesc="A sophisticated object-relational DBMS, version $_majorver" -url="https://www.postgresql.org/" -arch="all !riscv64 !loongarch64" -license="PostgreSQL" -_llvmver=14 -depends="$pkgname-client postgresql-common tzdata" -depends_dev=" - libpq-dev - libecpg-dev - clang$_llvmver - icu-dev - llvm$_llvmver - openssl-dev>3 - " -checkdepends="diffutils" -makedepends="$depends_dev - libxml2-dev - linux-headers - llvm$_llvmver-dev - openldap-dev - perl-dev - python3-dev - readline-dev - tcl-dev - util-linux-dev - zlib-dev - bison flex - " -pkgusers="postgres" -pkggroups="postgres" -install="$pkgname.post-install $pkgname.pre-deinstall" -provider_priority=$_majorver -provides="postgresql" -replaces="postgresql" # for backward compatibility -$_default_ver && subpackages=" - libpq - libpq-dev:libpq_dev - libecpg - libecpg-dev:libecpg_dev - " -subpackages=" - $subpackages - $pkgname-client - $pkgname-jit - $pkgname-contrib - $pkgname-plperl - $pkgname-plperl-contrib:plperl_contrib - $pkgname-plpython3 - $pkgname-plpython3-contrib:plpython3_contrib - $pkgname-pltcl - $pkgname-contrib-jit:contrib_jit - $pkgname-dev - $pkgname-doc - $pkgname-openrc - " -source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz2 - initdb.patch - perl-rpath.patch - per-version-dirs.patch - unix_socket_directories.patch - disable-broken-tests.patch - disable-test-collate.icu.utf8.patch - disable-html-docs.patch - remove-libecpg_compat.patch - czech-snowball-stemmer.patch - make-split-headers.patch - jit-datalayout-mismatch-on-s390x.patch - pg_config-add-major-version.patch - dont-use-locale-a-on-musl.patch - icu-collations-hack.patch - libpgport-pkglibdir.patch.txt - external-libpq.patch.txt - - pltcl_create_tables.sql - " -builddir="$srcdir/$_pkgname-$pkgver" - -# secfixes: -# 13.14-r0: -# - CVE-2024-0985 -# 13.12-r0: -# - CVE-2023-39418 -# - CVE-2023-39417 -# 13.11-r0: -# - CVE-2023-2454 -# - CVE-2023-2455 -# 13.10-r0: -# - CVE-2022-41862 -# 13.8-r0: -# - CVE-2022-2625 -# 13.7-r0: -# - CVE-2022-1552 -# 13.5-r0: -# - CVE-2021-23214 -# - CVE-2021-23222 -# 13.4-r0: -# - CVE-2021-3677 -# 13.3-r0: -# - CVE-2021-32027 -# - CVE-2021-32028 -# - CVE-2021-32029 -# 13.2-r0: -# - CVE-2021-3393 -# - CVE-2021-20229 - -_bindir=usr/libexec/$pkgname -_datadir=usr/share/$pkgname -_docdir=usr/share/doc/$pkgname -_mandir=$_datadir/man -_includedir=usr/include/postgresql -# Directory for server-related libraries. This is hard-coded in -# per-version-dirs.patch. -_srvlibdir=usr/lib/$pkgname - -# Programs to be included in the -client subpackage. -# TODO: This was probably originally copied from Debian and I have no idea -# why these are considered as front-end (client) programs and the rest of -# the programs are not. So it should be reviewed. -_client_cmds=" - clusterdb - createdb - createuser - dropdb - dropuser - pg_basebackup - pg_dump - pg_dumpall - pg_isready - pg_receivewal - pg_recvlogical - pg_restore - pg_verifybackup - pgbench - psql - reindexdb - vacuumdb - " - -prepare() { - default_prepare - - if $_default_ver; then - cp -rl "$builddir" "$builddir-ifaces" - else - msg 'external-libpq.patch' - patch -p1 < "$srcdir"/external-libpq.patch.txt - fi - # Note: This must be applied after clonning $builddir-ifaces. - patch -p1 < "$srcdir"/libpgport-pkglibdir.patch.txt -} - -build() { - export LLVM_CONFIG="/usr/lib/llvm$_llvmver/bin/llvm-config" - export PYTHON=/usr/bin/python3 - export CFLAGS="${CFLAGS/-Os/-O2}" - export CPPFLAGS="${CPPFLAGS/-Os/-O2}" - # older clang versions don't have a 'clang' exe anymore. - export CLANG=clang-$_llvmver - - _configure --with-ldap - make world - - if $_default_ver; then - cd "$builddir-ifaces" - - _configure --without-ldap - local dir; for dir in include common port interfaces bin/pg_config; do - make -C src/$dir - done - fi -} - -_configure() { - local _extra_opts - # When disable-spinlocks is no longer required - check postgresql-bdr package. - case "$CARCH" in - riscv64) _extra_opts='--disable-spinlocks';; - esac - - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --bindir=/$_bindir \ - --datarootdir=/usr/share \ - --datadir=/$_datadir \ - --docdir=/$_docdir \ - --includedir=/$_includedir \ - --libdir=/usr/lib \ - --mandir=/$_mandir \ - --sysconfdir=/etc/postgresql \ - --disable-rpath \ - --with-system-tzdata=/usr/share/zoneinfo \ - --with-libxml \ - --with-openssl \ - --with-uuid=e2fs \ - --with-llvm \ - --with-icu \ - --with-perl \ - --with-python \ - --with-tcl \ - $_extra_opts \ - "$@" -} - -check() { - _run_tests src/test - _run_tests src/pl - _run_tests contrib -} - -package() { - make DESTDIR="$pkgdir" install install-docs - - if $_default_ver; then - cd "$builddir-ifaces" - - # Override libpq and libecpg files with the build without LDAP support. - local dir; for dir in common port interfaces bin/pg_config; do - make -C src/$dir DESTDIR="$pkgdir" bindir=/usr/bin install - done - make -C src/include DESTDIR="$pkgdir" install-interfaces - fi - - cd "$pkgdir" - - # Duplicate of usr/bin/ecpg. - rm -f ./$_bindir/ecpg - - mkdir -p ./usr/bin - ln -s /$_bindir/postgres ./usr/bin/postgres$_majorver - - # This file is used by pg_versions and init script. - echo "$_majorver" > ./$_bindir/PG_VERSION - - install -d -m750 -o postgres -g postgres \ - ./etc/postgresql$_majorver \ - ./var/lib/postgresql \ - ./var/log/postgresql - - local server_cmds=$(_setdiff "$(ls -1 $_bindir)" "$_client_cmds pg_config ecpg PG_VERSION") - [ "$server_cmds" ] || die 'package: variable server_cmds is empty' - - # These commands are symlinked to /usr/bin by pg_versions script after - # installation. - provides="$provides $(echo "$server_cmds" | sed 's/^/cmd:&/')" -} - -libpq() { - pkgdesc="PostgreSQL client library" - depends="" - replaces="" - - amove usr/lib/libpq.so.* -} - -libpq_dev() { - pkgdesc="PostgreSQL client library (development files)" - depends="" - replaces="" - - amove usr/bin/pg_config - - amove $_includedir/internal/* - amove $_includedir/libpq-*.h - amove $_includedir/libpq/* - amove $_includedir/pg_config*.h - amove $_includedir/postgres_ext.h - - amove usr/lib/libpq.* - amove usr/lib/libpgcommon*.a - amove usr/lib/libpgport*.a - amove usr/lib/pkgconfig/libpq.pc -} - -libecpg() { - pkgdesc="ECPG - Embedded SQL in C" - depends="" - provides="postgresql-libs" # for backward compatibility (Alpine <3.15) - replaces="$provides" # for backward compatibility (Alpine <3.15) - - amove usr/lib/libecpg.so.* - amove usr/lib/libpgtypes.so.* -} - -libecpg_dev() { - pkgdesc="ECPG - Embedded SQL in C (development files)" - depends="libpq-dev=$pkgver-r$pkgrel" - replaces="" - - amove usr/bin/ecpg - - amove $_includedir/ecpg*.h - amove $_includedir/informix/* - amove $_includedir/pgtypes*.h - amove $_includedir/sql3types.h - amove $_includedir/sqlca.h - amove $_includedir/sqlda*.h - - amove usr/lib/libecpg.* - amove usr/lib/libpgtypes.* - amove usr/lib/pkgconfig/libecpg.pc - amove usr/lib/pkgconfig/libpgtypes.pc -} - -client() { - pkgdesc="PostgreSQL client" - depends="postgresql-common" - _subpkg_common - - local cmd; for cmd in $_client_cmds; do - amove $_bindir/$cmd - # These commands are symlinked to /usr/bin by pg_versions script after - # installation. - provides="$provides cmd:$cmd" - done - amove $_bindir/PG_VERSION -} - -jit() { - pkgdesc="Just-in-time compilation support for PostgreSQL" - depends="$pkgname=$pkgver-r$pkgrel" - _subpkg_common - - amove $_srvlibdir/bitcode/* - amove $_srvlibdir/llvmjit.so - amove $_srvlibdir/llvmjit_types.bc -} - -contrib() { - pkgdesc="Extension modules distributed with PostgreSQL" - depends="$pkgname=$pkgver-r$pkgrel" - _subpkg_common - - cd "$builddir" - - # Avoid installing plperl and plpython extensions, these will be - # installed into separate subpackages. - sed -Ei -e 's/(.*_plperl)/#\1/' \ - -e 's/(.*_plpython)/#\1/' \ - contrib/Makefile - - make -C contrib DESTDIR="$subpkgdir" install - - _contrib_common - - provides="$provides $(ls -1 "$subpkgdir"/$_bindir | sed 's/^/cmd:&/')" -} - -pltcl() { - pkgdesc="PL/Tcl procedural language for PostgreSQL" - depends="$pkgname=$pkgver-r$pkgrel pgtcl" - _subpkg_common - - amove $_srvlibdir/pltcl.so - amove $_datadir/extension/pltcl* - - install -m 644 "$srcdir"/pltcl_create_tables.sql -t "$subpkgdir"/$_datadir/ -} - -plperl() { - pkgdesc="PL/Perl procedural language for PostgreSQL" - depends="$pkgname=$pkgver-r$pkgrel" - _subpkg_common - - amove $_srvlibdir/plperl.so - amove $_datadir/extension/plperl* -} - -plperl_contrib() { - _plcontrib plperl "PL/Perl" - - cd "$builddir" - make -C contrib/hstore_plperl DESTDIR="$subpkgdir" install - - _contrib_common -} - -plpython3() { - pkgdesc="PL/Python3 procedural language for PostgreSQL" - depends="$pkgname=$pkgver-r$pkgrel python3" - _subpkg_common - - amove $_srvlibdir/plpython3.so - amove $_datadir/extension/plpython* -} - -plpython3_contrib() { - _plcontrib plpython3 "PL/Python 3" - - cd "$builddir" - make -C contrib/hstore_plpython DESTDIR="$subpkgdir" install - make -C contrib/ltree_plpython DESTDIR="$subpkgdir" install - - cd "$subpkgdir"/$_datadir/extension/ - rm ./*plpython2* ./*plpythonu* - - _contrib_common -} - -contrib_jit() { - pkgdesc="Extension modules distributed with PostgreSQL (JIT support)" - depends="$pkgname-contrib=$pkgver-r$pkgrel" - install_if="$pkgname-jit $pkgname-contrib=$pkgver-r$pkgrel" - _subpkg_common - - amove $_srvlibdir/bitcode/* -} - -dev() { - default_dev - _subpkg_common - replaces="" - - amove $_srvlibdir/pgxs/* -} - -doc() { - default_doc - _subpkg_common - - amove $_mandir -} - -openrc() { - default_openrc - depends="postgresql-common-openrc" - - mkdir -p "$subpkgdir" -} - -_plcontrib() { - local subname="$1" - pkgdesc="$2 extension modules distributed with PostgreSQL" - depends="$pkgname-$subname=$pkgver-r$pkgrel" - install_if="$pkgname-$subname=$pkgver-r$pkgrel $pkgname-contrib=$pkgver-r$pkgrel" - _subpkg_common -} - -_subpkg_common() { - provides="postgresql${subpkgname#$pkgname}" - replaces="$provides" # for backward compatibility -} - -_contrib_common() { - # Move headers, bitcode and docs from subpackage back to pkgdir, so it - # can be catched by subsequent split functions. - local dir; for dir in $_includedir $_srvlibdir/bitcode $_docdir; do - [ -d "$subpkgdir"/$dir ] || continue - - mkdir -p "$pkgdir"/$dir - cp -rf "$subpkgdir"/$dir/* "$pkgdir"/$dir/ - rm -rf "$subpkgdir"/$dir/* - rmdir -p "$subpkgdir"/$dir || true - done -} - -_run_tests() { - local path="$1"; shift - - msg "Running test suite at $path..." - # Note: some tests fail when running in parallel. - make -k -j 1 -C "$path" "$@" check MAX_CONNECTIONS=5 || { - printf "\n%s\n\n" "Trying to find all regression.diffs files in build directory..." >&2 - find "$path" -name regression.diffs | while read -r file; do - echo "=== test failure: $file ===" >&2 - cat "$file" >&2 - done - return 1 - } -} - -# $1: whitespace-separated items of set A -# $2: whitespace-separated items of set B -# stdout: newline-separated items of A - B -_setdiff() { - python3 -c 'import sys;print("\n".join(set(sys.argv[1].split()).difference(set(sys.argv[2].split()))))' "$@" -} - -sha512sums=" -25d545de69d6ac16b044e09939678af97b6574c71d47d98f95f0ef9ad11ff65e864e503ddff119d73fbb3c61e648e31219982d60da7fc2382ba10e0bfc370aa5 postgresql-13.14.tar.bz2 -1f8e7dc58f5b0a12427cf2fd904ffa898a34f23f3332c8382b94e0d991c007289e7913a69e04498f3d93fc5701855796c207b4b1cc4a0b366f586050124d7fcc initdb.patch -27e00b58fe5c3899c66fc0dde51846c14701bcfedd132b106d676783ba603e8cbdc6e620f29b52dc892bdaa9302052788cf5e575a1659f61c017a12e0d2ee4d0 perl-rpath.patch -92d28f91b57a01afc81a00d386e87b9e2aa812f341a1578f262af372ee905530205592eda595111827582acceacd1bf244d1df130330003f05e74e4ddb5a7c4f per-version-dirs.patch -d0040599d7646b709af4e3413bf0c228090f256395e806f3fee230ccc6037ed9c0df1cd160d01b6a73b25a742fdd3fb070733a14a78f53d297fbdbbb44f6f878 unix_socket_directories.patch -c4179fcd8b71791cdc41ea7b622cf82e9bd42ac1de66999234b98a83c0c508c79c492a9301274fe859c06a3f1a8b17b53ab97541ab76801a985f8f0b9b8716e7 disable-broken-tests.patch -14703da0a9441ae1bbad9fe124c4c267526975a22080c5f3e8c3a323164b743158ee10fcff31f18131a64e765c89125410652b317da46e92e962f251079f5a9a disable-test-collate.icu.utf8.patch -2e33e1ae38d60e0daf3ed18e6eaa9ddf6762b4b1bb7e51f1d2690e3df9d602aa1a700e603ba3ee69314a75a963131c7dc67c1b1f8b7eb5564e9c4253e81a4db4 disable-html-docs.patch -d8eb4274a54b94bed4a2ded7ae775c5a95ca0f051b831b859ccf78bf6d2ea6fe89a9a0611771f6ad85573995a7e3af1fdf5859e20cae3267a52239f12e1b61c3 remove-libecpg_compat.patch -2bd10c4911a50432a00d47bf423c2bb120bacd01a04b41430aa427ae15eafeb3f61e386893211fd147bc7972e4e7f9075ec9e0cd18d50caac14ab0eddb707ef7 czech-snowball-stemmer.patch -5262f4944844bccc839c4441570b9eb2e0792390234ebfdb8ebb7b83380ce5f5de84b038cb03045526da202a185af9c3972c2ae1b9e0e743a95c6e84f4621cf9 make-split-headers.patch -87f470bb8d08050dd955bd6f1da291891970027e6cd001452efc0bd6a57ac46187082393cd5910c289fc6e1daaf0967415393629379c07aed4e78b8e87e5fff7 jit-datalayout-mismatch-on-s390x.patch -7790e4e4374f7bdc6b4484ba87a5fa709d30d3cbdce61ee7bf9c5dfce40cb51c7bd54ab42f4050fb48eede08ef573624d819128e57cc8c976e01202854740308 pg_config-add-major-version.patch -b0688d66fdd7d612c24d9aa69bdd80d30787d2d6409b4524c79b41797144fc743213460e6de9c536bfb72da089f92cf89731f15137b1407fd04ca97fd393bfd2 dont-use-locale-a-on-musl.patch -0ebee9cf40a7e84e8eda3998c0dd0f7601d9288233411f45f9710fcafc5f4ca3e4a91e8e1b552cc4f4d2c0e8fa6512703b1094e501f132ea2842db0398e62934 icu-collations-hack.patch -cde5fbf5a39e5de18a40ec1d9ac919dcf166e0ca178a6b9dbdfded8d16b4969b91917a2550bbf33eccd1ecb3bd9e0753a47012e60f4efe720bbef2a2c5368529 libpgport-pkglibdir.patch.txt -6078defb3da67e7df96665cc130d32b69eebfcaf49d92eef368ea8eea8bb311fab56064c104bc97f53da9cd925301bef696b506af33e0b66d65bc6cd41ec7499 external-libpq.patch.txt -5c9bfd9e295dcf678298bf0aa974347a7c311d6e7c2aa76a6920fcb751d01fd1ab77abbec11f3c672f927ad9deaa88e04e370c0b5cd1b60087554c474b748731 pltcl_create_tables.sql -" diff --git a/community/postgresql13/czech-snowball-stemmer.patch b/community/postgresql13/czech-snowball-stemmer.patch deleted file mode 100644 index 54bf2f0dfd1..00000000000 --- a/community/postgresql13/czech-snowball-stemmer.patch +++ /dev/null @@ -1,1064 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Thu, 7 Jan 2021 00:55:21 +0100 -Subject: [PATCH] Add Czech Snowball Stemmer - -This patch is based on [1] from Jan Dedek. It includes C implementation of -the Czech Snowball stemmer generated automatically using Snowball utility -from sources available at https://snowballstem.org/otherapps/oregan/ -(licensed under BSD). - -File czech.stop was extracted from http://www.pgsql.cz/data/czech.tar.gz -(author of this tarball is Pavel Stehule). - -[1]: https://github.com/datlowe/postgres_snowball_czech/commit/4363325f719a463fce04c04cbcdcc7e625cdbca5 - -diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c ---- a/src/backend/snowball/dict_snowball.c -+++ b/src/backend/snowball/dict_snowball.c -@@ -44,6 +44,7 @@ - #include "snowball/libstemmer/stem_ISO_8859_2_romanian.h" - #include "snowball/libstemmer/stem_KOI8_R_russian.h" - #include "snowball/libstemmer/stem_UTF_8_arabic.h" -+#include "snowball/libstemmer/stem_UTF_8_czech.h" - #include "snowball/libstemmer/stem_UTF_8_danish.h" - #include "snowball/libstemmer/stem_UTF_8_dutch.h" - #include "snowball/libstemmer/stem_UTF_8_english.h" -@@ -110,6 +111,7 @@ - STEMMER_MODULE(romanian, PG_LATIN2, ISO_8859_2), - STEMMER_MODULE(russian, PG_KOI8R, KOI8_R), - STEMMER_MODULE(arabic, PG_UTF8, UTF_8), -+ STEMMER_MODULE(czech, PG_UTF8, UTF_8), - STEMMER_MODULE(danish, PG_UTF8, UTF_8), - STEMMER_MODULE(dutch, PG_UTF8, UTF_8), - STEMMER_MODULE(english, PG_UTF8, UTF_8), -diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile ---- a/src/backend/snowball/Makefile -+++ b/src/backend/snowball/Makefile -@@ -41,6 +41,7 @@ - stem_ISO_8859_2_romanian.o \ - stem_KOI8_R_russian.o \ - stem_UTF_8_arabic.o \ -+ stem_UTF_8_czech.o \ - stem_UTF_8_danish.o \ - stem_UTF_8_dutch.o \ - stem_UTF_8_english.o \ -@@ -70,6 +71,7 @@ - # must come after creation of that language - LANGUAGES= \ - arabic arabic \ -+ czech czech \ - danish danish \ - dutch dutch \ - english english \ -diff --git a/src/backend/snowball/stem_UTF_8_czech.c b/src/backend/snowball/stem_UTF_8_czech.c -new file mode 100644 -index 000000000000..d23663fa077f ---- /dev/null -+++ b/src/backend/snowball/stem_UTF_8_czech.c -@@ -0,0 +1,894 @@ -+/* This file was generated automatically by the Snowball to ISO C compiler */ -+/* http://snowballstem.org/ */ -+ -+#include "header.h" -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+extern int czech_UTF_8_stem(struct SN_env * z); -+#ifdef __cplusplus -+} -+#endif -+static int r_do_aggressive(struct SN_env * z); -+static int r_do_deriv_single(struct SN_env * z); -+static int r_do_derivational(struct SN_env * z); -+static int r_do_augmentative(struct SN_env * z); -+static int r_do_diminutive(struct SN_env * z); -+static int r_do_comparative(struct SN_env * z); -+static int r_do_case(struct SN_env * z); -+static int r_do_possessive(struct SN_env * z); -+static int r_mark_regions(struct SN_env * z); -+static int r_palatalise(struct SN_env * z); -+static int r_R1(struct SN_env * z); -+static int r_RV(struct SN_env * z); -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+ -+extern struct SN_env * czech_UTF_8_create_env(void); -+extern void czech_UTF_8_close_env(struct SN_env * z); -+ -+ -+#ifdef __cplusplus -+} -+#endif -+static const symbol s_0_0[2] = { 'c', 'e' }; -+static const symbol s_0_1[2] = { 'z', 'e' }; -+static const symbol s_0_2[3] = { 0xC2, 0xBE, 'e' }; -+static const symbol s_0_3[2] = { 'c', 'i' }; -+static const symbol s_0_4[4] = { 0xC3, 0xA8, 't', 'i' }; -+static const symbol s_0_5[4] = { 0xC2, 0xB9, 't', 'i' }; -+static const symbol s_0_6[2] = { 'z', 'i' }; -+static const symbol s_0_7[3] = { 0xC3, 0xA8, 'i' }; -+static const symbol s_0_8[3] = { 0xC2, 0xBE, 'i' }; -+static const symbol s_0_9[2] = { 0xC3, 0xA8 }; -+static const symbol s_0_10[5] = { 0xC3, 0xA8, 't', 0xC3, 0xA9 }; -+static const symbol s_0_11[5] = { 0xC2, 0xB9, 't', 0xC3, 0xA9 }; -+static const symbol s_0_12[5] = { 0xC3, 0xA8, 't', 0xC3, 0xAC }; -+static const symbol s_0_13[5] = { 0xC2, 0xB9, 't', 0xC3, 0xAC }; -+ -+static const struct among a_0[14] = -+{ -+/* 0 */ { 2, s_0_0, -1, 1, 0}, -+/* 1 */ { 2, s_0_1, -1, 2, 0}, -+/* 2 */ { 3, s_0_2, -1, 2, 0}, -+/* 3 */ { 2, s_0_3, -1, 1, 0}, -+/* 4 */ { 4, s_0_4, -1, 3, 0}, -+/* 5 */ { 4, s_0_5, -1, 4, 0}, -+/* 6 */ { 2, s_0_6, -1, 2, 0}, -+/* 7 */ { 3, s_0_7, -1, 1, 0}, -+/* 8 */ { 3, s_0_8, -1, 2, 0}, -+/* 9 */ { 2, s_0_9, -1, 1, 0}, -+/* 10 */ { 5, s_0_10, -1, 3, 0}, -+/* 11 */ { 5, s_0_11, -1, 4, 0}, -+/* 12 */ { 5, s_0_12, -1, 3, 0}, -+/* 13 */ { 5, s_0_13, -1, 4, 0} -+}; -+ -+static const symbol s_1_0[2] = { 'i', 'n' }; -+static const symbol s_1_1[2] = { 'o', 'v' }; -+static const symbol s_1_2[3] = { 0xC3, 0xB9, 'v' }; -+ -+static const struct among a_1[3] = -+{ -+/* 0 */ { 2, s_1_0, -1, 2, 0}, -+/* 1 */ { 2, s_1_1, -1, 1, 0}, -+/* 2 */ { 3, s_1_2, -1, 1, 0} -+}; -+ -+static const symbol s_2_0[1] = { 'a' }; -+static const symbol s_2_1[3] = { 'a', 'm', 'a' }; -+static const symbol s_2_2[3] = { 'a', 't', 'a' }; -+static const symbol s_2_3[1] = { 'e' }; -+static const symbol s_2_4[4] = { 0xC3, 0xAC, 't', 'e' }; -+static const symbol s_2_5[3] = { 'e', 'c', 'h' }; -+static const symbol s_2_6[5] = { 'a', 't', 'e', 'c', 'h' }; -+static const symbol s_2_7[3] = { 'i', 'c', 'h' }; -+static const symbol s_2_8[4] = { 0xC3, 0xA1, 'c', 'h' }; -+static const symbol s_2_9[4] = { 0xC3, 0xAD, 'c', 'h' }; -+static const symbol s_2_10[4] = { 0xC3, 0xBD, 'c', 'h' }; -+static const symbol s_2_11[1] = { 'i' }; -+static const symbol s_2_12[2] = { 'm', 'i' }; -+static const symbol s_2_13[3] = { 'a', 'm', 'i' }; -+static const symbol s_2_14[3] = { 'e', 'm', 'i' }; -+static const symbol s_2_15[4] = { 0xC3, 0xAC, 'm', 'i' }; -+static const symbol s_2_16[4] = { 0xC3, 0xAD, 'm', 'i' }; -+static const symbol s_2_17[4] = { 0xC3, 0xBD, 'm', 'i' }; -+static const symbol s_2_18[4] = { 0xC3, 0xAC, 't', 'i' }; -+static const symbol s_2_19[3] = { 'o', 'v', 'i' }; -+static const symbol s_2_20[2] = { 'e', 'm' }; -+static const symbol s_2_21[5] = { 0xC3, 0xAC, 't', 'e', 'm' }; -+static const symbol s_2_22[3] = { 0xC3, 0xA1, 'm' }; -+static const symbol s_2_23[3] = { 0xC3, 0xA9, 'm' }; -+static const symbol s_2_24[3] = { 0xC3, 0xAD, 'm' }; -+static const symbol s_2_25[5] = { 'a', 't', 0xC3, 0xB9, 'm' }; -+static const symbol s_2_26[3] = { 0xC3, 0xBD, 'm' }; -+static const symbol s_2_27[1] = { 'o' }; -+static const symbol s_2_28[3] = { 'i', 'h', 'o' }; -+static const symbol s_2_29[4] = { 0xC3, 0xA9, 'h', 'o' }; -+static const symbol s_2_30[4] = { 0xC3, 0xAD, 'h', 'o' }; -+static const symbol s_2_31[2] = { 'e', 's' }; -+static const symbol s_2_32[2] = { 'o', 's' }; -+static const symbol s_2_33[2] = { 'u', 's' }; -+static const symbol s_2_34[2] = { 'a', 't' }; -+static const symbol s_2_35[1] = { 'u' }; -+static const symbol s_2_36[3] = { 'i', 'm', 'u' }; -+static const symbol s_2_37[4] = { 0xC3, 0xA9, 'm', 'u' }; -+static const symbol s_2_38[2] = { 'o', 'u' }; -+static const symbol s_2_39[1] = { 'y' }; -+static const symbol s_2_40[3] = { 'a', 't', 'y' }; -+static const symbol s_2_41[2] = { 0xC3, 0xA1 }; -+static const symbol s_2_42[2] = { 0xC3, 0xA9 }; -+static const symbol s_2_43[4] = { 'o', 'v', 0xC3, 0xA9 }; -+static const symbol s_2_44[2] = { 0xC3, 0xAC }; -+static const symbol s_2_45[2] = { 0xC3, 0xAD }; -+static const symbol s_2_46[2] = { 0xC3, 0xB9 }; -+static const symbol s_2_47[2] = { 0xC3, 0xBD }; -+ -+static const struct among a_2[48] = -+{ -+/* 0 */ { 1, s_2_0, -1, 1, 0}, -+/* 1 */ { 3, s_2_1, 0, 1, 0}, -+/* 2 */ { 3, s_2_2, 0, 1, 0}, -+/* 3 */ { 1, s_2_3, -1, 2, 0}, -+/* 4 */ { 4, s_2_4, 3, 2, 0}, -+/* 5 */ { 3, s_2_5, -1, 2, 0}, -+/* 6 */ { 5, s_2_6, 5, 1, 0}, -+/* 7 */ { 3, s_2_7, -1, 2, 0}, -+/* 8 */ { 4, s_2_8, -1, 1, 0}, -+/* 9 */ { 4, s_2_9, -1, 2, 0}, -+/* 10 */ { 4, s_2_10, -1, 1, 0}, -+/* 11 */ { 1, s_2_11, -1, 2, 0}, -+/* 12 */ { 2, s_2_12, 11, 1, 0}, -+/* 13 */ { 3, s_2_13, 12, 1, 0}, -+/* 14 */ { 3, s_2_14, 12, 2, 0}, -+/* 15 */ { 4, s_2_15, 12, 2, 0}, -+/* 16 */ { 4, s_2_16, 12, 2, 0}, -+/* 17 */ { 4, s_2_17, 12, 1, 0}, -+/* 18 */ { 4, s_2_18, 11, 2, 0}, -+/* 19 */ { 3, s_2_19, 11, 1, 0}, -+/* 20 */ { 2, s_2_20, -1, 3, 0}, -+/* 21 */ { 5, s_2_21, 20, 1, 0}, -+/* 22 */ { 3, s_2_22, -1, 1, 0}, -+/* 23 */ { 3, s_2_23, -1, 2, 0}, -+/* 24 */ { 3, s_2_24, -1, 2, 0}, -+/* 25 */ { 5, s_2_25, -1, 1, 0}, -+/* 26 */ { 3, s_2_26, -1, 1, 0}, -+/* 27 */ { 1, s_2_27, -1, 1, 0}, -+/* 28 */ { 3, s_2_28, 27, 2, 0}, -+/* 29 */ { 4, s_2_29, 27, 2, 0}, -+/* 30 */ { 4, s_2_30, 27, 2, 0}, -+/* 31 */ { 2, s_2_31, -1, 2, 0}, -+/* 32 */ { 2, s_2_32, -1, 1, 0}, -+/* 33 */ { 2, s_2_33, -1, 1, 0}, -+/* 34 */ { 2, s_2_34, -1, 1, 0}, -+/* 35 */ { 1, s_2_35, -1, 1, 0}, -+/* 36 */ { 3, s_2_36, 35, 2, 0}, -+/* 37 */ { 4, s_2_37, 35, 2, 0}, -+/* 38 */ { 2, s_2_38, 35, 1, 0}, -+/* 39 */ { 1, s_2_39, -1, 1, 0}, -+/* 40 */ { 3, s_2_40, 39, 1, 0}, -+/* 41 */ { 2, s_2_41, -1, 1, 0}, -+/* 42 */ { 2, s_2_42, -1, 1, 0}, -+/* 43 */ { 4, s_2_43, 42, 1, 0}, -+/* 44 */ { 2, s_2_44, -1, 2, 0}, -+/* 45 */ { 2, s_2_45, -1, 2, 0}, -+/* 46 */ { 2, s_2_46, -1, 1, 0}, -+/* 47 */ { 2, s_2_47, -1, 1, 0} -+}; -+ -+static const symbol s_3_0[2] = { 'o', 'b' }; -+static const symbol s_3_1[3] = { 'i', 't', 'b' }; -+static const symbol s_3_2[2] = { 'e', 'c' }; -+static const symbol s_3_3[4] = { 'i', 'n', 'e', 'c' }; -+static const symbol s_3_4[6] = { 'o', 'b', 'i', 'n', 'e', 'c' }; -+static const symbol s_3_5[4] = { 'o', 'v', 'e', 'c' }; -+static const symbol s_3_6[2] = { 'i', 'c' }; -+static const symbol s_3_7[4] = { 'e', 'n', 'i', 'c' }; -+static const symbol s_3_8[3] = { 'o', 'c', 'h' }; -+static const symbol s_3_9[5] = { 0xC3, 0xA1, 's', 'e', 'k' }; -+static const symbol s_3_10[2] = { 'n', 'k' }; -+static const symbol s_3_11[3] = { 'i', 's', 'k' }; -+static const symbol s_3_12[5] = { 'o', 'v', 'i', 's', 'k' }; -+static const symbol s_3_13[2] = { 't', 'k' }; -+static const symbol s_3_14[2] = { 'v', 'k' }; -+static const symbol s_3_15[3] = { 0xC3, 0xA8, 'k' }; -+static const symbol s_3_16[4] = { 'n', 0xC3, 0xAD, 'k' }; -+static const symbol s_3_17[6] = { 'o', 'v', 'n', 0xC3, 0xAD, 'k' }; -+static const symbol s_3_18[5] = { 'o', 'v', 0xC3, 0xAD, 'k' }; -+static const symbol s_3_19[4] = { 'i', 0xC2, 0xB9, 'k' }; -+static const symbol s_3_20[4] = { 'u', 0xC2, 0xB9, 'k' }; -+static const symbol s_3_21[2] = { 'd', 'l' }; -+static const symbol s_3_22[4] = { 'i', 't', 'e', 'l' }; -+static const symbol s_3_23[2] = { 'u', 'l' }; -+static const symbol s_3_24[2] = { 'a', 'n' }; -+static const symbol s_3_25[4] = { 0xC3, 0xA8, 'a', 'n' }; -+static const symbol s_3_26[2] = { 'e', 'n' }; -+static const symbol s_3_27[2] = { 'i', 'n' }; -+static const symbol s_3_28[5] = { 0xC2, 0xB9, 't', 'i', 'n' }; -+static const symbol s_3_29[4] = { 'o', 'v', 'i', 'n' }; -+static const symbol s_3_30[4] = { 't', 'e', 'l', 'n' }; -+static const symbol s_3_31[4] = { 0xC3, 0xA1, 'r', 'n' }; -+static const symbol s_3_32[4] = { 0xC3, 0xAD, 'r', 'n' }; -+static const symbol s_3_33[3] = { 'o', 'u', 'n' }; -+static const symbol s_3_34[4] = { 'l', 'o', 'u', 'n' }; -+static const symbol s_3_35[3] = { 'o', 'v', 'n' }; -+static const symbol s_3_36[2] = { 'y', 'n' }; -+static const symbol s_3_37[3] = { 'k', 'y', 'n' }; -+static const symbol s_3_38[3] = { 0xC3, 0xA1, 'n' }; -+static const symbol s_3_39[4] = { 'i', 0xC3, 0xA1, 'n' }; -+static const symbol s_3_40[3] = { 0xC3, 0xA8, 'n' }; -+static const symbol s_3_41[3] = { 0xC3, 0xAC, 'n' }; -+static const symbol s_3_42[3] = { 0xC3, 0xAD, 'n' }; -+static const symbol s_3_43[2] = { 'a', 's' }; -+static const symbol s_3_44[2] = { 'i', 't' }; -+static const symbol s_3_45[2] = { 'o', 't' }; -+static const symbol s_3_46[3] = { 'i', 's', 't' }; -+static const symbol s_3_47[3] = { 'o', 's', 't' }; -+static const symbol s_3_48[4] = { 'n', 'o', 's', 't' }; -+static const symbol s_3_49[3] = { 'o', 'u', 't' }; -+static const symbol s_3_50[6] = { 'o', 'v', 'i', 0xC2, 0xB9, 't' }; -+static const symbol s_3_51[2] = { 'i', 'v' }; -+static const symbol s_3_52[2] = { 'o', 'v' }; -+static const symbol s_3_53[2] = { 't', 'v' }; -+static const symbol s_3_54[3] = { 'c', 't', 'v' }; -+static const symbol s_3_55[3] = { 's', 't', 'v' }; -+static const symbol s_3_56[5] = { 'o', 'v', 's', 't', 'v' }; -+static const symbol s_3_57[4] = { 'o', 'v', 't', 'v' }; -+static const symbol s_3_58[3] = { 'a', 0xC3, 0xA8 }; -+static const symbol s_3_59[4] = { 0xC3, 0xA1, 0xC3, 0xA8 }; -+static const symbol s_3_60[3] = { 'o', 0xC3, 0xB2 }; -+static const symbol s_3_61[4] = { 0xC3, 0xA1, 0xC3, 0xB8 }; -+static const symbol s_3_62[5] = { 'k', 0xC3, 0xA1, 0xC3, 0xB8 }; -+static const symbol s_3_63[7] = { 'i', 'o', 'n', 0xC3, 0xA1, 0xC3, 0xB8 }; -+static const symbol s_3_64[4] = { 0xC3, 0xA9, 0xC3, 0xB8 }; -+static const symbol s_3_65[5] = { 'n', 0xC3, 0xA9, 0xC3, 0xB8 }; -+static const symbol s_3_66[4] = { 0xC3, 0xAD, 0xC3, 0xB8 }; -+static const symbol s_3_67[4] = { 'o', 'u', 0xC2, 0xB9 }; -+ -+static const struct among a_3[68] = -+{ -+/* 0 */ { 2, s_3_0, -1, 1, 0}, -+/* 1 */ { 3, s_3_1, -1, 2, 0}, -+/* 2 */ { 2, s_3_2, -1, 3, 0}, -+/* 3 */ { 4, s_3_3, 2, 2, 0}, -+/* 4 */ { 6, s_3_4, 3, 1, 0}, -+/* 5 */ { 4, s_3_5, 2, 1, 0}, -+/* 6 */ { 2, s_3_6, -1, 2, 0}, -+/* 7 */ { 4, s_3_7, 6, 3, 0}, -+/* 8 */ { 3, s_3_8, -1, 1, 0}, -+/* 9 */ { 5, s_3_9, -1, 1, 0}, -+/* 10 */ { 2, s_3_10, -1, 1, 0}, -+/* 11 */ { 3, s_3_11, -1, 2, 0}, -+/* 12 */ { 5, s_3_12, 11, 1, 0}, -+/* 13 */ { 2, s_3_13, -1, 1, 0}, -+/* 14 */ { 2, s_3_14, -1, 1, 0}, -+/* 15 */ { 3, s_3_15, -1, 1, 0}, -+/* 16 */ { 4, s_3_16, -1, 1, 0}, -+/* 17 */ { 6, s_3_17, 16, 1, 0}, -+/* 18 */ { 5, s_3_18, -1, 1, 0}, -+/* 19 */ { 4, s_3_19, -1, 2, 0}, -+/* 20 */ { 4, s_3_20, -1, 1, 0}, -+/* 21 */ { 2, s_3_21, -1, 1, 0}, -+/* 22 */ { 4, s_3_22, -1, 2, 0}, -+/* 23 */ { 2, s_3_23, -1, 1, 0}, -+/* 24 */ { 2, s_3_24, -1, 1, 0}, -+/* 25 */ { 4, s_3_25, 24, 1, 0}, -+/* 26 */ { 2, s_3_26, -1, 3, 0}, -+/* 27 */ { 2, s_3_27, -1, 2, 0}, -+/* 28 */ { 5, s_3_28, 27, 1, 0}, -+/* 29 */ { 4, s_3_29, 27, 1, 0}, -+/* 30 */ { 4, s_3_30, -1, 1, 0}, -+/* 31 */ { 4, s_3_31, -1, 1, 0}, -+/* 32 */ { 4, s_3_32, -1, 6, 0}, -+/* 33 */ { 3, s_3_33, -1, 1, 0}, -+/* 34 */ { 4, s_3_34, 33, 1, 0}, -+/* 35 */ { 3, s_3_35, -1, 1, 0}, -+/* 36 */ { 2, s_3_36, -1, 1, 0}, -+/* 37 */ { 3, s_3_37, 36, 1, 0}, -+/* 38 */ { 3, s_3_38, -1, 1, 0}, -+/* 39 */ { 4, s_3_39, 38, 2, 0}, -+/* 40 */ { 3, s_3_40, -1, 1, 0}, -+/* 41 */ { 3, s_3_41, -1, 5, 0}, -+/* 42 */ { 3, s_3_42, -1, 6, 0}, -+/* 43 */ { 2, s_3_43, -1, 1, 0}, -+/* 44 */ { 2, s_3_44, -1, 2, 0}, -+/* 45 */ { 2, s_3_45, -1, 1, 0}, -+/* 46 */ { 3, s_3_46, -1, 2, 0}, -+/* 47 */ { 3, s_3_47, -1, 1, 0}, -+/* 48 */ { 4, s_3_48, 47, 1, 0}, -+/* 49 */ { 3, s_3_49, -1, 1, 0}, -+/* 50 */ { 6, s_3_50, -1, 1, 0}, -+/* 51 */ { 2, s_3_51, -1, 2, 0}, -+/* 52 */ { 2, s_3_52, -1, 1, 0}, -+/* 53 */ { 2, s_3_53, -1, 1, 0}, -+/* 54 */ { 3, s_3_54, 53, 1, 0}, -+/* 55 */ { 3, s_3_55, 53, 1, 0}, -+/* 56 */ { 5, s_3_56, 55, 1, 0}, -+/* 57 */ { 4, s_3_57, 53, 1, 0}, -+/* 58 */ { 3, s_3_58, -1, 1, 0}, -+/* 59 */ { 4, s_3_59, -1, 1, 0}, -+/* 60 */ { 3, s_3_60, -1, 1, 0}, -+/* 61 */ { 4, s_3_61, -1, 1, 0}, -+/* 62 */ { 5, s_3_62, 61, 1, 0}, -+/* 63 */ { 7, s_3_63, 61, 2, 0}, -+/* 64 */ { 4, s_3_64, -1, 4, 0}, -+/* 65 */ { 5, s_3_65, 64, 1, 0}, -+/* 66 */ { 4, s_3_66, -1, 6, 0}, -+/* 67 */ { 4, s_3_67, -1, 1, 0} -+}; -+ -+static const symbol s_4_0[1] = { 'c' }; -+static const symbol s_4_1[1] = { 'k' }; -+static const symbol s_4_2[1] = { 'l' }; -+static const symbol s_4_3[1] = { 'n' }; -+static const symbol s_4_4[1] = { 't' }; -+static const symbol s_4_5[2] = { 0xC3, 0xA8 }; -+ -+static const struct among a_4[6] = -+{ -+/* 0 */ { 1, s_4_0, -1, 1, 0}, -+/* 1 */ { 1, s_4_1, -1, 1, 0}, -+/* 2 */ { 1, s_4_2, -1, 1, 0}, -+/* 3 */ { 1, s_4_3, -1, 1, 0}, -+/* 4 */ { 1, s_4_4, -1, 1, 0}, -+/* 5 */ { 2, s_4_5, -1, 1, 0} -+}; -+ -+static const symbol s_5_0[3] = { 'i', 's', 'k' }; -+static const symbol s_5_1[3] = { 0xC3, 0xA1, 'k' }; -+static const symbol s_5_2[3] = { 'i', 'z', 'n' }; -+static const symbol s_5_3[4] = { 'a', 'j', 'z', 'n' }; -+ -+static const struct among a_5[4] = -+{ -+/* 0 */ { 3, s_5_0, -1, 2, 0}, -+/* 1 */ { 3, s_5_1, -1, 1, 0}, -+/* 2 */ { 3, s_5_2, -1, 2, 0}, -+/* 3 */ { 4, s_5_3, -1, 1, 0} -+}; -+ -+static const symbol s_6_0[1] = { 'k' }; -+static const symbol s_6_1[2] = { 'a', 'k' }; -+static const symbol s_6_2[2] = { 'e', 'k' }; -+static const symbol s_6_3[4] = { 'a', 'n', 'e', 'k' }; -+static const symbol s_6_4[4] = { 'e', 'n', 'e', 'k' }; -+static const symbol s_6_5[4] = { 'i', 'n', 'e', 'k' }; -+static const symbol s_6_6[4] = { 'o', 'n', 'e', 'k' }; -+static const symbol s_6_7[4] = { 'u', 'n', 'e', 'k' }; -+static const symbol s_6_8[5] = { 0xC3, 0xA1, 'n', 'e', 'k' }; -+static const symbol s_6_9[5] = { 'a', 0xC3, 0xA8, 'e', 'k' }; -+static const symbol s_6_10[5] = { 'e', 0xC3, 0xA8, 'e', 'k' }; -+static const symbol s_6_11[5] = { 'i', 0xC3, 0xA8, 'e', 'k' }; -+static const symbol s_6_12[5] = { 'o', 0xC3, 0xA8, 'e', 'k' }; -+static const symbol s_6_13[5] = { 'u', 0xC3, 0xA8, 'e', 'k' }; -+static const symbol s_6_14[6] = { 0xC3, 0xA1, 0xC3, 0xA8, 'e', 'k' }; -+static const symbol s_6_15[6] = { 0xC3, 0xA9, 0xC3, 0xA8, 'e', 'k' }; -+static const symbol s_6_16[6] = { 0xC3, 0xAD, 0xC3, 0xA8, 'e', 'k' }; -+static const symbol s_6_17[6] = { 'o', 'u', 0xC2, 0xB9, 'e', 'k' }; -+static const symbol s_6_18[2] = { 'i', 'k' }; -+static const symbol s_6_19[3] = { 'a', 'n', 'k' }; -+static const symbol s_6_20[3] = { 'e', 'n', 'k' }; -+static const symbol s_6_21[3] = { 'i', 'n', 'k' }; -+static const symbol s_6_22[3] = { 'o', 'n', 'k' }; -+static const symbol s_6_23[3] = { 'u', 'n', 'k' }; -+static const symbol s_6_24[4] = { 0xC3, 0xA1, 'n', 'k' }; -+static const symbol s_6_25[4] = { 0xC3, 0xA9, 'n', 'k' }; -+static const symbol s_6_26[4] = { 0xC3, 0xAD, 'n', 'k' }; -+static const symbol s_6_27[2] = { 'o', 'k' }; -+static const symbol s_6_28[4] = { 0xC3, 0xA1, 't', 'k' }; -+static const symbol s_6_29[2] = { 'u', 'k' }; -+static const symbol s_6_30[3] = { 0xC3, 0xA1, 'k' }; -+static const symbol s_6_31[4] = { 'a', 0xC3, 0xA8, 'k' }; -+static const symbol s_6_32[4] = { 'e', 0xC3, 0xA8, 'k' }; -+static const symbol s_6_33[4] = { 'i', 0xC3, 0xA8, 'k' }; -+static const symbol s_6_34[4] = { 'o', 0xC3, 0xA8, 'k' }; -+static const symbol s_6_35[4] = { 'u', 0xC3, 0xA8, 'k' }; -+static const symbol s_6_36[5] = { 0xC3, 0xA1, 0xC3, 0xA8, 'k' }; -+static const symbol s_6_37[5] = { 0xC3, 0xA9, 0xC3, 0xA8, 'k' }; -+static const symbol s_6_38[5] = { 0xC3, 0xAD, 0xC3, 0xA8, 'k' }; -+static const symbol s_6_39[3] = { 0xC3, 0xA9, 'k' }; -+static const symbol s_6_40[3] = { 0xC3, 0xAD, 'k' }; -+static const symbol s_6_41[4] = { 'u', 0xC2, 0xB9, 'k' }; -+ -+static const struct among a_6[42] = -+{ -+/* 0 */ { 1, s_6_0, -1, 1, 0}, -+/* 1 */ { 2, s_6_1, 0, 7, 0}, -+/* 2 */ { 2, s_6_2, 0, 2, 0}, -+/* 3 */ { 4, s_6_3, 2, 1, 0}, -+/* 4 */ { 4, s_6_4, 2, 2, 0}, -+/* 5 */ { 4, s_6_5, 2, 4, 0}, -+/* 6 */ { 4, s_6_6, 2, 1, 0}, -+/* 7 */ { 4, s_6_7, 2, 1, 0}, -+/* 8 */ { 5, s_6_8, 2, 1, 0}, -+/* 9 */ { 5, s_6_9, 2, 1, 0}, -+/* 10 */ { 5, s_6_10, 2, 2, 0}, -+/* 11 */ { 5, s_6_11, 2, 4, 0}, -+/* 12 */ { 5, s_6_12, 2, 1, 0}, -+/* 13 */ { 5, s_6_13, 2, 1, 0}, -+/* 14 */ { 6, s_6_14, 2, 1, 0}, -+/* 15 */ { 6, s_6_15, 2, 3, 0}, -+/* 16 */ { 6, s_6_16, 2, 5, 0}, -+/* 17 */ { 6, s_6_17, 2, 1, 0}, -+/* 18 */ { 2, s_6_18, 0, 4, 0}, -+/* 19 */ { 3, s_6_19, 0, 1, 0}, -+/* 20 */ { 3, s_6_20, 0, 1, 0}, -+/* 21 */ { 3, s_6_21, 0, 1, 0}, -+/* 22 */ { 3, s_6_22, 0, 1, 0}, -+/* 23 */ { 3, s_6_23, 0, 1, 0}, -+/* 24 */ { 4, s_6_24, 0, 1, 0}, -+/* 25 */ { 4, s_6_25, 0, 1, 0}, -+/* 26 */ { 4, s_6_26, 0, 1, 0}, -+/* 27 */ { 2, s_6_27, 0, 8, 0}, -+/* 28 */ { 4, s_6_28, 0, 1, 0}, -+/* 29 */ { 2, s_6_29, 0, 9, 0}, -+/* 30 */ { 3, s_6_30, 0, 6, 0}, -+/* 31 */ { 4, s_6_31, 0, 1, 0}, -+/* 32 */ { 4, s_6_32, 0, 1, 0}, -+/* 33 */ { 4, s_6_33, 0, 1, 0}, -+/* 34 */ { 4, s_6_34, 0, 1, 0}, -+/* 35 */ { 4, s_6_35, 0, 1, 0}, -+/* 36 */ { 5, s_6_36, 0, 1, 0}, -+/* 37 */ { 5, s_6_37, 0, 1, 0}, -+/* 38 */ { 5, s_6_38, 0, 1, 0}, -+/* 39 */ { 3, s_6_39, 0, 3, 0}, -+/* 40 */ { 3, s_6_40, 0, 5, 0}, -+/* 41 */ { 4, s_6_41, 0, 1, 0} -+}; -+ -+static const symbol s_7_0[4] = { 'e', 'j', 0xC2, 0xB9 }; -+static const symbol s_7_1[5] = { 0xC3, 0xAC, 'j', 0xC2, 0xB9 }; -+ -+static const struct among a_7[2] = -+{ -+/* 0 */ { 4, s_7_0, -1, 2, 0}, -+/* 1 */ { 5, s_7_1, -1, 1, 0} -+}; -+ -+static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 25, 4, 19 }; -+ -+static const symbol s_0[] = { 'k' }; -+static const symbol s_1[] = { 'h' }; -+static const symbol s_2[] = { 'c', 'k' }; -+static const symbol s_3[] = { 's', 'k' }; -+static const symbol s_4[] = { 'e' }; -+static const symbol s_5[] = { 'i' }; -+static const symbol s_6[] = { 'e' }; -+static const symbol s_7[] = { 0xC3, 0xA9 }; -+static const symbol s_8[] = { 0xC3, 0xAC }; -+static const symbol s_9[] = { 0xC3, 0xAD }; -+static const symbol s_10[] = { 'i' }; -+static const symbol s_11[] = { 'e' }; -+static const symbol s_12[] = { 0xC3, 0xA9 }; -+static const symbol s_13[] = { 'i' }; -+static const symbol s_14[] = { 0xC3, 0xAD }; -+static const symbol s_15[] = { 0xC3, 0xA1 }; -+static const symbol s_16[] = { 'a' }; -+static const symbol s_17[] = { 'o' }; -+static const symbol s_18[] = { 'u' }; -+static const symbol s_19[] = { 0xC3, 0xAC }; -+static const symbol s_20[] = { 'e' }; -+ -+static int r_mark_regions(struct SN_env * z) { /* forwardmode */ -+ z->I[0] = z->l; /* $pV = <integer expression>, line 45 */ -+ z->I[1] = z->l; /* $p1 = <integer expression>, line 46 */ -+ { int c1 = z->c; /* do, line 48 */ -+ { /* gopast */ /* non v, line 49 */ -+ int ret = in_grouping_U(z, g_v, 97, 253, 1); -+ if (ret < 0) goto lab0; -+ z->c += ret; -+ } -+ z->I[0] = z->c; /* setmark pV, line 49 */ -+ { /* gopast */ /* non v, line 50 */ -+ int ret = in_grouping_U(z, g_v, 97, 253, 1); -+ if (ret < 0) goto lab0; -+ z->c += ret; -+ } -+ { /* gopast */ /* grouping v, line 50 */ -+ int ret = out_grouping_U(z, g_v, 97, 253, 1); -+ if (ret < 0) goto lab0; -+ z->c += ret; -+ } -+ z->I[1] = z->c; /* setmark p1, line 50 */ -+ lab0: -+ z->c = c1; -+ } -+ return 1; -+} -+ -+static int r_RV(struct SN_env * z) { /* backwardmode */ -+ if (!(z->I[0] <= z->c)) return 0; /* $pV <= <integer expression>, line 56 */ -+ return 1; -+} -+ -+static int r_R1(struct SN_env * z) { /* backwardmode */ -+ if (!(z->I[1] <= z->c)) return 0; /* $p1 <= <integer expression>, line 57 */ -+ return 1; -+} -+ -+static int r_palatalise(struct SN_env * z) { /* backwardmode */ -+ int among_var; -+ z->ket = z->c; /* [, line 60 */ -+ among_var = find_among_b(z, a_0, 14); /* substring, line 60 */ -+ if (!(among_var)) return 0; -+ z->bra = z->c; /* ], line 60 */ -+ { int ret = r_RV(z); /* call RV, line 60 */ -+ if (ret <= 0) return ret; -+ } -+ switch (among_var) { /* among, line 60 */ -+ case 0: return 0; -+ case 1: -+ { int ret = slice_from_s(z, 1, s_0); /* <-, line 62 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ case 2: -+ { int ret = slice_from_s(z, 1, s_1); /* <-, line 64 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ case 3: -+ { int ret = slice_from_s(z, 2, s_2); /* <-, line 66 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ case 4: -+ { int ret = slice_from_s(z, 2, s_3); /* <-, line 68 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ } -+ return 1; -+} -+ -+static int r_do_possessive(struct SN_env * z) { /* backwardmode */ -+ int among_var; -+ z->ket = z->c; /* [, line 73 */ -+ if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 110 && z->p[z->c - 1] != 118)) return 0; /* substring, line 73 */ -+ among_var = find_among_b(z, a_1, 3); -+ if (!(among_var)) return 0; -+ z->bra = z->c; /* ], line 73 */ -+ { int ret = r_RV(z); /* call RV, line 73 */ -+ if (ret <= 0) return ret; -+ } -+ switch (among_var) { /* among, line 73 */ -+ case 0: return 0; -+ case 1: -+ { int ret = slice_del(z); /* delete, line 75 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ case 2: -+ { int ret = slice_del(z); /* delete, line 78 */ -+ if (ret < 0) return ret; -+ } -+ { int m1 = z->l - z->c; (void)m1; /* try, line 79 */ -+ { int ret = r_palatalise(z); /* call palatalise, line 79 */ -+ if (ret == 0) { z->c = z->l - m1; goto lab0; } -+ if (ret < 0) return ret; -+ } -+ lab0: -+ ; -+ } -+ break; -+ } -+ return 1; -+} -+ -+static int r_do_case(struct SN_env * z) { /* backwardmode */ -+ int among_var; -+ z->ket = z->c; /* [, line 85 */ -+ among_var = find_among_b(z, a_2, 48); /* substring, line 85 */ -+ if (!(among_var)) return 0; -+ z->bra = z->c; /* ], line 85 */ -+ switch (among_var) { /* among, line 85 */ -+ case 0: return 0; -+ case 1: -+ { int ret = slice_del(z); /* delete, line 92 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ case 2: -+ { int ret = slice_del(z); /* delete, line 99 */ -+ if (ret < 0) return ret; -+ } -+ { int m1 = z->l - z->c; (void)m1; /* try, line 100 */ -+ { int ret = r_palatalise(z); /* call palatalise, line 100 */ -+ if (ret == 0) { z->c = z->l - m1; goto lab0; } -+ if (ret < 0) return ret; -+ } -+ lab0: -+ ; -+ } -+ break; -+ case 3: -+ { int ret = slice_from_s(z, 1, s_4); /* <-, line 104 */ -+ if (ret < 0) return ret; -+ } -+ { int m2 = z->l - z->c; (void)m2; /* try, line 105 */ -+ { int ret = r_palatalise(z); /* call palatalise, line 105 */ -+ if (ret == 0) { z->c = z->l - m2; goto lab1; } -+ if (ret < 0) return ret; -+ } -+ lab1: -+ ; -+ } -+ break; -+ } -+ return 1; -+} -+ -+static int r_do_derivational(struct SN_env * z) { /* backwardmode */ -+ int among_var; -+ z->ket = z->c; /* [, line 111 */ -+ among_var = find_among_b(z, a_3, 68); /* substring, line 111 */ -+ if (!(among_var)) return 0; -+ z->bra = z->c; /* ], line 111 */ -+ { int ret = r_R1(z); /* call R1, line 111 */ -+ if (ret <= 0) return ret; -+ } -+ switch (among_var) { /* among, line 111 */ -+ case 0: return 0; -+ case 1: -+ { int ret = slice_del(z); /* delete, line 120 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ case 2: -+ { int ret = slice_from_s(z, 1, s_5); /* <-, line 126 */ -+ if (ret < 0) return ret; -+ } -+ { int ret = r_palatalise(z); /* call palatalise, line 127 */ -+ if (ret <= 0) return ret; -+ } -+ break; -+ case 3: -+ { int ret = slice_from_s(z, 1, s_6); /* <-, line 131 */ -+ if (ret < 0) return ret; -+ } -+ { int ret = r_palatalise(z); /* call palatalise, line 132 */ -+ if (ret <= 0) return ret; -+ } -+ break; -+ case 4: -+ { int ret = slice_from_s(z, 2, s_7); /* <-, line 136 */ -+ if (ret < 0) return ret; -+ } -+ { int ret = r_palatalise(z); /* call palatalise, line 137 */ -+ if (ret <= 0) return ret; -+ } -+ break; -+ case 5: -+ { int ret = slice_from_s(z, 2, s_8); /* <-, line 141 */ -+ if (ret < 0) return ret; -+ } -+ { int ret = r_palatalise(z); /* call palatalise, line 142 */ -+ if (ret <= 0) return ret; -+ } -+ break; -+ case 6: -+ { int ret = slice_from_s(z, 2, s_9); /* <-, line 147 */ -+ if (ret < 0) return ret; -+ } -+ { int ret = r_palatalise(z); /* call palatalise, line 148 */ -+ if (ret <= 0) return ret; -+ } -+ break; -+ } -+ return 1; -+} -+ -+static int r_do_deriv_single(struct SN_env * z) { /* backwardmode */ -+ int among_var; -+ z->ket = z->c; /* [, line 153 */ -+ among_var = find_among_b(z, a_4, 6); /* substring, line 153 */ -+ if (!(among_var)) return 0; -+ z->bra = z->c; /* ], line 153 */ -+ switch (among_var) { /* among, line 153 */ -+ case 0: return 0; -+ case 1: -+ { int ret = slice_del(z); /* delete, line 155 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ } -+ return 1; -+} -+ -+static int r_do_augmentative(struct SN_env * z) { /* backwardmode */ -+ int among_var; -+ z->ket = z->c; /* [, line 161 */ -+ if (z->c - 2 <= z->lb || (z->p[z->c - 1] != 107 && z->p[z->c - 1] != 110)) return 0; /* substring, line 161 */ -+ among_var = find_among_b(z, a_5, 4); -+ if (!(among_var)) return 0; -+ z->bra = z->c; /* ], line 161 */ -+ switch (among_var) { /* among, line 161 */ -+ case 0: return 0; -+ case 1: -+ { int ret = slice_del(z); /* delete, line 163 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ case 2: -+ { int ret = slice_from_s(z, 1, s_10); /* <-, line 166 */ -+ if (ret < 0) return ret; -+ } -+ { int ret = r_palatalise(z); /* call palatalise, line 167 */ -+ if (ret <= 0) return ret; -+ } -+ break; -+ } -+ return 1; -+} -+ -+static int r_do_diminutive(struct SN_env * z) { /* backwardmode */ -+ int among_var; -+ z->ket = z->c; /* [, line 173 */ -+ if (z->c <= z->lb || z->p[z->c - 1] != 107) return 0; /* substring, line 173 */ -+ among_var = find_among_b(z, a_6, 42); -+ if (!(among_var)) return 0; -+ z->bra = z->c; /* ], line 173 */ -+ switch (among_var) { /* among, line 173 */ -+ case 0: return 0; -+ case 1: -+ { int ret = slice_del(z); /* delete, line 180 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ case 2: -+ { int ret = slice_from_s(z, 1, s_11); /* <-, line 183 */ -+ if (ret < 0) return ret; -+ } -+ { int ret = r_palatalise(z); /* call palatalise, line 184 */ -+ if (ret <= 0) return ret; -+ } -+ break; -+ case 3: -+ { int ret = slice_from_s(z, 2, s_12); /* <-, line 188 */ -+ if (ret < 0) return ret; -+ } -+ { int ret = r_palatalise(z); /* call palatalise, line 189 */ -+ if (ret <= 0) return ret; -+ } -+ break; -+ case 4: -+ { int ret = slice_from_s(z, 1, s_13); /* <-, line 193 */ -+ if (ret < 0) return ret; -+ } -+ { int ret = r_palatalise(z); /* call palatalise, line 194 */ -+ if (ret <= 0) return ret; -+ } -+ break; -+ case 5: -+ { int ret = slice_from_s(z, 2, s_14); /* <-, line 198 */ -+ if (ret < 0) return ret; -+ } -+ { int ret = r_palatalise(z); /* call palatalise, line 199 */ -+ if (ret <= 0) return ret; -+ } -+ break; -+ case 6: -+ { int ret = slice_from_s(z, 2, s_15); /* <-, line 202 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ case 7: -+ { int ret = slice_from_s(z, 1, s_16); /* <-, line 204 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ case 8: -+ { int ret = slice_from_s(z, 1, s_17); /* <-, line 206 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ case 9: -+ { int ret = slice_from_s(z, 1, s_18); /* <-, line 208 */ -+ if (ret < 0) return ret; -+ } -+ break; -+ } -+ return 1; -+} -+ -+static int r_do_comparative(struct SN_env * z) { /* backwardmode */ -+ int among_var; -+ z->ket = z->c; /* [, line 213 */ -+ if (z->c - 3 <= z->lb || z->p[z->c - 1] != 185) return 0; /* substring, line 213 */ -+ among_var = find_among_b(z, a_7, 2); -+ if (!(among_var)) return 0; -+ z->bra = z->c; /* ], line 213 */ -+ switch (among_var) { /* among, line 213 */ -+ case 0: return 0; -+ case 1: -+ { int ret = slice_from_s(z, 2, s_19); /* <-, line 216 */ -+ if (ret < 0) return ret; -+ } -+ { int ret = r_palatalise(z); /* call palatalise, line 217 */ -+ if (ret <= 0) return ret; -+ } -+ break; -+ case 2: -+ { int ret = slice_from_s(z, 1, s_20); /* <-, line 221 */ -+ if (ret < 0) return ret; -+ } -+ { int ret = r_palatalise(z); /* call palatalise, line 222 */ -+ if (ret <= 0) return ret; -+ } -+ break; -+ } -+ return 1; -+} -+ -+static int r_do_aggressive(struct SN_env * z) { /* backwardmode */ -+ { int m1 = z->l - z->c; (void)m1; /* do, line 228 */ -+ { int ret = r_do_comparative(z); /* call do_comparative, line 228 */ -+ if (ret == 0) goto lab0; -+ if (ret < 0) return ret; -+ } -+ lab0: -+ z->c = z->l - m1; -+ } -+ { int m2 = z->l - z->c; (void)m2; /* do, line 229 */ -+ { int ret = r_do_diminutive(z); /* call do_diminutive, line 229 */ -+ if (ret == 0) goto lab1; -+ if (ret < 0) return ret; -+ } -+ lab1: -+ z->c = z->l - m2; -+ } -+ { int m3 = z->l - z->c; (void)m3; /* do, line 230 */ -+ { int ret = r_do_augmentative(z); /* call do_augmentative, line 230 */ -+ if (ret == 0) goto lab2; -+ if (ret < 0) return ret; -+ } -+ lab2: -+ z->c = z->l - m3; -+ } -+ { int m4 = z->l - z->c; (void)m4; /* or, line 231 */ -+ { int ret = r_do_derivational(z); /* call do_derivational, line 231 */ -+ if (ret == 0) goto lab4; -+ if (ret < 0) return ret; -+ } -+ goto lab3; -+ lab4: -+ z->c = z->l - m4; -+ { int ret = r_do_deriv_single(z); /* call do_deriv_single, line 231 */ -+ if (ret <= 0) return ret; -+ } -+ } -+lab3: -+ return 1; -+} -+ -+extern int czech_UTF_8_stem(struct SN_env * z) { /* forwardmode */ -+ { int c1 = z->c; /* do, line 236 */ -+ { int ret = r_mark_regions(z); /* call mark_regions, line 236 */ -+ if (ret == 0) goto lab0; -+ if (ret < 0) return ret; -+ } -+ lab0: -+ z->c = c1; -+ } -+ z->lb = z->c; z->c = z->l; /* backwards, line 237 */ -+ -+ { int ret = r_do_case(z); /* call do_case, line 238 */ -+ if (ret <= 0) return ret; -+ } -+ { int ret = r_do_possessive(z); /* call do_possessive, line 239 */ -+ if (ret <= 0) return ret; -+ } -+ { int ret = r_do_aggressive(z); /* call do_aggressive, line 242 */ -+ if (ret <= 0) return ret; -+ } -+ z->c = z->lb; -+ return 1; -+} -+ -+extern struct SN_env * czech_UTF_8_create_env(void) { return SN_create_env(0, 2, 0); } -+ -+extern void czech_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); } -+ -diff --git a/src/include/snowball/libstemmer/stem_UTF_8_czech.h b/src/include/snowball/libstemmer/stem_UTF_8_czech.h -new file mode 100644 ---- /dev/null -+++ b/src/include/snowball/libstemmer/stem_UTF_8_czech.h -@@ -0,0 +1,16 @@ -+/* This file was generated automatically by the Snowball to ISO C compiler */ -+/* http://snowballstem.org/ */ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+extern struct SN_env * czech_UTF_8_create_env(void); -+extern void czech_UTF_8_close_env(struct SN_env * z); -+ -+extern int czech_UTF_8_stem(struct SN_env * z); -+ -+#ifdef __cplusplus -+} -+#endif -+ -diff --git a/src/backend/snowball/stopwords/czech.stop b/src/backend/snowball/stopwords/czech.stop -new file mode 100644 ---- /dev/null -+++ b/src/backend/snowball/stopwords/czech.stop -@@ -0,0 +1,86 @@ -+a -+ale -+ano -+atd -+by -+být -+co -+čí -+čím -+do -+i -+já -+jak -+je -+jeho -+jemu -+její -+jejich -+ji -+jí -+jim -+již -+jsem -+jsi -+jsou -+k -+kde -+kdo -+kdy -+který -+mě -+mém -+mne -+mně -+můj -+my -+na -+nad -+nám -+náš -+ne -+o -+on -+ona -+oni -+ono -+pak -+po -+pod -+pro -+proto -+proč -+před -+s -+se -+sem -+si -+svůj -+ta -+tady -+tak -+také -+tam -+tato -+teď -+ten -+ti -+tím -+to -+tobě -+tomu -+tvůj -+ty -+tyto -+u -+už -+v -+ve -+vám -+váš -+viz -+vy -+z -+za -+ze -+že diff --git a/community/postgresql13/disable-broken-tests.patch b/community/postgresql13/disable-broken-tests.patch deleted file mode 100644 index 1ebccbc416b..00000000000 --- a/community/postgresql13/disable-broken-tests.patch +++ /dev/null @@ -1,119 +0,0 @@ -These tests fail due to some really weird linking issue like: - - ERROR: could not load library "<builddir>/tmp_install/usr/lib/postgresql/libpqwalreceiver.so": Error loading shared library libpq.so.5: No such file or directory (needed by <builddir>/tmp_install/usr/lib/postgresql/libpqwalreceiver.so) - -psql dynamically loads libpq and libpqwalreceiver libs using pg_dlopen() -which is an alias for dlopen() on Linux. The above message comes from -src/backend/utils/fmgr/dfmgr.c. The part "Error loading ..." is from -pg_dlerror() which is alias for dlerror(). - -LD_LIBRARY_PATH is set and passed correctly. However, the error -disappeared when I've copied libpq.so* to /usr/lib... - -Also: - - $ LD_LIBRARY_PATH=$(pwd) ldd postgresql/libpqwalreceiver.so - ldd (0x280d565e000) - libpq.so.5 => <builddir>/tmp_install/usr/lib/libpq.so.5 (0x280d520d000) - libc.musl-x86_64.so.1 => ldd (0x280d565e000) - libssl.so.43 => /lib/libssl.so.43 (0x280d4fc2000) - libcrypto.so.41 => /lib/libcrypto.so.41 (0x280d4c1c000) - libldap_r-2.4.so.2 => /usr/lib/libldap_r-2.4.so.2 (0x280d49d6000) - liblber-2.4.so.2 => /usr/lib/liblber-2.4.so.2 (0x280d47c9000) - libsasl2.so.3 => /usr/lib/libsasl2.so.3 (0x280d45b0000) - Error relocating postgresql/libpqwalreceiver.so: appendStringInfoChar: symbol not found - Error relocating postgresql/libpqwalreceiver.so: MyLatch: symbol not found - Error relocating postgresql/libpqwalreceiver.so: MemoryContextDelete: symbol not found - Error relocating postgresql/libpqwalreceiver.so: errstart: symbol not found - Error relocating postgresql/libpqwalreceiver.so: pg_atoi: symbol not found - Error relocating postgresql/libpqwalreceiver.so: TupleDescGetAttInMetadata: symbol not found - Error relocating postgresql/libpqwalreceiver.so: WalReceiverFunctions: symbol not found - Error relocating postgresql/libpqwalreceiver.so: WaitLatchOrSocket: symbol not found - Error relocating postgresql/libpqwalreceiver.so: MemoryContextReset: symbol not found - Error relocating postgresql/libpqwalreceiver.so: pfree: symbol not found - Error relocating postgresql/libpqwalreceiver.so: errmsg: symbol not found - Error relocating postgresql/libpqwalreceiver.so: tuplestore_puttuple: symbol not found - Error relocating postgresql/libpqwalreceiver.so: pchomp: symbol not found - Error relocating postgresql/libpqwalreceiver.so: appendStringInfoString: symbol not found - Error relocating postgresql/libpqwalreceiver.so: errfinish: symbol not found - Error relocating postgresql/libpqwalreceiver.so: pstrdup: symbol not found - Error relocating postgresql/libpqwalreceiver.so: palloc0: symbol not found - Error relocating postgresql/libpqwalreceiver.so: errdetail: symbol not found - Error relocating postgresql/libpqwalreceiver.so: ResetLatch: symbol not found - Error relocating postgresql/libpqwalreceiver.so: work_mem: symbol not found - Error relocating postgresql/libpqwalreceiver.so: AllocSetContextCreate: symbol not found - Error relocating postgresql/libpqwalreceiver.so: CurrentMemoryContext: symbol not found - Error relocating postgresql/libpqwalreceiver.so: tuplestore_begin_heap: symbol not found - Error relocating postgresql/libpqwalreceiver.so: BuildTupleFromCStrings: symbol not found - Error relocating postgresql/libpqwalreceiver.so: errcode: symbol not found - Error relocating postgresql/libpqwalreceiver.so: MyDatabaseId: symbol not found - Error relocating postgresql/libpqwalreceiver.so: GetDatabaseEncodingName: symbol not found - Error relocating postgresql/libpqwalreceiver.so: palloc: symbol not found - Error relocating postgresql/libpqwalreceiver.so: pg_lsn_in: symbol not found - Error relocating postgresql/libpqwalreceiver.so: ProcessInterrupts: symbol not found - Error relocating postgresql/libpqwalreceiver.so: elog_start: symbol not found - Error relocating postgresql/libpqwalreceiver.so: DirectFunctionCall1Coll: symbol not found - Error relocating postgresql/libpqwalreceiver.so: elog_finish: symbol not found - Error relocating postgresql/libpqwalreceiver.so: CreateTemplateTupleDesc: symbol not found - Error relocating postgresql/libpqwalreceiver.so: InterruptPending: symbol not found - Error relocating postgresql/libpqwalreceiver.so: TupleDescInitEntry: symbol not found - Error relocating postgresql/libpqwalreceiver.so: initStringInfo: symbol not found w - -These symbols are really not provided by libpq. - -I wasted one day trying to figure out what's going on here, but still -have no idea. :( - ---- a/src/test/regress/parallel_schedule -+++ b/src/test/regress/parallel_schedule -@@ -73,7 +73,7 @@ - # ---------- - # Another group of parallel tests - # ---------- --test: brin gin gist spgist privileges init_privs security_label collate matview lock replica_identity rowsecurity object_address tablesample groupingsets drop_operator password identity generated join_hash -+test: brin gin gist spgist privileges init_privs security_label collate matview lock replica_identity rowsecurity tablesample groupingsets drop_operator password identity generated join_hash - - # ---------- - # Another group of parallel tests -@@ -89,7 +89,7 @@ - test: write_parallel - - # no relation related tests can be put in this group --test: publication subscription -+test: publication - - # ---------- - # Another group of parallel tests ---- a/src/test/modules/dummy_seclabel/Makefile -+++ b/src/test/modules/dummy_seclabel/Makefile -@@ -6,7 +6,7 @@ - EXTENSION = dummy_seclabel - DATA = dummy_seclabel--1.0.sql - --REGRESS = dummy_seclabel -+#REGRESS = dummy_seclabel - - ifdef USE_PGXS - PG_CONFIG = pg_config ---- a/contrib/postgres_fdw/Makefile -+++ b/contrib/postgres_fdw/Makefile -@@ -10,7 +10,7 @@ - EXTENSION = postgres_fdw - DATA = postgres_fdw--1.0.sql - --REGRESS = postgres_fdw -+#REGRESS = postgres_fdw - - ifdef USE_PGXS - PG_CONFIG = pg_config ---- a/contrib/dblink/Makefile -+++ b/contrib/dblink/Makefile -@@ -10,7 +10,7 @@ - dblink--unpackaged--1.0.sql - PGFILEDESC = "dblink - connect to other PostgreSQL databases" - --REGRESS = paths dblink -+#REGRESS = paths dblink - REGRESS_OPTS = --dlpath=$(top_builddir)/src/test/regress - EXTRA_CLEAN = sql/paths.sql expected/paths.out - diff --git a/community/postgresql13/disable-html-docs.patch b/community/postgresql13/disable-html-docs.patch deleted file mode 100644 index 6fbf90373c9..00000000000 --- a/community/postgresql13/disable-html-docs.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Thu, 28 Oct 2021 01:27:53 +0200 -Subject: [PATCH] Disable HTML docs, install only man pages - -HTML docs are big and they are available only anyway. - ---- a/doc/src/sgml/Makefile -+++ b/doc/src/sgml/Makefile -@@ -26,9 +26,9 @@ - include $(top_builddir)/src/Makefile.global - - --all: html man -+all: man - --distprep: html distprep-man -+distprep: distprep-man - - - ifndef DBTOEPUB -@@ -220,14 +220,14 @@ - ## Install - ## - --install: install-html install-man -+install: install-man - - installdirs: -- $(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) -+ $(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) - - # If the install used a man directory shared with other applications, this will remove all files. - uninstall: -- rm -f '$(DESTDIR)$(htmldir)/html/'* $(addprefix '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*) -+ rm -f $(addprefix '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*) - - - ## Install html diff --git a/community/postgresql13/disable-test-collate.icu.utf8.patch b/community/postgresql13/disable-test-collate.icu.utf8.patch deleted file mode 100644 index b539576723f..00000000000 --- a/community/postgresql13/disable-test-collate.icu.utf8.patch +++ /dev/null @@ -1,20 +0,0 @@ -Regression test collate.icu.utf8 fails with the following error: - - ERROR: collations with different collate and ctype values are not supported by ICU - CONTEXT: SQL statement "CREATE COLLATION test1 (provider = icu, lc_collate = 'C', lc_ctype = 'C.UTF-8');" - PL/pgSQL function inline_code_block line 3 at EXECUTE - -I don't know how to fix nor what's the cause. Unsetting LC_COLLATE (it's set -to `C` by /etc/profile.d/locale.sh) or setting it to `C.UTF-8` didn't help. - ---- a/src/test/regress/parallel_schedule -+++ b/src/test/regress/parallel_schedule -@@ -78,7 +78,7 @@ - # ---------- - # Another group of parallel tests - # ---------- --test: create_table_like alter_generic alter_operator misc async dbsize misc_functions sysviews tsrf tid tidscan collate.icu.utf8 incremental_sort -+test: create_table_like alter_generic alter_operator misc async dbsize misc_functions sysviews tsrf tid tidscan incremental_sort - - # rules cannot run concurrently with any test that creates - # a view or rule in the public schema diff --git a/community/postgresql13/dont-use-locale-a-on-musl.patch b/community/postgresql13/dont-use-locale-a-on-musl.patch deleted file mode 100644 index ce61856d4e2..00000000000 --- a/community/postgresql13/dont-use-locale-a-on-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Wed, 03 Aug 2022 20:40:33 +0200 -Subject: [PATCH] Don't generate collations based on locale(1) - -When the PostgreSQL cluster is initialized (using initdb(1)) or the -DB administrator calls `pg_import_system_collations()` directly, this -function creates COLLATIONs in the system catalog (pg_collations). -If the locale(1) command is available, this function creates COLLATIONs -based on the `locale -a` output. - -The locale(1) command is normally not available on Alpine Linux, so it -does nothing and only the default and ICU-based COLLATIONs are created. -However, there's a musl-locales package that provides locale(1), but it -doesn't implement any collations. This package just provides locale -translations. So if the user happens to have locale(1) installed and they -initialize the cluster or call `pg_import_system_collations()`, they end -up with dozens of libc-based COLLATIONs in the system catalog that -actually do not work! They will all behave like "C", because musl libc -doesn't implement locales. - ---- a/src/backend/commands/collationcmds.c -+++ b/src/backend/commands/collationcmds.c -@@ -401,7 +401,7 @@ - - - /* will we use "locale -a" in pg_import_system_collations? */ --#if defined(HAVE_LOCALE_T) && !defined(WIN32) -+#if defined(HAVE_LOCALE_T) && !defined(WIN32) && defined(__GLIBC__) // XXX-Patched - #define READ_LOCALE_A_OUTPUT - #endif - diff --git a/community/postgresql13/external-libpq.patch.txt b/community/postgresql13/external-libpq.patch.txt deleted file mode 100644 index e148edd1b8f..00000000000 --- a/community/postgresql13/external-libpq.patch.txt +++ /dev/null @@ -1,41 +0,0 @@ -Patch-Source: https://src.fedoraproject.org/rpms/postgresql/blob/f35/f/postgresql-external-libpq.patch - -This patch is applied only when building non-default postgresql aport, i.e. -we want to link against libpq provided by the default postgresql aport. - -diff --git a/src/Makefile b/src/Makefile -index bcdbd95..4bea236 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -20,7 +20,6 @@ SUBDIRS = \ - backend/utils/mb/conversion_procs \ - backend/snowball \ - include \ -- interfaces \ - backend/replication/libpqwalreceiver \ - backend/replication/pgoutput \ - fe_utils \ -diff --git a/src/Makefile.global.in b/src/Makefile.global.in -index b9d86ac..29df69f 100644 ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -549,7 +549,7 @@ endif - # How to link to libpq. (This macro may be used as-is by backend extensions. - # Client-side code should go through libpq_pgport or libpq_pgport_shlib, - # instead.) --libpq = -L$(libpq_builddir) -lpq -+libpq = -lpq - - # libpq_pgport is for use by client executables (not libraries) that use libpq. - # We force clients to pull symbols from the non-shared libraries libpgport -@@ -579,7 +579,6 @@ endif - # Commonly used submake targets - - submake-libpq: | submake-generated-headers -- $(MAKE) -C $(libpq_builddir) all - - submake-libpgport: | submake-generated-headers - $(MAKE) -C $(top_builddir)/src/port all --- -2.21.0 - diff --git a/community/postgresql13/icu-collations-hack.patch b/community/postgresql13/icu-collations-hack.patch deleted file mode 100644 index b98410b81a1..00000000000 --- a/community/postgresql13/icu-collations-hack.patch +++ /dev/null @@ -1,893 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Wed, 03 Aug 2022 20:40:33 +0200 -Subject: [PATCH] Hack to generate usable ICU-based collations with - icu-data-en - -This is a downstream patch for Alpine Linux, it should never be -upstreamed in this form! - -When the PostgreSQL cluster is initialized (using initdb(1)) or the -DB administrator calls `pg_import_system_collations()` directly, this -function creates COLLATIONs in the system catalog (pg_collations). -There are two types: libc-based and ICU-based. The latter are created -based on *locales* (not collations) known to ICU, i.e. based on the ICU -data installed at the time. - -collationcmds.c includes the following comment: -> We use uloc_countAvailable()/uloc_getAvailable() rather than -> ucol_countAvailable()/ucol_getAvailable(). The former returns a full -> set of language+region combinations, whereas the latter only returns -> language+region combinations if they are distinct from the language's -> base collation. So there might not be a de-DE or en-GB, which would be -> confusing. - -There's a problem with this approach: locales and collations are two -different things. ICU data may include collation algorithms and data for -all or some languages, but not locales (language + country/region). -The collation data is small compared to locales. There are ~800 locales -(combinations of language, country and variants), but only 98 collations. -There's a mapping between collations and locales hidden somewhere in ICU -data. - -Since full ICU data is very big (30 MiB), we have created a stripped down -variant with only English locale (package icu-data-en, 2.6 MiB). It also -includes a subset of 18 collations that cover hundreds of languages. - -When the cluster is initialized or `pg_import_system_collations()` is -called directly and only icu-data-en (default) is installed, the user -ends up with only und, en and en_GB ICU-based COLLATIONs. The user can -create missing COLLATIONs manually, but this a) is not expected nor -reasonable behaviour, b) it's not easy to find out for which locales -there's a collation available for. - -I couldn't find any way how to list all language+country variants for the -given collation. It can be constructed when we iterate over all locales, -but this approach is useless when we don't have the locale data -available... I should also note that the reverse lookup (locale -> -collation) is not a problem for ICU when full locale data is stripped. - -So I ended up with a very ugly workaround: pre-generating a list of -collation -> locale mapping and embedding it in the collationcmds.c -source. Then we replace `uloc_countAvailable()`/`uloc_getAvailable()` -with `ucol_countAvailable()` / `ucol_getAvailable()` to iterate over -the collations instead of locales and lookup the locales in the -pre-generated list. - -This data is quite stable, there's a very low risk of getting outdated in -a way that would be a problem. - -`icu_coll_locales` has been generated using the following code: - - #include <stdio.h> - #include <string.h> - #include <unicode/ucol.h> - - // Copy-pasted from collationcmds.c. - static char *get_icu_language_tag(const char *localename) { - char buf[ULOC_FULLNAME_CAPACITY]; - UErrorCode status = U_ZERO_ERROR; - - uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status); - - if (U_FAILURE(status)) { - fprintf(stderr, "could not convert locale name \"%s\" to language tag: %s\n", - localename, u_errorName(status)); - return strdup(localename); - } - return strdup(buf); - } - - int main() { - UErrorCode status = U_ZERO_ERROR; - - for (int i = 0; i < uloc_countAvailable(); i++) { - const char *locale = uloc_getAvailable(i); - - UCollator *collator = ucol_open(locale, &status); - const char *actual_locale = ucol_getLocaleByType(collator, ULOC_ACTUAL_LOCALE, &status); - - // Strip @.* - char *ptr = strchr(actual_locale, '@'); - if (ptr != NULL) { - *ptr = '\0'; - } - if (strcmp(actual_locale, "root") == 0) { - actual_locale = ""; - } - if (strcmp(actual_locale, locale) != 0) { - printf("\"%s\", \"%s\",\n", actual_locale, get_icu_language_tag(locale)); - } - ucol_close(collator); - } - return 0; - } - -compiled and executed using: - - gcc -o main main.c $(pkg-config --libs icu-uc icu-io) && ./main | sort | uniq - ---- a/src/backend/commands/collationcmds.c -+++ b/src/backend/commands/collationcmds.c -@@ -513,6 +513,715 @@ - - return result; - } -+ -+/* -+ * XXX-Patched: Added a static mapping: collation name (parent) to locale (children) -+ * I'm gonna burn in hell for this... -+ */ -+static char* icu_coll_locales[] = { -+ "", "agq", -+ "", "agq-CM", -+ "", "ak", -+ "", "ak-GH", -+ "", "asa", -+ "", "asa-TZ", -+ "", "ast", -+ "", "ast-ES", -+ "", "bas", -+ "", "bas-CM", -+ "", "bem", -+ "", "bem-ZM", -+ "", "bez", -+ "", "bez-TZ", -+ "", "bm", -+ "", "bm-ML", -+ "", "brx", -+ "", "brx-IN", -+ "", "ca", -+ "", "ca-AD", -+ "", "ca-ES", -+ "", "ca-FR", -+ "", "ca-IT", -+ "", "ccp", -+ "", "ccp-BD", -+ "", "ccp-IN", -+ "", "ce", -+ "", "ce-RU", -+ "", "cgg", -+ "", "cgg-UG", -+ "", "ckb", -+ "", "ckb-IQ", -+ "", "ckb-IR", -+ "", "dav", -+ "", "dav-KE", -+ "", "de", -+ "", "de-AT", -+ "", "de-BE", -+ "", "de-CH", -+ "", "de-DE", -+ "", "de-IT", -+ "", "de-LI", -+ "", "de-LU", -+ "", "dje", -+ "", "dje-NE", -+ "", "doi", -+ "", "doi-IN", -+ "", "dua", -+ "", "dua-CM", -+ "", "dyo", -+ "", "dyo-SN", -+ "", "dz", -+ "", "dz-BT", -+ "", "ebu", -+ "", "ebu-KE", -+ "", "en", -+ "", "en-001", -+ "", "en-150", -+ "", "en-AE", -+ "", "en-AG", -+ "", "en-AI", -+ "", "en-AS", -+ "", "en-AT", -+ "", "en-AU", -+ "", "en-BB", -+ "", "en-BE", -+ "", "en-BI", -+ "", "en-BM", -+ "", "en-BS", -+ "", "en-BW", -+ "", "en-BZ", -+ "", "en-CA", -+ "", "en-CC", -+ "", "en-CH", -+ "", "en-CK", -+ "", "en-CM", -+ "", "en-CX", -+ "", "en-CY", -+ "", "en-DE", -+ "", "en-DG", -+ "", "en-DK", -+ "", "en-DM", -+ "", "en-ER", -+ "", "en-FI", -+ "", "en-FJ", -+ "", "en-FK", -+ "", "en-FM", -+ "", "en-GB", -+ "", "en-GD", -+ "", "en-GG", -+ "", "en-GH", -+ "", "en-GI", -+ "", "en-GM", -+ "", "en-GU", -+ "", "en-GY", -+ "", "en-HK", -+ "", "en-IE", -+ "", "en-IL", -+ "", "en-IM", -+ "", "en-IN", -+ "", "en-IO", -+ "", "en-JE", -+ "", "en-JM", -+ "", "en-KE", -+ "", "en-KI", -+ "", "en-KN", -+ "", "en-KY", -+ "", "en-LC", -+ "", "en-LR", -+ "", "en-LS", -+ "", "en-MG", -+ "", "en-MH", -+ "", "en-MO", -+ "", "en-MP", -+ "", "en-MS", -+ "", "en-MT", -+ "", "en-MU", -+ "", "en-MV", -+ "", "en-MW", -+ "", "en-MY", -+ "", "en-NA", -+ "", "en-NF", -+ "", "en-NG", -+ "", "en-NL", -+ "", "en-NR", -+ "", "en-NU", -+ "", "en-NZ", -+ "", "en-PG", -+ "", "en-PH", -+ "", "en-PK", -+ "", "en-PN", -+ "", "en-PR", -+ "", "en-PW", -+ "", "en-RW", -+ "", "en-SB", -+ "", "en-SC", -+ "", "en-SD", -+ "", "en-SE", -+ "", "en-SG", -+ "", "en-SH", -+ "", "en-SI", -+ "", "en-SL", -+ "", "en-SS", -+ "", "en-SX", -+ "", "en-SZ", -+ "", "en-TC", -+ "", "en-TK", -+ "", "en-TO", -+ "", "en-TT", -+ "", "en-TV", -+ "", "en-TZ", -+ "", "en-UG", -+ "", "en-UM", -+ "", "en-US", -+ "", "en-VC", -+ "", "en-VG", -+ "", "en-VI", -+ "", "en-VU", -+ "", "en-WS", -+ "", "en-ZA", -+ "", "en-ZM", -+ "", "en-ZW", -+ "", "eu", -+ "", "eu-ES", -+ "", "ewo", -+ "", "ewo-CM", -+ "", "ff", -+ "", "ff-Latn", -+ "", "ff-Latn-BF", -+ "", "ff-Latn-CM", -+ "", "ff-Latn-GH", -+ "", "ff-Latn-GM", -+ "", "ff-Latn-GN", -+ "", "ff-Latn-GW", -+ "", "ff-Latn-LR", -+ "", "ff-Latn-MR", -+ "", "ff-Latn-NE", -+ "", "ff-Latn-NG", -+ "", "ff-Latn-SL", -+ "", "ff-Latn-SN", -+ "", "fr", -+ "", "fr-BE", -+ "", "fr-BF", -+ "", "fr-BI", -+ "", "fr-BJ", -+ "", "fr-BL", -+ "", "fr-CD", -+ "", "fr-CF", -+ "", "fr-CG", -+ "", "fr-CH", -+ "", "fr-CI", -+ "", "fr-CM", -+ "", "fr-DJ", -+ "", "fr-DZ", -+ "", "fr-FR", -+ "", "fr-GA", -+ "", "fr-GF", -+ "", "fr-GN", -+ "", "fr-GP", -+ "", "fr-GQ", -+ "", "fr-HT", -+ "", "fr-KM", -+ "", "fr-LU", -+ "", "fr-MA", -+ "", "fr-MC", -+ "", "fr-MF", -+ "", "fr-MG", -+ "", "fr-ML", -+ "", "fr-MQ", -+ "", "fr-MR", -+ "", "fr-MU", -+ "", "fr-NC", -+ "", "fr-NE", -+ "", "fr-PF", -+ "", "fr-PM", -+ "", "fr-RE", -+ "", "fr-RW", -+ "", "fr-SC", -+ "", "fr-SN", -+ "", "fr-SY", -+ "", "fr-TD", -+ "", "fr-TG", -+ "", "fr-TN", -+ "", "fr-VU", -+ "", "fr-WF", -+ "", "fr-YT", -+ "", "fur", -+ "", "fur-IT", -+ "", "fy", -+ "", "fy-NL", -+ "", "ga", -+ "", "ga-GB", -+ "", "ga-IE", -+ "", "gd", -+ "", "gd-GB", -+ "", "gsw", -+ "", "gsw-CH", -+ "", "gsw-FR", -+ "", "gsw-LI", -+ "", "guz", -+ "", "guz-KE", -+ "", "gv", -+ "", "gv-IM", -+ "", "ia", -+ "", "ia-001", -+ "", "id", -+ "", "id-ID", -+ "", "ii", -+ "", "ii-CN", -+ "", "it", -+ "", "it-CH", -+ "", "it-IT", -+ "", "it-SM", -+ "", "it-VA", -+ "", "jgo", -+ "", "jgo-CM", -+ "", "jmc", -+ "", "jmc-TZ", -+ "", "jv", -+ "", "jv-ID", -+ "", "kab", -+ "", "kab-DZ", -+ "", "kam", -+ "", "kam-KE", -+ "", "kde", -+ "", "kde-TZ", -+ "", "kea", -+ "", "kea-CV", -+ "", "kgp", -+ "", "kgp-BR", -+ "", "khq", -+ "", "khq-ML", -+ "", "ki", -+ "", "ki-KE", -+ "", "kkj", -+ "", "kkj-CM", -+ "", "kln", -+ "", "kln-KE", -+ "", "ks", -+ "", "ks-Arab", -+ "", "ks-Arab-IN", -+ "", "ks-Deva", -+ "", "ks-Deva-IN", -+ "", "ksb", -+ "", "ksb-TZ", -+ "", "ksf", -+ "", "ksf-CM", -+ "", "ksh", -+ "", "ksh-DE", -+ "", "kw", -+ "", "kw-GB", -+ "", "lag", -+ "", "lag-TZ", -+ "", "lb", -+ "", "lb-LU", -+ "", "lg", -+ "", "lg-UG", -+ "", "lrc", -+ "", "lrc-IQ", -+ "", "lrc-IR", -+ "", "lu", -+ "", "lu-CD", -+ "", "luo", -+ "", "luo-KE", -+ "", "luy", -+ "", "luy-KE", -+ "", "mai", -+ "", "mai-IN", -+ "", "mas", -+ "", "mas-KE", -+ "", "mas-TZ", -+ "", "mer", -+ "", "mer-KE", -+ "", "mfe", -+ "", "mfe-MU", -+ "", "mg", -+ "", "mg-MG", -+ "", "mgh", -+ "", "mgh-MZ", -+ "", "mgo", -+ "", "mgo-CM", -+ "", "mi", -+ "", "mi-NZ", -+ "", "mni", -+ "", "mni-Beng", -+ "", "mni-Beng-IN", -+ "", "ms", -+ "", "ms-BN", -+ "", "ms-ID", -+ "", "ms-MY", -+ "", "ms-SG", -+ "", "mua", -+ "", "mua-CM", -+ "", "mzn", -+ "", "mzn-IR", -+ "", "naq", -+ "", "naq-NA", -+ "", "nd", -+ "", "nd-ZW", -+ "", "nl", -+ "", "nl-AW", -+ "", "nl-BE", -+ "", "nl-BQ", -+ "", "nl-CW", -+ "", "nl-NL", -+ "", "nl-SR", -+ "", "nl-SX", -+ "", "nmg", -+ "", "nmg-CM", -+ "", "nnh", -+ "", "nnh-CM", -+ "", "nus", -+ "", "nus-SS", -+ "", "nyn", -+ "", "nyn-UG", -+ "", "os", -+ "", "os-GE", -+ "", "os-RU", -+ "", "pcm", -+ "", "pcm-NG", -+ "", "pt", -+ "", "pt-AO", -+ "", "pt-BR", -+ "", "pt-CH", -+ "", "pt-CV", -+ "", "pt-GQ", -+ "", "pt-GW", -+ "", "pt-LU", -+ "", "pt-MO", -+ "", "pt-MZ", -+ "", "pt-PT", -+ "", "pt-ST", -+ "", "pt-TL", -+ "", "qu", -+ "", "qu-BO", -+ "", "qu-EC", -+ "", "qu-PE", -+ "", "rm", -+ "", "rm-CH", -+ "", "rn", -+ "", "rn-BI", -+ "", "rof", -+ "", "rof-TZ", -+ "", "rw", -+ "", "rw-RW", -+ "", "rwk", -+ "", "rwk-TZ", -+ "", "sa", -+ "", "sa-IN", -+ "", "sah", -+ "", "sah-RU", -+ "", "saq", -+ "", "saq-KE", -+ "", "sat", -+ "", "sat-Olck", -+ "", "sat-Olck-IN", -+ "", "sbp", -+ "", "sbp-TZ", -+ "", "sc", -+ "", "sc-IT", -+ "", "sd", -+ "", "sd-Arab", -+ "", "sd-Arab-PK", -+ "", "sd-Deva", -+ "", "sd-Deva-IN", -+ "", "seh", -+ "", "seh-MZ", -+ "", "ses", -+ "", "ses-ML", -+ "", "sg", -+ "", "sg-CF", -+ "", "shi", -+ "", "shi-Latn", -+ "", "shi-Latn-MA", -+ "", "shi-Tfng", -+ "", "shi-Tfng-MA", -+ "", "sn", -+ "", "sn-ZW", -+ "", "so", -+ "", "so-DJ", -+ "", "so-ET", -+ "", "so-KE", -+ "", "so-SO", -+ "", "su", -+ "", "su-Latn", -+ "", "su-Latn-ID", -+ "", "sw", -+ "", "sw-CD", -+ "", "sw-KE", -+ "", "sw-TZ", -+ "", "sw-UG", -+ "", "teo", -+ "", "teo-KE", -+ "", "teo-UG", -+ "", "tg", -+ "", "tg-TJ", -+ "", "ti", -+ "", "ti-ER", -+ "", "ti-ET", -+ "", "tt", -+ "", "tt-RU", -+ "", "twq", -+ "", "twq-NE", -+ "", "tzm", -+ "", "tzm-MA", -+ "", "vai", -+ "", "vai-Latn", -+ "", "vai-Latn-LR", -+ "", "vai-Vaii", -+ "", "vai-Vaii-LR", -+ "", "vun", -+ "", "vun-TZ", -+ "", "wae", -+ "", "wae-CH", -+ "", "xh", -+ "", "xh-ZA", -+ "", "xog", -+ "", "xog-UG", -+ "", "yav", -+ "", "yav-CM", -+ "", "yrl", -+ "", "yrl-BR", -+ "", "yrl-CO", -+ "", "yrl-VE", -+ "", "zgh", -+ "", "zgh-MA", -+ "", "zu", -+ "", "zu-ZA", -+ "af", "af-NA", -+ "af", "af-ZA", -+ "am", "am-ET", -+ "ar", "ar-001", -+ "ar", "ar-AE", -+ "ar", "ar-BH", -+ "ar", "ar-DJ", -+ "ar", "ar-DZ", -+ "ar", "ar-EG", -+ "ar", "ar-EH", -+ "ar", "ar-ER", -+ "ar", "ar-IL", -+ "ar", "ar-IQ", -+ "ar", "ar-JO", -+ "ar", "ar-KM", -+ "ar", "ar-KW", -+ "ar", "ar-LB", -+ "ar", "ar-LY", -+ "ar", "ar-MA", -+ "ar", "ar-MR", -+ "ar", "ar-OM", -+ "ar", "ar-PS", -+ "ar", "ar-QA", -+ "ar", "ar-SA", -+ "ar", "ar-SD", -+ "ar", "ar-SO", -+ "ar", "ar-SS", -+ "ar", "ar-SY", -+ "ar", "ar-TD", -+ "ar", "ar-TN", -+ "ar", "ar-YE", -+ "as", "as-IN", -+ "az", "az-Cyrl", -+ "az", "az-Cyrl-AZ", -+ "az", "az-Latn", -+ "az", "az-Latn-AZ", -+ "be", "be-BY", -+ "bg", "bg-BG", -+ "bn", "bn-BD", -+ "bn", "bn-IN", -+ "bo", "bo-CN", -+ "bo", "bo-IN", -+ "br", "br-FR", -+ "bs", "bs-Latn", -+ "bs", "bs-Latn-BA", -+ "bs_Cyrl", "bs-Cyrl-BA", -+ "ceb", "ceb-PH", -+ "chr", "chr-US", -+ "cs", "cs-CZ", -+ "cy", "cy-GB", -+ "da", "da-DK", -+ "da", "da-GL", -+ "dsb", "dsb-DE", -+ "ee", "ee-GH", -+ "ee", "ee-TG", -+ "el", "el-CY", -+ "el", "el-GR", -+ "eo", "eo-001", -+ "es", "es-419", -+ "es", "es-AR", -+ "es", "es-BO", -+ "es", "es-BR", -+ "es", "es-BZ", -+ "es", "es-CL", -+ "es", "es-CO", -+ "es", "es-CR", -+ "es", "es-CU", -+ "es", "es-DO", -+ "es", "es-EA", -+ "es", "es-EC", -+ "es", "es-ES", -+ "es", "es-GQ", -+ "es", "es-GT", -+ "es", "es-HN", -+ "es", "es-IC", -+ "es", "es-MX", -+ "es", "es-NI", -+ "es", "es-PA", -+ "es", "es-PE", -+ "es", "es-PH", -+ "es", "es-PR", -+ "es", "es-PY", -+ "es", "es-SV", -+ "es", "es-US", -+ "es", "es-UY", -+ "es", "es-VE", -+ "et", "et-EE", -+ "fa", "fa-IR", -+ "ff_Adlm", "ff-Adlm-BF", -+ "ff_Adlm", "ff-Adlm-CM", -+ "ff_Adlm", "ff-Adlm-GH", -+ "ff_Adlm", "ff-Adlm-GM", -+ "ff_Adlm", "ff-Adlm-GN", -+ "ff_Adlm", "ff-Adlm-GW", -+ "ff_Adlm", "ff-Adlm-LR", -+ "ff_Adlm", "ff-Adlm-MR", -+ "ff_Adlm", "ff-Adlm-NE", -+ "ff_Adlm", "ff-Adlm-NG", -+ "ff_Adlm", "ff-Adlm-SL", -+ "ff_Adlm", "ff-Adlm-SN", -+ "fi", "fi-FI", -+ "fil", "fil-PH", -+ "fo", "fo-DK", -+ "fo", "fo-FO", -+ "gl", "gl-ES", -+ "gu", "gu-IN", -+ "ha", "ha-GH", -+ "ha", "ha-NE", -+ "ha", "ha-NG", -+ "haw", "haw-US", -+ "he", "he-IL", -+ "hi", "hi-IN", -+ "hi", "hi-Latn", -+ "hi", "hi-Latn-IN", -+ "hr", "hr-BA", -+ "hr", "hr-HR", -+ "hsb", "hsb-DE", -+ "hu", "hu-HU", -+ "hy", "hy-AM", -+ "ig", "ig-NG", -+ "is", "is-IS", -+ "ja", "ja-JP", -+ "ka", "ka-GE", -+ "kk", "kk-KZ", -+ "kl", "kl-GL", -+ "km", "km-KH", -+ "kn", "kn-IN", -+ "ko", "ko-KP", -+ "ko", "ko-KR", -+ "kok", "kok-IN", -+ "ku", "ku-TR", -+ "ky", "ky-KG", -+ "lkt", "lkt-US", -+ "ln", "ln-AO", -+ "ln", "ln-CD", -+ "ln", "ln-CF", -+ "ln", "ln-CG", -+ "lo", "lo-LA", -+ "lt", "lt-LT", -+ "lv", "lv-LV", -+ "mk", "mk-MK", -+ "ml", "ml-IN", -+ "mn", "mn-MN", -+ "mr", "mr-IN", -+ "mt", "mt-MT", -+ "my", "my-MM", -+ "ne", "ne-IN", -+ "ne", "ne-NP", -+ "no", "nb", -+ "no", "nb-NO", -+ "no", "nb-SJ", -+ "no", "nn", -+ "no", "nn-NO", -+ "om", "om-ET", -+ "om", "om-KE", -+ "or", "or-IN", -+ "pa", "pa-Arab", -+ "pa", "pa-Arab-PK", -+ "pa", "pa-Guru", -+ "pa", "pa-Guru-IN", -+ "pl", "pl-PL", -+ "ps", "ps-AF", -+ "ps", "ps-PK", -+ "ro", "ro-MD", -+ "ro", "ro-RO", -+ "ru", "ru-BY", -+ "ru", "ru-KG", -+ "ru", "ru-KZ", -+ "ru", "ru-MD", -+ "ru", "ru-RU", -+ "ru", "ru-UA", -+ "se", "se-FI", -+ "se", "se-NO", -+ "se", "se-SE", -+ "si", "si-LK", -+ "sk", "sk-SK", -+ "sl", "sl-SI", -+ "smn", "smn-FI", -+ "sq", "sq-AL", -+ "sq", "sq-MK", -+ "sq", "sq-XK", -+ "sr", "sr-Cyrl", -+ "sr", "sr-Cyrl-BA", -+ "sr", "sr-Cyrl-ME", -+ "sr", "sr-Cyrl-RS", -+ "sr", "sr-Cyrl-XK", -+ "sr_Latn", "sr-Latn-BA", -+ "sr_Latn", "sr-Latn-ME", -+ "sr_Latn", "sr-Latn-RS", -+ "sr_Latn", "sr-Latn-XK", -+ "sv", "sv-AX", -+ "sv", "sv-FI", -+ "sv", "sv-SE", -+ "ta", "ta-IN", -+ "ta", "ta-LK", -+ "ta", "ta-MY", -+ "ta", "ta-SG", -+ "te", "te-IN", -+ "th", "th-TH", -+ "tk", "tk-TM", -+ "to", "to-TO", -+ "tr", "tr-CY", -+ "tr", "tr-TR", -+ "ug", "ug-CN", -+ "uk", "uk-UA", -+ "ur", "ur-IN", -+ "ur", "ur-PK", -+ "uz", "uz-Arab", -+ "uz", "uz-Arab-AF", -+ "uz", "uz-Cyrl", -+ "uz", "uz-Cyrl-UZ", -+ "uz", "uz-Latn", -+ "uz", "uz-Latn-UZ", -+ "vi", "vi-VN", -+ "wo", "wo-SN", -+ "yi", "yi-001", -+ "yo", "yo-BJ", -+ "yo", "yo-NG", -+ "zh", "yue", -+ "zh", "yue-Hans", -+ "zh", "yue-Hans-CN", -+ "zh", "yue-Hant", -+ "zh", "yue-Hant-HK", -+ "zh", "zh-Hans", -+ "zh", "zh-Hans-CN", -+ "zh", "zh-Hans-HK", -+ "zh", "zh-Hans-MO", -+ "zh", "zh-Hans-SG", -+ "zh", "zh-Hant", -+ "zh", "zh-Hant-HK", -+ "zh", "zh-Hant-MO", -+ "zh", "zh-Hant-TW", -+ NULL, NULL, -+}; -+ - #endif /* USE_ICU */ - - -@@ -709,18 +1419,19 @@ - * Start the loop at -1 to sneak in the root locale without too much - * code duplication. - */ -- for (i = -1; i < uloc_countAvailable(); i++) -+ for (i = -1; i < ucol_countAvailable(); i++) /* XXX-Patched: changed from uloc_countAvailable() */ - { - const char *name; - char *langtag; - char *icucomment; - const char *collcollate; - Oid collid; -+ char **ptr; /* XXX-Patched: added */ - - if (i == -1) - name = ""; /* ICU root locale */ - else -- name = uloc_getAvailable(i); -+ name = ucol_getAvailable(i); /* XXX-Patched: changed from uloc_getAvailable() */ - - langtag = get_icu_language_tag(name); - collcollate = U_ICU_VERSION_MAJOR_NUM >= 54 ? langtag : name; -@@ -749,6 +1460,44 @@ - CreateComments(collid, CollationRelationId, 0, - icucomment); - } -+ -+ /* -+ * XXX-Patched: The following block is added to create collations also for derived -+ * locales (combination of language+country/region). -+ * It's terribly inefficient, but in the big picture, it doesn't matter that much -+ * (it's typically called only once in the life of the cluster). -+ */ -+ for (ptr = icu_coll_locales; *ptr != NULL; ptr++) -+ { -+ /* -+ * icu_coll_locales is a 1D array of pairs: collation name and locale (langtag). -+ * ptr++ moves pointer to the second string of the pair and it's a post-increment, -+ * so after the comparison with name is evaluated. -+ */ -+ if (strcmp(*ptr++, name) == 0) { -+ const char *langtag; -+ -+ langtag = pstrdup(*ptr); -+ collid = CollationCreate(psprintf("%s-x-icu", langtag), -+ nspid, GetUserId(), -+ COLLPROVIDER_ICU, true, -1, -+ langtag, langtag, -+ get_collation_actual_version(COLLPROVIDER_ICU, langtag), -+ true, true); -+ -+ if (OidIsValid(collid)) -+ { -+ ncreated++; -+ -+ CommandCounterIncrement(); -+ -+ icucomment = get_icu_locale_comment(langtag); -+ if (icucomment) -+ CreateComments(collid, CollationRelationId, 0, -+ icucomment); -+ } -+ } -+ } - } - } - #endif /* USE_ICU */ diff --git a/community/postgresql13/initdb.patch b/community/postgresql13/initdb.patch deleted file mode 100644 index 59a872a4998..00000000000 --- a/community/postgresql13/initdb.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c ---- a/src/bin/initdb/initdb.c -+++ b/src/bin/initdb/initdb.c -@@ -3259,9 +3259,7 @@ - /* translator: This is a placeholder in a shell command. */ - appendPQExpBuffer(start_db_cmd, " -l %s start", _("logfile")); - -- printf(_("\nSuccess. You can now start the database server using:\n\n" -- " %s\n\n"), -- start_db_cmd->data); -+ printf(_("\nSuccess.\n\n")); - - destroyPQExpBuffer(start_db_cmd); - diff --git a/community/postgresql13/jit-datalayout-mismatch-on-s390x.patch b/community/postgresql13/jit-datalayout-mismatch-on-s390x.patch deleted file mode 100644 index bce5c61e159..00000000000 --- a/community/postgresql13/jit-datalayout-mismatch-on-s390x.patch +++ /dev/null @@ -1,100 +0,0 @@ -Patch-Source: https://src.fedoraproject.org/rpms/postgresql/blob/f35/f/postgresql-datalayout-mismatch-on-s390.patch -From 0edaa982336823d4d7af8f10b91579fe0099ef3d Mon Sep 17 00:00:00 2001 -From: Tom Stellard <tstellar@redhat.com> -Date: Tue, 20 Apr 2021 20:14:21 -0700 -Subject: [PATCH] jit: Workaround potential datalayout mismatch on s390x - -LLVM's s390x target uses a different datalayout for z13 and newer processors. -If llvmjit_types.bc is compiled to target a processor older than z13, and -then the JIT runs on a z13 or newer processor, then there will be a mismatch -in datalayouts between llvmjit_types.bc and the JIT engine. This mismatch -causes the JIT to fail at runtime. ---- - src/backend/jit/llvm/llvmjit.c | 46 ++++++++++++++++++++++++++++++++-- - 1 file changed, 44 insertions(+), 2 deletions(-) - -diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c -index 98a27f08bf..05b6438ba8 100644 ---- a/src/backend/jit/llvm/llvmjit.c -+++ b/src/backend/jit/llvm/llvmjit.c -@@ -776,6 +776,35 @@ llvm_compile_module(LLVMJitContext *context) - errhidecontext(true))); - } - -+/* -+ * For the systemz target, LLVM uses a different datalayout for z13 and newer -+ * CPUs than it does for older CPUs. This can cause a mismatch in datalayouts -+ * in the case where the llvm_types_module is compiled with a pre-z13 CPU -+ * and the JIT is running on z13 or newer. -+ * See computeDataLayout() function in -+ * llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp for information on the -+ * datalayout differences. -+ */ -+static bool -+needs_systemz_workaround(void) -+{ -+ bool ret = false; -+ LLVMContextRef llvm_context; -+ LLVMTypeRef vec_type; -+ LLVMTargetDataRef llvm_layoutref; -+ if (strncmp(LLVMGetTargetName(llvm_targetref), "systemz", strlen("systemz"))) -+ { -+ return false; -+ } -+ -+ llvm_context = LLVMGetModuleContext(llvm_types_module); -+ vec_type = LLVMVectorType(LLVMIntTypeInContext(llvm_context, 32), 4); -+ llvm_layoutref = LLVMCreateTargetData(llvm_layout); -+ ret = (LLVMABIAlignmentOfType(llvm_layoutref, vec_type) == 16); -+ LLVMDisposeTargetData(llvm_layoutref); -+ return ret; -+} -+ - /* - * Per session initialization. - */ -@@ -785,6 +814,7 @@ llvm_session_initialize(void) - MemoryContext oldcontext; - char *error = NULL; - char *cpu = NULL; -+ char *host_features = NULL; - char *features = NULL; - LLVMTargetMachineRef opt0_tm; - LLVMTargetMachineRef opt3_tm; -@@ -816,10 +846,17 @@ llvm_session_initialize(void) - * features not all CPUs have (weird, huh). - */ - cpu = LLVMGetHostCPUName(); -- features = LLVMGetHostCPUFeatures(); -+ features = host_features = LLVMGetHostCPUFeatures(); - elog(DEBUG2, "LLVMJIT detected CPU \"%s\", with features \"%s\"", - cpu, features); - -+ if (needs_systemz_workaround()) -+ { -+ const char *no_vector =",-vector"; -+ features = malloc(sizeof(char) * (strlen(host_features) + strlen(no_vector) + 1)); -+ sprintf(features, "%s%s", host_features, no_vector); -+ } -+ - opt0_tm = - LLVMCreateTargetMachine(llvm_targetref, llvm_triple, cpu, features, - LLVMCodeGenLevelNone, -@@ -833,8 +870,13 @@ llvm_session_initialize(void) - - LLVMDisposeMessage(cpu); - cpu = NULL; -- LLVMDisposeMessage(features); -+ if (features != host_features) -+ { -+ free(features); -+ } - features = NULL; -+ LLVMDisposeMessage(host_features); -+ host_features = NULL; - - /* force symbols in main binary to be loaded */ - LLVMLoadLibraryPermanently(NULL); --- -2.27.0 - diff --git a/community/postgresql13/libpgport-pkglibdir.patch.txt b/community/postgresql13/libpgport-pkglibdir.patch.txt deleted file mode 100644 index cb862fc344d..00000000000 --- a/community/postgresql13/libpgport-pkglibdir.patch.txt +++ /dev/null @@ -1,91 +0,0 @@ -Patch-Source: https://sources.debian.org/src/postgresql-14/14.0-1/debian/patches/libpgport-pkglibdir -Author: Christoph Berg <myon@debian.org> -Description: Move libpgport/libpgcommon/libpgfeutils from libdir to pkglibdir - This allows client applications to link to version-specific libraries. - Used by pg-checksums. - ---- a/src/common/Makefile -+++ b/src/common/Makefile -@@ -68,15 +68,15 @@ all: libpgcommon.a libpgcommon_shlib.a l - - # libpgcommon is needed by some contrib - install: all installdirs -- $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(libdir)/libpgcommon.a' -- $(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(libdir)/libpgcommon_shlib.a' -+ $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(pkglibdir)/libpgcommon.a' -+ $(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a' - - installdirs: -- $(MKDIR_P) '$(DESTDIR)$(libdir)' -+ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)' - - uninstall: -- rm -f '$(DESTDIR)$(libdir)/libpgcommon.a' -- rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a' -+ rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon.a' -+ rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a' - - libpgcommon.a: $(OBJS_FRONTEND) - rm -f $@ ---- a/src/fe_utils/Makefile -+++ b/src/fe_utils/Makefile -@@ -35,13 +35,13 @@ distprep: psqlscan.c - - # libpgfeutils could be useful to contrib, so install it - install: all installdirs -- $(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(libdir)/libpgfeutils.a' -+ $(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(pkglibdir)/libpgfeutils.a' - - installdirs: -- $(MKDIR_P) '$(DESTDIR)$(libdir)' -+ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)' - - uninstall: -- rm -f '$(DESTDIR)$(libdir)/libpgfeutils.a' -+ rm -f '$(DESTDIR)$(pkglibdir)/libpgfeutils.a' - - clean distclean: - rm -f libpgfeutils.a $(OBJS) lex.backup ---- a/src/port/Makefile -+++ b/src/port/Makefile -@@ -54,15 +54,15 @@ all: libpgport.a libpgport_shlib.a libpg - - # libpgport is needed by some contrib - install: all installdirs -- $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a' -- $(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(libdir)/libpgport_shlib.a' -+ $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(pkglibdir)/libpgport.a' -+ $(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a' - - installdirs: -- $(MKDIR_P) '$(DESTDIR)$(libdir)' -+ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)' - - uninstall: -- rm -f '$(DESTDIR)$(libdir)/libpgport.a' -- rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a' -+ rm -f '$(DESTDIR)$(pkglibdir)/libpgport.a' -+ rm -f '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a' - - libpgport.a: $(OBJS) - rm -f $@ ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -599,7 +599,7 @@ - ifeq ($(PORTNAME),darwin) - libpq_pgport = $(libpq) - else ifdef PGXS --libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq) -+libpq_pgport = -L$(pkglibdir) -lpgcommon -lpgport $(libpq) - else - libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq) - endif -@@ -610,7 +610,7 @@ - # done if they don't, since they will have satisfied all their references - # from these libraries.) - ifdef PGXS --libpq_pgport_shlib = -L$(libdir) -lpgcommon_shlib -lpgport_shlib $(libpq) -+libpq_pgport_shlib = -L$(pkglibdir) -lpgcommon_shlib -lpgport_shlib $(libpq) - else - libpq_pgport_shlib = -L$(top_builddir)/src/common -lpgcommon_shlib -L$(top_builddir)/src/port -lpgport_shlib $(libpq) - endif diff --git a/community/postgresql13/make-split-headers.patch b/community/postgresql13/make-split-headers.patch deleted file mode 100644 index 1a280a49c98..00000000000 --- a/community/postgresql13/make-split-headers.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Mon, 08 Nov 2021 14:56:33 +0100 -Subject: [PATCH] Allow to install interfaces headers and server headers separately - -Don't install headers of the interfaces (libpq and libecpg) by the install -target, allow to install them separately from the headers needed for server. -We need this for two reasons: - -a. Allow building PostgreSQL server with LDAP support, but libpq without - dependency on LDAP. -b. Allow building/installing PostgreSQL server without the interfaces. - This is used for non-default postgresql aports (older versions of - PostgreSQL) - we want to provide just one version of libpq and libecpg - library provided by the default (newest) postgresql aport. - ---- a/src/include/Makefile -+++ b/src/include/Makefile -@@ -26,8 +26,10 @@ - port/win32_msvc/sys port/win32/arpa port/win32/netinet \ - port/win32/sys portability - --# Install all headers --install: all installdirs -+# Install server headers -+install: install-server -+install-interfaces: all -+ $(MKDIR_P) '$(DESTDIR)$(includedir)/libpq' '$(DESTDIR)$(includedir_internal)/libpq' - # These headers are needed by the public headers of the interfaces. - $(INSTALL_DATA) $(srcdir)/postgres_ext.h '$(DESTDIR)$(includedir)' - $(INSTALL_DATA) $(srcdir)/libpq/libpq-fs.h '$(DESTDIR)$(includedir)/libpq' -@@ -40,6 +42,8 @@ - $(INSTALL_DATA) $(srcdir)/port.h '$(DESTDIR)$(includedir_internal)' - $(INSTALL_DATA) $(srcdir)/postgres_fe.h '$(DESTDIR)$(includedir_internal)' - $(INSTALL_DATA) $(srcdir)/libpq/pqcomm.h '$(DESTDIR)$(includedir_internal)/libpq' -+install-server: all -+ $(MKDIR_P) $(addprefix '$(DESTDIR)$(includedir_server)'/, $(SUBDIRS)) - # These headers are needed for server-side development - $(INSTALL_DATA) pg_config.h '$(DESTDIR)$(includedir_server)' - $(INSTALL_DATA) pg_config_ext.h '$(DESTDIR)$(includedir_server)' -@@ -64,10 +68,6 @@ - chmod $(INSTALL_DATA_MODE) *.h || exit; \ - done - --installdirs: -- $(MKDIR_P) '$(DESTDIR)$(includedir)/libpq' '$(DESTDIR)$(includedir_internal)/libpq' -- $(MKDIR_P) $(addprefix '$(DESTDIR)$(includedir_server)'/, $(SUBDIRS)) -- - - uninstall: - rm -f $(addprefix '$(DESTDIR)$(includedir)'/, pg_config.h pg_config_ext.h pg_config_os.h pg_config_manual.h postgres_ext.h libpq/libpq-fs.h) diff --git a/community/postgresql13/per-version-dirs.patch b/community/postgresql13/per-version-dirs.patch deleted file mode 100644 index a81e1259311..00000000000 --- a/community/postgresql13/per-version-dirs.patch +++ /dev/null @@ -1,69 +0,0 @@ -Author: Martin Pitt <mpitt@debian.org> -Description: Use version specific installation directories so that several major versions can be installed in parallel. - - * Install server lib files into /usr/lib/postgresql<version>/ - * Install server related header files into /usr/include/postgresql/<version>/server/ - * Disable PostgreSQL's automagic path mangling and fix libdir for pg_config, - so that pg_config in /usr/bin and /usr/libexec/postgresql<version> behave - identically. - -Bug-Debian: http://bugs.debian.org/462037 -Patch-Source: https://sources.debian.org/src/postgresql-14/14.0-1/debian/patches/50-per-version-dirs.patch - ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -119,7 +119,7 @@ libdir := @libdir@ - pkglibdir = $(libdir) - ifeq "$(findstring pgsql, $(pkglibdir))" "" - ifeq "$(findstring postgres, $(pkglibdir))" "" --override pkglibdir := $(pkglibdir)/postgresql -+override pkglibdir := /usr/lib/postgresql@PG_MAJORVERSION@ - endif - endif - -@@ -167,7 +167,7 @@ endif # PGXS - - # These derived path variables aren't separately configurable. - --includedir_server = $(pkgincludedir)/server -+includedir_server = $(pkgincludedir)/@PG_MAJORVERSION@/server - includedir_internal = $(pkgincludedir)/internal - pgxsdir = $(pkglibdir)/pgxs - bitcodedir = $(pkglibdir)/bitcode ---- a/src/bin/pg_config/pg_config.c -+++ b/src/bin/pg_config/pg_config.c -@@ -27,6 +27,8 @@ - #include "common/config_info.h" - #include "port.h" - -+#include "../port/pg_config_paths.h" -+ - static const char *progname; - - /* -@@ -149,11 +151,7 @@ main(int argc, char **argv) - } - } - -- if (find_my_exec(argv[0], my_exec_path) < 0) -- { -- fprintf(stderr, _("%s: could not find own program executable\n"), progname); -- exit(1); -- } -+ snprintf(my_exec_path, sizeof(my_exec_path), "%s/%s", PGBINDIR, progname); - - configdata = get_configdata(my_exec_path, &configdata_len); - /* no arguments -> print everything */ ---- a/src/test/perl/TestLib.pm -+++ b/src/test/perl/TestLib.pm -@@ -591,6 +591,10 @@ sub check_pg_config - or die "could not execute pg_config"; - chomp($stdout); - $stdout =~ s/\r$//; -+ # Alpine's pg_config is not relocatable, manually check for correct location -+ if (-d "../../../build/tmp_install/usr/include/postgresql") { -+ $stdout = "../../../build/tmp_install/usr/include/postgresql"; -+ } - - open my $pg_config_h, '<', "$stdout/pg_config.h" or die "$!"; - my $match = (grep { /^$regexp/ } <$pg_config_h>); diff --git a/community/postgresql13/perl-rpath.patch b/community/postgresql13/perl-rpath.patch deleted file mode 100644 index 6e522dbe67e..00000000000 --- a/community/postgresql13/perl-rpath.patch +++ /dev/null @@ -1,22 +0,0 @@ -We configure Postgres with --disable-rpath because for the most part we -want to leave it to ldconfig to determine where libraries are. However, -for some reason the Perl package puts libperl.so in a nonstandard place -and doesn't add that place to the ldconfig search path. I think this -is a Perl packaging bug, myself, but apparently it's not going to change. -So work around it by adding an rpath spec to plperl.so (only). - -Alpine notes: -This patch is copied from Fedora. - ---- a/src/pl/plperl/GNUmakefile -+++ b/src/pl/plperl/GNUmakefile -@@ -55,6 +55,9 @@ - - SHLIB_LINK = $(perl_embed_ldflags) - -+# Force rpath to be used even though we disable it everywhere else -+SHLIB_LINK += $(rpath) -+ - REGRESS_OPTS = --dbname=$(PL_TESTDB) - REGRESS = plperl_setup plperl plperl_lc plperl_trigger plperl_shared \ - plperl_elog plperl_util plperl_init plperlu plperl_array \ diff --git a/community/postgresql13/pg_config-add-major-version.patch b/community/postgresql13/pg_config-add-major-version.patch deleted file mode 100644 index 8f10f366d4e..00000000000 --- a/community/postgresql13/pg_config-add-major-version.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Tue, 09 Nov 2021 00:33:22 +0100 -Subject: [PATCH] pg_config: Add new option --major-version - -We use this option in aports for PostgreSQL extensions to easily get major -version of the default postgresql. - ---- a/src/bin/pg_config/pg_config.c -+++ b/src/bin/pg_config/pg_config.c -@@ -65,6 +65,7 @@ - {"--ldflags_ex", "LDFLAGS_EX"}, - {"--ldflags_sl", "LDFLAGS_SL"}, - {"--libs", "LIBS"}, -+ {"--major-version", "MAJOR-VERSION"}, - {"--version", "VERSION"}, - {NULL, NULL} - }; -@@ -101,6 +102,8 @@ - printf(_(" --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was built\n")); - printf(_(" --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built\n")); - printf(_(" --libs show LIBS value used when PostgreSQL was built\n")); -+ printf(_(" --major-version show the PostgreSQL major version number\n" -+ " (Alpine Linux specific option)\n")); - printf(_(" --version show the PostgreSQL version\n")); - printf(_(" -?, --help show this help, then exit\n")); - printf(_("\nWith no arguments, all known items are shown.\n\n")); ---- a/src/common/config_info.c -+++ b/src/common/config_info.c -@@ -38,7 +38,7 @@ - int i = 0; - - /* Adjust this to match the number of items filled below */ -- *configdata_len = 23; -+ *configdata_len = 24; - configdata = (ConfigData *) palloc(*configdata_len * sizeof(ConfigData)); - - configdata[i].name = pstrdup("BINDIR"); -@@ -193,6 +193,11 @@ - - configdata[i].name = pstrdup("VERSION"); - configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION); -+ i++; -+ -+ // XXX-Patched: Alpine Linux specific, used in extension aports. -+ configdata[i].name = pstrdup("MAJOR-VERSION"); -+ configdata[i].setting = pstrdup(PG_MAJORVERSION); - i++; - - Assert(i == *configdata_len); diff --git a/community/postgresql13/pltcl_create_tables.sql b/community/postgresql13/pltcl_create_tables.sql deleted file mode 100644 index 76c7a954af3..00000000000 --- a/community/postgresql13/pltcl_create_tables.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Create tables needed for PL/Tcl autoloading. This script should be run by --- the database administrator only. --- --- Statements in this script are extracted from pltcl_loadmod script. --- --- Author: G.J.R. Timmer --- Date: 2017-01-28 - -create table pltcl_modules (modname name, modseq int2, modsrc text); -create index pltcl_modules_i on pltcl_modules using btree (modname name_ops); - -create table pltcl_modfuncs (funcname name, modname name); -create index pltcl_modfuncs_i on pltcl_modfuncs using hash (funcname name_ops); diff --git a/community/postgresql13/postgresql13.post-install b/community/postgresql13/postgresql13.post-install deleted file mode 100644 index 476959a55a3..00000000000 --- a/community/postgresql13/postgresql13.post-install +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -majorver=${1%%.*} - -cat >&2 <<EOF -* -* If you want to use JIT in PostgreSQL, install postgresql$majorver-jit or -* postgresql-jit (if you didn't install specific major version of postgresql). -* -EOF - -exit 0 diff --git a/community/postgresql13/postgresql13.pre-deinstall b/community/postgresql13/postgresql13.pre-deinstall deleted file mode 100644 index db24e86452f..00000000000 --- a/community/postgresql13/postgresql13.pre-deinstall +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -pkgver=$1 -pkgver_major=${pkgver%%.*} -default_ver=$(pg_versions get-default 2>/dev/null) || true - -# If this package is not set as the default PostgreSQL version (see -# pg_versions), let it go. -[ "$default_ver" = "$pkgver_major" ] || exit 0 - -# If this package ('postgresql<majorver>') has been installed explicitly, i.e. -# not via 'postgresql' provider or as a dependency, the user is apparently -# uninstalling it intentionally, so let it go. -grep -Fqx "postgresql$pkgver_major" /etc/apk/world 2>/dev/null && exit 0 - -data_dir=$( - . /etc/conf.d/postgresql 2>/dev/null - echo "${data_dir:-"/var/lib/postgresql/$pkgver_major/data"}" -) -# If data_dir for this version does not exist or is empty, let it go. -[ -f "$data_dir"/PG_VERSION ] || exit 0 - - -cat >&2 <<EOF -* -* You are uninstalling your default PostgreSQL version ($default_ver) which seems to be -* in use! If it's *not* intentional and you want to preserve this version, -* install it explicitly: \`apk add postgresql$default_ver\`. -* -* Please note that to upgrade your cluster to a new major version using -* pg_upgrade(1), you must have both the old and new versions installed. -* -EOF - -exit 1 diff --git a/community/postgresql13/remove-libecpg_compat.patch b/community/postgresql13/remove-libecpg_compat.patch deleted file mode 100644 index ff5fab07fad..00000000000 --- a/community/postgresql13/remove-libecpg_compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Nothing ever depended on libecpg_compat.so.3 in Fedora, so don't build -it now, at least till somebody explicitly requests that. - -Patch-Source: https://src.fedoraproject.org/rpms/libecpg/blob/f35/f/libecpg-10.5-no-compat-lib.patch - -diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile -index 41460a1..cc3dd37 100644 ---- a/src/interfaces/ecpg/Makefile -+++ b/src/interfaces/ecpg/Makefile -@@ -2,7 +2,7 @@ subdir = src/interfaces/ecpg - top_builddir = ../../.. - include $(top_builddir)/src/Makefile.global - --SUBDIRS = include pgtypeslib ecpglib compatlib preproc -+SUBDIRS = include pgtypeslib ecpglib preproc - - # Suppress parallel build of subdirectories to avoid a bug in GNU make 3.82, cf - # http://savannah.gnu.org/bugs/?30653 diff --git a/community/postgresql13/unix_socket_directories.patch b/community/postgresql13/unix_socket_directories.patch deleted file mode 100644 index e7de03ed664..00000000000 --- a/community/postgresql13/unix_socket_directories.patch +++ /dev/null @@ -1,29 +0,0 @@ -Using /tmp for sockets allows everyone to spoof a PostgreSQL server. Thus use -/run/postgresql/ for "system" clusters which run as 'postgres' (user -clusters will still use /tmp). Since system cluster are by far the common case, -set it as default. - -This is inspired by Fedora and Debian patches. - ---- a/src/backend/utils/misc/postgresql.conf.sample -+++ b/src/backend/utils/misc/postgresql.conf.sample -@@ -63,7 +63,7 @@ - #port = 5432 # (change requires restart) - #max_connections = 100 # (change requires restart) - #superuser_reserved_connections = 3 # (change requires restart) --#unix_socket_directories = '/tmp' # comma-separated list of directories -+unix_socket_directories = '/run/postgresql' # comma-separated list of directories - # (change requires restart) - #unix_socket_group = '' # (change requires restart) - #unix_socket_permissions = 0777 # begin with 0 to use octal notation ---- a/src/include/pg_config_manual.h -+++ b/src/include/pg_config_manual.h -@@ -201,7 +201,7 @@ - * support them yet. - */ - #ifndef WIN32 --#define DEFAULT_PGSOCKET_DIR "/tmp" -+#define DEFAULT_PGSOCKET_DIR "/run/postgresql" - #else - #define DEFAULT_PGSOCKET_DIR "" - #endif diff --git a/community/postgresql14/APKBUILD b/community/postgresql14/APKBUILD index 7f0775d2948..c24f95c4036 100644 --- a/community/postgresql14/APKBUILD +++ b/community/postgresql14/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> _pkgname=postgresql pkgver=14.11 -pkgrel=1 +pkgrel=2 _majorver=${pkgver%%.*} # Should this aport provide libpq* and libecpg*? true/false # Exactly one postgresql aport must be the default one! @@ -13,7 +13,7 @@ pkgdesc="A sophisticated object-relational DBMS, version $_majorver" url="https://www.postgresql.org/" arch="all !riscv64 !loongarch64" license="PostgreSQL" -_llvmver=14 +_llvmver=16 depends="$pkgname-client postgresql-common tzdata" depends_dev=" libpq-dev diff --git a/community/postsrsd/APKBUILD b/community/postsrsd/APKBUILD index 5bb4cf530e6..468b39a58d8 100644 --- a/community/postsrsd/APKBUILD +++ b/community/postsrsd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=postsrsd -pkgver=2.0.8 +pkgver=2.0.9 pkgrel=0 pkgdesc="Postfix Sender Rewriting Scheme daemon" url="https://github.com/roehling/postsrsd" @@ -56,7 +56,7 @@ package() { } sha512sums=" -6f21b194890afad11f0c131ef892227bef536fabbd9b1add2b5d6994b3d2f7391e489aa84fb8c0dcb3ffb936e1073f09ff7d9382a1cbf240887857f37f13e3db postsrsd-2.0.8.tar.gz +f57e3e098a5c67f77da2c018a7102e60c0c6671fe186e352e4148d6ab2d3a20e8f3bb0839531f6984f53d057dbf21a77f8aa69da5e6dc1defae02b1afc19a311 postsrsd-2.0.9.tar.gz affa7e7ab165e2c11c8e32bd4638d29f371fc1d0f38c6eaf4d0b6853de384bda199e238067b70e7ccf9bc55859e54f76b978c461d6feb6f45b98667643ee8b6f postsrsd-conf-change-defaults.patch 213a45f07de7f45ddbfaa905a80682ac7a9762d6f0c62b11101aaeee07a7ffe802a392dc1a97389adfed7ca16e8268ad0dc20e99b8501a9a7c21736dca79a7e1 postsrsd.initd " diff --git a/community/potrace/APKBUILD b/community/potrace/APKBUILD index c05faac9bc9..2958e91a33b 100644 --- a/community/potrace/APKBUILD +++ b/community/potrace/APKBUILD @@ -12,6 +12,11 @@ makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-doc" source="https://potrace.sourceforge.net/download/$pkgver/$pkgname-$pkgver.tar.gz" +prepare(){ + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/pound/APKBUILD b/community/pound/APKBUILD index 5ad70aa6e2f..d55d1d8a9c9 100644 --- a/community/pound/APKBUILD +++ b/community/pound/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pound -pkgver=4.11 +pkgver=4.12 pkgrel=0 pkgdesc="A reverse proxy, load balancer, and SSL wrapper" url="https://github.com/graygnuorg/pound" @@ -40,7 +40,7 @@ package() { } sha512sums=" -6dcb3209cd606c6c7cf5274ce928c10925e54098533f806796d21df9436a05f52872ff0dbfc3c8c9962cfa44ebdc9e400e3e2fb17bd9b55d991ecb6649805b89 pound-4.11.tar.gz +ffec8cee5d5b9716c3555b7cab7607ad83baf9a18c7cec39b15a94e2d742a22815771e72c826e6189520a5fb6b8eeabc6016b2923cf4de294a32f127e27e8a54 pound-4.12.tar.gz 9471e5abe3e0ee83165ed01a7081a4d14075c6c21b9f9d7c3fb239aa78c38eae74394a7c7e7e7753d218a7ce5cae388823570d19b702a829baa93e949a8946b8 pound.cfg 4c89ccfee07b0dcbd5c8341b2711c69cc67b13a50f21bd9b1fa8b0355dd4928461a941fc9085d93d85cfc0aaa514059a7eef8a203e57b5a20a7de498dd099bf8 pound.initd 29149d2fa2c161ecb47f8189a6be86ae85d6da2b7cf04258ce41c4e710144296b6a7642d4341c3c62eb98745dcc5d855df36451d2db069e71584045d36e09dfe pound.confd diff --git a/community/poweralertd/APKBUILD b/community/poweralertd/APKBUILD index 434d3f3d0a7..a9e0c4f4b4f 100644 --- a/community/poweralertd/APKBUILD +++ b/community/poweralertd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=poweralertd -pkgver=0.2.0 -pkgrel=3 +pkgver=0.3.0 +pkgrel=0 pkgdesc="UPower-powered power alerter" url="https://git.sr.ht/~kennylevinsen/poweralertd" license="GPL-3.0" @@ -28,5 +28,5 @@ package() { } sha512sums=" -5fc804622a230956bd6205581e05ecb310febc8ee6e44bfde4ea9e0c7a506447a004df0020c450543d8a71791d966fbd59e57d35339493f77805c532799c8269 poweralertd-0.2.0.tar.gz +db1760b536059607677781b4ac91811aedebb083ca3af90c5b328a9dd4bdd916bb0d89f553a2bf6066f88b91dcf11cb7ded35cda9f7085467138aa29c12d4ea1 poweralertd-0.3.0.tar.gz " diff --git a/community/powerdevil/APKBUILD b/community/powerdevil/APKBUILD index ee9e5456dda..c09fd2cda15 100644 --- a/community/powerdevil/APKBUILD +++ b/community/powerdevil/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=powerdevil -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Manages the power consumption settings of a Plasma Shell" # armhf blocked by extra-cmake-modules @@ -81,5 +81,5 @@ package() { } sha512sums=" -e96db98ac84a7d98445a79acb1cfc3878d4ffa9c8de55094d3e918458335825b34e0251557c10665963330f93760df898d2577f09d4badce3d965efb3dec41ee powerdevil-6.0.3.tar.xz +9290ea667b254f4a9c7ce7322a1f34eed755d15067caa1dd29573bfd9b4cff1d47589f585176e63e9f8e0435129287581ca52e5548c4083c5c2f6e508c0f7a49 powerdevil-6.0.4.tar.xz " diff --git a/community/ppsspp/APKBUILD b/community/ppsspp/APKBUILD index 4b905441afb..f23950ecff8 100644 --- a/community/ppsspp/APKBUILD +++ b/community/ppsspp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Díaz Urbaneja Diego <sodomon2@gmail.com> # Maintainer: Díaz Urbaneja Diego <sodomon2@gmail.com> pkgname=ppsspp -pkgver=1.16.6 +pkgver=1.17.1 pkgrel=0 pkgdesc="PPSSPP - a fast and portable PSP emulator" url="https://www.ppsspp.org/" @@ -23,9 +23,7 @@ makedepends=" zlib-dev zstd-dev " -source="https://github.com/hrydgard/ppsspp/releases/download/v$pkgver/ppsspp-$pkgver.tar.xz - gcc13.patch - " +source="https://github.com/hrydgard/ppsspp/releases/download/v$pkgver/ppsspp-$pkgver.tar.xz" options="!check" # make check not implemented build() { @@ -51,6 +49,5 @@ package() { } sha512sums=" -a60e724fc6f297f49d4fca922d8acaf79174332adf4c18a32e1f6b7def86f48b1267df89850f41f8143137e0ac51a19a4c7b69f9065e9e83a91775f6d86f3bf3 ppsspp-1.16.6.tar.xz -fa4b8cb0439c287d09c486058651bb50ff4b4bb1faeac255fa289ad87077c3fd8f9408744752d4b5313166ced5cc707628334df107c12f848dff1d0c5a30e672 gcc13.patch +eaa0046f5d8e529efd8238690fa242638aa88630172abe59c4b7ffb16b1e18eeb38fcaf8e70ef76dbd2304b226d1f33e10cde709abe00fa2a5baff16c1883c31 ppsspp-1.17.1.tar.xz " diff --git a/community/ppsspp/gcc13.patch b/community/ppsspp/gcc13.patch deleted file mode 100644 index 5b058a3a8f0..00000000000 --- a/community/ppsspp/gcc13.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/ext/armips/Util/Util.h b/ext/armips/Util/Util.h -index d4916764..af77ed00 100644 ---- a/ext/armips/Util/Util.h -+++ b/ext/armips/Util/Util.h -@@ -1,5 +1,6 @@ - #pragma once - -+#include <cstdint> - #include <string> - #include <vector> - ---- a/Core/HLE/sceKernelTime.h -+++ b/Core/HLE/sceKernelTime.h -@@ -17,6 +17,8 @@ - - #pragma once - -+#include <cstdint> -+ - u32 sceKernelLibcGettimeofday(u32 timeAddr, u32 tzAddr); - u32 sceKernelLibcTime(u32 outPtr); - int sceKernelUSec2SysClock(u32 microsec, u32 clockPtr); ---- a/Core/HLE/sceRtc.h -+++ b/Core/HLE/sceRtc.h -@@ -19,6 +19,7 @@ - - #include "Common/CommonTypes.h" - #include "Common/Swap.h" -+#include <cstdint> - - class PointerWrap; - diff --git a/community/pre-commit/APKBUILD b/community/pre-commit/APKBUILD index 2f4366594d0..9862e6b3732 100644 --- a/community/pre-commit/APKBUILD +++ b/community/pre-commit/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Galen Abell <galen@galenabell.com> # Maintainer: Galen Abell <galen@galenabell.com> pkgname=pre-commit -pkgver=3.7.0 -pkgrel=1 +pkgver=3.7.1 +pkgrel=0 pkgdesc="framework for managing and maintaining multi-language pre-commit hooks" url="https://pre-commit.com" arch="noarch" @@ -70,5 +70,5 @@ package() { } sha512sums=" -2a238e74ce2f080914e4403b7ce7b8dbd2a257a736d8292e2ec299c8015d3c4611e51f4be1a95ff2bd29db4888f6997e335346931567e943a8b5d78be7c14725 pre-commit-3.7.0.tar.gz +ffb7606b1706d5e9f46bdffbe20420e6fd4241f6a402740e02f6d8a0e87f29201a20ab92d89fd7ed77f3df31ada6f157837beac9defab7f35ebabf85d47399e8 pre-commit-3.7.1.tar.gz " diff --git a/community/prime_server/APKBUILD b/community/prime_server/APKBUILD index c258a4e0705..bdee1abd899 100644 --- a/community/prime_server/APKBUILD +++ b/community/prime_server/APKBUILD @@ -50,6 +50,6 @@ package() { sha512sums=" b9f225689f5582798650b3141b73ef428fa687f38a1197b48edb19942c29d2c2f874e54257b74f9e8e4c998eaf67552a86f67a768eb9d64355eb7ccf0db4d379 prime_server-0.7.0.tar.gz -161504d5a18893a4e544c136de6295926958861c6937e16fcc3ffdda67d0905beb06d1c4eedc4a8c4cd0316982565906f0c70e3a9c13c8954c2e7355b70bbf1b logging-39f2e39273c625d96790.hpp +ff5bdbab9c3b45c415f9da28790df52fc67eb93b0cf70c3d6d39ac37d9a0a0a9908ffd6a8d17567ffdc890b4799ab07fda1e7f46e62816fdf7d03b30c327dd89 logging-39f2e39273c625d96790.hpp 0ebdb0d0ef5184357b4090bca1083bb351103a8ec05994c56114ee23590956a9aa3fb228c29b3d37885d1e9eb98e4c631c0e91e20f070a22c0509ef08085f2ba testing-ada902fb51a1ad1e5a27.hpp " diff --git a/community/print-manager/APKBUILD b/community/print-manager/APKBUILD index fa8a3dc4f92..42efc8f62c8 100644 --- a/community/print-manager/APKBUILD +++ b/community/print-manager/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=print-manager -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -52,5 +52,5 @@ package() { } sha512sums=" -4159e0482eb72e26b3bacf267511bb50783fd89fe68a3d31e377d901c53792717247ca350073914d579fe65ea25ee6f438f5251b5f1a230dd8dec4fedb9f4127 print-manager-6.0.3.tar.xz +fd1d5e1c1cb26838e0b5b98ade3f703425caa6a86b6184af508df4adeaa2521980546a20362e0f2f55d6e968b1f7c24c663a3e0754403977d457860f86885855 print-manager-6.0.4.tar.xz " diff --git a/community/prismlauncher/APKBUILD b/community/prismlauncher/APKBUILD index eb4424cc04d..bdf634e4a89 100644 --- a/community/prismlauncher/APKBUILD +++ b/community/prismlauncher/APKBUILD @@ -2,7 +2,7 @@ # Contributor: knuxify <knuxify@gmail.com> # Maintainer: Sertonix <sertonix@posteo.net> pkgname=prismlauncher -pkgver=8.2 +pkgver=8.3 pkgrel=0 pkgdesc="A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once" url="https://prismlauncher.org/" @@ -67,5 +67,5 @@ package() { } sha512sums=" -6a0988a83e36df0da328fed0efe93171f8b4c565622f8eddf885e6e019214b15b8f64485ce1d9982dd441fad7c4aac8d1647e1b4dbf2cdb8ebadc46f664857ad PrismLauncher-8.2.tar.gz +c4153fbfd5b6c09ecf2d78d95a629e78685a45a85ccbb5d7f8e4ec7bf7efb66d72f5eee0947ccb13090b4a8429b00cb92fdf96bb0dbe435b61a285d7517d37b2 PrismLauncher-8.3.tar.gz " diff --git a/community/prison/APKBUILD b/community/prison/APKBUILD index b3abf369628..c08c68e0c3b 100644 --- a/community/prison/APKBUILD +++ b/community/prison/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=prison -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="A barcode API to produce QRCode barcodes and DataMatrix barcodes" arch="all !armhf" # armhf blocked by qt6-qtdeclarative @@ -50,5 +50,5 @@ package() { } sha512sums=" -4111b286b4d61b37c2a2127b2a78fea7c44a9282db17c4635c13f61217782485b919519fd50a82314f33c6a155897c6a238278bba09797fa03eb54da4e4c3887 prison-6.1.0.tar.xz +9ef1d98957efdd87a6331a708a69e9b59c66abdd8a732b7e8ec0d5002b62d0eaf0442882e764c721bff8e8601fe44f8772df3fdff761bbbdd9f13ce86359cb7e prison-6.2.0.tar.xz " diff --git a/community/prison5/APKBUILD b/community/prison5/APKBUILD index 934e30396c0..d1ce6d3bdd5 100644 --- a/community/prison5/APKBUILD +++ b/community/prison5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=prison5 pkgver=5.115.0 pkgrel=1 diff --git a/community/process-cpp/APKBUILD b/community/process-cpp/APKBUILD index d545f43e67c..ae071d59988 100644 --- a/community/process-cpp/APKBUILD +++ b/community/process-cpp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=process-cpp pkgver=3.0.1 -pkgrel=8 +pkgrel=9 pkgdesc="A simple convenience library for handling processes in C++11" url="https://gitlab.com/ubports/core/lib-cpp/process-cpp" arch="all" diff --git a/community/proj-data/APKBUILD b/community/proj-data/APKBUILD index f976258ef7a..5bd7e8e8c71 100644 --- a/community/proj-data/APKBUILD +++ b/community/proj-data/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=proj-data -pkgver=1.16 +pkgver=1.17 pkgrel=0 pkgdesc="Resource files for Cartographic Projections and Coordinate Transformations Library PROJ" url="https://proj.org/" @@ -16,5 +16,5 @@ package() { } sha512sums=" -ae7ed0e4179d71caa25921000918d3c2b22c737e87573ae76bdb385f83c6a5a07f8856f91ec9ab03dbb49dff0993b4056c6fb524f74340e98553d52d6728131f proj-data-1.16.zip +e1c8f58246cc19acaf2fc2f3011ed9f1f71f3455e4e8d23e44b28f3300872a46327c36f0fdfaa3f39a6db957678229b55a43f00e2817702abdfee1de5ecee678 proj-data-1.17.zip " diff --git a/community/proj/APKBUILD b/community/proj/APKBUILD index d41f126e611..65c81c9fa19 100644 --- a/community/proj/APKBUILD +++ b/community/proj/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=proj -pkgver=9.3.1 +pkgver=9.4.0 pkgrel=0 pkgdesc="PROJ coordinate transformation software library" url="https://proj.org/" @@ -61,6 +61,6 @@ util() { } sha512sums=" -e97a76516c6bd82ec56563e757f6c3a04def57060f78b631ea50130c2b600df44e9df248366a1a4891efc4ea37707d0a8461c40a1aa8cae4a074a25e6517679b proj-9.3.1.tar.gz -dfc84e13c771a2981177760412a995523dee99cfb02359194ab45e5a7ec614f542a1307fbc06d540811987f6c68234e57e78aafd7136203d3a3b3eae5f01ad6c builtins-tolerance.patch +9cce269e2ea98d20726f433dfef85b4ccdf7defb428844d6404f3175e7034fa4c86cafd51c70cf151645abf1a79a12b96bddb8e6cab403114d72d14755ac0ed1 proj-9.4.0.tar.gz +7f3a8393463ec20ac9566cb83b891b1a7e00b32360218213f6ee7b1e2874d163445a7784ba8ffdedd75e8afd93f58798b7d8989dd2731f4b6634839b2388b8e6 builtins-tolerance.patch " diff --git a/community/proj/builtins-tolerance.patch b/community/proj/builtins-tolerance.patch index 944d332f326..7007a742e6d 100644 --- a/community/proj/builtins-tolerance.patch +++ b/community/proj/builtins-tolerance.patch @@ -1,12 +1,12 @@ diff --git a/test/gie/builtins.gie b/test/gie/builtins.gie --- a/test/gie/builtins.gie +++ b/test/gie/builtins.gie -@@ -7150,7 +7150,7 @@ +@@ -7245,7 +7245,7 @@ ------------------------------------------------------------------------------- - operation +proj=vandg +a=6400000 +over + operation +proj=vandg +a=6400000 ------------------------------------------------------------------------------- -tolerance 0.25 mm +tolerance 0.35 mm - accept 2 1 expect 223395.249543407 111704.596633675 + diff --git a/community/prometheus-blackbox-exporter/APKBUILD b/community/prometheus-blackbox-exporter/APKBUILD index cfb91075d1d..f62d689df9a 100644 --- a/community/prometheus-blackbox-exporter/APKBUILD +++ b/community/prometheus-blackbox-exporter/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: ungleich <alpinelinux@ungleich.ch> pkgname=prometheus-blackbox-exporter _pkgname=blackbox_exporter -pkgver=0.24.0 -pkgrel=6 +pkgver=0.25.0 +pkgrel=0 pkgdesc="Prometheus Blackbox Exporter" url="https://github.com/prometheus/blackbox_exporter" license="Apache-2.0" @@ -53,7 +53,7 @@ package() { } sha512sums=" -0c2c19d5a44465838d17c46318804416d32ed229c9d882d064559c2fec41d82029d0f5b7e5c8e6fb6e3473c41b53ae2a4a6c6e65ffacac3afe4263a48c698c29 blackbox_exporter-0.24.0.tar.gz +86edb5c6aac213c5d5821ee58233a72043ac6abe5c5b2a8695f33160127d7126ab27de1d83fdd99d3053447efae41d2ba260bff7c84687dcea30df6439970630 blackbox_exporter-0.25.0.tar.gz 2aadbcf2d1fa18650dbc930f9b09ad786f537e8d8525568c016e240798b3db60606f95cf949d75bb797dd9e02d3f07e24e87ee7a420280eec9a326e1455f261d blackbox-exporter.confd 9e69c8804657e01f9346cab5845c933c1e2eefc2a9a33054d484b50b0c1848ee27c5759876c51194c2374aac84d3c88c13fc41be438eebaf1ce618f51edd0263 blackbox-exporter.initd " diff --git a/community/prometheus-node-exporter/APKBUILD b/community/prometheus-node-exporter/APKBUILD index efa92cf3b59..d23ed1e4533 100644 --- a/community/prometheus-node-exporter/APKBUILD +++ b/community/prometheus-node-exporter/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Tiago Ilieve <tiago.myhro@gmail.com> pkgname=prometheus-node-exporter _pkgname=node_exporter -pkgver=1.7.0 -pkgrel=2 +pkgver=1.8.0 +pkgrel=0 pkgdesc="Prometheus exporter for machine metrics" url="https://github.com/prometheus/node_exporter" license="Apache-2.0" @@ -49,7 +49,7 @@ cleanup_srcdir() { } sha512sums=" -4cd38b81cb54ca620a57c642a88b89d6d1ae36a752fff5f065c8848ea02066a211c6feb955bea4e311f7baafffee30a74670efe1cf4dac113c9bf7d154a1067b node_exporter-1.7.0.tar.gz +4774ff3e146665783044769235b9d4f538ba3ff1d7c9fdfb33e5546042846371c7d26efa8a6d672e6de3c5a10107c2e72e5bbf38ed2952a5c48eda81fdc1379a node_exporter-1.8.0.tar.gz 67b16a002daf45893e7d814e6d921f92dfc26d31ea802a4c511dc3affd8143d3827b7d895bb3efc13337894a893f4feac01d2a0f0e381ef53d00dffe9ff0577a node-exporter.initd 592d3f17a3cf487d97a14c803dded07d2dfb112b159ab1a3575310fc0176fc3255ddad6657f16a8d6d3c161bfb03c203a6271ec6e6395b75716a14b0de8baced node-exporter.confd 36952039e5db39aa06a2ca16fa5d318f22eb967e3e9b1363508b2f3d3d0b14e5df111c77ce951bea2f65dd2be0a0a1582be245acfe4641623381a940204e53d9 disable-go-race-detector.patch diff --git a/community/promu/APKBUILD b/community/promu/APKBUILD index 5f97401101c..bda040e702f 100644 --- a/community/promu/APKBUILD +++ b/community/promu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=promu -pkgver=0.16.0 +pkgver=0.17.0 pkgrel=0 pkgdesc="Prometheus Utility Tool" url="https://github.com/prometheus/promu" @@ -35,7 +35,7 @@ package() { } sha512sums=" -36013301baad9c6f79f510e25369e55e4c3eae51c2daaf99313d85b0b3386354dc1c7e92e3dabe22d11dd46084a4b36a904543165904664368e8dd7189d31c85 promu-0.16.0.tar.gz +8265fd0e9f37624dc1e6abdef87475b5116a7e7af260fc83bc3cda98409af78d4db9d409cd404e251cbf81c124e6a6cd5ab70eef6845ec33048da4937eac01dd promu-0.17.0.tar.gz 9947edb3a8c6d1964f6e4a233d3919b14fa3622e390131d938096464c0b15597bd3bf0a92df807d009b9864c832e1960e2d976a5b152deb0c914e8b99f29b2d3 default-config-no-static.patch e03189d979087f43e8f27da5ee158f93bf5d3d22b7b95b41f3a4152bf4ba596c176c79b98ce92ba310fd58b06ad1912b43f3fbdb0297610a6539131920d665c4 test-tarball-prefix.patch " diff --git a/community/pulumi-language-dotnet/APKBUILD b/community/pulumi-language-dotnet/APKBUILD index 341b64d009d..17c1ed77c10 100644 --- a/community/pulumi-language-dotnet/APKBUILD +++ b/community/pulumi-language-dotnet/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=pulumi-language-dotnet -pkgver=3.60.0 -pkgrel=1 +pkgver=3.63.1 +pkgrel=0 pkgdesc="Infrastructure as Code SDK (.NET language provider)" url="https://pulumi.com/" # blocked by pulumi @@ -33,5 +33,5 @@ package() { } sha512sums=" -ab69a38b61217935425580e1465b4bb12b5195f327bcca1be7fbc9af59f76fb4cc513aa3c31311fe336f8902340544eae6de02add044537da486949517d9b93c pulumi-language-dotnet-3.60.0.tar.gz +4b2e3f05061b90060101a272ff7fcabc15ef73d26325ca52f919093bbe153b5e4e651f5d113a0dd2020465c2e47a8667b67f01e45f5b3a1f525bcbe9f9ae4ccc pulumi-language-dotnet-3.63.1.tar.gz " diff --git a/community/pulumi-language-java/APKBUILD b/community/pulumi-language-java/APKBUILD index 72167f8fe61..b1213520938 100644 --- a/community/pulumi-language-java/APKBUILD +++ b/community/pulumi-language-java/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=pulumi-language-java -pkgver=0.9.9 -pkgrel=2 +pkgver=0.10.0 +pkgrel=0 pkgdesc="Infrastructure as Code SDK (Java language provider)" url="https://pulumi.com/" # blocked by pulumi @@ -54,5 +54,5 @@ package() { } sha512sums=" -f16fc89460f598367441a4ab72f92457ad7ff0127458989f9164719d5ba259e7b187c8cea3af13f140aec2119467d035475cae3c0c1159d721837b78f59c462a pulumi-language-java-0.9.9.tar.gz +db1c5008e659d43e8ecedf82999f387e1f21fd901c08011fe96f3d264f762a2f87d625aa62b8281253d3c219ed58216a277b64869e2d142c16ad7c9d49a64ff0 pulumi-language-java-0.10.0.tar.gz " diff --git a/community/pulumi-language-yaml/APKBUILD b/community/pulumi-language-yaml/APKBUILD index 33a1c5b0685..5361072db11 100644 --- a/community/pulumi-language-yaml/APKBUILD +++ b/community/pulumi-language-yaml/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=pulumi-language-yaml -pkgver=1.6.0 -pkgrel=1 +pkgver=1.7.0 +pkgrel=0 pkgdesc="Infrastructure as Code SDK (YAML language provider)" url="https://pulumi.com/" # blocked by pulumi @@ -32,5 +32,5 @@ package() { } sha512sums=" -3f226e0138ce12943a9ec53ff20f39979d1c4f9a1d292d90663241c87583cc12a84806fb30f575e523323566cf39741a424a6892c9bdc56204a0a7037bf17d96 pulumi-language-yaml-1.6.0.tar.gz +a22243d8fddcea6476eaec5ace25695874f80067aa1239349b4babacd978ad0bf088a9f5cbd2080d2ca50300991aadbdd8353c6da1dbc09d337a322c380bb321 pulumi-language-yaml-1.7.0.tar.gz " diff --git a/community/pulumi/APKBUILD b/community/pulumi/APKBUILD index ee3d67a522a..e56e81cbad2 100644 --- a/community/pulumi/APKBUILD +++ b/community/pulumi/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Fraser Waters <frassle@gmail.com> # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=pulumi -pkgver=3.111.1 -pkgrel=1 +pkgver=3.115.0 +pkgrel=0 pkgdesc="Infrastructure as Code SDK" url="https://pulumi.com/" # Tests show that pulumi's plugin system doesn't work on any other platforms @@ -20,6 +20,7 @@ subpackages=" $pkgname-language-python:_python " source="$pkgname-$pkgver.tar.gz::https://github.com/pulumi/pulumi/archive/v$pkgver.tar.gz" +options="net" # download Go modules export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -121,5 +122,5 @@ _python() { } sha512sums=" -c71fa2932ff870b76b1e7c4ce936e860bace8c482ab15b2906beed7ae4f6af85e0ab03beb6be2eab7bbbabae2df33e78936f5a687ffddf184dacf3a8826d02c0 pulumi-3.111.1.tar.gz +ff8921754a8d6723b3ad4bda6e009f8ef33960c6a6ccab6fdffc0d79c2eb028badb6f03aa76e9b2a54ad63ecee2cadc4d02ccf2461c9ad257f8f6807184c35f3 pulumi-3.115.0.tar.gz " diff --git a/community/pure-maps/APKBUILD b/community/pure-maps/APKBUILD index 2e3169c1cce..e6a1af04676 100644 --- a/community/pure-maps/APKBUILD +++ b/community/pure-maps/APKBUILD @@ -8,8 +8,8 @@ pkgdesc="Maps and navigation" url="https://github.com/rinigus/pure-maps" # armhf blocked by mapbox-gl-qml -> qt5-qtdeclarative-dev # s390x blocked by mimic1 -# ppc64le, riscv64 blocked by luajit -> osmscout-server -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, riscv64, loongarch64 blocked by luajit -> osmscout-server +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" license="GPL-3.0-or-later" depends=" geoclue diff --git a/community/purpose/APKBUILD b/community/purpose/APKBUILD index 0ff078ba9c8..661505a87fd 100644 --- a/community/purpose/APKBUILD +++ b/community/purpose/APKBUILD @@ -4,12 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=purpose -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Framework for providing abstractions to get the developer's purposes fulfilled" # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -> kaccounts-integration -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt6-qtwebengine -> kaccounts-integration +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://community.kde.org/Frameworks" license="LGPL-2.1-or-later" depends_dev=" @@ -53,5 +53,5 @@ package() { } sha512sums=" -a52b365c3e33966e2557529d63a9cab8af66d1ea976a47e9aeee62755897bada371ad16f758abefb47201728e371f050c40fd88d29b9584445b4c816e954ff78 purpose-6.1.0.tar.xz +6eaf12c4a2c85b201a8cc3fdd321f5c99274b467b3785fcc4ceed1016873433b71bbb14b1d1b97dd81baa94c5dd22a34d41813948d799b4a6a2fdd7ede0d28c6 purpose-6.2.0.tar.xz " diff --git a/community/purpose5/APKBUILD b/community/purpose5/APKBUILD index 36880640ccd..59208987161 100644 --- a/community/purpose5/APKBUILD +++ b/community/purpose5/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: team/kde <bribbers@disroot.org> # The group tag is just to easily find this APKBUILD by some scripts for automation -# group=kde-frameworks +# group=kde-frameworks-old pkgname=purpose5 pkgver=5.115.0 pkgrel=2 pkgdesc="Framework for providing abstractions to get the developer's purposes fulfilled" # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> kaccounts-integration -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine -> kaccounts-integration +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://community.kde.org/Frameworks" license="LGPL-2.1-or-later" depends_dev=" diff --git a/main/putty/APKBUILD b/community/putty/APKBUILD index 5c250ea981a..5c250ea981a 100644 --- a/main/putty/APKBUILD +++ b/community/putty/APKBUILD diff --git a/community/pv/APKBUILD b/community/pv/APKBUILD index b193abd64b9..6b78d4daf6a 100644 --- a/community/pv/APKBUILD +++ b/community/pv/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pv -pkgver=1.8.5 +pkgver=1.8.9 pkgrel=0 pkgdesc="CLI tool for monitoring the progress of data through a pipeline" url="https://www.ivarch.com/programs/pv.shtml" @@ -35,5 +35,5 @@ package() { } sha512sums=" -6d7a0f785ace5e25c5677af4cf38a003386774e60563865de7f1dae60f1785685541da93e1f88236b8b2e14431584bc2cb2adb3a575fb90dc774bc6bacf22e21 pv-1.8.5.tar.gz +d6e483d2cb5ef3def1df9c72774ab70a5210e7a45f165d3d1527f11366e7bbab57320f1987d460783eda94605a17c5ef2a027fa4a7e9d58b529f4b1b05ec07a8 pv-1.8.9.tar.gz " diff --git a/community/py3-aiosmtpd/APKBUILD b/community/py3-aiosmtpd/APKBUILD new file mode 100644 index 00000000000..3472f5fed4d --- /dev/null +++ b/community/py3-aiosmtpd/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-aiosmtpd +pkgver=1.4.5 +pkgrel=0 +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=aiosmtpd +pkgdesc="asyncio based SMTP server" +url="https://github.com/aio-libs/aiosmtpd" +arch="noarch" +license="Apache-2.0" +depends=" + py3-attrs + py3-atpublic +" +checkdepends=" + py3-pytest + py3-pytest-asyncio + py3-pytest-cov + py3-pytest-mock +" +makedepends=" + py3-setuptools + py3-gpep517 + py3-wheel +" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/aio-libs/aiosmtpd/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +d33441aa3179cab0711dbbf14a9b243d292195cce41b730e9fd965ffaa40c4bbf4a61acdc4e209c93f370a058dd1f207258cc4207746dbe5e14fa4c83837f137 py3-aiosmtpd-1.4.5.tar.gz +" diff --git a/community/py3-ansible-compat/APKBUILD b/community/py3-ansible-compat/APKBUILD index 7f538b79643..d06d78e56e3 100644 --- a/community/py3-ansible-compat/APKBUILD +++ b/community/py3-ansible-compat/APKBUILD @@ -50,5 +50,5 @@ package() { } sha512sums=" -6b60ffdc7ca01f51f49989ac25f518c8b0c7d63a55db03b4d9b5e081c6060b79c686c7831280c2c8c1fc64a619e7b9121640e7050ea0019e237334cc99ba8353 ansible-compat-4.1.12.tar.gz +c9b2c340dc2b1ffb6f6db76017f7537e20307a7519a4df2dfb31811180cd647e39812bc433db51bd94d42f4c52a6c2f729d81edadcd615a5e0d23566969d8911 ansible-compat-4.1.12.tar.gz " diff --git a/community/py3-arrow/APKBUILD b/community/py3-arrow/APKBUILD index a236c9202a8..cebe4fc265f 100644 --- a/community/py3-arrow/APKBUILD +++ b/community/py3-arrow/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> -# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: fossdd <fossdd@pwned.life> pkgname=py3-arrow pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python3 library to create and manipulate dates, times, and timestamps" url="https://arrow.readthedocs.io/" arch="noarch" diff --git a/community/py3-asttokens/APKBUILD b/community/py3-asttokens/APKBUILD index ccf6b8c12a2..162e24de152 100644 --- a/community/py3-asttokens/APKBUILD +++ b/community/py3-asttokens/APKBUILD @@ -26,7 +26,16 @@ build() { check() { python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest + + case "$CARCH" in + s390x) + .testenv/bin/python3 -m pytest \ + --deselect tests/test_mark_tokens.py::TestMarkTokens::test_deep_recursion + ;; + *) + .testenv/bin/python3 -m pytest + ;; + esac } package() { diff --git a/community/py3-atpublic/APKBUILD b/community/py3-atpublic/APKBUILD new file mode 100644 index 00000000000..b9fc4320567 --- /dev/null +++ b/community/py3-atpublic/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-atpublic +pkgver=4.1.0 +pkgrel=0 +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=atpublic +pkgdesc="@public decorator for Python" +url="https://github.com/aio-libs/aiosmtpd" +arch="noarch" +license="Apache-2.0" +checkdepends=" + py3-pytest-cov + py3-sybil +" +makedepends=" + py3-setuptools + py3-hatchling + py3-gpep517 + py3-wheel +" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://gitlab.com/warsaw/public/-/archive/$pkgver/public-$pkgver.tar.gz" +builddir="$srcdir/public-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +e6608572a6dfff0b9fa9039c6f7aea4488caabb89a2dcafc19435693b861336cd100da16c8f4bde0b8b454eea0354f0baedf3bf1ccdc8536b1dc11129e972f22 py3-atpublic-4.1.0.tar.gz +" diff --git a/community/py3-bcrypt/APKBUILD b/community/py3-bcrypt/APKBUILD index d2a3cd2d6a7..e9a2714498c 100644 --- a/community/py3-bcrypt/APKBUILD +++ b/community/py3-bcrypt/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=py3-bcrypt _pkgname=bcrypt -pkgver=4.1.2 -pkgrel=1 +pkgver=4.1.3 +pkgrel=0 pkgdesc="Modern password hashing for your software and your servers" url="https://github.com/pyca/bcrypt" arch="all" @@ -42,5 +42,5 @@ package() { } sha512sums=" -9cd6535249b88d83efd6f84e36c552cfb68d080c12b5f35167976219fd298efa03010c8674aa6d173242c098194c7d6ace3e2a5173a910bebf63791f60e7ade3 py3-bcrypt-4.1.2.tar.gz +59a5aafc729a6e7ac61121469bbca73809d87cafc1b16dcb0701c33fccc6298eff1071680c364042c46f91d701830a414e6ecf0bff4bee9500e4ce146dcad974 py3-bcrypt-4.1.3.tar.gz " diff --git a/community/py3-boto3/APKBUILD b/community/py3-boto3/APKBUILD index faba692f05a..f1faedc895d 100644 --- a/community/py3-boto3/APKBUILD +++ b/community/py3-boto3/APKBUILD @@ -1,8 +1,8 @@ -# Maintainer: Valery Kartel <valery.kartel@gmail.com> # Contributor: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-boto3 -pkgver=1.28.12 -pkgrel=1 +pkgver=1.34.95 +pkgrel=0 pkgdesc="AWS SDK for Python (Boto3)" url="https://aws.amazon.com/sdk-for-python/" license="Apache-2.0" @@ -37,5 +37,5 @@ package() { } sha512sums=" -bfba48e37bbdbd8e106fe66365058a038e807862e5cfc3c3c6bb3e883ec4db3c99385429fb1064a1d6866cc991a3cd96dbd355d9431bbf033244703f6b2890bd boto3-1.28.12.tar.gz +f6d57435da348c9ef5a3997188e97bb975c709bdd0b998c228276027ea5acb926e43f5ed28c1dd4a02e9f0cfb7dbac827dc04ec111d1431928e3f5fb854f19a7 boto3-1.34.95.tar.gz " diff --git a/community/py3-botocore/APKBUILD b/community/py3-botocore/APKBUILD index f8df954dec6..ab6062907ad 100644 --- a/community/py3-botocore/APKBUILD +++ b/community/py3-botocore/APKBUILD @@ -1,8 +1,8 @@ -# Maintainer: Valery Kartel <valery.kartel@gmail.com> # Contributor: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-botocore # Verify required version from py3-boto3 on this package before upgrading -pkgver=1.31.12 +pkgver=1.34.39 pkgrel=1 pkgdesc="The low-level, core functionality of Boto3" url="https://github.com/boto/botocore" @@ -39,5 +39,5 @@ package() { } sha512sums=" -b8354f2d531bfda166155e111abc61640293a175d88b814aec9ff0e1d6cb3ebd90806c0027787f847ad3ddd6c9f835256a4ba0b74e908f3372e391282724a1cb botocore-1.31.12.tar.gz +5b3703f13167ea0a6b1483c6c7a1b446e417b84254cb8e86a682bdacd6d544f63846096d43e3e5b24512acdecd1e48ba341d204c1e0e38776ae72e13d14fae5c botocore-1.34.39.tar.gz " diff --git a/community/py3-branca/APKBUILD b/community/py3-branca/APKBUILD index 4748aaa09e7..362f04ff0b4 100644 --- a/community/py3-branca/APKBUILD +++ b/community/py3-branca/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-branca _pkgorig=branca -pkgver=0.7.1 -pkgrel=1 +pkgver=0.7.2 +pkgrel=0 pkgdesc="Generate complex HTML+JS pages with Python" url="https://github.com/python-visualization/branca" arch="noarch" @@ -41,5 +41,5 @@ package() { } sha512sums=" -70b6e361e93a01c319928890a40e3aa1e887e718b0736afe0a65bc45fe56fe6ca24a4c50db099066d84876cc8efd540a5cc14aa48607671ac068df3ae5124d29 branca-0.7.1.tar.gz +ad62e4496b43405dbc54b2cca35ee9d0265b8deeeb3df3b0868e63e6890fe491bfc4987318d74c1e78d83f05bdf56bfd570609699860ab1af9d189357bf00107 branca-0.7.2.tar.gz " diff --git a/testing/py3-cbor2/APKBUILD b/community/py3-cbor2/APKBUILD index 6ad2f3fb299..6ad2f3fb299 100644 --- a/testing/py3-cbor2/APKBUILD +++ b/community/py3-cbor2/APKBUILD diff --git a/testing/py3-cbor2/fix-32bit-tests.patch b/community/py3-cbor2/fix-32bit-tests.patch index de8fdbb0823..de8fdbb0823 100644 --- a/testing/py3-cbor2/fix-32bit-tests.patch +++ b/community/py3-cbor2/fix-32bit-tests.patch diff --git a/community/py3-cdsapi/APKBUILD b/community/py3-cdsapi/APKBUILD index 62afcf78a15..a456ecb59cb 100644 --- a/community/py3-cdsapi/APKBUILD +++ b/community/py3-cdsapi/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-cdsapi _pkgorig=cdsapi -pkgver=0.6.1 -pkgrel=5 +pkgver=0.7.0 +pkgrel=0 pkgdesc="Python API to access the Copernicus Climate Data Store" url="https://github.com/ecmwf/cdsapi" arch="noarch" @@ -34,5 +34,5 @@ package() { } sha512sums=" -99f25295fdd8be58837608f15fed4a98eee22844d312d2e4d6c377d1f8baac5c5dd78832d90a72c3c41d22c9dd8ca74d17a1afa8f8763e350d8a1cc95c97ae1c py3-cdsapi-0.6.1.tar.gz +4975a31ff6498e443cbc859ac3f2dedda34f6926f5ef8d828863abcda97b6f7d0854779d1c022d48c200a24c3fedf2f5fe6d56762e83f7779d367a1f445106d3 py3-cdsapi-0.7.0.tar.gz " diff --git a/community/py3-channels/APKBUILD b/community/py3-channels/APKBUILD index 5e3c7e09b09..68555922e78 100644 --- a/community/py3-channels/APKBUILD +++ b/community/py3-channels/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-channels _pyname="channels" pkgver=4.1.0 -pkgrel=1 +pkgrel=2 arch="noarch" pkgdesc="Developer-friendly asynchrony for Django" url="https://pypi.python.org/project/channels" @@ -18,8 +18,13 @@ makedepends=" py3-gpep517 py3-wheel " -options="!check" # No testsuite -source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/c/channels/channels-$pkgver.tar.gz" +checkdepends=" + py3-pytest + py3-pytest-django + py3-pytest-asyncio + py3-async-timeout +" +source="$pkgname-$pkgver-gh.tar.gz::https://github.com/django/channels/archive/refs/tags/$pkgver.tar.gz" builddir="$srcdir"/$_pyname-$pkgver subpackages="$pkgname-pyc" @@ -29,11 +34,17 @@ build() { --output-fd 3 3>&1 >&2 } +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest -v +} + package() { python3 -m installer -d "$pkgdir" \ .dist/*.whl } sha512sums=" -7a238da53ce19cd9520ff580b8449d61c4c451664126ebf67a7c21f7acdd32626f0cf62ced073519281e842f0c9efd61dbab2eab13ef79cb397d3dd5ad44ad7a py3-channels-4.1.0.tar.gz +2891ac6b507c59db5eb2acf78da180afdee45a1dc26dfc1f8530f13a7e7142490dbf75fdd821913906f33f42de6e28a7c85607734b8bea9b172d915498d4f5a3 py3-channels-4.1.0-gh.tar.gz " diff --git a/community/py3-chaospy/APKBUILD b/community/py3-chaospy/APKBUILD index 6643753138f..efcd981381a 100644 --- a/community/py3-chaospy/APKBUILD +++ b/community/py3-chaospy/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-chaospy _pkgorig=chaospy -pkgver=4.3.13 -pkgrel=2 +pkgver=4.3.14 +pkgrel=0 pkgdesc="Numerical tool for performing uncertainty quantification" url="https://github.com/jonathf/chaospy" arch="noarch !x86 !armhf !armv7 !s390x !ppc64le" # assertion errors and py3-numpoly @@ -13,7 +13,7 @@ depends=" py3-matplotlib py3-numpoly py3-numpy - py3-scipy + py3-scipy<1.13 py3-scikit-learn " checkdepends="py3-pytest" @@ -44,6 +44,6 @@ package() { } sha512sums=" -833c09b5205a1ec2de2a395e62d980a893d73ef7cddbebb3b5c8763f332b0b8eae143e09c485c66a3e5f614b3826ba6c3a8167fdf4ff00def6aff2ad01f52312 py3-chaospy-4.3.13.tar.gz +d25f183a80907db8ffb8adc7b209ff0af4e9c588cb38724574efc95ae92e9b38bb00893abd89f73c74cbe5ff3dba78cd4a29e60e267fbb258e9ba3578f8f47df py3-chaospy-4.3.14.tar.gz 5b76498a070d2864613fe0e2a29506c6a02bdb2248c842b38cf08eebcdc64fffc07f890644ee3d962a584ad83237b99bafe27dc926082ed4a904254aa6d6bc04 importlib.patch " diff --git a/community/py3-cheroot/APKBUILD b/community/py3-cheroot/APKBUILD index 82aecd9004b..8bdf2c28586 100644 --- a/community/py3-cheroot/APKBUILD +++ b/community/py3-cheroot/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Duncan Bellamy <dunk@denkimushi.com> _pyname=cheroot pkgname=py3-cheroot -pkgver=10.0.0 -pkgrel=2 +pkgver=10.0.1 +pkgrel=0 pkgdesc="High-performance, pure-Python HTTP server used by CherryPy" url="https://cheroot.cherrypy.dev/" license="BSD-3-Clause" @@ -34,9 +34,7 @@ checkdepends=" py3-trustme " subpackages="$pkgname-tests $pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/c/$_pyname/$_pyname-$pkgver.tar.gz - setuptools-git.patch - " +source="https://files.pythonhosted.org/packages/source/c/$_pyname/$_pyname-$pkgver.tar.gz" builddir="$srcdir/$_pyname-$pkgver" options="!check" # fail on deprecation warning @@ -62,6 +60,5 @@ tests() { amove usr/lib/python*/site-packages/cheroot/test } sha512sums=" -02e32e52a596463cbb9874a800dbcdc5680dd7d9dfa95ca6e73c81f9248a488087c514ae70cdba94fe9df1f5d3ab1c68efcb720561cbeb7b667109fe5962f85b cheroot-10.0.0.tar.gz -7831aeeea0b6d1ed094c92eb697632395de903d5de170c37230db2b7d083041855473f8d50b93c1e2f630e0c411ccf5f909593b3160cb134339e9d3e21ed691c setuptools-git.patch +c878647a7bcf564509ee07481b3e371a2e09019d78240e79293bc4e0bfa872e8e2f947925c54eda56cc1790a3ff4d656c70066278c74073b44fc070627f5c71d cheroot-10.0.1.tar.gz " diff --git a/community/py3-cheroot/setuptools-git.patch b/community/py3-cheroot/setuptools-git.patch deleted file mode 100644 index 4bb94d50267..00000000000 --- a/community/py3-cheroot/setuptools-git.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/setup.cfg -+++ b/setup.cfg -@@ -56,7 +56,6 @@ - include_package_data = True - setup_requires = - setuptools_scm>=1.15.0 -- setuptools_scm_git_archive>=1.0 - install_requires = - backports.functools_lru_cache; python_version < '3.3' - selectors2; python_version< '3.4' diff --git a/community/py3-cliff/APKBUILD b/community/py3-cliff/APKBUILD index 3f729592206..de97390bf97 100644 --- a/community/py3-cliff/APKBUILD +++ b/community/py3-cliff/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=py3-cliff -pkgver=4.5.0 -pkgrel=1 +pkgver=4.6.0 +pkgrel=0 pkgdesc="Command Line Interface Formulation Framework" url="https://docs.openstack.org/cliff/latest/" arch="noarch" @@ -46,5 +46,5 @@ package() { } sha512sums=" -e32f5c6f53a37306e79de79d3be653ea9fbe8581da6162578048f17188bb48d82a8108bd118cf34712601b08f53be80287c33929e07993c7363b09ad4f076d33 cliff-4.5.0.tar.gz +59e887eddbdf695927e9ece46749f3f62557fd20bb24d7ff109f174a4ae4886cb3b44994903522c1d31c83b9f7f101f16604f6ffc4167ed6405e49a09f236dd0 cliff-4.6.0.tar.gz " diff --git a/community/py3-concurrent-log-handler/APKBUILD b/community/py3-concurrent-log-handler/APKBUILD index c7d6a4e6772..b96199b0283 100644 --- a/community/py3-concurrent-log-handler/APKBUILD +++ b/community/py3-concurrent-log-handler/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-concurrent-log-handler -_pyname=concurrent_log_handler +_pyname=concurrent-log-handler pkgver=0.9.25 -pkgrel=1 +pkgrel=2 arch="noarch" pkgdesc="RotatingFileHandler replacement with concurrency, gzip and Windows support" url="https://pypi.python.org/project/concurrent-log-handler" @@ -17,12 +17,11 @@ makedepends=" py3-wheel py3-hatchling " -checkdepends=" - py3-pytest - py3-stresstest +checkdepends="py3-pytest" +source=" + $pkgname-$pkgver-gh.tar.gz::https://github.com/Preston-Landers/concurrent-log-handler/archive/refs/tags/$pkgver.tar.gz + null-failing-test-units.patch " -options="!check" # Missing depend stresstest -source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/c/concurrent-log-handler/concurrent_log_handler-$pkgver.tar.gz" builddir="$srcdir"/$_pyname-$pkgver subpackages="$pkgname-pyc" @@ -33,7 +32,11 @@ build() { } check() { - PYTHONPATH="$builddir" pytest + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + # FAILED tests/test_stresstest.py::test_run_stress_test[backupCount=3, use_gzip=True, use_timed=True, interval=3, log_calls=3_000, num_processes=4-test_opts11] - AssertionError: assert 1 == 0 + where 1 = run_stress_test(TestOptions(log_opts={'maxBytes': 0, 'when': 'S', 'interval': 3, 'backupCount': 3, 'encoding': 'utf-8', 'debug': False, 'use_gzip': True}, log_file='stress_test.log', log_dir='output_tests', num_processes=4, log_calls=3000, use_asyncio=False, induce_failure=False, sleep_min=0.0001, sleep_max=0.01, use_timed=True, min_rollovers=4)) + # FAILED tests/test_stresstest.py::test_run_stress_test[backupCount=5, use_timed=True, maxBytes=1KiB, interval=5, log_calls=1_000, use_gzip=True, debug=True-test_opts14] - AssertionError: assert 1 == 0 + where 1 = run_stress_test(TestOptions(log_opts={'maxBytes': 1024, 'when': 'S', 'interval': 5, 'backupCount': 5, 'encoding': 'utf-8', 'debug': True, 'use_gzip': True}, log_file='stress_test.log', log_dir='output_tests', num_processes=10, log_calls=1000, use_asyncio=False, induce_failure=False, sleep_min=0.0001, sleep_max=0.01, use_timed=True, min_rollovers=5)) + .testenv/bin/python3 -m pytest -v } package() { @@ -42,5 +45,6 @@ package() { } sha512sums=" -d13d51b0379a7c246958ef367f2c878f8d8b6e08f9afd3fd3e00d678ff450c615e96aed8f2d575269883da3fa53205bf27177dab69d824a53b100fcada4db339 py3-concurrent-log-handler-0.9.25.tar.gz +682f33a9a81c78e7c07bcf7c30f5955100a2846d08d3da4331ec8d155e5a35c92e224bafbb848b121b41ab2e84b60b35a31034185b57b7c02ea4bdaaccf8c4ac py3-concurrent-log-handler-0.9.25-gh.tar.gz +dab453965b9f8c476ade755e8a182b15b210dd186cedbdd47b63596c635bbe2adf1b186e1888d7b83154f18da34a1a08022d403356028bb08af679a50ff84433 null-failing-test-units.patch " diff --git a/community/py3-concurrent-log-handler/null-failing-test-units.patch b/community/py3-concurrent-log-handler/null-failing-test-units.patch new file mode 100644 index 00000000000..6573e1d5889 --- /dev/null +++ b/community/py3-concurrent-log-handler/null-failing-test-units.patch @@ -0,0 +1,45 @@ +diff --git a/tests/test_stresstest.py.orig b/tests/test_stresstest.py +index eaa0264eed9..9a84b1ba6a7 100644 +--- a/tests/test_stresstest.py.orig ++++ b/tests/test_stresstest.py +@@ -76,19 +76,6 @@ TEST_CASES = { + } + ), + ), +- "backupCount=3, use_gzip=True, use_timed=True, interval=3, log_calls=3_000, num_processes=4": TestOptions( +- use_timed=True, +- num_processes=4, +- log_calls=3_000, +- min_rollovers=4, +- log_opts=TestOptions.default_timed_log_opts( +- { +- "backupCount": 3, +- "interval": 3, +- "use_gzip": True, +- } +- ), +- ), + "backupCount=4, use_timed=True, interval=4, log_calls=3_000, num_processes=5": TestOptions( + use_timed=True, + num_processes=5, +@@ -119,20 +106,6 @@ TEST_CASES = { + } + ), + ), +- "backupCount=5, use_timed=True, maxBytes=1KiB, interval=5, log_calls=1_000, use_gzip=True, debug=True": TestOptions( +- use_timed=True, +- log_calls=1_000, +- min_rollovers=5, +- log_opts=TestOptions.default_timed_log_opts( +- { +- "maxBytes": 1024, +- "backupCount": 5, +- "interval": 5, +- "use_gzip": True, +- "debug": True, +- } +- ), +- ), + "use_timed=True, num_processes=15, interval=1, log_calls=5_000, use_gzip=True": TestOptions( + use_timed=True, + log_calls=5_000, diff --git a/community/py3-corner/APKBUILD b/community/py3-corner/APKBUILD index bfddc80fdaa..72f8fbb4e4f 100644 --- a/community/py3-corner/APKBUILD +++ b/community/py3-corner/APKBUILD @@ -5,7 +5,7 @@ pkgver=2.2.2 pkgrel=2 pkgdesc="Make some beautiful corner plots" url="https://github.com/dfm/corner.py" -arch="noarch !s390x !ppc64le" # failed tests +arch="noarch !s390x !ppc64le !riscv64" # failed tests license="BSD-2-Clause" depends=" python3 diff --git a/community/py3-cryptography/APKBUILD b/community/py3-cryptography/APKBUILD index d5fffe7cd8f..52287a694bf 100644 --- a/community/py3-cryptography/APKBUILD +++ b/community/py3-cryptography/APKBUILD @@ -1,8 +1,8 @@ # Contributor: August Klein <amatcoder@gmail.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-cryptography -pkgver=42.0.5 -pkgrel=1 +pkgver=42.0.7 +pkgrel=0 pkgdesc="Cryptographic recipes and primitives for Python" url="https://cryptography.io/" arch="all" @@ -75,7 +75,7 @@ package() { } sha512sums=" -5524fd230b55580a2c647a0a78197a783e201fdfa8b3177b72c6d7b689afd76a689e4fe3593120d3adb7ee5cc4adf9211e8deedc8fab355e9ed70076db09f68b cryptography-42.0.5.tar.gz -38af39f8cb869af630d4b75d7a62ba9778fd59ceee2858504655d9065a82d2365644c9ab301c90f3ebd9f32f2e04867650b6d392c1f2b6880e3bb0c216e6a419 cryptography_vectors-42.0.5.tar.gz +2f502fd78490ed2dc26884b05c9db32d6dcf8ed17ca3808299e528aa53ec13805e2be741d92d6a540b7dded011850cf033abe2e073f22f07e271c7c1c25c024b cryptography-42.0.7.tar.gz +5d64b3b7576ff1f39db1c12fbe5ed71e8430ca82cd936aedaf41c45812ec6f72456d6369dbbc58fed1d29909a845fac467a41e0acf74e681f3de8ccb1b8422fc cryptography_vectors-42.0.7.tar.gz 670ecc2d95083186bf7e986b18093ac289c218e7ab77b54258e21d09fd5729f551cf876645f2a175086c1a089926a367426d7745ef406efc3d1d82286d454323 skip-aead-tests-on-32-bit.patch " diff --git a/community/py3-curl/APKBUILD b/community/py3-curl/APKBUILD index c1d88fe710b..dea881f9fd2 100644 --- a/community/py3-curl/APKBUILD +++ b/community/py3-curl/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=py3-curl _pkgname=pycurl -pkgver=7.45.2 -pkgrel=2 +pkgver=7.45.3 +pkgrel=0 pkgdesc="Python3 interface to libcurl" url="http://pycurl.io/" arch="all" @@ -27,5 +27,5 @@ package() { } sha512sums=" -8a82346395acfc0bd37a8c4d8d2b17e5ab4602710308ed50f9ed88c223c73f15f5b1c95fc6191708e3bd9d647e4bc5ec91f740de433dd87e2ae0796ac79879ac pycurl-7.45.2.tar.gz +12a55070602a1fd22b160ad582a4001bdd28531d2b2ccd365ff0136bc13dd23af80b19488bdbbc60a902a3a362b64383b9ae6acce6ed328c74dcffc8a6a3f4ad pycurl-7.45.3.tar.gz " diff --git a/community/py3-cytoolz/APKBUILD b/community/py3-cytoolz/APKBUILD index df9abe6b4f4..3114c25fce2 100644 --- a/community/py3-cytoolz/APKBUILD +++ b/community/py3-cytoolz/APKBUILD @@ -13,7 +13,9 @@ checkdepends="py3-pytest" makedepends="python3-dev py3-setuptools" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/c/cytoolz/cytoolz-$pkgver.tar.gz -do-not-package-tests.patch" + do-not-package-tests.patch + fix-test-inspect-wrapped-property.patch + " builddir="$srcdir/$_pkgorig-$pkgver" build() { @@ -28,15 +30,8 @@ check() { local python_version=$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[:2])))') export PYTHONPATH="build/lib.linux-$CARCH-$python_version/:$PYTHONPATH" echo "$PYTHONPATH" - case "$CARCH" in - s390x|x86_64) - # https://github.com/pytoolz/cytoolz/issues/200 - pytest -v --deselect cytoolz/tests/test_inspect_args.py::test_inspect_wrapped_property - ;; - *) - pytest -v - ;; - esac + + pytest -v } package() { @@ -46,4 +41,5 @@ package() { sha512sums=" b3c46182b1d93b4e862e8d37e7e49fd44126e7ce503b9a25f7d78ff79ee9eac938bf47a63fda6ff6adbb660efedf0eb07810fbc2e91d7a471cb0167bb7ef0ad6 py3-cytoolz-0.12.3.tar.gz d5a79048e053efccec379e73a185bd8002ad95246b696a8c612bbb849e2b55f1c06e203ccc164f25b9a9242515805590c26028da188ac789ffe965b5a7430707 do-not-package-tests.patch +e386763f3f5c1af48c222f967f78952ba641e5f6cbb11d93e958c9c99ce7f2a6d6e74b8e61f6eb5250d52c25eb318ba7154cdf4a1edef0bc669e35cc70d1dcaf fix-test-inspect-wrapped-property.patch " diff --git a/community/py3-cytoolz/fix-test-inspect-wrapped-property.patch b/community/py3-cytoolz/fix-test-inspect-wrapped-property.patch new file mode 100644 index 00000000000..d9b5c7ce09b --- /dev/null +++ b/community/py3-cytoolz/fix-test-inspect-wrapped-property.patch @@ -0,0 +1,25 @@ +Patch-Source: https://github.com/pytoolz/cytoolz/pull/205.patch +-- +From dc21daf180b0d54d4349c415c134931f499459c5 Mon Sep 17 00:00:00 2001 +From: Colin Watson <cjwatson@debian.org> +Date: Fri, 26 Apr 2024 14:43:28 +0100 +Subject: [PATCH] Fix test failure on Python 3.11.9/3.12.3/main + +--- + cytoolz/tests/test_inspect_args.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cytoolz/tests/test_inspect_args.py b/cytoolz/tests/test_inspect_args.py +index b2c5669..fb0bb7f 100644 +--- a/cytoolz/tests/test_inspect_args.py ++++ b/cytoolz/tests/test_inspect_args.py +@@ -482,6 +482,8 @@ def __wrapped__(self): + wrapped = Wrapped(func) + assert inspect.signature(func) == inspect.signature(wrapped) + +- assert num_required_args(Wrapped) is None ++ # Python 3.11.9/3.12.3/3.13.0 added inspect.signature support for custom ++ # callables; before then, this returned None. ++ assert num_required_args(Wrapped) in (None, 1) + _sigs.signatures[Wrapped] = (_sigs.expand_sig((0, lambda func: None)),) + assert num_required_args(Wrapped) == 1 diff --git a/community/py3-daphne/0001-pytest-runner-extra.patch b/community/py3-daphne/0001-pytest-runner-extra.patch deleted file mode 100644 index 7cbb141aaa2..00000000000 --- a/community/py3-daphne/0001-pytest-runner-extra.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/setup.py b/setup.py -index ae19f5d..636c5d5 100755 ---- a/setup.py -+++ b/setup.py -@@ -24,8 +24,7 @@ setup( - include_package_data=True, - install_requires=["twisted[tls]>=22.4", "autobahn>=22.4.2", "asgiref>=3.5.2,<4"], - python_requires=">=3.7", -- setup_requires=["pytest-runner"], -- extras_require={"tests": ["hypothesis", "pytest", "pytest-asyncio", "django"]}, -+ extras_require={"tests": ["pytest-runner","hypothesis", "pytest", "pytest-asyncio", "django"]}, - entry_points={ - "console_scripts": ["daphne = daphne.cli:CommandLineInterface.entrypoint"] - }, diff --git a/community/py3-daphne/APKBUILD b/community/py3-daphne/APKBUILD index 244542fad8a..1cb7b42be89 100644 --- a/community/py3-daphne/APKBUILD +++ b/community/py3-daphne/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Alex Denes <caskd@redxen.eu> -# Maintainer: Alex Denes <caskd@redxen.eu> -_pkgname=daphne -pkgname="py3-$_pkgname" -pkgver=4.0.0 -pkgrel=2 +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-daphne +_pkgreal=daphne +pkgver=4.1.2 +pkgrel=0 pkgdesc="HTTP, HTTP2 and WebSocket protocol server for ASGI and ASGI-HTTP" url="https://github.com/django/daphne" arch="noarch" @@ -15,33 +15,40 @@ depends=" " checkdepends=" py3-hypothesis + py3-django py3-cryptography py3-pytest py3-pytest-asyncio py3-pytest-runner " -makedepends="py3-setuptools_scm" -subpackages="$pkgname-pyc" -source=" - https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz - 0001-pytest-runner-extra.patch +makedepends=" + py3-gpep517 + py3-setuptools + py3-setuptools_scm + py3-wheel " -options="!check" # tests attempt to build checkdepends -builddir="$srcdir/$_pkgname-$pkgver" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/django/daphne/archive/refs/tags/$pkgver.tar.gz" +builddir="$srcdir"/$_pkgreal-$pkgver build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { - python3 setup.py test + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest -v } package() { - python3 setup.py install --root "$pkgdir" + python3 -m installer -d "$pkgdir" \ + .dist/*.whl } + sha512sums=" -1c7f707c3368fcc5c30fbb930effeb0ba1823727692514add4e6438082c9d02300a9031b56d432c1359f8f8299b0af2b925f3f9f32b4c365700f79052606676f daphne-4.0.0.tar.gz -1b754db1ca81768d1026db567fcd0ca4b6695389144a70d20ebca8a7615bd13d271529e522b3e8fa897a36827428765a5952470b2420f42f98d00400eeaa7c34 0001-pytest-runner-extra.patch +2be34cd2474068a31bd88363d4f9a4c0bb1f3209c52e9381e67649c6d4ca4f08186481ee57f59fd70689340e3fda287cc4907c1dc4dccd109b1c37119b30b9f2 py3-daphne-4.1.2.tar.gz " diff --git a/community/py3-dasbus/APKBUILD b/community/py3-dasbus/APKBUILD index a9828e316ec..a4447babd12 100644 --- a/community/py3-dasbus/APKBUILD +++ b/community/py3-dasbus/APKBUILD @@ -9,7 +9,7 @@ arch="noarch" license="LGPL-2.1-or-later" depends="python3 py3-gobject3 dbus" makedepends="py3-setuptools" -checkdepends="py3-pytest" +checkdepends="py3-pytest7" subpackages="$pkgname-pyc" source="https://github.com/rhinstaller/dasbus/releases/download/v$pkgver/dasbus-$pkgver.tar.gz" builddir="$srcdir/dasbus-$pkgver" diff --git a/community/py3-deepdiff/APKBUILD b/community/py3-deepdiff/APKBUILD index 29c81f7adb2..169d0e3d4c7 100644 --- a/community/py3-deepdiff/APKBUILD +++ b/community/py3-deepdiff/APKBUILD @@ -35,7 +35,7 @@ check() { .testenv/bin/python3 -m installer .dist/*.whl # needs newer pydantic version .testenv/bin/python3 -m pytest -k 'not test_pydantic1 and not test_pydantic2' -} +} package() { python3 -m installer -d "$pkgdir" \ diff --git a/community/py3-django-allauth/APKBUILD b/community/py3-django-allauth/APKBUILD index fc23e622820..f2158176063 100644 --- a/community/py3-django-allauth/APKBUILD +++ b/community/py3-django-allauth/APKBUILD @@ -2,13 +2,16 @@ # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-django-allauth _pyname="django-allauth" -pkgver=0.61.1 -pkgrel=1 +pkgver=0.62.1 +pkgrel=0 arch="noarch" pkgdesc="Integrated set of Django applications addressing SSO" url="https://pypi.python.org/project/django-allauth" license="MIT" +# missing opt depends: python3-openid depends=" + py3-python3-saml + py3-qrcode py3-django py3-openid py3-requests @@ -22,14 +25,11 @@ makedepends=" py3-wheel " checkdepends=" - py3-qrcode py3-pytest py3-pytest-django - py3-onelogin " source="$pkgname-$pkgver.tar.gz::https://github.com/pennersr/$_pyname/archive/$pkgver.tar.gz" builddir="$srcdir"/$_pyname-$pkgver -options="!check" # Missing py3-onelogin depend subpackages="$pkgname-pyc" build() { @@ -39,7 +39,9 @@ build() { } check() { - python3 manage.py test allauth + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest -v } package() { @@ -47,5 +49,5 @@ package() { } sha512sums=" -ad86f79f54ae222a97884fd0e0b18f8eddb0caf08c541490a1f61f968a44ce9b3504c5456bd6e416a459f455b477e5c36f2eda58b7c68ba0f51ba8f67af1759f py3-django-allauth-0.61.1.tar.gz +43aeb4e81382bf8f8a616730db365f08c5c73e607606cb38107693d5920504136e3cc66c8515d15343f74ffb7d374d1f6172deba7bc7b3407fa29343a20d95c7 py3-django-allauth-0.62.1.tar.gz " diff --git a/testing/py3-django-auth-ldap/APKBUILD b/community/py3-django-auth-ldap/APKBUILD index f3c10d9e0d5..48b005e937c 100644 --- a/testing/py3-django-auth-ldap/APKBUILD +++ b/community/py3-django-auth-ldap/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-django-auth-ldap #_pkgreal is used by apkbuild-pypi to find modules at PyPI _pkgreal=django-auth-ldap pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Django LDAP authentication backend" url="https://pypi.python.org/project/django-auth-ldap" # s390x | riscv64: test failure @@ -22,13 +22,13 @@ checkdepends=" openldap-clients openldap-overlay-syncprov " -makedepends="py3-setuptools py3-gpep517 py3-wheel" +makedepends="py3-setuptools_scm py3-gpep517 py3-wheel" source="$pkgname-$pkgver.tar.gz::https://github.com/django-auth-ldap/django-auth-ldap/archive/refs/tags/$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" subpackages="$pkgname-pyc" build() { - gpep517 build-wheel \ + SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver gpep517 build-wheel \ --wheel-dir .dist \ --output-fd 3 3>&1 >&2 } @@ -36,7 +36,7 @@ build() { check() { python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -Wa -b -m django test --settings tests.settings + TMP=/tmp .testenv/bin/python3 -Wa -b -m django test --settings tests.settings } package() { diff --git a/community/py3-django-celery-results/APKBUILD b/community/py3-django-celery-results/APKBUILD index 73643c04647..dc5ff01c478 100644 --- a/community/py3-django-celery-results/APKBUILD +++ b/community/py3-django-celery-results/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> -_pyname="django-celery-results" -pkgname=py3-$_pyname +pkgname=py3-django-celery-results +_pkgreal="django-celery-results" pkgver=2.5.1 -pkgrel=1 -arch="noarch !s390x" # Missing py3-celery depend +pkgrel=2 +arch="noarch" pkgdesc="Celery result backends for Django." url="https://pypi.python.org/project/django-celery-results" license="BSD-3-Clause" @@ -19,17 +19,20 @@ makedepends=" " checkdepends=" py3-pytest + py3-nose py3-pytest-django py3-pytest-benchmark py3-pytest-cov - py3-pytz + py3-tz py3-psycopg2 - py3-pyscopg + py3-psycopg py3-case " -options="!check" # Broken testsuite -source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/d/django-celery-results/django_celery_results-$pkgver.tar.gz" -builddir="$srcdir"/django_celery_results-$pkgver +source=" + $pkgname-$pkgver-gh.tar.gz::https://github.com/celery/django-celery-results/archive/refs/tags/v$pkgver.tar.gz + fix-test-cache.patch + " +builddir="$srcdir"/$_pkgreal-$pkgver subpackages="$pkgname-pyc" build() { @@ -39,14 +42,20 @@ build() { } check() { - python3 manage.py test + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + # FAILED t/unit/test_models.py::test_Models::test_retry_store_result_fails - assert {<TaskResult:...7 (PENDING)>>} == set() + # FAILED t/unit/test_models.py::test_Models::test_retry_store_result_succeeds - assert {<TaskResult:...e (PENDING)>>} == set() + # FAILED t/unit/test_models.py::test_Models::test_store_group_result - AssertionError: assert {<GroupResult...7719570ccfe>>} == set() + # FAILED t/unit/test_models.py::test_Models::test_store_result - AssertionError: assert {<TaskResult:...5 (PENDING)>>} == set() + .testenv/bin/python3 -m pytest -v -k 'not test_retry_store_result_fails and not test_retry_store_result_succeeds and not test_store_group_result and not test_store_result' } - package() { python3 -m installer -d "$pkgdir" \ .dist/*.whl } sha512sums=" -2da39098a36847ab171a0758b37daafd0a7e17c905b599efebb582226a7adce5f1b5b941bd59db29e5d502d896f8474d2b9771454ef409cdef03b952f0a42526 py3-django-celery-results-2.5.1.tar.gz +4527c49a79bca802623526141052ba757eca5213165bc8415f36c9f01cdb33857ff332815036d7b7ab38de72153d9525d91e3db554ac79b10c74c493dc427a1f py3-django-celery-results-2.5.1-gh.tar.gz +c23800ce089e516b9d7e3dee856afdd7279ba34181c6d712370832347c29a604f83965dd0e45703d97d3cca9b8d45569e4c8a65abef93edca388f2a4210ac7d2 fix-test-cache.patch " diff --git a/community/py3-django-celery-results/fix-test-cache.patch b/community/py3-django-celery-results/fix-test-cache.patch new file mode 100644 index 00000000000..8eb175875cb --- /dev/null +++ b/community/py3-django-celery-results/fix-test-cache.patch @@ -0,0 +1,12 @@ +diff --git a/t/unit/backends/test_cache.py.orig b/t/unit/backends/test_cache.py +index 1cc70401aa8..aa880d8f651 100644 +--- a/t/unit/backends/test_cache.py.orig ++++ b/t/unit/backends/test_cache.py +@@ -17,6 +17,7 @@ class SomeClass: + + class test_CacheBackend: + ++ @pytest.fixture(autouse=True) + def setup(self): + self.b = CacheBackend(app=self.app) + diff --git a/community/py3-django-extensions/1841_update-mail-debug-command-to-use-aiosmtpd.patch b/community/py3-django-extensions/1841_update-mail-debug-command-to-use-aiosmtpd.patch new file mode 100644 index 00000000000..d5f19d4af90 --- /dev/null +++ b/community/py3-django-extensions/1841_update-mail-debug-command-to-use-aiosmtpd.patch @@ -0,0 +1,93 @@ +From 37d56c4a4704c823ac6a4ef7c3de4c0232ceee64 Mon Sep 17 00:00:00 2001 +From: Wes Lord <weslord@gmail.com> +Date: Tue, 17 Oct 2023 21:06:57 -0700 +Subject: [PATCH] Update mail_debug command to use aiosmtpd + +smtpd deprecated by Python 3.6, removed in Python 3.12 +--- + .../management/commands/mail_debug.py | 22 ++++++++++--------- + requirements-dev.txt | 1 + + tests/management/commands/test_mail_debug.py | 4 ++-- + 3 files changed, 15 insertions(+), 12 deletions(-) + +diff --git a/django_extensions/management/commands/mail_debug.py b/django_extensions/management/commands/mail_debug.py +index 7a8424dc4..c76007612 100644 +--- a/django_extensions/management/commands/mail_debug.py ++++ b/django_extensions/management/commands/mail_debug.py +@@ -1,8 +1,8 @@ + # -*- coding: utf-8 -*- +-import asyncore ++import asyncio + import sys ++from aiosmtpd.controller import Controller + from logging import getLogger +-from smtpd import SMTPServer + from typing import List + + from django.core.management.base import BaseCommand, CommandError +@@ -12,14 +12,12 @@ + logger = getLogger(__name__) + + +-class ExtensionDebuggingServer(SMTPServer): +- """Duplication of smtpd.DebuggingServer, but using logging instead of print.""" +- +- # Do something with the gathered message +- def process_message(self, peer, mailfrom, rcpttos, data, **kwargs): ++class CustomHandler: ++ async def handle_DATA(self, server, session, envelope): + """Output will be sent to the module logger at INFO level.""" ++ peer = session.peer + inheaders = 1 +- lines = data.split('\n') ++ lines = envelope.content.decode('utf8', errors='replace').splitlines() + logger.info('---------- MESSAGE FOLLOWS ----------') + for line in lines: + # headers first +@@ -28,6 +26,7 @@ def process_message(self, peer, mailfrom, rcpttos, data, **kwargs): + inheaders = 0 + logger.info(line) + logger.info('------------ END MESSAGE ------------') ++ return '250 OK' + + + class Command(BaseCommand): +@@ -78,8 +77,11 @@ def handle(self, addrport='', *args, **options): + def inner_run(): + quit_command = (sys.platform == 'win32') and 'CTRL-BREAK' or 'CONTROL-C' + print("Now accepting mail at %s:%s -- use %s to quit" % (addr, port, quit_command)) +- ExtensionDebuggingServer((addr, port), None, decode_data=True) +- asyncore.loop() ++ handler = CustomHandler() ++ controller = Controller(handler, hostname=addr, port=port) ++ controller.start() ++ loop = asyncio.get_event_loop() ++ loop.run_forever() + + try: + inner_run() +diff --git a/requirements-dev.txt b/requirements-dev.txt +index cc9112252..08578babd 100644 +--- a/requirements-dev.txt ++++ b/requirements-dev.txt +@@ -8,6 +8,7 @@ factory-boy + requests + pygments + vobject ++aiosmtpd + + types-pyOpenSSL + types-PyYAML +diff --git a/tests/management/commands/test_mail_debug.py b/tests/management/commands/test_mail_debug.py +index c75dbede1..f723f52c5 100644 +--- a/tests/management/commands/test_mail_debug.py ++++ b/tests/management/commands/test_mail_debug.py +@@ -4,6 +4,6 @@ + + + def test_initialize_mail_server(): +- with mock.patch('django_extensions.management.commands.mail_debug.asyncore.loop') as loop: ++ with mock.patch('django_extensions.management.commands.mail_debug.asyncio') as asyncio: + call_command('mail_debug', '2525') +- assert loop.called, 'asyncore.loop was not called' ++ assert asyncio.get_event_loop.called, 'asyncio.get_event_loop was not called' diff --git a/community/py3-django-extensions/APKBUILD b/community/py3-django-extensions/APKBUILD index 4647c9fea35..7b1369876ef 100644 --- a/community/py3-django-extensions/APKBUILD +++ b/community/py3-django-extensions/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-django-extensions _pyname=django-extensions pkgver=3.2.3 -pkgrel=2 +pkgrel=3 arch="noarch" pkgdesc="A collection of custom extensions for the Django Framework" url="https://pypi.python.org/project/django-extensions" @@ -11,6 +11,7 @@ license="MIT" depends=" python3 py3-django + py3-aiosmtpd " makedepends=" py3-setuptools @@ -19,10 +20,20 @@ makedepends=" " checkdepends=" py3-pytest + py3-pygments py3-shortuuid + py3-pytest-cov + py3-pytest-django + py3-pytest-factoryboy + py3-django-rest-framework + py3-pip + py3-requests + py3-werkzeug + " +source=" + $pkgname-$pkgver-gh.tar.gz::https://github.com/django-extensions/django-extensions/archive/refs/tags/$pkgver.tar.gz + 1841_update-mail-debug-command-to-use-aiosmtpd.patch " -options="!check" # Missing shortuuid depend -source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/d/django-extensions/django-extensions-$pkgver.tar.gz" builddir="$srcdir"/$_pyname-$pkgver subpackages="$pkgname-pyc" @@ -33,7 +44,13 @@ build() { } check() { - pytest -v + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + # test_pipchecker: seems to expect control over system libraries + # DumpScriptTests: django.db.utils.OperationalError: no such table: django_extensions_permmodel + # test_installed_apps_no_resolve_conflicts_function: AssertionError: "Can't instantiate abstract class CRNoFunction with abstract method resolve_collisions" does not match "Can't instantiate abstract class CRNoFunction without an implementation for abstract method 'resolve_collisions'" + # test_do_export_emails_format_vcard_start: SystemExit 1 + .testenv/bin/python3 -m pytest -v -k 'not test_pipchecker and not DumpScriptTests and not test_installed_apps_no_resolve_conflicts_function and not test_do_export_emails_format_vcard_start' } package() { @@ -42,5 +59,6 @@ package() { } sha512sums=" -b4c575c200a9d0903db34038fd52877dfe2581d4b5c9f98ee0ef191bf4f2c615ba3cd11277a5b6621b4ccba4d3a27286fb3e08fac216d3ee48417583134e899f py3-django-extensions-3.2.3.tar.gz +0d4d34678d829c91e9af917b63a35c327cea83591c021834e97c784293d7e94b98e5fff5676e52fed6cfb4c2add2ac98301c742354555a345d55896c0b83f0d2 py3-django-extensions-3.2.3-gh.tar.gz +7f22a6c0657a86935a52cdcff38234eb65f6c50502b1a79b4746e2ddc18bf8414a4f220b61c84c7106673bb595c50d462c08289da6fffc4a86b15653abd2b248 1841_update-mail-debug-command-to-use-aiosmtpd.patch " diff --git a/community/py3-django-otp/APKBUILD b/community/py3-django-otp/APKBUILD index 723cb984004..4f88bbc9a69 100644 --- a/community/py3-django-otp/APKBUILD +++ b/community/py3-django-otp/APKBUILD @@ -2,12 +2,13 @@ # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-django-otp _pyname=django_otp -pkgver=1.4.1 +pkgver=1.5.0 pkgrel=1 arch="noarch" pkgdesc="A pluggable framework for adding two-factor authentication to Django using one-time passwords." url="https://pypi.python.org/project/django-otp" license="BSD-2-Clause" +# also supports py3-segno depends=" py3-django py3-qrcode @@ -21,7 +22,6 @@ makedepends=" checkdepends=" py3-freezegun " -options="!check" # Can't find module for some reason source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/d/django-otp/django_otp-$pkgver.tar.gz" builddir="$srcdir"/$_pyname-$pkgver subpackages="$pkgname-pyc" @@ -33,9 +33,11 @@ build() { } check() { - DJANGO_SETTINGS_MODULE="test_project.settings" \ + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl PYTHONPATH="test" \ - python3 -s -m django test django_otp + DJANGO_SETTINGS_MODULE="test_project.settings" \ + .testenv/bin/python3 -s -m django test -v 2 django_otp } package() { @@ -45,5 +47,5 @@ package() { } sha512sums=" -bb041a6ecd93dbad4f83d6593dfbc2f4768e1a3e68df332a61ed9ce483a8ec7090179a6865b128d02a2fc5ba2b42cd63dc16595a7b98e2728733fc274d506b1a py3-django-otp-1.4.1.tar.gz +0169804992b155dfa88fbc0d695091f3f03225f28a104c595e7790f174ff3f4943280b7a3dbb3d4c263cc1bad0ea0370e4749d8d0b1df1e3675881365fc15dfe py3-django-otp-1.5.0.tar.gz " diff --git a/community/py3-django-picklefield/APKBUILD b/community/py3-django-picklefield/APKBUILD index 3078b6774f2..8d8368f567d 100644 --- a/community/py3-django-picklefield/APKBUILD +++ b/community/py3-django-picklefield/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-django-picklefield _pyname="django-picklefield" pkgver=3.2.0 -pkgrel=1 +pkgrel=2 arch="noarch" pkgdesc="A pickled object field for Django" url="https://pypi.python.org/project/django-picklefield" @@ -16,7 +16,6 @@ makedepends=" py3-gpep517 py3-wheel " -options="!check" # No testsuite source="$pkgname-$pkgver.tar.gz::https://github.com/gintas/django-picklefield/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir"/$_pyname-$pkgver subpackages="$pkgname-pyc" @@ -27,6 +26,13 @@ build() { --output-fd 3 3>&1 >&2 } +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + DJANGO_SETTINGS_MODULE="tests.settings" \ + .testenv/bin/python3 -s -m django test -v 2 +} + package() { python3 -m installer -d "$pkgdir" \ .dist/*.whl diff --git a/community/py3-django-q2/APKBUILD b/community/py3-django-q2/APKBUILD index 77a61070215..d417a89a31e 100644 --- a/community/py3-django-q2/APKBUILD +++ b/community/py3-django-q2/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-django-q2 _pyname="django-q2" pkgver=1.6.2 -pkgrel=1 +pkgrel=2 arch="noarch" pkgdesc="A multiprocessing distributed task queue for Django" url="https://pypi.python.org/project/django-q2" @@ -28,13 +28,15 @@ makedepends=" py3-poetry-core " checkdepends=" - py3-pytest + valkey + py3-pytest-django + py3-boto3 + py3-psutil + py3-mongo " -# 'python-boto3: Amazon Simple Queue Service message queue support' -# 'python-psutil: resource usage limit support' -# 'python-pymongo: MongoDB as a message broker support' -options="!check" # Missing check depends -source="$pkgname-$pkgver.tar.gz::https://github.com/django-q2/django-q2/archive/refs/tags/v$pkgver.tar.gz +source=" + $pkgname-$pkgver.tar.gz::https://github.com/django-q2/django-q2/archive/refs/tags/v$pkgver.tar.gz + fix-HiredisParser-reference.patch " builddir="$srcdir"/$_pyname-$pkgver subpackages="$pkgname-pyc" @@ -46,7 +48,20 @@ build() { } check() { - PYTHONPATH="$builddir" pytest -v + valkey-server & + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + # test_qcluster: stalls + # test_scheduler: requires croniter module + # test_mongo: reqires setting up mongo server + # test_max_rss: failure on 32-bit arches + REDIS_HOST=127.0.0.1 \ + MONGO_HOST=127.0.0.1 \ + .testenv/bin/python3 -m pytest -v -k 'not test_qcluster and not test_scheduler and not test_mongo and not test_max_rss' || FAIL=true + pkill valkey-server + if [ "$FAIL" = "true" ]; then + return 1 + fi } package() { @@ -56,4 +71,5 @@ package() { sha512sums=" 1d33a29f392bae84e44f637ebfeadb9fad7623732aa7f1e46ee2712459b1fefc501ad240415803542d9ded1835aaa372f5c3f5ad1ba285d4b1d158f3921aa7e4 py3-django-q2-1.6.2.tar.gz +b4df8b946cff0b9160a8dc2a94f7ebbc288c35a4ee956f3f29d7a268f6a769bbc2bfdec6b7bd2e4c7134974820f306d07dfba37aeae2c37b8b9eefb2b3f3e5d4 fix-HiredisParser-reference.patch " diff --git a/community/py3-django-q2/fix-HiredisParser-reference.patch b/community/py3-django-q2/fix-HiredisParser-reference.patch new file mode 100644 index 00000000000..80f50605807 --- /dev/null +++ b/community/py3-django-q2/fix-HiredisParser-reference.patch @@ -0,0 +1,13 @@ +diff --git a/django_q/tests/settings.py.orig b/django_q/tests/settings.py +index b6246449429..b8b2f780e8e 100644 +--- a/django_q/tests/settings.py.orig ++++ b/django_q/tests/settings.py +@@ -116,7 +116,7 @@ CACHES = { + "LOCATION": f"redis://{REDIS_HOST}:6379/0", + "OPTIONS": { + "CLIENT_CLASS": "django_redis.client.DefaultClient", +- "PARSER_CLASS": "redis.connection.HiredisParser", ++ "PARSER_CLASS": "redis.connection._HiredisParser", + }, + } + } diff --git a/community/py3-django-rest-framework/APKBUILD b/community/py3-django-rest-framework/APKBUILD index 691741a3f4d..7d9bc9b9442 100644 --- a/community/py3-django-rest-framework/APKBUILD +++ b/community/py3-django-rest-framework/APKBUILD @@ -4,15 +4,32 @@ pkgname=py3-django-rest-framework _pkgname=django-rest-framework pkgver=3.15.1 -pkgrel=1 +pkgrel=2 pkgdesc="Web APIs for Django" -options="!check" # fails with "OperationalError: no such table: auth_user" url="https://github.com/encode/django-rest-framework" arch="noarch" license="Custom" -depends="py3-django py3-tz" -makedepends="py3-setuptools py3-gpep517 py3-wheel" -checkdepends="py3-pytest py3-core-api py3-jinja2 py3-uritemplate" +depends=" + py3-django + py3-tz +" +makedepends=" + py3-setuptools + py3-gpep517 + py3-wheel +" +checkdepends=" + py3-pytest-django + py3-pytest-cov + py3-core-api + py3-jinja2 + py3-uritemplate + py3-django-guardian + py3-psycopg2 + py3-markdown + py3-yaml + py3-inflection +" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/encode/$_pkgname/archive/$pkgver.tar.gz" builddir="$srcdir"/$_pkgname-$pkgver @@ -26,7 +43,9 @@ build() { check() { python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl - .testenv/bin/python3 ./runtests.py + # test_urlpatterns: AssertionError: assert [<URLPattern ''>] is not [<URLPattern ''>] + # test_markdown: rather hard to decipher assertion error + .testenv/bin/python3 -m pytest -v -k 'not test_urlpatterns and not test_markdown' } package() { diff --git a/community/py3-django-storages/APKBUILD b/community/py3-django-storages/APKBUILD index dc597a67729..d02fb670221 100644 --- a/community/py3-django-storages/APKBUILD +++ b/community/py3-django-storages/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=py3-django-storages -pkgver=1.14.2 -pkgrel=1 +pkgver=1.14.3 +pkgrel=0 pkgdesc="Custom storage backends for Django" url="https://django-storages.readthedocs.io/" arch="noarch" @@ -48,5 +48,5 @@ package() { } sha512sums=" -5e1cfdddfde21bde1a0f735ca04e0a1fdf30e779bd63b580610eb7761cf053ad66eb115bb85a966ffa9f8bf2c38927132761eba407749f283cc5511e72267759 py3-django-storages-1.14.2.tar.gz +bdf391ea4292b558085e6f3e453a0a70e86761bbe22d07307b432b3c0abecf5e04650bb2a285a214b2b64fa7519a1a61aeeb7acf98c6b25a45334773eda07a15 py3-django-storages-1.14.3.tar.gz " diff --git a/community/py3-django/APKBUILD b/community/py3-django/APKBUILD index ca5f7776191..6c3b2717a49 100644 --- a/community/py3-django/APKBUILD +++ b/community/py3-django/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=py3-django _pkgname=Django -pkgver=4.2.11 -pkgrel=1 +pkgver=4.2.12 +pkgrel=0 pkgdesc="High-level Python3 Web framework" url="https://djangoproject.com/" arch="noarch" @@ -22,7 +22,7 @@ makedepends=" options="!check" # some depends missing, others in community/testing subpackages="$pkgname-pyc" source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" -builddir="$srcdir"/$_pkgname-$pkgver +builddir="$srcdir/django-$pkgver" replaces="py-django" # Backwards compatibility provides="py-django=$pkgver-r$pkgrel" # Backwards compatibility @@ -123,5 +123,5 @@ package() { } sha512sums=" -5842f0c2592b695ecfd7f00d250075cb9581efc8a7f389f155dbac74d80ac7899f600ffba0d51e3391f15c4a1444554d901b8a673a1091ab7269e24862122ef0 Django-4.2.11.tar.gz +5fe9a7b1c12d6e2aee2ff9108eca77719d0bc44bd26990465a6651cd5ea0d705cce49704be1a0e9afcf11b3ec37457232484193ed1902bb8e872e28b3c05c4c1 Django-4.2.12.tar.gz " diff --git a/community/py3-ducc0/APKBUILD b/community/py3-ducc0/APKBUILD index b539ed1f62d..2cc42ec5528 100644 --- a/community/py3-ducc0/APKBUILD +++ b/community/py3-ducc0/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Martin Reinecke <martin@mpa-garching.mpg.de> pkgname=py3-ducc0 _pyname=ducc0 -pkgver=0.33.0 +pkgver=0.34.0 _tagname="${pkgver//./_}" pkgrel=1 pkgdesc="Efficient algorithms for Fast Fourier transforms and more" @@ -43,5 +43,5 @@ package() { } sha512sums=" -f983dbbd3cc510ec662126cd81ceb99124727f0f1cb947f4cd5a893388638c3731f553609f64e64f7ffb6366fa7287e5925f663391b44ec7c92695fb080a1152 ducc-ducc0_0_33_0.tar.gz +023dfc60e5c3fdebc3142fd96aac288374d5560e1f484e3c10283d65fda172aa28d181860c7f2de1c7544b1948aa7243c4e3597a233f9b37065afd5b1cfba008 ducc-ducc0_0_34_0.tar.gz " diff --git a/community/py3-emcee/APKBUILD b/community/py3-emcee/APKBUILD index 21cbf9e98bf..2e4373c3c73 100644 --- a/community/py3-emcee/APKBUILD +++ b/community/py3-emcee/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-emcee -pkgver=3.1.4 -pkgrel=1 +pkgver=3.1.6 +pkgrel=0 pkgdesc="Python ensemble sampling toolkit for affine-invariant MCMC" url="https://github.com/dfm/emcee" arch="noarch !x86 !armhf !armv7" @@ -46,5 +46,5 @@ package() { } sha512sums=" -9c6c22c7854438e7951c7bccefca21159945405cba05f52e0b99563e651789475d7342226f63c8a2e8250fd25287064ca095ea961427e6ac15ceb217d3dbb174 emcee-3.1.4.tar.gz +0715cb71f4b1381751effa2f0a49463c246b3ee77e2e9caeeb5a97fd6119a5c78c5ad91e44ff048bfde9491299cfb466467b59b9062beef0064345511bbbf7df emcee-3.1.6.tar.gz " diff --git a/community/py3-emoji/APKBUILD b/community/py3-emoji/APKBUILD index 7cfb55ead1e..3d97e592721 100644 --- a/community/py3-emoji/APKBUILD +++ b/community/py3-emoji/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-emoji _pkgorig=emoji -pkgver=2.11.0 -pkgrel=1 +pkgver=2.11.1 +pkgrel=0 pkgdesc="Emoji terminal output for Python" url="https://github.com/carpedm20/emoji" arch="noarch" @@ -33,5 +33,5 @@ package() { } sha512sums=" -2b8263dcb84a73a54c17b63a878d2f6446b41742fd3148d0be6124acc176c97a6b5cdae72bd9bb22b7a384896a8f875f7dd6962cc5bd72700f9b7e5d568c7fd4 py3-emoji-2.11.0.tar.gz +c200e3b143569ba6890b5c83721d9c8fbd76288e05e8d8dad02b853adc79fab5886a6a9606fd361430c9cd42689c24f05583bbe1c4aeff520fff4591aa443af5 py3-emoji-2.11.1.tar.gz " diff --git a/community/py3-evopreprocess/APKBUILD b/community/py3-evopreprocess/APKBUILD deleted file mode 100644 index cd0e886e043..00000000000 --- a/community/py3-evopreprocess/APKBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Contributor: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> -# Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> -pkgname=py3-evopreprocess -pkgver=0.5.0 -pkgrel=4 -pkgdesc="Data Preprocessing with Evolutionary and Nature Inspired Algorithms" -url="https://github.com/karakatic/EvoPreprocess" -arch="noarch" -license="GPL-3.0-or-later" -depends=" - python3 - py3-imbalanced-learn - py3-niapy - py3-numpy - py3-scipy - py3-scikit-learn - " -makedepends="py3-gpep517 py3-setuptools py3-wheel" -subpackages="$pkgname-pyc" -source="https://github.com/karakatic/EvoPreprocess/archive/v$pkgver/evopreprocess-$pkgver.tar.gz - remove-tests.patch" -builddir="$srcdir/EvoPreprocess-$pkgver" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -# tests are immature; use smoke tests instead -check() { - PYTHONPATH=build/lib python3 -c "from evopreprocess.feature_selection import EvoFeatureSelection" -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -ca8d23b7431f72bbb24b3b651749937c8773b15e0549b1b986990440ce517d5cf426ec9b7790996e9c685c5bffefa548df3948f6caf2048d7e5396b05d27b5cc evopreprocess-0.5.0.tar.gz -03ba2a5c600119515c0cb9d73d86a8b3ff140cdb06ef49ca710c97a082a9b98c2da0d16472d1675192d8e68159fd5e82fdaa56467b829e4b68b544488dfbf07b remove-tests.patch -" diff --git a/community/py3-evopreprocess/remove-tests.patch b/community/py3-evopreprocess/remove-tests.patch deleted file mode 100644 index 750a44f0ec6..00000000000 --- a/community/py3-evopreprocess/remove-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -31,7 +31,7 @@ - long_description=long_description, - long_description_content_type='text/markdown', - url='https://github.com/karakatic/EvoPreprocess', -- packages=setuptools.find_packages(), -+ packages=setuptools.find_packages(exclude=("*tests.*", "*tests")), - classifiers=[ - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', diff --git a/community/py3-execnet/APKBUILD b/community/py3-execnet/APKBUILD index 6f630b1d661..d5205877de1 100644 --- a/community/py3-execnet/APKBUILD +++ b/community/py3-execnet/APKBUILD @@ -1,38 +1,33 @@ # Contributor: Dmitry Romanenko <dmitry@romanenko.in> # Maintainer: Dmitry Romanenko <dmitry@romanenko.in> pkgname=py3-execnet -_pkgname=execnet -pkgver=1.9.0 -pkgrel=3 -pkgdesc="execnet: rapid multi-Python deployment" -url="https://github.com/pytest-dev/execnet" +pkgver=2.1.1 +pkgrel=0 +pkgdesc="distributed Python deployment and communication" +url="https://execnet.readthedocs.io" arch="noarch" license="MIT" -depends="py3-apipkg" -# tests for py-gevent are broken, jython is missing in repo, eventlet is part -# of testing -checkdepends="py3-pytest py3-py" -makedepends="py3-setuptools py3-setuptools_scm" +makedepends="py3-gpep517 py3-hatch-vcs py3-setuptools py3-wheel" +checkdepends="py3-pytest" subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" -builddir="$srcdir"/$_pkgname-$pkgver - -replaces="py-execnet" # Backwards compatibility -provides="py-execnet=$pkgver-r$pkgrel" # Backwards compatibility +source="https://files.pythonhosted.org/packages/source/e/execnet/execnet-$pkgver.tar.gz" +builddir="$srcdir"/execnet-$pkgver build() { - python3 setup.py build + gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2 + } check() { - mv $builddir/doc/example/conftest.py $builddir - python3 -m pytest + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest } package() { - python3 setup.py install --skip-build --root="$pkgdir" + python3 -m installer -d "$pkgdir" .dist/*.whl } sha512sums=" -d425e7b6f3708efecb5dfa2c36a837cb55f2c32cf2ec0c1dc11cd1ca6ea614d119d04908b84dd5a3593c87db35e71fee202f843665c853ac3538479f60c83d60 execnet-1.9.0.tar.gz +486f906ad653d16cce7337d9085c36070fe3dd721a3723ca62ceb25862c3ff837120062df028d5aadec17f854c0d46204537e9d75d22079a677f08c50dd48d21 execnet-2.1.1.tar.gz " diff --git a/community/py3-extruct/214_fix-syntaxwarning.patch b/community/py3-extruct/214_fix-syntaxwarning.patch new file mode 100644 index 00000000000..98e6d6046da --- /dev/null +++ b/community/py3-extruct/214_fix-syntaxwarning.patch @@ -0,0 +1,46 @@ +From 22fa7887383187260db8a8506c3b7f4c8b21e5b2 Mon Sep 17 00:00:00 2001 +From: dmo <marillat@users.noreply.github.com> +Date: Mon, 12 Feb 2024 09:40:31 +0100 +Subject: [PATCH 1/2] Fix SyntaxWarning in #213 + +--- + extruct/rdfa.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extruct/rdfa.py b/extruct/rdfa.py +index 273b0b5..58a0dd9 100644 +--- a/extruct/rdfa.py ++++ b/extruct/rdfa.py +@@ -85,7 +85,7 @@ def _replaceNS(self, prop, html_element, head_element): + + match = None + if head_element.get("prefix"): +- match = re.search(prefix + ": [^\s]+", head_element.get("prefix")) ++ match = re.search(prefix + ": [^\\s]+", head_element.get("prefix")) + + # if namespace taken from prefix attribute in head tag + if match: + +From dc8ef20b99d02ce720284e731e842e1cd7fd6da1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= <adrian@chaves.io> +Date: Fri, 12 Apr 2024 13:31:48 +0200 +Subject: [PATCH 2/2] Update extruct/rdfa.py + +Co-authored-by: Andrey Rakhmatullin <wrar@wrar.name> +--- + extruct/rdfa.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extruct/rdfa.py b/extruct/rdfa.py +index 58a0dd9..c313e2b 100644 +--- a/extruct/rdfa.py ++++ b/extruct/rdfa.py +@@ -85,7 +85,7 @@ def _replaceNS(self, prop, html_element, head_element): + + match = None + if head_element.get("prefix"): +- match = re.search(prefix + ": [^\\s]+", head_element.get("prefix")) ++ match = re.search(prefix + r": [^\s]+", head_element.get("prefix")) + + # if namespace taken from prefix attribute in head tag + if match: diff --git a/community/py3-extruct/217_add-support-lxml-5.1.0.patch b/community/py3-extruct/217_add-support-lxml-5.1.0.patch new file mode 100644 index 00000000000..340b9d9f524 --- /dev/null +++ b/community/py3-extruct/217_add-support-lxml-5.1.0.patch @@ -0,0 +1,333 @@ +From 046b85e31b1ff40d6855578500cc1c8e94156adb Mon Sep 17 00:00:00 2001 +From: Michael Genson <71845777+michael-genson@users.noreply.github.com> +Date: Mon, 1 Apr 2024 22:18:32 +0000 +Subject: [PATCH 1/8] add support for lxml >= 5.1 + +--- + extruct/xmldom.py | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +diff --git a/extruct/xmldom.py b/extruct/xmldom.py +index fe0a03b..c4beee0 100644 +--- a/extruct/xmldom.py ++++ b/extruct/xmldom.py +@@ -6,15 +6,22 @@ + from xml.dom import Node + from xml.dom.minidom import Attr, NamedNodeMap + +-from lxml.etree import ( +- ElementBase, +- XPath, +- _ElementStringResult, +- _ElementUnicodeResult, +- tostring, +-) ++from lxml.etree import ElementBase, XPath, _ElementUnicodeResult, tostring + from lxml.html import HtmlElementClassLookup, HTMLParser + ++try: ++ from lxml.etree import _ElementStringResult ++except ImportError: ++ ++ class _ElementStringResult(bytes): ++ """ ++ _ElementStringResult is removed in lxml >= 5.1.0, ++ so we define it here for compatibility. ++ """ ++ ++ def getparent(self): ++ return self._parent ++ + + class DomElementUnicodeResult: + CDATA_SECTION_NODE = Node.CDATA_SECTION_NODE + +From 1a18238c6287b66cb75d64766d018c95b1b60775 Mon Sep 17 00:00:00 2001 +From: Michael Genson <71845777+michael-genson@users.noreply.github.com> +Date: Mon, 1 Apr 2024 22:31:37 +0000 +Subject: [PATCH 2/8] remove _ElementStringResult and break lxml <5.2.0 + compatibility + +--- + extruct/xmldom.py | 19 +++---------------- + 1 file changed, 3 insertions(+), 16 deletions(-) + +diff --git a/extruct/xmldom.py b/extruct/xmldom.py +index c4beee0..93d4e7c 100644 +--- a/extruct/xmldom.py ++++ b/extruct/xmldom.py +@@ -9,19 +9,6 @@ + from lxml.etree import ElementBase, XPath, _ElementUnicodeResult, tostring + from lxml.html import HtmlElementClassLookup, HTMLParser + +-try: +- from lxml.etree import _ElementStringResult +-except ImportError: +- +- class _ElementStringResult(bytes): +- """ +- _ElementStringResult is removed in lxml >= 5.1.0, +- so we define it here for compatibility. +- """ +- +- def getparent(self): +- return self._parent +- + + class DomElementUnicodeResult: + CDATA_SECTION_NODE = Node.CDATA_SECTION_NODE +@@ -54,7 +41,7 @@ def lxmlDomNodeType(node): + if isinstance(node, ElementBase): + return Node.ELEMENT_NODE + +- elif isinstance(node, (_ElementStringResult, _ElementUnicodeResult)): ++ elif isinstance(node, _ElementUnicodeResult): + if node.is_attribute: + return Node.ATTRIBUTE_NODE + else: +@@ -123,7 +110,7 @@ def childNodes_xpath(self): + if isinstance(n, ElementBase): + yield n + +- elif isinstance(n, (_ElementStringResult, _ElementUnicodeResult)): ++ elif isinstance(n, _ElementUnicodeResult): + + if isinstance(n, _ElementUnicodeResult): + n = DomElementUnicodeResult(n) +@@ -149,7 +136,7 @@ def getElementById(self, i): + + @property + def data(self): +- if isinstance(self, (_ElementStringResult, _ElementUnicodeResult)): ++ if isinstance(self, _ElementUnicodeResult): + return self + else: + raise RuntimeError + +From c6f0433b57f387d2a6e6549936c0539a5279f05a Mon Sep 17 00:00:00 2001 +From: Michael Genson <71845777+michael-genson@users.noreply.github.com> +Date: Mon, 1 Apr 2024 22:32:34 +0000 +Subject: [PATCH 3/8] pin lxml>=5.2.0 with html_clean + +--- + requirements.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requirements.txt b/requirements.txt +index aefa8e3..0a042ef 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,6 +1,6 @@ + # project requirements, install them using following command: + # pip install -r requirements.txt +-lxml ++lxml>=5.2.0[html_clean] + requests + rdflib>=6.0.0; python_version>="3.7" + rdflib<6.0.0; python_version<"3.7" + +From 699c8584d0250c7ffd18ba6658624f30226f45dd Mon Sep 17 00:00:00 2001 +From: Michael Genson <71845777+michael-genson@users.noreply.github.com> +Date: Tue, 2 Apr 2024 13:41:32 +0000 +Subject: [PATCH 4/8] fix requirements format + +--- + requirements.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requirements.txt b/requirements.txt +index 0a042ef..0e9eb5e 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,6 +1,6 @@ + # project requirements, install them using following command: + # pip install -r requirements.txt +-lxml>=5.2.0[html_clean] ++lxml[html_clean]>=5.2.0 + requests + rdflib>=6.0.0; python_version>="3.7" + rdflib<6.0.0; python_version<"3.7" + +From 3a00899affe2635438ddc10e7bde3cc51687edbb Mon Sep 17 00:00:00 2001 +From: Michael Genson <71845777+michael-genson@users.noreply.github.com> +Date: Thu, 4 Apr 2024 09:09:12 -0500 +Subject: [PATCH 5/8] re-add support for older lxml versions + +--- + extruct/xmldom.py | 19 ++++++++++++++++--- + requirements.txt | 2 +- + 2 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/extruct/xmldom.py b/extruct/xmldom.py +index 93d4e7c..fe76ce6 100644 +--- a/extruct/xmldom.py ++++ b/extruct/xmldom.py +@@ -9,6 +9,19 @@ + from lxml.etree import ElementBase, XPath, _ElementUnicodeResult, tostring + from lxml.html import HtmlElementClassLookup, HTMLParser + ++try: ++ from lxml.etree import _ElementStringResult ++except ImportError: ++ ++ class _ElementStringResult(bytes): # type: ignore[no-redef] ++ """ ++ _ElementStringResult is removed in lxml >= 5.1.0, ++ so we define it here for compatibility. ++ """ ++ ++ def getparent(self): ++ return self._parent # type: ignore[attr-defined] ++ + + class DomElementUnicodeResult: + CDATA_SECTION_NODE = Node.CDATA_SECTION_NODE +@@ -41,7 +54,7 @@ def lxmlDomNodeType(node): + if isinstance(node, ElementBase): + return Node.ELEMENT_NODE + +- elif isinstance(node, _ElementUnicodeResult): ++ elif isinstance(node, (_ElementStringResult, _ElementUnicodeResult)): + if node.is_attribute: + return Node.ATTRIBUTE_NODE + else: +@@ -110,7 +123,7 @@ def childNodes_xpath(self): + if isinstance(n, ElementBase): + yield n + +- elif isinstance(n, _ElementUnicodeResult): ++ elif isinstance(n, (_ElementStringResult, _ElementUnicodeResult)): + + if isinstance(n, _ElementUnicodeResult): + n = DomElementUnicodeResult(n) +@@ -136,7 +149,7 @@ def getElementById(self, i): + + @property + def data(self): +- if isinstance(self, _ElementUnicodeResult): ++ if isinstance(self, (_ElementStringResult, _ElementUnicodeResult)): + return self + else: + raise RuntimeError +diff --git a/requirements.txt b/requirements.txt +index 0e9eb5e..6665ca9 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,6 +1,6 @@ + # project requirements, install them using following command: + # pip install -r requirements.txt +-lxml[html_clean]>=5.2.0 ++lxml[html_clean] + requests + rdflib>=6.0.0; python_version>="3.7" + rdflib<6.0.0; python_version<"3.7" + +From fd6460575d88395a4011ec76fed1def6c2e8cfd6 Mon Sep 17 00:00:00 2001 +From: Michael Genson <71845777+michael-genson@users.noreply.github.com> +Date: Thu, 4 Apr 2024 15:54:33 -0500 +Subject: [PATCH 6/8] update tests for breaking mf2py changes + +--- + tests/samples/misc/microformat_flat_test.json | 5 ++++- + tests/samples/misc/microformat_test.json | 6 +++++- + tests/test_uniform.py | 5 ++++- + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/tests/samples/misc/microformat_flat_test.json b/tests/samples/misc/microformat_flat_test.json +index 28344b3..60ad482 100644 +--- a/tests/samples/misc/microformat_flat_test.json ++++ b/tests/samples/misc/microformat_flat_test.json +@@ -32,7 +32,10 @@ + "aJ Styles FastLane 2018 15 x 17 Framed Plaque w/ Ring Canvas" + ], + "photo": [ +- "/on/demandware.static/-/Sites-main/default/dwa3227ee6/images/small/CN1148.jpg" ++ { ++ "alt": "aJ Styles FastLane 2018 15 x 17 Framed Plaque w/ Ring Canvas", ++ "value": "/on/demandware.static/-/Sites-main/default/dwa3227ee6/images/small/CN1148.jpg" ++ } + ] + } + ] +diff --git a/tests/samples/misc/microformat_test.json b/tests/samples/misc/microformat_test.json +index a485db0..5eea845 100644 +--- a/tests/samples/misc/microformat_test.json ++++ b/tests/samples/misc/microformat_test.json +@@ -27,7 +27,11 @@ + { + "properties": { + "photo": [ +- "/on/demandware.static/-/Sites-main/default/dwa3227ee6/images/small/CN1148.jpg" ++ { ++ "alt": "aJ Styles FastLane 2018 15 x 17 Framed Plaque w/ Ring Canvas", ++ "value": "/on/demandware.static/-/Sites-main/default/dwa3227ee6/images/small/CN1148.jpg" ++ ++ } + ], + "name": [ + "aJ Styles FastLane 2018 15 x 17 Framed Plaque w/ Ring Canvas" +diff --git a/tests/test_uniform.py b/tests/test_uniform.py +index ca27dd2..fc44227 100644 +--- a/tests/test_uniform.py ++++ b/tests/test_uniform.py +@@ -167,7 +167,10 @@ def test_umicroformat(self): + "Canvas" + ], + "photo": [ +- "/on/demandware.static/-/Sites-main/default/dwa3227ee6/images/small/CN1148.jpg" ++ { ++ "alt": "aJ Styles FastLane 2018 15 x 17 Framed Plaque w/ Ring Canvas", ++ "value": "/on/demandware.static/-/Sites-main/default/dwa3227ee6/images/small/CN1148.jpg" ++ } + ], + }, + ], + +From d7df9160e72ac84636c7536b4d2a726d22ada1f7 Mon Sep 17 00:00:00 2001 +From: Michael Genson <71845777+michael-genson@users.noreply.github.com> +Date: Fri, 5 Apr 2024 08:57:18 -0500 +Subject: [PATCH 7/8] fixed wrong tab size + +--- + tests/test_uniform.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test_uniform.py b/tests/test_uniform.py +index fc44227..81d9284 100644 +--- a/tests/test_uniform.py ++++ b/tests/test_uniform.py +@@ -168,8 +168,8 @@ def test_umicroformat(self): + ], + "photo": [ + { +- "alt": "aJ Styles FastLane 2018 15 x 17 Framed Plaque w/ Ring Canvas", +- "value": "/on/demandware.static/-/Sites-main/default/dwa3227ee6/images/small/CN1148.jpg" ++ "alt": "aJ Styles FastLane 2018 15 x 17 Framed Plaque w/ Ring Canvas", ++ "value": "/on/demandware.static/-/Sites-main/default/dwa3227ee6/images/small/CN1148.jpg", + } + ], + }, + +From 0a320551026bcc966ba2d45858703fa2c46358ce Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= <adrian@chaves.io> +Date: Thu, 11 Apr 2024 18:39:17 +0200 +Subject: [PATCH 8/8] Update extruct/xmldom.py + +Co-authored-by: James Addison <55152140+jayaddison@users.noreply.github.com> +--- + extruct/xmldom.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extruct/xmldom.py b/extruct/xmldom.py +index fe76ce6..018919c 100644 +--- a/extruct/xmldom.py ++++ b/extruct/xmldom.py +@@ -15,7 +15,7 @@ + + class _ElementStringResult(bytes): # type: ignore[no-redef] + """ +- _ElementStringResult is removed in lxml >= 5.1.0, ++ _ElementStringResult is removed in lxml >= 5.1.1, + so we define it here for compatibility. + """ + diff --git a/community/py3-extruct/APKBUILD b/community/py3-extruct/APKBUILD index 83e30be6271..8e7b9996dfd 100644 --- a/community/py3-extruct/APKBUILD +++ b/community/py3-extruct/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-extruct #_pkgreal is used by apkbuild-pypi to find modules at PyPI _pkgreal=extruct pkgver=0.16.0 -pkgrel=1 +pkgrel=3 pkgdesc="Extract embedded metadata from HTML markup" url="https://pypi.python.org/project/extruct" license="BSD-3-Clause" @@ -21,9 +21,12 @@ depends=" " checkdepends="py3-pytest" makedepends="py3-setuptools py3-gpep517 py3-wheel" -source="$pkgname-$pkgver.tar.gz::https://github.com/scrapinghub/extruct/archive/refs/tags/v$pkgver.tar.gz" +source=" + $pkgname-$pkgver.tar.gz::https://github.com/scrapinghub/extruct/archive/refs/tags/v$pkgver.tar.gz + 217_add-support-lxml-5.1.0.patch + 214_fix-syntaxwarning.patch +" builddir="$srcdir/$_pkgreal-$pkgver" -options="!check" # test_microformat fails due to AssertionError subpackages="$pkgname-pyc" build() { @@ -45,4 +48,6 @@ package() { sha512sums=" bb9f831a84e28f7bb6b9a1464fdc76801d72a57014ce83b2459e1acf9cf5f28e45ae94b5a89e5c239e9fd57d0585baa02e7f9c3650bb46cc5861df4362eda724 py3-extruct-0.16.0.tar.gz +8d317c0f18b7acc895f9fd18171389303eb82c592c08b7d77e605f950a329938da33892e4d5241bda623e6dd55e8d302a5cf7c9eef583c0b228e3ee3a203ef15 217_add-support-lxml-5.1.0.patch +cd923aaecdfe7c49c94b947b285e799474810a379fb62cc82b2388a88feadd6d9b27161a38b786ffec18511b86ece72443d68d2adcf0065cc2793e747449ae3d 214_fix-syntaxwarning.patch " diff --git a/community/py3-factory-boy/APKBUILD b/community/py3-factory-boy/APKBUILD index a0291cce0e1..6658218411a 100644 --- a/community/py3-factory-boy/APKBUILD +++ b/community/py3-factory-boy/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-factory-boy _pkgname=factory_boy pkgver=3.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="A versatile test fixtures replacement based on thoughtbot's factory_girl for Ruby" url="https://github.com/FactoryBoy/factory_boy" arch="noarch" diff --git a/community/py3-faker/APKBUILD b/community/py3-faker/APKBUILD index f166638419d..0c88941f530 100644 --- a/community/py3-faker/APKBUILD +++ b/community/py3-faker/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=py3-faker _pyname=Faker -pkgver=24.1.0 -pkgrel=1 +pkgver=25.0.1 +pkgrel=0 pkgdesc="Python package that generates fake data for you" url="https://faker.readthedocs.io/en/master" license="MIT" @@ -49,5 +49,5 @@ package() { } sha512sums=" -a467cfab41a074ac88c398640b02898f96ced7150d5989270573fd5765e880e539932046b5829b3428d087b5f6f97c9c5ea51725003abbf2ae06e8862fd86fef Faker-24.1.0.tar.gz +0f0cfc86f76584320fc6ab0afae40da8c022b65fca07eff639ba9a89744814afc7f9e37c987a73d0ec025fa971c0468f3b8b026b16dc4a5813bacb9562a33384 Faker-25.0.1.tar.gz " diff --git a/community/py3-fakeredis/APKBUILD b/community/py3-fakeredis/APKBUILD index d0dbd21ba74..8c945f86dd9 100644 --- a/community/py3-fakeredis/APKBUILD +++ b/community/py3-fakeredis/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=py3-fakeredis _pkgname=${pkgname#py3-} -pkgver=2.21.2 -pkgrel=1 +pkgver=2.22.0 +pkgrel=0 pkgdesc="Fake implementation of redis API for testing purposes" url="https://pypi.org/project/fakeredis/" arch="noarch" @@ -41,6 +41,6 @@ package() { } sha512sums=" -0ba5e31e403670e864a5364498e26e818641d0fbba59554b78bd0d82a2d944a730d519184c132bdb367761b830bb3a55b43a957770f833891cccd11d528ff540 py3-fakeredis-2.21.2.tar.gz +a533f26c2a4289b1b4d398ee426f44c93f01a4aac0dc841854bf94674d7e0738fde38ea896280d4e83bf16041dba505db13e3fa3837a912dc872b1d36c05cc6e py3-fakeredis-2.22.0.tar.gz 69ffb5c3eb8e991cdfe8900c72df3de421b696ecab55fadd51ba30d3283cf71e64ad80ceef298e0aa93ea1504a4f98ef2df37488d9498050aef01975e67e019c fix-test-exception-msg.patch " diff --git a/community/py3-flask-caching/APKBUILD b/community/py3-flask-caching/APKBUILD index 387865e85ca..5b435055a71 100644 --- a/community/py3-flask-caching/APKBUILD +++ b/community/py3-flask-caching/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Simon Rupf <simon@rupf.net> pkgname=py3-flask-caching -_pkgname=Flask-Caching -pkgver=2.1.0 -pkgrel=1 +_pkgname=flask_caching +pkgver=2.3.0 +pkgrel=0 pkgdesc="Flask caching support" url="https://flask-caching.readthedocs.io/" arch="noarch" @@ -33,5 +33,5 @@ package() { } sha512sums=" -72a070d804377c950c790b543766ed9f33be997e96ed857432473e4355f6cd4552ad6b0816dfc810089d8a0e89460d24f211cc29a563829b68433c69d402d794 Flask-Caching-2.1.0.tar.gz +40ed857cf0822267af7e2c138b3136ff6312b3b2ea627a97738792ea4f7649db20f2df31a7414c42cc245a66d34248b3a54681824cf23d800bdb0d453c02df49 flask_caching-2.3.0.tar.gz " diff --git a/testing/py3-flask-principal/APKBUILD b/community/py3-flask-principal/APKBUILD index bd64616063d..27d86069b9e 100644 --- a/testing/py3-flask-principal/APKBUILD +++ b/community/py3-flask-principal/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> -# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-flask-principal _pkgname=flask-principal pkgver=0.4.0 diff --git a/community/py3-flask/APKBUILD b/community/py3-flask/APKBUILD index d7ac6635beb..cc0458ff9f5 100644 --- a/community/py3-flask/APKBUILD +++ b/community/py3-flask/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Steven Guikal <void@fluix.one> pkgname=py3-flask _pkgname=flask -pkgver=3.0.2 -pkgrel=1 +pkgver=3.0.3 +pkgrel=0 pkgdesc="web development microframework" url="https://flask.palletsprojects.com/" arch="noarch" @@ -48,5 +48,5 @@ package() { } sha512sums=" -02f937dae7d654f6286eb9fcf2d68d83f3ef56dbc4d59a961ea1bd95d17fac7a5ace3f27ebb03ff0592f6a87361e59934ffda098714fc8a049a487d4c0bbc0ef flask-3.0.2.tar.gz +977c0e5fd2d496fae8e34a035f211118642dc6518a14dc5f6c175b72c6a76407aeb9ff0ed1f5db636370a9aa7e0d36baa783713ea7bdabd7f28c8c2b94643cd1 flask-3.0.3.tar.gz " diff --git a/testing/py3-gitlab/APKBUILD b/community/py3-gitlab/APKBUILD index 28fac140ffc..28fac140ffc 100644 --- a/testing/py3-gitlab/APKBUILD +++ b/community/py3-gitlab/APKBUILD diff --git a/community/py3-gst/APKBUILD b/community/py3-gst/APKBUILD index 263ff899a62..9ac29c2a3ea 100644 --- a/community/py3-gst/APKBUILD +++ b/community/py3-gst/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Krassy Boykinov <kboykinov@teamcentrixx.com> pkgname=py3-gst -pkgver=1.22.11 -pkgrel=1 +pkgver=1.24.3 +pkgrel=0 pkgdesc="GStreamer Python3 bindings" url="https://gitlab.freedesktop.org/gstreamer/gstreamer" arch="all" @@ -50,6 +50,6 @@ package() { } sha512sums=" -749a3080ad56edfee66c6f24ab106b07cd2a7d6e5f704147a69e12fc0a1da9d9b8d8337c36ce62af459577df3f0804c60cbeb4a211454277ad0a46fd89edcfa5 gst-python-1.22.11.tar.xz -62e54d028898ff15d51d3fa863f419a533a05bb510b6c391778d2fff5e245143771b38902deb512ac5a7a7d704d7fc9f4e84d22a4761eb85e535b67d0ab640f4 suffix.patch +5a4bbd530364e33580b223f9c22145c21abeb0babb68efcc518cbab6068d53d31f25411e096d9a45c0de2190514e8e17421498a5195136c0aaabe3a9792778ed gst-python-1.24.3.tar.xz +5ec14d7fa8bb39e5a07ca7c34ee9e383ba1677e0f3a8d84987eb8e1d062fd46b3cc4663fa99f2291684a169eda8681ab47b1361cd4f3e8128a5cd5aa4ef0c3ab suffix.patch " diff --git a/community/py3-gst/suffix.patch b/community/py3-gst/suffix.patch index e4dd6058aff..ad85c134316 100644 --- a/community/py3-gst/suffix.patch +++ b/community/py3-gst/suffix.patch @@ -5,12 +5,12 @@ diff --git a/meson.build b/meson.build index b0bc448..349cb93 100644 --- a/meson.build +++ b/meson.build -@@ -68,7 +68,7 @@ message('pygobject overrides directory = @0@'.format(pygi_override_dir)) - libdir = get_option('prefix')+'/'+get_option('libdir') - - +@@ -43,7 +43,7 @@ message(f'python_abi_flags = @python_abi_flags@') + pylib_loc = get_option('libpython-dir') + fsmod = import('fs') + pylib_prefix = 'lib' -pylib_suffix = 'so' +pylib_suffix = 'so.@SUFF@' - if host_machine.system() == 'windows' - pylib_suffix = 'dll' - elif host_machine.system() == 'darwin' + pylib_ver = python_dep.version() + pylib_locs = [] + if host_system == 'windows' diff --git a/community/py3-h5py/APKBUILD b/community/py3-h5py/APKBUILD index c867231c8d0..f3c785aaaa0 100644 --- a/community/py3-h5py/APKBUILD +++ b/community/py3-h5py/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: James White <stegoxorus@gmail.com> pkgname=py3-h5py pkgver=3.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Read and write HDF5 files from Python" url="https://www.h5py.org" # 32-bit: tests fail due to size mismatch between python and cython, broken @@ -56,7 +56,7 @@ check() { python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl cd .testenv - bin/python3 -m pytest -n ${JOBS:-2} --pyargs h5py + bin/python3 -m pytest -n ${JOBS:-2} --pyargs h5py -k "not test_too_small_pbs and not test_reopen and not test_multiprocess" } package() { diff --git a/community/py3-hatch-jupyter-builder/APKBUILD b/community/py3-hatch-jupyter-builder/APKBUILD index ee510b7f41a..fa6a06561d7 100644 --- a/community/py3-hatch-jupyter-builder/APKBUILD +++ b/community/py3-hatch-jupyter-builder/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=py3-hatch-jupyter-builder -pkgver=0.8.3 -pkgrel=2 +pkgver=0.9.1 +pkgrel=0 pkgdesc="A hatch plugin to help build Jupyter packages" url="https://github.com/jupyterlab/hatch-jupyter-builder" arch="noarch" @@ -29,5 +29,5 @@ package() { } sha512sums=" -047d292ad1985ee9b7908de46b40a5b340575f5f43dbe5b2eebe9d5b0b82c37181d5f2e7ece3d06abf685a45c1a007f004080cd1527922c0bf38d99ca02c587e py3-hatch-jupyter-builder-0.8.3.tar.gz +6f1c3fcc10862086885f74bcbec4de2bcdf04e7cef3d7ad19eb323fe5b5fefc068a9eb0cfadaaa438784cf8de2153a23a30f43432b5498075570ee10cbd6ca0d py3-hatch-jupyter-builder-0.9.1.tar.gz " diff --git a/community/py3-html-text/APKBUILD b/community/py3-html-text/APKBUILD index e144c749e55..d8d93e0bc7b 100644 --- a/community/py3-html-text/APKBUILD +++ b/community/py3-html-text/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-html-text +pkgver=0.6.2 +pkgrel=0 #_pkgreal is used by apkbuild-pypi to find modules at PyPI _pkgreal=html_text -pkgver=0.6.0 -pkgrel=1 pkgdesc="Extract text from HTML" url="https://pypi.python.org/project/html-rext" arch="noarch" @@ -33,5 +33,5 @@ package() { .dist/*.whl } sha512sums=" -2d9d3002d3dabcc47eedef5502e418aac59cdf1cc187dbaa3b07b3830a78fb8e0573f6d8422acd0834b8083c3d3ed3973fd53011ea41082d5ba6ac53b822d01c py3-html-text-0.6.0.tar.gz +bf3d43aeb3c20136ac4c20c142ce2bef5467745a94f8bf7a10947cc2c82fc399dc615967622293ae1d81692a9742956c1cb82d645e9488c3a213565676ddbb4c py3-html-text-0.6.2.tar.gz " diff --git a/community/py3-httpretty/APKBUILD b/community/py3-httpretty/APKBUILD index 5881ce9c5b9..70a15a8e5af 100644 --- a/community/py3-httpretty/APKBUILD +++ b/community/py3-httpretty/APKBUILD @@ -2,13 +2,15 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> pkgname=py3-httpretty pkgver=1.1.4 -pkgrel=3 +pkgrel=4 pkgdesc="HTTP client mocking tool for Python" url="https://github.com/gabrielfalcao/HTTPretty" arch="noarch" license="MIT" depends="python3" -makedepends="python3-dev py3-setuptools" +makedepends="py3-gpep517 py3-setuptools py3-wheel python3-dev" +checkdepends="py3-boto3 py3-httpx py3-pytest py3-requests py3-tornado" +options="!check" # missing module https://github.com/gabrielfalcao/sure subpackages="$pkgname-pyc" source="https://files.pythonhosted.org/packages/source/h/httpretty/httpretty-$pkgver.tar.gz" replaces="py-httpretty" @@ -16,17 +18,17 @@ provides="py-httpretty=$pkgver-r$pkgrel" builddir="$srcdir"/httpretty-$pkgver build() { - python3 setup.py build + gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2 } check() { - python3 setup.py build + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest } package() { - python3 setup.py install --skip-build --root="$pkgdir" - # Fix permissions on .EGG-INFO - chmod 644 "$pkgdir"/usr/lib/python3*/site-packages/*.egg-info/* + python3 -m installer -d "$pkgdir" .dist/*.whl } sha512sums=" diff --git a/community/py3-hypothesis/APKBUILD b/community/py3-hypothesis/APKBUILD index 124a782bcff..06767ebdeb2 100644 --- a/community/py3-hypothesis/APKBUILD +++ b/community/py3-hypothesis/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Michał Polański <michal@polanski.me> pkgname=py3-hypothesis -pkgver=6.99.4 -pkgrel=1 +pkgver=6.100.1 +pkgrel=0 pkgdesc="Advanced property-based (QuickCheck-like) testing for Python" options="!check" url="https://hypothesis.works/" @@ -13,7 +13,7 @@ depends="py3-attrs py3-sortedcontainers" makedepends="py3-gpep517 py3-setuptools py3-wheel" checkdepends="py3-pytest py3-coverage py3-tz py3-numpy py3-dateutil py3-pexpect" subpackages="$pkgname-pyc" -source="py-hypothesis-$pkgver.tar.gz::https://github.com/HypothesisWorks/hypothesis-python/archive/hypothesis-python-$pkgver.tar.gz +source="$pkgname-$pkgver.tar.gz::https://github.com/HypothesisWorks/hypothesis-python/archive/hypothesis-python-$pkgver.tar.gz " builddir="$srcdir/hypothesis-hypothesis-python-$pkgver/hypothesis-python" @@ -40,5 +40,5 @@ package() { } sha512sums=" -bb1ac9d2881a3577a07cd396c01be5e96bfe45e2a0254a8dc2c51a86718fd225e04943a6e451a015378fe2f813621b2a7e9fd4b757d180bdae5cb3a6d7b7133b py-hypothesis-6.99.4.tar.gz +4b46c5dfb330c65c8fc4afce90ed28309fc377e39d65b1ba0bf086efb5fe53b2be021bcb5e6a90fa6bdad463de6254761faab14fe2ad7814e84dfff08ff1a9d9 py3-hypothesis-6.100.1.tar.gz " diff --git a/community/py3-identify/APKBUILD b/community/py3-identify/APKBUILD index 341dd1b2fd6..77399450575 100644 --- a/community/py3-identify/APKBUILD +++ b/community/py3-identify/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Galen Abell <galen@galenabell.com> pkgname=py3-identify _pyname=identify -pkgver=2.5.35 -pkgrel=1 +pkgver=2.5.36 +pkgrel=0 pkgdesc="File identification library for Python" url="https://github.com/pre-commit/identify" arch="noarch" @@ -33,5 +33,5 @@ package() { } sha512sums=" -1d01535f95818533220c06988eb2d9f495c004b41fd197482ab0e3520f81ab2aebce0344dffeb0449423abd6574c21043fa0ad20472b3aaff6cb97986f31fd88 identify-2.5.35.tar.gz +713ce08bafc076d2724f847c0b051036072d6b8d53c77a0ca011b7ec3af4ec27381de3ef4622235db0791ef4fc449514f78c2ad250d77c055e9fec9dc6f14a57 identify-2.5.36.tar.gz " diff --git a/community/py3-inflect/APKBUILD b/community/py3-inflect/APKBUILD index 5e691170c4d..df6e0f75d62 100644 --- a/community/py3-inflect/APKBUILD +++ b/community/py3-inflect/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-inflect -pkgver=7.2.0 +pkgver=7.2.1 pkgrel=0 pkgdesc="Correctly generate plurals, singular nouns, ordinals, indefinite articles; convert numbers to words" url="https://github.com/jaraco/inflect" @@ -37,5 +37,5 @@ package() { } sha512sums=" -13b698637a8049987675dd419359907baba6d8a9805c3602bbc414ed8fb422bfaa32ec26bcc309508ead5cb72bed632d9142f7796c981269551f1238b88c9019 inflect-7.2.0.tar.gz +b994b1cb486f318f54fe73e159ffb41c637298c651e3b2ed0899659add450cd47f168e7ba242fc70dd1c177e622850409485c1671e5b89eb1f2b554d315bdf00 inflect-7.2.1.tar.gz " diff --git a/community/py3-influxdb/APKBUILD b/community/py3-influxdb/APKBUILD index c518c6aa109..5ff54ab8c9e 100644 --- a/community/py3-influxdb/APKBUILD +++ b/community/py3-influxdb/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py3-influxdb _pkgname=influxdb-python -pkgver=5.3.1 -pkgrel=3 +pkgver=5.3.2 +pkgrel=0 pkgdesc="Python bindings for InfluxDB" options="!check" # Requires unpackaged nose-cov url="https://github.com/influxdata/influxdb-python" @@ -32,5 +32,5 @@ package() { } sha512sums=" -fa8a3427a725058ca64d73a27b91c4f13eb7cf491affb905725b1efce5ff80e0bbc1e0b2fa3e8e31f06a716705563d2b96f0f75f2c9d52ec1e15f1f380e93b11 py3-influxdb-5.3.1.tar.gz +2cca3b67cb53e154f1415314499e635585556e50240fcd4522b225d0a3ddd9ed3139adc085087fdbaf80d132c570ac2aa3901f178524ec2796ec973be525f8e4 py3-influxdb-5.3.2.tar.gz " diff --git a/community/py3-inform/APKBUILD b/community/py3-inform/APKBUILD index 98e6b5fcc14..c2b9d3532b6 100644 --- a/community/py3-inform/APKBUILD +++ b/community/py3-inform/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Andy Hawkins <andy@gently.org.uk> # Maintainer: Andy Hawkins <andy@gently.org.uk> pkgname=py3-inform -pkgver=1.28 -pkgrel=2 +pkgver=1.29 +pkgrel=0 pkgdesc="Print & Logging Utilities" url="https://inform.readthedocs.io/" arch="noarch" @@ -41,5 +41,5 @@ package() { } sha512sums=" -68840f92e0efa7d5604f4c23623cb7829519962301e659bf18aff22070335e54b699f6eb3ce1f3321dfd9cb15b8941d3ec3901f7069ae862f3c0deeed6372803 inform-v1.28.tar.gz +57c4dee4ffff96dbd41bbe551d46c69565fabce9c89db8b0fb8710eaa0a42848a28e3eeac5ddfc142359d2911533dd3a0e92c01c4447fec9323a2eb138bb0cf5 inform-v1.29.tar.gz " diff --git a/community/py3-jaraco.functools/APKBUILD b/community/py3-jaraco.functools/APKBUILD index 646fa505b8a..0ac203342df 100644 --- a/community/py3-jaraco.functools/APKBUILD +++ b/community/py3-jaraco.functools/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=py3-jaraco.functools -pkgver=4.0.0 -pkgrel=1 +pkgver=4.0.1 +pkgrel=0 pkgdesc="Functools like those found in stdlib" url="https://github.com/jaraco/jaraco.functools" arch="noarch" @@ -21,8 +21,8 @@ makedepends=" " checkdepends="py3-pytest" subpackages="$pkgname-pyc" -source="https://pypi.python.org/packages/source/j/jaraco.functools/jaraco.functools-$pkgver.tar.gz" -builddir="$srcdir/jaraco.functools-$pkgver" +source="https://pypi.python.org/packages/source/j/jaraco_functools/jaraco_functools-$pkgver.tar.gz" +builddir="$srcdir/jaraco_functools-$pkgver" # backwards compatibility for old name replaces="py3-jaraco-functools" @@ -46,5 +46,5 @@ package() { } sha512sums=" -2545bf3b9c9357ae867e7a5627582e14d0bdf25bac6acc5fbbb7e86f7aa24bc33b5bca584543b4180abdde203610b9716950110253045c1fe11f8bd045283c78 jaraco.functools-4.0.0.tar.gz +04e0ea4719ec8c4439e5a1dd3c3ba0241b21b54b06d53ecc44263046e994aa736b9d196490edd3fd9d7ea997c23c177b30db506b2088bd9de62c637856101982 jaraco_functools-4.0.1.tar.gz " diff --git a/community/py3-jaraco.packaging/APKBUILD b/community/py3-jaraco.packaging/APKBUILD index 0397c92912d..833b48ccdf2 100644 --- a/community/py3-jaraco.packaging/APKBUILD +++ b/community/py3-jaraco.packaging/APKBUILD @@ -1,22 +1,22 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-jaraco.packaging -_pkgreal=${pkgname#"py3-"} -pkgver=9.5.0 -pkgrel=1 +pkgver=10.1.0 +pkgrel=0 pkgdesc="tools to supplement packaging Python releases" url="https://github.com/jaraco/jaraco.packaging" arch="noarch" license="MIT" -# archive has no tests +# missing test deps options="!check" -depends="py3-setuptools" +depends="py3-build py3-jaraco.context" makedepends="py3-gpep517 py3-installer py3-setuptools_scm py3-wheel" subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/j/jaraco.packaging/jaraco.packaging-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/jaraco/jaraco.packaging/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir/jaraco.packaging-$pkgver" build() { + export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver gpep517 build-wheel \ --wheel-dir .dist \ --output-fd 3 3>&1 >&2 @@ -28,5 +28,5 @@ package() { } sha512sums=" -ea7520c6bc8aed85ff55b36ac24198b915a933533589100026b18bd2bd66242d5fac72d4b406b6b7b4a1f3dddcc3f340d929e929044ad4e7ebc2c8dd00b3a77f jaraco.packaging-9.5.0.tar.gz +5e237ad9d40b0188c5d6c921f159b630c4cf95874583e07a6bda69237bd07e0d329090434526e627dbb701068dfc06f764c93c49ecc3cd2e2602ee7b4b6e02ee py3-jaraco.packaging-10.1.0.tar.gz " diff --git a/community/py3-jmespath/APKBUILD b/community/py3-jmespath/APKBUILD index 22316e6842d..8a0fe000822 100644 --- a/community/py3-jmespath/APKBUILD +++ b/community/py3-jmespath/APKBUILD @@ -2,13 +2,13 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> pkgname=py3-jmespath pkgver=1.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="JMESPath is a query language for JSON" url="https://jmespath.org" arch="noarch" license="MIT" depends="python3" -makedepends="py3-setuptools" +makedepends="py3-gpep517 py3-setuptools py3-wheel" checkdepends="py3-pytest" subpackages="$pkgname-pyc" source="https://files.pythonhosted.org/packages/source/j/jmespath/jmespath-$pkgver.tar.gz" @@ -18,15 +18,18 @@ replaces=py-jmespath # Backwards compatibility provides=py-jmespath=$pkgver-r$pkgrel # Backwards compatibility build() { - python3 setup.py build + gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2 + } check() { - pytest + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest } package() { - python3 setup.py install --skip-build --root="$pkgdir" + python3 -m installer -d "$pkgdir" .dist/*.whl } sha512sums=" diff --git a/community/py3-joblib/APKBUILD b/community/py3-joblib/APKBUILD index 71695097d9a..a013dc46b3b 100644 --- a/community/py3-joblib/APKBUILD +++ b/community/py3-joblib/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=py3-joblib -pkgver=1.4.0 -pkgrel=2 +pkgver=1.4.2 +pkgrel=0 pkgdesc="Computing with Python functions" url="https://joblib.readthedocs.org/en/latest/" arch="noarch" @@ -68,6 +68,6 @@ package() { } sha512sums=" -5c7e5475347906cdc8575eac8d2052470408c4ed5267d59a88a9d3126fb72b977d20b24fb0983b070e2f3c101e7da000fc03231733fef62531f9aeffacc47baf joblib-1.4.0.tar.gz +d4c84803207ace0025701261f9e7976329e2ff9fa18a3155be1afe1f03ebfd470772e39e94b3ed01f9d1409589991c9592dc4188bca86dba158c44c70355441b joblib-1.4.2.tar.gz b75f438c04e30f7d2cd34cac80f02f84d29f174b8dd2b1a1a546bbdd81f2b94d21e04a456bcb9f0435b4f0d081a876119693ea047615569ee6fd2cf17efa9d05 de-vendor.patch " diff --git a/community/py3-jsonpickle/APKBUILD b/community/py3-jsonpickle/APKBUILD index 3dff829ddd7..5800cf61cc2 100644 --- a/community/py3-jsonpickle/APKBUILD +++ b/community/py3-jsonpickle/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-jsonpickle -pkgver=3.0.3 -pkgrel=1 +pkgver=3.0.4 +pkgrel=0 pkgdesc="Serializing any arbitrary object graph into JSON" url="https://pypi.org/project/jsonpickle/" arch="noarch" @@ -38,6 +38,6 @@ package() { } sha512sums=" -dc7f5a822c99e707251a6d8463e0bab3463b615101726c42a1379ae56983a8203bf85e281603e88460add10cc76d1d6969a34a9bdc27f42ef1a0409e3b993eaa jsonpickle-3.0.3.tar.gz +d4696faa12e6653a9d6dd4447f6c3d0a0f9d1fde05824f52589ce6fb8a0cdfeecfbb748f69d56f84105e56f912cc8d5e4e432f33c1a0ad6681b11e0f0df1bf63 jsonpickle-3.0.4.tar.gz f9bfea88de20248b7f3f72633c5e189966313de858956a832c2eb9f8afb4917cb26cfbf949b6ac77f25a7e6f1683f5b8b146f6c1021cb2a63e9605ae00fe2884 pandas2.patch " diff --git a/community/py3-jsonschema-path/APKBUILD b/community/py3-jsonschema-path/APKBUILD new file mode 100644 index 00000000000..246533ae97f --- /dev/null +++ b/community/py3-jsonschema-path/APKBUILD @@ -0,0 +1,53 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-jsonschema-path +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=jsonschema-path +pkgver=0.3.2 +pkgrel=0 +pkgdesc="Object-oriented JSONSchema" +url="https://github.com/p1c2u/jsonschema-path" +arch="noarch" +license="Apache-2.0" +depends=" + py3-jsonschema + py3-pathable + py3-yaml + py3-requests + py3-referencing +" +checkdepends=" + py3-pytest + py3-pytest-cov + py3-responses +" +makedepends=" + poetry + py3-setuptools + py3-gpep517 + py3-wheel +" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/p1c2u/jsonschema-path/archive/refs/tags/$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +e49b32c4609238d2808938976bd0022f86837e9d7d296a137d42f8e8c80d20d20fdd23a07b898063536290b36bd72df0abef64b65997a66cb3fb9c403cc275d3 py3-jsonschema-path-0.3.2.tar.gz +" diff --git a/community/py3-jsonschema/APKBUILD b/community/py3-jsonschema/APKBUILD index 0aa99c2a3e0..c40c5ab8693 100644 --- a/community/py3-jsonschema/APKBUILD +++ b/community/py3-jsonschema/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=py3-jsonschema -pkgver=4.21.1 -pkgrel=1 +pkgver=4.22.0 +pkgrel=0 pkgdesc="JSON Schema validation for Python" url="https://github.com/python-jsonschema/jsonschema" arch="noarch" @@ -54,6 +54,6 @@ package() { } sha512sums=" -b0744a80d64572307860c9238ff5048e062b7665d9ed97dd390bae0b168ab96497f359ddc4e95f052d8b177161e5b808ee432bd9fe182c1ea39cbad417db9278 jsonschema-4.21.1.tar.gz +72c9ffd1edf8820696d831062cfae2d38729935b32d12b7fa5171fefa3d38d495b588152c07224a5c9d1f4b9f97bd9b2aa7919d3d4ecdae0ba396e60e954b1c5 jsonschema-4.22.0.tar.gz 4e74925bfa689bb53840f31faed361463e82bb2fd16c86a90de7cbcd0d1d6949c81944bc60e8d2068a6043e1da64b62fd48a062d683e9b96d6bc9b6603b2ccd6 skip-license-test.patch " diff --git a/community/py3-jupyter-events/APKBUILD b/community/py3-jupyter-events/APKBUILD index 61ec246daff..4694c03d649 100644 --- a/community/py3-jupyter-events/APKBUILD +++ b/community/py3-jupyter-events/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=py3-jupyter-events -pkgver=0.7.0 -pkgrel=1 +pkgver=0.10.0 +pkgrel=0 pkgdesc="Configurable event system for Jupyter applications and extensions." url="https://github.com/jupyter/jupyter_events" arch="noarch" @@ -25,5 +25,5 @@ package() { } sha512sums=" -5931963bfc12f27be5315437c07d13fbfbd1e4e34ef5955cd561fa6cb02e27783d575d22cb26073249d5ffd7863db8d6b1f202204ada49541bd4865a48649151 py3-jupyter-events-0.7.0.tar.gz +2bf4098746fd70ae2715916917261beb2ff499d60f7124aa72f92a3f09deb58b1583398507717aa382909c354051cbe06b790a13e8ce15b171d6ce66f6368bbd py3-jupyter-events-0.10.0.tar.gz " diff --git a/community/py3-jupyter_client/APKBUILD b/community/py3-jupyter_client/APKBUILD index ae0f86aff71..39dd69f3150 100644 --- a/community/py3-jupyter_client/APKBUILD +++ b/community/py3-jupyter_client/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=py3-jupyter_client -pkgver=8.3.0 -pkgrel=2 +pkgver=8.6.1 +pkgrel=0 pkgdesc="Jupyter protocol client APIs" url="https://github.com/jupyter/jupyter_client" arch="noarch" @@ -55,5 +55,5 @@ package() { } sha512sums=" -aa0c7d8a7511c5a99116c343a60e6c30a178ea52145a6f3dd854a400a1cddd0bedf4c6fef79021dc2d0ce85a43765285e7c9542af45f965031a0235f0c76d7ba py3-jupyter_client-8.3.0.tar.gz +441ecaa3e2d8a44361458c2bfcde328db631890b424dd98391c329477077739985ac948892539a1491c00fe76021e576978b373f1d56adc2a45ae91aff76acb3 py3-jupyter_client-8.6.1.tar.gz " diff --git a/community/py3-jupyter_core/APKBUILD b/community/py3-jupyter_core/APKBUILD index 4e3dcf35a60..2c34dbe38ad 100644 --- a/community/py3-jupyter_core/APKBUILD +++ b/community/py3-jupyter_core/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=py3-jupyter_core -pkgver=5.3.1 -pkgrel=1 +pkgver=5.7.2 +pkgrel=0 pkgdesc="Core Jupyter functionality" url="https://github.com/jupyter/jupyter_core" arch="noarch" license="BSD-3-Clause" depends="py3-traitlets py3-platformdirs" makedepends="py3-hatchling py3-gpep517" -checkdepends="py3-pytest" +checkdepends="py3-pytest7" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/jupyter/jupyter_core/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir/jupyter_core-$pkgver" @@ -22,12 +22,13 @@ build() { check() { pytest \ - --deselect jupyter_core/tests/test_command.py::test_not_on_path \ - --deselect jupyter_core/tests/test_command.py::test_path_priority \ - --deselect jupyter_core/tests/test_paths.py::test_jupyter_path_prefer_env \ - --deselect jupyter_core/tests/test_paths.py::test_jupyter_path_user_site \ - --deselect jupyter_core/tests/test_paths.py::test_jupyter_path_no_user_site \ - --deselect jupyter_core/tests/test_command.py::test_argv0 + --deselect tests/test_command.py::test_not_on_path \ + --deselect tests/test_command.py::test_path_priority \ + --deselect tests/test_paths.py::test_jupyter_path_prefer_env \ + --deselect tests/test_paths.py::test_jupyter_path_user_site \ + --deselect tests/test_paths.py::test_jupyter_path_no_user_site \ + --deselect tests/test_command.py::test_argv0 \ + --deselect tests/test_troubleshoot.py::test_troubleshoot } package() { @@ -36,5 +37,5 @@ package() { } sha512sums=" -6125eb65f28e29797a026fb5fead72b5c33e11c74e15b07d39484658583f2bf69484d610de130b5ce4d3f0987c73300794fe6d67f5f2b0da044c88010a13646c py3-jupyter_core-5.3.1.tar.gz +488bb54c633a6a025a4b5046d9f529e868f69f3823fdbaf3c0d711f1f41441956d023bb6e1657f01a61dd43aca513a3d5987add753c84b64a14bfaf3fb73441d py3-jupyter_core-5.7.2.tar.gz " diff --git a/community/py3-k5test/APKBUILD b/community/py3-k5test/APKBUILD index 2fd44825671..96f7bc2b262 100644 --- a/community/py3-k5test/APKBUILD +++ b/community/py3-k5test/APKBUILD @@ -2,31 +2,33 @@ # Maintainer: Dmitry Romanenko <dmitry@romanenko.in> pkgname=py3-k5test _pkgname=k5test -pkgver=0.10.3 -pkgrel=2 +pkgver=0.10.4 +pkgrel=0 pkgdesc="A library for testing Python applications in self-contained Kerberos 5 environments" url="https://github.com/pythongssapi/k5test" arch="noarch" license="MIT" depends="python3 krb5-dev krb5 krb5-server" -makedepends="py3-setuptools" +makedepends="py3-gpep517 py3-setuptools py3-wheel" subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/k/$_pkgname/$_pkgname-$pkgver.tar.gz" -builddir="$srcdir"/$_pkgname-$pkgver +source="https://files.pythonhosted.org/packages/source/k/k5test/k5test-$pkgver.tar.gz" +builddir="$srcdir"/k5test-$pkgver build() { - python3 setup.py build + gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2 } check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl # no upstream tests - PYTHONPATH=build/lib python3 -c "import k5test" + PYTHONPATH=build/lib .testenv/bin/python3 -c "import k5test" } package() { - python3 setup.py install --skip-build --root="$pkgdir" + python3 -m installer -d "$pkgdir" .dist/*.whl } sha512sums=" -8c07677fbed5189d4ef905d6b201470871eab96700318194527514e7d841a8ec2c28c4f5139dbb2d7fe9be0db4046656d0b3f69ace86c1bbbd3886096adb5792 k5test-0.10.3.tar.gz +98d76e9df0a4afc0e6eada4909f9eb01b6fd96d53003bb0e8dcda01cd25ab3e338f917a00e985ec23b9fc8756ced6927f0578864c1c06a365e23268dd16d8401 k5test-0.10.4.tar.gz " diff --git a/community/py3-kombu/APKBUILD b/community/py3-kombu/APKBUILD index 85a8de53b23..bc09e47db96 100644 --- a/community/py3-kombu/APKBUILD +++ b/community/py3-kombu/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="a message queue abstraction layer" options="!check" # 3 Redis tests fail url="https://pypi.org/project/kombu/" -arch="noarch !s390x" # Limited by py3-dill +arch="noarch" license="BSD-3-Clause" depends="py3-amqp py3-vine" makedepends="py3-setuptools py3-gpep517 py3-wheel" diff --git a/community/py3-lsp-server/APKBUILD b/community/py3-lsp-server/APKBUILD index 0bd214db38e..ffd5d1e4578 100644 --- a/community/py3-lsp-server/APKBUILD +++ b/community/py3-lsp-server/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=py3-lsp-server -pkgver=1.10.1 -pkgrel=1 +pkgver=1.11.0 +pkgrel=0 pkgdesc="python implementation of the language server protocol, fork of python-language-server" url="https://github.com/python-lsp/python-lsp-server" arch="noarch !armhf !s390x" # armhf: no py3-qt, s390x: no py3-pylint @@ -55,11 +55,15 @@ build() { check() { python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl + local k="not test_jedi_completion_environment" + k="$k and not test_symbols_all_scopes_with_jedi_environment" + # fails on riscv64 + k="$k and not test_autoimport_code_actions_and_completions_for_notebook_document" # deselect'ed tests are broken # pydocstyle is no longer maintaned upstream .testenv/bin/python3 -m pytest \ --ignore test/plugins/test_pydocstyle_lint.py \ - -k 'not test_jedi_completion_environment and not test_symbols_all_scopes_with_jedi_environment' + -k "$k" } package() { @@ -68,5 +72,5 @@ package() { } sha512sums=" -4c8e6a72ef6004248a5cb4a1e4c251b9d487cd4ce39d6c7268ce611c8537d6a5912eeb49d2eb1a25c230934b17e9a624504591c25f0291e07971eeccb70b09ba python-lsp-server-1.10.1.tar.gz +bd96850b822dc3c2e97d5ee38f25c9f7731dc68b31fedcc2d3e0ff373bc3ad8a989f1a4b85527477bbbc875e853d5513d8583bc3cdc22a3c0545716e68382093 python-lsp-server-1.11.0.tar.gz " diff --git a/community/py3-meson-python/APKBUILD b/community/py3-meson-python/APKBUILD index c7082d7b563..bebb7dee234 100644 --- a/community/py3-meson-python/APKBUILD +++ b/community/py3-meson-python/APKBUILD @@ -13,6 +13,7 @@ depends=" " checkdepends=" cython + git patchelf py3-pytest py3-pytest-mock @@ -20,7 +21,9 @@ checkdepends=" python3-dev " subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://github.com/mesonbuild/meson-python/archive/refs/tags/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/mesonbuild/meson-python/archive/refs/tags/$pkgver.tar.gz + pyproject-metadata-0.8.0.patch + " builddir="$srcdir/meson-python-$pkgver" build() { @@ -43,4 +46,5 @@ package() { sha512sums=" f1fce89bb0a3d279b9900c4ecec78e5f24da92d72f64ebf6c27648b4201a75a65204c3fac08aaa3e8d70dbeef245c3235e39994c7c0b9cba27c0df528211c7f7 py3-meson-python-0.15.0.tar.gz +15fe0b6fa4d4b019ff975be19b408a09526d5cd9bbcf333d7be4e27054b5789bafee378a7cccb8c6e10177bb460a8855040f26f984d6e7afaa6083f1818fd205 pyproject-metadata-0.8.0.patch " diff --git a/community/py3-meson-python/pyproject-metadata-0.8.0.patch b/community/py3-meson-python/pyproject-metadata-0.8.0.patch new file mode 100644 index 00000000000..0172a91aba9 --- /dev/null +++ b/community/py3-meson-python/pyproject-metadata-0.8.0.patch @@ -0,0 +1,70 @@ +Patch-Source: https://github.com/mesonbuild/meson-python/commit/225a26d8c854987897448b17478166570c7be777.patch +-- +From 225a26d8c854987897448b17478166570c7be777 Mon Sep 17 00:00:00 2001 +From: Daniele Nicolodi <daniele@grinta.net> +Date: Mon, 15 Apr 2024 22:34:36 +0200 +Subject: [PATCH] TST: adapt to changes in pyproject-metadata 0.8.0 + +--- + tests/test_metadata.py | 8 +++++++- + tests/test_sdist.py | 9 +++++++-- + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/tests/test_metadata.py b/tests/test_metadata.py +index 0c278da6..088e82f7 100644 +--- a/tests/test_metadata.py ++++ b/tests/test_metadata.py +@@ -3,6 +3,7 @@ + # SPDX-License-Identifier: MIT + + import pathlib ++import re + + import packaging.version + import pyproject_metadata +@@ -48,5 +49,10 @@ def test_missing_version(package_missing_version): + pyproject = {'project': { + 'name': 'missing-version', + }} +- with pytest.raises(pyproject_metadata.ConfigurationError, match='Required "project.version" field is missing'): ++ match = '|'.join(( ++ re.escape('Required "project.version" field is missing'), ++ # pyproject-metatadata 0.8.0 and later ++ re.escape('Field "project.version" missing and "version" not specified in "project.dynamic"'), ++ )) ++ with pytest.raises(pyproject_metadata.ConfigurationError, match=match): + Metadata.from_pyproject(pyproject, pathlib.Path()) +diff --git a/tests/test_sdist.py b/tests/test_sdist.py +index 6e337617..fb698b53 100644 +--- a/tests/test_sdist.py ++++ b/tests/test_sdist.py +@@ -3,6 +3,7 @@ + # SPDX-License-Identifier: MIT + + import os ++import re + import stat + import sys + import tarfile +@@ -30,7 +31,7 @@ def test_pep621(sdist_full_metadata): + with tarfile.open(sdist_full_metadata, 'r:gz') as sdist: + sdist_pkg_info = sdist.extractfile('full_metadata-1.2.3/PKG-INFO').read().decode() + +- assert sdist_pkg_info == textwrap.dedent('''\ ++ metadata = re.escape(textwrap.dedent('''\ + Metadata-Version: 2.1 + Name: full-metadata + Version: 1.2.3 +@@ -65,7 +66,11 @@ def test_pep621(sdist_full_metadata): + # full-metadata + + An example package with all of the PEP 621 metadata! +- ''') ++ ''')) ++ ++ # pyproject-metadata 0.8.0 and later uses a comma to separate keywords ++ expr = metadata.replace(r'Keywords:\ full\ metadata', r'Keywords:\ full[ ,]metadata') ++ assert re.fullmatch(expr, sdist_pkg_info) + + + def test_dynamic_version(sdist_dynamic_version): diff --git a/community/py3-mizani/APKBUILD b/community/py3-mizani/APKBUILD index ce1f1c00818..5440e8d527d 100644 --- a/community/py3-mizani/APKBUILD +++ b/community/py3-mizani/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-mizani -pkgver=0.11.1 -pkgrel=1 +pkgver=0.11.3 +pkgrel=0 pkgdesc="A scales package for python" url="https://github.com/has2k1/mizani" arch="noarch" @@ -41,5 +41,5 @@ package() { } sha512sums=" -363b8d0adb82183f2e09c017a74a2f80cdf505a68a6630b3ad01f49bcdf2a259480c86a09d643e516b975a0c9caa4b33530da3aa47d557c6935d9eebe7c97f4b mizani-0.11.1.tar.gz +fcdd0d618bbd07653a20922eae32270106a2fd554e61f611b5c6556e18ce4ec6ce40bc4868d3a8d179fe2d178dce7978379b8a0f1fc6f2f6e85570eb7f2b550c mizani-0.11.3.tar.gz " diff --git a/community/py3-model-bakery/APKBUILD b/community/py3-model-bakery/APKBUILD index 39d68e6f507..2afe6b13dc5 100644 --- a/community/py3-model-bakery/APKBUILD +++ b/community/py3-model-bakery/APKBUILD @@ -2,10 +2,9 @@ # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-model-bakery _pyname="model_bakery" -pkgver=1.17.0 +pkgver=1.18.0 pkgrel=0 -# s390x: missing ruff checkdepend -arch="noarch !s390x" +arch="noarch" pkgdesc="Smart object creation facility for Django" url="https://pypi.python.org/project/model-bakary" license="Apache-2.0" @@ -47,5 +46,5 @@ package() { .dist/*.whl } sha512sums=" -eaa7be3432842eb68035b9dcda5184befe4e7db51af4adbc92ae43e19670d0236a800dc61f12f23678e85be0abb80d68139c7a63e14b53f7631216643311fcbf py3-model-bakery-1.17.0.tar.gz +1273a219b343b4ca3432c1ae04efb154304b67b289accd3e1a18bddd6214dd5a3f5085306de01f4aed0199ae6a89b2ca2f759185e27a5b419cf50c94dba2d3b1 py3-model-bakery-1.18.0.tar.gz " diff --git a/community/py3-moto/APKBUILD b/community/py3-moto/APKBUILD new file mode 100644 index 00000000000..6dc9412d5c2 --- /dev/null +++ b/community/py3-moto/APKBUILD @@ -0,0 +1,106 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-moto +pkgver=5.0.6 +pkgrel=0 +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=moto +pkgdesc="A library that allows you to easily mock out tests based on AWS infrastructure." +url="https://github.com/getmoto/moto" +arch="noarch" +license="Apache-2.0" +depends=" + py3-boto3 + py3-botocore + py3-cryptography + py3-requests + py3-xmltodict + py3-werkzeug + py3-dateutil + py3-responses + py3-jinja2 +" +checkdepends=" + py3-pytest + py3-coverage + py3-pytest-cov + py3-pytest-xdist + py3-freezegun + py3-pylint + py3-flask + py3-flask-cors + py3-openapi-spec-validator + py3-docker-py +" +makedepends=" + py3-setuptools + py3-gpep517 + py3-wheel +" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/getmoto/moto/archive/refs/tags/$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + # tests/test_cognitoidp: missing module joserfc + # tests/test_iotdata: missing module jsondiff + # tests/test_xray: missing module aws_xray_sdk + # tests/test_apigateway/test_apigateway.py: missing module joserfc + # tests/test_appsync/test_appsync_schema.py: missing module graphql + # tests/test_awslambda: requires do_eventsourcemappingcker + # tests/test_batch/test_batch_jobs.py: timeout error + # tests/test_cloudformation: missing module cfnlint + timeout error + # tests/test_core/test_docker.py: requires docker + # tests/test_dynamodb/test_dynamodb_statements.py: missing module py_partiql_parser + # tests/test_events/test_events_lambdatriggers_integration.py: requires docker + # tests/test_logs/test_integration.py: requires docker + # tests/test_resiliencehub/test_resiliencehub.py: botocore.exceptions.ParamValidationError: Parameter validation failed + # tests/test_s3/test_s3_lambda_integration.py: requires docker + # tests/test_s3/test_s3_select.py: missing module py_partiql_parser + # tests/test_secretsmanager/test_secretsmanager.py: AttributeError: 'SecretsManager' object has no attribute 'batch_get_secret_value'. Did you mean: 'get_secret_value'? + # tests/test_sqs/test_sqs_integration.py: requires docker + # tests/test_stepfunctions/parser: missing module antlr4 + # tests/test_resiliencehub/test_resiliencyhub_resources.py: key error: creationTime + # tests/test_ssoadmin/test_ssoadmin.py: AttributeError: 'SSOAdmin' object has no attribute 'list_account_assignments_for_principal'. Did you mean: 'list_account_assignment_creation_status + # tests/test_s3/{test_server.py,test_multiple_accounts_server.py}: Failed to establish a new connection: [Errno -2] Name does not resolve' + .testenv/bin/python3 -m pytest -v \ + --ignore=tests/test_cognitoidp \ + --ignore=tests/test_iotdata \ + --ignore=tests/test_xray \ + --ignore=tests/test_apigateway/test_apigateway.py \ + --ignore=tests/test_appsync/test_appsync_schema.py \ + --ignore=tests/test_awslambda \ + --ignore=tests/test_batch/test_batch_jobs.py \ + --ignore=tests/test_cloudformation \ + --ignore=tests/test_core/test_docker.py \ + --ignore=tests/test_dynamodb/test_dynamodb_statements.py \ + --ignore=tests/test_events/test_events_lambdatriggers_integration.py \ + --ignore=tests/test_logs/test_integration.py \ + --ignore=tests/test_resiliencehub/test_resiliencehub.py \ + --ignore=tests/test_s3/test_s3_lambda_integration.py \ + --ignore=tests/test_s3/test_s3_select.py \ + --ignore=tests/test_secretsmanager/test_secretsmanager.py \ + --ignore=tests/test_sqs/test_sqs_integration.py \ + --ignore=tests/test_stepfunctions/parser \ + --ignore=tests/test_resiliencehub/test_resiliencyhub_resources.py \ + --ignore=tests/test_ssoadmin/test_ssoadmin.py \ + --ignore=tests/test_s3/test_multiple_accounts_server.py \ + --ignore=tests/test_s3/test_server.py +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +7f3002ce201952e235d412fd3ec41b12a4e3371bdcabb5f662bfc0df934dee5e47cee28c80548267d871c3d749368e3ac24ee4508d793572a546a31383f9832e py3-moto-5.0.6.tar.gz +" diff --git a/community/py3-mpv/APKBUILD b/community/py3-mpv/APKBUILD index 0e9a31ae3b6..dcbbc2894d6 100644 --- a/community/py3-mpv/APKBUILD +++ b/community/py3-mpv/APKBUILD @@ -1,24 +1,23 @@ # Contributor: Alex McGrath <amk@amk.ie> # Maintainer: Alex McGrath <amk@amk.ie> pkgname=py3-mpv -pkgver=1.0.5 -pkgrel=1 +pkgver=1.0.6 +pkgrel=0 pkgdesc="Python interface to the mpv media player" url="https://github.com/jaseg/python-mpv" arch="noarch" license="MIT" -depends="python3 mpv-libs" +depends="mpv-libs" makedepends=" py3-setuptools py3-gpep517 py3-installer py3-wheel " -options="!check" # tests require unpackaged xvfbwrapper - -# release 1.0.3 has a typo where the version is vv$pkgver rather than v$pkgver +checkdepends="pytest" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/jaseg/python-mpv/archive/v$pkgver.tar.gz" +options="!check" # tests require unpackaged xvfbwrapper builddir="$srcdir/python-mpv-$pkgver" build() { @@ -27,11 +26,17 @@ build() { --output-fd 3 3>&1 >&2 } +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest +} + package() { python3 -m installer -d "$pkgdir" \ .dist/*.whl } sha512sums=" -cefc0b38146d707a06e2b9e58951675be8d236c95e24de7665085641b24f7d7d5303130ebdb4c97f4f4c79b6de393c30656d9fc0dabf6760156d4aca8207d77c py3-mpv-1.0.5.tar.gz +f5848f62f978372b04d09e89e9d04b64ff0c437a1f9f63c4ba4751bbe4a8bd0eb20e7503a3f25c7ca64ef0ab5c91db8be68473dbc29a04d78a9246ed784bcc38 py3-mpv-1.0.6.tar.gz " diff --git a/community/py3-msoffcrypto-tool/APKBUILD b/community/py3-msoffcrypto-tool/APKBUILD index 62743a806fd..93ce6653ed8 100644 --- a/community/py3-msoffcrypto-tool/APKBUILD +++ b/community/py3-msoffcrypto-tool/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-msoffcrypto-tool -pkgver=5.3.1 -pkgrel=1 +pkgver=5.4.0 +pkgrel=0 pkgdesc="tool and library for decrypting MS Office files with passwords or other keys" url="https://github.com/nolze/msoffcrypto-tool" arch="noarch" @@ -35,5 +35,5 @@ package() { } sha512sums=" -affebaec294cb9fb8cc2f7c808a7a8aca5adf15d83770b30db594bd1ce0d9229f010c307d54aa6f6cf02f696680dcf5cda13d2fe6e110b2a39d820ae1833dc51 py3-msoffcrypto-tool-5.3.1.tar.gz +bebb727754512b0f1f011538d65f113d0b63c59b758fc5d427202c74587f9efc091cf5747098f6b50df40761a143ba8732a9a5e253827bcffb5f5577af986a0c py3-msoffcrypto-tool-5.4.0.tar.gz " diff --git a/community/py3-myst-parser/APKBUILD b/community/py3-myst-parser/APKBUILD index 4e221c82f76..dd0a027584f 100644 --- a/community/py3-myst-parser/APKBUILD +++ b/community/py3-myst-parser/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-myst-parser -pkgver=2.0.0 -pkgrel=1 +pkgver=3.0.1 +pkgrel=0 pkgdesc="Extended commonmark compliant parser" url="https://myst-parser.readthedocs.io/" arch="noarch" @@ -15,7 +15,6 @@ depends=" py3-sphinx py3-typing-extensions py3-yaml - python3 " makedepends="py3-gpep517 py3-flit-core py3-installer" checkdepends="py3-pytest py3-pytest-benchmark py3-beautifulsoup4" @@ -42,5 +41,5 @@ package() { } sha512sums=" -c47bdd773565e93c4714d318a70f9a8adab1be6e2a63c23175667fc4afb5da4d66b84e11176782c8202e9fd68883e74d444911ddfb0b91356c2ba07fa65f7ea4 py3-myst-parser-2.0.0.tar.gz +4c2b08e9307685c2ef02eee89becba1d6e9f67eba7ab6d5bb5b425f232ac0922bb31cb5df5d60a5ed0846a9314475bcd2cb073a0101f514455c2598340e4b441 py3-myst-parser-3.0.1.tar.gz " diff --git a/community/py3-nestedtext/APKBUILD b/community/py3-nestedtext/APKBUILD index 43074783c1f..b4652f11fdf 100644 --- a/community/py3-nestedtext/APKBUILD +++ b/community/py3-nestedtext/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Andy Hawkins <andy@gently.org.uk> # Maintainer: Andy Hawkins <andy@gently.org.uk> pkgname=py3-nestedtext -pkgver=3.6 -pkgrel=1 +pkgver=3.7 +pkgrel=0 pkgdesc="A Human Friendly Data Format" url="https://nestedtext.org/" arch="noarch" @@ -62,6 +62,6 @@ package() { } sha512sums=" -becc1198fb9263b81228b8602296b3c12563e91cc7db7e521e824c8ec4478cfe91c528cdb3de22dfe8ec5a17f2394fc29453f06832b50c5c17272c40cdef8500 nestedtext-v3.6.tar.gz +8197b82c71c4c1ba4c56ba6c37f33e5f46cdfd01df5217282d948f7e64da979f5fc007239d1ed8d29bbfb65a52b2b8ede792f8142f36fdf531b83e1a2e4145e3 nestedtext-v3.7.tar.gz dbd03a9e847a3f7984d0422b0806c11a606c3555249865d5947114eb7c5a112076393173f8f560b850750b615c13960a37391d72b88293304a92d5c8a52f6f74 82b4393e54ff40723d950cfaa004ac267f3ba350.zip " diff --git a/community/py3-niaaml/APKBUILD b/community/py3-niaaml/APKBUILD index 49e4171a357..ebb55df612b 100644 --- a/community/py3-niaaml/APKBUILD +++ b/community/py3-niaaml/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-niaaml _pkgorig=NiaAML -pkgver=1.2.0 -pkgrel=2 +pkgver=2.0.0 +pkgrel=0 pkgdesc="Python automated machine learning framework" url="https://github.com/firefly-cpp/NiaAML" arch="noarch" @@ -37,5 +37,5 @@ package() { } sha512sums=" -277550856057c5f61fefb7618c9cde9335062f2ee91f69de8028b20284a4c771886363f273f6fb1f6ea619faef6f97bbb36413ee2ed0cf327fc66f46a394be2c NiaAML-1.2.0.tar.gz +91d72f5bc5f566cee6225e59a1abc7fa1d64e346bef57a8fe4aaa9320e2594655c7d965d2fbfd76e95a8b0464d2f37c6e8451828717091529984e123c2917cff NiaAML-2.0.0.tar.gz " diff --git a/community/py3-oci/APKBUILD b/community/py3-oci/APKBUILD index cd8b1d0bee2..2dafd31cdb9 100644 --- a/community/py3-oci/APKBUILD +++ b/community/py3-oci/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-oci -pkgver=2.125.2 +pkgver=2.126.1 pkgrel=0 pkgdesc="Oracle Cloud Infrastructure Python SDK" url="https://docs.oracle.com/en-us/iaas/tools/python/2.53.1/index.html" @@ -35,6 +35,6 @@ package() { } sha512sums=" -b0c9fb3727293b511f6e3d119432caf747d56313f527efedc4c71158842dcb1e344d01d764e386934c51d3b39c5ad733257f5b027be96ba0e2ce8491b4494e00 py3-oci.2.125.2.tar.gz +375b1a43a5c9a480c842f3545c00695fb2359e3d10fa9cef261bd1ea6d603299740ec265663c17b385bf076b46125e54a2238c069dae7000a96d4fd2224a07bc py3-oci.2.126.1.tar.gz e88495f19a3b9bd4b4b086007e2c93d6200aa316e93c1ec58b31794afb58967994f061a5ad1346edbbecd9119cea7a60c1e2ac6cba99f78b4e349b8f594ce01f vcr.patch " diff --git a/community/py3-openapi-schema-validator/APKBUILD b/community/py3-openapi-schema-validator/APKBUILD new file mode 100644 index 00000000000..ffea874692f --- /dev/null +++ b/community/py3-openapi-schema-validator/APKBUILD @@ -0,0 +1,54 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-openapi-schema-validator +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=openapi-schema-validator +pkgver=0.6.2 +pkgrel=0 +pkgdesc="OpenApi schema validation for OpenApi versions v2, v3.0.x and v3.1.x" +url="OpenAPI schema validation for Python" +arch="noarch" +license="Apache-2.0" +depends=" + py3-jsonschema + py3-jsonschema-specifications + py3-rfc3339-validator +" +checkdepends=" + py3-pytest + py3-pytest-cov +" +makedepends=" + poetry + py3-setuptools + py3-gpep517 + py3-wheel +" +subpackages="$pkgname-pyc" +source=" + $pkgname-$pkgver.tar.gz::https://github.com/python-openapi/openapi-schema-validator/archive/refs/tags/$pkgver.tar.gz + dfb83c2_jsonschema-4.20-prefixitems-test-fix.patch +" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +8a1f25a2b56ec4bf77080cae3dee5093eeece1b06b94998ba4d17fb4d08a1fda89aeb57c7c48917ee800f6ba9d00cceb7826c8030d1429222ec18b282a90da16 py3-openapi-schema-validator-0.6.2.tar.gz +d2468fd02cccf826be1a6c6197420a1a42bdb283fb40e15cb6ccf4df24a5f58d51d9c3519d49e6895390bbc1d3a604a6b9d1db9d68748d8d7239782e7a023fbe dfb83c2_jsonschema-4.20-prefixitems-test-fix.patch +" diff --git a/community/py3-openapi-schema-validator/dfb83c2_jsonschema-4.20-prefixitems-test-fix.patch b/community/py3-openapi-schema-validator/dfb83c2_jsonschema-4.20-prefixitems-test-fix.patch new file mode 100644 index 00000000000..c97beb1e75a --- /dev/null +++ b/community/py3-openapi-schema-validator/dfb83c2_jsonschema-4.20-prefixitems-test-fix.patch @@ -0,0 +1,26 @@ +From dfb83c2961bcb6541c8c5e483f10389c77a4f5a0 Mon Sep 17 00:00:00 2001 +From: p1c2u <maciag.artur@gmail.com> +Date: Sat, 16 Mar 2024 17:05:13 +0000 +Subject: [PATCH] Jsonschema 4.20 prefixItems test fix + +--- + tests/integration/test_validators.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/tests/integration/test_validators.py b/tests/integration/test_validators.py +index 07bc4df..07dfaa9 100644 +--- a/tests/integration/test_validators.py ++++ b/tests/integration/test_validators.py +@@ -863,5 +863,10 @@ def test_array_prefixitems_invalid(self, validator_class, value): + with pytest.raises(ValidationError) as excinfo: + validator.validate(value) + +- error = "Expected at most 4 items, but found 5" +- assert error in str(excinfo.value) ++ errors = [ ++ # jsonschema < 4.20.0 ++ "Expected at most 4 items, but found 5", ++ # jsonschema >= 4.20.0 ++ "Expected at most 4 items but found 1 extra", ++ ] ++ assert any(error in str(excinfo.value) for error in errors) diff --git a/community/py3-openapi-spec-validator/APKBUILD b/community/py3-openapi-spec-validator/APKBUILD new file mode 100644 index 00000000000..532fc62708e --- /dev/null +++ b/community/py3-openapi-spec-validator/APKBUILD @@ -0,0 +1,51 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-openapi-spec-validator +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=openapi-spec-validator +pkgver=0.7.1 +pkgrel=0 +pkgdesc="OpenAPI 2.0 (aka Swagger) and OpenAPI 3 spec validator" +url="https://github.com/python-openapi/openapi-spec-validator" +arch="noarch" +license="Apache-2.0" +depends=" + py3-jsonschema + py3-jsonschema-path + py3-openapi-schema-validator + py3-lazy-object-proxy +" +checkdepends=" + py3-pytest + py3-pytest-cov +" +makedepends=" + poetry + py3-setuptools + py3-gpep517 + py3-wheel +" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/python-openapi/openapi-spec-validator/archive/refs/tags/$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +2a57ae1beb5f38f278839749f80cd92881bb57aa035573e604ee5fad5db6868150a9b4ebd1c00c20cc0fa00672619f5d99295de4df3173d25a841fe25c374c9d py3-openapi-spec-validator-0.7.1.tar.gz +" diff --git a/community/py3-orjson/APKBUILD b/community/py3-orjson/APKBUILD index 0b3560c17ff..38c9412f1e2 100644 --- a/community/py3-orjson/APKBUILD +++ b/community/py3-orjson/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-orjson -pkgver=3.10.0 -pkgrel=1 +pkgver=3.10.1 +pkgrel=0 pkgdesc="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy" url="https://github.com/ijl/orjson" arch="all" @@ -49,5 +49,5 @@ package() { } sha512sums=" -d8659a2eb01e6874c2d7bff37ae6978b0e346e81934d4a27b84af0ee916a785a35a524862f1f98bc8fe8c3cb35929bb16ba1f10bb5603ccf3b1e58ad2ed6ea01 py3-orjson-3.10.0.tar.gz +b6b5ccda0853ba7c13e7899a6268324efc042ff11f0794fcc5bd0bb632337518b1f6a6678604791608ad40f677139087c7614b59112dacb352d6f2b9d6579606 py3-orjson-3.10.1.tar.gz " diff --git a/community/py3-parametrize-from-file/APKBUILD b/community/py3-parametrize-from-file/APKBUILD index 9b0342b7f02..2c46f5f77a4 100644 --- a/community/py3-parametrize-from-file/APKBUILD +++ b/community/py3-parametrize-from-file/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Andy Hawkins <andy@gently.org.uk> # Maintainer: Andy Hawkins <andy@gently.org.uk> pkgname=py3-parametrize-from-file -pkgver=0.19.0 +pkgver=0.20.0 pkgrel=1 pkgdesc="Parametrize From File" url="https://parametrize-from-file.readthedocs.io/en/latest/" arch="noarch" license="MIT" depends=" - python3>=3.6 + python3>=3.8 py3-toml py3-yaml py3-nestedtext @@ -46,5 +46,5 @@ package() { } sha512sums=" -0fd468aa19cf9a9cc9be17893ad75d31facf7d8d43227aac2e007c17daf4fcb2c239a3493ddc025c8c639dbba2fe5fc351117755ea1b7173435172c9d3f1f910 parametrize_from_file-v0.19.0.tar.gz +b6911d2f2429b97f5a6a2ae81695a900aa27b9287ea07e0cfb9b791c2d36c42d44f01ee65f0a7c4517ac749d7ad2b0ad8c51b065be68d0d9bc570104bde9d205 parametrize_from_file-v0.20.0.tar.gz " diff --git a/community/py3-paste/APKBUILD b/community/py3-paste/APKBUILD index bb880757de0..cdada03b0db 100644 --- a/community/py3-paste/APKBUILD +++ b/community/py3-paste/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-paste -pkgver=3.9.0 -pkgrel=1 +pkgver=3.10.0 +pkgrel=0 pkgdesc="Tools for using a Web Server Gateway Interface stack" url="https://pythonpaste.readthedocs.io/en/latest/" arch="noarch" @@ -38,5 +38,5 @@ package() { } sha512sums=" -a9099b89e17f597e853d82cc5d99aaf84fa71ee25e92a382a47a482982800a7e766d8389530ef2a7ad145771ebbabdb1ae5d8370d9cd30121b94e18bcaef3f81 py3-paste-3.9.0.tar.gz +52a6b410564417659cb6f49d6e4b91268386f5e9a82be944b3128a11e37424766d42e9a9f082d682605258a96a57cde113f79c40e32fdaff023a04739c91325b py3-paste-3.10.0.tar.gz " diff --git a/community/py3-pathable/APKBUILD b/community/py3-pathable/APKBUILD new file mode 100644 index 00000000000..5ebbd510f04 --- /dev/null +++ b/community/py3-pathable/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-pathable +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=pathable +pkgver=0.4.3 +pkgrel=0 +pkgdesc="Object-oriented JSONSchema" +url="https://github.com/p1c2u/pathable" +arch="noarch" +license="Apache-2.0" +checkdepends=" + py3-pytest + py3-pytest-cov +" +makedepends=" + poetry + py3-setuptools + py3-gpep517 + py3-wheel +" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/p1c2u/pathable/archive/refs/tags/$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +5481ba1e6f4ab4318b9a7bd1d1ddd152f715b001bc7edd1b1221501da1a95578ee6601ce4ce0bdb98773c7954212687d249418e69acef1b350fc5d6cb188dbfc py3-pathable-0.4.3.tar.gz +" diff --git a/community/py3-peewee/APKBUILD b/community/py3-peewee/APKBUILD index 0e61cfee0ce..f4b01759849 100644 --- a/community/py3-peewee/APKBUILD +++ b/community/py3-peewee/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=py3-peewee -pkgver=3.17.2 +pkgver=3.17.5 pkgrel=0 pkgdesc="Small, expressive ORM" url="https://github.com/coleifer/peewee" @@ -39,5 +39,5 @@ package() { } sha512sums=" -eaf495523170400e97416a4c3c6632f722648224f45aeba4ecc486e502324c4947fc0422acb0ba2bc8941c58b2ea920c5f48778e9d9af77aaf795035785dea01 py3-peewee-3.17.2.tar.gz +b9878450a0759740f28cb6425ba0f14aa92e037bc4c888c13ae24bc38993787e64bff6342edcdf5364b5aac97c405e1c8e53e1140016e6bdbeba6d57d7f339ec py3-peewee-3.17.5.tar.gz " diff --git a/community/py3-phonenumbers/APKBUILD b/community/py3-phonenumbers/APKBUILD index 5c29467c627..768b82daa12 100644 --- a/community/py3-phonenumbers/APKBUILD +++ b/community/py3-phonenumbers/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org> # Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org> pkgname=py3-phonenumbers -pkgver=8.13.34 -pkgrel=1 +pkgver=8.13.35 +pkgrel=0 pkgdesc="International phone number library for Python" url="https://github.com/daviddrysdale/python-phonenumbers" arch="noarch" @@ -38,5 +38,5 @@ package() { } sha512sums=" -ba841f5c7f71bf8bffc10491a09cb6118915ea6344d4fba805b29a64762298fb0d56f2684812b9b8af8d60777e2af2787718596128b4e73bc5398a5f74128678 phonenumbers-8.13.34.tar.gz +56c94f535f104532269f71fe8bcd796ce96f500d3d7002329074c1333ae35b8bbe5ef67ab284914c38153514e93c9d60c249ea88c4a791f483aead527a4a0185 phonenumbers-8.13.35.tar.gz " diff --git a/community/py3-pikepdf/APKBUILD b/community/py3-pikepdf/APKBUILD index 5fe9807fe48..d55d09b87d1 100644 --- a/community/py3-pikepdf/APKBUILD +++ b/community/py3-pikepdf/APKBUILD @@ -55,5 +55,5 @@ package() { } sha512sums=" -e7ce84ebabcae6fa30689e6f6314f8b2083ece1f36e17dc9129c2fbfdf9117f4915d06bd30b8f56f4f3b9b00e21818219b509c4ba40d71c513b29df47ca3eb9c py3-pikepdf-8.14.0.tar.gz +51fa58148c0d9095ed3fd130f6c04a5103796ee1e51e4708ba80100a3d4b71a21c4bd86dbcaf83be7f7a829a8c6957a436ae7778cce146b9da70455ed90a3d68 py3-pikepdf-8.14.0.tar.gz " diff --git a/community/py3-platformdirs/APKBUILD b/community/py3-platformdirs/APKBUILD index 6f1384199cd..6c7dbc2e898 100644 --- a/community/py3-platformdirs/APKBUILD +++ b/community/py3-platformdirs/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-platformdirs -pkgver=4.2.0 -pkgrel=1 +pkgver=4.2.1 +pkgrel=0 pkgdesc="Module for determining appropriate platform-specific dirs" url="https://github.com/platformdirs/platformdirs" arch="noarch" @@ -30,5 +30,5 @@ package() { } sha512sums=" -615742163cc4eb0ee97c4dba069d59a08e0056e05a3fbeab32dcab854ed56976e8707dd70afd65dbd0732bf1ad1a42c565fb3d980b7b668aa2cdecc5cc1de4f0 platformdirs-4.2.0.tar.gz +c6c671022a74ba35610469f08e9a275daa19f0362a98208096fab147a77abfc96c12a0312fdf65668b3e457e0c06d938f141efec1217ef1a7598a77f65786130 platformdirs-4.2.1.tar.gz " diff --git a/community/py3-plotnine/APKBUILD b/community/py3-plotnine/APKBUILD index 1f3db3612c4..692d6888787 100644 --- a/community/py3-plotnine/APKBUILD +++ b/community/py3-plotnine/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-plotnine -pkgver=0.13.4 -pkgrel=1 +pkgver=0.13.6 +pkgrel=0 pkgdesc="A grammar of graphics for Python" url="https://github.com/has2k1/plotnine" arch="noarch" @@ -57,5 +57,5 @@ package() { } sha512sums=" -263816642a01fcb26aad30c815cef02585ca857b1c0bb365f57944cd762ac1d486ad467d5341ccbd36d1239e3c8f188a2a0f471c038ac3d6c95c137d92c8a28a plotnine-0.13.4.tar.gz +b4aca7b3bdc929f13279e68d38b81c1fe35b7fec67cf789d92761fb475c3c68bf178d13ebd583610d592011647fca7b95a3c8f88f12ce55d44ca421f44acd82d plotnine-0.13.6.tar.gz " diff --git a/community/py3-psycopg/APKBUILD b/community/py3-psycopg/APKBUILD index 82d342f9da7..43fce3b6d88 100644 --- a/community/py3-psycopg/APKBUILD +++ b/community/py3-psycopg/APKBUILD @@ -1,8 +1,8 @@ # Contributor: omni <omni+alpine@hack.org> # Maintainer: omni <omni+alpine@hack.org> pkgname=py3-psycopg -pkgver=3.1.18 -pkgrel=1 +pkgver=3.1.19 +pkgrel=0 pkgdesc="PostgreSQL adapter for python" options="!check" # Requires running database url="https://www.psycopg.org/" @@ -80,7 +80,7 @@ _c_pyc() { } sha512sums=" -1e27eec49f3ae99f1fec68816dff3974aa9b1f526df45ccca295c7c6703cc309ca4f8f65d7e3450b628906a938c65f8cbd1a1f3cb6a41b6e51dc5e220985af39 psycopg-3.1.18.tar.gz +a7d02570632a28080ffd99fa492c2f1af623e7ca55e57e8c5d4664aff4d033ae85fc21cfbb1f85a90c48e01944ed1be68e857b5cb34c0547b51ca465bac0a361 psycopg-3.1.19.tar.gz d61e8d6a32ad43e439e906738d1046cf839a9b6576c339b342c46be3565b8863fa0a13205c98f24e8378a8b81939f8eb7465f290264ffd736736508dcb3e2331 fix-missing-type-imports.patch f11a4be8d70117f63bc24a658f53df96be4e71f9c6eb7a515ec7a39f328ecdfc84cc299a5a4d68f61a44e0e3796ec15e54c9347e0f4be7fb3cc806f633a8c592 typing-ext.patch 630ae96920d23826db387dc65f0af3f79aff2af933e207db717061d6acfffa220e2e4e9770a663319c0e25974d5434908b7c6340d63a59ce1471dbd182a36263 psycopg-binary.patch diff --git a/community/py3-pyaml/APKBUILD b/community/py3-pyaml/APKBUILD index 8fb08b8d61d..c612ce92f2c 100644 --- a/community/py3-pyaml/APKBUILD +++ b/community/py3-pyaml/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-pyaml _pyname="pyaml" -pkgver=23.12.0 -pkgrel=1 +pkgver=24.4.0 +pkgrel=0 arch='noarch' pkgdesc="PyYAML-based module to produce pretty and readable YAML-serialized data" url="https://pypi.python.org/pypi/pyaml" @@ -40,5 +40,5 @@ package() { } sha512sums=" -f1f03baf2b0a469ffbe7d6eea806cf7623a28c96221bc710873d548d8f416160bf566f44a3a42ca3572085834889e1dd394fc9bdeefe14fe23177b61573df12c py3-pyaml-23.12.0.tar.gz +d2c1ae1f29f61d210cb822c2c1b3fa3ace81a4b863c7dfec5d75c5418537256828ee54ca545edc9ce30995ba272dfd064f7ed6009dae00910a081ffc0270546e py3-pyaml-24.4.0.tar.gz " diff --git a/community/py3-pybind11/APKBUILD b/community/py3-pybind11/APKBUILD index 5a8ee1817da..d26f1225af9 100644 --- a/community/py3-pybind11/APKBUILD +++ b/community/py3-pybind11/APKBUILD @@ -2,7 +2,7 @@ pkgname=py3-pybind11 _pkgname=pybind11 pkgver=2.12.0 -pkgrel=0 +pkgrel=1 pkgdesc="Seamless operability between C++11 and Python" url="https://github.com/pybind/pybind11" arch="noarch" diff --git a/community/py3-pygame/APKBUILD b/community/py3-pygame/APKBUILD index 1f27b1e8211..9735bdbfed3 100644 --- a/community/py3-pygame/APKBUILD +++ b/community/py3-pygame/APKBUILD @@ -1,8 +1,8 @@ # Contributor: knuxify <knuxify@gmail.com> -# Maintainer: knuxify <knuxify@gmail.com> +# Maintainer: pkgname=py3-pygame pkgver=2.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Python library for making applications and games based on SDL" url="https://pygame.org" arch="all" diff --git a/community/py3-pylint/APKBUILD b/community/py3-pylint/APKBUILD index 33131e51adb..051d1a5231d 100644 --- a/community/py3-pylint/APKBUILD +++ b/community/py3-pylint/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> -# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: fossdd <fossdd@pwned.life> pkgname=py3-pylint pkgver=3.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Analyzes Python code looking for bugs and signs of poor quality" url="https://github.com/PyCQA/pylint" arch="noarch" diff --git a/community/py3-pynitrokey/APKBUILD b/community/py3-pynitrokey/APKBUILD index 7a0dce75276..deaede75f7a 100644 --- a/community/py3-pynitrokey/APKBUILD +++ b/community/py3-pynitrokey/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=py3-pynitrokey -pkgver=0.4.46 +pkgver=0.4.47 pkgrel=0 pkgdesc="Python Library for Nitrokey devices" url="https://github.com/Nitrokey/pynitrokey" @@ -60,5 +60,5 @@ package() { } sha512sums=" -98cdc9cb9fc1f34b614fc4d9ed15cad3bee18f7505e3eb583dc386f8922c45f44e30ac00bbd8207bdae59d2cabb7fd980f6617c53bef015cd3231a7c7599f15a pynitrokey-0.4.46.tar.gz +22e4003b26338b7cf181777d873f8037f7315f8e51b4945f54e7703e0563872bcfaf9b905e676f7055e2faa087bfcd01fcd18579288be56609ea812f6501e08e pynitrokey-0.4.47.tar.gz " diff --git a/community/py3-pyppeteer/APKBUILD b/community/py3-pyppeteer/APKBUILD index 004719a176d..61e2c260b23 100644 --- a/community/py3-pyppeteer/APKBUILD +++ b/community/py3-pyppeteer/APKBUILD @@ -6,7 +6,7 @@ pkgver=2.0.0 pkgrel=1 pkgdesc="Headless chrome/chromium automation library (unofficial port of puppeteer)" url="https://pypi.python.org/project/pyppeteer" -arch="noarch !armhf !ppc64le !riscv64 !s390x !x86" # needs chromium +arch="noarch !armhf !ppc64le !riscv64 !s390x !x86 !loongarch64" # needs chromium license="MIT" depends=" chromium diff --git a/community/py3-pyproject-metadata/APKBUILD b/community/py3-pyproject-metadata/APKBUILD index c26da322652..155551834b4 100644 --- a/community/py3-pyproject-metadata/APKBUILD +++ b/community/py3-pyproject-metadata/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-pyproject-metadata -pkgver=0.7.1 -pkgrel=5 +pkgver=0.8.0 +pkgrel=0 pkgdesc="PEP 621 metadata parsing" url="https://github.com/FFY00/python-pyproject-metadata" arch="noarch" license="MIT" depends="python3 py3-packaging" -makedepends="py3-gpep517 py3-setuptools py3-wheel" +makedepends="py3-gpep517 py3-flit-core py3-wheel" checkdepends="py3-pytest" source="$pkgname-$pkgver-3.tar.gz::https://github.com/FFY00/python-pyproject-metadata/archive/refs/tags/$pkgver.tar.gz" subpackages="$pkgname-pyc" @@ -29,5 +29,5 @@ package() { } sha512sums=" -3decbe7dae753bc03c0b3459a53707c34b7a4e140632da15c8234876d6cb07f43f8bb65e3661c68950fd3eac37904316767617954a057c606d0158e8982e0afa py3-pyproject-metadata-0.7.1-3.tar.gz +8d8c7839a318acce64b0cf15b3adbc49c2f309b453135b55f2d7942967ba8bbd4f85696d0f3c651e1246c50e33657e6108f0f05ac20b4a9162cdb2875269c548 py3-pyproject-metadata-0.8.0-3.tar.gz " diff --git a/community/py3-pyqt-builder/APKBUILD b/community/py3-pyqt-builder/APKBUILD index 25350e927e9..92c99f34541 100644 --- a/community/py3-pyqt-builder/APKBUILD +++ b/community/py3-pyqt-builder/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=py3-pyqt-builder -pkgver=1.16.0 -pkgrel=1 +pkgver=1.16.2 +pkgrel=0 pkgdesc="The PEP 517 compliant PyQt build system" url="https://www.riverbankcomputing.com/software/pyqt-builder/" arch="noarch" @@ -14,9 +14,9 @@ makedepends=" " checkdepends="py3-pytest" subpackages="$pkgname-pyc" -source="https://pypi.python.org/packages/source/P/PyQt-builder/PyQt-builder-$pkgver.tar.gz" +source="https://pypi.python.org/packages/source/P/PyQt-builder/pyqt_builder-$pkgver.tar.gz" options="!check" # No tests -builddir="$srcdir/PyQt-builder-$pkgver" +builddir="$srcdir/pyqt_builder-$pkgver" build() { gpep517 build-wheel \ @@ -30,5 +30,5 @@ package() { } sha512sums=" -1584b41e0c260a45b2b883d035e7611b29501a24172a8d9f36702c4fbde8c3f7953a6897781b59f48b9fa1ceab51eb3767afa83e0e3ff097caf029d87a7114d8 PyQt-builder-1.16.0.tar.gz +64fc969799a12a176eb730fdc4581f18293dceb8edff20db0177ce409fe7e712cdfb07449b6c4abdd33f1fd9aabe8bee248fe9aeb5373df533d805f9d2a0c6a5 pyqt_builder-1.16.2.tar.gz " diff --git a/community/py3-pyro4/APKBUILD b/community/py3-pyro4/APKBUILD index bb119721424..eacd1ad58e7 100644 --- a/community/py3-pyro4/APKBUILD +++ b/community/py3-pyro4/APKBUILD @@ -5,7 +5,7 @@ pkgver=4.82 pkgrel=3 pkgdesc="Python remote objects" url="http://pyro4.readthedocs.io/" -arch="noarch !s390x" # Limited by py3-dill +arch="noarch" license="MIT" depends="py3-serpent" makedepends="python3 py3-setuptools py3-gpep517 py3-wheel" diff --git a/community/py3-pysocks/APKBUILD b/community/py3-pysocks/APKBUILD index a5e3feb4e23..ac7f1c5a5df 100644 --- a/community/py3-pysocks/APKBUILD +++ b/community/py3-pysocks/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: +# Maintainer: fossdd <fossdd@pwned.life> pkgname=py3-pysocks pkgver=1.7.1 -pkgrel=6 +pkgrel=7 pkgdesc="Python Socks module" url="https://github.com/Anorov/PySocks" arch="noarch" diff --git a/community/py3-pytest-asyncio/APKBUILD b/community/py3-pytest-asyncio/APKBUILD index 969f81c33b1..00a5b1071e6 100644 --- a/community/py3-pytest-asyncio/APKBUILD +++ b/community/py3-pytest-asyncio/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=py3-pytest-asyncio -pkgver=0.21.1 -pkgrel=2 +pkgver=0.21.2 +pkgrel=0 pkgdesc="Pytest support for asyncio" url="https://github.com/pytest-dev/pytest-asyncio" arch="noarch" @@ -34,5 +34,5 @@ package() { } sha512sums=" -315007038d510ce876638d49d2310962f34264440452ed49f7cbdb608340bd1eb4868d529e44812a9cb5bf5dfe123c338ab2fa4c892505329820f5da15d2bb6d py3-pytest-asyncio-0.21.1.tar.gz +1ec0d5830cc3cc5551e828a584245acb874c6d32ef47b9a836ccb03cbbd34702c4789f5af8a741a978f702f4eae36641e519ee4dcc96f0858788c647defcbdad py3-pytest-asyncio-0.21.2.tar.gz " diff --git a/community/py3-pytest-celery/APKBUILD b/community/py3-pytest-celery/APKBUILD new file mode 100644 index 00000000000..537bd8e2a11 --- /dev/null +++ b/community/py3-pytest-celery/APKBUILD @@ -0,0 +1,59 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-pytest-celery +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=pytest-celery +pkgver=1.0.0 +pkgrel=0 +pkgdesc="Official pytest plugin for Celery." +url="https://github.com/celery/pytest-celery" +arch="noarch" +license="BSD-3-Clause" +depends=" + py3-redis + py3-python-memcached + py3-pytest-docker-tools + py3-retry + py3-psutil +" +checkdepends=" + py3-celery + py3-pytest + py3-coverage + py3-pytest-sugar + py3-pytest-cov + py3-pytest-xdist + py3-pytest-subtests + py3-pytest-rerunfailures +" +makedepends=" + poetry + py3-setuptools + py3-gpep517 + py3-wheel +" +options="!check" # requires docker and has circular dependency with py3-celery +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/celery/pytest-celery/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +6bbcfa0134c4fa9dd42706c7a8d33e06875534acf9a976669f8f0acd3e4754a5177bb2ad123effd515dc68fc55b72b1d9902361687f4b9a81d9868ea02798500 py3-pytest-celery-1.0.0.tar.gz +" diff --git a/community/py3-pytest-click/APKBUILD b/community/py3-pytest-click/APKBUILD new file mode 100644 index 00000000000..bfa4648519c --- /dev/null +++ b/community/py3-pytest-click/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-pytest-click +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=pytest-click +pkgver=1.1.0 +pkgrel=0 +pkgdesc="Pytest plugin for Click" +url="https://github.com/Stranger6667/pytest-click" +arch="noarch" +license="MIT" +depends=" + py3-click + py3-pytest +" +makedepends=" + py3-setuptools + py3-gpep517 + py3-wheel +" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/Stranger6667/pytest-click/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +aed7a67477cc523789063c72b8da67ae09cfbade6d66d77a2dc098821648324b2d3caf8d187b5dcca2dbd013c2eaac173cb0a7ed8f4db0f69279cdaee4978ed6 py3-pytest-click-1.1.0.tar.gz +" diff --git a/community/py3-pytest-cov/APKBUILD b/community/py3-pytest-cov/APKBUILD index 595597183b4..68eccae7a39 100644 --- a/community/py3-pytest-cov/APKBUILD +++ b/community/py3-pytest-cov/APKBUILD @@ -1,8 +1,8 @@ # Contributor: TBK <alpine@jjtc.eu> # Maintainer: TBK <alpine@jjtc.eu> pkgname=py3-pytest-cov -pkgver=4.1.0 -pkgrel=1 +pkgver=5.0.0 +pkgrel=0 pkgdesc="Pytest plugin for measuring coverage" options="!check" # Requires unpackaged 'fields' module url="https://github.com/pytest-dev/pytest-cov" @@ -31,5 +31,5 @@ package() { } sha512sums=" -d5eca8c750b6668a2b893e65d6799267d1a13eda78908880f454533a7846f1c4f94df6b5b702436e74a2ffb7912a19cae5edb6452abf3cc7c4765f187db039f1 py3-pytest-cov-4.1.0.tar.gz +26721791424ef35eff6f3344b4c5bda486015f83657a9a33bab942bfa3514c319397dc343a292d2d76e175f4615062e4a229218420bc4cb331e09a9ceb0266d8 py3-pytest-cov-5.0.0.tar.gz " diff --git a/community/py3-pytest-docker-tools/APKBUILD b/community/py3-pytest-docker-tools/APKBUILD new file mode 100644 index 00000000000..d506ed6ea6b --- /dev/null +++ b/community/py3-pytest-docker-tools/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-pytest-docker-tools +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=pytest-docker-tools +pkgver=3.1.3 +pkgrel=0 +pkgdesc="Opionated helpers for creating py.test fixtures for Docker integration and smoke testing environments" +url="https://github.com/Jc2k/pytest-docker-tools" +arch="noarch" +license="Apache-2.0" +depends=" + py3-docker-py + py3-pytest +" +checkdepends=" + py3-pytest-cov +" +makedepends=" + poetry + py3-setuptools + py3-gpep517 + py3-wheel + docker +" +options="!check" # requires docker +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/Jc2k/pytest-docker-tools/archive/refs/tags/$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +9f99fe30ad98302bac295d63e145de488a3a7cb60a242101ccfdc41eecf274e831c0c54eb7c11f3f38e55ed4cb6b0db217b38e8fbf7f2a2f9f9edddbcfe2ba90 py3-pytest-docker-tools-3.1.3.tar.gz +" diff --git a/community/py3-pytest-factoryboy/APKBUILD b/community/py3-pytest-factoryboy/APKBUILD index ef290761aa9..10aefe25146 100644 --- a/community/py3-pytest-factoryboy/APKBUILD +++ b/community/py3-pytest-factoryboy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-pytest-factoryboy pkgver=2.7.0 -pkgrel=0 +pkgrel=1 _gittag=8c1809a71eb9537a2a4882a6831d0b05df0ecd87 #_pkgreal is used by apkbuild-pypi to find modules at PyPI _pkgreal=pytest-factoryboy @@ -14,11 +14,6 @@ depends="py3-pytest py3-inflection py3-factory-boy py3-typing-extensions" checkdepends="py3-tox py3-coverage py3-mypy" makedepends="py3-setuptools py3-gpep517 py3-wheel py3-poetry-core" subpackages="$pkgname-pyc" -# disabled due to errors presumed to be related to factory_boy -# AttributeError: 'str' object has no attribute 'iter_parents' -# TypeError: RunResult.assert_outcomes() got an unexpected keyword argument 'error' -# TODO: recheck when factoryboy 3.3.1 is released -options="!check" source="$pkgname-$pkgver.tar.gz::https://github.com/pytest-dev/pytest-factoryboy/archive/$_gittag.tar.gz" builddir="$srcdir/$_pkgreal-$_gittag" @@ -31,7 +26,23 @@ build() { check() { python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl - .testenv/bin/python3 -m pytest -v + # FAILED tests/test_model_name.py::test_generic_model_with_custom_name_no_warning - TypeError: RunResult.assert_outcomes() got an unexpected keyword argument 'error' + # FAILED tests/test_model_name.py::test_generic_model_name_raises_warning - TypeError: RunRes[ult.assert_outcomes() got an unexpected keyword argument 'error' + # FAILED tests/test_model_name.py::test_generic_model_with_register_override_no_warning - TypeError: RunResult.assert_outcomes() got an unexpected keyword argument 'error' + # FAILED tests/test_model_name.py::test_using_generic_model_name_for_subfactory_raises_warning - TypeError: RunResult.assert_outcomes() got an unexpected keyword argument 'error' + # FAILED tests/test_postgen_dependencies.py::test_getfixturevalue - AttributeError: 'str' object has no attribute 'iter_parents' + # ERROR tests/test_circular.py::test_circular - AttributeError: 'str' object has no attribute 'iter_parents' + # ERROR tests/test_factory_fixtures.py::test_model - AttributeError: 'str' object has no attribute 'iter_parents' + # ERROR tests/test_factory_fixtures.py::test_parametrized[2000-Bill Gates-1.0-PyTest for Dummies] - AttributeError: 'str' object has no attribute 'iter_parents' + # ERROR tests/test_factory_fixtures.py::TestLazyFixture::test_lazy_fixture_name[book__author0] - AttributeError: 'str' object has no attribute 'iter_parents' + # ERROR tests/test_factory_fixtures.py::TestLazyFixture::test_lazy_fixture_callable[book__author0] - AttributeError: 'str' object has no attribute 'iter_parents' + # ERROR tests/test_factory_fixtures.py::TestLazyFixture::test_override_subfactory_with_lazy_fixture - AttributeError: 'str' object has no attribute 'iter_parents' + # ERROR tests/test_postgen_dependencies.py::test_postgen_invoked - AttributeError: 'str' object has no attribute 'iter_parents' + # ERROR tests/test_postgen_dependencies.py::test_depends_on[1-3] - AttributeError: 'str' object has no attribute 'iter_parents' + # ERROR tests/test_postgen_dependencies.py::test_after_postgeneration - AttributeError: 'str' object has no attribute 'iter_parents' + # ERROR tests/test_postgen_dependencies.py::test_postgeneration_fixture[123] - AttributeError: 'str' object has no attribute 'iter_parents' + # ERROR tests/test_postgen_dependencies.py::test_postgenerationmethodcall_fixture[test secret-456] - AttributeError: 'str' object has no attribute 'iter_parents' + .testenv/bin/python3 -m pytest -v -k 'not test_generic_model and not test_using_generic_model_name_for_subfactory_raises_warning and not test_getfixturevalue and not test_model and not test_parametrized and not test_lazy_fixture_name and not test_lazy_fixture_callable and not test_override_subfactory_with_lazy_fixture and not test_postgen_invoked and not test_depends_on and not test_after_postgeneration and not test_postgeneration_fixture and not test_postgenerationmethodcall_fixture and not test_circular' } package() { diff --git a/community/py3-pytest-jupyter/APKBUILD b/community/py3-pytest-jupyter/APKBUILD index bcd0e43bf4a..294df9af29e 100644 --- a/community/py3-pytest-jupyter/APKBUILD +++ b/community/py3-pytest-jupyter/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=py3-pytest-jupyter -pkgver=0.8.0 -pkgrel=1 +pkgver=0.10.1 +pkgrel=0 pkgdesc="A pytest plugin for testing Jupyter core libraries and extensions." url="https://github.com/jupyter-server/pytest-jupyter" arch="noarch" @@ -25,5 +25,5 @@ package() { } sha512sums=" -8fc238422b762df1a39f6edcb7749a40dc3c62b71839aa5392759f2d6779b04acaa1d5fcde0ce977642a34a5487980fe49bac973f5b3cc3c188c3e022ace3fbd py3-pytest-jupyter-0.8.0.tar.gz +4d781139914a190e4d6d3488214e36f83f4485874a988c68341d42078fa13c348f7790d83a0c62c5257779752e42b686523cb786d8ce5166562a18192d385c55 py3-pytest-jupyter-0.10.1.tar.gz " diff --git a/community/py3-pytest-randomly/APKBUILD b/community/py3-pytest-randomly/APKBUILD index 11d1a55cad0..eb9037cb910 100644 --- a/community/py3-pytest-randomly/APKBUILD +++ b/community/py3-pytest-randomly/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-pytest-randomly #_pkgreal is used by apkbuild-pypi to find modules at PyPI _pkgreal=pytest-randomly pkgver=3.15.0 -pkgrel=0 +pkgrel=1 pkgdesc="Pytest plugin to randomly order tests and control random.seed." url="https://github.com/pytest-dev/pytest-randomly" arch="noarch" @@ -21,10 +21,6 @@ checkdepends=" " makedepends="py3-setuptools py3-gpep517 py3-wheel" subpackages="$pkgname-pyc" -# Failure due to pytest8 incompatibility: -# AssertionError: assert ['', 'test_on...est_b PASSED'] == ['test_one.py...est_d PASSED'] -# TODO: recheck with next release -options="!check" source="$pkgname-$pkgver.tar.gz::https://github.com/pytest-dev/pytest-randomly/archive/refs/tags/$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" @@ -37,7 +33,16 @@ build() { check() { python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl - .testenv/bin/python3 -m pytest -v + # FAILED tests/test_pytest_randomly.py::test_files_reordered - AssertionError: assert ['collecting ...st_it PASSED'] == ['test_b.py::...st_it PASSED'] + # FAILED tests/test_pytest_randomly.py::test_entrypoint_injection - AssertionError: assert [] == [call(1), cal...l(1), call(2)] + # FAILED tests/test_pytest_randomly.py::test_files_reordered_when_seed_not_reset - AssertionError: assert ['collecting ...st_it PASSED'] == ['test_b.py::...st_it PASSED'] + # FAILED tests/test_pytest_randomly.py::test_test_functions_reordered - AssertionError: assert ['collecting ...est_a PASSED'] == ['test_one.py...est_d PASSED'] + # FAILED tests/test_pytest_randomly.py::test_test_functions_reordered_when_randomness_in_module - AssertionError: assert ['collecting ...est_a PASSED'] == ['test_one.py...est_d PASSED'] + # FAILED tests/test_pytest_randomly.py::test_doctests_reordered - AssertionError: assert ['collecting ... 2 items', ''] == ['test_one.py...e.foo PASSED'] + # FAILED tests/test_pytest_randomly.py::test_classes_reordered - AssertionError: assert ['collecting ...est_b PASSED'] == ['test_one.py...est_a PASSED'] + # FAILED tests/test_pytest_randomly.py::test_class_test_methods_reordered - AssertionError: assert ['collecting ...est_b PASSED'] == ['test_one.py...est_d PASSED'] + # FAILED tests/test_pytest_randomly.py::test_doctests_in_txt_files_reordered - AssertionError: assert ['collecting ... 2 items', ''] == ['test2.txt::...t.txt PASSED'] + .testenv/bin/python3 -m pytest -v -k 'not test_files_reordered and not test_entrypoint_injection and not test_functions_reordered and not test_doctests_reordered and not test_classes_reordered and not test_classes_reordered and not test_class_test_methods_reordered and not test_doctests_in_txt_files_reordered' } package() { diff --git a/community/py3-pytest-xdist/APKBUILD b/community/py3-pytest-xdist/APKBUILD index 4df1e0d8018..5d2775bc1c3 100644 --- a/community/py3-pytest-xdist/APKBUILD +++ b/community/py3-pytest-xdist/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Dmitry Romanenko <dmitry@romanenko.in> # Maintainer: Dmitry Romanenko <dmitry@romanenko.in> pkgname=py3-pytest-xdist -pkgver=3.5.0 -pkgrel=1 +pkgver=3.6.1 +pkgrel=0 pkgdesc="pytest xdist plugin for distributed testing and loop-on-failing modes" -url="https://github.com/pytest-dev/pytest-xdist" +url="https://pytest-xdist.readthedocs.io" arch="noarch" license="MIT" depends="py3-execnet py3-pytest" checkdepends="py3-filelock py3-py py3-pexpect py3-psutil" makedepends="py3-gpep517 py3-setuptools py3-setuptools_scm py3-wheel" subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/p/pytest-xdist/pytest-xdist-$pkgver.tar.gz" -builddir="$srcdir/pytest-xdist-$pkgver" +source="https://files.pythonhosted.org/packages/source/p/pytest_xdist/pytest_xdist-$pkgver.tar.gz" +builddir="$srcdir/pytest_xdist-$pkgver" replaces="pytest-xdist" # Backwards compatibility provides="pytest-xdist=$pkgver-r$pkgrel" # Backwards compatibility @@ -35,5 +35,5 @@ package() { } sha512sums=" -1b6a896c6c69c110d1f3aa634740ffced570bbb788b3474687fef20147a5480a8681886b04db0413f7db68db546236f9a7f37e1592a74d1145f6eb6d876216ca pytest-xdist-3.5.0.tar.gz +583a78d0adc05d81458bbdd5832c239581c0fcd9cad9edfd16fa78009c005c15bffec7ed074d9e18f1542393f62d9ccb2c9e0a96d825e9cff1faec123545a2a3 pytest_xdist-3.6.1.tar.gz " diff --git a/community/py3-python-ipware/APKBUILD b/community/py3-python-ipware/APKBUILD index 852c48f5115..843945a6426 100644 --- a/community/py3-python-ipware/APKBUILD +++ b/community/py3-python-ipware/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-python-ipware _pyname="python-ipware" -pkgver=2.0.3 +pkgver=3.0.0 pkgrel=0 arch="noarch" pkgdesc="A python package for server applications to retrieve client's IP address" @@ -13,8 +13,8 @@ makedepends=" py3-gpep517 py3-wheel " -options="!check" # No testsuite -source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/p/python-ipware/python-ipware-$pkgver.tar.gz" +checkdepends="py3-pytest" +source="$pkgname-$pkgver.tar.gz::https://github.com/un33k/python-ipware/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir"/$_pyname-$pkgver subpackages="$pkgname-pyc" @@ -24,11 +24,17 @@ build() { --output-fd 3 3>&1 >&2 } +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m unittest discover +} + package() { python3 -m installer -d "$pkgdir" \ .dist/*.whl } sha512sums=" -7ecf87af3eb266c6b07dd4c55487bf06507f79788f26d100b71b46017746f810370bfe8200e9bb15618f4b37d63a29e93c311e360b4ea00df020427819b3a42c py3-python-ipware-2.0.3.tar.gz +a901b0e09f1a0d0b53725d41272e24c7cc3a0ea3250e7210de42fb233b196b8ff28153d0657a13031e5ac9618958005574230969f97a109a7bb91409d42228d5 py3-python-ipware-3.0.0.tar.gz " diff --git a/community/py3-python3-saml/APKBUILD b/community/py3-python3-saml/APKBUILD new file mode 100644 index 00000000000..bc645e1caeb --- /dev/null +++ b/community/py3-python3-saml/APKBUILD @@ -0,0 +1,54 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-python3-saml +_pkgreal=python3-saml +pkgver=1.16.0 +pkgrel=0 +pkgdesc="Saml Python Toolkit. Add SAML support to your Python software using this library" +url="https://github.com/SAML-Toolkits/python3-saml" +arch="noarch" +license="MIT" +depends="py3-xmlsec py3-isodate py3-lxml" +makedepends=" + py3-setuptools + py3-gpep517 + py3-wheel + poetry +" +checkdepends=" + py3-coverage + py3-freezegun + py3-pytest +" +source="$pkgname-$pkgver.tar.gz::https://github.com/SAML-Toolkits/python3-saml/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" +subpackages="$pkgname-pyc" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + cp -R tests .testenv/lib/python*/. # installer does not install tests as expected by pytest + # FAILED tests/src/OneLogin/saml2_tests/settings_test.py::OneLogin_Saml2_Settings_Test::testGetLibPath - AssertionError: '/hom[65 chars]l-1.16.0/.testenv/lib/python3.12/site-packages/onelogin/saml2/' != '/hom[65 chars]l-1.16.0/src/onelogin/saml2/' + # FAILED tests/src/OneLogin/saml2_tests/settings_test.py::OneLogin_Saml2_Settings_Test::testGetSchemasPath - AssertionError: '/hom[69 chars]16.0/.testenv/lib/python3.12/site-packages/one[16 chars]mas/' != '/hom[69 chars]16.0/src/onelogin/saml2/schemas/' + # FAILED tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py::OneLogin_Saml2_IdPMetadataParser_Test::testParseRemoteWithHeaders - urllib.error.URLError: <urlopen error [Errno -3] Try again> + # FAILED tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py::OneLogin_Saml2_IdPMetadataParser_Test::testGetMetadataWithHeaders - urllib.error.URLError: <urlopen error [Errno -3] Try again> + # FAILED tests/src/OneLogin/saml2_tests/response_test.py::OneLogin_Saml2_Response_Test::testIsInValidEncIssues_2 - AssertionError: 'The attributes have expired, based on the[59 chars]onse' != 'Could not validate timestamp: expired. Ch[13 chars]ock.' + # FAILED tests/src/OneLogin/saml2_tests/response_test.py::OneLogin_Saml2_Response_Test::testValidateTimestamps - AssertionError: True is not false + # FAILED tests/src/OneLogin/saml2_tests/utils_test.py::OneLogin_Saml2_Utils_Test::testAddSign - AttributeError: 'Text' object has no attribute 'tagName' + .testenv/bin/python3 -m pytest -v -k 'not testGetLibPath and not testGetSchemasPath and not testParseRemoteWithHeaders and not testGetMetadataWithHeaders and not testIsInValidEncIssues_2 and not testValidateTimestamps and not testAddSign' +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +77e779a3d3190f3164105bbc2943b54729dfef12c71b0303a523acada95da291bc77b331a83726f00c503ef09040a05180c234620e5a65d4ea4fd88da24eeade py3-python3-saml-1.16.0.tar.gz +" diff --git a/community/py3-pytoml/APKBUILD b/community/py3-pytoml/APKBUILD index ff91e5ce9a1..f99b67ee78c 100644 --- a/community/py3-pytoml/APKBUILD +++ b/community/py3-pytoml/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> -# Maintainer: +# Maintainer: fossdd <fossdd@pwned.life> pkgname=py3-pytoml pkgver=0.1.21 -pkgrel=6 +pkgrel=7 _test_commit=bbfef3b9277eac47e5d6e9e507c99f0a40a61f8a pkgdesc="TOML-0.4.0 parse/writer for Python3" url="https://github.com/avakar/pytoml" diff --git a/community/py3-qtwebengine/APKBUILD b/community/py3-qtwebengine/APKBUILD index 2046991ec25..ec271de70ae 100644 --- a/community/py3-qtwebengine/APKBUILD +++ b/community/py3-qtwebengine/APKBUILD @@ -6,8 +6,8 @@ pkgdesc="Python 3 bindings for QtWebEngine" url="https://www.riverbankcomputing.com/software/pyqtwebengine/intro" # ppc64le and s390x are not supported # armhf blocked by py3-qt5 -> qt5-qtdeclarative -# riscv64 blocked by qt5-qtwebengine -arch="all !ppc64le !s390x !armhf !riscv64" +# riscv64 and loongarch64 blocked by qt5-qtwebengine +arch="all !ppc64le !s390x !armhf !riscv64 !loongarch64" license="GPL-2.0-or-later" depends="python3" makedepends=" diff --git a/community/py3-quantiphy/APKBUILD b/community/py3-quantiphy/APKBUILD index 23d50255421..ab8c7d29060 100644 --- a/community/py3-quantiphy/APKBUILD +++ b/community/py3-quantiphy/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Andy Hawkins <andy@gently.org.uk> # Maintainer: Andy Hawkins <andy@gently.org.uk> pkgname=py3-quantiphy -pkgver=2.19 -pkgrel=2 +pkgver=2.20 +pkgrel=0 pkgdesc="Physical Quantities" url="https://quantiphy.readthedocs.io/" arch="noarch" @@ -42,5 +42,5 @@ package() { } sha512sums=" -8f76a493997ff51d325ad6e043c12cf0ea272cd1962cf7a9d3b354b2eb2d3c581eda4b3e291b174ba2fe7a1f2f151ed2720c16b9c428e03c22705afb74418755 quantiphy-v2.19.tar.gz +53a221ee5e2bcf8276a603fd76c6abe4c9683284e12d64c59f54f852d814c2001e0798551b4a301f5cf4e6aab4cee3734bed158d69a176624da6c4841d988525 quantiphy-v2.20.tar.gz " diff --git a/community/py3-rapidfuzz/APKBUILD b/community/py3-rapidfuzz/APKBUILD index bd733d82c5b..13fcf7968d6 100644 --- a/community/py3-rapidfuzz/APKBUILD +++ b/community/py3-rapidfuzz/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-rapidfuzz -pkgver=3.6.1 -pkgrel=1 +pkgver=3.9.0 +pkgrel=0 pkgdesc="Rapid fuzzy string matching in Python using various string metrics" url="https://github.com/maxbachmann/RapidFuzz" arch="all" @@ -54,5 +54,5 @@ package() { } sha512sums=" -17b40c9c3f94277340568f32ef121b277882e9191ad445df930cb394adb47bc4207008932550e74990af0d284c7af00e8ea3003114113a109a629117ebd9859c rapidfuzz-3.6.1.tar.gz +bfd0d399dc75c6654d5e66522a057298d3914f8b74955e873034b314926127971f1bf4ddca0c2c92e81ba5bae79caf249303b169805d48ef3d6c64fb706c9547 rapidfuzz-3.9.0.tar.gz " diff --git a/community/py3-recipe-scrapers/APKBUILD b/community/py3-recipe-scrapers/APKBUILD index adc37f4a23f..88923d52d09 100644 --- a/community/py3-recipe-scrapers/APKBUILD +++ b/community/py3-recipe-scrapers/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-recipe-scrapers +pkgver=14.56.0 +pkgrel=0 #_pkgreal is used by apkbuild-pypi to find modules at PyPI _pkgreal=recipe-scrapers -pkgver=14.55.0 -pkgrel=1 pkgdesc="Python package, scraping recipes from all over the internet" url="https://pypi.python.org/project/recipe-scrapers" arch="noarch" @@ -34,5 +34,5 @@ package() { } sha512sums=" -43a3ae6f9fa55c663bccf6873004e062e6f19677c20b6b279fb228eb08ff30a2c681f3dfc4191f5d397abc5657e8442e795ca9dcf0772d4c719ba9a0d87e59c3 py3-recipe-scrapers-14.55.0.tar.gz +19fbc68d1b7f7a3d981541f5a98c4727119051ca2282295e4fde2d15e61e683db934f4238e77b2aa584ea9915ada09d14464ba88a44de777e228fa2280a38bb0 py3-recipe-scrapers-14.56.0.tar.gz " diff --git a/community/py3-redis/APKBUILD b/community/py3-redis/APKBUILD index 3580f5e7f79..ac1e407598c 100644 --- a/community/py3-redis/APKBUILD +++ b/community/py3-redis/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Eivind Uggedal <eu@eju.no> pkgname=py3-redis _pkgname=redis -pkgver=5.0.3 -pkgrel=1 +pkgver=5.0.4 +pkgrel=0 pkgdesc="Python3 client for Redis key-value store" url="https://github.com/andymccurdy/redis-py" arch="noarch" @@ -43,5 +43,5 @@ package() { } sha512sums=" -c5a5420c6b64f8435bc6cdde51ff093a3616f28393b3a106b21801f389939fdfaf884512b05eac9643e8d566b2f8c54046f20b1b94e61e022f79cff2a91e0227 py3-redis-5.0.3.tar.gz +b456364dc32a5ddef7dbaed821a8b48bd3c1ee56cf2b48ba119f6273070611f1ef0ecfff5dcc0012b46fe93c222616deb09af3129df77bfce344b6ef927ad052 py3-redis-5.0.4.tar.gz " diff --git a/community/py3-referencing/APKBUILD b/community/py3-referencing/APKBUILD index bc4402cd7a8..51f685abc71 100644 --- a/community/py3-referencing/APKBUILD +++ b/community/py3-referencing/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-referencing -pkgver=0.34.0 -pkgrel=1 +pkgver=0.35.0 +pkgrel=0 pkgdesc="Cross-specification JSON referencing" url="https://github.com/python-jsonschema/referencing" arch="noarch" @@ -33,5 +33,5 @@ package() { } sha512sums=" -97e4cfe0fb306068abfd6c0348d12483cbd3705c0b4c8852c0f0209c4d05be08bf77fa3ec56af77a2815a4ff3294ff06d3f09f213a165ae17bdcab246e47c178 referencing-0.34.0.tar.gz +c637a3767a7d03445adb14bcb4c1e9c9a069779d31c5043f300e34398c9c728dfe09cdf9601516a96280d6c095740114e3bd4a6b5103f8a1938b1be6b9cb9cb3 referencing-0.35.0.tar.gz " diff --git a/community/py3-retry/APKBUILD b/community/py3-retry/APKBUILD new file mode 100644 index 00000000000..5baafa5173b --- /dev/null +++ b/community/py3-retry/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-retry +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=retry +pkgver=0.9.2 +pkgrel=0 +pkgdesc="Easy to use retry decorator" +url="https://github.com/invl/retry" +arch="noarch" +license="Apache-2.0" +depends=" + py3-decorator + py3-py +" +checkdepends=" + py3-pytest +" +makedepends=" + py3-setuptools + py3-gpep517 + py3-wheel +" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/invl/retry/archive/refs/tags/$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +69b4a24cb185a0ddf86b098de8fbb31b311c0b76bad39516c62dfbc30f9706868b8482d4e8697fa782a16e83b713151d03eef10aae49bb0e5ba669ad5add13a1 py3-retry-0.9.2.tar.gz +" diff --git a/community/py3-rfc3339-validator/APKBUILD b/community/py3-rfc3339-validator/APKBUILD new file mode 100644 index 00000000000..5733ebe18bb --- /dev/null +++ b/community/py3-rfc3339-validator/APKBUILD @@ -0,0 +1,49 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-rfc3339-validator +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=rfc3339-validator +pkgver=0.1.4 +pkgrel=0 +pkgdesc="A pure python RFC3339 validator" +url="https://github.com/naimetti/rfc3339-validator" +arch="noarch" +license="MIT" +depends=" + py3-six +" +checkdepends=" + py3-pytest + py3-strict-rfc3339 + py3-hypothesis +" +makedepends=" + py3-setuptools + py3-gpep517 + py3-wheel +" +options="!check" # missing py3-strict-rfc3339 +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/naimetti/rfc3339-validator/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +ed593b31c4984cdbc313e42dc0432173eaa649712e29627ab462dfa262efb30cee97b74f589d3d211c2193623fac3baca560a52a7a3f718071a63482e06c4203 py3-rfc3339-validator-0.1.4.tar.gz +" diff --git a/community/py3-rpy2/APKBUILD b/community/py3-rpy2/APKBUILD index 75ca60f220d..0c99af2ead6 100644 --- a/community/py3-rpy2/APKBUILD +++ b/community/py3-rpy2/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-rpy2 _pyname="rpy2" pkgver=3.5.16 -pkgrel=1 +pkgrel=2 pkgdesc="A very simple, yet robust, Python interface to the R Programming Language" url="https://pypi.python.org/project/rpy2" # riscv64: R missing @@ -23,11 +23,11 @@ makedepends=" py3-wheel python3-dev R-dev + libdeflate-dev " checkdepends=" py3-pytest " -options="!check" # test failures due to missing R packages source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/r/rpy2/rpy2-$pkgver.tar.gz" builddir="$srcdir"/$_pyname-$pkgver subpackages="$pkgname-pyc" @@ -39,8 +39,11 @@ build() { } check() { - PYTHONPATH="$PWD"/$(echo build/lib.*) \ - pytest -v -k 'not test_rendertofile and not test_rendertobytes_plot' # Skip test that segfaults in build server + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + # test_rendertofile | test_rendertobytes_plit: Segfaults in build server + # test_find_onlyfromloadedlibrary: Error in detach("package:survival") : invalid 'name' argument + .testenv/bin/python3 -m pytest -v -k 'not test_rendertofile and not test_rendertobytes_plot and not test_find_onlyfromloadedlibrary' } package() { diff --git a/community/py3-s3transfer/APKBUILD b/community/py3-s3transfer/APKBUILD index 1fda28a811c..cf23b96b247 100644 --- a/community/py3-s3transfer/APKBUILD +++ b/community/py3-s3transfer/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> pkgname=py3-s3transfer _pkgname=s3transfer -pkgver=0.6.1 -pkgrel=2 +pkgver=0.10.1 +pkgrel=0 pkgdesc="Amazon S3 Transfer Manager for Python" url="https://github.com/boto/s3transfer" arch="noarch" @@ -31,5 +31,5 @@ package() { } sha512sums=" -f7a298bc95ac8267f155065b924d8a799ce9173319db125aec3ed3e1c7d2c8cfc0af65c393eac634300e19e70733644816af4ede6a2a51fceaaa7bfb2163cbc3 s3transfer-0.6.1.tar.gz +20f5d2a21ef8e3427e1977a15f4e5ca179872443e396444a78287edea24a95bb2742ecec7fdceb13d4b13e0c0482bfe5d732a516d99cb6d67843a84cc55269d0 s3transfer-0.10.1.tar.gz " diff --git a/testing/py3-sarge/APKBUILD b/community/py3-sarge/APKBUILD index 4036da557a9..a1bbb5c75e0 100644 --- a/testing/py3-sarge/APKBUILD +++ b/community/py3-sarge/APKBUILD @@ -1,12 +1,12 @@ -# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks> -# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks> +# Contributor: lauren n. liberda <lauren@selfisekai.rocks> +# Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=py3-sarge pkgver=0.1.7 pkgrel=1 pkgdesc="Subprocess Allegedly Rewards Good Encapsulation" url="https://github.com/vsajip/sarge" arch="noarch" -license="BSD-3-Clause" # effectively BSD-3-clause but not exact text +license="BSD-3-Clause" makedepends="py3-gpep517 py3-setuptools py3-wheel" checkdepends="py3-pytest" subpackages="$pkgname-pyc" diff --git a/community/py3-scikit-plot/APKBUILD b/community/py3-scikit-plot/APKBUILD index a430eb811e3..feac3bf6a2b 100644 --- a/community/py3-scikit-plot/APKBUILD +++ b/community/py3-scikit-plot/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="An intuitive library to add plotting functionality to scikit-learn obje url="https://github.com/reiinakano/scikit-plot" arch="noarch" license="MIT" -depends="python3 py3-joblib py3-matplotlib py3-scipy py3-scikit-learn" +depends="python3 py3-joblib py3-matplotlib py3-scipy<1.13 py3-scikit-learn" checkdepends="py3-pytest-xdist" makedepends="py3-gpep517 py3-setuptools py3-wheel" subpackages="$pkgname-pyc" diff --git a/community/py3-scipy/APKBUILD b/community/py3-scipy/APKBUILD index 4cd13c91153..bb5e4e53245 100644 --- a/community/py3-scipy/APKBUILD +++ b/community/py3-scipy/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Martell Malone <martellmalone@gmail.com> -# Contributor: fossdd <fosdd@pwned.life> -# Maintainer: fossdd <fosdd@pwned.life> +# Contributor: fossdd <fossdd@pwned.life> +# Maintainer: fossdd <fossdd@pwned.life> pkgname=py3-scipy -pkgver=1.13.0 -pkgrel=0 +pkgver=1.11.4 +pkgrel=2 pkgdesc="Python library for scientific computing" url="https://www.scipy.org/" arch="all" @@ -22,7 +22,6 @@ makedepends=" py3-wheel python3-dev pythran - cython " checkdepends="py3-hypothesis py3-pytest" subpackages="$pkgname-tests $pkgname-pyc" @@ -32,10 +31,6 @@ builddir="$srcdir"/scipy-$pkgver replaces=py-scipy # Backwards compatibility provides=py-scipy=$pkgver-r$pkgrel # Backwards compatibility -case "$CARCH" in - riscv64) options="$options !check";; # FIXME: tests hangs -esac - build() { case "$CARCH" in ppc64le) @@ -72,5 +67,5 @@ tests() { } sha512sums=" -9bd6fd3f76742a07e5bb003edf4c0e3a82edf749077502fbce3d16fe595d455846edcf57db12ec0a9d4792803e974355362d919047414badfcaededf1e4343f7 scipy-1.13.0.tar.gz +2eb403f6de9723b411d948b8e1b5457078704c605b8e760d42362c82d802e167eaaf701ddb8b480af2bdf2efe4dbf66fcc4e97321519bb8dab19b0e2a8976beb scipy-1.11.4.tar.gz " diff --git a/community/py3-shapely/APKBUILD b/community/py3-shapely/APKBUILD index 876db2b6deb..e2a026bbdf5 100644 --- a/community/py3-shapely/APKBUILD +++ b/community/py3-shapely/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=py3-shapely -pkgver=2.0.3 -pkgrel=1 +pkgver=2.0.4 +pkgrel=0 pkgdesc="Manipulation and analysis of geometric objects in the Cartesian plane" url="https://pypi.org/project/Shapely" arch="all" @@ -50,5 +50,5 @@ package() { } sha512sums=" -4ac5c7d78a9d69332c974ef0ff85deb966a6693a6c8973f22b4ce62a6882c7e6d1003536e1df9cf07e48996b8eb263e5596ae378bf5201a583337d0bc4cb861c shapely-2.0.3.tar.gz +2c6b0a0efc591a9aec2b257209340a4043247a914f4a2482948b4235a1bf34d4fd5e4e01698fbdeef035164c435c3be6c574324b4f4a5ab8f83330682a58bde7 shapely-2.0.4.tar.gz " diff --git a/testing/py3-shortuuid/APKBUILD b/community/py3-shortuuid/APKBUILD index 4fd011cf015..b3d02d17952 100644 --- a/testing/py3-shortuuid/APKBUILD +++ b/community/py3-shortuuid/APKBUILD @@ -1,32 +1,37 @@ -# Maintainer: +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-shortuuid _pkgname=shortuuid pkgver=1.0.11 -pkgrel=3 +pkgrel=4 pkgdesc="Python library that generates short, pretty, unambiguous unique IDs" url="https://pypi.org/project/shortuuid/" arch="noarch" license="BSD-3-Clause" depends="python3" -makedepends="py3-setuptools" -checkdepends="py3-django" +makedepends="py3-setuptools py3-wheel py3-installer poetry py3-gpep517" +checkdepends="py3-pytest-django" subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/s/shortuuid/shortuuid-$pkgver.tar.gz" builddir="$srcdir/shortuuid-$pkgver" replaces="py-shortuuid" # Backwards compatibility provides="py-shortuuid=$pkgver-r$pkgrel" # Backwards compatibility build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { - python3 setup.py test + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest -v } package() { - python3 setup.py install --skip-build --root="$pkgdir" + python3 -m installer -d "$pkgdir" \ + .dist/*.whl } sha512sums=" diff --git a/testing/py3-shtab/APKBUILD b/community/py3-shtab/APKBUILD index 21b7f95f538..a8c2d980d26 100644 --- a/testing/py3-shtab/APKBUILD +++ b/community/py3-shtab/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Keith Toh <ktprograms@gmail.com> pkgname=py3-shtab -pkgver=1.6.4 -pkgrel=1 +pkgver=1.7.1 +pkgrel=0 pkgdesc="Automagic shell tab completion for Python CLI applications" url="https://docs.iterative.ai/shtab/" arch="noarch" @@ -40,5 +40,5 @@ doc() { } sha512sums=" -35db209e2dcb2342c944f8cf37dafa3191e01e304037cb46dec6742b4a29724e30912f23986e989f7d159f253f4b61cff5f02262716efb1aab030ecd9511b984 shtab-1.6.4.tar.gz +749f21e5b4eba75744a270809b761e7c795e4404727f8e6da87f6620622e42dc6e35aa923c7f8df34bec27af45ec16496fdab11b8450edb09067df9c830ae219 shtab-1.7.1.tar.gz " diff --git a/community/py3-softlayer/APKBUILD b/community/py3-softlayer/APKBUILD index 1a91f086303..566e0766f36 100644 --- a/community/py3-softlayer/APKBUILD +++ b/community/py3-softlayer/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-softlayer -pkgver=6.1.11 -pkgrel=1 +pkgver=6.2.0 +pkgrel=0 pkgdesc="library for SoftLayer's API" url="https://github.com/softlayer/softlayer-python" arch="noarch" @@ -33,5 +33,5 @@ package() { } sha512sums=" -8c1551bb3eea53b95d5f38fcb8a6220883a2aca4a0d85481145d259f9d822858417131e4e2083d1c626c404539690f14b3003d07d8429209e1c831241157ac48 py3-softlayer-6.1.11.tar.gz +dd1bacafa81bddc255a8fc266c9a2c5a04779a4c4a8eb67cdf1261c8ec685a8963580b3921b36ac7cdc1b6a47cf84f862cecbd02e4b9575666308734f8458c36 py3-softlayer-6.2.0.tar.gz " diff --git a/community/py3-speechrecognition/APKBUILD b/community/py3-speechrecognition/APKBUILD index 02ed08f1912..047d85a3150 100644 --- a/community/py3-speechrecognition/APKBUILD +++ b/community/py3-speechrecognition/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=py3-speechrecognition -pkgver=3.10.3 -pkgrel=1 +pkgver=3.10.4 +pkgrel=0 pkgdesc="Library for performing speech recognition, with support for several engines and APIs, online and offline" url="https://github.com/Uberi/speech_recognition/" # s390x blocked by failing tests @@ -53,5 +53,5 @@ package() { } sha512sums=" -09bb7539df466d6452d187482dd8683f2f157f407eb962d41f8e7b6b16bb654d022d7ce79aea68d314bf10ad0a2a9b8dacff57b1bf5de9a83a3b5477d238263f py3-speechrecognition-3.10.3.tar.gz +cbdc055f4df03cfaa91855cc32bc8658e6ef2465f6e5855e78f18e16dd7dbf615e7a255ad43f7412bcc100012c1e4d94ab01ffed6b021f40907241f286e1ebee py3-speechrecognition-3.10.4.tar.gz " diff --git a/testing/py3-sphinxcontrib-autoprogram/APKBUILD b/community/py3-sphinxcontrib-autoprogram/APKBUILD index 9a1f6f8c5fa..3aa93964819 100644 --- a/testing/py3-sphinxcontrib-autoprogram/APKBUILD +++ b/community/py3-sphinxcontrib-autoprogram/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=py3-sphinxcontrib-autoprogram -pkgver=0.1.8 -pkgrel=2 +pkgver=0.1.9 +pkgrel=0 pkgdesc="Sphinx extension to document CLI programs" url="https://github.com/sphinx-contrib/autoprogram" arch="noarch" @@ -37,5 +37,5 @@ package() { } sha512sums=" -bc07f25c34884f8e3130bbe5d2d6fb645f45aca5794c6b11a772f0351d680380d3e63cfe4b60aabf05ad8c6f44bae72e592500454598d31cc3c98dcbc8dbf899 py3-sphinxcontrib-autoprogram-0.1.8.tar.gz +2f32f4686bdfb6ea6a1696b92577841dbb820992e6108d839eb3d5afd8af8befe4e66700facf1c57044b61f07d71dfc28f55490abe2fb74de82fc5946244fad3 py3-sphinxcontrib-autoprogram-0.1.9.tar.gz " diff --git a/community/py3-starlette/APKBUILD b/community/py3-starlette/APKBUILD index 15348436b83..9f749497a29 100644 --- a/community/py3-starlette/APKBUILD +++ b/community/py3-starlette/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Marten Ringwelski <git+alpine@maringuu.de> # Contributor: Steven Guikal <apk-void@fluix.one> -# Maintainer: Marten Ringwelski <git+alpine@maringuu.de> +# Maintainer: Steven Guikal <apk-void@fluix.one> pkgname=py3-starlette pkgver=0.37.2 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight ASGI framework/toolkit, which is ideal for building async web services in Python" url="https://github.com/encode/starlette" arch="noarch" diff --git a/community/py3-statsmodels/APKBUILD b/community/py3-statsmodels/APKBUILD index 1cd328919dc..2e1990bb8ce 100644 --- a/community/py3-statsmodels/APKBUILD +++ b/community/py3-statsmodels/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-statsmodels -pkgver=0.14.1 -pkgrel=1 +pkgver=0.14.2 +pkgrel=0 pkgdesc="Statistical modeling and econometrics in Python" url="https://www.statsmodels.org/" arch="all" @@ -46,5 +46,5 @@ package() { } sha512sums=" -e382ca807205e2aeff76dd22b42e7824914472588ea040d90835fd46e0c993e155828c58e81f53f9539ad9bdf195bbbd1a49a45658187498d60287374112fd68 py3-statsmodels-0.14.1.tar.gz +0a38482bccac61081ff0c8de3b9fcf81689ec15437c53d79a8949df058e0ac8a4e93136a50a37a06577108dc29f1a51e0d00e041ee7e8f9dff93b6e8cf1f0f16 py3-statsmodels-0.14.2.tar.gz " diff --git a/community/py3-tika/APKBUILD b/community/py3-tika/APKBUILD index 0f1a71b1f2b..d44dd98e662 100644 --- a/community/py3-tika/APKBUILD +++ b/community/py3-tika/APKBUILD @@ -3,19 +3,31 @@ pkgname=py3-tika _pyname="tika" pkgver=2.6.0 -pkgrel=1 -arch="noarch" +pkgrel=2 +# x86 | armv7 | armhf: blocked by openjdk +# riscv64: Unable to start Tika server +arch="noarch !riscv64 !x86 !armv7 !armhf" pkgdesc="Apache Tika Python library" url="https://pypi.python.org/project/tika" license="Apache-2.0" +depends=" + py3-requests +" makedepends=" py3-setuptools py3-gpep517 py3-wheel - " -options="!check" # Failing testsuite -source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/t/tika/tika-$pkgver.tar.gz" -builddir="$srcdir"/$_pyname-$pkgver +" +checkdepends=" + py3-pytest + py3-pytest-benchmark + py3-pytest-cov + py3-coveralls + py3-yaml + openjdk21-jre-headless +" +source="$pkgname-$pkgver-gh.tar.gz::https://github.com/chrismattmann/tika-python/archive/refs/tags/$pkgver.tar.gz" +builddir="$srcdir"/tika-python-$pkgver subpackages="$pkgname-pyc" build() { @@ -25,7 +37,10 @@ build() { } check() { - pytest -v + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + # test_url | test_remote_jpg: urllib.error.HTTPError: HTTP Error 404: Not Found + .testenv/bin/python3 -m pytest -v -k 'not test_url and not test_remote_jpg' } package() { @@ -34,5 +49,5 @@ package() { } sha512sums=" -092986afd0968d41b6a0274b1f1cac5f6a168bc79cea920f65543c46b6541b6b02eceb0ae89fc254b709421dd75ebe50aad0f17a52becbdb27a541b80a08a0ae py3-tika-2.6.0.tar.gz +8182fc9e4905343bac9e00b60fbcc1434559d7b1bdec17b2d32a5e09209efe1734a8858c08fbb19906c747d98351f9a4deceefeb67c5430e4bb481afe7af4e8f py3-tika-2.6.0-gh.tar.gz " diff --git a/community/py3-tinycss2/APKBUILD b/community/py3-tinycss2/APKBUILD index 589a8afb6f9..84be3bd5feb 100644 --- a/community/py3-tinycss2/APKBUILD +++ b/community/py3-tinycss2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-tinycss2 -pkgver=1.2.1 -pkgrel=6 +pkgver=1.3.0 +pkgrel=0 pkgdesc="Low-level CSS parser for Python" url="https://pypi.org/project/tinycss2" arch="noarch" @@ -31,5 +31,5 @@ package() { } sha512sums=" -633198637f1d7cb802d1a7336a01447fc6b902cda1ade6c526e403fc2a5319277e1457c68a06780f7a6254d4c0dbf42df5d32969536ea697887a2de3e98a5f1a tinycss2-1.2.1.tar.gz +d215ba2d8c580ca785bc2c3e33c8ae220c085e3ec1b932c01f81e176987c48559867af186056e2c501541d1d337b4fc33eea7ff2feba490e81076608b7c3aaee tinycss2-1.3.0.tar.gz " diff --git a/community/py3-tinynarm/APKBUILD b/community/py3-tinynarm/APKBUILD index d2928d9354b..8b0c6c7a973 100644 --- a/community/py3-tinynarm/APKBUILD +++ b/community/py3-tinynarm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-tinynarm pkgver=0.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="Simplify numerical association rule mining" url="https://gitlab.com/firefly-cpp/tinynarm" arch="noarch" @@ -10,7 +10,7 @@ license="MIT" depends="python3 py3-niaarm" makedepends="py3-poetry-core py3-gpep517" checkdepends="py3-pytest-xdist" -subpackages="$pkgname-pyc" +subpackages="$pkgname-doc $pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://gitlab.com/firefly-cpp/tinynarm/-/archive/$pkgver/tinynarm-$pkgver.tar.gz" builddir="$srcdir/tinynarm-$pkgver" @@ -29,6 +29,9 @@ check() { package() { python3 -m installer -d "$pkgdir" \ .dist/tinynarm-$pkgver-py3-none-any.whl + + install -Dm644 CITATION.cff -t "$pkgdir"/usr/share/doc/$pkgname + install -Dm644 README.md -t "$pkgdir"/usr/share/doc/$pkgname } sha512sums=" diff --git a/community/py3-tornado/APKBUILD b/community/py3-tornado/APKBUILD index 129baf60226..fa163cec908 100644 --- a/community/py3-tornado/APKBUILD +++ b/community/py3-tornado/APKBUILD @@ -2,7 +2,7 @@ pkgname=py3-tornado _pkgname=tornado pkgver=6.4 -pkgrel=1 +pkgrel=2 pkgdesc="Python3 web framework and asynchronous networking library" options="!check" # 3 Tests fail by failure to resolve 'localhost' url="https://www.tornadoweb.org/" @@ -12,7 +12,9 @@ depends="python3" makedepends="python3-dev py3-gpep517 py3-setuptools py3-wheel" checkdepends="py3-curl py3-mock py3-twisted" subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz + fix-pytest-8.2-compat.patch + " builddir="$srcdir/$_pkgname-$pkgver" replaces="py-tornado" # Backwards compatibility @@ -39,4 +41,5 @@ package() { sha512sums=" c063509d4c385e410c63cccdc1e9c66aa2bb739473667ede56cb801b7379b910c8059dec831d609109f3076222b588b257afd960dffa422d7a872867dcdda7c7 tornado-6.4.tar.gz +4ceaf3ab5dcc1137c680ab482d712f1059dd4905bc9803c1a53f1aab3a56e45dd00d8c44ed2b2e1532d8a60343cf25056e9b872677e97167a6100abb589883e5 fix-pytest-8.2-compat.patch " diff --git a/community/py3-tornado/fix-pytest-8.2-compat.patch b/community/py3-tornado/fix-pytest-8.2-compat.patch new file mode 100644 index 00000000000..0ee44064b16 --- /dev/null +++ b/community/py3-tornado/fix-pytest-8.2-compat.patch @@ -0,0 +1,68 @@ +Patch-Source: https://github.com/tornadoweb/tornado/pull/3374 +-- +From c851aa8a949524b35f72c82b45a52353aa3c0558 Mon Sep 17 00:00:00 2001 +From: Ran Benita <ran@unusedvar.com> +Date: Sun, 28 Apr 2024 14:17:54 +0300 +Subject: [PATCH] testing: allow to instantiate an empty AsyncTestCase + +`unittest.TestCase` has a feature where it allows instantiating +`MyTestClass()` with the default method name `runTest` even if a +`runTest` method doesn't actually exist. This is documented in +`TestCase`'s docs under "Changed in version 3.2"[0]. + +Since version 8.2, pytest relies on this, and started breaking on +Tornado's `AsyncTestCase`[1]. + +Change `AsyncTestCase` to allow empty instatiation, by matching the +upstream code. + +[0] https://docs.python.org/3/library/unittest.html#unittest.TestCase +[1] https://github.com/pytest-dev/pytest/issues/12263 +--- + tornado/test/testing_test.py | 9 +++++++++ + tornado/testing.py | 12 +++++++++++- + 2 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py +index 0429feee83..8e2b8db428 100644 +--- a/tornado/test/testing_test.py ++++ b/tornado/test/testing_test.py +@@ -61,6 +61,15 @@ def test_subsequent_wait_calls(self): + self.io_loop.add_timeout(self.io_loop.time() + 0.2, self.stop) + self.wait(timeout=0.4) + ++ def test_empty_instantation_is_allowed(self): ++ """ ++ Test that empty instatiation of an AsyncTestCase is allowed. ++ ++ unittest.TestCase docs guarantee this working, and pytest's unittest ++ support relies on it. ++ """ ++ AsyncTestCaseTest() ++ + + class LeakTest(AsyncTestCase): + def tearDown(self): +diff --git a/tornado/testing.py b/tornado/testing.py +index bdbff87bc3..9455411a6d 100644 +--- a/tornado/testing.py ++++ b/tornado/testing.py +@@ -177,7 +177,17 @@ def __init__(self, methodName: str = "runTest") -> None: + # the test will silently be ignored because nothing will consume + # the generator. Replace the test method with a wrapper that will + # make sure it's not an undecorated generator. +- setattr(self, methodName, _TestMethodWrapper(getattr(self, methodName))) ++ try: ++ test_method = getattr(self, methodName) ++ except AttributeError: ++ if methodName != "runTest": ++ # We allow instantiation with no explicit method name ++ # but not an *incorrect* or missing method name. ++ raise ValueError( ++ "no such test method in %s: %s" % (self.__class__, methodName) ++ ) ++ else: ++ setattr(self, methodName, _TestMethodWrapper(test_method)) + + # Not used in this class itself, but used by @gen_test + self._test_generator = None # type: Optional[Union[Generator, Coroutine]] diff --git a/community/py3-tqdm/APKBUILD b/community/py3-tqdm/APKBUILD index 02270ccbc89..39616de9680 100644 --- a/community/py3-tqdm/APKBUILD +++ b/community/py3-tqdm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=py3-tqdm -pkgver=4.66.2 -pkgrel=2 +pkgver=4.66.4 +pkgrel=0 pkgdesc="Fast, Extensible Progress Meter" url="https://pypi.org/project/tqdm" arch="noarch" @@ -24,15 +24,9 @@ builddir="$srcdir/tqdm-$pkgver" replaces="py-tqdm" # Backwards compatibility provides="py-tqdm=$pkgver-r$pkgrel" # Backwards compatibility -prepare() { - default_prepare - case "$CARCH" in - # FIXME: remove selected failing tests on selected arches - aarch64) rm -v tests/tests_perf.py;; - s390x) rm -v tests/tests_perf.py;; - x86) rm -v tests/tests_synchronisation.py;; - esac -} +# secfixes: +# 4.66.4-r0: +# - CVE-2024-34062 build() { export SETUPTOOLS_SCM_PRETEND_VERSION="$pkgver" @@ -46,7 +40,16 @@ check() { .testenv/bin/python3 -m installer .dist/*.whl # 30s timeout - .testenv/bin/python3 -m pytest -k 'not test_lock_args' + case "$CARCH" in + riscv64) + .testenv/bin/python3 -m pytest \ + --ignore tests/tests_perf.py + ;; + *) + .testenv/bin/python3 -m pytest \ + --deselect tests/tests_perf.py::test_lock_args + ;; + esac } package() { @@ -56,5 +59,5 @@ package() { } sha512sums=" -49abd9006ca7c8672835b202e4e722602035a0e21723337b4227e114d6d50b678edb6c5f2b0cf4e6741eae5e86551ba59233f87989f6b69bb4d4414d5a3c80e5 tqdm-4.66.2.tar.gz +fdafa64784564f7f400f29ffa75ba564a3c9bc6d935a1ccd82260d4a1f4431792a9dae2d5c6ed69cc265f078f674081589a040d47b8745a500870d27670feadc tqdm-4.66.4.tar.gz " diff --git a/community/py3-traitlets/APKBUILD b/community/py3-traitlets/APKBUILD index 39ab9873c53..3ff8c4fbeef 100644 --- a/community/py3-traitlets/APKBUILD +++ b/community/py3-traitlets/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=py3-traitlets -pkgver=5.14.1 -pkgrel=1 +pkgver=5.14.2 +pkgrel=0 pkgdesc="lightweight Traits like module" url="https://traitlets.readthedocs.io/" arch="noarch" @@ -29,5 +29,5 @@ package() { } sha512sums=" -b16a2882b9c69578d85ab1dcf59543c02442405937767a419416d83f46b351d3c93e128fb116f2b695a38e717213b56e2a5cce0cb0202432e5bd301aad23a745 traitlets-5.14.1.tar.gz +3ef8f1494a5257d2e8b0b4f3705913ba73b2eb2a0b02175bdf43257cfe7f0034d4f49cfc5b38021bd4def1e3e7e4a5534e99367b1faca5c3d7e861903079863a traitlets-5.14.2.tar.gz " diff --git a/testing/py3-ufonormalizer/APKBUILD b/community/py3-ufonormalizer/APKBUILD index 11a73d1a3b7..c4bf8d3d047 100644 --- a/testing/py3-ufonormalizer/APKBUILD +++ b/community/py3-ufonormalizer/APKBUILD @@ -3,30 +3,33 @@ pkgname=py3-ufonormalizer _pyname=ufonormalizer pkgver=0.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="Normalize the XML and other data inside UFO font design sources" url="https://github.com/unified-font-object/ufoNormalizer" arch="noarch" license="BSD-3-Clause" depends="python3" -makedepends="py3-setuptools py3-setuptools_scm" +makedepends="py3-gpep517 py3-setuptools py3-setuptools_scm py3-wheel" +checkdepends="py3-pytest" subpackages="$pkgname-pyc" source="https://files.pythonhosted.org/packages/source/u/$_pyname/$_pyname-$pkgver.zip" builddir="$srcdir/$_pyname-$pkgver" build() { export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { - python3 setup.py check + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest } package() { - python3 setup.py install --skip-build --root="$pkgdir" - # Make files world-readable so others than root can run the installed script. - chmod -R a+r "$pkgdir"/usr/lib/python3*/site-packages + python3 -m installer -d "$pkgdir" .dist/*.whl } sha512sums=" diff --git a/community/py3-urllib3-secure-extra/APKBUILD b/community/py3-urllib3-secure-extra/APKBUILD index 10b8bf6d85e..1709471dfc4 100644 --- a/community/py3-urllib3-secure-extra/APKBUILD +++ b/community/py3-urllib3-secure-extra/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-urllib3-secure-extra _pyname=urllib3-secure-extra pkgver=0.1.0 -pkgrel=1 +pkgrel=2 arch="noarch" pkgdesc="Marker library to detect whether urllib3 was installed with the deprecated [secure] extra" url="https://pypi.python.org/project/urllib3-secure-extra" @@ -15,10 +15,12 @@ makedepends=" py3-gpep517 py3-setuptools py3-wheel - py3-flit + py3-flit-core " -options="!check" # No testsuite -source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/u/urllib3-secure-extra/urllib3-secure-extra-$pkgver.tar.gz" +checkdepends=" + py3-pytest +" +source="$pkgname-$pkgver-gh.tar.gz::https://github.com/urllib3/urllib3-secure-extra/archive/refs/tags/$pkgver.tar.gz" builddir="$srcdir"/$_pyname-$pkgver subpackages="$pkgname-pyc" @@ -28,10 +30,17 @@ build() { --output-fd 3 3>&1 >&2 } +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest -v +} + package() { - python3 -m installer --destdir="$pkgdir" .dist/*.whl + python3 -m installer -d "$pkgdir" \ + .dist/*.whl } sha512sums=" -151dfa2dd4e7fecea482bec0be69410c213336b95e00c900f600053dc9777618c3b9cc1c69e14f61e909ad7b785bcf391ea11c74b1b710749b70e138fbdd6de3 py3-urllib3-secure-extra-0.1.0.tar.gz +e656c30d17ea3b0af14a49770eced285c33fdbd5cae91bfb2090d0ef4b58bb8048caae916e344d13380a5155495659da0f572847db556042088692d2ca7f362f py3-urllib3-secure-extra-0.1.0-gh.tar.gz " diff --git a/community/py3-validate-pyproject/APKBUILD b/community/py3-validate-pyproject/APKBUILD index af35ec545d9..28f9fbe9975 100644 --- a/community/py3-validate-pyproject/APKBUILD +++ b/community/py3-validate-pyproject/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-validate-pyproject -pkgver=0.16 -pkgrel=2 +pkgver=0.17 +pkgrel=0 pkgdesc="Validation library for simple check on pyproject.toml" url="https://validate-pyproject.readthedocs.io" arch="noarch" @@ -22,6 +22,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/abravalheri/validate-pyproje no-useless-check.patch " builddir="$srcdir/validate-pyproject-$pkgver" +options="net" # tests require network build() { gpep517 build-wheel \ @@ -41,6 +42,6 @@ package() { } sha512sums=" -a88641f5c936d6122e437dfa9a00aa3c1565216c7674e2a04c2c64dc171d9a1c5f16114588fadc14f76f9a57581c8164360cf5cbfac73604959a5419e6f1b5c4 py3-validate-pyproject-0.16.tar.gz +8e7e38eee09144c123f0f971f386b39bad0ac66b179db57f95195abe902a4fbaef81f33f8c2eccdc1e63e0c11b025dd11ef50b5d20da4779b10ed046b415c501 py3-validate-pyproject-0.17.tar.gz 831c908ac5c8d62bafe8aafff2ae27998d568e0479f90ed721493c0c4731d1914bb457055ca3dfdf97c7a780939e2027fcd8359339258c8e82a226d5a22da967 no-useless-check.patch " diff --git a/community/py3-validators/APKBUILD b/community/py3-validators/APKBUILD index 3e4eb7fffbc..d02cc9aedac 100644 --- a/community/py3-validators/APKBUILD +++ b/community/py3-validators/APKBUILD @@ -2,8 +2,8 @@ # Contributor: fossdd <fossdd@pwned.life> # Maintainer: fossdd <fossdd@pwned.life> pkgname=py3-validators -pkgver=0.28.0 -pkgrel=1 +pkgver=0.28.1 +pkgrel=0 pkgdesc="Python3 Data Validation for Humans" url="https://github.com/python-validators/validators" arch="noarch" @@ -32,5 +32,5 @@ package() { } sha512sums=" -99e27b64cf18d773777cc351f8b4661dda8db8c42ed88e59630f1c35c6519d66c181f178d03ea44d1d380c523836903ccbbc8ff1a7d588d2fc01189c5562b2ac py3-validators-0.28.0.tar.gz +6a3b9ffffbdc5f68d7ffd6123251d3bf3b26f5600b3398966abf022ec3c7cafedffe04fc18570ed110f7bbfa6048424a91283bc06384571413270a354784b43d py3-validators-0.28.1.tar.gz " diff --git a/community/py3-virtnbdbackup/APKBUILD b/community/py3-virtnbdbackup/APKBUILD index cad8932819e..1f72b0de3ac 100644 --- a/community/py3-virtnbdbackup/APKBUILD +++ b/community/py3-virtnbdbackup/APKBUILD @@ -1,8 +1,8 @@ # Contributor: André Klitzing <aklitzing@gmail.com> # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=py3-virtnbdbackup -pkgver=2.7 -pkgrel=1 +pkgver=2.9 +pkgrel=0 pkgdesc="Backup utility for Libvirt / qemu / kvm" url="https://github.com/abbbi/virtnbdbackup" arch="noarch" @@ -30,5 +30,5 @@ package() { } sha512sums=" -3665d389dfcedce2299ada3145083a35931508bf45dc7a8b9cc9ad8e6d91fe02be6df697e2c1feec8d44f96c39090267e51604a50a4997c893d1c211370eab8d virtnbdbackup-2.7.tar.gz +3be993a5197222b3af351934d8d6de4bb506727ed8793ca2a06369d85c55e3eeefe4f546bfe114c48b9c901f642155856e3c1d3fccd0cb2e47bdf3e8459820c5 virtnbdbackup-2.9.tar.gz " diff --git a/community/py3-vt-py/APKBUILD b/community/py3-vt-py/APKBUILD index 79dee5bf459..8afd35d749d 100644 --- a/community/py3-vt-py/APKBUILD +++ b/community/py3-vt-py/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Will Sinatra <wpsinatra@gmail.com> # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=py3-vt-py -pkgver=0.18.1 +pkgver=0.18.2 pkgrel=0 pkgdesc="Official Python client library for VirusTotal's REST API" url="https://github.com/virustotal/vt-py" @@ -31,5 +31,5 @@ package() { } sha512sums=" -56282322beb12bf36a7d34dc2ae4d6423586f9d7daec774e007519eb8f5d38a67d14ccd370baf5fbb9099a3b1912247f8f03748097c4aa31dd5de31c18c24283 py3-vt-py-0.18.1.tar.gz +ed908921426f5a9551a54281c55d66fbed4670098afaeaaf5585f2005fd4fa98e39d6cfcfda62196609f3c199d22b782c8f6709285a2622841919c51f114cd74 py3-vt-py-0.18.2.tar.gz " diff --git a/community/py3-wand/APKBUILD b/community/py3-wand/APKBUILD index f409ced2605..99f280158b8 100644 --- a/community/py3-wand/APKBUILD +++ b/community/py3-wand/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-wand _pyname=wand pkgver=0.6.13 -pkgrel=1 +pkgrel=2 pkgdesc="Ctypes-based simple MagickWand API binding for Python" url="https://github.com/emcconville/wand" license="MIT" @@ -11,14 +11,20 @@ arch="noarch" depends=" imagemagick libxml2 - " +" makedepends=" py3-setuptools py3-gpep517 py3-wheel - " +" +checkdepends=" + py3-pytest + py3-pytest-xdist + py3-pytest-cov + py3-psutil + imagemagick-jpeg +" source="$pkgname-$pkgver.tar.gz::https://github.com/emcconville/wand/archive/$pkgver.tar.gz" -options="!check" # Failing test units builddir="$srcdir"/$_pyname-$pkgver subpackages="$pkgname-pyc" @@ -34,7 +40,10 @@ build() { } check() { - pytest -v + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + # test_*_quantum: failure on 32-bit arches + .testenv/bin/python3 -m pytest -v -k 'not quantum' } package() { diff --git a/community/py3-webauthn/APKBUILD b/community/py3-webauthn/APKBUILD index b4eefcbdaff..a283553467f 100644 --- a/community/py3-webauthn/APKBUILD +++ b/community/py3-webauthn/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-webauthn _pyname=webauthn pkgver=2.1.0 -pkgrel=1 +pkgrel=2 arch="noarch" pkgdesc="A Python3 implementation of the WebAuthn API focused on making it easy to leverage the power of WebAuthn." url="https://pypi.python.org/project/webauthn" @@ -13,9 +13,14 @@ makedepends=" py3-gpep517 py3-wheel " -options="!check" # No testsuite -source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/w/webauthn/webauthn-$pkgver.tar.gz" -builddir="$srcdir"/$_pyname-$pkgver +checkdepends=" + py3-pytest + py3-cbor2 + py3-openssl + py3-asn1crypto +" +source="$pkgname-$pkgver-gh.tar.gz::https://github.com/duo-labs/py_webauthn/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir"/py_webauthn-$pkgver subpackages="$pkgname-pyc" build() { @@ -24,10 +29,16 @@ build() { --output-fd 3 3>&1 >&2 } +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest -v +} + package() { python3 -m installer -d "$pkgdir" \ .dist/*.whl } sha512sums=" -2fe9b2222ead7cd75a327f6d793c2011a31f53d67cb3a7a0fe3a9dc89f9ccb9ef25a5d015b19ca4205aa16a967eb004b6fbb775b92e38bf81b7160b64faf07c0 py3-webauthn-2.1.0.tar.gz +1191d9d45e51685c4179c6abbfcfc811986a18f42cb68b5dcc396f3a5a573884a62bc7bb2349df678e505ee1404b13ae1c4547022539e1c20d835134d114aba8 py3-webauthn-2.1.0-gh.tar.gz " diff --git a/testing/py3-webdavclient3/APKBUILD b/community/py3-webdavclient3/APKBUILD index 0e477599a33..ed1b6958f08 100644 --- a/testing/py3-webdavclient3/APKBUILD +++ b/community/py3-webdavclient3/APKBUILD @@ -10,12 +10,19 @@ url="https://pypi.python.org/project/webdavclient3" arch="noarch" license="MIT" depends="py3-requests py3-lxml py3-dateutil" -checkdepends="py3-pytest" +checkdepends=" + py3-pytest + nginx + nginx-mod-http-dav-ext + " makedepends="py3-setuptools py3-gpep517 py3-wheel" -source="$pkgname-$pkgver.tar.gz::https://github.com/ezhov-evgeny/webdav-client-python-3/archive/refs/tags/v$pkgver.tar.gz" +source=" + $pkgname-$pkgver.tar.gz::https://github.com/ezhov-evgeny/webdav-client-python-3/archive/refs/tags/v$pkgver.tar.gz + nginx-test.conf + nginx-user.conf + " builddir="$srcdir/$_pkgreal-$pkgver" subpackages="$pkgname-pyc" -options="!check" # Test suite needs more work to be setup to work in aports env build() { gpep517 build-wheel \ @@ -24,9 +31,19 @@ build() { } check() { + nginx -c "$srcdir"/nginx-test.conf & + mkdir -p /tmp/www python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer "$builddir"/.dist/*.whl - .testenv/bin/python3 -m pytest -v + # set and get property disabled due to nginx-dav-ext-module not supporting PROPPATCH + # see https://github.com/arut/nginx-dav-ext-module/pull/64 + # upstream uses apache2 for test server, which can't run as normal user + .testenv/bin/python3 -m pytest -v -k 'not test_get_property and not test_set_property' || local FAIL=true + pkill nginx + rm -R /tmp/www + if [ "$FAIL" = "true" ]; then + return 1 + fi } package() { @@ -36,4 +53,6 @@ package() { sha512sums=" 4621dfe3fdde4a60a7580b37aaf2bf778ebae1615946e9ff5aedcf3d2d17b3e60511a4522f8023bd4756139c66027149a2afafbd07bf02d029d811bec172057d py3-webdavclient3-3.14.6.tar.gz +94fc0ca132eb3f96b613a8bc4788ff8ce4d9f06b7576d13a5bbd4a2994684d6087da791b258aac45ecaca3224a98c34d2853026ead24774901dc9ac8f0763dbb nginx-test.conf +c0f9b9558abc0809fbf5e7600ba9f868f491debb7405bb5595ecfcc300cb68c602d2efe4340f1c86367f2ba7449b7f725affb9575a8b08bb5f9b65119f297a88 nginx-user.conf " diff --git a/community/py3-webdavclient3/nginx-test.conf b/community/py3-webdavclient3/nginx-test.conf new file mode 100644 index 00000000000..51ea87a103f --- /dev/null +++ b/community/py3-webdavclient3/nginx-test.conf @@ -0,0 +1,60 @@ +pid /tmp/nginx.pid; +error_log stderr; +worker_processes 1; +daemon off; +load_module "/usr/lib/nginx/modules/ngx_http_dav_ext_module.so"; + +events { + worker_connections 1024; +} + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + dav_ext_lock_zone zone=foo:10m; + + sendfile on; + + keepalive_timeout 65; + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + access_log /tmp/access.log; + error_log /tmp/error.log; + proxy_temp_path /tmp/proxy_temp_path; + client_body_temp_path /tmp/client_body_temp_path/; + fastcgi_temp_path /tmp/fastcgi_temp_path; + uwsgi_temp_path /tmp/uwsgi_temp_path; + scgi_temp_path /tmp/scgi_temp_path; + + server { + listen 8585 default_server; + listen [::]:8585 default_server; + root /tmp/www/; + index index.html index.htm index.nginx-debian.html; + server_name _; + + location / { + autoindex on; + if (-d $request_filename) { rewrite ^(.*[^/])$ $1/ break; } + dav_methods PUT DELETE MKCOL COPY MOVE; + dav_ext_methods PROPFIND OPTIONS LOCK UNLOCK; + dav_ext_lock zone=foo; + dav_access user:rw group:rw all:rw; + + # enable creating directories without trailing slash + set $x $uri$request_method; + if ($x ~ [^/]MKCOL$) { + rewrite ^(.*)$ $1/; + } + + client_max_body_size 0; + create_full_put_path on; + client_body_temp_path /tmp/client_body_temp_path; + + auth_basic "Restricted Access"; + auth_basic_user_file ./nginx-user.conf; + } + } +} diff --git a/community/py3-webdavclient3/nginx-user.conf b/community/py3-webdavclient3/nginx-user.conf new file mode 100644 index 00000000000..4a8420b2614 --- /dev/null +++ b/community/py3-webdavclient3/nginx-user.conf @@ -0,0 +1 @@ +alice:$apr1$D8rOJ90Z$9DjYGFgSrkZnyNMH13qvD/ diff --git a/community/py3-websocket-client/APKBUILD b/community/py3-websocket-client/APKBUILD index 3f72e82ef05..6eeeb4620fc 100644 --- a/community/py3-websocket-client/APKBUILD +++ b/community/py3-websocket-client/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=py3-websocket-client -pkgver=1.7.0 -pkgrel=1 +pkgver=1.8.0 +pkgrel=0 pkgdesc="WebSocket client library for Python" url="https://github.com/websocket-client/websocket-client" arch="noarch" @@ -38,5 +38,5 @@ package() { } sha512sums=" -13208a17dcabf60fcd5202dbd1a296b9f39f95fc0fccabc11f8bcc16f69bef4d2a2b4ccd633eaea45fe8a2216793dca3574b22b29c099617178461340f702cad websocket-client-v1.7.0.tar.gz +183102a78d625da32d384f37f1784e020d4856a66cb318aba9fd53be30200c6bbc13dc0d36d0b88bb13e5a56fa484ef58e70cb3744b9bf2daf4f7920518aaf8e websocket-client-v1.8.0.tar.gz " diff --git a/community/py3-werkzeug/APKBUILD b/community/py3-werkzeug/APKBUILD index 775d32aacc2..eac1fea1b0f 100644 --- a/community/py3-werkzeug/APKBUILD +++ b/community/py3-werkzeug/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: prspkt <prspkt@protonmail.com> pkgname=py3-werkzeug _pkgname=werkzeug -pkgver=3.0.1 -pkgrel=1 +pkgver=3.0.3 +pkgrel=0 pkgdesc="The WSGI swiss-army knife" url="https://werkzeug.palletsprojects.com/" arch="noarch" @@ -11,8 +11,7 @@ depends="python3 py3-markupsafe" makedepends="py3-gpep517 py3-flit-core" checkdepends="py3-pytest py3-requests py3-pytest-timeout" subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz - pytest8.patch" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" replaces="py-werkzeug" # Backwards compatibility @@ -52,6 +51,5 @@ package() { } sha512sums=" -83bacda231cd714cf111ebcaf78b47f7e400cefbaf4a450bde99b630136c2976a2e7629a3a34140493c5f54c2ea1c034c673085dd7d1fd7ce8f1da49d8576bb8 werkzeug-3.0.1.tar.gz -eddd871dfe1faf3b2ab35dac32fe991ee26679eb6116fe6290e7a20f2abe430a025b0345b39137746c05c0da79f555ca10d73df298eb02d5c5ef82b13d6384ad pytest8.patch +fc771c161b37a376a86930c29c8b8052f81fb869cedea8c3c83af1e8b1aba271358c918e3067f3b0ac6d4a1689c8c355bff410d521c73a1909fd0ffc90fee6c6 werkzeug-3.0.3.tar.gz " diff --git a/community/py3-werkzeug/pytest8.patch b/community/py3-werkzeug/pytest8.patch deleted file mode 100644 index 10d454adf61..00000000000 --- a/community/py3-werkzeug/pytest8.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4e5bdca7f8227d10cae828f8064fb98190ace4aa Mon Sep 17 00:00:00 2001 -From: pgjones <philip.graham.jones@googlemail.com> -Date: Thu, 29 Feb 2024 21:03:16 +0000 -Subject: [PATCH] Make the exception tests more robust - -This should ensure that the tests work with Pytest 8 onwards. The -issue appears to be that __subclasses__ "returns a list of all those -references still alive." which could include the RequestRedirect. If -it does include RequestRedirect the tests will fail as it requires an -argument to be constructed. Note this test is not meant for -RequestRedirect. ---- - tests/test_exceptions.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py -index e4ee58633..91ad1a7ce 100644 ---- a/tests/test_exceptions.py -+++ b/tests/test_exceptions.py -@@ -7,7 +7,7 @@ - from werkzeug import exceptions - from werkzeug.datastructures import Headers - from werkzeug.datastructures import WWWAuthenticate --from werkzeug.exceptions import HTTPException -+from werkzeug.exceptions import default_exceptions, HTTPException - from werkzeug.wrappers import Response - - -@@ -138,7 +138,7 @@ def test_retry_after_mixin(cls, value, expect): - @pytest.mark.parametrize( - "cls", - sorted( -- (e for e in HTTPException.__subclasses__() if e.code and e.code >= 400), -+ (e for e in default_exceptions.values() if e.code and e.code >= 400), - key=lambda e: e.code, # type: ignore - ), - ) -@@ -158,7 +158,7 @@ def test_description_none(): - @pytest.mark.parametrize( - "cls", - sorted( -- (e for e in HTTPException.__subclasses__() if e.code), -+ (e for e in default_exceptions.values() if e.code), - key=lambda e: e.code, # type: ignore - ), - ) diff --git a/community/py3-whoosh/APKBUILD b/community/py3-whoosh/APKBUILD index 09c56cb871e..8955e4389de 100644 --- a/community/py3-whoosh/APKBUILD +++ b/community/py3-whoosh/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-whoosh _pyname="Whoosh" pkgver=2.7.4 -pkgrel=1 +pkgrel=2 arch="noarch" pkgdesc="Fast, pure-Python full text indexing, search, and spell checking library" url="https://pypi.python.org/project/whoosh" @@ -20,7 +20,6 @@ source=" $pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/W/Whoosh/Whoosh-$pkgver.tar.gz test-fix.patch " -options="!check" # Failing test units builddir="$srcdir"/$_pyname-$pkgver subpackages="$pkgname-pyc" @@ -31,7 +30,10 @@ build() { } check() { - PYTHONPATH="$builddir"/src pytest -v + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + # test_minimize_dfa: AssertionError: assert <whoosh.automata.fsa.DFA object at 0x7fe398473ad0> == <whoosh.automata.fsa.DFA object at 0x7fe3984706e0> + .testenv/bin/python3 -m pytest -v -k 'not test_minimize_dfa' } package() { diff --git a/community/py3-xarray/APKBUILD b/community/py3-xarray/APKBUILD index 207b9eb984e..19671daa554 100644 --- a/community/py3-xarray/APKBUILD +++ b/community/py3-xarray/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-xarray _pkgorig=xarray -pkgver=2024.1.1 -pkgrel=1 +pkgver=2024.3.0 +pkgrel=0 pkgdesc="N-D labeled arrays and datasets in Python" url="https://xarray.dev" arch="noarch !s390x" # assertionErrors @@ -14,6 +14,7 @@ checkdepends="py3-coverage py3-mock py3-pytest-xdist py3-pytest-cov" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/x/xarray/xarray-$pkgver.tar.gz" builddir="$srcdir/$_pkgorig-$pkgver" +options="!check" # some tests are failing in this release | temporary fix build() { gpep517 build-wheel \ @@ -35,5 +36,5 @@ package() { } sha512sums=" -b6447ca2c80b3a3091ac2baba648fef4faa79ffff272360e9726b318b517ede9d2717d1b6f77f03fdacf55527233f1a37c0d114901fe1a265d3e435cf293a487 py3-xarray-2024.1.1.tar.gz +4c7490b2efb4ed1a7278c807f4d200d99407d21bd54287ca5d35300194049a82aef3d8fbedba8f180ddb0d554cbb3f8f63abbb01401d5904f6d29cfa729e2ab0 py3-xarray-2024.3.0.tar.gz " diff --git a/community/py3-xlsxwriter/APKBUILD b/community/py3-xlsxwriter/APKBUILD index efb2bc758bf..7b2acb91e7d 100644 --- a/community/py3-xlsxwriter/APKBUILD +++ b/community/py3-xlsxwriter/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=py3-xlsxwriter -pkgver=3.1.9 -pkgrel=1 +pkgver=3.2.0 +pkgrel=0 pkgdesc="A Python module for creating Excel XLSX files" url="https://github.com/jmcnamara/XlsxWriter" arch="noarch" @@ -39,5 +39,5 @@ package() { } sha512sums=" -1c7ea489182f1abe50fae5f1f387274f67e6043ef3fa909b015a340e38d8449f18ef1f40a64719982680371430a98bd0ac0d441b88daad655599f6eccae04a85 py3-xlsxwriter-3.1.9.tar.gz +b36ee896d01e5a6369f4f42e69338b69b9ea5ee4919eea9361c0f5f6ff012ca153c708ff1c719b82ce067c5d57392e3b72c47e828a7e832953d0c06de9f65962 py3-xlsxwriter-3.2.0.tar.gz " diff --git a/community/py3-xmldiff/APKBUILD b/community/py3-xmldiff/APKBUILD index f2b2e162739..b0866ae6d89 100644 --- a/community/py3-xmldiff/APKBUILD +++ b/community/py3-xmldiff/APKBUILD @@ -1,31 +1,36 @@ # Contributor: Sascha Brawer <sascha@brawer.ch> -# Maintainer: Sascha Brawer <sascha@brawer.ch> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=py3-xmldiff -_pyname=xmldiff -pkgver=2.6.3 -pkgrel=1 +pkgver=2.7.0 +pkgrel=0 pkgdesc="Creates diffs of XML files" url="https://github.com/Shoobx/xmldiff" arch="noarch" license="MIT" -depends="python3 py3-lxml" -makedepends="py3-setuptools" +depends="py3-lxml" +makedepends="py3-gpep517 py3-setuptools py3-wheel" +checkdepends="py3-pytest" subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/x/$_pyname/$_pyname-$pkgver.tar.gz" -builddir="$srcdir/$_pyname-$pkgver" +source="https://files.pythonhosted.org/packages/source/x/xmldiff/xmldiff-$pkgver.tar.gz" +builddir="$srcdir/xmldiff-$pkgver" build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { - python3 setup.py check + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest } package() { - python3 setup.py install --skip-build --root="$pkgdir" + python3 -m installer -d "$pkgdir" \ + .dist/*.whl } sha512sums=" -ba25b8cc9866c66bc829a82d1f20108c17a09e2f46735763317f7fd6f60c3920ba6d3114454ead1461de4a59c177065291bb71bebb7ee9c4a03f3584452a9e33 xmldiff-2.6.3.tar.gz +e285c0e30b4a6f057dd4888599a6bd354b1f1465598eafa7a9ac91d3eb2e8b04e25e466d410dde84d1b6986b647d3759bad322036f3c5c9cd498e8fc291ab888 xmldiff-2.7.0.tar.gz " diff --git a/community/py3-xmlsec/APKBUILD b/community/py3-xmlsec/APKBUILD new file mode 100644 index 00000000000..2b576de9022 --- /dev/null +++ b/community/py3-xmlsec/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-xmlsec +_pkgreal=xmlsec +pkgver=1.3.14 +pkgrel=0 +arch="all" +pkgdesc="Python bindings for the XML Security Library" +url="https://pypi.python.org/project/xmlsec" +license="MIT" +depends=" + py3-lxml + xmlsec + " +makedepends=" + py3-gpep517 + py3-setuptools + py3-setuptools_scm + py3-pkgconfig + py3-wheel + python3-dev + libxml2-dev + xmlsec-dev + " +checkdepends="py3-pytest" +source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/x/xmlsec/xmlsec-$pkgver.tar.gz" +builddir="$srcdir"/$_pkgreal-$pkgver + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} +sha512sums=" +7ac5b3f1d983662153393ac06be606ade2e8043fc1be85db08ab1920cf30a7668d9a33d9b9e219f8ab9816a82ba35b3dd022175f0cc68c8792a61098566fc4c4 py3-xmlsec-1.3.14.tar.gz +" diff --git a/community/py3-ytmusicapi/APKBUILD b/community/py3-ytmusicapi/APKBUILD index f0cf5020770..9597b974a81 100644 --- a/community/py3-ytmusicapi/APKBUILD +++ b/community/py3-ytmusicapi/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=py3-ytmusicapi -pkgver=1.6.0 -pkgrel=1 +pkgver=1.7.1 +pkgrel=0 pkgdesc="Unofficial API for YouTube Music" url="https://github.com/sigma67/ytmusicapi" arch="noarch" @@ -26,5 +26,5 @@ package() { } sha512sums=" -9886c0b4ec29bf9b676b4c77f9e84ca6c7a0f1b4da264d589aed19d50c8be6ef3718185af755d8a9f652d425ae98603fff09ea8d84ec839756dab43181eb9f4c ytmusicapi-1.6.0.tar.gz +1285ca07cfe18e3965cb769c34a507266188e4d5fa3e34f8e29bb69e0a31aab605f25dbdf24c790621cbcbd7552c0b44a0ae8a0be0237971a02f19d58a05b79f ytmusicapi-1.7.1.tar.gz " diff --git a/testing/py3-zipstream-ng/APKBUILD b/community/py3-zipstream-ng/APKBUILD index 793debfc873..793debfc873 100644 --- a/testing/py3-zipstream-ng/APKBUILD +++ b/community/py3-zipstream-ng/APKBUILD diff --git a/community/pyside6/APKBUILD b/community/pyside6/APKBUILD index 4b774ab1161..450f42d9775 100644 --- a/community/pyside6/APKBUILD +++ b/community/pyside6/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=pyside6 pkgver=6.6.0 -pkgrel=2 +pkgrel=3 _llvmver=17 pkgdesc="Enables the use of Qt6 APIs in Python applications" url="https://doc.qt.io/qtforpython-6/" @@ -56,11 +56,9 @@ builddir="$srcdir/pyside-setup-everywhere-src-${pkgver%.*}" options="!check" # Tests fail case "$CARCH" in -x86) - ;; -*) - makedepends="$makedepends qt6-qt3d-dev" - ;; + armhf|ppc64le|s390x) makedepends="$makedepends qt6-qt3d-dev" ;; + x86) makedepends="$makedepends qt6-qtwebview-dev" ;; + *) makedepends="$makedepends qt6-qt3d-dev qt6-qtwebview-dev" ;; esac build() { diff --git a/community/qbittorrent/APKBUILD b/community/qbittorrent/APKBUILD index 0cb48e1907b..e29c1f3dac9 100644 --- a/community/qbittorrent/APKBUILD +++ b/community/qbittorrent/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Simon Zeni <simon@bl4ckb0ne.ca> pkgname=qbittorrent pkgver=4.6.4 -pkgrel=0 +pkgrel=1 pkgdesc="qBittorrent client" url="https://www.qbittorrent.org/" arch="all" diff --git a/community/qemu/APKBUILD b/community/qemu/APKBUILD index 91506b96c5a..961507a8086 100644 --- a/community/qemu/APKBUILD +++ b/community/qemu/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu -pkgver=8.2.2 +pkgver=9.0.0 pkgrel=0 pkgdesc="QEMU is a generic machine emulator and virtualizer" url="https://qemu.org/" @@ -208,8 +208,6 @@ subpackages="$subpackages qemu-modules:_all_modules" subpackages="$subpackages $pkgname-img" # -img must be declared the last -# https://gitlab.com/qemu-project/qemu/-/commit/91e0127087257048d2eb98b5b1a5671f53c3a36d -_edk2hash="91e0127087257048d2eb98b5b1a5671f53c3a36d" source="https://wiki.qemu-project.org/download/qemu-$pkgver.tar.xz 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch xattr_size_max.patch @@ -219,8 +217,7 @@ source="https://wiki.qemu-project.org/download/qemu-$pkgver.tar.xz lfs64.patch mips-softfloat.patch musl-initialise-msghdr.patch - - CVE-2021-20255.patch + fix-strerrorname_np.patch $pkgname-guest-agent.confd $pkgname-guest-agent.initd @@ -585,7 +582,7 @@ bridgehelper() { } sha512sums=" -dfd2e1305f9e51bfbc90a7738c69336d5f805481a626ea527b971bdfb6dbe6867e5df7461d48d1c22b79be2dc18e057ea9fa36ef593127cd8b262a5c33f1aa41 qemu-8.2.2.tar.xz +1603517cd4c93632ba60ad7261eb67374f12a744bf58f10b0e8686e46d3a02d8b6bf58a0c617f23a1868084aaba6386c24341894f75539e0b816091718721427 qemu-9.0.0.tar.xz b392f229e631d149d28eb952dcd507d9e5b6975cbba123fd3dab10860fa1936d5035d8e266926652acc1d7cde6874c440beccd33d729bf346769d2c138ebbc01 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch 2c6b3b22877674f870958bb0c74ad85c814f01c98fb123142b1ce77d89adf5c08626e6eade7f627090a53b48f5cebe2a535547804345648cff91dd66f90c2d5b xattr_size_max.patch 7672a3518050f275219920f2cb088f6991ac810dba077856129d779fdf45a3e8c0302c8ca4aa58c0c38e44af80f56404006b3f250e4921fb364cd6fe7149e6ea MAP_SYNC-fix.patch @@ -594,7 +591,7 @@ b392f229e631d149d28eb952dcd507d9e5b6975cbba123fd3dab10860fa1936d5035d8e266926652 d5b4626193fa9b7c687a649aa5ea37d8a74fd2e556a66a71e31af618a0990e144beae253b82b89efd8a798102bcab59cf1a61a76029afcdb0bc5ed58fb40493f lfs64.patch 8a8385dbf4a232adbd51be31d64b1e3ad2333eeb0de867555f995bf1b353ec530f85a25c8b33ce6b9572edfe4bb979a0645f14b839394d8bd47c9ffcd91509a2 mips-softfloat.patch 7a6340df8aa28811af20cd23b98ba95fc8072d4d4d3a2d497604386396892cf26716d0755821e47d02c8eded203133d7dde100537c117e2a047179e4f93883cf musl-initialise-msghdr.patch -25778c29c1f2bf40572125a7b39a01227e3165ed555add44de72a714e4b9d5a91b1504f69d0df55b4e178035813d4c3eca5be048d9afa5e3647d13df3e2f5a30 CVE-2021-20255.patch +68c6a1965606427a1b28dd4fe84af5abff120bfe2d0d903e2b5b2a6fd6289c6cf8ca6637ab9f5f6a2fb2cb292b97cbc9c3f54f4a8e70277bfe889155e219ea78 fix-strerrorname_np.patch d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f qemu-guest-agent.confd 1cd24c2444c5935a763c501af2b0da31635aad9cf62e55416d6477fcec153cddbe7de205d99616def11b085e0dd366ba22463d2270f831d884edbc307c7864a6 qemu-guest-agent.initd 9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2 80-kvm.rules diff --git a/community/qemu/CVE-2021-20255.patch b/community/qemu/CVE-2021-20255.patch deleted file mode 100644 index 63c4893135f..00000000000 --- a/community/qemu/CVE-2021-20255.patch +++ /dev/null @@ -1,43 +0,0 @@ -CVE-2021-20255 patch adapted from QEMU patch by Stefan Weil - -Link: https://bugzilla.redhat.com/show_bug.cgi?id=1930646 - -Signed-off-by: Neha Agarwal <nehaagarwal@microsoft.com> ---- -diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c -index 679f52f..9c178c1 100644 ---- a/hw/net/eepro100.c -+++ b/hw/net/eepro100.c -@@ -279,6 +279,9 @@ typedef struct { - /* Quasi static device properties (no need to save them). */ - uint16_t stats_size; - bool has_extended_tcb_support; -+ -+ /* Flag to avoid recursions. */ -+ bool busy; - } EEPRO100State; - - /* Word indices in EEPROM. */ -@@ -844,6 +847,14 @@ static void action_command(EEPRO100State *s) - Therefore we limit the number of iterations. */ - unsigned max_loop_count = 16; - -+ if (s->busy) { -+ /* Prevent recursions. */ -+ logout("recursion in %s:%u\n", __FILE__, __LINE__); -+ return; -+ } -+ -+ s->busy = true; -+ - for (;;) { - bool bit_el; - bool bit_s; -@@ -940,6 +951,7 @@ static void action_command(EEPRO100State *s) - } - TRACE(OTHER, logout("CU list empty\n")); - /* List is empty. Now CU is idle or suspended. */ -+ s->busy = false; - } - - static void eepro100_cu_command(EEPRO100State * s, uint8_t val) diff --git a/community/qemu/fix-strerrorname_np.patch b/community/qemu/fix-strerrorname_np.patch new file mode 100644 index 00000000000..7f3c4b7f13c --- /dev/null +++ b/community/qemu/fix-strerrorname_np.patch @@ -0,0 +1,26 @@ +diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c +index 49d2f3ad58..a9c4cbc0ad 100644 +--- a/target/riscv/kvm/kvm-cpu.c ++++ b/target/riscv/kvm/kvm-cpu.c +@@ -1054,8 +1054,8 @@ static void kvm_riscv_read_vlenb(RISCVCPU *cpu, KVMScratchCPU *kvmcpu, + + ret = ioctl(kvmcpu->cpufd, KVM_GET_ONE_REG, ®); + if (ret != 0) { +- error_report("Unable to read vlenb register, error code: %s", +- strerrorname_np(errno)); ++ error_report("Unable to read vlenb register: %s", ++ strerror(errno)); + exit(EXIT_FAILURE); + } + +@@ -1690,8 +1690,8 @@ static bool kvm_cpu_realize(CPUState *cs, Error **errp) + if (riscv_has_ext(&cpu->env, RVV)) { + ret = prctl(PR_RISCV_V_SET_CONTROL, PR_RISCV_V_VSTATE_CTRL_ON); + if (ret) { +- error_setg(errp, "Error in prctl PR_RISCV_V_SET_CONTROL, code: %s", +- strerrorname_np(errno)); ++ error_setg(errp, "Error in prctl PR_RISCV_V_SET_CONTROL: %s", ++ strerror(errno)); + return false; + } + } diff --git a/community/qqc2-breeze-style/APKBUILD b/community/qqc2-breeze-style/APKBUILD index f839e75705b..efd27e5d20c 100644 --- a/community/qqc2-breeze-style/APKBUILD +++ b/community/qqc2-breeze-style/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=qqc2-breeze-style -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Breeze inspired QQC2 style" # armhf blocked by extra-cmake-modules @@ -50,5 +50,5 @@ package() { } sha512sums=" -b0fb8e669a29e9e9f063d009ba8d3eedca658a60b2263874603b7d5243149c3681fa820e2ddf25557d9f4edcd3650c465f26ba39affdddbd9aa1ebc3f6820ef2 qqc2-breeze-style-6.0.3.tar.xz +51f9a855ab574115e2f6121a25a5271236743c52cf504a17a83e394f923352d24e12ab1713689edede3e128014e4061db04e3e3d4b1c76906490362391d275ab qqc2-breeze-style-6.0.4.tar.xz " diff --git a/community/qqc2-desktop-style/APKBUILD b/community/qqc2-desktop-style/APKBUILD index f0227b7f9ad..ffbd6910de4 100644 --- a/community/qqc2-desktop-style/APKBUILD +++ b/community/qqc2-desktop-style/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=qqc2-desktop-style -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="A style for Qt Quick Controls 2 to make it follow your desktop theme" # armhf blocked by qt6-qtdeclarative @@ -49,5 +49,5 @@ package() { } sha512sums=" -befb9c9ee024fcf73a04be9495800172d2049f9a0c14d21fe8e5c7d889a1411702de2297e1a27ca11154f7471b541ab1b02b182d38622a81eabd6b3a8aca1530 qqc2-desktop-style-6.1.0.tar.xz +c63d7c043a2f28b53268e98583cc6772b9efeb7636f6d5ddff09333c4f2f0e170d8a4fc9205eac4ecf3d4fe54800abf3ad011634b97bd3f30eb53da730fa9239 qqc2-desktop-style-6.2.0.tar.xz " diff --git a/community/qrca/APKBUILD b/community/qrca/APKBUILD index c532654e952..bb5f0669fc1 100644 --- a/community/qrca/APKBUILD +++ b/community/qrca/APKBUILD @@ -6,8 +6,8 @@ pkgrel=1 _commit=907dd4bde9a33c85d969ba0c9f4ec0145c39d3a1 pkgdesc="QR-Code scanner for Plasma Mobile" # armhf blocked by qt5-qtdeclarative -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> purpose -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine -> purpose +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://invent.kde.org/utilities/qrca" license="GPL-3.0-or-later" depends=" diff --git a/community/qscintilla/APKBUILD b/community/qscintilla/APKBUILD index 51ebaf9ba7d..da34c30c82f 100644 --- a/community/qscintilla/APKBUILD +++ b/community/qscintilla/APKBUILD @@ -1,8 +1,8 @@ -# Maintainer: Marian Buschsiewke <marian.buschsieweke@ovgu.de> +# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> # Contributor: Holger Jaekel <holger.jaekel@gmx.de> pkgname=qscintilla pkgver=2.14.1 -pkgrel=1 +pkgrel=2 pkgdesc="QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor control" url="https://www.riverbankcomputing.com/software/qscintilla" arch="all" diff --git a/community/qt5-qtbase/APKBUILD b/community/qt5-qtbase/APKBUILD index 12909e9218e..43aec5bee09 100644 --- a/community/qt5-qtbase/APKBUILD +++ b/community/qt5-qtbase/APKBUILD @@ -71,6 +71,7 @@ source="https://dev.alpinelinux.org/archive/qt/$_fullname.tar.xz qt5-base-cflags.patch qt5-base-nostrip.patch fix-build-with-xkbcommon-160.patch + loongarch64.patch " builddir="$srcdir/$_fullname" @@ -264,4 +265,5 @@ d5bd9ace2cc15a96c3266603be067620f1a31d8e2636f2bdd6ee9d03d03329af0b86b823f5d35645 fa3dddfe42b7f0ade45bd0530badfc3a3800adbd3798bd814597527713c9fe360a242f7cf39312f4cc3c88e9bd7aba233bd6674c0fc78e694a1fd868474c4240 qt5-base-cflags.patch af061bb56d5079d11407e6eb352fa4af7fefa6aed7f8cc40b5b2d591ef7ff04e9da6c6d534ca1904355ea7552951a1610fdcefb04ef9d696cb2b23ad6a0606e8 qt5-base-nostrip.patch 1f97b8ac068df2169c114a44e277faec66e4b353a024c328dd506c6ca1270d124f84a61c0c5cf45f7458a6d702570bf7fcdd70e0ce2d040d0b4a8f4cf59d8776 fix-build-with-xkbcommon-160.patch +7f0a3f255e25b47b1a45632207f6c0b506119b9cf84edcf1bc02c1a31c4487d1b52359861a731522613f32147890c171446a9c05f166dcf97c046a45964e03d1 loongarch64.patch " diff --git a/community/qt5-qtbase/loongarch64.patch b/community/qt5-qtbase/loongarch64.patch new file mode 100644 index 00000000000..37257685c29 --- /dev/null +++ b/community/qt5-qtbase/loongarch64.patch @@ -0,0 +1,12 @@ +diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h +index 70e697ca..4b606dd9 100644 +--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -94,6 +94,7 @@ int main(int argc, char** argv) { + defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ ++ defined(__loongarch__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ + defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ diff --git a/community/qt5-qtscript/APKBUILD b/community/qt5-qtscript/APKBUILD index 467ec757448..2c23b2e16c1 100644 --- a/community/qt5-qtscript/APKBUILD +++ b/community/qt5-qtscript/APKBUILD @@ -15,6 +15,7 @@ subpackages="$pkgname-dev" source="https://dev.alpinelinux.org/archive/qt/$_fullname.tar.xz qtscript-everywhere-src-5.10.1-sgidefs.patch qtscript-s390x.patch + qtscript-loongarch64.patch " builddir="$srcdir/$_fullname" @@ -61,4 +62,5 @@ sha512sums=" d43cba0e036b34fec59378660050444048c2c15025c2a74be35ef5867047e8b201233a5d3b90db3c1cf29eb1adb733a7f062631257ab73bce6f4abf200a6808d qtscript-4f8c35a528586541ea55bb8b3361eaa6749e52b1.tar.xz c89124fc940ceaa5cfc52c8f48b8eef17bba575a080fad3f27d61e3da98ab5cfd4bb6ffaae09ccae81f6f7644719fa28d38d4b7a7fe4cdb4268673c39627eb22 qtscript-everywhere-src-5.10.1-sgidefs.patch a0a22824954d35495d9d08c2b82d6eeeec26765760d417b8bc72c51e1753d4bb9f5e55d5289001d2d6071669a0bfd4f856fc3d0cf58b509bcbcd5211df35e482 qtscript-s390x.patch +f2708815aec1c12b3d4cdaa93473504ab1139ccd3caf9c9fbda8113480e4394048d0024914c45ce51c6c627b03d12ae73be700bafa802a4c55cfb2e3b214846d qtscript-loongarch64.patch " diff --git a/community/qt5-qtscript/qtscript-loongarch64.patch b/community/qt5-qtscript/qtscript-loongarch64.patch new file mode 100644 index 00000000000..82206b03435 --- /dev/null +++ b/community/qt5-qtscript/qtscript-loongarch64.patch @@ -0,0 +1,25 @@ +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +index 108adfc..66a3cb9 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -419,6 +419,11 @@ + #define WTF_CPU_RISCV32 1 + #endif + ++/* CPU(LOONGARCH64) - LOONGARCH64 64-bit */ ++#if defined(__loongarch64) ++#define WTF_CPU_LOONGARCH64 1 ++#endif ++ + /* ==== OS() - underlying operating system; only to be used for mandated low-level services like + virtual memory, not to choose a GUI toolkit ==== */ + +@@ -970,7 +975,7 @@ + #endif + + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) +-#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(RISCV64) ++#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(RISCV64) || CPU(LOONGARCH64) + #define WTF_USE_JSVALUE64 1 + #elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32) || CPU(S390X) + #define WTF_USE_JSVALUE32 1 diff --git a/community/qt5-qtwebengine/APKBUILD b/community/qt5-qtwebengine/APKBUILD index bb8f843fcaa..7abbaf19600 100644 --- a/community/qt5-qtwebengine/APKBUILD +++ b/community/qt5-qtwebengine/APKBUILD @@ -3,13 +3,13 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=qt5-qtwebengine pkgver=5.15.16 -pkgrel=7 +pkgrel=8 # latest commit of 87-based branch of qtwebengine-chromium -_chromium_commit="fdfef5b37af3bed8402d7c7e20a5487f2602b0a6" +_chromium_commit="060d3aa868d6f4403a9416fe34b48ffbfcfe19cb" pkgdesc="Qt5 - QtWebEngine components" url="https://doc.qt.io/QT-5/qtwebengine-index.html" -# ppc64le, riscv64 and s390x are not supported -arch="all !ppc64le !riscv64 !s390x" +# ppc64le, riscv64, s390x and loongarch64 are not supported +arch="all !ppc64le !riscv64 !s390x !loongarch64" license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" depends="mesa-dri-gallium" depends_dev=" @@ -103,10 +103,15 @@ source="$pkgname-$pkgver-lts.tar.gz::https://github.com/qt/qtwebengine/archive/r silent-ninja.patch ffmpeg5.patch pipewire-0.3.patch + python3.12-imp.patch + python3.12-six.patch " builddir="$srcdir/qtwebengine-$pkgver-lts" # secfixes: +# 5.15.16-r8: +# - CVE-2024-3157 +# - CVE-2024-3516 # 5.15.16-r7: # - CVE-2023-7104 # 5.15.16-r6: @@ -487,7 +492,7 @@ package() { sha512sums=" c021166a5bf8072269e674eb19d38ae8dc5633305163e7f1a85f6a27d7c7b13a532807ce6290fb498f12a0ed2ce9648dbd958426956198b50e358ffcfb64e5d1 qt5-qtwebengine-5.15.16-lts.tar.gz -406beed77bec0950dc9a76638f127f3c7d65e49d08686efc605f4fcb69ddf3a5a67ced75123e70a81b39d3e94f6d71cd96fe0b77eada5cbc5abae422c73ee73f qtwebengine-chromium-fdfef5b37af3bed8402d7c7e20a5487f2602b0a6.tar.gz +7cec6f19d66e66486b904cfc5fcf70e1c71181c398b2b75633129a2bce5b7157fe22ce86f4af3948140960a7f7b7213ce6264cf0f1938a4cba5b588314017688 qtwebengine-chromium-060d3aa868d6f4403a9416fe34b48ffbfcfe19cb.tar.gz 2eee4a43bb7855b5316ac750858272cbe258428ab8aac3c46f5eceeb6fdf085042b36a5fa27440a2270df7a826b8a32115319279b8d3bb6b23844b68cd5bb9dd 0001-pretend-to-stay-at-lower.patch 2438ac56b1c819d1f6634814b148919e15d7d4e41a64fedab38358d794e8286a1eebaaa8579661e8e75fbc321f4d16c47b1838219cb0aadc307c4c8dd97e91b1 0010-chromium-musl-Match-syscalls-to-match-musl.patch 08b88858e5fb38bd53ead81f3abbc24dcb26c504798adeb3f7c6ca3b63532279a7a40aa75f601d2e2ac02058e86589a155d3ef97b51375f560adc268dbf1f805 lfs64.patch @@ -517,4 +522,6 @@ f4cb20796922b6e26433a18ab2ba5dd8750e8bbfb479e9416a362073c9e6a3ac12ee9e9868f6c933 75e3d333f0af28a6a0d846ca380036181c4c0bfb083a4b94449b63572bd8da0fdb99a0ad0550801fc5b5bd115278cf894a0883fac1147c7a6826f1e6a09475b3 silent-ninja.patch 01d31c13f15af6b40e0595c7ebe6c13905dd7ae3fd3b564a2e13b538451f14d44081332c9279ece7c9b01a40802e1381e197442f94946cf713ea8cb3326e502f ffmpeg5.patch 1fbe738bfa09831df540cff355193d096232eefcf51ddd3be7509e1c63e5107bd8087179140ce84bc67a901795cd804a8e538a32fadc776608b9914dab617c3f pipewire-0.3.patch +10015b012d025ff9424fedcc257568c9682b4a669af901acb3e672997ee75e28d8431d8d6115405dd86a37c1ae9565c235711569942635b6e140189235dc231e python3.12-imp.patch +4d6b5eda2ce9be44cc9c7bfdb3fd41ffa87ac260d37d30e7af6f4ff7d5ebbf10b17b6119729bbf51f6405494189f82602c657daa139338526b49db89fb8ec682 python3.12-six.patch " diff --git a/community/qt5-qtwebengine/python3.12-imp.patch b/community/qt5-qtwebengine/python3.12-imp.patch new file mode 100644 index 00000000000..85dbd08f66c --- /dev/null +++ b/community/qt5-qtwebengine/python3.12-imp.patch @@ -0,0 +1,50 @@ +From 3664134f749f4851a14ab1953a9ee460a1fe0b68 Mon Sep 17 00:00:00 2001 +From: Bruno Pitrus <brunopitrus@hotmail.com> +Date: Tue, 25 Jul 2023 18:34:09 +0000 +Subject: [PATCH] Remove unused python import + +The `imp` module has been removed in Python 3.12 causing these scripts to error out. + +Task-number: QTBUG-121555 +Change-Id: Ic7c038d21b86052bdda13015f80934db52a2143e +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4714859 +Auto-Submit: Bruno Pitrus <brunopitrus@hotmail.com> +Reviewed-by: Ken Rockot <rockot@google.com> +Commit-Queue: Ken Rockot <rockot@google.com> +Cr-Commit-Position: refs/heads/main@{#1174966} +NOKEYCHECK=True +GitOrigin-RevId: f5f6e361d037c31630661186e7bd7b31d2784cb8 +Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/534568 +Reviewed-by: Michal Klocek <michal.klocek@qt.io> +--- + chromium/mojo/public/tools/mojom/mojom/fileutil.py | 1 - + chromium/mojo/public/tools/mojom/mojom/parse/lexer.py | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/chromium/mojo/public/tools/mojom/mojom/fileutil.py b/chromium/mojo/public/tools/mojom/mojom/fileutil.py +index 29daec367c5..124f12c134b 100644 +--- a/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py ++++ b/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py +@@ -3,7 +3,6 @@ + # found in the LICENSE file. + + import errno +-import imp + import os.path + import sys + +diff --git a/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py b/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py +index 73ca15df94c..1083a1af7bb 100644 +--- a/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py ++++ b/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py +@@ -2,7 +2,6 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-import imp + import os.path + import sys + +-- +2.32.0 + diff --git a/community/qt5-qtwebengine/python3.12-six.patch b/community/qt5-qtwebengine/python3.12-six.patch new file mode 100644 index 00000000000..bfc043883e6 --- /dev/null +++ b/community/qt5-qtwebengine/python3.12-six.patch @@ -0,0 +1,58 @@ +Patch-Source: https://sources.debian.org/data/main/q/qtwebengine-opensource-src/5.15.16+dfsg-3/debian/patches/python3.12-six.patch +-- +Description: implement find_spec() for _SixMetaPathImporter +Origin: upstream, https://github.com/benjaminp/six/commit/25916292d96f5f09 +Last-Update: 2024-03-17 + +--- a/src/3rdparty/chromium/third_party/protobuf/third_party/six/six.py ++++ b/src/3rdparty/chromium/third_party/protobuf/third_party/six/six.py +@@ -71,6 +71,11 @@ else: + MAXSIZE = int((1 << 63) - 1) + del X + ++if PY34: ++ from importlib.util import spec_from_loader ++else: ++ spec_from_loader = None ++ + + def _add_doc(func, doc): + """Add documentation to a function.""" +@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object): + return self + return None + ++ def find_spec(self, fullname, path, target=None): ++ if fullname in self.known_modules: ++ return spec_from_loader(fullname, self) ++ return None ++ + def __get_module(self, fullname): + try: + return self.known_modules[fullname] +--- a/src/3rdparty/chromium/tools/grit/third_party/six/__init__.py ++++ b/src/3rdparty/chromium/tools/grit/third_party/six/__init__.py +@@ -71,6 +71,11 @@ else: + MAXSIZE = int((1 << 63) - 1) + del X + ++if PY34: ++ from importlib.util import spec_from_loader ++else: ++ spec_from_loader = None ++ + + def _add_doc(func, doc): + """Add documentation to a function.""" +@@ -186,6 +191,11 @@ class _SixMetaPathImporter(object): + return self + return None + ++ def find_spec(self, fullname, path, target=None): ++ if fullname in self.known_modules: ++ return spec_from_loader(fullname, self) ++ return None ++ + def __get_module(self, fullname): + try: + return self.known_modules[fullname] diff --git a/community/qt5-qtwebview/APKBUILD b/community/qt5-qtwebview/APKBUILD index 69eea3eb799..fc4f7d13bed 100644 --- a/community/qt5-qtwebview/APKBUILD +++ b/community/qt5-qtwebview/APKBUILD @@ -6,9 +6,9 @@ pkgrel=0 _module="${pkgname#qt5-}" _pkgver=7e941648610ff4033ae8f9709077edd0595364f0 _fullname=$_module-$_pkgver -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine # armhf blocked by qt5-qtdeclarative -arch="all !armhf !ppc64le !s390x !riscv64" +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://www.qt.io/developers/" license="LGPL-3.0-only AND GPL-2.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" pkgdesc="Provides a way to display web content in a QML application" diff --git a/community/qt6-qtwebengine/APKBUILD b/community/qt6-qtwebengine/APKBUILD index 8843b61c2d5..60eb8531c50 100644 --- a/community/qt6-qtwebengine/APKBUILD +++ b/community/qt6-qtwebengine/APKBUILD @@ -5,9 +5,9 @@ # group=qt6 pkgname=qt6-qtwebengine pkgver=6.6.3 -pkgrel=2 +pkgrel=3 # latest commit of 112-based branch of qtwebengine-chromium -_chromium_commit="20eddf6037712f677235f6048d43bf5e384bed53" +_chromium_commit="221f2bc6e7199b53ddab406fe23c6c3f8c9feba4" pkgdesc="Provides support for web applications using the Chromium browser project" url="https://qt.io/" # riscv64 unknown current CPU @@ -57,6 +57,12 @@ subpackages="$pkgname-dev" builddir="$srcdir/qtwebengine-${pkgver/_/-}" # secfixes: +# 6.6.3-r3: +# - CVE-2024-3837 +# - CVE-2024-3839 +# - CVE-2024-3914 +# - CVE-2024-4058 +# - CVE-2024-4331 # 6.6.3-r2: # - CVE-2024-2625 # - CVE-2024-2626 @@ -193,7 +199,7 @@ package() { sha512sums=" 6e631f7b4e5eb19f0a2c1cb7f0b0bed341c4e3be6181ae65e1616c6229afa6d8b9bac7caf220a422aa64947a49a3f0994e6d098276e2ea5f708c21b544197cb0 qt6-qtwebengine-6.6.3.tar.gz -8a465c9e8ca08fe6303c65eb6037b2ec7cd0b7c7b3ebb5616663bed463958961f24ae8f9e8c2602a3710bc5a0379e99c0306d525d0a9b6a0769fcccec6698cb2 qtwebengine-chromium-20eddf6037712f677235f6048d43bf5e384bed53.tar.gz +9a20390ab0d75afcb7694b9d5b3e72cb44c44af0396399137f4a1cd9c46ddef377afd249e4dec5303fa9a21d33f9d3c151330b45e0785d2bc8cb99cbc2f2b420 qtwebengine-chromium-221f2bc6e7199b53ddab406fe23c6c3f8c9feba4.tar.gz 9a05c07c4616053d247b1200cdd1883e8067babc5ab5bc169ea1599643d120c445fb4db586f5e247e122711f37e148d13fc8a7443d879877d7c82fb1f778db58 0001-Enable-building-on-musl.patch 7b6ed37975c55e5ebc20b9a6207044b6f86102d69caa6fdd457078a7ae242026d3de5537651d3d86497ba18ddd1e97523aa082da4dff703a8a4f618bccd4af57 0002-temp-failure-retry.patch 82433802b2f22391a6321782eae7f60a2a8453b3a73199cfb7a4e7cd3fc7388ef9896651a7a55d0c8ec67bccb9d4b065709e0f48c0eeadda670225c0462590bb 0003-qt-musl-mallinfo.patch diff --git a/community/quassel/APKBUILD b/community/quassel/APKBUILD index 855f6f468f0..c9952eb4ec7 100644 --- a/community/quassel/APKBUILD +++ b/community/quassel/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Ariadne Conill <ariadne@dereferenced.org> pkgname=quassel pkgver=0.14.0 -pkgrel=16 +pkgrel=17 url="https://www.quassel-irc.org/" pkgdesc="Distributed IRC client - metapackage" arch="all" diff --git a/community/qutebrowser/APKBUILD b/community/qutebrowser/APKBUILD index c15b5c15427..f0d6ac558d4 100644 --- a/community/qutebrowser/APKBUILD +++ b/community/qutebrowser/APKBUILD @@ -5,9 +5,9 @@ pkgver=3.1.0 pkgrel=1 pkgdesc="Keyboard-driven, vim-like browser based on Python and Qt" url="https://qutebrowser.org/" -# s390x, ppc64le and riscv64 blocked by qt5/qt6-qtwebengine +# s390x, ppc64le, riscv64 and loongarch64 blocked by qt5/qt6-qtwebengine # armhf blocked by qt5-qtdeclarative -> py3-qt5 -arch="noarch !armhf !s390x !ppc64le !riscv64" +arch="noarch !armhf !s390x !ppc64le !riscv64 !loongarch64" license="GPL-3.0-only" depends=" py3-adblock diff --git a/testing/rabbitmq-server/APKBUILD b/community/rabbitmq-server/APKBUILD index 9a004ff10b6..45ef6c8b0ac 100644 --- a/testing/rabbitmq-server/APKBUILD +++ b/community/rabbitmq-server/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Nathan Johnson <nathan@nathanjohnson.info> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=rabbitmq-server -pkgver=3.13.1 +pkgver=3.13.2 pkgrel=0 pkgdesc="open source multi-protocol messaging broker" url="https://www.rabbitmq.com/" @@ -85,7 +85,7 @@ package() { } sha512sums=" -022c6e213cf7cea865a6931a3481897efea65dffa649dd77df9d88bb5f9b7abaaa83b525f983de4cb336b1e0469073cadc2ce48d4f47f93005c87b9fdadb3857 rabbitmq-server-3.13.1.tar.xz +fdf095044a6b6cae2f14ca847e36a0ce34ec464058bf782e5a68b1a39113c024a9d1af13e7d1a36597cf6b61442f63842afb8d04be12d9a0dce880639b45a6a7 rabbitmq-server-3.13.2.tar.xz 52413e264ae13a607262f17068ea9b9e65cc23e348d4baf45635473893758ee4571fe1b47989b1c0e69d82ec653e013955719465d37474d3e3e29c21808403f5 rabbitmq-server.initd b8655cb048ab3b32001d4e6920bb5366696f3a5da75c053605e9b270e771c548e36858dca8338813d34376534515bba00af5e6dd7b4b1754a0e64a8fb756e3f3 rabbitmq-server.logrotate " diff --git a/testing/rabbitmq-server/rabbitmq-server.initd b/community/rabbitmq-server/rabbitmq-server.initd index 8fe0f05046a..8fe0f05046a 100644 --- a/testing/rabbitmq-server/rabbitmq-server.initd +++ b/community/rabbitmq-server/rabbitmq-server.initd diff --git a/testing/rabbitmq-server/rabbitmq-server.logrotate b/community/rabbitmq-server/rabbitmq-server.logrotate index f902ed185ff..f902ed185ff 100644 --- a/testing/rabbitmq-server/rabbitmq-server.logrotate +++ b/community/rabbitmq-server/rabbitmq-server.logrotate diff --git a/testing/rabbitmq-server/rabbitmq-server.post-deinstall b/community/rabbitmq-server/rabbitmq-server.post-deinstall index 9c9ef7ce7b6..9c9ef7ce7b6 100644 --- a/testing/rabbitmq-server/rabbitmq-server.post-deinstall +++ b/community/rabbitmq-server/rabbitmq-server.post-deinstall diff --git a/testing/rabbitmq-server/rabbitmq-server.pre-install b/community/rabbitmq-server/rabbitmq-server.pre-install index 0c67e4090f8..0c67e4090f8 100644 --- a/testing/rabbitmq-server/rabbitmq-server.pre-install +++ b/community/rabbitmq-server/rabbitmq-server.pre-install diff --git a/community/radare2/APKBUILD b/community/radare2/APKBUILD index 304896b4344..6d7971a6e47 100644 --- a/community/radare2/APKBUILD +++ b/community/radare2/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Contributor: stef <l0ls0fo2i@ctrlc.hu> # Contributor: Jose-Luis Rivas <ghostbar@riseup.net> -# Maintainer: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: omni <omni+alpine@hack.org> pkgname=radare2 pkgver=5.9.0 -pkgrel=0 +pkgrel=1 pkgdesc="Opensource, crossplatform reverse engineering framework" url="https://www.radare.org/" arch="all" diff --git a/community/radsecproxy/APKBUILD b/community/radsecproxy/APKBUILD index b94e424647f..ace57ee6689 100644 --- a/community/radsecproxy/APKBUILD +++ b/community/radsecproxy/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Josef Vybíhal <josef.vybihal@gmail.com> pkgname=radsecproxy -pkgver=1.10.0 +pkgver=1.10.1 pkgrel=0 pkgdesc="Generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports" url="https://github.com/radsecproxy/radsecproxy" @@ -58,7 +58,7 @@ package() { } sha512sums=" -ba9967015561ef8ee3fbff68f58da785861d5213f5df9e1a27603dcb7688a26e927cbcb8b9845220bf436d99b170c5ce375cee6f5578ec193ac58e32e9c960df radsecproxy-1.10.0.tar.gz +939affc398430b1152a965390524ae46471536d31a4ec7195646d6c9007e7d9d111d04763f3b4baa126dc14ffb2cd0cc8c2695f798eeffb43cfbc8aa3671ea49 radsecproxy-1.10.1.tar.gz b8fb597b7d972d4b1ca2063ded6a23ccecc90e84d303f7b7c52a82750b2eaf54c4a55d74bf190c4301e9b3fccf340974097438aa8b420bc98d2e18be14df9dc2 dont-ignore-logdestination-in-foreground.patch d1cf3b812854f952d69d536fbd9381e71debdd083992a8882d68427ffbadc29f6cc73b43d61dcafacad731d3f78cd4828dc7c0ade7172947ddb68b08f28f0dc1 radsecproxy.conf d5d62277cb0c7dda3f5fdef7ed4fdda8359d382183ca83fad6a7b550d0f00606a3d0650cc50374d90cd9e6fccc9d565a638cb088d1a210d5db6c0cbd983e43b1 radsecproxy.initd diff --git a/community/rakudo-star/APKBUILD b/community/rakudo-star/APKBUILD index ee22825f766..e36a9d054ae 100644 --- a/community/rakudo-star/APKBUILD +++ b/community/rakudo-star/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=rakudo-star -pkgver=2024.03 +pkgver=2024.04 pkgrel=0 pkgdesc="Rakudo modules distribution" url="https://rakudo.org/star/" @@ -41,10 +41,10 @@ package() { } sha512sums=" -d1046128ed3d9ff821049f37c632c2993d3ccd414194594a9dadc13e6adaee1f4977f2a1fea275a62a5e37e3fa8ae0d915d37d8a8d23e863dec63721503ff6c1 rakudo-star-2024.03.tar.gz +f64ee0eb14a09009710c68d78b6e6fd9d100c850f9154b0c9f617e73634875d3978b834bde71497fcd59213734261f7496485353a4523421c591b04855c2ddf3 rakudo-star-2024.04.tar.gz c915cfab907b266d674e796b364ccc61d677773295c5962d5775faf7fab32f02d743c9b4f72d49890f94174481a5ec47c03409dcece0d71a4a0dbf4cf249de14 rakudo-not-perl6.patch cee4eb863c9c6f66ee02e9d16171ad766daa881135c747e4b9b43b1e40442ed2384a6586f090dfe6014b48871873bb109ec76abf45447b72d9a2b5ab63d2e71d openssl-nativelib.patch 29be28af0ce4ddd3d2f4f98a3acbc2684dd29aced756fa08e1ee0bade92af6fb5d786d180740c48abe41138cefcc9cf8a0a86d88248e98804070c875a15e07cc use-newer-versions.patch -14d3ecf476f03962701ae6f85819c51efa5287fbff71195b64b56088e2834652303b453a9159b0508b6202842cf3c4b2129277e250b9542b5abca417937d051e reorder-modules.patch +12a46287ba873ad3d63e51fe21a3db3014e3d1d614a63bed0565cee9dd46e7eb82c88516aabd07932b57fdb2f57997e9de96e653409833689a6d038d0591eab8 reorder-modules.patch 03b71414fe3cb650bcaf5f230ec32b1e879c670dcdd46cb07947f41048c02134559501e16f056ece0a41fb5b7e12e7551407adb95aa46eb9846b80944987bc3e lock-depends-version.patch " diff --git a/community/rakudo-star/reorder-modules.patch b/community/rakudo-star/reorder-modules.patch index c0c267edadf..16961ce833b 100644 --- a/community/rakudo-star/reorder-modules.patch +++ b/community/rakudo-star/reorder-modules.patch @@ -3,78 +3,78 @@ @@ -5,6 +5,8 @@ # Zef, the package manager - zef git https://github.com/ugexe/zef.git v0.21.4 + zef git https://github.com/ugexe/zef.git v0.21.4 + -+JSON-Fast git https://github.com/timo/json_fast.git 0.19 - App::Zef-Deps git https://github.com/coke/raku-zef-deps.git 0.9.8 ++JSON-Fast git https://github.com/timo/json_fast.git 0.19 + App::Zef-Deps git https://github.com/coke/raku-zef-deps.git 0.9.8 # Internationalization @@ -15,10 +17,15 @@ # Logging - Log git https://git.tyil.nl/raku/log v0.3.1 + # Log git 2024.03 2024.03 + -+Terminal-ANSIColor git https://github.com/tadzik/Terminal-ANSIColor.git 0.9.1 - Log-Colored git https://git.tyil.nl/raku/log-colored v0.1.2 ++Terminal-ANSIColor git https://github.com/tadzik/Terminal-ANSIColor.git 0.9.1 + # Log-Colored git 2024.03 v0.1.2 -+File-Which git https://github.com/azawawi/perl6-file-which.git 1.0.4 -+Shell-Command git https://github.com/tadzik/Shell-Command.git 1.1 -+LibraryMake git https://github.com/retupmoca/P6-LibraryMake.git v1.0.5 ++File-Which git https://github.com/azawawi/perl6-file-which.git 1.0.4 ++Shell-Command git https://github.com/tadzik/Shell-Command.git 1.1 ++LibraryMake git https://github.com/retupmoca/P6-LibraryMake.git v1.0.5 + # terminal related modules --Terminal-ANSIColor git https://github.com/tadzik/Terminal-ANSIColor.git 0.9.1 - Term-termios git https://github.com/krunen/term-termios 0.2.7 - Terminal-ANSIParser git https://github.com/japhb/Terminal-ANSIParser.git 0.0.3 - Terminal-LineEditor git https://github.com/japhb/Terminal-LineEditor.git 0.0.16 +-Terminal-ANSIColor git https://github.com/tadzik/Terminal-ANSIColor.git 0.9.1 + Term-termios git https://github.com/krunen/term-termios 0.2.7 + Terminal-ANSIParser git https://github.com/japhb/Terminal-ANSIParser.git 0.0.3 + Terminal-LineEditor git https://github.com/japhb/Terminal-LineEditor.git 0.0.16 @@ -26,6 +33,17 @@ # Configuration management - Hash-Merge git https://github.com/scriptkitties/p6-Hash-Merge.git v2.0.0 - IO-Path-XDG git https://git.tyil.nl/raku/io-path-xdg v0.2.0 + Hash-Merge git https://github.com/scriptkitties/p6-Hash-Merge.git v2.0.0 + # IO-Path-XDG git 2024.03 v0.2.0 + -+URI git https://github.com/raku-community-modules/uri.git 0.3.7 -+JSON-OptIn git https://github.com/jonathanstowe/JSON-OptIn.git v0.0.2 -+JSON-Name git https://github.com/jonathanstowe/JSON-Name.git v0.0.7 -+JSON-Unmarshal git https://github.com/raku-community-modules/JSON-Unmarshal.git 0.15 -+JSON-Marshal git https://github.com/jonathanstowe/JSON-Marshal.git v0.0.25 -+JSON-Class git https://github.com/jonathanstowe/JSON-Class.git v0.0.21 -+META6 git https://github.com/jonathanstowe/META6.git v0.0.30 -+License-SPDX git https://github.com/jonathanstowe/License-SPDX.git v3.23.0 -+Test-META git https://github.com/jonathanstowe/Test-META.git v0.0.20 ++URI git https://github.com/raku-community-modules/uri.git 0.3.7 ++JSON-OptIn git https://github.com/jonathanstowe/JSON-OptIn.git v0.0.2 ++JSON-Name git https://github.com/jonathanstowe/JSON-Name.git v0.0.7 ++JSON-Unmarshal git https://github.com/raku-community-modules/JSON-Unmarshal.git 0.15 ++JSON-Marshal git https://github.com/jonathanstowe/JSON-Marshal.git v0.0.25 ++JSON-Class git https://github.com/jonathanstowe/JSON-Class.git v0.0.21 ++META6 git https://github.com/jonathanstowe/META6.git v0.0.30 ++License-SPDX git https://github.com/jonathanstowe/License-SPDX.git v3.23.0 ++Test-META git https://github.com/jonathanstowe/Test-META.git v0.0.20 + - Glob-IO git https://github.com/zostay/raku-IO-Glob.git v0.9.0 - Config git https://github.com/scriptkitties/p6-Config v3.0.4 + Glob-IO git https://github.com/zostay/raku-IO-Glob.git v0.9.0 + Config git https://github.com/scriptkitties/p6-Config v3.0.4 @@ -37,7 +55,6 @@ - YAMLish git https://github.com/Leont/yamlish.git 0.1.0 - Config-Parser-yaml git https://github.com/scriptkitties/p6-Config-Parser-yaml v1.0.0 + YAMLish git https://github.com/Leont/yamlish.git 0.1.0 + Config-Parser-yaml git https://github.com/scriptkitties/p6-Config-Parser-yaml v1.0.0 --JSON-Fast git https://github.com/timo/json_fast.git 0.19 - Config-Parser-json git https://github.com/arjancwidlak/p6-Config-Parser-json.git master +-JSON-Fast git https://github.com/timo/json_fast.git 0.19 + Config-Parser-json git https://github.com/arjancwidlak/p6-Config-Parser-json.git master # Database interaction @@ -56,15 +73,6 @@ - Template-Mojo git https://github.com/tadzik/Template-Mojo.git 0.2.2 + Template-Mojo git https://github.com/tadzik/Template-Mojo.git 0.2.2 # Taken from the previous iteration of Rakudo Star --URI git https://github.com/raku-community-modules/uri.git 0.3.7 --JSON-OptIn git https://github.com/jonathanstowe/JSON-OptIn.git v0.0.2 --JSON-Name git https://github.com/jonathanstowe/JSON-Name.git v0.0.7 --JSON-Unmarshal git https://github.com/raku-community-modules/JSON-Unmarshal.git 0.15 --JSON-Marshal git https://github.com/jonathanstowe/JSON-Marshal.git v0.0.25 --JSON-Class git https://github.com/jonathanstowe/JSON-Class.git v0.0.21 --META6 git https://github.com/jonathanstowe/META6.git v0.0.30 --License-SPDX git https://github.com/jonathanstowe/License-SPDX.git v3.23.0 --Test-META git https://github.com/jonathanstowe/Test-META.git v0.0.20 - XML-Writer git https://github.com/masak/xml-writer.git master - SVG git https://github.com/moritz/svg.git v1.0 - SVG-Plot git https://github.com/moritz/svg-plot.git master +-URI git https://github.com/raku-community-modules/uri.git 0.3.7 +-JSON-OptIn git https://github.com/jonathanstowe/JSON-OptIn.git v0.0.2 +-JSON-Name git https://github.com/jonathanstowe/JSON-Name.git v0.0.7 +-JSON-Unmarshal git https://github.com/raku-community-modules/JSON-Unmarshal.git 0.15 +-JSON-Marshal git https://github.com/jonathanstowe/JSON-Marshal.git v0.0.25 +-JSON-Class git https://github.com/jonathanstowe/JSON-Class.git v0.0.21 +-META6 git https://github.com/jonathanstowe/META6.git v0.0.30 +-License-SPDX git https://github.com/jonathanstowe/License-SPDX.git v3.23.0 +-Test-META git https://github.com/jonathanstowe/Test-META.git v0.0.20 + XML-Writer git https://github.com/masak/xml-writer.git master + SVG git https://github.com/moritz/svg.git v1.0 + SVG-Plot git https://github.com/moritz/svg-plot.git master @@ -94,9 +102,6 @@ - HTTP-UserAgent git https://github.com/sergot/http-useragent.git v1.1.52 - Pod-To-HTML git https://github.com/raku/Pod-To-HTML.git v0.8.1 - Pod-To-BigPage git https://github.com/perl6/perl6-pod-to-bigpage.git 0.5.2 --File-Which git https://github.com/azawawi/perl6-file-which.git 1.0.4 --Shell-Command git https://github.com/tadzik/Shell-Command.git 1.1 --LibraryMake git https://github.com/retupmoca/P6-LibraryMake.git v1.0.5 - IO-String git https://github.com/hoelzro/p6-io-string.git master - DateTime-Format git https://github.com/supernovus/perl6-datetime-format.git 0.1.5 - IO-Capture-Simple git https://github.com/JJ/raku-io-capture-simple.git v0.0.2 + HTTP-UserAgent git https://github.com/sergot/http-useragent.git v1.1.52 + Pod-To-HTML git https://github.com/raku/Pod-To-HTML.git v0.8.1 + Pod-To-BigPage git https://github.com/perl6/perl6-pod-to-bigpage.git 0.5.2 +-File-Which git https://github.com/azawawi/perl6-file-which.git 1.0.4 +-Shell-Command git https://github.com/tadzik/Shell-Command.git 1.1 +-LibraryMake git https://github.com/retupmoca/P6-LibraryMake.git v1.0.5 + IO-String git https://github.com/hoelzro/p6-io-string.git master + DateTime-Format git https://github.com/supernovus/perl6-datetime-format.git 0.1.5 + IO-Capture-Simple git https://github.com/JJ/raku-io-capture-simple.git v0.0.2 diff --git a/community/rakudo/APKBUILD b/community/rakudo/APKBUILD index c10cfbaebe3..c20ea5fb103 100644 --- a/community/rakudo/APKBUILD +++ b/community/rakudo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Curt Tilmes <Curt.Tilmes@nasa.gov> # Maintainer: Curt Tilmes <Curt.Tilmes@nasa.gov> pkgname=rakudo -pkgver=2024.03 +pkgver=2024.04 pkgrel=0 pkgdesc="Compiler for the Raku programming language" url="https://rakudo.org/" @@ -68,5 +68,5 @@ dev() { } sha512sums=" -e4c1f4f88ca145ce2eec8a69d11789684d8ff898f2fabe05ac0c2f38c8589015a6893ea1a834554fe81b541d242622c0e72f014a4df46ed29620baf8aad3bac4 rakudo-2024.03.tar.gz +98b4dd35456df1774a320dbd53ffecc72323d91c260ce1264b2056624e8cdf8a47cfcd89b775411f8bf3fb1f1b4725e2b75c7724c5891a4d366e5ba3f2a11cd4 rakudo-2024.04.tar.gz " diff --git a/community/raspberrypi-utils/APKBUILD b/community/raspberrypi-utils/APKBUILD index 1a0c055de0f..ea37fde3849 100644 --- a/community/raspberrypi-utils/APKBUILD +++ b/community/raspberrypi-utils/APKBUILD @@ -1,9 +1,9 @@ # Contributor: macmpi <spam@ipik.org> # Maintainer: macmpi <spam@ipik.org> pkgname=raspberrypi-utils -pkgver=0.20240313 +pkgver=0.20240424 pkgrel=0 -_commit="cf46fe84b2a345146e067a9a3529ba6e28517c8e" +_commit="451b9881b72cb994c102724b5a7d9b93f97dc315" pkgdesc="Collection of Raspberry Pi utilities (scripts and simple applications)" url="https://github.com/raspberrypi/utils" arch="armhf armv7 aarch64" @@ -192,5 +192,5 @@ vcmailbox_doc() { } sha512sums=" -0898867eda8b42afa9213ceca6405885f7cb94c332ac63951ec52e77c81748127b9fe340dd367add681650ce0443e34634f085054c5d48a19e485c14a08a6c71 raspberrypi-utils-cf46fe84b2a345146e067a9a3529ba6e28517c8e.tar.gz +2ef1d36bd8cf4fb641e7ef07712aaefe301f5217cf649068375dbdcc74be586e44f90270e3b51ee8368a3470874d8655c48427ec4b0ad4c7c562cca10e2a4484 raspberrypi-utils-451b9881b72cb994c102724b5a7d9b93f97dc315.tar.gz " diff --git a/community/rbspy/APKBUILD b/community/rbspy/APKBUILD index 335fd555f93..c1840491685 100644 --- a/community/rbspy/APKBUILD +++ b/community/rbspy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Adam Jensen <adam@acj.sh> # Maintainer: Adam Jensen <adam@acj.sh> pkgname=rbspy -pkgver=0.19.1 +pkgver=0.20.0 pkgrel=0 pkgdesc="Sampling profiler for Ruby" url="https://rbspy.github.io/" @@ -32,5 +32,5 @@ package() { } sha512sums=" -23e7e36e2f840b70a4871db4582a10bb638247e0abf4214ae7be01c6e88cf5b47dabb512f6065e2bbc5de8f1d4a9314aeb6fde8eccd523a3de7e518a671cc16f rbspy-0.19.1.tar.gz +75a14b115b9770bf9aee5ad47f5c9087637df49ba7b47b91b865f3c0d9550445f7375df791e7bb476d549dc9a86ef0ca821181649384505f5a0078e20acda519 rbspy-0.20.0.tar.gz " diff --git a/community/rdma-core/APKBUILD b/community/rdma-core/APKBUILD index b59a24936c0..203970d55e2 100644 --- a/community/rdma-core/APKBUILD +++ b/community/rdma-core/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=rdma-core -pkgver=50.0 -pkgrel=1 +pkgver=51.0 +pkgrel=0 pkgdesc="RDMA core userspace libraries and daemons" url="https://github.com/linux-rdma/rdma-core" license="GPL-2.0-only OR BSD-2-Clause" @@ -36,6 +36,6 @@ package() { } sha512sums=" -0d341300dde2a8756ab0e80bf8d316627c997e85661d50b51897aa03e1b7326f4ca7a6f24e370354779482a2d9455e58dbb07e6292ed8b511e7f195e4e2d1850 rdma-core-50.0.tar.gz +25b92f4cf98172c00bdfc166666307be39fbdbc061e91c290fee9e932829df799e864019273cfd1f6118968bdfb3361b467d414f062b5bd7a269246c5857671d rdma-core-51.0.tar.gz 0cc864e07087287ffa4b90d5ce6efdc4ab6f0ca54b01c77eb5ed28568c89f978429fd3687b5bafed726663d9145e1123e1701e9e58a59cbf9715f96d8f2b1bbe Cmakelists.patch " diff --git a/community/re2/APKBUILD b/community/re2/APKBUILD index 3fb88b1d148..3e930cdfdf6 100644 --- a/community/re2/APKBUILD +++ b/community/re2/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=re2 -pkgver=2024.04.01 +pkgver=2024.05.01 _pkgver=${pkgver//./-} -pkgrel=1 +pkgrel=0 pkgdesc="Efficient, principled regular expression library" url="https://github.com/google/re2" arch="all" @@ -67,5 +67,5 @@ py3() { } sha512sums=" -1511d163ee90c724705cc16d2995e777a7d894ff8133bd3457a26d8c6a9dcb8ccdd2e77b73681e623317a1edbbd3c928569358af91e72ce8612f7b7b61108283 re2-2024.04.01.tar.gz +f6ba22b1d3fdb4c9a6932fd3da6142bbe4617f173a21692878f30210922be3fc550f3a84f84ff1859e3a4235c29946369800c6c848b17af75679eeab3cef2167 re2-2024.05.01.tar.gz " diff --git a/testing/read-it-later/APKBUILD b/community/read-it-later/APKBUILD index a32bbb7dcc0..56e9e17f8e4 100644 --- a/testing/read-it-later/APKBUILD +++ b/community/read-it-later/APKBUILD @@ -7,9 +7,19 @@ pkgdesc="Wallabag Client built with GTK" url="https://gitlab.gnome.org/World/read-it-later" arch="all" license="GPL-3.0-only" -makedepends="meson bash rust cargo webkit2gtk-6.0-dev libadwaita-dev sqlite-dev - gettext-dev openssl-dev>3 gtk4.0-dev desktop-file-utils" -source="read-it-later-$pkgver.tar.gz::https://gitlab.gnome.org/World/read-it-later/-/archive/$pkgver/read-it-later-$pkgver.tar.gz +makedepends=" + bash + cargo + desktop-file-utils + gettext-dev + gtk4.0-dev + libadwaita-dev + meson + openssl-dev>3 + rust + sqlite-dev + webkit2gtk-6.0-dev" +source="https://gitlab.gnome.org/World/read-it-later/-/archive/$pkgver/read-it-later-$pkgver.tar.gz " build() { diff --git a/testing/redict/APKBUILD b/community/redict/APKBUILD index 25491bdc246..873337d5ec8 100644 --- a/testing/redict/APKBUILD +++ b/community/redict/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: fossdd <fossdd@pwned.life> pkgname=redict pkgver=7.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A distributed key/value database" url="https://redict.io/" arch="all" @@ -13,8 +13,17 @@ pkgusers="redict" pkggroups="redict" makedepends="linux-headers openssl-dev>3" checkdepends="tcl procps" -install="$pkgname.pre-install $pkgname.post-install" -subpackages="$pkgname-openrc" +install=" + $pkgname-compat.pre-install + $pkgname.post-install + $pkgname.pre-install + " +subpackages=" + $pkgname-benchmark + $pkgname-cli + $pkgname-compat::noarch + $pkgname-openrc + " builddir="$srcdir/$pkgname" source="redict-$pkgver.tar.gz::https://codeberg.org/redict/redict/archive/$pkgver.tar.gz redict.conf.patch @@ -25,6 +34,11 @@ source="redict-$pkgver.tar.gz::https://codeberg.org/redict/redict/archive/$pkgve $pkgname.logrotate " +case "$CARCH" in + # FIXME: One test is broken on s390x. + s390x) options="!check";; +esac + build() { export CFLAGS="$CFLAGS -DUSE_MALLOC_USABLE_SIZE -O2 -flto=auto" make USE_JEMALLOC=no \ @@ -57,6 +71,28 @@ package() { var/log/redict } +benchmark() { + pkgdesc="Redict benchmarking tool" + + amove usr/bin/redict-benchmark +} + +cli() { + pkgdesc="Redict CLI client" + + amove usr/bin/redict-cli +} + +compat() { + pkgdesc="Redict command symlinks and system group for compatibility with redis" + depends="!redis !valkey-compat" + + mkdir -p "$subpkgdir"/usr/bin + for i in benchmark check-aof check-rdb cli sentinel server; do + ln -s /usr/bin/redict-$i "$subpkgdir"/usr/bin/redis-$i + done +} + sha512sums=" d33f4dfaf728f5a22abe7a6223f3192c39dc41a32e7bcb0f453caaa859f35b512534979c26ced9f4458c19611debd282f37955e930151c0f827035f349647226 redict-7.3.0.tar.gz 96740880cd0caac2cecb11066a555055e7c3f10feb312b2d4c7a206fb92c1003415cf7ab81bec4ac96f7631724d9097b1ca130621c8b564a7987dcd75d2f6e25 redict.conf.patch diff --git a/community/redict/redict-compat.pre-install b/community/redict/redict-compat.pre-install new file mode 100644 index 00000000000..6bab8d89207 --- /dev/null +++ b/community/redict/redict-compat.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S redis 2>/dev/null +addgroup redict redis 2>/dev/null + +exit 0 diff --git a/testing/redict/redict-sentinel.initd b/community/redict/redict-sentinel.initd index 13018fea835..13018fea835 100644 --- a/testing/redict/redict-sentinel.initd +++ b/community/redict/redict-sentinel.initd diff --git a/testing/redict/redict.conf.patch b/community/redict/redict.conf.patch index 5eea659ef17..5eea659ef17 100644 --- a/testing/redict/redict.conf.patch +++ b/community/redict/redict.conf.patch diff --git a/testing/redict/redict.confd b/community/redict/redict.confd index ba1e9948fbe..ba1e9948fbe 100644 --- a/testing/redict/redict.confd +++ b/community/redict/redict.confd diff --git a/testing/redict/redict.initd b/community/redict/redict.initd index 6abbd10640e..6abbd10640e 100644 --- a/testing/redict/redict.initd +++ b/community/redict/redict.initd diff --git a/testing/redict/redict.logrotate b/community/redict/redict.logrotate index 64d894b3eef..64d894b3eef 100644 --- a/testing/redict/redict.logrotate +++ b/community/redict/redict.logrotate diff --git a/testing/redict/redict.post-install b/community/redict/redict.post-install index 1fe8b18cbdb..3189533841b 100644 --- a/testing/redict/redict.post-install +++ b/community/redict/redict.post-install @@ -8,4 +8,15 @@ if ! [ -e /sbin/openrc ]; then install -d -m 755 -o redict -g redict /run/redict fi +ver_old=$2 + +if [ "$(apk version -t "$ver_old" '7.3.0-r2')" = '<' ]; then + cat >&2 <<-EOF + * + * redict-cli and redict-benchmark have been moved to separate subpackages. + * If you use it, run: apk add redict-cli redict-benchmark + * + EOF +fi + exit 0 diff --git a/testing/redict/redict.pre-install b/community/redict/redict.pre-install index 2f47a36e1c8..2f47a36e1c8 100644 --- a/testing/redict/redict.pre-install +++ b/community/redict/redict.pre-install diff --git a/testing/redict/sentinel.conf.patch b/community/redict/sentinel.conf.patch index 4bf5cfbb5eb..4bf5cfbb5eb 100644 --- a/testing/redict/sentinel.conf.patch +++ b/community/redict/sentinel.conf.patch diff --git a/main/redis/APKBUILD b/community/redis/APKBUILD index b6b9fb91d1b..b6b9fb91d1b 100644 --- a/main/redis/APKBUILD +++ b/community/redis/APKBUILD diff --git a/main/redis/redis-sentinel.initd b/community/redis/redis-sentinel.initd index f5d2a371c53..f5d2a371c53 100644 --- a/main/redis/redis-sentinel.initd +++ b/community/redis/redis-sentinel.initd diff --git a/main/redis/redis.conf.patch b/community/redis/redis.conf.patch index a28e21fffcd..a28e21fffcd 100644 --- a/main/redis/redis.conf.patch +++ b/community/redis/redis.conf.patch diff --git a/main/redis/redis.confd b/community/redis/redis.confd index 422145f4ec8..422145f4ec8 100644 --- a/main/redis/redis.confd +++ b/community/redis/redis.confd diff --git a/main/redis/redis.initd b/community/redis/redis.initd index f617e005ff6..f617e005ff6 100644 --- a/main/redis/redis.initd +++ b/community/redis/redis.initd diff --git a/main/redis/redis.logrotate b/community/redis/redis.logrotate index 5281d381171..5281d381171 100644 --- a/main/redis/redis.logrotate +++ b/community/redis/redis.logrotate diff --git a/main/redis/redis.post-install b/community/redis/redis.post-install index a0cfbe51ee9..a0cfbe51ee9 100644 --- a/main/redis/redis.post-install +++ b/community/redis/redis.post-install diff --git a/main/redis/redis.pre-install b/community/redis/redis.pre-install index 22622e58400..22622e58400 100644 --- a/main/redis/redis.pre-install +++ b/community/redis/redis.pre-install diff --git a/main/redis/sentinel.conf.patch b/community/redis/sentinel.conf.patch index 9c18168bad7..9c18168bad7 100644 --- a/main/redis/sentinel.conf.patch +++ b/community/redis/sentinel.conf.patch diff --git a/community/remind/APKBUILD b/community/remind/APKBUILD index 38405732c8d..b7947e2c5b3 100644 --- a/community/remind/APKBUILD +++ b/community/remind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=remind -pkgver=04.03.06 +pkgver=04.03.07 pkgrel=0 pkgdesc="Sophisticated calendar and alarm program" url="https://dianne.skoll.ca/projects/remind/" @@ -37,5 +37,5 @@ tkremind() { } sha512sums=" -a1edd2dbb7a96bb41aa9bab20053e80846d8aeda27b4d9dbdace360c983754682b4e3838e40d023860a08cb76fbf8929caf36fd388c3a2455914029c3ad8eba8 remind-04.03.06.tar.gz +5fd875b3ca11362572be22cfedac7cdefb7e3cb68902ae726246420c8fbc8c026a9290b58b30f43ef571af7dbc079643c336776beb2a38f9dbdd54b42d0ab783 remind-04.03.07.tar.gz " diff --git a/community/retawq/APKBUILD b/community/retawq/APKBUILD index 03180da234f..d1c018dd9f0 100644 --- a/community/retawq/APKBUILD +++ b/community/retawq/APKBUILD @@ -11,6 +11,7 @@ makedepends="ncurses-dev openssl-dev>3" subpackages="$pkgname-doc" source="https://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz libressl.patch + ncurses-opaque.patch " build() { @@ -32,5 +33,8 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="555f61460decf3108e85f0d0153d281a7b9a9fd2474563fcf47145bf969025ffcfad6d5dc0ae946bde11bdf880cc26ceb5cde3194194a1cbbaadc4a672a094f8 retawq-0.2.6c.tar.gz -3f54adee86945c2b5a2acc300cfc580186759a7545868578780e6bf60f17b29e39c1a4f55745e48dbfdfa05010bddf0ec98cdb510aa5dd19d437c5f45e97a632 libressl.patch" +sha512sums=" +555f61460decf3108e85f0d0153d281a7b9a9fd2474563fcf47145bf969025ffcfad6d5dc0ae946bde11bdf880cc26ceb5cde3194194a1cbbaadc4a672a094f8 retawq-0.2.6c.tar.gz +3f54adee86945c2b5a2acc300cfc580186759a7545868578780e6bf60f17b29e39c1a4f55745e48dbfdfa05010bddf0ec98cdb510aa5dd19d437c5f45e97a632 libressl.patch +c307193cc8f2c8ecee5462ad0c5bfbdfb4f0c5e560c0dd92ed867e4080af21b9a9af7dfd682fb1da9dd95a49a0140304aa5d5d8d2939eb2d66a784dd66151075 ncurses-opaque.patch +" diff --git a/community/retawq/ncurses-opaque.patch b/community/retawq/ncurses-opaque.patch new file mode 100644 index 00000000000..910360d435f --- /dev/null +++ b/community/retawq/ncurses-opaque.patch @@ -0,0 +1,15 @@ +--- a/main.c ++++ b/main.c +@@ -4525,10 +4525,10 @@ + + #if TGC_IS_CURSES + static my_inline void __curleft(void) +-{ (void) move(stdscr->_cury, stdscr->_curx - 1); ++{ (void) move(getcury(stdscr), getcurx(stdscr) - 1); + } + static my_inline void __curright(void) +-{ (void) move(stdscr->_cury, stdscr->_curx + 1); ++{ (void) move(getcury(stdscr), getcurx(stdscr) + 1); + } + #endif + diff --git a/testing/rime-plum/APKBUILD b/community/rime-plum/APKBUILD index d70ebc4dfb3..d70ebc4dfb3 100644 --- a/testing/rime-plum/APKBUILD +++ b/community/rime-plum/APKBUILD diff --git a/community/rippled/APKBUILD b/community/rippled/APKBUILD index 73e9deb06d3..deb6c5000f2 100644 --- a/community/rippled/APKBUILD +++ b/community/rippled/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=rippled pkgver=1.9.4 -pkgrel=20 +pkgrel=22 pkgdesc="Blockchain daemon implementing the Ripple Consensus Ledger" options="net !check" # FIXME: 1 failure, rippled testsuite doesn't tell which one it is url="https://ripple.com/" # needs 64bit, build fails on s390x and ppc64le -arch="aarch64 x86_64" +#arch="aarch64 x86_64" license="ISC" makedepends=" abseil-cpp-dev diff --git a/community/rkward/APKBUILD b/community/rkward/APKBUILD index 2a67a890577..87c043cb9e8 100644 --- a/community/rkward/APKBUILD +++ b/community/rkward/APKBUILD @@ -5,10 +5,10 @@ # group=kde-other pkgname=rkward pkgver=0.7.5 -pkgrel=2 +pkgrel=3 # armhf blocked by extra-cmake-modules -# s390x, ppc64le and riscv64 blocked by qt5-qtwebengine -arch="all !armhf !s390x !ppc64le !riscv64" +# s390x, ppc64le, riscv64 and loongarch64 blocked by qt5-qtwebengine +arch="all !armhf !s390x !ppc64le !riscv64 !loongarch64" url="https://rkward.kde.org/" pkgdesc="Easy extensible and easy-to-use IDE/GUI for R" license="GPL-2.0-or-later" @@ -32,7 +32,8 @@ makedepends=" " checkdepends="xvfb-run" _repo_url="https://invent.kde.org/education/rkward.git" -source="https://download.kde.org/stable/rkward/$pkgver/rkward-$pkgver.tar.gz" +source="https://download.kde.org/stable/rkward/$pkgver/rkward-$pkgver.tar.gz + format-security.patch" subpackages="$pkgname-doc $pkgname-lang" build() { @@ -53,4 +54,5 @@ package() { sha512sums=" 247ee50fbebb9b74a1c03d6ef99dded18a1b3cf18286a6d2afcaa8ff7472cc3cb735db0a876926625aff4674906956f7a0c001a46d0dfd328a93e8c7af9f6c6b rkward-0.7.5.tar.gz +4478fa5a3dd5320ce6dbe11c514f899e016ab926c9ae554c42df3285ce344242d588a2892075e04cbaf3e5b0e794dd8c5f499b2728eea624d1cd3bb13d6b1a48 format-security.patch " diff --git a/community/rkward/format-security.patch b/community/rkward/format-security.patch new file mode 100644 index 00000000000..7099a3b8071 --- /dev/null +++ b/community/rkward/format-security.patch @@ -0,0 +1,33 @@ +Without this patch, rkward will fail to build from source due to -Werror=format-security. +The problem here is that Rf_warning and Rf_error expect a format string as the first +argument, however, here the first argument is the QByteArray returned by ::fromUtf8 +which is implicitly converted to a char*. + +We can fix this, by specifying a "%s" format string as the first argument and then +passing the QByteArray as a parameter for this format string. + +diff -upr rkward-0.7.5.orig/rkward/rbackend/rkrbackend.cpp rkward-0.7.5/rkward/rbackend/rkrbackend.cpp +--- rkward-0.7.5.orig/rkward/rbackend/rkrbackend.cpp 2024-05-11 10:33:22.354687832 +0200 ++++ rkward-0.7.5/rkward/rbackend/rkrbackend.cpp 2024-05-11 10:33:54.493177844 +0200 +@@ -945,8 +945,8 @@ SEXP doSubstackCall (SEXP _call, SEXP _a + + // For now, for simplicity, assume args are always strings, although possibly nested in lists + auto ret = RKRBackend::this_pointer->handleRequestWithSubcommands(call, RKRSupport::SEXPToNestedStrings(_args)); +- if (!ret.warning.isEmpty()) Rf_warning(RKRBackend::fromUtf8(ret.warning)); // print warnings, first, as errors will cause a stop +- if (!ret.error.isEmpty()) Rf_error(RKRBackend::fromUtf8(ret.error)); ++ if (!ret.warning.isEmpty()) Rf_warning("%s", RKRBackend::fromUtf8(ret.warning).data()); // print warnings, first, as errors will cause a stop ++ if (!ret.error.isEmpty()) Rf_error("%s", RKRBackend::fromUtf8(ret.error).data()); + + return RKRSupport::QVariantToSEXP(ret.ret); + } +@@ -957,8 +957,8 @@ SEXP doPlainGenericRequest (SEXP call, S + R_CheckUserInterrupt (); + + auto ret = RKRBackend::this_pointer->handlePlainGenericRequest(RKRSupport::SEXPToStringList(call), RKRSupport::SEXPToInt(synchronous)); +- if (!ret.warning.isEmpty()) Rf_warning(RKRBackend::fromUtf8(ret.warning)); // print warnings, first, as errors will cause a stop +- if (!ret.error.isEmpty()) Rf_error(RKRBackend::fromUtf8(ret.error)); ++ if (!ret.warning.isEmpty()) Rf_warning("%s", RKRBackend::fromUtf8(ret.warning).data()); // print warnings, first, as errors will cause a stop ++ if (!ret.error.isEmpty()) Rf_error("%s", RKRBackend::fromUtf8(ret.error).data()); + + return RKRSupport::QVariantToSEXP(ret.ret); + } diff --git a/community/rnp/APKBUILD b/community/rnp/APKBUILD index 7f5cdab8b8d..9f5a7b7ddde 100644 --- a/community/rnp/APKBUILD +++ b/community/rnp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=rnp -pkgver=0.17.0 +pkgver=0.17.1 pkgrel=0 pkgdesc="High performance C++ OpenPGP library used by Mozilla Thunderbird" url="https://www.rnpgp.org/" @@ -18,9 +18,8 @@ makedepends=" zlib-dev " subpackages="$pkgname-dev $pkgname-doc librnp" +options="chmod-clean" source="https://github.com/rnpgp/rnp/archive/v$pkgver/rnp-$pkgver.tar.gz - cleanup-nopermsdir.patch - system-libsexpp.patch " case "$CARCH" in @@ -73,7 +72,5 @@ librnp() { } sha512sums=" -0aa5262aa3be163b8a8931d6b9200ced52bb640cd7b02b50009cfb8d5fe1e664d27b2c4a0a3e534cf59d6ea42fbc1c62c970a07cadc27ab6962e0f69f996f74d rnp-0.17.0.tar.gz -abb84713d54763b5cfb4a3a80078db04ef3ad7c8913bfdcc44c82081e1d4547039e78cfaae8a11ead53e05bc7f9308641c044a62c8fe9f8c4922b12495c61240 cleanup-nopermsdir.patch -379ad237dc7db9d6b56e48cd3f8d826fdeb63ac5271eab5d96f0608fa445b370fb0624a04c86216e6a8e27a576d5a327fd20e43f5356ca699e2d608c6519f0a9 system-libsexpp.patch +0224f79e4dd4b72ddd9c191218327da5485ed1d81321cc3a167cfeea68c00e47cec9151a4177e65e5560039345db3a52e41a093adfdf833f57e867bc559494a5 rnp-0.17.1.tar.gz " diff --git a/community/rnp/cleanup-nopermsdir.patch b/community/rnp/cleanup-nopermsdir.patch deleted file mode 100644 index 404e26c5fd9..00000000000 --- a/community/rnp/cleanup-nopermsdir.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Mon, 10 Jan 2022 23:22:21 +0100 -Subject: [PATCH] Fix problem with undeletable "noperms" directory - -Directory "noperms" is created with chmod 000 and the test doesn't remove it -nor change the perms afterwards, so `abuild clean` cannot delete it. - ---- a/src/tests/generatekey.cpp -+++ b/src/tests/generatekey.cpp -@@ -507,8 +507,8 @@ - /* Try to generate key in the directory and make sure generation fails */ - #ifndef _WIN32 - assert_false(generate_test_key(RNP_KEYSTORE_GPG, NULL, "SHA256", nopermsdir)); -+ (void) chmod(nopermsdir, S_IRWXU | S_IRWXG); // XXX-Patched: change back so we can delete it - #else -- /* There are no permissions for mkdir() under the Windows */ - assert_true(generate_test_key(RNP_KEYSTORE_GPG, NULL, "SHA256", nopermsdir)); - #endif - } diff --git a/community/rnp/system-libsexpp.patch b/community/rnp/system-libsexpp.patch deleted file mode 100644 index 1aa9f55a0fa..00000000000 --- a/community/rnp/system-libsexpp.patch +++ /dev/null @@ -1,178 +0,0 @@ -This patch backports relevant parts of - -* 8f7b2f27af277b0577ada7ecc54bb2db190eac85 -* 3e9831ac3409095db40b7967866b9197eb36ff64 -* df4f24bd48b6691692379f1370fde3c12e96e3ab -* f9147e72a369f1e412d2f2385cf23a3e9dd6882d -* 82d9747f1da36db0393c122b451a847cf561bb7c - -See-Also: https://github.com/rnpgp/rnp/pull/2103 --- -From: Remi Collet <remi@remirepo.net> -Date: Wed, 21 Jun 2023 14:12:26 +0200 -Subject: Renamed libsexp to libsexpp; integrated an option to use - libsexpp provided by the system - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,6 +58,8 @@ option(ENABLE_COVERAGE "Enable code coverage testing.") - option(ENABLE_SANITIZERS "Enable ASan and other sanitizers.") - option(ENABLE_FUZZERS "Enable fuzz targets.") - option(DOWNLOAD_GTEST "Download Googletest" On) -+option(SYSTEM_LIBSEXPP "Use system sexpp library" OFF) -+ - # crypto components - function(tristate_feature_auto NAME DESCRIPTION) - set(${NAME} Auto CACHE STRING ${DESCRIPTION}) -@@ -176,10 +178,36 @@ if (ENABLE_FUZZERS) - endif() - add_subdirectory(src/common) - --set(WITH_SEXP_CLI OFF) --set(WITH_SEXP_TESTS OFF) --set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development) --add_subdirectory(src/libsexp EXCLUDE_FROM_ALL) -+if (SYSTEM_LIBSEXPP) -+ find_package(PkgConfig QUIET) -+ pkg_check_modules(SEXPP sexpp>=0.8.7 REQUIRED) -+ find_library(SEXPP_LIBRARY -+ NAMES -+ "libsexpp" -+ "sexpp" -+ HINTS -+ "${SEXPP_LIBRARY_DIRS}" -+ ) -+ add_library(sexpp UNKNOWN IMPORTED) -+ set_target_properties(sexpp -+ PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES "${SEXPP_INCLUDE_DIR}" -+ IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" -+ IMPORTED_LOCATION "${SEXPP_LIBRARY}" -+ ) -+else (SYSTEM_LIBSEXPP) -+# If we use system libsexpp is not used we build sexpp static library -+# If librnp is shared, libsexpp.a is a transient artifact which is hidden from -+# the end user. -+# If librnp is static we install libsexpp.a aside -+ set(SAVED_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) -+ set(BUILD_SHARED_LIBS OFF) -+ set(WITH_SEXP_CLI OFF) -+ set(WITH_SEXP_TESTS OFF) -+ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development) -+ add_subdirectory(src/libsexpp EXCLUDE_FROM_ALL) -+ set(BUILD_SHARED_LIBS ${SAVED_BUILD_SHARED_LIBS}) -+endif (SYSTEM_LIBSEXPP) - - add_subdirectory(src/lib) - add_subdirectory(src/rnp) ---- a/src/lib/CMakeLists.txt -+++ b/src/lib/CMakeLists.txt -@@ -320,6 +320,7 @@ target_include_directories(librnp-obj - PRIVATE - "${CMAKE_CURRENT_SOURCE_DIR}" - "${PROJECT_SOURCE_DIR}/src" -+ "${SEXPP_INCLUDE_DIRS}" - ) - target_link_libraries(librnp-obj PRIVATE JSON-C::JSON-C) - if (CRYPTO_BACKEND_BOTAN) -@@ -328,7 +329,7 @@ elseif (CRYPTO_BACKEND_OPENSSL) - target_link_libraries(librnp-obj PRIVATE OpenSSL::Crypto) - endif() - --target_link_libraries(librnp-obj PRIVATE sexp) -+target_link_libraries(librnp-obj PRIVATE sexpp) - - set_target_properties(librnp-obj PROPERTIES CXX_VISIBILITY_PRESET hidden) - if (TARGET BZip2::BZip2) -@@ -384,7 +385,7 @@ foreach (prop LINK_LIBRARIES INTERFACE_LINK_LIBRARIES INCLUDE_DIRECTORIES INTERF - get_target_property(val librnp-obj ${prop}) - if (BUILD_SHARED_LIBS) - set_property(TARGET librnp-static PROPERTY ${prop} ${val}) -- list(REMOVE_ITEM val "$<LINK_ONLY:sexp>") -+ list(REMOVE_ITEM val "$<LINK_ONLY:sexpp>") - set_property(TARGET librnp PROPERTY ${prop} ${val}) - else() - set_property(TARGET librnp PROPERTY ${prop} ${val}) -@@ -433,31 +433,34 @@ install(TARGETS librnp - COMPONENT development - ) - -- install(TARGETS librnp-static sexp -- EXPORT rnp-targets -- ARCHIVE -- DESTINATION "${CMAKE_INSTALL_LIBDIR}" -- COMPONENT development -- ) -+# install dll only for windows -+ if (WIN32) -+ install(TARGETS librnp -+ RUNTIME -+ DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ COMPONENT runtime -+ ) -+ endif(WIN32) - else(BUILD_SHARED_LIBS) --# static libraries only --install(TARGETS librnp sexp -+# static libraries -+# install libsexpp unless system-installed libsexpp is used -+ if (SYSTEM_LIBSEXPP) -+ install(TARGETS librnp -+ EXPORT rnp-targets -+ ARCHIVE -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ COMPONENT development -+ ) -+ else (SYSTEM_LIBSEXPP) -+ install(TARGETS librnp sexpp - EXPORT rnp-targets - ARCHIVE - DESTINATION "${CMAKE_INSTALL_LIBDIR}" - COMPONENT development --) -+ ) -+ endif (SYSTEM_LIBSEXPP) - endif(BUILD_SHARED_LIBS) - --# install dll only for windows --if (WIN32) -- install(TARGETS librnp -- RUNTIME -- DESTINATION "${CMAKE_INSTALL_BINDIR}" -- COMPONENT runtime -- ) --endif(WIN32) -- - # install headers - install( - FILES ---- a/src/librekey/g23_sexp.hpp -+++ b/src/librekey/g23_sexp.hpp -@@ -27,8 +27,8 @@ - #ifndef RNP_G23_SEXP_HPP - #define RNP_G23_SEXP_HPP - --#include "sexp/sexp.h" --#include "sexp/ext-key-format.h" -+#include "sexpp/sexp.h" -+#include "sexpp/ext-key-format.h" - - #define SXP_MAX_DEPTH 30 - ---- a/src/tests/CMakeLists.txt -+++ b/src/tests/CMakeLists.txt -@@ -171,12 +171,13 @@ target_include_directories(rnp_tests - "${PROJECT_SOURCE_DIR}/src" - "${PROJECT_SOURCE_DIR}/src/lib" - "${BOTAN2_INCLUDE_DIRS}" -+ "${SEXPP_INCLUDE_DIRS}" - ) - target_link_libraries(rnp_tests - PRIVATE - librnp-static - JSON-C::JSON-C -- sexp -+ sexpp - ${GTestMain} - ) - if (CRYPTO_BACKEND_LOWERCASE STREQUAL "openssl") diff --git a/community/robin-map/APKBUILD b/community/robin-map/APKBUILD index abc10dd4eac..825cf7fa03d 100644 --- a/community/robin-map/APKBUILD +++ b/community/robin-map/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leon Marz <main@lmarz.org> # Maintainer: Leon Marz <main@lmarz.org> pkgname=robin-map -pkgver=1.2.2 +pkgver=1.3.0 pkgrel=0 pkgdesc="C++ implementation of a fast hash map" url="https://github.com/Tessil/robin-map" @@ -24,5 +24,5 @@ package() { } sha512sums=" -50e68afc5d24e9c963336a2e4dba6e2656d2046278679bc081fc66dae1ffb0ee75176699bde79340346e538ced15a7072dc298e6be7e4d3e80f9df5163e09396 robin-map-1.2.2.tar.gz +862cb98d771d1acb692e27d1cc8a4f2cda0883b66af7b38b63ea702ed2d4fc4d49e5700ca4d5f5148fee132f36e111c4839d4f8c52c96a9c60f3937d941b2320 robin-map-1.3.0.tar.gz " diff --git a/community/rocs/APKBUILD b/community/rocs/APKBUILD index 28c2dcd539d..2398fec4b2c 100644 --- a/community/rocs/APKBUILD +++ b/community/rocs/APKBUILD @@ -5,7 +5,7 @@ # group=kde-applications pkgname=rocs pkgver=24.02.2 -pkgrel=0 +pkgrel=1 # armhf blocked by extra-cmake-modules arch="all !armhf" url="https://kde.org/applications/education/org.kde.rocs" diff --git a/community/rootlesskit/APKBUILD b/community/rootlesskit/APKBUILD index 6abe0d421b2..fb45e2eb946 100644 --- a/community/rootlesskit/APKBUILD +++ b/community/rootlesskit/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=rootlesskit -pkgver=2.0.2 -pkgrel=1 +pkgver=2.1.0 +pkgrel=0 pkgdesc="Linux-native fake root for implementing rootless containers" url="https://github.com/rootless-containers/rootlesskit" arch="all" @@ -44,5 +44,5 @@ _docker_proxy() { } sha512sums=" -4f03f0cd1c650b2f1d3dd866b25ca2cca9cc6028f10a6f43e5bca7d736da605847262f2a2103e252e513caa9c0bf0ebb05fbfb1c10ba21e67fb434cfaa8123e3 rootlesskit-2.0.2.tar.gz +004cf6d27562e538609417783bcd28d13a71c7913cea0ff77a71be3184cdf4ddc96ca89a94a71e8ec0cf8fced745672a825b925110b20844c82feda6ba35b01e rootlesskit-2.1.0.tar.gz " diff --git a/community/rqlite/APKBUILD b/community/rqlite/APKBUILD index f0bc29b93da..4849c9d14dd 100644 --- a/community/rqlite/APKBUILD +++ b/community/rqlite/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=rqlite -pkgver=8.23.1 -pkgrel=1 +pkgver=8.24.7 +pkgrel=0 pkgdesc="Lightweight, distributed relational database built on SQLite" url="https://github.com/rqlite/rqlite" arch="all" @@ -56,5 +56,5 @@ client() { } sha512sums=" -02ddf1eb3bd347b527212b845ea632814bda56141067f2a6d5e4aae0da0b12137adde1fc3c22907b8b91dd68e23fa410fb6c54d56845509bb2d872684437bb9d rqlite-8.23.1.tar.gz +2b5d178a1c3be78a6b297a586f3b8e057bb48e2f8018006e3070fe217a5c148fd2397a800e3654f489a1a175e8ae911d97e7aeedaa5f755d058425c02f1c4658 rqlite-8.24.7.tar.gz " diff --git a/community/rspamd/APKBUILD b/community/rspamd/APKBUILD index c9cc3a4cddf..dee1a85cd2a 100644 --- a/community/rspamd/APKBUILD +++ b/community/rspamd/APKBUILD @@ -37,7 +37,7 @@ makedepends=" zstd-dev " case "$CARCH" in - ppc64le|riscv64|s390x|x86) makedepends="$makedepends lua5.4-dev" + ppc64le|riscv64|s390x|x86|loongarch64) makedepends="$makedepends lua5.4-dev" _luajit="OFF" ;; *) makedepends="$makedepends luajit-dev" _luajit="ON" ;; diff --git a/community/rtl_433/APKBUILD b/community/rtl_433/APKBUILD index 6bb3c67138e..2579222c4c3 100644 --- a/community/rtl_433/APKBUILD +++ b/community/rtl_433/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=rtl_433 pkgver=23.11 -pkgrel=0 +pkgrel=1 pkgdesc="Program to decode transmissions on the ISM bands" url="https://github.com/merbanan/rtl_433" arch="all" diff --git a/community/rtpengine-lts/APKBUILD b/community/rtpengine-lts/APKBUILD index b049ff7ac7d..fe6964ffb12 100644 --- a/community/rtpengine-lts/APKBUILD +++ b/community/rtpengine-lts/APKBUILD @@ -7,7 +7,7 @@ _rel=1 # kernel version # when changing _kver make sure _krel=0 & _rel=0 -_kver=6.6.27 +_kver=6.6.30 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/community/rubberband/APKBUILD b/community/rubberband/APKBUILD index a2c4cae73f5..a4f877b7acc 100644 --- a/community/rubberband/APKBUILD +++ b/community/rubberband/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: David Demelier <markand@malikania.fr> pkgname=rubberband pkgver=3.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="library for audio time-stretching and pitch-shifting" url="https://www.breakfastquay.com/rubberband" arch="all" @@ -37,7 +37,15 @@ build() { } check() { - meson test --print-errorlogs --no-rebuild -C output + case "$CARCH" in + riscv64) + meson test --timeout-multiplier=30 --print-errorlogs --no-rebuild -C output + # 8/8 Stretcher TIMEOUT 30.04s killed by signal 15 SIGTERM + ;; + *) + meson test --print-errorlogs --no-rebuild -C output + ;; + esac } package() { diff --git a/community/ruby-mini_portile2/APKBUILD b/community/ruby-mini_portile2/APKBUILD index c37c87964bf..4d75beaa6de 100644 --- a/community/ruby-mini_portile2/APKBUILD +++ b/community/ruby-mini_portile2/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=ruby-mini_portile2 _gemname=${pkgname#ruby-} -pkgver=2.8.5 -pkgrel=2 +pkgver=2.8.6 +pkgrel=0 pkgdesc="Simplistic port-like solution for developers" url="https://github.com/flavorjones/mini_portile" arch="noarch" @@ -34,5 +34,5 @@ package() { } sha512sums=" -fa09bc2c4aefc341cb249dc33b5ad3182aa582ef150645793e323bdef4d19cbeeced0348c3c962a7225a9aa91b40824347fa1499955326525eddcf867f6ff798 mini_portile2-2.8.5.gem +7131806ef5af09082e08a05000256ad7ce9fcd170ef3485f42618c69e0bee6cdf8f2e14b67e61d36b9efed5c1df970045720a01d9e0b7ffac434da651a28f238 mini_portile2-2.8.6.gem " diff --git a/community/ruby-nokogiri/APKBUILD b/community/ruby-nokogiri/APKBUILD index a8885db7018..9cc0cca3e34 100644 --- a/community/ruby-nokogiri/APKBUILD +++ b/community/ruby-nokogiri/APKBUILD @@ -4,7 +4,7 @@ # TODO: Unbundle gombo-parser. pkgname=ruby-nokogiri _gemname=${pkgname#ruby-} -pkgver=1.16.3 +pkgver=1.16.4 pkgrel=0 pkgdesc="An HTML, XML, SAX, and Reader parser" url="https://nokogiri.org/" @@ -63,7 +63,7 @@ build() { # Remove unnecessary files and rubbish... find dist/extensions/ -name mkmf.log -delete cd dist/gems/$_gemname-$pkgver/ - rm -rf ext/ patches/ + rm -rf ext/ gumbo-parser/ patches/ rm ./*.md ./*.yml rm -rf lib/nokogiri/jruby/ # TODO: move into subpackage? rm lib/nokogiri/*.so @@ -94,7 +94,7 @@ package() { } sha512sums=" -e86d5d2cb47720b9f2e72ced13e07e6d9a2bda808e05d9d151ffba92820e148bb6cd8cfe148d15247b13c23feb2abe64942f2665431e66dc821b9655425df8e3 nokogiri-1.16.3.tar.gz +76a179fa7c907d5ffd548e472b9d03d02ba1afbd80c58f8c2760a0e342c2d3db75bd973e7a2f3751c671b68dd63ea3da95a6631f4963e18f85d5c5e7b9b877f4 nokogiri-1.16.4.tar.gz b4d2457a6065d6c0878841acd259d6e231bb08b3aa0868943d0f90733f211cfbca28fac3c9678d1874b8e6f91c746c0c4381211efaf9781267c9183197fc1912 gemspec-fix-deps.patch 4e637fccb39e4f5e7c4b2b902fc7ad60287a571fa37ab3b7afafbd3fdb7445a81518f654bf83e0c43b3e5ff06b37518f433fa22dc9f78e1cd840055603c55319 test-helper-remove-unnecessary-deps.patch 63519d5b314c6fee49c219c8ab6999b340e1e6b1acecfaf3aee3dcc37302be8ff82dbd00484b3570f457d5de3c54529b843e1d382f5b65b9e128548b37c97198 shutdown-libxml2-warning.patch diff --git a/community/ruff/APKBUILD b/community/ruff/APKBUILD index e9e7c1bfb60..7bcd32e399b 100644 --- a/community/ruff/APKBUILD +++ b/community/ruff/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Hugo Osvaldo Barrera <hugo@whynothugo.nl> pkgname=ruff -pkgver=0.3.7 +pkgver=0.4.4 pkgrel=0 pkgdesc="Extremely fast Python linter" url="https://github.com/astral-sh/ruff" @@ -65,5 +65,5 @@ package() { } sha512sums=" -88c7b31b6598a470fa5810cae572a3a955077485aa5eea5fa81d23e1180af6f3e2d32d3293770e0b6a08fe23b06383eb393db5a4734dff418e7ac2722c130197 ruff-0.3.7.tar.gz +d5b14266d30920e4772cc690e263478abfdfd08865ca7cae64b9184566e172fc5c70d3f9463967cc431bb12bff9c97333835d3773fa70462953aa9fafd47aa0d ruff-0.4.4.tar.gz " diff --git a/community/runc/APKBUILD b/community/runc/APKBUILD index 635b52e9ac9..b8e747b65fc 100644 --- a/community/runc/APKBUILD +++ b/community/runc/APKBUILD @@ -12,6 +12,7 @@ license="Apache-2.0" makedepends="bash go go-md2man libseccomp-dev libtool" subpackages="$pkgname-doc" source="https://github.com/opencontainers/runc/archive/v$pkgver/runc-$pkgver.tar.gz + add-seccomp-for-loongarch64.patch " options="!check" @@ -56,4 +57,5 @@ package() { sha512sums=" 92e8ac54a77d7ebcc76b5a9cc08d9a064211f12e9d26f064070cc203a5afb11c3af28d8f556f297513f797a2933d50bf10a8f22e307724041d66aa8c5ca1d9d3 runc-1.1.12.tar.gz +e2e468406557e93514fc4bc6c3e9f6a698175a2f2533417ccfe180ce668fb94a5d9b0519541ad22b0e9de7c817342943ee6774a3a920d3f4c3615e992cd95ea3 add-seccomp-for-loongarch64.patch " diff --git a/community/runc/add-seccomp-for-loongarch64.patch b/community/runc/add-seccomp-for-loongarch64.patch new file mode 100644 index 00000000000..b88e48afbcc --- /dev/null +++ b/community/runc/add-seccomp-for-loongarch64.patch @@ -0,0 +1,151 @@ +diff --git a/libcontainer/seccomp/config.go b/libcontainer/seccomp/config.go +index 2b15576..841f9d9 100644 +--- a/libcontainer/seccomp/config.go ++++ b/libcontainer/seccomp/config.go +@@ -69,6 +69,7 @@ var archs = map[string]string{ + "SCMP_ARCH_RISCV64": "riscv64", + "SCMP_ARCH_S390": "s390", + "SCMP_ARCH_S390X": "s390x", ++ "SCMP_ARCH_LOONGARCH64": "loong64", + } + + // KnownArchs returns the list of the known archs. +diff --git a/libcontainer/seccomp/patchbpf/enosys_linux.go b/libcontainer/seccomp/patchbpf/enosys_linux.go +index efe6dca..4f0f388 100644 +--- a/libcontainer/seccomp/patchbpf/enosys_linux.go ++++ b/libcontainer/seccomp/patchbpf/enosys_linux.go +@@ -75,6 +75,7 @@ const uint32_t C_AUDIT_ARCH_PPC64LE = AUDIT_ARCH_PPC64LE; + const uint32_t C_AUDIT_ARCH_S390 = AUDIT_ARCH_S390; + const uint32_t C_AUDIT_ARCH_S390X = AUDIT_ARCH_S390X; + const uint32_t C_AUDIT_ARCH_RISCV64 = AUDIT_ARCH_RISCV64; ++const uint32_t C_AUDIT_ARCH_LOONGARCH64 = AUDIT_ARCH_LOONGARCH64; + */ + import "C" + +@@ -212,6 +213,8 @@ func archToNative(arch libseccomp.ScmpArch) (nativeArch, error) { + return nativeArch(C.C_AUDIT_ARCH_S390X), nil + case libseccomp.ArchRISCV64: + return nativeArch(C.C_AUDIT_ARCH_RISCV64), nil ++ case libseccomp.ArchLOONGARCH64: ++ return nativeArch(C.C_AUDIT_ARCH_LOONGARCH64), nil + default: + return invalidArch, fmt.Errorf("unknown architecture: %v", arch) + } +diff --git a/libcontainer/seccomp/patchbpf/enosys_linux_test.go b/libcontainer/seccomp/patchbpf/enosys_linux_test.go +index e2d363a..a66fe35 100644 +--- a/libcontainer/seccomp/patchbpf/enosys_linux_test.go ++++ b/libcontainer/seccomp/patchbpf/enosys_linux_test.go +@@ -105,6 +105,7 @@ var testArches = []string{ + "ppc64le", + "s390", + "s390x", ++ "loong64", + } + + func testEnosysStub(t *testing.T, defaultAction configs.Action, arches []string) { +diff --git a/libcontainer/system/syscall_linux_64.go b/libcontainer/system/syscall_linux_64.go +index 1ed0dba..ccb9340 100644 +--- a/libcontainer/system/syscall_linux_64.go ++++ b/libcontainer/system/syscall_linux_64.go +@@ -1,6 +1,6 @@ +-//go:build linux && (arm64 || amd64 || mips || mipsle || mips64 || mips64le || ppc || ppc64 || ppc64le || riscv64 || s390x) ++//go:build linux && (arm64 || amd64 || mips || mipsle || mips64 || mips64le || ppc || ppc64 || ppc64le || riscv64 || s390x || loong64) + // +build linux +-// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le riscv64 s390x ++// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le riscv64 s390x loong64 + + package system + +diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go +index 6a7a91e..624f3fa 100644 +--- a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go ++++ b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go +@@ -635,6 +635,7 @@ const ( + ArchPARISC Arch = "SCMP_ARCH_PARISC" + ArchPARISC64 Arch = "SCMP_ARCH_PARISC64" + ArchRISCV64 Arch = "SCMP_ARCH_RISCV64" ++ ArchLOONGARCH64 Arch = "SCMP_ARCH_LOONGARCH64" + ) + + // LinuxSeccompAction taken upon Seccomp rule match +diff --git a/vendor/github.com/seccomp/libseccomp-golang/seccomp.go b/vendor/github.com/seccomp/libseccomp-golang/seccomp.go +index 8dad12f..2552394 100644 +--- a/vendor/github.com/seccomp/libseccomp-golang/seccomp.go ++++ b/vendor/github.com/seccomp/libseccomp-golang/seccomp.go +@@ -174,6 +174,8 @@ const ( + ArchPARISC64 + // ArchRISCV64 represents RISCV64 + ArchRISCV64 ++ // ArchLOONGARCH64 represents 64-bit LoongArch System syscalls ++ ArchLOONGARCH64 + ) + + const ( +@@ -305,6 +307,8 @@ func GetArchFromString(arch string) (ScmpArch, error) { + return ArchPARISC64, nil + case "riscv64": + return ArchRISCV64, nil ++ case "loongarch64", "loong64": ++ return ArchLOONGARCH64, nil + default: + return ArchInvalid, fmt.Errorf("cannot convert unrecognized string %q", arch) + } +@@ -351,6 +355,8 @@ func (a ScmpArch) String() string { + return "parisc64" + case ArchRISCV64: + return "riscv64" ++ case ArchLOONGARCH64: ++ return "loong64" + case ArchNative: + return "native" + case ArchInvalid: +diff --git a/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go b/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go +index df4dfb7..1997fb3 100644 +--- a/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go ++++ b/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go +@@ -68,6 +68,10 @@ const uint32_t C_ARCH_BAD = ARCH_BAD; + #define SCMP_ARCH_RISCV64 ARCH_BAD + #endif + ++#ifndef SCMP_ARCH_LOONGARCH64 ++#define SCMP_ARCH_LOONGARCH64 ARCH_BAD ++#endif ++ + const uint32_t C_ARCH_NATIVE = SCMP_ARCH_NATIVE; + const uint32_t C_ARCH_X86 = SCMP_ARCH_X86; + const uint32_t C_ARCH_X86_64 = SCMP_ARCH_X86_64; +@@ -88,6 +92,7 @@ const uint32_t C_ARCH_S390X = SCMP_ARCH_S390X; + const uint32_t C_ARCH_PARISC = SCMP_ARCH_PARISC; + const uint32_t C_ARCH_PARISC64 = SCMP_ARCH_PARISC64; + const uint32_t C_ARCH_RISCV64 = SCMP_ARCH_RISCV64; ++const uint32_t C_ARCH_LOONGARCH64 = SCMP_ARCH_LOONGARCH64; + + #ifndef SCMP_ACT_LOG + #define SCMP_ACT_LOG 0x7ffc0000U +@@ -291,7 +296,7 @@ const ( + scmpError C.int = -1 + // Comparison boundaries to check for architecture validity + archStart ScmpArch = ArchNative +- archEnd ScmpArch = ArchRISCV64 ++ archEnd ScmpArch = ArchLOONGARCH64 + // Comparison boundaries to check for action validity + actionStart ScmpAction = ActKillThread + actionEnd ScmpAction = ActKillProcess +@@ -551,6 +556,8 @@ func archFromNative(a C.uint32_t) (ScmpArch, error) { + return ArchPARISC64, nil + case C.C_ARCH_RISCV64: + return ArchRISCV64, nil ++ case C.C_ARCH_LOONGARCH64: ++ return ArchLOONGARCH64, nil + default: + return 0x0, fmt.Errorf("unrecognized architecture %#x", uint32(a)) + } +@@ -597,6 +604,8 @@ func (a ScmpArch) toNative() C.uint32_t { + return C.C_ARCH_PARISC64 + case ArchRISCV64: + return C.C_ARCH_RISCV64 ++ case ArchLOONGARCH64: ++ return C.C_ARCH_LOONGARCH64 + case ArchNative: + return C.C_ARCH_NATIVE + default: diff --git a/community/ruqola/APKBUILD b/community/ruqola/APKBUILD index 0a746f8d59f..6b24ff7c3bc 100644 --- a/community/ruqola/APKBUILD +++ b/community/ruqola/APKBUILD @@ -9,8 +9,8 @@ pkgrel=0 pkgdesc="A Qt client for Rocket Chat" url="https://invent.kde.org/network/ruqola" # armhf blocked by qt5-qtdeclarative-dev -# ppc64le, riscv64 and s390x blocked by qt6-qtwebengine -> purpose -arch="all !armhf !ppc64le !riscv64 !s390x" +# ppc64le, riscv64, s390x and loongarch64 blocked by qt6-qtwebengine -> purpose +arch="all !armhf !ppc64le !riscv64 !s390x !loongarch64" license="GPL-2.0-only OR GPL-3.0-only" makedepends=" extra-cmake-modules diff --git a/community/rust-analyzer/APKBUILD b/community/rust-analyzer/APKBUILD index d9f912a3701..eeb1b39d2d6 100644 --- a/community/rust-analyzer/APKBUILD +++ b/community/rust-analyzer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: S.M Mukarram Nainar <theone@sm2n.ca> # Maintainer: team/rust <alpine@ptrcnull.me> pkgname=rust-analyzer -pkgver=2024.04.15 +pkgver=2024.05.06 _pkgver=${pkgver//./-} pkgrel=0 pkgdesc="Rust compiler front-end for IDEs" @@ -58,5 +58,5 @@ package() { } sha512sums=" -778e752b9e4a9977c7cde4859a4f489133ccc842ff6828d522e2028bf719a05ab94204d708caf21aa070083407ec580d01c3a96569d73de5ffddac6b3f929ac7 rust-analyzer-2024.04.15.tar.gz +4516332f39524e47aef2a9efb8c3aef632be8cc7bebff4bfd934b7eb13cc169bae0c3a30e7b807079451c4ea6a23b5ec6600bd7c3eb36dc57b4de501175eac07 rust-analyzer-2024.05.06.tar.gz " diff --git a/community/rutorrent/APKBUILD b/community/rutorrent/APKBUILD index a7f66098e05..ecef3993238 100644 --- a/community/rutorrent/APKBUILD +++ b/community/rutorrent/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=rutorrent _pkgname=ruTorrent -pkgver=4.2.10 +pkgver=4.3.0 pkgrel=0 pkgdesc="Yet another web front-end for rTorrent" url="https://github.com/Novik/ruTorrent" @@ -34,5 +34,5 @@ package() { } sha512sums=" -b57e95591b835fd8d0c0e9acdf9c23dbaf6a37542c46397794da625edd02524af508510e0396308ddfe024d37c92e493134a13aae9dd28c5c642cdbd8d9264a5 rutorrent-4.2.10.tar.gz +64079663162b09bafd34f5f93e3e5ea473b2acfb88af8d20e5c602cc56bbfb66d2266e86e42907c7f4319e09f32ff9884e1f79c886a2b8eb5ca148ee853133f3 rutorrent-4.3.0.tar.gz " diff --git a/community/s2n-tls/APKBUILD b/community/s2n-tls/APKBUILD index bc1bcfeda31..e91a6a349bc 100644 --- a/community/s2n-tls/APKBUILD +++ b/community/s2n-tls/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: pkgname=s2n-tls -pkgver=1.4.10 +pkgver=1.4.14 pkgrel=0 pkgdesc="AWS C99 implementation of the TLS/SSL protocols" url="https://github.com/aws/s2n-tls" @@ -51,5 +51,5 @@ dev() { } sha512sums=" -86095d7c35366f1f4fc8be0a119ce8aab1a5e3b136000f13d459444f75898abc4a11aa8f7bf273e2eec9052ed041e1c11c90b85f51d60f540b85cd3e8913927f s2n-tls-1.4.10.tar.gz +ff835314db87b5f97cf674964eba3f893d934b7f536ab5ee47558cb7c8888bd58c2c6e677d589ea9f1db11541a528ef8c6425f410f78c5497d981dc04b26344d s2n-tls-1.4.14.tar.gz " diff --git a/community/saga-gis/APKBUILD b/community/saga-gis/APKBUILD index 0245201a584..1fb7a4aefe0 100644 --- a/community/saga-gis/APKBUILD +++ b/community/saga-gis/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=saga-gis -pkgver=9.3.2 +pkgver=9.4.0 pkgrel=1 pkgdesc="System for Automated Geoscientific Analyses" url="https://saga-gis.sourceforge.io/en/index.html" @@ -90,5 +90,5 @@ py3() { } sha512sums=" -f75204df1c2a33c4868c7bbfb63125eeb1ee1a8fbdf77fb63d653b2eefd9a71c4cee2e398667bb4fe0840481003d4387548ff2bf1f20eee7849be4fee10a96a3 saga-9.3.2.tar.gz +248e0848f63f3ec025d0b61cb2c0cfc505fd471a89a42b6e0dbcc1fb362d2392f50b0e8140ab840c66765ae4e0d2f2a945ab7a9eef548a8fd6a93aba506405f5 saga-9.4.0.tar.gz " diff --git a/community/salt/APKBUILD b/community/salt/APKBUILD index 2ef57d675e4..2f66083104f 100644 --- a/community/salt/APKBUILD +++ b/community/salt/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Contributor: Olivier Mauras <olivier@mauras.ch> -# Contributor: Will Sinatra <wpsinatra@gmail.com> -# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> +# Contributor: Kevin Daudt <kdaudt@alpinelinux.org> +# Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=salt pkgver=3007.0 -pkgrel=2 +pkgrel=3 pkgdesc="parallel remote execution system" url="https://github.com/saltstack/salt" arch="noarch" diff --git a/community/sane/APKBUILD b/community/sane/APKBUILD index 4c652fd8205..fde3ad7afce 100644 --- a/community/sane/APKBUILD +++ b/community/sane/APKBUILD @@ -60,6 +60,11 @@ builddir="$srcdir"/$_pkgname-$pkgver # - CVE-2020-12866 # - CVE-2020-12867 +prepare() { + default_prepare + update_config_guess +} + build() { ./configure \ --prefix=/usr \ diff --git a/community/sbcl/APKBUILD b/community/sbcl/APKBUILD index aa57446fd29..85fb1d9a797 100644 --- a/community/sbcl/APKBUILD +++ b/community/sbcl/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Will Sinatra <wpsinatra@gmail.com> # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=sbcl -pkgver=2.4.3 +pkgver=2.4.4 pkgrel=0 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -62,7 +62,7 @@ package() { } sha512sums=" -ac61e02af16b81cb25a806b44272956dd72875ae884a04b075c983881be70b618908bad7ebddb763358401f7207c05adde932e4a845e5b8cffccc0c7b76e7557 sbcl-2.4.3.tar.bz2 +2730b1375b8e871bda96e0fa8536142f5d93e454187a4b6dbe2a2b439c694a5d013648a320aa183f268fae7fda046f8a2a9ce80a315d198db4822d380f845600 sbcl-2.4.4.tar.bz2 549cc9936ddbd4c19067a455dfad151bd0ce59200b2dce761de67e259e621e4174beefaa5a322886bcd731d2470d229a3e1b75a55a194c54e2feb7c0bcdffb37 ppc-musl.patch b8b9b8d8e489bfa18d0c59de54420e5a930a9c0e4cb9ffe1fe9c69d6a10b67880601b66ca2fab0fe77733f722b6709bf8e1cd32a257398a6e28d61b50080e26e march-armv5-removed.patch " diff --git a/community/sbctl/APKBUILD b/community/sbctl/APKBUILD index b4344aa0541..07bf97d99eb 100644 --- a/community/sbctl/APKBUILD +++ b/community/sbctl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=sbctl -pkgver=0.13 -pkgrel=2 +pkgver=0.14 +pkgrel=0 pkgdesc="Secure Boot key manager" url="https://github.com/Foxboron/sbctl/" arch="all" @@ -14,7 +14,7 @@ subpackages=" $pkgname-fish-completion $pkgname-zsh-completion " -source="https://github.com/Foxboron/sbctl/releases/download/$pkgver/sbctl-$pkgver.tar.gz" +source="https://github.com/Foxboron/sbctl/archive/refs/tags/$pkgver/sbctl-$pkgver.tar.gz" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -44,5 +44,5 @@ package() { } sha512sums=" -02c1f3e745f83f0e0a2fe90974f940a314aadbe26bd0d0c3e314bb3720b72c74715a26c891f8b22023f40eb8d1d8d24a7d2b1bc1c5d60f9781971f7e97224a4c sbctl-0.13.tar.gz +01d2688c79ed1cbf3c306b7b65b594098289f74751f154256ba6ec1c99dead1d74d1e369f0626852d1841c2e5253570f51fc76d53ce42eae38ae25d9e307bfc7 sbctl-0.14.tar.gz " diff --git a/community/scanssh/APKBUILD b/community/scanssh/APKBUILD index 911c008f377..d6938778503 100644 --- a/community/scanssh/APKBUILD +++ b/community/scanssh/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> -# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: fossdd <fossdd@pwned.life> pkgname=scanssh pkgver=2.1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Fast SSH server and open proxy scanner" url="https://github.com/ofalk/scanssh" arch="all" diff --git a/community/scc/APKBUILD b/community/scc/APKBUILD index 44f1fd8f4ad..8966065e4d6 100644 --- a/community/scc/APKBUILD +++ b/community/scc/APKBUILD @@ -1,16 +1,14 @@ # Contributor: Andrej Kolchin <KAAtheWise@protonmail.com> # Maintainer: Andrej Kolchin <KAAtheWise@protonmail.com> pkgname=scc -pkgver=3.2.0 -pkgrel=2 +pkgver=3.3.3 +pkgrel=0 pkgdesc="Very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go" url="https://github.com/boyter/scc" arch="all" license="MIT" makedepends="go" -source="$pkgname-$pkgver.tar.gz::https://github.com/boyter/scc/archive/v$pkgver.tar.gz - ensure-32-bit-works.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/boyter/scc/archive/v$pkgver.tar.gz" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -29,6 +27,5 @@ package() { } sha512sums=" -277b8748d4bb2e1635a32cf3e3010f426711dce7770ea0c247c515cc7dcd38cdd1c02997ff41992d5aa9fc7b51bce91ffb62b8dcadbf883063c55298570feee3 scc-3.2.0.tar.gz -cf8a9d7956041f1ac8c69dd453561d215fad94bdaaa6b7040774a3dea0869f5426e3b155576a6eb001a400e726d25d03f8501e17ad8717a55ece3c796df32f2a ensure-32-bit-works.patch +369a638d719129cf949c592442e75fb791803c1b3a285b01ba6f0edac6794ba4d5b5978e931bbb05503ddf00bfd33a813cde3bbb12164d793e916fbf781e5986 scc-3.3.3.tar.gz " diff --git a/community/scc/ensure-32-bit-works.patch b/community/scc/ensure-32-bit-works.patch deleted file mode 100644 index 41ee3a05fbb..00000000000 --- a/community/scc/ensure-32-bit-works.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e1519e0a9feb11b92012f29736a7feb81ea066f5 Mon Sep 17 00:00:00 2001 -From: Ben Boyter <ben@boyter.org> -Date: Thu, 30 Nov 2023 08:52:10 +1100 -Subject: [PATCH] ensure 32 bit works - ---- - cmd/badges/simplecache.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmd/badges/simplecache.go b/cmd/badges/simplecache.go -index 3d66f64..fb4b74f 100644 ---- a/cmd/badges/simplecache.go -+++ b/cmd/badges/simplecache.go -@@ -87,7 +87,7 @@ func (cache *SimpleCache) expireItems() { - count := 10 - if len(cache.items) >= cache.maxItems { - lfuKey := "" -- lfuLowestCount := math.MaxInt64 -+ lfuLowestCount := math.MaxInt - - for k, v := range cache.items { - v.hits-- --- -2.43.0 - diff --git a/community/sccache/APKBUILD b/community/sccache/APKBUILD index d83e7b329bd..2ff0cb26617 100644 --- a/community/sccache/APKBUILD +++ b/community/sccache/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=sccache -pkgver=0.7.7 +pkgver=0.8.0 pkgrel=0 pkgdesc="shared compilation cache for C/C++ and Rust" url="https://github.com/mozilla/sccache/" @@ -61,6 +61,6 @@ dist() { } sha512sums=" -b1a204e6638e2224af055f290df0c9f3a5cd30f43c720b9ddee194adb0c6290feb20badcdbd8f04a5830088b25b27665a617e6f20a3a60b2849b4ad81d48a25a sccache-0.7.7.tar.gz -41086a95ffa6119e6e9eab14ba5e3e8452121ad357a560928eeba21b76674133f936b4e7b9b4a8ac0e15d87dac7ebcf7e635390692467ca4e0c5b16d50426696 test_musl_ldd_parse.patch +1b0a85ff12e9e17c39b4145adbab8706108691ad924a4dad94ee2cf6a48c4ee6a5fba47c5edd810c6767c04bea9c40e1ca0971fc8fab4af724228979446361bc sccache-0.8.0.tar.gz +e185fc6371bcfd59b5c5243d6d4461327061b26d608680187ec49b3698a459e4dca03a0641553a690b8009bd08413d157cf03697bfad7b7d47e8a31c80f37bac test_musl_ldd_parse.patch " diff --git a/community/sccache/test_musl_ldd_parse.patch b/community/sccache/test_musl_ldd_parse.patch index c95c54b5767..36ff977abfd 100644 --- a/community/sccache/test_musl_ldd_parse.patch +++ b/community/sccache/test_musl_ldd_parse.patch @@ -2,7 +2,7 @@ Adjust this test to musl and our output of 'ldd /bin/ls'. This test will be run on x86_64. --- a/src/dist/pkg.rs +++ b/src/dist/pkg.rs -@@ -377,24 +377,26 @@ mod toolchain_imp { +@@ -378,24 +378,28 @@ mod toolchain_imp { } #[test] @@ -12,13 +12,14 @@ This test will be run on x86_64. -\tlibc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f69ca6a1000) -\tlibc.so.6 => /usr/lib/libc.so.6 (0x00007f49807c2000) -\t/lib64/ld-linux-x86-64.so.2 => /usr/lib64/ld-linux-x86-64.so.2 (0x00007f49809e9000) -+ fn test_musl_ldd_parse_v1_2_2() { -+ let alpinelinux_ls_output = "\t/lib/ld-musl-x86_64.so.1 (0x7f10902bf000) -+\tlibacl.so.1 => /lib/libacl.so.1 (0x7f108fd98000) -+\tlibattr.so.1 => /lib/libattr.so.1 (0x7f108fd91000) -+\tlibutmps.so.0.1 => /lib/libutmps.so.0.1 (0x7f108fd8c000) -+\tlibc.musl-x86_64.so.1 => /lib/ld-musl-x86_64.so.1 (0x7f10902bf000) -+\tlibskarnet.so.2.13 => /lib/libskarnet.so.2.13 (0x7f108fd53000) ++ fn test_musl_ldd_parse_v1_2_5() { ++ let alpinelinux_ls_output = "\t/lib/ld-musl-x86_64.so.1 (0x7f56f69bc000) ++\tlibcrypto.so.3 => /lib/libcrypto.so.3 (0x7f56f6474000) ++\tlibacl.so.1 => /lib/libacl.so.1 (0x7f56f646b000) ++\tlibattr.so.1 => /lib/libattr.so.1 (0x7f56f6464000) ++\tlibutmps.so.0.1 => /lib/libutmps.so.0.1 (0x7f56f645f000) ++\tlibc.musl-x86_64.so.1 => /lib/ld-musl-x86_64.so.1 (0x7f56f69bc000) ++\tlibskarnet.so.2.14 => /lib/libskarnet.so.2.14 (0x7f56f6427000) "; assert_eq!( - parse_ldd_output(archlinux_ls_output) @@ -33,11 +34,12 @@ This test will be run on x86_64. - "/lib64/ld-linux-x86-64.so.2", - "/usr/lib64/ld-linux-x86-64.so.2", + "/lib/ld-musl-x86_64.so.1", ++ "/lib/libcrypto.so.3", + "/lib/libacl.so.1", + "/lib/libattr.so.1", + "/lib/libutmps.so.0.1", + "/lib/ld-musl-x86_64.so.1", -+ "/lib/libskarnet.so.2.13", ++ "/lib/libskarnet.so.2.14", ] ) } diff --git a/community/scribus/APKBUILD b/community/scribus/APKBUILD index 76c40c71b74..3869768746c 100644 --- a/community/scribus/APKBUILD +++ b/community/scribus/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=scribus pkgver=1.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="libre desktop publishing" url="https://www.scribus.net/" arch="all !s390x" # s390x doesn't have podofo package diff --git a/community/sddm-kcm/APKBUILD b/community/sddm-kcm/APKBUILD index 8a62cfcb7a6..133537cdba5 100644 --- a/community/sddm-kcm/APKBUILD +++ b/community/sddm-kcm/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=sddm-kcm -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Config module for SDDM" # armhf blocked by extra-cmake-modules @@ -57,5 +57,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -5e8b4276b45520f5718d9558ab113ab14329b65baeff9e74bc41a766fb28043d3bb76241bf22a73875eda8c057d02913cd0bdae28f4f5268a1661cb87be83416 sddm-kcm-6.0.3.tar.xz +41f4d76f214be149d570ec152f0d155566d96831807d498012b2672c203d998bcaa5e2b74e2d45e8bf41d0451fa01fcc6854e8b8717af7b700ae9fc2222c111b sddm-kcm-6.0.4.tar.xz " diff --git a/community/sddm/APKBUILD b/community/sddm/APKBUILD index 8cb9335f5b9..4a0c05eb6e3 100644 --- a/community/sddm/APKBUILD +++ b/community/sddm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=sddm pkgver=0.21.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simple Desktop Display Manager" url="https://github.com/sddm/sddm/" # armhf blocked by qt6-qtdeclarative @@ -84,6 +84,6 @@ sha512sums=" 2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370caaaa70f458 sddm-v0.21.0.tar.gz 42a0b24717820d98a42d178b5d3a40441672d496c9d8f7c2f8002d770a2718324e9d00d0f27602232b91e8bb042693125507d6cb8371b6f6f211f2b95babe666 0001-pam-path-fix.patch bc7b572331de32245abba234e3537885a3d9dd20273a12bd7a82eb754467dd3c753fc4d90ec24cc206f7df0210cf3119dd056c477168b4173b77fc335b6546b0 0003-disable-automatic-portal-launching.patch -4876bf46790dd507f0df803987ad81d7ff2a00c22a8aabec88dd0e3a23aeda92aac59f08ef56ed1bf2b5cb9443077e77b31c9f453bafab2fd6f533be242fcbd4 sddm.initd +f8138b72c66c2661382c8bb07524902290352ec768a9ff4cfcba228721c5bf717b7f566fe5ffff4e5823f1101b837ed14cebef19df32068de8f6d31a5e89b893 sddm.initd b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706 sddm.confd " diff --git a/community/sddm/sddm.initd b/community/sddm/sddm.initd index ea79bb6a786..29f24343058 100644 --- a/community/sddm/sddm.initd +++ b/community/sddm/sddm.initd @@ -6,9 +6,9 @@ description="SDDM Display Manager" command=/usr/bin/sddm command_args="$sddm_opts" -depends() { +depend() { provide display-manager - needs localmount + need localmount } start_pre() { diff --git a/community/seahorse/APKBUILD b/community/seahorse/APKBUILD index c8e8bb1300b..03d6287170b 100644 --- a/community/seahorse/APKBUILD +++ b/community/seahorse/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=seahorse pkgver=43.0 -pkgrel=3 +pkgrel=4 pkgdesc="GNOME application for managing PGP keys." url="https://projects.gnome.org/seahorse/" arch="all" diff --git a/testing/sems/APKBUILD b/community/sems/APKBUILD index 35380354f7d..35380354f7d 100644 --- a/testing/sems/APKBUILD +++ b/community/sems/APKBUILD diff --git a/testing/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch b/community/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch index 4e702ad149a..4e702ad149a 100644 --- a/testing/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch +++ b/community/sems/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch diff --git a/testing/sems/sems-0004-musl-fixes.patch b/community/sems/sems-0004-musl-fixes.patch index e7fcb149f67..e7fcb149f67 100644 --- a/testing/sems/sems-0004-musl-fixes.patch +++ b/community/sems/sems-0004-musl-fixes.patch diff --git a/testing/sems/sems-0005-stats-needs-version.patch b/community/sems/sems-0005-stats-needs-version.patch index 01a7108e0c5..01a7108e0c5 100644 --- a/testing/sems/sems-0005-stats-needs-version.patch +++ b/community/sems/sems-0005-stats-needs-version.patch diff --git a/testing/sems/sems-0014-further-musl-fixes.patch b/community/sems/sems-0014-further-musl-fixes.patch index 2d2f2ab09b3..2d2f2ab09b3 100644 --- a/testing/sems/sems-0014-further-musl-fixes.patch +++ b/community/sems/sems-0014-further-musl-fixes.patch diff --git a/testing/sems/sems.initd b/community/sems/sems.initd index fda1e8a8387..fda1e8a8387 100755 --- a/testing/sems/sems.initd +++ b/community/sems/sems.initd diff --git a/testing/sems/sems.pre-install b/community/sems/sems.pre-install index 5fe904da652..5fe904da652 100644 --- a/testing/sems/sems.pre-install +++ b/community/sems/sems.pre-install diff --git a/community/sensorfw/APKBUILD b/community/sensorfw/APKBUILD index 955870b3590..b76b4f50120 100644 --- a/community/sensorfw/APKBUILD +++ b/community/sensorfw/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=sensorfw pkgver=0.12.6 -pkgrel=1 +pkgrel=2 pkgdesc="Sensorfw" url="https://github.com/sailfishos/sensorfw" arch="all" @@ -56,6 +56,6 @@ aa3ece82d0383689928ae720a48b7ae470f0521b3398b35811668e691a0a4287cc900a43460a12a8 b73478e7aa1ec0ebffcb32538932f025f172db25276266d9a6ccd227980562078313450484408f91634f8b92ad7d80c93aecffb038f5bb9595f901652bb97924 0003-Add-Wrist-gesture-sensor-via-libhybris-adaptor.patch f3c33bd7a439bcccc10bfa4a030b06f020792e2d5f1edd5e7b9e96660a77c157a2a586f7870a62562e8cc1d3ecb9c111e9cd59ad9a6245ef258092e031349cdb 0004-Fix-compilation-when-hybris-is-used.patch 8e362f48fc5db58dc37d035f80f5ab0b09a20c82e6859e9662affdc192e2aa0bc7a259a9b0c63db330b3873d8b1f22af3f9193a0b7d79068354d1a788391376c primaryuse.conf -208b98052574b0bc59a50654eebadc35aa6068f82c13e984fb4fdfb2e5f57cd29d0625bca6f47954aa03f967bc35abf4c3aa359723b28b8db42dd8e9459236a0 sensorfw.initd +17f5d578766b92022992fd5cd333d204a846d1111e7ef59234d7a907290e4cf9e9beb1cb0370b2c9c9982720e62effc5022e625469d9d64eb7613a8d6ef7f8c2 sensorfw.initd b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706 sensorfw.confd " diff --git a/community/sensorfw/sensorfw.initd b/community/sensorfw/sensorfw.initd index 40f2c2b6f48..cc300878768 100644 --- a/community/sensorfw/sensorfw.initd +++ b/community/sensorfw/sensorfw.initd @@ -6,6 +6,6 @@ description="Sensor Framework Qt5" command=/usr/sbin/sensorfwd command_args="-c=/etc/sensorfw/primaryuse.conf --no-magnetometer-bg-calibration" -depends() { +depend() { need udev } diff --git a/community/sfcgal/APKBUILD b/community/sfcgal/APKBUILD index 77c7972df09..c89b72c8a4d 100644 --- a/community/sfcgal/APKBUILD +++ b/community/sfcgal/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=sfcgal pkgver=1.5.1 -pkgrel=0 +pkgrel=1 pkgdesc="Library for ISO 19107:2013 and OGC SFA 1.2 for 3D operations" url="https://sfcgal.gitlab.io/SFCGAL/index.html" arch="all" diff --git a/community/shadowsocks-rust/APKBUILD b/community/shadowsocks-rust/APKBUILD index c0ba6438998..b27ee9d4e7f 100644 --- a/community/shadowsocks-rust/APKBUILD +++ b/community/shadowsocks-rust/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=shadowsocks-rust -pkgver=1.18.2 +pkgver=1.18.4 pkgrel=0 pkgdesc="Rust port of shadowsocks" url="https://github.com/shadowsocks/shadowsocks-rust" @@ -119,5 +119,5 @@ ssurl() { } sha512sums=" -6418c48286b1237a7311c18323004fbf2823b9f3154da0644d551040877ea06cb6c5bf17d843fb744ba2ac9d6589f7cfe75738141d2d6e3f6b2415d339daac6f shadowsocks-rust-1.18.2.tar.gz +82e0a08d7bdcd863bbe98d3ea4369cae5540c2ce2c80d7829897862886f3b12b839b4986373ff208b8d98e01bfa1d4b07f39ab9e5400389fb362953d00224d9c shadowsocks-rust-1.18.4.tar.gz " diff --git a/community/shotcut/APKBUILD b/community/shotcut/APKBUILD index 10f07e20f55..f817b84bbd1 100644 --- a/community/shotcut/APKBUILD +++ b/community/shotcut/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=shotcut -pkgver=24.02.29 +pkgver=24.04.28 pkgrel=0 pkgdesc="Cross-platform video editor" url="https://www.shotcut.org" @@ -50,6 +50,6 @@ package() { } sha512sums=" -6d9f24a2eaa4162b9d6502c06e2f889eb0961fd95b34846e7f88d538027fc694f6c9b7b5c4c889528dfe3dfece68728db42e7933ca8a56149bde9e5c9039d749 shotcut-24.02.29.tar.xz +a0fd523abc09c748065f96be329a425b1393482fa4273dfb076ce0042a8c55ffb6462481dee2e78a2c3482a65736297f6e5ade9f316447d0e8b0662963978de1 shotcut-24.04.28.tar.xz c9d4263cf5c4a1964ad73fb810353e338e6417e3241a177f444ef151c2da7970eaaa0ca94cfcf52da4d3fe9b1abc4d5fac78361c287aa7e10e3aab2026893cca launcher " diff --git a/community/shotwell/APKBUILD b/community/shotwell/APKBUILD index fb052135beb..1f20ce3e2b7 100644 --- a/community/shotwell/APKBUILD +++ b/community/shotwell/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=shotwell pkgver=0.32.6 -pkgrel=0 +pkgrel=1 pkgdesc="Digital photo organizer designed for the GNOME desktop environment" url="https://wiki.gnome.org/Apps/Shotwell" arch="all" diff --git a/community/signal-cli/APKBUILD b/community/signal-cli/APKBUILD index 70fa654ed9c..0bda0f37efb 100644 --- a/community/signal-cli/APKBUILD +++ b/community/signal-cli/APKBUILD @@ -2,19 +2,21 @@ # Contributor: Simon Frankenberger <simon-alpine@fraho.eu> # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu> pkgname=signal-cli -pkgver=0.13.0 +pkgver=0.13.3 pkgrel=0 pkgdesc="commandline interface for libsignal-service-java" url="https://github.com/AsamK/signal-cli" # jdk17 only available on 64 bit archs # cargo and rust not available on s390x and riscv64 -# ppc64le: no openjdk17-jdk -# aarch64: blocked by https://github.com/gradle/gradle/issues/24875 -arch="x86_64" +# java-libsignal-client not available on ppc64le +arch="x86_64 aarch64" license="GPL-3.0-or-later" depends="java-libsignal-client" makedepends="openjdk21-jdk" -source="$pkgname-$pkgver.tar.gz::https://github.com/AsamK/signal-cli/archive/v$pkgver.tar.gz" +source=" + $pkgname-$pkgver.tar.gz::https://github.com/AsamK/signal-cli/archive/v$pkgver.tar.gz + upgrade-gradle-fix-sigsegv-aarch64.patch + " build() { ./gradlew installDist @@ -41,5 +43,6 @@ package() { } sha512sums=" -9107bf934767c721af96d2f3181a97eba0c25a95e58904e718459d5c17bb9c2fec13d38dbb176ebdbf91cfa1de28b2a57daefad1d60587ebfa1a02e7796529cc signal-cli-0.13.0.tar.gz +855c0237203e37284c41e73920920e81efae244823c9187715bd6f77474242671571bfa5adde1f2d552e3e15ddc6d1f4a9f6bdf334ad269d1f45e81bcbd36f38 signal-cli-0.13.3.tar.gz +e03849fe9fdbb2bff868e61742e5745d5cd89770b8c1aa4aa778958a7fbb291e1ee844e452b179ab59f91ce3e433a4cc7f5ffb12ce7672e7a2e6242789cd9f16 upgrade-gradle-fix-sigsegv-aarch64.patch " diff --git a/community/signal-cli/upgrade-gradle-fix-sigsegv-aarch64.patch b/community/signal-cli/upgrade-gradle-fix-sigsegv-aarch64.patch new file mode 100644 index 00000000000..9d6c66af3c1 --- /dev/null +++ b/community/signal-cli/upgrade-gradle-fix-sigsegv-aarch64.patch @@ -0,0 +1,11 @@ +diff -ur old/gradle/wrapper/gradle-wrapper.properties new/gradle/wrapper/gradle-wrapper.properties +--- old/gradle/wrapper/gradle-wrapper.properties 2024-04-19 19:21:07.000000000 +0200 ++++ new/gradle/wrapper/gradle-wrapper.properties 2024-04-23 05:37:35.854017506 +0200 +@@ -1,6 +1,6 @@ + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists +-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip ++distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.8-20240411013326+0000-bin.zip + networkTimeout=10000 + validateDistributionUrl=true + zipStoreBase=GRADLE_USER_HOME diff --git a/community/sioyek/APKBUILD b/community/sioyek/APKBUILD index 15b3a048142..e474386baf3 100644 --- a/community/sioyek/APKBUILD +++ b/community/sioyek/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=sioyek pkgver=2.0.0 -pkgrel=19 +pkgrel=20 pkgdesc="PDF viewer designed for reading research papers and technical books" url="https://sioyek.info" arch="all !aarch64 !armhf !armv7" # fails to build diff --git a/testing/slick-greeter/APKBUILD b/community/slick-greeter/APKBUILD index 06759974c0f..0e6f9124030 100644 --- a/testing/slick-greeter/APKBUILD +++ b/community/slick-greeter/APKBUILD @@ -2,15 +2,17 @@ # Maintainer: David Demelier <markand@malikania.fr> pkgname=slick-greeter pkgver=2.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="a slick-looking LightDM greeter" url="https://github.com/linuxmint/slick-greeter" # s390x: mainframe arch="all !s390x" license="GPL-3.0-only" -makedepends="automake autoconf libtool libcanberra-dev lightdm-dev gnome-common vala xapp-dev" +makedepends="automake autoconf intltool libtool libcanberra-dev lightdm-dev vala xapp-dev" subpackages="$pkgname-doc $pkgname-lang" -source="$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/slick-greeter/archive/refs/tags/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/slick-greeter/archive/refs/tags/$pkgver.tar.gz + get-rid-of-gnome-common.patch + " options="!check" # No tests prepare() { @@ -35,4 +37,5 @@ package() { sha512sums=" db6424e68f547d95fb67c835a8e2a842232cadf92fbded7a329c9e4ed8fd9588ee0914c92a7f11b97d28859e3a8ef2885b6b4cea73214d5693074397edbb7279 slick-greeter-2.0.3.tar.gz +1060172686538ad92f58abb7be80cdc99a6fd914e16700c4ea4d95a99abf09f82a05181961961732adce1d505787f93aa73d744e12c8e019e084fef5b28f8081 get-rid-of-gnome-common.patch " diff --git a/community/slick-greeter/get-rid-of-gnome-common.patch b/community/slick-greeter/get-rid-of-gnome-common.patch new file mode 100644 index 00000000000..5b626a9c5f3 --- /dev/null +++ b/community/slick-greeter/get-rid-of-gnome-common.patch @@ -0,0 +1,84 @@ +From 52a1b5970534790becd977894545cacee92d2552 Mon Sep 17 00:00:00 2001 +From: Jakko3 <jahau@rocketmail.com> +Date: Mon, 12 Feb 2024 20:02:51 +0100 +Subject: [PATCH] Get rid of gnome-common build dependency (#231) + +"gnome-common" is deprecated. Replace the autogen.sh script by the +template suggested at the gnome-common migration page [1], adding +the mentioned aclocal line. + +[1] https://wiki.gnome.org/Projects/GnomeCommon/Migration +--- + autogen.sh | 45 ++++++++++++++++++++++++++++++++------------- + debian/control | 1 - + 2 files changed, 32 insertions(+), 14 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 7ac1a76..efc3e5f 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -1,20 +1,39 @@ + #!/bin/sh + # Run this to generate all the initial makefiles, etc. ++test -n "$srcdir" || srcdir=$(dirname "$0") ++test -n "$srcdir" || srcdir=. + +-srcdir=`dirname $0` +-test -z "$srcdir" && srcdir=. ++olddir=$(pwd) + +-REQUIRED_AUTOMAKE_VERSION=1.7 ++cd $srcdir + +-(test -f $srcdir/configure.ac \ +- && test -d $srcdir/src) || { +- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" +- echo " top-level slick-greeter directory" +- exit 1 ++(test -f configure.ac) || { ++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***" ++ exit 1 + } + +-which gnome-autogen.sh || { +- echo "You need to install gnome-common from the GNOME CVS" +- exit 1 +-} +-. gnome-autogen.sh ++# shellcheck disable=SC2016 ++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac) ++ ++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then ++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2 ++ echo "*** If you wish to pass any to it, please specify them on the" >&2 ++ echo "*** '$0' command line." >&2 ++ echo "" >&2 ++fi ++ ++aclocal --install || exit 1 ++autoreconf --verbose --force --install || exit 1 ++ ++cd "$olddir" ++if [ "$NOCONFIGURE" = "" ]; then ++ $srcdir/configure "$@" || exit 1 ++ ++ if [ "$1" = "--help" ]; then ++ exit 0 ++ else ++ echo "Now type 'make' to compile $PKG_NAME" || exit 1 ++ fi ++else ++ echo "Skipping configure process." ++fi +diff --git a/debian/control b/debian/control +index 8bff7bd..5340245 100644 +--- a/debian/control ++++ b/debian/control +@@ -6,7 +6,6 @@ Standards-Version: 4.6.1 + Build-Depends: debhelper-compat (= 12), + at-spi2-core, + dbus-x11, +- gnome-common, + fonts-ubuntu, + libcanberra-dev, + libgtk-3-dev, diff --git a/community/slim/APKBUILD b/community/slim/APKBUILD index d0e8a55bc37..4495d5bd575 100644 --- a/community/slim/APKBUILD +++ b/community/slim/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=slim pkgver=1.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Desktop-independent graphical login manager for X11" url="https://sourceforge.net/projects/slim-fork" arch="all" @@ -67,6 +67,6 @@ sha512sums=" 23fd8b60567b89783072f0e76e07a24ef2d2d8462b8a51939045494ec5fd69c9be663d0d2e69079ee692114076a5b32821b727c2b30a667a3ccc90b5a725cb3e slim-1.4.1.tar.gz 3cd3de67e5b1e122da05e02e0e6e8fe2c5a1ae07487e51068aa56ddf05d17854562350ef47c914a2c9fb2534b8f757a326cfed64f4b5ddbbeb18e48af43b46c6 slim-alpinelinux-0.2.0.tar.gz e5f398ea58adbedea7ae40c7a907d2f926148ee6f3c51fc5761b84d1d119c091fa0cf34f908cd49300fcddea71c5c9b6f2ac21731808ce5d73ea65a65b19a55b slim.logrotate -042803894dbc34351f2efd436b1e07610f63feb12f31d5d0cc1dc26e758d208790ff79ef678854d3ffd781776bc84033d9b752757944474e721e679d3cbcfbce slim.initd +bb040b7d4ba0c8ba1e0892ce6f3edbf85a31c38fab7389658fc593ef50a28b02947c3b055d09de3e538626caa66de08cb6618bafb490c4c56d0c8b069839b3d6 slim.initd c3e65b4d113c7e59acdb8ff9e34918942c9b752e2cc12271e24d9e2dd37dfa9114f4ed98c3b20d12fb0f0772cde8dd3f960896ae6d6a8f58aa67329a16527d21 fix-include-on-musl.patch " diff --git a/community/slim/slim.initd b/community/slim/slim.initd index fd9a6c426ae..b0fc2b27bbc 100755 --- a/community/slim/slim.initd +++ b/community/slim/slim.initd @@ -1,7 +1,7 @@ #!/sbin/openrc-run -depends() { - needs localmount dbus +depend() { + need localmount dbus } start() { diff --git a/testing/snac/APKBUILD b/community/snac/APKBUILD index 174f6b2ba79..9a74243ccf3 100644 --- a/testing/snac/APKBUILD +++ b/community/snac/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=snac -pkgver=2.51 +pkgver=2.52 pkgrel=0 pkgdesc="Simple, minimalistic ActivityPub instance written in portable C" url="https://codeberg.org/grunfink/snac2" @@ -35,6 +35,6 @@ package() { } sha512sums=" -c1c755ab91999b34f5ffe7606796ca1ad8453b439aadf457611642c73c653e41d6bf4462185673aa991d3ec1be1f10da80b077d0384bb7a0e5571aa98e90461e snac-2.51.tar.gz +82a22bb940fb46d0ce2f06a4140439eacb66ca0e066180bbe797a0ada86d99d98aef22fd4067e67f8fc2f617c9a66c371b779cf1862f9452b50bca4e8b1697b1 snac-2.52.tar.gz 8451eb37e5135b926a1a36b7f69d63cb76aa617ca3f9b9167f2284223582dcf66723ee67c51c6abc2d1605c41678d26f67ec6cb1bf920c61379dbf63f7852e1a snac.initd " diff --git a/testing/snac/snac.initd b/community/snac/snac.initd index 7b4f3684710..7b4f3684710 100644 --- a/testing/snac/snac.initd +++ b/community/snac/snac.initd diff --git a/testing/snac/snac.pre-install b/community/snac/snac.pre-install index 74884f92567..74884f92567 100644 --- a/testing/snac/snac.pre-install +++ b/community/snac/snac.pre-install diff --git a/community/snapcast/APKBUILD b/community/snapcast/APKBUILD index 36dee51896a..e01b76d4115 100644 --- a/community/snapcast/APKBUILD +++ b/community/snapcast/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=snapcast pkgver=0.28.0 -pkgrel=0 +pkgrel=1 pkgdesc="Synchronous multi-room audio player" url="https://github.com/badaix/snapcast" arch="all" @@ -24,7 +24,7 @@ pkgusers="$pkgname" pkggroups="$pkgname audio" install="$pkgname-client.pre-install $pkgname-server.pre-install" subpackages="$pkgname-doc $pkgname-client $pkgname-server" -source="$pkgname-$pkgver.tar.gz::https://github.com/badaix/snapcast/archive/refs/tags/v$pkgver.tar.gz +source="$pkgname-v$pkgver.tar.gz::https://github.com/badaix/snapcast/archive/refs/tags/v$pkgver.tar.gz $pkgname-client.initd $pkgname-client.confd $pkgname-server.initd @@ -79,7 +79,7 @@ server() { } sha512sums=" -bd2b69b2066b8ebb7a8c564995915be7f458e2204a51e6844b89557cea35ac9d08b2b292e3d5cb9e57de61584b85772bbc21d8eff9448d01df386a12e46f4bc8 snapcast-0.28.0.tar.gz +924c6ec9f5909e2c3f0887e494fb9aa5f46cda770717523fcf025668a930c658b6b3f7e1feb8448b48df4e61a4ff1b2e3d5b7de874631e372658ac63ea4c3cc7 snapcast-v0.28.0.tar.gz bc2219f00fa70890be0c12f6fb8da0ac86949f65c1714648d20f6e83a80e075b8482bafd65ebadcc65708f0c488f9655ad2ddd803e5a061973de4132134acbc0 snapcast-client.initd fa353d7974d3a8b3b22ff009b762c7c4ee318f9f83e22762a9ebf550484b9fc3cc4dffd389b6d756630dc035cb86d5c5643541957785f8bbf71fe4915691c337 snapcast-client.confd 47feaf72d96ccab6996d24619b1d36a89a74e50d402fb6760792ee62d5c2460718324ef8f437ce2be121488f164372c2c0883b9ff0e45d484b5b0e3778d6d99b snapcast-server.initd diff --git a/community/snapshot/APKBUILD b/community/snapshot/APKBUILD index 12da97df8dc..19d09e949cb 100644 --- a/community/snapshot/APKBUILD +++ b/community/snapshot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Thomas Aldrian <aldrian.thom@proton.me> # Maintainer: team/gnome <aldrian.thom@proton.me> pkgname=snapshot -pkgver=46.1 +pkgver=46.3 pkgrel=0 pkgdesc="Take pictures and videos" url="https://gitlab.gnome.org/GNOME/snapshot" @@ -41,5 +41,5 @@ package() { } sha512sums=" -2a372480b6969c1e7162f76c370551c07a638f987ec587bbf86bb1ed3820c2ebbc82889cf54dcb717a7ed2c32209e9b8aa4afdfd47fe121c89f0f659c8d33f4e snapshot-46.1.tar.xz +d2fc212727d90ec403f743b8fe92fbdd47d3e8bb80b79b21035be8f9f97c682011c72a7f07d2dd44c963464312c18043ebd5de1ecffb52f1dfe2b2a799690e5f snapshot-46.3.tar.xz " diff --git a/community/sof-firmware/APKBUILD b/community/sof-firmware/APKBUILD index da675c80df1..9e0cde47b6d 100644 --- a/community/sof-firmware/APKBUILD +++ b/community/sof-firmware/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hugo Osvaldo Barrera <hugo@whynothugo.nl> pkgname=sof-firmware -pkgver=2023.12 -pkgrel=0 +pkgver=2024.03 +pkgrel=1 pkgdesc="Sound Open Firmware" url="https://github.com/thesofproject/sof-bin" arch="noarch" @@ -18,11 +18,11 @@ package() { mkdir -p "$pkgdir"/usr/share/licenses \ "$pkgdir"/lib/firmware/intel - cp -a sof sof-tplg sof-ace-tplg "$pkgdir"/lib/firmware/intel/ + cp -a sof* "$pkgdir"/lib/firmware/intel/ install -m644 LICENCE.* Notice.* "$pkgdir"/usr/share/licenses/ } sha512sums=" -ed43e7597c93140b15499ba17bae1866dcf1e2959d910e81b3831e4db2224a1dcff790ef21afcd610d7cc9309251a08351bae1c959ded18e5e28a6b24ae99506 sof-bin-2023.12.tar.gz +1e9891d3891f5a4413a77a68ea6d3a2e6ead8c1a67eaa7e9aaf30871753617ffce19bd3b85ebcbb617e606646f6aa0e1dafee5279c294ec72ef4b2885e009f72 sof-bin-2024.03.tar.gz " diff --git a/community/solid/APKBUILD b/community/solid/APKBUILD index 5cf1e2fe101..69495e84c83 100644 --- a/community/solid/APKBUILD +++ b/community/solid/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=solid -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Hardware integration and detection" # armhf blocked by qt6-qtdeclarative @@ -46,5 +46,5 @@ package() { } sha512sums=" -a1ad3cd98a4b39b687c7354759e70dfd3a816b8881ca68db70ed23e38513c93320e30b866322ffdea6f929c49c1c72ec7e2007737cc5ee4553c7fd43582affca solid-6.1.0.tar.xz +809517d751b5b70b3e7c2221e5fb180a35fcd538e3efa2ee1ca7621e01957efd0a0bebe610a2cc7a766702e95f63a50c46570f0cc636680908bcb86bb506547d solid-6.2.0.tar.xz " diff --git a/community/sonnet/APKBUILD b/community/sonnet/APKBUILD index ae819d06151..11284f26106 100644 --- a/community/sonnet/APKBUILD +++ b/community/sonnet/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=sonnet -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Spelling framework for Qt" # armhf blocked by extra-cmake-modules @@ -47,5 +47,5 @@ package() { } sha512sums=" -af609e0f978d287073c5ca338ddb221fb8fc3c27a5165bda5f639a3f532f0d02672575287f71be368e0399beac99dc8bdb8f8977df69072e58d8c5f040458635 sonnet-6.1.0.tar.xz +925960e2c276cf8884fff2cfe7446acda17fbc024b36f85960f27d78d08c489ccb424489d09a440e403fc60684e489d2e1f91b881f8328907f6cc67fda3e8788 sonnet-6.2.0.tar.xz " diff --git a/community/spdlog/APKBUILD b/community/spdlog/APKBUILD index 5af82cc26dc..9dad37acb34 100644 --- a/community/spdlog/APKBUILD +++ b/community/spdlog/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=spdlog -pkgver=1.12.0 -pkgrel=1 +pkgver=1.14.1 +pkgrel=0 pkgdesc="Fast C++ logging library" url="https://github.com/gabime/spdlog" arch="all" @@ -10,9 +10,7 @@ license="MIT" makedepends="cmake fmt-dev samurai" checkdepends="catch2-3" subpackages="$pkgname-dev" -source="https://github.com/gabime/spdlog/archive/v$pkgver/spdlog-v$pkgver.tar.gz - spdlog-1.12.0-tests.patch - " +source="https://github.com/gabime/spdlog/archive/v$pkgver/spdlog-v$pkgver.tar.gz" build() { cmake -B build -G Ninja \ @@ -29,7 +27,7 @@ build() { } check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest --test-dir build + ctest --test-dir build --output-on-failure } package() { @@ -39,6 +37,5 @@ package() { } sha512sums=" -db9a4f13b6c39ffde759db99bcdfe5e2dbe4231e73b29eb906a3fa78d6b8ec66920b8bd4371df17ae21b7b562472a236bc4435678f3af92b6496be090074181d spdlog-v1.12.0.tar.gz -13c5acf1a69190e98b1e67d0684f5ba35fc794aba8dc1101ed73df3285ebb5c7d59414254bd5b47c950679479c7152799a8382bfab7659351a57ac24622d93a5 spdlog-1.12.0-tests.patch +d8f36a3d65a43d8c64900e46137827aadb05559948b2f5a389bea16ed1bfac07d113ee11cf47970913298d6c37400355fe6895cda8fa6dcf6abd9da0d8f199e9 spdlog-v1.14.1.tar.gz " diff --git a/community/spdlog/spdlog-1.12.0-tests.patch b/community/spdlog/spdlog-1.12.0-tests.patch deleted file mode 100644 index aa97b3277f4..00000000000 --- a/community/spdlog/spdlog-1.12.0-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -Patch-Source: https://github.com/gabime/spdlog/commit/6a508d3d7e9af6e8b60eb00f77c2721ddf0e7ea1 -From 6a508d3d7e9af6e8b60eb00f77c2721ddf0e7ea1 Mon Sep 17 00:00:00 2001 -From: Vitaly Zaitsev <vitaly@easycoding.org> -Date: Sun, 23 Jul 2023 10:11:37 +0200 -Subject: [PATCH] Added missing square bracket to fix the level_to_string_view - test. - ---- - tests/test_misc.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_misc.cpp b/tests/test_misc.cpp -index 9f3cb1744d..6199641ff2 100644 ---- a/tests/test_misc.cpp -+++ b/tests/test_misc.cpp -@@ -43,7 +43,7 @@ TEST_CASE("log_levels", "[log_levels]") - REQUIRE(log_info("Hello", spdlog::level::trace) == "Hello"); - } - --TEST_CASE("level_to_string_view", "[convert_to_string_view") -+TEST_CASE("level_to_string_view", "[convert_to_string_view]") - { - REQUIRE(spdlog::level::to_string_view(spdlog::level::trace) == "trace"); - REQUIRE(spdlog::level::to_string_view(spdlog::level::debug) == "debug"); diff --git a/community/spectacle/APKBUILD b/community/spectacle/APKBUILD index 1900f392413..1e892b0cbd4 100644 --- a/community/spectacle/APKBUILD +++ b/community/spectacle/APKBUILD @@ -8,8 +8,8 @@ pkgver=24.02.2 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -> purpose -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt6-qtwebengine -> purpose +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kde.org/applications/utilities/org.kde.spectacle" license="GPL-2.0-only" makedepends=" diff --git a/main/speedtest-cli/APKBUILD b/community/speedtest-cli/APKBUILD index 37edbaa6c16..37edbaa6c16 100644 --- a/main/speedtest-cli/APKBUILD +++ b/community/speedtest-cli/APKBUILD diff --git a/community/spotifyd/APKBUILD b/community/spotifyd/APKBUILD index ae3eeeacb26..164ab83b7f7 100644 --- a/community/spotifyd/APKBUILD +++ b/community/spotifyd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=spotifyd pkgver=0.3.5 -pkgrel=2 +pkgrel=3 pkgdesc="Open source Spotify client running as a UNIX daemon" url="https://github.com/Spotifyd/spotifyd" # rust-ring @@ -24,6 +24,7 @@ subpackages="$pkgname-openrc" source="https://github.com/Spotifyd/spotifyd/archive/v$pkgver/spotifyd-$pkgver.tar.gz bump-getrandom.patch + bump-rustc-serialize.patch spotifyd.initd spotifyd.conf @@ -52,6 +53,7 @@ package() { sha512sums=" c457f4927b58f7ae7b27f88a841ebb0eefd6a850bf8baec06e96c7721fc185ddd553e3189578b0c1e6673f81a1489dcd4fa4cd80b90ed26b61d4da201f8f50ef spotifyd-0.3.5.tar.gz 6d4c3585eb7ca7e86b5fa5d3f53e92f589d34355a7dcb327cb0749c13b78ce085a3c48774685f137bb7ce9f473513f1a9f4f6ff54c900da966dfd0ccab6e911c bump-getrandom.patch +4f6c70953f5c0d74faf7306f91df683527489edc5901f51874cd35896b95b50c5df997bba26b8b52022dc7917c91bbab97a01463d99722587e46553951b87a81 bump-rustc-serialize.patch dd4664c5818af8de3439deedfecb2a9d6bd70ab41c3db57cf659d42d4071ffe47d137fa55d94009022472d5927668978df2e6236c574bbe35596fb386ef274a2 spotifyd.initd 3b431114226af7c67838bf860d07c4f4f661808142caadc9920d4268c1c3a89d61d99c310c13b3b4568dc6c10a5c95dfcb05a52f8551884a836a17b20b3ec06c spotifyd.conf " diff --git a/community/spotifyd/bump-rustc-serialize.patch b/community/spotifyd/bump-rustc-serialize.patch new file mode 100644 index 00000000000..45c9653a6ef --- /dev/null +++ b/community/spotifyd/bump-rustc-serialize.patch @@ -0,0 +1,16 @@ +fixes https://github.com/rust-lang-deprecated/rustc-serialize/pull/200 + +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2584,9 +2584,9 @@ + + [[package]] + name = "rustc-serialize" +-version = "0.3.24" ++version = "0.3.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" ++checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" + + [[package]] + name = "rustc_version" diff --git a/community/spvm/APKBUILD b/community/spvm/APKBUILD index c00fcf339ee..da54655e0cb 100644 --- a/community/spvm/APKBUILD +++ b/community/spvm/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=spvm -pkgver=0.989102 +pkgver=0.990006 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=SPVM @@ -39,5 +39,5 @@ package() { } sha512sums=" -826161d9c66a1d0feda6593859c51a922c062e82d9c33b316a1215ed9ebc8e628fe40dafaa0bd9db20f80f48207b109fa91eaa7309457f2f281ffd7f7c55ea5a SPVM-0.989102.tar.gz +daf9858a05dffa39f1f39b7a169a694d49236acde02556f16db2afeba3ae73ec6c098e84ec2ef8bf63a74b8d848c84012e96ea39864dc8b6f6cd41c5673e8276 SPVM-0.990006.tar.gz " diff --git a/community/squeekboard/APKBUILD b/community/squeekboard/APKBUILD index 9d0b85c168c..1b517a86146 100644 --- a/community/squeekboard/APKBUILD +++ b/community/squeekboard/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Contributor: Danct12 <danct12@disroot.org> # Contributor: Rasmus Thomsen <oss@cogitri.dev> -# Maintainer: Newbyte <newbyte@postmarketos.org> +# Maintainer: team/phosh <newbyte@postmarketos.org> pkgname=squeekboard -pkgver=1.38.0 -pkgrel=1 +pkgver=1.39.0 +pkgrel=0 pkgdesc="The final Phosh keyboard" arch="all !s390x !ppc64le" # fails to build on ppc64le url="https://gitlab.gnome.org/World/Phosh/squeekboard" @@ -59,6 +59,6 @@ package() { } sha512sums=" -da417ee0208bdbc02b7fe67ed3444ecd6f22a7d28d98ec8d4152a076252f7bd240a149a3150e4fbf5fb6b73e0b43d0c5feff4e952b72f95ce4162d552355f0ca squeekboard-v1.38.0.tar.gz +51bbbb7c6f461f5e647b4bdb085b9e82021a8f134b96c9cd195adfc34b0a277abc800826442e74157dd322248b9f05b3a1490b9bb766ac07dae7992686811c07 squeekboard-v1.39.0.tar.gz 39072909e750ba3a635b4245f45d969129e5e846aaa83af7530b265ccf31b5758f03520ebdb19dfe7a3494a6203d543addae1c9afba51ac5aafec044683e4172 sm.puri.OSK0.desktop " diff --git a/community/sslh/APKBUILD b/community/sslh/APKBUILD index 88aa18761a9..7cad6c367de 100644 --- a/community/sslh/APKBUILD +++ b/community/sslh/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=sslh -pkgver=2.0.1 +pkgver=2.1.1 pkgrel=0 pkgdesc="Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)" url="https://www.rutschle.net/tech/sslh/README.html" arch="all" license="GPL-2.0-or-later" -makedepends="libconfig-dev libcap-dev pcre2-dev libev-dev perl" +makedepends="libconfig-dev libcap-dev pcre2-dev libev-dev perl +autoconf automake libtool" checkdepends="perl-conf-libconfig perl-io-socket-inet6 lcov valgrind" subpackages="$pkgname-fail2ban::noarch $pkgname-doc $pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://github.com/yrutschle/sslh/archive/refs/tags/v$pkgver.tar.gz @@ -21,12 +22,15 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/yrutschle/sslh/archive/refs/ # Can't test in chroot due to sockets and processes opened. (?) options="!check" +prepare() { + default_prepare + aclocal && autoconf + libtoolize +} + build() { - make CFLAGS="$CFLAGS -std=gnu99" \ - ENABLE_REGEX=1 \ - USELIBPCRE=1 \ - USELIBCONFIG=1 \ - USELIBCAP=1 + ./configure --prefix=/usr + make } check() { @@ -62,8 +66,8 @@ doc() { } sha512sums=" -a20f33af45b3719d85f8c1595ab58e378646894506a2c7179d4a1010a514131de33507c0fa873dc1dbc4d0ba99f5ceaf564bd0252014116d172f0f09efb89fef sslh-2.0.1.tar.gz -b82d3c799f0cdf183fe0545e1d2b4f142070112d7ec3594afd709608c4893c300122aa32026dd7f8e782eb3981bf85fc02f878e2613ddfe014f39bbb94fb441e fix-make-install.patch +f689394028ec25e16dd59a5f1aa4c18a760108f0acf23b4eb2ccf000dc09adf1428272c3e93f5b0012f9603076ab1408a3e1aca98adb3e69743d184cb898a9a4 sslh-2.1.1.tar.gz +a5676b7b4626f298c6d31ba5bbd27a1b1732de04f9b54b55d421a80ff12f7ca15aae5c9aef36af23db4ba0efa4c2c3761fb17ace715f7df0baeac34a9ec859c4 fix-make-install.patch 5773ee1d91e099726b614dbe385f2668699d25029fc300b664411c6082e95d3f27df11b9b1489bee3444c81bf941b8db13b4d382343788e47408c593c4531816 fail2ban.patch 0e677ed7c9d09fa96d0a0571d09660a094a24e5978d6c9f0cf43d8c2b084df2b6b2f4c9bddfb63be943a56e9bb628f8a156f06d0fc4b6ce52d63ea02c6569307 config.patch 20ad403c7e8bd37c849263886ff4307a478fbeaec74d52b7db864dea2e9bdafb2c501afd70fa2621385baf3536553a79cee006b4a629260921d2e08db7991696 sslh.initd diff --git a/community/sslh/fix-make-install.patch b/community/sslh/fix-make-install.patch index d289f6a6b1b..aab4315a064 100644 --- a/community/sslh/fix-make-install.patch +++ b/community/sslh/fix-make-install.patch @@ -1,13 +1,12 @@ ---- a/Makefile -+++ b/Makefile -@@ -98,7 +98,9 @@ - install: sslh $(MAN) +diff --git a/Makefile.in b/Makefile.in +index 57cf591..624a59e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -143,6 +143,7 @@ install: sslh-fork $(MAN) mkdir -p $(DESTDIR)/$(BINDIR) mkdir -p $(DESTDIR)/$(MANDIR) -- install -p sslh-fork $(DESTDIR)/$(BINDIR)/sslh -+ install -p sslh-fork $(DESTDIR)/$(BINDIR)/sslh-fork + install -p sslh-fork $(DESTDIR)/$(BINDIR)/sslh + install -p sslh-select $(DESTDIR)/$(BINDIR)/sslh-select -+ ln -s sslh-fork $(DESTDIR)/$(BINDIR)/sslh install -p -m 0644 $(MAN) $(DESTDIR)/$(MANDIR)/$(MAN) # "extended" install for Debian: install startup script diff --git a/community/stellarium/APKBUILD b/community/stellarium/APKBUILD index 70fd2e65ed5..d8de47f30e3 100644 --- a/community/stellarium/APKBUILD +++ b/community/stellarium/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=stellarium pkgver=24.1 -pkgrel=0 +pkgrel=1 pkgdesc="A stellarium with great graphics and a nice database of sky-objects" url="https://stellarium.org/" # gigantic package diff --git a/testing/stellarsolver/0001-don-t-mess-with-qsort_r.patch b/community/stellarsolver/0001-don-t-mess-with-qsort_r.patch index a3ee679bd23..a3ee679bd23 100644 --- a/testing/stellarsolver/0001-don-t-mess-with-qsort_r.patch +++ b/community/stellarsolver/0001-don-t-mess-with-qsort_r.patch diff --git a/testing/stellarsolver/APKBUILD b/community/stellarsolver/APKBUILD index 3841dda4683..3841dda4683 100644 --- a/testing/stellarsolver/APKBUILD +++ b/community/stellarsolver/APKBUILD diff --git a/community/strawberry/APKBUILD b/community/strawberry/APKBUILD index ede9632ffcd..8ebc7f35da6 100644 --- a/community/strawberry/APKBUILD +++ b/community/strawberry/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: knuxify <knuxify@gmail.com> pkgname=strawberry pkgver=1.0.23 -pkgrel=0 +pkgrel=1 pkgdesc="Strawberry Music Player" url="https://strawberrymusicplayer.org" arch="all" diff --git a/community/stress-ng/APKBUILD b/community/stress-ng/APKBUILD index 0ab3aa6687c..919f0b379a4 100644 --- a/community/stress-ng/APKBUILD +++ b/community/stress-ng/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Olliver Schinagl <oliver@schinagl.nl> # Maintainer: Olliver Schinagl <oliver@schinagl.nl> pkgname=stress-ng -pkgver=0.17.07 +pkgver=0.17.08 pkgrel=0 pkgdesc="stress-ng will stress test a computer system in various selectable ways" url="https://github.com/ColinIanKing/stress-ng" @@ -30,5 +30,5 @@ package() { } sha512sums=" -5bd6dc8175d2d410447559c489e7bb1187fdce7657018ac48a2744be6e8998bc21e84b7bc536477b5db170ca9bd2aba0992127af90e3ff2312bd6130061dce6c stress-ng-0.17.07.tar.gz +3df9bb507687839ad9978099bea33bc6923d324c6e6f66d441911670fcd8080e093fd02741ea8516626ae1ba357f42d2c50b6553cb75f48fd5f008e59d469777 stress-ng-0.17.08.tar.gz " diff --git a/community/supertux/APKBUILD b/community/supertux/APKBUILD index 422a4450553..8e158e0e52c 100644 --- a/community/supertux/APKBUILD +++ b/community/supertux/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: alpterry <alpterry@protonmail.com> pkgname=supertux pkgver=0.6.3 -pkgrel=6 +pkgrel=7 pkgdesc="Open-source classic 2D jump'n run sidescroller game" url="https://www.supertux.org/" arch="all !s390x" # build fails diff --git a/community/suricata/APKBUILD b/community/suricata/APKBUILD index 27a5df198b4..f19106f2e6e 100644 --- a/community/suricata/APKBUILD +++ b/community/suricata/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Stuart Cardall <developer at it-offshore dot co.uk> # Maintainer: Steve McMaster <code@mcmaster.io> pkgname=suricata -pkgver=7.0.4 +pkgver=7.0.5 pkgrel=0 pkgdesc="High performance Network IDS, IPS and Network Security Monitoring engine" url="https://suricata.io/" @@ -50,7 +50,7 @@ source="https://www.openinfosecfoundation.org/download/suricata-$pkgver.tar.gz # - CVE-2021-35063 case "$CARCH" in - ppc64le|riscv64) + ppc64le|riscv64|loongarch64) _lua="" ;; *) _lua="--enable-luajit" @@ -110,7 +110,7 @@ package() { } sha512sums=" -098364a5f0b2c14bf3a0c8895ec9c94a23edd990468f618fa35181c54405be6db012a6e97981e0024140864342764df97101be73308c835d6fabf6cd98a7ffc3 suricata-7.0.4.tar.gz +4eae28a78e1e9595c7f37215e9cccdf417235eadf3c8a9dc4cb531d7dc3fb353c903154ee745df7a44620d299998b84f15d6db95e5f0562744ff7cbaac398d34 suricata-7.0.5.tar.gz ed7c78a80192f3f3ed433330df323beccb6079b5413289b9e9faa3fceea2c536de93de7372968d8605abd1618d73c9319ee39d86b16eed22e7313c8667252f5d suricata.confd 258c6d60fc878dc1c7b7bf93cc758080050f591084a1edf7f1aac81ccb523c73615716616fedd0269f9ac5ef2fa7adcb3e2cefd714754bac5571e9806b6781be suricata.initd 4f76a35bcde78c9860701897fe19bb84cc46bbc429124c4cb2e94cf3330f00ebe8067c0d7f3f83478e9b95323adb947e5081658f455657c4d03c682abe707534 suricata.logrotate diff --git a/community/sushi/APKBUILD b/community/sushi/APKBUILD index 5b54a300b23..ca8c434cfc2 100644 --- a/community/sushi/APKBUILD +++ b/community/sushi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=sushi -pkgver=45.0 +pkgver=46.0 pkgrel=0 pkgdesc="Quick preview for Nautilus" url="https://gitlab.gnome.org/GNOME/sushi" @@ -38,5 +38,5 @@ package() { } sha512sums=" -25f8183e8a98ece5f8fe8b62bd60c1570e580634bc154650c044d37a18f3848fac724a2bebcc59a6d2b55290cf2ec852abda21864b15d97b3395183c2391ae0f sushi-45.0.tar.xz +a05a9e1c1135fe20b917977eb3b6c7ba35202a8e490f62e0ada913a2e3c7e98b42ef33246661843ffa2665c609e8f329fd74cc692502fc6be2b0b7eadae87634 sushi-46.0.tar.xz " diff --git a/community/svxlink/APKBUILD b/community/svxlink/APKBUILD index b5fc0e7367a..04d158e0585 100644 --- a/community/svxlink/APKBUILD +++ b/community/svxlink/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=svxlink pkgver=24.02 -pkgrel=0 +pkgrel=1 pkgdesc="advanced radio repeater controller and EchoLink" url="http://www.svxlink.org" arch="all" diff --git a/community/sway/APKBUILD b/community/sway/APKBUILD index 7689a433158..de164007f1b 100644 --- a/community/sway/APKBUILD +++ b/community/sway/APKBUILD @@ -1,10 +1,9 @@ # Contributor: Henrik Riomar <henrik.riomar@gmail.com> # Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch> -# Contributor: # Maintainer: Michał Polański <michal@polanski.me> pkgname=sway pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc="i3-compatible window manager for Wayland" url="https://swaywm.org/" license="MIT" @@ -45,6 +44,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/swaywm/sway/archive/$pkgver. sway.desktop remove-aports-git-version.patch " +install="$pkgname-portalsconf.pre-install $pkgname-portalsconf.pre-upgrade" options="setcap !check" # no test suite # Remove when Alpine >= 3.21 @@ -76,7 +76,7 @@ portalsconf() { install_if="$pkgname=$pkgver-r$pkgrel xdg-desktop-portal>=1.17.0" install -Dm644 "$srcdir"/sway-portals.conf \ - -t "$subpkgdir"/etc/xdg-desktop-portal/ + -t "$subpkgdir"/usr/share/xdg-desktop-portal/ } wallpapers() { @@ -104,6 +104,6 @@ swaynag() { sha512sums=" 7ec0a29078eb7e0fb1b6af97613c263adec78ddb03a63cb75fb5e44c7241ed144687fd094ee2eb70f4397832ca9bdffc88bc32dee7683bf0e515417c7a05d4c4 sway-1.9.tar.gz c10862928d839a5a8a3a8c235ab9df58b0ffb111b7a0b11e9110b39169ac37de6e7eb1d945ec3611fb213ba159f0e47afd97085faa6ee8238e4d06fed0d74d70 sway-portals.conf -c9bc08fbd9d059c037ad1e3b7ab5e91bcde27dce248cc558c1f126b01c85b1d0d4ed4bb10e3f27bc818a06e60a81f19478b95529d4eeb32036e2c6ea9f29db36 sway.desktop +327f11cc053b39816da76a62199ef40f564acc1fe474b013fc1fd594c448ae3da805bfc475b7c68cce3a17b4a261c5a4bc7e9e91a471f90f5cf4e95bbd937e6c sway.desktop 3081f34ff88be38889ace94489ff4dc97a3d2d8402a6f2e83e968b991db478b7d3329d1685697898d8e43761e83be0d7c348a5fee45fe41dbb77521cda7b5a72 remove-aports-git-version.patch " diff --git a/community/sway/sway-portalsconf.pre-install b/community/sway/sway-portalsconf.pre-install new file mode 100644 index 00000000000..241bf6b83c6 --- /dev/null +++ b/community/sway/sway-portalsconf.pre-install @@ -0,0 +1,15 @@ +#!/bin/sh + +cat << __EOF__ +* +* The sway-portals.conf from the package \`sway-portalsconf\` doesn't specify multiple +* important portal backends, as this is left for the user to configure. Mainly +* org.freedesktop.Settings (used for e.g the color scheme) and org.freedesktop.Secret. +* +* See also: +* - \`man 5 portals.conf\` +* - https://flatpak.github.io/xdg-desktop-portal/docs/backends.html +* +__EOF__ + +exit 0 diff --git a/community/sway/sway-portalsconf.pre-upgrade b/community/sway/sway-portalsconf.pre-upgrade new file mode 120000 index 00000000000..61ee7b5fc30 --- /dev/null +++ b/community/sway/sway-portalsconf.pre-upgrade @@ -0,0 +1 @@ +sway-portalsconf.pre-install
\ No newline at end of file diff --git a/community/sway/sway.desktop b/community/sway/sway.desktop index 8800aecd8b3..26bc4027850 100644 --- a/community/sway/sway.desktop +++ b/community/sway/sway.desktop @@ -7,5 +7,5 @@ Exec=dbus-run-session /usr/bin/sway TryExec=/usr/bin/sway Icon= Type=Application -X-DesktopNames=Sway +DesktopNames=Sway Keywords=launch;Sway;desktop;session; diff --git a/community/swaybg/APKBUILD b/community/swaybg/APKBUILD index 54ff7044593..e6ba5e1cbdf 100644 --- a/community/swaybg/APKBUILD +++ b/community/swaybg/APKBUILD @@ -2,7 +2,7 @@ # Contributor: # Maintainer: Michał Polański <michal@polanski.me> pkgname=swaybg -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=0 pkgdesc="Wallpaper daemon for Wayland" url="https://swaywm.org/" @@ -32,5 +32,5 @@ package() { } sha512sums=" -e0c0d78a1887e8a6ff396305ea717be22ec316cd17ef7e2f61a0fe25f976ff12bb5fd48bf8dc7d99d7c9bf6948b4a00d99bf9ac68021080ae9c393ca84e86e0a swaybg-1.2.0.tar.gz +ea5f1e2db58eb6865e79b05b85e045bd07afa411d6d1cd4e08710c891ef0bc68d78af8fc500e6200824abad865bfe625b030c31d6c9f76cb6a46fefd2c0d5aa8 swaybg-1.2.1.tar.gz " diff --git a/community/swayimg/APKBUILD b/community/swayimg/APKBUILD index a2992cafbb7..b9c99cef1d8 100644 --- a/community/swayimg/APKBUILD +++ b/community/swayimg/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=swayimg pkgver=2.2 -pkgrel=0 +pkgrel=1 pkgdesc="Image viewer for Sway" url="https://github.com/artemsen/swayimg" # optional libjxl, but nobody is using this on s390x diff --git a/community/swaync/APKBUILD b/community/swaync/APKBUILD index 0ef4fc0e7e6..57a1dfc30ba 100644 --- a/community/swaync/APKBUILD +++ b/community/swaync/APKBUILD @@ -3,11 +3,11 @@ pkgname=swaync _projname=SwayNotificationCenter pkgver=0.10.1 -pkgrel=0 +pkgrel=1 pkgdesc="Notification daemon with a GTK GUI for notifications and the control center" url="https://github.com/ErikReider/SwayNotificationCenter" arch="all" -license="GPL-3.0" +license="GPL-3.0-only" depends="dbus" makedepends=" gobject-introspection-dev diff --git a/community/swc/APKBUILD b/community/swc/APKBUILD index a220b157ffb..e3481961141 100644 --- a/community/swc/APKBUILD +++ b/community/swc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=swc -pkgver=1.4.12 +pkgver=1.5.0 pkgrel=0 pkgdesc="A super-fast TypeScript / JavaScript compiler written in Rust" url="https://swc.rs" @@ -33,5 +33,5 @@ package() { } sha512sums=" -0bdf727af1481d52b26c983de3cfb183d9e9429e04f11c8e6264a3c5222593474e6baf0072bc6d7698b496eeca238ce87ee9a243bb1c7a279dac3638af20edda swc-1.4.12.tar.gz +6aafd15243a9355df8aed29345c0283dfa1c783e6105288d668390ffafb560c234cf6660c69deb295a4591241cd8172127351545e4f10c9978b980573592323c swc-1.5.0.tar.gz " diff --git a/community/swww/APKBUILD b/community/swww/APKBUILD index 60995757d73..41110bbed95 100644 --- a/community/swww/APKBUILD +++ b/community/swww/APKBUILD @@ -1,12 +1,19 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=swww -pkgver=0.8.2 +pkgver=0.9.5 pkgrel=0 pkgdesc="Efficient animated wallpaper daemon for Wayland compositors" url="https://github.com/LGFae/swww" -arch="all !s390x" # Build failed +arch="all" license="GPL-3.0-or-later" -makedepends="scdoc cargo libxkbcommon-dev wayland-dev cargo-auditable" +makedepends=" + cargo + cargo-auditable + libxkbcommon-dev + lz4-dev + wayland-dev + scdoc + " subpackages=" $pkgname-doc $pkgname-bash-completion @@ -46,5 +53,5 @@ package() { } sha512sums=" -6d42ef4ed3d8178e52d545b985d26f0b0cabffc89ee25758da4272aa52f12a2399db57642efbee3d6058a7eef635feeec048495343859e1d6570a3119f18e67c swww-0.8.2.tar.gz +79e599357ba5b28bd5b963b4d4949962948ba482ad870e9909946d1d892f5aa9d78fcea3e7294371880842b2b9a1a29354bf3199f82cd142fbd1156f34440aae swww-0.9.5.tar.gz " diff --git a/community/synapse/APKBUILD b/community/synapse/APKBUILD index b8d1b5df8dc..53701460cb3 100644 --- a/community/synapse/APKBUILD +++ b/community/synapse/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: 6543 <6543@obermui.de> pkgname=synapse -pkgver=1.104.0 -pkgrel=1 +pkgver=1.106.0 +pkgrel=0 pkgdesc="Matrix reference homeserver" url="https://github.com/element-hq/synapse" arch="all" @@ -81,6 +81,8 @@ esac # secfixes: +# 1.105.1-r0: +# - CVE-2024-31208 # 1.95.1-r0: # - CVE-2023-43796 # 1.94.0-r0: @@ -153,7 +155,7 @@ package() { } sha512sums=" -8002069c445210566d698ff81027de8709e4a6df32d2487a0b8ced72b12de971667e5a0d6cc441560e87e292be29cff58a229fb99793d6fd42a6af1aad2730e9 synapse-1.104.0.tar.gz -7ac08b676b246647ebfa50f46525ed81d4fa53e83ab11d984f1cedc79ffbbcf12234424215f44f7038b82b7523c1e2fcac306d8bdc9d64648c5d994017b51e55 synapse.initd +6d9faca9131431190202947bf995e50c9ff7ea57d0ab8f5be324585223eaacdd925a99c66d2db64da426a0551c86d52a79871e43c08da22dcededbce7a44a2e9 synapse-1.106.0.tar.gz +80b32fc482578470692228d2258da858e06703ba2a4aed895c506101976a569d03b02c0bbf9ce911c27d14f3001e1a64539a8fd3643a796cb366d01f5a051fef synapse.initd 7c022f0e00c8ac363d6d2e003b6389fb06a3934f68390ebac156cb46bc1366585e6b6cda07b15176bc62a00f5bf21bfda153ff5418b07331257a7075102a6f83 synapse.confd " diff --git a/community/synapse/synapse.initd b/community/synapse/synapse.initd index c2bf51d843b..4a3b5cda33d 100644 --- a/community/synapse/synapse.initd +++ b/community/synapse/synapse.initd @@ -10,7 +10,7 @@ description="Daemon for Synapse, the Matrix reference homeserver" command="/usr/bin/python3" command_args="-m synapse.app.homeserver --config-path=$config $command_args" -depends() { +depend() { need net } diff --git a/community/syncthing/APKBUILD b/community/syncthing/APKBUILD index 60ccf1ee129..48667540df6 100644 --- a/community/syncthing/APKBUILD +++ b/community/syncthing/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Sertonix <sertonix@posteo.net> pkgname=syncthing -pkgver=1.27.6 +pkgver=1.27.7 pkgrel=0 pkgdesc="Open Source Continuous File Synchronization" url="https://syncthing.net/" @@ -20,7 +20,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/syncthing/syncthing/archive/ only-test-with-race-when-provided.patch $pkgname.initd " -options="chmod-clean" +options="chmod-clean net" case "$CARCH" in # arm*: oom on tests # riscv64: bind error @@ -80,7 +80,7 @@ utils() { } sha512sums=" -a343dec73dab067c0721142e549cb931770c299342b6d864a88d9d64870e3e7d1ba59a17fc6e05eb4e041f5235a77c128461b3a67482ed4786a0a525f674e3be syncthing-1.27.6.tar.gz +43207cf203c40a9846b50789c6e45f2c2bfbcf14cdcdc735b076520343506f20556f4609ab456e53064c0015555bc764ed7ce564b3e5b24f657fd50f55c8f05b syncthing-1.27.7.tar.gz 30c96641f073ba732d495e9df4b04a9f00ddb19439b4764c2aef07e4ec4a5f53ec6527210c76dc2d2af8f76a37666e44c57acd444206427a258c1b39b53ee5d0 build-unset-CGO_ENABLED.patch 81bcb6b2e0956624b596201d1de24a3b6fcb10d08761f2c426081350b611295a7f4d47775d175f2ee5dbbb289b98bc022389fc9992f0d31bcdbfde855ceafaf8 only-test-with-race-when-provided.patch 8c95d8794e10c97d6546a48b07af769e9c1b26870fcc53d524868ca6e57e96ad686ebcd988ddb2f355404cced81b9f19eeba99a7c832eb4641ff0066f7916749 syncthing.initd diff --git a/community/syndication/APKBUILD b/community/syndication/APKBUILD index 1d9a6a9ff6c..54a9e55e83c 100644 --- a/community/syndication/APKBUILD +++ b/community/syndication/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=syndication -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="An RSS/Atom parser library" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -43,5 +43,5 @@ package() { } sha512sums=" -40d5e8b40a53ce4e86a48cafc9c1f7a3e92872a366ab381412eb29331126e4e0e89ec76a15c8c4c0be9d2425dd5e1c78f8d9cc36077f169609f245b5b4168e53 syndication-6.1.0.tar.xz +c8c18b9de798d8735eb8f9629aa4729deefba729c0a0c902e7e7b5ba3de6138707f8851dfdb0505ec34a447a8520e7dfe4051b0cb31b06ba084459f72e83eab4 syndication-6.2.0.tar.xz " diff --git a/community/syntax-highlighting/APKBUILD b/community/syntax-highlighting/APKBUILD index fedb33a6de1..95a94a68247 100644 --- a/community/syntax-highlighting/APKBUILD +++ b/community/syntax-highlighting/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=syntax-highlighting -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="Syntax highlighting engine for structured text and code" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -44,5 +44,5 @@ package() { } sha512sums=" -1aebf4507461aca80f5248cbce3311ca5a000b0d5e1f214ca877fd184a9380ac7646fab999901e230717a90047c90a66e8eedb35c224883474e20554b6931690 syntax-highlighting-6.1.0.tar.xz +4578d145bccbb269e0cf29b934b035d0dad8c22938e98c31a49e2982372d5ad66bd76c85794a5e1231ded7d6ba6399e487eb28e2aefb76867b0d2aa37e8f23af syntax-highlighting-6.2.0.tar.xz " diff --git a/community/systemsettings/APKBUILD b/community/systemsettings/APKBUILD index 1e8a44c62cb..218ac959b9d 100644 --- a/community/systemsettings/APKBUILD +++ b/community/systemsettings/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=systemsettings -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="Plasma system manager for hardware, software, and workspaces" # armhf blocked by qt6-qtdeclarative @@ -64,5 +64,5 @@ package() { } sha512sums=" -8583689d1ae539796bd79f074dd0686a5412f2dd0bdb841f5035eb8aaa1b855dfbb1ce16b2225593188a8861f9d37f67146ef11ff0aa35c47aa4aeb118807be5 systemsettings-6.0.3.tar.xz +8c631bab21d70baec86352cb8238883fc8df2b3c6a0955f76d392f50d81166b9d25085771da7d8dd929d88cf86f68ef62b5b1cb285df29f8e7c8e177d9aba7c8 systemsettings-6.0.4.tar.xz " diff --git a/community/tailscale/APKBUILD b/community/tailscale/APKBUILD index aebbbb2c940..bfd62576bbc 100644 --- a/community/tailscale/APKBUILD +++ b/community/tailscale/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Xe <xe@tailscale.com> # Maintainer: Robert Günzler <r@gnzler.io> pkgname=tailscale -pkgver=1.62.0 -pkgrel=1 +pkgver=1.66.1 +pkgrel=0 pkgdesc="The easiest, most secure way to use WireGuard and 2FA" url="https://tailscale.com/" license="BSD-3-Clause" @@ -27,6 +27,8 @@ export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" # secfixes: +# 1.66.1-r0: +# - CVE-????-????? TS-2024-005 # 1.32.3-r0: # - CVE-2022-41924 TS-2022-004 # 0: @@ -75,10 +77,10 @@ package() { } sha512sums=" -187cadb3eb0db54b8b4a6ae78d77745750167ead7fd6e68bc95171ea6058386e91696a3e36fdd8101f8a52fe0a2d9344484b4bca0a48929f19b2d314bb182e1c tailscale-1.62.0.tar.gz +46e226c651abd5dee248e49fcf40a0cea9de72fe9e330015299acd9ec1fc83e1f192948c26b803f0fe3404558471b374391f3cf9155ecb2257a2563f79f3278b tailscale-1.66.1.tar.gz 24706f10a6f5f7091c0f73a13e0c2d72e969e92e6f7aa21abe504f8e2c16af4d1d80fd28c33acbe4866dd8174abd9dc201d97eb5271f6355f7589a56f470f52c tailscale.confd 5cb35e0144d3bc2c20b1fde1ee402aab642b666c259bb324bf1c742a79fd8b3892cf2e7419e684764a50b6a29dc562ee674915bbf16a76eda543fd9c8988428c tailscale.initd -c139461ff829359bfdc66866ef4cd6561f781e2bc3b40e5cfe9c9d06e3e749d179835ee8548d2b2e725f9a59644db64b1136393dff78ae29955c905e76c8ef46 tailscale.logrotate +4f44f59553142bff5ca0914543114e4a6e3e413a96353543551445be6fa3ddc1037492baf0e091c95fe22a63e639b58bc5040285b8b5d246dbb57b70337d5178 tailscale.logrotate 871b650ff982be061532b4c5fe4812f41e6e2c58fc69b24f8a745f9a43389da44e742a69b0467b3c3d9e2b031af0728e20f10fa4584695c4f5ac87768a1fd34e tailscale.modules-load d62ca3f75f23319ffb45452499d082a82862ba90099e50287cc152ba6d9796bc5c4ad2a90d662919023e0a6e9b1e7722d8f35ba85f4807908abcc202d77fc31c test-bump-conn-max-overhead.patch " diff --git a/community/tailscale/tailscale.logrotate b/community/tailscale/tailscale.logrotate index c897172ffab..3888d3b7c76 100644 --- a/community/tailscale/tailscale.logrotate +++ b/community/tailscale/tailscale.logrotate @@ -2,5 +2,4 @@ missingok notifempty sharedscripts - endscript } diff --git a/testing/tangram/APKBUILD b/community/tangram/APKBUILD index 24a1963cc73..24a1963cc73 100644 --- a/testing/tangram/APKBUILD +++ b/community/tangram/APKBUILD diff --git a/testing/tangram/busybox.patch b/community/tangram/busybox.patch index 20329dc0e6f..20329dc0e6f 100644 --- a/testing/tangram/busybox.patch +++ b/community/tangram/busybox.patch diff --git a/community/tau/APKBUILD b/community/tau/APKBUILD index cea74c83135..855f138f8a1 100644 --- a/community/tau/APKBUILD +++ b/community/tau/APKBUILD @@ -11,7 +11,8 @@ url="https://gitlab.gnome.org/World/Tau" # s390x fails to build # x86 fails to build # riscv64: rust broken -arch="all !ppc64le !x86 !armv7 !s390x !riscv64" +#arch="all !ppc64le !x86 !armv7 !s390x !riscv64" +arch="" # libhandy-dev is now in testing/ license="MIT" makedepends=" cargo diff --git a/community/telegraf/APKBUILD b/community/telegraf/APKBUILD index 3f740dec9d1..a40e9e4e2a5 100644 --- a/community/telegraf/APKBUILD +++ b/community/telegraf/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Katie Holly <holly@fuslvz.ws> # Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com> pkgname=telegraf -pkgver=1.30.1 +pkgver=1.30.2 pkgrel=0 -_commit=fb76952e1 # git rev-parse --short HEAD +_commit=10c15ce41 # git rev-parse --short HEAD _branch=release-${pkgver%.*} pkgdesc="A plugin-driven server agent for collecting & reporting metrics, part of the InfluxDB project" url="https://www.influxdata.com/time-series-platform/telegraf/" @@ -49,7 +49,7 @@ package() { } sha512sums=" -84b97d781530dd83e91df8e986b57192082906640e2de8995842c71c28220574e74edd2619e78b7aa90f35c0f540ec13f75bdefb550f03f8675998e8ef1daf1a telegraf-1.30.1.tar.gz +9f66b371ef7e562f99a30358590be21e6c041be610491a74b9588e9ad9c2e8bdbd014b7fd0292f711f0fe72221078791e18316597ebac9e00b762111a19dfaa1 telegraf-1.30.2.tar.gz abe483deb8e12fe140de2c36d17bbfbc97ed7a5de8c3d76162357f7ba6575b8236b7197b92a26ed6d54f95c1ccbfc12ca62d6cc0371bf49d10a1ea5622a51ed1 telegraf.initd d1a9aa57f8b5179f2d8396518b9db757fe1c40337b515c1f750cf577683ff15f3174bc757afa70d880a1fef809c873e6aa0da1b903a5a97934c14965712d47a4 telegraf.confd " diff --git a/community/telegram-desktop/APKBUILD b/community/telegram-desktop/APKBUILD index 912c320d8da..de228f06fe6 100644 --- a/community/telegram-desktop/APKBUILD +++ b/community/telegram-desktop/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Contributor: Nulo <alpine@nulo.in> # Contributor: Donoban <donoban@riseup.net> -# Maintainer: +# Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=telegram-desktop # NOTE: Keep in mind that seemingly normal releases may be pre-releases. # Check GitHub to make sure: # https://github.com/telegramdesktop/tdesktop/releases -pkgver=4.15.0 -pkgrel=5 +pkgver=5.0.1 +pkgrel=6 pkgdesc="Telegram Desktop messaging app" options="!check" # no test suite url="https://desktop.telegram.org/" @@ -44,7 +44,6 @@ makedepends=" abseil-cpp-dev ffmpeg-dev - glibmm2.68-dev gobject-introspection-dev libdispatch-dev gsl-dev @@ -98,6 +97,6 @@ package() { } sha512sums=" -95aa5f14a9a88b9c6421049445f59f1c5c5d7ab4ca4e8b8f4ab7389bdb8f3cc6b29fea270574881633035acec769ba271261f84ec269010c63af28a03719da98 tdesktop-4.15.0-full.tar.gz +45b7833f20f01d78c09163e205af7d68afffcfc88075ba6af35dc6cbbce1f0205c0150b137ca09e6bdaf271240e4d1336411ad427bc27a2b2ad42dc435ee0ec2 tdesktop-5.0.1-full.tar.gz 396b5577bdeb852be3659fcbf09a1ebdc33432baea49296869e2f968d61343679187ed4b923c51c8f417b8d4679aedd7ac863abed255b5b6b1b589029fdc34f6 small-sizes.patch " diff --git a/community/telepathy-glib/APKBUILD b/community/telepathy-glib/APKBUILD index 92ad9114d03..15a367662cc 100644 --- a/community/telepathy-glib/APKBUILD +++ b/community/telepathy-glib/APKBUILD @@ -11,7 +11,9 @@ makedepends="dbus-glib-dev intltool libxslt python3 glib-dev diffutils vala gobject-introspection-dev automake autoconf gtk-doc" checkdepends="dbus" subpackages="$pkgname-dev $pkgname-doc" -source="https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-$pkgver.tar.gz" +source="https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-$pkgver.tar.gz + test-cm.patch + " case "$CARCH" in s390x) @@ -53,4 +55,5 @@ package() { sha512sums=" 736590c299b6522c41153e01e80d9bfdac1d4cbec646b28c9fba67a07429426ff2c8e38818f2cddd7ccdc38a061d210906f6e551f7a6059c34c4dd08b789b501 telepathy-glib-0.24.2.tar.gz +779ae9628367f25aeb6a3c3322ef5e14f7c4271ba592f42e9c4bd82235a2bf767f8fea6ef13d61c746eb1719bf8e74c54c8f4da6d170496a595b5c4b96a39c5d test-cm.patch " diff --git a/community/telepathy-glib/test-cm.patch b/community/telepathy-glib/test-cm.patch new file mode 100644 index 00000000000..a66e8173a66 --- /dev/null +++ b/community/telepathy-glib/test-cm.patch @@ -0,0 +1,36 @@ +Patch-Source: https://gitlab.freedesktop.org/telepathy/telepathy-glib/-/commit/aa858698d7ede76b3b4c825ca14b8061c24f14e1.patch +-- +From aa858698d7ede76b3b4c825ca14b8061c24f14e1 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Mon, 4 Sep 2023 17:56:15 +0900 +Subject: [PATCH] test: make test-cm accepted with newer GLib + +With GLib 2.77.3, the key value "foo\;bar" is no longer accepted +with g_key_file_get_string and it returns null string result. + +Modify key value in test file to get it accepted by new GLib. +--- + tests/dbus/telepathy/managers/test_manager_file.manager | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/tests/dbus/telepathy/managers/test_manager_file.manager b/tests/dbus/telepathy/managers/test_manager_file.manager +index 426ad4a7e..bdb3f90f1 100644 +--- a/tests/dbus/telepathy/managers/test_manager_file.manager ++++ b/tests/dbus/telepathy/managers/test_manager_file.manager +@@ -79,11 +79,9 @@ default-triply-escaped-semicolon-in-list = list\\\;of;misc; + param-empty-list = as + default-empty-list = + +-# this is probably technically a Desktop Entry spec violation? +-# we should be permissive, interpreting this as either "foo\;bar" or "foo;bar" +-# seems reasonable ++# the value is "foo\\;bar" + param-escaped-semicolon = s +-default-escaped-semicolon = foo\;bar ++default-escaped-semicolon = foo\\;bar + + # all the other types + param-object = o +-- +GitLab + diff --git a/community/texlive/APKBUILD b/community/texlive/APKBUILD index 180119c967f..496114c69b2 100644 --- a/community/texlive/APKBUILD +++ b/community/texlive/APKBUILD @@ -3,12 +3,12 @@ pkgname=texlive pkgver=20240210.69778 _commit=8fc7b0ba764da3d30d18662dd7ea5a97abced38b -pkgrel=1 +pkgrel=2 pkgdesc="Comprehensive TeX document production system" url="https://tug.org/texlive/" # ppc64le: fatal error: mplib.h: No such file or directory -# s390x, riscv64: luajit fails to compile -arch="all !ppc64le !s390x !riscv64" +# s390x, riscv64, loongarch64: luajit fails to compile +arch="all !ppc64le !s390x !riscv64 !loongarch64" license="GPL-2.0-or-later AND GPL-3.0-or-later" depends=" ghostscript @@ -45,6 +45,7 @@ makedepends=" checkdepends=" $_xetex_deps texmf-dist-full + texmf-dist-full-examples " triggers="$pkgname.trigger=/usr/share/texmf-dist" subpackages=" @@ -53,7 +54,8 @@ subpackages=" $pkgname-context:context $pkgname-doc $pkgname-dvi:dvi - $pkgname-full:meta:noarch + $pkgname-full:_subpkg_full:noarch + $pkgname-most:_subpkg_most:noarch $pkgname-luatex:lua $pkgname-xetex:xetex libsynctex @@ -489,7 +491,7 @@ context() { ) } -meta() { +_subpkg_full() { pkgdesc="A complete TeX distribution" depends=" $pkgname @@ -504,6 +506,19 @@ meta() { mkdir -p "$subpkgdir" } +_subpkg_most() { + pkgdesc="A mostly complete TeX distribution" + depends=" + $pkgname + $pkgname-context + $pkgname-luatex + $pkgname-xetex + texmf-dist-most + " + + mkdir -p "$subpkgdir" +} + sha512sums=" 519546a939f981c35d457f39fb57133e417fb6f87cc51ec4a55f0872fe332e62fd6d37e7436f06500e83d04a7b0653a57c7177510be4e2d2b9fcf0fe48d5d633 texlive-20240210.69778.tar.gz " diff --git a/community/texmf-dist/APKBUILD b/community/texmf-dist/APKBUILD index 5b10b82cb85..db534ddfa7d 100644 --- a/community/texmf-dist/APKBUILD +++ b/community/texmf-dist/APKBUILD @@ -3,7 +3,7 @@ pkgname=texmf-dist pkgver=2024.0 _release=20240312 -pkgrel=1 +pkgrel=4 pkgdesc="TeX Live texmf core distribution" url="https://tug.org/texlive/" # texlive @@ -19,50 +19,53 @@ makedepends=" gawk " subpackages=" - texmf-dist-lang - texmf-dist-full - texmf-dist-most - - texmf-dist-bibtexextra:_subpkg - texmf-dist-binextra:_subpkg - texmf-dist-context:_subpkg - texmf-dist-fontsextra:_subpkg - texmf-dist-fontsrecommended:_subpkg - texmf-dist-fontutils:_subpkg - texmf-dist-formatsextra:_subpkg - texmf-dist-games:_subpkg - texmf-dist-humanities:_subpkg - texmf-dist-langarabic:_subpkg - texmf-dist-langchinese:_subpkg - texmf-dist-langcjk:_subpkg - texmf-dist-langcyrillic:_subpkg - texmf-dist-langczechslovak:_subpkg - texmf-dist-langenglish:_subpkg - texmf-dist-langeuropean:_subpkg - texmf-dist-langfrench:_subpkg - texmf-dist-langgerman:_subpkg - texmf-dist-langgreek:_subpkg - texmf-dist-langitalian:_subpkg - texmf-dist-langjapanese:_subpkg - texmf-dist-langkorean:_subpkg - texmf-dist-langother:_subpkg - texmf-dist-langpolish:_subpkg - texmf-dist-langportuguese:_subpkg - texmf-dist-langspanish:_subpkg - texmf-dist-latex:_subpkg - texmf-dist-latexextra:_subpkg - texmf-dist-latexrecommended:_subpkg - texmf-dist-luatex:_subpkg - texmf-dist-mathscience:_subpkg - texmf-dist-metapost:_subpkg - texmf-dist-music:_subpkg - texmf-dist-pictures:_subpkg - texmf-dist-plaingeneric:_subpkg - texmf-dist-pstricks:_subpkg - texmf-dist-publishers:_subpkg - texmf-dist-texworks:_subpkg - texmf-dist-wintools:_subpkg - texmf-dist-xetex:_subpkg + texmf-dist-doc + texmf-dist-examples:_examples + texmf-dist-lang:_lang + texmf-dist-full:_full + texmf-dist-full-examples:_full_examples + texmf-dist-most:_most + " + +_collections=" + bibtexextra + binextra + context + fontsextra + fontsrecommended + fontutils + formatsextra + games + humanities + langarabic + langchinese + langcjk + langcyrillic + langczechslovak + langenglish + langeuropean + langfrench + langgerman + langgreek + langitalian + langjapanese + langkorean + langother + langpolish + langportuguese + langspanish + latex + latexextra + latexrecommended + luatex + mathscience + metapost + music + pictures + plaingeneric + pstricks + publishers + xetex " source=" https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/${_release:0:4}/texlive-$_release-texmf.tar.xz @@ -74,6 +77,21 @@ source=" " builddir="$srcdir/texlive-$_release-texmf" +# One subpackage and doc package per collection. All collections are packed +# by the _subpkg function, which will based on the subpkgname pack both the +# srcfiles and runfiles into the subpkg folder, but also copy the docfiles +# into the -doc subpackage folder. This avoids searching the package twice +# in the db. The split function for the -doc subpackages will then only +# compress the man pages. +for collection in $_collections; do + # the runfiles and srcfiles go in here + subpackages="$subpackages $pkgname-$collection:_subpkg" + # the man pages go in here + subpackages="$subpackages $pkgname-$collection-doc:_subpkgdoc:noarch" + # the other documentation goes in here + subpackages="$subpackages $pkgname-$collection-examples:_subpkgexamples:noarch" +done + _tlpdb="$srcdir/texlive-$pkgver.tlpdb" _tlpdb_get_values() { @@ -87,13 +105,35 @@ _tlpdb_get_values() { "$_tlpdb" } -_tlpdb_get_files() { +_tlpdb_write_pkgsnip() { local pkg pkg="$1" + local snip + snip="$2" awk \ - "/^name $pkg\$/,/^$/{ if (/^ texmf-dist\/.*\$/) print \$1 }" \ - "$_tlpdb" + "/^name $pkg\$/,/^\$/{print \$0}" \ + "$_tlpdb" > "$snip" +} + +_tlpdb_get_xfiles() { + local pkg + local type + snip="$1" + type="$2" + + awk \ + '/^'"$type"'files size=[0-9]*$/ {flag=1; next} flag && /^ texmf-dist/ {print $1; next} flag && !/^ / {exit}' \ + "$snip" +} + +_tlpdb_get_docfiles() { + _tlpdb_get_xfiles "$1" doc +} + +_tlpdb_get_datafiles() { + _tlpdb_get_xfiles "$1" run + _tlpdb_get_xfiles "$1" src } _tlpdb_get_collections() { @@ -104,13 +144,15 @@ _tlpdb_get_collections() { _pack_collection() { local collection - local destdir + local datadir local deps + local pkgsnip + pkgsnip="$(mktemp)" collection="$1" - destdir="$2" + datadir="$2" + docdir="$3" deps="$(_tlpdb_get_values "collection-$collection" "depend")" - for dep in $deps; do case "$dep" in collection-basic) @@ -124,15 +166,43 @@ _pack_collection() { ;; *) msg "Adding $dep" + # writing part of DB for current package into temporary file, so + # that when parsing metadata from it we do not need to search the + # whole DB again. + _tlpdb_write_pkgsnip "$dep" "$pkgsnip" local paths - paths="$(_tlpdb_get_files "$dep")" + paths="$(_tlpdb_get_datafiles "$pkgsnip")" + for path in $paths; do + mkdir -p "$datadir/usr/share/$(dirname "$path")" + cp "$builddir/$path" "$datadir/usr/share/$path" + done + paths="$(_tlpdb_get_docfiles "$pkgsnip")" for path in $paths; do - mkdir -p "$destdir/usr/share/$(dirname "$path")" - cp "$builddir/$path" "$destdir/usr/share/$path" + case "$path" in + texmf-dist/doc/man/*.pdf) + # all man pages are provided twice, one as PDF and once + # as troff. Since they are identical content-wise, we only + # pack the smaller troff file + ;; + texmf-dist/doc/man/*.1) + mkdir -p "$docdir/usr/share/man/man1" + cp "$builddir/$path" "$docdir/usr/share/man/man1/${path##*/}texmf-dist" + ;; + texmf-dist/doc/man/*.5) + mkdir -p "$docdir/usr/share/man/man5" + cp "$builddir/$path" "$docdir/usr/share/man/man5/${path##*/}texmf-dist" + ;; + *) + mkdir -p "$docdir/usr/share/$(dirname "$path")" + cp "$builddir/$path" "$docdir/usr/share/$path" + ;; + esac done ;; esac done + + rm -f "$pkgsnip" } prepare() { @@ -185,6 +255,12 @@ check() { # no subpackage for basic, the basic collection goes into the root # package instead ;; + texworks) + # windows-only package + ;; + wintools) + # windows-only package + ;; *) case "$subpackages" in *"texmf-dist-$collection"*) @@ -200,7 +276,7 @@ check() { } package() { - _pack_collection "basic" "$pkgdir" + _pack_collection "basic" "$pkgdir" "${pkgdir%/}-doc" # install tlpkg parts needed for texconfig mkdir -p "$pkgdir"/usr/share/tlpkg @@ -213,17 +289,43 @@ _subpkg() { collection="${subpkgname#texmf-dist-}" pkgdesc="texmf-dist: $(_tlpdb_get_values "collection-$collection" shortdesc)" depends="texmf-dist" - _pack_collection "$collection" "$subpkgdir" + _pack_collection "$collection" "$subpkgdir" "${subpkgdir%/}-doc" +} + +_subpkgdoc() { + local base + base="${subpkgname%-doc}" + local collection + collection="${base#texmf-dist-}" + # We cannot use default_doc, as this does not work for subpackges + pkgdesc="texmf-dist: $(_tlpdb_get_values "collection-$collection" shortdesc) (man pages)" + + install_if="docs ${subpkgname%-doc}=$pkgver-r$pkgrel" + + # compress man pages, if the doc packages contains some uncompressed ones + if [ -d "$subpkgdir"/usr/share/man ]; then + find "$subpkgdir"/usr/share/man -type f ! -name "*.gz" \ + -exec gzip -9 {} \; + fi } -most() { +_subpkgexamples() { + local base + base="${subpkgname%-examples}" + local collection + collection="${base#texmf-dist-}" + pkgdesc="texmf-dist: $(_tlpdb_get_values "collection-$collection" shortdesc) (examples and documentation)" + depends="$base $base-doc" + + mkdir -p "$subpkgdir" +} + +_most() { pkgdesc="TeX Live texmf distribution including most packages" # everything but texmf-dist-lang* and texmf-dist-fontsextra depends="$pkgname" - local collections - collections="$(_tlpdb_get_collections)" - for collection in $collections; do + for collection in $_collections; do case "$collection" in lang*) ;; @@ -239,13 +341,11 @@ most() { mkdir -p "$subpkgdir" } -lang() { +_lang() { pkgdesc="TeX Live texmf distribution: Additional languages" depends="$pkgname" - local collections - collections="$(_tlpdb_get_collections)" - for collection in $collections; do + for collection in $_collections; do case "$collection" in lang*) depends="$depends texmf-dist-$collection" @@ -255,12 +355,27 @@ lang() { mkdir -p "$subpkgdir" } -full() { +_examples() { + pkgdesc="$pkgdesc (examples and doc)" + depends="$pkgname $pkgname-doc" + + mkdir -p "$subpkgdir" +} + +_full() { pkgdesc="Full TeX Live texmf distribution" depends="$pkgname-most $pkgname-lang $pkgname-fontsextra" mkdir -p "$subpkgdir" } +_full_examples() { + pkgdesc="All examples and documentation for the TeX Live texmf distribution" + depends="$pkgname-examples" + for collection in $_collections; do + depends="$depends $pkgname-$collection-doc $pkgname-$collection-examples" + done + mkdir -p "$subpkgdir" +} sha512sums=" 32d65b59e8ee334c301e1d918d7e3c8fa7c9be1d0a367331a76c658082200cd95f7318ce857c192f08bd9c1fcc1b31d4350f4ae0b59ec493565711fb06148830 texlive-20240312-texmf.tar.xz diff --git a/community/tflint/APKBUILD b/community/tflint/APKBUILD index 56c18f08a4b..ff7f7cdc577 100644 --- a/community/tflint/APKBUILD +++ b/community/tflint/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Will Sinatra <wpsinatra@gmail.com> # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=tflint -pkgver=0.50.3 -pkgrel=2 +pkgver=0.51.1 +pkgrel=0 pkgdesc="A linter for Terraform code" license="MIT" arch="all" @@ -25,5 +25,5 @@ package() { } sha512sums=" -4d92abb1307fb3655bde25b44bb05d216d6cb3ca4f3872294920df3cf4805edd83279fe40c7c38c721ce4f0383e7f557a063bf8075b85f88042b41d787458656 tflint-0.50.3.tar.gz +e26f30fc5923327db5c17ab91cf30109ea1d2e34331a0e3403fa26984e38c062545be79b077f2359425cacda0a3e9cb7769f654eac3758d81a8721c2a38948d5 tflint-0.51.1.tar.gz " diff --git a/community/thin-provisioning-tools/APKBUILD b/community/thin-provisioning-tools/APKBUILD index 1c7b6744528..8f056e423e0 100644 --- a/community/thin-provisioning-tools/APKBUILD +++ b/community/thin-provisioning-tools/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="suite of tools for manipulating the metadata of the dm-thin device-mapper target" url="https://github.com/jthornber/thin-provisioning-tools" # ucontext libc fs_type_t -arch="all !s390x" +arch="all" license="GPL-3.0-only" makedepends="cargo gawk cargo-auditable" subpackages="$pkgname-doc" diff --git a/community/threadweaver/APKBUILD b/community/threadweaver/APKBUILD index 7363155adf2..24feb3d4aec 100644 --- a/community/threadweaver/APKBUILD +++ b/community/threadweaver/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks pkgname=threadweaver -pkgver=6.1.0 +pkgver=6.2.0 pkgrel=0 pkgdesc="High-level multithreading framework" arch="all !armhf" # armhf blocked by qt6-qtdeclarative @@ -42,5 +42,5 @@ package() { } sha512sums=" -ebbc7c83caa9bbd369ca0c8a7c807291f60b78fa1a7b4bcd1aa2bc2e5f8d1714f73b564b5ca511e430d8b594675ae2fe71032b6ceb62426f18cac85e94380b60 threadweaver-6.1.0.tar.xz +8d656032356e1c69904d6084de61765bed9336ba7919e90d8f5567ead315bcdaf4de2caf36403eb43546cb3847c1f9b87b4c2c8f4d4422ea5ada444801f26451 threadweaver-6.2.0.tar.xz " diff --git a/community/thrift/APKBUILD b/community/thrift/APKBUILD index 02ac8f414b9..8360ea1b5d4 100644 --- a/community/thrift/APKBUILD +++ b/community/thrift/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrick Gansterer <paroga@paroga.com> pkgname=thrift pkgver=0.20.0 -pkgrel=0 +pkgrel=1 pkgdesc="Language-independent software stack for RPC implementation" url="https://thrift.apache.org/" arch="all" diff --git a/community/thunderbird/APKBUILD b/community/thunderbird/APKBUILD index e1c963249af..4530c744f7b 100644 --- a/community/thunderbird/APKBUILD +++ b/community/thunderbird/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Joseph Benden <joe@benden.us> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=thunderbird -pkgver=115.9.0 +pkgver=115.10.2 pkgrel=0 pkgdesc="Thunderbird email client" url="https://www.thunderbird.net/" @@ -72,6 +72,8 @@ source="https://ftp.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderb ppc-webrtc.patch python-deps.patch rust-lto-thin.patch + https://dev.alpinelinux.org/archive/firefox/rust1.78-packed-to-portable_simd.patch + rust1.78-qcms-stdsimd.patch sandbox-fork.patch sandbox-largefile.patch sandbox-sched_setscheduler.patch @@ -87,6 +89,8 @@ source="https://ftp.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderb options="!check" # huge browser thing, skipped like firefox # secfixes: +# 115.10.1-r0: +# - CVE-2024-3864 # 115.5.0-r0: # - CVE-2023-6204 # - CVE-2023-6205 @@ -383,6 +387,7 @@ export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection/} -g0 -O2 -Wno-deprecated-b prepare() { default_prepare + rm -rf third_party/rust/packed_simd/ cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/ _clear_vendor_checksums audio_thread_priority @@ -571,7 +576,7 @@ package() { ln -sfv /usr/bin/thunderbird "$pkgdir"/$_mozappdir/thunderbird-bin } sha512sums=" -8ff0bed6e6d7f337ebae09011a10b59343ae7a8355ed1da2d72ec0d4218010adfae78e42565e5b784df26cef4702f313dc9616ac5ca5530fb772d77bdf7f2ea4 thunderbird-115.9.0.source.tar.xz +e893cba882fe3fba516758b8822fa16a6c5b1f633cd2877a91357255f956be32b55ee671ab8ebc4372f116848d4fb67a2220a673c8d5f3c95952ba266d99cd67 thunderbird-115.10.2.source.tar.xz 3e0501ae7a650346c667dfdc0ae0ca286084f22e89ab2ac671cc0d7315673dc5b6dcb9f9882f6f39d26e9a31e57f7a0fd53d6b805e520224e22b8976850e2eb8 audio-lfs64.patch 454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch 2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch @@ -584,6 +589,8 @@ cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549 6f60e83599041db1b707c21784197ea9816b2c936b89a274bfc24554a600981e6f28448fe41fab0942bd31acd49b1c00beb2eb0961149f2ffa6a4154be123ea7 ppc-webrtc.patch 4e40b34c5f77a1a21fe971a6fcd8a21b1a63423a3a7932a5a6e1c7a2779f9f06a561c806614a01931679a4b1c6afdfd8ae1f3cc6b673f259ccd368e8e54f6e90 python-deps.patch 1c6918dd6655d3a1251bfd4af2e1c561cbb00d540a883b4c1ebf7f5de530d754d9ac07b4b5f56cdab6c511d25c8910ec94043f5733e97501a67abffe1bafaeb1 rust-lto-thin.patch +e4795b88e572bb3b6f009dbacc7872b59db2f8facbe2b07f14dd4f45a77c22049783581869f18c6bb3f04d6edb3da59347278321cce2bfa629a4d35e136cda5c rust1.78-packed-to-portable_simd.patch +eae1afad93cc5fa7699b156619600ca4b41e67943b8b6e05ab972d449aece93bbf1e68a5ea1a7b1c9278633dbf7cf31503255558e3e06ddf168b3937a0e014e8 rust1.78-qcms-stdsimd.patch 2518f2fc75b5db30058e0735f47d60fdf1e7adfaeee4b33fb2afb1bd9a616ce943fd88f4404d0802d4083703f4acf1d5ad42377218d025bc768807fbaf7e1609 sandbox-fork.patch b7d0a6126bdf6c0569f80aabf5b37ed2c7a35712eb8a0404a2d85381552f5555d4f97d213ea26cec6a45dc2785f22439376ed5f8e78b4fd664ef0223307b333e sandbox-largefile.patch 94433c5ffdbe579c456d95c5f053f61fcbab2f652fa90bc69dcc27d9a1507a8e5c677adeadae9a7a75cc9a55184c1040737f4dfd10b279c088ef016561e6f135 sandbox-sched_setscheduler.patch diff --git a/community/thunderbird/rust1.78-qcms-stdsimd.patch b/community/thunderbird/rust1.78-qcms-stdsimd.patch new file mode 100644 index 00000000000..2c86aa14a0b --- /dev/null +++ b/community/thunderbird/rust1.78-qcms-stdsimd.patch @@ -0,0 +1,64 @@ +Relevant bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=1882291 + + +diff --git a/Cargo.lock b/Cargo.lock +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4274,10 +4274,11 @@ + [[package]] + name = "qcms" + version = "0.2.0" + dependencies = [ + "libc", ++ "version_check", + ] + + [[package]] + name = "qlog" + version = "0.4.0" +diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml +--- a/gfx/qcms/Cargo.toml ++++ b/gfx/qcms/Cargo.toml +@@ -18,5 +18,8 @@ + iccv4-enabled = [] + cmyk = [] + + [dependencies] + libc = {version = "0.2", optional = true } ++ ++[build-dependencies] ++version_check = "0.9" +diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs +new file mode 100644 +--- /dev/null ++++ b/gfx/qcms/build.rs +@@ -0,0 +1,7 @@ ++extern crate version_check as rustc; ++ ++fn main() { ++ if rustc::is_min_version("1.78.0").unwrap_or(false) { ++ println!("cargo:rustc-cfg=stdsimd_split"); ++ } ++} +diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs +--- a/gfx/qcms/src/lib.rs ++++ b/gfx/qcms/src/lib.rs +@@ -5,13 +5,15 @@ + #![allow(non_camel_case_types)] + #![allow(non_snake_case)] + #![allow(non_upper_case_globals)] + // These are needed for the neon SIMD code and can be removed once the MSRV supports the + // instrinsics we use +-#![cfg_attr(feature = "neon", feature(stdsimd))] ++#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))] ++#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))] ++#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))] + #![cfg_attr( +- feature = "neon", ++ all(target_arch = "arm", feature = "neon"), + feature(arm_target_feature, raw_ref_op) + + )] + + /// These values match the Rendering Intent values from the ICC spec + diff --git a/community/tiledb/APKBUILD b/community/tiledb/APKBUILD index 535a156dca8..cc733a01d26 100644 --- a/community/tiledb/APKBUILD +++ b/community/tiledb/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=tiledb pkgver=2.17.4 -pkgrel=3 +pkgrel=4 pkgdesc="Engine for storing and accessing dense and sparse multi-dimensional arrays" url="https://tiledb.com/" # Tests fail on s390x diff --git a/community/tinyssh/APKBUILD b/community/tinyssh/APKBUILD index c2585481104..89815fa9d78 100644 --- a/community/tinyssh/APKBUILD +++ b/community/tinyssh/APKBUILD @@ -1,17 +1,17 @@ # Contributor: Stuart Cardall <developer@it-offshore.co.uk> -# Maintainer: Stuart Cardall <developer@it-offshore.co.uk> +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> pkgname=tinyssh pkgver=20240101 -pkgrel=0 +pkgrel=1 pkgdesc="Small SSH server using NaCl / TweetNaCl (no dependency on OpenSSL)" url="https://tinyssh.org/" license="CC0-1.0" arch="all !riscv64" -_openrc_deps="s6-networking" +_openrc_deps="ucspi-tcp6" makedepends="libsodium-dev" options="!check" subpackages="$pkgname-doc $pkgname-openrc" -source="$pkgname-$pkgver.tar.gz::https://github.com/janmojzis/tinyssh/archive/$pkgver.tar.gz +source="$pkgname-$pkgver.tar.gz::https://github.com/janmojzis/tinyssh/archive/refs/tags/$pkgver.tar.gz $pkgname.initd $pkgname.confd " @@ -44,17 +44,17 @@ package() { mkdir -p "$pkgdir/usr/share/doc/$pkgname" cat > $pkgdir/usr/share/doc/$pkgname/README.alpine <<EOF TinySSH can be run in 3 different ways: --------------------------------------- +--------------------------------------- (1) /etc/init.d/tinysshd (requires tcpserver & takes care of key generation) -(2) via inetd (you will need to 'tinysshd-makekeys <dir>' manually): +(2) via busybox (you will need to 'tinysshd-makekeys <dir>' manually): -echo '22 stream tcp nowait root /usr/sbin/tinysshd tinysshd -l -v /etc/tinyssh/sshkeys' >> /etc/inetd.conf -rc-service inetd start +busybox tcpsvd 0.0.0.0 22 tinysshd -v /etc/tinyssh/sshkeys & -(3) Using runit with either (1) or (2) +(3) via inetd (you will need to 'tinysshd-makekeys <dir>' manually): -Stealth SSH with FWKNOP: https://it-offshore.co.uk/security/53-stealth-your-ssh-port-ssh-into-lxc-containers +echo '22 stream tcp nowait root /usr/sbin/tinysshd tinysshd -l -v /etc/tinyssh/sshkeys' >> /etc/inetd.conf +rc-service inetd start EOF } @@ -65,6 +65,6 @@ openrc() { sha512sums=" b48561cfc11bb6d2e9b1c805c9dfc36be5f1bbbf04a455b8db3f02b5b8df15e420fcd93d58fb23526baaf0fd70e9969deca261152a656015f12a433a61092e90 tinyssh-20240101.tar.gz -d25f2d80f360528aaf7956ef6d257b09692c22de10e70c7eed132253c3903297269ff60f948f57a587fcd677fa9207b59715c54f257a777c95cc497570d21b56 tinyssh.initd +ee3b43f86239825daf320853c6da1f289e11e66ab8fc69ff181327dffcd71a5e8f10e151f717b5a8c65befaf89fea49e75ca0e78cd57b6d3868e2ac0ee258d94 tinyssh.initd 7c6282a6ae972d83d3e624530cac4958adee1e2313d0e44aff38c94bde1a3f549a536ec80e594d44c29a6a981919dd30322e8d8511626fdb6493c98587047392 tinyssh.confd " diff --git a/community/tinyssh/tinyssh.initd b/community/tinyssh/tinyssh.initd index d7f51c7097b..b044e4e14f6 100644 --- a/community/tinyssh/tinyssh.initd +++ b/community/tinyssh/tinyssh.initd @@ -3,6 +3,7 @@ # Copyright 2017 Stuart Cardall (https://github.com/itoffshore) # Distributed under the terms of the GNU General Public License, v2 or later # # Modified by Laurent Bercot <ska-devel@skarnet.org> 2021-12-07 +# Modified by Miguel Da Silva <midas@contauro.com> 2024-04-04 OPTIONS=${OPTIONS:-\-v -l} PORT=${PORT:-22} @@ -15,28 +16,16 @@ depend() { after logger firewall } -name=tinysshd +daemon=tinysshd +supervisor=supervise-daemon description="Small SSH server using libsodium (no dependency on OpenSSL)" -command="s6-tcpserver" -command_args="${IP} ${PORT} $name ${OPTIONS} $keydir" -command_background=true -pidfile=/var/run/tinysshd.pid + +command="tcpserver" +command_args="-HRDl0 ${IP} ${PORT} $daemon ${OPTIONS} $keydir" start_pre() { if ! [ -d "$keydir" ]; then - checkpath -D ${CONFDIR} + checkpath --directory ${CONFDIR} tinysshd-makekey $keydir 2>/dev/null fi } - -stop_post() { - if [ "$RC_RUNLEVEL" = "shutdown" ]; then - local _tinysshd_pids=$(pgrep tinysshd) - if [ -n "$_tinysshd_pids" ]; then - ebegin "Shutting down ssh connections" - # shellcheck disable=SC2086 - kill -TERM $_tinysshd_pids >/dev/null 2>&1 - eend 0 - fi - fi -} diff --git a/community/tio/APKBUILD b/community/tio/APKBUILD index 06c1f1da132..0a8babc4683 100644 --- a/community/tio/APKBUILD +++ b/community/tio/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sodface <sod@sodface.com> # Maintainer: Sodface <sod@sodface.com> pkgname=tio -pkgver=2.8 +pkgver=3.2 pkgrel=0 pkgdesc="Simple TTY Terminal I/O Application" url="https://github.com/tio/tio" @@ -9,7 +9,7 @@ arch="all" license="GPL-2.0-or-later" makedepends=" bash-completion-dev - inih-dev + glib-dev linux-headers lua5.4-dev meson @@ -28,5 +28,5 @@ package() { } sha512sums=" -b9bac84eb84147a964a504c56dd5aa1ffe706dafc8a7ced4e42a7bb9e1ef262e7f4f015879e5a20b7bfbb1dfe9474bd4ad920b677750b812996b412d05d76272 tio-2.8.tar.xz +37ee36a52b0a41bd8e8fdc0329036fdaedd3130d2e19a92c8f14d86fd2193a5ed1354893c3a8f05e102db5fcb496993fb1700303fd0d2820b9e519abb33976cf tio-3.2.tar.xz " diff --git a/community/tmuxinator/APKBUILD b/community/tmuxinator/APKBUILD index ae7ab8b0f65..c393fae2762 100644 --- a/community/tmuxinator/APKBUILD +++ b/community/tmuxinator/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=tmuxinator -pkgver=3.1.2 -pkgrel=1 +pkgver=3.2.0 +pkgrel=0 pkgdesc="manage complex tmux sessions easily" url="https://github.com/tmuxinator/tmuxinator" arch="noarch" @@ -16,7 +16,6 @@ subpackages=" $pkgname-zsh-completion " source="https://github.com/tmuxinator/tmuxinator/archive/v$pkgver/tmuxinator-$pkgver.tar.gz - replace-erubis-with-erubi.patch tmuxinator-use-new-xdg-version.patch " @@ -54,7 +53,6 @@ package() { } sha512sums=" -1334e110541f32eddf67c155f371c83ea9259fae5bd303feea1bf8dfff0a842e64e9db46777ba6fb4c2cb054ff2658a833ecf116e502fa12867201bdc8ea1cf6 tmuxinator-3.1.2.tar.gz -dedfe8c94f293c8d465016075ddd9c6d05fe4ea68dda946dc296335114805ca8ec5d4c46fe22c0036bcbe3f1600c1d0214ebb79e6b17f14b00330fca7a533e7c replace-erubis-with-erubi.patch +d9258405b2aef18c17f8f4dcf8625d3d86d1b8133322cf18875ebcce1c4379f19b741cc34e885056b44dc59f06dd4d4c9b962488b3fedfca41d13bf784c2f4f0 tmuxinator-3.2.0.tar.gz 1c6d0e708301662e2175c6c5c67658683af5135fd0a1bb156a18159f4a59e65e466a8c2434b8236c56ae99708f54a2451ffdec281109218291cf8e89f39f192f tmuxinator-use-new-xdg-version.patch " diff --git a/community/tmuxinator/replace-erubis-with-erubi.patch b/community/tmuxinator/replace-erubis-with-erubi.patch deleted file mode 100644 index 044644800d4..00000000000 --- a/community/tmuxinator/replace-erubis-with-erubi.patch +++ /dev/null @@ -1,61 +0,0 @@ -Created from: https://github.com/tmuxinator/tmuxinator/pull/793 -diff --git a/lib/tmuxinator.rb b/lib/tmuxinator.rb -index de4837e..6acf290 100644 ---- a/lib/tmuxinator.rb -+++ b/lib/tmuxinator.rb -@@ -1,4 +1,4 @@ --require "erubis" -+require "erubi" - require "fileutils" - require "shellwords" - require "thor" -diff --git a/lib/tmuxinator/cli.rb b/lib/tmuxinator/cli.rb -index e54a9b0..032526c 100644 ---- a/lib/tmuxinator/cli.rb -+++ b/lib/tmuxinator/cli.rb -@@ -169,7 +169,8 @@ module Tmuxinator - def generate_project_file(name, path) - template = Tmuxinator::Config.default? ? :default : :sample - content = File.read(Tmuxinator::Config.send(template.to_sym)) -- erb = Erubis::Eruby.new(content).result(binding) -+ erubi_content = Erubi::Engine.new(content).src -+ erb = binding.instance_eval(erubi_content) - File.open(path, "w") { |f| f.write(erb) } - path - end -diff --git a/lib/tmuxinator/project.rb b/lib/tmuxinator/project.rb -index d8066c9..df4e62a 100644 ---- a/lib/tmuxinator/project.rb -+++ b/lib/tmuxinator/project.rb -@@ -47,7 +47,8 @@ module Tmuxinator - @settings = parse_settings(args) - @args = args - -- content = Erubis::Eruby.new(raw_content).result(binding) -+ erubi_content = Erubi::Engine.new(raw_content).src -+ content = binding.instance_eval(erubi_content) - YAML.safe_load(content, aliases: true) - rescue SyntaxError, StandardError => error - raise "Failed to parse config file: #{error.message}" -@@ -103,7 +104,7 @@ module Tmuxinator - - def self.render_template(template, bndg) - content = File.read(template) -- Erubis::Eruby.new(content).result(bndg) -+ bndg.eval(Erubi::Engine.new(content).src) - end - - def windows -diff --git a/tmuxinator.gemspec b/tmuxinator.gemspec -index fac1cd2..3747aa0 100644 ---- a/tmuxinator.gemspec -+++ b/tmuxinator.gemspec -@@ -39,7 +39,7 @@ Gem::Specification.new do |s| - s.required_rubygems_version = ">= 1.8.23" - s.required_ruby_version = ">= 2.6.7" - -- s.add_dependency "erubis", "~> 2.6" -+ s.add_dependency "erubi", "~> 1.10" - s.add_dependency "thor", "~> 1.3.0" - s.add_dependency "xdg", "~> 2.2", ">= 2.2.5" - diff --git a/community/todoman/APKBUILD b/community/todoman/APKBUILD index 5df9d40532b..e9f25b3c8f0 100644 --- a/community/todoman/APKBUILD +++ b/community/todoman/APKBUILD @@ -3,8 +3,8 @@ pkgname=todoman _pyname=todoman pkgver=4.4.0 -pkgrel=1 -pkgdesc="A simple CalDav-based todo manager" +pkgrel=2 +pkgdesc="Simple iCalendar-based todo manager" url="https://pypi.org/project/todoman/" arch="noarch" license="ISC" @@ -36,7 +36,13 @@ checkdepends=" py3-pytest py3-pytest-cov " -subpackages="$pkgname-doc $pkgname-bash-completion $pkgname-zsh-completion:zshcomp:noarch $pkgname-pyc" +subpackages=" + $pkgname-doc + $pkgname-bash-completion + $pkgname-zsh-completion:zshcomp:noarch + $pkgname-pyc + $pkgname-repl:repl:noarch + " source="https://files.pythonhosted.org/packages/source/${_pyname:0:1}/$_pyname/$_pyname-$pkgver.tar.gz" build() { @@ -66,6 +72,12 @@ zshcomp() { depends="$depends jq" } +repl() { + depends="py3-click-repl $pkgname=$pkgver-r$pkgrel" + pkgdesc="Simple iCalendar based todo manager (interactive shell)" + install -d "$subpkgdir" +} + sha512sums=" 02eb38ac44033371496ba94bab5a0a909d0df56dd10e2de7c3c80ea325bd16d4389effa0d6d2be87cf31d3debf6d0c48cddf4cd185b7c50b4168f924548459cf todoman-4.4.0.tar.gz " diff --git a/community/tokodon/APKBUILD b/community/tokodon/APKBUILD index 5b90fee9bf5..d9755b50bd1 100644 --- a/community/tokodon/APKBUILD +++ b/community/tokodon/APKBUILD @@ -10,7 +10,8 @@ pkgdesc="A Mastodon client for Plasma and Plasma Mobile" url="https://invent.kde.org/network/tokodon/" # armhf blocked by extra-cmake-modules # riscv64, ppc64le, s390x: blocked by proposals -arch="all !armhf !riscv64 !ppc64le !s390x" +# loongarch64 blocked by purpose +arch="all !armhf !riscv64 !ppc64le !s390x !loongarch64" license="GPL-3.0-only AND CC0-1.0" depends=" kirigami diff --git a/community/tor/APKBUILD b/community/tor/APKBUILD index 1c6e09c83f9..ac4576411b1 100644 --- a/community/tor/APKBUILD +++ b/community/tor/APKBUILD @@ -66,7 +66,7 @@ build() { check() { # FIXME: find out why these specific tests only fail on these archs case "$CARCH" in - aarch64) + aarch64|riscv64) patch src/test/test_sandbox.c \ "$srcdir"/0003-disable-sandbox_chown_filename-test_patch patch src/test/test_sandbox.c \ diff --git a/community/tpm2-abrmd/APKBUILD b/community/tpm2-abrmd/APKBUILD index ca988d7f4fc..9b88c4026e7 100644 --- a/community/tpm2-abrmd/APKBUILD +++ b/community/tpm2-abrmd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Olliver Schinagl <oliver@schinagl.nl> pkgname=tpm2-abrmd pkgver=3.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="TPM2 Access Broker & Resource Management Daemon implementing the TCG spec." url="https://github.com/tpm2-software/tpm2-abrmd" arch="all" @@ -11,6 +11,10 @@ depends="dbus libtss2-tcti-armbd" makedepends=" glib-dev tpm2-tss-dev + tpm2-tss-mu + tpm2-tss-rc + tpm2-tss-sys + tpm2-tss-tctildr " install="$pkgname.pre-install" options="!check" # Requires IBM TPM simulator diff --git a/community/tpm2-tss-engine/APKBUILD b/community/tpm2-tss-engine/APKBUILD index ab88f6e005c..0fa2d2ede69 100644 --- a/community/tpm2-tss-engine/APKBUILD +++ b/community/tpm2-tss-engine/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Alexander Sack <asac@pantacor.com> pkgname=tpm2-tss-engine pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="tpm2tss engine for openssl" url="https://github.com/tpm2-software/tpm2-tss-engine/" arch="all" license="BSD-2-Clause" -makedepends="tpm2-tss-dev openssl-dev>3 doxygen linux-headers" +makedepends="tpm2-tss-dev tpm2-tss-mu tpm2-tss-esys tpm2-tss-tctildr openssl-dev>3 doxygen linux-headers" subpackages=" $pkgname-dev $pkgname-doc diff --git a/community/tpm2-tss/APKBUILD b/community/tpm2-tss/APKBUILD index 9d402787945..3799a3e7bf3 100644 --- a/community/tpm2-tss/APKBUILD +++ b/community/tpm2-tss/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Alexander Sack <asac@pantacor.com> # Maintainer: Alexander Sack <asac@pantacor.com> pkgname=tpm2-tss -pkgver=4.0.1 -pkgrel=2 +pkgver=4.1.1 +pkgrel=0 pkgdesc="TPM 2.0 TSS" url="https://github.com/tpm2-software/tpm2-tss/" pkgusers="tss" @@ -42,6 +42,12 @@ install="tpm2-tss-fapi.pre-install tpm2-tss-fapi.pre-upgrade tpm2-tss-fapi.post- source=" https://github.com/tpm2-software/tpm2-tss/releases/download/$pkgver/tpm2-tss-$pkgver.tar.gz " +# fhs: /var/run/tpm2-tss/eventlog created in package() +options="!fhs" + +# secfixes: +# 4.1.1-r0: +# - CVE-2024-29040 case "$CARCH" in s390x) @@ -50,11 +56,6 @@ s390x) ;; esac -prepare() { - default_prepare - update_config_sub -} - build() { ./configure \ --build=$CBUILD \ @@ -193,5 +194,5 @@ policy() { } sha512sums=" -ed6ddc52cb0e8c1082a4bb001e1225eb9905fd2380da88db5fd69ff5b5d9d43a93eb67b634e49d53eb5d586832da3aef2c4c7e5f18d51bb730481f8913319d7d tpm2-tss-4.0.1.tar.gz +a8fdc85e44c4a7960cdc21fd46154fbdb63992e072cc4356f472c962a751a826906604848b7b2608344494f85f72d591f4c0bdf42e3df7491446bdecbe22f2af tpm2-tss-4.1.1.tar.gz " diff --git a/community/tracker-miners/APKBUILD b/community/tracker-miners/APKBUILD index 8dbbcad15b1..59e4043f56b 100644 --- a/community/tracker-miners/APKBUILD +++ b/community/tracker-miners/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tracker-miners -pkgver=3.6.2 -pkgrel=3 +pkgver=3.7.3 +pkgrel=0 pkgdesc="Data miners for tracker" url="https://gitlab.gnome.org/GNOME/tracker-miners" # s390x blocked by exempi @@ -58,6 +58,7 @@ build() { -Dtracker_core=system \ -Dsystemd_user_services=false \ -Dminer_rss=false \ + -Dlandlock=enabled \ . output meson compile -C output } @@ -71,5 +72,5 @@ package() { } sha512sums=" -032c96d41e02ed15b56937ea543428aef7b45ce4c206b749e6a99506dd48dd760e45b12563846a3208f0da42387d0547de9eef1fcb54d93cdbca4aad52050af4 tracker-miners-3.6.2.tar.xz +69918c029c7d7b7433c1758a63d6c5e19c8dc6ae0af90d000356f6707f64a1aee907990397878025e40735770a0154ef3d46d35d5319a5c4a73d4195cd0de61a tracker-miners-3.7.3.tar.xz " diff --git a/community/tracker/APKBUILD b/community/tracker/APKBUILD index fc3e30eeed0..b02b9ff4e60 100644 --- a/community/tracker/APKBUILD +++ b/community/tracker/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tracker -pkgver=3.6.0 -pkgrel=3 +pkgver=3.7.3 +pkgrel=0 pkgdesc="Personal search tool and storage system" url="https://tracker.gnome.org/" arch="all" @@ -39,12 +39,6 @@ subpackages=" $pkgname-testutils:_testutils" source="https://download.gnome.org/sources/tracker/${pkgver%.*}/tracker-$pkgver.tar.xz" -# x86: still sigabrts -# armhf: hang for a really long time -case "$CARCH" in -armhf|x86) options="$options !check" ;; -esac - build() { abuild-meson \ -Db_lto=true \ @@ -73,5 +67,5 @@ _testutils() { } sha512sums=" -d3b7d4c1fd1cdcccc0d78c05f43b85f5cdab584e378cb56a2b568293ff95c887650d41c3c7f65de8864a0b6f80ae26410f4a443f045a80e30bacdf7ef9499697 tracker-3.6.0.tar.xz +e6b074c9942de7e5559f56a5e27df3f8e73de7cd09efd389eed3f615fbbf957ac69e0a2861efbf39f356b91455399b86b73ebb11e9d5fe0ef2afa2a7060fa7af tracker-3.7.3.tar.xz " diff --git a/community/transmission/APKBUILD b/community/transmission/APKBUILD index 890565c4167..48b6040aa42 100644 --- a/community/transmission/APKBUILD +++ b/community/transmission/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Alex McGrath <amk@amk.ie> pkgname=transmission pkgver=4.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight GTK BitTorrent client" url="https://transmissionbt.com/" install="transmission-daemon.pre-install transmission-daemon.post-upgrade" diff --git a/community/tree-sitter-cli/APKBUILD b/community/tree-sitter-cli/APKBUILD index 03879870449..36e58bd9a4d 100644 --- a/community/tree-sitter-cli/APKBUILD +++ b/community/tree-sitter-cli/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=tree-sitter-cli -pkgver=0.22.2 +pkgver=0.22.5 pkgrel=0 pkgdesc="Tree Sitter CLI" url="https://tree-sitter.github.io/" @@ -35,5 +35,5 @@ package() { } sha512sums=" -a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856 tree-sitter-cli-0.22.2.tar.gz +cff3902e8f6e0211b6d4fafecf9f0d73a2bf73efed68df0d6e8798aac3e685cbcc882fb698ebc10115e72bcf46b59aabd0b14dd402a08d3b42cfceffea5aab2c tree-sitter-cli-0.22.5.tar.gz " diff --git a/community/tree-sitter-cpp/APKBUILD b/community/tree-sitter-cpp/APKBUILD index 66c8b8bac44..00071cd29af 100644 --- a/community/tree-sitter-cpp/APKBUILD +++ b/community/tree-sitter-cpp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=tree-sitter-cpp -pkgver=0.20.5 +pkgver=0.22.0 pkgrel=0 pkgdesc="C++ grammar for tree-sitter" url="https://github.com/tree-sitter/tree-sitter-cpp" @@ -21,5 +21,5 @@ package() { } sha512sums=" -0afe19dc868bce8fef7114c0553ed3af2c479fc84257959a617dd6acf695fb13a91468a3daddafd39cac11f7d5a72ba988bd29d7d7f1987d7486ae4d1dc7f746 tree-sitter-cpp-v0.20.5.tar.gz +68ec7378a6abc3154090bf7f14b95f646c44ac09e309ec5161906f42641e568171412fd4c30360680982af5e621cac4d51a1cfe03695117560a3a5eeed73d22d tree-sitter-cpp-v0.22.0.tar.gz " diff --git a/community/tree-sitter-java/APKBUILD b/community/tree-sitter-java/APKBUILD index f32b6ebe879..73b0738f51c 100644 --- a/community/tree-sitter-java/APKBUILD +++ b/community/tree-sitter-java/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=tree-sitter-java -pkgver=0.20.2 -pkgrel=1 +pkgver=0.21.0 +pkgrel=0 pkgdesc="Java grammar for tree-sitter" url="https://github.com/tree-sitter/tree-sitter-java" arch="all" @@ -21,5 +21,5 @@ package() { } sha512sums=" -188b4d4c5aad6367ab25e5bbc3b7f56fe1b6108ee1dbe072d71a7376e52793364fad004e2f79d1aa6e18176d5642afef982a40b8da127d4252f2ea10d4bf874c tree-sitter-java-0.20.2.tar.gz +236159990182f2cab0fd50ab1f43898f021243a37e7517f7c8df039296f08e1fe615889a0fd0677eae3abd6a495333ed56be5164f43855cb9ef8e0cc4f2b70c9 tree-sitter-java-0.21.0.tar.gz " diff --git a/community/tree-sitter-json/APKBUILD b/community/tree-sitter-json/APKBUILD index 0f4e8108064..5528b8d9750 100644 --- a/community/tree-sitter-json/APKBUILD +++ b/community/tree-sitter-json/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=tree-sitter-json -pkgver=0.20.2 +pkgver=0.21.0 pkgrel=0 pkgdesc="JSON grammar for tree-sitter" url="https://github.com/tree-sitter/tree-sitter-json" @@ -21,5 +21,5 @@ package() { } sha512sums=" -511376b7be02c624bc48b0a46dd937f1a5d6def3d2a15a7b61cf71b846ecf98ef8af93f05f861152270ea0dcacc18940f8c25bfbad69e9d5c520485d25dab7f5 tree-sitter-json-0.20.2.tar.gz +37ee6a511e15eeb832c7a49d74d977724fecfe24943472047e2100aa18bf4e64f297b1a8e8e37f1d2223614dd9ceec038abd84b5f1fcc00bb67289b70de2ebd2 tree-sitter-json-0.21.0.tar.gz " diff --git a/community/tree-sitter-julia/APKBUILD b/community/tree-sitter-julia/APKBUILD index 41b06673db4..3da36445338 100644 --- a/community/tree-sitter-julia/APKBUILD +++ b/community/tree-sitter-julia/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=tree-sitter-julia -pkgver=0.20.0 -pkgrel=1 +pkgver=0.22.0 +pkgrel=0 pkgdesc="Julia grammar for tree-sitter" url="https://github.com/tree-sitter/tree-sitter-julia" arch="all" @@ -21,5 +21,5 @@ package() { } sha512sums=" -173e990ba6353e8b3f124fb3b1e1e5c281882d7fd6f7d53b3f40304db0f5361c0220017af51dbc569ddc2debf494ae8325877fc3c5de60239da942299a054b3d tree-sitter-julia-0.20.0.tar.gz +9687875f641eb0f599a15a5c9ced0a873c81a2d6ad36528f2c29120126a92ca5d6a51c97f736c1c1e46cd8af32e7c5739c694b0372fa62ca840f39f0fbd6a387 tree-sitter-julia-0.22.0.tar.gz " diff --git a/community/tree-sitter-rust/APKBUILD b/community/tree-sitter-rust/APKBUILD index 30c8751ce10..98ba3b0672d 100644 --- a/community/tree-sitter-rust/APKBUILD +++ b/community/tree-sitter-rust/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=tree-sitter-rust -pkgver=0.21.0 +pkgver=0.21.2 pkgrel=0 pkgdesc="Rust grammar for tree-sitter" url="https://github.com/tree-sitter/tree-sitter-rust" @@ -20,5 +20,5 @@ package() { } sha512sums=" -f9cd32e43b544a18eddfc0b6f8210f1fbc3e7a5d6e9b72c482a536df1e215ceadb41545a65f0c6fc791f6063adbe51957d4e20f7c8fa07a5079a4338a0351bf3 tree-sitter-rust-0.21.0.tar.gz +304b232683ded9973a94ec872401151a5900e3423c7bff966b3f5ec4a71122405fb3790f71f5fb445b8af72a31176349cb3ea8bc7d1b1a042ee574420472e19e tree-sitter-rust-0.21.2.tar.gz " diff --git a/community/tree-sitter/APKBUILD b/community/tree-sitter/APKBUILD index 5638a153316..cfb3a9e1945 100644 --- a/community/tree-sitter/APKBUILD +++ b/community/tree-sitter/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: TBK <alpine@jjtc.eu> pkgname=tree-sitter pkgver=0.22.2 -pkgrel=0 +pkgrel=1 pkgdesc="Incremental parsing system for programming tools" url="https://tree-sitter.github.io/" license="MIT" @@ -56,5 +56,5 @@ grammars() { sha512sums=" a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856 tree-sitter-0.22.2.tar.gz -b76cdd81ce5ba53330d44c0036b11637d546b7995608af8de8696a102fe04cabf6bf23cf256fc5d4d75f5224c9eb6ba3161b537e5f8cb0e0658ff6fc4822c343 abuild-tree-sitter +3ddaf38e368371ec7fef8846f9f40d2c1be9166f50f22c84e886f22bd7950cfe4125b16c41722c2d0abfe6b9fbf08f19332d292e4d8bc422a8ff57f99793e67c abuild-tree-sitter " diff --git a/community/tree-sitter/abuild-tree-sitter b/community/tree-sitter/abuild-tree-sitter index 182669760af..14238b5c9c4 100644 --- a/community/tree-sitter/abuild-tree-sitter +++ b/community/tree-sitter/abuild-tree-sitter @@ -58,13 +58,11 @@ esac querydir='./queries' srcdir='./src' -destdir= name= -while getopts ':q:s:D:h' OPT; do +while getopts ':q:s:D:n:h' OPT; do case "$OPT" in q) querydir=$OPTARG;; s) srcdir=$OPTARG;; - D) destdir=$OPTARG;; n) name=$OPTARG;; h) help; exit 0;; \?) die "unknown option: -$OPTARG";; diff --git a/community/trurl/APKBUILD b/community/trurl/APKBUILD index 04596b3bfde..8ecc4a585c8 100644 --- a/community/trurl/APKBUILD +++ b/community/trurl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=trurl -pkgver=0.10 +pkgver=0.12 pkgrel=0 pkgdesc="command line tool for URL parsing and manipulation" url="https://curl.se/trurl/" @@ -30,5 +30,5 @@ package() { } sha512sums=" -e94c12edcda529d0dc5850eb02158ccf15f0f96e8061ab59d005a609ff839bd971aa3ef8e7c8146c61943bb0194c8d05f89bcd3f723d3de5f56a9bb7012d6873 trurl-0.10.tar.gz +3e8acef76bb704df1315deb0d02c5e1f4995147ab6f7f17ecd3b02d93c212a34bd6b77839cb292db01568c101c62b5cdeb30d544c22bd87144320701ae45cef4 trurl-0.12.tar.gz " diff --git a/community/ttyplot/APKBUILD b/community/ttyplot/APKBUILD index 33e3fae0ef5..a0639b9e88e 100644 --- a/community/ttyplot/APKBUILD +++ b/community/ttyplot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sergiy Stupar <owner@sestolab.pp.ua> # Maintainer: Sergiy Stupar <owner@sestolab.pp.ua> pkgname=ttyplot -pkgver=1.6.2 +pkgver=1.6.3 pkgrel=0 pkgdesc="Realtime plotting utility for terminal/console with data input from stdin" url="https://github.com/tenox7/ttyplot" @@ -21,5 +21,5 @@ package() { } sha512sums=" -7ede447667a0a8f4b164a2a409e1264c36c95c22eeeda348c894678cb8d7209e742bb90f48a8a5260dd457ae7ff0a090a7d8b7eb25b20e20ada575e00cc4eb0b ttyplot-1.6.2.tar.gz +235d4008829222187762aeb15f8936fae50aeb2e3be653def8211241fa6b3da0e4c0e0bab61e85596c18f48842ee8d38ceab6c44df73a3bef0f9b62b51cb68d7 ttyplot-1.6.3.tar.gz " diff --git a/community/tvheadend/APKBUILD b/community/tvheadend/APKBUILD index 504017aa65a..145a77fa3ce 100644 --- a/community/tvheadend/APKBUILD +++ b/community/tvheadend/APKBUILD @@ -1,7 +1,8 @@ -# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> +# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> +# Maintainer: fossdd <fossdd@pwned.life> pkgname=tvheadend pkgver=4.2.8 -pkgrel=6 +pkgrel=8 pkgdesc="TV Streaming server for linux" url="https://tvheadend.org/" arch="all" diff --git a/community/u-boot-asahi/APKBUILD b/community/u-boot-asahi/APKBUILD index a2b2991c8d8..0dd256fb3da 100644 --- a/community/u-boot-asahi/APKBUILD +++ b/community/u-boot-asahi/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Milan P. Stanić <mps@arvanta.net> # **** temporary aport till all is upstreamed ***** pkgname=u-boot-asahi -pkgver=2023.07.02_p4 -pkgrel=1 +pkgver=2024.04_p1 +pkgrel=0 pkgdesc="u-boot bootloader for Apple Silicon Macs" url="https://github.com/AsahiLinux/u-boot" arch="aarch64" @@ -52,7 +52,7 @@ package() { } sha512sums=" -7ef733b7a40dff53a2e8cd961de218e65b2812cd058471a80876da78b0b229adeae1629222d99d2efcbf17c4b6aa9e8dfdd39faac053aba1d4f312d64363b5ca asahi-v2023.07.02-4.tar.gz +47ac7b4972d460de12035971e721c636591851df8145bb6c1d1c340a43211c7efa22a4ce9e0a46089462151da47a78f0272a72e7404b8d3dc935a8e4d37d1333 asahi-v2024.04-1.tar.gz e096055da0c0fbd2b072098fe47f434c7798ab4cd9a602555e0750656feb5b7d1a0d6f8a20380afbbb53dafabd2a0455a7146c0f69e33c404c79028ad9e7a394 update-u-boot-asahi efd3e8cf9996fd8984a15bf9bd4b780d32c30e1fb880d8f85cc102550f61dec60e885160b454deb2f909d84174e8fe05873944c02a3239dcf6ba8319aa84ec94 0001-video-add-simple-cursor.patch " diff --git a/community/ucspi-tcp6/APKBUILD b/community/ucspi-tcp6/APKBUILD index dc79e33d0fc..558be07e04a 100644 --- a/community/ucspi-tcp6/APKBUILD +++ b/community/ucspi-tcp6/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=ucspi-tcp6 pkgver=1.12.4 -pkgrel=0 +pkgrel=1 pkgdesc="IPv6 enabled ucspi-tcp superserver" url="http://www.fehcom.de/ipnet/ucspi-tcp6.html" arch="all" @@ -41,8 +41,6 @@ package() { ) install -Dm0644 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - # remove commands ending with @ and their shell scripts until alpine/abuild!165 is merged/solved - rm -f "$pkgdir/usr/bin/"*@* "$pkgdir/usr/share/man/"man*/*@* } sha512sums=" diff --git a/community/udiskie/APKBUILD b/community/udiskie/APKBUILD index 42cfba769cf..4b448c1dd4b 100644 --- a/community/udiskie/APKBUILD +++ b/community/udiskie/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=udiskie -pkgver=2.5.2 -pkgrel=1 +pkgver=2.5.3 +pkgrel=0 pkgdesc="udisks2 frontend that allows managing removable media from userspace" url="https://github.com/coldfix/udiskie" arch="noarch" @@ -51,5 +51,5 @@ package() { } sha512sums=" -146d5e117c5f13ab220ca438ef1e9c9fd2825efba7e0d9857a018073ff6a7668bff546ad95bc0b00d50ac7bd5b2ef5d1e87fcfaab4ea153117a169d6825024ab udiskie-2.5.2.tar.gz +ff23929f2e1258d4c40a86dec2034d3c68848a9d1e76196c46e621bfcc52abd0c9746023cef248cd74967f37e555c563f1e872ab07732ff1e9f63a24bc6299e6 udiskie-2.5.3.tar.gz " diff --git a/community/ugrep/APKBUILD b/community/ugrep/APKBUILD index e8ed36dbdca..5f69858af30 100644 --- a/community/ugrep/APKBUILD +++ b/community/ugrep/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Camuffo <dev@fmac.xyz> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=ugrep -pkgver=5.1.4 +pkgver=6.0.0 pkgrel=0 pkgdesc="Ultra fast grep with interactive query UI and fuzzy search" url="https://ugrep.com/" @@ -48,5 +48,5 @@ package() { } sha512sums=" -d746c77a22a98c2719cc7b443351a3d27f0f2712a2be483596965cc2b6127f28b9e564ca32db1fea950a6315053c89440912d4b7311073bd97d7702f02521378 ugrep-5.1.4.tar.gz +cb67fa088e372d2e59d707366d23dde386102a54fb829d00b17e11469b5e05c44dc2891ba8d157100674e77fbf4267a33d9ab5bd31fa2d1655859b0643cf6930 ugrep-6.0.0.tar.gz " diff --git a/community/uhd/APKBUILD b/community/uhd/APKBUILD index c9ee35ce2b8..c2f4e38fabc 100644 --- a/community/uhd/APKBUILD +++ b/community/uhd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=uhd pkgver=4.6.0.0 -pkgrel=1 +pkgrel=3 pkgdesc="USRP Hardware Driver" url="https://github.com/EttusResearch/uhd" options="!check" # no tests diff --git a/community/unison/APKBUILD b/community/unison/APKBUILD index ec708368185..2d17d937ae6 100644 --- a/community/unison/APKBUILD +++ b/community/unison/APKBUILD @@ -1,25 +1,31 @@ # Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch> # Contributor: omni <omni+alpine@hack.org> -# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=unison +pkgver=2.53.5 +pkgrel=0 # Note: unison breaks compatibility between minor (major.minor) versions. -pkgver=2.53.3 _majorver=${pkgver%.*} # x.y -pkgrel=0 pkgdesc="Efficient file-synchronization tool" url="https://www.cis.upenn.edu/~bcpierce/unison/" -arch="all !riscv64" # ocaml +arch="all !loongarch64" # ocaml 4+5 license="GPL-3.0-or-later" makedepends="ocaml linux-headers" checkdepends="coreutils" subpackages="$pkgname-doc" -source="unison-$pkgver.tar.gz::https://github.com/bcpierce00/unison/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/bcpierce00/unison/archive/v$pkgver.tar.gz" + +case "$CARCH" in + riscv64) + makedepends="${makedepends//ocaml/ocaml5}" + ;; +esac build() { - make -j1 UISTYLE=text DEBUGGING=false THREADS=true - make -C man - cp src/unison unison-text - cp src/unison-fsmonitor unison-fsmonitor + make NATIVE="$(command -v ocamlopt >/dev/null && echo true || echo false)" + + cp -v src/unison unison-text + cp -v src/unison-fsmonitor unison-fsmonitor } check() { @@ -27,18 +33,18 @@ check() { } package() { - install -Dm755 unison-text \ + install -Dvm755 unison-text \ "$pkgdir"/usr/bin/unison-text-$_majorver - install -Dm755 unison-fsmonitor \ + install -Dvm755 unison-fsmonitor \ "$pkgdir"/usr/bin/unison-fsmonitor-$_majorver - install -Dm644 man/unison.1 \ - -t "$pkgdir"/usr/share/man/man1 + install -Dvm644 man/unison.1 \ + -t "$pkgdir"/usr/share/man/man1/ cd "$pkgdir"/usr/bin - ln -s unison-text-$_majorver unison-text - ln -s unison-text unison + ln -sv unison-text-$_majorver unison-text + ln -sv unison-text unison } sha512sums=" -f3fafd5e1a2950a00ed8bcc682036180ea40eff1ccfa1fc671cca49954890a535ee48faf1e8e62002563143e5479b9df1eca1db1caf03dffc50449fb467b8e2b unison-2.53.3.tar.gz +eabeed7b428f1985610b47ce8bc7faac515fd24937727612aa45435da3e38d40b6cd6d227eb3b65dc370d46458cecfca9d0e9e1712b2b7fa41b76675f8115c4c unison-2.53.5.tar.gz " diff --git a/community/unit/APKBUILD b/community/unit/APKBUILD index bafac597830..43e459c2c61 100644 --- a/community/unit/APKBUILD +++ b/community/unit/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=unit pkgver=1.32.1 -pkgrel=2 +pkgrel=3 pkgdesc="NGINX Unit is a dynamic web application server" url="https://unit.nginx.org/" arch="all" @@ -104,6 +104,9 @@ package() { install -D -m 755 tools/setup-unit "$pkgdir"/usr/bin/setup-unit install -D -m 755 tools/unitc "$pkgdir"/usr/bin/unitc install -D -m 644 tools/README.md "$pkgdir"/usr/share/doc/$pkgname/README.md + + # abuild 3.13.0 adds checks prohibiting packages from creating /var/run + rmdir "$pkgdir"/var/run/unit "$pkgdir"/var/run } tools() { diff --git a/community/unrealircd/APKBUILD b/community/unrealircd/APKBUILD index 6499505cda2..b64f79442a4 100644 --- a/community/unrealircd/APKBUILD +++ b/community/unrealircd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alex Yam <alex@alexyam.com> # Maintainer: Willow Barraco <contact@willowbarraco.fr> pkgname=unrealircd -pkgver=6.1.4 +pkgver=6.1.5 pkgrel=0 pkgdesc="internet relay chat daemon (ircd)" url="https://www.unrealircd.org/" @@ -86,7 +86,7 @@ package() { } sha512sums=" -4f2a6e91804579f36d0ef4a5f8db5b626e843ea86cfadce8128c4843bdb0f7785e50b9670a63ecd982c787dfb8c20dd7516d0f77f08300b9d4ec0572c30ce98d unrealircd-6.1.4.tar.gz +942215005c614c154823ca4049243cbcc927072365bf3b7c8fba6cf4c5b86b255ea96cf97ec6361ddd63f96ea9d36e0eb5eb16a6c41b813c53a0d61a4fa21a6e unrealircd-6.1.5.tar.gz 532cb2419d2b79685a391113cf1f498417ff46ad545b41e3b9e2153966ba92e21e2ef8dc9010ab491bbc10c7758d38a61a1213caf7eabe1c066ccd12c0a6f13e 0001.configure-without-running-config.patch 40b7b53d628f6775f25edb7a9e5cf12935c9f96b5682733fc18dd2395478574e2ff01bbe8313619f975516517b18a9a1613725c0505fd213d41db94092e045ec unrealircd.confd 79c87a1ca4b33788516c92e7cf3b1e81030a64687d34c8ec84805c42d12b5835bf06d5fc1918c4a8bda83a0d449818ae4c67cdbdb229e61607796b5d9e4f7e41 unrealircd.initd diff --git a/community/unrtf/APKBUILD b/community/unrtf/APKBUILD index 3c87eb1f0e2..b038b229b08 100644 --- a/community/unrtf/APKBUILD +++ b/community/unrtf/APKBUILD @@ -2,13 +2,15 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=unrtf pkgver=0.21.10 -pkgrel=2 +pkgrel=3 pkgdesc="Command-line program which converts RTF documents to other formats" url="https://www.gnu.org/software/unrtf" arch="all" license="GPL-3.0-or-later" subpackages="$pkgname-doc" -source="https://ftp.gnu.org/gnu/unrtf/unrtf-$pkgver.tar.gz" +source="https://ftp.gnu.org/gnu/unrtf/unrtf-$pkgver.tar.gz + enable-strcasestr.patch + " prepare() { default_prepare @@ -37,4 +39,5 @@ package() { sha512sums=" 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9 unrtf-0.21.10.tar.gz +aff99f8e34bb262228e9b3c316a3fe5003e55c164934990f1c25c746d49175d872e1c449bfc4468a609723e92c50aa928d7e2863abfd8d49dfa80aadb6cc0659 enable-strcasestr.patch " diff --git a/community/unrtf/enable-strcasestr.patch b/community/unrtf/enable-strcasestr.patch new file mode 100644 index 00000000000..f113e19f0f5 --- /dev/null +++ b/community/unrtf/enable-strcasestr.patch @@ -0,0 +1,13 @@ +Patch-Source: https://github.com/gentoo/gentoo/pull/32868 +Enable strcasestr nonstandard extension + +--- a/src/convert.c ++++ b/src/convert.c +@@ -104,6 +104,7 @@ + #ifdef HAVE_STRING_H + /* For strcasestr() */ + #define __USE_GNU ++#define _GNU_SOURCE + #include <string.h> + #endif + diff --git a/community/upmpdcli/APKBUILD b/community/upmpdcli/APKBUILD index c2d301e5d9b..353ae00faea 100644 --- a/community/upmpdcli/APKBUILD +++ b/community/upmpdcli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Marvin Preuss <marvin@xsteadfastx.org> # Maintainer: Marvin Preuss <marvin@xsteadfastx.org> pkgname=upmpdcli -pkgver=1.8.9 +pkgver=1.8.10 pkgrel=0 pkgdesc="upmpdcli is a UPnP Media Renderer front-end for MPD, the Music Player Daemon" pkgusers="upmpdcli" @@ -9,8 +9,14 @@ pkggroups="upmpdcli" url="https://www.lesbonscomptes.com/upmpdcli" arch="all" license="LGPL-2.1-or-later" -options="!check" -makedepends="libupnpp-dev libmpdclient-dev libmicrohttpd-dev jsoncpp-dev" +options="!check" # no test suite +makedepends=" + jsoncpp-dev + libmicrohttpd-dev + libmpdclient-dev + libupnpp-dev + meson + " subpackages="$pkgname-doc $pkgname-openrc" install="$pkgname.pre-install" source="$pkgname-$pkgver.tar.gz::https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-$pkgver.tar.gz @@ -18,16 +24,12 @@ source="$pkgname-$pkgver.tar.gz::https://www.lesbonscomptes.com/upmpdcli/downloa $pkgname.conf" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc - make + abuild-meson . output + meson compile -C output } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install --no-rebuild -C output install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -Dm644 "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname.conf @@ -35,7 +37,7 @@ package() { } sha512sums=" -f7fc474d91076acfe1d1482db6ea3e9a4a15612cfdef854e11721673f5822f1d2adf1b353b39bdbfbb6cbf869f4b6e8b6995c78e11555cd03c44140f4104b087 upmpdcli-1.8.9.tar.gz +4f8b430a293d62ca82f8bb88bfe57c13694b1972d16402a492700b0ddf8a3689987d2e0a2b4acc7f982c18c6419e22657057e4037d338ddc1392002fa025b672 upmpdcli-1.8.10.tar.gz f586c538abb51f373bf8a8277132694ad289f9c23de9389cb5c9cb67fdbec192529645b759f745ddeca3ce24893580b0ce0d344a8e75b3fd1edd021a0335f617 upmpdcli.initd b6815c29e8c648fd7577f9137f1552dab96710e80458a19fc332c6382471c47fdc056c8e3e1353fc982610173e498b96df8fd18de93f5546773a22e02e58886d upmpdcli.conf " diff --git a/community/upx/APKBUILD b/community/upx/APKBUILD index 6224bc8b5dd..c9600604b09 100644 --- a/community/upx/APKBUILD +++ b/community/upx/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Mitch Tishmack <mitch.tishmack@gmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=upx -pkgver=4.2.3 +pkgver=4.2.4 pkgrel=0 pkgdesc="The Ultimate Packer for eXecutables" url="https://upx.github.io/" @@ -55,5 +55,5 @@ package() { } sha512sums=" -b9ebda5d3372132bb861e0dd035829b16e4c06900f68af182895f17975493707d78cbabc63060e581de1ce149bb5129d883f6e6abcde0413c0bf474db919f5fd upx-4.2.3-src.tar.xz +fc833dea010cb65a9a7b6fbf80021c98d8c112b55fa54101f3d39f09d049d75d89024206a28262996c08f253130917811736f7f546fa8743703bc86a2dbd33a5 upx-4.2.4-src.tar.xz " diff --git a/community/urfkill/APKBUILD b/community/urfkill/APKBUILD index c3552385003..384e9b56c8b 100644 --- a/community/urfkill/APKBUILD +++ b/community/urfkill/APKBUILD @@ -28,6 +28,8 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-openrc" source="https://github.com/lcp/urfkill/archive/$_commit/urfkill-$_commit.tar.gz urfkill.initd urfkill.confd + + fix-autoconf.patch " builddir="$srcdir/urfkill-$_commit" options="!check" # Fails with translations check @@ -60,4 +62,5 @@ sha512sums=" f45104a4016a32af4616a03c7395ce65667b797f953ea18573d8f859099000e611fd9c734da7c82cd8b8782220a398d81659300984c6ad1ef091a0c30c5094bd urfkill-333a29d5d7b09c4ae296ec37d9c6aaaf1b8f539b.tar.gz 7126aaa8d4d47e6cd0b5bceacc0508db7a4b70a1ce50aa2ffe7eb0043923d08b959f05a2246389f66270c91c2c43efc1c7349e8a01897a239af89af1065fe1ee urfkill.initd b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706 urfkill.confd +f2f5988d614ab37466b907fa919fd7883c95999c5ca531dcc2b707914e8fb63360cec139bf2194cc0fb8563163490afea1f63b8b5e1438f85cfa2cc890cf12e4 fix-autoconf.patch " diff --git a/community/urfkill/fix-autoconf.patch b/community/urfkill/fix-autoconf.patch new file mode 100644 index 00000000000..af5ecf42c9e --- /dev/null +++ b/community/urfkill/fix-autoconf.patch @@ -0,0 +1,13 @@ +The single-quoted comma causes autoconf to generate an invalid configure script + +--- a/configure.ac ++++ b/configure.ac +@@ -184,7 +184,7 @@ + AS_IF([test "$with_session_tracking" = "none"], with_session_tracking=no) + # check value + AS_IF([! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$")], +- AC_MSG_ERROR([--with-session-tracking must be systemd/consolekit/no, not $with_session_tracking])) ++ AC_MSG_ERROR([[--with-session-tracking must be systemd/consolekit/no, not $with_session_tracking]])) + # add conditionals and subtitution + AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = "consolekit") + AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "$with_session_tracking" = "systemd") diff --git a/community/uriparser/APKBUILD b/community/uriparser/APKBUILD index 1f565bd1c9e..b5bab0537e0 100644 --- a/community/uriparser/APKBUILD +++ b/community/uriparser/APKBUILD @@ -3,8 +3,8 @@ # Contributor: fossdd <fossdd@pwned.life> # Maintainer: fossdd <fossdd@pwned.life> pkgname=uriparser -pkgver=0.9.7 -pkgrel=1 +pkgver=0.9.8 +pkgrel=0 pkgdesc="strictly RFC 3986 compliant URI parsing and handling library" url="https://uriparser.github.io/" arch="all" @@ -14,6 +14,9 @@ subpackages="$pkgname-dev lib$pkgname:libs" source="https://github.com/uriparser/uriparser/releases/download/uriparser-$pkgver/uriparser-$pkgver.tar.bz2" # secfixes: +# 0.9.8-r0: +# - CVE-2024-34402 +# - CVE-2024-34403 # 0.9.6-r0: # - CVE-2021-46141 # - CVE-2021-46142 @@ -44,5 +47,5 @@ package() { } sha512sums=" -7f69c9806665745c1bafe11f818434e27c2da03af387f009ef46c1427af8c008faa45e6f49bece66e0b96fd17b3924ba0af25476e796972c5e4b651f35f74c13 uriparser-0.9.7.tar.bz2 +41377e27f92345442cafa4e443485808c286430fcb5ce2354a683344e744786a170f443425f304bdb5a152edf96a3412f203eabe4fb3345a369e6d69f3d97e40 uriparser-0.9.8.tar.bz2 " diff --git a/community/uutils-coreutils/APKBUILD b/community/uutils-coreutils/APKBUILD index bd25995d405..fab5a203ab0 100644 --- a/community/uutils-coreutils/APKBUILD +++ b/community/uutils-coreutils/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=uutils-coreutils _pkgname=coreutils -pkgver=0.0.25 +pkgver=0.0.26 pkgrel=0 pkgdesc="coreutils rewritten in Rust" # s390x: blocked by nix crate @@ -67,5 +67,5 @@ package() { } sha512sums=" -bdf523120aa72f41b1d3e8e3ab848f55de5ab5bef888ec0b7a5fa90680b461ea9b7012f39c399750fa35b41893d44d1bee7c31ac10b78946b1649198d0b93278 uutils-coreutils-0.0.25.tar.gz +ba3eb06b4a11ba1adbe28fd53282827a148a3dd616db06230f7d31810418fd80f024e55ecd29ff2556b307f146bd99b083bd337912a900e7190db1c32bdf5cb0 uutils-coreutils-0.0.26.tar.gz " diff --git a/community/valhalla/APKBUILD b/community/valhalla/APKBUILD index 45b60cf48a2..4ac3dfcbff5 100644 --- a/community/valhalla/APKBUILD +++ b/community/valhalla/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=valhalla pkgver=3.1.4 -pkgrel=16 +pkgrel=17 pkgdesc="Open Source Routing Engine for OpenStreetMap" url="https://valhalla.readthedocs.io/" # s390x blocked by prime_server -# ppc64le, riscv64 blocked by luajit -arch="all !ppc64le !s390x !riscv64" +# ppc64le, riscv64, loongarch64 blocked by luajit +arch="all !ppc64le !s390x !riscv64 !loongarch64" license="MIT" depends_dev=" boost-dev diff --git a/community/vectorscan/APKBUILD b/community/vectorscan/APKBUILD index d5155ae1979..6809348f113 100644 --- a/community/vectorscan/APKBUILD +++ b/community/vectorscan/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=vectorscan pkgver=5.4.11 -pkgrel=0 +pkgrel=1 pkgdesc="High-performance regular expression matching library" url="https://www.hyperscan.io" # requires SSSE3, Neon, or VSX diff --git a/community/victoria-metrics/APKBUILD b/community/victoria-metrics/APKBUILD index a37fb4b7678..9b6934b0d11 100644 --- a/community/victoria-metrics/APKBUILD +++ b/community/victoria-metrics/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Konstantin Kulikov <k.kulikov2@gmail.com> # Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com> pkgname=victoria-metrics -pkgver=1.100.1 +pkgver=1.101.0 pkgrel=0 provides="victoriametrics=$pkgver-r$pkgrel" pkgdesc="Fast, cost-effective and scalable time series database" @@ -74,7 +74,7 @@ _backup_tools() { } sha512sums=" -f1a41a274a0b02f229dba6149df94a1d9909c0733508b13f749008de2157f8e6253529b097a8a84deba270393fbc585bae152027c3b6c24bfb28f4db37ad0fdc victoria-metrics-1.100.1.tar.gz +dc730bc16e8a46affa004c3de6151771d7449011febe88d65514251ee993217c53f71b806ae38009e3b6b2c274d5e61bcbd9be54c0e7589c371538c60f8ed233 victoria-metrics-1.101.0.tar.gz d727de5653e0ed9c7d7448dce6ab3766683d14e8d946935929691709c8b077572d5eb73c26749593cd7995820d370d46851be487fc03b663e495129c6a9e0244 victoria-metrics.initd 85bd8696eb701ad4a23063334a688a9915846558e3a57b0dbdf59c36c38cf435edcfdf66f8cb18611820b944ab529dedc0817b1f565050eeea2aec25ebda52ce victoria-metrics.confd " diff --git a/community/vigra/APKBUILD b/community/vigra/APKBUILD index bc6e4aabaad..4711f5cafa6 100644 --- a/community/vigra/APKBUILD +++ b/community/vigra/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: pkgname=vigra pkgver=1.11.1 -pkgrel=10 +pkgrel=11 pkgdesc="An image processing and analysis library" url="http://ukoethe.github.io/vigra/" arch="all" license="MIT" depends_dev="tiff-dev libjpeg-turbo-dev libpng-dev boost-dev" -makedepends="$depends_dev cmake doxygen samurai" +makedepends="$depends_dev cmake doxygen py3-setuptools samurai" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-$pkgver-src.tar.gz" diff --git a/testing/vimiv-qt/APKBUILD b/community/vimiv-qt/APKBUILD index df52e05491b..df52e05491b 100644 --- a/testing/vimiv-qt/APKBUILD +++ b/community/vimiv-qt/APKBUILD diff --git a/testing/vimiv/APKBUILD b/community/vimiv/APKBUILD index fb20706776d..fb20706776d 100644 --- a/testing/vimiv/APKBUILD +++ b/community/vimiv/APKBUILD diff --git a/community/vips/APKBUILD b/community/vips/APKBUILD index fb8b6c5fb23..2a56b49a24f 100644 --- a/community/vips/APKBUILD +++ b/community/vips/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Will Jordan <will.jordan@gmail.com> pkgname=vips pkgver=8.15.2 -pkgrel=0 +pkgrel=1 pkgdesc="fast image processing library with low memory needs" url="https://libvips.github.io/libvips/" arch="all" @@ -45,7 +45,7 @@ subpackages=" $pkgname-tools $pkgname-cpp " -source="https://github.com/libvips/libvips/releases/download/v${pkgver}a/vips-$pkgver.tar.xz" +source="https://github.com/libvips/libvips/releases/download/v$pkgver/vips-$pkgver.tar.xz" case "$CARCH" in s390x) diff --git a/community/virglrenderer/APKBUILD b/community/virglrenderer/APKBUILD index e4e4f1a9d55..d3f26c195dc 100644 --- a/community/virglrenderer/APKBUILD +++ b/community/virglrenderer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fernando Casas Schossow <casasfernando@outlook.com> # Maintainer: Fernando Casas Schossow <casasfernando@outlook.com> pkgname=virglrenderer -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=0 pkgdesc="A virtual 3D GPU library, that allows the guest operating system to use the host GPU to accelerate 3D rendering" url="https://virgil3d.github.io/" @@ -41,5 +41,5 @@ package() { } sha512sums=" -3007e208ecd645295c145944520585bb6c2312af43191015b2de7068efdeb64c143059b6393286dd24d0c3502908af8df79c0487919a06edc1c8eb0072586b73 virglrenderer-virglrenderer-1.0.0.tar.gz +9f3b29f06c6359ac385c199fa186e004b2d32fbb50e9ad01ffd16aaf076ac6d6bf93cf5c938ad76505c80cda8b644342a9f6703e493860ee962d67f413966714 virglrenderer-virglrenderer-1.0.1.tar.gz " diff --git a/community/virt-manager/APKBUILD b/community/virt-manager/APKBUILD index 0168804cd00..39edd35168c 100644 --- a/community/virt-manager/APKBUILD +++ b/community/virt-manager/APKBUILD @@ -45,6 +45,8 @@ subpackages=" source=" https://releases.pagure.org/virt-manager/virt-manager-$pkgver.tar.gz fix-latest-libvirt-xml-output.patch + upstream_tests-Fix-host-copy-XML-with-libvirt-10.1.0.patch + test-cli-Adjust-hotplug-test-for-latest-libvirt.patch " # secfixes: @@ -57,18 +59,29 @@ build() { check() { _skipped_tests=" - not testAlterCpuMode - and not testCLI0004virt_install_many_devices - and not testCLI0020virt_install_cpu_rhel7_default - and not testCLI0388virt_xml_edit_cpu_host_copy - and not testCLI0402virt_xml_edit_simple_features - and not testCLI0454virt_xml_add_host_device + not testDASDMdev + and not testAPQNMdev + and not testPCIMdev + and not testPCIMdevNewFormat + and not testAlterCpuMode + and not testCLI0001virt_install_many_devices and not testCLI0057virt_install_osinfo_url and not testCLI0079virt_install_osinfo_url_with_disk and not testCLI0114virt_install_osinfo_url_unattended and not testCLI0115virt_install_osinfo_unattended_treeapis - " + and not testCLI0366virt_xml_add_hostdev_mdev + and not testCLI0374virt_xml_add_hostdev_mdev_start + and not testCLI0168virt_install_s390x_cdrom + and not testCLI0394virt_clone_auto_unmanaged + and not testCLI0397virt_clone + and not testCLI0398virt_clone + and not testCLI0412virt_clone + and not testCLI0413virt_clone + and not testCLI0415virt_clone + and not testCLI0416virt_clone + and not testCLI0424virt_clone + " python3 -m pytest -k "$(echo $_skipped_tests | tr -d '\n')" } @@ -104,4 +117,6 @@ pyc() { sha512sums=" 725cb5bcbaebaafae417f95deffb4243ccdad769668cba6e1235f4607e2b29dbd099d2a9a3885981158f53ea854dd71cc29ed9d7557b2791161c13d34f2ef883 virt-manager-4.1.0.tar.gz 3106c7d3d91db6c7fa3208a13869c5a84bb636a261939acd3be0a59ce7196dfa6102ec97372d762d8143cef4a1d0ef1c37f4a107c3826c23ff2ed22c6d57f914 fix-latest-libvirt-xml-output.patch +5c1f5c4ded570f15c5c408d8da68fb9f77774503724ff253c6dd87962bf909305654a63503945678c44c4b6ce9206c7628c7640bddce525abfd1288c48ce2570 upstream_tests-Fix-host-copy-XML-with-libvirt-10.1.0.patch +21febff0bb079af8e9895dda406c24bedef3b68f955e71c466d0c3fa31526a82435c32ac45a449e46345f4934fc08b1354eb48b09f263c9505d24d893d56ffc1 test-cli-Adjust-hotplug-test-for-latest-libvirt.patch " diff --git a/community/virt-manager/test-cli-Adjust-hotplug-test-for-latest-libvirt.patch b/community/virt-manager/test-cli-Adjust-hotplug-test-for-latest-libvirt.patch new file mode 100644 index 00000000000..5b793378f0f --- /dev/null +++ b/community/virt-manager/test-cli-Adjust-hotplug-test-for-latest-libvirt.patch @@ -0,0 +1,28 @@ +From 83fcc5b2e8f2cede84564387756fe8971de72188 Mon Sep 17 00:00:00 2001 +From: Cole Robinson <crobinso@redhat.com> +Date: Mon, 22 Jan 2024 17:10:41 -0500 +Subject: [PATCH] tests: cli: Adjust hotplug test for latest libvirt + +The libvirt test driver now has implementations for hotplug routines, +which broke string matching for one case. + +Loosen it up to work for old and new libvirt versions. + +Signed-off-by: Cole Robinson <crobinso@redhat.com> +--- + tests/test_cli.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_cli.py b/tests/test_cli.py +index 8274c788f..b2f707b9a 100644 +--- a/tests/test_cli.py ++++ b/tests/test_cli.py +@@ -1341,7 +1341,7 @@ def add_compare(self, cat, args, compbase, **kwargs): + c.add_invalid("test --edit", grep="No change specified.") + c.add_invalid("test --edit 2 --cpu host-passthrough", grep="'--edit 2' requested but there's only 1 --cpu object in the XML") + c.add_invalid("test-for-virtxml --edit 5 --tpm /dev/tpm", grep="'--edit 5' requested but there's only 1 --tpm object in the XML") +-c.add_invalid("test-for-virtxml --add-device --host-device 0x04b3:0x4485 --update --confirm", input_text="yes", grep="not supported by the connection driver: virDomainAttachDevice") ++c.add_invalid("test-for-virtxml --add-device --host-device 0x04b3:0x4485 --update --confirm", input_text="yes", grep="not supported") + c.add_invalid("test-for-virtxml --remove-device --host-device 1 --update --confirm", input_text="foo\nyes\n", grep="not supported by the connection driver: virDomainDetachDevice") + c.add_invalid("test-for-virtxml --edit --graphics password=foo,keymap= --update --confirm", input_text="yes", grep="not supported by the connection driver: virDomainUpdateDeviceFlags") + c.add_invalid("--build-xml --memory 10,maxmemory=20", grep="--build-xml not supported for --memory") diff --git a/community/virt-manager/upstream_tests-Fix-host-copy-XML-with-libvirt-10.1.0.patch b/community/virt-manager/upstream_tests-Fix-host-copy-XML-with-libvirt-10.1.0.patch new file mode 100644 index 00000000000..19fffce5a0a --- /dev/null +++ b/community/virt-manager/upstream_tests-Fix-host-copy-XML-with-libvirt-10.1.0.patch @@ -0,0 +1,42 @@ +From 8b6db203f726965529567459b302aab1c68c70eb Mon Sep 17 00:00:00 2001 +From: Cole Robinson <crobinso@redhat.com> +Date: Sat, 6 Apr 2024 15:48:46 -0400 +Subject: [PATCH] tests: Fix host-copy XML with libvirt 10.1.0 + +New `clusters` changes XML output + +Signed-off-by: Cole Robinson <crobinso@redhat.com> +--- + tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml | 2 +- + tests/test_cli.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml b/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml +index 6e663a84..e342cf89 100644 +--- a/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml ++++ b/tests/data/cli/compare/virt-xml-edit-cpu-host-copy.xml +@@ -5,7 +5,7 @@ + - <cpu mode="custom" match="exact"> + - <model fallback="allow">core2duo</model> + - <vendor>Intel</vendor> +-- <topology sockets="9" dies="1" cores="1" threads="1"/> ++- <topology sockets="9" dies="1" clusters="1" cores="1" threads="1"/> + - <feature policy="require" name="pbe"/> + - <feature policy="require" name="tm2"/> + - <feature policy="require" name="est"/> +diff --git a/tests/test_cli.py b/tests/test_cli.py +index 922de6d6..d9280690 100644 +--- a/tests/test_cli.py ++++ b/tests/test_cli.py +@@ -1372,7 +1372,7 @@ c.add_compare("--confirm 1 --edit --cpu host-passthrough", "prompt-response", in + c.add_compare("--edit --print-diff --qemu-commandline clearxml=yes", "edit-clearxml-qemu-commandline", input_file=(_VIRTXMLDIR + "virtxml-qemu-commandline-clear.xml")) + c.add_compare("--print-diff --remove-device --serial 1", "remove-console-dup", input_file=(_VIRTXMLDIR + "virtxml-console-dup.xml")) + c.add_compare("--print-diff --define --connect %(URI-KVM-X86)s test --edit --boot uefi", "edit-boot-uefi") +-c.add_compare("--print-diff --define --connect %(URI-KVM-X86)s test-many-devices --edit --cpu host-copy", "edit-cpu-host-copy") ++c.add_compare("--print-diff --define --connect %(URI-KVM-X86)s test-many-devices --edit --cpu host-copy", "edit-cpu-host-copy", precompare_check="10.1.0") + c.add_compare("--connect %(URI-KVM-X86)s test-many-devices --build-xml --disk source.pool=pool-disk,source.volume=sdfg1", "build-pool-logical-disk") + c.add_compare("test --add-device --network default --update --confirm", "update-succeed", env={"VIRTXML_TESTSUITE_UPDATE_IGNORE_FAIL": "1", "VIRTINST_TEST_SUITE_INCREMENT_MACADDR": "1"}, input_text="yes\nyes\n") # test hotplug success + c.add_compare("test --add-device --network default --update --confirm --no-define", "update-nodefine-succeed", env={"VIRTXML_TESTSUITE_UPDATE_IGNORE_FAIL": "1"}, input_text="yes\n") # test hotplug success without define +-- +2.43.0 + diff --git a/community/virtio_vmmci-lts/APKBUILD b/community/virtio_vmmci-lts/APKBUILD index f811aadd8e6..416d5caccb7 100644 --- a/community/virtio_vmmci-lts/APKBUILD +++ b/community/virtio_vmmci-lts/APKBUILD @@ -10,7 +10,7 @@ _rel=0 # when changing _kver make sure _krel=0 & _rel=0 _flavor=${FLAVOR:-lts} _kpkg="linux-$_flavor" -_kver=6.6.27 +_kver=6.6.30 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/community/vis/APKBUILD b/community/vis/APKBUILD index 63024c16114..30eb93be395 100644 --- a/community/vis/APKBUILD +++ b/community/vis/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=vis -pkgver=0.8 +pkgver=0.9 _testver=0.5 pkgrel=0 pkgdesc="Modern, legacy free, simple yet efficient vim-like editor" @@ -35,6 +35,6 @@ package() { } sha512sums=" -ab4eda075034955411bdbc0ade2fe9149a48c644fa2f70add8d3b9d749f86b98a4e429745b5cae7fdbc0a1e07c8587539a055cd1c6734bb59e43c580c949e0aa vis-0.8.tar.gz -c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1 vis-test-0.8.tar.gz +64025569f6feb1a3b5aa8aaa79af319cdf8fc1fd5d1f5b29a6838ff00ea950cade1efb366d0a95d77e516f5605048bcb557fd7aa52b3a9510a15e69acaee147c vis-0.9.tar.gz +c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1 vis-test-0.9.tar.gz " diff --git a/community/vmm_clock-lts/APKBUILD b/community/vmm_clock-lts/APKBUILD index f7c5c990f7f..2ed881127a8 100644 --- a/community/vmm_clock-lts/APKBUILD +++ b/community/vmm_clock-lts/APKBUILD @@ -10,7 +10,7 @@ _rel=0 # when changing _kver make sure _krel=0 & _rel=0 _flavor=${FLAVOR:-lts} _kpkg="linux-$_flavor" -_kver=6.6.27 +_kver=6.6.30 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/community/vosk-api/APKBUILD b/community/vosk-api/APKBUILD index f70b2975f1b..1819ead254a 100644 --- a/community/vosk-api/APKBUILD +++ b/community/vosk-api/APKBUILD @@ -1,9 +1,9 @@ # Contributor: John Gebbie <me@johngebbie.com> # Maintainer: John Gebbie <me@johngebbie.com> pkgname=vosk-api -pkgver=0.3.45 -pkgrel=7 -_kaldi=93ef0019b847272a239fbb485ef97f29feb1d587 +pkgver=0.3.50 +pkgrel=1 +_kaldi=2b69aed630e26fb2c700bba8c45f3bd012371c5c pkgdesc="Offline speech recognition toolkit" url="https://alphacephei.com/vosk" arch="x86_64 aarch64 armv7" @@ -102,8 +102,8 @@ _py3() { } sha512sums=" -cf55ddb4abf078c1a16a5ae149d3ac141da9fd88ccd9bed018df5f5c0fd489517ffe0a1dc9b20b4f5b07738cfac771f9c08637c9e92e8d494727124b76772eb1 vosk-api-0.3.45.tar.gz -8ee5c146befcf9ba7f9e0bc5daf373cb9470a783d6fa9f8aa3d0f49b37a3d6e5ca5817bed0ae2b0e00db32002568fd601f2597cc7ae19e8e6cdc963c8ac9dde3 kaldi-93ef0019b847272a239fbb485ef97f29feb1d587.tar.gz +cc627fefd87336a7507444ffa201d1ef0b325fdc79659e6dc0f616671d82226977d567decda414b4a1b17986a9755e400c135d9637069dc96a067240a69484fa vosk-api-0.3.50.tar.gz +e70f06e03445cd07aa4c20f7e1af1e9e922a708e24b68e35f1cd68249bf2ed0b4c91260b253ec3cb1665835db4bb18bdf8edf2dc94ad78401a115b61771c9448 kaldi-2b69aed630e26fb2c700bba8c45f3bd012371c5c.tar.gz 2abc35c26790aa8e512330a76c258444801f5389c6b5dda15ce185cd901eaac1626fe6d27c6b5698a1376c3a91f498f870f3b1f7a14dea6b5f3c94225b2cb191 kaldi-no-armv7-neon.patch.noauto 64aa075252aabed4f5f1664e86afda53105148de649b9d7bef690673d3d17cbebfee94f1b8d289104f45fa6cb2d7d9c8c3f6f44f28878e00efed5d2520210240 kaldi-to-openblas-0.3.21.patch.noauto c932ff420094fd9f5a2f66e90da0a9d5b8513e39bb990d4b68faad609bf0c8e223fd933b4536afffd5d28eea233b1aa1918df53ad5ec761289e29f35412c848f kaldi-to-openfst-1.8.2.patch.noauto diff --git a/community/vte3/APKBUILD b/community/vte3/APKBUILD index 61038c5bd7a..4bfe719a575 100644 --- a/community/vte3/APKBUILD +++ b/community/vte3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vte3 -pkgver=0.76.0 +pkgver=0.76.1 pkgrel=0 pkgdesc="Virtual Terminal Emulator library" url="https://gitlab.gnome.org/GNOME/vte" @@ -57,6 +57,6 @@ gtk4() { } sha512sums=" -2745aa716f7d0da292a67fcb06167cd3c729f79493030cf930dcc02f15de32cce230c401553280fbb566b6d501f253ca2466a93f887420844dc677e6162918d6 vte-0.76.0.tar.gz +9c5d6e994428803e64200aa0db6fa50e670436d9e6e7310f2430e98deefe4aebfb7c8a13f46dc5f44fcff7dc706f94d51adff54d4cba95876e4cd2bb3e2513ac vte-0.76.1.tar.gz b6c1856bf075c2e3e91a0d4aff700c59e738bd6abe4122a11d680f104a2dab9d99f7d836a3ef3020b25ceff0a37231a6561eb917f0e4b9f90837eb634d8f7f20 fix-W_EXITCODE.patch " diff --git a/community/vtk/APKBUILD b/community/vtk/APKBUILD index b13764e1636..f805d68b103 100644 --- a/community/vtk/APKBUILD +++ b/community/vtk/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=vtk -pkgver=9.2.6 -pkgrel=4 +pkgver=9.3.0 +pkgrel=3 pkgdesc="A software system for 3D computer graphics, image processing and visualization" url="https://vtk.org/" # s390x blocked by netcdf @@ -46,12 +46,17 @@ source=" https://www.vtk.org/files/release/${pkgver%.*}/VTKData-$pkgver.tar.gz https://www.vtk.org/files/release/${pkgver%.*}/VTKLargeData-$pkgver.tar.gz disable-tests.patch - include-cstdint.patch lfs64.patch unistd.patch " builddir="$srcdir/VTK-$pkgver" +case "$CARCH" in +# Tests on RISC-V should be re-enabled when llvmpipe has proper RISC-V support. +# cf. https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26018 +riscv64) options="$options !check" ;; +esac + build() { CXXFLAGS="$CXXFLAGS -DLOGURU_STACKTRACES=0" \ cmake -B build -G Ninja \ @@ -84,11 +89,10 @@ package() { } sha512sums=" -f2328caae959d583299b7fd57205f3dd76f87c8c1ee78653e85d44cab085295bf7bf88b3f6a2b960a57df96ccb32049337ebccb067ecde6d84d25eda636196bc VTK-9.2.6.tar.gz -5c5f2b365777733180a63daff224da7055e1c2911eb5e4efda26e38b9ac01cb8e886cf7e71c45ac83347642caf1786e72bb469c22954ffbbb6e2c317fc6b4080 VTKData-9.2.6.tar.gz -f0b71baa4e346746e186c6a0cc93588d227b91cd4993ee6afe15708006250b0b3aa9447822845e01432728c12af56c68a213831b6dc809807ca341ff6912f55f VTKLargeData-9.2.6.tar.gz -53dc8a9f9680bd124399161f6703aa2a4e1ce3460b237de1858e2abff128628769a08484f927a4d0aa87c26abd279025391c6206751a68d4ba8dc7b0ef96e1d1 disable-tests.patch -7f05d7815f5c99e00af1fe891fd9251e353271cc53fc72a8463a06da23e2614cb80e331aac566608868d01ada74672f25217c7bfe6d645218256a0ed9e4b54dd include-cstdint.patch +2722dc8186779df1af5c534f26b20186ea33cb3bca2cef8cb333542b12e738382616e26e8d4d0341cb98c30403f8a896d77ddb04adb07e26d0d548c4a34b7d2f VTK-9.3.0.tar.gz +385d609c2adc1746c073690b58a3fc25e496946c03f08e6c9e0a69ee406cee447e66d267986c3e5ba9006dd1cb0015b68134bb3c375ae41aef8f3b1e0d923d51 VTKData-9.3.0.tar.gz +d87eb0fb4ce27ae9f4363c54bb711e66c5d2dbcdf508cb5fae9fcc1574407df2816f29d20037297b834440cd8a54fcf8e1d6db14700054f057bff2fe48404d33 VTKLargeData-9.3.0.tar.gz +87e2c4377251d4a4b173fa44d2e4305bfd865a389c50395502869eefd82624942083a5d2d8907a8b6b788b161fefe5b0ab46034c1ed00a23c0accc06b9390590 disable-tests.patch ec8d73f9fa425c4ad4caa9031e656ecb2d89db7ea31df0fa029ef45dc832b76557b4fef306d2c40ca8694b4bad8f37c0c8672face34728f1bcc764c6df039c6b lfs64.patch -0f9135c421344f789db64ad46f6acd452214de8f1d4696dea3cd1d3517d0057d277a4d01e82804ffb7db086fd7527e511baa1b24a38826aec5c44872610ca0cb unistd.patch +e814f5d8edc72d868b0209c878702b83723f46215ec1d681058c23c33ed16d6f9a917932705fb37afe8a8915c42bcb639fb2beb553ec103f0a85a08463771668 unistd.patch " diff --git a/community/vtk/disable-tests.patch b/community/vtk/disable-tests.patch index ef85a600e2c..dd34f90765c 100644 --- a/community/vtk/disable-tests.patch +++ b/community/vtk/disable-tests.patch @@ -1,6 +1,6 @@ --- ./CMake/CTestCustom.cmake.in +++ ./CMake/CTestCustom.cmake.in -@@ -214,3 +214,70 @@ +@@ -253,3 +253,86 @@ # Exclude files from the Utilities directories ".*/Utilities/.*" ".*/ThirdParty/.*") @@ -70,4 +70,20 @@ + VTK::FiltersGeneralCxx-TestContourTriangulatorHoles + VTK::IOCesium3DTilesCxx-TestCesium3DTilesWriter + VTK::FiltersGeneralCxx-TestContourTriangulatorBadData ++ VTK::InteractionWidgetsCxx-TestResliceCursorWidget2 ++ VTK::InteractionWidgetsCxx-TestResliceCursorWidget3 ++ VTK::FiltersParallelCxx-TestAngularPeriodicFilter ++ VTK::RenderingCoreCxx-TestInteractorTimers ++ VTK::CommonDataModelCxx-TestHyperTreeGridGeometricLocator ++ VTK::RenderingCoreCxx-TestCompositePolyDataMapperSpheres ++ VTK::RenderingCoreCxx-TestCompositePolyDataMapperVertices ++ VTK::CommonDataModelCxx-TestHyperTreeGridGeometricLocator ++ VTK::IOExodusCxx-TestExodusAttributes ++ VTK::IOExodusCxx-TestExodusSideSets ++ VTK::IOExodusCxx-TestMultiBlockExodusWrite ++ VTK::IOExodusCxx-TestExodusTetra15 ++ VTK::IOExodusCxx-TestExodusWedge21 ++ VTK::IOExodusCxx-Tetra15 ++ VTK::IOExodusCxx-Wedge21 ++ VTK::RenderingCoreCxx-TestInteractorTimers +) diff --git a/community/vtk/include-cstdint.patch b/community/vtk/include-cstdint.patch deleted file mode 100644 index a5e8adfeb7b..00000000000 --- a/community/vtk/include-cstdint.patch +++ /dev/null @@ -1,71 +0,0 @@ -Patch-Source: https://github.com/Kitware/VTK/commit/1233ceec.patch -Patch-Source: https://github.com/Kitware/VTK/commit/4d8283bc.patch --- -From 1233ceec268d5366c66f5e79786ec784042b591b Mon Sep 17 00:00:00 2001 -From: Laurent Rineau <laurent.rineau@cgal.org> -Date: Tue, 17 Jan 2023 16:18:53 +0100 -Subject: [PATCH] Add #include <cstdint> to compile with gcc13 - -The `vtkSEPReader` was introduced by MRs !4909 (from my former -collaborator Maxime) and !4938. Then it was highly modified by -!7516. The later MR is the one that introduced the uses of -`std::uint8_t` and `std::uint32_t`. - -Those types needs the inclusion of `<cstdint>`. ---- - IO/Image/vtkSEPReader.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/IO/Image/vtkSEPReader.h b/IO/Image/vtkSEPReader.h -index a7d8aad1510..37d0c44d18c 100644 ---- a/IO/Image/vtkSEPReader.h -+++ b/IO/Image/vtkSEPReader.h -@@ -25,8 +25,9 @@ - #include "vtkImageAlgorithm.h" - #include "vtkNew.h" // for ivars - --#include <array> // for std::array --#include <string> // for std::string -+#include <array> // for std::array -+#include <cstdint> // for std::uint8_t and std::uint32_t -+#include <string> // for std::string - - namespace details - { --- -From 4d8283bcb460ff60d8df1b7b67b5db19876a5ca3 Mon Sep 17 00:00:00 2001 -From: Laurent Rineau <laurent.rineau@cgal.org> -Date: Thu, 23 Feb 2023 15:34:56 +0100 -Subject: [PATCH] More #include <cstdint> to compile with gcc13 - ---- - IO/PIO/PIOData.h | 1 + - Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/IO/PIO/PIOData.h b/IO/PIO/PIOData.h -index 8eddfb5b927..2a27c6b92e3 100644 ---- a/IO/PIO/PIOData.h -+++ b/IO/PIO/PIOData.h -@@ -3,6 +3,7 @@ - - #include "vtkABINamespace.h" - -+#include <cstdint> - #include <fstream> - #include <iostream> - #include <list> -diff --git a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -index cbccd727ddf..d3e233a9394 100644 ---- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -@@ -49,7 +49,8 @@ - #include "vtkMathTextUtilities.h" - #include "vtkRenderingMatplotlibModule.h" // For export macro - --#include <vector> // for std::vector -+#include <cstdint> // for std::uint64_t -+#include <vector> // for std::vector - - struct _object; - typedef struct _object PyObject; diff --git a/community/vtk/unistd.patch b/community/vtk/unistd.patch index 0c41684e36a..11ec125b31d 100644 --- a/community/vtk/unistd.patch +++ b/community/vtk/unistd.patch @@ -6,6 +6,6 @@ #else -#include <sys/unistd.h> +#include <unistd.h> - #endif - - #ifdef SEACAS_HAVE_MPI + #if defined(__APPLE__) && defined(__MACH__) + #include <sys/param.h> + #include <sys/mount.h> diff --git a/community/vvave/APKBUILD b/community/vvave/APKBUILD index 339e709e2d3..85022e335cf 100644 --- a/community/vvave/APKBUILD +++ b/community/vvave/APKBUILD @@ -8,8 +8,8 @@ pkgver=3.0.2 pkgrel=0 pkgdesc="VVAVE Music Player" # armhf blocked by qt5-qtdeclarative -# s390x, ppc64le and riscv64 blocked by qt5-qtwebview -arch="all !armhf !s390x !ppc64le !riscv64" +# s390x, ppc64le, riscv64 and loongarch64 blocked by qt5-qtwebview +arch="all !armhf !s390x !ppc64le !riscv64 !loongarch64" url="https://invent.kde.org/maui/vvave" license="GPL-3.0-or-later" depends=" diff --git a/community/vvmplayer/APKBUILD b/community/vvmplayer/APKBUILD index 10550d68238..8c3e4b52e31 100644 --- a/community/vvmplayer/APKBUILD +++ b/community/vvmplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=vvmplayer -pkgver=2.5 +pkgver=2.6 pkgrel=0 pkgdesc="front end GUI to display, play, and delete visual voicemails" url="https://gitlab.com/kop316/vvmplayer" @@ -37,5 +37,5 @@ package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output } sha512sums=" -92225a7a210f6bdcd6151a0a0c30d7215920a590e788621e54c60c7d08e679e7a2376abac54e5aa98ac5a37ea7a3490f6712f32f3749980df82739164c016dfc vvmplayer-2.5.tar.gz +c48a763bfc5290c1ee69f6826be8efaf22191af71e8813fde4dd8f0e1b6de83bfd573a51322eaa953a77ac1ce46dc545301370ca46f5108fc42dc4ed16515b04 vvmplayer-2.6.tar.gz " diff --git a/community/wacomtablet/APKBUILD b/community/wacomtablet/APKBUILD index 29da6c701b5..3b2c3b75ac5 100644 --- a/community/wacomtablet/APKBUILD +++ b/community/wacomtablet/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=wacomtablet -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="GUI for Wacom Linux drivers that supports different button/pen layout profiles" # armhf blocked by qt6-qtdeclarative @@ -54,5 +54,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -d8b757eb675c06320df68a018e99523119d7d471924a3c80d77e7da88dfd1e5800aca0382bd66e21d0b37d454ee5eb0893d88929cf05a959d6ac5b7817d43e80 wacomtablet-6.0.3.tar.xz +7e12a8b27b1c52f19b4847558ccdce86709eca06982798d9ada7a27cf954fa4f9c5b2c3e2f6d8593045c218a5256c3a87078823fd8d0901e2382172de21a4095 wacomtablet-6.0.4.tar.xz " diff --git a/community/waf/APKBUILD b/community/waf/APKBUILD index 6f57eb8cc80..bb5451bc431 100644 --- a/community/waf/APKBUILD +++ b/community/waf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Adam Saponara <as@php.net> # Maintainer: pkgname=waf -pkgver=2.0.27 +pkgver=2.1.0 pkgrel=0 pkgdesc="The meta build system" url="https://waf.io/" @@ -16,5 +16,5 @@ package() { } sha512sums=" -22c21dfcbf5ed25c25040ab04f62326f271b2b18ff96ca7598dadf68230d21d70cef1c9d7ef56721edbd9c737a56576fd4a9ffac1b00cb93d5c013b8f3a9d97e waf-2.0.27 +c4947e7fc880c346c136a2badd64787fe49d73fe7cfc9a1d2e1dd54a02d6c6ea44d59996caac8c4fe02cee9e7cccba42ce9891dac0334a1d52be85d3794679b3 waf-2.1.0 " diff --git a/community/warp/APKBUILD b/community/warp/APKBUILD index 9a536263715..f478a0d6e80 100644 --- a/community/warp/APKBUILD +++ b/community/warp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: knuxify <knuxify@gmail.com> # Maintainer: knuxify <knuxify@gmail.com> pkgname=warp -pkgver=0.6.2 +pkgver=0.7.0 pkgrel=0 pkgdesc="Fast and secure file transfer" url="https://apps.gnome.org/en/app/app.drey.Warp/" @@ -39,5 +39,5 @@ package() { } sha512sums=" -f181e0f2d612f28ce81f2784179b69531d86c3c846b4c16278603e3167f62d8182fd7e11524686f8f2de84ab0ac604a8e3cb0455ed5d88685d2850b772754db2 warp-v0.6.2.tar.gz +d386e8cfe88229997929f18e3b2c765bf14823741c70568a84d7c199f73690c82f0f9188be05305f3f667f1675a26125a0aacf3c2d3773efb297757c043ca6f0 warp-v0.7.0.tar.gz " diff --git a/community/watchexec/APKBUILD b/community/watchexec/APKBUILD index 47e19081237..29fd3c22aba 100644 --- a/community/watchexec/APKBUILD +++ b/community/watchexec/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Chloe Kudryavtsev <code@toast.bunkerlabs.net> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=watchexec -pkgver=1.25.1 +pkgver=2.1.1 pkgrel=0 pkgdesc="Executes commands in response to file modifications" url="https://github.com/watchexec/watchexec" @@ -49,6 +49,6 @@ package() { } sha512sums=" -f214487e3e27dee88828fcd149df9884be585b7937e678941e081a539b7e99d0d3f72ef542a5da4b24c82d0de21329b4abe29e69f2cfb57e4c2ad81dfb44b772 watchexec-1.25.1.tar.gz -d94b3efcf2ae121511bca157b90ba061e3d7797931725bba48f07f4443017b1b53a681805b29e0566f729100bfe82d28354524822470b1c5529d1c0acf737783 system-dbus.patch +7d84398c53140b45466bb95e8e32dc352535de5da9f0037d1b242b70142b8185775cb38687f9ca29c749c075ed3c22b6e77fd0b1f84973103b40347aa7669c13 watchexec-2.1.1.tar.gz +9827cde53207fc20ab7a6e971e952e9c3c9cab7b2d1714ca3816a4468e9dd3bba4281a4fbaa3d46cc8e53db52d21226072c615750e72f590cf76e69863e14266 system-dbus.patch " diff --git a/community/watchexec/system-dbus.patch b/community/watchexec/system-dbus.patch index 74f5be94e13..d5bacdbf640 100644 --- a/community/watchexec/system-dbus.patch +++ b/community/watchexec/system-dbus.patch @@ -1,91 +1,71 @@ --- a/Cargo.lock +++ b/Cargo.lock -@@ -121,140 +121,15 @@ - ] +@@ -143,123 +143,15 @@ + checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] -name = "async-broadcast" --version = "0.5.1" +-version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +-checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" -dependencies = [ -- "event-listener 2.5.3", +- "event-listener 5.3.0", +- "event-listener-strategy 0.5.1", - "futures-core", +- "pin-project-lite", -] - -[[package]] -name = "async-channel" --version = "2.1.1" +-version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +-checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" -dependencies = [ - "concurrent-queue", -- "event-listener 4.0.2", -- "event-listener-strategy", +- "event-listener 5.3.0", +- "event-listener-strategy 0.5.1", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" --version = "1.8.0" +-version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +-checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" -dependencies = [ -- "async-lock 3.2.0", - "async-task", - "concurrent-queue", -- "fastrand 2.0.1", -- "futures-lite 2.1.0", +- "fastrand", +- "futures-lite", - "slab", -] - -[[package]] -name = "async-fs" --version = "1.6.0" +-version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +-checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" -dependencies = [ -- "async-lock 2.8.0", -- "autocfg", +- "async-lock 3.3.0", - "blocking", -- "futures-lite 1.13.0", +- "futures-lite", -] - -[[package]] -name = "async-io" --version = "1.13.0" +-version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +-checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" -dependencies = [ -- "async-lock 2.8.0", -- "autocfg", -- "cfg-if", -- "concurrent-queue", -- "futures-lite 1.13.0", -- "log", -- "parking", -- "polling 2.8.0", -- "rustix 0.37.27", -- "slab", -- "socket2 0.4.10", -- "waker-fn", --] -- --[[package]] --name = "async-io" --version = "2.2.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" --dependencies = [ -- "async-lock 3.2.0", +- "async-lock 3.3.0", - "cfg-if", - "concurrent-queue", - "futures-io", -- "futures-lite 2.1.0", +- "futures-lite", - "parking", -- "polling 3.3.1", -- "rustix 0.38.28", +- "polling", +- "rustix", - "slab", - "tracing", - "windows-sys 0.52.0", @@ -102,12 +82,12 @@ - -[[package]] -name = "async-lock" --version = "3.2.0" +-version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ -- "event-listener 4.0.2", -- "event-listener-strategy", +- "event-listener 4.0.3", +- "event-listener-strategy 0.4.0", - "pin-project-lite", -] - @@ -117,32 +97,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acde96f444d31031f760c5c43dc786b97d3e1cb2ee49dd06898383fe9a999758" dependencies = [ -- "event-listener 4.0.2", +- "event-listener 4.0.3", + "event-listener", ] [[package]] -name = "async-process" --version = "1.8.1" +-version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +-checksum = "cad07b3443bfa10dcddf86a452ec48949e8e7fedf7392d82de3969fda99e90ed" -dependencies = [ -- "async-io 1.13.0", -- "async-lock 2.8.0", +- "async-channel", +- "async-io", +- "async-lock 3.3.0", - "async-signal", +- "async-task", - "blocking", - "cfg-if", -- "event-listener 3.1.0", -- "futures-lite 1.13.0", -- "rustix 0.38.28", -- "windows-sys 0.48.0", +- "event-listener 5.3.0", +- "futures-lite", +- "rustix", +- "tracing", +- "windows-sys 0.52.0", -] - -[[package]] name = "async-recursion" - version = "1.0.5" + version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -266,24 +141,6 @@ +@@ -271,24 +163,6 @@ ] [[package]] @@ -151,13 +134,13 @@ -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" -dependencies = [ -- "async-io 2.2.2", +- "async-io", - "async-lock 2.8.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", -- "rustix 0.38.28", +- "rustix", - "signal-hook-registry", - "slab", - "windows-sys 0.48.0", @@ -167,7 +150,7 @@ name = "async-stream" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -306,12 +163,6 @@ +@@ -311,12 +185,6 @@ ] [[package]] @@ -178,9 +161,9 @@ - -[[package]] name = "async-trait" - version = "0.1.77" + version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -329,12 +180,6 @@ +@@ -334,12 +202,6 @@ checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3" [[package]] @@ -191,9 +174,9 @@ - -[[package]] name = "autocfg" - version = "1.1.0" + version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -434,31 +279,6 @@ +@@ -462,31 +324,6 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] @@ -212,64 +195,37 @@ -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" -dependencies = [ - "async-channel", -- "async-lock 3.2.0", +- "async-lock 3.3.0", - "async-task", -- "fastrand 2.0.1", +- "fastrand", - "futures-io", -- "futures-lite 2.1.0", +- "futures-lite", - "piper", - "tracing", -] - -[[package]] name = "bosion" - version = "1.0.2" + version = "1.0.3" dependencies = [ -@@ -519,7 +339,7 @@ - "c-scape", - "errno", - "libc", -- "rustix 0.38.28", -+ "rustix", - "tz-rs", - ] - -@@ -533,7 +353,7 @@ - "errno", - "libc", - "libm", -- "memoffset 0.9.0", -+ "memoffset", - "num-complex", - "origin", - "posix-regex", -@@ -542,7 +362,7 @@ - "rand_core", - "rand_pcg", - "realpath-ext", -- "rustix 0.38.28", -+ "rustix", - "rustix-dlmalloc", - "rustix-futex-sync", - "rustix-openpty", -@@ -750,15 +570,6 @@ +@@ -775,15 +612,6 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] -name = "cpufeatures" --version = "0.2.11" +-version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] name = "crc32fast" - version = "1.3.2" + version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -809,16 +620,6 @@ - ] +@@ -827,16 +655,6 @@ + checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] -name = "crypto-common" @@ -285,8 +241,8 @@ name = "cstr_core" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -835,36 +636,26 @@ - checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" +@@ -866,36 +684,26 @@ + ] [[package]] -name = "deranged" @@ -332,14 +288,26 @@ name = "dirs" version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -958,27 +749,6 @@ +@@ -990,39 +798,12 @@ + ] + + [[package]] +-name = "endi" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" +- +-[[package]] + name = "endian-type" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" [[package]] -name = "enumflags2" --version = "0.7.8" +-version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +-checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" -dependencies = [ - "enumflags2_derive", - "serde", @@ -347,20 +315,20 @@ - -[[package]] -name = "enumflags2_derive" --version = "0.7.8" +-version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +-checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" -dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.47", +- "syn 2.0.60", -] - -[[package]] name = "env_logger" - version = "0.10.1" + version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1005,23 +775,6 @@ +@@ -1049,12 +830,6 @@ [[package]] name = "event-listener" @@ -370,9 +338,17 @@ - -[[package]] -name = "event-listener" --version = "3.1.0" + version = "4.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +@@ -1065,37 +840,6 @@ + ] + + [[package]] +-name = "event-listener" +-version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +-checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" -dependencies = [ - "concurrent-queue", - "parking", @@ -380,68 +356,39 @@ -] - -[[package]] --name = "event-listener" - version = "4.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "218a870470cce1469024e9fb66b901aa983929d81304a1cdb299f28118e550d5" -@@ -1032,16 +785,6 @@ - ] - - [[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ -- "event-listener 4.0.2", +- "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] - name = "eyra" - version = "0.16.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1061,15 +804,6 @@ - - [[package]] - name = "fastrand" --version = "1.9.0" +-name = "event-listener-strategy" +-version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +-checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" -dependencies = [ -- "instant", +- "event-listener 5.3.0", +- "pin-project-lite", -] - -[[package]] --name = "fastrand" - version = "2.0.1" + name = "eyra" + version = "0.16.10" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" -@@ -1178,34 +912,6 @@ +@@ -1220,19 +964,6 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] -name = "futures-lite" --version = "1.13.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" --dependencies = [ -- "fastrand 1.9.0", -- "futures-core", -- "futures-io", -- "memchr", -- "parking", -- "pin-project-lite", -- "waker-fn", --] -- --[[package]] --name = "futures-lite" --version = "2.1.0" +-version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ -- "fastrand 2.0.1", +- "fastrand", - "futures-core", - "futures-io", - "parking", @@ -452,7 +399,7 @@ name = "futures-macro" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1247,16 +953,6 @@ +@@ -1274,16 +1005,6 @@ ] [[package]] @@ -467,76 +414,59 @@ - -[[package]] name = "getrandom" - version = "0.2.11" + version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1720,7 +1416,7 @@ - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "de6225e2de30b6e9bca2d9f1cc4731640fcef0fb3cabddceee366e7e85d3e94f" - dependencies = [ -- "fastrand 2.0.1", -+ "fastrand", +@@ -1351,7 +1072,7 @@ + "gix-utils", + "itoa", + "thiserror", +- "winnow 0.6.6", ++ "winnow", ] [[package]] -@@ -1803,12 +1499,6 @@ - checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +@@ -1395,7 +1116,7 @@ + "smallvec", + "thiserror", + "unicode-bom", +- "winnow 0.6.6", ++ "winnow", + ] [[package]] --name = "hex" --version = "0.4.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -- --[[package]] - name = "home" - version = "0.5.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1874,7 +1564,7 @@ - "httpdate", +@@ -1551,7 +1272,7 @@ "itoa", - "pin-project-lite", -- "socket2 0.5.5", -+ "socket2", - "tokio", - "tower-service", - "tracing", -@@ -2001,33 +1691,13 @@ + "smallvec", + "thiserror", +- "winnow 0.6.6", ++ "winnow", ] [[package]] --name = "instant" --version = "0.1.12" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" --dependencies = [ -- "cfg-if", --] -- --[[package]] --name = "io-lifetimes" --version = "1.0.11" +@@ -1637,7 +1358,7 @@ + "gix-validate", + "memmap2", + "thiserror", +- "winnow 0.6.6", ++ "winnow", + ] + + [[package]] +@@ -1841,12 +1562,6 @@ + checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + + [[package]] +-name = "hex" +-version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" --dependencies = [ -- "hermit-abi", -- "libc", -- "windows-sys 0.48.0", --] +-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] - name = "is-terminal" - version = "0.4.10" + name = "hifijson" + version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" - dependencies = [ - "hermit-abi", -- "rustix 0.38.28", -+ "rustix", - "windows-sys 0.52.0", - ] - -@@ -2103,6 +1773,15 @@ - checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +@@ -2189,6 +1904,15 @@ + checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] +name = "libdbus-sys" @@ -551,46 +481,17 @@ name = "libm" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -2131,12 +1810,6 @@ - - [[package]] - name = "linux-raw-sys" --version = "0.3.8" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" -- --[[package]] --name = "linux-raw-sys" - version = "0.4.12" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" -@@ -2229,15 +1902,6 @@ - - [[package]] - name = "memoffset" --version = "0.7.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" --dependencies = [ -- "autocfg", --] -- --[[package]] --name = "memoffset" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -@@ -2337,7 +2001,6 @@ - "bitflags 1.3.2", +@@ -2411,7 +2135,6 @@ "cfg-if", + "cfg_aliases", "libc", -- "memoffset 0.7.1", +- "memoffset", ] [[package]] -@@ -2399,11 +2062,10 @@ +@@ -2462,11 +2185,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226" + checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f" dependencies = [ + "dbus", "log", @@ -601,7 +502,7 @@ ] [[package]] -@@ -2505,16 +2167,6 @@ +@@ -2574,16 +2296,6 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] @@ -616,65 +517,36 @@ - -[[package]] name = "origin" - version = "0.17.0" + version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -2522,10 +2174,10 @@ - dependencies = [ - "bitflags 2.4.1", - "env_logger", -- "linux-raw-sys 0.4.12", -+ "linux-raw-sys", - "log", -- "memoffset 0.9.0", -- "rustix 0.38.28", -+ "memoffset", -+ "rustix", - "rustix-futex-sync", - "smallvec", - "unwinding", -@@ -2669,47 +2321,12 @@ +@@ -2738,32 +2450,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "piper" -version = "0.2.1" +name = "pkg-config" -+version = "0.3.28" ++version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", -- "fastrand 2.0.1", +- "fastrand", - "futures-io", -] -+checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" ++checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] -name = "polling" --version = "2.8.0" +-version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" --dependencies = [ -- "autocfg", -- "bitflags 1.3.2", -- "cfg-if", -- "concurrent-queue", -- "libc", -- "log", -- "pin-project-lite", -- "windows-sys 0.48.0", --] -- --[[package]] --name = "polling" --version = "3.3.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +-checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" -dependencies = [ - "cfg-if", - "concurrent-queue", +- "hermit-abi", - "pin-project-lite", -- "rustix 0.38.28", +- "rustix", - "tracing", - "windows-sys 0.52.0", -] @@ -683,99 +555,41 @@ name = "posix-regex" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -2740,16 +2357,6 @@ +@@ -2794,15 +2486,6 @@ ] [[package]] -name = "proc-macro-crate" --version = "1.3.1" +-version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ -- "once_cell", -- "toml_edit 0.19.15", +- "toml_edit 0.21.1", -] - -[[package]] name = "proc-macro2" - version = "1.0.75" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -2972,20 +2579,6 @@ - - [[package]] - name = "rustix" --version = "0.37.27" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" --dependencies = [ -- "bitflags 1.3.2", -- "errno", -- "io-lifetimes", -- "libc", -- "linux-raw-sys 0.3.8", -- "windows-sys 0.48.0", --] -- --[[package]] --name = "rustix" - version = "0.38.28" + version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" -@@ -2994,7 +2587,7 @@ - "errno", - "itoa", - "libc", -- "linux-raw-sys 0.4.12", -+ "linux-raw-sys", - "once_cell", - "windows-sys 0.52.0", - ] -@@ -3005,7 +2598,7 @@ - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a0fab868d3bd1ac5de1f1507e58fab624339e5bb201049e3329767974ba219ec" - dependencies = [ -- "rustix 0.38.28", -+ "rustix", - "rustix-futex-sync", - ] - -@@ -3016,7 +2609,7 @@ - checksum = "fbf5fb8d04cb2409733689b671078896d4a79ebb34cee0b9067fa4e82e072484" - dependencies = [ - "lock_api", -- "rustix 0.38.28", -+ "rustix", - ] - - [[package]] -@@ -3027,7 +2620,7 @@ - dependencies = [ - "errno", - "libc", -- "rustix 0.38.28", -+ "rustix", - ] - - [[package]] -@@ -3095,17 +2688,6 @@ +@@ -3170,17 +2853,6 @@ ] [[package]] -name = "serde_repr" --version = "0.1.18" +-version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +-checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.47", +- "syn 2.0.60", -] - -[[package]] name = "serde_spanned" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -3115,17 +2697,6 @@ +@@ -3190,17 +2862,6 @@ ] [[package]] @@ -793,24 +607,7 @@ name = "sha1_smol" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -3216,16 +2787,6 @@ - - [[package]] - name = "socket2" --version = "0.4.10" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" --dependencies = [ -- "libc", -- "winapi", --] -- --[[package]] --name = "socket2" - version = "0.5.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -@@ -3235,12 +2796,6 @@ +@@ -3300,12 +2961,6 @@ ] [[package]] @@ -821,66 +618,45 @@ - -[[package]] name = "strsim" - version = "0.10.0" + version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -3319,9 +2874,9 @@ - checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" - dependencies = [ - "cfg-if", -- "fastrand 2.0.1", -+ "fastrand", - "redox_syscall", -- "rustix 0.38.28", -+ "rustix", - "windows-sys 0.52.0", - ] - -@@ -3350,7 +2905,7 @@ - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" - dependencies = [ -- "rustix 0.38.28", -+ "rustix", - "windows-sys 0.48.0", - ] - -@@ -3467,7 +3022,7 @@ - "num_cpus", - "pin-project-lite", - "signal-hook-registry", -- "socket2 0.5.5", -+ "socket2", - "tokio-macros", - "tracing", - "windows-sys 0.48.0", -@@ -3528,7 +3083,7 @@ +@@ -3578,7 +3233,7 @@ "serde", "serde_spanned", "toml_datetime", -- "toml_edit 0.21.0", +- "toml_edit 0.22.12", + "toml_edit", ] [[package]] -@@ -3542,17 +3097,6 @@ +@@ -3592,17 +3247,6 @@ [[package]] name = "toml_edit" --version = "0.19.15" +-version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ -- "indexmap 2.1.0", +- "indexmap 2.2.6", - "toml_datetime", -- "winnow", +- "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" - version = "0.21.0" + version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" -@@ -3761,29 +3305,12 @@ + checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +@@ -3611,7 +3255,7 @@ + "serde", + "serde_spanned", + "toml_datetime", +- "winnow 0.6.6", ++ "winnow", + ] + + [[package]] +@@ -3778,29 +3422,12 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] @@ -901,88 +677,68 @@ -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ -- "memoffset 0.9.0", +- "memoffset", - "tempfile", - "winapi", -] - -[[package]] - name = "unicase" - version = "2.7.0" + name = "unicode-bidi" + version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -3901,12 +3428,6 @@ - ] +@@ -4392,15 +4019,6 @@ [[package]] --name = "waker-fn" --version = "1.1.1" + name = "winnow" +-version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +-dependencies = [ +- "memchr", +-] - -[[package]] - name = "walkdir" - version = "2.4.0" +-name = "winnow" + version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -4153,7 +3674,7 @@ - "either", - "home", - "once_cell", -- "rustix 0.38.28", -+ "rustix", - ] + checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" +@@ -4425,80 +4043,6 @@ + checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" [[package]] -@@ -4165,7 +3686,7 @@ - "either", - "home", - "once_cell", -- "rustix 0.38.28", -+ "rustix", - "windows-sys 0.48.0", - ] - -@@ -4387,118 +3908,4 @@ - dependencies = [ - "cfg-if", - "windows-sys 0.48.0", --] -- --[[package]] -name = "xdg-home" --version = "1.0.0" +-version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +-checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" -dependencies = [ -- "nix 0.26.4", +- "libc", - "winapi", -] - -[[package]] -name = "zbus" --version = "3.14.1" +-version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +-checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", -- "async-io 1.13.0", -- "async-lock 2.8.0", +- "async-io", +- "async-lock 3.3.0", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", -- "byteorder", - "derivative", - "enumflags2", -- "event-listener 2.5.3", +- "event-listener 5.3.0", - "futures-core", - "futures-sink", - "futures-util", - "hex", -- "nix 0.26.4", -- "once_cell", +- "nix 0.28.0", - "ordered-stream", - "rand", - "serde", @@ -991,7 +747,7 @@ - "static_assertions", - "tracing", - "uds_windows", -- "winapi", +- "windows-sys 0.52.0", - "xdg-home", - "zbus_macros", - "zbus_names", @@ -1000,9 +756,9 @@ - -[[package]] -name = "zbus_macros" --version = "3.14.1" +-version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +-checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" -dependencies = [ - "proc-macro-crate", - "proc-macro2", @@ -1014,9 +770,9 @@ - -[[package]] -name = "zbus_names" --version = "2.6.0" +-version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +-checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", @@ -1024,14 +780,23 @@ -] - -[[package]] + name = "zerocopy" + version = "0.7.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -4516,41 +4060,4 @@ + "proc-macro2", + "quote", + "syn 2.0.60", +-] +- +-[[package]] -name = "zvariant" --version = "3.15.0" +-version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +-checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" -dependencies = [ -- "byteorder", +- "endi", - "enumflags2", -- "libc", - "serde", - "static_assertions", - "zvariant_derive", @@ -1039,9 +804,9 @@ - -[[package]] -name = "zvariant_derive" --version = "3.15.0" +-version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +-checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" -dependencies = [ - "proc-macro-crate", - "proc-macro2", @@ -1052,9 +817,9 @@ - -[[package]] -name = "zvariant_utils" --version = "1.0.1" +-version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +-checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" -dependencies = [ - "proc-macro2", - "quote", @@ -1062,12 +827,12 @@ ] --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml -@@ -30,7 +30,7 @@ - futures = "0.3.29" - humantime = "2.1.0" - is-terminal = "0.4.4" +@@ -38,7 +38,7 @@ + jaq-parse = "1.0.2" + jaq-std = "1.2.1" + jaq-syn = "1.1.0" -notify-rust = "4.9.0" +notify-rust = { version = "4.9.0", default-features = false, features = ["d"] } + once_cell = "1.17.1" serde_json = "1.0.107" tempfile = "3.8.1" - termcolor = "1.4.0" diff --git a/community/waybar/APKBUILD b/community/waybar/APKBUILD index d2ef47bc62c..8668fef8e6a 100644 --- a/community/waybar/APKBUILD +++ b/community/waybar/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Luca Weiss <luca@z3ntu.xyz> -# Maintainer: Luca Weiss <luca@z3ntu.xyz> +# Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=waybar -pkgver=0.10.0 -pkgrel=1 +pkgver=0.10.3 +pkgrel=0 pkgdesc="Highly customizable Wayland bar for Sway and Wlroots based compositors" url="https://github.com/Alexays/Waybar/" # s390x: no wireplumber (but who uses it there anyway) @@ -32,7 +32,6 @@ makedepends=" subpackages="$pkgname-doc" source="https://github.com/Alexays/Waybar/archive/$pkgver/Waybar-$pkgver.tar.gz config-fix-clock.patch - wireplumber-0.5.patch " options="!check" # No test suite builddir="$srcdir/Waybar-$pkgver" @@ -63,7 +62,6 @@ package() { } sha512sums=" -89d5ee6fb52438aadfcad8929940b2f2c4a469f7f07331fa5dff77997e1dedb6b3b020c2c2f809687993a7da2571b9f08768e92172d08bfb3d4b66db2d20d61f Waybar-0.10.0.tar.gz +2e90007056b79bccad06902db2e8b6f25103bb7c86736cb0b7dc260795bc4a1b5db7a7b8a4bebe9169f0590585fd6b170193cf8aa5437d69bab0f78d66922084 Waybar-0.10.3.tar.gz cd6fea7e9981e13ecb911da66b4f22e949542d4085d696e01d8d4eac0986e0ab15d5c1430040b76be730437a586dbe1f5c49ac8435269e6310fb2c213b6c74a2 config-fix-clock.patch -287764a68dccacdb6bdfe4c77d6c71d291e250df009aea8d5a7f3d8abc5db5b091feb1deb846aaa9efc316fa2a8ff98a102a33630001646526e55beb5f9044ab wireplumber-0.5.patch " diff --git a/community/waybar/wireplumber-0.5.patch b/community/waybar/wireplumber-0.5.patch deleted file mode 100644 index 7cfe343790d..00000000000 --- a/community/waybar/wireplumber-0.5.patch +++ /dev/null @@ -1,539 +0,0 @@ -From 70de2fb8b2123a042ace28346d8ad1885e9acfe5 Mon Sep 17 00:00:00 2001 -From: Ryan Walklin <ryan@testtoast.com> -Date: Thu, 15 Feb 2024 09:37:36 +1300 -Subject: [PATCH 1/3] Update Wireplumber API to 0.5 - -The WP component loader API has changed to be asynchronous, so implement a (GAsyncReadyCallback)-based loader to manage them. Logging integration change was required for 0.5.0 RCs but not for the 0.5.0 release. ---- - include/modules/wireplumber.hpp | 7 ++- - meson.build | 2 +- - src/modules/wireplumber.cpp | 78 ++++++++++++++++++++++----------- - 3 files changed, 59 insertions(+), 28 deletions(-) - -diff --git a/include/modules/wireplumber.hpp b/include/modules/wireplumber.hpp -index 9bbf4d464..50121424b 100644 ---- a/include/modules/wireplumber.hpp -+++ b/include/modules/wireplumber.hpp -@@ -3,6 +3,9 @@ - #include <fmt/format.h> - #include <wp/wp.h> - -+#define WP_LOCAL_LOG_TOPIC wp_waybar -+WP_LOG_TOPIC_EXTERN (wp_waybar) -+ - #include <algorithm> - #include <array> - -@@ -17,12 +20,14 @@ class Wireplumber : public ALabel { - auto update() -> void override; - - private: -- void loadRequiredApiModules(); -+ void asyncLoadRequiredApiModules(); - void prepare(); - void activatePlugins(); - static void updateVolume(waybar::modules::Wireplumber* self, uint32_t id); - static void updateNodeName(waybar::modules::Wireplumber* self, uint32_t id); - static void onPluginActivated(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self); -+ static void onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self); -+ static void onMixerApiLoaded(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self); - static void onObjectManagerInstalled(waybar::modules::Wireplumber* self); - static void onMixerChanged(waybar::modules::Wireplumber* self, uint32_t id); - static void onDefaultNodesApiChanged(waybar::modules::Wireplumber* self); -diff --git a/meson.build b/meson.build -index e21ff262c..120976083 100644 ---- a/meson.build -+++ b/meson.build -@@ -92,7 +92,7 @@ libevdev = dependency('libevdev', required: get_option('libevdev')) - libmpdclient = dependency('libmpdclient', required: get_option('mpd')) - xkbregistry = dependency('xkbregistry') - libjack = dependency('jack', required: get_option('jack')) --libwireplumber = dependency('wireplumber-0.4', required: get_option('wireplumber')) -+libwireplumber = dependency('wireplumber-0.5', required: get_option('wireplumber')) - - libsndio = compiler.find_library('sndio', required: get_option('sndio')) - if libsndio.found() -diff --git a/src/modules/wireplumber.cpp b/src/modules/wireplumber.cpp -index 51bb708d1..021160168 100644 ---- a/src/modules/wireplumber.cpp -+++ b/src/modules/wireplumber.cpp -@@ -18,31 +18,24 @@ waybar::modules::Wireplumber::Wireplumber(const std::string& id, const Json::Val - min_step_(0.0), - node_id_(0) { - wp_init(WP_INIT_PIPEWIRE); -- wp_core_ = wp_core_new(NULL, NULL); -+ wp_core_ = wp_core_new(NULL, NULL, NULL); - apis_ = g_ptr_array_new_with_free_func(g_object_unref); - om_ = wp_object_manager_new(); - - prepare(); - -- loadRequiredApiModules(); -+ spdlog::debug("[{}]: connecting to pipewire...", name_); - -- spdlog::debug("[{}]: connecting to pipewire...", this->name_); -- -- if (!wp_core_connect(wp_core_)) { -- spdlog::error("[{}]: Could not connect to PipeWire", this->name_); -+ if (wp_core_connect(wp_core_) == 0) { -+ spdlog::error("[{}]: Could not connect to PipeWire", name_); - throw std::runtime_error("Could not connect to PipeWire\n"); - } - -- spdlog::debug("[{}]: connected!", this->name_); -+ spdlog::debug("[{}]: connected!", name_); - - g_signal_connect_swapped(om_, "installed", (GCallback)onObjectManagerInstalled, this); - -- activatePlugins(); -- -- dp.emit(); -- -- event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK); -- event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &Wireplumber::handleScroll)); -+ asyncLoadRequiredApiModules(); - } - - waybar::modules::Wireplumber::~Wireplumber() { -@@ -251,26 +244,59 @@ void waybar::modules::Wireplumber::prepare() { - "=s", "Audio/Sink", NULL); - } - --void waybar::modules::Wireplumber::loadRequiredApiModules() { -- spdlog::debug("[{}]: loading required modules", name_); -- g_autoptr(GError) error = NULL; -+void waybar::modules::Wireplumber::onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res, -+ waybar::modules::Wireplumber* self) { -+ gboolean success = FALSE; -+ g_autoptr(GError) error = nullptr; -+ -+ spdlog::debug("[{}]: callback loading default node api module", self->name_); - -- if (!wp_core_load_component(wp_core_, "libwireplumber-module-default-nodes-api", "module", NULL, -- &error)) { -+ -+ success = wp_core_load_component_finish(self->wp_core_, res, &error); -+ -+ if (success == FALSE) { -+ spdlog::error("[{}]: default nodes API load failed", self->name_); - throw std::runtime_error(error->message); - } -+ spdlog::debug("[{}]: loaded default nodes api", self->name_); -+ g_ptr_array_add(self->apis_, wp_plugin_find(self->wp_core_, "default-nodes-api")); -+ -+ spdlog::debug("[{}]: loading mixer api module", self->name_); -+ wp_core_load_component(self->wp_core_, "libwireplumber-module-mixer-api", "module", nullptr, -+ "mixer-api", nullptr, (GAsyncReadyCallback)onMixerApiLoaded, self); -+} - -- if (!wp_core_load_component(wp_core_, "libwireplumber-module-mixer-api", "module", NULL, -- &error)) { -+void waybar::modules::Wireplumber::onMixerApiLoaded(WpObject* p, GAsyncResult* res, -+ waybar::modules::Wireplumber* self) { -+ gboolean success = FALSE; -+ g_autoptr(GError) error = nullptr; -+ -+ success = wp_core_load_component_finish(self->wp_core_, res, nullptr); -+ -+ if (success == FALSE) { -+ spdlog::error("[{}]: mixer API load failed", self->name_); - throw std::runtime_error(error->message); - } - -- g_ptr_array_add(apis_, wp_plugin_find(wp_core_, "default-nodes-api")); -- g_ptr_array_add(apis_, ({ -- WpPlugin* p = wp_plugin_find(wp_core_, "mixer-api"); -- g_object_set(G_OBJECT(p), "scale", 1 /* cubic */, NULL); -- p; -- })); -+ spdlog::debug("[{}]: loaded mixer API", self->name_); -+ g_ptr_array_add(self->apis_, ({ -+ WpPlugin* p = wp_plugin_find(self->wp_core_, "mixer-api"); -+ g_object_set(G_OBJECT(p), "scale", 1 /* cubic */, nullptr); -+ p; -+ })); -+ -+ self->activatePlugins(); -+ -+ self->dp.emit(); -+ -+ self->event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK); -+ self->event_box_.signal_scroll_event().connect(sigc::mem_fun(*self, &Wireplumber::handleScroll)); -+} -+ -+void waybar::modules::Wireplumber::asyncLoadRequiredApiModules() { -+ spdlog::debug("[{}]: loading default nodes api module", name_); -+ wp_core_load_component(wp_core_, "libwireplumber-module-default-nodes-api", "module", nullptr, -+ "default-nodes-api", nullptr, (GAsyncReadyCallback)onDefaultNodesApiLoaded, this); - } - - auto waybar::modules::Wireplumber::update() -> void { - -From 2aa6b862c51b2f71eb6688a7aff6f8f42f524923 Mon Sep 17 00:00:00 2001 -From: Ryan Walklin <ryan@testtoast.com> -Date: Wed, 20 Mar 2024 14:10:21 +1300 -Subject: [PATCH 2/3] Remove WP_LOCAL_LOG_TOPIC - this was required for - 0.4.81-0.4.90, but fixed for 0.5.0 - -See https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e9d8eeedefa8adf47646ab9375c8888506f143e6 ---- - include/modules/wireplumber.hpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/include/modules/wireplumber.hpp b/include/modules/wireplumber.hpp -index 50121424b..aa6e96ec1 100644 ---- a/include/modules/wireplumber.hpp -+++ b/include/modules/wireplumber.hpp -@@ -3,9 +3,6 @@ - #include <fmt/format.h> - #include <wp/wp.h> - --#define WP_LOCAL_LOG_TOPIC wp_waybar --WP_LOG_TOPIC_EXTERN (wp_waybar) -- - #include <algorithm> - #include <array> - - -From 19f792a3e43c8351c8eb7368e60bf3763ca56df1 Mon Sep 17 00:00:00 2001 -From: Ryan Walklin <ryan@testtoast.com> -Date: Wed, 20 Mar 2024 14:12:48 +1300 -Subject: [PATCH 3/3] Fix clang-tidy and clang-format warnings - -Note these are significantly wider than the changes for 0.5.0 so optional beyond the existing patchset. ---- - include/modules/wireplumber.hpp | 3 +- - src/modules/wireplumber.cpp | 132 ++++++++++++++++---------------- - 2 files changed, 70 insertions(+), 65 deletions(-) - -diff --git a/include/modules/wireplumber.hpp b/include/modules/wireplumber.hpp -index aa6e96ec1..6255b95fd 100644 ---- a/include/modules/wireplumber.hpp -+++ b/include/modules/wireplumber.hpp -@@ -23,7 +23,8 @@ class Wireplumber : public ALabel { - static void updateVolume(waybar::modules::Wireplumber* self, uint32_t id); - static void updateNodeName(waybar::modules::Wireplumber* self, uint32_t id); - static void onPluginActivated(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self); -- static void onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self); -+ static void onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res, -+ waybar::modules::Wireplumber* self); - static void onMixerApiLoaded(WpObject* p, GAsyncResult* res, waybar::modules::Wireplumber* self); - static void onObjectManagerInstalled(waybar::modules::Wireplumber* self); - static void onMixerChanged(waybar::modules::Wireplumber* self, uint32_t id); -diff --git a/src/modules/wireplumber.cpp b/src/modules/wireplumber.cpp -index 021160168..bd019b623 100644 ---- a/src/modules/wireplumber.cpp -+++ b/src/modules/wireplumber.cpp -@@ -18,7 +18,7 @@ waybar::modules::Wireplumber::Wireplumber(const std::string& id, const Json::Val - min_step_(0.0), - node_id_(0) { - wp_init(WP_INIT_PIPEWIRE); -- wp_core_ = wp_core_new(NULL, NULL, NULL); -+ wp_core_ = wp_core_new(nullptr, nullptr, nullptr); - apis_ = g_ptr_array_new_with_free_func(g_object_unref); - om_ = wp_object_manager_new(); - -@@ -56,32 +56,36 @@ void waybar::modules::Wireplumber::updateNodeName(waybar::modules::Wireplumber* - return; - } - -- auto proxy = static_cast<WpProxy*>(wp_object_manager_lookup( -- self->om_, WP_TYPE_GLOBAL_PROXY, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, NULL)); -+ auto* proxy = static_cast<WpProxy*>(wp_object_manager_lookup(self->om_, WP_TYPE_GLOBAL_PROXY, -+ WP_CONSTRAINT_TYPE_G_PROPERTY, -+ "bound-id", "=u", id, nullptr)); - -- if (!proxy) { -+ if (proxy == nullptr) { - auto err = fmt::format("Object '{}' not found\n", id); - spdlog::error("[{}]: {}", self->name_, err); - throw std::runtime_error(err); - } - - g_autoptr(WpProperties) properties = -- WP_IS_PIPEWIRE_OBJECT(proxy) ? wp_pipewire_object_get_properties(WP_PIPEWIRE_OBJECT(proxy)) -- : wp_properties_new_empty(); -- g_autoptr(WpProperties) global_p = wp_global_proxy_get_global_properties(WP_GLOBAL_PROXY(proxy)); -+ WP_IS_PIPEWIRE_OBJECT(proxy) != 0 -+ ? wp_pipewire_object_get_properties(WP_PIPEWIRE_OBJECT(proxy)) -+ : wp_properties_new_empty(); -+ g_autoptr(WpProperties) globalP = wp_global_proxy_get_global_properties(WP_GLOBAL_PROXY(proxy)); - properties = wp_properties_ensure_unique_owner(properties); -- wp_properties_add(properties, global_p); -- wp_properties_set(properties, "object.id", NULL); -- auto nick = wp_properties_get(properties, "node.nick"); -- auto description = wp_properties_get(properties, "node.description"); -- -- self->node_name_ = nick ? nick : description ? description : "Unknown node name"; -+ wp_properties_add(properties, globalP); -+ wp_properties_set(properties, "object.id", nullptr); -+ const auto* nick = wp_properties_get(properties, "node.nick"); -+ const auto* description = wp_properties_get(properties, "node.description"); -+ -+ self->node_name_ = nick != nullptr ? nick -+ : description != nullptr ? description -+ : "Unknown node name"; - spdlog::debug("[{}]: Updating node name to: {}", self->name_, self->node_name_); - } - - void waybar::modules::Wireplumber::updateVolume(waybar::modules::Wireplumber* self, uint32_t id) { - spdlog::debug("[{}]: updating volume", self->name_); -- GVariant* variant = NULL; -+ GVariant* variant = nullptr; - - if (!isValidNodeId(id)) { - spdlog::error("[{}]: '{}' is not a valid node ID. Ignoring volume update.", self->name_, id); -@@ -90,7 +94,7 @@ void waybar::modules::Wireplumber::updateVolume(waybar::modules::Wireplumber* se - - g_signal_emit_by_name(self->mixer_api_, "get-volume", id, &variant); - -- if (!variant) { -+ if (variant == nullptr) { - auto err = fmt::format("Node {} does not support volume\n", id); - spdlog::error("[{}]: {}", self->name_, err); - throw std::runtime_error(err); -@@ -108,9 +112,9 @@ void waybar::modules::Wireplumber::onMixerChanged(waybar::modules::Wireplumber* - spdlog::debug("[{}]: (onMixerChanged) - id: {}", self->name_, id); - - g_autoptr(WpNode) node = static_cast<WpNode*>(wp_object_manager_lookup( -- self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, NULL)); -+ self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", "=u", id, nullptr)); - -- if (!node) { -+ if (node == nullptr) { - spdlog::warn("[{}]: (onMixerChanged) - Object with id {} not found", self->name_, id); - return; - } -@@ -133,49 +137,49 @@ void waybar::modules::Wireplumber::onMixerChanged(waybar::modules::Wireplumber* - void waybar::modules::Wireplumber::onDefaultNodesApiChanged(waybar::modules::Wireplumber* self) { - spdlog::debug("[{}]: (onDefaultNodesApiChanged)", self->name_); - -- uint32_t default_node_id; -- g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &default_node_id); -+ uint32_t defaultNodeId; -+ g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &defaultNodeId); - -- if (!isValidNodeId(default_node_id)) { -+ if (!isValidNodeId(defaultNodeId)) { - spdlog::warn("[{}]: '{}' is not a valid node ID. Ignoring node change.", self->name_, -- default_node_id); -+ defaultNodeId); - return; - } - - g_autoptr(WpNode) node = static_cast<WpNode*>( - wp_object_manager_lookup(self->om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_G_PROPERTY, "bound-id", -- "=u", default_node_id, NULL)); -+ "=u", defaultNodeId, nullptr)); - -- if (!node) { -+ if (node == nullptr) { - spdlog::warn("[{}]: (onDefaultNodesApiChanged) - Object with id {} not found", self->name_, -- default_node_id); -+ defaultNodeId); - return; - } - -- const gchar* default_node_name = -+ const gchar* defaultNodeName = - wp_pipewire_object_get_property(WP_PIPEWIRE_OBJECT(node), "node.name"); - - spdlog::debug( - "[{}]: (onDefaultNodesApiChanged) - got the following default node: Node(name: {}, id: {})", -- self->name_, default_node_name, default_node_id); -+ self->name_, defaultNodeName, defaultNodeId); - -- if (g_strcmp0(self->default_node_name_, default_node_name) == 0) { -+ if (g_strcmp0(self->default_node_name_, defaultNodeName) == 0) { - spdlog::debug( - "[{}]: (onDefaultNodesApiChanged) - Default node has not changed. Node(name: {}, id: {}). " - "Ignoring.", -- self->name_, self->default_node_name_, default_node_id); -+ self->name_, self->default_node_name_, defaultNodeId); - return; - } - - spdlog::debug( - "[{}]: (onDefaultNodesApiChanged) - Default node changed to -> Node(name: {}, id: {})", -- self->name_, default_node_name, default_node_id); -+ self->name_, defaultNodeName, defaultNodeId); - - g_free(self->default_node_name_); -- self->default_node_name_ = g_strdup(default_node_name); -- self->node_id_ = default_node_id; -- updateVolume(self, default_node_id); -- updateNodeName(self, default_node_id); -+ self->default_node_name_ = g_strdup(defaultNodeName); -+ self->node_id_ = defaultNodeId; -+ updateVolume(self, defaultNodeId); -+ updateNodeName(self, defaultNodeId); - } - - void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wireplumber* self) { -@@ -183,14 +187,14 @@ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wir - - self->def_nodes_api_ = wp_plugin_find(self->wp_core_, "default-nodes-api"); - -- if (!self->def_nodes_api_) { -+ if (self->def_nodes_api_ == nullptr) { - spdlog::error("[{}]: default nodes api is not loaded.", self->name_); - throw std::runtime_error("Default nodes API is not loaded\n"); - } - - self->mixer_api_ = wp_plugin_find(self->wp_core_, "mixer-api"); - -- if (!self->mixer_api_) { -+ if (self->mixer_api_ == nullptr) { - spdlog::error("[{}]: mixer api is not loaded.", self->name_); - throw std::runtime_error("Mixer api is not loaded\n"); - } -@@ -199,7 +203,7 @@ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wir - &self->default_node_name_); - g_signal_emit_by_name(self->def_nodes_api_, "get-default-node", "Audio/Sink", &self->node_id_); - -- if (self->default_node_name_) { -+ if (self->default_node_name_ != nullptr) { - spdlog::debug("[{}]: (onObjectManagerInstalled) - default configured node name: {} and id: {}", - self->name_, self->default_node_name_, self->node_id_); - } -@@ -214,11 +218,11 @@ void waybar::modules::Wireplumber::onObjectManagerInstalled(waybar::modules::Wir - - void waybar::modules::Wireplumber::onPluginActivated(WpObject* p, GAsyncResult* res, - waybar::modules::Wireplumber* self) { -- auto plugin_name = wp_plugin_get_name(WP_PLUGIN(p)); -- spdlog::debug("[{}]: onPluginActivated: {}", self->name_, plugin_name); -- g_autoptr(GError) error = NULL; -+ const auto* pluginName = wp_plugin_get_name(WP_PLUGIN(p)); -+ spdlog::debug("[{}]: onPluginActivated: {}", self->name_, pluginName); -+ g_autoptr(GError) error = nullptr; - -- if (!wp_object_activate_finish(p, res, &error)) { -+ if (wp_object_activate_finish(p, res, &error) == 0) { - spdlog::error("[{}]: error activating plugin: {}", self->name_, error->message); - throw std::runtime_error(error->message); - } -@@ -233,7 +237,7 @@ void waybar::modules::Wireplumber::activatePlugins() { - for (uint16_t i = 0; i < apis_->len; i++) { - WpPlugin* plugin = static_cast<WpPlugin*>(g_ptr_array_index(apis_, i)); - pending_plugins_++; -- wp_object_activate(WP_OBJECT(plugin), WP_PLUGIN_FEATURE_ENABLED, NULL, -+ wp_object_activate(WP_OBJECT(plugin), WP_PLUGIN_FEATURE_ENABLED, nullptr, - (GAsyncReadyCallback)onPluginActivated, this); - } - } -@@ -241,7 +245,7 @@ void waybar::modules::Wireplumber::activatePlugins() { - void waybar::modules::Wireplumber::prepare() { - spdlog::debug("[{}]: preparing object manager", name_); - wp_object_manager_add_interest(om_, WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, "media.class", -- "=s", "Audio/Sink", NULL); -+ "=s", "Audio/Sink", nullptr); - } - - void waybar::modules::Wireplumber::onDefaultNodesApiLoaded(WpObject* p, GAsyncResult* res, -@@ -251,7 +255,6 @@ void waybar::modules::Wireplumber::onDefaultNodesApiLoaded(WpObject* p, GAsyncRe - - spdlog::debug("[{}]: callback loading default node api module", self->name_); - -- - success = wp_core_load_component_finish(self->wp_core_, res, &error); - - if (success == FALSE) { -@@ -263,7 +266,7 @@ void waybar::modules::Wireplumber::onDefaultNodesApiLoaded(WpObject* p, GAsyncRe - - spdlog::debug("[{}]: loading mixer api module", self->name_); - wp_core_load_component(self->wp_core_, "libwireplumber-module-mixer-api", "module", nullptr, -- "mixer-api", nullptr, (GAsyncReadyCallback)onMixerApiLoaded, self); -+ "mixer-api", nullptr, (GAsyncReadyCallback)onMixerApiLoaded, self); - } - - void waybar::modules::Wireplumber::onMixerApiLoaded(WpObject* p, GAsyncResult* res, -@@ -280,10 +283,10 @@ void waybar::modules::Wireplumber::onMixerApiLoaded(WpObject* p, GAsyncResult* r - - spdlog::debug("[{}]: loaded mixer API", self->name_); - g_ptr_array_add(self->apis_, ({ -- WpPlugin* p = wp_plugin_find(self->wp_core_, "mixer-api"); -- g_object_set(G_OBJECT(p), "scale", 1 /* cubic */, nullptr); -- p; -- })); -+ WpPlugin* p = wp_plugin_find(self->wp_core_, "mixer-api"); -+ g_object_set(G_OBJECT(p), "scale", 1 /* cubic */, nullptr); -+ p; -+ })); - - self->activatePlugins(); - -@@ -296,12 +299,13 @@ void waybar::modules::Wireplumber::onMixerApiLoaded(WpObject* p, GAsyncResult* r - void waybar::modules::Wireplumber::asyncLoadRequiredApiModules() { - spdlog::debug("[{}]: loading default nodes api module", name_); - wp_core_load_component(wp_core_, "libwireplumber-module-default-nodes-api", "module", nullptr, -- "default-nodes-api", nullptr, (GAsyncReadyCallback)onDefaultNodesApiLoaded, this); -+ "default-nodes-api", nullptr, (GAsyncReadyCallback)onDefaultNodesApiLoaded, -+ this); - } - - auto waybar::modules::Wireplumber::update() -> void { - auto format = format_; -- std::string tooltip_format; -+ std::string tooltipFormat; - - if (muted_) { - format = config_["format-muted"].isString() ? config_["format-muted"].asString() : format; -@@ -318,12 +322,12 @@ auto waybar::modules::Wireplumber::update() -> void { - getState(vol); - - if (tooltipEnabled()) { -- if (tooltip_format.empty() && config_["tooltip-format"].isString()) { -- tooltip_format = config_["tooltip-format"].asString(); -+ if (tooltipFormat.empty() && config_["tooltip-format"].isString()) { -+ tooltipFormat = config_["tooltip-format"].asString(); - } - -- if (!tooltip_format.empty()) { -- label_.set_tooltip_text(fmt::format(fmt::runtime(tooltip_format), -+ if (!tooltipFormat.empty()) { -+ label_.set_tooltip_text(fmt::format(fmt::runtime(tooltipFormat), - fmt::arg("node_name", node_name_), - fmt::arg("volume", vol), fmt::arg("icon", getIcon(vol)))); - } else { -@@ -343,31 +347,31 @@ bool waybar::modules::Wireplumber::handleScroll(GdkEventScroll* e) { - if (dir == SCROLL_DIR::NONE) { - return true; - } -- double max_volume = 1; -+ double maxVolume = 1; - double step = 1.0 / 100.0; - if (config_["scroll-step"].isDouble()) { - step = config_["scroll-step"].asDouble() / 100.0; - } - if (config_["max-volume"].isDouble()) { -- max_volume = config_["max-volume"].asDouble() / 100.0; -+ maxVolume = config_["max-volume"].asDouble() / 100.0; - } - - if (step < min_step_) step = min_step_; - -- double new_vol = volume_; -+ double newVol = volume_; - if (dir == SCROLL_DIR::UP) { -- if (volume_ < max_volume) { -- new_vol = volume_ + step; -- if (new_vol > max_volume) new_vol = max_volume; -+ if (volume_ < maxVolume) { -+ newVol = volume_ + step; -+ if (newVol > maxVolume) newVol = maxVolume; - } - } else if (dir == SCROLL_DIR::DOWN) { - if (volume_ > 0) { -- new_vol = volume_ - step; -- if (new_vol < 0) new_vol = 0; -+ newVol = volume_ - step; -+ if (newVol < 0) newVol = 0; - } - } -- if (new_vol != volume_) { -- GVariant* variant = g_variant_new_double(new_vol); -+ if (newVol != volume_) { -+ GVariant* variant = g_variant_new_double(newVol); - gboolean ret; - g_signal_emit_by_name(mixer_api_, "set-volume", node_id_, variant, &ret); - } diff --git a/community/waydroid/APKBUILD b/community/waydroid/APKBUILD index b046d6b7cfd..100124c1a1c 100644 --- a/community/waydroid/APKBUILD +++ b/community/waydroid/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=waydroid pkgver=1.4.2 -pkgrel=4 +pkgrel=5 pkgdesc="A container-based approach to boot a full Android system on a regular Linux system" url="https://github.com/waydroid/waydroid" # Only x86, armv7, x86_64 and aarch64 supported upstream @@ -63,7 +63,7 @@ pyc() { sha512sums=" 0d3eba799895c853545b7087e3c07160d593d4a3166822039973669bc0ee93a8a6b9c394a7d982e57cfbbfbd8df1ba7991dd33b1b1517d79fcbe191d8a86890a waydroid-1.4.2.tar.gz -a173f927586c4d036113bee7170775a497cd833ea683957ed4b29746500769f407ba47f6c8b2c6280d411d0663e84be660cb5883c844d1b7a70f2c8d700a71a6 waydroid-container.initd +f319dde4f4bb365069dff2c1ddaa0a85d711c9e9d49011b15aec0d10da2ba0da39c464505d28cd7e8b4f803e932fdde04ca69602805d084529bac0ee6b22ba59 waydroid-container.initd b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706 waydroid-container.confd 27cec579cfda197ff70d6328043755fc3d1719347bf4987edb86a07341bc4f02b99b65a6ef1fcde58b48a925176e6d770ed7cef304edff6a860bf4d408a62e06 51_waydroid.nft 56dc332d66c3eb3af08887eb2f4b8235419ff87a4e4632108cdde39cf274bc88b9e95c650a7d407d05a72f1ce2edf5d465a06b7e526113d9c9ae3817a6ed1f78 waydroid-session.desktop diff --git a/community/waydroid/waydroid-container.initd b/community/waydroid/waydroid-container.initd index 3efd0f07027..8d0ba38a60d 100644 --- a/community/waydroid/waydroid-container.initd +++ b/community/waydroid/waydroid-container.initd @@ -15,7 +15,7 @@ start_stop_daemon_args='--env PYTHONDONTWRITEBYTECODE="$PYTHONDONTWRITEBYTECODE" depend() { need cgroups - uses net + use net } start_pre() { diff --git a/testing/wcslib/APKBUILD b/community/wcslib/APKBUILD index dfa5c61a82c..dfa5c61a82c 100644 --- a/testing/wcslib/APKBUILD +++ b/community/wcslib/APKBUILD diff --git a/community/weasyprint/APKBUILD b/community/weasyprint/APKBUILD index 4411a5bdea3..24cb6277d2a 100644 --- a/community/weasyprint/APKBUILD +++ b/community/weasyprint/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=weasyprint -pkgver=61.2 -pkgrel=1 +pkgver=62.1 +pkgrel=0 pkgdesc="A visual rendering engine for HTML and CSS that can export to PDF" url="https://weasyprint.org" arch="noarch" @@ -50,5 +50,5 @@ package() { } sha512sums=" -62c3afba18bcc141bc013b95848b0e2426160123533509b6e353caa6c33173266524be84b0a50443ac2549b1b8013e5eb915f54a68168d65e98c9251c4fdf339 weasyprint-61.2.tar.gz +8eaee6daa610accd7594141102aecaf1b5debecbae196c442c32d522d4dcb54c411a215b77956b6e66deeb0abda66cb36d0e081d5d3fd69a8bf5a82716209aeb weasyprint-62.1.tar.gz " diff --git a/community/webkit2gtk-4.1/APKBUILD b/community/webkit2gtk-4.1/APKBUILD index 61f9d07f47e..b216cabe8cb 100644 --- a/community/webkit2gtk-4.1/APKBUILD +++ b/community/webkit2gtk-4.1/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=webkit2gtk-4.1 pkgver=2.44.1 -pkgrel=0 +pkgrel=1 pkgdesc="Portable web rendering engine WebKit for GTK+ - GTK+3 libsoup3 version" url="https://webkitgtk.org/" arch="all" diff --git a/community/webkit2gtk-6.0/APKBUILD b/community/webkit2gtk-6.0/APKBUILD index 1d4e10f67f4..510c7c3846e 100644 --- a/community/webkit2gtk-6.0/APKBUILD +++ b/community/webkit2gtk-6.0/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=webkit2gtk-6.0 pkgver=2.44.1 -pkgrel=0 +pkgrel=1 pkgdesc="Portable web rendering engine WebKit for GTK+ - GTK4 version" url="https://webkitgtk.org/" arch="all" diff --git a/community/webkit2gtk/APKBUILD b/community/webkit2gtk/APKBUILD index 8248eb70e05..c0a2a854691 100644 --- a/community/webkit2gtk/APKBUILD +++ b/community/webkit2gtk/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=webkit2gtk pkgver=2.44.1 -pkgrel=0 +pkgrel=1 pkgdesc="Portable web rendering engine WebKit for GTK+" url="https://webkitgtk.org/" arch="all" diff --git a/community/wesnoth/APKBUILD b/community/wesnoth/APKBUILD index f7f06b75b4e..2000bb638f4 100644 --- a/community/wesnoth/APKBUILD +++ b/community/wesnoth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: David Demelier <markand@malikania.fr> # Maintainer: David Demelier <markand@malikania.fr> pkgname=wesnoth -pkgver=1.16.9 +pkgver=1.16.12 _major=${pkgver%.*} pkgrel=0 pkgdesc="turn-based strategy game in fantasy world" @@ -24,10 +24,8 @@ makedepends=" sdl2_mixer-dev " subpackages="$pkgname-doc" -source="https://sourceforge.net/projects/wesnoth/files/wesnoth-$_major/wesnoth-$pkgver/wesnoth-$pkgver.tar.bz2 - fix-cstdint.patch - " -options="!check" # No tests +source="https://sourceforge.net/projects/wesnoth/files/wesnoth-$_major/wesnoth-$pkgver/wesnoth-$pkgver.tar.bz2" +options="!check !fhs" # No tests, creates dirs under /var/run build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -47,6 +45,5 @@ package() { } sha512sums=" -6dac161d7215c9d1ab26da2b6573234d9bf71f4d9bd22f11613328af76d319daad3445a36d0e525be547494d98296d5dca6e0cb603f1a64ba7ea6b7590f5a6f2 wesnoth-1.16.9.tar.bz2 -984fe694ded965626c6092abb70b403e07e851ed0035da4e4b3323f7663605566182f7f27c7731f76db7af75fb7728f9c89e191c31f8faf50bb578cfea9b5d02 fix-cstdint.patch +b05715bf45d4b7111960333eb9df2c86c1816fe7da032d38d2ea3f8e9c41e73dc30e035789c42db8037f198d7182b75511142df11b9bf947c11962fd8e44b74e wesnoth-1.16.12.tar.bz2 " diff --git a/community/wesnoth/fix-cstdint.patch b/community/wesnoth/fix-cstdint.patch deleted file mode 100644 index 89dfb6a0f50..00000000000 --- a/community/wesnoth/fix-cstdint.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/log.hpp -+++ b/src/log.hpp -@@ -53,6 +53,7 @@ - - #include <iostream> // needed else all files including log.hpp need to do it. - #include <sstream> // as above. iostream (actually, iosfwd) declares stringstream as an incomplete type, but does not define it -+#include <cstdint> - #include <string> - #include <utility> - #include <ctime> ---- a/src/deprecation.hpp -+++ b/src/deprecation.hpp -@@ -15,6 +15,7 @@ - #pragma once - - #include <string> -+#include <cstdint> - - /** See https://wiki.wesnoth.org/CompatibilityStandards for more info. */ - enum class DEP_LEVEL : uint8_t { INDEFINITE = 1, PREEMPTIVE, FOR_REMOVAL, REMOVED }; ---- a/src/serialization/base64.hpp -+++ b/src/serialization.base64.hpp -@@ -15,6 +15,7 @@ - - #pragma once - -+#include <cstdint> - #include <string_view> - #include <vector> - diff --git a/community/weston/APKBUILD b/community/weston/APKBUILD index 501636509f7..89bc2df2c06 100644 --- a/community/weston/APKBUILD +++ b/community/weston/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Valery Kartel <valery.kartel@gmail.com> pkgname=weston -pkgver=12.0.2 +pkgver=12.0.4 pkgrel=0 _libname=lib$pkgname _libdir=$_libname-${pkgver%%.*} @@ -146,5 +146,5 @@ _sub() { } sha512sums=" -4277cc71a2001768816d6c30df6c01f09ee24efd16651e7048d425afa63c78f92d6def0cca78150965b0f3fa946675b0325881ff9d2878925dedea216a968d59 weston-12.0.2.tar.xz +c988256b73ea72f06d8ec4faaac2f4a2c52b250b573d3c9906cd00dcba017ad2202875ff04d012b194044715fb5e586331238c54daa508b814c7ab22f3d40006 weston-12.0.4.tar.xz " diff --git a/community/wezterm/APKBUILD b/community/wezterm/APKBUILD index 8310557d901..f854aee3818 100644 --- a/community/wezterm/APKBUILD +++ b/community/wezterm/APKBUILD @@ -3,7 +3,7 @@ pkgname=wezterm pkgver=20240203.110809 _pkgver="${pkgver/./-}-5046fc22" -pkgrel=1 +pkgrel=2 pkgdesc="GPU-accelerated cross-platform terminal emulator and multiplexer written in Rust" url="https://wezfurlong.org/wezterm/" # s390x blocked by nix crate @@ -53,6 +53,7 @@ subpackages=" source=" https://github.com/wez/wezterm/releases/download/$_pkgver/wezterm-$_pkgver-src.tar.gz link-against-system-libs.patch + rust1.78-from_raw_parts.patch " builddir="$srcdir/wezterm-$_pkgver" options="net" @@ -161,4 +162,5 @@ fonts() { sha512sums=" 2413e1537ed4cf699f0754d76f35cd679591e4e215e782fab61f5bd7c4615e3916398e16709445406ef241e3fb721111daed917c546abb1f5130109b40bb2774 wezterm-20240203-110809-5046fc22-src.tar.gz d4c13f079dd0348d60eed577a0467cf4da9b202c5c959902b0626019c95d945d2a91023bc6844c19d5a3aecaa8d0de007966a6a2113549fe5328c3c8de79381f link-against-system-libs.patch +a13edbf756ef697ecc640103589d686043f4790b36ac0867a777c47cae1b6cd7482eca229d514fb6feb61e5b274c564e304eacad90001dff82e3dc01f20a3ffa rust1.78-from_raw_parts.patch " diff --git a/community/wezterm/rust1.78-from_raw_parts.patch b/community/wezterm/rust1.78-from_raw_parts.patch new file mode 100644 index 00000000000..3ef4f95e3be --- /dev/null +++ b/community/wezterm/rust1.78-from_raw_parts.patch @@ -0,0 +1,154 @@ +Patch-Source: https://github.com/wez/wezterm/commit/67d4ba9f76470a7ff1f3e7609119cdbb9d33024c +-- +From 67d4ba9f76470a7ff1f3e7609119cdbb9d33024c Mon Sep 17 00:00:00 2001 +From: Wez Furlong <wez@wezfurlong.org> +Date: Sat, 4 May 2024 15:53:28 -0700 +Subject: [PATCH] fix when running on rust 1.78 + +std::slice::from_raw_parts will now panic if the ptr is null. +Resolve this by adding our own wrapper that translates that +case to an empty slice. +--- + wezterm-font/src/ftwrap.rs | 60 +++++++++++-------------- + wezterm-font/src/rasterizer/freetype.rs | 4 +- + 2 files changed, 29 insertions(+), 35 deletions(-) + +diff --git a/wezterm-font/src/ftwrap.rs b/wezterm-font/src/ftwrap.rs +index 5f06a3fb809..5c9bf128631 100644 +--- a/wezterm-font/src/ftwrap.rs ++++ b/wezterm-font/src/ftwrap.rs +@@ -260,10 +260,7 @@ impl Face { + } + + let bytes = unsafe { +- std::slice::from_raw_parts( +- sfnt_name.string as *const u8, +- sfnt_name.string_len as usize, +- ) ++ from_raw_parts(sfnt_name.string as *const u8, sfnt_name.string_len as usize) + }; + + let encoding = match (sfnt_name.platform_id as u32, sfnt_name.encoding_id as u32) { +@@ -350,14 +347,12 @@ impl Face { + { + let mm = &*mm; + +- let styles = +- std::slice::from_raw_parts(mm.namedstyle, mm.num_namedstyles as usize); ++ let styles = from_raw_parts(mm.namedstyle, mm.num_namedstyles as usize); + let instance = &styles[vidx]; +- let axes = std::slice::from_raw_parts(mm.axis, mm.num_axis as usize); ++ let axes = from_raw_parts(mm.axis, mm.num_axis as usize); + + for (i, axis) in axes.iter().enumerate() { +- let coords = +- std::slice::from_raw_parts(instance.coords, mm.num_axis as usize); ++ let coords = from_raw_parts(instance.coords, mm.num_axis as usize); + let value = coords[i].to_num::<f64>(); + let default_value = axis.def.to_num::<f64>(); + let scale = if default_value != 0. { +@@ -436,7 +431,7 @@ impl Face { + pub fn pixel_sizes(&self) -> Vec<u16> { + let sizes = unsafe { + let rec = &(*self.face); +- std::slice::from_raw_parts(rec.available_sizes, rec.num_fixed_sizes as usize) ++ from_raw_parts(rec.available_sizes, rec.num_fixed_sizes as usize) + }; + sizes + .iter() +@@ -494,7 +489,7 @@ impl Face { + + let sizes = unsafe { + let rec = &(*self.face); +- std::slice::from_raw_parts(rec.available_sizes, rec.num_fixed_sizes as usize) ++ from_raw_parts(rec.available_sizes, rec.num_fixed_sizes as usize) + }; + if sizes.is_empty() { + return Err(err); +@@ -723,24 +718,12 @@ impl Face { + let data = result.assume_init(); + let mut palettes = vec![]; + +- let name_ids = if data.palette_name_ids.is_null() { +- &[] +- } else { +- std::slice::from_raw_parts(data.palette_name_ids, data.num_palettes as usize) +- }; +- let flagses = if data.palette_flags.is_null() { +- &[] +- } else { +- std::slice::from_raw_parts(data.palette_flags, data.num_palettes as usize) +- }; +- let entry_name_ids = if data.palette_entry_name_ids.is_null() { +- &[] +- } else { +- std::slice::from_raw_parts( +- data.palette_entry_name_ids, +- data.num_palette_entries as usize, +- ) +- }; ++ let name_ids = from_raw_parts(data.palette_name_ids, data.num_palettes as usize); ++ let flagses = from_raw_parts(data.palette_flags, data.num_palettes as usize); ++ let entry_name_ids = from_raw_parts( ++ data.palette_entry_name_ids, ++ data.num_palette_entries as usize, ++ ); + + let entry_names: Vec<String> = entry_name_ids + .iter() +@@ -777,10 +760,8 @@ impl Face { + ft_result(FT_Get_Sfnt_Name(self.face, i, sfnt_name.as_mut_ptr()), ()) + .context("FT_Get_Sfnt_Name")?; + let sfnt_name = sfnt_name.assume_init(); +- let bytes = std::slice::from_raw_parts( +- sfnt_name.string as *const u8, +- sfnt_name.string_len as usize, +- ); ++ let bytes = ++ from_raw_parts(sfnt_name.string as *const u8, sfnt_name.string_len as usize); + + let encoding = match (sfnt_name.platform_id as u32, sfnt_name.encoding_id as u32) { + (TT_PLATFORM_MACINTOSH, TT_MAC_ID_JAPANESE) +@@ -1472,6 +1453,19 @@ impl FreeTypeStream { + } + } + ++/// Wrapper around std::slice::from_raw_parts that allows for ptr to be ++/// null. In the null ptr case, an empty slice is returned. ++/// This is necessary because it is common for freetype to encode ++/// empty arrays in that way, and rust 1.78 will panic if a null ++/// ptr is passed in. ++pub(crate) unsafe fn from_raw_parts<'a, T>(ptr: *const T, size: usize) -> &'a [T] { ++ if ptr.is_null() { ++ &[] ++ } else { ++ std::slice::from_raw_parts(ptr, size) ++ } ++} ++ + #[derive(Debug)] + pub struct PaletteInfo { + pub num_palettes: usize, +diff --git a/wezterm-font/src/rasterizer/freetype.rs b/wezterm-font/src/rasterizer/freetype.rs +index 9f9cf334243..2e7a366a1cb 100644 +--- a/wezterm-font/src/rasterizer/freetype.rs ++++ b/wezterm-font/src/rasterizer/freetype.rs +@@ -20,8 +20,8 @@ use cairo::{Content, Context, Extend, Format, ImageSurface, Matrix, Operator, Re + use config::{DisplayPixelGeometry, FreeTypeLoadFlags, FreeTypeLoadTarget}; + use std::cell::RefCell; + use std::f64::consts::PI; ++use std::mem; + use std::mem::MaybeUninit; +-use std::{mem, slice}; + use wezterm_color_types::{linear_u8_to_srgb8, SrgbaPixel}; + + pub struct FreeTypeRasterizer { +@@ -93,7 +93,7 @@ impl FontRasterizer for FreeTypeRasterizer { + // pitch is the number of bytes per source row + let pitch = ft_glyph.bitmap.pitch.abs() as usize; + let data = unsafe { +- slice::from_raw_parts_mut( ++ crate::ftwrap::from_raw_parts( + ft_glyph.bitmap.buffer, + ft_glyph.bitmap.rows as usize * pitch, + ) diff --git a/community/widelands/APKBUILD b/community/widelands/APKBUILD index fa43a7785af..20d79efe8f7 100644 --- a/community/widelands/APKBUILD +++ b/community/widelands/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=widelands pkgver=1.2 -pkgrel=0 +pkgrel=1 pkgdesc="realtime strategy game with emphasis on economy and transport" url="https://widelands.org" arch="all !s390x" # nobody will use s390x to place widelands diff --git a/community/wike/APKBUILD b/community/wike/APKBUILD new file mode 100644 index 00000000000..57bdd9bf53c --- /dev/null +++ b/community/wike/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: fossdd <fossdd@pwned.life> +# Maintainer: fossdd <fossdd@pwned.life> +pkgname=wike +_pkgname=Wike +pkgver=3.0.1 +pkgrel=0 +pkgdesc="Wikipedia Reader for the GNOME Desktop" +url="https://apps.gnome.org/Wike" +arch="noarch" +license="GPL-3.0-or-later" +depends=" + libadwaita + py3-gobject3 + py3-requests + webkit2gtk-6.0 + " +makedepends=" + meson + glib-dev + " +checkdepends="appstream" +subpackages="$pkgname-lang" +source="$pkgname-$pkgver.tar.gz::https://github.com/hugolabe/Wike/archive/refs/tags/$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + abuild-meson . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + meson install -C output --destdir "$pkgdir" +} + +sha512sums=" +f31e0dff2b1d2f2dbceef63e0c0b59d850791624301bd5ec9e1c9e015ca1503cff03701a8b2867c1a4783fffccb7fecb2517252535a640a3ff3d25f7acf9ea93 wike-3.0.1.tar.gz +" diff --git a/community/wimlib/APKBUILD b/community/wimlib/APKBUILD index eda94950d62..d73205dbb87 100644 --- a/community/wimlib/APKBUILD +++ b/community/wimlib/APKBUILD @@ -1,7 +1,7 @@ # Contributor: alealexpro100 <alealexn@gmail.com> # Maintainer: alealexpro100 <alealexn@gmail.com> pkgname=wimlib -pkgver=1.14.3 +pkgver=1.14.4 pkgrel=0 pkgdesc="Create, extract, and modify Windows Imaging archives" url="https://wimlib.net/" @@ -23,7 +23,7 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --with-fuse \ - --with-ntfs-3g \ + --with-ntfs-3g make } @@ -36,6 +36,6 @@ package() { } sha512sums=" -397121a355e3577eb75590c58d6a00e400c52b5352311fa44a9d7dcc443f409dca14796ba74a807ce893d3cb24072ac642441ec22dc334b34a76d9dd5d135d32 wimlib-1.14.3.tar.gz +f3c25ee14fe849f452f004ce8137ef040410ea048555ae71180086f010858b6ed593c8881b805bac65f9ee878bf11661a7f17677c6c24e2c77149c35ee0cd853 wimlib-1.14.4.tar.gz 48a70d6b32ba4c8d6faeca6e4dfc2ed83523c979d714c6dd8ef024cb7913b0240f35a671280ff7aa0b534ec8384b5f4f575c5f5ab70ce743741e8213017a0952 rename.patch " diff --git a/community/wireplumber/APKBUILD b/community/wireplumber/APKBUILD index 8232d965d35..d861ac9455e 100644 --- a/community/wireplumber/APKBUILD +++ b/community/wireplumber/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: team/alpine-desktop <bribbers@disroot.org> pkgname=wireplumber -pkgver=0.5.1 -pkgrel=1 +pkgver=0.5.2 +pkgrel=0 pkgdesc="Session / policy manager implementation for PipeWire" url="https://pipewire.org/" arch="all" @@ -75,5 +75,5 @@ logind() { } sha512sums=" -fecdbdb8ea7d6e38c85f4678201148ffb5e3a069fc28db9a2d510d3e90d0162c1b1a9dc4c7022e6a26cdd0f45c4f3cdf366f439105ab9834c8c29695e26bd8ad wireplumber-0.5.1.tar.gz +d9228a4ca1be08d0358af9fe9fb5475b04d5e93c5ce0188928bc45f0967ad25a60b458bc33844b0a1cb728b9a57d35c6172948ddcb387119b1939677039aadc7 wireplumber-0.5.2.tar.gz " diff --git a/community/wlcs/APKBUILD b/community/wlcs/APKBUILD index c7714686340..d3f5de56a7f 100644 --- a/community/wlcs/APKBUILD +++ b/community/wlcs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=wlcs pkgver=1.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="Wayland Conformance Test Suite" url="https://github.com/MirServer/wlcs" arch="all" diff --git a/community/wlogout/APKBUILD b/community/wlogout/APKBUILD index de583a2ad2b..ab7651350e2 100644 --- a/community/wlogout/APKBUILD +++ b/community/wlogout/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=wlogout -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=0 pkgdesc="A wayland based logout menu" url="https://github.com/ArtsyMacaw/wlogout" @@ -38,7 +38,7 @@ package() { } sha512sums=" -b23e0678702d9edaa631b2e70c3ac21480ae58f73f5f6f0e297837a0121ac9cc2f04594f57e06368e7475824e2c436bd4987cfa6789a5b0e94a68e8ba2908758 wlogout-1.2.1.tar.gz +b95bda6b7ac6aab525e18d0a7d4f24d2bb486567e2392503896921d49ef728f571a28458c88edf2d788539d551c46941006c1248d2052a216b33b63e72448e6f wlogout-1.2.2.tar.gz 78bf4e56b1bb301e955fbc9992b03c0400d90245c026e9537f130d0e619f14579492fc76519ce35ba895d7b8ea71977b7aaa36286d7214343b96ce8afd9d9f5d fish.patch e57e70cf0b28af85a522899f5ae490efcfd24f79173bde758c90d433a33caf25994c37b4c7de9ef06eee74738a43ee5427d53bcd121696c1a6248467b2db009c default-layout.patch " diff --git a/community/wlroots/APKBUILD b/community/wlroots/APKBUILD index ca39442689d..f92495ab523 100644 --- a/community/wlroots/APKBUILD +++ b/community/wlroots/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Henrik Riomar <henrik.riomar@gmail.com> # Maintainer: Michał Polański <michal@polanski.me> pkgname=wlroots -pkgver=0.17.2 +pkgver=0.17.3 pkgrel=0 pkgdesc="Modular Wayland compositor library" url="https://gitlab.freedesktop.org/wlroots/wlroots" @@ -47,5 +47,5 @@ package() { } sha512sums=" -118361f4436371241215775ddc5b346f14a9d74e19d0642f724ed766bed8348d78ccc120ef806ac9393eb2cee8e97dde7041ed999a468db13a7176fc7d6fca9e wlroots-0.17.2.tar.gz +48be2b762912225258ab925552d552589c258e413f6c5c518c63be0e09891607c06bf09547f1fb5fdecb74ae1ef0fd5947b17a3bdc396e0e7ffbce2256e6edf4 wlroots-0.17.3.tar.gz " diff --git a/community/wlsunset/APKBUILD b/community/wlsunset/APKBUILD index 51019a5321b..62d8df0a997 100644 --- a/community/wlsunset/APKBUILD +++ b/community/wlsunset/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=wlsunset -pkgver=0.3.0 +pkgver=0.4.0 pkgrel=0 pkgdesc="Day/night gamma adjustments for Wayland" url="https://git.sr.ht/~kennylevinsen/wlsunset" @@ -25,5 +25,5 @@ package() { } sha512sums=" -0685989ec99d7066d5d1efacfbb4676d2df235d33d64cfe3d41c762ccc2ff5c292e03430414b43d719c35ddc0ad8267b765764c15afd1b3177ed1e0bb6f449c1 wlsunset-0.3.0.tar.gz +f72a067a5458931a6394bbccfa1ec5d3790beb5ccce42f2ad865ac6e839c5996363c0806636e337358c8d14cd0a73cb3db37bfc6f3faf26fee2e40a837f69efa wlsunset-0.4.0.tar.gz " diff --git a/community/wpewebkit/APKBUILD b/community/wpewebkit/APKBUILD index e4a0adfc654..29a51175c10 100644 --- a/community/wpewebkit/APKBUILD +++ b/community/wpewebkit/APKBUILD @@ -46,6 +46,7 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://wpewebkit.org/releases/wpewebkit-$pkgver.tar.xz armv6kz.patch initial-exec.patch + libxml2-2.12.patch patch-gettext.patch " options="!check" @@ -112,5 +113,6 @@ sha512sums=" 5874eedb6c605ee0663bf70f75c35b7badb3330bcd1bd36671ac3be1beee1bf27f0cfc1875fa5c1841ceb0030c0e7bd278fae7877921c29f365a5c377d8f134d wpewebkit-2.40.5.tar.xz 8c89d4ac737a2bd6d970fec3ecb9d0b72d61ffb9a37d4b0b56bc0106914398a65319e940c593c0305fc40d6900aac2a8b4fc3bafc9a96062063d15abd1f5039d armv6kz.patch 26f3df81758068a83bf770e1f8b48546e9ec2428d23cbc4e1c5cc7851c91ad1dfeeac89aea73568a5f498cd6c053aaab7e1af67e59a471ad2d0375c1c64cbd8a initial-exec.patch +d583ddc3d99fe6231c7073c6c8961e7ec7c418464d512a31efaced4a9f686712b3b48536ab9703cf602874f8e0209102fe1d9100936b80fd216eb758aceea6a2 libxml2-2.12.patch 4316330f0c42fcfe800210bdbeabbb6bdcf532b71e2761550b8a753499d801fd0405cc961a516dfddfc28c3a6cf0c17b6db461ff51158238b8d874bf75b799f2 patch-gettext.patch " diff --git a/community/wpewebkit/libxml2-2.12.patch b/community/wpewebkit/libxml2-2.12.patch new file mode 100644 index 00000000000..387e5392989 --- /dev/null +++ b/community/wpewebkit/libxml2-2.12.patch @@ -0,0 +1,58 @@ +Patch-Source: https://github.com/WebPlatformForEmbedded/WPEWebKit/commit/2c9d24b8ef008a7319cd3901e82bfd44463f76d7.patch +-- +From 2c9d24b8ef008a7319cd3901e82bfd44463f76d7 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro <aperez@igalia.com> +Date: Mon, 20 Nov 2023 07:42:30 -0800 +Subject: [PATCH] Build fails with libxml2 version 2.12.0 due to API change + https://bugs.webkit.org/show_bug.cgi?id=265128 + +Reviewed by Philippe Normand. + +Starting with libxml2 2.12.0, the API has changed the const-ness of the +xmlError pointers, which results in a build error due to a mismatched +type in the parsing error callback. This papers over the difference by +using preprocessor conditionals. + +* Source/WebCore/xml/XSLTProcessor.h: Use const when building against + libxml2 2.12.0 or newer. +* Source/WebCore/xml/XSLTProcessorLibxslt.cpp: +(WebCore::XSLTProcessor::parseErrorFunc): Ditto. + +Canonical link: https://commits.webkit.org/270977@main +--- + Source/WebCore/xml/XSLTProcessor.h | 4 ++++ + Source/WebCore/xml/XSLTProcessorLibxslt.cpp | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/Source/WebCore/xml/XSLTProcessor.h b/Source/WebCore/xml/XSLTProcessor.h +index 80813f441ae11..1743411bb30bc 100644 +--- a/Source/WebCore/xml/XSLTProcessor.h ++++ b/Source/WebCore/xml/XSLTProcessor.h +@@ -61,7 +61,11 @@ class XSLTProcessor : public RefCounted<XSLTProcessor> { + + void reset(); + ++#if LIBXML_VERSION >= 21200 ++ static void parseErrorFunc(void* userData, const xmlError*); ++#else + static void parseErrorFunc(void* userData, xmlError*); ++#endif + static void genericErrorFunc(void* userData, const char* msg, ...); + + // Only for libXSLT callbacks +diff --git a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp +index c4da91141be7d..5c7135027ea08 100644 +--- a/Source/WebCore/xml/XSLTProcessorLibxslt.cpp ++++ b/Source/WebCore/xml/XSLTProcessorLibxslt.cpp +@@ -62,7 +62,11 @@ void XSLTProcessor::genericErrorFunc(void*, const char*, ...) + // It would be nice to do something with this error message. + } + ++#if LIBXML_VERSION >= 21200 ++void XSLTProcessor::parseErrorFunc(void* userData, const xmlError* error) ++#else + void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error) ++#endif + { + PageConsoleClient* console = static_cast<PageConsoleClient*>(userData); + if (!console) diff --git a/community/wt/APKBUILD b/community/wt/APKBUILD index 30476f6a694..836824789fd 100644 --- a/community/wt/APKBUILD +++ b/community/wt/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=wt pkgver=4.10.0 -pkgrel=0 +pkgrel=2 pkgdesc="C++ library and application server for developing and deploying web applications" url="https://www.webtoolkit.eu/" arch="all" diff --git a/community/wvkbd/APKBUILD b/community/wvkbd/APKBUILD index 7456e2ca917..e00e7654126 100644 --- a/community/wvkbd/APKBUILD +++ b/community/wvkbd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Maarten van Gompel <proycon@anaproy.nl> # Maintainer: Willow Barraco <contact@willowbarraco.fr> pkgname=wvkbd -pkgver=0.14.4 +pkgver=0.15 pkgrel=0 pkgdesc="On-screen keyboard for wlroots that sucks less" url="https://git.sr.ht/~proycon/wvkbd" @@ -22,5 +22,5 @@ package() { } sha512sums=" -1e882ba33a8c7ad87fcb2e676edb06484f3eaf4d3e1c4d3161abd24378653cf6076def12677faa831ec4dc20dcdb8a4cb367683fdc4033bca181e072230187b3 wvkbd-v0.14.4.tar.gz +a04e339b9b8afd784937126ef04875f5afe9278019ef122e36830667e1f1f6b7dfbf9e55209ab9740f4b9a70d562909d750be6d857e9c65c8bca00f072d4ad01 wvkbd-v0.15.tar.gz " diff --git a/testing/x11-calc/APKBUILD b/community/x11-calc/APKBUILD index 437e1bc11aa..87995d61f73 100644 --- a/testing/x11-calc/APKBUILD +++ b/community/x11-calc/APKBUILD @@ -1,9 +1,9 @@ # Contributor: macmpi <spam@ipik.org> # Maintainer: macmpi <spam@ipik.org> pkgname=x11-calc -pkgver=0.14.0147 +pkgver=0.14.0154 pkgrel=0 -pkgdesc="An HP calculator emulator" +pkgdesc="HP Calculator Simulator" url="https://github.com/mike632t/x11-calc" arch="all" license="GPL-3.0-or-later" @@ -11,6 +11,7 @@ makedepends="libx11-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/mike632t/x11-calc/archive/refs/tags/v$pkgver.tar.gz" # does not have any tests options="!check" +subpackages="$pkgname-prg:prg:noarch" build() { make @@ -20,6 +21,13 @@ package() { make DESTDIR="$pkgdir" prefix=/usr DESKTOP=freedesktop install } +prg() { + pkgdesc="Sample calculators saves & programs for $pkgname" + depends="$pkgname=$pkgver-r$pkgrel" + + amove usr/share/x11-calc/prg +} + sha512sums=" -8baf896c55b4b18bb7087d039d60a98d8cc4063bd7aabab8c462f773508e7841b300904c502eaf381d5771a2b853b2a1bd2d4b6826cadf39d5299212dee33714 x11-calc-0.14.0147.tar.gz +dc66e74729f28f066cce4e1657ccb2919b9279d99a48958d4e0f0bf67023ed25d14f0087576c1dc3823fb1661c3f2835a9c36e948a6cfd645b90614c6db15059 x11-calc-0.14.0154.tar.gz " diff --git a/community/xdg-desktop-portal-gnome/APKBUILD b/community/xdg-desktop-portal-gnome/APKBUILD index 9e833f12b16..b8dd8185e90 100644 --- a/community/xdg-desktop-portal-gnome/APKBUILD +++ b/community/xdg-desktop-portal-gnome/APKBUILD @@ -1,7 +1,7 @@ # Contributor: knuxify <knuxify@gmail.com> # Maintainer: team/gnome <knuxify@gmail.com> pkgname=xdg-desktop-portal-gnome -pkgver=46.0 +pkgver=46.1 pkgrel=0 pkgdesc="backend implementation for xdg-desktop-portal for the GNOME desktop environment" url="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome" @@ -38,5 +38,5 @@ package() { } sha512sums=" -39d7364c343eac98fb65ddec2316570a28e7d2610ba583e43f24b68f3476316baba7149417a098cd568288d657b329995655315e89c008112f942d0988af3ac7 xdg-desktop-portal-gnome-46.0.tar.xz +deac695606731a910c4a4b0874c7d2d3a7a218b91c583ab07a6d9f7bbf5356f86e5adc2c1170965e81a3a472d238fcdb4953681d55aa3128beb3f6f36d66f332 xdg-desktop-portal-gnome-46.1.tar.xz " diff --git a/community/xdg-desktop-portal-kde/APKBUILD b/community/xdg-desktop-portal-kde/APKBUILD index 158e45e9db1..5770189bf29 100644 --- a/community/xdg-desktop-portal-kde/APKBUILD +++ b/community/xdg-desktop-portal-kde/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=xdg-desktop-portal-kde -pkgver=6.0.3 +pkgver=6.0.4 pkgrel=0 pkgdesc="A backend implementation for xdg-desktop-portal that is using Qt/KDE" # armhf blocked by extra-cmake-modules @@ -55,5 +55,5 @@ package() { } sha512sums=" -1f297332cbfce92c05e064cc073d67440c362f80975baee55804c17eb1d11ab19dc4771f6ce94435bb514f14b772038024b10bd2238cc02627765154b229d18a xdg-desktop-portal-kde-6.0.3.tar.xz +7682ffc69315c4319404c13f1c29016c5ae6f4f60233fa41f035cf4532b8f56f976969536aec52ca0cc676a2399ee04e04a06972dbf598d36e0c89e0b5f92669 xdg-desktop-portal-kde-6.0.4.tar.xz " diff --git a/community/xdg-desktop-portal/APKBUILD b/community/xdg-desktop-portal/APKBUILD index 60728b9ce86..35554aacae3 100644 --- a/community/xdg-desktop-portal/APKBUILD +++ b/community/xdg-desktop-portal/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=xdg-desktop-portal -pkgver=1.18.3 -pkgrel=1 +pkgver=1.18.4 +pkgrel=0 pkgdesc="Desktop integration portal" url="https://github.com/flatpak/xdg-desktop-portal" arch="all" @@ -31,6 +31,7 @@ subpackages=" $pkgname-dev $pkgname-lang $pkgname-doc + $pkgname-dbg xdg-document-portal:_document_portal " source="https://github.com/flatpak/xdg-desktop-portal/releases/download/$pkgver/xdg-desktop-portal-$pkgver.tar.xz" @@ -43,6 +44,7 @@ build() { -Dsystemd=disabled \ -Dman-pages=enabled \ -Ddocbook-docs=disabled \ + -Ddebug=true \ . output meson compile -C output } @@ -74,5 +76,5 @@ _document_portal() { } sha512sums=" -aada58ac8ad5e15b509a3435b350f898b12e4638e09b1fd2f517e641e67991d5ae22ca32e0f2f0edfa902a4e1515a36b367b84040e95d27ef0b5b8092b768f55 xdg-desktop-portal-1.18.3.tar.xz +482676777e8180752e13ff485acab91de117f4ecf2aefd313a6f596df800f37d7004ee4ba1040009eb69a6efc780efc7dcd7e46b3f59c47bd9f21aef48d346de xdg-desktop-portal-1.18.4.tar.xz " diff --git a/community/xdm/APKBUILD b/community/xdm/APKBUILD index 2800f56abd0..00bed0ca04a 100644 --- a/community/xdm/APKBUILD +++ b/community/xdm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=xdm -pkgver=1.1.14 +pkgver=1.1.16 pkgrel=1 pkgdesc="X Display Manager" options="!check" # No testsuite @@ -61,9 +61,9 @@ package() { } sha512sums=" -8ed1d2c946916c24cb4b2de9326f65629c97e53b145312c9cb9c6e4308d8b47d67d3981319fbd4feac9b3ed436b9dfb24a1c905d37d7bcf07b49c18a68c7a6e4 xdm-1.1.14.tar.xz +a7e0aca67b770b3939aee2c12feac3c0f5efa531ec4a6045ab8b53d9c35b701ab5533447feb39b7cbe0df74ff8483ee1637314b847b37a6c3f7e9c8fdf5e172d xdm-1.1.16.tar.xz c9f5c20c298de4bb412c7df94adaf601e7d88fc9bd889540c32e9948be3aacc19074aae201ad4f1695f97483d4564b04c0720eacdb61cf9b97bc3394b781054e Xsession-loginshell.patch -e5a1c62d1ce62f3db5ffe13313f74d91f416cd08495aa1c780c728a3c58dd92473a08317334050c91fbf22a2cf4037a23a5baf4c31b5143ed2fac56f1ccdaf2f xdm.initd +58097e6df43f8942eaa99961ba1692bf4b9c5b8209eeed2735088f3c3ccada3528bca0e931ae32feb25fab6f933f2c0ce4c1c186ad423a411e493f60c47f2111 xdm.initd 9d08ee82afeb85e7d9e0a1013226a44bdbef8d6da227f5fef7734524861c41f0cdc9ba4616b2faaf3a8d4b16134115ed004bf0a5fcf71be7c6e13506fbcda95b xdm.confd 2a9db579323d680b6b3d7a0377ea1140c8570870c4f06f2ecc5e0ec73233b3621e46823ff3f694d8fa296a4de83b4fd62c2635c3c6b413b613ebe83cba4cf033 Xresources.alpinelinux 5d667541fdb39bdbd637da45e05a243736af32b7aa75ce27f2bbf097bce2fad87932619b372ab03add29b0bef7dd8816eb89875fbf2426eba83978d720687d90 Xresources.alpinelinux_old diff --git a/community/xdm/xdm.initd b/community/xdm/xdm.initd index 49529355d88..38e867cbb1c 100644 --- a/community/xdm/xdm.initd +++ b/community/xdm/xdm.initd @@ -9,9 +9,9 @@ command=/usr/bin/xdm command_args="${xdm_opts}" command_args_foreground="-nodaemon" -depends() { +depend() { provide display-manager - needs localmount + need localmount } # uses the openrc templates for start()/stop() diff --git a/community/xfce4-statusnotifier-plugin/APKBUILD b/community/xfce4-statusnotifier-plugin/APKBUILD index 976677a933d..d5cf9377d33 100644 --- a/community/xfce4-statusnotifier-plugin/APKBUILD +++ b/community/xfce4-statusnotifier-plugin/APKBUILD @@ -10,6 +10,11 @@ makedepends="glib-dev libxfce4ui-dev xfce4-panel-dev libdbusmenu-gtk3-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-statusnotifier-plugin/${pkgver%.*}/xfce4-statusnotifier-plugin-$pkgver.tar.bz2" +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/xfce4-stopwatch-plugin/APKBUILD b/community/xfce4-stopwatch-plugin/APKBUILD index f3f0d3aed2c..eda7335f349 100644 --- a/community/xfce4-stopwatch-plugin/APKBUILD +++ b/community/xfce4-stopwatch-plugin/APKBUILD @@ -11,6 +11,11 @@ options="!check" # no testsuite subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-stopwatch-plugin/${pkgver%.*}/xfce4-stopwatch-plugin-$pkgver.tar.bz2" +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/xfce4-weather-plugin/APKBUILD b/community/xfce4-weather-plugin/APKBUILD index 1ee4ac295ab..b72c16b6111 100644 --- a/community/xfce4-weather-plugin/APKBUILD +++ b/community/xfce4-weather-plugin/APKBUILD @@ -1,13 +1,13 @@ # Contributor: knuxify <knuxify@gmail.com> -# Maintainer: knuxify <knuxify@gmail.com> +# Maintainer: pkgname=xfce4-weather-plugin -pkgver=0.11.1 +pkgver=0.11.2 pkgrel=1 pkgdesc="Weather plugin for the Xfce desktop environment" url="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin" arch="all" license="GPL-2.0-or-later" -makedepends="xfce4-panel-dev libxfce4ui-dev libsoup-dev libxml2-dev" +makedepends="xfce4-panel-dev libxfce4ui-dev libsoup-dev libxml2-dev json-c-dev upower-dev" subpackages="$pkgname-lang" source="https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/${pkgver%.*}/xfce4-weather-plugin-$pkgver.tar.bz2" @@ -34,5 +34,5 @@ package() { } sha512sums=" -625b2aab1ded60eb39171969cd67224569cf7477c0a6e47aa5600a4a09b4a2cecd4b830f4c01669e6f2289edd4e7d882b15d56526a1211b8b5b86141b585778f xfce4-weather-plugin-0.11.1.tar.bz2 +011868165b17501a8b5aacb0387c23be635a1f4037a49501a823cf4aeb2be77d40aad51a4f1d1ccb1057b49e82d4cce2b2cffb82d165cf695340fbab99665ae2 xfce4-weather-plugin-0.11.2.tar.bz2 " diff --git a/community/xh/APKBUILD b/community/xh/APKBUILD index 22dcf250bf0..30cde9621eb 100644 --- a/community/xh/APKBUILD +++ b/community/xh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=xh -pkgver=0.21.0 +pkgver=0.22.0 pkgrel=0 pkgdesc="Yet another HTTPie clone" url="https://github.com/ducaale/xh" @@ -58,5 +58,5 @@ package() { } sha512sums=" -0941f3d4f0336a30cf92ded36ecc8c8341aa3e448b351223dd1415f28dbd47d17f4366a5b440eacc5c2d884f8d3148d820a89451cd9bc41bbc717c157dac9711 xh-0.21.0.tar.gz +8f7ba8ab5db5d498d022d92e7cad629838649a460dcfd180579a021d3825cd063b3274ef2dee818f07cb3412546f887c12463332ec55e12a0a1f0e4e211ec054 xh-0.22.0.tar.gz " diff --git a/testing/xmake/01-pkgconfig-libsv.patch b/community/xmake/01-pkgconfig-libsv.patch index 4b361f89815..4b361f89815 100644 --- a/testing/xmake/01-pkgconfig-libsv.patch +++ b/community/xmake/01-pkgconfig-libsv.patch diff --git a/testing/xmake/02-system-include.patch b/community/xmake/02-system-include.patch index 340c24808e3..340c24808e3 100644 --- a/testing/xmake/02-system-include.patch +++ b/community/xmake/02-system-include.patch diff --git a/testing/xmake/APKBUILD b/community/xmake/APKBUILD index 5cd0b40c927..8ec6727d0df 100644 --- a/testing/xmake/APKBUILD +++ b/community/xmake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: qaqland <qaq@qaq.land> # Maintainer: qaqland <qaq@qaq.land> pkgname=xmake -pkgver=2.8.9 +pkgver=2.9.1 pkgrel=0 pkgdesc="A cross-platform build utility based on Lua" url="https://xmake.io/" @@ -81,7 +81,7 @@ package() { } sha512sums=" -4eb4a8e607c9edb79409d805645669acbd2d676c572135b1a14356ed6b68b3501fdc120fcdcc69792a1389f0b1d643c1ed46ad705d172c26356f9975891e23a8 xmake-2.8.9.tar.gz +9e5bbab9c3025c522af5d4cd8e1349a641147fd53618ba6ab223491cc08bf3bf99b3e1d5d4910de55007dd575f79451d31806aa9d83d69c72b55b48c05e4c3a6 xmake-2.9.1.tar.gz a2799a33230c849102f27e15c44b3972691132f551d7a571ed5c8d99a628d2f1923f093bcc41cc2b11c9fd431dfa4b2cb71438530ed3fe2c2daa656530a2fccc 01-pkgconfig-libsv.patch 735560bb8a148818b3c1efeac612c2873c473fd6727e749de78053442fda09919e51292f1aae71e49e5b22ab432da0a981d2d7505bd6e25ae02e4b40b6084279 02-system-include.patch " diff --git a/community/xmrig/APKBUILD b/community/xmrig/APKBUILD index b27dd261cc3..bddd5c876fc 100644 --- a/community/xmrig/APKBUILD +++ b/community/xmrig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Oleg Titov <oleg.titov@gmail.com> # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=xmrig -pkgver=6.21.2 +pkgver=6.21.3 pkgrel=0 pkgdesc="XMRig is a high performance Monero (XMR) miner" url="https://xmrig.com/" @@ -46,6 +46,6 @@ package() { } sha512sums=" -e6fefa091c5884ebd30a938472032efcf68fccde1ba492bd045dc50fef1ec95bb951bbbf1ed1832670bc241400629754f31318477ae634080a89790e9fa27957 xmrig-6.21.2.tar.gz +91e92f61e385b75715b0b00fcb772bf997f3db19ef47f43c4bda3662aec6276273551ac915a7a6eeef253deb8da5b0ec0b45e02f0b84211ab8f0f5a37f34c87e xmrig-6.21.3.tar.gz 40cd7e3a884920951ec48efebbea5d7181deaeef6a226444a46ad8dc83b54eceae954c8d28952c21d63a15a4947eac72d1024b83684b5cb15437d3c8d32b006a enable-donateless-mode.patch " diff --git a/community/xournalpp/APKBUILD b/community/xournalpp/APKBUILD index 56f5372654b..d00684e2791 100644 --- a/community/xournalpp/APKBUILD +++ b/community/xournalpp/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.2.3 pkgrel=0 pkgdesc="Xournal++ is a handwriting notetaking software with PDF annotation support" url="https://github.com/xournalpp/xournalpp" -arch="all !s390x !riscv64" +arch="all !s390x !riscv64 !loongarch64" license="GPL-2.0-or-later" depends="adwaita-icon-theme" makedepends=" diff --git a/testing/xplr/APKBUILD b/community/xplr/APKBUILD index 2de0488e31b..316b4e30866 100644 --- a/testing/xplr/APKBUILD +++ b/community/xplr/APKBUILD @@ -1,19 +1,19 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=xplr -pkgver=0.21.5 -pkgrel=2 +pkgver=0.21.8 +pkgrel=0 pkgdesc="Hackable, minimal, fast TUI file explorer" url="https://xplr.dev" # s390x: nix crate arch="all !s390x" license="MIT" -makedepends="cargo lua5.4-dev cargo-auditable" +makedepends="cargo cargo-auditable lua5.4-dev" options="net" subpackages="$pkgname-doc" source=" https://github.com/sayanarijit/xplr/archive/refs/tags/v$pkgver/xplr-$pkgver.tar.gz - remove-vendored-lua.patch modified-field-lua54.patch + mlua-lua54.patch " prepare() { @@ -23,7 +23,8 @@ prepare() { } build() { - cargo auditable build --release --frozen + cargo auditable build --release --frozen \ + --no-default-features } check() { @@ -54,7 +55,7 @@ package() { } sha512sums=" -4f6323d123e3963c1b427df55200771f2d3cf2d8cfc07dac488d513215030bf98c96bdcbdf5b801f319afd3fd780c82abfbc6b212a6178bdfae86f798dd0f0df xplr-0.21.5.tar.gz -65886618305c63119e3be0e08f4fae7f9b63ad479767f1abe40c6de56356619caddc5b360f05018e64c758f59780bd265e51796d2fd29d95e41bffebe16abc6e remove-vendored-lua.patch -9a4109b0988065ce4ae79535238c447e281f6e730957faab2c48b6a0c861eac2a6263c5cac24bc8dbdaa37e442e4c52ea4279b52d4e75df9a5ea1f0e3321728e modified-field-lua54.patch +e98f52762aa1b8d8d5c061bc0d10615328d9ba99bfce306ad7a302605798f54d4834a85203a773ca505acd875843414d3834fd335f2176ee88545bb4113a79d9 xplr-0.21.8.tar.gz +ef2b2316c6de14c6d611a8a232a43c4d5e057a88d47a43c019b39c6a3923dbd0065b38e66da063963fed9f62d380e90383259ad94248e79a3a1be06cf8ad3cef modified-field-lua54.patch +1cebc131e53a1728d94eac0f5abd26858d1c499bb421567c294b7e3a3031546f66fac51b6ecd765dfe618b3a83a5d8a16e1fce71f85b8432ccaa1e48104294fc mlua-lua54.patch " diff --git a/community/xplr/mlua-lua54.patch b/community/xplr/mlua-lua54.patch new file mode 100644 index 00000000000..931bbe49dc7 --- /dev/null +++ b/community/xplr/mlua-lua54.patch @@ -0,0 +1,11 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -73,7 +73,7 @@ features = ['serde'] + + [dependencies.mlua] + version = "0.9.6" +-features = ['luajit', 'serialize', 'send'] ++features = ['lua54', 'serialize', 'send'] + + [dependencies.tui-input] + version = "0.8.0" diff --git a/testing/xplr/modified-field-lua54.patch b/community/xplr/modified-field-lua54.patch index 4c394f8584b..1d634e0714d 100644 --- a/testing/xplr/modified-field-lua54.patch +++ b/community/xplr/modified-field-lua54.patch @@ -2,7 +2,7 @@ Switch to ISO 8601 while we're at it, but the important change here is to round down to a value that tostring() can always handle. --- a/src/init.lua +++ b/src/init.lua -@@ -3046,7 +3046,7 @@ end +@@ -3215,7 +3215,7 @@ end -- Renders the fifth column in the table xplr.fn.builtin.fmt_general_table_row_cols_4 = function(m) diff --git a/community/xscreensaver/APKBUILD b/community/xscreensaver/APKBUILD index 18611d9d1bd..73744a5d28a 100644 --- a/community/xscreensaver/APKBUILD +++ b/community/xscreensaver/APKBUILD @@ -40,6 +40,11 @@ _confdir=/usr/share/xscreensaver/config # 6.02-r0: # - CVE-2021-34557 +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/xsimd/APKBUILD b/community/xsimd/APKBUILD index 2a1f6627d70..50eb48c7f30 100644 --- a/community/xsimd/APKBUILD +++ b/community/xsimd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=xsimd -pkgver=12.1.1 +pkgver=13.0.0 pkgrel=0 pkgdesc="C++ wrappers for SIMD intrinsics and parallelized, optimized mathematical functions (SSE, AVX, NEON, AVX512)" url="https://github.com/xtensor-stack/xsimd" @@ -39,6 +39,6 @@ package() { } sha512sums=" -8e45a8e9b28358d5f20f713ea19a8c366edc62790c27984149f283dfe808d78a549c8ec465e8b3677d7e30b2cb80093908de364bbb9dc80683f5fdfb843131e1 xsimd-12.1.1.tar.gz +cdc42ddad3353297cf25ea2b6b3f09967f5f388efc26241f2997979fdbbac072819ff771145bc5bfa86cb326cca84b4119e8e6e3f658407961cf203a40603a7f xsimd-13.0.0.tar.gz b7cbd3ccf71c73e8cc670a76daf864803ec1080ca0312e876d20e8219fcc535807bdd5def6f4dca3a1cad7977fa16781d8ea55f87a87983298b71eebe4c5d754 failed-tests.patch " diff --git a/community/yadifa/APKBUILD b/community/yadifa/APKBUILD index b595b88ec22..1af14d86a4b 100644 --- a/community/yadifa/APKBUILD +++ b/community/yadifa/APKBUILD @@ -11,7 +11,7 @@ license="BSD-3-Clause" makedepends="openssl-dev" install="$pkgname.post-install" subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" -source="$pkgname-$pkgver.tar.gz::https://www.yadifa.eu/sites/default/files/releases/yadifa-$pkgver-$_buildnr.tar.gz +source="$pkgname-$pkgver.tar.gz::https://yadifa.eu/sites/default/files/releases/yadifa-$pkgver-$_buildnr.tar.gz no-execinfo.patch remove-backtrace.patch $pkgname.initd diff --git a/community/yambar/APKBUILD b/community/yambar/APKBUILD index ffdd1655275..04a6ea51810 100644 --- a/community/yambar/APKBUILD +++ b/community/yambar/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=yambar -pkgver=1.10.0 -pkgrel=1 +pkgver=1.11.0 +pkgrel=0 pkgdesc="Modular status panel for X11 and Wayland, inspired by Polybar" url="https://codeberg.org/dnkl/yambar" license="MIT" @@ -29,7 +29,9 @@ makedepends=" " checkdepends="font-dejavu" subpackages="$pkgname-doc $pkgname-dev $pkgname-zsh-completion" -source="$pkgname-$pkgver-1.tar.gz::https://codeberg.org/dnkl/yambar/archive/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://codeberg.org/dnkl/yambar/archive/$pkgver.tar.gz + fix-missing-break-in-switch-statement.patch + " builddir="$srcdir/$pkgname" build() { @@ -46,5 +48,6 @@ package() { } sha512sums=" -f7f6392a855bba2b940e050dbf4030652c883e003c1bd185bfad8ffd01d6d968e7cc25baf749efd0cc64e72713565c1c60ade1d161ac2d1177efb4ec201c1db0 yambar-1.10.0-1.tar.gz +af932799916316b152767be2ba57b53d4eba38ab295731a96a29ca20d70e3df30163ebe55981a98b540cef43412ac635d55d477fdf2d9b5a47f7dc5c34985272 yambar-1.11.0.tar.gz +8fe81e384d3442ea4b9b6ebf375c229f455314a04a8ba78b4dc34080dd48ea58e1f0f0c5695fe718977bcb52b0af054412c1f49423124a1cae6aa10e360b7b33 fix-missing-break-in-switch-statement.patch " diff --git a/community/yambar/fix-missing-break-in-switch-statement.patch b/community/yambar/fix-missing-break-in-switch-statement.patch new file mode 100644 index 00000000000..5ba08e600c7 --- /dev/null +++ b/community/yambar/fix-missing-break-in-switch-statement.patch @@ -0,0 +1,14 @@ +https://codeberg.org/dnkl/yambar/pulls/378 +--- +diff --git a/modules/network.c b/modules/network.c +index 4bb0fb2..adb8f68 100644 +--- a/modules/network.c ++++ b/modules/network.c +@@ -595,6 +595,7 @@ handle_link(struct module *mod, uint16_t type, const struct ifinfomsg *msg, size + iface->name = strdup((const char *)RTA_DATA(attr)); + LOG_DBG("%s: index=%d", iface->name, iface->index); + mtx_unlock(&mod->lock); ++ break; + case IFLA_OPERSTATE: { + uint8_t operstate = *(const uint8_t *)RTA_DATA(attr); + if (iface->state == operstate) diff --git a/community/yq-go/APKBUILD b/community/yq-go/APKBUILD new file mode 100644 index 00000000000..d7c1e685833 --- /dev/null +++ b/community/yq-go/APKBUILD @@ -0,0 +1,60 @@ +# Contributor: Hoang Nguyen <folliekazetani@protonmail.com> +# Contributor: Tuan Hoang <tmhoang@linux.ibm.com> +# Maintainer: Tuan Hoang <tmhoang@linux.ibm.com> +pkgname=yq-go +_projname=yq +pkgver=4.43.1 +pkgrel=1 +pkgdesc="Portable command-line YAML processor written in Go" +url="https://github.com/mikefarah/yq" +arch="all" +license="MIT" +makedepends="go" +checkdepends="bash tzdata" +replaces="yq~=4.0" # backward compatibility (Alpine <3.20) +subpackages=" + $pkgname-bash-completion + $pkgname-zsh-completion + $pkgname-fish-completion + " +source="$pkgname-$pkgver.tar.gz::https://github.com/mikefarah/yq/archive/v$pkgver.tar.gz" +builddir="$srcdir/$_projname-$pkgver" + +export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" +export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" +export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" + +build() { + go build -v -o yq + + ./yq shell-completion bash > yq.bash + ./yq shell-completion zsh > yq.zsh + ./yq shell-completion fish > yq.fish +} + +check() { + go test ./... + + # Yanked from scripts/acceptance.sh + for test in acceptance_tests/*.sh; do + echo "--------------------------------------------------------------" + echo "$test" + echo "--------------------------------------------------------------" + bash "$test" + done +} + +package() { + install -Dm755 yq "$pkgdir"/usr/bin/yq + + install -Dm644 yq.bash \ + "$pkgdir"/usr/share/bash-completion/completions/yq + install -Dm644 yq.zsh \ + "$pkgdir"/usr/share/zsh/site-functions/_yq + install -Dm644 yq.fish \ + "$pkgdir"/usr/share/fish/vendor_completions.d/yq.fish +} + +sha512sums=" +a3bb594421811db613118af5ba002e08ccb4b76a63ddf428bbdd4926cf8614217d67f47bfa4ad2c87361a96ade1841fde656fcf9ed700a8994333d61b9a80a8d yq-go-4.43.1.tar.gz +" diff --git a/community/yq/APKBUILD b/community/yq/APKBUILD index 0e8ea476913..6cd28bad00a 100644 --- a/community/yq/APKBUILD +++ b/community/yq/APKBUILD @@ -1,57 +1,50 @@ -# Contributor: Hoang Nguyen <folliekazetani@protonmail.com> -# Contributor: Tuan Hoang <tmhoang@linux.ibm.com> -# Maintainer: Tuan Hoang <tmhoang@linux.ibm.com> +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Jakub Jirutka <jakub@jirutka.cz> +# +# NOTE: yq and yq-go are NOT interchangeable, they have quite different CLI +# and syntax. Most distros package this Python implementation as "yq". pkgname=yq -pkgver=4.43.1 -pkgrel=1 -pkgdesc="Portable command-line YAML processor written in Go" -url="https://github.com/mikefarah/yq" -arch="all" -license="MIT" -makedepends="go" -checkdepends="bash tzdata" -subpackages=" - $pkgname-bash-completion - $pkgname-zsh-completion - $pkgname-fish-completion +pkgver=3.2.3 +pkgrel=0 +pkgdesc="jq wrapper for YAML/XML/TOML documents" +url="https://github.com/kislyuk/yq" +arch="noarch" +license="Apache-2.0" +depends=" + !yq-go + jq + py3-pyaml + py3-xmltodict + py3-tomlkit + py3-argcomplete " -source="$pkgname-$pkgver.tar.gz::https://github.com/mikefarah/yq/archive/v$pkgver.tar.gz" - -export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" -export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" -export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" +makedepends=" + py3-gpep517 + py3-setuptools + py3-wheel + " +checkdepends="py3-pytest" +subpackages="$pkgname-pyc" +install="$pkgname.post-upgrade" +source="https://github.com/kislyuk/yq/archive/v$pkgver/yq-$pkgver.tar.gz" +builddir="$srcdir/yq-$pkgver" build() { - go build -v -o yq + echo "version = '$pkgver'" > yq/version.py - ./yq shell-completion bash > yq.bash - ./yq shell-completion zsh > yq.zsh - ./yq shell-completion fish > yq.fish + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } check() { - go test ./... - - # Yanked from scripts/acceptance.sh - for test in acceptance_tests/*.sh; do - echo "--------------------------------------------------------------" - echo "$test" - echo "--------------------------------------------------------------" - bash "$test" - done + python3 ./test/test.py -v } package() { - install -Dm755 yq "$pkgdir"/usr/bin/yq - - install -Dm644 yq.bash \ - "$pkgdir"/usr/share/bash-completion/completions/yq - install -Dm644 yq.zsh \ - "$pkgdir"/usr/share/zsh/site-functions/_yq - install -Dm644 yq.fish \ - "$pkgdir"/usr/share/fish/vendor_completions.d/yq.fish + python3 -m installer -d "$pkgdir" .dist/*.whl } sha512sums=" -a3bb594421811db613118af5ba002e08ccb4b76a63ddf428bbdd4926cf8614217d67f47bfa4ad2c87361a96ade1841fde656fcf9ed700a8994333d61b9a80a8d yq-4.43.1.tar.gz +6238746d59511577fb0368ab43e3593c60dfb40dfebd7a01e475abf7171d27f7e0d2de9b03a3d95a554d82e181ddaf3cd030020853e7c9efad2f77914ea9c0ad yq-3.2.3.tar.gz " diff --git a/community/yq/yq.post-upgrade b/community/yq/yq.post-upgrade new file mode 100644 index 00000000000..b1969dad445 --- /dev/null +++ b/community/yq/yq.post-upgrade @@ -0,0 +1,19 @@ +#!/bin/sh + +ver_new="$1" +ver_old="$2" + +# NOTE: .pre-upgrade doesn't work here, that's why it's in .post-upgrade. +if [ "${ver_new%%.*}" = 3 ] && [ "${ver_old%%.*}" = 4 ]; then + cat >&2 <<-EOF + * + * Until Alpine 3.20, the yq package was mikefarah's Go implementation. Now the + * yq package is kislyuk's Python implementation (as in most distros), and the + * Go implementation has been renamed to yq-go. They are incompatible. + * + * If you want to keep the Go implementation: apk del yq && apk add yq-go + * + EOF +fi + +exit 0 diff --git a/community/ytdl-sub/APKBUILD b/community/ytdl-sub/APKBUILD index 456938302db..74ff419b189 100644 --- a/community/ytdl-sub/APKBUILD +++ b/community/ytdl-sub/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=ytdl-sub -pkgver=2024.03.19 -pkgrel=1 +pkgver=2024.04.28 +pkgrel=0 pkgdesc="tool for downloading media with yt-dlp and creating metadata" url="https://github.com/jmbannon/ytdl-sub" arch="noarch" @@ -54,5 +54,5 @@ package() { } sha512sums=" -08e51ce125608b3a4d5227e92330cbcc2bc3fdd6c49edaefb0a9a8683db92c35db881785a3735c8f0004cc637b78e537748898a3a2dbb074240b1a52c8032bd8 ytdl-sub-2024.03.19.tar.gz +dc8037804b5d0fb37f7caef7f14d763159dc7a34e2cc088a4c03b4a72682ed4aaa493012184bac502f04200e263f3c534e2e7666f72a870f7fa8068ca921ea48 ytdl-sub-2024.04.28.tar.gz " diff --git a/community/yubico-piv-tool/APKBUILD b/community/yubico-piv-tool/APKBUILD index de068cb5396..4b9f8ee1162 100644 --- a/community/yubico-piv-tool/APKBUILD +++ b/community/yubico-piv-tool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Christophe BERAUD-DUFOUR <christophe.berauddufour@gmail.com> # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=yubico-piv-tool -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=0 pkgdesc="PIV Tools for yubikey" url="https://developers.yubico.com/yubico-piv-tool" @@ -39,6 +39,6 @@ package() { } sha512sums=" -736aeeac3d9368699b33e928cfb5b54ad6aa1450acf734397bc689ba9ccc82077f46f7ea2bd06dd1457b91eb50f7a0231a57914b3ea2ff0f07d425b4d27b96e4 yubico-piv-tool-2.5.1.tar.gz +522a163be55dd92c2f18a779b64b1a163a6f81390757db34b58e909d896d78bcff30907eb8a2dc703d70133cdd71e2d3841d36d77cf7211351b5c825965dffd0 yubico-piv-tool-2.5.2.tar.gz 1475032b9588bb56026a9850a041e7e287502fc53a7efe038c11ea60d719c166199f990a2760ff18b31c57be287825553de76dc79faf59e9d4064bfa8c01b31f werror.patch " diff --git a/community/yubikey-manager/APKBUILD b/community/yubikey-manager/APKBUILD index c3d87321e38..1260d594f4a 100644 --- a/community/yubikey-manager/APKBUILD +++ b/community/yubikey-manager/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Daniel Everett <deverett@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=yubikey-manager -pkgver=5.3.0 -pkgrel=1 +pkgver=5.4.0 +pkgrel=0 pkgdesc="Python library and command line tool for configuring any YubiKey over all USB interfaces" url="https://developers.yubico.com/yubikey-manager/" arch="noarch" @@ -52,5 +52,5 @@ ykman() { } sha512sums=" -6cdcb10e490319344f3afb18a6826b4a83bd2ea388b2942b57b3e3eff7a21384df8e183989281eb30375dd371dfcfdf6504195144515439190f6c49f6b9e6a49 yubikey_manager-5.3.0.tar.gz +c773895957d17ceac8e944958435071fbb3a80469016a22aa13785a5bc009406870366e5b65d3d2ddbd2ed1722f84b377a49101f4db67f0d3c04daee852301b3 yubikey_manager-5.4.0.tar.gz " diff --git a/community/zabbix/APKBUILD b/community/zabbix/APKBUILD index 3ecd020bd69..65f314472c2 100644 --- a/community/zabbix/APKBUILD +++ b/community/zabbix/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=zabbix -pkgver=6.4.12 -pkgrel=2 +pkgver=6.4.14 +pkgrel=0 pkgdesc="Enterprise-class open source distributed monitoring" url="https://www.zabbix.com/" arch="all" @@ -291,7 +291,7 @@ agent2_openrc() { } sha512sums=" -bbac34febd7269c55fd490842fe6d6b11a879405b9aa73f4e1386ad2f24c8da00150f9b69ff37518ab37bc09d06ae20b35f6d68bdec5ddb3a48d02a515d14e3b zabbix-6.4.12.tar.gz +cbfa6313170dd0a0395535227f57f515d4638d9110f128fdd60ccf16519e75ff79a8a4af98fdb5c78cff1f95cf09c1ef3cb270b733d0004c8e75da330af59568 zabbix-6.4.14.tar.gz 9998ee172a28002d98bacc3f76038ff52b8cf2b206e101418d76b4ca3de94afaf92cb4f7a6235ecf177f74beb9dd3ea1f3983c4f164b4f60bb601acba65aa175 zabbix-server.initd 9c06527bf653c40585fa7eeb3f7a0b2fc454031d24cd0d1633aed87b78a681c5227a193c5b9fcfcea0839135874e27ba7dd9b198573f905f680a2856f79e9512 zabbix-server.confd 7beca0fc6e254c1692e0e74deb9eb3d06ac78f5f6b08f3ab0491861e11e09f00f57bb4d22e11517dab86456e87bd13110805bfb38a715d2f1e68549937b29c76 zabbix-agentd.initd diff --git a/community/zanshin/APKBUILD b/community/zanshin/APKBUILD index 63e35ab89d8..4013b945289 100644 --- a/community/zanshin/APKBUILD +++ b/community/zanshin/APKBUILD @@ -5,10 +5,11 @@ # group=kde-applications pkgname=zanshin pkgver=24.02.2 -pkgrel=0 +pkgrel=1 # armhf blocked by qt6-qtdeclarative # armv7, ppc64le and s390x blocked by qt6-qtwebengine -> akonadi-calendar -arch="all !armhf !armv7 !ppc64le !s390x !riscv64" +# loongarch64 blocked by akonadi-calendar +arch="all !armhf !armv7 !ppc64le !s390x !riscv64 !loongarch64" url="https://zanshin.kde.org/" pkgdesc="A Getting Things Done application which aims at getting your mind like water" license="(GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.0-or-later" diff --git a/community/zathura-cb/APKBUILD b/community/zathura-cb/APKBUILD index 2c3b48677e4..9e81dac0d09 100644 --- a/community/zathura-cb/APKBUILD +++ b/community/zathura-cb/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=zathura-cb pkgver=0.1.10 -pkgrel=3 +pkgrel=4 pkgdesc="Comic book support for zathura" url="https://git.pwmt.org/pwmt/zathura-cb" arch="all" diff --git a/community/zathura-djvu/APKBUILD b/community/zathura-djvu/APKBUILD index 589079f4951..d7f2c72ebf4 100644 --- a/community/zathura-djvu/APKBUILD +++ b/community/zathura-djvu/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Cormac Stephenson <c7s@kasku.net> pkgname=zathura-djvu pkgver=0.2.9 -pkgrel=3 +pkgrel=4 pkgdesc="djvu plugin for zathura" url="https://pwmt.org/projects/zathura-djvu/" arch="all" diff --git a/community/zathura-pdf-mupdf/APKBUILD b/community/zathura-pdf-mupdf/APKBUILD index 831f5409d48..fbf27252ef3 100644 --- a/community/zathura-pdf-mupdf/APKBUILD +++ b/community/zathura-pdf-mupdf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=zathura-pdf-mupdf pkgver=0.4.1 -pkgrel=13 +pkgrel=16 pkgdesc="mupdf plugin to zathura" url="https://git.pwmt.org/pwmt/zathura-pdf-mupdf" arch="all" diff --git a/community/zathura-pdf-poppler/APKBUILD b/community/zathura-pdf-poppler/APKBUILD index 6f16c574b3a..bb82f41cb5c 100644 --- a/community/zathura-pdf-poppler/APKBUILD +++ b/community/zathura-pdf-poppler/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch> pkgname=zathura-pdf-poppler pkgver=0.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Poppler plugin adds PDF support to zathura" options="!check" # No testsuite url="https://git.pwmt.org/pwmt/zathura-pdf-poppler" diff --git a/community/zathura-ps/APKBUILD b/community/zathura-ps/APKBUILD index fafd0c4b163..8b7cc250ef1 100644 --- a/community/zathura-ps/APKBUILD +++ b/community/zathura-ps/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch> pkgname=zathura-ps pkgver=0.2.7 -pkgrel=3 +pkgrel=4 pkgdesc="zathura-ps - plugin adds PostScript support to zathura" url="https://git.pwmt.org/pwmt/zathura-ps" arch="all" diff --git a/community/zathura/APKBUILD b/community/zathura/APKBUILD index 48a523e73cd..185f0ea0b14 100644 --- a/community/zathura/APKBUILD +++ b/community/zathura/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch> # Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch> pkgname=zathura -pkgver=0.5.5 +pkgver=0.5.6 pkgrel=0 pkgdesc="zathura - highly customizable and functional document viewer" url="https://git.pwmt.org/pwmt/zathura" @@ -33,10 +33,10 @@ subpackages=" $pkgname-zsh-completion $pkgname-fish-completion " -source="https://git.pwmt.org/pwmt/zathura/-/archive/$pkgver/zathura-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/pwmt/zathura/archive/refs/tags/$pkgver.tar.gz" case "$CARCH" in -ppc64le|s390x|riscv64) ;; +ppc64le|s390x|riscv64|loongarch64) ;; *) makedepends="$makedepends texlive-dev" ;; esac @@ -54,5 +54,5 @@ package() { } sha512sums=" -b26e5987c54361d15710c48c2ad54dd49d986c0629871d86fdfe91aae26662501ae8f620ebec5cad9078b25ee7bf46d3aa53764c16afee18c450b1142c429558 zathura-0.5.5.tar.gz +df518865bc559b97d7abebde2dae17cbd7bde6b9f8219338bd3a455a5d71b42f62299591b9c12c75a9a6f007b1179cb163722eaaf43ee86e6a6d9e2e25f63465 zathura-0.5.6.tar.gz " diff --git a/community/zeal/APKBUILD b/community/zeal/APKBUILD index 9a6302bcce5..4290cbc91d7 100644 --- a/community/zeal/APKBUILD +++ b/community/zeal/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.7.0 pkgrel=0 pkgdesc="Offline documentation browser inspired by Dash" url="https://zealdocs.org/" -arch="all !ppc64le !s390x !riscv64" # blocked by qt5-qtwebengine +arch="all !ppc64le !s390x !riscv64 !loongarch64" # blocked by qt5-qtwebengine license="GPL-3.0-only" depends="hicolor-icon-theme" makedepends=" diff --git a/community/zellij/APKBUILD b/community/zellij/APKBUILD index 50f8aaad1df..8a3c748f793 100644 --- a/community/zellij/APKBUILD +++ b/community/zellij/APKBUILD @@ -1,7 +1,7 @@ # Contributor: guddaff <guddaff@protonmail.com> # Maintainer: guddaff <guddaff@protonmail.com> pkgname=zellij -pkgver=0.39.2 +pkgver=0.40.0 pkgrel=0 pkgdesc="Terminal multiplexer" url="https://zellij.dev/" @@ -62,5 +62,5 @@ package() { } sha512sums=" -4f77adfdad74fce1ece1abee6a354dc5fb2d81470ad798a76713b0c1c429d47d37f34a1e7c26949023c57d1ce57531f60df9f4bb1a5d5badd6fadcd62ffb4d30 zellij-0.39.2.tar.gz +fb09f62f21292f862a8c060bbcad17294d0e2b0aaf4af03fdb2d7e438617d931aa8302cb0cfd4e3991fed5f1c2520c641f96216e861d5c3f2a356232fb09e7d3 zellij-0.40.0.tar.gz " diff --git a/community/zenith/APKBUILD b/community/zenith/APKBUILD index f8fb667b4a4..edaa27e485b 100644 --- a/community/zenith/APKBUILD +++ b/community/zenith/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=zenith -pkgver=0.14.0 -pkgrel=1 +pkgver=0.14.1 +pkgrel=0 pkgdesc="Sort of like htop but with zoom-able charts, CPU, GPU, network, disk usage" url="https://github.com/bvaisvil/zenith" # riscv64: couldn't verify - broken CI @@ -17,9 +17,7 @@ makedepends=" linux-headers llvm$_llvmver-dev " -source="https://github.com/bvaisvil/zenith/archive/$pkgver/zenith-$pkgver.tar.gz - update-linux-taskstats.patch - " +source="https://github.com/bvaisvil/zenith/archive/$pkgver/zenith-$pkgver.tar.gz" # !check: no tests provided # net: fetch dependencies options="!check net" @@ -42,6 +40,5 @@ package() { } sha512sums=" -dac74b0fa9e3563655dc1e9cbdda7e809791d2c9d865ba990dfbd020d6f01a52585595feb28f60fa4f3ada147dc21d2a953062c8b5eeecfa77be5bfc378a055a zenith-0.14.0.tar.gz -c71f8bd8fceec4a441b46d212b17ec08af1b595d9a034e145db821832a382094700913f29dc15721e13385afd1482b55f55cfb1be1be07638291966cd8bea954 update-linux-taskstats.patch +2936fc0a401995529c602a5b6dc81d9ceed5050f26c96fff117e5de5c0691cd8bf6badb5a2b29f2f2d5657527fc76ecded6ebb86e671be93c48043239647361c zenith-0.14.1.tar.gz " diff --git a/community/zenith/update-linux-taskstats.patch b/community/zenith/update-linux-taskstats.patch deleted file mode 100644 index 8112d6bfbd5..00000000000 --- a/community/zenith/update-linux-taskstats.patch +++ /dev/null @@ -1,414 +0,0 @@ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -39,4 +39,4 @@ - nvml-wrapper = { version = "0.8.0", optional = true } - unicode-width = "0.1.9" - [target.'cfg(target_os = "linux")'.dependencies] --linux-taskstats = { version = "0.2.0", default-features = false } -+linux-taskstats = { version = "0.4.0", default-features = false } ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -9,15 +9,6 @@ - checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - - [[package]] --name = "aho-corasick" --version = "0.7.15" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" --dependencies = [ -- "memchr", --] -- --[[package]] - name = "android_system_properties" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -27,15 +18,6 @@ - ] - - [[package]] --name = "ansi_term" --version = "0.12.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" --dependencies = [ -- "winapi", --] -- --[[package]] - name = "async-channel" - version = "1.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -146,7 +128,7 @@ - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.103", - ] - - [[package]] -@@ -156,17 +138,6 @@ - checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" - - [[package]] --name = "atty" --version = "0.2.14" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" --dependencies = [ -- "hermit-abi", -- "libc", -- "winapi", --] -- --[[package]] - name = "autocfg" - version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -183,15 +154,13 @@ - - [[package]] - name = "bindgen" --version = "0.59.2" -+version = "0.63.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -+checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" - dependencies = [ - "bitflags", - "cexpr", - "clang-sys", -- "clap", -- "env_logger 0.9.1", - "lazy_static", - "lazycell", - "log", -@@ -201,6 +170,7 @@ - "regex", - "rustc-hash", - "shlex", -+ "syn 1.0.103", - "which", - ] - -@@ -312,21 +282,6 @@ - ] - - [[package]] --name = "clap" --version = "2.34.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" --dependencies = [ -- "ansi_term", -- "atty", -- "bitflags", -- "strsim 0.8.0", -- "textwrap", -- "unicode-width", -- "vec_map", --] -- --[[package]] - name = "codespan-reporting" - version = "0.11.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -478,7 +433,7 @@ - "proc-macro2", - "quote", - "scratch", -- "syn", -+ "syn 1.0.103", - ] - - [[package]] -@@ -495,7 +450,7 @@ - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.103", - ] - - [[package]] -@@ -518,8 +473,8 @@ - "ident_case", - "proc-macro2", - "quote", -- "strsim 0.9.3", -- "syn", -+ "strsim", -+ "syn 1.0.103", - ] - - [[package]] -@@ -530,7 +485,7 @@ - dependencies = [ - "darling_core", - "quote", -- "syn", -+ "syn 1.0.103", - ] - - [[package]] -@@ -588,19 +543,6 @@ - - [[package]] - name = "env_logger" --version = "0.9.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" --dependencies = [ -- "atty", -- "humantime", -- "log", -- "regex", -- "termcolor", --] -- --[[package]] --name = "env_logger" - version = "0.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -@@ -710,7 +652,7 @@ - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.103", - ] - - [[package]] -@@ -783,7 +725,7 @@ - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.103", - ] - - [[package]] -@@ -969,12 +911,6 @@ - ] - - [[package]] --name = "humantime" --version = "2.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -- --[[package]] - name = "iana-time-zone" - version = "0.1.53" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1036,9 +972,9 @@ - - [[package]] - name = "libc" --version = "0.2.137" -+version = "0.2.140" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" -+checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" - - [[package]] - name = "libloading" -@@ -1061,9 +997,9 @@ - - [[package]] - name = "linux-taskstats" --version = "0.2.0" -+version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b5fe0070f80bc563d4fc21f2b064eb314a944ad167edb64dc76eb37fa8826401" -+checksum = "60fdd14efd42f7d3383f76d5da9cbc1056ac6497be7352eadfabef14a5d699c0" - dependencies = [ - "bindgen", - "libc", -@@ -1199,7 +1135,7 @@ - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.103", - ] - - [[package]] -@@ -1349,18 +1285,18 @@ - - [[package]] - name = "proc-macro2" --version = "1.0.47" -+version = "1.0.54" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -+checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" - dependencies = [ - "unicode-ident", - ] - - [[package]] - name = "quote" --version = "1.0.21" -+version = "1.0.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" - dependencies = [ - "proc-macro2", - ] -@@ -1420,20 +1356,18 @@ - - [[package]] - name = "regex" --version = "1.4.6" -+version = "1.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" -+checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" - dependencies = [ -- "aho-corasick", -- "memchr", - "regex-syntax", - ] - - [[package]] - name = "regex-syntax" --version = "0.6.27" -+version = "0.6.29" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - - [[package]] - name = "rustc-hash" -@@ -1470,7 +1404,7 @@ - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.103", - ] - - [[package]] -@@ -1577,12 +1511,6 @@ - - [[package]] - name = "strsim" --version = "0.8.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -- --[[package]] --name = "strsim" - version = "0.9.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" -@@ -1599,6 +1527,17 @@ - ] - - [[package]] -+name = "syn" -+version = "2.0.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "unicode-ident", -+] -+ -+[[package]] - name = "sysinfo" - version = "0.15.1" - source = "git+https://github.com/bvaisvil/sysinfo.git?branch=zenith_changes_15.1#bcff3dc5c5b53320c53984cef5773ed850001fd8" -@@ -1622,32 +1561,23 @@ - ] - - [[package]] --name = "textwrap" --version = "0.11.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" --dependencies = [ -- "unicode-width", --] -- --[[package]] - name = "thiserror" --version = "1.0.37" -+version = "1.0.40" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" -+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" - dependencies = [ - "thiserror-impl", - ] - - [[package]] - name = "thiserror-impl" --version = "1.0.37" -+version = "1.0.40" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" -+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 2.0.10", - ] - - [[package]] -@@ -1736,12 +1666,6 @@ - checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" - - [[package]] --name = "vec_map" --version = "0.8.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -- --[[package]] - name = "waker-fn" - version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1780,7 +1704,7 @@ - "once_cell", - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.103", - "wasm-bindgen-shared", - ] - -@@ -1802,7 +1726,7 @@ - dependencies = [ - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.103", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] -@@ -1936,7 +1860,7 @@ - "darling", - "proc-macro2", - "quote", -- "syn", -+ "syn 1.0.103", - ] - - [[package]] -@@ -1948,7 +1872,7 @@ - "chrono", - "crossterm", - "dirs-next", -- "env_logger 0.10.0", -+ "env_logger", - "flate2", - "futures", - "gumdrop", diff --git a/testing/zig/APKBUILD b/community/zig/APKBUILD index 44f118a6efa..d0248fe9feb 100644 --- a/testing/zig/APKBUILD +++ b/community/zig/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=zig -pkgver=0.11.0 -pkgrel=3 +pkgver=0.12.0 +pkgrel=0 pkgdesc="General-purpose programming language designed for robustness, optimality, and maintainability" url="https://ziglang.org/" # arm*, x86: fails to build (allocation failed) @@ -12,20 +12,20 @@ url="https://ziglang.org/" arch="x86_64 aarch64" license="MIT" install="$pkgname.pre-upgrade" -_llvmver=16 +_llvmver=17 +# will need switch to lld$_llvmver-dev later makedepends=" clang$_llvmver-dev cmake libxml2-dev - lld$_llvmver-dev + lld-dev llvm$_llvmver-dev samurai zlib-dev " provides="zig-dev=$pkgver-r$pkgrel" subpackages="$pkgname-doc" -source="zig-$pkgver-1.tar.xz::https://ziglang.org/download/$pkgver/zig-$pkgver.tar.xz - $pkgname-cbe-omit-trap-in-naked-fn-1.patch::https://github.com/ziglang/zig/commit/8c6a32ac28b9cccc9dd3f371c77458cac853b240.diff +source="https://ziglang.org/download/$pkgver/zig-$pkgver.tar.xz " build() { @@ -67,6 +67,5 @@ package() { } sha512sums=" -c19a8ae6d440a16dd5e77941fc77c036d1f284f1784376625e63b65f30b4acad62f9f4217bc818c401f88c2c33f8722f26fc467c3e23c29a89178c4b1882d1c4 zig-0.11.0-1.tar.xz -cac6500b4aa6eb2129d7df73315cbf487b05577a6d1a1e300bcc8a5e950fa00fb2143e26105b0348393df26edb6a0b23b60ffefe68fa7fcbad2bd4a597bd72a6 zig-cbe-omit-trap-in-naked-fn-1.patch +0c3d9396fea4905245c7e32ce6bd9b4ff140f061cd8a957929e4c84cf105f5bbcbf2e7c030013ac649edb569e909f65d928b3e8a86f35c9076fb62e996feea14 zig-0.12.0.tar.xz " diff --git a/testing/zig/zig.pre-upgrade b/community/zig/zig.pre-upgrade index a396aae7ec2..a396aae7ec2 100644 --- a/testing/zig/zig.pre-upgrade +++ b/community/zig/zig.pre-upgrade diff --git a/community/zigbee2mqtt/APKBUILD b/community/zigbee2mqtt/APKBUILD index 041b13af175..b11cb1e2695 100644 --- a/community/zigbee2mqtt/APKBUILD +++ b/community/zigbee2mqtt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=zigbee2mqtt -pkgver=1.36.1 +pkgver=1.37.0 pkgrel=0 pkgdesc="Zigbee to MQTT bridge" url="https://www.zigbee2mqtt.io/" @@ -121,7 +121,7 @@ dbg() { } sha512sums=" -f0bdb90135b6b42c4c772d10eeaf383784e8bec2e09bb01fe0c8747ceee6ecb879dc55c018004fce2ed073834b34ef05838a39296b5d82f9901b1b1a4f56bfae zigbee2mqtt-1.36.1.tar.gz +a60911e384c9404675ecee6f4433e486acc2b1371435d6982767e8488f597da543f9eac6d29c9598e2ec32db852a458aa374ef3ca6ad748217ccea9f7eb53169 zigbee2mqtt-1.37.0.tar.gz 8775de86a7a00e69cd6ec275f87458cd3b842547e2fc91dde9c1e74b61c751c798bf7d94274129ffbef2eac5c5954cfb0da0c37c5df141aa52a3d895dba823ac dont-build-on-start.patch dcb9c4cacdc3799d008ffc68868d83f64941bb5a00b555103868f1236e3a395c68d486fcaa6d7174422ec065994bf925a7aeed9537e07fe32e5093076eafcaba ungit.patch 30eb7ca0a65a99fd04d227853dba5f2d64d409948706cfc934f85217490d40fb06763404fa755817ca462905e130f6eaa42fbe81216247856f57154bca54b017 pan_id-secret.patch diff --git a/community/zlib-ng/APKBUILD b/community/zlib-ng/APKBUILD index a58afa146e2..113feac04ca 100644 --- a/community/zlib-ng/APKBUILD +++ b/community/zlib-ng/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=zlib-ng pkgver=2.1.6 -pkgrel=0 +pkgrel=1 pkgdesc="zlib replacement with optimizations for next generation systems" url="https://github.com/zlib-ng/zlib-ng" arch="all" @@ -10,7 +10,9 @@ license="Zlib" makedepends="cmake samurai" checkdepends="gzip xxd zlib-dev" subpackages="$pkgname-dev" -source="https://github.com/zlib-ng/zlib-ng/archive/$pkgver/zlib-ng-$pkgver.tar.gz" +source="https://github.com/zlib-ng/zlib-ng/archive/$pkgver/zlib-ng-$pkgver.tar.gz + fix-rvv-detection-riscv64.patch + " # secfixes: # 2.0.6-r0: @@ -47,4 +49,5 @@ package() { sha512sums=" 59ef586c09b9a63788475abfd6dd59ed602316b38f543f801bea802ff8bec8b55a89bee90375b8bbffa3bdebc7d92a00903f4b7c94cdc1a53a36e2e1fd71d13a zlib-ng-2.1.6.tar.gz +22433ea48e49688acc6ba318a629362e71a704fe148aa8d0cde00ab9c88603ad0923ea4b3d756fa5261fb56801535111ec277b8665f8ac51a2220a8351c09e73 fix-rvv-detection-riscv64.patch " diff --git a/community/zlib-ng/fix-rvv-detection-riscv64.patch b/community/zlib-ng/fix-rvv-detection-riscv64.patch new file mode 100644 index 00000000000..c673aff6e5d --- /dev/null +++ b/community/zlib-ng/fix-rvv-detection-riscv64.patch @@ -0,0 +1,25 @@ +diff --git a/arch/riscv/riscv_features.c b/arch/riscv/riscv_features.c +index b066f42..259a63a 100644 +--- a/arch/riscv/riscv_features.c ++++ b/arch/riscv/riscv_features.c +@@ -42,4 +42,20 @@ void Z_INTERNAL riscv_check_features(struct riscv_cpu_features *features) { + riscv_check_features_runtime(features); + else + riscv_check_features_compile_time(features); ++ if (features->has_rvv) { ++ size_t e8m1_vec_len; ++ int64_t vtype_reg_val; ++ // Check that a vuint8m1_t vector is at least 16 bytes and that tail ++ // agnostic and mask agnostic mode are supported ++ // ++ __asm__ volatile( ++ "vsetvli %0, zero, e8, m1, ta, ma\n\t" ++ "csrr %1, vtype" ++ : "=r"(e8m1_vec_len), "=r"(vtype_reg_val)); ++ ++ // The RVV target is supported if the VILL bit of VTYPE (the MSB bit of ++ // VTYPE) is not set and the length of a vuint8m1_t vector is at least 16 ++ // bytes ++ features->has_rvv = (vtype_reg_val >= 0 && e8m1_vec_len >= 16); ++ } + } diff --git a/community/znc/APKBUILD b/community/znc/APKBUILD index 0ee465c56d6..e8839e8f9b3 100644 --- a/community/znc/APKBUILD +++ b/community/znc/APKBUILD @@ -1,14 +1,16 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Contributor: Fabricio Silva <hi@fabricio.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=znc -pkgver=1.8.2 -pkgrel=17 +pkgver=1.9.0 +pkgrel=0 pkgdesc="Advanced IRC bouncer" url="https://wiki.znc.in/ZNC" arch="all" license="Apache-2.0" -makedepends="perl-dev openssl-dev>3 cyrus-sasl-dev c-ares-dev swig - gettext-dev tcl-dev autoconf automake python3-dev icu-dev" +makedepends="cmake ninja argon2-dev perl-dev openssl-dev cyrus-sasl-dev c-ares-dev + gettext-dev tcl-dev python3-dev icu-dev" +options="!check" # no test suite pkgusers="$pkgname" pkggroups="$pkgusers" install="$pkgname.pre-install" @@ -29,29 +31,27 @@ source="https://znc.in/releases/archive/znc-$pkgver.tar.gz # - CVE-2018-14055 # - CVE-2018-14056 -prepare() { - default_prepare - update_config_sub -} - build() { - export CFLAGS="$CFLAGS -D_GNU_SOURCE" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --enable-perl \ - --enable-tcl \ - --enable-python - make + export CFLAGS="$CFLAGS -flto=auto -DNDEBUG -D_GNU_SOURCE" + export CXXFLAGS="$CXXFLAGS -flto=auto -DNDEBUG -Wno-deprecated-declarations" + + cmake . \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_MANDIR=/usr/share/man \ + -DCMAKE_INSTALL_INFODIR=/usr/share/info \ + -DWANT_CYRUS=YES \ + -DWANT_TCL=YES \ + -DWANT_PERL=YES \ + -DWANT_PYTHON=YES \ + -DWANT_ARGON=YES + ninja } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja install install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname @@ -116,7 +116,7 @@ _mv_to_sub() { } sha512sums=" -e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9 znc-1.8.2.tar.gz +22b8bd6fd7332643860f7a99ceaa0f6d0c9dd8ba9edac14b3f3731c9301eeb58e03e3af8d09e939e453aa980ff9f24afbe79e66d1106993f81d8779c97731a17 znc-1.9.0.tar.gz 47f9bd00f07861e195333d2cda5b1c7386e2324a1842b890837a7936a94b65b7a269f7fee656a522ec86b58a94bd451a2a3629bd6465578681b8d0733c2c77dc znc.initd 00360f9b487ed5a9d50c85ce597e65c89cf869cabb893c294d0bc7fcd88f9610ecb63ba6df7af1ba1dd977b6d5b05da625a3ee799a46d381f17ac04b976a1f29 znc.confd " diff --git a/community/zziplib/APKBUILD b/community/zziplib/APKBUILD index 58b3d77fa2e..560b89cc1f2 100644 --- a/community/zziplib/APKBUILD +++ b/community/zziplib/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Mika Havela <mika.havela@gmail.com> # Maintainer: Mika Havela <mika.havela@gmail.com> pkgname=zziplib -pkgver=0.13.72 -pkgrel=1 +pkgver=0.13.74 +pkgrel=0 pkgdesc="Lightweight library to easily extract data from zip files" options="!check" # Some tests fail url="https://github.com/gdraheim/zziplib" @@ -12,7 +12,7 @@ license="LGPL-2.0-or-later MPL-1.1" makedepends="cmake zlib-dev python3 bash samurai" checkdepends="zip" subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" -source="zziplib-$pkgver.tar.gz::https://github.com/gdraheim/zziplib/archive/v$pkgver.tar.gz" +source="zziplib-$pkgver.tar.gz::https://github.com/gdraheim/zziplib/archive/refs/tags/v$pkgver.tar.gz" # secfixes: # 0.13.69-r2: @@ -53,5 +53,5 @@ utils() { } sha512sums=" -4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8 zziplib-0.13.72.tar.gz +7dd27247cbc475e2c6beb3a96c620f9938ade0dff6f4e088f9c28432fc4cc01df9d6771ec3d5e07baabe27033f4764d60e31c4c54588559de64e894d0557c94f zziplib-0.13.74.tar.gz " diff --git a/main/abuild/0001-abuild-allow-packages-to-install-under-run.patch b/main/abuild/0001-abuild-allow-packages-to-install-under-run.patch new file mode 100644 index 00000000000..312df410af6 --- /dev/null +++ b/main/abuild/0001-abuild-allow-packages-to-install-under-run.patch @@ -0,0 +1,29 @@ +From c48f8498e72928778a0501f8c958f0f61c214858 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Sat, 20 Apr 2024 08:16:55 +0200 +Subject: [PATCH] abuild: allow packages to install under run + +I have some vauge memory that it is conveinent for Docker users that the +state dir under /run exists. + +Allow this for alpine 3.20 and revisit later. +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index ac0b6ff..f873620 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -782,7 +782,7 @@ postcheck() { + msg "Running postcheck for $name" + # checking for FHS compat + if ! options_has "!fhs"; then +- for i in srv usr/local opt run var/run tmp var/tmp var/lock var/empty home sys proc mnt dev; do ++ for i in srv usr/local opt var/run tmp var/tmp var/lock var/empty home sys proc mnt dev; do + for j in "$dir"/"$i"/* "$dir"/"$i"/.[!.]* "$dir"/"$i"/..?*; do + if [ -L "$j" ] || [ -e "$j" ]; then + error "Packages must not put anything under /$i" +-- +2.44.0 + diff --git a/main/abuild/0001-abuild-pass-APORTS_BOOTSTRAP-to-bubblewrap.patch b/main/abuild/0001-abuild-pass-APORTS_BOOTSTRAP-to-bubblewrap.patch new file mode 100644 index 00000000000..9baacd2b23d --- /dev/null +++ b/main/abuild/0001-abuild-pass-APORTS_BOOTSTRAP-to-bubblewrap.patch @@ -0,0 +1,24 @@ +From eeca95d195652ef3506a154e9d18fd98f0dbf5b2 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 19 Apr 2024 23:41:45 +0200 +Subject: [PATCH] abuild: pass APORTS_BOOTSTRAP to bubblewrap + +--- + abuild.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/abuild.in b/abuild.in +index 3e41902..ac0b6ff 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -2627,6 +2627,7 @@ rootbld() { + --setenv REPODEST "$REPODEST" \ + --setenv ABUILD_USERDIR "$ABUILD_USERDIR" \ + ${ABUILD_BOOTSTRAP:+--setenv ABUILD_BOOTSTRAP "$ABUILD_BOOTSTRAP"} \ ++ ${APORTS_BOOTSTRAP:+--setenv APORTS_BOOTSTRAP "$APORTS_BOOTSTRAP"} \ + --setenv SOURCE_DATE_EPOCH "$SOURCE_DATE_EPOCH" \ + --setenv ABUILD_LAST_COMMIT "$ABUILD_LAST_COMMIT" \ + --setenv PATH ${USE_CCACHE:+/usr/lib/ccache/bin:}/bin:/usr/bin:/sbin:/usr/sbin \ +-- +2.44.0 + diff --git a/main/abuild/0001-abuild-skip-var-run-in-fhs-check.patch b/main/abuild/0001-abuild-skip-var-run-in-fhs-check.patch new file mode 100644 index 00000000000..31a2ea3ba7d --- /dev/null +++ b/main/abuild/0001-abuild-skip-var-run-in-fhs-check.patch @@ -0,0 +1,29 @@ +From 68d6aa65f43557de008abc7ec97856906bf5e657 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Sun, 21 Apr 2024 10:35:19 +0200 +Subject: [PATCH] abuild: skip /var/run in fhs check + +We have many package containing directories under /var/run. Allow those +for now. + +Partially reverts commit 08d2d81587d9 (abuild: extend fhs check) +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index f873620..0f70a4b 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -782,7 +782,7 @@ postcheck() { + msg "Running postcheck for $name" + # checking for FHS compat + if ! options_has "!fhs"; then +- for i in srv usr/local opt var/run tmp var/tmp var/lock var/empty home sys proc mnt dev; do ++ for i in srv usr/local opt tmp var/tmp var/lock var/empty home sys proc mnt dev; do + for j in "$dir"/"$i"/* "$dir"/"$i"/.[!.]* "$dir"/"$i"/..?*; do + if [ -L "$j" ] || [ -e "$j" ]; then + error "Packages must not put anything under /$i" +-- +2.44.0 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 5082316bc54..2aab2588e86 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=3.13.0 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=3 pkgdesc="Script to build Alpine Packages" url="https://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -36,6 +36,9 @@ subpackages=" options="suid" pkggroups="abuild" source="https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$pkgver/abuild-$pkgver.tar.gz + 0001-abuild-pass-APORTS_BOOTSTRAP-to-bubblewrap.patch + 0001-abuild-allow-packages-to-install-under-run.patch + 0001-abuild-skip-var-run-in-fhs-check.patch " builddir="$srcdir"/abuild-$pkgver @@ -121,4 +124,7 @@ _sudo() { sha512sums=" 9aa46693984bd65a1a940d4547239e0a10170e82f186ab231b0d3a26b09a75cf258fae0e16f936e79cf52353dce9fc8a18881e84042b7961f390aba3f34d88da abuild-3.13.0.tar.gz +2d7cf76202bd50e97fa3ed517c82dd94cbddd27b43d51e41e97c4281092565046aa55cab0869b20753c6bc1d592194528700a779426b67177b9ee7632c943742 0001-abuild-pass-APORTS_BOOTSTRAP-to-bubblewrap.patch +f7a4240972d33be36931527f4764cb8852989f724406cc079567e71875e7ca7b4c897755770a26f9901ebe9faf166d0e8eb88cb028cbf012f55ddd6efad47e6e 0001-abuild-allow-packages-to-install-under-run.patch +b94819e61a0a5a7a835bbf7d879371ff1f1573e93c40bb9f7a05b8a54fafbf8fe9234ddaefc2f0dc280d918639fe4193422fa8a56225c622d65466049efe9824 0001-abuild-skip-var-run-in-fhs-check.patch " diff --git a/main/acf-snort/APKBUILD b/main/acf-snort/APKBUILD index c7a3f2cdf7b..d76bd133051 100644 --- a/main/acf-snort/APKBUILD +++ b/main/acf-snort/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.8.1 pkgrel=0 pkgdesc="Web-based system administration interface for snort" url="https://gitlab.alpinelinux.org/acf/acf-snort" -arch="noarch !ppc64le !riscv64" # blocked by snort -> luajit +arch="noarch !ppc64le !riscv64 !loongarch64" # blocked by snort -> luajit license="GPL-2.0-only" options="!check" # no test suite depends="acf-core snort" diff --git a/main/acpid/APKBUILD b/main/acpid/APKBUILD index 8ce7c96fa45..86765b675f3 100644 --- a/main/acpid/APKBUILD +++ b/main/acpid/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=acpid pkgver=2.0.34 -pkgrel=3 +pkgrel=4 pkgdesc="The ACPI Daemon (acpid) With Netlink Support" url="https://sourceforge.net/projects/acpid2/" arch="all" @@ -60,7 +60,7 @@ openrc() { sha512sums=" 2bf92295b55bb44fe83074b3e0c1ae639f63edaeea84b2184ae95b38852be40f380d5413110b8c0fcb2efc2ec01bf4764e1dcb97022fc724bebbfc35c0b63c81 acpid-2.0.34.tar.xz 050c81446ac563d5d4c5d63a3e0b41558d5934427589114dc8b3215b72a1bd5923e0b8812e6d2265a6f53b6b0bcf8d7cc84d8ea6f2993ceea49c3c864c89c42c handler.sh -daf2510f202377a4db9b52448e4805bc4468c66f507cd4e676dc589306b716043c653ff18b697a4c37e5a005123a64a0278f3e4980504d98dd42ac9e95a3443f power-supply-ac +2478afa7cc072f84907789bd90d0d85c8a2f450a29a09637d764d665fd5e68ac7dee3a4ef9e183136e5b0745504c52e7357c5cdb172328c7e7318aa77ecd9c52 power-supply-ac f6df3e75198e779826c187038804ba80e7a445567342ac912ff4e5d894ce936fb9347146c302c7d7c9bbc8b3a0e47aeee9d23a4b297ee37e3938b7310a1b5ad9 lid-closed 8ec95453c21c5801a0864a5a91fd1d714f29d10a50658e93f027a395dcff91cd0e1ea5047ece199131e6205a422ae6f1887b388068630a0579995e3069d6a3bd suspend 2e04e5c8a428bfc653b4d56f5a2ff4472169a094ed9eee4b02ea88c755848e4803a0edeb054e152516ee50cb67c8c2be2c43e2e9db9dc80b7fcf218b8907ef6c anything diff --git a/main/acpid/power-supply-ac b/main/acpid/power-supply-ac index 337aae21d22..9fb6ba74825 100644 --- a/main/acpid/power-supply-ac +++ b/main/acpid/power-supply-ac @@ -11,7 +11,12 @@ rc=0 # Iterate through power supplies sysfs knows about. for ps in /sys/class/power_supply/*; do + # Ignore batteries. + [ -r $ps/type ] && [ "$(cat $ps/type)" = 'Battery' ] && continue + + # Ignore when no online info (we return 0 when no AC power found). [ -r $ps/online ] || continue + # We know we have an AC adaptor, our default return changes to failed. rc=1 diff --git a/main/ada/APKBUILD b/main/ada/APKBUILD index 1812539a50c..988f867d91b 100644 --- a/main/ada/APKBUILD +++ b/main/ada/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=ada # NOTE: The primary use of this library is for main/nodejs and community/nodejs-current. -pkgver=2.7.7 -pkgrel=1 +pkgver=2.7.8 +pkgrel=0 pkgdesc="WHATWG-compliant and fast URL parser written in modern C++" url="https://ada-url.github.io/ada" arch="all" @@ -55,6 +55,6 @@ tools() { } sha512sums=" -987782dacee5115f061f5579257fddf3ed26cdb8654279ce47915bef03abe7ca9904f0f4082b774be23772a3400925e908db45d9da935c7683269aae0ac2186a ada-2.7.7.tar.gz +e98619ac295e79348dc12fef5aaa6663e897c980b1ead1e1b871e69708b2ce876690f4c00aabc410d2c3a16abffb9580fe7634ee3b095fc225a5889c417b9c0b ada-2.7.8.tar.gz 63b4585bb29df3d922f31eefd60e37029c10ef654aa0bd098bffae622f6d74520d9e47ae76cadb9347eb6cea5140386f8c794bf9236f8c1ad014007e5597c1db use-system-simdjson-cxxopts.patch " diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD index e89705e76f1..5ff50cf19db 100644 --- a/main/alpine-baselayout/APKBUILD +++ b/main/alpine-baselayout/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-baselayout -pkgver=3.6.4 +pkgver=3.6.5 pkgrel=0 pkgdesc="Alpine base dir structure and init scripts" url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout" diff --git a/main/alpine-baselayout/alpine-baselayout.post-install b/main/alpine-baselayout/alpine-baselayout.post-install index 7cfe97d6357..88966d35c33 100644 --- a/main/alpine-baselayout/alpine-baselayout.post-install +++ b/main/alpine-baselayout/alpine-baselayout.post-install @@ -9,6 +9,6 @@ esac # the /etc/group file is created after /etc/shadow. Needed to apply the group # properly. chown root:shadow etc/shadow -chown root:shadow etc/shadow- +[ -e etc/shadow- ] && chown root:shadow etc/shadow- exit 0 diff --git a/main/aom/APKBUILD b/main/aom/APKBUILD index d6abef214a3..b34bef843de 100644 --- a/main/aom/APKBUILD +++ b/main/aom/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Oleg Titov <oleg.titov@gmail.com> # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=aom -pkgver=3.8.2 +pkgver=3.9.0 pkgrel=0 pkgdesc="Alliance for Open Media (AOM) AV1 codec SDK" url="https://aomedia.org/" @@ -61,6 +61,6 @@ package() { } sha512sums=" -539cb86645f1675e3f2d45c7c10d5d66ef7d36eaddf0c2d50f1a532287c70f780c8ce6dd8959f4bb112fd74e2b63501652e8e1eba5d18bf03a926ad158f6cfb0 libaom-3.8.2.tar.gz +0793e0801be72d35144162141a180ff5e3ae11186f734af738b1eb2d81bff1364be7741cc34ae2507d2b88de11f840609a09f8b05b75e8d853aa80626241bf95 libaom-3.9.0.tar.gz 14e241f4bf8f181c323cc7db16ea791e3a5ccf6f7f82b854b468f167e7f7210ab66cfacd85806693ba604c58e91ff6a45a5c49dc17a200d5fd65eb3788d397b5 posix-implicit.patch " diff --git a/main/apcupsd/APKBUILD b/main/apcupsd/APKBUILD index f79bd1493dc..8f906de7abf 100644 --- a/main/apcupsd/APKBUILD +++ b/main/apcupsd/APKBUILD @@ -8,12 +8,19 @@ url="http://www.apcupsd.org" arch="all" license="GPL-2.0-or-later" depends="util-linux" -makedepends="net-snmp-dev linux-headers gd-dev libusb-compat-dev" +makedepends=" + gd-dev + libusb-compat-dev + linux-headers + mandoc + net-snmp-dev + " options="!check" # no test suite included source="https://sourceforge.net/projects/apcupsd/files/apcupsd%20-%20Stable/$pkgver/apcupsd-$pkgver.tar.gz apcupsd.initd apcupsd.powerfail.initd apcupsd-alpine.patch + manify-with-mandoc.patch " prepare() { @@ -50,7 +57,10 @@ webif() { mv "$pkgdir"/etc/apcupsd/*.cgi "$subpkgdir"/usr/share/webapps/apcupsd } -sha512sums="c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f apcupsd-3.14.14.tar.gz +sha512sums=" +c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f apcupsd-3.14.14.tar.gz 82bff9001e86e2eb082e0bdebce69563458bb9e864f6f70622aa7d173d5134522f295b7f2496a9ef74aa6075e52026f714810c49a866026ee834acb8adbb3c70 apcupsd.initd 8d1c266bd86cd1cdf4fccdd171a877957bf5e26e1bb8c20e4c9c6b362a63d8cc1b887a1661939e4e56228a8d23dfc81fe782806b5d1527423c2ef7872cbeb881 apcupsd.powerfail.initd -4f0712519213c4ef14f41eeef681c5498fac7bf42f205de8a855938f8e834d9488d86820d7c883e89d0d305ee287e17e2d321dbbc98ae12f8487bf58aa0d4a6b apcupsd-alpine.patch" +4f0712519213c4ef14f41eeef681c5498fac7bf42f205de8a855938f8e834d9488d86820d7c883e89d0d305ee287e17e2d321dbbc98ae12f8487bf58aa0d4a6b apcupsd-alpine.patch +151d6c2f2a150a9ffbf411042e8f5df883c79b2ac15292e009edc58338d790917b1afd01dc588c08741be70cc6de6bb1b13b4ddd233e5907efaebb7c5c33e311 manify-with-mandoc.patch +" diff --git a/main/apcupsd/manify-with-mandoc.patch b/main/apcupsd/manify-with-mandoc.patch new file mode 100644 index 00000000000..cb1aa8bb281 --- /dev/null +++ b/main/apcupsd/manify-with-mandoc.patch @@ -0,0 +1,15 @@ +cmd:col is no longer provided by util-linux-misc +since 2.40, it was disabled for musl libc in +https://github.com/util-linux/util-linux/commit/8886d84e25a457702b45194d69a47313f76dc6bc + +--- a/autoconf/targets.mak ++++ b/autoconf/targets.mak +@@ -298,7 +298,7 @@ + # Format a manpage into plain text + define MANIFY + @$(ECHO) " MAN " $(1) -\> $(2) +- $(V)man ./$(1) | col -b > $(2) ++ $(V)mandoc -Tascii ./$(1) > $(2) + endef + + # Rule to build a Windows resource object from the source RC file diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD index 6c70670b97d..ecd824d163f 100644 --- a/main/arpwatch/APKBUILD +++ b/main/arpwatch/APKBUILD @@ -22,6 +22,11 @@ source="https://ee.lbl.gov/downloads/arpwatch/arpwatch-$pkgver.tar.gz fix-time-h.patch " +prepare() { + default_prepare + update_config_sub +} + build() { export PYTHON=python3 diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD index 2fd06a2148f..0453b03dbfa 100644 --- a/main/bind/APKBUILD +++ b/main/bind/APKBUILD @@ -10,12 +10,14 @@ _ver=${pkgver%_p*} _p=${pkgver#*_p} _major=${pkgver%%.*} [ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p" -pkgrel=0 +pkgrel=1 pkgdesc="The ISC DNS server" url="https://www.isc.org/" arch="all" license="MPL-2.0" -options="!check" # requires bind server +# check: requires bind server +# fhs: creates /var/run; TODO: fix? +options="!check !fhs" pkgusers="named" pkggroups="named" depends="dns-root-hints bind-tools" diff --git a/main/bind/bind.post-install b/main/bind/bind.post-install index aa1b7a85e59..94c1424e798 100644 --- a/main/bind/bind.post-install +++ b/main/bind/bind.post-install @@ -1,7 +1,7 @@ #!/bin/sh # Generate key required for reload to work -> creates /etc/bind/rndc.key -if ! [ -f /etc/bind/rndc.key ]; then - rndc-confgen -a - chown named:named /etc/bind/rndc.key +if ! [ -f etc/bind/rndc.key ]; then + rndc-confgen -a -c etc/bind/rndc.key + chown named:named etc/bind/rndc.key fi diff --git a/main/bluez-headers/APKBUILD b/main/bluez-headers/APKBUILD index 1741f6517a9..4878a0de312 100644 --- a/main/bluez-headers/APKBUILD +++ b/main/bluez-headers/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bluez-headers -pkgver=5.73 +pkgver=5.75 pkgrel=0 pkgdesc="Bluez development headers" url="https://www.bluez.org/" @@ -31,5 +31,5 @@ package() { } sha512sums=" -20090da036d3d614706b14a757b02acf138859d8f0476aa7f68d57635dfb3632ce7d8bb3456320904d72333d1314a5fe14dcb8ece307e6d31ce6d2d516de25e8 bluez-5.73.tar.xz +f5fdad3824ed094d944d33f3d116c045e69d593a2b4dae5e57feeb5625a13e024e2433a3178921d2f8e1bd8261794ecdfc25ff3e52672e6e8d42e85b33a735a4 bluez-5.75.tar.xz " diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD index 8c320b7747a..e87eb1967f2 100644 --- a/main/bluez/APKBUILD +++ b/main/bluez/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bluez # Make sure to also update the obexd-enhanced package if updating bluez -pkgver=5.73 -pkgrel=0 +pkgver=5.75 +pkgrel=1 pkgdesc="Tools for the Bluetooth protocol stack" url="https://www.bluez.org/" arch="all" @@ -53,6 +53,8 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz disable-lock-test.patch fix-endianness.patch test-mesh-crypto.patch + disable-test-vcp.patch + basename.patch " # secfixes: @@ -80,7 +82,10 @@ build() { } check() { - make check + make check || { + cat test-suite.log + return 1 + } } package() { @@ -177,7 +182,7 @@ openrc() { } sha512sums=" -20090da036d3d614706b14a757b02acf138859d8f0476aa7f68d57635dfb3632ce7d8bb3456320904d72333d1314a5fe14dcb8ece307e6d31ce6d2d516de25e8 bluez-5.73.tar.xz +f5fdad3824ed094d944d33f3d116c045e69d593a2b4dae5e57feeb5625a13e024e2433a3178921d2f8e1bd8261794ecdfc25ff3e52672e6e8d42e85b33a735a4 bluez-5.75.tar.xz 5442f4f489718e51c50611c143803f2cc99e540b55a72af20ea2921b256774a6c7c5e273f2bedb745753d8c67d3fb7c938750fb48feac7460b32bd1cca029a28 bluetooth.initd 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd @@ -191,4 +196,6 @@ ac635f9bca0e983835940572eb1b96ad70cf60fb84d5b0fde38c76ea6d1b13ef7d9adf81468b9fed 04c4889372c8e790bb338dde7ffa76dc32fcf7370025c71b9184fcf17fd01ade4a6613d84d648303af3bbc54043ad489f29fc0cd4679ec8c9029dcb846d7e026 disable-lock-test.patch 2f54da5e77893d1d8b7164ddac5561a9e536c2b93b1d33dcbd97e74c0fd45588f1f50dc1d9d8519297871e3a376948082a2e45e27d823ec81cdedecd8dba3f0c fix-endianness.patch b5d6f7d2df755a9b8cffaeef13d232ba1bab27544bc59e2299bbd6a8017768cf7781f3ca65e430a149a26f0b30ae74b8510529ce161705bb6f41ae512cc2dbac test-mesh-crypto.patch +e7a07f26d92caaf11a457a8504219973da0aa80f2c97b36af2135aa36f7f4b52978f632c9c5123d66d71b4b65a780710dea802ca0dcaabc5c051f7b7d21763cf disable-test-vcp.patch +7ab64b247e60f3a2c3af076d7837bbe41af619abb120a48edbb91de8996c61a84c98f93894218f8bee6a819754efedb6f2a76aa01cd4f5c36e3999debc187513 basename.patch " diff --git a/main/bluez/basename.patch b/main/bluez/basename.patch new file mode 100644 index 00000000000..1537db9f6d9 --- /dev/null +++ b/main/bluez/basename.patch @@ -0,0 +1,24 @@ +See https://gitlab.alpinelinux.org/alpine/aports/-/issues/16106 + +diff -upr bluez-5.75.orig/mesh/rpl.c bluez-5.75/mesh/rpl.c +--- bluez-5.75.orig/mesh/rpl.c 2024-05-12 12:44:45.183126137 +0200 ++++ bluez-5.75/mesh/rpl.c 2024-05-12 12:45:05.756509147 +0200 +@@ -15,6 +15,7 @@ + #define _GNU_SOURCE + #include <fcntl.h> + #include <limits.h> ++#include <libgen.h> + #include <stdio.h> + #include <unistd.h> + #include <dirent.h> +diff -upr bluez-5.75.orig/tools/hex2hcd.c bluez-5.75/tools/hex2hcd.c +--- bluez-5.75.orig/tools/hex2hcd.c 2024-05-12 12:47:29.033540002 +0200 ++++ bluez-5.75/tools/hex2hcd.c 2024-05-12 12:47:38.530230930 +0200 +@@ -18,6 +18,7 @@ + #include <fcntl.h> + #include <unistd.h> + #include <string.h> ++#include <libgen.h> + #include <getopt.h> + #include <dirent.h> + #include <stdint.h> diff --git a/main/bluez/disable-test-vcp.patch b/main/bluez/disable-test-vcp.patch new file mode 100644 index 00000000000..ffbdbddea17 --- /dev/null +++ b/main/bluez/disable-test-vcp.patch @@ -0,0 +1,24 @@ +From 1d5a2ec8eb96e9186aeb2826927057ddc7a9d0a6 Mon Sep 17 00:00:00 2001 +From: macmpi <16296055+macmpi@users.noreply.github.com> +Date: Wed, 17 Jan 2024 09:34:28 +0100 +Subject: [PATCH] disable test_aics_unit_testcases + +fails on x86-64 +https://github.com/bluez/bluez/issues/726 +--- + unit/test-vcp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unit/test-vcp.c b/unit/test-vcp.c +index 6a61ea2c44..3886177758 100644 +--- a/unit/test-vcp.c ++++ b/unit/test-vcp.c +@@ -2754,7 +2754,7 @@ int main(int argc, char *argv[]) + tester_init(&argc, &argv); + + test_vocs_unit_testcases(); +- test_aics_unit_testcases(); ++// test_aics_unit_testcases(); test fails on x86-64 + + return tester_run(); + } diff --git a/main/boost1.82/APKBUILD b/main/boost1.82/APKBUILD index 3f2bcb65beb..d6102ce927e 100644 --- a/main/boost1.82/APKBUILD +++ b/main/boost1.82/APKBUILD @@ -61,7 +61,7 @@ _libs=" nowide " for _lib in $_libs; do - subpackages="$subpackages $pkgname-${_lib}:_boostlib" + subpackages="$subpackages $pkgname-$_lib:_boostlib" done; unset -v _lib subpackages="$subpackages $pkgname-libs" @@ -144,8 +144,7 @@ package() { --libdir="$pkgdir"/usr/lib \ install - install -Dm755 dist/bin/bcp "$pkgdir"/usr/bin/bcp - install -Dm755 b2 "$pkgdir"/usr/bin/b2 + install -Dm755 -t "$pkgdir"/usr/bin dist/bin/bcp b2 ln -s b2 "$pkgdir"/usr/bin/bjam # old name for b2 binary } @@ -162,9 +161,8 @@ static() { } _boostlib() { - local name="${subpkgname#$pkgname-}" + local name="${subpkgname#"$pkgname"-}" pkgdesc="Boost $name shared library" - depends="$depends__boostlib" # Claim the unversioned name, this must be removed once we switch our # boost to a new version @@ -190,14 +188,11 @@ libs() { done mkdir -p "$subpkgdir" - rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || : } dev() { - # Claim the unversioned name, this must be removed once we switch our - # boost to a new version. Replace previous boost version for clean -dev - # upgrade default_dev + # Replace previous boost version for clean -dev upgrade replaces="boost$_previousver-dev" } diff --git a/main/boost1.84/APKBUILD b/main/boost1.84/APKBUILD new file mode 100644 index 00000000000..bb9c0ba8455 --- /dev/null +++ b/main/boost1.84/APKBUILD @@ -0,0 +1,216 @@ +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=boost1.84 +pkgver=1.84.0 +_pkgver="${pkgver//./_}" +pkgrel=1 +pkgdesc="Free peer-reviewed portable C++ source libraries" +url="https://www.boost.org/" +arch="all" +license="BSL-1.0" +depends="$pkgname-libs" +depends_dev="$pkgname linux-headers bzip2-dev icu-dev xz-dev zlib-dev zstd-dev" +makedepends="$depends_dev python3-dev>=3.8 flex bison" +subpackages=" + $pkgname-static + $pkgname-dev + $pkgname-doc + boost-dev:_dev + " +source="https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/boost_$_pkgver.tar.bz2 + boost-1.57.0-python-abi_letters.patch + boost-1.57.0-python-libpython_dep.patch + boost-phoenix-uarg.patch + " +builddir="$srcdir/boost_$_pkgver" +options="!check" # some tests fail now, figure it out later + +_libs=" + atomic + chrono + container + context + contract + coroutine + date_time + fiber + filesystem + graph + iostreams + locale + log_setup + log + math + prg_exec_monitor + program_options + python3 + random + regex + serialization + stacktrace_basic + stacktrace_noop + system + thread + timer + type_erasure + unit_test_framework + url + wave + wserialization + json + nowide + " +for _lib in $_libs; do + subpackages="$subpackages $pkgname-$_lib:_boostlib" + depends_libs="$depends_libs $pkgname-$_lib" +done; unset -v _lib +subpackages="$subpackages $pkgname-libs" + +# Claim the unversioned name, this must be removed once we switch our +# boost to a new version +_previousver=1.82 +provides="boost=$pkgver-r$pkgrel" +replaces="boost$_previousver" + +_set_options() { + local _python="$(_pyversion python3)" + export PY3_VERSION="$_python" + export BOOST_ROOT="$builddir" + + _options=" + --user-config=\"$builddir/user-config.jam\" + --prefix=\"$pkgdir/usr\" + variant=release + python=$PY3_VERSION + toolset=gcc + debug-symbols=off + threading=multi + runtime-link=shared + link=shared,static + cflags=-fno-strict-aliasing + --layout=system + --without-graph_parallel + --without-mpi + -q + -j${JOBS:-2} + " +} + +prepare() { + default_prepare + _set_options + + local abiflags="$(python3-config --abiflags)" + + # create user-config.jam + cat > user-config.jam <<-__EOF__ + + using gcc : : $CXX : <cflags>"$CFLAGS" <cxxflags>"$CXXFLAGS" <linkflags>"$LDFLAGS" ; + using python : $PY3_VERSION : /usr/bin/python3 : /usr/include/python${PY3_VERSION}$abiflags : : : : $abiflags ; + + __EOF__ +} + +build() { + _set_options + + msg "Building b2" + cd "$builddir"/tools/build + ./bootstrap.sh --cxxflags="$CXXFLAGS $LDFLAGS" + + msg "Building bcp" + cd "$builddir"/tools/bcp + ../build/b2 -j${JOBS:-2} + + msg "Building boost" + cd "$builddir" + ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=python3 + ./b2 $_options +} + +check() { + cd "$builddir"/tools/build/test + + PATH="$pkgdir/usr/bin:$PATH" python3 test_all.py --default-bjam +} + +package() { + _set_options + + install -Dm644 LICENSE_1_0.txt \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE_1_0.txt + + ./b2 $_options \ + --includedir="$pkgdir"/usr/include \ + --libdir="$pkgdir"/usr/lib \ + install + + install -Dm755 -t "$pkgdir"/usr/bin dist/bin/bcp b2 + ln -s b2 "$pkgdir"/usr/bin/bjam # old name for b2 binary +} + +static() { + pkgdesc="Boost static libraries" + depends="$depends_static" + + # Claim the unversioned name, this must be removed once we switch our + # boost to a new version + provides="boost-static=$pkgver-r$pkgrel" + replaces="boost$_previousver-static" + + amove usr/lib/lib*.a +} + +_boostlib() { + local name="${subpkgname#"$pkgname"-}" + pkgdesc="Boost $name shared library" + + # Claim the unversioned name, this must be removed once we switch our + # boost to a new version + provides="boost-$name=$pkgver-r$pkgrel" + replaces="boost$_previousver-$name" + depends= + + amove usr/lib/libboost_$name*.so.[0-9]* +} + +libs() { + default_libs + + # Claim the unversioned name, this must be removed once we switch our + # boost to a new version + provides="boost-libs=$pkgver-r$pkgrel" + pkgdesc="Boost shared libraries" + mkdir -p "$subpkgdir" +} + +dev() { + default_dev + # Replace previous boost version for clean -dev upgrade + replaces="boost$_previousver-dev" +} + +_dev() { + # This makes boost-dev be a metapackage that depends on boostX.Y-dev + mkdir -p "$subpkgdir" + depends="$pkgname-dev=$pkgver-r$pkgrel" +} + +doc() { + # Claim the unversioned name, this must be removed once we switch our + # boost to a new version + provides="boost-doc=$pkgver-r$pkgrel" + replaces="boost$_previousver-doc" + + default_doc +} + +_pyversion() { + "$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))' +} + +sha512sums=" +5dfeb35198bb096e46cf9e131ef0334cb95bc0bf09f343f291b860b112598b3c36111bd8c232439c401a2b2fb832fa0c399a8d5b96afc60bd359dff070154497 boost_1_84_0.tar.bz2 +d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66 boost-1.57.0-python-abi_letters.patch +132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch +7fad4b81ae5df38f740148153bcb5b4b31c12061f1264404b96a324e0d2f06943530cbcf9002d17772fb4ad87dcf0ba8bf4ed397725ee448a4d310df5d0383ad boost-phoenix-uarg.patch +" diff --git a/main/boost1.84/boost-1.57.0-python-abi_letters.patch b/main/boost1.84/boost-1.57.0-python-abi_letters.patch new file mode 100644 index 00000000000..7df3ee7047d --- /dev/null +++ b/main/boost1.84/boost-1.57.0-python-abi_letters.patch @@ -0,0 +1,62 @@ +--- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200 ++++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200 +@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti + # using python : 2.3 : /usr/local/bin/python ; + # + rule init ( version ? : cmd-or-prefix ? : includes * : libraries ? +- : condition * : extension-suffix ? ) ++ : condition * : extension-suffix ? : abi-letters ? ) + { + project.push-current $(.project) ; + +@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ? + } + } + +- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ; ++ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ; + + project.pop-current ; + } +@@ -653,7 +653,7 @@ local rule system-library-dependencies ( + + # Declare a target to represent Python's library. + # +-local rule declare-libpython-target ( version ? : requirements * ) ++local rule declare-libpython-target ( version ? : requirements * : abi-letters ? ) + { + # Compute the representation of Python version in the name of Python's + # library file. +@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve + } + + # Declare it. +- lib python.lib : : <name>python$(lib-version) $(requirements) ; ++ lib python.lib : : <name>python$(lib-version)$(abi-letters) $(requirements) ; + } + + + # Implementation of init. + local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : +- condition * : extension-suffix ? ) ++ condition * : extension-suffix ? : abi-letters ? ) + { + local prefix ; + local exec-prefix ; +@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o + extension-suffix ?= _d ; + } + extension-suffix ?= "" ; ++ abi-letters ?= "" ; + + # Normalize and dissect any version number. + local major-minor ; +@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o + } + else + { +- declare-libpython-target $(version) : $(target-requirements) ; ++ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ; + + # This is an evil hack. On, Windows, when Python is embedded, nothing + # seems to set up sys.path to include Python's standard library diff --git a/main/boost1.84/boost-1.57.0-python-libpython_dep.patch b/main/boost1.84/boost-1.57.0-python-libpython_dep.patch new file mode 100644 index 00000000000..57bfc26774e --- /dev/null +++ b/main/boost1.84/boost-1.57.0-python-libpython_dep.patch @@ -0,0 +1,13 @@ +Index: boost_1_57_0/tools/build/src/tools/python.jam +=================================================================== +--- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406) ++++ boost_1_57_0/tools/build/src/tools/python.jam (working copy) +@@ -994,7 +994,7 @@ + else + { + alias python_for_extensions +- : ++ : python + : $(target-requirements) + : + : $(usage-requirements) diff --git a/main/boost1.84/boost-phoenix-uarg.patch b/main/boost1.84/boost-phoenix-uarg.patch new file mode 100644 index 00000000000..491f3722e6f --- /dev/null +++ b/main/boost1.84/boost-phoenix-uarg.patch @@ -0,0 +1,11 @@ +diff --git a/boost/phoenix/stl.hpp b/boost/phoenix/stl.hpp +index 254820a83..c1013bc97 100644 +--- a/boost/phoenix/stl.hpp ++++ b/boost/phoenix/stl.hpp +@@ -11,6 +11,5 @@ + + #include <boost/phoenix/stl/algorithm.hpp> + #include <boost/phoenix/stl/container.hpp> +-#include <boost/phoenix/stl/tuple.hpp> + + #endif diff --git a/main/botan/APKBUILD b/main/botan/APKBUILD index 7a79fb0eb0d..13a71b8fcc7 100644 --- a/main/botan/APKBUILD +++ b/main/botan/APKBUILD @@ -1,8 +1,8 @@ # Contributor: tcely <tcely@users.noreply.github.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=botan -pkgver=2.19.3 -pkgrel=5 +pkgver=2.19.4 +pkgrel=0 pkgdesc="Crypto and TLS for C++11" url="https://botan.randombit.net/" arch="all" @@ -28,7 +28,8 @@ builddir="$srcdir/Botan-$pkgver" # - CVE-2018-9127 case $CARCH in - ppc64le|aarch64|armhf|armv7) options="$options !check" ;; # 3 tests timeout + arm*|riscv64|loongarch64) + options="$options !check" ;; # several tests fail esac build() { @@ -61,5 +62,5 @@ package() { } sha512sums=" -80012397e2aa7cc88a9536340ac9b770d1195fddda53b9d4cfde82318dd05f9d4f925bbdff773aba99883a701f4d30581e9d5c97e915fa80c3ca2acfa5a92110 Botan-2.19.3.tar.xz +2fab4347367703dce8302b7710698ed228c6cc6dd609c39829ba17ad580407ed40d822862d467aa7aea4bfd633c1f1d1c0d437e86376f453845cc609596335d8 Botan-2.19.4.tar.xz " diff --git a/main/botan3/APKBUILD b/main/botan3/APKBUILD index 28ef23d25e9..2a046dba6f9 100644 --- a/main/botan3/APKBUILD +++ b/main/botan3/APKBUILD @@ -1,8 +1,8 @@ # Contributor: tcely <tcely@users.noreply.github.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=botan3 -pkgver=3.2.0 -pkgrel=1 +pkgver=3.4.0 +pkgrel=0 pkgdesc="Crypto and TLS for C++11 (v3)" url="https://botan.randombit.net/" arch="all" @@ -22,6 +22,11 @@ subpackages="$pkgname-dev $pkgname-doc py3-$pkgname:py3 $pkgname-libs" source="https://botan.randombit.net/releases/Botan-$pkgver.tar.xz" builddir="$srcdir/Botan-$pkgver" +case "$CARCH" in +riscv64) + options="!check" ;; # several tests fail +esac + build() { # botan benefits from -O3. Upstream is using it when testing. export CXXFLAGS="$CXXFLAGS -O3" CFLAGS="$CFLAGS -O3" @@ -58,5 +63,5 @@ py3() { } sha512sums=" -526cf71144584fef6e73f14f6aa1e2a7b03a92a3e51436287764bb61e742a94e02926bcc2aab038f08ef2169cb511152c8ecd71d51e06deb4875dc676875c2d9 Botan-3.2.0.tar.xz +509a0e7afa8d27fb40035d2b8e1914736c67ce2c71dc1c37993da5ee465225de78077b984ffe10175ee854633d2bb5f45186b95c5256a9fb4d8a694b6d8ddef3 Botan-3.4.0.tar.xz " diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD index b5c9d374d53..a7105965e42 100644 --- a/main/btrfs-progs/APKBUILD +++ b/main/btrfs-progs/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=btrfs-progs -pkgver=6.8 +pkgver=6.8.1 pkgrel=1 pkgdesc="BTRFS filesystem utilities" url="https://btrfs.wiki.kernel.org" @@ -45,6 +45,7 @@ subpackages=" source="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar.xz btrfs-scan.initd remove-sphinx_rtd_theme.patch + basename.patch " builddir="$srcdir/$pkgname-v$pkgver" # most pass, one fails to build (fsstress renameat2) @@ -101,7 +102,8 @@ extra() { } sha512sums=" -adce7c15ef5a19c4fc513f1743b4f65f2c72aa4490703d36c93230abb305c576bd69a32c4bcf19c2b58aee5b5755e0d54fb82fe649a5fe021366eb0d89af4261 btrfs-progs-v6.8.tar.xz +b5f0694e56eecf1956313b3406610c2e22658ace51a636d79efe996780bb0b03fed95e68a8c9a11dd8649958c0e7dbc7417bb479859365d47b52e478f6830d46 btrfs-progs-v6.8.1.tar.xz 8f8757e094e5cb3b2748e2b41ba3c50d4535e24c5ced3b31eea6457f61f9fe90894a51d512d306ec8ea20ace6bb8dfe00422d3cbea9734568b492a044d4b2018 btrfs-scan.initd c8354118cc4f17d19213a99580c2d8c0cf3173a91c5e42a62c8a7d3b2b66395419136b9761d70503ced0fc959cf8071ae2e2dc1667f000bf0ac86eddc9253bb3 remove-sphinx_rtd_theme.patch +8f88c06bd244f41cb318b5f432edcf8d7db06dfdb886e75f1b33f6e911a772f32b3b5d67181967469706cf29a37acbe4bc9ec63f6f16a6450b061f17ae1d2fa8 basename.patch " diff --git a/main/btrfs-progs/basename.patch b/main/btrfs-progs/basename.patch new file mode 100644 index 00000000000..8d2c85b69d8 --- /dev/null +++ b/main/btrfs-progs/basename.patch @@ -0,0 +1,15 @@ +Include libgen.h for the basename(3) function prototype. + +See https://gitlab.alpinelinux.org/alpine/aports/-/issues/16106 + +diff -upr btrfs-progs-v6.8.1.orig/common/device-utils.c btrfs-progs-v6.8.1/common/device-utils.c +--- btrfs-progs-v6.8.1.orig/common/device-utils.c 2024-05-12 12:31:38.711451023 +0200 ++++ btrfs-progs-v6.8.1/common/device-utils.c 2024-05-12 12:31:51.201469868 +0200 +@@ -30,6 +30,7 @@ + #include <fcntl.h> + #include <dirent.h> + #include <errno.h> ++#include <libgen.h> + #include <blkid/blkid.h> + #include "kernel-lib/sizes.h" + #include "kernel-shared/disk-io.h" diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index fb15152e280..4eb46173b33 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=busybox pkgver=1.36.1 -pkgrel=25 +pkgrel=26 pkgdesc="Size optimized toolbox of many common UNIX utilities" url="https://busybox.net/" arch="all" @@ -446,7 +446,7 @@ aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f03 cfd96023125ca27c6eddb13af490a36e5e7d2fcfd0847363e48f1fa5ce237e93e6a9fe4577feeb35291d79d6240ae5e6a518b9258966e0fac27e30a43172b792 busyboxconfig-extras 0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c afc27da5f95bec3e3ccb5b1fcb5bd80a8317d8753e6c70cc0750d0875313e44bf2e487472c8499d7bbe5afba3e583c75548ccdcff4dcadc94bb791f53fb77ba3 dad.if-up -26eac967d6cfe13b7dc973112de145543ac0bdda9e9dd3a69bbd8c133ae6a20387abe9377917efb770b191130d3a6385ff5738abc84a8216d7b86ae88b159260 ssl_client.c +1c7c78afb274d1316725b22585452efd7de9a80ad326f099f25e34d0877c5d81ced579e2dc795314221e316f58071374f61ee22c6ffd34072266525f65d3614c ssl_client.c e56f9d74f7d471893ff9c3fde319b989e1854c9b12f06c1b6739694b07165ae256b5c555bc75c92986265df7f0a276001aba73853855c7a0fb3404a091a92c86 default.script 5f9ff70f99a970e88460c0de81a6637d8a82252fba6715e259833f16ed8cbfc3440972b1fa454eb77dbbcd1e244774c96b4eef96f71a2b67a9039a0dd5e6fc1e udhcpc.conf fcb532233fd7ba8cad302d037b88cff00ee8b96b37c90b34fc823479208cf7cdda48818c972ce2c4703b7283fd58e99ba8a724818f884f3b09eaa7e2d6ffad21 acpid.initd diff --git a/main/busybox/ssl_client.c b/main/busybox/ssl_client.c index 1be9e585b3b..45c62a5c80b 100644 --- a/main/busybox/ssl_client.c +++ b/main/busybox/ssl_client.c @@ -124,8 +124,9 @@ void usage(const char *prog, int ret) { int main(int argc, char *argv[]) { int c, sfd = 1;; - const char *sni = NULL; + char *sni = NULL; int insecure = 0; + size_t sni_len; SSL_CTX *ctx; SSL *ssl = NULL; @@ -148,6 +149,12 @@ int main(int argc, char *argv[]) } } + /* openssl doesn't ignore a trailing dot in a domain on it's own. + * https://github.com/openssl/openssl/issues/11560 + */ + if (sni && (sni_len = strlen(sni)) && sni[sni_len - 1] == '.') + sni[sni_len - 1] = '\0'; + OPENSSL_init_ssl(0, NULL); if ((ctx = SSL_CTX_new(TLS_client_method())) == NULL) diff --git a/main/cargo-auditable/APKBUILD b/main/cargo-auditable/APKBUILD index 9d6d8f6b251..ff4950fece2 100644 --- a/main/cargo-auditable/APKBUILD +++ b/main/cargo-auditable/APKBUILD @@ -10,6 +10,8 @@ depends="cmd:cargo" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v$pkgver.tar.gz 0001-Fix-tests-on-Rust-1.77.patch + add-loongarch64-support.patch + upgrade-rust-libc.patch " options="net" @@ -39,4 +41,6 @@ package() { sha512sums=" 3656f124d8e43fbb4518d9aa3ad9e40a7cae61c56fa4718e9ff886934b2fcb5b2f116551c63ca17712c203ac93daf2b28a22efe41e556013189dec0ad9248f1f cargo-auditable-0.6.2.tar.gz b5a871ea32bbfba1c6cda46c97ed5793f5dafeb237fc7da2462408d7125ac75519cad9ba6af159a4ce8abe6285b19c65048ba37c3e4a3c05f81625482d575235 0001-Fix-tests-on-Rust-1.77.patch +27dc8f73fa981e7d04a37def2355a2f1466162a727e20e2a346c05d33c0e0eb97b7e9e03a6ccadd20a356ad78598c3a93f44bf9c0293cd2b7dc8779e05399fb3 add-loongarch64-support.patch +0721760a8d747e0ee4a34153bcc056503b07e812b2b74475492d6eacb5afc5c86c80e571c6c92ab07bd737969e19149e21c677a5fd65665183bbf62feb549ac5 upgrade-rust-libc.patch " diff --git a/main/cargo-auditable/add-loongarch64-support.patch b/main/cargo-auditable/add-loongarch64-support.patch new file mode 100644 index 00000000000..e6058da1a35 --- /dev/null +++ b/main/cargo-auditable/add-loongarch64-support.patch @@ -0,0 +1,90 @@ +From 39f83fa298e7174362195adac9dcbd64c26223e4 Mon Sep 17 00:00:00 2001 +From: WANG Rui <wangrui@loongson.cn> +Date: Tue, 7 May 2024 20:42:39 +0800 +Subject: [PATCH] Add LoongArch support + +--- + cargo-auditable/src/object_file.rs | 46 ++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +diff --git a/cargo-auditable/src/object_file.rs b/cargo-auditable/src/object_file.rs +index 347f0c0..6dcb9bc 100644 +--- a/cargo-auditable/src/object_file.rs ++++ b/cargo-auditable/src/object_file.rs +@@ -84,6 +84,7 @@ fn create_object_file( + "riscv32" => Architecture::Riscv32, + "riscv64" => Architecture::Riscv64, + "sparc64" => Architecture::Sparc64, ++ "loongarch64" => Architecture::LoongArch64, + // Unsupported architecture. + _ => return None, + }; +@@ -150,6 +151,21 @@ fn create_object_file( + } + e_flags + } ++ Architecture::LoongArch64 => { ++ // Source: https://github.com/loongson/la-abi-specs/blob/release/laelf.adoc#e_flags-identifies-abi-type-and-version ++ let mut e_flags: u32 = elf::EF_LARCH_OBJABI_V1; ++ let features = loongarch_features(target_triple); ++ ++ // Select the appropriate floating-point ABI ++ if features.contains('d') { ++ e_flags |= elf::EF_LARCH_ABI_DOUBLE_FLOAT; ++ } else if features.contains('f') { ++ e_flags |= elf::EF_LARCH_ABI_SINGLE_FLOAT; ++ } else { ++ e_flags |= elf::EF_LARCH_ABI_SOFT_FLOAT; ++ } ++ e_flags ++ } + _ => 0, + }; + // adapted from LLVM's `MCELFObjectTargetWriter::getOSABI` +@@ -181,6 +197,16 @@ fn riscv_features(target_triple: &str) -> String { + extensions + } + ++// This function was not present in the original rustc code, which simply used ++// `sess.target.options.features` ++// We do not have access to compiler internals, so we have to reimplement this function. ++fn loongarch_features(target_triple: &str) -> String { ++ match target_triple { ++ "loongarch64-unknown-none-softfloat" => "".to_string(), ++ _ => "f,d".to_string(), ++ } ++} ++ + #[cfg(test)] + mod tests { + use super::*; +@@ -210,6 +236,26 @@ mod tests { + assert!(features.contains('f')); + } + ++ #[test] ++ fn test_loongarch_abi_detection() { ++ // real-world target with double floats ++ let features = loongarch_features("loongarch64-unknown-linux-gnu"); ++ assert!(features.contains('d')); ++ assert!(features.contains('f')); ++ // real-world target with double floats ++ let features = loongarch_features("loongarch64-unknown-linux-musl"); ++ assert!(features.contains('d')); ++ assert!(features.contains('f')); ++ // real-world target with double floats ++ let features = loongarch_features("loongarch64-unknown-none"); ++ assert!(features.contains('d')); ++ assert!(features.contains('f')); ++ // real-world target with soft floats ++ let features = loongarch_features("loongarch64-unknown-none-softfloat"); ++ assert!(!features.contains('d')); ++ assert!(!features.contains('f')); ++ } ++ + #[test] + fn test_create_object_file_linux() { + let rustc_output = br#"debug_assertions +-- +2.44.0 + diff --git a/main/cargo-auditable/upgrade-rust-libc.patch b/main/cargo-auditable/upgrade-rust-libc.patch new file mode 100644 index 00000000000..44c440240c3 --- /dev/null +++ b/main/cargo-auditable/upgrade-rust-libc.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index d039aae..0d3b00f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -198,9 +198,9 @@ checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" + + [[package]] + name = "libc" +-version = "0.2.132" ++version = "0.2.154" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" ++checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" + + [[package]] + name = "memchr" diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD index a6142afaf90..3b3db4886ea 100644 --- a/main/ccache/APKBUILD +++ b/main/ccache/APKBUILD @@ -24,6 +24,14 @@ source="https://github.com/ccache/ccache/releases/download/v$pkgver/ccache-$pkgv system-xxhash.patch " +prepare() { + default_prepare + + # The riscv64 builder seems to have setgid bit set, + # which causes tests 2, 22, and 34 to fail. + chmod -v -s . +} + build() { cmake -B build -G Ninja \ -DCCACHE_DEV_MODE=OFF \ diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD index b4cbeb796aa..cc2495ccb1a 100644 --- a/main/cifs-utils/APKBUILD +++ b/main/cifs-utils/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=cifs-utils pkgver=7.0 -pkgrel=3 +pkgrel=4 pkgdesc="CIFS filesystem user-space tools" url="https://wiki.samba.org/index.php/LinuxCIFS_utils" arch="all" @@ -13,6 +13,7 @@ subpackages="$pkgname-doc $pkgname-dev" source="https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-$pkgver.tar.bz2 musl-fix-includes.patch xattr_size_max.patch + fix-implicit-basename.patch cifs.upcall.request-key.conf " options="suid" @@ -58,5 +59,6 @@ sha512sums=" 4c57741af0c4567a78f352c73caca998881666a5ed36536275cfa775efd66ff1a44ebe539a8ed96c409c5b08a1378266964ce667a27e9fc7f2d43999c63dd0eb cifs-utils-7.0.tar.bz2 99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch 2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch +8f93c8c7ae35bec6e67f26d0aa3a0edc4c427ef91b1e279a01abbd2eadaadbae21d46d2a7b53c6c7392c3cfa8f58ba43ed337026409fcd3a93192abff7267375 fix-implicit-basename.patch 4b5f32e6b80858858713ffa918bf592e39deeebe03e2d05cff965e13fde8ca8c20a7b5283bce89c0a0cb0d9447044f71807698274ed9d5fd8c71f450fdc29512 cifs.upcall.request-key.conf " diff --git a/main/cifs-utils/fix-implicit-basename.patch b/main/cifs-utils/fix-implicit-basename.patch new file mode 100644 index 00000000000..16007456cb0 --- /dev/null +++ b/main/cifs-utils/fix-implicit-basename.patch @@ -0,0 +1,44 @@ +diff -upr cifs-utils-7.0.orig/cifscreds.c cifs-utils-7.0/cifscreds.c +--- cifs-utils-7.0.orig/cifscreds.c 2024-05-12 11:56:19.023002421 +0200 ++++ cifs-utils-7.0/cifscreds.c 2024-05-12 11:57:09.486444286 +0200 +@@ -29,6 +29,7 @@ + #include <keyutils.h> + #include <getopt.h> + #include <errno.h> ++#include <libgen.h> + #include "cifskey.h" + #include "mount.h" + #include "resolve_host.h" +diff -upr cifs-utils-7.0.orig/getcifsacl.c cifs-utils-7.0/getcifsacl.c +--- cifs-utils-7.0.orig/getcifsacl.c 2024-05-12 11:56:19.019669081 +0200 ++++ cifs-utils-7.0/getcifsacl.c 2024-05-12 11:56:58.229753405 +0200 +@@ -38,6 +38,7 @@ + #include "cifsacl.h" + #include "idmap_plugin.h" + #include <ftw.h> ++#include <libgen.h> + + static void *plugin_handle; + static bool plugin_loaded; +diff -upr cifs-utils-7.0.orig/mount.cifs.c cifs-utils-7.0/mount.cifs.c +--- cifs-utils-7.0.orig/mount.cifs.c 2024-05-12 11:56:19.039669124 +0200 ++++ cifs-utils-7.0/mount.cifs.c 2024-05-12 11:56:42.343052575 +0200 +@@ -38,6 +38,7 @@ + #include <errno.h> + #include <netdb.h> + #include <string.h> ++#include <libgen.h> + #include <mntent.h> + #include <fcntl.h> + #include <limits.h> +diff -upr cifs-utils-7.0.orig/setcifsacl.c cifs-utils-7.0/setcifsacl.c +--- cifs-utils-7.0.orig/setcifsacl.c 2024-05-12 11:56:19.026335762 +0200 ++++ cifs-utils-7.0/setcifsacl.c 2024-05-12 11:57:20.573134789 +0200 +@@ -49,6 +49,7 @@ + #include <limits.h> + #include <ctype.h> + #include <sys/xattr.h> ++#include <libgen.h> + + #include "cifsacl.h" + #include "idmap_plugin.h" diff --git a/main/clang14/APKBUILD b/main/clang14/APKBUILD deleted file mode 100644 index 8f52a1fd8ee..00000000000 --- a/main/clang14/APKBUILD +++ /dev/null @@ -1,341 +0,0 @@ -# Contributor Eric Molitor <eric@molitor.org> -# Contributor Patrick Gansterer <paroga@paroga.com> -# Contributor Travis Tilley <ttilley@gmail.com> -# Contributor omni <omni+alpine@hack.org> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> -pkgname=clang14 -pkgver=14.0.6 -pkgrel=8 -_llvmver=${pkgver%%.*} -pkgdesc="A C language family front-end for LLVM" -arch="all !loongarch64 !riscv64" -url="https://llvm.org/" -license="Apache-2.0 WITH LLVM-exception" -options="!check" # fail to build -makedepends=" - cmake - help2man - libxml2-dev - llvm$_llvmver-dev - llvm$_llvmver-static - llvm$_llvmver-test-utils - samurai - python3 - " -checkdepends="diffutils bash gtest-dev" -depends_dev="$pkgname=$pkgver-r$pkgrel" -subpackages=" - $pkgname-static - $pkgname-libclang - $pkgname-libs - $pkgname-dev - " -source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-$pkgver.src.tar.xz - 10-add-musl-triples.patch - 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch - " -builddir="$srcdir/clang-$pkgver.src" - -# Whether is this package the default (latest) clang version. -_default_clang="no" - -if [ "$_default_clang" = yes ]; then - provides="clang=$pkgver-r$pkgrel" - replaces="clang" - depends_dev="$depends_dev $pkgname-extra-tools=$pkgver-r$pkgrel" -fi - -build() { - local python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/') - - if [ $_default_clang = yes ]; then - local extras=ON - local onlymain=OFF - else - local extras=OFF - local onlymain=ON - fi - - cmake -B build -G Ninja -Wno-dev \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr/lib/llvm$_llvmver \ - -DCMAKE_MODULE_PATH="$srcdir/cmake-$pkgver.src/Modules" \ - -DCLANG_BUILT_STANDALONE=ON \ - -DCLANG_ENABLE_ARCMT=$extras \ - -DCLANG_ENABLE_STATIC_ANALYZER=$extras \ - -DCLANG_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \ - -DCLANG_LINK_CLANG_DYLIB=ON \ - -DCLANG_PLUGIN_SUPPORT=ON \ - -DCLANG_PYTHON_BINDINGS_VERSIONS="$python_version" \ - -DCLANG_VENDOR=Alpine \ - -DENABLE_LINKER_BUILD_ID=ON \ - -DLIBCLANG_BUILD_STATIC=ON \ - -DLLVM_INSTALL_TOOLCHAIN_ONLY=$onlymain - - ninja -C build clang-tblgen - ninja -C build - - if [ "$_default_clang" = yes ]; then - help2man --no-info \ - --source "Alpine" \ - --name "Alpine Clang $pkgver-r$pkgrel" \ - --version-string "$pkgver-r$pkgrel" \ - --help-option "--help-hidden" \ - ./build/bin/clang > clang.1 - fi -} - -check() { - ninja -C build check-all -} - -package() { - # the libraries should always exactly match, not just by soname - depends="$pkgname-libs=$pkgver-r$pkgrel gcc libstdc++-dev" - - DESTDIR="$pkgdir" cmake --install build - mkdir -p "$pkgdir"/usr/bin - - install -Dm644 build/lib/libclang.a -t "$pkgdir"/usr/lib/llvm$_llvmver/lib/ - - if [ $_default_clang = "yes" ]; then - rm "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-format-bbedit.applescript \ - "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-doc-default-stylesheet.css \ - "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/index.js - - mkdir -p "$pkgdir"/usr/share/bash-completion/completions - mv "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/bash-autocomplete.sh \ - "$pkgdir"/usr/share/bash-completion/completions/clang - - mkdir -p "$pkgdir"/usr/share/emacs/site-lisp - mv "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-*.el \ - "$pkgdir"/usr/share/emacs/site-lisp - rmdir -p usr/lib/llvm$_llvmver/share/emacs/clang || true - - local sitedir=$(python3 -c "import site; print(site.getsitepackages()[0])") - mv "$pkgdir"/usr/lib/llvm$_llvmver/lib/python3* "$pkgdir"/usr/lib - mkdir -p "$pkgdir"/"$sitedir" - mv "$pkgdir"/usr/lib/llvm$_llvmver/lib/libscanbuild "$pkgdir"/"$sitedir" - - mv "$pkgdir"/usr/lib/llvm$_llvmver/share/* "$pkgdir"/usr/share/ - - # symlink everything in the bin dir, - # into /usr/bin. - local clangexes=" - analyze-build - c-index-test - clang - clang-cl - clang-cpp - clang-linker-wrapper - clang-nvlink-wrapper - clang-pseudo - clang++ - clang-$_llvmver - clang-apply-replacements - clang-change-namespace - clang-check - clang-doc - clang-extdef-mapping - clang-format - clang-include-fixer - clang-move - clang-offload-bundler - clang-offload-packager - clang-offload-wrapper - clang-query - clang-refactor - clang-rename - clang-reorder-fields - clang-repl - clang-scan-deps - clang-tidy - clangd - diagtool - find-all-symbols - git-clang-format - hmaptool - intercept-build - modularize - pp-trace - run-clang-tidy - scan-build - scan-build-py - scan-view - " - for clangexe in $clangexes; do - ln -sfv ../lib/llvm$_llvmver/bin/$clangexe "$pkgdir"/usr/bin/$clangexe - done - - install -Dm644 "$builddir"/clang.1 -t "$pkgdir"/usr/share/man/man1/ - else - # only has things we want to put in the main version - rm -rf "$pkgdir"/usr/lib/llvm$_llvmver/share - rm -rf "$pkgdir"/usr/lib/llvm$_llvmver/lib/python* - - # provide only a versioned link, so you can add more than one clang version at once, - # and they don't conflict as this is the only thing in the global bin. - # we also add clang++-$_llvmver which is not normally present. - ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang-$_llvmver - ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang++-$_llvmver - fi - - # hack- 14 had weird naming. - local libs=" - libclang-cpp.so - libclang-cpp.so.$_llvmver - libclang.so - libclang.so.13 - libclang.so.$pkgver - " - for lib in $libs; do - ln -sfv ../lib/llvm$_llvmver/lib/$lib "$pkgdir"/usr/lib/$lib - done - - # compat symlink back to fix clang with -no-canonical-prefixes - mkdir -p "$pkgdir"/usr/lib/clang - ln -sfv ../../lib/llvm$_llvmver/lib/clang/$pkgver "$pkgdir"/usr/lib/clang/$pkgver -} - -dev() { - default_dev - _default_replace - - # move back usr/lib/llvm*/lib/clang/x.y.z/include with files such as altivec.h, msa.h etc - # these are needed to build programs *with* clang, not *against* it. - mv "$subpkgdir"/usr/lib/llvm$_llvmver/lib/clang "$pkgdir"/usr/lib/llvm$_llvmver/lib/ -} - -static() { - default_static - _default_replace -} - -bash() { - default_bashcomp - _default_replace -} - -libs() { - default_libs - # this can fail depending on the symlinks and is already moved - amove usr/lib/libclang-cpp.so.* || true - amove usr/lib/llvm$_llvmver/lib/libclang-cpp.so.* - _default_replace -} - -libclang() { - _default_replace - replaces="$replaces clang-libs" - - # we add an extra subpackage for this so things that link to libclang don't - # have to pull libclang-cpp too (separate) - amove usr/lib/libclang.so.* - amove usr/lib/llvm$_llvmver/lib/libclang.so.* -} - -analyzer() { - pkgdesc="Clang source code analysis framework" - depends="$pkgname=$pkgver-r$pkgrel py3-$pkgname=$pkgver-r$pkgrel perl python3" - _default_replace - - amove \ - usr/bin/scan* \ - usr/bin/analyze-build* \ - usr/bin/intercept-build* \ - usr/lib/llvm$_llvmver/bin/scan* \ - usr/lib/llvm$_llvmver/bin/analyze-build* \ - usr/lib/llvm$_llvmver/bin/intercept-build* \ - usr/lib/llvm$_llvmver/libexec/*-analyzer* \ - usr/lib/llvm$_llvmver/libexec/analyze-* \ - usr/lib/llvm$_llvmver/libexec/intercept-* \ - usr/lib/llvm$_llvmver/lib/libear* \ - usr/share/scan-* -} - -extra() { - pkgdesc="Extra tools built using Clang’s tooling APIs" - _default_replace - - amove \ - usr/bin/clang-apply-replacements* \ - usr/bin/clang-change-namespace* \ - usr/bin/clang-check* \ - usr/bin/clang-doc* \ - usr/bin/clang-extdef-mapping* \ - usr/bin/clang-format* \ - usr/bin/clang-include-fixer* \ - usr/bin/clang-move* \ - usr/bin/clang-offload-bundler* \ - usr/bin/clang-offload-wrapper* \ - usr/bin/clang-query* \ - usr/bin/clang-refactor* \ - usr/bin/clang-rename* \ - usr/bin/clang-reorder-fields* \ - usr/bin/clang-repl* \ - usr/bin/clang-scan-deps* \ - usr/bin/clang-tidy* \ - usr/bin/clangd* \ - usr/bin/c-index-test* \ - usr/bin/diagtool* \ - usr/bin/find-all-symbols* \ - usr/bin/git-clang-format* \ - usr/bin/hmaptool* \ - usr/bin/modularize* \ - usr/bin/pp-trace* \ - usr/bin/run-clang-tidy* \ - usr/lib/llvm$_llvmver/bin/clang-apply-replacements* \ - usr/lib/llvm$_llvmver/bin/clang-change-namespace* \ - usr/lib/llvm$_llvmver/bin/clang-check* \ - usr/lib/llvm$_llvmver/bin/clang-doc* \ - usr/lib/llvm$_llvmver/bin/clang-extdef-mapping* \ - usr/lib/llvm$_llvmver/bin/clang-format* \ - usr/lib/llvm$_llvmver/bin/clang-include-fixer* \ - usr/lib/llvm$_llvmver/bin/clang-move* \ - usr/lib/llvm$_llvmver/bin/clang-offload-bundler* \ - usr/lib/llvm$_llvmver/bin/clang-offload-wrapper* \ - usr/lib/llvm$_llvmver/bin/clang-query* \ - usr/lib/llvm$_llvmver/bin/clang-refactor* \ - usr/lib/llvm$_llvmver/bin/clang-rename* \ - usr/lib/llvm$_llvmver/bin/clang-reorder-fields* \ - usr/lib/llvm$_llvmver/bin/clang-repl* \ - usr/lib/llvm$_llvmver/bin/clang-scan-deps* \ - usr/lib/llvm$_llvmver/bin/clang-tidy* \ - usr/lib/llvm$_llvmver/bin/clangd* \ - usr/lib/llvm$_llvmver/bin/c-index-test* \ - usr/lib/llvm$_llvmver/bin/diagtool* \ - usr/lib/llvm$_llvmver/bin/find-all-symbols* \ - usr/lib/llvm$_llvmver/bin/git-clang-format* \ - usr/lib/llvm$_llvmver/bin/hmaptool* \ - usr/lib/llvm$_llvmver/bin/modularize* \ - usr/lib/llvm$_llvmver/bin/pp-trace* \ - usr/lib/llvm$_llvmver/bin/run-clang-tidy* \ - usr/share/clang/clang-include-fixer* \ - usr/share/clang/clang-format*.py \ - usr/share/clang/*clang-tidy* \ - usr/share/clang/run-find-all-symbols.py \ - usr/share/emacs -} - -python() { - pkgdesc="Clang Python Bindings" - depends="$pkgname-libs=$pkgver-r$pkgrel python3" - provides="py3-clang=$pkgver-r$pkgrel" - replaces="py3-clang" - - amove usr/lib/python* - amove usr/share/clang/clang-rename.py -} - -_default_replace() { - if [ "$_default_clang" = yes ]; then - replaces="clang${subpkgname#"$pkgname"}" - provides="$replaces=$pkgver-r$pkgrel" - fi -} - -sha512sums=" -5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b clang-14.0.6.src.tar.xz -5809d931656cac13b91bc91aac63df072b0403708ac718bf01546d9d520ff2c4163ee11411439dce5bb683a3bfa044b62443b6f66a1419c9086d20e79a018071 10-add-musl-triples.patch -b9b5529bcf460767796ddbc6f7d8c479b62d63c74d39297b3c7c79a2f6898272ac52a2f2d1ea2bd601e869cecf23c0cd69fbcd613b8c6299b14a1be8203fd089 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch -" diff --git a/main/clang15/APKBUILD b/main/clang15/APKBUILD index cb5cba6274b..73207120e9c 100644 --- a/main/clang15/APKBUILD +++ b/main/clang15/APKBUILD @@ -8,7 +8,7 @@ pkgver=15.0.7 pkgrel=19 _llvmver=${pkgver%%.*} pkgdesc="C language family front-end for LLVM" -arch="all" +arch="all !loongarch64" url="https://llvm.org/" license="Apache-2.0 WITH LLVM-exception" options="!check" # fail to build diff --git a/main/clang14/10-add-musl-triples.patch b/main/clang18/10-add-musl-triples.patch index 0ed9c81675f..d1e32ff8cec 100644 --- a/main/clang14/10-add-musl-triples.patch +++ b/main/clang18/10-add-musl-triples.patch @@ -29,11 +29,11 @@ static const char *const X32Triples[] = {"x86_64-linux-gnux32", "x86_64-pc-linux-gnux32"}; static const char *const X32LibDirs[] = {"/libx32", "/lib"}; -@@ -2110,6 +2112,7 @@ +@@ -2497,6 +2504,7 @@ "i586-linux-gnu", "i686-linux-gnu", "i686-pc-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux", "i386-redhat-linux", - "i586-suse-linux", "i686-montavista-linux", "i686-gnu", + "i586-suse-linux", "i686-montavista-linux", + "i686-linux-musl", }; - static const char *const M68kLibDirs[] = {"/lib"}; + static const char *const LoongArch64LibDirs[] = {"/lib64", "/lib"}; diff --git a/main/clang14/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang18/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch index bae4532c16a..42c8893a5d2 100644 --- a/main/clang14/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch +++ b/main/clang18/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch @@ -1,3 +1,20 @@ +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index 4f23403..da6883e 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -588,6 +588,10 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + CmdArgs.push_back("-lm"); + } + ++ if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles, options::OPT_nodefaultlibs)) { ++ CmdArgs.push_back("-lssp_nonshared"); ++ } ++ + // Silence warnings when linking C code with a C++ '-stdlib' argument. + Args.ClaimAllArgs(options::OPT_stdlib_EQ); + +diff --git a/lib/Driver/ToolChains/Linux.h b/lib/Driver/ToolChains/Linux.h +index 52439174..d754b543 100644 --- a/lib/Driver/ToolChains/Linux.h +++ b/lib/Driver/ToolChains/Linux.h @@ -11,6 +11,7 @@ @@ -8,11 +25,11 @@ namespace clang { namespace driver { -@@ -60,6 +61,15 @@ - llvm::DenormalMode getDefaultDenormalModeForType( +@@ -63,7 +64,15 @@ public: const llvm::opt::ArgList &DriverArgs, const JobAction &JA, const llvm::fltSemantics *FPType = nullptr) const override; -+ + + const char *getDefaultLinker() const override; + LangOptions::StackProtectorMode + GetDefaultStackProtectorLevel(bool KernelOrKext) const override { + StringRef VendorName = Linux::getTriple().getVendorName(); @@ -24,24 +41,28 @@ protected: Tool *buildAssembler() const override; +diff --git a/test/Driver/fsanitize.c b/test/Driver/fsanitize.c +index 8ad6dc25..1619b59a 100644 --- a/test/Driver/fsanitize.c +++ b/test/Driver/fsanitize.c -@@ -666,12 +666,12 @@ +@@ -700,12 +700,12 @@ // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP // NOSP-NOT: "-fsanitize=safe-stack" --// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP -+// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP - // RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN - // RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP - // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP --// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP --// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP -+// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP -+// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP - // RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP +-// RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP ++// RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP + // RUN: not %clang --target=x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN + // RUN: %clang --target=x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP + // RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP +-// RUN: %clang --target=arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP +-// RUN: %clang --target=aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP ++// RUN: %clang --target=arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP ++// RUN: %clang --target=aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP // NO-SP-NOT: stack-protector // NO-SP: "-fsanitize=safe-stack" + // SP-ASAN: error: invalid argument '-fsanitize=safe-stack' not allowed with '-fsanitize=address' +diff --git a/test/Driver/stack-protector.c b/test/Driver/stack-protector.c +index 16937691..80987f67 100644 --- a/test/Driver/stack-protector.c +++ b/test/Driver/stack-protector.c @@ -33,6 +33,22 @@ @@ -67,16 +88,3 @@ // Test default stack protector values for Darwin platforms // RUN: %clang -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS ---- a/lib/Driver/ToolChains/Gnu.cpp -+++ b/lib/Driver/ToolChains/Gnu.cpp -@@ -563,6 +563,10 @@ - // The profile runtime also needs access to system libraries. - getToolChain().addProfileRTLibs(Args, CmdArgs); - -+ if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles, options::OPT_nodefaultlibs)) { -+ CmdArgs.push_back("-lssp_nonshared"); -+ } -+ - if (D.CCCIsCXX() && - !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs, - options::OPT_r)) { diff --git a/main/clang18/APKBUILD b/main/clang18/APKBUILD new file mode 100644 index 00000000000..9b641d3c548 --- /dev/null +++ b/main/clang18/APKBUILD @@ -0,0 +1,497 @@ +# Contributor Eric Molitor <eric@molitor.org> +# Contributor Patrick Gansterer <paroga@paroga.com> +# Contributor Travis Tilley <ttilley@gmail.com> +# Contributor omni <omni+alpine@hack.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=clang18 +pkgver=18.1.5 +pkgrel=0 +_llvmver=${pkgver%%.*} +pkgdesc="C language family front-end for LLVM" +arch="all" +url="https://llvm.org/" +license="Apache-2.0 WITH LLVM-exception" +options="!check" # fail to build +makedepends=" + cmake + help2man + libxml2-dev + llvm$_llvmver-dev + llvm$_llvmver-gtest + llvm$_llvmver-static + llvm$_llvmver-test-utils + samurai + python3 + " +checkdepends="diffutils bash gtest-dev" +depends_dev="$pkgname=$pkgver-r$pkgrel" +subpackages=" + $pkgname-static + $pkgname-headers + $pkgname-libclang + $pkgname-libs + $pkgname-dev + $pkgname-ccache + $pkgname-extra-tools:extra + " +source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-$pkgver.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-tools-extra-$pkgver.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/cmake-$pkgver.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/third-party-$pkgver.src.tar.xz + 10-add-musl-triples.patch + 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch + + clang-001-fortify-include.patch + clang-002-fortify-enable.patch + clang-003-as-needed.patch + " +builddir="$srcdir/clang-$pkgver.src" + +prepare() { + mv "$srcdir/clang-tools-extra-$pkgver.src" "$builddir/tools/extra" + default_prepare + mv "$srcdir"/cmake-${pkgver//_/}.src "$srcdir"/cmake + mv "$srcdir"/third-party-${pkgver//_/}.src "$srcdir"/thirtd-party +} + +# Whether is this package the default (latest) clang version. +_default_clang="no" + +if [ "$_default_clang" = yes ]; then + subpackages=" + $subpackages + $pkgname-doc + $pkgname-analyzer::noarch + $pkgname-bash-completion:bash:noarch + $pkgname-emacs::noarch + py3-$pkgname:python:noarch + " + provides="clang=$pkgver-r$pkgrel" + replaces="clang" + depends_dev="$depends_dev $pkgname-extra-tools=$pkgver-r$pkgrel" +fi + +build() { + local python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/') + + if [ $_default_clang = yes ]; then + local extras=ON + else + local extras=OFF + fi + + cmake -B build -G Ninja -Wno-dev \ + -DCLANG_BUILT_STANDALONE=ON \ + -DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang$_llvmver \ + -DCLANG_DEFAULT_PIE_ON_LINUX=ON \ + -DCLANG_ENABLE_ARCMT=$extras \ + -DCLANG_ENABLE_STATIC_ANALYZER=$extras \ + -DCLANG_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \ + -DCLANG_LINK_CLANG_DYLIB=ON \ + -DCLANG_PLUGIN_SUPPORT=ON \ + -DCLANG_PYTHON_BINDINGS_VERSIONS="$python_version" \ + -DCLANG_SYSTEMZ_DEFAULT_ARCH=z196 \ + -DCLANG_VENDOR=Alpine \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/lib/llvm$_llvmver \ + -DCMAKE_INSTALL_RPATH=/usr/lib/llvm$_llvmver/lib \ + -DCMAKE_MODULE_PATH="$srcdir/cmake-$pkgver.src/Modules" \ + -DENABLE_LINKER_BUILD_ID=ON \ + -DLIBCLANG_BUILD_STATIC=ON \ + -DLLVM_INCLUDE_TESTS=OFF \ + -DLLVM_EXTERNAL_LIT=/usr/bin/lit \ + -DLLVM_BUILD_TESTS=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_LINK_LLVM_DYLIB=ON \ + -DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src" + + ninja -C build clang-tblgen + ninja -C build + + if [ "$_default_clang" = yes ]; then + help2man --no-info \ + --source "Alpine" \ + --name "Alpine Clang $pkgver-r$pkgrel" \ + --version-string "$pkgver-r$pkgrel" \ + --help-option "--help-hidden" \ + ./build/bin/clang > clang.1 + fi +} + +check() { + ninja -C build check-all +} + +package() { + # the libraries should always exactly match, not just by soname + # gcc is for libgcc-dev which we don't have split + depends=" + $pkgname-headers=$pkgver-r$pkgrel + $pkgname-libs=$pkgver-r$pkgrel + fortify-headers>=1.1-r2 + gcc + libstdc++-dev + llvm$_llvmver-linker-tools + musl-dev + " + + # create system config + # clang doesn't really have a way to set default -march abi options, so use the system config dir + # see the clang UsersManual for how this config directory is parsed / fallback order. + # this is set based on our gcc baseline. see the --with arguments in main/gcc. + mkdir -p "$pkgdir"/etc/clang$_llvmver + case "$CARCH" in + x86_64) + # unsurprisingly, this is the same as gcc + touch config.cfg + ;; + x86) + # clang defaults to pentium4 on i*86- triples. + # see https://github.com/llvm/llvm-project/issues/61347 + cat > config.cfg <<-EOF + -march=pentium-m -mfpmath=sse + EOF + ;; + armhf) + # clang defaults to 'armv6' for armhf, i.e. no -zk. + # -zk is also a deprecated name for -kz. + cat > config.cfg <<-EOF + -march=armv6kz + -mfpu=vfp + -mtune=arm1176jzf-s + EOF + ;; + armv7) + # clang defaults to neon fpu and non-thumb. + # XXX: but seemingly changing it from this makes it not really work on armv7 + # cat > config.cfg <<-EOF + # -mfpu=vfpv3-d16 + # -mthumb + # EOF + touch config.cfg + ;; + s390x) + # this is correct, as this is the one thing that we have a build-time -D for. + # see -DCLANG_SYSTEMZ_DEFAULT_ARCH. + touch config.cfg + ;; + ppc64le) + # this is seemingly correct, clang defaults to secureplt for musl and elfv2. + touch config.cfg + ;; + riscv64) + # this is correct, as clang defaults to rvXLENimafdc (-gc) for non-unknown. + # this is our target already. + touch config.cfg + ;; + aarch64) + # XXX: this defaults to + # CmdArgs.push_back("-mfpu=crypto-neon-fp-armv8"); + # is that correct? armv8 is always neon, but the others are unclear. + # the output still runs on an rpi4 that normally doesn't have "crypto", so maybe that is misleading + # (Gnu.cpp) + touch config.cfg + ;; + esac + # the target triple being built for + # in LLVM, we set -DLLVM_DEFAULT_TARGET_TRIPLE to the same thing, + # so that is the default triple, and one of the checked files. + # it's possible to do CBUILD-clang.cfg and similar to make it per-tool + mv config.cfg "$pkgdir"/etc/clang$_llvmver/$CBUILD.cfg + + DESTDIR="$pkgdir" cmake --install build + mkdir -p "$pkgdir"/usr/bin + + install -Dm644 build/lib/libclang.a -t "$pkgdir"/usr/lib/llvm$_llvmver/lib/ + + if [ $_default_clang = "yes" ]; then + rm "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-format-bbedit.applescript \ + "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-doc-default-stylesheet.css \ + "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/index.js + + mkdir -p "$pkgdir"/usr/share/bash-completion/completions + mv "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/bash-autocomplete.sh \ + "$pkgdir"/usr/share/bash-completion/completions/clang + + mkdir -p "$pkgdir"/usr/share/emacs/site-lisp + mv "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-*.el \ + "$pkgdir"/usr/share/emacs/site-lisp + rmdir -p usr/lib/llvm$_llvmver/share/emacs || true + + mv "$pkgdir"/usr/lib/llvm$_llvmver/share/man "$pkgdir"/usr/share/ + # XXX: scan-build specifically needs to stay in llvm path, but scan-view has to not be + # everything uses different path lookup logic.. + mv "$pkgdir"/usr/lib/llvm$_llvmver/share/scan-view "$pkgdir"/usr/share/ + + local sitedir=$(python3 -c "import site; print(site.getsitepackages()[0])") + mv "$pkgdir"/usr/lib/llvm$_llvmver/lib/python3* "$pkgdir"/usr/lib + mkdir -p "$pkgdir"/"$sitedir" + mv "$pkgdir"/usr/lib/llvm$_llvmver/lib/libscanbuild "$pkgdir"/"$sitedir" + + # symlink everything in the bin dir, + # into /usr/bin. + local clangexes=" + analyze-build + amdgpu-arch + c-index-test + clang + clang-cl + clang-cpp + clang-include-cleaner + clang-linker-wrapper + clang-pseudo + clang++ + clang-$_llvmver + clang-apply-replacements + clang-change-namespace + clang-check + clang-doc + clang-extdef-mapping + clang-format + clang-include-fixer + clang-move + clang-offload-bundler + clang-offload-packager + clang-query + clang-refactor + clang-rename + clang-reorder-fields + clang-repl + clang-scan-deps + clang-tidy + clangd + diagtool + find-all-symbols + git-clang-format + hmaptool + intercept-build + modularize + nvptx-arch + pp-trace + run-clang-tidy + scan-build + scan-build-py + scan-view + " + for clangexe in $clangexes; do + ln -sfv ../lib/llvm$_llvmver/bin/$clangexe "$pkgdir"/usr/bin/$clangexe + done + ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang++-$_llvmver + + install -Dm644 "$builddir"/clang.1 -t "$pkgdir"/usr/share/man/man1/ + else + ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang-$_llvmver + ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang++-$_llvmver + + # delete things we don't want non-latest of + rm -r "$pkgdir"/usr/lib/llvm$_llvmver/share + rm -r "$pkgdir"/usr/lib/llvm$_llvmver/lib/python3* + fi + + local libs=" + libclang-cpp.so + libclang-cpp.so.$_llvmver + libclang.so + libclang.so.$_llvmver + libclang.so.$pkgver + " + for lib in $libs; do + ln -sfv ../lib/llvm$_llvmver/lib/$lib "$pkgdir"/usr/lib/$lib + done + + # compat symlink back to fix clang with -no-canonical-prefixes + mkdir -p "$pkgdir"/usr/lib/clang/ + ln -sfv ../llvm$_llvmver/lib/clang/$_llvmver "$pkgdir"/usr/lib/clang/$_llvmver +} + +dev() { + default_dev + _default_replace + + # move cmake to -dev + amove usr/lib/llvm$_llvmver/lib/cmake/clang + + # create cmakedir symlinks, so find_package works + # llvm does the same thing- versioned, plus unversioned default. + mkdir -p "$subpkgdir"/usr/lib/cmake + ln -sfv ../llvm$_llvmver/lib/cmake/clang "$subpkgdir"/usr/lib/cmake/clang$_llvmver + if [ $_default_clang = yes ]; then + ln -sfv clang$_llvmver "$subpkgdir"/usr/lib/cmake/clang + fi +} + +static() { + default_static + _default_replace +} + +bash() { + default_bashcomp + _default_replace +} + +libs() { + default_libs + # this can fail depending on the symlinks and is already moved + amove usr/lib/libclang-cpp.so.* || true + amove usr/lib/llvm$_llvmver/lib/libclang-cpp.so* + _default_replace +} + +libclang() { + _default_replace + replaces="$replaces clang-libs" + depends="$pkgname-headers=$pkgver-r$pkgrel" + + # we add an extra subpackage for this so things that link to libclang don't + # have to pull libclang-cpp too (separate) + amove usr/lib/libclang.so.* + amove usr/lib/llvm$_llvmver/lib/libclang.so* +} + +analyzer() { + pkgdesc="Clang source code analysis framework" + depends="$pkgname=$pkgver-r$pkgrel py3-$pkgname=$pkgver-r$pkgrel perl python3" + _default_replace + + amove \ + usr/bin/scan* \ + usr/bin/analyze-build* \ + usr/bin/intercept-build* \ + usr/lib/llvm$_llvmver/bin/scan* \ + usr/lib/llvm$_llvmver/bin/analyze-build* \ + usr/lib/llvm$_llvmver/bin/intercept-build* \ + usr/lib/llvm$_llvmver/libexec/*-analyzer* \ + usr/lib/llvm$_llvmver/libexec/analyze-* \ + usr/lib/llvm$_llvmver/libexec/intercept-* \ + usr/lib/llvm$_llvmver/lib/libear* \ + usr/lib/llvm$_llvmver/share/scan-build \ + usr/share/scan-view +} + +headers() { + _default_replace + amove usr/lib/llvm$_llvmver/lib/clang/$_llvmver/include +} + +extra() { + pkgdesc="Extra tools built using Clang's tooling APIs" + _default_replace + + if [ "$_default_clang" = "yes" ]; then + amove \ + usr/bin/amdgpu-arch \ + usr/bin/clang-apply-replacements* \ + usr/bin/clang-change-namespace* \ + usr/bin/clang-check* \ + usr/bin/clang-doc* \ + usr/bin/clang-extdef-mapping* \ + usr/bin/clang-format* \ + usr/bin/clang-include-cleaner* \ + usr/bin/clang-include-fixer* \ + usr/bin/clang-move* \ + usr/bin/clang-offload-bundler* \ + usr/bin/clang-pseudo* \ + usr/bin/clang-query* \ + usr/bin/clang-refactor* \ + usr/bin/clang-rename* \ + usr/bin/clang-reorder-fields* \ + usr/bin/clang-repl* \ + usr/bin/clang-scan-deps* \ + usr/bin/clang-tidy* \ + usr/bin/clangd* \ + usr/bin/c-index-test* \ + usr/bin/diagtool* \ + usr/bin/find-all-symbols* \ + usr/bin/git-clang-format* \ + usr/bin/hmaptool* \ + usr/bin/modularize* \ + usr/bin/nvptx-arch \ + usr/bin/pp-trace* \ + usr/bin/run-clang-tidy* + fi + +# usr/lib/llvm$_llvmver/bin/clang-check* \ +# usr/lib/llvm$_llvmver/bin/clang-extdef-mapping* \ + amove \ + usr/lib/llvm$_llvmver/bin/clang-apply-replacements* \ + usr/lib/llvm$_llvmver/bin/clang-change-namespace* \ + usr/lib/llvm$_llvmver/bin/clang-doc* \ + usr/lib/llvm$_llvmver/bin/clang-format* \ + usr/lib/llvm$_llvmver/bin/clang-include-cleaner* \ + usr/lib/llvm$_llvmver/bin/clang-include-fixer* \ + usr/lib/llvm$_llvmver/bin/clang-move* \ + usr/lib/llvm$_llvmver/bin/clang-offload-bundler* \ + usr/lib/llvm$_llvmver/bin/clang-pseudo* \ + usr/lib/llvm$_llvmver/bin/clang-query* \ + usr/lib/llvm$_llvmver/bin/clang-refactor* \ + usr/lib/llvm$_llvmver/bin/clang-rename* \ + usr/lib/llvm$_llvmver/bin/clang-reorder-fields* \ + usr/lib/llvm$_llvmver/bin/clang-repl* \ + usr/lib/llvm$_llvmver/bin/clang-scan-deps* \ + usr/lib/llvm$_llvmver/bin/clang-tidy* \ + usr/lib/llvm$_llvmver/bin/clangd* \ + usr/lib/llvm$_llvmver/bin/c-index-test* \ + usr/lib/llvm$_llvmver/bin/diagtool* \ + usr/lib/llvm$_llvmver/bin/find-all-symbols* \ + usr/lib/llvm$_llvmver/bin/git-clang-format* \ + usr/lib/llvm$_llvmver/bin/hmaptool* \ + usr/lib/llvm$_llvmver/bin/modularize* \ + usr/lib/llvm$_llvmver/bin/pp-trace* \ + usr/lib/llvm$_llvmver/bin/run-clang-tidy* \ +# usr/lib/llvm$_llvmver/share/clang/clang* \ +# usr/lib/llvm$_llvmver/share/clang/run-find-all-symbols.py +} + +emacs() { + _default_replace + pkgdesc="clang plugin for emacs" + install_if="$pkgname-extra-tools=$pkgver-r$pkgrel emacs" + + amove usr/share/emacs +} + +python() { + pkgdesc="Clang Python Bindings" + depends="$pkgname-libs=$pkgver-r$pkgrel python3" + provides="py3-clang=$pkgver-r$pkgrel" + replaces="py3-clang" + + amove usr/lib/python* +} + +ccache() { + _default_replace + pkgdesc="$pkgdesc (ccache symlinks)" + install_if="$pkgname=$pkgver-r$pkgrel ccache" + replaces="$replaces ccache" + + mkdir -p "$subpkgdir"/usr/lib/ccache/bin + ln -sfv ../../../bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang-$_llvmver + ln -sfv ../../../bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang++-$_llvmver + if [ "$_default_clang" = yes ]; then + ln -sfv ../../../bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang++ + ln -sfv ../../../bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang + fi +} + +_default_replace() { + if [ "$_default_clang" = yes ]; then + replaces="clang${subpkgname#"$pkgname"} clang16${subpkgname#"$pkgname"}" + provides="clang${subpkgname#"$pkgname"}=$pkgver-r$pkgrel" + fi +} + +sha512sums=" +2a2bba27bd2205a58d99464436658910116c9f049f996ca88323eb2f96e6102c08c3da5bce408d8347999f75073761d602dce9514faf35fb968b74b498210efd clang-18.1.5.src.tar.xz +c7402c984e560c2cdc45299c430badefdcaa844c702cdebaffc831abf6bde8f78b34e8ebff9b81a55341e48486773cf1f97a0e21ed2043c657f0beacac132c7d clang-tools-extra-18.1.5.src.tar.xz +5ce7c10d077207e6d3125d3d356b391387e81dcde071673640a455d6ed25f700afa14027e27ef036a2e1d62c8f7c489bfa23f2193bd90c788e818e387483e458 cmake-18.1.5.src.tar.xz +87f4a51d63ac16ef7c931574880fad32d56af8c369cb05da38124f03631c8b9a8a1ccdf0096892fcb8ef1816ec5c2c11878913253c873904b1a39f4a31ead3ee llvm-18.1.5.src.tar.xz +e1ae2143a9f4342582d5f4c4a5d6b866c7c8adc5533c57be5237f6fecb2a136d280b6b1ebcee3ef5b884a236fb0ff20f5fca07add09f7d3e20525ceddafe802d third-party-18.1.5.src.tar.xz +3010f526598ab2e8d378f9447eaf9e91539f4b1da92e21f9711e1d167557a19f6f31651377f1803d7efc91c79073b286157c46bff5cccdc62db73a812ee10a61 10-add-musl-triples.patch +f0eb08b24a3dec2a0223e3a6792cc556bc1e0d571240ae644e34383ff5d4fb60550a1a7d38e0ee9351f1642263b1983203522389b76b3929f75e8ee410b05033 30-Enable-stack-protector-by-default-for-Alpine-Linux.patch +aa2dff990278e0258763934eaa528827baa1733eeb7dc36cc7f1500a4919b8d11870a0522f20f210d454322e3faf5945e9afaeffc9f3a3c4fd422b706370a663 clang-001-fortify-include.patch +751f8acef2bfd1b50c065dea2ad0c3a20cadd4ff4c842ae519b5085c48372127b49a75d3fd0bd32291f5a69119340e5568a9fba6d94e6f354b14233986f61328 clang-002-fortify-enable.patch +5f98f147d7d66315e9a56ae6fee602a053d40e57a8b1ee4f2ef1764203bb6fdb9082c8e825c535a9388213a38b49d2702b1e936fcf56560c4a2a56b7e6dd232c clang-003-as-needed.patch +" diff --git a/main/clang18/clang-001-fortify-include.patch b/main/clang18/clang-001-fortify-include.patch new file mode 100644 index 00000000000..968c26e5131 --- /dev/null +++ b/main/clang18/clang-001-fortify-include.patch @@ -0,0 +1,36 @@ +From eca9994181dc355cfba61e726c038832d5ff6975 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa <daniel@octaforge.org> +Date: Sun, 23 Oct 2022 00:47:57 +0200 +Subject: [PATCH 1/4] clang: add fortify include paths for musl triplets + +When we have fortify headers this lets them get included. +--- + lib/Driver/ToolChains/Linux.cpp | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp +index 7fcdcf125..d5df4a240 100644 +--- a/lib/Driver/ToolChains/Linux.cpp ++++ b/lib/Driver/ToolChains/Linux.cpp +@@ -622,10 +622,14 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs, + if (getTriple().getOS() == llvm::Triple::RTEMS) + return; + +- // Add an include of '/include' directly. This isn't provided by default by +- // system GCCs, but is often used with cross-compiling GCCs, and harmless to +- // add even when Clang is acting as-if it were a system compiler. +- addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/include")); ++ if (getTriple().isMusl()) { ++ addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/usr/include/fortify")); ++ } else { ++ // Preserve original clang behavior for non-musl triples, but for musl ++ // this just gets in the way and none of our crosstoolchains are ever ++ // actually built this way (and we'd have to figure out fortify for it) ++ addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/include")); ++ } + + addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/usr/include")); + +-- +2.38.0 + diff --git a/main/clang18/clang-002-fortify-enable.patch b/main/clang18/clang-002-fortify-enable.patch new file mode 100644 index 00000000000..30100c9cba4 --- /dev/null +++ b/main/clang18/clang-002-fortify-enable.patch @@ -0,0 +1,29 @@ +From 0a876ce2825f1e54bec7059a387e43a2e0386665 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa <daniel@octaforge.org> +Date: Sun, 23 Oct 2022 01:02:35 +0200 +Subject: [PATCH 2/4] clang: enable fortify by default on optimizing musl + targets + +--- + lib/Frontend/InitPreprocessor.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp +index 20bfbf144..9095c0f2f 100644 +--- a/lib/Frontend/InitPreprocessor.cpp ++++ b/lib/Frontend/InitPreprocessor.cpp +@@ -1288,6 +1288,11 @@ static void InitializePredefinedMacros(const TargetInfo &TI, + Builder.defineMacro("__GLIBCXX_BITSIZE_INT_N_0", "128"); + } + ++ // Enable fortify by default on musl when optimizing, but not with asan ++ if (TI.getTriple().isMusl() && LangOpts.Optimize && ++ !LangOpts.Sanitize.has(SanitizerKind::Address)) ++ Builder.defineMacro("_FORTIFY_SOURCE", "2"); ++ + // Get other target #defines. + TI.getTargetDefines(LangOpts, Builder); + } +-- +2.38.0 + diff --git a/main/clang18/clang-003-as-needed.patch b/main/clang18/clang-003-as-needed.patch new file mode 100644 index 00000000000..a92836fe07a --- /dev/null +++ b/main/clang18/clang-003-as-needed.patch @@ -0,0 +1,31 @@ +forces as-needed regardless of ldflags +From f59f126a9344f265e3766003766d7a66b6a638e3 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa <daniel@octaforge.org> +Date: Sun, 23 Oct 2022 01:26:37 +0200 +Subject: [PATCH 3/4] clang: use --as-needed by default + +--- + clang/lib/Driver/ToolChains/Gnu.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp +index f203cae1d..9e181a79a 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -560,6 +560,13 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs); + bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs); + addLinkerCompressDebugSectionsOption(ToolChain, Args, CmdArgs); ++ ++ // Use --as-needed by default for all explicit linker inputs on Linux ++ // We don't reset it afterwards because explicit argument does not ++ // get reset either (and that is permitted, so it should be fine) ++ if (Triple.isOSLinux()) ++ CmdArgs.push_back("--as-needed"); ++ + AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA); + + addHIPRuntimeLibArgs(ToolChain, Args, CmdArgs); +-- +2.38.0 + diff --git a/main/clucene/APKBUILD b/main/clucene/APKBUILD index ad9f8b0047a..f5fa22d8139 100644 --- a/main/clucene/APKBUILD +++ b/main/clucene/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=clucene pkgver=2.3.3.4 -pkgrel=21 +pkgrel=22 pkgdesc="A C++ port of Lucene" url="https://www.sourceforge.net/projects/clucene/" arch="all" diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD index cbf26b67f7d..ebf59928f9c 100644 --- a/main/cmake/APKBUILD +++ b/main/cmake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cmake -pkgver=3.29.2 +pkgver=3.29.3 pkgrel=0 pkgdesc="Cross-platform, open-source make system" url="https://www.cmake.org/" @@ -14,7 +14,6 @@ makedepends=" libuv-dev linux-headers ncurses-dev - nghttp2-dev py3-sphinx rhash-dev samurai @@ -37,9 +36,9 @@ source="https://www.cmake.org/files/$_v/cmake-$pkgver.tar.gz" options="!check" build() { - # jsoncpp/cppdap/curl needs cmake to build so to avoid recursive build + # jsoncpp/cppdap/curl/nghttp2 needs cmake to build so to avoid recursive build # dependency, we use the bundled version. - # Do NOT remove --no-system-jsoncpp, --no-system-cppdap or --no-system-curl + # Do NOT remove --no-system-* ./bootstrap \ --prefix=/usr \ @@ -50,13 +49,13 @@ build() { --no-system-cppdap \ --no-system-curl \ --no-system-jsoncpp \ + --no-system-nghttp2 \ --system-bzip2 \ --system-expat \ --system-libarchive \ --system-liblzma \ --system-librhash \ --system-libuv \ - --system-nghttp2 \ --system-zlib \ --generator=Ninja \ --parallel="${JOBS:-2}" @@ -92,5 +91,5 @@ vim() { } sha512sums=" -0dad9e0e3ad9c1178d337cd3a14e9ce145e011175e9d9fce4961d12b8fe37091f9fdf05f4303cdd846408955b11bac3cfe5064f852833b99e31f5a7b82a9d1eb cmake-3.29.2.tar.gz +930060cf484a769992ebc798d5e81984560b2cd7e163db7053181ad842656ccd0085e7e077c9c620e719d212f78283ca0db19bec5491a355d38078bbe0bac254 cmake-3.29.3.tar.gz " diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD index cae7441b5b1..04f91e44f3c 100644 --- a/main/conky/APKBUILD +++ b/main/conky/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=conky -pkgver=1.19.8 +pkgver=1.21.0 pkgrel=0 pkgdesc="Advanced, highly configurable system monitor for X based on torsmo" url="https://github.com/brndnmtthws/conky" @@ -13,6 +13,7 @@ makedepends=" curl-dev gawk glib-dev + gperf imlib2-dev libxdamage-dev libxext-dev @@ -47,7 +48,8 @@ build() { -DBUILD_I18N=OFF \ -DBUILD_LUA_CAIRO=ON \ -DBUILD_WAYLAND=ON \ - -DLUA_LIBRARIES="/usr/lib/lua5.4/liblua.so" + -DLUA_LIBRARIES="/usr/lib/lua5.4/liblua.so" \ + -DVc_ENABLE_INSTALL=OFF cmake --build build } @@ -57,5 +59,5 @@ package() { } sha512sums=" -bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4 conky-1.19.8.tar.gz +584b74cacb3d398bdaf345558c8431d85c3bd1371cf58f678c53d6d01a76804589678ceb4bbf6073094dc2f99705e14d9e4f8e61701fcf7608504ddea7d1f2ba conky-1.21.0.tar.gz " diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD index f3256864483..dbe7dea9d08 100644 --- a/main/coreutils/APKBUILD +++ b/main/coreutils/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=coreutils pkgver=9.5 -pkgrel=0 +pkgrel=1 pkgdesc="The basic file, shell and text manipulation utilities" url="https://www.gnu.org/software/coreutils/" arch="all" @@ -11,7 +11,9 @@ license="GPL-3.0-or-later" makedepends="acl-dev attr-dev utmps-dev perl openssl-dev" subpackages="$pkgname-doc $pkgname-env $pkgname-fmt $pkgname-sha512sum:_sha512sum" install="$pkgname.post-deinstall" -source="https://ftp.gnu.org/gnu/coreutils/coreutils-$pkgver.tar.xz" +source="https://ftp.gnu.org/gnu/coreutils/coreutils-$pkgver.tar.xz + renameat2-fakeroot.patch + " options="!check" # FAIL: tests/cp/reflink-auto # secfixes: @@ -89,4 +91,5 @@ _sha512sum() { sha512sums=" 2ca0deac4dc10a80fd0c6fd131252e99d457fd03b7bd626a6bc74fe5a0529c0a3d48ce1f5da1d3b3a7a150a1ce44f0fbb6b68a6ac543dfd5baa3e71f5d65401c coreutils-9.5.tar.xz +a0317f6f42a0f821c6ec6745ff0f6be4ed9d2330ef1f886947a80a0f24dcddc6a28660c1d661da996577cc26b02c095a8aa058e553050acf90bce445ab07136a renameat2-fakeroot.patch " diff --git a/main/coreutils/renameat2-fakeroot.patch b/main/coreutils/renameat2-fakeroot.patch new file mode 100644 index 00000000000..c4cf5909825 --- /dev/null +++ b/main/coreutils/renameat2-fakeroot.patch @@ -0,0 +1,18 @@ +calling the syscall directly for renameat2 breaks fakeroot. +Force fallback til musl has implemented renameat2. + +ref: https://gitlab.alpinelinux.org/alpine/aports/-/issues/16016 + +diff --git a/lib/renameatu.c b/lib/renameatu.c +index 6893232..a6b278d 100644 +--- a/lib/renameatu.c ++++ b/lib/renameatu.c +@@ -109,7 +109,7 @@ renameatu (int fd1, char const *src, int fd2, char const *dst, + #ifdef HAVE_RENAMEAT2 + ret_val = renameat2 (fd1, src, fd2, dst, flags); + err = errno; +-#elif defined SYS_renameat2 ++#elif defined SYS_renameat2 && defined BREAK_FAKEROOT + ret_val = syscall (SYS_renameat2, fd1, src, fd2, dst, flags); + err = errno; + #endif diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD index 8f043d71a37..7ffa6fc362c 100644 --- a/main/cups/APKBUILD +++ b/main/cups/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cups pkgver=2.4.7 -pkgrel=3 +pkgrel=4 pkgdesc="The CUPS Printing System" url="https://github.com/OpenPrinting/cups/" arch="all" @@ -104,8 +104,7 @@ package() { sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' \ usr/share/applications/cups.desktop fi - find usr/share/cups/model \( -name "*.ppd" -a ! -name "*.gz" \) \ - -exec gzip -n9f {} \+ + find usr/share/cups/model -name "*.ppd" -exec gzip -n9f {} + } dev() { diff --git a/main/dmidecode/APKBUILD b/main/dmidecode/APKBUILD index 5c9fbfe9c54..d4824cee11e 100644 --- a/main/dmidecode/APKBUILD +++ b/main/dmidecode/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Nathan Angelacos <nangel@alpinelinux.org> pkgname=dmidecode -pkgver=3.5 -pkgrel=1 +pkgver=3.6 +pkgrel=0 pkgdesc="A utility for reporting system hardware as described by BIOS" url="https://nongnu.org/dmidecode" arch="all" license="GPL-2.0-or-later" +makedepends="bash-completion bash-completion-dev" options="!check" # No testsuite -subpackages="$pkgname-doc" +subpackages="$pkgname-doc $pkgname-bash-completion" source="https://download.savannah.gnu.org/releases/dmidecode/dmidecode-$pkgver.tar.xz" prepare() { @@ -24,5 +25,5 @@ package() { } sha512sums=" -690c9bea391f6bbfc8cd48e8db408a61d5b551a07a2823c29d03a09607fc2043cc1bea44ee9fd27fd0e7bc0b287bf9de9f22a1a66053f5b1e63d77c03d93e1ae dmidecode-3.5.tar.xz +b1e47a2121062581876ba2daf3ce80b1c39612d078718609b8bc97d4e7a4b47427200502468b5d71f0d0dcb5ba299fb2e808791b62dc5b50e67acac60c51a461 dmidecode-3.6.tar.xz " diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD index 38a1a1dfeed..b1821676a32 100644 --- a/main/dnsmasq/APKBUILD +++ b/main/dnsmasq/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> pkgname=dnsmasq pkgver=2.90 -pkgrel=2 +pkgrel=3 pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server" url="https://www.thekelleys.org.uk/dnsmasq/" arch="all" @@ -13,18 +13,22 @@ makedepends=" dbus-dev linux-headers nettle-dev + nftables-dev " install=" $pkgname.pre-install $pkgname.pre-upgrade $pkgname-dnssec.pre-install $pkgname-dnssec.pre-upgrade + $pkgname-dnssec-nftset.pre-install + $pkgname-dnssec-nftset.pre-upgrade $pkgname-dnssec-dbus.pre-install $pkgname-dnssec-dbus.pre-upgrade " subpackages=" $pkgname-doc $pkgname-dnssec + $pkgname-dnssec-nftset $pkgname-dnssec-dbus $pkgname-openrc $pkgname-common::noarch @@ -78,6 +82,9 @@ build() { make LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" COPTS="-DHAVE_DNSSEC" all mv src/dnsmasq src/dnsmasq~dnssec + make LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" COPTS="-DHAVE_DNSSEC -DHAVE_NFTSET" all + mv src/dnsmasq src/dnsmasq~nftset + make LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" COPTS="-DHAVE_DNSSEC -DHAVE_DBUS" all mv src/dnsmasq src/dnsmasq~dbus @@ -94,7 +101,7 @@ check() { } package() { - provider_priority=100 # highest (other providers are dnsmasq-dnssec, dnsmasq-dnssec-dbus) + provider_priority=100 # highest (other providers are dnsmasq-dnssec, dnsmasq-dnssec-nftset, dnsmasq-dnssec-dbus) make PREFIX=/usr DESTDIR="$pkgdir" install @@ -105,11 +112,23 @@ package() { dnssec() { pkgdesc="$pkgdesc with DNSSEC support" provides="$pkgname=$pkgver-r$pkgrel" - provider_priority=20 # middle (other providers are dnsmasq, dnsmasq-dnssec-dbus) + provider_priority=20 # middle (other providers are dnsmasq, dnsmasq-dnssec-nftset, dnsmasq-dnssec-dbus) install -D -m 755 "$builddir"/src/dnsmasq~dnssec "$subpkgdir"/usr/sbin/dnsmasq } +nftset() { + pkgdesc="$pkgdesc with DNSSEC and nftables set support" + provides=" + $pkgname=$pkgver-r$pkgrel + $pkgname-dnssec=$pkgver-r$pkgrel + " + provider_priority=15 # lower (other providers are dnsmasq, dnsmasq-dnssec, dnsmasq-dnssec-nftset) + + cd "$builddir" + install -D -m755 src/dnsmasq~nftset "$subpkgdir"/usr/sbin/dnsmasq +} + dbus() { pkgdesc="$pkgdesc with DNSSEC and D-Bus support" provides=" @@ -117,7 +136,7 @@ dbus() { $pkgname-dbus=$pkgver-r$pkgrel $pkgname-dnssec=$pkgver-r$pkgrel " - provider_priority=10 # lowest (other providers are dnsmasq, dnsmasq-dnssec) + provider_priority=10 # lowest (other providers are dnsmasq, dnsmasq-dnssec, dnsmasq-dnssec-nftset) cd "$builddir" install -D -m755 src/dnsmasq~dbus "$subpkgdir"/usr/sbin/dnsmasq diff --git a/main/dnsmasq/dnsmasq-dnssec-nftset.pre-install b/main/dnsmasq/dnsmasq-dnssec-nftset.pre-install new file mode 120000 index 00000000000..b456897a9ad --- /dev/null +++ b/main/dnsmasq/dnsmasq-dnssec-nftset.pre-install @@ -0,0 +1 @@ +dnsmasq.pre-install
\ No newline at end of file diff --git a/main/dnsmasq/dnsmasq-dnssec-nftset.pre-upgrade b/main/dnsmasq/dnsmasq-dnssec-nftset.pre-upgrade new file mode 120000 index 00000000000..b456897a9ad --- /dev/null +++ b/main/dnsmasq/dnsmasq-dnssec-nftset.pre-upgrade @@ -0,0 +1 @@ +dnsmasq.pre-install
\ No newline at end of file diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD index c754fc0b2a1..cb006599aab 100644 --- a/main/drbd-utils/APKBUILD +++ b/main/drbd-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=drbd-utils -pkgver=9.27.0 +pkgver=9.28.0 pkgrel=0 pkgdesc="Network-based RAID 1" url="https://www.drbd.org" @@ -72,7 +72,7 @@ pacemaker() { } sha512sums=" -066849e77bac04515682f497398e3840eecdf16c866a0d67df4e8978e9278dee120d9a216ba7dcf16e1dc2cfdd7271ff775e5bee9ccd0cead8360b7e33e08f5d drbd-utils-9.27.0.tar.gz +57114bef36b09bcd17ff273c7c63c16cb68dfdb9b5eec71bc95780fd639ac40bd0ea5f388ae3fbed46770fdc0e7ba9bf9c712e4a915691fb55dc9576237470f2 drbd-utils-9.28.0.tar.gz 39a64a59577a28f8dc5f968bcfd35ab04b010ec1b9390dcaedefa609b8999ec4aabf2cfaf2db7dfd8348d8d09aca5720839de51b3bfb093960b3c61f92ebe4f0 drbdsetup-permissions.patch f61a833dc5eea79000a7dd85e83ae10e284109c76b5d59974ed69f92dbab6c389d6d20f7ea374b7c066519c6d1d816ed27b48dbaee6b91fb9754974acf52f46e drbd.initd " diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD index 310bb0a6c3d..a6bb3d066c0 100644 --- a/main/dropbear/APKBUILD +++ b/main/dropbear/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dropbear pkgver=2024.84 -pkgrel=0 +pkgrel=3 pkgdesc="small SSH 2 client/server designed for small memory environments" url="https://matt.ucc.asn.au/dropbear/dropbear.html" arch="all" @@ -20,6 +20,7 @@ source="https://matt.ucc.asn.au/dropbear/releases/dropbear-$pkgver.tar.bz2 dropbear.initd dropbear.confd dropbear-options_sftp-server_path.patch + dropbear-options_ssh_config.patch dropbear-fix-utmp.patch new-config.h-location.patch " @@ -70,36 +71,38 @@ package() { _convert() { pkgdesc="$pkgname dropbearconvert command" depends="" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/dropbearconvert "$subpkgdir"/usr/bin/ + + amove usr/bin/dropbearconvert } _dbclient() { pkgdesc="$pkgname dbclient command" depends="" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/dbclient "$subpkgdir"/usr/bin/ + + amove usr/bin/dbclient } _scp() { pkgdesc="$pkgname scp support" depends="!openssh-client" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/scp "$subpkgdir"/usr/bin/ + + amove usr/bin/scp } _ssh() { pkgdesc="$pkgname ssh command (compatibility symlink for dbclient)" - depends="dropbear-dbclient !openssh-client" + depends="$pkgname-dbclient !openssh-client" + mkdir -p "$subpkgdir"/usr/bin - ln -s /usr/bin/dbclient "$subpkgdir"/usr/bin/ssh + ln -s dbclient "$subpkgdir"/usr/bin/ssh } sha512sums=" 254daea819c5aeaa65bb43449386fb964f4aa13e3b3037fe11064120205c6e265925e7ef2d84f7ebe66c6a00cf0a22e6010314c065ed49a3815f47137b7aca44 dropbear-2024.84.tar.bz2 -78bd4142f9ad05b40520de6dbe71cd64fb2b3bf2d346f7710aa2ab2313162ea17be13fa27e8f8c645307c9d32f640e05ec1d92d303936e60feb8e95cc4369f5c dropbear.initd +55af2b9ece9845f30e07f707474c81d78921b17abfe614669fcefa600868d4ecef007a1e2276b74db8675ba5562c78397da6ae8de8717a2ca9c425384dc519d5 dropbear.initd 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f dropbear.confd 09e73041ecb55d5d97106b3b8f4256df9e6d84c7aceeaaccdb148a9243ccd4defaccb320c45bf76620f5b004264dd775dbfc207db4a045ee1c7b7db2dedb2d79 dropbear-options_sftp-server_path.patch +75d17e9a340c4ecb903b3ff29ffc2795ba2ce69f57def3c56d2e3427dd176902f7e31a53799007fcc551c8c477fcd02781e9347912ca39308c9b6769ed71e468 dropbear-options_ssh_config.patch 5c0d118944481237611cdbe9239bd26548859dc2ab04f2e81854388de9c34c99e083843e925312b4f90ce8b22037bef3c61858fc19d843e5b6db5f3006448304 dropbear-fix-utmp.patch b773b90e92f451a99b6f0e98c85b7fd614ed9a3c1562e086c4e2db1accd1cfec1129b24f3e0731411c3f09014902bc6e9493ebbc2fafc2438e51cfc450e25f15 new-config.h-location.patch " diff --git a/main/dropbear/dropbear-options_ssh_config.patch b/main/dropbear/dropbear-options_ssh_config.patch new file mode 100644 index 00000000000..503324d0d07 --- /dev/null +++ b/main/dropbear/dropbear-options_ssh_config.patch @@ -0,0 +1,25 @@ +From 74b5113de163cc653c180fac7dc723d8de4e631b Mon Sep 17 00:00:00 2001 +From: Coco Liliace <coco@liliace.dev> +Date: Tue, 14 May 2024 10:04:24 +0800 +Subject: [PATCH] enable ssh config + +--- + src/default_options.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/default_options.h b/src/default_options.h +index 6e970bb..e94eb55 100644 +--- a/src/default_options.h ++++ b/src/default_options.h +@@ -262,7 +262,7 @@ group1 in Dropbear server too */ + + /* Per client configuration file + */ +-#define DROPBEAR_USE_SSH_CONFIG 0 ++#define DROPBEAR_USE_SSH_CONFIG 1 + + /* Allow specifying the password for dbclient via the DROPBEAR_PASSWORD + * environment variable. */ +-- +2.45.0 + diff --git a/main/dropbear/dropbear.initd b/main/dropbear/dropbear.initd index 4120f9af14b..0aaf7dfa99f 100644 --- a/main/dropbear/dropbear.initd +++ b/main/dropbear/dropbear.initd @@ -10,10 +10,6 @@ depend() { } check_config() { - if [ ! -e /etc/dropbear/dropbear_dss_host_key ] ; then - einfo "Generating DSS-Hostkey..." - /usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key - fi if [ ! -e /etc/dropbear/dropbear_rsa_host_key ] ; then einfo "Generating RSA-Hostkey..." /usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key diff --git a/main/efi-mkkeys/APKBUILD b/main/efi-mkkeys/APKBUILD index a10d5cdc34a..a031c0a0329 100644 --- a/main/efi-mkkeys/APKBUILD +++ b/main/efi-mkkeys/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.1.0 pkgrel=0 pkgdesc="Script to easily generate self-signed UEFI keys for Secure Boot" url="https://github.com/jirutka/efi-mkkeys" -arch="noarch !armhf !s390x !ppc64le !mips !mips64 !riscv64" # limited by efitools +arch="noarch !armhf !s390x !ppc64le !mips !mips64 !riscv64 !loongarch64" # limited by efitools license="MIT" depends="efitools cmd:openssl cmd:uuidgen" source="https://github.com/jirutka/efi-mkkeys/archive/v$pkgver/efi-mkkeys-$pkgver.tar.gz" diff --git a/main/efitools/APKBUILD b/main/efitools/APKBUILD index bcff10e04e1..e50988490f6 100644 --- a/main/efitools/APKBUILD +++ b/main/efitools/APKBUILD @@ -8,7 +8,7 @@ pkgdesc="EFI tools" url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git" # riscv64: fails to build # others: limited by sbsigntool -arch="all !armhf !s390x !ppc64le !mips !mips64 !riscv64" +arch="all !armhf !s390x !ppc64le !mips !mips64 !riscv64 !loongarch64" license="(GPL-2.0-only AND LGPL-2.1-or-later) WITH OpenSSL-Exception" options="!check" # no testsuite # efi-readvar requires mount(8) with -l option diff --git a/main/ell/APKBUILD b/main/ell/APKBUILD index e7b321cabfd..283b236dc51 100644 --- a/main/ell/APKBUILD +++ b/main/ell/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=ell -pkgver=0.64 +pkgver=0.65 pkgrel=0 pkgdesc="Linux library for embedded development" url="https://01.org/ell" @@ -39,6 +39,6 @@ package() { } sha512sums=" -970a488c6ccdcedf6ea0b35b2b7d80613410acdddef75217d7d23cf77bfbb898a803149767bb156966445786f759e635d81aeb4d80ef4bcc686e057a17379758 ell-0.64.tar.gz +f83b8380d913c2dc549b835301f6bb7526aeadd3f94f4c01f7cdc42a5152a67b5fdc55b47dc18ac39fc74a774c1448b69a49c6a3ea0edb72c807f6cfc87a829b ell-0.65.tar.gz 0762cc5c0471afbcdd17ecbd599f3ae6b0725ed79a845435f5f48c020990b973307c490362ead7550bfe7b61a36e6b663464a038808256f1a1ae7241f0851d1c use-libgen-basename.patch " diff --git a/main/execline/APKBUILD b/main/execline/APKBUILD index bce730d2c0a..1ad44cd5c4f 100644 --- a/main/execline/APKBUILD +++ b/main/execline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: John Regan <john@jrjrtech.com> # Maintainer: Laurent Bercot <ska-devel@skarnet.org> pkgname=execline -pkgver=2.9.4.0 +pkgver=2.9.5.1 pkgrel=0 pkgdesc="A small scripting language, to be used in place of a shell in non-interactive scripts." url=https://skarnet.org/software/execline/ @@ -42,5 +42,5 @@ static() { } sha512sums=" -11d96863d2f90abc371656e17bac9fd83f1303337444db5a1f24e8a02cab654a3b5e9081af130d5cbca5a4f6ea5cf5f6c2affa66e2b4a9eb39c20410efeb8795 execline-2.9.4.0.tar.gz +11bfd825b0b72cba118eff9ecb97672d0c015e0bd50c7c8f83e101ee41c323b3a3c82e42fed75b6bc65ab6edb85a8bbeef8900b594cf651825b6313a5123c88f execline-2.9.5.1.tar.gz " diff --git a/main/fail2ban/APKBUILD b/main/fail2ban/APKBUILD index f1804c0ba96..03bf19ce673 100644 --- a/main/fail2ban/APKBUILD +++ b/main/fail2ban/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Jeff Bilyk <jbilyk@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fail2ban -pkgver=1.0.2 -pkgrel=4 +pkgver=1.1.0 +pkgrel=0 pkgdesc="Scans log files for login failures then updates iptables to reject originating ip address" url="https://www.fail2ban.org/" arch="noarch" @@ -26,7 +26,6 @@ options="!check" # really flaky # - CVE-2021-32749 build() { - sh fail2ban-2to3 python3 setup.py build } @@ -67,7 +66,7 @@ tests() { } sha512sums=" -688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb fail2ban-1.0.2.tar.gz +9bff7b9c41e58a953901800468e5c4153c9db6af01c7eb18111ad8620b40d03a0771020472fb759b2809d250e2bb45471e6c7e8283e72ea48290ecf7bf921821 fail2ban-1.1.0.tar.gz 9ba3da904e2169264ca2ad3af1a6c10ba82f559b9c746d20c515ec806263a7fe0576536e38e4e6107cd551048aa8868b45986f1a803a049ea745158678b8d8be fail2ban.initd 1e7581dd04e7777d6fd5c40cc842a7ec5f4e6a0374673d020d89dd61bf4093d48934844bee89bcac9084f9ae44f3beb66e714cf3c2763d79c3e8feb790c5e43b fail2ban.confd ee1c229db970239ebc707cd484a650fcf2347c70b411728ee2a4a35a72f4118cfccecf2a221275603320e0332efcc16e4979201933cec1aef1c5d5a082fc4940 fail2ban.logrotate diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD index d722f8e4928..2ffa9197ffb 100644 --- a/main/fakeroot/APKBUILD +++ b/main/fakeroot/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fakeroot -pkgver=1.33 +pkgver=1.34 pkgrel=0 provider_priority=100 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" @@ -57,7 +57,7 @@ package() { } sha512sums=" -f87b85531fc5af4ff24a6e27a5b7a25f7d220672fb0b0b925554b0138f3cff7ff7920ce96ed77313a7fb55656a313dc07b58c2935be262091405e509fdcbec03 fakeroot_1.33.orig.tar.gz +d3b4b9ca8718ba945029e151415a24412ca5a40dbefe6fbfaed3565879b5ad80b4b6de9748695a8848c3086e3ba1cde270efc8dfb4cc345cf8aa11f3234153f1 fakeroot_1.34.orig.tar.gz 7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209 fakeroot-no64.patch ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch 70bf7609a5951326ac7372a252a15516f96a1ee6e458a659b16f0e4f1e2db6556482c71178d4b2f10e5ebdc0abfb7a3cc97c9878984e60cdf6e7d7281790e1fc xstatjunk.patch diff --git a/main/fping/APKBUILD b/main/fping/APKBUILD index f3448cdd41d..59c03058cac 100644 --- a/main/fping/APKBUILD +++ b/main/fping/APKBUILD @@ -1,17 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fping -pkgver=5.1 -pkgrel=5 +pkgver=5.2 +pkgrel=0 pkgdesc="A utility to ping multiple hosts at once" url="https://fping.org/" arch="all" license="MIT" makedepends="libcap-utils" subpackages="$pkgname-doc" -source="https://fping.org/dist/fping-$pkgver.tar.gz - int-conversion.patch - unprivileged-ping.patch - " +source="https://fping.org/dist/fping-$pkgver.tar.gz" # setcap: needs cap_net_raw to be able to send icmp packets options="!check setcap" # no testsuite @@ -31,7 +28,5 @@ package() { } sha512sums=" -1a208da8dcd99093d0512af5d85ba5e7b5743ec97993d24c1fe612bb58d93090ac1ba0952f648aa075f16d390a77c4be65e394ae56dbede2a6914e0e8c68e2bd fping-5.1.tar.gz -aac9c7906b44f65eb586b4de50cb6b10c6d99b1a2f7fc2ea030491a23e174500dac945ebe9ad8a85a38da0bac4c3883aa41c6ebf980480de02ded709f76bde38 int-conversion.patch -57fb8976a382ef21200430a238985cec04ecb72458e67d02ae4eac3af4f14108ad90460d562ee9f46a579d6226335b9391542c641acd2c6e1736fa138176e52f unprivileged-ping.patch +062896662804c55ffe2d4e3eb7efc2ff796d20a77b367e16f8fa381e302986b5127ca55f0866bbf08f8ae2b2f6795ec4c5d43dc59ebec157fb3e8eff25d0bdb3 fping-5.2.tar.gz " diff --git a/main/fping/int-conversion.patch b/main/fping/int-conversion.patch deleted file mode 100644 index 75abfdae596..00000000000 --- a/main/fping/int-conversion.patch +++ /dev/null @@ -1,34 +0,0 @@ -initialising without names is not possible because there are hidden __padding -fields, so the order of args is wrong. --- -diff --git a/src/fping.c b/src/fping.c -index e26b216..d499689 100644 ---- a/src/fping.c -+++ b/src/fping.c -@@ -1948,17 +1948,17 @@ int receive_packet(int64_t wait_time, - int recv_len; - static unsigned char msg_control[40]; - struct iovec msg_iov = { -- reply_buf, -- reply_buf_len -+ .iov_base = reply_buf, -+ .iov_len = reply_buf_len - }; - struct msghdr recv_msghdr = { -- reply_src_addr, -- reply_src_addr_len, -- &msg_iov, -- 1, -- &msg_control, -- sizeof(msg_control), -- 0 -+ .msg_name = reply_src_addr, -+ .msg_namelen = reply_src_addr_len, -+ .msg_iov = &msg_iov, -+ .msg_iovlen = 1, -+ .msg_control = &msg_control, -+ .msg_controllen = sizeof(msg_control), -+ .msg_flags = 0 - }; - #if HAVE_SO_TIMESTAMPNS - struct cmsghdr* cmsg; diff --git a/main/fping/unprivileged-ping.patch b/main/fping/unprivileged-ping.patch deleted file mode 100644 index cc414df9e51..00000000000 --- a/main/fping/unprivileged-ping.patch +++ /dev/null @@ -1,28 +0,0 @@ -Patch-Source: https://github.com/schweikert/fping/commit/e975a4339b24716fb57bed234b0a1176f2bf3451 --- -Author: David Schweikert <david@schweikert.ch> -Committer: Nash Kaminski <Nash.Kaminski@ny.email.gs.com> -Summary: This patch backports the upstream bugfix from - https://github.com/schweikert/fping/issues/248 - for a regression introduced in version 5.1 which - prevents fping from functioning when run in an - unprivileged container. ----- -diff --git a/src/fping.c b/src/fping.c -index e26b216c..0bd2b70c 100644 ---- a/src/fping.c -+++ b/src/fping.c -@@ -1104,11 +1104,11 @@ int main(int argc, char** argv) - exit(num_noaddress ? 2 : 1); - } - -- if (src_addr_set && socket4 >= 0) { -+ if (socket4 >= 0 && (src_addr_set || socktype4 == SOCK_DGRAM)) { - socket_set_src_addr_ipv4(socket4, &src_addr, (socktype4 == SOCK_DGRAM) ? &ident4 : NULL); - } - #ifdef IPV6 -- if (src_addr6_set && socket6 >= 0) { -+ if (socket6 >= 0 && (src_addr6_set || socktype4 == SOCK_DGRAM)) { - socket_set_src_addr_ipv6(socket6, &src_addr6, (socktype6 == SOCK_DGRAM) ? &ident6 : NULL); - } - #endif diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD index 3f0c19b4bcd..46d5aa43a13 100644 --- a/main/freetds/APKBUILD +++ b/main/freetds/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=freetds -pkgver=1.4.12 +pkgver=1.4.13 pkgrel=0 pkgdesc="Tabular Datastream Library" url="https://www.freetds.org/" @@ -42,5 +42,5 @@ package() { } sha512sums=" -cb537490a06c12aa25ce02e1c3b474ad8d6a2be0737719c1b9f83d51245d275abcbd6f4a32dec158cac964ea924458609e253bf9c1497572e386a7436506df8c freetds-1.4.12.tar.bz2 +4e25127bc8f324c1d2c00adafa02cad8214172b85b15aad44f01b6dd51034d3d245a89f0e085d8518ec8c7d889e3af3b56eb8cb49419e530b92c023a8df55d7d freetds-1.4.13.tar.bz2 " diff --git a/main/fribidi/APKBUILD b/main/fribidi/APKBUILD index d46978f030e..5194d5268fe 100644 --- a/main/fribidi/APKBUILD +++ b/main/fribidi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fribidi -pkgver=1.0.13 +pkgver=1.0.14 pkgrel=0 pkgdesc="Free Implementation of the Unicode Bidirectional Algorithm" url="https://github.com/fribidi/fribidi" @@ -34,5 +34,5 @@ package() { } sha512sums=" -09357d842ff9e05b918f826e28e4a25ad996e17f73242ee9ce53fae9f37ec6c639f9cae4271577f6e0269f34265afc893858225c4a94610f0a6ee7580fb1fe07 fribidi-1.0.13.tar.xz +70270826625767a916156c9d752d8ad02c71b33d532060981680942c5121746bb9b0272a3f2188b9019e841c642d1ad686bbc3e7ba54a2f951baa532b01b059a fribidi-1.0.14.tar.xz " diff --git a/main/gdk-pixbuf/0001-fix-build-failure-due-to-typo-in-the-build-script.patch b/main/gdk-pixbuf/0001-fix-build-failure-due-to-typo-in-the-build-script.patch new file mode 100644 index 00000000000..aa5d4004f0e --- /dev/null +++ b/main/gdk-pixbuf/0001-fix-build-failure-due-to-typo-in-the-build-script.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Christian Heusel <christian@heusel.eu> +Date: Sat, 20 Apr 2024 11:07:32 +0200 +Subject: [PATCH] fix build failure due to typo in the build script + +The fixed commit had a typo where it would try to call a nonexistant +function instead of the .contains method of the relevant array. +This was only made visible when the "other" loaders were enabled so it +is triggered all the time. + +This was made visible when working on +https://gitlab.archlinux.org/archlinux/packaging/packages/gdk-pixbuf2/-/merge_requests/1 + +Fixes: 81a77399a ("Update the testsuite") +Signed-off-by: Christian Heusel <christian@heusel.eu> +--- + tests/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 78d0ad92e5e2..78ae43af17f9 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -71,7 +71,7 @@ installed_tests = { + 'pixbuf-construction': { 'suites': ['conform'], }, + 'animation': { + 'suites': ['format'], +- 'skip': not (enabled_loaders.contains('ani') and enabled_loaders_contains('gif')), ++ 'skip': not (enabled_loaders.contains('ani') and enabled_loaders.contains('gif')), + }, + 'cve-2015-4491': { + 'suites': ['security'], diff --git a/main/gdk-pixbuf/APKBUILD b/main/gdk-pixbuf/APKBUILD index 231c6a0866c..66481d9d225 100644 --- a/main/gdk-pixbuf/APKBUILD +++ b/main/gdk-pixbuf/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gdk-pixbuf -pkgver=2.42.10 -pkgrel=6 +pkgver=2.42.11 +pkgrel=1 pkgdesc="GTK+ image loading library" url="https://wiki.gnome.org/Projects/GdkPixbuf" arch="all" @@ -20,7 +20,9 @@ makedepends=" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/gdk-pixbuf-2.0/*/loaders" subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang $pkgname-dev $pkgname-loaders" -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 + 0001-fix-build-failure-due-to-typo-in-the-build-script.patch + " case "$CARCH" in x86|arm*) @@ -42,6 +44,7 @@ build() { abuild-meson \ -Db_lto=true \ -Dinstalled_tests=false \ + -Dothers=enabled \ -Dtests="$(want_check && echo true || echo false)" \ output . meson compile -C output @@ -61,5 +64,6 @@ loaders() { } sha512sums=" -ad64963b61ef8cc84ae450328ec8c90a852f974e29ffdd42263ed32de47af93c058f3ffdf91c5d6e9bba815f4e8e8fe5a19422ac1bfb079666339814ac059b3a gdk-pixbuf-2.42.10.tar.xz +582ea4eee2bfe0824175c35f56baf72799585f90ac86069a781830830b605f4cd93f5c6eafab80f4f7354f8f9d51d157ae89eda6eb1e32a0e51de37d7f6290cc gdk-pixbuf-2.42.11.tar.xz +45420d8f4119c222768f7477fafa4ffcbd479948f5b6d06f74726700b1645579fb6647f81247b0b281dcde0df010c7811c954021f2a477a88a40acd232247336 0001-fix-build-failure-due-to-typo-in-the-build-script.patch " diff --git a/main/git/APKBUILD b/main/git/APKBUILD index ae7059b4487..6b63268002c 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -47,8 +47,8 @@ # - CVE-2021-46101 pkgname=git -pkgver=2.44.0 -pkgrel=2 +pkgver=2.45.0 +pkgrel=0 pkgdesc="Distributed version control system" url="https://www.git-scm.com/" arch="all" @@ -93,7 +93,7 @@ options="$options !check" # a few need updated for perl 5.38 _gitcoredir=/usr/libexec/git-core -if [ -z "$BOOTSTRAP" ]; then +if [ -z "$BOOTSTRAP" ] && [ -z "$APORTS_BOOTSTRAP" ]; then # we need tcl and tk to be built before git due to git-gui and gitk makedepends="$makedepends asciidoc python3-dev tcl tk libsecret-dev glib-dev" subpackages="$subpackages @@ -104,6 +104,7 @@ if [ -z "$BOOTSTRAP" ]; then $pkgname-subtree-doc:subtree_doc:noarch $pkgname-credential-libsecret:credential_libsecret " + _full_build=1 fi case "$CARCH" in @@ -131,7 +132,7 @@ prepare() { PYTHON_PATH=/usr/bin/python3 EOF - if [ -n "$BOOTSTRAP" ]; then + if [ -z "$_full_build" ]; then cat >> config.mak <<-EOF NO_PYTHON=YesPlease NO_TCLTK=YesPlease @@ -148,7 +149,7 @@ build() { make -C contrib/subtree prefix=/usr DESTDIR="$pkgdir" make -C contrib/diff-highlight prefix=/usr DESTDIR="$pkgdir" - if [ -z "$BOOTSTRAP" ]; then + if [ -n "$_full_build" ]; then # generate manpages outside of package() make prefix=/usr man @@ -163,7 +164,7 @@ check() { } package() { - if [ -z "$BOOTSTRAP" ]; then + if [ -n "$_full_build" ]; then local install_man=install-man fi @@ -189,7 +190,7 @@ package() { install -Dm644 contrib/completion/git-prompt.sh \ "$pkgdir"/usr/share/git-core/git-prompt.sh - if [ -z "$BOOTSTRAP" ]; then + if [ -n "$_full_build" ]; then install -Dm755 contrib/credential/libsecret/git-credential-libsecret "$pkgdir"/usr/libexec/git-core fi } @@ -379,7 +380,7 @@ _init_template() { } sha512sums=" -9e4b9c8a8e28cd50c0db75a93eae8a3423aa7e51c4312af1e1cdaf408e93f306c23aa747f0a97f27c11ab0e2f5e6283e52c8b61c9fe6be5b9b18673a43ce1780 git-2.44.0.tar.xz +36d438bf9a57dee8fe0536c90cb25d53c552e9f80e7575447d1d2af30cadab08522356f4ecd0f69b7877d5a7f84ab3b9766d8386beae57fe8d411d05d70db214 git-2.45.0.tar.xz 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd be5d568fc5b8b84c9afb97b31e471e41f32ccfe188eba0588ea0ef98b2d96c2ce4b2c1a3d70e88205aa4f6667f850b3f32c13bbb149ecddbf670344c162a4e25 fix-t4219-with-sticky-bit.patch diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD index babe4c69254..25740351f74 100644 --- a/main/glib/APKBUILD +++ b/main/glib/APKBUILD @@ -3,9 +3,9 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Pablo Correa Gómez <ablocorrea@hotmail.com> pkgname=glib -pkgver=2.80.0 +pkgver=2.80.2 _gi_version=1.80.1 -pkgrel=3 +pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" arch="all" @@ -54,6 +54,8 @@ source="https://download.gnome.org/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz replaces="gobject-introspection<1.80.0" # secfixes: +# 2.80.1-r0: +# - CVE-2024-34397 # 2.66.6-r0: # - CVE-2021-27219 GHSL-2021-045 # 2.62.5-r0: @@ -140,7 +142,7 @@ static() { } sha512sums=" -1514d62aeb4c4a1a1048ae0f84f7db7f0dbf355772b2dadf6a34ec547045b163a5e28331b096e7616fe3c9c19bed98025a0202b05073f5d7ee901d0efaffe143 glib-2.80.0.tar.xz +9b00d6741523ba5bc60c83da9fbbc1a13bd61307612471acd7faaf57cbcb480941fd61dfff94b2712bd78094beff3af1ceffe4985db0ff97ffe948cc67b821aa glib-2.80.2.tar.xz f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a gobject-introspection-1.80.1.tar.xz 41d23f0797cae11d017f9e9492173f1f68125d99c28416ff2482e3eb81460a9c33cecc2bee806dad1d1da19800d0a90ae43d9a44f5e2864c2cd7c8a704669eb3 alwaysbash.patch 744239ea2afb47e15d5d0214c37d7c798edac53797ca3ac14d515aee4cc3999ef9716ba744c64c40198fb259edc922559f77c9051104a568fc8ee4fc790810b1 deprecated-no-warn.patch diff --git a/main/gnu-efi/APKBUILD b/main/gnu-efi/APKBUILD index c5ecbcbda1e..7f6f6ac2cde 100644 --- a/main/gnu-efi/APKBUILD +++ b/main/gnu-efi/APKBUILD @@ -4,7 +4,7 @@ pkgver=3.0.15 pkgrel=4 pkgdesc="Development Libraries and headers for EFI" url="https://sourceforge.net/projects/gnu-efi/" -arch="all !armhf !s390x !ppc64le !mips !mips64" +arch="all !armhf !s390x !ppc64le !mips !mips64 !loongarch64" license="BSD-2-Clause" subpackages="$pkgname-dev" depends_dev="$pkgname" diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD index 465344e133d..dc4c551e158 100644 --- a/main/gnutls/APKBUILD +++ b/main/gnutls/APKBUILD @@ -54,6 +54,13 @@ source="https://www.gnupg.org/ftp/gcrypt/gnutls/v$_v/gnutls-$pkgver.tar.xz # 3.5.13-r0: # - CVE-2017-7507 +prepare() { + default_prepare + + # tries to do local networking, "Failed to connect to server" + sed -i 's/cert-reencoding.sh//' tests/Makefile* +} + build() { ./configure \ --build=$CBUILD \ diff --git a/main/gptfdisk/APKBUILD b/main/gptfdisk/APKBUILD index ef3d6d29525..3f63c691243 100644 --- a/main/gptfdisk/APKBUILD +++ b/main/gptfdisk/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gptfdisk pkgver=1.0.10 -pkgrel=0 +pkgrel=1 pkgdesc="Text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch="all" url="https://www.rodsbooks.com/gdisk" @@ -22,11 +22,8 @@ build() { } package() { - mkdir -p "$pkgdir"/usr/bin "$pkgdir"/usr/share/man/man8 - local i; for i in gdisk cgdisk sgdisk fixparts; do - install $i "$pkgdir"/usr/bin/ - install $i.8 "$pkgdir"/usr/share/man/man8/ - done + install -Dm0644 -t "$pkgdir"/usr/share/man/man8 ./*.8 + install -Dm0755 -t "$pkgdir"/usr/bin gdisk cgdisk sgdisk fixparts } check() { @@ -35,8 +32,8 @@ check() { sgdisk() { pkgdesc="Command-line GUID partition table (GPT) manipulator" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/sgdisk "$subpkgdir"/usr/bin/ + + amove usr/bin/sgdisk } sha512sums=" diff --git a/main/gst-plugins-base/APKBUILD b/main/gst-plugins-base/APKBUILD index df1b3823208..ee0add4bdb3 100644 --- a/main/gst-plugins-base/APKBUILD +++ b/main/gst-plugins-base/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-plugins-base -pkgver=1.22.11 +pkgver=1.24.3 pkgrel=0 pkgdesc="GStreamer streaming media framework base plug-ins" url="https://gstreamer.freedesktop.org" @@ -73,5 +73,5 @@ doc() { } sha512sums=" -cfd8f7fe66f4707e043c8f070110eb80f9804cec529c8d29b13dbc8604db90e3f010c9614d538ad076b826df54f75ce5ebac355bd05a874e44dccead6a953c60 gst-plugins-base-1.22.11.tar.xz +8003435416423d99afc10a870cebf062e9d4fdd492d09b216afe0d7bdea908256eb24cc26130556c063d712582110341d62c9d43052449f13dc9a5a145a296c3 gst-plugins-base-1.24.3.tar.xz " diff --git a/main/gstreamer/APKBUILD b/main/gstreamer/APKBUILD index e9fb455fe44..b8b875e25c9 100644 --- a/main/gstreamer/APKBUILD +++ b/main/gstreamer/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gstreamer -pkgver=1.22.11 +pkgver=1.24.3 pkgrel=0 pkgdesc="GStreamer streaming media framework" url="https://gstreamer.freedesktop.org" @@ -23,7 +23,6 @@ subpackages=" $pkgname-doc $pkgname-tools $pkgname-lang - $pkgname-ptp-helper:ptp_helper " source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz" # setcap: gst-ptp-helper @@ -43,7 +42,6 @@ build() { -Db_lto=true \ -Dintrospection=enabled \ -Dbash-completion=disabled \ - -Dptp-helper-permissions=capabilities \ -Dpackage-name="GStreamer (Alpine Linux)" \ -Dpackage-origin="https://alpinelinux.org" \ . output @@ -84,13 +82,6 @@ tools() { amove usr/bin } -ptp_helper() { - pkgdesc="$pkgdesc (ptp helper)" - install_if="$pkgname=$pkgver-r$pkgrel" - - amove usr/libexec/gstreamer-*/gst-ptp-helper -} - sha512sums=" -8976cebd2cbac3ef31ee6163d2c5264be7d10d54ab9fe6f0b2317d7d0380420ef2378e1b476af09f1e6b203e3eafcda88fc08bb2f550a6f411d8670dec04843e gstreamer-1.22.11.tar.xz +81b50013adbaa30964fc909b53b72304aba43dfeefba40aaa1f75a7163da783bcf53622da8adc06990ab78b4705257caec877181283701ba485eee9ea35688b8 gstreamer-1.24.3.tar.xz " diff --git a/main/highlight/APKBUILD b/main/highlight/APKBUILD index 8053e3245ae..07da6df1dd5 100644 --- a/main/highlight/APKBUILD +++ b/main/highlight/APKBUILD @@ -3,7 +3,7 @@ _luaver=5.4 pkgname=highlight pkgver=4.11 -pkgrel=0 +pkgrel=1 pkgdesc="Fast and flexible source code highlighter" url="http://www.andre-simon.de/doku/highlight/highlight.html" arch="all" diff --git a/main/iniparser/APKBUILD b/main/iniparser/APKBUILD index bed53f62a35..374216e2afe 100644 --- a/main/iniparser/APKBUILD +++ b/main/iniparser/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iniparser -pkgver=4.1 -pkgrel=4 +pkgver=4.2 +pkgrel=0 pkgdesc="C library for parsing INI-style files" url="https://github.com/ndevilla/iniparser" arch="all" @@ -9,7 +9,6 @@ license="MIT" makedepends="bash" subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/ndevilla/iniparser/archive/v$pkgver.tar.gz - CVE-2023-33461.patch rpath.patch " @@ -34,7 +33,6 @@ package() { } sha512sums=" -a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968 iniparser-4.1.tar.gz -d2becc2fdbe5a57c7bdd05c61ba4f5a199c43fac55cd98c9b54e11ca06d74d5c592e7fea86c634c91db92c74fa3ec95abad379ff4caa4c79449198528d5b6e48 CVE-2023-33461.patch +532479daad99a5966d559ff62164da40240df4401c7b6ae9a0adc4d3224c6434521d9be76aac06e671f4da48fe37b030fe0233fed5d1e86af2a8959055fcad79 iniparser-4.2.tar.gz db7bdab6f8faafd47c8b50104e1a461fbd9324b75482b1455a8fc059c07278e7e60f088a3f712b0ade05a9bb989168d17684455b9863018f22a61e0190a888c6 rpath.patch " diff --git a/main/iniparser/CVE-2023-33461.patch b/main/iniparser/CVE-2023-33461.patch deleted file mode 100644 index d667ffca1ee..00000000000 --- a/main/iniparser/CVE-2023-33461.patch +++ /dev/null @@ -1,45 +0,0 @@ -Patch-Source: https://github.com/ndevilla/iniparser/pull/146 --- -From ace9871f65d11b5d73f0b9ee8cf5d2807439442d Mon Sep 17 00:00:00 2001 -From: Antonio <antoniolrt@gmail.com> -Date: Fri, 2 Jun 2023 15:03:10 -0300 -Subject: [PATCH] Handle null return from iniparser_getstring - -Fix handling of NULL returns from iniparser_getstring in -iniparser_getboolean, iniparser_getlongint and iniparser_getdouble, -avoiding a crash. ---- - src/iniparser.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/iniparser.c b/src/iniparser.c -index f1d1658..dbceb20 100644 ---- a/src/iniparser.c -+++ b/src/iniparser.c -@@ -456,7 +456,7 @@ long int iniparser_getlongint(const dictionary * d, const char * key, long int n - const char * str ; - - str = iniparser_getstring(d, key, INI_INVALID_KEY); -- if (str==INI_INVALID_KEY) return notfound ; -+ if (str==NULL || str==INI_INVALID_KEY) return notfound ; - return strtol(str, NULL, 0); - } - -@@ -511,7 +511,7 @@ double iniparser_getdouble(const dictionary * d, const char * key, double notfou - const char * str ; - - str = iniparser_getstring(d, key, INI_INVALID_KEY); -- if (str==INI_INVALID_KEY) return notfound ; -+ if (str==NULL || str==INI_INVALID_KEY) return notfound ; - return atof(str); - } - -@@ -553,7 +553,7 @@ int iniparser_getboolean(const dictionary * d, const char * key, int notfound) - const char * c ; - - c = iniparser_getstring(d, key, INI_INVALID_KEY); -- if (c==INI_INVALID_KEY) return notfound ; -+ if (c==NULL || c==INI_INVALID_KEY) return notfound ; - if (c[0]=='y' || c[0]=='Y' || c[0]=='1' || c[0]=='t' || c[0]=='T') { - ret = 1 ; - } else if (c[0]=='n' || c[0]=='N' || c[0]=='0' || c[0]=='f' || c[0]=='F') { diff --git a/main/iperf3/APKBUILD b/main/iperf3/APKBUILD index 15b7c4a879f..8e10874ae62 100644 --- a/main/iperf3/APKBUILD +++ b/main/iperf3/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iperf3 _pkgname=iperf -pkgver=3.16 +pkgver=3.17 pkgrel=0 pkgdesc="Tool to measure IP bandwidth using UDP or TCP" url="https://github.com/esnet/iperf" @@ -43,7 +43,7 @@ package() { } sha512sums=" -32c0a35c632ade4185ba495495842fe7a6af62cb8a8691b791ea4b37429b7b9a22baf5e7389a4c41e344fb35149cf64ece6adda2c79cc096c7787f7c2e3421da iperf3-3.16.tar.gz +6c67dd67076b470db89d7ee5114f3e823e86897aa5fbb1696f7094bd3b39c5a1039e3e7052578e77661006b79f58b0cc33fe18601de4a1e988fc7f0d6b4eba77 iperf3-3.17.tar.gz fdaf06316886ae02a865848ea6df6b77aecde78fab15bcbc22e077871c3f567521eeee19ef13c402fef467c2edd916a7d976a4c933dbfb637373145a18563ef9 iperf3.initd 4c6b766c154612f5f2e5f6150396f443ba37ec59ed0a8a994bf84612059db22827aee3dd3b7c3249e0bb6037163788d830efcb1caad5eba1c97d2349bdbc55f9 iperf3.confd " diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD index 8706f53fa90..d27df6a61cc 100644 --- a/main/iproute2/APKBUILD +++ b/main/iproute2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iproute2 -pkgver=6.8.0 +pkgver=6.9.0 pkgrel=0 pkgdesc="IP Routing Utilities" url="https://wiki.linuxfoundation.org/networking/iproute2" @@ -30,7 +30,8 @@ subpackages=" $pkgname-ss $pkgname-rdma " -source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz" +source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz + basename.patch" options="!check" # requires namespaces support and root # secfixes: @@ -87,5 +88,6 @@ rdma() { } sha512sums=" -54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0 iproute2-6.8.0.tar.xz +1cbb234cb8f94213c3529f0b74fed5a575ff1fb838e783b8d2b440643c2e91246eda42e9b26e9775897aadb8b8133d199b2851b8ea0df06a899dc02acf403325 iproute2-6.9.0.tar.xz +7d38eddfc55a2c02b92a05597d9ff66607a35565caadc788b09ac729e9c3539c7535165265d6a0fa3ed30348cb069b37beb01d212196f36a4ec0b3b23579f17c basename.patch " diff --git a/main/iproute2/basename.patch b/main/iproute2/basename.patch new file mode 100644 index 00000000000..dc5d2b2c8df --- /dev/null +++ b/main/iproute2/basename.patch @@ -0,0 +1,15 @@ +See https://gitlab.alpinelinux.org/alpine/aports/-/issues/16106 + +diff -upr iproute2-6.8.0.orig/rdma/rdma.c iproute2-6.8.0/rdma/rdma.c +--- iproute2-6.8.0.orig/rdma/rdma.c 2024-05-12 12:53:01.571060710 +0200 ++++ iproute2-6.8.0/rdma/rdma.c 2024-05-12 12:53:26.597791868 +0200 +@@ -8,6 +8,9 @@ + #include "version.h" + #include "color.h" + ++/* For basename(3) prototype */ ++#include <libgen.h> ++ + /* Global utils flags */ + int json; + diff --git a/main/irqbalance/APKBUILD b/main/irqbalance/APKBUILD index 48092ccf76b..7725ba8aa85 100644 --- a/main/irqbalance/APKBUILD +++ b/main/irqbalance/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=irqbalance pkgver=1.9.4 -pkgrel=0 +pkgrel=1 pkgdesc="Daemon that distributes interrupts over the processors" url="https://github.com/Irqbalance/irqbalance" arch="all" @@ -43,5 +43,5 @@ package() { sha512sums=" abdcac9dccabb18ae644b73dc2a8528c03279811c1f9182a5a5b0af43b30c5982d7bb14e79d4430b5d4f2cea8e17115e6038851c74de1ff3bdfc4e303392479a irqbalance-1.9.4.tar.gz 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c irqbalance.confd -72cfbe333253837481aca9b47d5af47a91f83c554df9ed6d958cd3099de403a23d99528c2d245c1be730b37678a127f57bc61a8d497f51ad4abb78ed81854185 irqbalance.initd +52fcf4333513238f1f45c4c6689706f26a59466384247d1c58a7431557fa2abab6ae82b6ff8b58d984785fe50aba8860e18f06fa8c1b61eaa85cfb12061891a5 irqbalance.initd " diff --git a/main/irqbalance/irqbalance.initd b/main/irqbalance/irqbalance.initd index 9c40fd92388..3241fd2be7b 100644 --- a/main/irqbalance/irqbalance.initd +++ b/main/irqbalance/irqbalance.initd @@ -8,7 +8,7 @@ command_args="--foreground $IRQBALANCE_OPTS" pidfile="/run/$RC_SVCNAME.pid" command_background=true -depends() { +depend() { need localmount after bootmisc hwdrivers modules } diff --git a/main/ivykis/APKBUILD b/main/ivykis/APKBUILD index aa1856a7b52..e328dd17383 100644 --- a/main/ivykis/APKBUILD +++ b/main/ivykis/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=ivykis -pkgver=0.42.4 -pkgrel=5 +pkgver=0.43 +pkgrel=0 pkgdesc="Library for asynchronous I/O readiness notification" -url="https://libivykis.sourceforge.net/" +url="https://github.com/buytenh/ivykis" arch="all" license="LGPL-2.1-or-later" makedepends="automake autoconf libtool" subpackages="$pkgname-static $pkgname-dev $pkgname-doc" -source="https://downloads.sourceforge.net/project/libivykis/$pkgver/ivykis-$pkgver.tar.gz" +source="https://github.com/buytenh/ivykis/archive/v$pkgver/ivykis-$pkgver.tar.gz" prepare() { default_prepare @@ -32,4 +32,6 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="4a9fc973e97b054e365cb5028024e1d988227d3a871ab2983569b99d29201d9cdbf9e05e87d2f880281a72a6e6dad10212585e7d276c107bb667ab94644efdbd ivykis-0.42.4.tar.gz" +sha512sums=" +75bf3878afb76f97ef5327005f58e97d13ba9a67eb5230c25b4a0ec3332f8e3e027f93fc5758554e056c3a00bcfb776862a0263bf251c97cc654b8d0570dafe9 ivykis-0.43.tar.gz +" diff --git a/main/jack/APKBUILD b/main/jack/APKBUILD index ff43af57e63..316bc77abec 100644 --- a/main/jack/APKBUILD +++ b/main/jack/APKBUILD @@ -22,6 +22,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-dbus" source="https://github.com/jackaudio/jack2/archive/v$pkgver/jack2-v$pkgver.tar.gz fix-execinfo.patch increase-api-version.patch + importlib.patch " builddir="$srcdir/jack2-$pkgver" options="!check" # no real tests provided @@ -53,4 +54,5 @@ sha512sums=" d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4 jack2-v1.9.22.tar.gz b5abec7e67485d1c13f399b5961539177dd35d21c5dd95e0aa767adb0f5b1e588e9ca2f9b29cc4d66fc039311ff7eacc4cf21f6700ef0a2c8de99b63cb00f84d fix-execinfo.patch 1ee0159ea0f75f964baa167fe13031fe82e04b31a1b14122c12161d103e1a3205061fc019bcd978f47eed6efc8ea6ee96188c0eb795e3d83f34481e193086fbe increase-api-version.patch +94fac61b17c3d4eef2bd29a86f6bdc042c0b8e770fc11abef95fe2ede3b0f3582e3a9ea9583e66ddd38ba8c77e04c6f2a13ae83224a8f3fe19eac994de37b800 importlib.patch " diff --git a/main/jack/importlib.patch b/main/jack/importlib.patch new file mode 100644 index 00000000000..6a8f92a5abc --- /dev/null +++ b/main/jack/importlib.patch @@ -0,0 +1,22 @@ +diff --git a/waflib/Context.py b/waflib/Context.py +index 761b521..d4406d8 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -6,7 +6,7 @@ + Classes and functions enabling the command system + """ + +-import os, re, imp, sys ++import os, re, types, sys + from waflib import Utils, Errors, Logs + import waflib.Node + +@@ -660,7 +660,7 @@ def load_module(path, encoding=None): + except KeyError: + pass + +- module = imp.new_module(WSCRIPT_FILE) ++ module = types.ModuleType(WSCRIPT_FILE) + try: + code = Utils.readf(path, m='r', encoding=encoding) + except EnvironmentError: diff --git a/main/kea/APKBUILD b/main/kea/APKBUILD index c74d0630dcc..1b707a4ef42 100644 --- a/main/kea/APKBUILD +++ b/main/kea/APKBUILD @@ -7,7 +7,7 @@ pkgname=kea # Odd-numbered versions are development versions. # NOTE: When bumping, always rebuild all kea hooks (kea-* aports)! pkgver=2.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="DHCPv4 and DHCPv6 server from ISC" url="https://kea.isc.org/" arch="all" diff --git a/main/libarchive/APKBUILD b/main/libarchive/APKBUILD index 184bb58b397..834eb16a070 100644 --- a/main/libarchive/APKBUILD +++ b/main/libarchive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libarchive -pkgver=3.7.3 +pkgver=3.7.4 pkgrel=0 pkgdesc="library that can create and read several streaming archive formats" url="https://libarchive.org/" @@ -24,6 +24,8 @@ source="https://libarchive.org/downloads/libarchive-$pkgver.tar.xz" options="!check" # secfixes: +# 3.7.4-r0: +# - CVE-2024-26256 # 3.6.1-r2: # - CVE-2022-36227 # 3.6.1-r0: @@ -59,5 +61,5 @@ tools() { } sha512sums=" -984e7c61010b9555bafe54d5f52ff2d089e28afe5cea3a14615e2aca8539075293789d18f17f8915882ec328bcbdca7b3d1536d6dc19620ca226e8b6d802ef63 libarchive-3.7.3.tar.xz +84bc346ba15861ab10aa54a3d687de955178e4efbe12bf3a49a467181e7f819673949f131f4c8338de8ed6e319a8565af376e5a540380bda08e60dffbc7c8686 libarchive-3.7.4.tar.xz " diff --git a/main/libbpf/APKBUILD b/main/libbpf/APKBUILD index cc5df6998a7..2e5ecfc4c71 100644 --- a/main/libbpf/APKBUILD +++ b/main/libbpf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Adam Jensen <acjensen@gmail.com> pkgname=libbpf -pkgver=1.4.0 +pkgver=1.4.2 pkgrel=0 pkgdesc="A library for interacting with the Linux kernel's Berkeley Packet Filter (BPF) facility from user space" url="https://github.com/libbpf/libbpf" @@ -36,6 +36,6 @@ package() { } sha512sums=" -400c91a4870be8bb115f7abcc12c460700980fb6a3afdf43c885b1cdbe28fed1d37142d3987a85e12b4c565787a48f5cd0b07cafff067d91902d70713528929f libbpf-1.4.0.tar.gz +b0faf45e77fc0197239b87d74010bad6b7ef7d48c1b3de2a3960164d9029851e2ad204b92d0cccb2fde2d0dfe44d9fa7f24b35a4917179dbab1bee192d3780db libbpf-1.4.2.tar.gz a374386f8b361b60c70d566aebb11b87a23bc43d8cfa02cce9997961139f89caf691d826020c4b08159e815c14d87cc907f2cc6e784329d0288d18d2b609fefd 10-consolidate-lib-dirs.patch " diff --git a/main/libcap-ng/APKBUILD b/main/libcap-ng/APKBUILD index b3397c90ec1..8e02082bfab 100644 --- a/main/libcap-ng/APKBUILD +++ b/main/libcap-ng/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libcap-ng -pkgver=0.8.4 +pkgver=0.8.5 pkgrel=0 pkgdesc="POSIX capabilities library" url="https://people.redhat.com/sgrubb/libcap-ng/index.html" @@ -43,6 +43,6 @@ utils() { } sha512sums=" -f4f3499d592e8583c2bdb8d700981a7930bd545f0889bc02f49acecf17e3bc600b100cd4f64e9326e5bac0a07a02a1ac4b7e83e919563066665a3d67cbe6871e libcap-ng-0.8.4.tar.gz +89fb86454847f354c012411ecdc7e17f07bb40d7e9719ca0b93ea81c436113685bbbb5c1b9cb1b7ac92d216c105c687285304135beb156aedd55ab1c61e4f269 libcap-ng-0.8.5.tar.gz 5f362d5d3f791d1bddc5d9ef3b31e5089c54f852904e12bc3b58dcd22fa87086766cfc095ae8b485bee1b3c4fd854575b89821052b77967a6fdca4ff7e0a0397 apply-disable.patch " diff --git a/main/libeconf/APKBUILD b/main/libeconf/APKBUILD index 6d0ee9e84dc..f2ea6a8d728 100644 --- a/main/libeconf/APKBUILD +++ b/main/libeconf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libeconf -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=0 pkgdesc="Enhanced Config File Parser" url="https://github.com/openSUSE/libeconf" @@ -12,7 +12,6 @@ checkdepends="bash" subpackages="$pkgname-dev $pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/openSUSE/libeconf/archive/refs/tags/v$pkgver.tar.gz musl-tests.patch - 0001-Fix-build-with-musl-libc-on-ppc64le.patch " build() { @@ -29,7 +28,6 @@ package() { } sha512sums=" -5646af5e76b54a9a1a05780160404dd53cdf2022085a519098223539d5c162b6ab5c1ba0ce1099a28eb411a19dd2df1a51c487a34cfe4f7f9fc3ecbce7762e59 libeconf-0.6.2.tar.gz +6a177474efa03d4933c1fff85eaf159837b9c803d3be8a8e8a23c271bbcd38f5513bc30df37592721c1d139c36a698fb224be012fa947595c0e90904e22fdadb libeconf-0.6.3.tar.gz 28431c1f80ee7815991584ef6307dabe593b4da58b9406e6f1a9cb30bfba3e925a48c83b0d3824427631bede5b1249b0c87e0d9fb55971d4ecf90805076b25dd musl-tests.patch -88a2e97e9952fee4f0957e97877e85da3524fb8ff2dfe14bb76eb77dbf1d93335377380a1277723491d98a66739b1d35e729524f4807ad03979476e8fef62b97 0001-Fix-build-with-musl-libc-on-ppc64le.patch " diff --git a/main/libfontenc/APKBUILD b/main/libfontenc/APKBUILD index 0024b51e7b0..a1b8d7801fe 100644 --- a/main/libfontenc/APKBUILD +++ b/main/libfontenc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libfontenc -pkgver=1.1.7 -pkgrel=5 +pkgver=1.1.8 +pkgrel=0 pkgdesc="X11 font encoding library" url="https://xorg.freedesktop.org/" arch="all" @@ -28,5 +28,5 @@ package() { } sha512sums=" -fd8578a81090fa938dd75ad9081ab62c6c54fa2535d1c6291afd799ac8dc7c344a43f07cea5cd4433af16df0d926c22e7c169877bc8b13d92584e7dec173d701 libfontenc-1.1.7.tar.xz +c9ddea9c0c6c6f4933b5b8ed2044e3dc259a9edbb3070a32f0335a6ad4d47b1858cefc01fa2dff9f29808bee311e9c677b05861200d2f2c4552c92b33fe027e2 libfontenc-1.1.8.tar.xz " diff --git a/main/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD index a16244e3612..bb33c39f2d3 100644 --- a/main/libgpg-error/APKBUILD +++ b/main/libgpg-error/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Contributor: Arto Kitula <arto.kitula@gmail.com> pkgname=libgpg-error -pkgver=1.48 +pkgver=1.49 pkgrel=0 pkgdesc="Support library for libgcrypt" url="https://www.gnupg.org/" @@ -51,5 +51,5 @@ static() { } sha512sums=" -3e9ea99cfb7d706791eb3349a9356b6bc44a53ef8bfa9a4e89afb5203dad5af3f466a039a1764361c0c7f697a6fa668a21d05ceaeb8e44ec5a11d6468998adf2 libgpg-error-1.48.tar.bz2 +bb4dd3faa8e2ec945e61fb2006697b48a51da7ee510b6650a6ab09c8734a987bc33c9835bc710ca9a9395c088271939091be418efc6ca5130b426c2fbc4959a3 libgpg-error-1.49.tar.bz2 " diff --git a/main/libjpeg-turbo/APKBUILD b/main/libjpeg-turbo/APKBUILD index 7eb09c36324..7e6e49e2448 100644 --- a/main/libjpeg-turbo/APKBUILD +++ b/main/libjpeg-turbo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libjpeg-turbo -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=0 pkgdesc="Accelerated baseline JPEG compression and decompression library" url="https://libjpeg-turbo.org/" @@ -103,5 +103,5 @@ dev() { } sha512sums=" -f5eadda0712feb810a8c3bb2621fda24a4c30574998ce30f423b3ffa25225c7a87cb14b696232bc0270485f422a2853a5c32eafb65bc5eeab1b41d8aeb32ad29 libjpeg-turbo-3.0.2.tar.gz +7c3a6660e7a54527eaa40929f5cc3d519842ffb7e961c32630ae7232b71ecaa19e89dbf5600c61038f0c5db289b607c2316fe9b6b03d482d770bcac29288d129 libjpeg-turbo-3.0.3.tar.gz " diff --git a/main/libkcapi/APKBUILD b/main/libkcapi/APKBUILD index f5169406321..643441e6902 100644 --- a/main/libkcapi/APKBUILD +++ b/main/libkcapi/APKBUILD @@ -14,7 +14,9 @@ makedepends=" " checkdepends="bash openssl" subpackages="$pkgname-dev $pkgname-tools $pkgname-doc" -source="https://www.chronox.de/libkcapi/libkcapi-$pkgver.tar.xz +# upstream returns 404 +#source="https://www.chronox.de/libkcapi/libkcapi-$pkgver.tar.xz +source="https://dev.alpinelinux.org/archive/libkcapi/libkcapi-$pkgver.tar.xz no-werror.patch " # requires AF_ALG support and enablement of ktls on running kernel diff --git a/main/librtlsdr/APKBUILD b/main/librtlsdr/APKBUILD index 071b4e49453..97c3bdda2f8 100644 --- a/main/librtlsdr/APKBUILD +++ b/main/librtlsdr/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=librtlsdr _realpkgname=rtl-sdr -pkgver=2.0.1 -pkgrel=1 +pkgver=2.0.2 +pkgrel=0 pkgdesc="Software defined radio receiver for Realtek RTL2832U" url="https://osmocom.org/projects/sdr/wiki/rtl-sdr" arch="all" @@ -44,6 +44,6 @@ doc() { } sha512sums=" -ae481780ed6d084c8fa367c19c1d87007e4d4bf91f183e8e243924aa0369b386f7628f806af74f048978591549c7aeb40e6a5036840ddf52d7008f69edce9271 rtl-sdr-2.0.1.tar.gz -8768be0e24cd5502f304363728caf65df10ae88806a2fffcde80acb4aa844d46b8433b5cb7cb5a658f7dece564e8c749f32a0a9636a49adb5e9d71530826b0f0 correct_udev_rules_path.patch +0c03665626e9d0f3b2db94af81e5d6a7e6c1497d76f86a261d6b260d837865686f93382f3d515f9a79e930295a51a748aeb64f59e5c1ddc207ce1c419def00c1 rtl-sdr-2.0.2.tar.gz +a191efe9ebb55696377ae4199178ba752719cbff5b3ecc8949c0e160a35480fb3bd3061588fe5f81c7a975d52c2071b82ad3b5454011d3f649de7912c9cb368c correct_udev_rules_path.patch " diff --git a/main/librtlsdr/correct_udev_rules_path.patch b/main/librtlsdr/correct_udev_rules_path.patch index 10b477808bf..f68470207b9 100644 --- a/main/librtlsdr/correct_udev_rules_path.patch +++ b/main/librtlsdr/correct_udev_rules_path.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -111,7 +111,7 @@ option(INSTALL_UDEV_RULES "Install udev +@@ -113,7 +113,7 @@ option(INSTALL_UDEV_RULES "Install udev if (INSTALL_UDEV_RULES) install ( FILES rtl-sdr.rules diff --git a/main/libunwind/APKBUILD b/main/libunwind/APKBUILD index 5775db0fcd2..1f68817aa69 100644 --- a/main/libunwind/APKBUILD +++ b/main/libunwind/APKBUILD @@ -16,6 +16,7 @@ subpackages="$pkgname-dbg $pkgname-static $pkgname-dev $pkgname-doc" source="https://github.com/libunwind/libunwind/releases/download/v$pkgver/libunwind-$pkgver.tar.gz force-enable-man.patch fix-libunwind-pc-in.patch + Remove-the-useless-endina.h-for-loongarch64.patch " build() { @@ -45,4 +46,5 @@ sha512sums=" aba7b578c1b8cbe78f05b64e154f3530525f8a34668b2a9f1ee6acb4b22c857befe34ad4e9e8cca99dbb66689d41bc72060a8f191bd8be232725d342809431b3 libunwind-1.8.1.tar.gz 2d210a2d8e960610e515d8cf9ebd388faa30a4f35613cae6a40a06e1ca1267540b974e96a9d94c02c465d47e114d3d3d6cbad72b4c1dbd0eb53d812970b1712d force-enable-man.patch ab5d44e9d3aaf32e3119fe79389e5dfcdc859c78cfda8400e54ee29fd1cdf04b99e2686caf18ab0b76ac94f861861d69a5cf740d46967af9c630095485523f1c fix-libunwind-pc-in.patch +db8ab626920fa7fea5f0ff17e92909f0b293804eca61425dff53dd79a0f92b4db80941850fa144cfc9ecd2e1537b26fa8d62c56824ffea8e2790ed3930c8ff96 Remove-the-useless-endina.h-for-loongarch64.patch " diff --git a/main/libunwind/Remove-the-useless-endina.h-for-loongarch64.patch b/main/libunwind/Remove-the-useless-endina.h-for-loongarch64.patch new file mode 100644 index 00000000000..eef66128174 --- /dev/null +++ b/main/libunwind/Remove-the-useless-endina.h-for-loongarch64.patch @@ -0,0 +1,25 @@ +From 44359b80a85cc2fa5bcb7c9c82d68a94fca3bd33 Mon Sep 17 00:00:00 2001 +From: Jingyun Hua <huajingyun@loongson.cn> +Date: Mon, 8 Apr 2024 15:57:15 +0800 +Subject: [PATCH] Remove the useless endina.h in getcontext.S for loongarch64 + +Fix issue #740 +--- + src/loongarch64/getcontext.S | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/loongarch64/getcontext.S b/src/loongarch64/getcontext.S +index 3344fc2e..c568832c 100644 +--- a/src/loongarch64/getcontext.S ++++ b/src/loongarch64/getcontext.S +@@ -25,7 +25,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + #include "offsets.h" +-#include <endian.h> + .text + + #define SREG(X) st.d $r##X, $r4, (LINUX_UC_MCONTEXT_GREGS + 8 * X) +-- +2.27.0 + diff --git a/main/liburing/APKBUILD b/main/liburing/APKBUILD index 479730f61d9..3ad0acce626 100644 --- a/main/liburing/APKBUILD +++ b/main/liburing/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=liburing -pkgver=2.5 -pkgrel=1 +pkgver=2.6 +pkgrel=0 pkgdesc="Linux kernel io_uring access library" url="https://git.kernel.dk/cgit/liburing/" arch="all" @@ -31,5 +31,5 @@ ffi() { } sha512sums=" -b537a644ba338fc6edc747e08a0c33e99008f5b0a33be03f304c7f94f4c28473d0eee7b0d731be966bf32be835b0e45beb308b3a0b3f6264a69a9e5362f00928 liburing-2.5.tar.gz +5e4b0b347619b4f26218ee851026eb3e5b523be11d1c9a7dcca65d43f07442b03e1520f12cc2fc0d39ee3d1837e266a9ca4974b695900f600705fb8e24630a37 liburing-2.6.tar.gz " diff --git a/main/linux-firmware/APKBUILD b/main/linux-firmware/APKBUILD index b3a0654643e..73cc04423ef 100644 --- a/main/linux-firmware/APKBUILD +++ b/main/linux-firmware/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Oliver Smith <ollieparanoid@postmarketos.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=linux-firmware -pkgver=20240312 +pkgver=20240410 pkgrel=0 pkgdesc="firmware files for linux" url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary" @@ -192,7 +192,7 @@ s5p_mfc() { } sha512sums=" -da151677939aa5edb2456dd6cf492abe74a40ba0e4b9bc0a2c3eab279cd1e8f70c6976adb5af37cf707af73bf3e28949433fb59bd16ea23e883c00a2f6e2b4ed linux-firmware-20240312.tar.gz +559cedb0e7f549ef4fd130a790f3c92e41fb5889120bb8c9ec1e4068a2dc658d851c5d217036b019dbbd6e984c73527c952c27ad18020138111bbbb6718c2a3b linux-firmware-20240410.tar.gz d5182840ba3c1a12e5d8afa078fa334d8c1a2e0e5ca33fa675e64ac1ac26f732a588ac2c7451a4ccf739121268bc56b2f7f22d66cc5344ff108e39e410886419 bluez-firmware-78d6a07730e2d20c035899521ab67726dc028e1c.tar.gz 0dd00bc388a76613ec0e06000dc1066d200f236142ca9777a4cee62faf611064f0b4625e6120bb3e5f9ec60d33a80b3a2b62bcc1a710618260c3c720eed8b800 brcm-firmware-223ccf3a3ddb11b3ea829749fbbba4d65b380897.tar.gz 1e122c69184c2b8b6aa71ad7dc961816cd74070622386af11880333190d5cd13dbac11fe2afe92535b0048e207ab25f5d465b1fc97095e24b3e54ccf6f1ea922 linux-firmware-ucode-amd17h-zenbleed-microcode_amd_fam17h.bin diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD index bfa4cfbecb6..5c3f5d57b73 100644 --- a/main/linux-lts/APKBUILD +++ b/main/linux-lts/APKBUILD @@ -2,7 +2,7 @@ _flavor=lts pkgname=linux-$_flavor -pkgver=6.6.27 +pkgver=6.6.30 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -359,17 +359,17 @@ sha512sums=" 75f232b6becee7d36d360ffaf2aaa837d13518f9ec620ca159bcb2a0e98eb18a77631406a9b44244ea0164a7ed59fad583823909681e9b894a012f9d13365b69 0003-kexec-add-kexec_load_disabled-boot-option.patch 2956050bb332411d00a285e9656618f2e34b631492bbc19bef54d83a6e91b8531f4e18830b9313cfe52fbf8a8ca6fb76cf55b3ddd146ca3b977046cf2fd10cad 0004-objtool-respect-AWK-setting.patch 4b16f15b47b5e5835b926126e39723f519290469517875cfb2d2b857a93ad1344f0d1ba4b255289e20f4da9c867647526b344f752981cee0a48c51577badac3f 0005-powerpc-config-defang-gcc-check-for-stack-protector-.patch -db28d1a2fe74f1d5147ccbaf693d464e7e52ca911433debe50c7dccdbb382baf2de193820e7ec11b9eff7a57e5266c4490e240b5c7bd657297829737f449c458 lts.aarch64.config -00f389f3f53b71b963e1f730d869b97c990499febecaa62b620c9cc9ac759b538c87526de894faa1a51b223ebbb1e5ed31dfa778bc11fd66c77095430666c6c1 lts.armv7.config -6dd7a9aa588fa5b3d15bf1064d12b44c74b3445d9cfed16950e309225b115a6706cb26798cab7cf29413514979d0600b827b32871767413b244dad73b8455331 lts.x86.config -0c364a4098dd69cf5e95c6a90f60a0a3cbe21d4ffa1ac91ddd0f8ce7a7efecbe1189554549ff546ece9284a33c4c34969882d93a3a0d71098acaaaa1d9f9860c lts.x86_64.config -d2664761764e9c0b1a3cdcc028fbeb2bb8b98fe28ce5bcda832fbdc69316cff41e78402f834b8cb2e16d9f1743568d9cfbe5ec1e4a4437cd0526464e521519d2 lts.ppc64le.config -a29343f52d69e7f8b91d92421098ade75b3249fa356c4c909b02c92efc49bfc98c52e43c715ca803da91255822865c7274794aa52f934c588dcd333b6c6dce14 lts.s390x.config -fc45e1f44c4f97ad00349ae412507ac6d040da4c071d3485ef8ac0f30e703424111fc2f6f9146eb901a84322fda2f3bb8bad66d3fd9cf152156e666398fd22e3 lts.loongarch64.config -a66b4f86921bc34f931b00a81bc56c837ca34abf984720fcbcdaaabeaef767427b2805fc1056eea7ed732685bfbdf8850425e5eab10918a7ff6f5d2a1a2388c9 virt.aarch64.config -8251d9f585e4468f54e800e0cbecff5ed7dba4f06ecd40309d3eae64804d3b6074a5b1082bf9ab3ae33259afe9e64bcec5b69db487f0c0b53ccec72f2fa441bc virt.armv7.config -461623079918cf73d621231c86497273be91bec9fc2d2aa4c520720a7a432c1dd0b7ee29652c90d8f21bd2293a3a8022aa55f2ac767fc3f0cc72d10c06fc3c24 virt.ppc64le.config -bc3f98ab75e02f6baf47bc8372b0b8ba75aae68b0a5130f7e53076dce255dc16f6c5afe8acec1aa848b51c391255285d3f2cdd491388acdf00dc90a42d64a1f8 virt.x86.config -5fc65b8033c56b58dc5c9a227a6bcb1069d53fabc79864c65ddb86d4fef25692b107665aaeb4fb07fe05bb7c1085956e18adf9cb2b62487a7f2202aded9162b7 virt.x86_64.config -16836f1a157d52795a6551e68e2e1ae22e254553e2e646e05d7d458e160bd83d86ef91e257fb23ca85f48e46eb8692292b826ff22ca7e71b5ae84f135ced08b5 patch-6.6.27.xz +ae8f01abee26ab4b184f7686fccec6a2559facd1c3fabc1be47c5a4310ca48747b81a055973f98ac2e0129ca48169ae078b6b777490b6257fb9cf87cded96923 lts.aarch64.config +57e57fcc9463ce5360fd09af9b56d0679275edc2c846e470557abffb751314408c6bdad4f47b3a60d81c931e0e226bad685b59e217e73b80bd45077565dd90a2 lts.armv7.config +c0e402e6da43cb30ec153fc3f421e172533d7b99fb5c6598209dfbac154156020ce0e73db73edcd0356b352e63877c4170c5a7620bf913e5f8ecc600d235c4dc lts.x86.config +c017c167a3f7e6169e3556eaa8e88f156a91de17e9c127fdbac3b54f8b4b1e025655f5ad8581a03994b0d2b27135c44ca228a3763858c0c2cf1b019da18dfbaf lts.x86_64.config +5cd3a8265329da4a06aad545a48063e473e48691e2e96d3b836f4e83013d0621e373c47f3af3cf72b35b40d76bdd1ea0fda7d0b46750d79951071e26dd1d4361 lts.ppc64le.config +b8629d77112d22bce5237152549326ea1c08d3534824b75a39111e539bc28510ccfafa0839d74f7e7455d2530b69f963c84fc4d39ddc2278ce99c932798a8052 lts.s390x.config +36f927268a01f431634ffc4c732653e8ab2dbb3c877137fda714b65eacfbfd897a1f0aaa6c35c745217c94a29bfadf71fbfa95722dcf551e62742bff2e29a42b lts.loongarch64.config +b7bd7caa856bc960f180682004685cc898bb176398ab2b832a9995225060161c01c377f596787d0113962611cd21c49689636180252d0b24247e7cf5b231f848 virt.aarch64.config +7e4cd192b30aed8e9d1f01c99a1350f09e7498ad31e332c0ff2d0b0291d70a787b80aee2105e6d3208f05066faee02a12cbd2fb82fc8e43dc9eec2baa84d35ff virt.armv7.config +2c660dd87ad7cf7e730b3748e9cb0e33c50cdaf7a37779b2b2787160c633686761ee02f28a4c35ee4a4db8cac8d0516af7e06a2a85ebb891724d8f401fff592a virt.ppc64le.config +ba056237fe5b1d18b0dbc242f609896e437d37dd9a6131f5257e2d9a706cac497f01fecf11e81b7a4319aa60cbf388f8a5c036c24cd65a6075aa1dd1f3aa1ffe virt.x86.config +91b7c53c346c806affc30502ecf7088804afa706f8c123a469718bf7c74b250e10696b46413e173187c2a40cdcdd7a3d435f4af35ee45e7257794e70289861cd virt.x86_64.config +f96b8db3029f0ae7207c9f4b60f96eb8d5f808b607bd3ecea940f63ea7de9d0be6e60524ddcedf5996ef89c7e202781b941fb88c76784d63a27a91eed3070cee patch-6.6.30.xz " diff --git a/main/linux-lts/lts.aarch64.config b/main/linux-lts/lts.aarch64.config index 947b3335f2d..5881c7d57ce 100644 --- a/main/linux-lts/lts.aarch64.config +++ b/main/linux-lts/lts.aarch64.config @@ -118,7 +118,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y CONFIG_MODVERSIONS=y -CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_SHA256=y CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_BLK_DEV_THROTTLING=y @@ -183,7 +182,6 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m CONFIG_TCP_CONG_BBR=m CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m @@ -192,6 +190,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_ILA=m CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_GRE=m CONFIG_IPV6_SUBTREES=y @@ -2863,6 +2862,8 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_FORTIFY_SOURCE=y CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_YAMA=y +CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LANDLOCK=y # CONFIG_INTEGRITY is not set CONFIG_DEFAULT_SECURITY_DAC=y diff --git a/main/linux-lts/lts.armv7.config b/main/linux-lts/lts.armv7.config index b05c5b47100..7c439ccc444 100644 --- a/main/linux-lts/lts.armv7.config +++ b/main/linux-lts/lts.armv7.config @@ -108,7 +108,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y CONFIG_MODVERSIONS=y -CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_SHA256=y CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_BLK_DEV_THROTTLING=y @@ -168,7 +167,6 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m CONFIG_TCP_CONG_BBR=m CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m @@ -177,6 +175,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_ILA=m CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_GRE=m CONFIG_IPV6_SUBTREES=y @@ -2155,6 +2154,8 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_FORTIFY_SOURCE=y CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_YAMA=y +CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LANDLOCK=y # CONFIG_INTEGRITY is not set CONFIG_DEFAULT_SECURITY_DAC=y diff --git a/main/linux-lts/lts.loongarch64.config b/main/linux-lts/lts.loongarch64.config index 42e75625d78..a6c2dbda769 100644 --- a/main/linux-lts/lts.loongarch64.config +++ b/main/linux-lts/lts.loongarch64.config @@ -850,6 +850,8 @@ CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_YAMA=y +CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_CRYPTO_USER=m # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set diff --git a/main/linux-lts/lts.ppc64le.config b/main/linux-lts/lts.ppc64le.config index 0e3c524d17e..bbd8144ac2c 100644 --- a/main/linux-lts/lts.ppc64le.config +++ b/main/linux-lts/lts.ppc64le.config @@ -57,7 +57,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y -CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_SHA256=y CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_PARTITION_ADVANCED=y @@ -99,7 +98,6 @@ CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_DIAG=m CONFIG_INET_DIAG_DESTROY=y -CONFIG_IPV6=m CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m @@ -108,6 +106,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_ILA=m CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_GRE=m CONFIG_IPV6_SUBTREES=y @@ -823,6 +822,8 @@ CONFIG_SECURITY=y CONFIG_HARDENED_USERCOPY=y CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_YAMA=y +CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LANDLOCK=y # CONFIG_INTEGRITY is not set CONFIG_DEFAULT_SECURITY_DAC=y diff --git a/main/linux-lts/lts.s390x.config b/main/linux-lts/lts.s390x.config index 51d0f5ce571..68e818b827f 100644 --- a/main/linux-lts/lts.s390x.config +++ b/main/linux-lts/lts.s390x.config @@ -1,7 +1,6 @@ # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y -CONFIG_AUDIT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_SCHED_CORE=y @@ -49,7 +48,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y CONFIG_MODVERSIONS=y -CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_SHA256=y CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_BLK_DEV_THROTTLING=y @@ -115,7 +113,6 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m CONFIG_TCP_CONG_BBR=m CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y @@ -125,6 +122,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_ILA=m CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_GRE=m CONFIG_IPV6_SUBTREES=y @@ -939,12 +937,15 @@ CONFIG_ENCRYPTED_KEYS=y CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y -CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_HARDENED_USERCOPY=y CONFIG_FORTIFY_SOURCE=y +CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_YAMA=y +CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LANDLOCK=y +CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity" CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_ZERO_CALL_USED_REGS=y @@ -980,7 +981,6 @@ CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_XCBC=m @@ -1004,7 +1004,6 @@ CONFIG_PKEY=m CONFIG_CRYPTO_PAES_S390=m CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CORDIC=m -CONFIG_CRC_CCITT=y CONFIG_CRC_T10DIF=y CONFIG_CRC7=m CONFIG_CRC8=m diff --git a/main/linux-lts/lts.x86.config b/main/linux-lts/lts.x86.config index 4ac1b89ea07..292a2147383 100644 --- a/main/linux-lts/lts.x86.config +++ b/main/linux-lts/lts.x86.config @@ -112,7 +112,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y CONFIG_MODVERSIONS=y -CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_SHA256=y CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_BLK_DEV_THROTTLING=y @@ -174,7 +173,6 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m CONFIG_TCP_CONG_BBR=m CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m @@ -183,6 +181,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_ILA=m CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_GRE=m CONFIG_IPV6_SUBTREES=y @@ -2808,6 +2807,8 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_FORTIFY_SOURCE=y CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_YAMA=y +CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LANDLOCK=y # CONFIG_INTEGRITY is not set CONFIG_DEFAULT_SECURITY_DAC=y diff --git a/main/linux-lts/lts.x86_64.config b/main/linux-lts/lts.x86_64.config index 2a7b1e023f0..efc1e3c1049 100644 --- a/main/linux-lts/lts.x86_64.config +++ b/main/linux-lts/lts.x86_64.config @@ -127,7 +127,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y CONFIG_MODVERSIONS=y -CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_SHA256=y CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_BLK_DEV_THROTTLING=y @@ -196,7 +195,6 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m CONFIG_TCP_CONG_BBR=m CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m @@ -205,6 +203,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_ILA=m CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_GRE=m CONFIG_IPV6_SUBTREES=y @@ -3131,6 +3130,8 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_FORTIFY_SOURCE=y CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_YAMA=y +CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LANDLOCK=y # CONFIG_INTEGRITY is not set CONFIG_DEFAULT_SECURITY_DAC=y diff --git a/main/linux-lts/virt.aarch64.config b/main/linux-lts/virt.aarch64.config index beae57a663f..a8c24477b07 100644 --- a/main/linux-lts/virt.aarch64.config +++ b/main/linux-lts/virt.aarch64.config @@ -2,7 +2,6 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_USELIB=y -CONFIG_AUDIT=y CONFIG_NO_HZ_FULL=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -91,7 +90,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y CONFIG_MODVERSIONS=y -CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_SHA256=y CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_BLK_DEV_THROTTLING=y @@ -155,7 +153,6 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m CONFIG_TCP_CONG_BBR=m CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m @@ -164,6 +161,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_ILA=m CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y @@ -994,9 +992,12 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y -CONFIG_SECURITYFS=y CONFIG_HARDENED_USERCOPY=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LANDLOCK=y +CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity" CONFIG_GCC_PLUGIN_STACKLEAK=y CONFIG_STACKLEAK_RUNTIME_DISABLE=y diff --git a/main/linux-lts/virt.armv7.config b/main/linux-lts/virt.armv7.config index ba095005772..e8601307e85 100644 --- a/main/linux-lts/virt.armv7.config +++ b/main/linux-lts/virt.armv7.config @@ -2,7 +2,6 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_USELIB=y -CONFIG_AUDIT=y CONFIG_NO_HZ_FULL=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -73,7 +72,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y CONFIG_MODVERSIONS=y -CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_SHA256=y CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_BLK_DEV_THROTTLING=y @@ -134,7 +132,6 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m CONFIG_TCP_CONG_BBR=m CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m @@ -143,6 +140,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_ILA=m CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y @@ -944,9 +942,12 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y -CONFIG_SECURITYFS=y CONFIG_HARDENED_USERCOPY=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LANDLOCK=y +CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity" CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_ZERO_CALL_USED_REGS=y diff --git a/main/linux-lts/virt.ppc64le.config b/main/linux-lts/virt.ppc64le.config index 31471bd4b91..c7e3ca12997 100644 --- a/main/linux-lts/virt.ppc64le.config +++ b/main/linux-lts/virt.ppc64le.config @@ -2,7 +2,6 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_USELIB=y -CONFIG_AUDIT=y CONFIG_NO_HZ_FULL=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -78,7 +77,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y CONFIG_MODVERSIONS=y -CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_SHA256=y CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_BLK_DEV_THROTTLING=y @@ -141,7 +139,6 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m CONFIG_TCP_CONG_BBR=m CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m @@ -150,6 +147,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_ILA=m CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y @@ -933,9 +931,12 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y -CONFIG_SECURITYFS=y CONFIG_HARDENED_USERCOPY=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LANDLOCK=y +CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity" CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_ZERO_CALL_USED_REGS=y diff --git a/main/linux-lts/virt.x86.config b/main/linux-lts/virt.x86.config index f060ccb5b34..572aa57bb6f 100644 --- a/main/linux-lts/virt.x86.config +++ b/main/linux-lts/virt.x86.config @@ -1,7 +1,6 @@ # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y -CONFIG_AUDIT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_BPF_SYSCALL=y @@ -90,7 +89,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y CONFIG_MODVERSIONS=y -CONFIG_MODULE_SIG=y CONFIG_MODULE_SIG_SHA256=y CONFIG_MODULE_COMPRESS_GZIP=y CONFIG_BLK_DEV_THROTTLING=y @@ -154,7 +152,6 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m CONFIG_TCP_CONG_BBR=m CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m @@ -163,6 +160,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_ILA=m CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y @@ -734,6 +732,7 @@ CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_SYSFS=y CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m CONFIG_RC_CORE=y CONFIG_DRM=m CONFIG_DRM_VMWGFX=m @@ -968,9 +967,12 @@ CONFIG_ENCRYPTED_KEYS=m CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y -CONFIG_SECURITYFS=y CONFIG_HARDENED_USERCOPY=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LANDLOCK=y +CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity" CONFIG_GCC_PLUGIN_STACKLEAK=y CONFIG_STACKLEAK_RUNTIME_DISABLE=y diff --git a/main/linux-lts/virt.x86_64.config b/main/linux-lts/virt.x86_64.config index a512e800e6d..a3bc935a0e9 100644 --- a/main/linux-lts/virt.x86_64.config +++ b/main/linux-lts/virt.x86_64.config @@ -168,7 +168,6 @@ CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m CONFIG_TCP_CONG_BBR=m CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m @@ -177,6 +176,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_ILA=m CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_GRE=m CONFIG_IPV6_MULTIPLE_TABLES=y @@ -754,6 +754,7 @@ CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_SYSFS=y CONFIG_I6300ESB_WDT=m +CONFIG_ITCO_WDT=m CONFIG_XEN_WDT=m CONFIG_DRM=m CONFIG_DRM_VMWGFX=m @@ -1001,6 +1002,7 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_FORTIFY_SOURCE=y CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_LOCKDOWN_LSM=y +CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LANDLOCK=y CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity" diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD index d95b8fa14aa..cb917d27d4e 100644 --- a/main/linux-rpi/APKBUILD +++ b/main/linux-rpi/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=linux-rpi -pkgver=6.6.21 +pkgver=6.6.29 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -299,7 +299,7 @@ _dev() { sha512sums=" 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 linux-6.6.tar.xz -e7c8e640fc519d6c92cd13985a7e37d2c8fe0277b7386a9f861c39a6f164d815133b5fb02a691d43c7b79563b09d6ea78674af0ccecfef1b418f4d03bf52a9bc patch-6.6.21.xz -cd73e92fbd2fe47bd756eeaae06b3927813bca528c2aecc7e5833797f0bb1d24cd15dec762088b1faaa8ca9785d8d30027aa6b4a419d030a7f1c7d078c8d6486 rpi-6.6.21-alpine.patch +fc0a0e25386dadc0663b6b5c9b2a9e0edb72f833acf591830818ed5b5e0e5859a301d35f3815dcf5b22f1e5b186fc21b4b3d95717483786239f7efedbace9c9e patch-6.6.29.xz +ed7b5c10a48e41d9cf00636907c9633c7a588990dae83629b252cf90b9a04132515366f0404acad9ec998104853717a1eae7e5358ad1ae46759b109e6a8c6a79 rpi-6.6.29-alpine.patch f014a9b3574df17a3f6e0d8a2c48aef4239f33a062d64704fd56ecd596d090bb0413c8cb2abd6ec3ceeee09fa66243b6a3f7b405657edbd9c7a6407d6ec79fef common-changes.config " diff --git a/main/llvm-runtimes/APKBUILD b/main/llvm-runtimes/APKBUILD index 59fcd32db4a..02df2571380 100644 --- a/main/llvm-runtimes/APKBUILD +++ b/main/llvm-runtimes/APKBUILD @@ -6,7 +6,7 @@ pkgname=llvm-runtimes # Note: Update together with llvm. pkgver=17.0.6 _llvmver=${pkgver%%.*} -pkgrel=0 +pkgrel=1 pkgdesc="LLVM Runtimes" url="https://llvm.org/" arch="all" @@ -43,7 +43,7 @@ options="!check" case "$CARCH" in # Sanitizers are broken on other arches. # Keep in sync with compiler-rt-sanitizer-supported-arch.patch. -aarch64|ppc64le|x86_64) +aarch64|ppc64le|x86_64|riscv64) _build_sanitizers='ON' ;; *) @@ -147,7 +147,7 @@ sha512sums=" 5e7bbddbaea902e5ba5cd4db78bedbeef216f44fdd9b8f73efde6c09f40115c078649a109ffa61fefa0ee2f26655c038a48589ecac83068a47d60e9248c5dff1 armv6-arch.patch.noauto 7c2cbd095b863f735842aaa8f0daecbf0282200fc58f1394139cee30d53c4a738757e38cbf0ec734398ee827e8a47314592bd7dc9768ef5c3664db682680e5a1 compiler-rt-lsan-dtp-offset.patch aaef886f71c5499da18ff18937404ab641cbc3a540ee9e4eed7ae6895970863e6d01ed598f8b2f1512936f33d6dd122cd7a00545afaf710a8026c729a3af720c compiler-rt-ppc-fixes.patch -448ad39865b1a86d69c80b6626500e16509834787944f0b402b3eb3b2d6d1c034073b4004b7e1eee6afdc21b553945e65943b79426105503012c4dfac1ee2e7b compiler-rt-sanitizer-supported-arch.patch +2460aeeb2ddcc24686939e172189d5a05e78eb30a4dca03fd60f03ec3bab5d55223a5806e44305278da0c726e65411907a6074cf64697164e613f42c013e365e compiler-rt-sanitizer-supported-arch.patch 102d050172d1f20c273515b8ccf05ee7e756287f1d74529116ac061f0119da5ce4e5ea3d1a5d21c6395256b5d0538aa928302a6cf39ae59f41aa35929b265e2f libunwind-link-libssp.patch 4295d104f3615d0ccae3f17e60a8e00c7df5b899fb790c746033f48e76c2b020e312639e03148d6162ce471a3c3b45461a5a82ac4eed407fafc670223656b572 fix-msan-with-musl.patch " diff --git a/main/llvm-runtimes/compiler-rt-sanitizer-supported-arch.patch b/main/llvm-runtimes/compiler-rt-sanitizer-supported-arch.patch index c5ef4437cb9..47b3dcc2713 100644 --- a/main/llvm-runtimes/compiler-rt-sanitizer-supported-arch.patch +++ b/main/llvm-runtimes/compiler-rt-sanitizer-supported-arch.patch @@ -10,7 +10,7 @@ i.e. enable it only on x86_64, aarch64, and ppc64le. -set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86} ${X86_64} ${PPC64} ${RISCV64} - ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} ${S390X} ${SPARC} ${SPARCV9} - ${HEXAGON} ${LOONGARCH64}) -+set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86_64} ${ARM64} ${PPC64}) ++set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86_64} ${ARM64} ${PPC64} ${RISCV64}) set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64} ${MIPS32} ${MIPS64} ${PPC64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON}) ${LOONGARCH64}) diff --git a/main/llvm14/lfs64.patch b/main/llvm14/lfs64.patch deleted file mode 100644 index 5d1dfd15b32..00000000000 --- a/main/llvm14/lfs64.patch +++ /dev/null @@ -1,106 +0,0 @@ -Patch-Source: https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67 --- -From 5cd554303ead0f8891eee3cd6d25cb07f5a7bf67 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 4 Feb 2023 13:54:41 -0800 -Subject: [PATCH] cmake: Enable 64bit off_t on 32bit glibc systems - -Pass -D_FILE_OFFSET_BITS=64 to compiler flags on 32bit glibc based -systems. This will make sure that 64bit versions of LFS functions are -used e.g. seek will behave same as lseek64. Also revert [1] partially -because this added a cmake test to detect lseek64 but then forgot to -pass the needed macro to actual compile, this test was incomplete too -since libc implementations like musl has 64bit off_t by default on 32bit -systems and does not bundle[2] -D_LARGEFILE64_SOURCE under -D_GNU_SOURCE -like glibc, which means the compile now fails on musl because the cmake -check passes but we do not have _LARGEFILE64_SOURCE defined. Using the -*64 function was transitional anyways so use -D_FILE_OFFSET_BITS=64 -instead - -[1] https://github.com/llvm/llvm-project/commit/8db7e5e4eed4c4e697dc3164f2c9351d8c3e942b -[2] https://git.musl-libc.org/cgit/musl/commit/?id=25e6fee27f4a293728dd15b659170e7b9c7db9bc - -Reviewed By: MaskRay - -Differential Revision: https://reviews.llvm.org/D139752 ---- - llvm/cmake/config-ix.cmake | 8 +++++--- - llvm/include/llvm/Config/config.h.cmake | 3 --- - llvm/lib/Support/raw_ostream.cpp | 2 -- - llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn | 2 -- - utils/bazel/llvm_configs/config.h.cmake | 3 --- - 5 files changed, 5 insertions(+), 13 deletions(-) - -diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake -index f959cd1f88484..b78c1b34ab8b9 100644 ---- a/cmake/config-ix.cmake -+++ b/cmake/config-ix.cmake -@@ -284,9 +284,6 @@ check_symbol_exists(futimes sys/time.h HAVE_FUTIMES) - if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE ) - check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK) - endif() --set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE") --check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) --set(CMAKE_REQUIRED_DEFINITIONS "") - check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL) - check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO) - check_symbol_exists(mallinfo2 malloc.h HAVE_MALLINFO2) -@@ -340,6 +337,11 @@ check_symbol_exists(__GLIBC__ stdio.h LLVM_USING_GLIBC) - if( LLVM_USING_GLIBC ) - add_compile_definitions(_GNU_SOURCE) - list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE") -+# enable 64bit off_t on 32bit systems using glibc -+ if (CMAKE_SIZEOF_VOID_P EQUAL 4) -+ add_compile_definitions(_FILE_OFFSET_BITS=64) -+ list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64") -+ endif() - endif() - - # This check requires _GNU_SOURCE. -diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake -index 3543e6fc29944..29ac536b4c31b 100644 ---- a/include/llvm/Config/config.h.cmake -+++ b/include/llvm/Config/config.h.cmake -@@ -128,9 +128,6 @@ - /* Define to 1 if you have the <link.h> header file. */ - #cmakedefine HAVE_LINK_H ${HAVE_LINK_H} - --/* Define to 1 if you have the `lseek64' function. */ --#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64} -- - /* Define to 1 if you have the <mach/mach.h> header file. */ - #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H} - -diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp -index 92b15f14c62fd..8943c4478c7f2 100644 ---- a/lib/Support/raw_ostream.cpp -+++ b/lib/Support/raw_ostream.cpp -@@ -802,8 +802,6 @@ uint64_t raw_fd_ostream::seek(uint64_t off) { - flush(); - #ifdef _WIN32 - pos = ::_lseeki64(FD, off, SEEK_SET); --#elif defined(HAVE_LSEEK64) -- pos = ::lseek64(FD, off, SEEK_SET); - #else - pos = ::lseek(FD, off, SEEK_SET); - #endif -diff --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn -index 1d70d96bd6d76..393744f2d6c53 100644 ---- a/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn -+++ b/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn -@@ -139,7 +139,6 @@ write_cmake_config("config") { - values += [ - "HAVE_FUTIMENS=1", - "HAVE_LINK_H=1", -- "HAVE_LSEEK64=1", - "HAVE_MALLINFO=1", - "HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=1", - ] -@@ -147,7 +146,6 @@ write_cmake_config("config") { - values += [ - "HAVE_FUTIMENS=", - "HAVE_LINK_H=", -- "HAVE_LSEEK64=", - "HAVE_MALLINFO=", - "HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=", - ] diff --git a/main/llvm14/llvm14.pre-upgrade b/main/llvm14/llvm14.pre-upgrade deleted file mode 100644 index 6967f800c89..00000000000 --- a/main/llvm14/llvm14.pre-upgrade +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -ver_old=$2 - -if [ "$(apk version -t "$ver_old" '14.0.6-r10')" = '<' ]; then - # in 14.0.6-r10 we flipped the symlink/target dirs for include/cmake - # so we have to delete the symlink to allow apk to replace them.. - # and only after an apk fix :/ - - # include - rm /usr/lib/llvm14/include - - # cmake - rm /usr/lib/llvm14/lib/cmake/llvm -fi - -exit 0 diff --git a/main/llvm15/APKBUILD b/main/llvm15/APKBUILD index 7244736050f..786b699e660 100644 --- a/main/llvm15/APKBUILD +++ b/main/llvm15/APKBUILD @@ -12,7 +12,7 @@ _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver pkgrel=13 pkgdesc="Low Level Virtual Machine compiler system, version $_majorver" -arch="all" +arch="all !loongarch64" url="https://llvm.org/" license="Apache-2.0" install="$pkgname.pre-upgrade" diff --git a/main/llvm14/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch b/main/llvm18/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch index b5a6e353247..e0cb43a2257 100644 --- a/main/llvm14/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch +++ b/main/llvm18/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Disable dynamic lib tests for musl's dlclose() is noop diff --git a/unittests/Support/CMakeLists.txt b/unittests/Support/CMakeLists.txt index 641163e..4f508d9 100644 ---- a/unittests/Support/CMakeLists.txt -+++ b/unittests/Support/CMakeLists.txt +--- a/llvm/unittests/Support/CMakeLists.txt ++++ b/llvm/unittests/Support/CMakeLists.txt @@ -124,5 +124,5 @@ if(NOT LLVM_INTEGRATED_CRT_ALLOC) diff --git a/main/llvm14/APKBUILD b/main/llvm18/APKBUILD index f9dea183863..530608d7b4b 100644 --- a/main/llvm14/APKBUILD +++ b/main/llvm18/APKBUILD @@ -7,33 +7,43 @@ # Contributor: omni <omni+alpine@hack.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> _pkgname=llvm -pkgver=14.0.6 +pkgver=18.1.5 _majorver=${pkgver%%.*} +_prevmajorver=$((_majorver - 1)) pkgname=$_pkgname$_majorver -pkgrel=18 +pkgrel=1 pkgdesc="Low Level Virtual Machine compiler system, version $_majorver" -arch="all !loongarch64 !riscv64" +arch="all" url="https://llvm.org/" license="Apache-2.0" -install="$pkgname.pre-upgrade" -depends_dev="$pkgname=$pkgver-r$pkgrel" +depends_dev="$pkgname=$pkgver-r$pkgrel libffi-dev zlib-dev zstd-dev" # See https://gitlab.alpinelinux.org/alpine/aports/-/commit/51d2fba931fb2ef0046dea19405a9290c8735051#note_234651 [ -z "$BOOTSTRAP" ] && depends_dev="$depends_dev $pkgname-test-utils=$pkgver-r$pkgrel" -makedepends_host="binutils-dev libffi-dev zlib-dev libxml2-dev" +makedepends_host="$depends_dev binutils-dev libxml2-dev" makedepends_build="cmake chrpath python3 py3-setuptools samurai" # diffutils for diff: unrecognized option: strip-trailing-cr # coreutils for 'od' binary checkdepends="bash coreutils diffutils" -subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-test-utils:_test_utils" -source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz +subpackages=" + $pkgname-gtest:_gtest + $pkgname-static + $pkgname-libs + $pkgname-linker-tools:linktools + $pkgname-dev + $pkgname-test-utils-pyc + $pkgname-test-utils:_test_utils + " +source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz 0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch allocscore.patch fix-memory-mf_exec-on-aarch64.patch install-prefix.patch - lfs64.patch llvm-stack-size.patch + + fix-hexagon-tests.patch + llvm-riscv-xthreadmempair.patch " -builddir="$srcdir/$_pkgname-$pkgver.src" +builddir="$srcdir/$_pkgname-project-$pkgver.src" # Whether is this package the default (latest) LLVM version. _default_llvm="no" @@ -45,7 +55,7 @@ if [ "$CBUILD" != "$CHOST" ]; then _llvm_tblgen="llvm$_majorver-tblgen" fi makedepends_build="$makedepends_build cmd:$_llvm_tblgen" - cmake_cross_options=" + _cmake_cross_options=" -DCMAKE_CROSSCOMPILING=ON -DLLVM_TABLEGEN=/usr/bin/$_llvm_tblgen " @@ -57,7 +67,7 @@ if [ "$_default_llvm" = yes ]; then fi # explicit override for previous version as well -replaces="llvm13" +replaces="llvm17" # NOTE: It seems that there's no (sane) way how to change includedir, sharedir # etc. separately, just the CMAKE_INSTALL_PREFIX. Standard CMake variables and @@ -82,13 +92,7 @@ _prefix="usr/lib/llvm$_majorver" prepare() { default_prepare - # Substitute python hashbangs with python3 - find . -name '*.py' -type f -exec \ - sed -i 's,^#!/usr/bin/env python$,#!/usr/bin/env python3,' {} + - find utils -type f -exec \ - sed -i 's,^#!/usr/bin/env python$,#!/usr/bin/env python3,' {} + - find runtimes -type f -exec \ - sed -i 's,^#!/usr/bin/env python$,#!/usr/bin/env python3,' {} + + cd llvm # Known broken test on musl rm -v test/CodeGen/AArch64/wineh4.mir @@ -96,69 +100,53 @@ prepare() { rm -v test/ExecutionEngine/Interpreter/intrinsics.ll case "$CARCH" in - x86) rm -v test/Object/macho-invalid.test \ - test/tools/llvm-size/radix.test - ;; - armv7) rm -v test/tools/llvm-readobj/ELF/dependent-libraries.test \ - test/Object/macho-invalid.test \ - test/tools/llvm-size/radix.test \ - test/tools/llvm-dwarfdump/X86/prettyprint_types.s \ - test/tools/llvm-dwarfdump/X86/simplified-template-names.s - ;; - armhf) rm -v test/tools/llvm-readobj/ELF/dependent-libraries.test \ - test/Object/macho-invalid.test \ - test/tools/gold/X86/split-dwarf.ll \ - test/tools/llvm-size/radix.test \ - test/ExecutionEngine/frem.ll \ - test/tools/llvm-dwarfdump/X86/prettyprint_types.s \ - test/tools/llvm-dwarfdump/X86/simplified-template-names.s \ - unittests/ExecutionEngine/Orc/OrcCAPITest.cpp - sed -i "/OrcCAPITest.cpp/d" \ - unittests/ExecutionEngine/Orc/CMakeLists.txt + x86|arm*) + rm -v test/Object/macho-invalid.test \ + test/tools/llvm-size/radix.test \ + test/ExecutionEngine/frem.ll ;; esac - - # Known broken codegen for Hexagon target, reported upstream. - # https://github.com/llvm/llvm-project/issues/48936 - rm -v \ - test/CodeGen/Hexagon/csr-stubs-spill-threshold.ll \ - test/CodeGen/Hexagon/long-calls.ll \ - test/CodeGen/Hexagon/mlong-calls.ll \ - test/CodeGen/Hexagon/pic-regusage.ll \ - test/CodeGen/Hexagon/runtime-stkchk.ll \ - test/CodeGen/Hexagon/swp-memrefs-epilog.ll \ - test/CodeGen/Hexagon/vararg-formal.ll \ - test/tools/llvm-objcopy/MachO/universal-object.test \ - test/DebugInfo/X86/vla-multi.ll - - # XXX: fail when built with gcc13 - rm -v \ - test/CodeGen/X86/vector-interleaved-load-i32-stride-4.ll \ - test/Transforms/SampleProfile/pseudo-probe-update-2.ll \ - test/Transforms/SampleProfile/pseudo-probe-update.ll } build() { # Auto-detect it by guessing either. local ffi_include_dir="$(pkg-config --cflags-only-I libffi | sed 's|^-I||g')" + + local zstd=ON + # tries linking host libzstd in cross + if [ -n "$BOOTSTRAP" ]; then + zstd=OFF + fi + + local targets= common_targets="AMDGPU;BPF;WebAssembly" case "$CARCH" in - x86) LDFLAGS="$LDFLAGS -Wl,--no-keep-memory";; # avoid exhausting memory limit + arm*) targets="-DLLVM_TARGETS_TO_BUILD=ARM;$common_targets";; + loongarch64) targets="-DLLVM_TARGETS_TO_BUILD=LoongArch;$common_targets";; + ppc64le) targets="-DLLVM_TARGETS_TO_BUILD=PowerPC;$common_targets";; + riscv64) targets="-DLLVM_TARGETS_TO_BUILD=RISCV;$common_targets";; esac # NOTE: DO NOT change CMAKE_BUILD_TYPE! Buildmodes like None will enable # debug assertions for LLVM! - cmake -B build -G Ninja -Wno-dev \ + cmake -B build -G Ninja -Wno-dev -S llvm \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/$_prefix \ + -DCMAKE_INSTALL_RPATH=/$_prefix \ + \ + -DLLVM_DEFAULT_TARGET_TRIPLE="$CBUILD" \ + -DLLVM_HOST_TRIPLE="$CHOST" \ + \ -DFFI_INCLUDE_DIR="$ffi_include_dir" \ + -DLLVM_APPEND_VC_REV=OFF \ -DLLVM_BINUTILS_INCDIR=/usr/include \ -DLLVM_BUILD_DOCS=OFF \ -DLLVM_BUILD_EXAMPLES=OFF \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \ -DLLVM_BUILD_LLVM_DYLIB=ON \ -DLLVM_BUILD_TESTS="$(want_check && echo ON || echo OFF)" \ - -DLLVM_DEFAULT_TARGET_TRIPLE="$CBUILD" \ -DLLVM_ENABLE_ASSERTIONS=OFF \ + -DLLVM_ENABLE_DUMP=ON \ + -DLLVM_ENABLE_EH=ON \ -DLLVM_ENABLE_FFI=ON \ -DLLVM_ENABLE_LIBCXX=OFF \ -DLLVM_ENABLE_LIBEDIT=OFF \ @@ -167,34 +155,33 @@ build() { -DLLVM_ENABLE_SPHINX=OFF \ -DLLVM_ENABLE_TERMINFO=ON \ -DLLVM_ENABLE_ZLIB=ON \ - -DLLVM_INSTALL_UTILS=ON \ - -DLLVM_HOST_TRIPLE="$CHOST" \ + -DLLVM_ENABLE_ZSTD=$zstd \ + -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DLLVM_INCLUDE_EXAMPLES=OFF \ + -DLLVM_INSTALL_GTEST=ON \ + -DLLVM_INSTALL_UTILS=ON \ -DLLVM_LINK_LLVM_DYLIB=ON \ - -DLLVM_APPEND_VC_REV=OFF \ - -DLLVM_INCLUDE_BENCHMARKS=OFF \ - $cmake_cross_options + -DLLVM_USE_PERF=ON \ + $targets \ + $_cmake_cross_options - cmake --build build --target llvm-tblgen cmake --build build - python3 utils/lit/setup.py build + python3 llvm/utils/lit/setup.py build } check() { + LD_LIBRARY_PATH="$PWD/build/lib" \ ninja -C build check-llvm } package() { + depends="$pkgname-linker-tools=$pkgver-r$pkgrel" DESTDIR="$pkgdir" cmake --install build + python3 llvm/utils/lit/setup.py install --root="$pkgdir" cd "$pkgdir"/$_prefix - # Remove RPATHs. - file lib/*.so bin/* \ - | awk -F: '$2~/ELF/{print $1}' \ - | xargs -r chrpath -d - # Symlink files from /usr/lib/llvm*/bin to /usr/bin. mkdir -p "$pkgdir"/usr/bin local name newname path @@ -225,24 +212,36 @@ package() { ln -sfv ../$pkgname/lib/cmake/llvm "$pkgdir"/usr/lib/cmake/$pkgname } +_gtest() { + pkgdesc="LLVM $_majorver gtest static libraries" + depends="" + _common_subpkg + amove "$_prefix"/lib/libLLVMTesting*.a \ + "$_prefix"/lib/libllvm_gtest*.a \ + "$_prefix"/include/llvm-gmock \ + "$_prefix"/include/llvm-gtest +} + static() { pkgdesc="LLVM $_majorver static libraries" + depends="" _common_subpkg - - _mv "$pkgdir"/$_prefix/lib/*.a "$subpkgdir"/$_prefix/lib/ + amove "$_prefix"/lib/*.a } libs() { pkgdesc="LLVM $_majorver runtime library" - local soname="libLLVM-$_majorver.so" - local soname2="libLLVM-$pkgver.so" + depends="" + local soname="libLLVM.so.${pkgver%.*}" + local soname2="libLLVM-$_majorver.so" mkdir -p "$subpkgdir" cd "$subpkgdir" # libLLVM should be in /usr/lib. This is needed for binaries that are # dynamically linked with libLLVM, so they can find it on default path. - _mv "$pkgdir"/$_prefix/lib/$soname usr/lib/ + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/$_prefix/lib/$soname "$subpkgdir"/usr/lib/ ln -s $soname usr/lib/$soname2 # And also symlink it back to the LLVM prefix. @@ -251,6 +250,25 @@ libs() { ln -s ../../$soname $_prefix/lib/$soname2 } +linktools() { + _common_subpkg + pkgdesc="$pkgdesc (linker plugins)" + + amove \ + $_prefix/lib/libLTO.so* \ + $_prefix/lib/LLVMgold* \ + + if [ "$_default_llvm" = yes ]; then + ln -sfv llvm$_majorver/lib/LLVMgold.so "$subpkgdir"/usr/lib/ + ln -sfv llvm$_majorver/lib/libLTO.so "$subpkgdir"/usr/lib/ + + # for bfd to work with clang -flto, you need to put the linker plugin in the bfd dir too, + # not just usr/lib. + mkdir -p "$subpkgdir"/usr/lib/bfd-plugins/ + ln -sfv ../llvm$_majorver/lib/LLVMgold.so "$subpkgdir"/usr/lib/bfd-plugins/ + fi +} + dev() { _common_subpkg default_dev @@ -260,25 +278,23 @@ dev() { $_prefix/lib \ $_prefix/bin/llvm-config - # Move libLTO and LLVMgold back - _mv "$subpkgdir"/$_prefix/lib/libLTO.so.* \ - "$subpkgdir"/$_prefix/lib/LLVMgold* \ - "$pkgdir"/$_prefix/lib - if [ "$_default_llvm" = yes ]; then ln -sf llvm$_majorver usr/lib/cmake/llvm - ln -sf llvm$_majorver/lib/LLVMgold.so "$subpkgdir"/usr/lib/ - ln -sf llvm$_majorver/lib/libLTO.so "$subpkgdir"/usr/lib/ + ln -sf llvm$_majorver/lib/LLVMgold.so "$pkgdir"/usr/lib/ + ln -sf llvm$_majorver/lib/libLTO.so "$pkgdir"/usr/lib/ fi + + # also add a suffix-version variant of llvm-config, as that's what things normally check for + mkdir -p "$subpkgdir"/usr/bin/ + ln -sfv ../lib/llvm$_majorver/bin/llvm-config "$subpkgdir"/usr/bin/llvm-config-$_majorver } _test_utils() { pkgdesc="LLVM $_majorver utilities for executing LLVM and Clang style test suites" depends="python3" _common_subpkg - replaces="" - local litver=$(python3 "$builddir"/utils/lit/setup.py --version 2>/dev/null \ + local litver=$(python3 "$builddir"/llvm/utils/lit/setup.py --version 2>/dev/null \ | sed 's/\.dev.*$//') test -n "$litver" provides="$provides lit=$litver-r$pkgrel" @@ -286,35 +302,34 @@ _test_utils() { amove usr/lib/$pkgname/bin/FileCheck \ usr/lib/$pkgname/bin/count \ usr/lib/$pkgname/bin/not \ - usr/bin/count14 \ - usr/bin/not14 + usr/lib/python* \ + usr/bin/lit - cd "$builddir"/build + mv "$subpkgdir"/usr/bin/lit "$subpkgdir"/$_prefix/bin/lit + ln -s lit "$subpkgdir"/$_prefix/bin/llvm-lit - python3 ../utils/lit/setup.py install --root="$subpkgdir" - ln -s ../../../bin/lit "$subpkgdir"/$_prefix/bin/lit - ln -s ../../../bin/lit "$subpkgdir"/$_prefix/bin/llvm-lit + if [ "$_default_llvm" = yes ]; then + amove usr/bin/count usr/bin/not + ln -s ../lib/llvm$_majorver/bin/lit "$subpkgdir"/usr/bin/lit + else + amove usr/bin/count$_majorver usr/bin/not$_majorver + fi } _common_subpkg() { if [ "$_default_llvm" = yes ]; then - replaces="llvm${subpkgname#"$pkgname"}" - provides="$replaces=$pkgver-r$pkgrel" + replaces="llvm${subpkgname#"$pkgname"} llvm${_prevmajorver}${subpkgname#"$pkgname"}" + provides="llvm${subpkgname#"$pkgname"}=$pkgver-r$pkgrel" fi } -_mv() { - local dest; for dest; do true; done # get last argument - mkdir -p "$dest" - mv "$@" -} - sha512sums=" -6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d llvm-14.0.6.src.tar.xz -6021b5a39843d645a8c63d558568f120d0d91a1ce209e46f0b980253fafb18dfc2078ef39cf63b0900f4313e3c5636320b3c179ff7a4e220d06aec2455063993 0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch -ed189ae609c73ab91c0973c3aeb334158370a1a2879f17fed93900f9225f34ca483aa1513d76b9f9f01d94221aa703642398fe7005f5fe878bf43d9ffbeac057 allocscore.patch -dd5efd88abdd13db3b17bde8735c2ddb1ed1ac690a8ab06072e3e91f87d7ede924dcb513ee31b855d304fe43246619e5fa83fcbaeabb256b3b96ff4ebaf3b110 fix-memory-mf_exec-on-aarch64.patch -7a87da5ee5f9d4db21974023eab88645610fdfae856e445f402169bc2aed74ab3861ad03974421aaa2312e24efb55bdbcd312146eb12b52f5c8c7515713bd40f install-prefix.patch -e288e8d3389536f1f040c0ae8a8eae168de8eedba6040efd5f477701e18529711329a279c6b86d5214ab44efaa6e27818d109be78891ee93e241a0ab1b3a0c5a lfs64.patch -c96cbd78a71d62e2ad273f0d2ef853644a5a80613e2519c49a9b7c04f684b106fb1dbb969626207bf16edb72c2dbfec23037b74716d5717263a1b86c60df52b4 llvm-stack-size.patch +9e2f1e251b3754a24a0b39676d78c98692887c05c85cf0bee50fd44d9635290019930d4dabd1ff4ba3c9c1067e7e0e09aa1bbcd3d76687f919a1d44ba85eee20 llvm-project-18.1.5.src.tar.xz +84ed6b165445d0cdb59daa59f612a7d960bf67b13a1b19bdd2a19d46548013e756faca6b8249cb6c60354f3a9aaef46652e5f531944c71294e46d2f7bfd8b832 0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch +ef63d5e01440cff65c10b84b65099bbd539bae72065d5581a8d2409cf2d0d4410d5bb3f501273ab29ee65bf8f5d23653a074428c2711ff9209324de56b857f3f allocscore.patch +1826a6877d0c9e93c2d6ce0b4f83fe1118b9449f82f1919b37be5fc6d7c11ae22e0c02a7d3e6e23ce41bbb07df2ff08124aa9172e254ef2b12ecbc80d9a674a9 fix-memory-mf_exec-on-aarch64.patch +ebc0be314c129ef38f00c8c2be9d589658cae89ac8cda109e35933b5044e775a3d370c0c584d3e501e4d43167b8523d8c5e5a85653d8ebe853571697ae40fb35 install-prefix.patch +2123f01d8075a15cf8c2d8091fc8c92cb99807b1d654af13b436690ddb55f3e893a494593b3c92aeab26e50db4e0500ac688129ab6bc11e4765c0308b90db101 llvm-stack-size.patch +bd51d487c46472963a350cd90f7d7a5d8a4494467716f4e4e3d21ba6be5f65c0e84f173a5bb8468fb68325e75401f08110f8886320d5caa9acd339d795b254bc fix-hexagon-tests.patch +3cd5f0086034cfa79f01c9ab8c28c76e89fbda4758fb6f550c65da1026a97f69abc6172253b89cc6c9852ef5a4c02031abcadef7781aed6d6a3ec025eb4cbc15 llvm-riscv-xthreadmempair.patch " diff --git a/main/llvm14/allocscore.patch b/main/llvm18/allocscore.patch index 659afb6afab..5421c6b1ae8 100644 --- a/main/llvm14/allocscore.patch +++ b/main/llvm18/allocscore.patch @@ -1,8 +1,8 @@ on x86, this fails with a float comparison error even though the floats are the same, because it does absolute eq -- ---- a/unittests/CodeGen/RegAllocScoreTest.cpp -+++ b/unittests/CodeGen/RegAllocScoreTest.cpp +--- a/llvm/unittests/CodeGen/RegAllocScoreTest.cpp ++++ b/llvm/unittests/CodeGen/RegAllocScoreTest.cpp @@ -172,14 +172,5 @@ ASSERT_EQ(Freq2, TotalScore.loadStoreCounts()); ASSERT_EQ(Freq1, TotalScore.cheapRematCounts()); diff --git a/main/llvm18/fix-hexagon-tests.patch b/main/llvm18/fix-hexagon-tests.patch new file mode 100644 index 00000000000..aef1470dbd9 --- /dev/null +++ b/main/llvm18/fix-hexagon-tests.patch @@ -0,0 +1,36 @@ +From 03160ed7b3c1be7884dae94635a4dcee787034ef Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 19 Sep 2023 17:13:42 +0200 +Subject: [PATCH] [Hexagon][test] Fix more tests on linux-musl + +-march=hexagon uses the default target triple and changes the arch part of +hexagon. On linux-musl, this essentially becomes hexagon-unknown-linux-musl +which has different code generation. Use -mtriple instead. + +Link: https://github.com/llvm/llvm-project/commit/944110353b970fc99de3f012292b4c29d4d91999 +Link: https://github.com/llvm/llvm-project/issues/48936 +--- + llvm/test/CodeGen/Hexagon/swp-memrefs-epilog.ll | 2 +- + llvm/test/CodeGen/Hexagon/vararg-formal.ll | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/llvm/test/CodeGen/Hexagon/swp-memrefs-epilog.ll b/llvm/test/CodeGen/Hexagon/swp-memrefs-epilog.ll +index 20e39dd08fd727a..bdb0ad459f6fb54 100644 +--- a/llvm/test/CodeGen/Hexagon/swp-memrefs-epilog.ll ++++ b/llvm/test/CodeGen/Hexagon/swp-memrefs-epilog.ll +@@ -1,4 +1,4 @@ +-; RUN: llc -march=hexagon -O2 -fp-contract=fast < %s -pipeliner-experimental-cg=true | FileCheck %s ++; RUN: llc -mtriple=hexagon -O2 -fp-contract=fast < %s -pipeliner-experimental-cg=true | FileCheck %s + + ; Test that the memoperands for instructions in the epilog are updated + ; correctly. Previously, the pipeliner updated the offset for the memoperands +diff --git a/llvm/test/CodeGen/Hexagon/vararg-formal.ll b/llvm/test/CodeGen/Hexagon/vararg-formal.ll +index 6bba65fcab16900..07a53c79020be0e 100644 +--- a/llvm/test/CodeGen/Hexagon/vararg-formal.ll ++++ b/llvm/test/CodeGen/Hexagon/vararg-formal.ll +@@ -1,4 +1,4 @@ +-; RUN: llc -march=hexagon < %s | FileCheck %s ++; RUN: llc -mtriple=hexagon < %s | FileCheck %s + + ; Make sure that the first formal argument is not loaded from memory. + ; CHECK-NOT: memw diff --git a/main/llvm14/fix-memory-mf_exec-on-aarch64.patch b/main/llvm18/fix-memory-mf_exec-on-aarch64.patch index c4166ed9a80..6e0e0fcb69d 100644 --- a/main/llvm14/fix-memory-mf_exec-on-aarch64.patch +++ b/main/llvm18/fix-memory-mf_exec-on-aarch64.patch @@ -12,14 +12,16 @@ Fix failures in AllocationTests/MappedMemoryTest.* on aarch64: Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10 ---- a/lib/Support/Unix/Memory.inc -+++ b/lib/Support/Unix/Memory.inc -@@ -58,7 +58,7 @@ +diff --git a/llvm/lib/Support/Unix/Memory.inc b/llvm/lib/Support/Unix/Memory.inc +index 4c8f6b2ea..6cddae13b 100644 +--- a/llvm/lib/Support/Unix/Memory.inc ++++ b/llvm/lib/Support/Unix/Memory.inc +@@ -50,7 +50,7 @@ static int getPosixProtectionFlags(unsigned Flags) { + llvm::sys::Memory::MF_EXEC: return PROT_READ | PROT_WRITE | PROT_EXEC; case llvm::sys::Memory::MF_EXEC: - #if (defined(__FreeBSD__) || defined(__POWERPC__) || defined (__ppc__) || \ -- defined(_POWER) || defined(_ARCH_PPC)) -+ defined(_POWER) || defined(_ARCH_PPC) || (defined(__linux__) && defined(__aarch64__))) +-#if defined(__FreeBSD__) || defined(__powerpc__) ++#if defined(__FreeBSD__) || defined(__powerpc__) || (defined(__linux__) && defined(__aarch64__)) // On PowerPC, having an executable page that has no read permission // can have unintended consequences. The function InvalidateInstruction- // Cache uses instructions dcbf and icbi, both of which are treated by diff --git a/main/llvm14/install-prefix.patch b/main/llvm18/install-prefix.patch index f7802cb8424..90f6c3e62d2 100644 --- a/main/llvm14/install-prefix.patch +++ b/main/llvm18/install-prefix.patch @@ -8,8 +8,9 @@ always be correct, and what cmake tries to autodetect anyway. also see: https://reviews.llvm.org/D29969 ---- a/cmake/modules/CMakeLists.txt -+++ b/cmake/modules/CMakeLists.txt +this is supposedly fixed now, but for some reason it still isn't +--- a/llvm/cmake/modules/CMakeLists.txt ++++ b/llvm/cmake/modules/CMakeLists.txt @@ -41,6 +41,8 @@ # diff --git a/main/llvm18/llvm-riscv-xthreadmempair.patch b/main/llvm18/llvm-riscv-xthreadmempair.patch new file mode 100644 index 00000000000..775b6a9fa56 --- /dev/null +++ b/main/llvm18/llvm-riscv-xthreadmempair.patch @@ -0,0 +1,17 @@ +diff --git a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp +index 08678a859ae2..23083672b4e1 100644 +--- a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp ++++ b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp +@@ -1403,8 +1403,10 @@ + ISD::BUILD_VECTOR, ISD::CONCAT_VECTORS, + ISD::EXPERIMENTAL_VP_REVERSE, ISD::MUL, + ISD::INSERT_VECTOR_ELT}); +- if (Subtarget.hasVendorXTHeadMemPair()) +- setTargetDAGCombine({ISD::LOAD, ISD::STORE}); ++ if (Subtarget.hasVendorXTHeadMemPair()) { ++ setTargetDAGCombine(ISD::LOAD); ++ setTargetDAGCombine(ISD::STORE); ++ } + if (Subtarget.useRVVForFixedLengthVectors()) + setTargetDAGCombine(ISD::BITCAST); + diff --git a/main/llvm14/llvm-stack-size.patch b/main/llvm18/llvm-stack-size.patch index 68f402f826b..0a053154242 100644 --- a/main/llvm14/llvm-stack-size.patch +++ b/main/llvm18/llvm-stack-size.patch @@ -9,26 +9,15 @@ Subject: [PATCH 10/22] always set a larger stack size explicitly 1 file changed, 9 deletions(-) diff --git a/llvm/lib/Support/Threading.cpp b/llvm/lib/Support/Threading.cpp -index 04a1a9e19..776badaad 100644 ---- a/lib/Support/Threading.cpp -+++ b/lib/Support/Threading.cpp -@@ -82,16 +82,7 @@ unsigned llvm::ThreadPoolStrategy::compute_thread_count() const { +index 923935bbc..26594aac8 100644 +--- a/llvm/lib/Support/Threading.cpp ++++ b/llvm/lib/Support/Threading.cpp +@@ -77,7 +77,7 @@ unsigned llvm::ThreadPoolStrategy::compute_thread_count() const { // keyword. #include "llvm/Support/thread.h" -#if defined(__APPLE__) -- // Darwin's default stack size for threads except the main one is only 512KB, -- // which is not enough for some/many normal LLVM compilations. This implements -- // the same interface as std::thread but requests the same stack size as the -- // main thread (8MB) before creation. - const llvm::Optional<unsigned> llvm::thread::DefaultStackSize = 8 * 1024 * 1024; --#else --const llvm::Optional<unsigned> llvm::thread::DefaultStackSize = None; --#endif -- - - #endif - --- -2.35.1 - ++#if 1 + // Darwin's default stack size for threads except the main one is only 512KB, + // which is not enough for some/many normal LLVM compilations. This implements + // the same interface as std::thread but requests the same stack size as the diff --git a/main/logcheck/APKBUILD b/main/logcheck/APKBUILD index 5d58df569a2..d95bb53d563 100644 --- a/main/logcheck/APKBUILD +++ b/main/logcheck/APKBUILD @@ -2,9 +2,10 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=logcheck pkgver=1.4.3 -pkgrel=0 +pkgrel=1 pkgdesc="Bash scripts used to monitor system log files for anomalies" -options="!check" # Requires writing to root owned paths but can't run as root +# !check: Requires writing to root owned paths but can't run as root +options="!check" url="https://packages.debian.org/source/sid/logcheck" arch="noarch" license="GPL-2.0-or-later" @@ -17,21 +18,21 @@ install="$pkgname.pre-install" subpackages="$pkgname-doc" pkgusers="logcheck" source="https://deb.debian.org/debian/pool/main/l/logcheck/logcheck_$pkgver.tar.xz + run-lock.patch logcheck.cron.d " package() { make DESTDIR="$pkgdir" install - mkdir -p "$pkgdir"/var/lib/$pkgname - mkdir -p "$pkgdir"/var/lock/$pkgname install -D -m 644 "$srcdir"/logcheck.cron.d "$pkgdir"/etc/logcheck/logcheck.cron.sample install -d "$pkgdir"/usr/share/man cp -a "$builddir"/docs/* "$pkgdir"/usr/share/man - chown -R $pkgusers "$pkgdir"/etc/logcheck "$pkgdir"/var/lock/logcheck "$pkgdir"/var/lib/logcheck + chown -R $pkgusers "$pkgdir"/etc/logcheck "$pkgdir"/run/lock/logcheck "$pkgdir"/var/lib/logcheck } sha512sums=" e6c3ef20b44e23099a6b9054f210c8baead6f6a6a84d2d2f0bc465ef95bdf9b267a85f59ec876d1854e0e76f1fb4263a30036caf84b4c8bff15763fb6f9ff6a2 logcheck_1.4.3.tar.xz +543575733f935d6f959a9eaf873dd800846e21f810b4041e6cbf6b64ec8fede2cf9672faeb8b44acbf1c8cd184edb5e44b5aeadb646d65dc93fa60f8d85c48a7 run-lock.patch a177388f18c220323eea6f5413f76873e6ad2a2334f58a05727c7b94a793fcb98bd605cefc6fe44aca6afe5c50a9ef851abcc439aefe5b7545d5d6bb584c0a8b logcheck.cron.d " diff --git a/main/logcheck/logcheck.post-install b/main/logcheck/logcheck.post-install index c3439021c39..35fca4de3fd 100644 --- a/main/logcheck/logcheck.post-install +++ b/main/logcheck/logcheck.post-install @@ -1,3 +1,3 @@ #!/bin/sh -chown -R logcheck /etc/logcheck /var/lock/logcheck /var/lib/logcheck +chown -R logcheck /etc/logcheck /run/lock/logcheck /var/lib/logcheck diff --git a/main/logcheck/run-lock.patch b/main/logcheck/run-lock.patch new file mode 100644 index 00000000000..8b884fa1b04 --- /dev/null +++ b/main/logcheck/run-lock.patch @@ -0,0 +1,16 @@ +logcheck uses /run/lock by default so fix the path for systems without +/var/lock -> /run/lock symlink + +diff --git a/Makefile b/Makefile +index fded3699..2a992473 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ install: + install -d $(DESTDIR)/var/lib/logcheck + install -d $(DESTDIR)/$(SBINDIR) + install -d $(DESTDIR)/$(BINDIR) +- install -d $(DESTDIR)/var/lock/logcheck ++ install -d $(DESTDIR)/run/lock/logcheck + install -d $(DESTDIR)/$(SHAREDIR) + + # Create directories for rules logcheck-database
\ No newline at end of file diff --git a/main/logrotate/APKBUILD b/main/logrotate/APKBUILD index bdffa5bd47b..f260e073fc2 100644 --- a/main/logrotate/APKBUILD +++ b/main/logrotate/APKBUILD @@ -24,6 +24,9 @@ source="https://github.com/logrotate/logrotate/releases/download/$pkgver/logrota prepare() { default_prepare + # If set, setgid bit is inherited by testdir causing test-0013 to fail + chmod -v -s test + ./autogen.sh } diff --git a/main/lua-lxc/APKBUILD b/main/lua-lxc/APKBUILD index ffd582b7aed..cb0faf407f6 100644 --- a/main/lua-lxc/APKBUILD +++ b/main/lua-lxc/APKBUILD @@ -18,6 +18,7 @@ done prepare() { default_prepare + update_config_sub # configure will complain about missing automake randomly ./autogen.sh } diff --git a/main/lua-ossl/APKBUILD b/main/lua-ossl/APKBUILD index da6c9a0d5b3..23b6a99d523 100644 --- a/main/lua-ossl/APKBUILD +++ b/main/lua-ossl/APKBUILD @@ -4,7 +4,7 @@ pkgname=lua-ossl _pkgname=luaossl pkgver=20220711 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=2 pkgdesc="comprehensive OpenSSL Lua module" url="https://25thandclement.com/~william/projects/luaossl.html" arch="all" diff --git a/main/lua-penlight/APKBUILD b/main/lua-penlight/APKBUILD index fb3e62a23a3..722f0a96c47 100644 --- a/main/lua-penlight/APKBUILD +++ b/main/lua-penlight/APKBUILD @@ -1,15 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lua-penlight _rockname=penlight -pkgver=1.13.1 +pkgver=1.14.0 pkgrel=0 pkgdesc="Lua libraries for extended operations on tables, lists and strings" -options="!check" # Requires lua-coveralls url="https://lunarmodules.github.io/Penlight/" arch="noarch" license="MIT" depends="lua lua-filesystem" -checkdepends="luajit" subpackages="$pkgname-doc" source="https://github.com/lunarmodules/Penlight/archive/$pkgver/lua-penlight-$pkgver.tar.gz" builddir="$srcdir/Penlight-$pkgver" @@ -23,8 +21,17 @@ for _v in $_luaversions; do subpackages="$subpackages lua$_v-penlight:_split" done +case "$CARCH" in +ppc64le|riscv64|loongarch64) + ;; +*) + checkdepends="$checkdepends luajit" + _luaversions="$_luaversions jit" + ;; +esac + check() { - local lver; for lver in $_luaversions jit; do + local lver; for lver in $_luaversions; do msg "Testing on Lua $lver" lua$lver run.lua tests done @@ -56,5 +63,5 @@ _split() { } sha512sums=" -de0a6a2f585f32bed234ef084d8fca9cee645eed3459aa3c39b885b46a05ae752b5c7ac3bb1957fef9519df2a11e250fc87d6d4d62ee6155be2742ad43a079fe lua-penlight-1.13.1.tar.gz +a83f70716106d6576b27a42222ba897d5d5a7b3918088c582e89283cf091a95a9920fe6d0b8d65e1ffc4c1664166f7d5bc4df3b023539d1b33d7175e585bbe9f lua-penlight-1.14.0.tar.gz " diff --git a/main/lua-resty-core/APKBUILD b/main/lua-resty-core/APKBUILD index 53ea84bbbe0..28052f9bde7 100644 --- a/main/lua-resty-core/APKBUILD +++ b/main/lua-resty-core/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="New FFI-based API for lua-nginx-module" url="https://github.com/openresty/lua-resty-core" # luajit -arch="noarch !ppc64le !riscv64" +arch="noarch !ppc64le !riscv64 !loongarch64" license="BSD-2-Clause" depends="luajit lua-resty-lrucache" source="https://github.com/openresty/lua-resty-core/archive/v$pkgver/lua-resty-core-$pkgver.tar.gz" diff --git a/main/luajit/APKBUILD b/main/luajit/APKBUILD index 5a7f42231de..5b57c3682fb 100644 --- a/main/luajit/APKBUILD +++ b/main/luajit/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgname=luajit _pkgname=luajit2 -pkgver=2.1_p20230410 +pkgver=2.1_p20240314 _pkgver=${pkgver/_p/-} -pkgrel=3 -_gitrev_tests=1fa1f103f9235e22aac5331fe04b267ee7be6206 +pkgrel=0 +_gitrev_tests=9ad3724b1a02855a3cad638bba2e564f825954ce pkgdesc="OpenResty's branch of LuaJIT" url="https://github.com/openresty/luajit2" # ppc64le: fails tests/not really supported @@ -71,8 +71,8 @@ package() { } sha512sums=" -b861b4182f4e6814878a9de84ed5a864429a8b9a29f8d1b20b2ec5f42e8883214f3d04ee0e8d7f80e3e58debfedff7a8b6363310b74d926f5cfe7be13ce0892c luajit2-2.1-20230410.tar.gz -9931f56998f89638e97ce60d9dab8e8e091d5001a576f7bb4125a8bf7c55cee391421fdf8c60c4454f2518c2865c9374e727ec24a09594b3edb08f2c100950d7 luajit2-test-suite-1fa1f103f9235e22aac5331fe04b267ee7be6206.tar.gz +74163706c81f590ebbcd7f8cec9a02ac6ea0896181c7be41e89157e7efd17492bd747ebd9ab3c0c1ff4561110bff1a5fdf68a5e575b36e2d142c76a5c3479ca6 luajit2-2.1-20240314.tar.gz +97026778f76cb4ae42b88e3799fc67eb168dd3a6f0c3837c2aa237b916c550e268dfe7dc8c1a5cc864c28ab0331f3299800abbdcefbe26fc7ba48685bee58001 luajit2-test-suite-9ad3724b1a02855a3cad638bba2e564f825954ce.tar.gz 684be4199634ac6e52183e98b65c9bcdc99217865c47b83a1f579a9f0e1ec55fb1a5fe8ae2f1293ac561c8c806aef269e451e3d73bf168ec20a4fd343c7a89d4 fix-tests-alpine.patch 9c6c410e142838c5128c70570e66beb53cc5422df5ecfb8ab0b5f362637b21ab5978c00f19bc1759165df162fd6438a2ed43e25020400011b7bb14014d87c62e module-paths.patch " diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD index 04a4ee62844..07295440df3 100644 --- a/main/lvm2/APKBUILD +++ b/main/lvm2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lvm2 pkgver=2.03.23 -pkgrel=2 +pkgrel=3 pkgdesc="Logical Volume Manager 2 utilities" url="https://sourceware.org/lvm2/" arch="all" @@ -18,6 +18,7 @@ source="https://mirrors.kernel.org/sourceware/lvm2/LVM2.$pkgver.tgz library_dir-default-config.patch mlockall-default-config.patch no-systemd.patch + fix-implicit-basename.patch 0001-lvresize-use-POSIX-shell.patch lvm.initd lvm.confd @@ -41,7 +42,7 @@ subpackages=" " builddir="$srcdir/LVM2.$pkgver" -if [ -z "$BOOTSTRAP" ]; then +if [ -z "$BOOTSTRAP" ] && [ -z "$APORTS_BOOTSTRAP" ]; then # XXX: enable-udev_sync needs a bit more polish to not fail with mdev-only _no_bootstrap="--enable-lvmlockd-sanlock --disable-udev_sync" makedepends_host="$makedepends_host eudev-dev sanlock-dev" @@ -181,6 +182,7 @@ c65ef16840321d8a58373e872713eeccbc315a84bb35beebccb6bc6063295b0f54b7c0726c799efd b790cfcb55aa0362c7046c26a8e050708edecaf0233946adbb34d9c1d967d3614bc19e0c91695da4fd12d7b18adb74041ae11239cd635310cc44b8a7079ccbec library_dir-default-config.patch 07f77491cffa0d9dcda86004e2df428d5d52652a3bda8037a4b09c9c786146253314a11bae42512231c664a8fae110fec815bd12135fc3c6152b94e2101f8213 mlockall-default-config.patch dfcda00e5607606ae8f10e5765de048af933afd05e0719b14036ba84ebc3b4eb07b138e5ce9af9f653416b4a6cc42161591e6f93ee3a36721a2b7396d70d5d91 no-systemd.patch +4e673f15d7531c3f3d31d4b994f8565f4d22945001939d52ee6603a90ea607b84c7d6ddef0bd6382f5bf4237d2ca7864fbc09a05c560b68cfc2a731be003f27c fix-implicit-basename.patch 3cec0a44e44b15dcfc0bb22f8a4318e76bf719fe9a550b6cf99160ea4181707f81ba6a50c8dafedc942638b1ae8bfde901eeff83ba0d6cb8383a178274ba54a5 0001-lvresize-use-POSIX-shell.patch 714e6aaba3437b43af38b0b559d0f983b2cea023e2bc64e0c3763e9c78ae4ca125fb75839fda52128e7044a4add81940fd69e92439d30d232cf20a4204f0e321 lvm.initd 07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d lvm.confd diff --git a/main/lvm2/fix-implicit-basename.patch b/main/lvm2/fix-implicit-basename.patch new file mode 100644 index 00000000000..25748e3ede9 --- /dev/null +++ b/main/lvm2/fix-implicit-basename.patch @@ -0,0 +1,13 @@ +See https://gitlab.alpinelinux.org/alpine/aports/-/issues/16103 + +diff -upr LVM2.2.03.23.orig/lib/device/device_id.c LVM2.2.03.23/lib/device/device_id.c +--- LVM2.2.03.23.orig/lib/device/device_id.c 2024-05-12 12:05:45.824137483 +0200 ++++ LVM2.2.03.23/lib/device/device_id.c 2024-05-12 12:06:00.537497883 +0200 +@@ -30,6 +30,7 @@ + #include <fcntl.h> + #include <unistd.h> + #include <time.h> ++#include <libgen.h> + #include <sys/types.h> + #include <sys/file.h> + #include <sys/sysmacros.h> diff --git a/main/lxc-templates-legacy/APKBUILD b/main/lxc-templates-legacy/APKBUILD index 1ccf55256e1..4fcd0abf6cb 100644 --- a/main/lxc-templates-legacy/APKBUILD +++ b/main/lxc-templates-legacy/APKBUILD @@ -18,6 +18,11 @@ source="https://linuxcontainers.org/downloads/lxc/lxc-templates-$pkgver.tar.gz " builddir="$srcdir/lxc-templates-$pkgver" +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 378798961aa..68063ef78f9 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -4,7 +4,7 @@ pkgname=lxc pkgver=6.0.0 _pkgver=${pkgver/_rc/.rc} -pkgrel=1 +pkgrel=4 pkgdesc="Userspace interface for the Linux kernel containment features" url="https://linuxcontainers.org/lxc/" arch="all" @@ -34,8 +34,10 @@ subpackages=" $pkgname-download:_download:noarch $pkgname-templates-oci:templates_oci:noarch $pkgname-templates::noarch + $pkgname-user-nic:_user_nic " source="https://linuxcontainers.org/downloads/lxc/lxc-$_pkgver.tar.gz + lxc-top-cgroupv2.patch lxc.initd lxc.confd " @@ -110,7 +112,7 @@ _py3() { _download() { pkgdesc="LXC container image downloader template" - depends="$pkgname gpg gnupg-dirmngr tar wget" + depends="$pkgname gpg gnupg-dirmngr tar wget xz" amove $_tmpldir/lxc-download } @@ -166,8 +168,15 @@ bridge() { EOF } +_user_nic() { + pkgdesc="suid helper to manage LXC network interfaces as unprivileged user" + + amove usr/libexec/lxc/lxc-user-nic +} + sha512sums=" acff2fc70cf2c65af37b70a21239482c3d845c408f7132558b54980e4400c23670c63178a3a3dfb239f047f529004df93cd829d728852a8c8647ce6babf7857f lxc-6.0.0.tar.gz +e7b7a443a71804f21e6225bed98310ccf2cad1a5bc2b9ad397e7d79fcfab6216e10ce02e249fbc0e6df2cfbe13e03320d9690db502027ae008a6f48218b81d17 lxc-top-cgroupv2.patch db71783366277a68a5c8116604cf845da4780fe4aebdb5820ae2c4fe028cfe52a9c94246db362476f2f195be6a9c2b835edbe521423f116fc66eb50023d6daab lxc.initd 91de43db5369a9e10102933514d674e9c875218a1ff2910dd882e5b9c308f9e430deacb13d1d7e0b2ed1ef682d0bb035aa6f8a6738f54fa2ca3a05acce04e467 lxc.confd " diff --git a/main/lxc/lxc-top-cgroupv2.patch b/main/lxc/lxc-top-cgroupv2.patch new file mode 100644 index 00000000000..a88b8546bd0 --- /dev/null +++ b/main/lxc/lxc-top-cgroupv2.patch @@ -0,0 +1,118 @@ +From ba823cc3cd2ea8b7eef714c317a212a9d7b5afe0 Mon Sep 17 00:00:00 2001 +From: Anoop Rachakonda <anooprac@utexas.edu> +Date: Wed, 1 May 2024 13:56:30 -0500 +Subject: [PATCH] stats_get: Changed paths to be aligned with cgroup2 + specifications + +Closes #4376 + +Signed-off-by: Devon Schwartz <devon.s.schwartz@utexas.edu> +--- + src/lxc/tools/lxc_top.c | 64 ++++++++++++++++++++++++++++++++--------- + 1 file changed, 51 insertions(+), 13 deletions(-) + +diff --git a/src/lxc/tools/lxc_top.c b/src/lxc/tools/lxc_top.c +index aa6e7209e3..f27025f730 100644 +--- a/src/lxc/tools/lxc_top.c ++++ b/src/lxc/tools/lxc_top.c +@@ -276,27 +276,33 @@ static uint64_t stat_match_get_int(struct lxc_container *c, const char *item, + Total 149327872 + */ + static void stat_get_blk_stats(struct lxc_container *c, const char *item, +- struct blkio_stats *stats) { ++ struct blkio_stats *stats, bool *success) { + char buf[4096]; + int i, len; + char **lines, **cols; ++ *success = true; + + len = c->get_cgroup_item(c, item, buf, sizeof(buf)); + if (len <= 0 || (size_t)len >= sizeof(buf)) { + fprintf(stderr, "Unable to read cgroup item %s\n", item); ++ *success = false; + return; + } + + lines = lxc_string_split_and_trim(buf, '\n'); +- if (!lines) ++ if (!lines) { ++ *success = false; + return; ++ } + + memset(stats, 0, sizeof(struct blkio_stats)); + + for (i = 0; lines[i]; i++) { + cols = lxc_string_split_and_trim(lines[i], ' '); +- if (!cols) ++ if (!cols) { ++ *success = false; + goto out; ++ } + + if (strncmp(cols[1], "Read", strlen(cols[1])) == 0) + stats->read += strtoull(cols[2], NULL, 0); +@@ -314,21 +320,53 @@ static void stat_get_blk_stats(struct lxc_container *c, const char *item, + return; + } + ++static void try_cgroup2(struct lxc_container *c, u_int64_t *stat, const char* path_cgroup1, const char* path_cgroup2, ++ const char* match, bool call_match) { ++ ++ int ret_cgroup2; ++ ++ if (call_match) { ++ ret_cgroup2 = stat_match_get_int(c, path_cgroup2, match, 1); ++ if (ret_cgroup2 < 0) { ++ *stat = stat_match_get_int(c, path_cgroup1, match, 1); ++ } ++ ++ } else { ++ ret_cgroup2 = stat_get_int(c, path_cgroup2); ++ ++ if (ret_cgroup2 < 0) { ++ *stat = stat_get_int(c, path_cgroup1); ++ } else { ++ *stat = ret_cgroup2; ++ } ++ } ++} ++ ++ + static void stats_get(struct lxc_container *c, struct container_stats *ct, struct stats *total) + { + ct->c = c; +- ct->stats->mem_used = stat_get_int(c, "memory.usage_in_bytes"); +- ct->stats->mem_limit = stat_get_int(c, "memory.limit_in_bytes"); +- ct->stats->memsw_used = stat_get_int(c, "memory.memsw.usage_in_bytes"); +- ct->stats->memsw_limit = stat_get_int(c, "memory.memsw.limit_in_bytes"); ++ ++ // handle stat_get_int cases ++ try_cgroup2(c, &(ct->stats->mem_used), "memory.usage_in_bytes", "memory.current", NULL, false); ++ try_cgroup2(c, &(ct->stats->mem_limit), "memory.limit_in_bytes", "memory.max", NULL, false); ++ try_cgroup2(c, &(ct->stats->memsw_used), "memory.memsw.usage_in_bytes", "memory.swap.current", NULL, false); ++ try_cgroup2(c, &(ct->stats->memsw_limit), "memory.memsw.limit_in_bytes", "memory.swap.max", NULL, false); ++ try_cgroup2(c, &(ct->stats->cpu_use_nanos), "cpuacct.usage", "cpu.stat", NULL, false); ++ try_cgroup2(c, &(ct->stats->cpu_use_user), "cpuacct.stat", "cpu.stat", "user", true); ++ try_cgroup2(c, &(ct->stats->cpu_use_sys), "cpuacct.stat", "cpu.stat", "system", true); ++ ++ // singular cgroup2 case for get blk stats ++ bool success; ++ stat_get_blk_stats(c, "io.stat", &ct->stats->io_service_bytes, &success); ++ if (!success) { ++ stat_get_blk_stats(c, "blkio.throttle.io_service_bytes", &ct->stats->io_service_bytes, &success); ++ } ++ ++ // paths only exist in cgroup1 + ct->stats->kmem_used = stat_get_int(c, "memory.kmem.usage_in_bytes"); + ct->stats->kmem_limit = stat_get_int(c, "memory.kmem.limit_in_bytes"); +- ct->stats->cpu_use_nanos = stat_get_int(c, "cpuacct.usage"); +- ct->stats->cpu_use_user = stat_match_get_int(c, "cpuacct.stat", "user", 1); +- ct->stats->cpu_use_sys = stat_match_get_int(c, "cpuacct.stat", "system", 1); +- +- stat_get_blk_stats(c, "blkio.throttle.io_service_bytes", &ct->stats->io_service_bytes); +- stat_get_blk_stats(c, "blkio.throttle.io_serviced", &ct->stats->io_serviced); ++ stat_get_blk_stats(c, "blkio.throttle.io_serviced", &ct->stats->io_serviced, &success); + + if (total) { + total->mem_used = total->mem_used + ct->stats->mem_used; diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD index 190e84787a9..f1e7afd46ed 100644 --- a/main/man-pages/APKBUILD +++ b/main/man-pages/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=man-pages -pkgver=6.06 +pkgver=6.7 pkgrel=0 pkgdesc="Linux man pages" url="https://www.kernel.org/doc/man-pages/" arch="noarch" license="GPL-2.0-or-later" +makedepends="coreutils" # need gnu install source="https://cdn.kernel.org/pub/linux/docs/man-pages/man-pages-$pkgver.tar.xz gnumakefile-shell.patch - no-install-T.patch " # just manpages options="!check" @@ -48,7 +48,6 @@ package() { } sha512sums=" -c50b5a47cff5172e46752b61af4dd9f54ee0be88ab69bcc5914bd8ce5ddfaf7358143bea9f69bd6a45f0420eb5eb4596c2200109b23fe98a5221dd01e4a8ea15 man-pages-6.06.tar.xz -1a11f3c6d15198e1eae7cc81c62fcecffce7a0a3690c1d00c312b749f4556b824dd8b87a96910da2936ecb94cefb52be8e957edaa38a201823629d66113c4b7d gnumakefile-shell.patch -ee68e51fc13f058410b95236ae7cc7217531af39e15f6ca6ff5595efa1a7d10e1ef17da1499114e5e03e77268bb9ba0fb6732bf53958c4de744c43baed435005 no-install-T.patch +6706bf1fcb1f60b2281c0ee1cf00edad3d883d75a14b861f9e6bba03cc56fac81cb3176ffce546ca043dc3f19e89fb6e9cec724e7bb1bb5ede19ea701cee15a2 man-pages-6.7.tar.xz +a2c889288d5ebad8277fbdceea9b91d9eb1e522c8b1c2a0d35d0aaf83db89e03d5b45a156d6d5671f721ec68b86bea4fc5b830267295b2fef17c59cdefe6f156 gnumakefile-shell.patch " diff --git a/main/man-pages/gnumakefile-shell.patch b/main/man-pages/gnumakefile-shell.patch index 7825028e47a..e0c2ed74aa9 100644 --- a/main/man-pages/gnumakefile-shell.patch +++ b/main/man-pages/gnumakefile-shell.patch @@ -1,12 +1,12 @@ ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -21,8 +21,8 @@ - ######################################################################## +--- a/GNUmakefile 2024-05-03 13:21:43.669859309 +0000 ++++ b/GNUmakefile 2024-05-03 13:26:15.463773574 +0000 +@@ -3,8 +3,8 @@ --SHELL := /usr/bin/env --.SHELLFLAGS := -S bash -Eeuo pipefail -c -+SHELL := /bin/sh + BASH := bash +-SHELL := /usr/bin/env +-.SHELLFLAGS := -S '$(BASH) -Eeuo pipefail -c' ++SHELL := /bin/sh +.SHELLFLAGS := -Eeuo pipefail -c diff --git a/main/man-pages/no-install-T.patch b/main/man-pages/no-install-T.patch deleted file mode 100644 index 4f41192eeed..00000000000 --- a/main/man-pages/no-install-T.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/share/mk/dist.mk -+++ b/share/mk/dist.mk -@@ -49,7 +49,7 @@ - <$< \ - $(SED) "/^.TH/s/(date)/$$(git log --format=%cs -1 -- $< $(HIDE_ERR))/" \ - | $(SED) '/^.TH/s/(unreleased)/$(DISTVERSION)/' \ -- | $(INSTALL_DATA) -T /dev/stdin $@ -+ | $(INSTALL_DATA) /dev/stdin $@ - - $(_DISTOTHERS): $(_DISTDIR)/%: $(srcdir)/% $(MK) | $$(@D)/ - $(info CP $@) ---- a/share/mk/install/html.mk -+++ b/share/mk/install/html.mk -@@ -23,7 +23,7 @@ - - $(_htmlpages): $(_htmldir)/%: $(_HTMLDIR)/% $(MK) | $$(@D)/ - $(info INSTALL $@) -- $(INSTALL_DATA) -T $< $@ -+ $(INSTALL_DATA) $< $@ - - - .PHONY: install-html ---- a/share/mk/install/man.mk -+++ b/share/mk/install/man.mk -@@ -63,7 +63,7 @@ - <$< \ - $(SED) $(foreach s, $(MANSECTIONS), \ - -e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \ -- | $(INSTALL_DATA) -T /dev/stdin $@ -+ | $(INSTALL_DATA) /dev/stdin $@ - ifeq ($(LINK_PAGES),symlink) - if $(GREP) '^\.so ' <$@ >/dev/null; then \ - $(GREP) '^\.so ' <$@ \ diff --git a/main/memcached/APKBUILD b/main/memcached/APKBUILD index 0cad10ec0ce..639b219f40c 100644 --- a/main/memcached/APKBUILD +++ b/main/memcached/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jeff Bilyk <jbilyk@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=memcached -pkgver=1.6.26 +pkgver=1.6.27 pkgrel=0 pkgdesc="Distributed memory object caching system" url="https://memcached.org/" @@ -46,7 +46,7 @@ package() { } sha512sums=" -7bd0d0dc0d228cde2fc3841c8973a2dde86bd50a4819f9737a22e12435f61d7459655029da390b63b8e6c3ca555b92a9c4c125a7c0bef5e6b051216414f1d49e memcached-1.6.26.tar.gz +d9de26887339d456e1cace60bf5b2cc2a78231a52ec6f6f36ed7d3ad373eaf231419601be46e80963a3a0254638d03198141647f81fa530b85dbdc4a6071c4cd memcached-1.6.27.tar.gz 31bd788433b8021ed332f86d291e7f03222ae234520e52ba673b581d5da2adf5656e8f73e8b985df73258dea9b2a1b8ef36195163fe47a92fda59825deedfed4 memcached.confd 11566ce544c3feedbbcca7f87cf21c9d7f7e47c8a0ebdbc0e833ac18a858211c5b00d4128457f957401f6f20453f0cbe902570488133a503c79ee01c102a7c18 memcached.initd 5b1ea6b0be30ca82b914532f698eea9c05eded06b45385b0fc565ee1c241836df36d421e0b86f8fe15876519d5d2e9661e30f8af0d1485b71be3f0896aedf9dd fix-bsd-headers.patch diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index e50ba0de6a0..784b66993df 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa -pkgver=24.0.4 -pkgrel=1 +pkgver=24.0.7 +pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="https://www.mesa3d.org" arch="all" @@ -370,7 +370,7 @@ _vulkan_layers() { } sha512sums=" -1d05b07026417fbe9cf18f7b18f2db9fe5fe327555c590283d87f69bbdd51f64135928a1dbe155d750187fc268bbdbb070bc1ae9ffc3e013b8707b391969d515 mesa-24.0.4.tar.xz +77b0fae80ab0a07e2e528c113eadef0e3004b8df3e6e98fffe6fc2d8ac39f5ce7fa38ebe5c2ae32bfbac993dd7cbe288ace18ebb03cf2fb445fe7114f74dd45c mesa-24.0.7.tar.xz 450e9c61a62487e2cc83e03a05521d40a48294118b1af9d56220fb546c50fedd61f1f005b85c5e956e23eb2397f696fe1bbf9626253c99233278ca406b75543b enable-mali-t600.patch e3d39d61b14188cd5a22e19e8c065650995f85943e6c42ec5775db5b76a9ebe8913253a8b9ac32056ac13a2c357cd951f867ecb39976c52f7d014dcc1a2d87dc no-unlink-megadrivers.patch " diff --git a/main/meson/APKBUILD b/main/meson/APKBUILD index edf26203867..a8be48f1585 100644 --- a/main/meson/APKBUILD +++ b/main/meson/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=meson pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Fast and user friendly build system" url="https://mesonbuild.com" arch="noarch" diff --git a/main/mlmmj/APKBUILD b/main/mlmmj/APKBUILD index 2c794cf2456..f244929f2f5 100644 --- a/main/mlmmj/APKBUILD +++ b/main/mlmmj/APKBUILD @@ -13,6 +13,11 @@ pkggroups="mlmmj" source="https://codeberg.org/mlmmj/mlmmj/releases/download/RELEASE_${pkgver//./_}/mlmmj-$pkgver.tar.gz" options="!check" +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/main/mosquitto/APKBUILD b/main/mosquitto/APKBUILD index 19db78a36db..177b787c8b2 100644 --- a/main/mosquitto/APKBUILD +++ b/main/mosquitto/APKBUILD @@ -12,14 +12,15 @@ install="$pkgname.pre-install" options="!check" # FIXME: some of the tests are flaky makedepends="openssl-dev>3 c-ares-dev util-linux-dev libxslt" checkdepends="python3 cunit-dev" -subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs++:_pp $pkgname-openrc +subpackages="$pkgname-dev $pkgname-doc $pkgname-libs++:_pp $pkgname-openrc $pkgname-libs $pkgname-clients" source="https://mosquitto.org/files/source/mosquitto-$pkgver.tar.gz mosquitto.initd mosquitto.confd " -if [ -z "$BOOTSTRAP" ]; then +if [ -z "$BOOTSTRAP" ] && [ -z "$APORTS_BOOTSTRAP" ]; then + subpackages="$pkgname-dbg $subpackages" makedepends="$makedepends libwebsockets-dev cjson-dev" _websockets=yes _cjson=yes diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD index ef4b14d2640..93533f8253c 100644 --- a/main/nagios/APKBUILD +++ b/main/nagios/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> pkgname=nagios -pkgver=4.4.13 -pkgrel=1 +pkgver=4.5.2 +pkgrel=0 pkgdesc="Popular monitoring tool" url="https://www.nagios.org/" arch="all" @@ -73,7 +73,7 @@ apache() { } sha512sums=" -43808bf2f9460d2d0fcac6aea8492cf7abc18a527c671e3a8e776ee3563bb91be1f5f384cfc3943157a355596ce4e1516e3ebc54d51c30479054180b01dfe3e8 nagios-4.4.13.tar.gz +a44a54e564a21e974f242491c3cd34a6d7f1f9363e1750d6e2cd5d3b48da181c4dd02e23efb966c1da70f0ef3cdb15308dc9e93bd43c8feef9eb49ca3b87ef96 nagios-4.5.2.tar.gz 8575902dcb7252f195847f9997b424c1ef9bee7dfacdd124c922fc119f583923c34847ce77c505783662d91f7290b1a85dc5e382ac50d177406bfb3876d4e40a nagios.confd a004ed1cf8e7d9faeb849cd714095dbe5157c707618d2cce92c98c78604b896bb806b55aa69b2db8ca3e954bd629f9e3db5d2676015f87d6be5da32fa9ec5664 nagios.initd 6f1448db1964e378dbc7460a6d321638f4d0f7a08bc078824edca12fb6653fb0200b3be365fa519e7b2ff566802701878975bb97e65d65dc54d3da34dae21588 lighttpd-nagios.conf diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD index a1f03b6425f..5124c1bf936 100644 --- a/main/nano/APKBUILD +++ b/main/nano/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=nano -pkgver=7.2 -pkgrel=1 +pkgver=8.0 +pkgrel=0 pkgdesc="Enhanced clone of the Pico text editor" url="https://www.nano-editor.org" arch="all" @@ -11,11 +11,6 @@ makedepends="linux-headers ncurses-dev" subpackages="$pkgname-doc $pkgname-syntax::noarch" source="https://www.nano-editor.org/dist/v${pkgver%%.*}/nano-$pkgver.tar.xz" -prepare() { - default_prepare - update_config_sub -} - build() { ./configure \ --build=$CBUILD \ @@ -49,9 +44,9 @@ syntax() { pkgdesc="Syntax highlighting definitions for $pkgname" depends="$pkgname=$pkgver-r$pkgrel" - amove usr/share/nano/* + amove usr/share/nano } sha512sums=" -a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583 nano-7.2.tar.xz +86c484428b8805768fd580d0f62aa32ce8f588f4beedcdd35a4014506b562928c7a2fa6487aa0d853b4c9c1639a4d186f46b4e96721568ff81191d5098403ca8 nano-8.0.tar.xz " diff --git a/main/nasm/APKBUILD b/main/nasm/APKBUILD index ae308df17b4..76e624be879 100644 --- a/main/nasm/APKBUILD +++ b/main/nasm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=nasm -pkgver=2.16.02 +pkgver=2.16.03 pkgrel=0 pkgdesc="80x86 assembler designed for portability and modularity" url="https://www.nasm.us" @@ -28,5 +28,5 @@ package() { } sha512sums=" -9ccafb4cd9064fb21f6551309d35ba7461de8da138b1239d76c2ea0c070a1a767f1019d5d705088375d625cfb73eebbfd9dfa3588107793b95354d89dcfd22c3 nasm-2.16.02.tar.xz +0c706e41a9c33e1ac3bad5056e8bf8cbcd51785b551a6e34ce7d0d723df8eaab8603a033e89b3dcda1004b558f9e9ef3196691500f10d8201bf47a323a516f84 nasm-2.16.03.tar.xz " diff --git a/main/ncdu/APKBUILD b/main/ncdu/APKBUILD index 92b05072723..7bd22bcc2d4 100644 --- a/main/ncdu/APKBUILD +++ b/main/ncdu/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=ncdu -pkgver=1.19 -pkgrel=1 +pkgver=1.20 +pkgrel=0 pkgdesc="Text-based disk usage viewer" url="https://dev.yorhel.nl/ncdu" options="!check" # no test suite @@ -27,5 +27,5 @@ package() { } sha512sums=" -2bbfe2bab101f92674e13bef5260a39b32c127a310ae59c045f3684aaa8dab6f767c0162dc8f868d8adfaa17d597d0b3d2c134fe97bbaf205da0f8272e96c5d6 ncdu-1.19.tar.gz +af9a45cc27bb3cdee7fd65236b9b48cb604f9e54208a762ed7b3b18333e07e87a8ae5a4cd0071496e7e382c60a7760734cad1f68fb69423a79fa3f050d2c09bb ncdu-1.20.tar.gz " diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD index 9b7f82a85ba..03fddb7d5bd 100644 --- a/main/ncurses/APKBUILD +++ b/main/ncurses/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ncurses -pkgver=6.4_p20240330 +pkgver=6.4_p20240420 _pkgver=${pkgver/_p/-} pkgrel=0 pkgdesc="Console display library" @@ -207,6 +207,6 @@ base() { } sha512sums=" -d2f293d8a65a9b21db8d5b3a68eb5acbedf485239f02bdd29d20aa3fd2bee0f1e2c1181168a7e79425a007816b7ebac78ad6a62f5bef278a30aacca8f59e4cca ncurses-6.4-20240330.tgz +1cd453045778fc6eaaff867bc2b1fbec5be61f4a9e65eb6ac90bffcdc712f40f5d7726c488d413119c6b547be528d75a16bd5cda66065e128273ca909ebd15da ncurses-6.4-20240420.tgz 201ef1876655101cedabc83a0ce46f75079b08f565ca8de4cf96fd69e41332a2d0597b77fe360dc58b10772586fa39bd52ac9ee670a912fef84840278356065a cleanup-pkgconfig-ldflags.patch " diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD index d6240bc1499..90ad95716a0 100644 --- a/main/nginx/APKBUILD +++ b/main/nginx/APKBUILD @@ -36,11 +36,11 @@ pkgname=nginx # NOTE: Upgrade only to even-numbered versions (e.g. 1.14.z, 1.16.z)! # Odd-numbered versions are mainline (development) versions. -pkgver=1.24.0 -pkgrel=18 +pkgver=1.26.0 +pkgrel=0 # Revision of nginx-tests to use for check(). _tests_hgrev=22f45bf99a9e -_njs_ver=0.8.3 +_njs_ver=0.8.4 # if this isn't set higher than testing/openresty that comes first for some reason # even though this has a higher version.. provider_priority=100 @@ -84,8 +84,8 @@ pkggroups="$_grp_ngx $_grp_www" install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade" subpackages="$pkgname-debug $pkgname-doc $pkgname-openrc $pkgname-vim::noarch" source="https://nginx.org/download/nginx-$pkgver.tar.gz - CVE-2023-44487.patch $pkgname-tests-$_tests_hgrev.tar.gz::https://hg.nginx.org/nginx-tests/archive/$_tests_hgrev.tar.gz + nginx-tests~fix-openssl-3.2.0-compatibility.patch $pkgname-njs-$_njs_ver.tar.gz::https://hg.nginx.org/njs/archive/$_njs_ver.tar.gz nginx-dav-ext-module~pr-56.patch::https://github.com/arut/nginx-dav-ext-module/pull/56.patch nginx-dav-ext-module~pr-62.patch::https://github.com/arut/nginx-dav-ext-module/commit/bbf93f75ca58657fb0f8376b0898f854f13cef91.patch @@ -118,7 +118,7 @@ _modules_dir="usr/lib/$pkgname/modules" _stream_js_depends="$pkgname-mod-stream" case "$CARCH" in - ppc64le|riscv64) _has_luajit=false;; + ppc64le|riscv64|loongarch64) _has_luajit=false;; *) _has_luajit=true; makedepends="$makedepends luajit-dev";; esac @@ -178,7 +178,7 @@ _add_module "http-accounting" "v2.0" "https://github.com/Lax/traffic-accounting- _add_module "http-array-var" "v0.06" "https://github.com/openresty/array-var-nginx-module" _http_array_var_depends="$pkgname-mod-devel-kit" -_add_module "http-auth-jwt" "0.6.0" "https://github.com/kjdev/nginx-auth-jwt" +_add_module "http-auth-jwt" "0.7.0" "https://github.com/kjdev/nginx-auth-jwt" _http_auth_jwt_desc="Nginx third-party module kjdev/nginx-auth-jwt (version $_http_auth_jwt_ver)" _add_module "http-brotli" "v1.0.0rc" "https://github.com/google/ngx_brotli" @@ -205,7 +205,9 @@ _stream_geoip2_depends="$pkgname-mod-stream" _add_module "http-headers-more" "v0.37" "https://github.com/openresty/headers-more-nginx-module" _http_headers_more_so="ngx_http_headers_more_filter_module.so" -_add_module "http-keyval" "0.2.0" "https://github.com/kjdev/nginx-keyval" +_add_module "http-keyval" "0.3.0" "https://github.com/kjdev/nginx-keyval" +_add_module "stream-keyval" "0.3.0" "https://github.com/kjdev/nginx-keyval" +_stream_keyval_depends="$pkgname-mod-stream" _add_module "http-log-zmq" "v1.0.0" "https://github.com/danifbento/nginx-log-zmq" @@ -495,10 +497,10 @@ getvar() { } sha512sums=" -1114e37de5664a8109c99cfb2faa1f42ff8ac63c932bcf3780d645e5ed32c0b2ac446f80305b4465994c8f9430604968e176ae464fd80f632d1cb2c8f6007ff3 nginx-1.24.0.tar.gz -18b69643648119dfab45101bb9404be667aeb9d550aa3bc9706e63e7da1c2806106e9a6bbfb2d10bd57ef56b9b5b0b524059353ec30a51469b44641cb7dbd8a6 CVE-2023-44487.patch +1f604a4a29f1b74eb56de7f1d8b0e5610fa055280b4ad2d3550c56926460de24da81b17485cffb358d8814061d4a9db1e0e5079af7921f1dc329e283e2775791 nginx-1.26.0.tar.gz d882d7f79814bd5caf323099aef318a5f4c75c2eb81f13bbd9688fd5404f5a2e4dc653dbc23121f77cc5ccf59742f80fb34db38b8788030c54b376eb9a2065ff nginx-tests-22f45bf99a9e.tar.gz -1cec9a322c40aa2b4ec6eb5bea78d7442880b0cff3a41ad171a3dc3157a6990baec6c8b9eda99ee02a9e51c0b933f13ef17431079a5ff409aaf84b912c7f4df7 nginx-njs-0.8.3.tar.gz +ba3512c78007b666b38abd5fd84537c9f3c98816e168022e70f4eca90a55c2c9f5425384b5e1d8ebbb646006810cf9c38d2eda4cabe2ea4cba50f7059c1dbc43 nginx-tests~fix-openssl-3.2.0-compatibility.patch +f2e897d82c1e1ecccd310032f0166ec907e61f3d0756c2231d1f042b25e356effcce5d59bbcfdc3f8d51c30639675987a44f363370dfc7215342f1a498de1169 nginx-njs-0.8.4.tar.gz 4c7a94aaebbb69599b0067e74f9f3db54ec383ca9499292fec5b875bb0b5859aa11dc14cef5664c94dd54aba231f31e85feacddc49f7622aa4d0fdb38709b6e1 nginx-dav-ext-module~pr-56.patch fdd66e433126e194a3ef22737993191a04fcc4c8caa044b27cb22bea0e7f16c8fdbc900553507d2bb541cdb82b542845a297db2a48c2460a38dd772d0ebfca9d nginx-dav-ext-module~pr-62.patch c89fab6d3d4226e37f2a8d2122d825046fc9a787e464fc75351a19fbda5b47016ddb907e0a61241a007304af921e11a0715895ba7b6d4c1112afe816177ed02a no-werror.patch @@ -527,7 +529,7 @@ ee10a5687740dde0c3d18d8b3555f49fcdc6abfc0a3bc2de1de3be0e99951a346fe8027d916aab73 a255e3a4a9b902b3e15140dc88bbbb152b0a9cdc64604152de41e1b254e81aa2a1e2c95c06cb4905c1520886acf9070031d63913b53fe98b034f8adad2bccf61 ngx_devel_kit-0.3.3.tar.gz 0df34c3765e18dc5cc5a053d3a17dbee17a686a1f6e76ad057c262741c4e4465c66bcef86e627a19258f836cad5f14745bf046fd396b00960ad79ed20c2a07bb traffic-accounting-nginx-module-2.0.tar.gz bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26 array-var-nginx-module-0.06.tar.gz -56fe87b7b456856c167b47e5dfc579ac77f15487785dd8411397f6041561b991218518218b4adf3054392fdf1569469a4eff288706f320cf8d2c45b066ef780b nginx-auth-jwt-0.6.0.tar.gz +abc07a43eb87e73f71e5760d3772363cafd79a04cdbb537766ae87e1363ff390cdc262e3c2f7da3f145ca294b27fdf7ec5d0563e61957bb60d5a720a6fd67f85 nginx-auth-jwt-0.7.0.tar.gz 05a880d5e48ac83be84498ed41fb4750211b827a9d7541acfd6ef494e5205a6e853d5594bfec3ab4ae668ea3f803e4f4b0ba550c76811971c8e266e42663c56d ngx_brotli-1.0.0rc.tar.gz aebc9b19a3e7dda3b57e6bd6d86a5ab66d25e05cf5c6c99c71234c789700eb9da8e29529b8b2abf3d775ff3c2610e695fc88e647738769f0d3730bcafc3be38b ngx_cache_purge-2.5.3.tar.gz 352cc3d033cc67ee34209f958dac13ada2147de429f4dd3da301c865d52970d80c8aa3c193f7fb28cf4854b88baff07b6efc3bae1fb813fe53d5956a87dfc81a nginx_cookie_flag_module-1.1.0.tar.gz @@ -537,7 +539,7 @@ c325ac4e3f3f735739e156d8c7ada503b34475c62533b4830231ff1b42c25cb0c841aae06b3448b5 c208cdf3e245527d7b313f9ef1f5d36ca26e3bdafe67df56492a13b7726587538665e5d9fd50f295fc933f218dc33394f2fe442713d15631701dbfc4a156799b ngx-fancyindex-0.5.2.tar.gz 18dea21e5ae2647bea1fc448058a1b773c936917245edef8d861d5e23ed92e9a3b1ec4ef43ffb2ece7b5899d787910adcf4fbd39f84d7e8d7c54759e2fee5b72 ngx_http_geoip2_module-3.4.tar.gz 0cc2fffe506194d439e3669644d41b7943e2c3cffa3483eb70b92067930b358d506a14646eff8362b191a11c624db29f6b53d830876929dcb4ce1c9d7b2bc40d headers-more-nginx-module-0.37.tar.gz -45b8f107a492f415f5053b9b95d3dad481d5736c603b87c1342541214e89b9acbe37925f93acc396782406232e607879b52f9bb480f9021c10d405b832298022 nginx-keyval-0.2.0.tar.gz +8c0f9265231132295f187d60073d84cc4529da99e3cec2bcf8c04c9d716d7854c5fd11e991e7e088ad316ad642c25108f51bb92bd6b0a37c8de53a5cc25d12f0 nginx-keyval-0.3.0.tar.gz 015a358d987476bb61302fbbe1cb105f5314edc1a8b7ee6310aae697f755c79fcb1834ff561fced054c8cd5624f5387fcc1de729731ccd70662f2eb72bcdc174 nginx-log-zmq-1.0.0.tar.gz 9abf00844ef00ce1dc5ff08d6fe4ddccf843f2ad2de6fd450854b38a66b45add71e814205dba9b19225b9165e67eb93578e83e5fe37af4e0c891e61e6a6bfb3d lua-nginx-module-0.10.26.tar.gz 72887c4490854b099cb26bb3f840073a36b0d812bde4486f04dc1be182ca74f0d1e3fd709e77c240c2dcf37665f74cf04e188ea9efe8e127c6789b27b487d0cd lua-upstream-nginx-module-0.07.tar.gz diff --git a/main/nginx/CVE-2023-44487.patch b/main/nginx/CVE-2023-44487.patch deleted file mode 100644 index b9fcfbf7d6c..00000000000 --- a/main/nginx/CVE-2023-44487.patch +++ /dev/null @@ -1,71 +0,0 @@ - -# HG changeset patch -# User Maxim Dounin <mdounin@mdounin.ru> -# Date 1696940019 -10800 -# Node ID cdda286c0f1b4b10f30d4eb6a63fefb9b8708ecc -# Parent 3db945fda515014d220151046d02f3960bcfca0a -HTTP/2: per-iteration stream handling limit. - -To ensure that attempts to flood servers with many streams are detected -early, a limit of no more than 2 * max_concurrent_streams new streams per one -event loop iteration was introduced. This limit is applied even if -max_concurrent_streams is not yet reached - for example, if corresponding -streams are handled synchronously or reset. - -Further, refused streams are now limited to maximum of max_concurrent_streams -and 100, similarly to priority_limit initial value, providing some tolerance -to clients trying to open several streams at the connection start, yet -low tolerance to flooding attempts. - -diff -r 3db945fda515 -r cdda286c0f1b src/http/v2/ngx_http_v2.c ---- a/src/http/v2/ngx_http_v2.c Fri Sep 22 19:23:57 2023 +0400 -+++ b/src/http/v2/ngx_http_v2.c Tue Oct 10 15:13:39 2023 +0300 -@@ -347,6 +347,7 @@ - ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 read handler"); - - h2c->blocked = 1; -+ h2c->new_streams = 0; - - if (c->close) { - c->close = 0; -@@ -1284,6 +1285,14 @@ - goto rst_stream; - } - -+ if (h2c->new_streams++ >= 2 * h2scf->concurrent_streams) { -+ ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, -+ "client sent too many streams at once"); -+ -+ status = NGX_HTTP_V2_REFUSED_STREAM; -+ goto rst_stream; -+ } -+ - if (!h2c->settings_ack - && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG) - && h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW) -@@ -1349,6 +1358,12 @@ - - rst_stream: - -+ if (h2c->refused_streams++ > ngx_max(h2scf->concurrent_streams, 100)) { -+ ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, -+ "client sent too many refused streams"); -+ return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_NO_ERROR); -+ } -+ - if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status) != NGX_OK) { - return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR); - } -diff -r 3db945fda515 -r cdda286c0f1b src/http/v2/ngx_http_v2.h ---- a/src/http/v2/ngx_http_v2.h Fri Sep 22 19:23:57 2023 +0400 -+++ b/src/http/v2/ngx_http_v2.h Tue Oct 10 15:13:39 2023 +0300 -@@ -131,6 +131,8 @@ - ngx_uint_t processing; - ngx_uint_t frames; - ngx_uint_t idle; -+ ngx_uint_t new_streams; -+ ngx_uint_t refused_streams; - ngx_uint_t priority_limit; - - size_t send_window; - diff --git a/main/nginx/nginx-tests~fix-openssl-3.2.0-compatibility.patch b/main/nginx/nginx-tests~fix-openssl-3.2.0-compatibility.patch new file mode 100644 index 00000000000..495a8f496cd --- /dev/null +++ b/main/nginx/nginx-tests~fix-openssl-3.2.0-compatibility.patch @@ -0,0 +1,113 @@ +Patch-Source: https://github.com/nginx/nginx-tests/commit/953461781bc0cd780bb5c4b3a3d727d7842e8d2e +-- +From 953461781bc0cd780bb5c4b3a3d727d7842e8d2e Mon Sep 17 00:00:00 2001 +From: Maxim Dounin <mdounin@mdounin.ru> +Date: Mon, 29 Jan 2024 00:34:16 +0300 +Subject: [PATCH] Tests: compatibility with "openssl" app from OpenSSL 3.2.0. + +OpenSSL 3.2.0's "openssl" app generates X.509v3 certificates unless explicitly +asked not to. Such certificates, even self-signed ones, cannot be used to sign +other certificates without CA:TRUE explicitly set in the basicConstraints +extension. As a result, tests doing so are now failing. + +Fix is to provide basicConstraints with CA:TRUE for self-signed root +certificates used in "openssl ca" calls. +--- + ssl.t | 3 +++ + ssl_certificate_chain.t | 3 +++ + ssl_crl.t | 3 +++ + ssl_ocsp.t | 3 +++ + ssl_stapling.t | 3 +++ + ssl_verify_depth.t | 3 +++ + 6 files changed, 18 insertions(+) + +diff --git a/ssl.t b/ssl.t +index 13d3daef..6055e083 100644 +--- a/ssl.t ++++ b/ssl.t +@@ -116,7 +116,10 @@ $t->write_file('openssl.conf', <<EOF); + default_bits = 2048 + encrypt_key = no + distinguished_name = req_distinguished_name ++x509_extensions = myca_extensions + [ req_distinguished_name ] ++[ myca_extensions ] ++basicConstraints = critical,CA:TRUE + EOF + + my $d = $t->testdir(); +diff --git a/ssl_certificate_chain.t b/ssl_certificate_chain.t +index 0fce9378..764933f1 100644 +--- a/ssl_certificate_chain.t ++++ b/ssl_certificate_chain.t +@@ -71,7 +71,10 @@ $t->write_file('openssl.conf', <<EOF); + default_bits = 2048 + encrypt_key = no + distinguished_name = req_distinguished_name ++x509_extensions = myca_extensions + [ req_distinguished_name ] ++[ myca_extensions ] ++basicConstraints = critical,CA:TRUE + EOF + + $t->write_file('ca.conf', <<EOF); +diff --git a/ssl_crl.t b/ssl_crl.t +index 8dad2d70..caaeec58 100644 +--- a/ssl_crl.t ++++ b/ssl_crl.t +@@ -79,7 +79,10 @@ $t->write_file('openssl.conf', <<EOF); + default_bits = 2048 + encrypt_key = no + distinguished_name = req_distinguished_name ++x509_extensions = myca_extensions + [ req_distinguished_name ] ++[ myca_extensions ] ++basicConstraints = critical,CA:TRUE + EOF + + $t->write_file('ca.conf', <<EOF); +diff --git a/ssl_ocsp.t b/ssl_ocsp.t +index 3bc9af40..db88fbec 100644 +--- a/ssl_ocsp.t ++++ b/ssl_ocsp.t +@@ -116,7 +116,10 @@ $t->write_file('openssl.conf', <<EOF); + default_bits = 2048 + encrypt_key = no + distinguished_name = req_distinguished_name ++x509_extensions = myca_extensions + [ req_distinguished_name ] ++[ myca_extensions ] ++basicConstraints = critical,CA:TRUE + EOF + + $t->write_file('ca.conf', <<EOF); +diff --git a/ssl_stapling.t b/ssl_stapling.t +index 575c167c..bcb36309 100644 +--- a/ssl_stapling.t ++++ b/ssl_stapling.t +@@ -125,7 +125,10 @@ $t->write_file('openssl.conf', <<EOF); + default_bits = 2048 + encrypt_key = no + distinguished_name = req_distinguished_name ++x509_extensions = myca_extensions + [ req_distinguished_name ] ++[ myca_extensions ] ++basicConstraints = critical,CA:TRUE + EOF + + $t->write_file('ca.conf', <<EOF); +diff --git a/ssl_verify_depth.t b/ssl_verify_depth.t +index 7f2f37b2..89c6668e 100644 +--- a/ssl_verify_depth.t ++++ b/ssl_verify_depth.t +@@ -76,7 +76,10 @@ $t->write_file('openssl.conf', <<EOF); + default_bits = 2048 + encrypt_key = no + distinguished_name = req_distinguished_name ++x509_extensions = myca_extensions + [ req_distinguished_name ] ++[ myca_extensions ] ++basicConstraints = critical,CA:TRUE + EOF + + $t->write_file('ca.conf', <<EOF); diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD index 6f08fbdcd05..88858f1b10d 100644 --- a/main/ngircd/APKBUILD +++ b/main/ngircd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ngircd -pkgver=26.1 -pkgrel=4 +pkgver=27 +pkgrel=0 pkgdesc="Next Generation IRC Daemon" url="https://ngircd.barton.de/" arch="all" @@ -38,5 +38,7 @@ package() { install -Dm755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } -sha512sums="6333244e3fb2dc00ee9812c8c45990baa95ff473a7037a0a11ca495bed86fa438110ad5151d86b9274b6187d86b7b5712fdca2b74b8cb92f7f66fa10cf1961ee ngircd-26.1.tar.xz -50339507917c956a38451394a8a5996337ff29948944ff6aa40ed39f6dd3d6bfdfb864d60a24199c0a86a01e18a71f213efa6cfb2857a320f31b9fcfb92c6ac1 ngircd.initd" +sha512sums=" +d653e0f430bc27485780c9492038622a850be9b910993d625cec4045f0d9973e448a39949c576450598e2cd923b377304ba987a6330f3fcdc42978e8a30334b8 ngircd-27.tar.xz +50339507917c956a38451394a8a5996337ff29948944ff6aa40ed39f6dd3d6bfdfb864d60a24199c0a86a01e18a71f213efa6cfb2857a320f31b9fcfb92c6ac1 ngircd.initd +" diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD index fc8934710ea..a6d9c16b6f6 100644 --- a/main/nmap/APKBUILD +++ b/main/nmap/APKBUILD @@ -1,16 +1,18 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=nmap -pkgver=7.94 +pkgver=7.95 pkgrel=0 pkgdesc="network exploration tool and security/port scanner" url="https://nmap.org" arch="all" license="custom" makedepends=" + autoconf + automake libpcap-dev libssh2-dev linux-headers - lua5.3-dev + lua5.4-dev openssl-dev pcre-dev zlib-dev @@ -50,7 +52,7 @@ build() { --with-libpcre=yes \ --with-libz=yes \ --with-libssh2=yes \ - --with-liblua=/usr/lua5.3 + --with-liblua=/usr/lua5.4 make } @@ -85,6 +87,6 @@ nping() { } sha512sums=" -a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c nmap-7.94.tar.bz2 +fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e nmap-7.95.tar.bz2 2d1f6e290723ac643f456a0e1ac95c4c966106cf2ab743839d25c835bf0141dc2d6bfee19285c3518d4c5f553b0505dabe5a496b769ba47b7adb03e791f05b8d fortify-source.patch " diff --git a/main/nodejs/APKBUILD b/main/nodejs/APKBUILD index a03f4bc7567..d163530c6e6 100644 --- a/main/nodejs/APKBUILD +++ b/main/nodejs/APKBUILD @@ -117,7 +117,7 @@ pkgname=nodejs # Note: Update only to even-numbered versions (e.g. 6.y.z, 8.y.z)! # Odd-numbered versions are supported only for 9 months by upstream. -pkgver=20.12.1 +pkgver=20.12.2 pkgrel=0 pkgdesc="JavaScript runtime built on V8 engine - LTS version" url="https://nodejs.org/" @@ -270,7 +270,7 @@ dev() { } sha512sums=" -24a858477f087383b9a531247ecd5622810b8a1af3a3baf3c4f3e608cceacb90642230ddb0f2d9043c19e87459da45ea5d6f3ffe0874948b2be90be53f39cc8c node-v20.12.1.tar.gz +25d35c0be251e557ba8b3115b75f38aa20000e2abcabcfd40143528c64d4db8a1eba338847f90be539e4918e62fb52840ff0ae9a8f5224f03335fc28d575cb36 node-v20.12.2.tar.gz 8c264eefc0bfa9dd57656f9f515e940d5c21b8d836dc549031ee559ba909643f4f2495b8b392ee9976c5eed7c3b4a09db876bbe0f7fcd5b2bf63fafca37bffc2 disable-running-gyp-on-shared-deps.patch 4fc09500212ebc178801e7419c840ccebc239ff06edcb28910315e39bfc772a3967f5ff2abff03845269e730643be161134ac95bab899069fa57dd64be98defa system-ada.patch 94db1f150cb962bf19f42e0ef7cec2c0e007d1909611d03a393095720cc8db58322e638ea3c3280b4412f47615963c88e69c71b4c5adf84292b9fc7f3be3b110 system-base64.patch diff --git a/main/nss/APKBUILD b/main/nss/APKBUILD index d26d36a891a..869507717d1 100644 --- a/main/nss/APKBUILD +++ b/main/nss/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=nss -pkgver=3.99 +pkgver=3.100 pkgrel=0 pkgdesc="Mozilla Network Security Services" url="https://developer.mozilla.org/docs/Mozilla/Projects/NSS" @@ -155,7 +155,7 @@ tools() { } sha512sums=" -8ae032f3cb8eadfe524505d20e430b90ed25af2b4732b2cf286c435b0fcd5701d2f5c48bd2cfb3f9aa0bfdf503c1f3d5394cf34f860f51a1141cc4a7586bba32 nss-3.99.tar.gz +725c10ffc02fc17347a213b42fabad789aec2c6352fe803b4ad166695ab59495849e9a69684578eb274faf818ec2277f2d433167cdd27997dcf8d8e94dd4df34 nss-3.100.tar.gz fba19cc35986dde6e5994ce67ab29fb4417814e12d6ae82c406600832eb8db79a0fdea4fd5eb6c5e77d565bfebb9e154e190796f67c06097ddae1539084243bb gyp-config.patch 20046e6adf3d1cfcd8ddf2b92fe3f79678d569c653d26126dde6a967ab6c90a798b9a6bb6351f82d49dbd751d0637c5e46aa98dbe7342c8cd604c7e3dc8ce48a no-werror.patch 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in diff --git a/main/numactl/APKBUILD b/main/numactl/APKBUILD index 519dff89e2b..983256f4bf9 100644 --- a/main/numactl/APKBUILD +++ b/main/numactl/APKBUILD @@ -27,7 +27,17 @@ build() { } check() { - make check VERBOSE=1 TESTS='test/distance test/nodemap test/tbitmap' + local tests="test/nodemap test/tbitmap" + + # riscv64 builder: "FAIL test/distance (exit status: 139)" + case "$CARCH" in + riscv64) ;; + *) + tests="test/distance $tests" + ;; + esac + + make check VERBOSE=1 TESTS="$tests" } package() { diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index f52cda686ce..ce0902cd985 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -4,7 +4,7 @@ pkgname=openssl pkgver=3.3.0 _abiver=${pkgver%.*.*} -pkgrel=0 +pkgrel=1 pkgdesc="Toolkit for Transport Layer Security (TLS)" url="https://www.openssl.org/" arch="all" @@ -217,6 +217,7 @@ _libcrypto() { _libssl() { pkgdesc="SSL shared libraries" + depends="libcrypto$_abiver=$pkgver-r$pkgrel" mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib for i in "$pkgdir"/usr/lib/libssl*; do diff --git a/main/opus/APKBUILD b/main/opus/APKBUILD index 185a5fa0f42..493a91b9a62 100644 --- a/main/opus/APKBUILD +++ b/main/opus/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=opus -pkgver=1.4 +pkgver=1.5.2 pkgrel=0 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet" url="https://www.opus-codec.org/" @@ -9,8 +9,9 @@ arch="all" license="BSD-3-Clause" makedepends="meson" subpackages="$pkgname-dev $pkgname-doc" -source="https://github.com/xiph/opus/releases/download/v$pkgver/opus-$pkgver.tar.gz +source="https://downloads.xiph.org/releases/opus/opus-$pkgver.tar.gz arm32.patch + fix-test.patch " case "$CARCH" in @@ -37,7 +38,7 @@ build() { } check() { - meson test -t10 --no-rebuild --print-errorlogs -C output + meson test -t10 --no-rebuild --print-errorlogs -C output } package() { @@ -46,6 +47,7 @@ package() { } sha512sums=" -1ecd39e0add24de12823bf7c936bb67441228721e2cdae0edbfcf3cee0894bcc6edf2a1d0ca5cdfdad1565803bf39cc4c985ad32710c2a9582f850adeb5ca631 opus-1.4.tar.gz +78d963cd56d5504611f111e2b3606e236189a3585d65fae1ecdbec9bf4545632b1956f11824328279a2d1ea2ecf441ebc11e455fb598d20a458df15185e95da4 opus-1.5.2.tar.gz 4218a3bc31efb91aa6b9cb2ac5928e63c34fd3b5aac61c68fa13b5a5fee00f902a1a03c61735d0610b0ded8f5b5e789494ea24165383bd4501d6a16e422e8eb6 arm32.patch +093650e1593c6d653a7037f199ea04f37e75c5783777112d26df9d689a548211a706ab6964b67edfe0818a0d02de2cebf734e222432bdbc13a91cb15a97e47a3 fix-test.patch " diff --git a/main/opus/fix-test.patch b/main/opus/fix-test.patch new file mode 100644 index 00000000000..63f4d0fcc05 --- /dev/null +++ b/main/opus/fix-test.patch @@ -0,0 +1,11 @@ +diff --git a/tests/meson.build b/tests/meson.build +index 1a4040b..263c779 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -1,6 +1,5 @@ + # Tests that link to libopus + opus_tests = [ +- ['test_opus_api'], + ['test_opus_decode', [], 120], + ['test_opus_encode', 'opus_encode_regressions.c', 240], + ['test_opus_extensions', [], 120], diff --git a/main/ortp/APKBUILD b/main/ortp/APKBUILD index 91cebdde00e..c715003cc90 100644 --- a/main/ortp/APKBUILD +++ b/main/ortp/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=ortp pkgver=5.3.38 -pkgrel=0 +pkgrel=1 pkgdesc="oRTP is a library implemeting Real-time Transport Protocol (RFC3550), licensed under LGPL" -url="https://www.linphone.org/technical-corner/ortp" +url="https://gitlab.linphone.org/BC/public/ortp" arch="all" options="!check" #no test avail license="LGPL-2.0-or-later" diff --git a/main/parallel/APKBUILD b/main/parallel/APKBUILD index 8c980f0cd4a..41c754dc4af 100644 --- a/main/parallel/APKBUILD +++ b/main/parallel/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> pkgname=parallel -pkgver=20240322 +pkgver=20240422 pkgrel=0 pkgdesc="Shell tool for executing jobs in parallel" arch="noarch" @@ -28,5 +28,5 @@ package() { } sha512sums=" -5eefc4dd8c320b3607eabc14924317340d74bbc56e4b0ede8cf7091380b433e6c8b2dac61711921516591396997b3e18a7737e0a06724ed7190cf3a8b37258af parallel-20240322.tar.bz2 +11bac45820feed573799bf77a2d25a4046f3fe18af54cb82ce183ee4551504c044dc07155e1b1a89950a2d2d2093604dcc1574b5aeb7823a10ebe64f7ffc459b parallel-20240422.tar.bz2 " diff --git a/main/pciutils/APKBUILD b/main/pciutils/APKBUILD index b8724ec1e89..ff72dca500d 100644 --- a/main/pciutils/APKBUILD +++ b/main/pciutils/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=pciutils pkgver=3.12.0 -pkgrel=0 +pkgrel=1 pkgdesc="PCI bus configuration space access library and tools" url="http://mj.ucw.cz/pciutils.html" arch="all" @@ -12,6 +12,7 @@ makedepends="linux-headers" options="!check" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" source="$pkgname-$pkgver.tar.gz::https://github.com/pciutils/pciutils/archive/refs/tags/v$pkgver.tar.gz + basename.patch " build() { @@ -38,4 +39,5 @@ package() { sha512sums=" 2157cda808acd685b985bd8b8e63bd868a042c6316859bb5bfd08f6de52172570dd6780fb3390a5abbf3b4c16d7e4bec05b4034caeee28b5a11cb3a8efc299ce pciutils-3.12.0.tar.gz +ea6f080f5266b4e55bf7e5dc8eb48fb2d700e794bc0d46042459c1b3e398365dafa356ba4fcf11e9140a687c146acab8bb7fd0763b5e328a64a13560e8a5447e basename.patch " diff --git a/main/pciutils/basename.patch b/main/pciutils/basename.patch new file mode 100644 index 00000000000..4e157328e95 --- /dev/null +++ b/main/pciutils/basename.patch @@ -0,0 +1,13 @@ +See https://gitlab.alpinelinux.org/alpine/aports/-/issues/16106 + +diff -upr pciutils-3.12.0.orig/lib/sysfs.c pciutils-3.12.0/lib/sysfs.c +--- pciutils-3.12.0.orig/lib/sysfs.c 2024-05-12 12:49:17.273816524 +0200 ++++ pciutils-3.12.0/lib/sysfs.c 2024-05-12 12:49:31.743853491 +0200 +@@ -14,6 +14,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <libgen.h> + #include <stdarg.h> + #include <unistd.h> + #include <errno.h> diff --git a/main/pcre2/APKBUILD b/main/pcre2/APKBUILD index bb65c1d6801..8bab8de8d1a 100644 --- a/main/pcre2/APKBUILD +++ b/main/pcre2/APKBUILD @@ -28,6 +28,14 @@ source="https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$pkgver/pcr # - CVE-2022-1586 # - CVE-2022-1587 +case "$CARCH" in + loongarch64) _enable_jit="";; + *) _enable_jit="--enable-jit";; +esac + +# _enable_jit="" cause some failures on loongarch64. +[ "$CARCH" = "loongarch64" ] && options="$options !check" + build() { # Note: Forced -O3 is recommended (needed?) for Julia. ./configure \ @@ -41,7 +49,7 @@ build() { --enable-pcre2-32 \ --enable-pcre2grep-libz \ --enable-pcre2test-libedit \ - --enable-jit + $_enable_jit make } diff --git a/main/perl-cgi-fast/APKBUILD b/main/perl-cgi-fast/APKBUILD index 7dc476e500c..ea0a75e945d 100644 --- a/main/perl-cgi-fast/APKBUILD +++ b/main/perl-cgi-fast/APKBUILD @@ -1,11 +1,12 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> -# Maintainer: Valery Kartel <valery.kartel@gmail.com> +# Contributor: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-cgi-fast +pkgver=2.17 +pkgrel=1 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=CGI-Fast -pkgver=2.17 -pkgrel=0 pkgdesc="CGI Interface for Fast CGI" url="https://metacpan.org/release/CGI-Fast/" arch="noarch" @@ -17,7 +18,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -28,7 +32,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/main/perl-compress-raw-bzip2/APKBUILD b/main/perl-compress-raw-bzip2/APKBUILD index 699ea8511d9..52633270c06 100644 --- a/main/perl-compress-raw-bzip2/APKBUILD +++ b/main/perl-compress-raw-bzip2/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=perl-compress-raw-bzip2 -pkgver=2.211 +pkgver=2.212 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Compress-Raw-Bzip2 @@ -37,5 +37,5 @@ package() { } sha512sums=" -d3eb1245c07b0c7834a76229fa0b46a6b444bb3bd46a901184a2105f234b5d080f64fe79dfe3fc97dedb2e60235db794cefef0f81adb248c03f9cf11a7c596d1 Compress-Raw-Bzip2-2.211.tar.gz +9e1e747d73ce0916fd108c6d1467fb262d42aa16f06f8429f21d46b30b87be754926b6a059fcd0fd9bf5f49fe0c78f56897e5f13725e6abf90267144eb2465c7 Compress-Raw-Bzip2-2.212.tar.gz " diff --git a/main/perl-compress-raw-zlib/APKBUILD b/main/perl-compress-raw-zlib/APKBUILD index 48895f8a021..12fc9e4279b 100644 --- a/main/perl-compress-raw-zlib/APKBUILD +++ b/main/perl-compress-raw-zlib/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=perl-compress-raw-zlib -pkgver=2.211 +pkgver=2.212 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Compress-Raw-Zlib @@ -37,5 +37,5 @@ package() { } sha512sums=" -463ddfec976dd20fa66172f39818521565736c65ef7abfabf3d53475e7baf87452644a06dd1051437a36820a00f874fc710d5ff7f8cea139cf06d324c34bb6da Compress-Raw-Zlib-2.211.tar.gz +75f3c7eafed7c4a3df4e8609e2e291e390663ccbd3166b860dfeb1025f5007b7a8f568face9dff2bbb4b3eab4234cbb0806f90a0c132c7d738f520d98d033a67 Compress-Raw-Zlib-2.212.tar.gz " diff --git a/main/perl-datetime-locale/APKBUILD b/main/perl-datetime-locale/APKBUILD index f41eea101de..65745e1114b 100644 --- a/main/perl-datetime-locale/APKBUILD +++ b/main/perl-datetime-locale/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-datetime-locale -pkgver=1.41 +pkgver=1.42 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=DateTime-Locale @@ -45,5 +45,5 @@ package() { } sha512sums=" -a5dae9887485cf778c7e5e9a3f14dd46e04d7d8cee27127870225ec4a3743f3b08f5116a62cd2426a18b63a6f48439557267c27a4370c447f54fecb83e4cbb3d DateTime-Locale-1.41.tar.gz +12b29d3b8f4511217125efc0607f382960941759ceb9a102e3934dced2b58eb1b509c0b7b1dcbe49638586e67cc537ec065e7f2280bd3f983c28919f8bcc0ca0 DateTime-Locale-1.42.tar.gz " diff --git a/main/perl-dbix-searchbuilder/APKBUILD b/main/perl-dbix-searchbuilder/APKBUILD index 045db2ec22c..6ee92bea761 100644 --- a/main/perl-dbix-searchbuilder/APKBUILD +++ b/main/perl-dbix-searchbuilder/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=perl-dbix-searchbuilder +pkgver=1.82 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=DBIx-SearchBuilder -pkgver=1.81 -pkgrel=0 pkgdesc="Encapsulate SQL queries and rows in simple perl objects" url="https://metacpan.org/release/DBIx-SearchBuilder/" arch="noarch" @@ -27,7 +27,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -38,9 +41,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -611dc2868255ff84ff94eff3083886c76d4aee00e3d4b92cd4cb1f0db35e3ef7b5c5a2be8a86aa28c5d7b9f6cc4af86496c8d44e074fb6092aaa1f69464a342a DBIx-SearchBuilder-1.81.tar.gz +795a43e7d037a7b50aac925144096c61157d98c8f896b2e78cc61f3839f6201469fca668c62456dd9c9ed8a1054382500abf264d36ac552b3fbc398a977dfa74 DBIx-SearchBuilder-1.82.tar.gz " diff --git a/main/perl-encode-hanextra/APKBUILD b/main/perl-encode-hanextra/APKBUILD index b0abf7199c9..b92d52aa1db 100644 --- a/main/perl-encode-hanextra/APKBUILD +++ b/main/perl-encode-hanextra/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-encode-hanextra +pkgver=0.23 +pkgrel=12 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Encode-HanExtra -pkgver=0.23 -pkgrel=11 pkgdesc="Extra sets of Chinese encodings" url="https://metacpan.org/release/Encode-HanExtra/" arch="all" @@ -13,12 +13,17 @@ license="MIT" depends="perl" makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/A/AU/AUDREYT/Encode-HanExtra-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/A/AU/AUDREYT/Encode-HanExtra-$pkgver.tar.gz + reproducible-hash-order.patch + " builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -29,9 +34,9 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" 218083b9b3b4517cfc714169479cba0689a3586d9abb24bcc79d3401d37dd9412cb4e878b6aad06676d5c4f0e03cc69dcaf2e5f48036e2da6f336508c381e462 Encode-HanExtra-0.23.tar.gz +2f89d85cc882509f4ee68e98d05fb073ba1f2143ed22c3a049946e4aa3f3847afc9bd8e26853ec6f091465d744f0070700cd7adf069e065184bf4903e9668914 reproducible-hash-order.patch " diff --git a/main/perl-encode-hanextra/reproducible-hash-order.patch b/main/perl-encode-hanextra/reproducible-hash-order.patch new file mode 100644 index 00000000000..e86cfd39651 --- /dev/null +++ b/main/perl-encode-hanextra/reproducible-hash-order.patch @@ -0,0 +1,74 @@ +Patch-Source: https://sources.debian.org/data/main/libe/libencode-hanextra-perl/0.23-6/debian/patches/0001-Make-the-build-reproducible-by-sorting-hash-keys-in-.patch +-- +From ffaee9c0e01aa0e66a8284948eb98efe4420549f Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Thu, 4 Jun 2015 20:35:36 +0300 +Subject: [PATCH] Make the build reproducible by sorting hash keys in + Makefile.PL + +Bug-Debian: https://bugs.debian.org/787754 +Bug: https://rt.cpan.org/Public/Bug/Display.html?id=104964 + +--- + Makefile.PL | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 9e6cf51..28b8489 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -79,7 +79,7 @@ sub post_initialize { + my $x = $self->{'OBJ_EXT'}; + + # Add the table O_FILES +- foreach my $e (keys %tables) { ++ foreach my $e (sort keys %tables) { + $o{ $e . $x } = 1; + } + $o{"$name$x"} = 1; +@@ -93,7 +93,7 @@ sub post_initialize { + + # $self->{'H'} = [$self->catfile($self->updir,'encode.h')]; + my %xs; +- foreach my $table (keys %tables) { ++ foreach my $table (sort keys %tables) { + push(@{ $self->{'C'} }, "$table.c"); + + # Do NOT add $table.h etc. to H_FILES unless we own up as to how they +@@ -112,7 +112,7 @@ sub post_initialize { + #define U8 U8 + #include "encode.h" + END +- foreach my $table (keys %tables) { ++ foreach my $table (sort keys %tables) { + print XS qq[#include "${table}.h"\n]; + } + print XS <<"END"; +@@ -141,7 +141,7 @@ PROTOTYPES: DISABLE + BOOT: + { + END +- foreach my $table (keys %tables) { ++ foreach my $table (sort keys %tables) { + print XS qq[#include "${table}.exh"\n]; + } + print XS "}\n"; +@@ -155,13 +155,13 @@ sub postamble { + my $str = + "# $name\$(OBJ_EXT) depends on .h and .exh files not .c files - but all written by enc2xs\n"; + $str .= "$name.c : $name.xs "; +- foreach my $table (keys %tables) { ++ foreach my $table (sort keys %tables) { + $str .= " $table.c"; + } + $str .= "\n\n"; + $str .= "$name\$(OBJ_EXT) : $name.c\n\n"; + +- foreach my $table (keys %tables) { ++ foreach my $table (sort keys %tables) { + my $numlines = 1; + my $lengthsofar = length($str); + my $continuator = ''; +-- +2.1.4 + diff --git a/main/perl-extutils-config/APKBUILD b/main/perl-extutils-config/APKBUILD index 29a0aa11867..c9d5b0df4ed 100644 --- a/main/perl-extutils-config/APKBUILD +++ b/main/perl-extutils-config/APKBUILD @@ -1,24 +1,26 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-extutils-config +pkgver=0.009 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=ExtUtils-Config -pkgver=0.008 -pkgrel=4 pkgdesc="A wrapper for perl's configuration" url="https://metacpan.org/release/ExtUtils-Config/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl" -makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-Config-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -29,9 +31,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -7775e2212b4605e60559c7e63604b8f2b4c56f4846e64f9f4454f3f5d0a7a21f618143e6c61eafabf5d9ee9bca8f722c04aedeaf9c51f59924de68c272b86db2 ExtUtils-Config-0.008.tar.gz +7f3d054f31b08a9179dbad47204f9223607d8af84e4dfa1e9250981dd271b753576e571e2071d94408340376f13d3d766278d23407b7c754dbc493b7df30e2cd ExtUtils-Config-0.009.tar.gz " diff --git a/main/perl-extutils-installpaths/APKBUILD b/main/perl-extutils-installpaths/APKBUILD index 5670321c478..3e8bd829142 100644 --- a/main/perl-extutils-installpaths/APKBUILD +++ b/main/perl-extutils-installpaths/APKBUILD @@ -1,24 +1,26 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-extutils-installpaths +pkgver=0.013 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=ExtUtils-InstallPaths -pkgver=0.012 -pkgrel=4 pkgdesc="Build.PL install path logic made easy" url="https://metacpan.org/release/ExtUtils-InstallPaths/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl perl-extutils-config" -makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -29,9 +31,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -92a4e9ebb387d330ae67b0716b96b27165d08503d2915d8301b3a6aa185f962940e761d21fd400033e6a814e276918e0662da3740ca2852a53cf0fe54f3d7660 ExtUtils-InstallPaths-0.012.tar.gz +bda9181724a2facb8057f872c23ba09b0f90e0af9a37797de050bc2768cb78e7d2d8116d7a75b250156c6d14c5668bc168128c960ef853ed2c6a1e1020dcbc93 ExtUtils-InstallPaths-0.013.tar.gz " diff --git a/main/perl-gd/APKBUILD b/main/perl-gd/APKBUILD index 246e383e6ee..356f5f404bd 100644 --- a/main/perl-gd/APKBUILD +++ b/main/perl-gd/APKBUILD @@ -1,18 +1,26 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-gd +pkgver=2.81 +pkgrel=1 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=GD -pkgver=2.78 -pkgrel=0 -pkgdesc="Perl interface to the gd2 graphics library" +pkgdesc="Perl interface to the libgd graphics library" url="https://metacpan.org/release/GD/" arch="all" -license="GPL-1.0-or-later OR Artistic-1.0-Perl" +license="GPL-1.0-or-later OR Artistic-2.0" depends="perl" -makedepends="perl-dev perl-extutils-pkgconfig gd-dev libjpeg-turbo-dev zlib-dev - libpng-dev freetype-dev libwebp-dev" +makedepends=" + perl-dev + perl-extutils-pkgconfig + freetype-dev + gd-dev + libjpeg-turbo-dev + libpng-dev + libwebp-dev + zlib-dev + " checkdepends="perl-test-fork perl-test-nowarnings" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/GD-$pkgver.tar.gz" @@ -20,7 +28,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -31,9 +42,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -ef3df42c003f105fd1c313ea9e8b8b1e75912b4fdb274e73f2e4f5664a0adb8479a2e62fae5a493e37c36865f9dc37207d2d31e96316eb18a3c5384e07858591 GD-2.78.tar.gz +5a921b30dfb644f2acdb8ea0d287973a4e41a702326e5d2b20e8d9b2e7b6c4b5fde94bb72dd470f89f2587a94daf9f62c31de65b55c6e4155b9149d8971ffda7 GD-2.81.tar.gz " diff --git a/main/perl-gdgraph/APKBUILD b/main/perl-gdgraph/APKBUILD index 24c91442131..5bb58c3ee99 100644 --- a/main/perl-gdgraph/APKBUILD +++ b/main/perl-gdgraph/APKBUILD @@ -1,17 +1,16 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-gdgraph +pkgver=1.56 +pkgrel=2 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=GDGraph -pkgver=1.56 -pkgrel=1 -pkgdesc="Produces charts with GD" +pkgdesc="Generate charts with GD" url="https://metacpan.org/release/GDGraph/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" -depends="perl perl-gdtextutil perl-gd" -makedepends="perl-dev" +depends="perl perl-gd perl-gdtextutil" checkdepends="perl-capture-tiny perl-test-exception" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/B/BP/BPS/GDGraph-$pkgver.tar.gz" @@ -19,7 +18,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -30,7 +32,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/main/perl-gdtextutil/APKBUILD b/main/perl-gdtextutil/APKBUILD index ae3d89d9f60..fa0dc15a19b 100644 --- a/main/perl-gdtextutil/APKBUILD +++ b/main/perl-gdtextutil/APKBUILD @@ -1,24 +1,26 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-gdtextutil +pkgver=0.86 +pkgrel=5 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=GDTextUtil -pkgver=0.86 -pkgrel=4 -pkgdesc="Perl module for GDTextUtil" +pkgdesc="Text utilities for GD" url="https://metacpan.org/release/GDTextUtil/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl perl-gd" -makedepends="perl-dev" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/M/MV/MVERB/GDTextUtil-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -29,7 +31,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/main/perl-mail-imapclient/APKBUILD b/main/perl-mail-imapclient/APKBUILD index e02676a81f5..746d48a2865 100644 --- a/main/perl-mail-imapclient/APKBUILD +++ b/main/perl-mail-imapclient/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-mail-imapclient +pkgver=3.43 +pkgrel=2 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Mail-IMAPClient -pkgver=3.43 -pkgrel=1 pkgdesc="IMAP4 client library" url="https://metacpan.org/release/Mail-IMAPClient/" arch="noarch" @@ -17,7 +17,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -28,7 +31,15 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="9e2346238d68ea62c0ad2e5c03ae9a36face8238dbccbbc083bcefd41d82a7f75887e3245c792e4bd2a5999ce66fabdc4e861118904e96cf2781e1ca549a1b09 Mail-IMAPClient-3.43.tar.gz" +doc() { + local file; find "$pkgdir" -name "*.pod" | while read -r file; do + amove "${file#"$pkgdir"}" + done + default_doc +} + +sha512sums=" +9e2346238d68ea62c0ad2e5c03ae9a36face8238dbccbbc083bcefd41d82a7f75887e3245c792e4bd2a5999ce66fabdc4e861118904e96cf2781e1ca549a1b09 Mail-IMAPClient-3.43.tar.gz +" diff --git a/main/perl-mime-tools/APKBUILD b/main/perl-mime-tools/APKBUILD index 3b14de02f45..4741eae3be4 100644 --- a/main/perl-mime-tools/APKBUILD +++ b/main/perl-mime-tools/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=perl-mime-tools -pkgver=5.514 +pkgver=5.515 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=MIME-tools @@ -35,5 +35,5 @@ package() { } sha512sums=" -1f80d436305bada1ed46104ba25a1bbd877cf358294c0e4101d7018ba5eb7f208debf62125b66378a0b8b9103a4e488165881c1b2bc6fa2964b6986a66c36b27 MIME-tools-5.514.tar.gz +3a9bbc1b58762170bfb3ccdc2d5fda006fcfdb5eca6092555011819e9fd0b68f1b0a178c86dc7e95a2e6f8d89d6988b1c26823d06ca201859ddc87f9e37981db MIME-tools-5.515.tar.gz " diff --git a/main/perl-net-dns/APKBUILD b/main/perl-net-dns/APKBUILD index b009bc524d9..40e65a730ec 100644 --- a/main/perl-net-dns/APKBUILD +++ b/main/perl-net-dns/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=perl-net-dns -pkgver=1.44 +pkgver=1.45 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Net-DNS @@ -41,5 +41,5 @@ doc() { } sha512sums=" -9de622a58d658799f8b3b636408d4e64ce8e4db7623f6e28809e12fb86802c8995e39ee3e0753e13ce8fdc8119fc6a449abc8fd768e72adca205d51fdb774bbe Net-DNS-1.44.tar.gz +38308bebc30949aa1b25c2a16292c3f25803235399a989647b0f4dd26fefba2fc2a4b18bbd0e50cf6d6e160bc6243a1435bdc53bdbc82f177d672e6d46fd274f Net-DNS-1.45.tar.gz " diff --git a/main/perl-net-smtp-tls-butmaintained/APKBUILD b/main/perl-net-smtp-tls-butmaintained/APKBUILD index fb72ba91a2f..8c9efa7c1a1 100644 --- a/main/perl-net-smtp-tls-butmaintained/APKBUILD +++ b/main/perl-net-smtp-tls-butmaintained/APKBUILD @@ -1,24 +1,26 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-net-smtp-tls-butmaintained +pkgver=0.24 +pkgrel=5 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Net-SMTP-TLS-ButMaintained -pkgver=0.24 -pkgrel=4 -pkgdesc="An SMTP client supporting TLS and AUTH (DEPRECATED, use Net::SMTPS instead)" +pkgdesc="SMTP client supporting TLS and AUTH" url="https://metacpan.org/release/Net-SMTP-TLS-ButMaintained/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" -depends="perl perl-net-ssleay perl-io-socket-ssl perl-digest-hmac" -makedepends="perl-dev" +depends="perl perl-digest-hmac perl-io-socket-ssl perl-net-ssleay" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -29,7 +31,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/main/perl-path-tiny/APKBUILD b/main/perl-path-tiny/APKBUILD index b24a68a3a41..2a0a8fa68fb 100644 --- a/main/perl-path-tiny/APKBUILD +++ b/main/perl-path-tiny/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=perl-path-tiny +pkgver=0.146 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Path-Tiny -pkgver=0.144 -pkgrel=1 pkgdesc="File path utility" url="https://metacpan.org/release/Path-Tiny/" arch="noarch" @@ -18,7 +18,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -29,9 +32,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -a6360ff3c81dac6026a7610b4934a415db04060a7792e37d38eec6f7b46970eeb42840da25fc0b4eab21eaa7b5f011c6d92ba5382dcea49e57e4fc693c4620d5 Path-Tiny-0.144.tar.gz +8939e7a42a2539db98825f2755399fb5eb38aac9e6ad17ec71d51edad99ddb4d5d891ef0119b57a79e4fa84c43faedff2a05c705a1e6d731f77d49798d6dc94e Path-Tiny-0.146.tar.gz " diff --git a/main/perl-super/APKBUILD b/main/perl-super/APKBUILD index 21b30732d59..84ca233f879 100644 --- a/main/perl-super/APKBUILD +++ b/main/perl-super/APKBUILD @@ -1,37 +1,36 @@ +# Automatically generated by apkbuild-cpan, template 4 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=perl-super -_pkgreal=SUPER pkgver=1.20190531 -pkgrel=2 +pkgrel=3 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=SUPER pkgdesc="Control superclass method dispatch" -url="https://metacpan.org/pod/SUPER" +url="https://metacpan.org/release/SUPER/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" -depends="perl" -makedepends="perl-dev perl-module-build perl-sub-identify" +depends="perl perl-sub-identify" +makedepends="perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/C/CH/CHROMATIC/SUPER-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - default_prepare - export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl Build.PL INSTALLDIRS=vendor -} - build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make + perl Build.PL \ + --installdirs=vendor \ + --create_packlist=0 + ./Build } check() { - make test + ./Build test } package() { - make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete + ./Build install --destdir="$pkgdir" } -sha512sums="fb1072c76aa9d82edb39ec75f0e14c0fa41837b36b7d2ec24482a20338484cba867646f5e3ceb12ff4f8e1a6f333f5243900c2114d772a29d6c0380feabd3565 SUPER-1.20190531.tar.gz" +sha512sums=" +fb1072c76aa9d82edb39ec75f0e14c0fa41837b36b7d2ec24482a20338484cba867646f5e3ceb12ff4f8e1a6f333f5243900c2114d772a29d6c0380feabd3565 SUPER-1.20190531.tar.gz +" diff --git a/main/perl-test-mockmodule/APKBUILD b/main/perl-test-mockmodule/APKBUILD index be6dc3f49d6..7bc9340433d 100644 --- a/main/perl-test-mockmodule/APKBUILD +++ b/main/perl-test-mockmodule/APKBUILD @@ -1,24 +1,26 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=perl-test-mockmodule +pkgver=0.178.0 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Test-MockModule -pkgver=0.177.0 -pkgrel=1 pkgdesc="Override subroutines in a module for unit testing" url="https://metacpan.org/release/Test-MockModule/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl perl-super" makedepends="perl-module-build" -checkdepends="perl-test-warnings perl-sub-identify" +checkdepends="perl-test-warnings" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/G/GF/GFRANKS/Test-MockModule-v0.177.0.tar.gz" -builddir="$srcdir/$_pkgreal-v0.177.0" +source="https://cpan.metacpan.org/authors/id/G/GF/GFRANKS/Test-MockModule-v$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-v$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - perl Build.PL --installdirs=vendor + perl Build.PL \ + --installdirs=vendor \ + --create_packlist=0 ./Build } @@ -28,9 +30,8 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -d28523202ba4dbf040e26a3cb0795297c2c4fc65598e7717a51ed8678bce308eec7eb3b5d5d35d71418b21c2c81833679cf1624e0e07c6b1e26e8f7605eb98b3 Test-MockModule-v0.177.0.tar.gz +5f3169819475d251cc266fe018d98b8a744d9a030fab40f72334ee17f561f4602d4ca9759a70438cb897195e4757df0103cce30e7241191b13fbba57b6c03700 Test-MockModule-v0.178.0.tar.gz " diff --git a/main/perl-test-simple/APKBUILD b/main/perl-test-simple/APKBUILD index 3ad4148519e..fd9c5cc8f46 100644 --- a/main/perl-test-simple/APKBUILD +++ b/main/perl-test-simple/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=perl-test-simple +pkgver=1.302199 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Test-Simple -pkgver=1.302198 -pkgrel=0 pkgdesc="Basic utilities for writing tests" url="https://metacpan.org/release/Test-Simple/" arch="noarch" @@ -16,7 +16,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -27,12 +30,11 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete # prevent conflict with main/perl rm -rf "$pkgdir"/usr/share/man } sha512sums=" -b59ed1033338219cd6352f825ed3657b6dc8e2cd38ac7ccd062181b2e2076d6ba48a7d559a20f75e68718165874231c2434f3a73b78d645947d129ebf1d8b04e Test-Simple-1.302198.tar.gz +ae3670ed55d75d7b3f2016f94aa2f9577c6bd2f6822c32476a70b343b2357df4c13db8ab98404cd4467a06878d33eaad07d557022a1e1d198a0860a53f2b21a5 Test-Simple-1.302199.tar.gz " diff --git a/main/perl-test2-suite/APKBUILD b/main/perl-test2-suite/APKBUILD index 014e473c96f..6f377760c8c 100644 --- a/main/perl-test2-suite/APKBUILD +++ b/main/perl-test2-suite/APKBUILD @@ -1,12 +1,12 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=perl-test2-suite +pkgver=0.000162 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Test2-Suite -pkgver=0.000159 -pkgrel=0 -pkgdesc="Distribution with a rich set of tools built upon the Test2 framework." +pkgdesc="Distribution with a rich set of tools built upon the Test2 framework" url="https://metacpan.org/release/Test2-Suite/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" @@ -17,7 +17,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -28,9 +31,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -ab132e87f0db5dde0ebd95b260236d95120445c89db497e92519335e989d8571481f2497898cd5fae25cb2065db1aa8902a9f2d37cf2163475caca1298629a3f Test2-Suite-0.000159.tar.gz +d0d9928786d29a55b0f864fd8b1aa6b5b03e47e4b04f551ef1031ceb6b3e6cccfe66fbcedb21828e13df16ee1bb18dc1712a29bba08f0e2d3c6c373c2f6d04e9 Test2-Suite-0.000162.tar.gz " diff --git a/main/perl-xs-parse-keyword/APKBUILD b/main/perl-xs-parse-keyword/APKBUILD index 46a7aa6efb6..c3a4eaf75f1 100644 --- a/main/perl-xs-parse-keyword/APKBUILD +++ b/main/perl-xs-parse-keyword/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=perl-xs-parse-keyword +pkgver=0.42 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=XS-Parse-Keyword -pkgver=0.39 -pkgrel=0 pkgdesc="XS functions to assist in parsing keyword syntax" url="https://metacpan.org/release/XS-Parse-Keyword/" arch="all" @@ -19,7 +19,9 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - perl Build.PL --installdirs=vendor + perl Build.PL \ + --installdirs=vendor \ + --create_packlist=0 ./Build } @@ -29,9 +31,8 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -41ac31707b473d729a7e63d4607caa77fca9da00580b931576361416d78002f56acd04a0fee0c4dd09ffc1796a914f6ae934bdbce8fcc4c9222064c6e419b7ce XS-Parse-Keyword-0.39.tar.gz +f7b95545edad107e8d1dcab2eda02a8f74aa043ce70da407b260ff772b1a6525c106c3947713e331dc869c38ebd9befb09826daff91e893173faee9bf0fae5e3 XS-Parse-Keyword-0.42.tar.gz " diff --git a/main/perl-yaml-libyaml/APKBUILD b/main/perl-yaml-libyaml/APKBUILD index 59727ac686d..31de3cc423f 100644 --- a/main/perl-yaml-libyaml/APKBUILD +++ b/main/perl-yaml-libyaml/APKBUILD @@ -1,10 +1,10 @@ # Automatically generated by apkbuild-cpan, template 4 # Contributor: Timo Teräs <timo.teras@iki.fi> # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Valery Kartel <valery.kartel@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-yaml-libyaml pkgver=0.89 -pkgrel=0 +pkgrel=1 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=YAML-LibYAML pkgdesc="Perl YAML Serialization using XS and libyaml" diff --git a/main/poppler/APKBUILD b/main/poppler/APKBUILD index b39d45cacab..8b7f03d58e3 100644 --- a/main/poppler/APKBUILD +++ b/main/poppler/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=poppler pkgver=24.02.0 -pkgrel=0 +pkgrel=1 pkgdesc="PDF rendering library based on xpdf 3.0" url="https://poppler.freedesktop.org/" arch="all" diff --git a/main/postgresql15/APKBUILD b/main/postgresql15/APKBUILD index ebe3c4b302f..48c180a4fb5 100644 --- a/main/postgresql15/APKBUILD +++ b/main/postgresql15/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> _pkgname=postgresql pkgver=15.6 -pkgrel=1 +pkgrel=2 _majorver=${pkgver%%[_.]*} # Should this aport provide libpq* and libecpg*? true/false # Exactly one postgresql aport must be the default one! @@ -13,7 +13,7 @@ pkgdesc="A sophisticated object-relational DBMS, version $_majorver" url="https://www.postgresql.org/" arch="all !riscv64 !loongarch64" license="PostgreSQL" -_llvmver=14 +_llvmver=16 depends="$pkgname-client postgresql-common tzdata" depends_dev=" libpq-dev @@ -72,6 +72,7 @@ subpackages=" $pkgname-openrc " source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz2 + fix-tests-on-musl.patch initdb.patch perl-rpath.patch per-version-dirs.patch @@ -84,14 +85,15 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz pg_config-add-major-version.patch dont-use-locale-a-on-musl.patch icu-collations-hack.patch + fix-test-check_guc.patch + fix-test-postgres_fdw.patch libpgport-pkglibdir.patch.txt external-libpq.patch.txt pltcl_create_tables.sql " builddir="$srcdir/$_pkgname-$pkgver" -# FIXME: https://gitlab.alpinelinux.org/alpine/aports/-/issues/14359 -options="net !check" +options="net" # secfixes: # 15.6-r0: @@ -202,6 +204,9 @@ _client_cmds=" prepare() { default_prepare + # FIXME: This test is broken, skip it for now. + sed -i '/test_pg_dump/d' src/test/modules/Makefile + if $_default_ver; then cp -rl "$builddir" "$builddir-ifaces" else @@ -273,6 +278,10 @@ check() { _run_tests src/test _run_tests src/pl _run_tests contrib + + if $_default_ver; then + _run_tests src/interfaces/libpq + fi } package() { @@ -542,9 +551,10 @@ _setdiff() { sha512sums=" d9f158d844ec21bc5a7eccad9193dfe026d3df46a011980412ad7d150b3894c01754be0053bed530976047d7eff657204ac321138ba8da6eac8fb7b93b9520ad postgresql-15.6.tar.bz2 +e3b05a2df199440cd558cd729aac9ee53cda6dd675f0ecdecda27d6158cc1b2f3f3fdb2b69657adba93886f4331183ec9f63c71868f34020a5ff82575e0a4202 fix-tests-on-musl.patch 73080f61ae274a214966d2d010de49c8c90eb3180e4f56d86a9e23063eaddbe7f8d2c40ed414591c16bc9cfe88577866af2a965c2b6effb54965d19ef96a3fa9 initdb.patch 27e00b58fe5c3899c66fc0dde51846c14701bcfedd132b106d676783ba603e8cbdc6e620f29b52dc892bdaa9302052788cf5e575a1659f61c017a12e0d2ee4d0 perl-rpath.patch -413e979745f81a5b95b7ad9ea44452217d095e3ee6b4a82b636a7b3c89093fefbe7b8d210e4f6bfdab1d6f81309133719e90b7eab93ba60ef2bb78308c52b3b9 per-version-dirs.patch +6d992f53bf8b3e914933f89bc3f01591de2b707cf809aeee4210f9d59e2dc11e3fce697f50a7660f54925a2f0a6154eaeab0f59a969f76572dac5ff6f08faa71 per-version-dirs.patch d0040599d7646b709af4e3413bf0c228090f256395e806f3fee230ccc6037ed9c0df1cd160d01b6a73b25a742fdd3fb070733a14a78f53d297fbdbbb44f6f878 unix_socket_directories.patch 2e33e1ae38d60e0daf3ed18e6eaa9ddf6762b4b1bb7e51f1d2690e3df9d602aa1a700e603ba3ee69314a75a963131c7dc67c1b1f8b7eb5564e9c4253e81a4db4 disable-html-docs.patch d8eb4274a54b94bed4a2ded7ae775c5a95ca0f051b831b859ccf78bf6d2ea6fe89a9a0611771f6ad85573995a7e3af1fdf5859e20cae3267a52239f12e1b61c3 remove-libecpg_compat.patch @@ -554,6 +564,8 @@ c24986becfd73546a062612335e53b4da34829e42a0c30e85ed7481924f13b1fd0a0e5079d680905 7790e4e4374f7bdc6b4484ba87a5fa709d30d3cbdce61ee7bf9c5dfce40cb51c7bd54ab42f4050fb48eede08ef573624d819128e57cc8c976e01202854740308 pg_config-add-major-version.patch b0688d66fdd7d612c24d9aa69bdd80d30787d2d6409b4524c79b41797144fc743213460e6de9c536bfb72da089f92cf89731f15137b1407fd04ca97fd393bfd2 dont-use-locale-a-on-musl.patch a98e5ecdd421f68f11b55bf07bf60280cf80508f89c5d21a084c7e7aa3be0a22c88b8e2ce611a13dd5c11efdd052eb9018271b549040c30663b9fd9b7c4fc611 icu-collations-hack.patch +b64e75778fcb7a8221cf1a3d81c6a1ade3910e3398f63dd6f9be743b1dd7e392ea626dda8da976f4149f838c18ba536e7c9f9da268ae7e03b78268304d89bafc fix-test-check_guc.patch +1698362340f0b1f18c4ddecef41bcc9ea2998eaab49b285134415544ab13f44a0265def194768fc7180b4b04d4964cdcaf0252184eaa12d8e417193fb5cf7795 fix-test-postgres_fdw.patch cde5fbf5a39e5de18a40ec1d9ac919dcf166e0ca178a6b9dbdfded8d16b4969b91917a2550bbf33eccd1ecb3bd9e0753a47012e60f4efe720bbef2a2c5368529 libpgport-pkglibdir.patch.txt 6078defb3da67e7df96665cc130d32b69eebfcaf49d92eef368ea8eea8bb311fab56064c104bc97f53da9cd925301bef696b506af33e0b66d65bc6cd41ec7499 external-libpq.patch.txt 5c9bfd9e295dcf678298bf0aa974347a7c311d6e7c2aa76a6920fcb751d01fd1ab77abbec11f3c672f927ad9deaa88e04e370c0b5cd1b60087554c474b748731 pltcl_create_tables.sql diff --git a/main/postgresql15/fix-test-check_guc.patch b/main/postgresql15/fix-test-check_guc.patch new file mode 100644 index 00000000000..48502e95978 --- /dev/null +++ b/main/postgresql15/fix-test-check_guc.patch @@ -0,0 +1,13 @@ +--- a/src/test/modules/test_misc/t/003_check_guc.pl ++++ b/src/test/modules/test_misc/t/003_check_guc.pl +@@ -36,6 +36,10 @@ + + # use the sample file from the temp install + my $share_dir = $node->config_data('--sharedir'); ++# XXX-Patched: --sharedir returns /usr/share/... ++if (-d "../../../../tmp_install") { ++ $share_dir = "../../../../tmp_install" . $share_dir ++} + my $sample_file = "$share_dir/postgresql.conf.sample"; + + # List of all the GUCs found in the sample file. diff --git a/main/postgresql15/fix-test-postgres_fdw.patch b/main/postgresql15/fix-test-postgres_fdw.patch new file mode 100644 index 00000000000..7fdd8467e32 --- /dev/null +++ b/main/postgresql15/fix-test-postgres_fdw.patch @@ -0,0 +1,13 @@ +The list of options is different due to linking with a newer libpq library. + +--- a/contrib/postgres_fdw/expected/postgres_fdw.out ++++ b/contrib/postgres_fdw/expected/postgres_fdw.out +@@ -9728,7 +9728,7 @@ + END; + $d$; + ERROR: invalid option "password" +-HINT: Valid options in this context are: service, passfile, channel_binding, connect_timeout, dbname, host, hostaddr, port, options, application_name, keepalives, keepalives_idle, keepalives_interval, keepalives_count, tcp_user_timeout, sslmode, sslcompression, sslcert, sslkey, sslrootcert, sslcrl, sslcrldir, sslsni, requirepeer, ssl_min_protocol_version, ssl_max_protocol_version, gssencmode, krbsrvname, gsslib, target_session_attrs, use_remote_estimate, fdw_startup_cost, fdw_tuple_cost, extensions, updatable, truncatable, fetch_size, batch_size, async_capable, parallel_commit, keep_connections ++HINT: Valid options in this context are: service, passfile, channel_binding, connect_timeout, dbname, host, hostaddr, port, options, application_name, keepalives, keepalives_idle, keepalives_interval, keepalives_count, tcp_user_timeout, sslmode, sslcompression, sslcert, sslkey, sslcertmode, sslrootcert, sslcrl, sslcrldir, sslsni, requirepeer, require_auth, ssl_min_protocol_version, ssl_max_protocol_version, gssencmode, krbsrvname, gsslib, gssdelegation, target_session_attrs, load_balance_hosts, use_remote_estimate, fdw_startup_cost, fdw_tuple_cost, extensions, updatable, truncatable, fetch_size, batch_size, async_capable, parallel_commit, keep_connections + CONTEXT: SQL statement "ALTER SERVER loopback_nopw OPTIONS (ADD password 'dummypw')" + PL/pgSQL function inline_code_block line 3 at EXECUTE + -- If we add a password for our user mapping instead, we should get a different diff --git a/main/postgresql15/fix-tests-on-musl.patch b/main/postgresql15/fix-tests-on-musl.patch new file mode 100644 index 00000000000..405ac8fb1a4 --- /dev/null +++ b/main/postgresql15/fix-tests-on-musl.patch @@ -0,0 +1,96 @@ +Patch-Source: https://github.com/postgres/postgres/commit/8a92b70c11ba2b5f0d2b2611d9453dd90f618629 +-- +From 8a92b70c11ba2b5f0d2b2611d9453dd90f618629 Mon Sep 17 00:00:00 2001 +From: Tom Lane <tgl@sss.pgh.pa.us> +Date: Tue, 26 Mar 2024 11:44:49 -0400 +Subject: [PATCH] Allow "make check"-style testing to work with musl C library. + +The musl dynamic linker saves a pointer to the process' environment +value of LD_LIBRARY_PATH very early in startup. When we move/clobber +the environment to make more room for ps status strings, we clobber +that value and thereby prevent libraries from being found via +LD_LIBRARY_PATH, which breaks the use of a temporary installation +for testing purposes. To fix, stop collecting usable space for +ps status if we notice that the variable we are about to clobber +is LD_LIBRARY_PATH. This will result in some reduction in how long +the ps status can be, but it's only likely to occur in temporary +test contexts, so it doesn't seem like a big problem. In any case, +we don't have to do it if we see we are on glibc, which surely is +where the majority of our Linux testing is done. + +Thomas Munro, Bruce Momjian, and Tom Lane, per report from Wolfgang +Walther. Back-patch to all supported branches, with the hope that +we'll set up a buildfarm animal to test on this platform. + +Discussion: https://postgr.es/m/fddd1cd6-dc16-40a2-9eb5-d7fef2101488@technowledgy.de +--- + src/backend/utils/misc/ps_status.c | 35 ++++++++++++++++++++++++++---- + 1 file changed, 31 insertions(+), 4 deletions(-) + +diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c +index 5d829e6e483a3..9da6377402024 100644 +--- a/src/backend/utils/misc/ps_status.c ++++ b/src/backend/utils/misc/ps_status.c +@@ -107,7 +107,8 @@ static char **save_argv; + * (The original argv[] will not be overwritten by this routine, but may be + * overwritten during init_ps_display. Also, the physical location of the + * environment strings may be moved, so this should be called before any code +- * that might try to hang onto a getenv() result.) ++ * that might try to hang onto a getenv() result. But see hack for musl ++ * within.) + * + * Note that in case of failure this cannot call elog() as that is not + * initialized yet. We rely on write_stderr() instead. +@@ -122,7 +123,7 @@ save_ps_display_args(int argc, char **argv) + + /* + * If we're going to overwrite the argv area, count the available space. +- * Also move the environment to make additional room. ++ * Also move the environment strings to make additional room. + */ + { + char *end_of_area = NULL; +@@ -151,7 +152,33 @@ save_ps_display_args(int argc, char **argv) + for (i = 0; environ[i] != NULL; i++) + { + if (end_of_area + 1 == environ[i]) +- end_of_area = environ[i] + strlen(environ[i]); ++ { ++ /* ++ * The musl dynamic linker keeps a static pointer to the ++ * initial value of LD_LIBRARY_PATH, if that is defined in the ++ * process's environment. Therefore, we must not overwrite the ++ * value of that setting and thus cannot advance end_of_area ++ * beyond it. Musl does not define any identifying compiler ++ * symbol, so we have to do this unless we see a symbol ++ * identifying a Linux libc we know is safe. ++ */ ++#if defined(__linux__) && (!defined(__GLIBC__) && !defined(__UCLIBC__)) ++ if (strncmp(environ[i], "LD_LIBRARY_PATH=", 16) == 0) ++ { ++ /* ++ * We can overwrite the name, but stop at the equals sign. ++ * Future loop iterations will not find any more ++ * contiguous space, but we don't break early because we ++ * need to count the total number of environ[] entries. ++ */ ++ end_of_area = environ[i] + 15; ++ } ++ else ++#endif ++ { ++ end_of_area = environ[i] + strlen(environ[i]); ++ } ++ } + } + + ps_buffer = argv[0]; +@@ -183,7 +210,7 @@ save_ps_display_args(int argc, char **argv) + * If we're going to change the original argv[] then make a copy for + * argument parsing purposes. + * +- * (NB: do NOT think to remove the copying of argv[], even though ++ * NB: do NOT think to remove the copying of argv[], even though + * postmaster.c finishes looking at argv[] long before we ever consider + * changing the ps display. On some platforms, getopt() keeps pointers + * into the argv array, and will get horribly confused when it is diff --git a/main/postgresql15/per-version-dirs.patch b/main/postgresql15/per-version-dirs.patch index ae091cee670..28c4df148d4 100644 --- a/main/postgresql15/per-version-dirs.patch +++ b/main/postgresql15/per-version-dirs.patch @@ -56,14 +56,29 @@ Patch-Source: https://sources.debian.org/src/postgresql-14/14.0-1/debian/patches /* no arguments -> print everything */ --- a/src/test/perl/PostgreSQL/Test/Utils.pm +++ b/src/test/perl/PostgreSQL/Test/Utils.pm -@@ -688,6 +688,10 @@ +@@ -721,6 +721,14 @@ + or die "could not execute pg_config"; chomp($stdout); $stdout =~ s/\r$//; -+ # Alpine's pg_config is not relocatable, manually check for correct location -+ if (-d "../../../build/tmp_install/usr/include/postgresql") { -+ $stdout = "../../../build/tmp_install/usr/include/postgresql"; ++ # XXX-Patched: Alpine's pg_config is not relocatable, manually check for correct location ++ if (-d "../../../tmp_install/usr/include/postgresql") { ++ my $result = IPC::Run::run [ 'pg_config', '--major-version' ], '>', ++ \$stdout, '2>', \$stderr; ++ chomp($stdout); ++ $stdout =~ s/\r$//; ++ $stdout = "../../../tmp_install/usr/include/postgresql/" . $stdout . "/server"; + } - + + open my $header_h, '<', "$stdout/$header_path" or die "$!"; + +@@ -759,6 +767,10 @@ + or die "could not execute pg_config"; + chomp($stdout); + $stdout =~ s/\r$//; ++ # XXX-Patched: Alpine's pg_config is not relocatable, manually check for correct location ++ if (-d "../../../tmp_install/usr/include/postgresql") { ++ $stdout = "../../../tmp_install/usr/include/postgresql"; ++ } + open my $pg_config_h, '<', "$stdout/pg_config.h" or die "$!"; my $match = (grep { /^$regexp/ } <$pg_config_h>); - close $pg_config_h; diff --git a/main/postgresql16/APKBUILD b/main/postgresql16/APKBUILD index 746c833b7a8..df55bc89c39 100644 --- a/main/postgresql16/APKBUILD +++ b/main/postgresql16/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> _pkgname=postgresql pkgver=16.2 -pkgrel=2 +pkgrel=4 _majorver=${pkgver%%[_.]*} # Should this aport provide libpq* and libecpg*? true/false # Exactly one postgresql aport must be the default one! @@ -72,6 +72,7 @@ subpackages=" $pkgname-openrc " source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz2 + fix-tests-on-musl.patch initdb.patch perl-rpath.patch per-version-dirs.patch @@ -84,13 +85,20 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz pg_config-add-major-version.patch dont-use-locale-a-on-musl.patch icu-collations-hack.patch + skip-test-icu.patch + fix-test-check_guc.patch libpgport-pkglibdir.patch.txt external-libpq.patch.txt pltcl_create_tables.sql " builddir="$srcdir/$_pkgname-$pkgver" -options="net !check" # TODO: reenable check +options="net" + +case "$CARCH" in + # XXX: Tests are broken. + riscv64) options="$options !check" +esac # secfixes: # 16.2-r0: @@ -137,6 +145,9 @@ _client_cmds=" prepare() { default_prepare + # FIXME: This test is broken, skip it for now. + sed -i '/test_pg_dump/d' src/test/modules/Makefile + if $_default_ver; then cp -rl "$builddir" "$builddir-ifaces" else @@ -205,9 +216,13 @@ _configure() { } check() { - #_run_tests src/test - #_run_tests src/pl + _run_tests src/test + _run_tests src/pl _run_tests contrib + + if $_default_ver; then + _run_tests src/interfaces/libpq + fi } package() { @@ -477,18 +492,21 @@ _setdiff() { sha512sums=" 3194941cc3f1ec86b6cf4f08c6422d268d99890441f8fc9ab87b6a7fd16c990fa230b544308644cbef54e6960c4984e3703752e40930bdc0537b7bfda3ab7ccf postgresql-16.2.tar.bz2 +e3b05a2df199440cd558cd729aac9ee53cda6dd675f0ecdecda27d6158cc1b2f3f3fdb2b69657adba93886f4331183ec9f63c71868f34020a5ff82575e0a4202 fix-tests-on-musl.patch 73080f61ae274a214966d2d010de49c8c90eb3180e4f56d86a9e23063eaddbe7f8d2c40ed414591c16bc9cfe88577866af2a965c2b6effb54965d19ef96a3fa9 initdb.patch 27e00b58fe5c3899c66fc0dde51846c14701bcfedd132b106d676783ba603e8cbdc6e620f29b52dc892bdaa9302052788cf5e575a1659f61c017a12e0d2ee4d0 perl-rpath.patch -413e979745f81a5b95b7ad9ea44452217d095e3ee6b4a82b636a7b3c89093fefbe7b8d210e4f6bfdab1d6f81309133719e90b7eab93ba60ef2bb78308c52b3b9 per-version-dirs.patch +6d992f53bf8b3e914933f89bc3f01591de2b707cf809aeee4210f9d59e2dc11e3fce697f50a7660f54925a2f0a6154eaeab0f59a969f76572dac5ff6f08faa71 per-version-dirs.patch d0040599d7646b709af4e3413bf0c228090f256395e806f3fee230ccc6037ed9c0df1cd160d01b6a73b25a742fdd3fb070733a14a78f53d297fbdbbb44f6f878 unix_socket_directories.patch 2e33e1ae38d60e0daf3ed18e6eaa9ddf6762b4b1bb7e51f1d2690e3df9d602aa1a700e603ba3ee69314a75a963131c7dc67c1b1f8b7eb5564e9c4253e81a4db4 disable-html-docs.patch d8eb4274a54b94bed4a2ded7ae775c5a95ca0f051b831b859ccf78bf6d2ea6fe89a9a0611771f6ad85573995a7e3af1fdf5859e20cae3267a52239f12e1b61c3 remove-libecpg_compat.patch -9cd5fa30f98acf11c5e4bd4593ea5bc8dbda81309133f30925d4c1689e9125f73d08d22208964b5fdcd1b328af2dc9ccdd6a6fe588e448b33a030f984a7b357f czech-snowball-stemmer.patch +ac39e7f23db12693409d722ea57f33110ff82359d1c19e2236bc1b270f17daad3a784170b85fc911784f9fe57ed69a232b00a3224c96e62ed06efd60c6c43fbf czech-snowball-stemmer.patch 5262f4944844bccc839c4441570b9eb2e0792390234ebfdb8ebb7b83380ce5f5de84b038cb03045526da202a185af9c3972c2ae1b9e0e743a95c6e84f4621cf9 make-split-headers.patch c24986becfd73546a062612335e53b4da34829e42a0c30e85ed7481924f13b1fd0a0e5079d680905a52afea1e99f2210cc3692c529a34a74cd6961c88cce9163 jit-datalayout-mismatch-on-s390x-and-x86.patch 04751b23c7085b40829c6d2d63bb428e04b11d79aa58804045f2ed52d096e75304b1c7d0f8f37e3398156f18f69e6f6f2879ece46209c091b4348bc39d181511 pg_config-add-major-version.patch b0688d66fdd7d612c24d9aa69bdd80d30787d2d6409b4524c79b41797144fc743213460e6de9c536bfb72da089f92cf89731f15137b1407fd04ca97fd393bfd2 dont-use-locale-a-on-musl.patch e1949917fa3ea7cfc25b843d22139694628f73b0eb763a92a23f19d0a87230d805a2454657652c200e916d6fc6ef1b16d2d7cb27b0195d4b69f8583f64d11b65 icu-collations-hack.patch +3ae334478ab6008022bda261e695a7957ae5c6037760925f98260f01b17568372c1284a5abf547a3c0fcae5fbb4a54e172f118de1afa1e81a839ee6f9544efd9 skip-test-icu.patch +b64e75778fcb7a8221cf1a3d81c6a1ade3910e3398f63dd6f9be743b1dd7e392ea626dda8da976f4149f838c18ba536e7c9f9da268ae7e03b78268304d89bafc fix-test-check_guc.patch cde5fbf5a39e5de18a40ec1d9ac919dcf166e0ca178a6b9dbdfded8d16b4969b91917a2550bbf33eccd1ecb3bd9e0753a47012e60f4efe720bbef2a2c5368529 libpgport-pkglibdir.patch.txt 6078defb3da67e7df96665cc130d32b69eebfcaf49d92eef368ea8eea8bb311fab56064c104bc97f53da9cd925301bef696b506af33e0b66d65bc6cd41ec7499 external-libpq.patch.txt 5c9bfd9e295dcf678298bf0aa974347a7c311d6e7c2aa76a6920fcb751d01fd1ab77abbec11f3c672f927ad9deaa88e04e370c0b5cd1b60087554c474b748731 pltcl_create_tables.sql diff --git a/main/postgresql16/czech-snowball-stemmer.patch b/main/postgresql16/czech-snowball-stemmer.patch index 96d9d72c78e..93097ddd07a 100644 --- a/main/postgresql16/czech-snowball-stemmer.patch +++ b/main/postgresql16/czech-snowball-stemmer.patch @@ -42,6 +42,14 @@ diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile stem_UTF_8_danish.o \ stem_UTF_8_dutch.o \ stem_UTF_8_english.o \ +@@ -73,6 +73,7 @@ + stem_UTF_8_yiddish.o + + stop_files = \ ++ czech.stop \ + danish.stop \ + dutch.stop \ + english.stop \ diff --git a/src/backend/snowball/snowball_create.pl b/src/backend/snowball/snowball_create.pl --- a/src/backend/snowball/snowball_create.pl +++ b/src/backend/snowball/snowball_create.pl diff --git a/main/postgresql16/fix-test-check_guc.patch b/main/postgresql16/fix-test-check_guc.patch new file mode 100644 index 00000000000..48502e95978 --- /dev/null +++ b/main/postgresql16/fix-test-check_guc.patch @@ -0,0 +1,13 @@ +--- a/src/test/modules/test_misc/t/003_check_guc.pl ++++ b/src/test/modules/test_misc/t/003_check_guc.pl +@@ -36,6 +36,10 @@ + + # use the sample file from the temp install + my $share_dir = $node->config_data('--sharedir'); ++# XXX-Patched: --sharedir returns /usr/share/... ++if (-d "../../../../tmp_install") { ++ $share_dir = "../../../../tmp_install" . $share_dir ++} + my $sample_file = "$share_dir/postgresql.conf.sample"; + + # List of all the GUCs found in the sample file. diff --git a/main/postgresql16/fix-tests-on-musl.patch b/main/postgresql16/fix-tests-on-musl.patch new file mode 100644 index 00000000000..405ac8fb1a4 --- /dev/null +++ b/main/postgresql16/fix-tests-on-musl.patch @@ -0,0 +1,96 @@ +Patch-Source: https://github.com/postgres/postgres/commit/8a92b70c11ba2b5f0d2b2611d9453dd90f618629 +-- +From 8a92b70c11ba2b5f0d2b2611d9453dd90f618629 Mon Sep 17 00:00:00 2001 +From: Tom Lane <tgl@sss.pgh.pa.us> +Date: Tue, 26 Mar 2024 11:44:49 -0400 +Subject: [PATCH] Allow "make check"-style testing to work with musl C library. + +The musl dynamic linker saves a pointer to the process' environment +value of LD_LIBRARY_PATH very early in startup. When we move/clobber +the environment to make more room for ps status strings, we clobber +that value and thereby prevent libraries from being found via +LD_LIBRARY_PATH, which breaks the use of a temporary installation +for testing purposes. To fix, stop collecting usable space for +ps status if we notice that the variable we are about to clobber +is LD_LIBRARY_PATH. This will result in some reduction in how long +the ps status can be, but it's only likely to occur in temporary +test contexts, so it doesn't seem like a big problem. In any case, +we don't have to do it if we see we are on glibc, which surely is +where the majority of our Linux testing is done. + +Thomas Munro, Bruce Momjian, and Tom Lane, per report from Wolfgang +Walther. Back-patch to all supported branches, with the hope that +we'll set up a buildfarm animal to test on this platform. + +Discussion: https://postgr.es/m/fddd1cd6-dc16-40a2-9eb5-d7fef2101488@technowledgy.de +--- + src/backend/utils/misc/ps_status.c | 35 ++++++++++++++++++++++++++---- + 1 file changed, 31 insertions(+), 4 deletions(-) + +diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c +index 5d829e6e483a3..9da6377402024 100644 +--- a/src/backend/utils/misc/ps_status.c ++++ b/src/backend/utils/misc/ps_status.c +@@ -107,7 +107,8 @@ static char **save_argv; + * (The original argv[] will not be overwritten by this routine, but may be + * overwritten during init_ps_display. Also, the physical location of the + * environment strings may be moved, so this should be called before any code +- * that might try to hang onto a getenv() result.) ++ * that might try to hang onto a getenv() result. But see hack for musl ++ * within.) + * + * Note that in case of failure this cannot call elog() as that is not + * initialized yet. We rely on write_stderr() instead. +@@ -122,7 +123,7 @@ save_ps_display_args(int argc, char **argv) + + /* + * If we're going to overwrite the argv area, count the available space. +- * Also move the environment to make additional room. ++ * Also move the environment strings to make additional room. + */ + { + char *end_of_area = NULL; +@@ -151,7 +152,33 @@ save_ps_display_args(int argc, char **argv) + for (i = 0; environ[i] != NULL; i++) + { + if (end_of_area + 1 == environ[i]) +- end_of_area = environ[i] + strlen(environ[i]); ++ { ++ /* ++ * The musl dynamic linker keeps a static pointer to the ++ * initial value of LD_LIBRARY_PATH, if that is defined in the ++ * process's environment. Therefore, we must not overwrite the ++ * value of that setting and thus cannot advance end_of_area ++ * beyond it. Musl does not define any identifying compiler ++ * symbol, so we have to do this unless we see a symbol ++ * identifying a Linux libc we know is safe. ++ */ ++#if defined(__linux__) && (!defined(__GLIBC__) && !defined(__UCLIBC__)) ++ if (strncmp(environ[i], "LD_LIBRARY_PATH=", 16) == 0) ++ { ++ /* ++ * We can overwrite the name, but stop at the equals sign. ++ * Future loop iterations will not find any more ++ * contiguous space, but we don't break early because we ++ * need to count the total number of environ[] entries. ++ */ ++ end_of_area = environ[i] + 15; ++ } ++ else ++#endif ++ { ++ end_of_area = environ[i] + strlen(environ[i]); ++ } ++ } + } + + ps_buffer = argv[0]; +@@ -183,7 +210,7 @@ save_ps_display_args(int argc, char **argv) + * If we're going to change the original argv[] then make a copy for + * argument parsing purposes. + * +- * (NB: do NOT think to remove the copying of argv[], even though ++ * NB: do NOT think to remove the copying of argv[], even though + * postmaster.c finishes looking at argv[] long before we ever consider + * changing the ps display. On some platforms, getopt() keeps pointers + * into the argv array, and will get horribly confused when it is diff --git a/main/postgresql16/per-version-dirs.patch b/main/postgresql16/per-version-dirs.patch index ae091cee670..28c4df148d4 100644 --- a/main/postgresql16/per-version-dirs.patch +++ b/main/postgresql16/per-version-dirs.patch @@ -56,14 +56,29 @@ Patch-Source: https://sources.debian.org/src/postgresql-14/14.0-1/debian/patches /* no arguments -> print everything */ --- a/src/test/perl/PostgreSQL/Test/Utils.pm +++ b/src/test/perl/PostgreSQL/Test/Utils.pm -@@ -688,6 +688,10 @@ +@@ -721,6 +721,14 @@ + or die "could not execute pg_config"; chomp($stdout); $stdout =~ s/\r$//; -+ # Alpine's pg_config is not relocatable, manually check for correct location -+ if (-d "../../../build/tmp_install/usr/include/postgresql") { -+ $stdout = "../../../build/tmp_install/usr/include/postgresql"; ++ # XXX-Patched: Alpine's pg_config is not relocatable, manually check for correct location ++ if (-d "../../../tmp_install/usr/include/postgresql") { ++ my $result = IPC::Run::run [ 'pg_config', '--major-version' ], '>', ++ \$stdout, '2>', \$stderr; ++ chomp($stdout); ++ $stdout =~ s/\r$//; ++ $stdout = "../../../tmp_install/usr/include/postgresql/" . $stdout . "/server"; + } - + + open my $header_h, '<', "$stdout/$header_path" or die "$!"; + +@@ -759,6 +767,10 @@ + or die "could not execute pg_config"; + chomp($stdout); + $stdout =~ s/\r$//; ++ # XXX-Patched: Alpine's pg_config is not relocatable, manually check for correct location ++ if (-d "../../../tmp_install/usr/include/postgresql") { ++ $stdout = "../../../tmp_install/usr/include/postgresql"; ++ } + open my $pg_config_h, '<', "$stdout/pg_config.h" or die "$!"; my $match = (grep { /^$regexp/ } <$pg_config_h>); - close $pg_config_h; diff --git a/main/postgresql16/skip-test-icu.patch b/main/postgresql16/skip-test-icu.patch new file mode 100644 index 00000000000..5804a97a735 --- /dev/null +++ b/main/postgresql16/skip-test-icu.patch @@ -0,0 +1,32 @@ +--- a/src/test/icu/t/010_database.pl ++++ b/src/test/icu/t/010_database.pl +@@ -69,18 +69,19 @@ + 0, + "LOCALE works for ICU locales if LC_COLLATE and LC_CTYPE are specified"); + ++# XXX-Patched: This test doesn't pass probably due to our ICU patch. + # Test that ICU-specific LOCALE without LC_COLLATE and LC_CTYPE must + # be specified with ICU_LOCALE +-my ($ret, $stdout, $stderr) = $node1->psql( +- 'postgres', +- q{CREATE DATABASE dbicu3 LOCALE_PROVIDER icu LOCALE '@colStrength=primary' +- TEMPLATE template0 ENCODING UTF8}); +-isnt($ret, 0, +- "ICU-specific locale must be specified with ICU_LOCALE: exit code not 0"); +-like( +- $stderr, +- qr/ERROR: invalid LC_COLLATE locale name/, +- "ICU-specific locale must be specified with ICU_LOCALE: error message"); ++#my ($ret, $stdout, $stderr) = $node1->psql( ++# 'postgres', ++# q{CREATE DATABASE dbicu3 LOCALE_PROVIDER icu LOCALE '@colStrength=primary' ++# TEMPLATE template0 ENCODING UTF8}); ++#isnt($ret, 0, ++# "ICU-specific locale must be specified with ICU_LOCALE: exit code not 0"); ++#like( ++# $stderr, ++# qr/ERROR: invalid LC_COLLATE locale name/, ++# "ICU-specific locale must be specified with ICU_LOCALE: error message"); + + + done_testing(); diff --git a/main/procps-ng/APKBUILD b/main/procps-ng/APKBUILD index 31e78a8021b..754b02a76be 100644 --- a/main/procps-ng/APKBUILD +++ b/main/procps-ng/APKBUILD @@ -19,9 +19,10 @@ provides="procps=$pkgver-r$pkgrel" replaces="procps" case "$CARCH" in -x86) - # TODO, FAIL: strtod_nol_or_err("123") != 123.000000 +x86|ppc64le) + # TODO, x86: FAIL: strtod_nol_or_err("123") != 123.000000 # https://gitlab.com/procps-ng/procps/-/issues/271 + # ppc64le: FAIL: check_fatal_proc_unmounted options="$options !check" ;; esac diff --git a/main/pspg/APKBUILD b/main/pspg/APKBUILD index eda09046c3a..a2676c1b8ed 100644 --- a/main/pspg/APKBUILD +++ b/main/pspg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=pspg -pkgver=5.8.2 +pkgver=5.8.6 pkgrel=0 pkgdesc="A unix pager optimized for psql" url="https://github.com/okbob/pspg" @@ -35,5 +35,5 @@ package() { } sha512sums=" -b64fd77c201e99881c8bc1afe435341ffedbd2ca40577e4f5a6e24bf8b0529f2106317452f87551a26b8c8a1907595440bce77dfd79b6293144165b106ec9517 pspg-5.8.2.tar.gz +1483adbecaac01fc5ef73fde2792a804bc6f8db00ef5ac434692985cf61f181c16be3ae3ddcfc50648cfe09ace8f237f3dbeee86c09e3ad1ccb2ec9141378b8d pspg-5.8.6.tar.gz " diff --git a/main/py3-coverage/APKBUILD b/main/py3-coverage/APKBUILD index b422281517a..1039acbbbe2 100644 --- a/main/py3-coverage/APKBUILD +++ b/main/py3-coverage/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Valery Kartel <valery.kartel@gmail.com> -# Contributor: Valery Kartel <valery.kartel@gmail.com> +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-coverage -pkgver=6.5.0 -pkgrel=6 +pkgver=7.5.1 +pkgrel=0 pkgdesc="Code coverage measurement for Python" options="!check" # Requires 'xdist' url="https://pypi.org/project/coverage" @@ -32,5 +32,5 @@ package() { } sha512sums=" -4f2ec0bf69a83471a2b5a73b6a2212372ee6e32ccc4c72e0d33eef915939152f3213ab60e1a22ce2b72791e706c2223b0c81c87b95bbfadd1e828fa1a9fff120 coverage-6.5.0.tar.gz +db9fe405c52e30e2aa673caf0cc8a02b5f62fd53b969003d231b52cf9463afc22924d5c29859447d6139be9c6642036f3cbc690ae4055d250a73c9dcd1f805a2 coverage-7.5.1.tar.gz " diff --git a/main/py3-elementpath/APKBUILD b/main/py3-elementpath/APKBUILD index 09750158a9f..bdbde113cb4 100644 --- a/main/py3-elementpath/APKBUILD +++ b/main/py3-elementpath/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=py3-elementpath -pkgver=4.1.5 -pkgrel=2 +pkgver=4.4.0 +pkgrel=0 pkgdesc="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml" url="https://github.com/sissaschool/elementpath" arch="noarch" @@ -22,19 +22,16 @@ build() { check() { python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl - # first four disabled tests fails on locale differences - # Rest of the tests need more investigation, started with upgrade to 4.1.0 + # first: AssertionError: ElementPathError not raised + # rest: AssertionError: First sequence is not a list: -1 .testenv/bin/python3 -m pytest \ - --ignore=tests/test_sequence_types.py \ - --deselect tests/test_xpath2_functions.py::XPath2FunctionsTest::test_compare_function \ - --deselect tests/test_xpath30.py::XPath30FunctionsTest::test_compare_function \ - --deselect tests/test_xpath31.py::XPath31FunctionsTest::test_compare_function \ --deselect tests/test_collations.py::CollationsTest::test_context_activation \ + --deselect tests/test_xpath2_functions.py::XPath2FunctionsTest::test_compare_function \ --deselect tests/test_xpath2_functions.py::LxmlXPath2FunctionsTest::test_compare_function \ + --deselect tests/test_xpath30.py::XPath30FunctionsTest::test_compare_function \ --deselect tests/test_xpath30.py::LxmlXPath30FunctionsTest::test_compare_function \ - --deselect tests/test_xpath31.py::LxmlXPath31FunctionsTest::test_compare_function \ - --deselect tests/test_validators.py::ValidatorsTest::test_validate_analyzed_string \ - --deselect tests/test_validators.py::ValidatorsTest::test_validate_json_to_xml + --deselect tests/test_xpath31.py::XPath31FunctionsTest::test_compare_function \ + --deselect tests/test_xpath31.py::LxmlXPath31FunctionsTest::test_compare_function } package() { @@ -43,5 +40,5 @@ package() { } sha512sums=" -29989210238aacdf111cba49d09488254a6bd479b381e57699c8d1eca8ec21badf666744402aae891210142ce56cfce66b55bf372e5de8b7b48a45bed46b0cf3 py3-elementpath-4.1.5.tar.gz +8171cb004dba68d84dd26a9ac5e8feeb9cc87eb518cc232b3128dadd7ad92840903fe2d02eb4428e4e4df7590bf6c68bdae180ad678bccb969686875b0a84ae1 py3-elementpath-4.4.0.tar.gz " diff --git a/main/py3-future/APKBUILD b/main/py3-future/APKBUILD index 646dd8bfbce..457bb038861 100644 --- a/main/py3-future/APKBUILD +++ b/main/py3-future/APKBUILD @@ -13,7 +13,9 @@ depends="python3" makedepends="py3-gpep517 py3-setuptools py3-wheel" checkdepends="py3-pytest" subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/f/future/future-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/f/future/future-$pkgver.tar.gz + test_ftp.patch + " builddir="$srcdir/$_pkgname-$pkgver" replaces="py-future" # Backwards compatibility @@ -38,4 +40,5 @@ package() { sha512sums=" 8e28d53172e3ae7b3b27c424a48fb698a6e86bf1c648cdf74e7fd57d34901a9bda18429fe4e176d70be67fc6c80b7f961b3021356594e38b5f294406af40bc61 py3-future-1.0.0.tar.gz +e045ba2f5a3d29ab78b75f6211e4b40ec8333d6fcb53bf09803fedecc0728f929753aa7745eda3275fcbc7087bbe22b1e2df455e6750e80b608fdc2a1a1e67f0 test_ftp.patch " diff --git a/main/py3-future/test_ftp.patch b/main/py3-future/test_ftp.patch new file mode 100644 index 00000000000..1fe23fe6dce --- /dev/null +++ b/main/py3-future/test_ftp.patch @@ -0,0 +1,15 @@ +Adapted from https://github.com/python-mechanize/mechanize/commit/1324b09b661aaac7d4cdc7e1e9d49e1c3851db2c + + +--- a/tests/test_future/test_urllib2.py ++++ b/tests/test_future/test_urllib2.py +@@ -709,7 +709,8 @@ + ["foo", "bar"], "", None), + ("ftp://localhost/baz.gif;type=a", + "localhost", ftplib.FTP_PORT, "", "", "A", +- [], "baz.gif", None), ++ [], "baz.gif", ++ "image/gif" if sys.version_info >= (3, 11) else None), + ("ftp://localhost/baz.gif", + "localhost", ftplib.FTP_PORT, "", "", "I", + [], "baz.gif", "image/gif"), diff --git a/main/py3-hatchling/APKBUILD b/main/py3-hatchling/APKBUILD index cf46c214638..7d73fa651c6 100644 --- a/main/py3-hatchling/APKBUILD +++ b/main/py3-hatchling/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-hatchling -pkgver=1.22.5 -pkgrel=1 +pkgver=1.24.2 +pkgrel=0 pkgdesc="Modern, extensible Python build backend" url="https://hatch.pypa.io/latest/" license="MIT" @@ -21,5 +21,5 @@ package() { } sha512sums=" -d0969cabce858348ca01e3446bc76e6045d4b012c8f5a86c88cb6d71c168f1d23e83227b894d358474b39581fbea6c636932adc51b529b56444b19ed9714c007 hatchling-1.22.5-py3-none-any.whl +fe6ef32aea0dd60ec36c34954b4345b55f031a694d24c4c18e1d77d7115b18bedf3d74f71a849d3a5c540d6361cd97c93ae20bbdbf306b7d249ab80999e7b33a hatchling-1.24.2-py3-none-any.whl " diff --git a/main/py3-jinja2/APKBUILD b/main/py3-jinja2/APKBUILD index f07971ebd4a..363936c31de 100644 --- a/main/py3-jinja2/APKBUILD +++ b/main/py3-jinja2/APKBUILD @@ -26,7 +26,9 @@ build() { check() { python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest -W ignore::DeprecationWarning + # test_elif_deep fails on s390x + .testenv/bin/python3 -m pytest -W ignore::DeprecationWarning \ + -k "not test_elif_deep" } package() { diff --git a/main/py3-mako/APKBUILD b/main/py3-mako/APKBUILD index e98ab795de5..62f0122157a 100644 --- a/main/py3-mako/APKBUILD +++ b/main/py3-mako/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py3-mako _pkgname=Mako -pkgver=1.3.2 -pkgrel=2 +pkgver=1.3.3 +pkgrel=0 pkgdesc="Python3 fast templating language" url="https://www.makotemplates.org/" arch="noarch" @@ -38,5 +38,5 @@ package() { } sha512sums=" -acde7b4be929fdd97f2a3fc133966ffc44b5706dbdd3f1af0fee16620b3c82d12b1a67b7292a229084ebb4f0c392e8db1b2844112baa3c6a5fd2be8777b04897 Mako-1.3.2.tar.gz +fa8bf3997f7a3edc18057f53e8450d72d5c86019229fef91eaa141f0b65a081ca9425c14245227b35aedcccc7dbe52e90bc7dfee34598b490e93cd01fc4a8321 Mako-1.3.3.tar.gz " diff --git a/main/py3-pluggy/APKBUILD b/main/py3-pluggy/APKBUILD index a60df3a8a47..5047627e5e6 100644 --- a/main/py3-pluggy/APKBUILD +++ b/main/py3-pluggy/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=py3-pluggy _pkgname=pluggy -pkgver=1.4.0 -pkgrel=1 +pkgver=1.5.0 +pkgrel=0 pkgdesc="Plugin management and hook calling for Python" # Needs py3-pytest for checkdepends, which require py3-pluggy # in depends, so disable here to break a circular dependency @@ -41,5 +41,5 @@ package() { } sha512sums=" -ac21a0c68cfcb9c7c401e5c48404f7447489b75befe8bc8b6e7ea84f24a1c6dbfb3de024577dd9e36ca9f538f9867ef836ba13018e3b8b348bba3e9bbd0c4dfd pluggy-1.4.0.tar.gz +032d41e1f2bed56eff22463c4645516e9415ee253e0a3fe5ba83a8de5e21700baae1f6384c979d2c6f622e4216a2b745eec489bc04f52a576d423e771365cc7a pluggy-1.5.0.tar.gz " diff --git a/main/py3-pygments/APKBUILD b/main/py3-pygments/APKBUILD index e111445af76..3e40d5d0aa1 100644 --- a/main/py3-pygments/APKBUILD +++ b/main/py3-pygments/APKBUILD @@ -1,8 +1,8 @@ -# Maintainer: Julien Voisin <julien.voisin@dustri.org> # Contributor: Peter Bui <pnutzh4x0r@gmail.com> +# Maintainer: Julien Voisin <julien.voisin@dustri.org> pkgname=py3-pygments -pkgver=2.17.2 -pkgrel=1 +pkgver=2.18.0 +pkgrel=0 pkgdesc="Syntax highlighting package written in Python" url="https://pygments.org/" arch="noarch" @@ -63,6 +63,6 @@ doc() { } sha512sums=" -a3408a21f4c0a9f1a81d4fae5c2924f66f1f17daf98a52c4379d6953625354f47bb8db3005e6ab09407627f592843efde12afb14e1271c1e685973eb4c238d89 pygments-2.17.2.tar.gz -132d410a0964fc27624e53c13bc72fc5b13a726752cb60ce8ab082c29ba24aba80a49a32805f942258cd10e07e334428695b4cae9ae0ddc984e934df0c2e1f08 build-with-setuptools.patch +2f696fed7f2120f9e3bd5f3d2837a5d6b883434b8d0f68d039c2620213508638cedf1517375019809720d56fc52f07e3bddd0defc4707703ace5d707908c00fb pygments-2.18.0.tar.gz +5843e84f597cb249c2ca4c88b224a7e737b204ce8cbb136005576739126b1f72d2cb89b12bcb23cd863d5f6447951ad767d37a38cbcb5d8db70f1f4fb5c11a76 build-with-setuptools.patch " diff --git a/main/py3-pygments/build-with-setuptools.patch b/main/py3-pygments/build-with-setuptools.patch index db620c52a86..044f8dc3570 100644 --- a/main/py3-pygments/build-with-setuptools.patch +++ b/main/py3-pygments/build-with-setuptools.patch @@ -15,7 +15,7 @@ py3-setuptools while waiting for py3-hatchling to be moved to main/. [project] name = "Pygments" -@@ -54,9 +55,8 @@ +@@ -53,12 +54,11 @@ [project.scripts] pygmentize = "pygments.cmdline:main" diff --git a/main/py3-pytest/APKBUILD b/main/py3-pytest/APKBUILD index 58c22ba9062..902033c94fb 100644 --- a/main/py3-pytest/APKBUILD +++ b/main/py3-pytest/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> -# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> +# Maintainer: fossdd <fossdd@pwned.life> pkgname=py3-pytest -pkgver=8.1.1 +pkgver=8.2.0 pkgrel=1 pkgdesc="Python3 testing library" url="https://docs.pytest.org/en/latest/" @@ -55,5 +55,5 @@ package() { } sha512sums=" -f1a9f69cd4eca3ab36c36bc666bf70b099125ed6e17b89d13554c3f13b100d05abfd0b35516660d00ca4fb9eca81164ab02bc8f7a9a8d90fd4302bf399cd88c0 pytest-8.1.1.tar.gz +1a74a2269010804101fc4b8efc370c5d8d484eb145eb4e181feeb1a17046457b97071d2de925c3e8bbd4c6090cd00ca532d69286cb9e10ea023e59a99cd51088 pytest-8.2.0.tar.gz " diff --git a/main/py3-testtools/APKBUILD b/main/py3-testtools/APKBUILD index 594f01f0f41..ee7b952e7a8 100644 --- a/main/py3-testtools/APKBUILD +++ b/main/py3-testtools/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-testtools _pkgname=testtools pkgver=2.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Extensions to the Python standard library unit testing framework" url="https://pypi.org/project/testtools" arch="noarch" @@ -11,7 +11,8 @@ license="MIT" depends="python3 py3-hatch-vcs py3-fixtures" makedepends="py3-gpep517 py3-setuptools py3-wheel" subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz + pytest8.2.patch" builddir="$srcdir"/$_pkgname-$pkgver options="!check" # needs community/py3-twisted and testscenarios from pypi @@ -28,4 +29,5 @@ package() { sha512sums=" 78af1c2af6f93671074dafedeaaf3ddbcc806e78c3153a3b90f88874c967e34a18cb85e5649b08fabb4ba4ae649eeb401e79c77c3b9233d9eee2a3c2267a4596 testtools-2.7.1.tar.gz +64151feb16be07260758cc9020fa978a1810b8bbe7fc2f56fc5b6ef6f0ce3ae68c092a57280bca4671f3982bac6254db66cc730e3cae67ece1e85eb2f861f19a pytest8.2.patch " diff --git a/main/py3-testtools/pytest8.2.patch b/main/py3-testtools/pytest8.2.patch new file mode 100644 index 00000000000..e3c9ee24d1b --- /dev/null +++ b/main/py3-testtools/pytest8.2.patch @@ -0,0 +1,23 @@ +diff --git a/testtools/testcase.py b/testtools/testcase.py +index 004fdb5..b8e9010 100644 +--- a/testtools/testcase.py ++++ b/testtools/testcase.py +@@ -693,7 +693,17 @@ class TestCase(unittest.TestCase): + + def _get_test_method(self): + method_name = getattr(self, '_testMethodName') +- return getattr(self, method_name) ++ try: ++ m = getattr(self, method_name) ++ except AttributeError: ++ if method_name != "runTest": ++ # We allow instantiation with no explicit method name ++ # but not an *incorrect* or missing method name. ++ raise ValueError( ++ "no such test method in %s: %s" % (self.__class__, method_name) ++ ) ++ else: ++ return m + + def _run_test_method(self, result): + """Run the test method for this test. diff --git a/main/py3-xmlschema/APKBUILD b/main/py3-xmlschema/APKBUILD index 9523c84b9ed..d5ef21edc2f 100644 --- a/main/py3-xmlschema/APKBUILD +++ b/main/py3-xmlschema/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=py3-xmlschema -pkgver=3.0.1 -pkgrel=1 +pkgver=3.3.1 +pkgrel=0 pkgdesc="XML schema validator and conversion library" url="https://github.com/sissaschool/xmlschema" arch="noarch" @@ -33,5 +33,5 @@ package() { } sha512sums=" -c7f76d459f70315d65177bf46d43d491402477f38f0efd737604fd246390726625262be8aecb4b14f7c6eec63ed460dc811cab67fd4e0940b30b757071d208bc py3-xmlschema-3.0.1.tar.gz +42f852b6898fe855db7f0cf58ce5571a6e516d655f7970bbeeed929654774c02959416360dd0383670035a7ce727891d5e145a9da072c39a69361d2a11454252 py3-xmlschema-3.3.1.tar.gz " diff --git a/main/python3/APKBUILD b/main/python3/APKBUILD index ba3b7b8c393..6d580da114b 100644 --- a/main/python3/APKBUILD +++ b/main/python3/APKBUILD @@ -4,7 +4,7 @@ pkgname=python3 # the python3-tkinter's pkgver needs to be synchronized with this. pkgver=3.12.3 _basever="${pkgver%.*}" -pkgrel=0 +pkgrel=1 pkgdesc="High-level scripting language" url="https://www.python.org/" arch="all" @@ -22,6 +22,7 @@ subpackages=" $pkgname-gdbm pyc:_pyc_meta:noarch " +depends="libssl3>=3.3.0" makedepends=" !gettext-dev bluez-headers diff --git a/main/raspberrypi-bootloader/APKBUILD b/main/raspberrypi-bootloader/APKBUILD index 210f4c0b53d..aeeda529193 100644 --- a/main/raspberrypi-bootloader/APKBUILD +++ b/main/raspberrypi-bootloader/APKBUILD @@ -3,8 +3,8 @@ pkgname=raspberrypi-bootloader # To match Alpine kernel schedule, use master branch commit id rather than older stable tagged releases # Keep by-the-date release numbering for consistency -_commit=545545d44d2f33cae473889b6e94687d578a89e9 -pkgver=1.20240229 +_commit=6bb99655a963e73937b981bbdf530da1a98e2b51 +pkgver=1.20240503 pkgrel=0 pkgdesc="Bootloader files for the Raspberry Pi" url="https://github.com/raspberrypi/rpi-firmware" @@ -65,6 +65,6 @@ cutdown() { } sha512sums=" -58dab41bf17926b0a07daeaa4d2d68e4950793d30c4acad1127917801e12cc4e773437a7658f7f3d196ce91074e9584abc9fa240444a5ea25c75da6dfff85d86 raspberrypi-bootloader-1.20240229.tar.gz +796f75cecfa5e7f0548e68a3a5ae10a604ffa68cda169493481b548170ddd4acf1e79340366463a6d13f5fcf8902e973b32caeff9a25d98df02dedad5c200c9c raspberrypi-bootloader-1.20240503.tar.gz 35af8c7bdd3ab6f2bbc0290d8cb2adbe333639e9e3d9d03f3d0b981e6814a0ab56fb508e0e34e44ae3a325909cab3a76819fb6844d7eafe394996f7a0db83c0e update-raspberrypi-bootloader " diff --git a/main/rng-tools/APKBUILD b/main/rng-tools/APKBUILD index 3a9a58c2ddf..beafdf30ab6 100644 --- a/main/rng-tools/APKBUILD +++ b/main/rng-tools/APKBUILD @@ -10,7 +10,7 @@ pkgname=rng-tools # upgrading rng-tools alone could break the rngd jitter functionality). # pkgver=6.16 -pkgrel=4 +pkgrel=5 pkgdesc="Random number generator daemon" url="https://github.com/nhorman/rng-tools" arch="all" diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD index 645d28f683d..a1ca7d55ac4 100644 --- a/main/rrdtool/APKBUILD +++ b/main/rrdtool/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=rrdtool pkgver=1.8.0 -pkgrel=5 +pkgrel=6 pkgdesc="Data logging and graphing application" url="http://www.rrdtool.org" arch="all" license="GPL-2.0-or-later" -depends="font-sony-misc" +depends="font-cantarell" makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev cairo-dev libxml2-dev pango-dev lua lua-dev groff autoconf automake libtool" checkdepends="diffutils" diff --git a/main/ruby-bundler/APKBUILD b/main/ruby-bundler/APKBUILD index fe2bf42c781..b82dba9e541 100644 --- a/main/ruby-bundler/APKBUILD +++ b/main/ruby-bundler/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=ruby-bundler _gemname=bundler -pkgver=2.5.7 +pkgver=2.5.9 pkgrel=0 pkgdesc="Manage an application's gem dependencies" url="https://bundler.io/" @@ -48,6 +48,6 @@ package() { } sha512sums=" -2cfca0887246cd4ac7cfea7bed02be1aaad4d77bc334306aad5205b6ebb6b9372e9898b0a7f557cc11455430bc3146c98c267bc9326da29868b181309283007a bundler-v2.5.7.tar.gz +5a37871a91ac18059ca6c3f92306bed9f4912901a8259cb1d421081f8c080b2004d829e753ce68e80a7cecdf3c3d82a220313738ec6d1f106dee3eebd828d59e bundler-v2.5.9.tar.gz 76c008a71af25db5dda7055c98330fcb864fe7ffb4a5de34a0ad2bea403b28e0d945faf05685abf525b98c67c305068808fc596882676bbb1eb418d83377db41 manpages.patch " diff --git a/main/ruby-net-smtp/APKBUILD b/main/ruby-net-smtp/APKBUILD index adfd958c330..90fd3bc32be 100644 --- a/main/ruby-net-smtp/APKBUILD +++ b/main/ruby-net-smtp/APKBUILD @@ -4,7 +4,7 @@ pkgname=ruby-net-smtp _gemname=net-smtp # Keep version in sync with "Bundled gems" (https://stdgems.org) for the # packaged Ruby version. -pkgver=0.4.0 +pkgver=0.4.0.1 pkgrel=0 pkgdesc="Simple Mail Transfer Protocol client library for Ruby" url="https://github.com/ruby/net-smtp" @@ -55,6 +55,6 @@ doc() { } sha512sums=" -3a130daac6392dd9328bdc644e1089eb34f290658b06f4aee48ab9f407086446af9fe674c5f417251ffb04478e5a6f14829f2b13b3e62fadb65ac09a2fa35bc1 net-smtp-0.4.0.tar.gz +9fdacd9f7ec40bdec7467789574d3fff774583d983c9509a6335daeb8e811be531a43bf6ad3d7f2ebb1cc3bb8d0f1baf8801e374445ddf7c1c1c46e5b59e615d net-smtp-0.4.0.1.tar.gz 82265f30a418ecf1248faec6f307aa4c4e4c3176325b0691d600a0fe85803caf8a10fd58391459e16bbd451b3482f543261ee3a4a6b580cc5a1576fe8afebc6e gemspec.patch " diff --git a/main/ruby-rake/APKBUILD b/main/ruby-rake/APKBUILD index 872f37b9b2b..67876172d5f 100644 --- a/main/ruby-rake/APKBUILD +++ b/main/ruby-rake/APKBUILD @@ -4,14 +4,14 @@ pkgname=ruby-rake _gemname=rake # Keep version in sync with "Bundled gems" (https://stdgems.org) for the # packaged Ruby version. -pkgver=13.1.0 +pkgver=13.2.1 pkgrel=0 pkgdesc="A Ruby task runner, inspired by make" url="https://github.com/ruby/rake" arch="noarch" license="MIT" depends="ruby" -checkdepends="ruby-minitest" +checkdepends="ruby-test-unit" makedepends="ruby-rdoc" subpackages="$pkgname-doc" source="https://github.com/ruby/rake/archive/v$pkgver/$_gemname-$pkgver.tar.gz" @@ -24,7 +24,7 @@ build() { check() { # FIXME: Fix test_signal_propagation_in_tests ruby -Ilib -Itest -e "Dir.glob('./test/**/test_*.rb', &method(:require))" -- \ - --exclude=test_signal_propagation_in_tests + --ignore-name=test_signal_propagation_in_tests } package() { @@ -54,5 +54,5 @@ doc() { } sha512sums=" -aaea4566834e588ff5cf9f48892cb7aea40f0057db949eb0053755b2f601d5c19073128aedb1f3c98cace441518bbf9bc215ba45d9135123d5b3a48a1625a995 rake-13.1.0.tar.gz +23948361713d751c6ed83fa84ce2c02031604d2c6f2f8d4db92a50ba2b614214f58b3c156066bb2653dd9728243493100cefbc76ee95ba377ccb90f696974952 rake-13.2.1.tar.gz " diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD index b7c061773db..1e78c03843d 100644 --- a/main/ruby/APKBUILD +++ b/main/ruby/APKBUILD @@ -1,8 +1,59 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> -# +pkgname=ruby +# When upgrading, upgrade also each ruby-<name> aport listed in file +# gems/bundled_gems. If some aport is missing or not in the main repo, +# create/move it. +pkgver=3.3.1 +_abiver="${pkgver%.*}.0" +pkgrel=0 +pkgdesc="An object-oriented language for quick and easy programming" +url="https://www.ruby-lang.org/" +arch="all" +license="Ruby AND BSD-2-Clause AND MIT" +depends="ca-certificates" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + $pkgname-rdoc=$pkgver-r$pkgrel + gmp-dev + libucontext-dev + " +makedepends="$depends_dev + autoconf + cargo + gdbm-dev + libffi-dev + linux-headers + openssl-dev>3 + readline-dev + yaml-dev + zlib-dev + " +install="$pkgname.post-upgrade" +subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev + $pkgname-rdoc::noarch + $pkgname-libs + $pkgname-full::noarch + " +source="https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-$pkgver.tar.gz + test_insns-lower-recursion-depth.patch + fix-get_main_stack.patch + dont-install-bundled-gems.patch + fix-riscv64-build.patch + " +replaces="ruby-gems" + +# For backward compatibility (pre 3.x). +for _i in bigdecimal etc fiddle gdbm io-console irb json; do + provides="$provides ruby-$_i=$pkgver-r$pkgrel" +done + # secfixes: +# 3.3.1-r0: +# - CVE-2024-27282 +# - CVE-2024-27281 +# - CVE-2024-27280 # 3.1.4-r0: # - CVE-2023-28755 # - CVE-2023-28756 @@ -53,54 +104,6 @@ # - CVE-2017-0902 # 2.4.3-r0: # - CVE-2017-17405 -# -pkgname=ruby -# When upgrading, upgrade also each ruby-<name> aport listed in file -# gems/bundled_gems. If some aport is missing or not in the main repo, -# create/move it. -pkgver=3.3.0 -_abiver="${pkgver%.*}.0" -pkgrel=0 -pkgdesc="An object-oriented language for quick and easy programming" -url="https://www.ruby-lang.org/" -arch="all" -license="Ruby AND BSD-2-Clause AND MIT" -depends="ca-certificates" -depends_dev=" - $pkgname=$pkgver-r$pkgrel - $pkgname-rdoc=$pkgver-r$pkgrel - gmp-dev - libucontext-dev - " -makedepends="$depends_dev - autoconf - cargo - gdbm-dev - libffi-dev - linux-headers - openssl-dev>3 - readline-dev - yaml-dev - zlib-dev - " -install="$pkgname.post-upgrade" -subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev - $pkgname-rdoc::noarch - $pkgname-libs - $pkgname-full::noarch - " -source="https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-$pkgver.tar.gz - test_insns-lower-recursion-depth.patch - fix-get_main_stack.patch - dont-install-bundled-gems.patch - fix-riscv64-build.patch - " -replaces="ruby-gems" - -# For backward compatibility (pre 3.x). -for _i in bigdecimal etc fiddle gdbm io-console irb json; do - provides="$provides ruby-$_i=$pkgver-r$pkgrel" -done _gemdir="/usr/lib/ruby/gems/$_abiver" _rubydir="/usr/lib/ruby/$_abiver" @@ -251,7 +254,7 @@ full() { } sha512sums=" -26074009b501fc793d71a74e419f34a6033c9353433919ca74ba2d24a3de432dbb11fd92c2bc285f0e4d951a6d6c74bf5b69a2ab36200c8c26e871746d6e0fc6 ruby-3.3.0.tar.gz +0c8ea922a79152ac7adbfb2541320565bce6a631692fd39d499a06f53ad6339c16fad8374d171351ed63f7bda3312b26d4f8c058c5b6df3d7548fde372c718f1 ruby-3.3.1.tar.gz 16fc1f35aee327d1ecac420b091beaa53c675e0504d5a6932004f17ca68a2c38f57b053b0a3903696f2232c5add160d363e3972a962f7f7bcb52e4e998c7315d test_insns-lower-recursion-depth.patch 42cd45c1db089a1ae57834684479a502e357ddba82ead5fa34e64c13971e7ab7ad2919ddd60a104a817864dd3e2e35bdbedb679210eb41d82cab36a0687e43d4 fix-get_main_stack.patch a77da5e5eb7d60caf3f1cabb81e09b88dc505ddd746e34efd1908c0096621156d81cc65095b846ba9bdb66028891aefce883a43ddec6b56b5beb4aac5e4ee33f dont-install-bundled-gems.patch diff --git a/main/rust/0001-Add-new-Tier-3-target-loongarch64-unknown-linux-musl.patch b/main/rust/0001-Add-new-Tier-3-target-loongarch64-unknown-linux-musl.patch deleted file mode 100644 index dc119b781df..00000000000 --- a/main/rust/0001-Add-new-Tier-3-target-loongarch64-unknown-linux-musl.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 9499baeeabc8f4494460770714a9805ff8aeaaa8 Mon Sep 17 00:00:00 2001 -From: WANG Rui <wangrui@loongson.cn> -Date: Mon, 5 Jun 2023 19:51:24 +0800 -Subject: [PATCH 01/12] Add new Tier-3 target: `loongarch64-unknown-linux-musl` - -MCP: https://github.com/rust-lang/compiler-team/issues/518 ---- - compiler/rustc_target/src/spec/mod.rs | 1 + - .../targets/loongarch64_unknown_linux_musl.rs | 18 ++++++++++++++++++ - src/doc/rustc/src/platform-support.md | 1 + - 3 files changed, 20 insertions(+) - create mode 100644 compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_musl.rs - -diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs -index 6c698c5b0..b3ee709c2 100644 ---- a/compiler/rustc_target/src/spec/mod.rs -+++ b/compiler/rustc_target/src/spec/mod.rs -@@ -1402,6 +1402,7 @@ supported_targets! { - ("i686-unknown-linux-gnu", i686_unknown_linux_gnu), - ("i586-unknown-linux-gnu", i586_unknown_linux_gnu), - ("loongarch64-unknown-linux-gnu", loongarch64_unknown_linux_gnu), -+ ("loongarch64-unknown-linux-musl", loongarch64_unknown_linux_musl), - ("m68k-unknown-linux-gnu", m68k_unknown_linux_gnu), - ("csky-unknown-linux-gnuabiv2", csky_unknown_linux_gnuabiv2), - ("csky-unknown-linux-gnuabiv2hf", csky_unknown_linux_gnuabiv2hf), -diff --git a/compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_musl.rs -new file mode 100644 -index 000000000..01a003ce8 ---- /dev/null -+++ b/compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_musl.rs -@@ -0,0 +1,18 @@ -+use crate::spec::{base, Target, TargetOptions}; -+ -+pub fn target() -> Target { -+ Target { -+ llvm_target: "loongarch64-unknown-linux-musl".into(), -+ pointer_width: 64, -+ data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(), -+ arch: "loongarch64".into(), -+ options: TargetOptions { -+ cpu: "generic".into(), -+ features: "+f,+d".into(), -+ llvm_abiname: "lp64d".into(), -+ max_atomic_width: Some(64), -+ crt_static_default: false, -+ ..base::linux_musl::opts() -+ }, -+ } -+} -diff --git a/src/doc/rustc/src/platform-support.md b/src/doc/rustc/src/platform-support.md -index f648a60b6..bc2427d6a 100644 ---- a/src/doc/rustc/src/platform-support.md -+++ b/src/doc/rustc/src/platform-support.md -@@ -167,6 +167,7 @@ target | std | notes - `i686-unknown-freebsd` | ✓ | 32-bit FreeBSD [^x86_32-floats-return-ABI] - `i686-unknown-linux-musl` | ✓ | 32-bit Linux with MUSL [^x86_32-floats-return-ABI] - [`i686-unknown-uefi`](platform-support/unknown-uefi.md) | * | 32-bit UEFI -+[`loongarch64-unknown-linux-musl`](platform-support/loongarch-linux.md) | ? | | LoongArch64 Linux (LP64D ABI) - [`loongarch64-unknown-none`](platform-support/loongarch-none.md) | * | | LoongArch64 Bare-metal (LP64D ABI) - [`loongarch64-unknown-none-softfloat`](platform-support/loongarch-none.md) | * | | LoongArch64 Bare-metal (LP64S ABI) - [`nvptx64-nvidia-cuda`](platform-support/nvptx64-nvidia-cuda.md) | * | --emit=asm generates PTX code that [runs on NVIDIA GPUs] --- -2.44.0 - diff --git a/main/rust/0006-ci-Add-support-for-dist-loongarch64-musl.patch b/main/rust/0001-ci-Add-support-for-dist-loongarch64-musl.patch index 46cd5c22913..46cd5c22913 100644 --- a/main/rust/0006-ci-Add-support-for-dist-loongarch64-musl.patch +++ b/main/rust/0001-ci-Add-support-for-dist-loongarch64-musl.patch diff --git a/main/rust/0007-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch b/main/rust/0002-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch index f42bb2ef2ae..f42bb2ef2ae 100644 --- a/main/rust/0007-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch +++ b/main/rust/0002-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch diff --git a/main/rust/0002-tests-Add-loongarch64-unknown-linux-musl-target.patch b/main/rust/0002-tests-Add-loongarch64-unknown-linux-musl-target.patch deleted file mode 100644 index 1b2e31fd4f1..00000000000 --- a/main/rust/0002-tests-Add-loongarch64-unknown-linux-musl-target.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 440278d4971c82b366077d61f682105e197f9680 Mon Sep 17 00:00:00 2001 -From: WANG Rui <wangrui@loongson.cn> -Date: Fri, 1 Mar 2024 11:43:27 +0800 -Subject: [PATCH 02/12] tests: Add loongarch64-unknown-linux-musl target - ---- - tests/assembly/targets/targets-elf.rs | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tests/assembly/targets/targets-elf.rs b/tests/assembly/targets/targets-elf.rs -index 41f5df0fb..bf89790a5 100644 ---- a/tests/assembly/targets/targets-elf.rs -+++ b/tests/assembly/targets/targets-elf.rs -@@ -231,6 +231,9 @@ - // revisions: loongarch64_unknown_linux_gnu - // [loongarch64_unknown_linux_gnu] compile-flags: --target loongarch64-unknown-linux-gnu - // [loongarch64_unknown_linux_gnu] needs-llvm-components: loongarch -+// revisions: loongarch64_unknown_linux_musl -+// [loongarch64_unknown_linux_musl] compile-flags: --target loongarch64-unknown-linux-musl -+// [loongarch64_unknown_linux_musl] needs-llvm-components: loongarch - // revisions: loongarch64_unknown_none - // [loongarch64_unknown_none] compile-flags: --target loongarch64-unknown-none - // [loongarch64_unknown_none] needs-llvm-components: loongarch --- -2.44.0 - diff --git a/main/rust/0008-vendor-libc-Add-support-for-loongarch64-linux-musl.patch b/main/rust/0003-vendor-libc-Add-support-for-loongarch64-linux-musl.patch index 6d541d1843f..6d541d1843f 100644 --- a/main/rust/0008-vendor-libc-Add-support-for-loongarch64-linux-musl.patch +++ b/main/rust/0003-vendor-libc-Add-support-for-loongarch64-linux-musl.patch diff --git a/main/rust/0010-vendor-libc-0.2.150-Add-support-for-loongarch64-linu.patch b/main/rust/0004-vendor-libc-0.2.151-Add-support-for-loongarch64-linu.patch index 8c88f920c8b..92a4b225db9 100644 --- a/main/rust/0010-vendor-libc-0.2.150-Add-support-for-loongarch64-linu.patch +++ b/main/rust/0004-vendor-libc-0.2.151-Add-support-for-loongarch64-linu.patch @@ -1,7 +1,7 @@ From 6396be7ffc6ca273bba0958c80547cb32281a964 Mon Sep 17 00:00:00 2001 From: WANG Rui <wangrui@loongson.cn> Date: Mon, 4 Mar 2024 19:28:13 +0800 -Subject: [PATCH 10/12] vendor: libc-0.2.150: Add support for +Subject: [PATCH 10/12] vendor: libc-0.2.151: Add support for loongarch64-linux-musl --- @@ -10,14 +10,14 @@ Subject: [PATCH 10/12] vendor: libc-0.2.150: Add support for .../src/unix/linux_like/linux/musl/b64/mod.rs | 3 + .../src/unix/linux_like/linux/musl/mod.rs | 3 +- 4 files changed, 708 insertions(+), 1 deletions(-) - create mode 100644 vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs - create mode 100644 vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs + create mode 100644 vendor/libc-0.2.151/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs + create mode 100644 vendor/libc-0.2.151/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs -diff --git a/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs +diff --git a/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs b/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs new file mode 100644 index 000000000..dc191f51f --- /dev/null -+++ b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs ++++ b/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs @@ -0,0 +1,40 @@ +s_no_extra_traits! { + #[allow(missing_debug_implementations)] @@ -59,11 +59,11 @@ index 000000000..dc191f51f + pub cgroup: ::c_ulonglong, + } +} -diff --git a/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs +diff --git a/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs b/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs new file mode 100644 index 000000000..dffbc2341 --- /dev/null -+++ b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs ++++ b/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs @@ -0,0 +1,663 @@ +//! LoongArch-specific definitions for 64-bit linux-like values + @@ -728,10 +728,10 @@ index 000000000..dffbc2341 + pub use self::align::*; + } +} -diff --git a/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/mod.rs b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/mod.rs +diff --git a/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/b64/mod.rs b/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/b64/mod.rs index 05586cdb4..d59343064 100644 ---- a/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/mod.rs -+++ b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/mod.rs +--- a/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/b64/mod.rs ++++ b/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/b64/mod.rs @@ -157,6 +157,9 @@ cfg_if! { } else if #[cfg(any(target_arch = "riscv64"))] { mod riscv64; @@ -742,10 +742,10 @@ index 05586cdb4..d59343064 100644 } else { // Unknown target_arch } -diff --git a/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/mod.rs b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/mod.rs +diff --git a/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/mod.rs b/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/mod.rs index b67d55e99..d4cc61484 100644 ---- a/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/mod.rs -+++ b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/mod.rs +--- a/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/mod.rs ++++ b/vendor/libc-0.2.151/src/unix/linux_like/linux/musl/mod.rs @@ -794,7 +794,8 @@ cfg_if! { target_arch = "mips64", target_arch = "powerpc64", diff --git a/main/rust/0005-configure.py-add-flag-for-loongarch64-musl-root.patch b/main/rust/0005-configure.py-add-flag-for-loongarch64-musl-root.patch deleted file mode 100644 index 9a6bccbe9d4..00000000000 --- a/main/rust/0005-configure.py-add-flag-for-loongarch64-musl-root.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ac3ab633b1d4ca35e49c7dfe8dbe5a6be7cbc303 Mon Sep 17 00:00:00 2001 -From: WANG Rui <wangrui@loongson.cn> -Date: Mon, 11 Mar 2024 11:28:34 +0800 -Subject: [PATCH 05/12] configure.py: add flag for loongarch64 musl-root - ---- - src/bootstrap/configure.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py -index d34c19a47..cba7f98e8 100755 ---- a/src/bootstrap/configure.py -+++ b/src/bootstrap/configure.py -@@ -130,6 +130,8 @@ v("musl-root-riscv32gc", "target.riscv32gc-unknown-linux-musl.musl-root", - "riscv32gc-unknown-linux-musl install directory") - v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root", - "riscv64gc-unknown-linux-musl install directory") -+v("musl-root-loongarch64", "target.loongarch64-unknown-linux-musl.musl-root", -+ "loongarch64-unknown-linux-musl install directory") - v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs", - "rootfs in qemu testing, you probably don't want to use this") - v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs", --- -2.44.0 - diff --git a/main/rust/0011-vendor-compiler_builtins-Add-support-for-loongarch64.patch b/main/rust/0005-vendor-compiler_builtins-Add-support-for-loongarch64.patch index f62dd43fc0f..f62dd43fc0f 100644 --- a/main/rust/0011-vendor-compiler_builtins-Add-support-for-loongarch64.patch +++ b/main/rust/0005-vendor-compiler_builtins-Add-support-for-loongarch64.patch diff --git a/main/rust/0012-vendor-openssl-src-Add-support-for-loongarch64-linux.patch b/main/rust/0006-vendor-openssl-src-Add-support-for-loongarch64-linux.patch index 45cacb45814..45cacb45814 100644 --- a/main/rust/0012-vendor-openssl-src-Add-support-for-loongarch64-linux.patch +++ b/main/rust/0006-vendor-openssl-src-Add-support-for-loongarch64-linux.patch diff --git a/main/rust/0007-Revert-loongarch-add-frecipe-and-relax-target-featur.patch b/main/rust/0007-Revert-loongarch-add-frecipe-and-relax-target-featur.patch new file mode 100644 index 00000000000..348c36b0bbc --- /dev/null +++ b/main/rust/0007-Revert-loongarch-add-frecipe-and-relax-target-featur.patch @@ -0,0 +1,79 @@ +Though leaving these features enabled on LLVM17 does not +cause compilation to fail, it floods the log output with +a large number of "not a recognized feature" messages. + +Remove this patch when switching to LLVM18. + + +From 32c68ac95130fc50482fd27f5d75e0d0fc3fb199 Mon Sep 17 00:00:00 2001 +From: WANG Rui <wangrui@loongson.cn> +Date: Sun, 28 Apr 2024 15:55:27 +0800 +Subject: [PATCH] Revert "loongarch: add frecipe and relax target feature" + +This reverts commit e81df3f3225ce53921a87b9e490959c41b783b02. +--- + compiler/rustc_target/src/target_features.rs | 2 -- + tests/ui/abi/compatibility.rs | 2 +- + tests/ui/check-cfg/mix.stderr | 2 +- + tests/ui/check-cfg/well-known-values.stderr | 2 +- + 4 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/compiler/rustc_target/src/target_features.rs b/compiler/rustc_target/src/target_features.rs +index c003982278e..af5a565fdc9 100644 +--- a/compiler/rustc_target/src/target_features.rs ++++ b/compiler/rustc_target/src/target_features.rs +@@ -377,12 +377,10 @@ pub fn is_stable(self) -> bool { + // tidy-alphabetical-start + ("d", Unstable(sym::loongarch_target_feature)), + ("f", Unstable(sym::loongarch_target_feature)), +- ("frecipe", Unstable(sym::loongarch_target_feature)), + ("lasx", Unstable(sym::loongarch_target_feature)), + ("lbt", Unstable(sym::loongarch_target_feature)), + ("lsx", Unstable(sym::loongarch_target_feature)), + ("lvz", Unstable(sym::loongarch_target_feature)), +- ("relax", Unstable(sym::loongarch_target_feature)), + ("ual", Unstable(sym::loongarch_target_feature)), + // tidy-alphabetical-end + ]; +diff --git a/tests/ui/abi/compatibility.rs b/tests/ui/abi/compatibility.rs +index 3ee4542810c..a4f60ea2684 100644 +--- a/tests/ui/abi/compatibility.rs ++++ b/tests/ui/abi/compatibility.rs +@@ -39,7 +39,7 @@ + //@ revisions: loongarch64 + //@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu + //@[loongarch64] needs-llvm-components: loongarch +-//@[loongarch64] min-llvm-version: 18 ++//@[loongarch64] min-llvm-version: 17 + //@ revisions: wasm + //@[wasm] compile-flags: --target wasm32-unknown-unknown + //@[wasm] needs-llvm-components: webassembly +diff --git a/tests/ui/check-cfg/mix.stderr b/tests/ui/check-cfg/mix.stderr +index 007f9de0331..93333e5ef2a 100644 +--- a/tests/ui/check-cfg/mix.stderr ++++ b/tests/ui/check-cfg/mix.stderr +@@ -251,7 +251,7 @@ warning: unexpected `cfg` condition value: `zebra` + LL | cfg!(target_feature = "zebra"); + | ^^^^^^^^^^^^^^^^^^^^^^^^ + | +- = note: expected values for `target_feature` are: `10e60`, `2e3`, `3e3r1`, `3e3r2`, `3e3r3`, `3e7`, `7e10`, `a`, `aclass`, `adx`, `aes`, `altivec`, `alu32`, `atomics`, `avx`, `avx2`, `avx512bf16`, `avx512bitalg`, `avx512bw`, `avx512cd`, `avx512dq`, `avx512er`, `avx512f`, `avx512fp16`, `avx512ifma`, `avx512pf`, `avx512vbmi`, `avx512vbmi2`, `avx512vl`, `avx512vnni`, `avx512vp2intersect`, `avx512vpopcntdq`, `bf16`, `bmi1`, `bmi2` and 187 more ++ = note: expected values for `target_feature` are: `10e60`, `2e3`, `3e3r1`, `3e3r2`, `3e3r3`, `3e7`, `7e10`, `a`, `aclass`, `adx`, `aes`, `altivec`, `alu32`, `atomics`, `avx`, `avx2`, `avx512bf16`, `avx512bitalg`, `avx512bw`, `avx512cd`, `avx512dq`, `avx512er`, `avx512f`, `avx512fp16`, `avx512ifma`, `avx512pf`, `avx512vbmi`, `avx512vbmi2`, `avx512vl`, `avx512vnni`, `avx512vp2intersect`, `avx512vpopcntdq`, `bf16`, `bmi1`, `bmi2` and 186 more + = note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration + + warning: 27 warnings emitted +diff --git a/tests/ui/check-cfg/well-known-values.stderr b/tests/ui/check-cfg/well-known-values.stderr +index cf18503b74b..e7df9736619 100644 +--- a/tests/ui/check-cfg/well-known-values.stderr ++++ b/tests/ui/check-cfg/well-known-values.stderr +@@ -154,7 +154,7 @@ warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE` + LL | target_feature = "_UNEXPECTED_VALUE", + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | +- = note: expected values for `target_feature` are: `10e60`, `2e3`, `3e3r1`, `3e3r2`, `3e3r3`, `3e7`, `7e10`, `a`, `aclass`, `adx`, `aes`, `altivec`, `alu32`, `atomics`, `avx`, `avx2`, `avx512bf16`, `avx512bitalg`, `avx512bw`, `avx512cd`, `avx512dq`, `avx512er`, `avx512f`, `avx512fp16`, `avx512ifma`, `avx512pf`, `avx512vbmi`, `avx512vbmi2`, `avx512vl`, `avx512vnni`, `avx512vp2intersect`, `avx512vpopcntdq`, `bf16`, `bmi1`, `bmi2`, `bti`, `bulk-memory`, `c`, `cache`, `cmpxchg16b`, `crc`, `crt-static`, `d`, `d32`, `dit`, `doloop`, `dotprod`, `dpb`, `dpb2`, `dsp`, `dsp1e2`, `dspe60`, `e`, `e1`, `e2`, `edsp`, `elrw`, `ermsb`, `exception-handling`, `f`, `f16c`, `f32mm`, `f64mm`, `fast-unaligned-access`, `fcma`, `fdivdu`, `fhm`, `flagm`, `float1e2`, `float1e3`, `float3e4`, `float7e60`, `floate1`, `fma`, `fp-armv8`, `fp16`, `fp64`, `fpuv2_df`, `fpuv2_sf`, `fpuv3_df`, `fpuv3_hf`, `fpuv3_hi`, `fpuv3_sf`, `frecipe`, `frintts`, `fxsr`, `gfni`, `hard-float`, `hard-float-abi`, `hard-tp`, `high-registers`, `hvx`, `hvx-length128b`, `hwdiv`, `i8mm`, `jsconv`, `lahfsahf`, `lasx`, `lbt`, `lor`, `lse`, `lsx`, `lvz`, `lzcnt`, `m`, `mclass`, `movbe`, `mp`, `mp1e2`, `msa`, `mte`, `multivalue`, `mutable-globals`, `neon`, `nontrapping-fptoint`, `nvic`, `paca`, `pacg`, `pan`, `pclmulqdq`, `pmuv3`, `popcnt`, `power10-vector`, `power8-altivec`, `power8-vector`, `power9-altivec`, `power9-vector`, `prfchw`, `rand`, `ras`, `rclass`, `rcpc`, `rcpc2`, `rdm`, `rdrand`, `rdseed`, `reference-types`, `relax`, `relaxed-simd`, `rtm`, `sb`, `sha`, `sha2`, `sha3`, `sign-ext`, `simd128`, `sm4`, `spe`, `ssbs`, `sse`, `sse2`, `sse3`, `sse4.1`, `sse4.2`, `sse4a`, `ssse3`, `sve`, `sve2`, `sve2-aes`, `sve2-bitperm`, `sve2-sha3`, `sve2-sm4`, `tbm`, `thumb-mode`, `thumb2`, `tme`, `trust`, `trustzone`, `ual`, `v`, `v5te`, `v6`, `v6k`, `v6t2`, `v7`, `v8`, `v8.1a`, `v8.2a`, `v8.3a`, `v8.4a`, `v8.5a`, `v8.6a`, `v8.7a`, `vaes`, `vdsp2e60f`, `vdspv1`, `vdspv2`, `vfp2`, `vfp3`, `vfp4`, `vh`, `virt`, `virtualization`, `vpclmulqdq`, `vsx`, `xsave`, `xsavec`, `xsaveopt`, `xsaves`, `zba`, `zbb`, `zbc`, `zbkb`, `zbkc`, `zbkx`, `zbs`, `zdinx`, `zfh`, `zfhmin`, `zfinx`, `zhinx`, `zhinxmin`, `zk`, `zkn`, `zknd`, `zkne`, `zknh`, `zkr`, `zks`, `zksed`, `zksh`, `zkt` ++ = note: expected values for `target_feature` are: `10e60`, `2e3`, `3e3r1`, `3e3r2`, `3e3r3`, `3e7`, `7e10`, `a`, `aclass`, `adx`, `aes`, `altivec`, `alu32`, `atomics`, `avx`, `avx2`, `avx512bf16`, `avx512bitalg`, `avx512bw`, `avx512cd`, `avx512dq`, `avx512er`, `avx512f`, `avx512fp16`, `avx512ifma`, `avx512pf`, `avx512vbmi`, `avx512vbmi2`, `avx512vl`, `avx512vnni`, `avx512vp2intersect`, `avx512vpopcntdq`, `bf16`, `bmi1`, `bmi2`, `bti`, `bulk-memory`, `c`, `cache`, `cmpxchg16b`, `crc`, `crt-static`, `d`, `d32`, `dit`, `doloop`, `dotprod`, `dpb`, `dpb2`, `dsp`, `dsp1e2`, `dspe60`, `e`, `e1`, `e2`, `edsp`, `elrw`, `ermsb`, `exception-handling`, `f`, `f16c`, `f32mm`, `f64mm`, `fast-unaligned-access`, `fcma`, `fdivdu`, `fhm`, `flagm`, `float1e2`, `float1e3`, `float3e4`, `float7e60`, `floate1`, `fma`, `fp-armv8`, `fp16`, `fp64`, `fpuv2_df`, `fpuv2_sf`, `fpuv3_df`, `fpuv3_hf`, `fpuv3_hi`, `fpuv3_sf`, `frintts`, `fxsr`, `gfni`, `hard-float`, `hard-float-abi`, `hard-tp`, `high-registers`, `hvx`, `hvx-length128b`, `hwdiv`, `i8mm`, `jsconv`, `lahfsahf`, `lasx`, `lbt`, `lor`, `lse`, `lsx`, `lvz`, `lzcnt`, `m`, `mclass`, `movbe`, `mp`, `mp1e2`, `msa`, `mte`, `multivalue`, `mutable-globals`, `neon`, `nontrapping-fptoint`, `nvic`, `paca`, `pacg`, `pan`, `pclmulqdq`, `pmuv3`, `popcnt`, `power10-vector`, `power8-altivec`, `power8-vector`, `power9-altivec`, `power9-vector`, `prfchw`, `rand`, `ras`, `rclass`, `rcpc`, `rcpc2`, `rdm`, `rdrand`, `rdseed`, `reference-types`, `relax`, `relaxed-simd`, `rtm`, `sb`, `sha`, `sha2`, `sha3`, `sign-ext`, `simd128`, `sm4`, `spe`, `ssbs`, `sse`, `sse2`, `sse3`, `sse4.1`, `sse4.2`, `sse4a`, `ssse3`, `sve`, `sve2`, `sve2-aes`, `sve2-bitperm`, `sve2-sha3`, `sve2-sm4`, `tbm`, `thumb-mode`, `thumb2`, `tme`, `trust`, `trustzone`, `ual`, `v`, `v5te`, `v6`, `v6k`, `v6t2`, `v7`, `v8`, `v8.1a`, `v8.2a`, `v8.3a`, `v8.4a`, `v8.5a`, `v8.6a`, `v8.7a`, `vaes`, `vdsp2e60f`, `vdspv1`, `vdspv2`, `vfp2`, `vfp3`, `vfp4`, `vh`, `virt`, `virtualization`, `vpclmulqdq`, `vsx`, `xsave`, `xsavec`, `xsaveopt`, `xsaves`, `zba`, `zbb`, `zbc`, `zbkb`, `zbkc`, `zbkx`, `zbs`, `zdinx`, `zfh`, `zfhmin`, `zfinx`, `zhinx`, `zhinxmin`, `zk`, `zkn`, `zknd`, `zkne`, `zknh`, `zkr`, `zks`, `zksed`, `zksh`, `zkt` + = note: see <https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html> for more information about checking conditional configuration + + warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE` +-- +2.44.0 + diff --git a/main/rust/0009-vendor-libc-0.2.148-Add-support-for-loongarch64-linu.patch b/main/rust/0009-vendor-libc-0.2.148-Add-support-for-loongarch64-linu.patch deleted file mode 100644 index c7d1985eb6e..00000000000 --- a/main/rust/0009-vendor-libc-0.2.148-Add-support-for-loongarch64-linu.patch +++ /dev/null @@ -1,761 +0,0 @@ -From 82b58c66bc60152236fc3009147681dff0bc364e Mon Sep 17 00:00:00 2001 -From: WANG Rui <wangrui@loongson.cn> -Date: Tue, 26 Mar 2024 16:27:33 +0800 -Subject: [PATCH 09/12] vendor: libc-0.2.148: Add support for - loongarch64-linux-musl - ---- - .../linux/musl/b64/loongarch64/align.rs | 40 ++ - .../linux/musl/b64/loongarch64/mod.rs | 663 ++++++++++++++++++ - .../src/unix/linux_like/linux/musl/b64/mod.rs | 3 + - .../src/unix/linux_like/linux/musl/mod.rs | 3 +- - 4 files changed, 708 insertions(+), 1 deletions(-) - create mode 100644 vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs - create mode 100644 vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs - -diff --git a/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs -new file mode 100644 -index 000000000..dc191f51f ---- /dev/null -+++ b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs -@@ -0,0 +1,40 @@ -+s_no_extra_traits! { -+ #[allow(missing_debug_implementations)] -+ #[repr(align(16))] -+ pub struct max_align_t { -+ priv_: [f64; 4] -+ } -+} -+ -+s! { -+ pub struct ucontext_t { -+ pub uc_flags: ::c_ulong, -+ pub uc_link: *mut ucontext_t, -+ pub uc_stack: ::stack_t, -+ pub uc_sigmask: ::sigset_t, -+ pub uc_mcontext: mcontext_t, -+ } -+ -+ #[repr(align(16))] -+ pub struct mcontext_t { -+ pub __pc: ::c_ulonglong, -+ pub __gregs: [::c_ulonglong; 32], -+ pub __flags: ::c_uint, -+ pub __extcontext: [::c_ulonglong; 0], -+ } -+ -+ #[repr(align(8))] -+ pub struct clone_args { -+ pub flags: ::c_ulonglong, -+ pub pidfd: ::c_ulonglong, -+ pub child_tid: ::c_ulonglong, -+ pub parent_tid: ::c_ulonglong, -+ pub exit_signal: ::c_ulonglong, -+ pub stack: ::c_ulonglong, -+ pub stack_size: ::c_ulonglong, -+ pub tls: ::c_ulonglong, -+ pub set_tid: ::c_ulonglong, -+ pub set_tid_size: ::c_ulonglong, -+ pub cgroup: ::c_ulonglong, -+ } -+} -diff --git a/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs -new file mode 100644 -index 000000000..dffbc2341 ---- /dev/null -+++ b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs -@@ -0,0 +1,663 @@ -+//! LoongArch-specific definitions for 64-bit linux-like values -+ -+pub type c_char = i8; -+pub type wchar_t = ::c_int; -+ -+pub type nlink_t = ::c_uint; -+pub type blksize_t = ::c_int; -+pub type fsblkcnt64_t = ::c_ulong; -+pub type fsfilcnt64_t = ::c_ulong; -+pub type __u64 = ::c_ulonglong; -+pub type __s64 = ::c_longlong; -+ -+s! { -+ pub struct pthread_attr_t { -+ __size: [::c_ulong; 7], -+ } -+ -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ __pad1: ::dev_t, -+ pub st_size: ::off_t, -+ pub st_blksize: ::blksize_t, -+ __pad2: ::c_int, -+ pub st_blocks: ::blkcnt_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ __unused: [::c_int; 2usize], -+ } -+ -+ pub struct stat64 { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino64_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ pub __pad1: ::dev_t, -+ pub st_size: ::off64_t, -+ pub st_blksize: ::blksize_t, -+ pub __pad2: ::c_int, -+ pub st_blocks: ::blkcnt_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ __unused: [::c_int; 2], -+ } -+ -+ pub struct statfs { -+ pub f_type: ::c_long, -+ pub f_bsize: ::c_long, -+ pub f_blocks: ::fsblkcnt_t, -+ pub f_bfree: ::fsblkcnt_t, -+ pub f_bavail: ::fsblkcnt_t, -+ pub f_files: ::fsfilcnt_t, -+ pub f_ffree: ::fsfilcnt_t, -+ pub f_fsid: ::fsid_t, -+ pub f_namelen: ::c_long, -+ pub f_frsize: ::c_long, -+ pub f_flags: ::c_long, -+ pub f_spare: [::c_long; 4], -+ } -+ -+ pub struct statfs64 { -+ pub f_type: ::c_long, -+ pub f_bsize: ::c_long, -+ pub f_blocks: ::fsblkcnt64_t, -+ pub f_bfree: ::fsblkcnt64_t, -+ pub f_bavail: ::fsblkcnt64_t, -+ pub f_files: ::fsfilcnt64_t, -+ pub f_ffree: ::fsfilcnt64_t, -+ pub f_fsid: ::fsid_t, -+ pub f_namelen: ::c_long, -+ pub f_frsize: ::c_long, -+ pub f_flags: ::c_long, -+ pub f_spare: [::c_long; 4], -+ } -+ -+ pub struct ipc_perm { -+ pub __key: ::key_t, -+ pub uid: ::uid_t, -+ pub gid: ::gid_t, -+ pub cuid: ::uid_t, -+ pub cgid: ::gid_t, -+ pub mode: ::c_uint, -+ pub __seq: ::c_ushort, -+ __pad2: ::c_ushort, -+ __unused1: ::c_ulong, -+ __unused2: ::c_ulong, -+ } -+ -+ pub struct user_regs_struct { -+ pub regs: [u64; 32], -+ pub orig_a0: u64, -+ pub csr_era: u64, -+ pub csr_badv: u64, -+ pub reserved: [u64; 10], -+ -+ } -+ -+ pub struct user_fp_struct { -+ pub fpr: [u64; 32], -+ pub fcc: u64, -+ pub fcsr: u32, -+ } -+} -+ -+pub const SYS_io_setup: ::c_long = 0; -+pub const SYS_io_destroy: ::c_long = 1; -+pub const SYS_io_submit: ::c_long = 2; -+pub const SYS_io_cancel: ::c_long = 3; -+pub const SYS_io_getevents: ::c_long = 4; -+pub const SYS_setxattr: ::c_long = 5; -+pub const SYS_lsetxattr: ::c_long = 6; -+pub const SYS_fsetxattr: ::c_long = 7; -+pub const SYS_getxattr: ::c_long = 8; -+pub const SYS_lgetxattr: ::c_long = 9; -+pub const SYS_fgetxattr: ::c_long = 10; -+pub const SYS_listxattr: ::c_long = 11; -+pub const SYS_llistxattr: ::c_long = 12; -+pub const SYS_flistxattr: ::c_long = 13; -+pub const SYS_removexattr: ::c_long = 14; -+pub const SYS_lremovexattr: ::c_long = 15; -+pub const SYS_fremovexattr: ::c_long = 16; -+pub const SYS_getcwd: ::c_long = 17; -+pub const SYS_lookup_dcookie: ::c_long = 18; -+pub const SYS_eventfd2: ::c_long = 19; -+pub const SYS_epoll_create1: ::c_long = 20; -+pub const SYS_epoll_ctl: ::c_long = 21; -+pub const SYS_epoll_pwait: ::c_long = 22; -+pub const SYS_dup: ::c_long = 23; -+pub const SYS_dup3: ::c_long = 24; -+pub const SYS_fcntl: ::c_long = 25; -+pub const SYS_inotify_init1: ::c_long = 26; -+pub const SYS_inotify_add_watch: ::c_long = 27; -+pub const SYS_inotify_rm_watch: ::c_long = 28; -+pub const SYS_ioctl: ::c_long = 29; -+pub const SYS_ioprio_set: ::c_long = 30; -+pub const SYS_ioprio_get: ::c_long = 31; -+pub const SYS_flock: ::c_long = 32; -+pub const SYS_mknodat: ::c_long = 33; -+pub const SYS_mkdirat: ::c_long = 34; -+pub const SYS_unlinkat: ::c_long = 35; -+pub const SYS_symlinkat: ::c_long = 36; -+pub const SYS_linkat: ::c_long = 37; -+pub const SYS_umount2: ::c_long = 39; -+pub const SYS_mount: ::c_long = 40; -+pub const SYS_pivot_root: ::c_long = 41; -+pub const SYS_nfsservctl: ::c_long = 42; -+pub const SYS_statfs: ::c_long = 43; -+pub const SYS_fstatfs: ::c_long = 44; -+pub const SYS_truncate: ::c_long = 45; -+pub const SYS_ftruncate: ::c_long = 46; -+pub const SYS_fallocate: ::c_long = 47; -+pub const SYS_faccessat: ::c_long = 48; -+pub const SYS_chdir: ::c_long = 49; -+pub const SYS_fchdir: ::c_long = 50; -+pub const SYS_chroot: ::c_long = 51; -+pub const SYS_fchmod: ::c_long = 52; -+pub const SYS_fchmodat: ::c_long = 53; -+pub const SYS_fchownat: ::c_long = 54; -+pub const SYS_fchown: ::c_long = 55; -+pub const SYS_openat: ::c_long = 56; -+pub const SYS_close: ::c_long = 57; -+pub const SYS_vhangup: ::c_long = 58; -+pub const SYS_pipe2: ::c_long = 59; -+pub const SYS_quotactl: ::c_long = 60; -+pub const SYS_getdents64: ::c_long = 61; -+pub const SYS_lseek: ::c_long = 62; -+pub const SYS_read: ::c_long = 63; -+pub const SYS_write: ::c_long = 64; -+pub const SYS_readv: ::c_long = 65; -+pub const SYS_writev: ::c_long = 66; -+pub const SYS_pread64: ::c_long = 67; -+pub const SYS_pwrite64: ::c_long = 68; -+pub const SYS_preadv: ::c_long = 69; -+pub const SYS_pwritev: ::c_long = 70; -+pub const SYS_sendfile: ::c_long = 71; -+pub const SYS_pselect6: ::c_long = 72; -+pub const SYS_ppoll: ::c_long = 73; -+pub const SYS_signalfd4: ::c_long = 74; -+pub const SYS_vmsplice: ::c_long = 75; -+pub const SYS_splice: ::c_long = 76; -+pub const SYS_tee: ::c_long = 77; -+pub const SYS_readlinkat: ::c_long = 78; -+pub const SYS_sync: ::c_long = 81; -+pub const SYS_fsync: ::c_long = 82; -+pub const SYS_fdatasync: ::c_long = 83; -+pub const SYS_sync_file_range: ::c_long = 84; -+pub const SYS_timerfd_create: ::c_long = 85; -+pub const SYS_timerfd_settime: ::c_long = 86; -+pub const SYS_timerfd_gettime: ::c_long = 87; -+pub const SYS_utimensat: ::c_long = 88; -+pub const SYS_acct: ::c_long = 89; -+pub const SYS_capget: ::c_long = 90; -+pub const SYS_capset: ::c_long = 91; -+pub const SYS_personality: ::c_long = 92; -+pub const SYS_exit: ::c_long = 93; -+pub const SYS_exit_group: ::c_long = 94; -+pub const SYS_waitid: ::c_long = 95; -+pub const SYS_set_tid_address: ::c_long = 96; -+pub const SYS_unshare: ::c_long = 97; -+pub const SYS_futex: ::c_long = 98; -+pub const SYS_set_robust_list: ::c_long = 99; -+pub const SYS_get_robust_list: ::c_long = 100; -+pub const SYS_nanosleep: ::c_long = 101; -+pub const SYS_getitimer: ::c_long = 102; -+pub const SYS_setitimer: ::c_long = 103; -+pub const SYS_kexec_load: ::c_long = 104; -+pub const SYS_init_module: ::c_long = 105; -+pub const SYS_delete_module: ::c_long = 106; -+pub const SYS_timer_create: ::c_long = 107; -+pub const SYS_timer_gettime: ::c_long = 108; -+pub const SYS_timer_getoverrun: ::c_long = 109; -+pub const SYS_timer_settime: ::c_long = 110; -+pub const SYS_timer_delete: ::c_long = 111; -+pub const SYS_clock_settime: ::c_long = 112; -+pub const SYS_clock_gettime: ::c_long = 113; -+pub const SYS_clock_getres: ::c_long = 114; -+pub const SYS_clock_nanosleep: ::c_long = 115; -+pub const SYS_syslog: ::c_long = 116; -+pub const SYS_ptrace: ::c_long = 117; -+pub const SYS_sched_setparam: ::c_long = 118; -+pub const SYS_sched_setscheduler: ::c_long = 119; -+pub const SYS_sched_getscheduler: ::c_long = 120; -+pub const SYS_sched_getparam: ::c_long = 121; -+pub const SYS_sched_setaffinity: ::c_long = 122; -+pub const SYS_sched_getaffinity: ::c_long = 123; -+pub const SYS_sched_yield: ::c_long = 124; -+pub const SYS_sched_get_priority_max: ::c_long = 125; -+pub const SYS_sched_get_priority_min: ::c_long = 126; -+pub const SYS_sched_rr_get_interval: ::c_long = 127; -+pub const SYS_restart_syscall: ::c_long = 128; -+pub const SYS_kill: ::c_long = 129; -+pub const SYS_tkill: ::c_long = 130; -+pub const SYS_tgkill: ::c_long = 131; -+pub const SYS_sigaltstack: ::c_long = 132; -+pub const SYS_rt_sigsuspend: ::c_long = 133; -+pub const SYS_rt_sigaction: ::c_long = 134; -+pub const SYS_rt_sigprocmask: ::c_long = 135; -+pub const SYS_rt_sigpending: ::c_long = 136; -+pub const SYS_rt_sigtimedwait: ::c_long = 137; -+pub const SYS_rt_sigqueueinfo: ::c_long = 138; -+pub const SYS_rt_sigreturn: ::c_long = 139; -+pub const SYS_setpriority: ::c_long = 140; -+pub const SYS_getpriority: ::c_long = 141; -+pub const SYS_reboot: ::c_long = 142; -+pub const SYS_setregid: ::c_long = 143; -+pub const SYS_setgid: ::c_long = 144; -+pub const SYS_setreuid: ::c_long = 145; -+pub const SYS_setuid: ::c_long = 146; -+pub const SYS_setresuid: ::c_long = 147; -+pub const SYS_getresuid: ::c_long = 148; -+pub const SYS_setresgid: ::c_long = 149; -+pub const SYS_getresgid: ::c_long = 150; -+pub const SYS_setfsuid: ::c_long = 151; -+pub const SYS_setfsgid: ::c_long = 152; -+pub const SYS_times: ::c_long = 153; -+pub const SYS_setpgid: ::c_long = 154; -+pub const SYS_getpgid: ::c_long = 155; -+pub const SYS_getsid: ::c_long = 156; -+pub const SYS_setsid: ::c_long = 157; -+pub const SYS_getgroups: ::c_long = 158; -+pub const SYS_setgroups: ::c_long = 159; -+pub const SYS_uname: ::c_long = 160; -+pub const SYS_sethostname: ::c_long = 161; -+pub const SYS_setdomainname: ::c_long = 162; -+pub const SYS_getrusage: ::c_long = 165; -+pub const SYS_umask: ::c_long = 166; -+pub const SYS_prctl: ::c_long = 167; -+pub const SYS_getcpu: ::c_long = 168; -+pub const SYS_gettimeofday: ::c_long = 169; -+pub const SYS_settimeofday: ::c_long = 170; -+pub const SYS_adjtimex: ::c_long = 171; -+pub const SYS_getpid: ::c_long = 172; -+pub const SYS_getppid: ::c_long = 173; -+pub const SYS_getuid: ::c_long = 174; -+pub const SYS_geteuid: ::c_long = 175; -+pub const SYS_getgid: ::c_long = 176; -+pub const SYS_getegid: ::c_long = 177; -+pub const SYS_gettid: ::c_long = 178; -+pub const SYS_sysinfo: ::c_long = 179; -+pub const SYS_mq_open: ::c_long = 180; -+pub const SYS_mq_unlink: ::c_long = 181; -+pub const SYS_mq_timedsend: ::c_long = 182; -+pub const SYS_mq_timedreceive: ::c_long = 183; -+pub const SYS_mq_notify: ::c_long = 184; -+pub const SYS_mq_getsetattr: ::c_long = 185; -+pub const SYS_msgget: ::c_long = 186; -+pub const SYS_msgctl: ::c_long = 187; -+pub const SYS_msgrcv: ::c_long = 188; -+pub const SYS_msgsnd: ::c_long = 189; -+pub const SYS_semget: ::c_long = 190; -+pub const SYS_semctl: ::c_long = 191; -+pub const SYS_semtimedop: ::c_long = 192; -+pub const SYS_semop: ::c_long = 193; -+pub const SYS_shmget: ::c_long = 194; -+pub const SYS_shmctl: ::c_long = 195; -+pub const SYS_shmat: ::c_long = 196; -+pub const SYS_shmdt: ::c_long = 197; -+pub const SYS_socket: ::c_long = 198; -+pub const SYS_socketpair: ::c_long = 199; -+pub const SYS_bind: ::c_long = 200; -+pub const SYS_listen: ::c_long = 201; -+pub const SYS_accept: ::c_long = 202; -+pub const SYS_connect: ::c_long = 203; -+pub const SYS_getsockname: ::c_long = 204; -+pub const SYS_getpeername: ::c_long = 205; -+pub const SYS_sendto: ::c_long = 206; -+pub const SYS_recvfrom: ::c_long = 207; -+pub const SYS_setsockopt: ::c_long = 208; -+pub const SYS_getsockopt: ::c_long = 209; -+pub const SYS_shutdown: ::c_long = 210; -+pub const SYS_sendmsg: ::c_long = 211; -+pub const SYS_recvmsg: ::c_long = 212; -+pub const SYS_readahead: ::c_long = 213; -+pub const SYS_brk: ::c_long = 214; -+pub const SYS_munmap: ::c_long = 215; -+pub const SYS_mremap: ::c_long = 216; -+pub const SYS_add_key: ::c_long = 217; -+pub const SYS_request_key: ::c_long = 218; -+pub const SYS_keyctl: ::c_long = 219; -+pub const SYS_clone: ::c_long = 220; -+pub const SYS_execve: ::c_long = 221; -+pub const SYS_mmap: ::c_long = 222; -+pub const SYS_fadvise64: ::c_long = 223; -+pub const SYS_swapon: ::c_long = 224; -+pub const SYS_swapoff: ::c_long = 225; -+pub const SYS_mprotect: ::c_long = 226; -+pub const SYS_msync: ::c_long = 227; -+pub const SYS_mlock: ::c_long = 228; -+pub const SYS_munlock: ::c_long = 229; -+pub const SYS_mlockall: ::c_long = 230; -+pub const SYS_munlockall: ::c_long = 231; -+pub const SYS_mincore: ::c_long = 232; -+pub const SYS_madvise: ::c_long = 233; -+pub const SYS_remap_file_pages: ::c_long = 234; -+pub const SYS_mbind: ::c_long = 235; -+pub const SYS_get_mempolicy: ::c_long = 236; -+pub const SYS_set_mempolicy: ::c_long = 237; -+pub const SYS_migrate_pages: ::c_long = 238; -+pub const SYS_move_pages: ::c_long = 239; -+pub const SYS_rt_tgsigqueueinfo: ::c_long = 240; -+pub const SYS_perf_event_open: ::c_long = 241; -+pub const SYS_accept4: ::c_long = 242; -+pub const SYS_recvmmsg: ::c_long = 243; -+pub const SYS_arch_specific_syscall: ::c_long = 244; -+pub const SYS_wait4: ::c_long = 260; -+pub const SYS_prlimit64: ::c_long = 261; -+pub const SYS_fanotify_init: ::c_long = 262; -+pub const SYS_fanotify_mark: ::c_long = 263; -+pub const SYS_name_to_handle_at: ::c_long = 264; -+pub const SYS_open_by_handle_at: ::c_long = 265; -+pub const SYS_clock_adjtime: ::c_long = 266; -+pub const SYS_syncfs: ::c_long = 267; -+pub const SYS_setns: ::c_long = 268; -+pub const SYS_sendmmsg: ::c_long = 269; -+pub const SYS_process_vm_readv: ::c_long = 270; -+pub const SYS_process_vm_writev: ::c_long = 271; -+pub const SYS_kcmp: ::c_long = 272; -+pub const SYS_finit_module: ::c_long = 273; -+pub const SYS_sched_setattr: ::c_long = 274; -+pub const SYS_sched_getattr: ::c_long = 275; -+pub const SYS_renameat2: ::c_long = 276; -+pub const SYS_seccomp: ::c_long = 277; -+pub const SYS_getrandom: ::c_long = 278; -+pub const SYS_memfd_create: ::c_long = 279; -+pub const SYS_bpf: ::c_long = 280; -+pub const SYS_execveat: ::c_long = 281; -+pub const SYS_userfaultfd: ::c_long = 282; -+pub const SYS_membarrier: ::c_long = 283; -+pub const SYS_mlock2: ::c_long = 284; -+pub const SYS_copy_file_range: ::c_long = 285; -+pub const SYS_preadv2: ::c_long = 286; -+pub const SYS_pwritev2: ::c_long = 287; -+pub const SYS_pkey_mprotect: ::c_long = 288; -+pub const SYS_pkey_alloc: ::c_long = 289; -+pub const SYS_pkey_free: ::c_long = 290; -+pub const SYS_statx: ::c_long = 291; -+pub const SYS_io_pgetevents: ::c_long = 292; -+pub const SYS_rseq: ::c_long = 293; -+pub const SYS_kexec_file_load: ::c_long = 294; -+pub const SYS_pidfd_send_signal: ::c_long = 424; -+pub const SYS_io_uring_setup: ::c_long = 425; -+pub const SYS_io_uring_enter: ::c_long = 426; -+pub const SYS_io_uring_register: ::c_long = 427; -+pub const SYS_open_tree: ::c_long = 428; -+pub const SYS_move_mount: ::c_long = 429; -+pub const SYS_fsopen: ::c_long = 430; -+pub const SYS_fsconfig: ::c_long = 431; -+pub const SYS_fsmount: ::c_long = 432; -+pub const SYS_fspick: ::c_long = 433; -+pub const SYS_pidfd_open: ::c_long = 434; -+pub const SYS_clone3: ::c_long = 435; -+pub const SYS_close_range: ::c_long = 436; -+pub const SYS_openat2: ::c_long = 437; -+pub const SYS_pidfd_getfd: ::c_long = 438; -+pub const SYS_faccessat2: ::c_long = 439; -+pub const SYS_process_madvise: ::c_long = 440; -+pub const SYS_epoll_pwait2: ::c_long = 441; -+pub const SYS_mount_setattr: ::c_long = 442; -+pub const SYS_quotactl_fd: ::c_long = 443; -+pub const SYS_landlock_create_ruleset: ::c_long = 444; -+pub const SYS_landlock_add_rule: ::c_long = 445; -+pub const SYS_landlock_restrict_self: ::c_long = 446; -+pub const SYS_process_mrelease: ::c_long = 448; -+pub const SYS_futex_waitv: ::c_long = 449; -+pub const SYS_set_mempolicy_home_node: ::c_long = 450; -+ -+pub const O_APPEND: ::c_int = 1024; -+pub const O_DIRECT: ::c_int = 0x4000; -+pub const O_DIRECTORY: ::c_int = 0x10000; -+pub const O_LARGEFILE: ::c_int = 0; -+pub const O_NOFOLLOW: ::c_int = 0x20000; -+pub const O_CREAT: ::c_int = 64; -+pub const O_EXCL: ::c_int = 128; -+pub const O_NOCTTY: ::c_int = 256; -+pub const O_NONBLOCK: ::c_int = 2048; -+pub const O_SYNC: ::c_int = 1052672; -+pub const O_RSYNC: ::c_int = 1052672; -+pub const O_DSYNC: ::c_int = 4096; -+pub const O_ASYNC: ::c_int = 4096; -+ -+pub const SIGSTKSZ: ::size_t = 16384; -+pub const MINSIGSTKSZ: ::size_t = 4096; -+ -+pub const ENAMETOOLONG: ::c_int = 36; -+pub const ENOLCK: ::c_int = 37; -+pub const ENOSYS: ::c_int = 38; -+pub const ENOTEMPTY: ::c_int = 39; -+pub const ELOOP: ::c_int = 40; -+pub const ENOMSG: ::c_int = 42; -+pub const EIDRM: ::c_int = 43; -+pub const ECHRNG: ::c_int = 44; -+pub const EL2NSYNC: ::c_int = 45; -+pub const EL3HLT: ::c_int = 46; -+pub const EL3RST: ::c_int = 47; -+pub const ELNRNG: ::c_int = 48; -+pub const EUNATCH: ::c_int = 49; -+pub const ENOCSI: ::c_int = 50; -+pub const EL2HLT: ::c_int = 51; -+pub const EBADE: ::c_int = 52; -+pub const EBADR: ::c_int = 53; -+pub const EXFULL: ::c_int = 54; -+pub const ENOANO: ::c_int = 55; -+pub const EBADRQC: ::c_int = 56; -+pub const EBADSLT: ::c_int = 57; -+pub const EMULTIHOP: ::c_int = 72; -+pub const EOVERFLOW: ::c_int = 75; -+pub const ENOTUNIQ: ::c_int = 76; -+pub const EBADFD: ::c_int = 77; -+pub const EBADMSG: ::c_int = 74; -+pub const EREMCHG: ::c_int = 78; -+pub const ELIBACC: ::c_int = 79; -+pub const ELIBBAD: ::c_int = 80; -+pub const ELIBSCN: ::c_int = 81; -+pub const ELIBMAX: ::c_int = 82; -+pub const ELIBEXEC: ::c_int = 83; -+pub const EILSEQ: ::c_int = 84; -+pub const ERESTART: ::c_int = 85; -+pub const ESTRPIPE: ::c_int = 86; -+pub const EUSERS: ::c_int = 87; -+pub const ENOTSOCK: ::c_int = 88; -+pub const EDESTADDRREQ: ::c_int = 89; -+pub const EMSGSIZE: ::c_int = 90; -+pub const EPROTOTYPE: ::c_int = 91; -+pub const ENOPROTOOPT: ::c_int = 92; -+pub const EPROTONOSUPPORT: ::c_int = 93; -+pub const ESOCKTNOSUPPORT: ::c_int = 94; -+pub const EOPNOTSUPP: ::c_int = 95; -+pub const ENOTSUP: ::c_int = EOPNOTSUPP; -+pub const EPFNOSUPPORT: ::c_int = 96; -+pub const EAFNOSUPPORT: ::c_int = 97; -+pub const EADDRINUSE: ::c_int = 98; -+pub const EADDRNOTAVAIL: ::c_int = 99; -+pub const ENETDOWN: ::c_int = 100; -+pub const ENETUNREACH: ::c_int = 101; -+pub const ENETRESET: ::c_int = 102; -+pub const ECONNABORTED: ::c_int = 103; -+pub const ECONNRESET: ::c_int = 104; -+pub const ENOBUFS: ::c_int = 105; -+pub const EISCONN: ::c_int = 106; -+pub const ENOTCONN: ::c_int = 107; -+pub const ESHUTDOWN: ::c_int = 108; -+pub const ETOOMANYREFS: ::c_int = 109; -+pub const ETIMEDOUT: ::c_int = 110; -+pub const ECONNREFUSED: ::c_int = 111; -+pub const EHOSTDOWN: ::c_int = 112; -+pub const EHOSTUNREACH: ::c_int = 113; -+pub const EALREADY: ::c_int = 114; -+pub const EINPROGRESS: ::c_int = 115; -+pub const ESTALE: ::c_int = 116; -+pub const EUCLEAN: ::c_int = 117; -+pub const ENOTNAM: ::c_int = 118; -+pub const ENAVAIL: ::c_int = 119; -+pub const EISNAM: ::c_int = 120; -+pub const EREMOTEIO: ::c_int = 121; -+pub const EDQUOT: ::c_int = 122; -+pub const ENOMEDIUM: ::c_int = 123; -+pub const EMEDIUMTYPE: ::c_int = 124; -+pub const ECANCELED: ::c_int = 125; -+pub const ENOKEY: ::c_int = 126; -+pub const EKEYEXPIRED: ::c_int = 127; -+pub const EKEYREVOKED: ::c_int = 128; -+pub const EKEYREJECTED: ::c_int = 129; -+pub const EOWNERDEAD: ::c_int = 130; -+pub const ENOTRECOVERABLE: ::c_int = 131; -+pub const EHWPOISON: ::c_int = 133; -+pub const ERFKILL: ::c_int = 132; -+ -+pub const SA_ONSTACK: ::c_int = 0x08000000; -+pub const SA_SIGINFO: ::c_int = 0x00000004; -+pub const SA_NOCLDWAIT: ::c_int = 0x00000002; -+ -+pub const SIGCHLD: ::c_int = 17; -+pub const SIGBUS: ::c_int = 7; -+pub const SIGTTIN: ::c_int = 21; -+pub const SIGTTOU: ::c_int = 22; -+pub const SIGXCPU: ::c_int = 24; -+pub const SIGXFSZ: ::c_int = 25; -+pub const SIGVTALRM: ::c_int = 26; -+pub const SIGPROF: ::c_int = 27; -+pub const SIGWINCH: ::c_int = 28; -+pub const SIGUSR1: ::c_int = 10; -+pub const SIGUSR2: ::c_int = 12; -+pub const SIGCONT: ::c_int = 18; -+pub const SIGSTOP: ::c_int = 19; -+pub const SIGTSTP: ::c_int = 20; -+pub const SIGURG: ::c_int = 23; -+pub const SIGIO: ::c_int = 29; -+pub const SIGSYS: ::c_int = 31; -+pub const SIGSTKFLT: ::c_int = 16; -+pub const SIGPOLL: ::c_int = 29; -+pub const SIGPWR: ::c_int = 30; -+pub const SIG_SETMASK: ::c_int = 2; -+pub const SIG_BLOCK: ::c_int = 0; -+pub const SIG_UNBLOCK: ::c_int = 1; -+ -+pub const F_GETLK: ::c_int = 5; -+pub const F_GETOWN: ::c_int = 9; -+pub const F_SETLK: ::c_int = 6; -+pub const F_SETLKW: ::c_int = 7; -+pub const F_SETOWN: ::c_int = 8; -+ -+pub const VEOF: usize = 4; -+ -+pub const POLLWRNORM: ::c_short = 0x100; -+pub const POLLWRBAND: ::c_short = 0x200; -+ -+pub const SOCK_STREAM: ::c_int = 1; -+pub const SOCK_DGRAM: ::c_int = 2; -+ -+pub const MAP_ANON: ::c_int = 0x0020; -+pub const MAP_GROWSDOWN: ::c_int = 0x0100; -+pub const MAP_DENYWRITE: ::c_int = 0x0800; -+pub const MAP_EXECUTABLE: ::c_int = 0x01000; -+pub const MAP_LOCKED: ::c_int = 0x02000; -+pub const MAP_NORESERVE: ::c_int = 0x04000; -+pub const MAP_POPULATE: ::c_int = 0x08000; -+pub const MAP_NONBLOCK: ::c_int = 0x010000; -+pub const MAP_STACK: ::c_int = 0x020000; -+pub const MAP_HUGETLB: ::c_int = 0x040000; -+pub const MAP_SYNC: ::c_int = 0x080000; -+ -+pub const MCL_CURRENT: ::c_int = 0x0001; -+pub const MCL_FUTURE: ::c_int = 0x0002; -+pub const MCL_ONFAULT: ::c_int = 0x0004; -+pub const CBAUD: ::tcflag_t = 0o0010017; -+pub const TAB1: ::c_int = 0x00000800; -+pub const TAB2: ::c_int = 0x00001000; -+pub const TAB3: ::c_int = 0x00001800; -+pub const CR1: ::c_int = 0x00000200; -+pub const CR2: ::c_int = 0x00000400; -+pub const CR3: ::c_int = 0x00000600; -+pub const FF1: ::c_int = 0x00008000; -+pub const BS1: ::c_int = 0x00002000; -+pub const VT1: ::c_int = 0x00004000; -+pub const VWERASE: usize = 14; -+pub const VREPRINT: usize = 12; -+pub const VSUSP: usize = 10; -+pub const VSTART: usize = 8; -+pub const VSTOP: usize = 9; -+pub const VDISCARD: usize = 13; -+pub const VTIME: usize = 5; -+pub const IXON: ::tcflag_t = 0x00000400; -+pub const IXOFF: ::tcflag_t = 0x00001000; -+pub const ONLCR: ::tcflag_t = 0x4; -+pub const CSIZE: ::tcflag_t = 0x00000030; -+pub const CS6: ::tcflag_t = 0x00000010; -+pub const CS7: ::tcflag_t = 0x00000020; -+pub const CS8: ::tcflag_t = 0x00000030; -+pub const CSTOPB: ::tcflag_t = 0x00000040; -+pub const CREAD: ::tcflag_t = 0x00000080; -+pub const PARENB: ::tcflag_t = 0x00000100; -+pub const PARODD: ::tcflag_t = 0x00000200; -+pub const HUPCL: ::tcflag_t = 0x00000400; -+pub const CLOCAL: ::tcflag_t = 0x00000800; -+pub const ECHOKE: ::tcflag_t = 0x00000800; -+pub const ECHOE: ::tcflag_t = 0x00000010; -+pub const ECHOK: ::tcflag_t = 0x00000020; -+pub const ECHONL: ::tcflag_t = 0x00000040; -+pub const ECHOPRT: ::tcflag_t = 0x00000400; -+pub const ECHOCTL: ::tcflag_t = 0x00000200; -+pub const ISIG: ::tcflag_t = 0x00000001; -+pub const ICANON: ::tcflag_t = 0x00000002; -+pub const PENDIN: ::tcflag_t = 0x00004000; -+pub const NOFLSH: ::tcflag_t = 0x00000080; -+pub const CIBAUD: ::tcflag_t = 0o02003600000; -+pub const CBAUDEX: ::tcflag_t = 0o010000; -+pub const VSWTC: usize = 7; -+pub const OLCUC: ::tcflag_t = 0o000002; -+pub const NLDLY: ::tcflag_t = 0o000400; -+pub const CRDLY: ::tcflag_t = 0o003000; -+pub const TABDLY: ::tcflag_t = 0o014000; -+pub const BSDLY: ::tcflag_t = 0o020000; -+pub const FFDLY: ::tcflag_t = 0o100000; -+pub const VTDLY: ::tcflag_t = 0o040000; -+pub const XTABS: ::tcflag_t = 0o014000; -+pub const B57600: ::speed_t = 0o010001; -+pub const B115200: ::speed_t = 0o010002; -+pub const B230400: ::speed_t = 0o010003; -+pub const B460800: ::speed_t = 0o010004; -+pub const B500000: ::speed_t = 0o010005; -+pub const B576000: ::speed_t = 0o010006; -+pub const B921600: ::speed_t = 0o010007; -+pub const B1000000: ::speed_t = 0o010010; -+pub const B1152000: ::speed_t = 0o010011; -+pub const B1500000: ::speed_t = 0o010012; -+pub const B2000000: ::speed_t = 0o010013; -+pub const B2500000: ::speed_t = 0o010014; -+pub const B3000000: ::speed_t = 0o010015; -+pub const B3500000: ::speed_t = 0o010016; -+pub const B4000000: ::speed_t = 0o010017; -+ -+pub const EDEADLK: ::c_int = 35; -+pub const EDEADLOCK: ::c_int = EDEADLK; -+pub const EXTPROC: ::tcflag_t = 0x00010000; -+pub const VEOL: usize = 11; -+pub const VEOL2: usize = 16; -+pub const VMIN: usize = 6; -+pub const IEXTEN: ::tcflag_t = 0x00008000; -+pub const TOSTOP: ::tcflag_t = 0x00000100; -+pub const FLUSHO: ::tcflag_t = 0x00001000; -+ -+cfg_if! { -+ if #[cfg(libc_align)] { -+ mod align; -+ pub use self::align::*; -+ } -+} -diff --git a/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/mod.rs b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/mod.rs -index f437355d9..fc1e275df 100644 ---- a/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/mod.rs -+++ b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/mod.rs -@@ -161,6 +161,9 @@ cfg_if! { - } else if #[cfg(any(target_arch = "riscv64"))] { - mod riscv64; - pub use self::riscv64::*; -+ } else if #[cfg(any(target_arch = "loongarch64"))] { -+ mod loongarch64; -+ pub use self::loongarch64::*; - } else { - // Unknown target_arch - } -diff --git a/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/mod.rs b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/mod.rs -index 4c6053389..40b7ac786 100644 ---- a/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/mod.rs -+++ b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/mod.rs -@@ -791,7 +791,8 @@ cfg_if! { - target_arch = "mips64", - target_arch = "powerpc64", - target_arch = "s390x", -- target_arch = "riscv64"))] { -+ target_arch = "riscv64", -+ target_arch = "loongarch64"))] { - mod b64; - pub use self::b64::*; - } else if #[cfg(any(target_arch = "x86", --- -2.44.0 - diff --git a/main/rust/APKBUILD b/main/rust/APKBUILD index d7208dc1849..b93e1aed782 100644 --- a/main/rust/APKBUILD +++ b/main/rust/APKBUILD @@ -7,10 +7,10 @@ # Contributor: omni <omni+alpine@hack.org> # Maintainer: team/rust <alpine@ptrcnull.me> pkgname=rust -pkgver=1.77.0 +pkgver=1.78.0 _llvmver=17 -_bootver=1.76.0 -pkgrel=1 +_bootver=1.77.0 +pkgrel=0 pkgdesc="Rust Programming Language toolchain" url="https://www.rust-lang.org/" arch="all" @@ -97,16 +97,13 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.xz revert-rustc_codegen_ssa-use-try_canonicalize-in-rpath.patch system-wasm-ld.patch - 0001-Add-new-Tier-3-target-loongarch64-unknown-linux-musl.patch - 0002-tests-Add-loongarch64-unknown-linux-musl-target.patch - 0005-configure.py-add-flag-for-loongarch64-musl-root.patch - 0006-ci-Add-support-for-dist-loongarch64-musl.patch - 0007-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch - 0008-vendor-libc-Add-support-for-loongarch64-linux-musl.patch - 0009-vendor-libc-0.2.148-Add-support-for-loongarch64-linu.patch - 0010-vendor-libc-0.2.150-Add-support-for-loongarch64-linu.patch - 0011-vendor-compiler_builtins-Add-support-for-loongarch64.patch - 0012-vendor-openssl-src-Add-support-for-loongarch64-linux.patch + 0001-ci-Add-support-for-dist-loongarch64-musl.patch + 0002-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch + 0003-vendor-libc-Add-support-for-loongarch64-linux-musl.patch + 0004-vendor-libc-0.2.151-Add-support-for-loongarch64-linu.patch + 0005-vendor-compiler_builtins-Add-support-for-loongarch64.patch + 0006-vendor-openssl-src-Add-support-for-loongarch64-linux.patch + 0007-Revert-loongarch-add-frecipe-and-relax-target-featur.patch check-rustc " @@ -185,8 +182,7 @@ _unpack_build_dist() { prepare() { default_prepare _clear_vendor_checksums libc - _clear_vendor_checksums libc-0.2.148 - _clear_vendor_checksums libc-0.2.150 + _clear_vendor_checksums libc-0.2.151 _clear_vendor_checksums compiler_builtins _clear_vendor_checksums openssl-src } @@ -478,27 +474,24 @@ _mv() { } sha512sums=" -59f19d9def93b613ac72925625e6662622f445506489b8f1cd405d037c28becd53ae1446b46edfd63734f6f236af2dc326a57a184f01bc10d497c96227f09034 rustc-1.77.0-src.tar.xz +d2fb9881e28849d871fda71b1b51652be3839b3283f0d32163f258c5c707a9fb7b589da8dc03bca2fefee1abdd2b44a5f17e85d8c6df7bea119d1e8d22371941 rustc-1.78.0-src.tar.xz 9de9d7ad05584e3cafddedcac409a4605a1d67e82260220deb3efd965603ee3148062b081c0cd736e50d82daad3a723fb6a7493fdf4dddfe36288645425a7946 alpine-move-py-scripts-to-share.patch -3ff7914ff697b3ba29c5225fe8db58587c1a109d0690ef968b7e0d9453ece81be96aa502453292af3ba5d841d49e41d7e0d45b3ed700dcb944adb009ae7ef4cd alpine-target.patch -b4f09270f4e1677975d12447be9960271b00ffb8ab55987864c306fa45b8f70bdb82fd89e5fa7ad1cf604a1c91fbac8f3753b29dc98e10e7f47edf13d9071d77 do-not-install-libunwind-source.patch -d4531905520b3fc699fbf57b267130bdbca94e2773a710e8b4c618ae3895149312934dd92d1988860c6dd102af50e05264b49a01662d5621c26de3604c753d6a gcc-eh-libunwind.patch +a2675849426b2aecdcbf702fd3d8ba6fffaa69736105c5afa6109a55c25c9e795f7a99f4fff250e24dbf8783cea57c1655a41b5af1848a7221956245877866c5 alpine-target.patch +0d9e5ee4ebf647d3c44dc59b8991d330f2eb0cfa788768c5c9c5f5b57327c3a46b26e93641753a32335d0e3e76a0ab95bb6ad8279913b0c76c752624b139c5c1 do-not-install-libunwind-source.patch +cfdb3499fa6b3dea5ff7d3fd266ab0e34571fd48fa17c5e0f1467b8896087979555209dd256c50d357fdca1859feade9bf4c8f7b5cf003a16891350d0a34d00b gcc-eh-libunwind.patch b283d31cc8d6559aa639d44f776e97c2a1e0f23c717b6784e549861b881555bd467fa6023180866aae81a9a58c5f83e306940ee645f3c6733a1bdef6130036c9 install-template-shebang.patch a32f3a9bcab771cce6be2ad936cd4edad3bb638f38da02e79c29cfed967eb0edcdf47ae892bbdd2959cebb5c74dee3fcc752dc2405f761d5c8ecc0021abb24a0 musl-fix-linux_musl_base.patch -fdcfa99321d6913321e9cc5e7ec8a204bbcd78fbb9cc4a3ddac363ab313d7b00ffca95a70670190342cb8bbf7af8ca5547edffe06a79ead68e921ebbf0561d86 need-rpath.patch -b6bf7be0b2eb2d31b4d9979852d5ec3ebc05d005b82e2f6b02394da6c43502729d32086ec2ffaf42f1006838ea5c2898b82a4172f9053fe08e978adcb711d5fa need-ssp_nonshared.patch -da5ea8ea2360ba6fdc2b3f29063baf978af19f7ff106d0511912b1357e1e613dae0417d3b55fb2aafb4e97d1749cb01046d76c6a27a03e384468e2d26c2a30dc no-export-ld-library-path.patch +f3051a7d67cf7937867d50a3169d391718d1d8a33f69066f08020df45e131076a811e9b9429e448460ff129bb2ebbf429b3cb5a4d05e188dace18f576a33562c need-rpath.patch +c5a94cc3518f3dbefb2011d1c4267530062843262133332cff96db2e779d7f9b57bdab336c50b927b1c84855db4fa1ab8eb62098286746c8dcf50a779ce0202b need-ssp_nonshared.patch +0688d21b59aa47867cf2a307bf997a996f14435a2931cdbbddcfe52c899f00d2676cdc67aeff2c4fbbc220fdb21d8405ec206e96aece93904a6541ba7438f649 no-export-ld-library-path.patch 74c0d14a68c2d7355f15ec3704d387556ad337e4991831e94951906d17aeb60387d20586a63cf6cdc62b46c60e1874340a250196ec2b3e75c268af1c41fae7e9 revert-rustc_codegen_ssa-use-try_canonicalize-in-rpath.patch 5216e083a1709b3ecbbdeaaaf0e112ec88e7534952fdadf834ce864b55768e15d7d181c14127d4ef39f66ca2a94dd40eddb2c4ab297081d75e5f3a09dcbcfa56 system-wasm-ld.patch -403cf84bf18587b0092d34bc17848bf4a9c46ebf053a696f026cb744559f2f93973258de3a1362cd369e5aae55bec90f77c835c8c583c8fe981e94d6351d25ee 0001-Add-new-Tier-3-target-loongarch64-unknown-linux-musl.patch -ec62ef0adf45b1a066508b19c2791b3f2c5c97399b7f77c8c6340ce08e0e6489db81959c703fd22544dc4228cd35b98efe2229da4f13c655bcb179c4fb216a9d 0002-tests-Add-loongarch64-unknown-linux-musl-target.patch -10ab89038206ed875fab64b7fa2d92500c19ecb5cdb3341bad37f37aebe1e253b0647469794a8afa344e9ade207bdc32b6d3418db1ce5872e7ee312179ced374 0005-configure.py-add-flag-for-loongarch64-musl-root.patch -a776824a63752cd46bfe954985558502751f3a9e4cf70b46a3fd4513b188209b99e7c7b11e1998a89d2155a199b3b9f8ecc4389df4e8fc4b983a3d387a4fea06 0006-ci-Add-support-for-dist-loongarch64-musl.patch -2473d80908b936cefdd99cb3c7e56ec6c714af0ae6d606f5459bfbe2d3713ac9e11ea642a8481b224d6c89074386802eb005a8a9d666d6a597a0cbcd35a19af9 0007-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch -6c4eee378995816f6da26bdea6c781e106be79ba9772d91544fbde781ab2f6de98809c6a8a6b553f1feef79ace06fb712ba87c3e554e227ad39426834fcd069a 0008-vendor-libc-Add-support-for-loongarch64-linux-musl.patch -f3b3253106d391d0ea5390b3566704ee4d7aa4c08a5fc0b095b8ca0f0e8272c265ac99b500110653d9321438429f374726fb8291ab98017507df17e23879ef42 0009-vendor-libc-0.2.148-Add-support-for-loongarch64-linu.patch -039a25e1ed0eae1226a021ce51b76b2ab287d2d807c912e835cef758b5ff6e97e37f8ce29ea3297c8258fd587c08ecc33665371335e3bd227549b901e2f4b8af 0010-vendor-libc-0.2.150-Add-support-for-loongarch64-linu.patch -808e5cb5e3e0cc991ded0875e6f9cad7b72854f004ce5b626f45169ca10dc1d0d6f6b30bbe573b7daec82636edac94792522e7d9f5a13a67fd9fb0d9db1a0757 0011-vendor-compiler_builtins-Add-support-for-loongarch64.patch -54ed2846e621aea0dd42e7a1e65bdea0d6ff2dcd396770f33ee1b9a3ed33e6b36e230643e3d444dd12285f30eceed7c66a9c83fbcd23c784fa5b9785aaf37ad1 0012-vendor-openssl-src-Add-support-for-loongarch64-linux.patch +a776824a63752cd46bfe954985558502751f3a9e4cf70b46a3fd4513b188209b99e7c7b11e1998a89d2155a199b3b9f8ecc4389df4e8fc4b983a3d387a4fea06 0001-ci-Add-support-for-dist-loongarch64-musl.patch +2473d80908b936cefdd99cb3c7e56ec6c714af0ae6d606f5459bfbe2d3713ac9e11ea642a8481b224d6c89074386802eb005a8a9d666d6a597a0cbcd35a19af9 0002-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch +6c4eee378995816f6da26bdea6c781e106be79ba9772d91544fbde781ab2f6de98809c6a8a6b553f1feef79ace06fb712ba87c3e554e227ad39426834fcd069a 0003-vendor-libc-Add-support-for-loongarch64-linux-musl.patch +ca8880cdf0c5a5e55d5b0ad6441d90d42e4a143bc8183cf1eefa8f0300e461f57ddc8bfb58547f3693c8e746f75ac6f5a89a85679e5cb43f71a27d69df520da7 0004-vendor-libc-0.2.151-Add-support-for-loongarch64-linu.patch +808e5cb5e3e0cc991ded0875e6f9cad7b72854f004ce5b626f45169ca10dc1d0d6f6b30bbe573b7daec82636edac94792522e7d9f5a13a67fd9fb0d9db1a0757 0005-vendor-compiler_builtins-Add-support-for-loongarch64.patch +54ed2846e621aea0dd42e7a1e65bdea0d6ff2dcd396770f33ee1b9a3ed33e6b36e230643e3d444dd12285f30eceed7c66a9c83fbcd23c784fa5b9785aaf37ad1 0006-vendor-openssl-src-Add-support-for-loongarch64-linux.patch +2144b8fdb6e413a51535276b320d1aa2e4d8dddc86f241360997b9fc2ea9f7450c33a5957dd54e54e3b80438316d5067482a80f692fe67ffb331c77d553b3c3a 0007-Revert-loongarch-add-frecipe-and-relax-target-featur.patch c31fdfe8a9b3411576c75da46645cf0465b9053000a2ab49cf9b2f2733f679d6d33acbf236d67a20e14935d094a685453b7f1840180249f39d610fd0902c3125 check-rustc " diff --git a/main/rust/alpine-target.patch b/main/rust/alpine-target.patch index fd79a882c0e..93565c28aef 100644 --- a/main/rust/alpine-target.patch +++ b/main/rust/alpine-target.patch @@ -77,7 +77,7 @@ and distribution-specific quirks instead of polluting the main musl target of +} --- rustc-1.48.0-src.orig/compiler/rustc_target/src/spec/mod.rs +++ rustc-1.48.0-src/compiler/rustc_target/src/spec/mod.rs -@@ -1397,6 +1397,17 @@ +@@ -1414,6 +1414,17 @@ } supported_targets! { diff --git a/main/rust/do-not-install-libunwind-source.patch b/main/rust/do-not-install-libunwind-source.patch index 3bcf3999749..8b97d43b8cd 100644 --- a/main/rust/do-not-install-libunwind-source.patch +++ b/main/rust/do-not-install-libunwind-source.patch @@ -8,7 +8,7 @@ dependencies prior to building. diff -Naur rustc-1.48.0-src.orig/src/bootstrap/dist.rs rustc-1.48.0-src/src/bootstrap/dist.rs --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs -@@ -909,7 +909,7 @@ +@@ -910,7 +910,7 @@ copy_src_dirs( builder, &builder.src, diff --git a/main/rust/gcc-eh-libunwind.patch b/main/rust/gcc-eh-libunwind.patch index eb29bf6cbed..10d12dd7f63 100644 --- a/main/rust/gcc-eh-libunwind.patch +++ b/main/rust/gcc-eh-libunwind.patch @@ -23,7 +23,7 @@ error: aborting due to previous error --- a/library/unwind/src/lib.rs +++ b/library/unwind/src/lib.rs -@@ -53,7 +53,10 @@ +@@ -59,7 +59,10 @@ #[link(name = "unwind", cfg(not(target_feature = "crt-static")))] extern "C" {} } else { diff --git a/main/rust/need-rpath.patch b/main/rust/need-rpath.patch index 6d3fb74c5eb..b297bbee236 100644 --- a/main/rust/need-rpath.patch +++ b/main/rust/need-rpath.patch @@ -13,7 +13,7 @@ Hacky hacky! --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs -@@ -1983,6 +1983,8 @@ pub struct TargetOptions { +@@ -2028,6 +2028,8 @@ pub struct TargetOptions { pub allows_weak_linkage: bool, /// Whether the linker support rpaths or not. Defaults to false. pub has_rpath: bool, @@ -22,7 +22,7 @@ Hacky hacky! /// Whether to disable linking to the default libraries, typically corresponds /// to `-nodefaultlibs`. Defaults to true. pub no_default_libraries: bool, -@@ -2317,6 +2319,7 @@ impl Default for TargetOptions { +@@ -2372,6 +2374,7 @@ impl Default for TargetOptions { default_dwarf_version: 4, allows_weak_linkage: true, has_rpath: false, @@ -30,7 +30,7 @@ Hacky hacky! no_default_libraries: true, position_independent_executables: false, static_position_independent_executables: false, -@@ -3042,6 +3045,7 @@ impl Target { +@@ -3122,6 +3125,7 @@ impl Target { key!(default_dwarf_version, u32); key!(allows_weak_linkage, bool); key!(has_rpath, bool); @@ -38,7 +38,7 @@ Hacky hacky! key!(no_default_libraries, bool); key!(position_independent_executables, bool); key!(static_position_independent_executables, bool); -@@ -3297,6 +3301,7 @@ impl ToJson for Target { +@@ -3379,6 +3383,7 @@ impl ToJson for Target { target_option_val!(default_dwarf_version); target_option_val!(allows_weak_linkage); target_option_val!(has_rpath); @@ -48,7 +48,7 @@ Hacky hacky! target_option_val!(static_position_independent_executables); --- a/compiler/rustc_codegen_ssa/src/back/link.rs.orig +++ b/compiler/rustc_codegen_ssa/src/back/link.rs -@@ -2036,7 +2036,10 @@ +@@ -2072,7 +2072,10 @@ // FIXME (#2397): At some point we want to rpath our guesses as to // where extern libraries might live, based on the // add_lib_search_paths diff --git a/main/rust/need-ssp_nonshared.patch b/main/rust/need-ssp_nonshared.patch index 68b652e25d9..184f8a34962 100644 --- a/main/rust/need-ssp_nonshared.patch +++ b/main/rust/need-ssp_nonshared.patch @@ -6,7 +6,7 @@ diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs index 68c9520..63f8a48 100644 --- a/library/std/src/sys/pal/unix/mod.rs +++ b/library/std/src/sys/pal/unix/mod.rs -@@ -379,6 +379,9 @@ cfg_if::cfg_if! { +@@ -376,6 +376,9 @@ cfg_if::cfg_if! { #[link(name = "dl", cfg(not(target_feature = "crt-static")))] #[link(name = "log", cfg(not(target_feature = "crt-static")))] extern "C" {} diff --git a/main/rust/no-export-ld-library-path.patch b/main/rust/no-export-ld-library-path.patch index feff239bdaa..86cc3fe5392 100644 --- a/main/rust/no-export-ld-library-path.patch +++ b/main/rust/no-export-ld-library-path.patch @@ -12,7 +12,7 @@ diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 7c36bb264..b4f9b7066 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py -@@ -893,12 +893,6 @@ class RustBuild(object): +@@ -895,12 +895,6 @@ class RustBuild(object): del env["CARGO_BUILD_TARGET"] env["CARGO_TARGET_DIR"] = build_dir env["RUSTC"] = self.rustc() diff --git a/main/s6/APKBUILD b/main/s6/APKBUILD index f458f368a86..eae1ed4afd5 100644 --- a/main/s6/APKBUILD +++ b/main/s6/APKBUILD @@ -1,8 +1,8 @@ # Contributor: John Regan <john@jrjrtech.com> # Maintainer: Laurent Bercot <ska-devel@skarnet.org> pkgname=s6 -pkgver=2.12.0.3 -pkgrel=2 +pkgver=2.12.0.4 +pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite." url=https://skarnet.org/software/s6/ arch="all" @@ -46,7 +46,7 @@ ipcserver() { } sha512sums=" -ecc57b5a06fb413d74337324f8942c905075cf14d87c1471568a836c747271cf95d0edecac69dea54cee55f7a3dbd102493876356c2d36065ab35962b87b559a s6-2.12.0.3.tar.gz -bcb503c64fe4644b8f33775e94f03f08e422854247d14c9ff85f5d593b37fb2373fadf373da4226a1e2f4eba17a99fdcd40acb3645f8533f2f3e1a55c984f053 s6-svscanboot +dfdb9c0189177762a89d1f47e1d6b0a82bba5554baef4fa899b1c0a85c192d5e1dac2b929173d750df3707f0d699b28591f1eab3e63b8791e4a51af1c65e3e56 s6-2.12.0.4.tar.gz +9104c3d18a36c8aaa51da553cc045881438ad55f251ba8155e90143cb9a0d3723d22cbbaeb0388e9bc162bda89d8028a6202b0b7ceca01c8d1f197bb990d128d s6-svscanboot d4ff33bbd674160f3d47ed8d566fe756ee5a54e1e8febd7d873f5f5158d1c4eeac1ddf460fbc6f23b75a8ee2d007117c3ababa6311ae9dcc5ad087dc4a154eee s6.initd " diff --git a/main/s6/s6-svscanboot b/main/s6/s6-svscanboot index 6f3f5b78717..89cac2f7344 100644 --- a/main/s6/s6-svscanboot +++ b/main/s6/s6-svscanboot @@ -1,32 +1,26 @@ #!/bin/execlineb -S1 -foreground { redirfd -w 2 /dev/null mkdir -p /run/uncaught-logs } +if { mkdir -p /run/uncaught-logs ${1}/s6-svscan-log } if { chown catchlog:catchlog /run/uncaught-logs } if { chmod 2700 /run/uncaught-logs } -foreground { redirfd -w 2 /dev/null mkdir -p ${1}/.s6-svscan ${1}/s6-svscan-log } -foreground { redirfd -w 2 /dev/null ln -sf /bin/false ${1}/.s6-svscan/crash } -if -{ - redirfd -w 1 ${1}/.s6-svscan/finish - heredoc 0 "#!/bin/execlineb -P\ns6-svc -x -- \"${1}/s6-svscan-log\"\n" - cat -} -if { chmod 0755 ${1}/.s6-svscan/finish } +if { redirfd -w 1 ${1}/s6-svscan-log/notification-fd echo 3 } foreground { redirfd -w 2 /dev/null mkfifo -m 0600 ${1}/s6-svscan-log/fifo } +unexport ? if { redirfd -w 1 ${1}/s6-svscan-log/run - heredoc 0 "#!/bin/execlineb -P -redirfd -w 2 /dev/console + heredoc 0 "#!/bin/execlineb -S1 +fdmove -c 1 2 redirfd -rnb 0 fifo s6-setuidgid catchlog exec -c -s6-log t /run/uncaught-logs\n" +s6-log -bpd3 -- t /run/uncaught-logs\n" cat } if { chmod 0755 ${1}/s6-svscan-log/run } redirfd -r 0 /dev/null +redirfd -w 3 /dev/console redirfd -wnb 1 ${1}/s6-svscan-log/fifo fdmove -c 2 1 -s6-svscan -- ${1} +s6-svscan -X3 -- ${1} diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index f3fede60785..d17f253c4ee 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=samba pkgver=4.19.5 -pkgrel=1 +pkgrel=2 pkgdesc="Tools to access a server's filespace and printers via SMB" url="https://www.samba.org/" arch="all" @@ -258,20 +258,19 @@ _common() { install -d -m700 "$subpkgdir"/var/lib/$pkgname/private } -# common-libs is an attempt to avoid libpython dependency for libsmbclient +# samba-libs-py3 is an attempt to avoid libpython dependency for libsmbclient _libs_py3() { pkgdesc="Libraries that require libpython" - depends= + depends="$pkgname-libs=$pkgver-r$pkgrel" amove \ usr/lib/$pkgname/libsamba-net*samba4.so \ usr/lib/$pkgname/libsamba-python*samba4.so - return 0 } # may depend on samba-common-server-libs but not samba-server-libs _common_tools() { pkgdesc="Tools for Samba servers and clients" - depends= + depends="$pkgname-libs=$pkgver-r$pkgrel" amove \ usr/bin/net \ usr/bin/pdbedit \ @@ -287,7 +286,7 @@ _common_tools() { # should not depend on client libs _common_server_libs() { pkgdesc="Samba libraries shared by common-tools and servers" # not shared with clients - depends="" + depends="$pkgname-libs=$pkgver-r$pkgrel" amove \ usr/lib/libdcerpc-server-core.so.* \ usr/lib/libnetapi.so.* \ @@ -301,7 +300,7 @@ _common_server_libs() { libsmbclient() { pkgdesc="The SMB client library" - depends= + depends="$pkgname-libs=$pkgver-r$pkgrel" amove \ usr/lib/libsmbclient.so.* } @@ -309,7 +308,7 @@ libsmbclient() { # should only depend on samba-util-libs, libwbclient and samba-libs _client_libs() { pkgdesc="Samba libraries used by clients" - depends= + depends="$pkgname-libs=$pkgver-r$pkgrel" amove \ usr/lib/$pkgname/libad-claims-samba4.so \ usr/lib/$pkgname/libauthn-policy-util-samba4.so \ @@ -329,8 +328,10 @@ _client_libs() { client() { pkgdesc="Samba client programs" - depends="$pkgname-common=$pkgver-r$pkgrel" - cd "$pkgdir" + depends=" + $pkgname-libs=$pkgver-r$pkgrel + $pkgname-common=$pkgver-r$pkgrel + " amove \ usr/bin/cifsdd \ usr/bin/dumpmscat \ @@ -360,7 +361,7 @@ client() { # should not pull in samba-client-libs _server_libs() { pkgdesc="Samba libraries shared by server and windbind" - depends= + depends="$pkgname-libs=$pkgver-r$pkgrel" amove \ usr/lib/$pkgname/libdcerpc-samba4.so \ usr/lib/$pkgname/libidmap-samba4.so \ @@ -370,7 +371,10 @@ _server_libs() { # should not pull in samba-client-libs winbind() { pkgdesc="Samba user and group resolver" - depends="$pkgname-common=$pkgver-r$pkgrel" + depends=" + $pkgname-libs=$pkgver-r$pkgrel + $pkgname-common=$pkgver-r$pkgrel + " install="winbind.pre-install winbind.pre-upgrade winbind.post-install winbind.post-upgrade" amove \ @@ -407,7 +411,7 @@ libwbclient() { _winbind_clients() { pkgdesc="Samba winbind client tools" - depends= + depends="$pkgname-libs=$pkgver-r$pkgrel" amove \ usr/bin/ntlm_auth \ usr/bin/wbinfo @@ -423,7 +427,7 @@ _libnss_winbind() { _winbind_krb5_locator() { pkgdesc="Samba winbind krb5 locator" - depends= + depends="$pkgname-libs=$pkgver-r$pkgrel" amove \ usr/lib/samba/krb5 } @@ -439,11 +443,14 @@ _pam_winbind() { dc() { pkgdesc="Samba AD Domain Controller" - depends="$pkgname-common=$pkgver-r$pkgrel + depends=" + $pkgname-libs=$pkgver-r$pkgrel + $pkgname-common=$pkgver-r$pkgrel $pkgname-server=$pkgver-r$pkgrel $pkgname-winbind=$pkgver-r$pkgrel py3-$pkgname=$pkgver-r$pkgrel - $_dc_deps" + $_dc_deps + " amove \ usr/bin/samba-tool \ usr/sbin/samba* \ @@ -457,6 +464,7 @@ dc() { _dc_libs() { pkgdesc="Samba AD Domain Controller libraries" + depends="$pkgname-libs=$pkgver-r$pkgrel" amove \ usr/lib/libdcerpc-samr.so.* \ usr/lib/libdcerpc-server.so.* \ @@ -483,7 +491,10 @@ _dc_libs() { server() { pkgdesc="Samba server" - depends="$pkgname-common=$pkgver-r$pkgrel" + depends=" + $pkgname-libs=$pkgver-r$pkgrel + $pkgname-common=$pkgver-r$pkgrel + " amove \ usr/sbin/nmbd \ usr/sbin/smbd \ @@ -510,14 +521,17 @@ pidl() { _py3() { pkgdesc="Samba python libraries" - depends="py3-tdb" + depends=" + $pkgname-libs=$pkgver-r$pkgrel + py3-tdb + " mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } _test() { pkgdesc="Samba server and client testing tools" - depends= + depends="$pkgname-libs=$pkgver-r$pkgrel" amove \ usr/bin/gentest \ usr/bin/locktest \ @@ -531,7 +545,7 @@ _test() { # avoid samba-libs and libsmbclient depending on pam _libauth() { pkgdesc="Samba auth library shared by common-tools, server and clients" - depends= + depends="$pkgname-libs=$pkgver-r$pkgrel" amove usr/lib/$pkgname/libauth-samba4.so } @@ -539,7 +553,10 @@ _libauth() { # should only depend on samba-util-libs and libwbclient libs() { pkgdesc="Samba core libraries shared by common-tools, server and clients" - depends= + depends=" + $pkgname-util-libs=$pkgver-r$pkgrel + libwbclient=$pkgver-r$pkgrel + " # heimdal libs amove \ usr/lib/$pkgname/libasn1-samba4.so* \ diff --git a/main/sbsigntool/APKBUILD b/main/sbsigntool/APKBUILD index c28aa66021f..1e7ab15183d 100644 --- a/main/sbsigntool/APKBUILD +++ b/main/sbsigntool/APKBUILD @@ -7,7 +7,7 @@ pkgrel=2 _ccancommit=b1f28e17227f2320d07fe052a8a48942fe17caa5 pkgdesc="Secure Boot signing tools" url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/" -arch="all !armhf !s390x !ppc64le !mips !mips64" # limited by gnu-efi +arch="all !armhf !s390x !ppc64le !loongarch64" # limited by gnu-efi license="GPL-3.0-or-later WITH cryptsetup-OpenSSL-exception" makedepends="autoconf automake bash binutils-dev gnu-efi-dev help2man openssl-dev>3 util-linux-dev" options="!check" # testsuite is not functional diff --git a/main/secureboot-hook/APKBUILD b/main/secureboot-hook/APKBUILD index 976f359888c..464d31364fc 100644 --- a/main/secureboot-hook/APKBUILD +++ b/main/secureboot-hook/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=secureboot-hook pkgver=0.2 -pkgrel=1 +pkgrel=2 pkgdesc="A kernel hook for generating signed UEFI Unified Kernel Image" url="https://gitlab.alpinelinux.org/alpine/aports" -arch="noarch !armhf !s390x !ppc64le !mips !mips64" # limited by sbsigntool +arch="noarch !armhf !s390x !ppc64le !loongarch64" # limited by sbsigntool license="MIT" depends="efi-mkuki kernel-hooks initramfs-generator sbsigntool" install="$pkgname.post-install $pkgname.pre-deinstall" @@ -23,6 +23,6 @@ package() { } sha512sums=" -8cf0ea83f32f7cc546f2235dcf0258ada36cf738c5738d6ac31b935b158ac40de51d53784c310810be0f8f6ce3947d9e09d781eab716f6cc303948d47384f6a8 secureboot.hook +cd76188468f27761a42bf92976e5e0475d3a3a46b24fa44c23c8afb28735f1bf99bac17665cedb1f0bed50eef522b909214f90bca703c7543314ed6ebdffc1b0 secureboot.hook 0777b1ec63d7d21a2144737fb913a52b8deedadbec69b7450799c228950adf9213d5d40e52617841dbae3bf4451f37a18f833e94860fab2c7779779b5fa9f66d secureboot.conf " diff --git a/main/secureboot-hook/secureboot.hook b/main/secureboot-hook/secureboot.hook index 39b778d6663..7b6847aa2f9 100644 --- a/main/secureboot-hook/secureboot.hook +++ b/main/secureboot-hook/secureboot.hook @@ -47,7 +47,7 @@ esac [ "$skip_flavors" ] && for flavor in $skip_flavors; do [ "$flavor" = "$FLAVOR" ] \ - && die 0 "skipping UEFI image creation for $FLAVOR kernel" + && die 0 "==> skipping UEFI image creation for $FLAVOR kernel" done [ "$cmdline" ] \ diff --git a/main/sircbot/APKBUILD b/main/sircbot/APKBUILD index 5ca68541f1d..65da0739fea 100644 --- a/main/sircbot/APKBUILD +++ b/main/sircbot/APKBUILD @@ -2,7 +2,7 @@ _luaversions="5.1 5.2 5.3 5.4" pkgname=sircbot pkgver=0.4 -pkgrel=6 +pkgrel=7 pkgdesc="Minimalistic IRC bot" url="https://git-old.alpinelinux.org/hosted/sircbot/" arch="all" @@ -62,7 +62,9 @@ for _v in $_luaversions; do eval "split_${_v/./_}() { _split $_v; }" done -sha512sums="1f91581548dcc2d3f6d0da31591027792271994b86ffce73141de828eff27595a1df8a364988e0c5349996e36ae8879b166c84d6024a194626e61c9dc9e96816 sircbot-0.4.tar.xz +sha512sums=" +1f91581548dcc2d3f6d0da31591027792271994b86ffce73141de828eff27595a1df8a364988e0c5349996e36ae8879b166c84d6024a194626e61c9dc9e96816 sircbot-0.4.tar.xz 45cbf2b16374f0fb7746d80ce09a9f65c293e08fd641c174821caf78f27e0614882500e0ced08a611679f26e5b2f8acded9869af6be81bd0966820588612b1e6 0001-add-simple-hack-to-allow-nickserv-identification.patch -5a8ce80e8d43aa7737bd210812c8a99f1f5d5e7af78996b09ebef0c492d7df6303d63dbe3eb037fd5f750c955173e85fd87c75dfeb6dda7c731740d065ffa3d9 sircbot.initd -315167ec664ce859908fcd230f6e0c604a0b02e56286156ba6ec76c32d6d514726acb493fe7a13b44d9255ec2e34fe4b2a6f02edf039b06e487cea6528d4d6a7 sircbot.confd" +ba06c40c606890f8918a07908d04ae4adbaf5d99d915b85a2c7a766f4811000c8c7574c9a65cacf1a687e4fa9f7a0095da8b93f96b0e449dfe0848d669b5e12a sircbot.initd +315167ec664ce859908fcd230f6e0c604a0b02e56286156ba6ec76c32d6d514726acb493fe7a13b44d9255ec2e34fe4b2a6f02edf039b06e487cea6528d4d6a7 sircbot.confd +" diff --git a/main/sircbot/sircbot.initd b/main/sircbot/sircbot.initd index 502ac09433b..12832d76099 100644 --- a/main/sircbot/sircbot.initd +++ b/main/sircbot/sircbot.initd @@ -5,7 +5,7 @@ sircbot_user=${sircbot_user:-sircbot} sircbot_group=${sircbot_group:-sircbot} pidfile=/var/run/sircbot/sircbot.pid -depends() { +depend() { need net after firewall } diff --git a/main/slang/APKBUILD b/main/slang/APKBUILD index 11e20732bde..2c42cdc38d0 100644 --- a/main/slang/APKBUILD +++ b/main/slang/APKBUILD @@ -26,6 +26,11 @@ source="https://www.jedsoft.org/releases/slang/slang-$pkgver.tar.bz2 skip-slsh-process-test.patch " +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/main/smartmontools/APKBUILD b/main/smartmontools/APKBUILD index a4e26186b6f..71deef74a10 100644 --- a/main/smartmontools/APKBUILD +++ b/main/smartmontools/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=smartmontools pkgver=7.4 -pkgrel=0 +pkgrel=1 pkgdesc="Control and monitor S.M.A.R.T. enabled hard drives" url="https://www.smartmontools.org/" arch="all" license="GPL-2.0-or-later" makedepends="linux-headers" -subpackages="$pkgname-doc $pkgname-openrc" +subpackages="$pkgname-dbg $pkgname-doc $pkgname-openrc" source="https://downloads.sourceforge.net/sourceforge/smartmontools/smartmontools-$pkgver.tar.gz + fix-segfault-in-option-handling.patch smartd.initd smartd.confd " @@ -39,6 +40,7 @@ package() { sha512sums=" 439fbf8d0e77fbe1d5a9fb100e655a7e47a82382ce8e1a4e942541a4dfbdff3391caa635e8d354d0e87c10ae79cb97aa6d24915f9f193620d763b384baf2e753 smartmontools-7.4.tar.gz +d41ba269b46591e605a87e043acd77fd2de3a723405fc83de0848afa8592f1ad912c5ac1e8199b10008ea53d8cfbc4917bf037578e7242346945664caa5bfc48 fix-segfault-in-option-handling.patch 4a2cbdab37cf0d761924854be4a2f2deebed22ca8d8754dee9a5ec44229c608f5fffb19545d2b9c687ab010460acde51d4f5fccd74d6c80dab2b1a7401d59b9f smartd.initd 9088b97fbaac45e677e5ac14bc8a9edb4bd7a924717bb201db92f4a85447bb0e0254e716c8c8e60d4830b96e3221488fc80b30442b2e4a1b57741535aa2c3e7b smartd.confd " diff --git a/main/smartmontools/fix-segfault-in-option-handling.patch b/main/smartmontools/fix-segfault-in-option-handling.patch new file mode 100644 index 00000000000..62c149e53be --- /dev/null +++ b/main/smartmontools/fix-segfault-in-option-handling.patch @@ -0,0 +1,14 @@ +upstream: https://www.smartmontools.org/ticket/1830#comment:1 +diff --git a/smartctl.cpp b/smartctl.cpp +index da97640..41a6e0a 100644 +--- a/smartctl.cpp ++++ b/smartctl.cpp +@@ -1168,7 +1168,7 @@ static int parse_options(int argc, char** argv, const char * & type, + printing_is_off = false; + printslogan(); + // Point arg to the argument in which this option was found. +- arg = argv[optind-1]; ++ arg = argv[optind-2]; + // Check whether the option is a long option that doesn't map to -h. + if (arg[1] == '-' && optchar != 'h') { + // Iff optopt holds a valid option then argument must be missing. diff --git a/main/source-highlight/APKBUILD b/main/source-highlight/APKBUILD index fe28b5a17bf..505b68f62b5 100644 --- a/main/source-highlight/APKBUILD +++ b/main/source-highlight/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=source-highlight pkgver=3.1.9 -pkgrel=11 +pkgrel=12 pkgdesc="Produces a document with syntax highlighting" url="https://www.gnu.org/software/src-highlite/" arch="all" diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD index fff903b57c5..163f8dd4603 100644 --- a/main/ssmtp/APKBUILD +++ b/main/ssmtp/APKBUILD @@ -3,7 +3,7 @@ pkgname=ssmtp pkgver=2.64 -pkgrel=21 +pkgrel=22 pkgdesc="Extremely simple MTA to get mail off the system to a mail hub" subpackages="$pkgname-doc" arch="all" @@ -16,6 +16,7 @@ source="https://deb.debian.org/debian/pool/main/s/ssmtp/ssmtp_$pkgver.orig.tar.b generate_config.patch libcrypto-underlinking.patch inet6-getaddrinfo.patch + basename.patch " build() { @@ -47,4 +48,5 @@ e25707d508a220c24105078c2e1ec32c5c37b2aea68e43cb90a885bb31467ff693daf498b6c13124 a4273d7c5b50984994b35de052c450a872f0014c45c1d3bfe36f2edd4f224281aacea234be61c6e966da2c4d3e033042628b79b2216340001487e6bb3a55b6cd generate_config.patch 9da89ec5ea66dae8b7a22ffcf196c45005c0403e6505162dba05003feac38eb397f8aff4f140d720f826ea057f92e47302ec3c24bddf5786c10b214ec906e82f libcrypto-underlinking.patch 92dc128b2f6ce234843e8f1e6ddb72653825652544cd68f693457b3fdc4ee22b0f9861feec0dfd123d012c294c7083dd8d24a9a589a3c2ae5bcdde697d30a290 inet6-getaddrinfo.patch +4d47d58d018fd5dadbe5abbfb7f3dcd8f344c614df3ecdcff1526d786b9110b394fcb6d242daced748c88693586de9dfd8ac1af0b9eec33060baa8d92154cdf7 basename.patch " diff --git a/main/ssmtp/basename.patch b/main/ssmtp/basename.patch new file mode 100644 index 00000000000..607740e347b --- /dev/null +++ b/main/ssmtp/basename.patch @@ -0,0 +1,13 @@ +Se https://gitlab.alpinelinux.org/alpine/aports/-/issues/16106 + +diff -upr ssmtp-2.64.orig/ssmtp.c ssmtp-2.64/ssmtp.c +--- ssmtp-2.64.orig/ssmtp.c 2024-05-12 12:51:08.577436203 +0200 ++++ ssmtp-2.64/ssmtp.c 2024-05-12 12:51:26.934150173 +0200 +@@ -25,6 +25,7 @@ + #include <string.h> + #include <ctype.h> + #include <netdb.h> ++#include <libgen.h> + #ifdef HAVE_SSL + #include <openssl/crypto.h> + #include <openssl/x509.h> diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD index 4146e5daede..0fa0d02a17d 100644 --- a/main/subversion/APKBUILD +++ b/main/subversion/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=subversion pkgver=1.14.3 -pkgrel=1 +pkgrel=2 _py3c_ver=1.4 pkgdesc="Replacement for CVS, another versioning system (svn)" url="https://subversion.apache.org/" diff --git a/main/swig/APKBUILD b/main/swig/APKBUILD index 3faa53916b8..be1284d0dba 100644 --- a/main/swig/APKBUILD +++ b/main/swig/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=swig pkgver=4.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A compiler that makes it easy to integrate C and C++ code with scripting languages" url="https://www.swig.org/" arch="all" diff --git a/main/syslog-ng/APKBUILD b/main/syslog-ng/APKBUILD index 28bc2b39fb5..d999ebdd936 100644 --- a/main/syslog-ng/APKBUILD +++ b/main/syslog-ng/APKBUILD @@ -4,8 +4,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: jv <jens@eisfair.org> pkgname=syslog-ng -pkgver=4.6.0 -pkgrel=1 +pkgver=4.7.1 +pkgrel=0 pkgdesc="Next generation logging daemon" url="https://www.syslog-ng.com/products/open-source-log-management/" arch="all" @@ -162,7 +162,7 @@ _module() { } sha512sums=" -7c4fbf1ac5377240afa7a1db8d72772399d2c62657fffc3c59e82b2dea6f12031f02320c4f567f981311bd1d8bbfd98962aeb59720ca857867a51b6bf83afb4b syslog-ng-4.6.0.tar.gz +2f1e0dea4c0ecfc3c77df7e6ac231ee8436c9c78fcb4df8ccdc417fea7d56791fdeb0844ac35f0342ce7c2bea5618d8723b6b54319c556120099eb809873082e syslog-ng-4.7.1.tar.gz 8faa3a07c1341c8c886703cd87a7a96dfb325687b8fb530a41f1cb5026f47ea4a55ca57d23487ab61b5a50bfc414ac2a55ef1a696332aa2f14c07f1ea7b4c10c pyversion.patch 06f79f7350d08c968a2b2b8e0511857a35b784bf6e8e4ba047d0ff24ad0e05f0f0915af049b10deb4ae8c9be788f3824f3818e350e07796ceed93e144838c6a5 syslog-ng.conf 6b6c628f38bf82a47c38d4cdc1e04cf4cf604cca5b191bea6251a2977162a6da509e92690b7d6e7019d4dbb315fb30eb9531023caf7583d9e9abf24c28e1d06c syslog-ng.logrotate diff --git a/main/tcpflow/APKBUILD b/main/tcpflow/APKBUILD index 8512e17cf02..99e76129c55 100644 --- a/main/tcpflow/APKBUILD +++ b/main/tcpflow/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tcpflow pkgver=1.6.1 -pkgrel=13 +pkgrel=14 pkgdesc="A Tool for monitoring, capturing and storing TCP connections flows" url="https://github.com/simsong/tcpflow" arch="all" diff --git a/main/testdisk/APKBUILD b/main/testdisk/APKBUILD index 318d584b170..f7a7c1073a3 100644 --- a/main/testdisk/APKBUILD +++ b/main/testdisk/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=testdisk pkgver=7.2 -pkgrel=0 +pkgrel=1 pkgdesc="A data recovery suite" url="https://www.cgsecurity.org/wiki/TestDisk" arch="all" license="GPL-2.0-or-later" makedepends="e2fsprogs-dev ntfs-3g-dev ncurses-dev zlib-dev libjpeg-turbo-dev" subpackages="$pkgname-doc" -source="https://www.cgsecurity.org/testdisk-$pkgver.tar.bz2" +source="https://www.cgsecurity.org/testdisk-$pkgver.tar.bz2 + implicit-basename-declaration.patch" build() { ./configure \ @@ -31,4 +32,5 @@ package() { sha512sums=" f99dd1c8f547c3d06e5459ba072438192a49d76c569de7915994beb269645092522d8136a212999382f88ca1d29c50f6482306d47197dc0994d168bcd4141f26 testdisk-7.2.tar.bz2 +2d446e5eaf43aefda334b16e0f1fec4f77e4dd44ddb14f3db0e94485b28da827215a813f36946eed768881abcc616c3aca6c767a95c596fcbcc8143f51f94237 implicit-basename-declaration.patch " diff --git a/main/testdisk/implicit-basename-declaration.patch b/main/testdisk/implicit-basename-declaration.patch new file mode 100644 index 00000000000..a3102572697 --- /dev/null +++ b/main/testdisk/implicit-basename-declaration.patch @@ -0,0 +1,17 @@ +POSIX requires libgen.h to be included for the basename function prototype. + +See https://gitlab.alpinelinux.org/alpine/aports/-/issues/16103 + +diff -upr testdisk-7.2.orig/src/hdaccess.c testdisk-7.2/src/hdaccess.c +--- testdisk-7.2.orig/src/hdaccess.c 2024-05-12 11:35:59.137491246 +0200 ++++ testdisk-7.2/src/hdaccess.c 2024-05-12 11:36:51.334218946 +0200 +@@ -48,6 +48,9 @@ + #ifdef HAVE_STRING_H + #include <string.h> + #endif ++#ifdef HAVE_LIBGEN_H ++#include <libgen.h> ++#endif + #ifdef HAVE_FCNTL_H + #include <fcntl.h> /* open */ + #endif diff --git a/main/tig/APKBUILD b/main/tig/APKBUILD index ce6b31f3ec8..7740aedde1e 100644 --- a/main/tig/APKBUILD +++ b/main/tig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=tig -pkgver=2.5.9 +pkgver=2.5.10 pkgrel=0 pkgdesc="Text-mode interface for the git revision control system" url="https://jonas.github.io/tig/" @@ -35,5 +35,5 @@ package() { } sha512sums=" -fbac05715812c49f1015f1da6999acaa5f994701025a64dc1283d3c8740d4887584d3fd274344c1f7f1638c8e63f938bb699d1d7cc8599d37ad43dcc53da789b tig-2.5.9.tar.gz +6b89a2edebfc58cd2f5e855bbd2137ba4e1be65e793c04a7a9858f3a32b31681f5a80f33e5c1d2d69104e4c37817d806a70ab9a1fc8807d5f49751d4f283d788 tig-2.5.10.tar.gz " diff --git a/main/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD index 2699a9d04dc..2b4dc4f6d0f 100644 --- a/main/tinyproxy/APKBUILD +++ b/main/tinyproxy/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=tinyproxy -pkgver=1.11.1 -pkgrel=3 +pkgver=1.11.2 +pkgrel=0 pkgdesc="Lightweight HTTP proxy" url="https://tinyproxy.github.io/" arch="all" @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" install="tinyproxy.pre-install" subpackages="$pkgname-doc $pkgname-openrc" source="https://github.com/tinyproxy/tinyproxy/releases/download/$pkgver/tinyproxy-$pkgver.tar.gz - CVE-2022-40468.patch tinyproxy.initd " pkgusers="tinyproxy" @@ -18,14 +17,11 @@ pkggroups="tinyproxy" options="!check" # secfixes: +# 1.11.2-r0: +# - CVE-2023-49606 # 1.11.1-r2: # - CVE-2022-40468 -prepare() { - default_prepare - update_config_sub -} - build() { ./configure \ --build=$CBUILD \ @@ -45,7 +41,6 @@ package() { } sha512sums=" -6ac7b57c33dcc87d6945c2b14f262e98d8c349c2492b3dd71f8028c4937df2a8e6ed7c913e8f6598b3e8ae83d5b51b9d5144c77f14f229df4aac5e094bcae6a6 tinyproxy-1.11.1.tar.gz -57728d1621f78d4eff07bc39757abca5034148cfaa9ee9110607afbe5f39910df3d10bcc797899883c9876ff8f218eca571223d2e5b0145e149ae9d8909c8f92 CVE-2022-40468.patch +d7cdc3aa273881ca1bd3027ff83d1fa3d3f40424a3f665ea906a3de059df2795455b65aeebde0f75ae5cacf9bba57219bc0c468808a9a75278e93f8d7913bac5 tinyproxy-1.11.2.tar.gz 0b4cf9c0904c766d227fc50bcdba4a602f9352009ab9c5b4b73e260414e4963f8010d83016605bae5a681f5af4dec12a76a57b2a84ebbf9ffe3709e78a4e29e8 tinyproxy.initd " diff --git a/main/tinyproxy/CVE-2022-40468.patch b/main/tinyproxy/CVE-2022-40468.patch deleted file mode 100644 index c674c9b7f5a..00000000000 --- a/main/tinyproxy/CVE-2022-40468.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3764b8551463b900b5b4e3ec0cd9bb9182191cb7 Mon Sep 17 00:00:00 2001 -From: rofl0r <rofl0r@users.noreply.github.com> -Date: Thu, 8 Sep 2022 15:18:04 +0000 -Subject: [PATCH] prevent junk from showing up in error page in invalid - requests - -fixes #457 ---- - src/reqs.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/reqs.c b/src/reqs.c -index bce69819..45db118d 100644 ---- a/src/reqs.c -+++ b/src/reqs.c -@@ -343,8 +343,12 @@ static struct request_s *process_request (struct conn_s *connptr, - goto fail; - } - -+ /* zero-terminate the strings so they don't contain junk in error page */ -+ request->method[0] = url[0] = request->protocol[0] = 0; -+ - ret = sscanf (connptr->request_line, "%[^ ] %[^ ] %[^ ]", - request->method, url, request->protocol); -+ - if (ret == 2 && !strcasecmp (request->method, "GET")) { - request->protocol[0] = 0; - diff --git a/main/tipidee/APKBUILD b/main/tipidee/APKBUILD new file mode 100644 index 00000000000..4cd3eb40161 --- /dev/null +++ b/main/tipidee/APKBUILD @@ -0,0 +1,86 @@ +# Contributor: Laurent Bercot <ska-devel@skarnet.org> +# Maintainer: Laurent Bercot <ska-devel@skarnet.org> +pkgname=tipidee +pkgver=0.0.4.0 +pkgrel=1 +pkgdesc="The skarnet.org web server" +url=https://skarnet.org/software/tipidee/ +arch="all" +options="!check" # No test suite. +license="ISC" +depends="execline s6 s6-networking" +makedepends="skalibs-dev>=2.14" +subpackages="$pkgname-static $pkgname-dev $pkgname-libs $pkgname-doc $pkgname-openrc" +source=" + https://skarnet.org/software/tipidee/tipidee-$pkgver.tar.gz + httpd.run + httpsd.run + logger.run + tipidee.conf + tipidee.confd + tipidee.initd + " +install=" + tipidee.pre-install + tipidee.post-install + tipidee.post-deinstall + " +pkggroups="tipidee" +pkgusers="tipideelog tipideed" + +build() { + ./configure \ + --enable-shared \ + --enable-static \ + --disable-allstatic \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --libexecdir="/usr/lib/$pkgname" \ + --with-dynlib=/lib + make +} + +_makeservicedir() { + name="http${1}d-${2}" + fn="$pkgdir/var/lib/tipidee/services/$name" + logdir="$pkgdir/var/log/$name" + mkdir -p "$fn/log" "$logdir" + chown tipideelog:tipidee "$logdir" + chmod 02755 "$logdir" + echo 3 > "$fn/log/notification-fd" + sed -e "s/@S@/${1}/g; s/@V@/${2}/g;" "$srcdir/logger.run" > "$fn/log/run" + chmod 0755 "$fn/log/run" + echo 3 > "$fn/notification-fd" + sed -e "s/@V@/${2}/g;" "$srcdir/http${1}d.run" > "$fn/run" + chmod 0755 "$fn/run" +} + +package() { + mkdir -p "$pkgdir/usr/share/doc" "$pkgdir/var/lib/tipidee/docroot" + make DESTDIR="$pkgdir" install + for i in '' s ; do for j in 4 6 ; do + _makeservicedir "$i" "$j" + done ; done + install -D -m 0644 "$srcdir/tipidee.conf" "$pkgdir/etc/tipidee.conf" + install -D -m 0644 "$srcdir/tipidee.confd" "$pkgdir/etc/conf.d/tipidee" + install -D -m 0755 "$srcdir/tipidee.initd" "$pkgdir/etc/init.d/tipidee" + cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" +} + +dev() { + default_dev + + # default_dev please stop being stupid + mv "$subpkgdir/usr/bin/tipidee-config" "$pkgdir/usr/bin/tipidee-config" +} + +sha512sums=" +d177f4c00db9855792dbddc4c96d2c75bd302443f29376e1d35d511d56964e5de11dd2cf4af3190d7465404c429eedfc17264715e4850d6b830a9e492ff25741 tipidee-0.0.4.0.tar.gz +0de0d6bd39adfd6e65694335e9cf06cec7625032e6af5cf5e54ced5c009707ca4e27b2dbdff8b7825575fbef7cd98ac0333e07b1924f24fda23019c92c08023f httpd.run +65cdbfb5a6485aed0203ed910af124b202994d5253cb365ed25432f0c906471dd30f96eb862b6f25004c6ec8ec4cb38a5b49cde717e7a00d7c9d7fd07025f225 httpsd.run +b5af306fe7040f966b13da84bfb0c4b528683c03205519d08fe429ee826ffad27c9ddb32be8c8bf8b42ce7964ef15572e3c66a96494aed833ee951c769f81bd2 logger.run +bb2681a3000133724bb8fd4918bc3209ea676c2e4f96ad8b298d8e7302aeebd6876341ea205f2d808f34e4c9b5c138bba032694c6069c17026b0ddf23702f9ba tipidee.conf +7a999200ad21b2b0737ce82136bc8e055d7ab4a865b7727e6dc8df0eaeea6ace11eb5756b64231ce7938d11b5ec218944173ea1df3db059d033bf3f848c9a608 tipidee.confd +9e0c8ed97894c60dc37b38debf9e087228c259e08bb6a17b35c756bcaa57903d3608620eb26aba6295c0fb087e4ab4c551bc65acd37d8b92b7b9e1c911542dd1 tipidee.initd +" diff --git a/main/tipidee/httpd.run b/main/tipidee/httpd.run new file mode 100644 index 00000000000..356ad995240 --- /dev/null +++ b/main/tipidee/httpd.run @@ -0,0 +1,19 @@ +#!/bin/execlineb -S1 + +fdmove -c 2 1 +emptyenv -p +fdmove 1 3 +envfile /etc/conf.d/tipidee +unexport HTTP +unexport HTTPS +multisubstitute +{ + importas -ui TIPIDEED_IPv@V@ TIPIDEED_IPv@V@ + importas -ui TIPIDEED_ROOT TIPIDEED_ROOT + importas -u -D1000 TIPIDEED_CONCURRENCY TIPIDEED_CONCURRENCY + importas -u -D10 TIPIDEED_LOCAL_CONCURRENCY TIPIDEED_LOCAL_CONCURRENCY +} +s6-envuidgid tipideed +cd ${TIPIDEED_ROOT} +s6-tcpserver -1 -U -c ${TIPIDEED_CONCURRENCY} -C ${TIPIDEED_LOCAL_CONCURRENCY} -- ${TIPIDEED_IPv@V@} 80 +tipideed diff --git a/main/tipidee/httpsd.run b/main/tipidee/httpsd.run new file mode 100644 index 00000000000..9d710158a0e --- /dev/null +++ b/main/tipidee/httpsd.run @@ -0,0 +1,23 @@ +#!/bin/execlineb -S1 + +fdmove -c 2 1 +emptyenv -p +fdmove 1 3 +envfile /etc/conf.d/tipidee +unexport HTTP +unexport HTTPS +multisubstitute +{ + importas -ui TIPIDEED_IPv@V@ TIPIDEED_IPv@V@ + importas -ui TIPIDEED_ROOT TIPIDEED_ROOT + importas -ui KEYFILE KEYFILE + importas -ui CERTFILE CERTFILE + importas -u -D1000 TIPIDEED_CONCURRENCY TIPIDEED_CONCURRENCY + importas -u -D10 TIPIDEED_LOCAL_CONCURRENCY TIPIDEED_LOCAL_CONCURRENCY +} +s6-envuidgid tipideed +export TLS_UID 65534 +export TLS_GID 65534 +cd ${TIPIDEED_ROOT} +s6-tlsserver -1 -U -K 5000 -c ${TIPIDEED_CONCURRENCY} -C ${TIPIDEED_LOCAL_CONCURRENCY} -- ${TIPIDEED_IPv@V@} 443 +tipideed diff --git a/main/tipidee/logger.run b/main/tipidee/logger.run new file mode 100644 index 00000000000..3f178570339 --- /dev/null +++ b/main/tipidee/logger.run @@ -0,0 +1,5 @@ +#!/bin/execlineb -S1 + +s6-setuidgid tipideelog +exec -c +s6-log -d3 -- t s1000000 /var/log/http@S@d-@V@ diff --git a/main/tipidee/tipidee.conf b/main/tipidee/tipidee.conf new file mode 100644 index 00000000000..40bba13f9f9 --- /dev/null +++ b/main/tipidee/tipidee.conf @@ -0,0 +1,18 @@ +# This is where the behaviour of the tipidee web server is +# configured. +# See https://skarnet.org/software/tipidee/tipidee.conf.html +# for the full documentation of the syntax. + +# The defaults work well, but here are some example directives that +# you can uncomment if you find them applicable to your setup. + +# global read_timeout 60000 +# global write_timeout 60000 +# global cgi_timeout 5000 +# index-file index.html index.cgi +# log start ip hostname request resource answer answer_size +# custom-header always Strict-Transport-Security max-age=63072000; includeSubDomains; preload +# +# domain example.com +# nph-prefix nph- +# cgi /cgi-bin/ diff --git a/main/tipidee/tipidee.confd b/main/tipidee/tipidee.confd new file mode 100644 index 00000000000..d47fb589f00 --- /dev/null +++ b/main/tipidee/tipidee.confd @@ -0,0 +1,33 @@ +# Configuration for the tipidee web server. + +# The IPs you want the tipidee server to listen on. +# Comment to disable. +TIPIDEED_IPv4=0.0.0.0 +TIPIDEED_IPv6=:: + +# Serve plaintext HTTP? true or false +HTTP=true + +# Serve HTTPS? true or false +HTTPS=false + +# If HTTPS is true, KEYFILE should point to +# your private key, and CERTFILE should point to your certificate. +# KEYFILE= +# CERTFILE= + +# Total authorized concurrent connections. Don't go above 5000 or so. +TIPIDEED_CONCURRENCY=1000 + +# Authorized concurrent connections *per IP*. +TIPIDEED_LOCAL_CONCURRENCY=10 + +# The server root. Make sure this directory exists, is readable by +# the tipideed user, and does *not* belong to the tipideed user. +# The documents need to be stored under subdirectories of TIPIDEED_ROOT, +# one subdirectory per virtual domain you're serving. +TIPIDEED_ROOT=/var/lib/tipidee/docroot + +# Also check the /etc/tipidee.conf file for detailed configuration of +# logging, document attributes, etc. +# Run tipidee-config after editing /etc/tipidee.conf. diff --git a/main/tipidee/tipidee.initd b/main/tipidee/tipidee.initd new file mode 100644 index 00000000000..430a6cb168e --- /dev/null +++ b/main/tipidee/tipidee.initd @@ -0,0 +1,65 @@ +#!/sbin/openrc-run + +description="Start/stop the tipidee services" + +depend() +{ + need s6 + after net + after localmount +} + +_get_services() +{ + list= + if "$HTTP" ; then + if test -n "$TIPIDEED_IPv4" ; then + list="$list httpd-4" + fi + if test -n "$TIPIDEED_IPv6" ; then + list="$list httpd-6" + fi + fi + if "$HTTPS" ; then + if test -n "$TIPIDEED_IPV4" ; then + list="$list httpsd-4" + fi + if test -n "$TIPIDEED_IPV6" ; then + list="$list httpsd-6" + fi + fi + echo $list +} + +stop() +{ + ebegin "Stopping the tipidee services" + for i in `_get_services` ; do + s6-svunlink /run/service "$i" + done + eend $? +} + +start() +{ + ebegin "Starting the tipidee services" + for i in `_get_services` ; do + s6-svlink -t10000 /run/service "/var/lib/tipidee/services/$i" + done + eend $? +} + +status() +{ + for i in `_get_services` ; do + echo -n "${i}: " + s6-svstat "/run/service/${i}" + done +} + +restart() +{ + for i in `_get_services` ; do + s6-svc -rwR "/run/service/$i" + done +} diff --git a/main/tipidee/tipidee.post-deinstall b/main/tipidee/tipidee.post-deinstall new file mode 100644 index 00000000000..3302f14184d --- /dev/null +++ b/main/tipidee/tipidee.post-deinstall @@ -0,0 +1,3 @@ +#!/bin/execlineb -P + +rm -f etc/tipidee.conf.cdb diff --git a/main/tipidee/tipidee.post-install b/main/tipidee/tipidee.post-install new file mode 100644 index 00000000000..425ab5aaac3 --- /dev/null +++ b/main/tipidee/tipidee.post-install @@ -0,0 +1,3 @@ +#!/bin/execlineb -P + +tipidee-config diff --git a/main/tipidee/tipidee.pre-install b/main/tipidee/tipidee.pre-install new file mode 100644 index 00000000000..0ef043441f8 --- /dev/null +++ b/main/tipidee/tipidee.pre-install @@ -0,0 +1,7 @@ +#!/bin/sh + +addgroup -S tipidee 2>/dev/null +adduser -S -D -h / -H -s /sbin/nologin -G tipidee -g tipideelog tipideelog 2>/dev/null +adduser -S -D -h / -H -s /sbin/nologin -G tipidee -g tipideed tipideed 2>/dev/null + +exit 0 diff --git a/main/tmux/APKBUILD b/main/tmux/APKBUILD index 53b8c02c10d..e43b463c765 100644 --- a/main/tmux/APKBUILD +++ b/main/tmux/APKBUILD @@ -16,6 +16,11 @@ source="https://github.com/tmux/tmux/releases/download/$pkgver/tmux-$pkgver.tar. # 3.1c-r0: # - CVE-2020-27347 +prepare() { + default_prepare + update_config_sub +} + build() { CFLAGS="$CFLAGS -flto=auto" \ ./configure \ @@ -38,9 +43,7 @@ package() { install -D -m644 example_tmux.conf \ "$pkgdir"/usr/share/doc/$pkgname/examples/$pkgname.conf - local file; for file in CHANGES README; do - install -m644 "$file" "$pkgdir"/usr/share/doc/$pkgname/ - done + install -Dm644 CHANGES README -t "$pkgdir"/usr/share/doc/$pkgname/ } sha512sums=" diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD index 56fce719924..7498df6920e 100644 --- a/main/unbound/APKBUILD +++ b/main/unbound/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=unbound -pkgver=1.19.3 -pkgrel=2 +pkgver=1.20.0 +pkgrel=0 pkgdesc="Unbound is a validating, recursive, and caching DNS resolver" url="https://nlnetlabs.nl/projects/unbound/about/" arch="all" @@ -48,6 +48,8 @@ source="https://unbound.net/downloads/unbound-$pkgver.tar.gz " # secfixes: +# 1.20.0-r0: +# - CVE-2024-33655 # 1.19.2-r0: # - CVE-2024-1931 # 1.19.1-r0: @@ -131,7 +133,7 @@ migrate() { } sha512sums=" -f860614f090a5a081cceff8ca7f4b3d416c00a251ae14ceb6b4159dc8cd022f025592074d3d78aee2f86c3eeae9d1a314713e4740aa91062579143199accd159 unbound-1.19.3.tar.gz +2f6bc76c03b71ca1c2cd2331dc72d62f51493d15e17c59af46b400e542fcabff22e6b9d33f750a3e5f918a0116f45afa760651b2d5aa2feadac151cbbd71b0bd unbound-1.20.0.tar.gz 05fec1829dfb5279f35a76eeab768d88b6dffee4477b1db693360021969bdcc89e309f71ea6cc63e0f921b1fc223a073b97892be2095ed93d7da917a59e09d00 conf.patch 7ab3f57ade3fe8add60bfce208efccc968728fac5c94c759c34aaa09aa71e0da06dd7c24ae0fecf9e2ccc869594226d68b24fe2b0a0b161b833e22c0de1b03b6 migrate-dnscache-to-unbound 7ca4c42c00a86f737fd8f5024efce218c9d0dee8fb8708df60f7b292c25b4d3a35ed46a8a0a32847451bca988b5de2dbdddb7fed352170c03263281fc579582b unbound.initd diff --git a/main/util-linux/0001-libblkid-Fix-segfault-when-blkid.conf-doesn-t-exist.patch b/main/util-linux/0001-libblkid-Fix-segfault-when-blkid.conf-doesn-t-exist.patch deleted file mode 100644 index b1d83c05a6f..00000000000 --- a/main/util-linux/0001-libblkid-Fix-segfault-when-blkid.conf-doesn-t-exist.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 7e357241b413a01c37b0b4d064bc0a47e3259361 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Mon, 1 Apr 2024 12:14:50 +0200 -Subject: [PATCH] libblkid: Fix segfault when blkid.conf doesn't exist - -* Move 'line' and 'uevent' to the beginning of the LIBECONF code. -* Remove unwanted space between function name and arguments. -* Check for 'line' pointer before dereferencing. - -References: https://github.com/util-linux/util-linux/pull/2883 -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - libblkid/src/config.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/libblkid/src/config.c b/libblkid/src/config.c -index 7b8b04f92..66c1864f0 100644 ---- a/libblkid/src/config.c -+++ b/libblkid/src/config.c -@@ -153,6 +153,8 @@ struct blkid_config *blkid_read_config(const char *filename) - #else /* !HAVE_LIBECONF */ - - static econf_file *file = NULL; -+ char *line = NULL; -+ bool uevent = false; - econf_err error; - - if (filename) { -@@ -187,7 +189,6 @@ struct blkid_config *blkid_read_config(const char *filename) - } - } - -- bool uevent = false; - if ((error = econf_getBoolValue(file, NULL, "SEND_UEVENT", &uevent))) { - if (error != ECONF_NOKEY) { - DBG(CONFIG, ul_debug("couldn't fetch SEND_UEVENT corrently: %s", econf_errString(error))); -@@ -209,7 +210,6 @@ struct blkid_config *blkid_read_config(const char *filename) - } - } - -- char *line = NULL; - if ((error = econf_getStringValue(file, NULL, "EVALUATE", &line))) { - conf->nevals = 0; - if (error != ECONF_NOKEY) { -@@ -219,7 +219,7 @@ struct blkid_config *blkid_read_config(const char *filename) - DBG(CONFIG, ul_debug("key CACHE_FILE not found, using built-in default ")); - } - } else { -- if (*line && parse_evaluate(conf, line) == -1) -+ if (line && *line && parse_evaluate(conf, line) == -1) - goto err; - } - -@@ -238,8 +238,8 @@ dflt: - if (f) - fclose(f); - #else -- econf_free (file); -- free (line); -+ econf_free(file); -+ free(line); - #endif - return conf; - err: -@@ -248,8 +248,8 @@ err: - #ifndef HAVE_LIBECONF - fclose(f); - #else -- econf_free (file); -- free (line); -+ econf_free(file); -+ free(line); - #endif - return NULL; - } --- -2.44.0 - diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD index aa29dc31dad..3e571a69be6 100644 --- a/main/util-linux/APKBUILD +++ b/main/util-linux/APKBUILD @@ -2,16 +2,17 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=util-linux -pkgver=2.40 -pkgrel=1 +pkgver=2.40.1 +pkgrel=0 pkgdesc="Random collection of Linux utilities" url="https://git.kernel.org/cgit/utils/util-linux/util-linux.git" arch="all" license="GPL-3.0-or-later AND GPL-2.0-or-later AND GPL-2.0-only AND GPL-1.0-only AND LGPL-2.1-or-later AND LGPL-1.0-only AND BSD-1-Clause AND BSD-3-Clause AND BSD-4-Clause-UC AND MIT AND Public-Domain" -checkdepends="bash findutils xz" +checkdepends="findutils xz" makedepends_host=" + bash libcap-ng-dev linux-headers ncurses-dev @@ -50,8 +51,8 @@ subpackages=" uuidgen:_mv_bin wipefs:_mv_bin " -if [ -z "$BOOTSTRAP" ]; then - checkdepends="bash findutils xz procps coreutils" +if [ -z "$BOOTSTRAP" ] && [ -z "$APORTS_BOOTSTRAP" ]; then + checkdepends="findutils xz procps coreutils" makedepends_build="$makedepends_build asciidoctor" makedepends_host="$makedepends_host linux-pam-dev @@ -69,7 +70,7 @@ if [ -z "$BOOTSTRAP" ]; then _bootstrap_config="--enable-runuser --with-python=3 --with-econf" else options="!check" - _bootstrap_config="--without-python --without-econf --disable-asciidoc --disable-login" + _bootstrap_config="--disable-runuser --without-python --without-econf --disable-asciidoc --disable-login" fi subpackages="$subpackages $pkgname-doc $pkgname-misc" makedepends="$makedepends_build $makedepends_host" @@ -82,7 +83,6 @@ case $pkgver in esac source="https://www.kernel.org/pub/linux/utils/util-linux/v$_v/util-linux-$pkgver.tar.xz utmps.patch - 0001-libblkid-Fix-segfault-when-blkid.conf-doesn-t-exist.patch ttydefaults.h rfkill.confd rfkill.initd @@ -114,6 +114,8 @@ prepare() { # these are flakey on the package builders rm -fv tests/ts/lsfd/mkfds-rw-character-device rm -fv tests/ts/lsfd/mkfds-multiplexing + # enosys fails in one of three tests + rm -fv tests/ts/misc/enosys case "$CARCH" in ppc64le) @@ -348,9 +350,8 @@ _py3() { } sha512sums=" -f06e61d4ee0e196223f7341ec75a16a6671f82d6e353823490ecff17e947bb169a6b65177e3ab0da6e733e079b24d6a77905a0e8bbfed82ca9aa22a3facb6180 util-linux-2.40.tar.xz +58ec6eb41d4b6bfc544a80e95c71b5f3798ab4d2a9435d3ee9e5edd56f9b3f09bcb154bdd70e002dc018938937e2e946ae731dcda0f86b362fc43423689e41fc util-linux-2.40.1.tar.xz c1c9cd816d20582438cda75a9c0ea4e687eee124e657172729aff410f52558be19cc5d649dae07c03f7618411e5aa6c23bcebc3fdf25529517a61b6b343966ef utmps.patch -d0fbba3fb3a7ca56e6c2fbe63557bac01c25389e21c51ff5c111463a96a7b8e2eacbc5d02db811dbc3807031543ec1fc759a9669ed26e059dafdce8ae16a1558 0001-libblkid-Fix-segfault-when-blkid.conf-doesn-t-exist.patch 876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h 401d2ccbdbfb0ebd573ac616c1077e2c2b79ff03e9221007759d8ac25eb522c401f705abbf7daac183d5e8017982b8ec5dd0a5ebad39507c5bb0a9f31f04ee97 rfkill.confd b0e11226c611fd52d54f599a40d23c4f748d5bd6971732dba2d25581aedaf5d2c62bcb49515d175569ff9aa1cf49a3dff25d1a5d4dcd89428c7020fc7ea3a581 rfkill.initd diff --git a/main/uwsgi/APKBUILD b/main/uwsgi/APKBUILD index fc5be503375..fedace57f3b 100644 --- a/main/uwsgi/APKBUILD +++ b/main/uwsgi/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=uwsgi -pkgver=2.0.24 -pkgrel=2 +pkgver=2.0.25.1 +pkgrel=0 pkgdesc="uWSGI application container server" url="https://projects.unbit.it/uwsgi/" arch="all" @@ -27,7 +27,7 @@ makedepends=" libxslt-dev lua5.3-dev openssl-dev - pcre-dev + pcre2-dev python3-dev zeromq-dev zlib-dev @@ -201,7 +201,7 @@ _plugin() { } sha512sums=" -55af38c1518409f8351c93a027f97958a8cdf36b1b5750dc316b9bc1cd35f9c3243c078e743c3b435c6c86d0991d5575c719326cc05ca9aad7d26dbdb78ab335 uwsgi-2.0.24.tar.gz +3b2a78917b129f5a2f38f3538e30b132e4cd6e270df55365ccc0dc6b94641a262af1484c62b252d0a24121eb68417cb061210e89e2b7885992ab4ffa07092119 uwsgi-2.0.25.1.tar.gz 1fef8a30e8e20b0322cf464a2adf744a4b46a35f4c9e104acacab4c99b913c5a0b537783bdfedf8900a4e7397e08079b675be2414beb571fd0b330985ac676cc uwsgi.initd 370202e143d0e041a2e36905346080d3ca592c9a74705a8c4e142a1307d22b921c10e673d683ca284ea27d184474ed86edd7723a6e590d35a562ad7cf6afa529 uwsgi.ini 2798c9d2e49e29292ffe6a5a29b866301c78d5f322fc5d07dfa9569efdaa5220237a5f6744652fbdd957be29311ddaff190541333f042cbf0e907dfa98ce3e2a readme.emperor diff --git a/main/valgrind/0001-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch b/main/valgrind/0001-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch deleted file mode 100644 index 1f6ae07b50b..00000000000 --- a/main/valgrind/0001-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch +++ /dev/null @@ -1,136 +0,0 @@ -From d35005cef8ad8207542738812705ceabf137d7e0 Mon Sep 17 00:00:00 2001 -From: Paul Floyd <pjfloyd@wanadoo.fr> -Date: Sun, 17 Dec 2023 14:18:51 +0100 -Subject: [PATCH] Bug 478624 - Valgrind incompatibility with binutils-2.42 on - x86 with new nop patterns (unhandled instruction bytes: 0x2E 0x8D 0xB4 0x26) - -It was a bit of a struggle to get the testcase to build -with both clang and gcc (oddly enough gcc was more difficult) so -I just resorted to using .byte arrays. ---- - .gitignore | 1 + - NEWS | 2 ++ - VEX/priv/guest_x86_toIR.c | 22 +++++++++++++- - none/tests/x86/Makefile.am | 2 ++ - none/tests/x86/gnu_binutils_nop.c | 34 ++++++++++++++++++++++ - none/tests/x86/gnu_binutils_nop.stderr.exp | 0 - none/tests/x86/gnu_binutils_nop.vgtest | 2 ++ - 7 files changed, 62 insertions(+), 1 deletion(-) - create mode 100644 none/tests/x86/gnu_binutils_nop.c - create mode 100644 none/tests/x86/gnu_binutils_nop.stderr.exp - create mode 100644 none/tests/x86/gnu_binutils_nop.vgtest - -diff --git a/VEX/priv/guest_x86_toIR.c b/VEX/priv/guest_x86_toIR.c -index 5d6e6dc64..3b6efb387 100644 ---- a/VEX/priv/guest_x86_toIR.c -+++ b/VEX/priv/guest_x86_toIR.c -@@ -8198,7 +8198,7 @@ DisResult disInstr_X86_WRK ( - delta += 5; - goto decode_success; - } -- /* Don't barf on recent binutils padding, -+ /* Don't barf on recent (2010) binutils padding, - all variants of which are: nopw %cs:0x0(%eax,%eax,1) - 66 2e 0f 1f 84 00 00 00 00 00 - 66 66 2e 0f 1f 84 00 00 00 00 00 -@@ -8223,6 +8223,26 @@ DisResult disInstr_X86_WRK ( - } - } - -+ /* bug478624 GNU binutils uses a leal of esi into itself with -+ a zero offset and CS prefix as an 8 byte no-op (Dec 2023). -+ Since the CS prefix is hardly ever used we don't do much -+ to decode it, just a few cases for conditional branches. -+ So add handling here with other pseudo-no-ops. -+ */ -+ if (code[0] == 0x2E && code[1] == 0x8D) { -+ if (code[2] == 0x74 && code[3] == 0x26 && code[4] == 0x00) { -+ DIP("leal %%cs:0(%%esi,%%eiz,1),%%esi\n"); -+ delta += 5; -+ goto decode_success; -+ } -+ if (code[2] == 0xB4 && code[3] == 0x26 && code[4] == 0x00 -+ && code[5] == 0x00 && code[6] == 0x00 && code[7] == 0x00) { -+ DIP("leal %%cs:0(%%esi,%%eiz,1),%%esi\n"); -+ delta += 8; -+ goto decode_success; -+ } -+ } -+ - // Intel CET requires the following opcodes to be treated as NOPs - // with any prefix and ModRM, SIB and disp combination: - // "0F 19", "0F 1C", "0F 1D", "0F 1E", "0F 1F" -diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am -index 3ecd1ad3c..dbae86571 100644 ---- a/none/tests/x86/Makefile.am -+++ b/none/tests/x86/Makefile.am -@@ -52,6 +52,7 @@ EXTRA_DIST = \ - fxtract.stdout.exp fxtract.stderr.exp fxtract.vgtest \ - fxtract.stdout.exp-older-glibc \ - getseg.stdout.exp getseg.stderr.exp getseg.vgtest \ -+ gnu_binutils_nop.stderr.exp gnu_binutils_nop.vgtest \ - incdec_alt.stdout.exp incdec_alt.stderr.exp incdec_alt.vgtest \ - int.stderr.exp int.stdout.exp int.disabled \ - $(addsuffix .stderr.exp,$(INSN_TESTS)) \ -@@ -100,6 +101,7 @@ check_PROGRAMS = \ - fpu_lazy_eflags \ - fxtract \ - getseg \ -+ gnu_binutils_nop \ - incdec_alt \ - $(INSN_TESTS) \ - int \ -diff --git a/none/tests/x86/gnu_binutils_nop.c b/none/tests/x86/gnu_binutils_nop.c -new file mode 100644 -index 000000000..412a4c2cb ---- /dev/null -+++ b/none/tests/x86/gnu_binutils_nop.c -@@ -0,0 +1,34 @@ -+int main(void) -+{ -+ // GNU binutils uses various opcodes as alternatives for nop -+ // the idea is that it is faster to execute one large opcode -+ // with no side-effects than multiple repetitions of the -+ // single byte 'nop'. This gives more choice when code -+ // needs to be padded. -+ -+ // the following is based on -+ // https://sourceware.org/cgit/binutils-gdb/tree/gas/config/tc-i386.c#n1256 -+ -+ // one byte -+ __asm__ __volatile__("nop"); -+ // two bytes -+ __asm__ __volatile__("xchg %ax,%ax"); -+ // three bytes -+ //__asm__ __volatile__("leal 0(%esi),%esi"); -+ __asm__ __volatile__(".byte 0x8d,0x76,0x00"); -+ // four bytes -+ //__asm__ __volatile__("leal 0(%esi,%eiz),%esi"); -+ __asm__ __volatile__(".byte 0x8d,0x74,0x26,0x00"); -+ // five bytes -+ //__asm__ __volatile__("leal %cs:0(%esi,%eiz),%esi"); -+ __asm__ __volatile__(".byte 0x2e,0x8d,0x74,0x26,0x00"); -+ // six bytes -+ //__asm__ __volatile__("leal 0L(%esi),%esi"); -+ __asm__ __volatile__(".byte 0x8d,0xb6,0x00,0x00,0x00,0x00"); -+ // seven bytes -+ //__asm__ __volatile__("leal 0L(%esi,%eiz),%esi"); -+ __asm__ __volatile__(".byte 0x8d,0xb4,0x26,0x00,0x00,0x00,0x00"); -+ // eight bytes -+ //__asm__ __volatile__("leal %cs:0L(%esi,%eiz),%esi"); -+ __asm__ __volatile__(".byte 0x2e,0x8d,0xb4,0x26,0x00,0x00,0x00,0x00"); -+} -diff --git a/none/tests/x86/gnu_binutils_nop.stderr.exp b/none/tests/x86/gnu_binutils_nop.stderr.exp -new file mode 100644 -index 000000000..e69de29bb -diff --git a/none/tests/x86/gnu_binutils_nop.vgtest b/none/tests/x86/gnu_binutils_nop.vgtest -new file mode 100644 -index 000000000..7f378dd53 ---- /dev/null -+++ b/none/tests/x86/gnu_binutils_nop.vgtest -@@ -0,0 +1,2 @@ -+prog: gnu_binutils_nop -+vgopts: -q --- -2.44.0 - diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD index 4ba0bcd6271..22c02c61acf 100644 --- a/main/valgrind/APKBUILD +++ b/main/valgrind/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=valgrind -pkgver=3.22.0 -pkgrel=1 +pkgver=3.23.0 +pkgrel=0 pkgdesc="Tool to help find memory-management problems in programs" url="https://valgrind.org/" # armv6/riscv64 not supported upstream -arch="all !armhf !riscv64" +arch="all !armhf !riscv64 !loongarch64" license="GPL-2.0-or-later" # it seems like busybox sed works but the configure script requires GNU sed makedepends="sed perl linux-headers" @@ -17,18 +17,10 @@ makedepends="sed perl linux-headers" options="!strip" subpackages="$pkgname-scripts $pkgname-dev $pkgname-doc" source="https://sourceware.org/pub/valgrind/valgrind-$pkgver.tar.bz2 - 0001-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch + fix-tests-musl-s390x.patch + fix-tests-musl-armv7.patch " -# Valgrind 3.19.0 added support for compiling the tests on musl. -# However, it seems they haven't tested this on many architectures. -# Disable check on architectures where it doesn't work for now. -# -# TODO: Report upstream. -case "$CARCH" in -aarch64|s390x|armv7|x86) options="$options !check" -esac - build() { export CFLAGS="${CFLAGS/-fno-plt} -fno-stack-protector -no-pie -U_FORTIFY_SOURCE" ./configure \ @@ -72,6 +64,7 @@ scripts() { } sha512sums=" -2904c13f68245bbafcea70998c6bd20725271300a7e94b6751ca00916943595fc3fac8557da7ea8db31b54a43f092823a0a947bc142829da811d074e1fe49777 valgrind-3.22.0.tar.bz2 -250cac58cd1710d4d9a6a24b9acc596fa01e4d2255b98b46b8ed5c7af9e658489a69b51ca7e7d17ebf5b2a9023f561391e149311c20e99607d6b7e471110cbe5 0001-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch +27d038faaaf6154cace2df18c3573291393548ba0738dbb6aba58eab6324c5beaa95fc5f3c0271663ca071baf829b15d806f7e81074f7cf087bef20ea0ed3117 valgrind-3.23.0.tar.bz2 +a6c5a33d0d5c09cc65c6c62456e213006560b20f37db0a24bf218c5bd2eb3275541494866699d15bbbc2672292122cb6f6d67176b0f37ba1dec37211c584c480 fix-tests-musl-s390x.patch +5e0f6b10081318fc5630a7500d490ff5e9b2832889158ecb40a4f310f8be6fcbd8a8744be96742341eba952a0994e407db091673a69d111fae3e132e0ea6ca72 fix-tests-musl-armv7.patch " diff --git a/main/valgrind/fix-tests-musl-armv7.patch b/main/valgrind/fix-tests-musl-armv7.patch new file mode 100644 index 00000000000..cf7a6a1437e --- /dev/null +++ b/main/valgrind/fix-tests-musl-armv7.patch @@ -0,0 +1,14 @@ +diff --git a/memcheck/tests/linux/timerfd-syscall.c b/memcheck/tests/linux/timerfd-syscall.c +index 61d75b5..1721249 100644 +--- a/memcheck/tests/linux/timerfd-syscall.c ++++ b/memcheck/tests/linux/timerfd-syscall.c +@@ -78,6 +78,9 @@ + #elif defined(__s390x__) + #define __NR_timerfd_settime 320 + #define __NR_timerfd_gettime 321 ++#elif defined(__arm__) && defined(__NR_timerfd_settime64) && defined(__NR_timerfd_gettime64) ++#define __NR_timerfd_settime __NR_timerfd_settime64 ++#define __NR_timerfd_gettime __NR_timerfd_gettime64 + #else + #error Cannot detect your architecture! + #endif diff --git a/main/valgrind/fix-tests-musl-s390x.patch b/main/valgrind/fix-tests-musl-s390x.patch new file mode 100644 index 00000000000..73e57f54850 --- /dev/null +++ b/main/valgrind/fix-tests-musl-s390x.patch @@ -0,0 +1,57 @@ +diff --git a/none/tests/s390x/ex_sig.c b/none/tests/s390x/ex_sig.c +index 9ff33fc..b5aaa7a 100644 +--- a/none/tests/s390x/ex_sig.c ++++ b/none/tests/s390x/ex_sig.c +@@ -1,5 +1,7 @@ + #include <features.h> ++#ifdef __GLIBC__ + #include <fpu_control.h> ++#endif + #include <signal.h> + #include <sys/types.h> + #include <signal.h> +diff --git a/none/tests/s390x/test_sig.c b/none/tests/s390x/test_sig.c +index b24dbbe..b93088b 100644 +--- a/none/tests/s390x/test_sig.c ++++ b/none/tests/s390x/test_sig.c +@@ -1,5 +1,7 @@ + #include <features.h> ++#ifdef __GLIBC__ + #include <fpu_control.h> ++#endif + #include <signal.h> + #include <sys/types.h> + #include <signal.h> +diff --git a/none/tests/s390x/traps.c b/none/tests/s390x/traps.c +index 86874c3..ce1fc74 100644 +--- a/none/tests/s390x/traps.c ++++ b/none/tests/s390x/traps.c +@@ -1,5 +1,7 @@ + #include <features.h> ++#ifdef __GLIBC__ + #include <fpu_control.h> ++#endif + #include <signal.h> + #include <sys/types.h> + #include <signal.h> +diff --git a/tests/s390x_features.c b/tests/s390x_features.c +index 507f3ab..40774de 100644 +--- a/tests/s390x_features.c ++++ b/tests/s390x_features.c +@@ -48,12 +48,16 @@ jmp_buf env; + // of the CPU facility list. To read the HWCAP, use 'getauxval' if available -- + // which should be the case with glibc versions >= 2.16. A system with an older + // glibc is unlikely to support any of these features anyhow. ++#ifdef __GLIBC__ + #if __GLIBC_PREREQ(2, 16) + #include <sys/auxv.h> + #define GET_HWCAP() getauxval(AT_HWCAP) + #else + #define GET_HWCAP() 0UL + #endif ++#else ++#define GET_HWCAP() 0UL ++#endif + + /* Number of double words needed to store all facility bits. */ + #define S390_NUM_FACILITY_DW 3 diff --git a/main/valkey/APKBUILD b/main/valkey/APKBUILD new file mode 100644 index 00000000000..c63bbbff440 --- /dev/null +++ b/main/valkey/APKBUILD @@ -0,0 +1,106 @@ +# Contributor: V.Krishn <vkrishn4@gmail.com> +# Contributor: Eivind Uggedal <eu@eju.no> +# Contributor: TBK <alpine@jjtc.eu> +# Maintainer: Jakub Jirutka <jakub@jirutka.cz> +pkgname=valkey +pkgver=7.2.5 +pkgrel=1 +pkgdesc="Open source high-performance key/value datastore (fork of Redis)" +url="https://valkey.io/" +arch="all" +license="BSD-3-Clause" +pkgusers="valkey" +pkggroups="valkey" +makedepends="linux-headers openssl-dev" +checkdepends="tcl procps" +install=" + $pkgname.pre-install + $pkgname-compat.pre-install + " +subpackages=" + $pkgname-benchmark + $pkgname-cli + $pkgname-compat::noarch + $pkgname-openrc + " +source="https://github.com/valkey-io/valkey/archive/$pkgver/valkey-$pkgver.tar.gz + valkey.conf.patch + sentinel.conf.patch + $pkgname.initd + $pkgname.confd + $pkgname-sentinel.initd + $pkgname-sentinel.confd + " + +case "$CARCH" in + # FIXME: One test is broken on s390x. + s390x) options="!check";; +esac + +build() { + export CFLAGS="$CFLAGS -DUSE_MALLOC_USABLE_SIZE -O2 -flto=auto" + make USE_JEMALLOC=no \ + MALLOC=libc \ + BUILD_TLS=yes \ + all +} + +check() { + make test +} + +package() { + make install PREFIX=/usr INSTALL_BIN="$pkgdir/usr/bin" + + cd "$pkgdir" + + # NOTE: /etc/valkey and /etc/valkey/sentinel.conf must be writable for valkey, + # otherwise Sentinel fails to start. + install -d -m 750 -o valkey -g valkey \ + etc/valkey \ + etc/valkey/valkey.d \ + var/lib/valkey \ + var/lib/valkey/sentinel + + install -D -m 640 -o root -g valkey "$builddir"/valkey.conf etc/valkey/valkey.conf + install -D -m 640 -o valkey -g valkey "$builddir"/sentinel.conf etc/valkey/sentinel.conf + + install -D -m 755 "$srcdir"/valkey.initd etc/init.d/valkey + install -D -m 755 "$srcdir"/valkey-sentinel.initd etc/init.d/valkey-sentinel + install -D -m 644 "$srcdir"/valkey.confd etc/conf.d/valkey + install -D -m 644 "$srcdir"/valkey-sentinel.confd etc/conf.d/valkey-sentinel + + install -d -m 750 -o valkey -g valkey \ + var/lib/valkey \ + var/lib/valkey/sentinel +} + +benchmark() { + pkgdesc="Valkey benchmarking tool" + + amove usr/bin/valkey-benchmark +} + +cli() { + pkgdesc="Valkey CLI client" + + amove usr/bin/valkey-cli +} + +compat() { + pkgdesc="Valkey command symlinks and system group for compatibility with redis" + depends="!redis !redict-compat" + + amove usr/bin/redis-* + rm "$subpkgdir"/usr/bin/redis-benchmark +} + +sha512sums=" +0b684a5ffe045ce51bb2f4f76429928784b8b46ee4817a95b658ffd69313a90b3d0fb12e0ddbb0b4cb57a7e0c79072f603eb4524a9bcce96ecc9ae8f1a5f02c3 valkey-7.2.5.tar.gz +20278cb287d9bc15839a120af4379d18bbc3bef61f07834931c807be87a2227027ad4f1bbd1fba3fdcc99b37e67262f2c925e99905b4bc1b15697a5be282265b valkey.conf.patch +d0311d2bfade7efbfa2bdcc6c74e8e8a151c09c627e30f5cea1826155dcb4f7ca4c1d35aba26bccec933575fadcbe5785e16b4801058fec73c7de5537ffeb09a sentinel.conf.patch +605c1f39cf5f206e03d19af54412a66732ad3c65d5cb36e5d6cfb9d28779807d2da9c29d01f07e0ba2956446cb6935b66c92844a74b255b6070870b30d7d45d8 valkey.initd +639a007f7e98cf7614d2afb6e109042883030e0bdf4eaf1dc3df3ecab8043d6be30647e1e46295f783efc7baf42dc420b2e5dcf388913efdc5bdf2cd1e418f9f valkey.confd +dd407cb4047524114b4814a28993978acbe300989acc466ec3809171bf19a1e0562756f7b5954981a087a37437c2c281e4a3667d361cfa8873d1c20d1b900632 valkey-sentinel.initd +926316561f0802b577caee03e7bccc5538dc8270095df95853549fdd519fac8d0e89bc3e563cdba2d7ec0dfe10db5e50b95859549597beec894c820abfdbecee valkey-sentinel.confd +" diff --git a/main/valkey/sentinel.conf.patch b/main/valkey/sentinel.conf.patch new file mode 100644 index 00000000000..182cd086186 --- /dev/null +++ b/main/valkey/sentinel.conf.patch @@ -0,0 +1,64 @@ +--- a/sentinel.conf ++++ b/sentinel.conf +@@ -9,16 +9,6 @@ + # The port that this sentinel instance will run on + port 26379 + +-# By default Valkey Sentinel does not run as a daemon. Use 'yes' if you need it. +-# Note that Valkey will write a pid file in /var/run/valkey-sentinel.pid when +-# daemonized. +-daemonize no +- +-# When running daemonized, Valkey Sentinel writes a pid file in +-# /var/run/valkey-sentinel.pid by default. You can specify a custom pid file +-# location here. +-pidfile /var/run/valkey-sentinel.pid +- + # Specify the server verbosity level. + # This can be one of: + # debug (a lot of information, useful for development/testing) +@@ -31,14 +21,14 @@ + # Specify the log file name. Also the empty string can be used to force + # Sentinel to log on the standard output. Note that if you use standard + # output for logging but daemonize, logs will be sent to /dev/null +-logfile "" ++# logfile /var/log/valkey/sentinel.log + + # To enable logging to the system logger, just set 'syslog-enabled' to yes, + # and optionally update the other syslog parameters to suit your needs. +-# syslog-enabled no ++syslog-enabled yes + + # Specify the syslog identity. +-# syslog-ident sentinel ++syslog-ident sentinel + + # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. + # syslog-facility local0 +@@ -70,7 +60,7 @@ + # For Valkey Sentinel to chdir to /tmp at startup is the simplest thing + # for the process to don't interfere with administrative tasks such as + # unmounting filesystems. +-dir /tmp ++dir /var/lib/valkey/sentinel + + # sentinel monitor <master-name> <ip> <valkey-port> <quorum> + # +@@ -266,7 +256,7 @@ + # + # Example: + # +-# sentinel notification-script mymaster /var/valkey/notify.sh ++# sentinel notification-script mymaster /etc/valkey/notify.sh + + # CLIENTS RECONFIGURATION SCRIPT + # +@@ -291,7 +281,7 @@ + # + # Example: + # +-# sentinel client-reconfig-script mymaster /var/valkey/reconfig.sh ++# sentinel client-reconfig-script mymaster /etc/valkey/reconfig.sh + + # SECURITY + # diff --git a/main/valkey/valkey-compat.pre-install b/main/valkey/valkey-compat.pre-install new file mode 100644 index 00000000000..e23cf4612f7 --- /dev/null +++ b/main/valkey/valkey-compat.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S redis 2>/dev/null +addgroup valkey redis 2>/dev/null + +exit 0 diff --git a/main/valkey/valkey-sentinel.confd b/main/valkey/valkey-sentinel.confd new file mode 100644 index 00000000000..daea879564b --- /dev/null +++ b/main/valkey/valkey-sentinel.confd @@ -0,0 +1,10 @@ +# Configuration for /etc/init.d/valkey-sentinel + +# Valkey Sentinel configuration file. +#cfgfile="/etc/valkey/sentinel.conf" + +# User (and group) to run valkey as. +#command_user="valkey:valkey" + +# Uncomment to run with process supervisor. +# supervisor="supervise-daemon" diff --git a/main/valkey/valkey-sentinel.initd b/main/valkey/valkey-sentinel.initd new file mode 100644 index 00000000000..7402907f02c --- /dev/null +++ b/main/valkey/valkey-sentinel.initd @@ -0,0 +1,38 @@ +#!/sbin/openrc-run + +name="Valkey Sentinel" + +: ${cfgfile:="/etc/valkey/sentinel.conf"} +: ${command_user:="valkey:valkey"} + +command="/usr/bin/valkey-sentinel" +command_args="$cfgfile --daemonize no $command_args" +command_background="yes" + +pidfile="/run/$RC_SVCNAME.pid" + +required_files="$cfgfile" + +depend() { + use net localmount logger + after keepalived firewall valkey + provide redis-sentinel +} + +start_pre() { + # Sets start-start-daemon's --chdir. + directory="$(config_get 'dir' '/var/lib/valkey')" || return 1 + + local logfile="$(config_get 'logfile')" + if [ "$logfile" ]; then + checkpath -f -o "$command_user" "$logfile" || return 1 + fi +} + +config_get() { + local key="$1" + local default="${2:-}" + + local value="$(awk "\$1 == \"$key\" { print \$2 }" "$cfgfile")" + printf '%s\n' "${value:-$default}" +} diff --git a/main/valkey/valkey.conf.patch b/main/valkey/valkey.conf.patch new file mode 100644 index 00000000000..f8cdcdc82e8 --- /dev/null +++ b/main/valkey/valkey.conf.patch @@ -0,0 +1,87 @@ +We force "daemonize no" in init script, so daemonize and pidfile does not +have any effect in valkey.conf. It's init/rc system's job to daemonize +programs and handle pidfiles, if it needs it! + +Applications often communicate with Redis via unix socket, so it's +convenient to have it enabled by default. + +--- a/valkey.conf ++++ b/valkey.conf +@@ -152,8 +152,8 @@ + # incoming connections. There is no default, so the server will not listen + # on a unix socket when not specified. + # +-# unixsocket /run/valkey.sock +-# unixsocketperm 700 ++unixsocket /run/valkey.sock ++unixsocketperm 770 + + # Close the connection after a client is idle for N seconds (0 to disable) + timeout 0 +@@ -300,11 +300,6 @@ + + ################################# GENERAL ##################################### + +-# By default the server does not run as a daemon. Use 'yes' if you need it. +-# Note that the server will write a pid file in /var/run/valkey.pid when daemonized. +-# When the server is supervised by upstart or systemd, this parameter has no impact. +-daemonize no +- + # If you run the server from upstart or systemd, the server can interact with your + # supervision tree. Options: + # supervised no - no supervision interaction +@@ -323,20 +318,6 @@ + # + # supervised auto + +-# If a pid file is specified, the server writes it where specified at startup +-# and removes it at exit. +-# +-# When the server runs non daemonized, no pid file is created if none is +-# specified in the configuration. When the server is daemonized, the pid file +-# is used even if not specified, defaulting to "/var/run/redis.pid". +-# +-# Creating a pid file is best effort: if the server is not able to create it +-# nothing bad happens, the server will start and run normally. +-# +-# Note that on modern Linux systems "/run/valkey.pid" is more conforming +-# and should be used instead. +-pidfile /var/run/valkey_6379.pid +- + # Specify the server verbosity level. + # This can be one of: + # debug (a lot of information, useful for development/testing) +@@ -349,14 +330,14 @@ + # Specify the log file name. Also the empty string can be used to force + # the server to log on the standard output. Note that if you use standard + # output for logging but daemonize, logs will be sent to /dev/null +-logfile "" ++# logfile /var/log/valkey.log + + # To enable logging to the system logger, just set 'syslog-enabled' to yes, + # and optionally update the other syslog parameters to suit your needs. +-# syslog-enabled no ++syslog-enabled yes + + # Specify the syslog identity. +-# syslog-ident redis ++syslog-ident valkey + + # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. + # syslog-facility local0 +@@ -504,7 +485,7 @@ + # The Append Only File will also be created inside this directory. + # + # Note that you must specify a directory here, not a file name. +-dir ./ ++dir /var/lib/valkey + + ################################# REPLICATION ################################# + +@@ -2282,3 +2263,6 @@ + # to suppress + # + # ignore-warnings ARM64-COW-BUG ++ ++# Include configuration fragments. ++include /etc/valkey/valkey.d/*.conf diff --git a/main/valkey/valkey.confd b/main/valkey/valkey.confd new file mode 100644 index 00000000000..7951cf1b041 --- /dev/null +++ b/main/valkey/valkey.confd @@ -0,0 +1,10 @@ +# Configuration for /etc/init.d/valkey + +# Valkey configuration file. +#cfgfile="/etc/valkey/valkey.conf" + +# User (and group) to run valkey as. +#command_user="valkey:valkey" + +# Uncomment to run with process supervisor. +# supervisor="supervise-daemon" diff --git a/main/valkey/valkey.initd b/main/valkey/valkey.initd new file mode 100644 index 00000000000..7fd3ece5392 --- /dev/null +++ b/main/valkey/valkey.initd @@ -0,0 +1,46 @@ +#!/sbin/openrc-run + +name="Valkey server" +description="Open source high-performance key/value datastore (fork of Redis)" + +: ${cfgfile:="/etc/valkey/valkey.conf"} +: ${command_user:="valkey:valkey"} + +command="/usr/bin/valkey-server" +command_args="$cfgfile --daemonize no $command_args" +command_background="yes" +pidfile="/run/$RC_SVCNAME.pid" + +required_files="$cfgfile" + +depend() { + use net localmount logger + after keepalived firewall + provide redis +} + +start_pre() { + # Sets start-start-daemon's --chdir. + directory="$(config_get 'dir' '/var/lib/valkey')" + checkpath -d -o "$command_user" "$directory" || return 1 + + local logfile="$(config_get 'logfile')" + if [ "$logfile" ]; then + checkpath -f -o "$command_user" "$logfile" || return 1 + fi + + local unixsocket="$(config_get 'unixsocket')" + if [ "$unixsocket" ] && ! [ -e "${unixsocket%/*}" ]; then + checkpath -d -o "$command_user" "${unixsocket%/*}" || return 1 + fi + + return 0 +} + +config_get() { + local key="$1" + local default="${2:-}" + + local value="$(awk "\$1 == \"$key\" { print \$2 }" "$cfgfile")" + printf '%s\n' "${value:-$default}" +} diff --git a/main/valkey/valkey.pre-install b/main/valkey/valkey.pre-install new file mode 100644 index 00000000000..58440139d2d --- /dev/null +++ b/main/valkey/valkey.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S valkey 2>/dev/null +adduser -S -D -H -h /var/lib/valkey -s /sbin/nologin -G valkey -g valkey valkey 2>/dev/null + +exit 0 diff --git a/main/varnish/APKBUILD b/main/varnish/APKBUILD index d76232d4e1d..202f39741a5 100644 --- a/main/varnish/APKBUILD +++ b/main/varnish/APKBUILD @@ -28,7 +28,7 @@ source="https://varnish-cache.org/_downloads/varnish-$pkgver.tgz varnishreload-$pkgver::https://github.com/varnishcache/pkg-varnish-cache/raw/35cba4e219b135b637bfd4fb27d98d548f21c20e/systemd/varnishreload" case "$CARCH" in - ppc64le) options="$options !check";; # tests fail + ppc64le|loongarch64) options="$options !check";; # tests fail esac # secfixes: diff --git a/main/wayland-protocols/APKBUILD b/main/wayland-protocols/APKBUILD index 23ecbce37c3..a7872b316c6 100644 --- a/main/wayland-protocols/APKBUILD +++ b/main/wayland-protocols/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Peter Shkenev <santurysim@gmail.com> pkgname=wayland-protocols -pkgver=1.34 +pkgver=1.36 pkgrel=0 pkgdesc="Protocols and protocol extensions complementing the Wayland core protocol" url="https://wayland.freedesktop.org" @@ -33,5 +33,5 @@ package() { } sha512sums=" -d180eaaf87281dc7adade19070ee8308a5cb3dc2f60cff077960436ad647d3d207eb63fa0b079b7b315109654ad6e6b5e2588bfe859900e67edf8c67b1c3ad20 wayland-protocols-1.34.tar.xz +5448b9aedc953ce6be0f378da900c195c8743cb6001f615823b5fc9cab3e3ee54271132055743278e10decef7f8e9dcdeef31593a2a12062575fb90eb0084be0 wayland-protocols-1.36.tar.xz " diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD index 4cf41113d78..acda7f265b9 100644 --- a/main/xfsprogs/APKBUILD +++ b/main/xfsprogs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfsprogs -pkgver=6.6.0 +pkgver=6.7.0 pkgrel=0 pkgdesc="XFS filesystem utilities" url="https://xfs.org/index.php/Main_Page" @@ -18,9 +18,7 @@ makedepends=" " options="!check" # no test suite subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-extra" -source="https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-$pkgver.tar.xz - lfs64.patch - " +source="https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-$pkgver.tar.xz" build() { export DEBUG=-DNDEBUG @@ -56,6 +54,5 @@ extra() { } sha512sums=" -89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da xfsprogs-6.6.0.tar.xz -efa59b3cdfb5f3c9d2fc4cbadf199be31de9a07fa283e67b8645547db64705a75e8135d73f94e31f85c44f51b86a8842ed90cd3bfa5ebee315eb9a6d8eb0e073 lfs64.patch +4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74 xfsprogs-6.7.0.tar.xz " diff --git a/main/xfsprogs/lfs64.patch b/main/xfsprogs/lfs64.patch deleted file mode 100644 index 05406ea063d..00000000000 --- a/main/xfsprogs/lfs64.patch +++ /dev/null @@ -1,683 +0,0 @@ -needed since https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc --- -diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c -index 79f6594..854fd7f 100644 ---- a/copy/xfs_copy.c -+++ b/copy/xfs_copy.c -@@ -881,7 +881,7 @@ - } - } else { - char *lb = memalign(wbuf_align, XFS_MAX_SECTORSIZE); -- off64_t off; -+ off_t off; - ssize_t len; - - /* ensure device files are sufficiently large */ -diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c -index ba02506..12fffbd 100644 ---- a/fsr/xfs_fsr.c -+++ b/fsr/xfs_fsr.c -@@ -1148,7 +1148,7 @@ packfile(char *fname, char *tname, int fd, - struct dioattr dio; - static xfs_swapext_t sx; - struct xfs_flock64 space; -- off64_t cnt, pos; -+ off_t cnt, pos; - void *fbuf = NULL; - int ct, wc, wc_b4; - char ffname[SMBUFSZ]; -diff --git a/io/bmap.c b/io/bmap.c -index 722a389..6182e1c 100644 ---- a/io/bmap.c -+++ b/io/bmap.c -@@ -257,7 +257,7 @@ bmap_f( - #define FLG_BSW 0000010 /* Not on begin of stripe width */ - #define FLG_ESW 0000001 /* Not on end of stripe width */ - int agno; -- off64_t agoff, bbperag; -+ off_t agoff, bbperag; - int foff_w, boff_w, aoff_w, tot_w, agno_w; - char rbuf[32], bbuf[32], abuf[32]; - int sunit, swidth; -@@ -267,8 +267,8 @@ bmap_f( - if (is_rt) - sunit = swidth = bbperag = 0; - else { -- bbperag = (off64_t)fsgeo.agblocks * -- (off64_t)fsgeo.blocksize / BBSIZE; -+ bbperag = (off_t)fsgeo.agblocks * -+ (off_t)fsgeo.blocksize / BBSIZE; - sunit = (fsgeo.sunit * fsgeo.blocksize) / BBSIZE; - swidth = (fsgeo.swidth * fsgeo.blocksize) / BBSIZE; - } -diff --git a/io/copy_file_range.c b/io/copy_file_range.c -index d154fa7..20ddde0 100644 ---- a/io/copy_file_range.c -+++ b/io/copy_file_range.c -@@ -54,7 +54,7 @@ copy_file_range_cmd(int fd, long long *src_off, long long *dst_off, size_t len) - return 0; - } - --static off64_t -+static off_t - copy_src_filesize(int fd) - { - struct stat st; -@@ -154,7 +154,7 @@ copy_range_f(int argc, char **argv) - } - - if (!len_specified) { -- off64_t sz; -+ off_t sz; - - sz = copy_src_filesize(fd); - if (sz < 0 || (unsigned long long)sz > SIZE_MAX) { -diff --git a/io/cowextsize.c b/io/cowextsize.c -index f6b134d..00e40c6 100644 ---- a/io/cowextsize.c -+++ b/io/cowextsize.c -@@ -50,10 +50,10 @@ static int - set_cowextsize(const char *path, int fd, long extsz) - { - struct fsxattr fsx; -- struct stat64 stat; -+ struct stat stat; - -- if (fstat64(fd, &stat) < 0) { -- perror("fstat64"); -+ if (fstat(fd, &stat) < 0) { -+ perror("fstat"); - exitcode = 1; - return 0; - } -diff --git a/io/fadvise.c b/io/fadvise.c -index 60cc0f0..0966c41 100644 ---- a/io/fadvise.c -+++ b/io/fadvise.c -@@ -39,7 +39,7 @@ fadvise_f( - int argc, - char **argv) - { -- off64_t offset = 0, length = 0; -+ off_t offset = 0, length = 0; - int c, range = 0, advise = POSIX_FADV_NORMAL; - - while ((c = getopt(argc, argv, "dnrsw")) != EOF) { -diff --git a/io/fiemap.c b/io/fiemap.c -index f0c74df..b41f71b 100644 ---- a/io/fiemap.c -+++ b/io/fiemap.c -@@ -234,9 +234,9 @@ fiemap_f( - int tot_w = 5; /* 5 since its just one number */ - int flg_w = 5; - __u64 last_logical = 0; /* last extent offset handled */ -- off64_t start_offset = 0; /* mapping start */ -- off64_t length = -1LL; /* mapping length */ -- off64_t range_end = -1LL; /* mapping end*/ -+ off_t start_offset = 0; /* mapping start */ -+ off_t length = -1LL; /* mapping length */ -+ off_t range_end = -1LL; /* mapping end*/ - size_t fsblocksize, fssectsize; - struct stat st; - -diff --git a/io/fsmap.c b/io/fsmap.c -index 7db5184..bf11963 100644 ---- a/io/fsmap.c -+++ b/io/fsmap.c -@@ -170,7 +170,7 @@ dump_map_verbose( - unsigned long long i; - struct fsmap *p; - int agno; -- off64_t agoff, bperag; -+ off_t agoff, bperag; - int foff_w, boff_w, aoff_w, tot_w, agno_w, own_w; - int nr_w, dev_w; - char rbuf[40], bbuf[40], abuf[40], obuf[40]; -@@ -183,8 +183,8 @@ dump_map_verbose( - dev_w = 3; - nr_w = 4; - tot_w = MINTOT_WIDTH; -- bperag = (off64_t)fsgeo->agblocks * -- (off64_t)fsgeo->blocksize; -+ bperag = (off_t)fsgeo->agblocks * -+ (off_t)fsgeo->blocksize; - sunit = (fsgeo->sunit * fsgeo->blocksize); - swidth = (fsgeo->swidth * fsgeo->blocksize); - -diff --git a/io/io.h b/io/io.h -index fe474fa..68e5e48 100644 ---- a/io/io.h -+++ b/io/io.h -@@ -53,7 +53,7 @@ extern int stat_f(int argc, char **argv); - typedef struct mmap_region { - void *addr; /* address of start of mapping */ - size_t length; /* length of mapping */ -- off64_t offset; /* start offset into backing file */ -+ off_t offset; /* start offset into backing file */ - int prot; /* protection mode of the mapping */ - int flags; /* MAP_* flags passed to mmap() */ - char *name; /* name of backing file */ -@@ -63,13 +63,13 @@ extern mmap_region_t *maptable; /* mmap'd region array */ - extern int mapcount; /* #entries in the mapping table */ - extern mmap_region_t *mapping; /* active mapping table entry */ - extern int maplist_f(void); --extern void *check_mapping_range(mmap_region_t *, off64_t, size_t, int); -+extern void *check_mapping_range(mmap_region_t *, off_t, size_t, int); - - /* - * Various xfs_io helper routines/globals - */ - --extern off64_t filesize(void); -+extern off_t filesize(void); - extern int openfile(char *, struct xfs_fsop_geom *, int, mode_t, - struct fs_path *); - extern int addfile(char *, int , struct xfs_fsop_geom *, int, -@@ -84,9 +84,9 @@ extern size_t io_buffersize; - extern int vectors; - extern struct iovec *iov; - extern int alloc_buffer(size_t, int, unsigned int); --extern int read_buffer(int, off64_t, long long, long long *, -+extern int read_buffer(int, off_t, long long, long long *, - int, int); --extern void dump_buffer(off64_t, ssize_t); -+extern void dump_buffer(off_t, ssize_t); - - extern void attr_init(void); - extern void bmap_init(void); -diff --git a/io/madvise.c b/io/madvise.c -index bde3153..6e9c5b1 100644 ---- a/io/madvise.c -+++ b/io/madvise.c -@@ -39,7 +39,7 @@ madvise_f( - int argc, - char **argv) - { -- off64_t offset, llength; -+ off_t offset, llength; - size_t length; - void *start; - int advise = MADV_NORMAL, c; -diff --git a/io/mincore.c b/io/mincore.c -index 67f1d6c..24147ac 100644 ---- a/io/mincore.c -+++ b/io/mincore.c -@@ -17,7 +17,7 @@ mincore_f( - int argc, - char **argv) - { -- off64_t offset, llength; -+ off_t offset, llength; - size_t length; - size_t blocksize, sectsize; - void *start; -diff --git a/io/mmap.c b/io/mmap.c -index 425957d..10fd7b4 100644 ---- a/io/mmap.c -+++ b/io/mmap.c -@@ -63,11 +63,11 @@ print_mapping( - void * - check_mapping_range( - mmap_region_t *map, -- off64_t offset, -+ off_t offset, - size_t length, - int pagealign) - { -- off64_t relative; -+ off_t relative; - - if (offset < mapping->offset) { - printf(_("offset (%lld) is before start of mapping (%lld)\n"), -@@ -155,7 +155,7 @@ mmap_f( - int argc, - char **argv) - { -- off64_t offset; -+ off_t offset; - ssize_t length = 0, length2 = 0; - void *address = NULL; - char *filename; -@@ -308,7 +308,7 @@ msync_f( - int argc, - char **argv) - { -- off64_t offset; -+ off_t offset; - ssize_t length; - void *start; - int c, flags = 0; -@@ -401,7 +401,7 @@ mread_f( - int argc, - char **argv) - { -- off64_t offset, tmp, dumpoffset, printoffset; -+ off_t offset, tmp, dumpoffset, printoffset; - ssize_t length; - size_t dumplen, cnt = 0; - char *bp; -@@ -566,7 +566,7 @@ mwrite_f( - int argc, - char **argv) - { -- off64_t offset, tmp; -+ off_t offset, tmp; - ssize_t length; - void *start; - char *sp; -diff --git a/io/pread.c b/io/pread.c -index 0f1d8b9..79990c6 100644 ---- a/io/pread.c -+++ b/io/pread.c -@@ -116,7 +116,7 @@ alloc_buffer( - static void - __dump_buffer( - void *buf, -- off64_t offset, -+ off_t offset, - ssize_t len) - { - int i, j; -@@ -141,7 +141,7 @@ __dump_buffer( - - void - dump_buffer( -- off64_t offset, -+ off_t offset, - ssize_t len) - { - int i, l; -@@ -164,7 +164,7 @@ dump_buffer( - static ssize_t - do_preadv( - int fd, -- off64_t offset, -+ off_t offset, - long long count) - { - int vecs = 0; -@@ -199,7 +199,7 @@ do_preadv( - static ssize_t - do_pread( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - size_t buffer_size) - { -@@ -212,13 +212,13 @@ do_pread( - static int - read_random( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - long long *total, - unsigned int seed, - int eof) - { -- off64_t end, off, range; -+ off_t end, off, range; - ssize_t bytes; - int ops = 0; - -@@ -259,12 +259,12 @@ read_random( - static int - read_backward( - int fd, -- off64_t *offset, -+ off_t *offset, - long long *count, - long long *total, - int eof) - { -- off64_t end, off = *offset; -+ off_t end, off = *offset; - ssize_t bytes = 0, bytes_requested; - long long cnt = *count; - int ops = 0; -@@ -319,7 +319,7 @@ read_backward( - static int - read_forward( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - long long *total, - int verbose, -@@ -353,7 +353,7 @@ read_forward( - int - read_buffer( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - long long *total, - int verbose, -@@ -368,7 +368,7 @@ pread_f( - char **argv) - { - size_t bsize; -- off64_t offset; -+ off_t offset; - unsigned int zeed = 0; - long long count, total, tmp; - size_t fsblocksize, fssectsize; -diff --git a/io/pwrite.c b/io/pwrite.c -index 467bfa9..8d134c5 100644 ---- a/io/pwrite.c -+++ b/io/pwrite.c -@@ -54,7 +54,7 @@ pwrite_help(void) - static ssize_t - do_pwritev( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - int pwritev2_flags) - { -@@ -97,7 +97,7 @@ do_pwritev( - static ssize_t - do_pwrite( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - size_t buffer_size, - int pwritev2_flags) -@@ -110,13 +110,13 @@ do_pwrite( - - static int - write_random( -- off64_t offset, -+ off_t offset, - long long count, - unsigned int seed, - long long *total, - int pwritev2_flags) - { -- off64_t off, range; -+ off_t off, range; - ssize_t bytes; - int ops = 0; - -@@ -155,12 +155,12 @@ write_random( - - static int - write_backward( -- off64_t offset, -+ off_t offset, - long long *count, - long long *total, - int pwritev2_flags) - { -- off64_t end, off = offset; -+ off_t end, off = offset; - ssize_t bytes = 0, bytes_requested; - long long cnt = *count; - int ops = 0; -@@ -214,11 +214,11 @@ write_backward( - - static int - write_buffer( -- off64_t offset, -+ off_t offset, - long long count, - size_t bs, - int fd, -- off64_t skip, -+ off_t skip, - long long *total, - int pwritev2_flags) - { -@@ -253,7 +253,7 @@ write_buffer( - - static int - write_once( -- off64_t offset, -+ off_t offset, - long long count, - long long *total, - int pwritev2_flags) -@@ -275,7 +275,7 @@ pwrite_f( - char **argv) - { - size_t bsize; -- off64_t offset, skip = 0; -+ off_t offset, skip = 0; - long long count, total, tmp; - unsigned int zeed = 0, seed = 0xcdcdcdcd; - size_t fsblocksize, fssectsize; -diff --git a/io/reflink.c b/io/reflink.c -index 8e4f389..b6a3c05 100644 ---- a/io/reflink.c -+++ b/io/reflink.c -@@ -98,7 +98,7 @@ dedupe_f( - int argc, - char **argv) - { -- off64_t soffset, doffset; -+ off_t soffset, doffset; - long long count, total; - char *infile; - int condensed, quiet_flag; -@@ -226,7 +226,7 @@ reflink_f( - int argc, - char **argv) - { -- off64_t soffset, doffset; -+ off_t soffset, doffset; - long long count = 0, total; - char *infile = NULL; - int condensed, quiet_flag; -diff --git a/io/seek.c b/io/seek.c -index 6734ecb..ffe7439 100644 ---- a/io/seek.c -+++ b/io/seek.c -@@ -63,8 +63,8 @@ static void - seek_output( - int startflag, - char *type, -- off64_t start, -- off64_t offset) -+ off_t start, -+ off_t offset) - { - if (offset == -1) { - if (errno == ENXIO) { -@@ -92,7 +92,7 @@ seek_f( - int argc, - char **argv) - { -- off64_t offset, start; -+ off_t offset, start; - size_t fsblocksize, fssectsize; - int c; - int current; /* specify data or hole */ -diff --git a/io/sendfile.c b/io/sendfile.c -index a003bb5..2ce569c 100644 ---- a/io/sendfile.c -+++ b/io/sendfile.c -@@ -34,12 +34,12 @@ sendfile_help(void) - - static int - send_buffer( -- off64_t offset, -+ off_t offset, - size_t count, - int fd, - long long *total) - { -- off64_t off = offset; -+ off_t off = offset; - ssize_t bytes, bytes_remaining = count; - int ops = 0; - -@@ -66,7 +66,7 @@ sendfile_f( - int argc, - char **argv) - { -- off64_t offset = 0; -+ off_t offset = 0; - long long count, total; - size_t blocksize, sectsize; - struct timeval t1, t2; -diff --git a/io/stat.c b/io/stat.c -index b57f9ee..e8f68dc 100644 ---- a/io/stat.c -+++ b/io/stat.c -@@ -21,7 +21,7 @@ static cmdinfo_t stat_cmd; - static cmdinfo_t statfs_cmd; - static cmdinfo_t statx_cmd; - --off64_t -+off_t - filesize(void) - { - struct stat st; -diff --git a/io/sync_file_range.c b/io/sync_file_range.c -index 94285c2..2375a06 100644 ---- a/io/sync_file_range.c -+++ b/io/sync_file_range.c -@@ -30,7 +30,7 @@ sync_range_f( - int argc, - char **argv) - { -- off64_t offset = 0, length = 0; -+ off_t offset = 0, length = 0; - int c, sync_mode = 0; - size_t blocksize, sectsize; - -diff --git a/io/truncate.c b/io/truncate.c -index 1d04919..a74b613 100644 ---- a/io/truncate.c -+++ b/io/truncate.c -@@ -16,7 +16,7 @@ truncate_f( - int argc, - char **argv) - { -- off64_t offset; -+ off_t offset; - size_t blocksize, sectsize; - - init_cvtnum(&blocksize, §size); -diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c -index d5aad3e..0faa05b 100644 ---- a/libxfs/rdwr.c -+++ b/libxfs/rdwr.c -@@ -576,7 +576,7 @@ libxfs_balloc( - - - static int --__read_buf(int fd, void *buf, int len, off64_t offset, int flags) -+__read_buf(int fd, void *buf, int len, off_t offset, int flags) - { - int sts; - -@@ -639,7 +639,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags) - fd = libxfs_device_to_fd(btp->bt_bdev); - buf = bp->b_addr; - for (i = 0; i < bp->b_nmaps; i++) { -- off64_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); -+ off_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); - int len = BBTOB(bp->b_maps[i].bm_len); - - error = __read_buf(fd, buf, len, offset, flags); -@@ -798,7 +798,7 @@ err: - } - - static int --__write_buf(int fd, void *buf, int len, off64_t offset, int flags) -+__write_buf(int fd, void *buf, int len, off_t offset, int flags) - { - int sts; - -@@ -864,7 +864,7 @@ libxfs_bwrite( - void *buf = bp->b_addr; - - for (i = 0; i < bp->b_nmaps; i++) { -- off64_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); -+ off_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); - int len = BBTOB(bp->b_maps[i].bm_len); - - bp->b_error = __write_buf(fd, buf, len, offset, -diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c -index 7c1a66c..bb54e38 100644 ---- a/mdrestore/xfs_mdrestore.c -+++ b/mdrestore/xfs_mdrestore.c -@@ -160,7 +160,7 @@ - } else { - /* ensure device is sufficiently large enough */ - char lb[XFS_MAX_SECTORSIZE] = { 0 }; -- off64_t off; -+ off_t off; - - off = nr_blocks * blocksize - sizeof(lb); - if (pwrite(dev_fd, lb, sizeof(lb), off) < 0) -diff --git a/repair/prefetch.c b/repair/prefetch.c -index 017750e..35b5013 100644 ---- a/repair/prefetch.c -+++ b/repair/prefetch.c -@@ -475,7 +475,7 @@ pf_batch_read( - { - struct xfs_buf *bplist[MAX_BUFS]; - unsigned int num; -- off64_t first_off, last_off, next_off; -+ off_t first_off, last_off, next_off; - int len, size; - int i; - int inode_bufs; -diff --git a/scrub/spacemap.c b/scrub/spacemap.c -index 03440d3..00bee17 100644 ---- a/scrub/spacemap.c -+++ b/scrub/spacemap.c -@@ -97,11 +97,11 @@ scan_ag_rmaps( - struct scrub_ctx *ctx = (struct scrub_ctx *)wq->wq_ctx; - struct scan_blocks *sbx = arg; - struct fsmap keys[2]; -- off64_t bperag; -+ off_t bperag; - int ret; - -- bperag = (off64_t)ctx->mnt.fsgeom.agblocks * -- (off64_t)ctx->mnt.fsgeom.blocksize; -+ bperag = (off_t)ctx->mnt.fsgeom.agblocks * -+ (off_t)ctx->mnt.fsgeom.blocksize; - - memset(keys, 0, sizeof(struct fsmap) * 2); - keys->fmr_device = ctx->fsinfo.fs_datadev; -diff --git a/spaceman/freesp.c b/spaceman/freesp.c -index 70dcdb5..f5177cb 100644 ---- a/spaceman/freesp.c -+++ b/spaceman/freesp.c -@@ -62,7 +62,7 @@ static void - addtohist( - xfs_agnumber_t agno, - xfs_agblock_t agbno, -- off64_t len) -+ off_t len) - { - long i; - -@@ -152,7 +152,7 @@ scan_ag( - struct fsmap *l, *h; - struct fsmap *p; - struct xfs_fd *xfd = &file->xfd; -- off64_t aglen; -+ off_t aglen; - xfs_agblock_t agbno; - unsigned long long freeblks = 0; - unsigned long long freeexts = 0; -diff --git a/spaceman/trim.c b/spaceman/trim.c -index e9ed47e..727dd81 100644 ---- a/spaceman/trim.c -+++ b/spaceman/trim.c -@@ -26,7 +26,7 @@ trim_f( - struct xfs_fd *xfd = &file->xfd; - struct xfs_fsop_geom *fsgeom = &xfd->fsgeom; - xfs_agnumber_t agno = 0; -- off64_t offset = 0; -+ off_t offset = 0; - ssize_t length = 0; - ssize_t minlen = 0; - int aflag = 0; diff --git a/main/xtables-addons-lts/APKBUILD b/main/xtables-addons-lts/APKBUILD index ec42b833f98..3016f91e482 100644 --- a/main/xtables-addons-lts/APKBUILD +++ b/main/xtables-addons-lts/APKBUILD @@ -8,7 +8,7 @@ _ver=3.26 _rel=2 # when changing _kver make sure _krel=0 & _rel=0 _kpkg=linux-$_flavor -_kver=6.6.27 +_kver=6.6.30 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/main/xtables-addons-rpi/APKBUILD b/main/xtables-addons-rpi/APKBUILD index 86645772c2c..93537d7f6e5 100644 --- a/main/xtables-addons-rpi/APKBUILD +++ b/main/xtables-addons-rpi/APKBUILD @@ -8,7 +8,7 @@ _ver=3.26 _rel=1 # when changing _kver make sure _krel=0 & _rel=0 _kpkg=linux-$_flavor -_kver=6.6.21 +_kver=6.6.29 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/main/yash/APKBUILD b/main/yash/APKBUILD index 0f91646d967..1e1eaf4c550 100644 --- a/main/yash/APKBUILD +++ b/main/yash/APKBUILD @@ -2,21 +2,26 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=yash pkgver=2.56.1 -pkgrel=0 +pkgrel=1 pkgdesc="Yet another shell" url="https://yash.osdn.jp" arch="all" license="GPL-2.0-or-later" makedepends="ncurses-dev" +checkdepends="ed" install=" $pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade " -subpackages="$pkgname-doc $pkgname-binsh" +subpackages="$pkgname-doc $pkgname-binsh::noarch" source="https://github.com/magicant/yash/releases/download/$pkgver/yash-$pkgver.tar.xz default-yashrc.patch sample-yashrc.patch + tests-musl-regex.patch + tests-unset-IFS.patch + tests-busybox-ps.patch + tests-busybox-argv0.patch global-yashrc " @@ -34,12 +39,10 @@ done subpackages="$subpackages $pkgname-completion::noarch" prepare() { - default_prepare + # setgid bit is present on the riscv64 builder, causing 58 tests to fail + find . -type d -exec chmod -c g-s {} \; - # XXX: Disable hanging tests. - sed -i -e 's/\bkill[24]-p.tst\b//g' \ - -e 's/\bsignal[12]-y.tst\b//g' \ - tests/Makefile.in + default_prepare # Remove completions for programs that are not available on Alpine # (just to decrease size of the package). @@ -56,8 +59,10 @@ build() { } check() { - # FIXME: Fix broken tests. - make tests LANG=en_US.UTF-8 || true + make tests LANG=en_US.UTF-8 || { + cat tests/summary.log + return 1 + } } package() { @@ -103,5 +108,9 @@ sha512sums=" 28e8bde5fc12e5178136b82ecdc0c52c37c98301245089b0d55c43266880e299237a5522e572883e5c51b7d9a0e9bf94fe265a9ebdbf346c28ff837b0f60cc00 yash-2.56.1.tar.xz 8fe512d219204ddbbd59d683732c930970db08a23997c88e91035b60fd5141ea813c4d3ab2d7f19fcf6147fca59b085600a904de0c595dd92f24ab63e19ae91d default-yashrc.patch ac24612a82a353d65e2e1a6b99727363be62eb7801eae3109c4661d694d82ddd5c9fc1233443e69d8b26abab725eeaac2c4110e26b1b366983b13cbf7699ebf5 sample-yashrc.patch +441f8eab939c524edf88c164a0d44ea76faa892ba8c67924ca93bb266d0b65885b498b3e8df9ea723ef8263fce9cd9bd0ffb346b8b7b96c84c91f8f141842cf3 tests-musl-regex.patch +75f4001698789f0fab5134cd4c7facb740f82b450235595f836477e0af57875414997578cda7c6800c30fd7a803953bab0a2c7cd675f1b0a5baf9d1ca4c2dba3 tests-unset-IFS.patch +beac976835806cce7ec1b89672d297a88ab325b5cbd49033604f620f40025c42f4bcb2c2a8a5930e7df48d5ef709a8a0d79d03eb1836dd1052e9500bd288de74 tests-busybox-ps.patch +3ec0d1ca964fed8a4afcc8c5db0126f8e952e08ea9638f41565478dbc6d74623c6d88e503cd30b27fc7b58ce00fff88f45615d05468e9b9eb0db379695c61cb9 tests-busybox-argv0.patch 778b6a4fa415692293cc9a91074be373572106dc90aeb7490b37643a737f223861f05a7245e4889d8ffea975570f56fd746877726630b9486c481d3159a23e30 global-yashrc " diff --git a/main/yash/tests-busybox-argv0.patch b/main/yash/tests-busybox-argv0.patch new file mode 100644 index 00000000000..82830aaed67 --- /dev/null +++ b/main/yash/tests-busybox-argv0.patch @@ -0,0 +1,61 @@ +busybox does not work well with argv0 changes + +--- a/tests/exec-y.tst ++++ b/tests/exec-y.tst +@@ -24,17 +24,17 @@ echo not reached + __IN__ + + test_oE -e 0 'executing with specific name (-a)' +-exec -a foo sh -c 'echo "$0"' ++exec -a ash sh -c 'echo "$0"' + echo not reached + __IN__ +-foo ++ash + __OUT__ + + test_oE -e 0 'executing with specific name (--as)' +-exec --as=foo sh -c 'echo "$0"' ++exec --as=ash sh -c 'echo "$0"' + echo not reached + __IN__ +-foo ++ash + __OUT__ + + # This test fails on some environments, notably Cygwin, which implicitly adds +--- a/tests/simple-p.tst ++++ b/tests/simple-p.tst +@@ -181,7 +181,7 @@ echo command + printf '[%s]\n' "$@" + END + chmod a+x dir2/ext_cmd +-ln -s "$(command -v sh)" dir2/link_to_sh ++ln -s "$(command -v sh)" dir2/ash + + test_o 'searching PATH for command' + PATH=./dir1:./dir2:./dir3:$PATH +@@ -278,19 +278,19 @@ __OUT__ + test_o 'argv[0] (command name without slash)' + sh -c 'echo "$0"' + PATH=./dir2:$PATH +-link_to_sh -c 'echo "$0"' ++ash -c 'echo "$0"' + __IN__ + sh +-link_to_sh ++ash + __OUT__ + + testcase "$LINENO" 'argv[0] (command name with slash)' \ + 3<<\__IN__ 4<<__OUT__ 5<&- + "$(command -v sh)" -c 'echo "$0"' +-./dir2/link_to_sh -c 'echo "$0"' ++./dir2/ash -c 'echo "$0"' + __IN__ + $(command -v sh) +-./dir2/link_to_sh ++./dir2/ash + __OUT__ + + # vim: set ft=sh ts=8 sts=4 sw=4 et: diff --git a/main/yash/tests-busybox-ps.patch b/main/yash/tests-busybox-ps.patch new file mode 100644 index 00000000000..8b5872ccee6 --- /dev/null +++ b/main/yash/tests-busybox-ps.patch @@ -0,0 +1,13 @@ +busybox ps doesn't have an option to only select a specific pid. + +--- a/tests/ppid-p.tst ++++ b/tests/ppid-p.tst +@@ -4,7 +4,7 @@ posix="true" + + test_OE -e 0 'PPID is parent process ID' + echo $PPID >variable.out +-echo $(ps -o ppid= $$) >ps.out ++echo $(ps -o pid=,ppid= | awk -v pid=$$ '$1 == pid {print $2}') >ps.out + diff variable.out ps.out + __IN__ + diff --git a/main/yash/tests-musl-regex.patch b/main/yash/tests-musl-regex.patch new file mode 100644 index 00000000000..7da1697cc73 --- /dev/null +++ b/main/yash/tests-musl-regex.patch @@ -0,0 +1,47 @@ +Test failing due to the incomplete regex implementaion in musl libc. +Missing are 'collating symbol' and 'equivalence class'. + +See https://git.musl-libc.org/cgit/musl/tree/src/regex/regcomp.c?id=e3b0ace505155b6b8e301d69924b0773fd82cb6e#n553 + +--- a/tests/bracket-y.tst ++++ b/tests/bracket-y.tst +@@ -67,7 +67,7 @@ __IN__ + + # Note: ksh renders reverse results for the first two + test_OE -e 0 'bracket pattern with binary primary =' +-! [[ b = [a"-"c] ]] && [[ - = [a"-"c] ]] && ! [[ \\ = ["."] ]] ++! [[ b = [a"-"c] ]] && ! [[ - = [a"-"c] ]] && ! [[ \\ = ["."] ]] + __IN__ + + test_OE -e 0 'literal pattern matching with binary primary ==' +@@ -167,7 +167,7 @@ __IN__ + test_OE -e 0 'bracket pattern with binary primary =~' + [[ b =~ [a"-"c] ]] && ! [[ - =~ [a"-"c] ]] && + [[ 'a*c' =~ 'a*c' ]] && [[ "a<b" =~ "a<b" ]] && +-! [[ \\ =~ ["."] ]] && [[ \\ =~ [[.\\.]] ]] && ++! [[ \\ =~ ["."] ]] && ! [[ \\ =~ [[.\\.]] ]] && + [[ x] =~ [^"]]]" ]] && [[ a+ =~ [a"[:alnum:]]+" ]] + __IN__ + +--- a/tests/fnmatch-p.tst ++++ b/tests/fnmatch-p.tst +@@ -255,10 +255,7 @@ alnum + graph + print + xdigit +-2 + 3 +-4 +-7 + __OUT__ + + test_oE 'brackets and quotations' +@@ -297,8 +294,6 @@ __IN__ + 11 + 13 + 21 +-45 +-55 + __OUT__ + + # vim: set ft=sh ts=8 sts=4 sw=4 et: diff --git a/main/yash/tests-unset-IFS.patch b/main/yash/tests-unset-IFS.patch new file mode 100644 index 00000000000..8356514e69b --- /dev/null +++ b/main/yash/tests-unset-IFS.patch @@ -0,0 +1,15 @@ +1 test uses 'export IFS' messing up word splitting of $diff_opt. + +Upstream issue: https://github.com/magicant/yash/issues/50 + +--- a/tests/run-test.sh ++++ b/tests/run-test.sh +@@ -305,6 +305,8 @@ testcase() { + ;; + esac + ++ unset -v IFS ++ + # check standard output + if { <&4; } 2>/dev/null; then + printf '%% standard output diff:\n' diff --git a/main/zfs-lts/APKBUILD b/main/zfs-lts/APKBUILD index e644da31438..77a73325ba4 100644 --- a/main/zfs-lts/APKBUILD +++ b/main/zfs-lts/APKBUILD @@ -3,12 +3,12 @@ # when changing _ver we *must* bump _rel _name=zfs -_ver=2.2.3 -_rel=0 +_ver=2.2.4 +_rel=1 # when changing _kver make sure _krel=0 & _rel=0 _flavor=${FLAVOR:-lts} _kpkg=linux-$_flavor -_kver=6.6.27 +_kver=6.6.30 _krel=0 _kpkgver="$_kver-r$_krel" @@ -112,6 +112,6 @@ dev() { } sha512sums=" -e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d zfs-2.2.3.tar.gz +1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1 zfs-2.2.4.tar.gz 18966558e213b7516d3359884ced72618956db401cac32306662fa6304d3e31a28b030adcc8678704a30e6bbdee28120b2c6125e8285afacbb11a1645b39695a aarch64-disable-neon.patch " diff --git a/main/zfs-rpi/APKBUILD b/main/zfs-rpi/APKBUILD index 61f86b20ffc..4f127d7b668 100644 --- a/main/zfs-rpi/APKBUILD +++ b/main/zfs-rpi/APKBUILD @@ -3,12 +3,12 @@ # when changing _ver we *must* bump _rel _name=zfs -_ver=2.2.3 -_rel=3 +_ver=2.2.4 +_rel=4 # when changing _kver/_krel make sure _rel=0 _flavor=${FLAVOR:-rpi} _kpkg=linux-$_flavor -_kver=6.6.21 +_kver=6.6.29 _krel=0 _kpkgver="$_kver-r$_krel" @@ -113,6 +113,6 @@ dev() { } sha512sums=" -e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d zfs-2.2.3.tar.gz +1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1 zfs-2.2.4.tar.gz 18966558e213b7516d3359884ced72618956db401cac32306662fa6304d3e31a28b030adcc8678704a30e6bbdee28120b2c6125e8285afacbb11a1645b39695a aarch64-disable-neon.patch " diff --git a/main/zfs/APKBUILD b/main/zfs/APKBUILD index a77b75f35a7..658b77207d7 100644 --- a/main/zfs/APKBUILD +++ b/main/zfs/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zfs -pkgver=2.2.3 -pkgrel=1 +pkgver=2.2.4 +pkgrel=0 pkgdesc="Advanced filesystem and volume manager" url="https://openzfs.org" arch="all" @@ -67,8 +67,16 @@ build() { package() { make DESTDIR="$pkgdir" install + + # no initramfs-tools rm -rf "$pkgdir"/usr/share/initramfs-tools + # we use doas(1) + rm -rf "$pkgdir"/etc/sudoers.d + + # zfs-mount-generator is a systemd.generator(7) + rm "$pkgdir"/usr/share/man/man8/zfs-mount-generator* + # Fix permissions of zfs OpenRC service configuration (#13840) chmod 644 "$pkgdir"/etc/conf.d/zfs } @@ -99,6 +107,7 @@ utils_py() { amove usr/bin/arc_summary amove usr/bin/arcstat amove usr/bin/dbufstat + amove usr/bin/zilstat } pyzfs() { @@ -109,6 +118,6 @@ pyzfs() { } sha512sums=" -e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d zfs-2.2.3.tar.gz -93f7aa5ccaa2d75093930914b291c0b030db5cca813e8cce179e24fc4a76cdeb236e63a9e51b4074dbeb896af1783766e02e4d4aa6134c2a1f1a1fd8fd15ba97 alpine-bash-completion-dir.patch +1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1 zfs-2.2.4.tar.gz +f662f763b5d220525c0a9eada6a643694987ae3741fbf4d86aa4a557a011ee70e833e3e9c67bf14c3c2b5856395557b1ec1943e8620305ebc50163cffd83f43d alpine-bash-completion-dir.patch " diff --git a/main/zfs/alpine-bash-completion-dir.patch b/main/zfs/alpine-bash-completion-dir.patch index f740f8f951c..1024e09b414 100644 --- a/main/zfs/alpine-bash-completion-dir.patch +++ b/main/zfs/alpine-bash-completion-dir.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -136424,6 +136424,7 @@ printf "%s\n" "no" >&6; } +@@ -139180,6 +139180,7 @@ printf "%s\n" "no" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking default bash completion directory" >&5 printf %s "checking default bash completion directory... " >&6; } case "$VENDOR" in diff --git a/main/zsh/APKBUILD b/main/zsh/APKBUILD index a51ab1fbe7f..76e8824a1ab 100644 --- a/main/zsh/APKBUILD +++ b/main/zsh/APKBUILD @@ -73,6 +73,7 @@ done prepare() { default_prepare + update_config_sub # Remove completions for other systems. cd "$builddir/Completion" diff --git a/scripts/mkimg.xen.sh b/scripts/mkimg.xen.sh index cfc1b9d818b..2fb47a107c3 100755 --- a/scripts/mkimg.xen.sh +++ b/scripts/mkimg.xen.sh @@ -15,6 +15,15 @@ profile_xen() { Includes packages targetted at Xen usage. Use for Xen Dom0." arch="x86_64" + kernel_addons="zfs" xen_params="" - apks="$apks ethtool lvm2 mdadm multipath-tools rng-tools sfdisk xen xen-bridge xen-qemu syslinux" + apks="$apks ethtool lvm2 mdadm multipath-tools rng-tools sfdisk xen xen-bridge xen-qemu syslinux zfs" + + local _k _a + for _k in $kernel_flavors; do + apks="$apks linux-$_k" + for _a in $kernel_addons; do + apks="$apks $_a-$_k" + done + done } diff --git a/testing/aercbook/0001-zig-0.12-std.ChildProcess.exec-run.patch b/testing/aercbook/0001-zig-0.12-std.ChildProcess.exec-run.patch new file mode 100644 index 00000000000..80c13b7f292 --- /dev/null +++ b/testing/aercbook/0001-zig-0.12-std.ChildProcess.exec-run.patch @@ -0,0 +1,23 @@ +From b7be34e4c7183817729e9e23eba32d93fceaf34d Mon Sep 17 00:00:00 2001 +From: "lauren n. liberda" <lauren@selfisekai.rocks> +Date: Sat, 20 Apr 2024 22:25:14 +0200 +Subject: [PATCH] zig 0.12: std.ChildProcess.exec -> run + +solves "error: struct 'child_process.ChildProcess' has no member named 'exec'" +--- + src/gitversiontag.zig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gitversiontag.zig b/src/gitversiontag.zig +index 40aed0f..08480a7 100644 +--- a/src/gitversiontag.zig ++++ b/src/gitversiontag.zig +@@ -6,7 +6,7 @@ pub fn gitVersionTag(a: std.mem.Allocator) []const u8 { + "--sort=-creatordate", + }; + +- if (std.ChildProcess.exec(.{ .argv = args[0..], .allocator = a })) |ret| { ++ if (std.ChildProcess.run(.{ .argv = args[0..], .allocator = a })) |ret| { + var it = std.mem.split(u8, ret.stdout, "\n"); + if (it.next()) |firstline| { + return firstline; diff --git a/testing/aercbook/0002-zig-0.12-convert-some-vars-to-consts.patch b/testing/aercbook/0002-zig-0.12-convert-some-vars-to-consts.patch new file mode 100644 index 00000000000..af73b72e80d --- /dev/null +++ b/testing/aercbook/0002-zig-0.12-convert-some-vars-to-consts.patch @@ -0,0 +1,55 @@ +From 5e40820838eaaf78e95132cb6fdc906686904480 Mon Sep 17 00:00:00 2001 +From: "lauren n. liberda" <lauren@selfisekai.rocks> +Date: Sat, 20 Apr 2024 22:29:48 +0200 +Subject: [PATCH] zig 0.12: convert some vars to consts + +solves "error: local variable is never mutated" +--- + src/args.zig | 6 +++--- + src/main.zig | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/args.zig b/src/args.zig +index a243c98..89a980e 100644 +--- a/src/args.zig ++++ b/src/args.zig +@@ -401,7 +401,7 @@ fn parseInt(comptime T: type, str: []const u8) !T { + base1024 = true; + } + if (buf.len != 0) { +- var pow: u3 = switch (buf[buf.len - 1]) { ++ const pow: u3 = switch (buf[buf.len - 1]) { + 'k', 'K' => 1, //kilo + 'm', 'M' => 2, //mega + 'g', 'G' => 3, //giga +@@ -415,7 +415,7 @@ fn parseInt(comptime T: type, str: []const u8) !T { + + if (comptime std.math.maxInt(T) < 1024) + return error.Overflow; +- var base: T = if (base1024) 1024 else 1000; ++ const base: T = if (base1024) 1024 else 1000; + multiplier = try std.math.powi(T, base, @intCast(pow)); + } + } +@@ -567,7 +567,7 @@ pub const ErrorCollection = struct { + + /// Appends an error to the collection + fn insert(self: *Self, err: Error) !void { +- var dupe = Error{ ++ const dupe = Error{ + .option = try self.arena.allocator().dupe(u8, err.option), + .kind = switch (err.kind) { + .invalid_value => |v| Error.Kind{ +diff --git a/src/main.zig b/src/main.zig +index 7759ebc..38f2a99 100644 +--- a/src/main.zig ++++ b/src/main.zig +@@ -440,7 +440,7 @@ pub fn main() anyerror!void { + help(); + return; + } +- var key: []const u8 = options.positionals[1]; ++ const key: []const u8 = options.positionals[1]; + var value: []const u8 = undefined; + if (options.positionals.len >= 3) { + value = options.positionals[2]; diff --git a/testing/aercbook/APKBUILD b/testing/aercbook/APKBUILD index a0a780c2ebc..d73e3f57796 100644 --- a/testing/aercbook/APKBUILD +++ b/testing/aercbook/APKBUILD @@ -2,14 +2,17 @@ # Maintainer: Coco Liliace <coco@liliace.dev> pkgname=aercbook pkgver=0.1.5 -pkgrel=0 +pkgrel=1 pkgdesc="Minimalistic address book for aerc" url="https://sr.ht/~renerocksai/aercbook/" arch="aarch64 x86_64" license="MIT" makedepends="zig" options="!check" # no tests -source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~renerocksai/aercbook/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~renerocksai/aercbook/archive/v$pkgver.tar.gz + 0001-zig-0.12-std.ChildProcess.exec-run.patch + 0002-zig-0.12-convert-some-vars-to-consts.patch + " builddir="$srcdir/$pkgname-v$pkgver" # We may want other than "baseline" for other targets, when enabled by zig @@ -27,4 +30,6 @@ package() { sha512sums=" ffabe7017e5d15df2cf19fa7663b045a7e693acfd34d25a85aa22235ed1f02d5ea40cee2cd0ff9f35d0ad497aefcde5048097365b7037c06c95729cf29d46614 aercbook-0.1.5.tar.gz +d6c164144d7296df949d24a876ae45e72236efdc1c0997ffe079125ae13794e78c60ffcee3d6d9b33dc5d6021225da27a9e6ba2669d8d4b53939b977e4de1255 0001-zig-0.12-std.ChildProcess.exec-run.patch +81ed9206b6530fd072732bb9587a3a8ad2c89518203ce49bc225799a06a30548e3654a16cf63bb16db4a6afa1be1c8394317c0b003eaa95eb982fca604f1489c 0002-zig-0.12-convert-some-vars-to-consts.patch " diff --git a/testing/aide/APKBUILD b/testing/aide/APKBUILD index d70c9794e58..7c9d9160087 100644 --- a/testing/aide/APKBUILD +++ b/testing/aide/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=aide -pkgver=0.18.6 +pkgver=0.18.8 pkgrel=0 pkgdesc="file integrity checker and intrusion detection program" url="https://aide.github.io/" @@ -38,5 +38,5 @@ package() { } sha512sums=" -c0e7c366029a401bce4cf44762caecada4d4831bfc2f00ebab6cb818ba259fae5409fdfcc7386d2bc9ca91a8e8fe0eb78927205bc75513578b8a3ccd17183744 aide-0.18.6.tar.gz +38763f527cfbc11847eca2fca17eceabc46158624954f0457feb49b885f34e4311f2dbc50b5471f4ff972e9e4e9c9f55c2da8dd8d55c04063a9043ab4829ff05 aide-0.18.8.tar.gz " diff --git a/testing/amazon-ssm-agent/APKBUILD b/testing/amazon-ssm-agent/APKBUILD index e10d984a904..805d862adf7 100644 --- a/testing/amazon-ssm-agent/APKBUILD +++ b/testing/amazon-ssm-agent/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Will Sinatra <wpsinatra@gmail.com> # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=amazon-ssm-agent -pkgver=3.3.217.0 +pkgver=3.3.418.0 pkgrel=0 pkgdesc="Amazon SSM Agent for managing EC2 Instances using the SSM APIs." url="https://aws.amazon.com/documentation/systems-manager/" @@ -13,7 +13,7 @@ source="https://github.com/aws/amazon-ssm-agent/archive/$pkgver/amazon-ssm-agent amazon-ssm-agent.initd 001_sanitize_makefile.patch" subpackages="$pkgname-openrc" -options="!check" +options="!check net" _binaries="amazon-ssm-agent ssm-agent-worker ssm-cli @@ -24,20 +24,20 @@ _binaries="amazon-ssm-agent " case "$CARCH" in - armhf) build_arch=arm ;; - armv7) build_arch=arm ;; - x86) build_arch=386 ;; - x86_64) build_arch=amd64 ;; - aarch64) build_arch=arm64 ;; + armhf) _build_arch=arm ;; + armv7) _build_arch=arm ;; + x86) _build_arch=386 ;; + x86_64) _build_arch=amd64 ;; + aarch64) _build_arch=arm64 ;; esac build() { - make build-linux-$build_arch + make build-linux-$_build_arch } package() { for bin in $_binaries; do - install -Dm0755 "$builddir"/bin/linux_$build_arch/$bin "$pkgdir"/usr/bin/$bin + install -Dm0755 "$builddir"/bin/linux_$_build_arch/$bin "$pkgdir"/usr/bin/$bin done install -Dm0644 "$builddir"/bin/amazon-ssm-agent.json.template \ @@ -52,7 +52,7 @@ package() { } sha512sums=" -96b4ef5b3b997b01c667bfbf4bb972cd401eddbfef430b19c69a0e5a498f63abc01fa0ea7ede4c16f4ea7acce63c9b05eae1157c34b27906df669214ad1064a6 amazon-ssm-agent-3.3.217.0.tar.gz +b614803911b5f248dff6882f58da7a37d0d0397ea531f1f9cf30f52762ff2e80a7f0e7bf45b23fdfaecb4106a1acdbbc3b343c16940b5807bea3f953ef8e0e05 amazon-ssm-agent-3.3.418.0.tar.gz 2c07d6777ad0d3994f09838818bff2c0bc061238e2c3ca757a9bd04cd25924ce24bdc2ecd7edbd4b10717ba3c8806398626e0718acf8e7ba5c66853369b20f48 amazon-ssm-agent.initd d90a10ed7f3cf0a58bb73f737c2d10d56b3942886535df7d9215e2cf809c59ef708ed4d9775062e46343cf64726d25adaf048c86f39d4a7647deebd91d69c2f9 001_sanitize_makefile.patch " diff --git a/testing/amule/APKBUILD b/testing/amule/APKBUILD index 6065cbd5627..6fee968f6ee 100644 --- a/testing/amule/APKBUILD +++ b/testing/amule/APKBUILD @@ -3,7 +3,7 @@ pkgname=amule _pkgname=aMule pkgver=2.3.3 -pkgrel=12 +pkgrel=13 pkgdesc="eMule-like client for the eD2k and Kademlia networks" url="https://www.amule.org/" arch="all !x86" # crypto++ diff --git a/testing/android-translation-layer/APKBUILD b/testing/android-translation-layer/APKBUILD index 7321a999411..e113c0ba67e 100644 --- a/testing/android-translation-layer/APKBUILD +++ b/testing/android-translation-layer/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=android-translation-layer -pkgver=0_git20240219 +pkgver=0_git20240428 pkgrel=0 -_commit="d3eedb0305d52be28d90560f1e099dd11056ab5d" +_commit="a99dfd80ccff8b39ca7014d42c93586dbe6e7edf" pkgdesc="A translation layer for running Android apps on a Linux system" url="https://gitlab.com/android_translation_layer/android_translation_layer" arch="x86_64 aarch64 armv7" @@ -18,6 +18,7 @@ makedepends=" glib-dev gtk4.0-dev java-common + libgudev-dev libportal-dev meson openjdk8-jdk @@ -44,5 +45,5 @@ package() { } sha512sums=" -c1d16346076fae74323bf573e436a3867dc03d5bdb58690bf304dabe9d209ee1d00339a92d16d13263efc1c4530523ef742044fbed425a9a75c538ac780d0376 android_translation_layer-d3eedb0305d52be28d90560f1e099dd11056ab5d.tar.gz +bef47fb541b61532d84f24a80743aff1d23ea9de495118f2695ceeb7794ad76cd752e379161073ad42b220eff13ef404017dae712714a19ad6b5d7b636f67fae android_translation_layer-a99dfd80ccff8b39ca7014d42c93586dbe6e7edf.tar.gz " diff --git a/testing/anki/APKBUILD b/testing/anki/APKBUILD index fa352a278b6..f3092bb5010 100644 --- a/testing/anki/APKBUILD +++ b/testing/anki/APKBUILD @@ -1,15 +1,15 @@ -# Maintainer: Frank Oltmanns <alpine@oltmanns.dev> # Contributor: Alexander Bocken <alexander@bocken.org> - +# Maintainer: Frank Oltmanns <alpine@oltmanns.dev> pkgname=anki -pkgver=23.12.1 -pkgrel=2 +pkgver=24.04.1 +pkgrel=0 # Remember to update the following lines when updating the pkgver -# anki -> git rev-parse $pkgver --short=8 -# ftl -> git submodule -_tags_ftl_core="fb301cc62da3b7a83b4ea266d9a2e70cfc1a8418" -_tags_ftl_desktop="8c2191a7c797747cec767e3953bbbcc50acc5246" -_anki_commit="c0f2fa48" +# 1. checkout the release tag +# 2. anki -> git rev-parse --short=8 $pkgver +# 3. ftl -> git submodule +_tags_ftl_core="e3af3c983241448a239871ca573c9dd2fa5e8619" +_tags_ftl_desktop="45155310c3302cbbbe645dec52ca196894422463" +_anki_commit="832d7b16" # This APKBUILD and the patches use the PKGBUILD for Anki 23.10 as # a basis. @@ -73,10 +73,9 @@ depends=" " subpackages="$pkgname-pyc" source=" - https://github.com/ankitects/anki/archive/$pkgver/anki-$pkgver.tar.gz + anki-$pkgver.tar.gz::https://github.com/ankitects/anki/archive/refs/tags/$pkgver.tar.gz anki-core-i18n-$_tags_ftl_core.tar.gz::https://github.com/ankitects/anki-core-i18n/archive/$_tags_ftl_core.tar.gz anki-desktop-ftl-$_tags_ftl_desktop.tar.gz::https://github.com/ankitects/anki-desktop-ftl/archive/$_tags_ftl_desktop.tar.gz - disable-git-checks.patch no-update.patch strip-formatter-deps.patch strip-type-checking-deps.patch @@ -92,11 +91,10 @@ prepare() { # - The original PKGBUILD changes the rust toolchain channel to # "stable". Since, the APKBUILD doesn't use rustup, we can skip that. - # Build process wants .git/HEAD to be present. Workaround to be able to use tarballs - # (together with disable-git-checks.patch) - mkdir -p .git + # Build process wants .git/HEAD to be present. Workaround to be able to use tarballs. + mkdir -p out .git touch .git/HEAD - sed -i "s/MY_REV/$_anki_commit/" build/runner/src/build.rs + echo "$_anki_commit" > out/buildhash # manually write the buildhash into out/buildhash to avoid git dependency in build # place translations in build dir rm -r ftl/core-repo ftl/qt-repo @@ -132,6 +130,9 @@ build() { export RELEASE=2 # anki-internal variable for optimization # set to "1" for faster but less optimized build export LDFLAGS="$LDFLAGS -fuse-ld=lld" + + export OFFLINE_BUILD=1 # do not download anything, disables git update check + ./ninja wheels } @@ -143,11 +144,11 @@ package() { install -Dm644 qt/bundle/lin/anki.desktop "$pkgdir"/usr/share/applications/anki.desktop install -Dm644 qt/bundle/lin/anki.png "$pkgdir"/usr/share/pixmaps/anki.png } + sha512sums=" -076d3eba5db7dd4b8e00de9b69140a54f73c2e6ce52f46ddce9a6455a8ce7ae5d49bfb2fc60571d851d6b4948a08a0b3deb508aa37c7e79624b6273837a975a5 anki-23.12.1.tar.gz -12e9187bda8f728d06a904fe21f3820aa2acad0e1924933d9db24f3879936b0a7b489934186fcab85440a40b974917ada729b5a7ec276ca2acea70b5c88caa5a anki-core-i18n-fb301cc62da3b7a83b4ea266d9a2e70cfc1a8418.tar.gz -91c3609fa8ca67de2d520798acbb7200d310c4d587270143528a5c18ed341c7dd3b9ddc8d79fe1f44224e83dc06f12cdbcdcf2114969513cbd60e82950343373 anki-desktop-ftl-8c2191a7c797747cec767e3953bbbcc50acc5246.tar.gz -60f2f37d4fc03d7c0681b2d6b9af17b2f7cd341ef6bd4504cd7dd6cb191c666b128a4c2184ced5295fab98c5f83affc4bfd4c5dc23f502371e2e095aa880e526 disable-git-checks.patch +998e62181f37243f0357c185426697bcca53a3f7d2c1703f869849b20d175ca07a27b0b344f308771ee9e0f07c8120d5aa45940e6964e1a66087a58ac4547cee anki-24.04.1.tar.gz +abbb6f77cd476aa798b66d283c7b560a9ad82bb17daec241d021a7aab73212f6272baefae1f49144054654efa74df7ac6c1b5ef8eb9305308ae5b08831c4da2e anki-core-i18n-e3af3c983241448a239871ca573c9dd2fa5e8619.tar.gz +b5163edd076562b89d90a12bb05eff2ac3f1adc5fd5f9f7450679ed7064fd79a2e741cee6fab59e571233c9ba6f6181b61915945eb916c3c4a5916489ababff3 anki-desktop-ftl-45155310c3302cbbbe645dec52ca196894422463.tar.gz 36c3bddb5de84f0f5eebe46b506b9723ecc80dd69281b3d2ffc9842fa2db181ececd8232ae0b3366bcfd5cb68a4d760abcadd3dada2a7ce2d2da26586a132e09 no-update.patch f71b45b08b8f05d98faab3a88d7ba2847a948a12ca26c682d58541dc423ad72ae8aac5b34155472869ebbf195e5e5c488cfc4e640df7247c7674e5dfad053d60 strip-formatter-deps.patch 2c7d1ab46d81e65f22e63cb5af37daef27a78d348f240570f9250730d6b33311670876027fd1c54d4c69922c18a7458e82211cb232e98591e182ac11c49877db strip-type-checking-deps.patch diff --git a/testing/anki/disable-git-checks.patch b/testing/anki/disable-git-checks.patch deleted file mode 100644 index 905e641b78e..00000000000 --- a/testing/anki/disable-git-checks.patch +++ /dev/null @@ -1,30 +0,0 @@ -We provide source tarballs without git functionality. -'MY_REV' gets replaced with the corresponding revision in prepare(). ---- a/build/ninja_gen/src/git.rs -+++ b/build/ninja_gen/src/git.rs -@@ -13,7 +13,7 @@ pub struct SyncSubmodule { - - impl BuildAction for SyncSubmodule { - fn command(&self) -> &str { -- "git -c protocol.file.allow=always submodule update --init $path" -+ "true" - } - - fn files(&mut self, build: &mut impl build::FilesHandle) { ---- a/build/runner/src/build.rs -+++ b/build/runner/src/build.rs -@@ -161,13 +161,7 @@ fn maybe_update_buildhash(build_root: &Utf8Path) { - } - - fn get_buildhash() -> String { -- let output = Command::new("git") -- .args(["rev-parse", "--short=8", "HEAD"]) -- .output() -- .expect("git"); -- assert!(output.status.success(), -- "Invoking 'git' failed. Make sure you're building from a clone of the git repo, and that 'git' is installed."); -- String::from_utf8(output.stdout).unwrap().trim().into() -+ String::from("MY_REV").trim().into() - } - - fn write_if_changed(path: &Utf8Path, contents: &str) { diff --git a/testing/apache-mod-auth-openidc/APKBUILD b/testing/apache-mod-auth-openidc/APKBUILD index 11eb98866b0..463d8c70d2b 100644 --- a/testing/apache-mod-auth-openidc/APKBUILD +++ b/testing/apache-mod-auth-openidc/APKBUILD @@ -2,7 +2,7 @@ pkgname=apache-mod-auth-openidc _pkgname=mod_auth_openidc pkgver=2.4.15.7 -pkgrel=0 +pkgrel=1 pkgdesc="OpenID Connect Relying Party implementation for Apache HTTP Server 2.x" url="https://www.mod-auth-openidc.org" arch="all !s390x" # tests fails on s390x from cjose @@ -48,7 +48,7 @@ package() { mkdir -p "$pkgdir"/etc/apache2/conf.d cat <<- __EOF__ > "$pkgdir"/etc/apache2/conf.d/mod-auth-openidc.conf - LoadModule auth_openidc_module modules/mod_auth_openidc.so + LoadModule auth_openidc_module mod_auth_openidc.so __EOF__ cat auth_openidc.conf >> "$pkgdir"/etc/apache2/conf.d/mod-auth-openidc.conf diff --git a/testing/arcticons-icon-theme/APKBUILD b/testing/arcticons-icon-theme/APKBUILD index 1e380b0ed9c..cb83315c5c7 100644 --- a/testing/arcticons-icon-theme/APKBUILD +++ b/testing/arcticons-icon-theme/APKBUILD @@ -1,35 +1,31 @@ # Contributor: Sertonix <sertonix@posteo.net> # Maintainer: Sertonix <sertonix@posteo.net> pkgname=arcticons-icon-theme -pkgver=8.7.1.0 +pkgver=9.2.4.1 pkgrel=0 -pkgdesc="A monotone line-based icon pack for android - freedesktop version" -url="https://github.com/Donnnno/Arcticons-Linux" +pkgdesc="Line-based icon pack" +url="https://github.com/Arcticons-Team/Arcticons-Linux" arch="noarch" license="GPL-3.0-or-later" depends="$pkgname-light $pkgname-dark" -subpackages="$pkgname-light:theme $pkgname-dark:theme" -source="https://github.com/Donnnno/Arcticons-Linux/archive/$pkgver/arcticons-icon-theme-$pkgver.tar.gz" +subpackages="$pkgname-light:_theme $pkgname-dark:_theme" +source="$pkgname-$pkgver.tar.gz::https://github.com/Arcticons-Team/Arcticons-Linux/archive/refs/tags/$pkgver.tar.gz" builddir="$srcdir/Arcticons-Linux-$pkgver" options="!check" -build() { - : -} - package() { install -d "$pkgdir/usr/share/icons" cp -r arcticons-dark arcticons-light -t "$pkgdir/usr/share/icons" } -theme() { +_theme() { depends= - variant="${subpkgname##"$pkgname"-}" - pkgdesc="$pkgdesc ($variant)" + local variant="${subpkgname##"$pkgname"-}" + pkgdesc="$pkgdesc (Version for $variant themes)" amove usr/share/icons/arcticons-"$variant" } sha512sums=" -f4312fb390328d1cd95da8cb5a748fceebf814ce9fef18c6c7f6690d04bea42d56123c842c9eabd184ae87953558f520b23684c2432bce5589e1c76760571321 arcticons-icon-theme-8.7.1.0.tar.gz +d05f989d6f8085325fa97af7e2b259de868c875b66d918ab87c0f506b1b5f966b8cd75725d3adb85567f96a95a8ec5a4ec208e3dd5878c73b0c00853a4785438 arcticons-icon-theme-9.2.4.1.tar.gz " diff --git a/testing/art_standalone/APKBUILD b/testing/art_standalone/APKBUILD index dba179260bc..bd6c04e11d1 100644 --- a/testing/art_standalone/APKBUILD +++ b/testing/art_standalone/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=art_standalone -pkgver=0_git20240220 -pkgrel=1 -_commit="672e299f85cf91901ba107d90084fd67865f047a" +pkgver=0_git20240307 +pkgrel=0 +_commit="c3055ca258fc726e5fa9fd2aa1d9899a5c548e58" pkgdesc="A standalone version of Dalvik with Art build in" url="https://gitlab.com/android_translation_layer/dalvik_standalone" arch="x86_64 aarch64 armv7" @@ -73,5 +73,5 @@ dev() { } sha512sums=" -8a91136df527ec094683313aaa24326afe338e051d1c15fb4942cc39ecdeb79fb5e082eede6213c9c311d357e37805db93fc888c0f880231ebcda0089474fdb6 art_standalone-672e299f85cf91901ba107d90084fd67865f047a.tar.gz +330d2767e67282c84161eb05b33d4099c7565067904e0cc9b7df79756e0cbf30f3d7fedf9290c3540441a11c6a3889f43f0e49f96949cc72db92926fde2d5383 art_standalone-c3055ca258fc726e5fa9fd2aa1d9899a5c548e58.tar.gz " diff --git a/testing/asahi-audio/APKBUILD b/testing/asahi-audio/APKBUILD index 2f2596e1831..55c202fdca4 100644 --- a/testing/asahi-audio/APKBUILD +++ b/testing/asahi-audio/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=asahi-audio -pkgver=1.7 +pkgver=2.1 pkgrel=0 pkgdesc="userspace audio configuration for Apple Silicon Macs" url="https://github.com/AsahiLinux/asahi-audio" @@ -27,5 +27,5 @@ package() { } sha512sums=" -cb5007189c7b661704c748159db69eaa9131c0d73cf631254151e4843b4140957f5fd989cd0fd8785abe50aa43e6d58ee4ecf98f5a3bd4d1462b2c3a049dd7d2 asahi-audio-1.7.tar.gz +dd2a72ca866feff72b749a569aac39f521fbfc26a7f150c0ec01ab83a38e74ed2841092903019a19b6f6bfd416d7eba20003775c7acb61c6fe6e4bfabeff9f19 asahi-audio-2.1.tar.gz " diff --git a/testing/atlas/APKBUILD b/testing/atlas/APKBUILD index d96c978d335..7cb0baf0e5a 100644 --- a/testing/atlas/APKBUILD +++ b/testing/atlas/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=atlas -pkgver=0.19.0 -pkgrel=2 +pkgver=0.22.0 +pkgrel=0 pkgdesc="Database schema migration tool using modern DevOps principles" url="https://atlasgo.io/" # x86, armhf, armv7: multiple packages fail to build on 32-bit platforms due to integer overflow @@ -49,5 +49,5 @@ package() { } sha512sums=" -c24f18b98037892c20e0cadd4187819ce5a19679b132b6e81ac2d218bf3b3d845c79d17ea0d5f51e090fb72f6caf7ccd25c240040f9c32ce82c543a439668141 atlas-0.19.0.tar.gz +47e6dec4d1a23f8aac7a7c071cb467d796ed4f51a301a435c039da5e282a3d33aed9e35254298f0d97cca5945fa095fa71377447e6d24cfbe449438f887ec4ec atlas-0.22.0.tar.gz " diff --git a/testing/autobrr/APKBUILD b/testing/autobrr/APKBUILD index 500b99599ee..37bbf4b7532 100644 --- a/testing/autobrr/APKBUILD +++ b/testing/autobrr/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Fabricio Silva <hi@fabricio.dev> # Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=autobrr -pkgver=1.40.1 -pkgrel=1 +pkgver=1.42.0 +pkgrel=0 pkgdesc="The modern download automation tool for torrents" url="https://autobrr.com/" arch="x86_64 aarch64 armv7" @@ -20,6 +20,7 @@ source=" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" +export COREPACK_ENABLE_STRICT=0 prepare() { default_prepare @@ -52,7 +53,7 @@ package() { } sha512sums=" -13f7cb9e03ed93410edf46baf940b221f1323a0ac1576e28f68d57d384c88779e35f1fe0e505bbc7bfd62a68f2319cf39ae2147acec9845853b623bef7941118 autobrr-1.40.1.tar.gz +f48d72aeb73ff3aa5681e8d767f260b96e4e0531dbb4ff848fd8649f65f000a8666e7fc87500cd93378f307f34fae0021382e79090b800d004649590f00e0f0d autobrr-1.42.0.tar.gz 42ce693eca67ca8b4c863440ebfb3efb41c197302274ccecd1b080c3e1f01e03078ab46b2fae8ca6cf5add4153296adb10e324b02dbe89c939465305be49f760 autobrr.initd 4072cabb7131a23283b1fecdd1370eb935ae156284972a5e503de36054a358f74112a40e200662386e85af51507213e3f25afdf343a2673e6ef372b7b5e04a80 autobrr.confd " diff --git a/testing/aws-session-manager-plugin/APKBUILD b/testing/aws-session-manager-plugin/APKBUILD index fc7dbbdf358..964c8331cbb 100644 --- a/testing/aws-session-manager-plugin/APKBUILD +++ b/testing/aws-session-manager-plugin/APKBUILD @@ -6,7 +6,8 @@ pkgrel=0 pkgdesc="AWS Session Manager Plugin for aws-cli." url="https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html" license="Apache-2.0" -arch="x86_64 aarch64" +arch="" # blocked by aws-cli +#arch="x86_64 aarch64" # aws-cli is not packaged on the following arches due to missing dependency py3-awscrt # armhf, armv7, s390x, ppc64le # aws-cli is not packaged on the following arches due to compilation issues diff --git a/testing/awscli-plugin-endpoint/APKBUILD b/testing/awscli-plugin-endpoint/APKBUILD index 042a77d410d..b5bb386ffc9 100644 --- a/testing/awscli-plugin-endpoint/APKBUILD +++ b/testing/awscli-plugin-endpoint/APKBUILD @@ -6,7 +6,8 @@ pkgrel=2 pkgdesc="Allows overriding endpoints in AWS CLI" url="https://github.com/wbingli/awscli-plugin-endpoint/" # aws-cli -arch="noarch !armhf !armv7 !ppc64le !s390x !x86" +arch="" +#arch="noarch !armhf !armv7 !ppc64le !s390x !x86" license="Apache-2.0" depends="aws-cli python3" makedepends="py3-setuptools" diff --git a/testing/azote/APKBUILD b/testing/azote/APKBUILD index 068528edeb5..884d1bcfdc1 100644 --- a/testing/azote/APKBUILD +++ b/testing/azote/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Matthew T Hoare <matthew.t.hoare@gmail.com> # Maintainer: Matthew T Hoare <matthew.t.hoare@gmail.com> pkgname=azote -pkgver=1.12.4 -pkgrel=1 +pkgver=1.12.7 +pkgrel=0 pkgdesc="Wallpaper and colour manager for Sway, i3 and other window managers" url="https://github.com/nwg-piotr/azote" arch="noarch" @@ -40,5 +40,5 @@ package() { } sha512sums=" -c40beafd5fa0d5337d0b09b9f0ab0e128a46d2e2eea1ecf0ef082ade2d531e4ef70d57dc932226ea7a88d2b4a72340ae0f41e049152b80d6c0d9da0ecae90640 azote-1.12.4.tar.gz +60a3851108f9e84743181c03a40e658dceca5abdac30665de8d6727b53a3a41101d1b10e7d92b29b511d081d86168fe9e298f7dfed0d2b4e4f360d51e0dc16bc azote-1.12.7.tar.gz " diff --git a/testing/barnyard2/APKBUILD b/testing/barnyard2/APKBUILD index b839e67530d..7f6dccb6efe 100644 --- a/testing/barnyard2/APKBUILD +++ b/testing/barnyard2/APKBUILD @@ -6,8 +6,8 @@ _gitrev=f9186f2478bfb096c5a43bdb0c91985c3ef3e20d pkgrel=1 pkgdesc="Parser for Snort unified/unified2 files" url="https://github.com/firnsy/barnyard2" -# riscv64, ppc64le: blocked by snort -> luajit -arch="all !ppc64le !riscv64" +# riscv64, ppc64le, loongarch64: blocked by snort -> luajit +arch="all !ppc64le !riscv64 !loongarch64" license="GPL-2.0-only" depends="snort" install="$pkgname.pre-install" diff --git a/testing/bazel4/APKBUILD b/testing/bazel4/APKBUILD deleted file mode 100644 index fcb97be1a6d..00000000000 --- a/testing/bazel4/APKBUILD +++ /dev/null @@ -1,143 +0,0 @@ -# Contributor: Oleg Titov <oleg.titov@gmail.com> -# Contributor: Jesse Chan <jc@linux.com> -# Maintainer: Jesse Chan <jc@linux.com> -pkgname=bazel4 -pkgver=4.2.2 -pkgrel=2 -pkgdesc="A fast, scalable, multi-language and extensible build system" -url="https://bazel.build/" -arch="all" -arch="$arch !x86 !armhf !armv7" # JDK dropped support -arch="$arch !riscv64" # JDK not yet bootstrapped -arch="$arch !ppc64le" # absl: Must implement UnscaledCycleClock::Frequency() -arch="$arch !s390x" # aborted: SIGFPE (0x8) at pc=0x000003ffb1f18462 (sent by kill) -license="Apache-2.0" -depends="bash java-jdk libarchive unzip zip" -makedepends="coreutils linux-headers openjdk17 protobuf python3" -options="!strip" -provides="bazel=$pkgver-r$pkgrel" -subpackages=" - $pkgname-doc - $pkgname-bash-completion - $pkgname-fish-completion - $pkgname-zsh-completion - " -source="https://github.com/bazelbuild/bazel/releases/download/$pkgver/bazel-$pkgver-dist.zip - patch_do_not_use_glibc_prebuilt.patch - patch_default_system_java_toolchain.patch - patch_fix_jdk_13.patch - patch_stop_hardcoding_verify_none_1.patch - patch_stop_hardcoding_verify_none_2.patch - patch_ftbfs_gcc11_1.patch - patch_ftbfs_gcc11_2.patch - patch_ftbfs_gcc11_3.patch - patch_ftbfs_gcc11_4.patch - patch_ftbfs_gcc11_5.patch - patch_remove_illegal_reflective.patch" - -build() { - export JAVA_HOME="/usr/lib/jvm/default-jvm" - - # Target Java version (minimum to run) - # should be the same as the upstream - export JAVA_VERSION="1.8" - - # horrible of horribles, just to have python in the PATH - # https://github.com/bazelbuild/bazel/issues/8665 - mkdir -p ./bin-hack - ln -s /usr/bin/python3 ./bin-hack/python - export PATH=$(pwd)/bin-hack:$PATH - - # Stage 1: build Bazel with bootstrap script - - # based on - # https://github.com/vbatts/copr-build-bazel/blob/master/bazel.spec - # EXTRA_BAZEL_ARGS is used by bootstrap script only - export EXTRA_BAZEL_ARGS="--sandbox_debug --verbose_failures" - - mkdir tmphome-stage1 - - env HOME="$(pwd)/tmphome-stage1" bash ./compile.sh - env HOME="$(pwd)/tmphome-stage1" ./output/bazel shutdown - - # Stage 2: use Bazel to build Bazel in optimized mode - mkdir tmphome-stage2 - - # We can't use embedded JDK, as there is no alpine support - echo startup --server_javabase=$JAVA_HOME \ - >> tmphome-stage2/.bazelrc - - env HOME="$(pwd)/tmphome-stage2" ./output/bazel build \ - -c opt \ - --stamp \ - --embed_label $pkgver \ - --distdir=derived/distdir \ - --javacopt="-source $JAVA_VERSION -target $JAVA_VERSION" \ - $EXTRA_BAZEL_ARGS \ - //scripts/packages:without-jdk/install.sh - env HOME="$(pwd)/tmphome-stage2" ./output/bazel shutdown - - # Copy outputs - rm -rf output && mkdir output - cp bazel-bin/scripts/packages/without-jdk/bazel output - cp bazel-bin/scripts/packages/without-jdk/bazel-real output - cp bazel-bin/scripts/bazel-complete.bash output - cp bazel-bin/scripts/bazel.fish output - cp scripts/zsh_completion/_bazel output - cp tmphome-stage2/.bazelrc output/bazel.bazelrc -} - -check() { - mkdir tmphome-check - cp output/bazel.bazelrc tmphome-check/.bazelrc - - env HOME="$(pwd)/tmphome-check" ./output/bazel test \ - --distdir=derived/distdir \ - --spawn_strategy=standalone \ - --genrule_strategy=standalone \ - --verbose_failures \ - --verbose_test_summary \ - --test_verbose_timeout_warnings \ - examples/cpp:hello-success_test \ - examples/py_native:test \ - examples/java-starlark/src/test/java/com/example/myproject:pass \ - examples/java-native/src/test/java/com/example/myproject:hello - - env HOME="$(pwd)/tmphome-check" ./output/bazel shutdown -} - -package() { - install -Dm755 output/bazel "$pkgdir"/usr/bin/bazel - install -Dm755 output/bazel-real "$pkgdir"/usr/bin/bazel-real - install -Dm644 output/bazel.bazelrc \ - "$pkgdir"/etc/bazel.bazelrc - - install -m644 -D -t "$pkgdir"/usr/share/doc/$pkgname README.md - - install -Dm644 output/bazel-complete.bash \ - "$pkgdir"/usr/share/bash-completion/completions/"$pkgname" - install -Dm644 output/bazel.fish \ - "$pkgdir"/usr/share/fish/completions/"$pkgname".fish - install -Dm644 output/_bazel \ - "$pkgdir"/usr/share/zsh/site-functions/_"$pkgname" -} - -unpack() { - mkdir -p "$builddir" - unzip "$srcdir"/bazel-$pkgver-dist.zip -d "$builddir" > /dev/null -} - -sha512sums=" -123f73dc87053e37705bb729f82bd722d6d2799fe106f79c51cf5566fb2771d824108cbe275aad55ae590b970c549008b433704cbf1245394769e950796eb8db bazel-4.2.2-dist.zip -b8858494f7c600145610d44d2ca81d2cf0e58924b5d876361043b395c88b1166bf9a17de2864ee718e6dce723b7f0c4d71cf8fb9c2ab316eb9013eb5e450ddbe patch_do_not_use_glibc_prebuilt.patch -fe1862bbd392f8a2d7af5f7c5e08fa6cf6dab0ba7b88280c28c4b072241613480e861af60212ceee1aebc10eb629f964c5def2b3e0a75c48453da8c397f4e93b patch_default_system_java_toolchain.patch -0b4b3e541eaa496253e83d6fd88ba98d14c2a53324b7438f57d240b45f2c3c63b659038224e2b66706d4420eccb7c17c834260839f2fd39e3c6b3dea2613b735 patch_fix_jdk_13.patch -f8456643419ac108a7cd72eaccd931e9c269c828611b0a62a79ad80a4f542b83cf5fa69af026e04bfb8d9f2c70527b5b25f9af56edb0a5a696ce66b3032df48d patch_stop_hardcoding_verify_none_1.patch -c5ad25926e5672cd86b27c791c7347b21b57777296cc26d92d2bd9ae6eb39ee81d48008edb666285432135082e91daa9162ea67c719625bcede8f2d5647c9633 patch_stop_hardcoding_verify_none_2.patch -992cf1acd662fd7e5f418e15122fd957c69bd6ca030b782b82d34222bec908d408472e839843b51fe828c2de5e56f4ff4cb4b4adcc17dacf82f2db7e9950cd64 patch_ftbfs_gcc11_1.patch -e9d6e4642a25ce5323ba00e75172238fe52dc31e39ac91e97b5aae6deb9661c5426d763584e1b1b9ee489204e3bf891d84e14e7fa339c9a7a17a5a67c9129dc3 patch_ftbfs_gcc11_2.patch -a001b7fe0bc7b34a6aab73e7f88a2f52dc5e67fcf3dda15bc06a6a8709b6ffa8883f705eb22ef83705fe70dfdbef64c5ff8ba762ffb526366b033375501e05e9 patch_ftbfs_gcc11_3.patch -b83b73b5ea7a2fc99d13567f881dcfac3f242510ab429e33fe4347024fb9fbbd464fb7ef7ee4d380452b17c459d84494f993ba134db65c13f2a27ae475a5d8cc patch_ftbfs_gcc11_4.patch -750c4ba2f41d61321db36c1d1154744e90d1b0f9ea39c75582edbdc28d16df2cee9c85fc4831114a414b6db8dba7b16d17b272b55a0308ac23a06242fc0c31db patch_ftbfs_gcc11_5.patch -47377bb1866d95c84e7e5a8709a3d95d424371697385a2e7cb9e2e1f8c50cf4e3e76dcc15eec0303466d999da24faf1682f858010c574a2373f1f077b4691426 patch_remove_illegal_reflective.patch -" diff --git a/testing/bazel4/patch_default_system_java_toolchain.patch b/testing/bazel4/patch_default_system_java_toolchain.patch deleted file mode 100644 index dc7370278f2..00000000000 --- a/testing/bazel4/patch_default_system_java_toolchain.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/src/BUILD -+++ b/src/BUILD -@@ -405,7 +405,7 @@ genrule( - ], - ) for suffix, jdk in [ - ("-dev", "_jdk_allmodules"), -- ("", "_jdk_minimal"), -+ ("", "_nojdk"), - ("_jdk_allmodules", "_jdk_allmodules"), - ("_jdk_minimal", "_jdk_minimal"), - ("_dev_jdk", "_dev_jdk"), ---- a/src/main/cpp/startup_options.cc -+++ b/src/main/cpp/startup_options.cc -@@ -462,12 +462,6 @@ blaze_util::Path StartupOptions::GetSystemJavabase() const { - } - - blaze_util::Path StartupOptions::GetEmbeddedJavabase() const { -- blaze_util::Path bundled_jre_path = blaze_util::Path( -- blaze_util::JoinPath(install_base, "embedded_tools/jdk")); -- if (blaze_util::CanExecuteFile( -- bundled_jre_path.GetRelative(GetJavaBinaryUnderJavabase()))) { -- return bundled_jre_path; -- } - return blaze_util::Path(); - } - ---- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java -+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java -@@ -654,7 +654,7 @@ public class JavaOptions extends FragmentOptions { - } - - Label defaultHostJavaBase() { -- return Label.parseAbsoluteUnchecked("@bazel_tools//tools/jdk:remote_jdk11"); -+ return Label.parseAbsoluteUnchecked("@local_jdk//:jdk"); - } - - Label defaultJavaToolchain() { ---- a/tools/jdk/BUILD -+++ b/tools/jdk/BUILD -@@ -340,7 +340,7 @@ alias( - - alias( - name = "host_jdk", -- actual = ":remote_jdk11", -+ actual = "jdk", - ) - - bootclasspath( -@@ -370,8 +370,7 @@ alias( - actual = select({ - "//src/conditions:darwin": "@remote_java_tools_darwin//:toolchain", - "//src/conditions:windows": "@remote_java_tools_windows//:toolchain", -- "//src/conditions:linux_x86_64": "@remote_java_tools_linux//:toolchain", -- "//conditions:default": "@bazel_tools//tools/jdk:legacy_toolchain", -+ "//conditions:default": "@bazel_tools//tools/jdk:toolchain_vanilla", - }), - ) - -@@ -380,8 +379,7 @@ alias( - actual = select({ - "//src/conditions:darwin": "@remote_java_tools_darwin//:toolchain", - "//src/conditions:windows": "@remote_java_tools_windows//:toolchain", -- "//src/conditions:linux_x86_64": "@remote_java_tools_linux//:toolchain", -- "//conditions:default": "@bazel_tools//tools/jdk:legacy_toolchain", -+ "//conditions:default": "@bazel_tools//tools/jdk:toolchain_vanilla", - }), - ) - diff --git a/testing/bazel4/patch_do_not_use_glibc_prebuilt.patch b/testing/bazel4/patch_do_not_use_glibc_prebuilt.patch deleted file mode 100644 index d76bb285445..00000000000 --- a/testing/bazel4/patch_do_not_use_glibc_prebuilt.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE -+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE -@@ -189,6 +189,7 @@ maybe( - maybe( - http_archive, - name = "remote_java_tools_linux", -+ patches = ["@bazel_tools//tools/jdk:java_tools.patch"], - sha256 = "085c0ba53ba764e81d4c195524f3c596085cbf9cdc01dd8e6d2ae677e726af35", - urls = [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.6/java_tools_javac11_linux-v10.6.zip", ---- a/tools/jdk/BUILD.java_tools -+++ b/tools/jdk/BUILD.java_tools -@@ -284,7 +284,7 @@ alias( - name = "singlejar", - actual = select({ - "//:remote": ":singlejar_cc_bin", -- "//conditions:default": ":singlejar_prebuilt_or_cc_binary", -+ "//conditions:default": ":singlejar_cc_bin", - }), - ) - -@@ -312,7 +312,7 @@ alias( - name = "ijar", - actual = select({ - ":remote": ":ijar_cc_binary", -- "//conditions:default": ":prebuilt_binary_or_cc_binary", -+ "//conditions:default": ":ijar_cc_binary", - }), - ) - ---- a/tools/jdk/java_toolchain_default.bzl.java_tools -+++ b/tools/jdk/java_toolchain_default.bzl.java_tools -@@ -121,8 +121,6 @@ PREBUILT_TOOLCHAIN_CONFIGURATION = dict( - "//:java_compiler_jar", - "//:jdk_compiler_jar", - ], -- ijar = ["//:ijar_prebuilt_binary"], -- singlejar = ["//:prebuilt_singlejar"], - ) - - _LABEL_LISTS = [ ---- /dev/null -+++ b/tools/jdk/java_tools.patch -@@ -0,0 +1,20 @@ -+--- BUILD -++++ BUILD -+@@ -284,7 +284,7 @@ alias( -+ name = "singlejar", -+ actual = select({ -+ "//:remote": ":singlejar_cc_bin", -+- "//conditions:default": ":singlejar_prebuilt_or_cc_binary", -++ "//conditions:default": ":singlejar_cc_bin", -+ }), -+ ) -+ -+@@ -312,7 +312,7 @@ alias( -+ name = "ijar", -+ actual = select({ -+ ":remote": ":ijar_cc_binary", -+- "//conditions:default": ":prebuilt_binary_or_cc_binary", -++ "//conditions:default": ":ijar_cc_binary", -+ }), -+ ) -+ diff --git a/testing/bazel4/patch_fix_jdk_13.patch b/testing/bazel4/patch_fix_jdk_13.patch deleted file mode 100644 index 6469eb28996..00000000000 --- a/testing/bazel4/patch_fix_jdk_13.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: philwo <philwo@google.com> -Date: Mon, 8 Feb 2021 10:45:50 -0800 -Subject: [PATCH] Fix Bazel #10214: JDK 13 introduced a source compatibility - issue. -Upstream: yes (https://github.com/bazelbuild/bazel/commit/0216ee54417fa1f2fef14f6eb14cbc1e8f595821) - -Quote from the Java release notes: - -The addition of newFileSystem(Path, Map<String, ?>) creates a source (but not binary) compatibility issue for code that has been using the existing 2-arg newFileSystem(Path, ClassLoader) and specifying the class loader as null. [...] To avoid the ambiguous reference, this code needs to be modified to cast the second parameter to java.lang.ClassLoader. - -RELNOTES: -PiperOrigin-RevId: 356301318 ---- - .../com/google/devtools/build/buildjar/VanillaJavaBuilder.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/VanillaJavaBuilder.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/VanillaJavaBuilder.java -index b2a4da2aaa..d63bd8485e 100644 ---- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/VanillaJavaBuilder.java -+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/VanillaJavaBuilder.java -@@ -78,7 +78,7 @@ public class VanillaJavaBuilder implements Closeable { - private FileSystem getJarFileSystem(Path sourceJar) throws IOException { - FileSystem fs = filesystems.get(sourceJar); - if (fs == null) { -- filesystems.put(sourceJar, fs = FileSystems.newFileSystem(sourceJar, null)); -+ filesystems.put(sourceJar, fs = FileSystems.newFileSystem(sourceJar, (ClassLoader) null)); - } - return fs; - } --- -2.31.1 - diff --git a/testing/bazel4/patch_ftbfs_gcc11_1.patch b/testing/bazel4/patch_ftbfs_gcc11_1.patch deleted file mode 100644 index 1c926b1b698..00000000000 --- a/testing/bazel4/patch_ftbfs_gcc11_1.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8cc0e261a313dbf5e81bfeca2bafa3e12a991046 Mon Sep 17 00:00:00 2001 -From: cushon <cushon@google.com> -Date: Tue, 15 Dec 2020 23:18:55 -0800 -Subject: [PATCH] Include <limits> - -Probably fixes https://github.com/bazelbuild/bazel/issues/12702 - -PiperOrigin-RevId: 347764132 ---- - third_party/ijar/zlib_client.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h -index ed6616362fcc..c4b051e0100c 100644 ---- a/third_party/ijar/zlib_client.h -+++ b/third_party/ijar/zlib_client.h -@@ -16,6 +16,7 @@ - #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_ - - #include <limits.h> -+#include <limits> - - #include "third_party/ijar/common.h" - diff --git a/testing/bazel4/patch_ftbfs_gcc11_2.patch b/testing/bazel4/patch_ftbfs_gcc11_2.patch deleted file mode 100644 index 42e9073296b..00000000000 --- a/testing/bazel4/patch_ftbfs_gcc11_2.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a129aeb333d83a4466ac2c996b84a113405acb4d Mon Sep 17 00:00:00 2001 -From: philwo <philwo@google.com> -Date: Mon, 14 Jun 2021 09:10:07 -0700 -Subject: [PATCH] Fix #13575: FTBFS with GCC 11 on ARMv8 - -This supposedly fixes the compiler error reported by the user: - -`error: 'numeric_limits' is not a member of 'std'` - -Thanks to samcom12 for the report and suggested fix. - -RELNOTES: None. -PiperOrigin-RevId: 379291338 ---- - third_party/ijar/zlib_client.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h -index c4b051e0100c..0a917ff0a99a 100644 ---- a/third_party/ijar/zlib_client.h -+++ b/third_party/ijar/zlib_client.h -@@ -16,7 +16,9 @@ - #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_ - - #include <limits.h> -+ - #include <limits> -+#include <stdexcept> - - #include "third_party/ijar/common.h" - diff --git a/testing/bazel4/patch_ftbfs_gcc11_3.patch b/testing/bazel4/patch_ftbfs_gcc11_3.patch deleted file mode 100644 index 667110479bc..00000000000 --- a/testing/bazel4/patch_ftbfs_gcc11_3.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9761509f9ccc3892f42425b904adf1ef10bcb1f4 Mon Sep 17 00:00:00 2001 -From: David Ostrovsky <david@ostrovsky.org> -Date: Wed, 16 Jun 2021 07:55:57 -0700 -Subject: [PATCH] Fix building on gcc 11 - -Fixes #12702. - -Without this include the build is failing with: - - third_party/ijar/mapped_file_unix.cc: In constructor 'devtools_ijar::MappedOutputFile::MappedOutputFile(const char*, size_t)': - third_party/ijar/mapped_file_unix.cc:115:21: error: 'numeric_limits' is not a member of 'std' - 115 | std::numeric_limits<size_t>::max()); - | ^~~~~~~~~~~~~~ - -Closes #13537. - -PiperOrigin-RevId: 379719635 ---- - third_party/ijar/mapped_file_unix.cc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/third_party/ijar/mapped_file_unix.cc b/third_party/ijar/mapped_file_unix.cc -index 6e3a90871844..65179e3290ec 100644 ---- a/third_party/ijar/mapped_file_unix.cc -+++ b/third_party/ijar/mapped_file_unix.cc -@@ -15,10 +15,11 @@ - #include <errno.h> - #include <fcntl.h> - #include <stdio.h> --#include <unistd.h> - #include <sys/mman.h> -+#include <unistd.h> - - #include <algorithm> -+#include <limits> - - #include "third_party/ijar/mapped_file.h" - diff --git a/testing/bazel4/patch_ftbfs_gcc11_4.patch b/testing/bazel4/patch_ftbfs_gcc11_4.patch deleted file mode 100644 index 795bc82b75f..00000000000 --- a/testing/bazel4/patch_ftbfs_gcc11_4.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/third_party/grpc/grpc_1.33.1.patch -+++ b/third_party/grpc/grpc_1.33.1.patch -@@ -58,6 +58,14 @@ index 09fcad95a2..9b737e5deb 100644 - ) - - native.bind( -+@@ -245,6 +245,7 @@ def grpc_deps(): -+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", -+ "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", -+ ], -++ patches = ["@com_github_grpc_grpc//:third_party/abseil-cpp/absl.patch"], -+ ) -+ -+ if "bazel_toolchains" not in native.existing_rules(): - diff --git a/bazel/grpc_extra_deps.bzl b/bazel/grpc_extra_deps.bzl - index 4c1dfad2e8..f63c54ddef 100644 - --- a/bazel/grpc_extra_deps.bzl -@@ -120,3 +128,25 @@ index c047f0c515..7c24fbc617 100644 - ":windows": "@com_github_grpc_grpc//third_party/cares:config_windows/ares_config.h", - ":android": "@com_github_grpc_grpc//third_party/cares:config_android/ares_config.h", - "//conditions:default": "@com_github_grpc_grpc//third_party/cares:config_linux/ares_config.h", -+ -+--- /dev/null -++++ b/third_party/abseil-cpp/absl.patch -+@@ -0,0 +1,18 @@ -++0e2c62da1dcaf6529abab952bdcc96c6de2d9506 by Abseil Team <absl-team@google.com>: -++ -++Add missing <limits> include -++ -++PiperOrigin-RevId: 339054753 -++ -++-- -++ -++--- absl/synchronization/internal/graphcycles.cc -+++++ absl/synchronization/internal/graphcycles.cc -++@@ -37,6 +37,7 @@ -++ -++ #include <algorithm> -++ #include <array> -+++#include <limits> -++ #include "absl/base/internal/hide_ptr.h" -++ #include "absl/base/internal/raw_logging.h" -++ #include "absl/base/internal/spinlock.h" diff --git a/testing/bazel4/patch_ftbfs_gcc11_5.patch b/testing/bazel4/patch_ftbfs_gcc11_5.patch deleted file mode 100644 index 0d594f2e833..00000000000 --- a/testing/bazel4/patch_ftbfs_gcc11_5.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/tools/jdk/java_tools.patch -+++ b/tools/jdk/java_tools.patch -@@ -18,3 +18,31 @@ - }), - ) - -+ -+--- java_tools/ijar/zlib_client.h -++++ java_tools/ijar/zlib_client.h -+@@ -16,6 +16,8 @@ -+ #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_ -+ -+ #include <limits.h> -++#include <limits> -++#include <stdexcept> -+ -+ #include "third_party/ijar/common.h" -+ -+ -+--- java_tools/ijar/mapped_file_unix.cc -++++ java_tools/ijar/mapped_file_unix.cc -+@@ -15,10 +15,11 @@ -+ #include <errno.h> -+ #include <fcntl.h> -+ #include <stdio.h> -+-#include <unistd.h> -+ #include <sys/mman.h> -++#include <unistd.h> -+ -+ #include <algorithm> -++#include <limits> -+ -+ #include "third_party/ijar/mapped_file.h" -+ diff --git a/testing/bazel4/patch_remove_illegal_reflective.patch b/testing/bazel4/patch_remove_illegal_reflective.patch deleted file mode 100644 index 1297133b67c..00000000000 --- a/testing/bazel4/patch_remove_illegal_reflective.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/main/cpp/blaze.cc -+++ b/src/main/cpp/blaze.cc -@@ -360,13 +360,6 @@ static vector<string> GetServerExeArgs(const blaze_util::Path &jvm_path, - result.push_back("-XX:HeapDumpPath=" + - startup_options.output_base.AsJvmArgument()); - -- // TODO(b/109998449): only assume JDK >= 9 for embedded JDKs -- if (!startup_options.GetEmbeddedJavabase().IsEmpty()) { -- // quiet warnings from com.google.protobuf.UnsafeUtil, -- // see: https://github.com/google/protobuf/issues/3781 -- result.push_back("--add-opens=java.base/java.nio=ALL-UNNAMED"); -- result.push_back("--add-opens=java.base/java.lang=ALL-UNNAMED"); -- } - - vector<string> user_options = startup_options.host_jvm_args; - ---- a/src/main/java/com/google/devtools/build/lib/unsafe/StringUnsafe.java -+++ b/src/main/java/com/google/devtools/build/lib/unsafe/StringUnsafe.java -@@ -72,10 +72,7 @@ public class StringUnsafe { - + Arrays.toString(String.class.getDeclaredFields()), - e); - } -- this.constructor.setAccessible(true); -- valueField.setAccessible(true); - valueOffset = UnsafeProvider.getInstance().objectFieldOffset(valueField); -- coderField.setAccessible(true); - coderOffset = UnsafeProvider.getInstance().objectFieldOffset(coderField); - } - diff --git a/testing/bazel4/patch_stop_hardcoding_verify_none_1.patch b/testing/bazel4/patch_stop_hardcoding_verify_none_1.patch deleted file mode 100644 index 78f1439af18..00000000000 --- a/testing/bazel4/patch_stop_hardcoding_verify_none_1.patch +++ /dev/null @@ -1,78 +0,0 @@ -From: cushon <cushon@google.com> -Date: Mon, 7 Dec 2020 13:00:08 -0800 -Subject: [PATCH] Stop hardcoding `-Xverify:none` in `SpawnAction` -Upstream: yes (https://github.com/bazelbuild/bazel/commit/0216ee54417fa1f2fef14f6eb14cbc1e8f595821) - -The motivation was to improve startup performance of host tools that we trust. -The hard-coded flags for JavaBuilder and turbine were made obsolete by -`java_toolchain.jvm_opts`, which allows them to be configured in the toolchain -instead. - -The option has been deprecated in Java 13 and will be removed in a future -release. - -Fixes https://github.com/bazelbuild/bazel/issues/11381 - -PiperOrigin-RevId: 346160835 ---- - .../build/lib/analysis/actions/SpawnAction.java | 1 - - .../build/lib/analysis/actions/SpawnActionTest.java | 10 ++++------ - 2 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java -index 500ca758a6..de2257776a 100644 ---- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java -+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java -@@ -1016,7 +1016,6 @@ public class SpawnAction extends AbstractAction implements CommandAction { - this.executableArgs = - CustomCommandLine.builder() - .addPath(javaExecutable) -- .add("-Xverify:none") - .addAll(ImmutableList.copyOf(jvmArgs)) - .addAll(ImmutableList.copyOf(launchArgs)); - toolsBuilder.add(deployJar); -diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java -index 526473aff7..871509533f 100644 ---- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java -+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SpawnActionTest.java -@@ -166,8 +166,7 @@ public class SpawnActionTest extends BuildViewTestCase { - collectingAnalysisEnvironment.registerAction(actions); - SpawnAction action = (SpawnAction) actions[0]; - assertThat(action.getArguments()) -- .containsExactly( -- "/bin/java", "-Xverify:none", "-jvmarg", "-cp", "pkg/exe.jar", "MyMainClass") -+ .containsExactly("/bin/java", "-jvmarg", "-cp", "pkg/exe.jar", "MyMainClass") - .inOrder(); - } - -@@ -193,8 +192,7 @@ public class SpawnActionTest extends BuildViewTestCase { - - // The action reports all arguments, including those inside the param file - assertThat(action.getArguments()) -- .containsExactly( -- "/bin/java", "-Xverify:none", "-jvmarg", "-cp", "pkg/exe.jar", "MyMainClass", "-X") -+ .containsExactly("/bin/java", "-jvmarg", "-cp", "pkg/exe.jar", "MyMainClass", "-X") - .inOrder(); - - Spawn spawn = -@@ -205,7 +203,7 @@ public class SpawnActionTest extends BuildViewTestCase { - assertThat(spawn.getArguments()) - .containsExactly( - "/bin/java", -- "-Xverify:none", -+ - "-jvmarg", - "-cp", - "pkg/exe.jar", -@@ -241,7 +239,7 @@ public class SpawnActionTest extends BuildViewTestCase { - assertThat(action.getArguments()) - .containsExactly( - "/bin/java", -- "-Xverify:none", -+ - "-jvmarg", - "-cp", - "pkg/exe.jar", --- -2.31.1 - diff --git a/testing/bazel4/patch_stop_hardcoding_verify_none_2.patch b/testing/bazel4/patch_stop_hardcoding_verify_none_2.patch deleted file mode 100644 index 87b76dfa1f3..00000000000 --- a/testing/bazel4/patch_stop_hardcoding_verify_none_2.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Jesse Chan <jc@linux.com> -Date: Thu, 24 Jun 2021 20:15:21 +0800 -Subject: [PATCH] Remove remaining hardcoded instances of `-Xverify:none` - -Bug: #11381, #13097 -Refs: d91e5b4e0 ---- - scripts/bootstrap/compile.sh | 2 +- - src/main/cpp/blaze.cc | 2 -- - .../build/lib/rules/java/JavaHeaderCompileActionBuilder.java | 1 - - 3 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh -index f9a152f145..e9cfbeec3d 100755 ---- a/scripts/bootstrap/compile.sh -+++ b/scripts/bootstrap/compile.sh -@@ -436,7 +436,7 @@ function run_bazel_jar() { - done - - "${JAVA_HOME}/bin/java" \ -- -XX:+HeapDumpOnOutOfMemoryError -Xverify:none -Dfile.encoding=ISO-8859-1 \ -+ -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=ISO-8859-1 \ - -XX:HeapDumpPath=${OUTPUT_DIR} \ - -Djava.util.logging.config.file=${OUTPUT_DIR}/javalog.properties \ - ${JNI_FLAGS} \ -diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc -index a3fd334f24..ecdc707c64 100644 ---- a/src/main/cpp/blaze.cc -+++ b/src/main/cpp/blaze.cc -@@ -368,8 +368,6 @@ static vector<string> GetServerExeArgs(const blaze_util::Path &jvm_path, - result.push_back("--add-opens=java.base/java.lang=ALL-UNNAMED"); - } - -- result.push_back("-Xverify:none"); -- - vector<string> user_options = startup_options.host_jvm_args; - - // Add JVM arguments particular to building blaze64 and particular JVM -diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileActionBuilder.java -index 6f855cfdb4..8a543a6e00 100644 ---- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileActionBuilder.java -+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileActionBuilder.java -@@ -337,7 +337,6 @@ public class JavaHeaderCompileActionBuilder { - executableLine = - CustomCommandLine.builder() - .addPath(javaToolchain.getJavaRuntime().javaBinaryExecPathFragment()) -- .add("-Xverify:none") - .addAll(javaToolchain.getTurbineJvmOptions()) - .add("-jar") - .addExecPath(headerCompiler.getExecutable()) --- -2.31.1 - diff --git a/testing/binwalk/APKBUILD b/testing/binwalk/APKBUILD index b13db61fbcf..362f0102216 100644 --- a/testing/binwalk/APKBUILD +++ b/testing/binwalk/APKBUILD @@ -1,14 +1,15 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=binwalk -pkgver=2.4.0 -pkgrel=1 +pkgver=2.4.1 +pkgrel=0 pkgdesc="Fast, easy to use tool for analyzing and extracting firmware images" -url="https://github.com/ReFirmLabs/binwalk/" +url="https://github.com/OSPG/binwalk/" arch="noarch" license="MIT" depends="py3-pycryptodome python3" -makedepends="py3-setuptools" +makedepends="py3-gpep517 py3-setuptools py3-wheel" +checkdepends="py3-pytest" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/OSPG/binwalk/archive/refs/tags/v$pkgver.tar.gz" @@ -17,13 +18,19 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OSPG/binwalk/archive/refs/ta # - CVE-2022-4510 build() { - python3 setup.py build + gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest } package() { - python3 setup.py install --skip-build --root="$pkgdir" + python3 -m installer -d "$pkgdir" .dist/*.whl } sha512sums=" -41bee6a0d1cd587f81dcf81c30215a305b61e4db208bc9d8e4f0b9f12acb47e4dc2e6af23e06118ef6e30c484f6be743b456b6d4324be4388413ff291682345e binwalk-2.4.0.tar.gz +f83d0ca09a39033944ce16345b7c2c8f3051a20f80315e4c797221df4e6844c7c89c0a49053d739156e2654b482d6ef93f0814fa588daab031dbeaed1423e6f2 binwalk-2.4.1.tar.gz " diff --git a/testing/bionic_translation/APKBUILD b/testing/bionic_translation/APKBUILD index 4998670fc55..b4ddadfd0f0 100644 --- a/testing/bionic_translation/APKBUILD +++ b/testing/bionic_translation/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=bionic_translation -pkgver=0_git20240202 +pkgver=0_git20240429 pkgrel=0 -_commit="534380e8d8bac0ec858012cdac05bb3f9d9367d1" +_commit="22655af6eed2e7cf4b8d792407c088434eefb028" pkgdesc="A set of libraries for loading bionic-linked .so files on musl/glibc" url="https://gitlab.com/android_translation_layer/bionic_translation" arch="x86_64 aarch64 armv7" @@ -35,5 +35,5 @@ package() { } sha512sums=" -55bf53043318e4b25c689f38910aa535c4eceacde5ab6ffc986a43cc5985e6617089fd97c1827d4c29f77aeda486e415286a1a7c54e0eed8fb89efa6cadad29f bionic_translation-534380e8d8bac0ec858012cdac05bb3f9d9367d1.tar.gz +d3244578b1e4e9f9d4d787b5361055ebe0d022b85358100be322c44f744a73969e80341729641d238d03196529f84642458f892a75792c23d4fee88c5eb3752c bionic_translation-22655af6eed2e7cf4b8d792407c088434eefb028.tar.gz " diff --git a/testing/bitritter/APKBUILD b/testing/bitritter/APKBUILD index c991f065456..232fcd613dc 100644 --- a/testing/bitritter/APKBUILD +++ b/testing/bitritter/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Clayton Craft <clayton@craftyguy.net> # Maintainer: pkgname=bitritter -pkgver=0_git20240328 +pkgver=0_git20240415 pkgrel=0 -_commit="b8c1c0c952fb53f174be745de0c6cbfa14f14883" +_commit="0a6b24a27fb28d06b22c6257d00d403889ece377" pkgdesc="GTK-based bitwarden client" url="https://codeberg.org/Chfkch/bitritter" arch="all !s390x" # 'nix' crate fails to compile @@ -48,6 +48,6 @@ package() { } sha512sums=" -845320c957f0a49f980b291f59a6ced554acca07a55adf8075fecdb8aa3ab3ce99d1b5b9a3598820cf0bdbf9dfce620ef3d0622432781d060206565c542e9b1d bitritter-b8c1c0c952fb53f174be745de0c6cbfa14f14883.tar.gz +1e2e1f11d9ce2dde92da308bb3a1be8a4f57183e20e1f36cf28e12bacfe21357a3ddee91366bb760b233716251243205895e51bf1832090db618a192e7569450 bitritter-0a6b24a27fb28d06b22c6257d00d403889ece377.tar.gz 03b31377d37edbaa3cb2447e02caea0ecaad4a0b78b9adb61d0c218af1be5472090b6cc3a8139ddd40a82bc75e826900033ea4225277cdd0f0f77c34543500be bitritter.desktop " diff --git a/testing/bootterm/0001-fix-includes.patch b/testing/bootterm/0001-fix-includes.patch new file mode 100644 index 00000000000..e4d88b0bed8 --- /dev/null +++ b/testing/bootterm/0001-fix-includes.patch @@ -0,0 +1,15 @@ +tcgetaddr() and friends are in termios.h +--- a/src/bt.c 2024-04-04 14:23:09.000000000 +0200 ++++ b/src/bt.c 2024-05-09 18:36:02.108344059 +0200 +@@ -38,11 +38,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#if defined(__linux__) && !defined(NO_TCGETS2) +-#include <asm/termbits.h> +-#else + #include <termios.h> +-#endif + #include <time.h> + #include <unistd.h> + #if defined(__FreeBSD__) diff --git a/testing/bootterm/APKBUILD b/testing/bootterm/APKBUILD index 652fadbef85..4add1517259 100644 --- a/testing/bootterm/APKBUILD +++ b/testing/bootterm/APKBUILD @@ -1,16 +1,21 @@ # Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de> # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=bootterm -pkgver=0.4 -pkgrel=2 +pkgver=0.5 +pkgrel=0 pkgdesc="Simple, reliable and powerful terminal designed to ease connection to ephemeral serial ports" url="https://github.com/wtarreau/bootterm" arch="all" license="MIT" makedepends="linux-headers" subpackages="$pkgname-dbg" +options="!check" # no unit tests provided -source="$pkgname-$pkgver.tar.gz::https://github.com/wtarreau/bootterm/archive/v$pkgver.tar.gz" +source=" + $pkgname-$pkgver.tar.gz::https://github.com/wtarreau/bootterm/archive/v$pkgver.tar.gz + + 0001-fix-includes.patch + " build() { make @@ -20,4 +25,7 @@ package() { make DESTDIR="$pkgdir" PREFIX=/usr install } -sha512sums="a4f1abcc4deaa8667ea3b41caf63f15c92bf19cc0c1ad57d1119acd4ba232d130675a94971b8270a869eededd073f2fd55d4ec7a95058f6bebd57f73e0cea9d9 bootterm-0.4.tar.gz" +sha512sums=" +6b01d33a343f42a261aece87b52936bfa174115ba684e0a07a87e2738407ceb6c2c12ddc8764ede5fe42e170be1f661b89e8e7841f662f0abb43fd675970fce8 bootterm-0.5.tar.gz +244c23f923fe956aa0ec802ec8e3e4461141c7ae3b4c684c172d0a9895248df0d1d3f98155befc7991c9cdc57eeaf8816d91ab98242855c66bd43850012ecf77 0001-fix-includes.patch +" diff --git a/testing/brial/APKBUILD b/testing/brial/APKBUILD index 4581f4ef7fe..2a12edc4df4 100644 --- a/testing/brial/APKBUILD +++ b/testing/brial/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Eloi Torrents <eloitor@disroot.org> pkgname=brial pkgver=1.2.11 -pkgrel=2 +pkgrel=3 pkgdesc="BRiAl (Boolean Ring Algebra) is the successor to PolyBoRi" url="https://github.com/BRiAl/BRiAl" arch="all" diff --git a/testing/btcd/APKBUILD b/testing/btcd/APKBUILD index fa857dae688..1119bf2974b 100644 --- a/testing/btcd/APKBUILD +++ b/testing/btcd/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Michał Adamski <michal@ert.pl> pkgname=btcd -pkgver=0.23.4 +pkgver=0.24.0 _pkgver=${pkgver/_/-} -pkgrel=5 +pkgrel=0 pkgdesc="Alternative full node bitcoin implementation written in Go" url="https://github.com/btcsuite/btcd#btcd" -arch="all" +arch="all !x86 !armhf !armv7" license="ISC" makedepends="go" source="https://github.com/btcsuite/btcd/archive/v$_pkgver/btcd-$_pkgver.tar.gz" @@ -25,8 +25,7 @@ build() { } check() { - export GOFLAGS="${GOFLAGS/-trimpath/}" - go test ./... + GOFLAGS="${GOFLAGS/-trimpath/}" go test ./... } package() { @@ -35,5 +34,5 @@ package() { done } sha512sums=" -aa6c40d58d8d4e7302005fa80b192a8f0298707d67685273e2b57cc339f2a999ea1953215f1a89c0480ea926dc6a55740c243656b67ca3b9d494b05f06537880 btcd-0.23.4.tar.gz +0786f74396f77cab7ac977483ea291bf57d2abc68cf824627424987386d94c2fe071e694a289f21a853a3a244e11b9f7fdf9ce8926684345752efe668f852b98 btcd-0.24.0.tar.gz " diff --git a/testing/btfs/APKBUILD b/testing/btfs/APKBUILD index 0097caeecf1..748227ef4ea 100644 --- a/testing/btfs/APKBUILD +++ b/testing/btfs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: dai9ah <dai9ah@protonmail.com> pkgname=btfs pkgver=2.24 -pkgrel=11 +pkgrel=12 pkgdesc="Bittorrent filesystem based on FUSE" options="!check" # No testsuite url="https://github.com/johang/btfs" diff --git a/testing/buf/APKBUILD b/testing/buf/APKBUILD index 401eda0de76..801a84c1098 100644 --- a/testing/buf/APKBUILD +++ b/testing/buf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=buf -pkgver=1.29.0 -pkgrel=2 +pkgver=1.31.0 +pkgrel=0 pkgdesc="CLI to work with Protocol Buffers" url="https://buf.build/" # 32bit: fail tests with int overflow @@ -16,6 +16,12 @@ subpackages=" $pkgname-protoc-plugins:_protoc " source="$pkgname-$pkgver.tar.gz::https://github.com/bufbuild/buf/archive/refs/tags/v$pkgver.tar.gz" +options="net" # download Go modules + +# private/bufpkg/bufstudioagent tests time out +case "$CARCH" in + riscv64|ppc64le) options="$options !check" +esac export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -69,5 +75,5 @@ _protoc() { } sha512sums=" -4b7e034429cb4eb3607546f6e671919ed3863221a52b374fb608148836dafb8aba7609716a2c3ceb30dc6b30370e8956a74d1d187cec3a48f7cf3216501e3466 buf-1.29.0.tar.gz +ddee58f528f938718fafdf5ae751b815edb2e62edf43b0710bd480d164484a9d7a1a6cef1ab948b93abe8cad8b56d5e3fc274edaf90caca1a9ec1f3831b0975c buf-1.31.0.tar.gz " diff --git a/testing/calibre/APKBUILD b/testing/calibre/APKBUILD index bf47c79855a..9578fa34bba 100644 --- a/testing/calibre/APKBUILD +++ b/testing/calibre/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Cowington Post <cowingtonpost@gmail.com> pkgname=calibre -pkgver=7.8.0 -pkgrel=0 +pkgver=7.10.0 +pkgrel=1 pkgdesc="Ebook management application" # qt6-webengine arch="x86_64 aarch64" @@ -110,6 +110,6 @@ package() { } sha512sums=" -c90d247af3a8ba3b2a94ca3a03bf9ee4d1c8f07d6feaa1ec045d639f448c476c4be9568e66845e7067e32b746e0ab034be65084a60f2b64f961f6678a30910e7 calibre-7.8.0.tar.xz +f01d4c57af7f8390c17231ebc6f2fee4b331a8f143337a128119b8585b6e269b5d531a5245c6f418a8ec51ee440f99ce978b0d102f28cc955a2d31911db3b107 calibre-7.10.0.tar.xz eb8e7ce40ff8b8daf6e7e55a5dff8ec4dff06c45744266bb48b3194e92ab1196bc91468203e3c2ca1e5144166a7d6be90e6cf0253513e761b56a4c85be4c2c76 0001-calibre-no-update.patch " diff --git a/testing/carapace/APKBUILD b/testing/carapace/APKBUILD index 2209a51c57a..e9f170ab0c7 100644 --- a/testing/carapace/APKBUILD +++ b/testing/carapace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Andrej Kolchin <KAAtheWise@protonmail.com> # Maintainer: Andrej Kolchin <KAAtheWise@protonmail.com> pkgname=carapace -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=0 pkgdesc="Multi-shell multi-command argument completer" url="https://carapace.sh/" @@ -36,5 +36,5 @@ package() { } sha512sums=" -4e4d745879209343ff06e2d716bcbb7ec59920bb885deea9cb6a765d4c7a2040e4ace578e3fa820bda4c89a6ecab55e48e914f22c00565551331645e62e3fe73 carapace-1.0.1.tar.gz +f32bea9b15d0517dab0a0e5176fdab4e23dc3c11209a9647578adf3f2a12628d69424505e1833bbab497d8f8348c393e0dcf5250434cf860ae2e6bb0e04e2bc5 carapace-1.0.2.tar.gz " diff --git a/testing/cargo-deny/APKBUILD b/testing/cargo-deny/APKBUILD new file mode 100644 index 00000000000..8c306fcfb96 --- /dev/null +++ b/testing/cargo-deny/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: Matthias Ahouansou <matthias@ahouansou.cz> +# Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> +pkgname=cargo-deny +pkgver=0.14.23 +pkgrel=0 +pkgdesc="Cargo plugin for linting your dependencies" +url="https://github.com/EmbarkStudios/cargo-deny" +arch="x86_64 ppc64le" # x86 tests fail, the rest don't build due to a proc-macro in clap_derive v4.4.7 +license="MIT OR Apache-2.0" +makedepends=" + cargo + cargo-auditable +" +source="$pkgname-$pkgver.tar.gz::https://github.com/EmbarkStudios/cargo-deny/archive/refs/tags/$pkgver.tar.gz" +options="net" + +prepare() { + default_prepare + cargo fetch --target="$CTARGET" --locked +} + +build() { + cargo auditable build --release --frozen +} + +check() { + # These tests require the advisory repos to be cloned via git + cargo test --frozen -- --skip fails_on_stale_advisory_database \ + --skip fetches_with_gix \ + --skip fetches_with_git \ + --skip downgrades_lint_levels \ + --skip detects_unsound \ + --skip warns_on_index_failures \ + --skip warns_on_ignored_and_withdrawn \ + --skip detects_vulnerabilities \ + --skip detects_unmaintained +} + +package() { + install -Dm 755 target/release/cargo-deny "$pkgdir"/usr/bin/cargo-deny + + for l in APACHE MIT + do + install -Dm 644 LICENSE-"$l" "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE-"$l" + done +} + +sha512sums=" +072f61312fa8bf6dfe7103854132a885df9566c82ab04ab778a756b88a6901890686cadde9d0d9a4049d443dd2ecad4e283ac5a7591b1147218cc1b8a77518e0 cargo-deny-0.14.23.tar.gz +" diff --git a/testing/cargo-leptos/APKBUILD b/testing/cargo-leptos/APKBUILD index 3f63e8e6765..0503378cb93 100644 --- a/testing/cargo-leptos/APKBUILD +++ b/testing/cargo-leptos/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=cargo-leptos -pkgver=0.2.16 +pkgver=0.2.17 pkgrel=0 pkgdesc="Build tool for Leptos" url="https://leptos.dev" @@ -40,5 +40,5 @@ package() { } sha512sums=" -334dadf021fa7aabcd3e8a71d0512ce3fdc04ec058fd9b22bfd0b1f89bbd8bc9e3f7fd37973a5a9ad656802174293607330cd07db1283366d0264daa9a704bbd cargo-leptos-0.2.16.tar.gz +fddce550ee3c903d04f2cb7fa01b370c8991e565f4d1c0a8a6af4019948dcff9c0b698af2176a4502f1026bf6a8e697c6951b68d5ed0ef9f37f9da959cae0f85 cargo-leptos-0.2.17.tar.gz " diff --git a/testing/cargo-shuttle/APKBUILD b/testing/cargo-shuttle/APKBUILD index fa36d0b0574..7c23ba84a18 100644 --- a/testing/cargo-shuttle/APKBUILD +++ b/testing/cargo-shuttle/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Orhun Parmaksız <orhunparmaksiz@gmail.com> pkgname=cargo-shuttle -pkgver=0.43.0 +pkgver=0.45.0 pkgrel=0 pkgdesc="Cargo command for the Shuttle platform" url="https://github.com/shuttle-hq/shuttle" @@ -45,5 +45,5 @@ package() { } sha512sums=" -0750bae9e0e6b3208924c27c16ab2bf0e8c64908d830e0e7f169601e608a8bf20e7ce83188bde474afa01eaa0e30edb437f28508a6e8af032216b46cec7a2f18 shuttle-0.43.0.tar.gz +e6a6ce2d6efe405ddb319b39bc626a2956307ded6ca2bc11bea77b1d6f5a1d8e73c815bcb65a091c9d4e5fb30c00893b89123e091270b6a9765b9d0b7bbeb30d shuttle-0.45.0.tar.gz " diff --git a/testing/cargo-sort/APKBUILD b/testing/cargo-sort/APKBUILD new file mode 100644 index 00000000000..b209c7cb701 --- /dev/null +++ b/testing/cargo-sort/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Matthias Ahouansou <matthias@ahouansou.cz> +# Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> +pkgname=cargo-sort +pkgver=1.0.9_git20240110 +_gitrev=55ec89082466f6bb246d870a8d56d166a8e1f08b +pkgrel=0 +pkgdesc="Check if tables and items in a .toml file are lexically sorted" +url="https://github.com/DevinR528/cargo-sort" +arch="all" +license="MIT OR Apache-2.0" +makedepends="cargo-auditable" +depends="cargo" +source=" + $pkgname-$_gitrev.tar.gz::https://github.com/DevinR528/cargo-sort/archive/$_gitrev.tar.gz +" +options="net" +builddir="$srcdir/$pkgname-$_gitrev" + +prepare() { + default_prepare + cargo fetch --target="$CTARGET" --locked +} + +build() { + cargo auditable build --release --frozen +} + +check() { + cargo test --frozen +} + +package() { + install -Dm 755 target/release/cargo-sort "$pkgdir"/usr/bin/cargo-sort +} + +sha512sums=" +064ccafb11d250bb20453eba55eb1b108f1cb6ef3dda4728f0462a2d4c011da884443c7fd4de7b7d2a1cc8ac3ac4cf0ca1658c08f0be561844fc9e7553a430a1 cargo-sort-55ec89082466f6bb246d870a8d56d166a8e1f08b.tar.gz +" diff --git a/testing/cargo-update/APKBUILD b/testing/cargo-update/APKBUILD index 0c40f8d7764..2a9bad73491 100644 --- a/testing/cargo-update/APKBUILD +++ b/testing/cargo-update/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=cargo-update -pkgver=13.3.0 +pkgver=13.4.0 pkgrel=0 pkgdesc="cargo subcommand for checking and applying updates to installed executables" url="https://github.com/nabijaczleweli/cargo-update" @@ -34,7 +34,7 @@ build() { } check() { - cargo test --frozen + TMPDIR="$srcdir" cargo test --frozen } package() { @@ -47,5 +47,5 @@ package() { } sha512sums=" -ef12ab1c998efeaab2ac680f9714ad6626434db021fd5aaa09f5f9e262fa6bea32fba53e513bf3a2fcc043e28fe2f19a24f163b1614899dc2d899472c0451ae0 cargo-update-13.3.0.tar.gz +14bf57b1624ada761f914acab3aae2211f7a97f9e40ebf8697fe3b82ba856836d8daff627a658540ad7b9d0aae7173e2803b2bbe001213d785dee22c24634d37 cargo-update-13.4.0.tar.gz " diff --git a/testing/cemu/APKBUILD b/testing/cemu/APKBUILD index b1f9feccf8d..d58ec102d91 100644 --- a/testing/cemu/APKBUILD +++ b/testing/cemu/APKBUILD @@ -3,7 +3,7 @@ pkgname=cemu pkgver=2.0.61 _pkgver=2.0-61 -pkgrel=0 +pkgrel=1 _cubeb=2071354a69aca7ed6df3b4222e305746c2113f60 _imgui=f65bcf481ab34cd07d3909aab1479f409fa79f2f pkgdesc="Wii U Emulator" diff --git a/testing/chamo/APKBUILD b/testing/chamo/APKBUILD index 16828958745..3bd47924e9e 100644 --- a/testing/chamo/APKBUILD +++ b/testing/chamo/APKBUILD @@ -1,36 +1,42 @@ # Contributor: rubicon <rubicon@mailo.com> -# Maintainer: +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=chamo -pkgver=3.0 -pkgrel=1 +pkgver=4.0 +pkgrel=0 pkgdesc="Emacs-inspired text editor written in and configurable with OCaml" -url="https://zoggy.frama.io/chamo" -arch="all !riscv64" # limited by ocaml aport +url="https://framagit.org/zoggy/chamo" +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-3.0-only" -# lablgtk3-sourceview3 is bundled together in ocaml-lablgtk3 +depends=" + font-dejavu + font-liberation + " depends_dev=" - ocaml-lablgtk3-dev - ocaml-lablgtk3-extras-dev + ocaml-fmt-dev + ocaml-integers-dev ocaml-logs-dev ocaml-lwt-dev - ocaml-lwt_ppx-dev ocaml-ocf-dev ocaml-pcre-dev + ocaml-ppx_blob-dev + ocaml-re-dev ocaml-sedlex-dev + ocaml-stk-dev ocaml-uutf-dev ocaml-xmlm-dev + ocaml-xtmpl-dev " makedepends=" $depends_dev - gnu-libiconv + dune ocaml - ocaml-compiler-libs - ocaml-findlib - ocaml-ocamldoc " -options="!check" -subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.bz2::https://framagit.org/zoggy/chamo/-/archive/$pkgver/chamo-$pkgver.tar.bz2" +options="!check" # no tests provided +subpackages=" + $pkgname-byte + $pkgname-dev + " +source="https://framagit.org/zoggy/chamo/-/archive/$pkgver/chamo-$pkgver.tar.bz2" _ocamldir=usr/lib/ocaml # 32-bit archs @@ -39,32 +45,51 @@ case "$CARCH" in esac build() { - export ICONV=/usr/bin/gnu-iconv - ./configure --prefix /usr - make -j1 all + dune build --release --verbose } package() { - export OCAMLFIND_DESTDIR="$pkgdir/$_ocamldir" - export OCAMLFIND_LDCONF=ignore - mkdir -vp "$OCAMLFIND_DESTDIR" + dune install --destdir="$pkgdir" --docdir=/.omit + + rm -v "$pkgdir"/usr/bin/chamo_byte +} - local pkgdirshare="$pkgdir"/usr/share/chamo3 - make GLADEDIR="$pkgdirshare"/glade \ - PIXMAPSDIR="$pkgdirshare"/pixmaps install +byte() { + pkgdesc="$pkgdesc (bytecode executable)" + depends="$depends ocaml-runtime" - local chamobinary="$OCAMLFIND_DESTDIR"/chamo3/chamo - install -Dv $chamobinary -t "$pkgdir"/usr/bin/ - rm -v $chamobinary + amove usr/bin/chamo.byte + ln -sv chamo.byte "$subpkgdir"/usr/bin/chamo_byte } dev() { - depends="$depends_dev ocaml-runtime" pkgdesc="$pkgdesc (development files)" + depends="$depends_dev" amove $_ocamldir } +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + sha512sums=" -f5d2980bf67c5e8b98dd8e0d8eaa7fdf96c762c2bc5907d7eba3737978d27dfff76a37cea29d1470a78b77aa0114655a65c723d4eeebad8198d23703294d724d chamo-3.0.tar.bz2 +f83be446a5b0f1178a2e854691973da41d8a1ada12098e9f0d65bde5301a6242a79a58dfb9b2f244a8548b01453eba4788d06b8ab62b8a04b29b9f6cedc31b54 chamo-4.0.tar.bz2 " diff --git a/testing/cilium-cli/APKBUILD b/testing/cilium-cli/APKBUILD index ad99e349c6e..893d89d1ebc 100644 --- a/testing/cilium-cli/APKBUILD +++ b/testing/cilium-cli/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=cilium-cli -pkgver=0.15.23 -pkgrel=2 +pkgver=0.16.6 +pkgrel=0 pkgdesc="CLI to install, manage and troubleshoot Kubernetes clusters running Cilium" url="https://cilium.io/" arch="all" @@ -12,7 +12,9 @@ subpackages=" $pkgname-fish-completion $pkgname-zsh-completion " -source="$pkgname-$pkgver.tar.gz::https://github.com/cilium/cilium-cli/archive/refs/tags/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/cilium/cilium-cli/archive/refs/tags/v$pkgver.tar.gz + byteorder-add-s390x-support.patch + " export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -44,5 +46,6 @@ package() { } sha512sums=" -374a1fad145a8947f42f2bef41c9599996c211fcee4d2261bd6f8ddbe21633ec5cf3b3b69e7416933c3aacd075c06f625ecb2125848d9a77eb4573f6da318376 cilium-cli-0.15.23.tar.gz +8c62877c58b9a3d855d5edc4f89a1f525ebb7ab1863df73e9106ad6fbca7536ba3b8d85e4f5a86f8fbde873b53fd23ff3389179b247f4c7aaad6bbaa18fba773 cilium-cli-0.16.6.tar.gz +872ccb44ac714420f87c476743d7be1b644c3a5c7e2a975d47720dc970c632ce82bb678421b053ebbc219d4a3b1f2c9f37aa74f3733a055b0f8c1dbe15fed23f byteorder-add-s390x-support.patch " diff --git a/testing/cilium-cli/byteorder-add-s390x-support.patch b/testing/cilium-cli/byteorder-add-s390x-support.patch new file mode 100644 index 00000000000..5d7fdac46e8 --- /dev/null +++ b/testing/cilium-cli/byteorder-add-s390x-support.patch @@ -0,0 +1,11 @@ +--- a/vendor/github.com/cilium/cilium/pkg/byteorder/byteorder_bigendian.go ++++ b/vendor/github.com/cilium/cilium/pkg/byteorder/byteorder_bigendian.go +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: Apache-2.0 + // Copyright Authors of Cilium + +-//go:build armbe || arm64be || mips || mips64 || ppc64 ++//go:build armbe || arm64be || mips || mips64 || ppc64 || s390x + + package byteorder + diff --git a/testing/clapper/APKBUILD b/testing/clapper/APKBUILD index 6e0470b62b6..9e3db36c90c 100644 --- a/testing/clapper/APKBUILD +++ b/testing/clapper/APKBUILD @@ -1,22 +1,21 @@ # Maintainer: Willow Barraco <contact@willowbarraco.fr> pkgname=clapper -pkgver=0.5.2 -pkgrel=1 -pkgdesc="A GNOME media player built using GJS with GTK4 toolkit and powered by GStreamer with OpenGL rendering" +pkgver=0.6.0 +pkgrel=0 +pkgdesc="Modern media player designed for simplicity and ease of use" url="https://github.com/Rafostar/clapper" -arch="all !s390x !armhf" # no gjs +arch="all" license="GPL-3.0-or-later" -depends=" - gjs - hicolor-icon-theme - " makedepends=" - gjs-dev + desktop-file-utils gst-plugins-base-dev gstreamer-dev gtk4.0-dev + libadwaita-dev + libmicrodns-dev + libsoup3-dev meson - " +" subpackages="$pkgname-lang" source="$pkgname-$pkgver.tar.gz::https://github.com/Rafostar/clapper/archive/refs/tags/$pkgver.tar.gz" options="!check" # No tests @@ -32,5 +31,5 @@ package() { } sha512sums=" -46934a6e1224e88338e85154bbc489dcd006887863fcdc880fa631e5573afa48de32c23fa0bcc9b2206f324e51b6f071d250b340c41a450e9d0c497863feacbf clapper-0.5.2.tar.gz +a2119a632f4706b41e5b07384052a8c063b4279971e332197d258b419f602f922316ddd5649a2799ad59da921639201fdb81d0b4b94ee7b5695503dc8ab2eebe clapper-0.6.0.tar.gz " diff --git a/testing/clementine/APKBUILD b/testing/clementine/APKBUILD index 8ea97bac33b..0b636bd0e94 100644 --- a/testing/clementine/APKBUILD +++ b/testing/clementine/APKBUILD @@ -1,8 +1,8 @@ # Contributor: knuxify <knuxify@gmail.com> -# Maintainer: knuxify <knuxify@gmail.com> +# Maintainer: pkgname=clementine pkgver=1.4.0_git20220324 -pkgrel=10 +pkgrel=12 _tag=1.4.0rc1-814-g2b340da79 pkgdesc="A modern music player and library organizer" url="https://clementine-player.org" diff --git a/testing/cloud-hypervisor/APKBUILD b/testing/cloud-hypervisor/APKBUILD index 9d3032c0729..3510a8eea48 100644 --- a/testing/cloud-hypervisor/APKBUILD +++ b/testing/cloud-hypervisor/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=cloud-hypervisor -pkgver=38.0 +pkgver=39.0 pkgrel=0 pkgdesc="Virtual machine monitor for modern cloud workloads" url="https://www.cloudhypervisor.org/" @@ -33,5 +33,5 @@ package() { } sha512sums=" -5ca0bcf6394957381fb2345bb345501926b7a9b23ea57a9ab3d78db6f32cef9bf494fc909b06d8687dfe8ca2f43fccd3eebb9470136b87eb0a3c62a233e61b65 cloud-hypervisor-v38.0.tar.xz +5a39cf7ad06232ed2426aab43a69def3cd6d5e5e9363d11214cf7a6b092cf6e11da8e8ef6dd9d1480e8a2442a5e71749cc59ae4185040eb2e039d20ab9af101d cloud-hypervisor-v39.0.tar.xz " diff --git a/testing/cm256cc/APKBUILD b/testing/cm256cc/APKBUILD index 62f4626e88b..bc65795a264 100644 --- a/testing/cm256cc/APKBUILD +++ b/testing/cm256cc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leon ROUX <leon.roux@federate.us> # Maintainer: Leon ROUX <leon.roux@federate.us> pkgname=cm256cc -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=0 pkgdesc="Fast GF(256) Cauchy MDS Block Erasure Codec library in C++" url="https://github.com/f4exb/cm256cc" @@ -42,5 +42,5 @@ package() { } sha512sums=" -2bd02675bb2c1c2b422c626c92bd36a0c0fc7a46a0512475424b1bc781d816137eadc52f33f11e100cdc69a7a595f3153fbed0020d6038916e305a2923700959 cm256cc-1.1.0.tar.gz +fcda338b766bcae1af1e25ab6237c30ed60722b2e6e679e13623005d441d3e8daa462c7a7735ca239c0a1fa5f2d8b28455fe40f40762ebefa997c2ebd3731082 cm256cc-1.1.1.tar.gz " diff --git a/testing/coccinelle/APKBUILD b/testing/coccinelle/APKBUILD index 7f1331c2ee4..202a1941d1d 100644 --- a/testing/coccinelle/APKBUILD +++ b/testing/coccinelle/APKBUILD @@ -2,7 +2,7 @@ pkgname=coccinelle pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="provides the spatch matching and transformation engine implementing semantic patch language" url="https://coccinelle.gitlabpages.inria.fr/website/" makedepends=" @@ -21,8 +21,8 @@ subpackages=" $pkgname-doc $pkgname-bash-completion " -# riscv64: ocaml -arch="all !riscv64" +# riscv64, loongarch64: ocaml +arch="all !riscv64 !loongarch64" license="GPL-2.0-only" source=" $pkgname-$pkgver.tar.gz::https://github.com/coccinelle/coccinelle/archive/$pkgver.tar.gz diff --git a/testing/code-oss/APKBUILD b/testing/code-oss/APKBUILD index 9b0ba5009ea..b6f6dad67e7 100644 --- a/testing/code-oss/APKBUILD +++ b/testing/code-oss/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=code-oss -pkgver=1.88.0 +pkgver=1.89.0 pkgrel=0 # get this from vscodium _productjson=2faafce844f574e1db0a27def376bacad2a15023 @@ -34,7 +34,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/microsoft/vscode/archive/ref no-git.patch no-res.patch.noauto electron21.patch - webpack-hash.patch.noauto system-electron.patch.noauto no-source-maps.patch " @@ -63,7 +62,6 @@ prepare() { yarn install --cache-folder "$srcdir" --frozen-lockfile - patch -Np1 < "$srcdir"/webpack-hash.patch.noauto patch -Np1 < "$srcdir"/no-res.patch.noauto patch -Np1 < "$srcdir"/system-electron.patch.noauto @@ -147,14 +145,13 @@ package() { } sha512sums=" -62617506f0b28d75329eed12041ad81813d14468d42686f4efab0bdf5a9c1c72ca8f094d43992dbf1a4319c112eddfb96ed0a6455d5c23f24cd4dd3dfeb6c012 code-oss-1.88.0.tar.gz +120178cabda6a22c87e989e15617a69d1665795a7796e1dea234455b235824b751ef45827522304ffa9813fe585b49985eb7011eaccd06b7e27e490691f25bb7 code-oss-1.89.0.tar.gz c46cdcad59d796ea91492ee763897baaf36f7329126d6fd8f6bb782aaefeeba9ddf79c877ab8c22ad1f2194fee5b57b998b81ff994f714d36fc0759da8905ce2 product-2faafce844f574e1db0a27def376bacad2a15023.json cca94a1762eec922b6fc4a93301087588455a82ea0e19733cb1067deec1fc64e05d466613860820d680dd8cf16e2aca30bc11afc84a315de1a9c2cb12854cbea launcher 9f36c7fa6f0fd6a516f8e22c47f53013337985e59085bf1ea70165d42a513a92aa2a7a99ef0715e752c7190fd39ba703d405838e61bcfb60cabe47c421781eb4 enable-extensions.patch 4f10b14aaab71e69652662dea0dd5ba00d996282bc864743210185d93a9b7c54c71942fe1e7cd630abd914e3c770eca6c2110c13fb6a8c5e728c5172d1d0cd9f no-git.patch 48e46bd2ec1490e456a9227c4d74eae5e5c6a7e48a98f8f463370bf60eb7fcb140337e3e02577dea1eabbc48174e2e3b31a4717a945d5dc21ccdbfd3a9807349 no-res.patch.noauto 050bcf858362836ad71ae204a50ce61eb1d512ae29778bff4f1f162a8650892e4a9d44295319d8142126a49a8fa1e6b306429c74a7448077051d479f04c19a93 electron21.patch -0939ed0e39883b27ac13cdde2e1dbce506043997b6b52610d1f75560db58bac646d6f8fd6b909e8ad595aab6ed9f3777206e33d7fa5a58e0a7acc4c530b5d6b0 webpack-hash.patch.noauto 7808076aff7037369c9dd40ee07374311a954be513ae08b4c152ff04cbd6fc20ab9e9799e0b62da91135084f98dc55fbe0b593f4a263c30dd12fd88d680f3db0 system-electron.patch.noauto 20310187474b13bb0d4a7d39cdd93cdb005bf241110da0b02c4fa0927363fe8ea566dd259ce767ceffab771806f3365c209e401f1a3435361582bbedb525c5c7 no-source-maps.patch " diff --git a/testing/code-oss/webpack-hash.patch.noauto b/testing/code-oss/webpack-hash.patch.noauto deleted file mode 100644 index 7b4e1f85dc3..00000000000 --- a/testing/code-oss/webpack-hash.patch.noauto +++ /dev/null @@ -1,11 +0,0 @@ ---- a/node_modules/webpack/lib/util/createHash.js -+++ b/node_modules/webpack/lib/util/createHash.js -@@ -142,7 +142,7 @@ - default: - if (crypto === undefined) crypto = require("crypto"); - return new BulkUpdateDecorator( -- () => crypto.createHash(algorithm), -+ () => crypto.createHash("sha1"), - algorithm - ); - } diff --git a/testing/codeberg-cli/APKBUILD b/testing/codeberg-cli/APKBUILD index f1c8697861e..1567e4fdebe 100644 --- a/testing/codeberg-cli/APKBUILD +++ b/testing/codeberg-cli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=codeberg-cli -pkgver=0.3.5 +pkgver=0.4.0 pkgrel=0 pkgdesc="CLI Tool for Codeberg similar to gh and glab" url="https://codeberg.org/RobWalt/codeberg-cli" @@ -43,5 +43,5 @@ package() { } sha512sums=" -cd22faee4d2fca78dcdee857112dd5cd8c03f314266a8ddaabddb4fcc054688fe1d3b679c904b84a40356b1404893e7999f0ddb651efcdfdc83c93cf512e5ce2 codeberg-cli-0.3.5.tar.gz +8913d407ec8618984f8373553ab917fd78c73d1a202fc10eda14ba5cb13153f7a4bd1f615074fa52b229af71fcf6a3c12af8ec8d4de58fda5d50a9082c4e3580 codeberg-cli-0.4.0.tar.gz " diff --git a/testing/coin/APKBUILD b/testing/coin/APKBUILD index 782df0b027f..7881fd9d021 100644 --- a/testing/coin/APKBUILD +++ b/testing/coin/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=coin pkgver=4.0.0 -pkgrel=5 +pkgrel=6 pkgdesc="OpenGL OpenInventor compatible graphics library" url="https://github.com/coin3d/coin" license="BSD-3-Clause" diff --git a/testing/compiz/APKBUILD b/testing/compiz/APKBUILD index 7032b592eec..6dda64466c0 100644 --- a/testing/compiz/APKBUILD +++ b/testing/compiz/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: leso-kn <info@lesosoftware.com> pkgname=compiz pkgver=0.9.14.2 -pkgrel=3 +pkgrel=4 pkgdesc="OpenGL window and compositing manager" url="http://www.compiz.org/" arch="all" diff --git a/testing/conduit/APKBUILD b/testing/conduit/APKBUILD index 5ff2795eba7..d2b2ab2d7ce 100644 --- a/testing/conduit/APKBUILD +++ b/testing/conduit/APKBUILD @@ -1,20 +1,19 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=conduit -pkgver=0.6.0 -pkgrel=2 +pkgver=0.7.0 +pkgrel=0 pkgdesc="Simple, fast and reliable chat server powered by Matrix" url="https://conduit.rs/" -# ring-rs -arch="all !ppc64le !s390x" +arch="all !s390x" # nix license="Apache-2.0" makedepends="cargo sqlite-dev cargo-auditable clang17-libclang rocksdb-dev snappy-dev" install="$pkgname.pre-install" subpackages="$pkgname-openrc" source="https://gitlab.com/famedly/conduit/-/archive/v$pkgver/conduit-v$pkgver.tar.gz https://github.com/leso-kn/ring/archive/refs/heads/riscv64-support-0.16.20-compat.tar.gz - riscv64-ring.patch.noauto system-sqlite.patch + downgrade-rocksdb.patch conduit.toml conduit.initd @@ -30,12 +29,6 @@ export SNAPPY_LIB_DIR="/usr/lib/" prepare() { default_prepare - case "$CARCH" in - riscv64) - # patch out ring dependency for riscv64, upstream investigating - patch -p1 -i "$srcdir"/riscv64-ring.patch.noauto - ;; - esac cargo fetch --target="$CTARGET" --locked } @@ -56,11 +49,11 @@ package() { } sha512sums=" -a8267f59ef829a7d3e6f528c9b4487993c7d3c930d6849254c3acf6547b041bceb5435572d937c7b98456f0379673c468528ff49ba5a6bef7590679ab9077c32 conduit-v0.6.0.tar.gz +8a5bd0ac7600ef5051c29a91fb8edc8abf651eff2eff6eeec75f3edaf5ee2ad40afaf297e99cbc28e75b87f89656fda536402194cb2a2f0e2b96dec10a225798 conduit-v0.7.0.tar.gz a68b9cbf701350c4e77f67f2e979180a9926895debc56764f3376cb6bcc390e310e8fcdd7fb5dc22423d41f65b129b119014400b5365a1b00422a0f0133f887f riscv64-support-0.16.20-compat.tar.gz -7658cc65aa20c913b077287da7bd913b4dba2feedfcc2c420c8e6685dec573bc764bd82825b222daf042e01138f4207c05c11f97f53e9d9efa0ff51bf2b3cec6 riscv64-ring.patch.noauto 7bc072043ebedd74ff8805c8b478ecc35f42e81a53d6b2c13d9d8568ad27b64b992d4a9bab9a6ced253971bbd4922f4da814cf2decdf253a2f5a078ced55f834 system-sqlite.patch -9b77f8934f79215a98c41a859c2b875fd9ee7b618c84316b6be849cb0998ceebcbb3dcbb9b834bda74c32d46722140c3320abd8744c59fe2023fb273c29edc5f conduit.toml +95b0c587902d0b83206154cebe55c73a7bdb91155f743df44f5fc503d2a3455e09ce471999637f6c9981418ff72bf2f150abc78ba5997ef28ff352b80479f9cd downgrade-rocksdb.patch +35600dd6a6c3700c6de44a3f364b08873f660c4798bff1241feeca70f7d63d5b36c0697b103e380ff0d1d8e26caf3464ad2c71902cfde465e5a128bf8cff2179 conduit.toml be411bc3447d684c546249e6fe6573d1c7798c7dfc148564b00b60026592eafa66dec4289a2d336656291ba1b915dd8b1e4df632de44a0ec0b3ad7d971ab062f conduit.initd 8769e2feb4e0db08d7c6861a9d9110db8b846a496086f697080fda7270c97b506cbb10326cf708cdeab5eda68ec93a5ad86db4db5b9b0ebc189e6a5cefacf3a1 conduit.confd " diff --git a/testing/conduit/conduit.toml b/testing/conduit/conduit.toml index 5b5dfcbb28b..5fa06cd829a 100644 --- a/testing/conduit/conduit.toml +++ b/testing/conduit/conduit.toml @@ -31,6 +31,12 @@ max_request_size = 20_000_000 # in bytes # Enables registration. If set to false, no users can register on this server. allow_registration = true +# A static registration token that new users will have to provide when creating +# an account. YOU NEED TO EDIT THIS. +# - Insert a password that users will have to enter on registration +# - Start the line with '#' to remove the condition +registration_token = "" + allow_federation = true allow_check_for_updates = false @@ -44,7 +50,11 @@ enable_lightning_bolt = true trusted_servers = ["matrix.org"] #max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time -#log = "warn,state_res=warn,rocket=off,_=off,sled=off" + +# Controls the log verbosity. See also [here][0]. +# +# [0]: https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html#directives +#log = "..." address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy #address = "0.0.0.0" # If Conduit is running in a container, make sure the reverse proxy (ie. Traefik) can reach it. diff --git a/testing/conduit/downgrade-rocksdb.patch b/testing/conduit/downgrade-rocksdb.patch new file mode 100644 index 00000000000..8e3d0752631 --- /dev/null +++ b/testing/conduit/downgrade-rocksdb.patch @@ -0,0 +1,1572 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 6e870c0..702c9ec 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + + [[package]] + name = "ahash" +-version = "0.8.11" ++version = "0.8.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" ++checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" + dependencies = [ + "cfg-if", + "once_cell", +@@ -46,15 +46,15 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + + [[package]] + name = "anstyle" +-version = "1.0.6" ++version = "1.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" ++checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" + + [[package]] + name = "arc-swap" +-version = "1.7.0" ++version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" ++checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + + [[package]] + name = "arrayref" +@@ -88,7 +88,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + ] + + [[package]] +@@ -204,22 +204,23 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + + [[package]] + name = "bindgen" +-version = "0.69.4" ++version = "0.65.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" ++checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" + dependencies = [ +- "bitflags 2.4.2", ++ "bitflags 1.3.2", + "cexpr", + "clang-sys", +- "itertools 0.12.1", + "lazy_static", + "lazycell", ++ "peeking_take_while", ++ "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", +- "syn 2.0.52", ++ "syn 2.0.48", + ] + + [[package]] +@@ -256,15 +257,15 @@ dependencies = [ + + [[package]] + name = "bumpalo" +-version = "3.15.4" ++version = "3.14.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" ++checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + + [[package]] + name = "bytemuck" +-version = "1.15.0" ++version = "1.14.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" ++checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" + + [[package]] + name = "byteorder" +@@ -291,9 +292,9 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.0.90" ++version = "1.0.83" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" ++checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" + dependencies = [ + "jobserver", + "libc", +@@ -314,12 +315,6 @@ version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +-[[package]] +-name = "cfg_aliases" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +- + [[package]] + name = "clang-sys" + version = "1.7.0" +@@ -333,9 +328,9 @@ dependencies = [ + + [[package]] + name = "clap" +-version = "4.5.2" ++version = "4.4.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" ++checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" + dependencies = [ + "clap_builder", + "clap_derive", +@@ -343,9 +338,9 @@ dependencies = [ + + [[package]] + name = "clap_builder" +-version = "4.5.2" ++version = "4.4.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" ++checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" + dependencies = [ + "anstyle", + "clap_lex", +@@ -353,21 +348,21 @@ dependencies = [ + + [[package]] + name = "clap_derive" +-version = "4.5.0" ++version = "4.4.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" ++checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" + dependencies = [ + "heck", + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + ] + + [[package]] + name = "clap_lex" +-version = "0.7.0" ++version = "0.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" ++checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + + [[package]] + name = "color_quant" +@@ -405,10 +400,10 @@ dependencies = [ + "regex", + "reqwest", + "ring", ++ "rocksdb", + "ruma", + "rusqlite", + "rust-argon2", +- "rust-rocksdb", + "sd-notify", + "serde", + "serde_html_form", +@@ -490,18 +485,18 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + + [[package]] + name = "crc32fast" +-version = "1.4.0" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" ++checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" + dependencies = [ + "cfg-if", + ] + + [[package]] + name = "crossbeam-channel" +-version = "0.5.12" ++version = "0.5.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" ++checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" + dependencies = [ + "crossbeam-utils", + ] +@@ -524,9 +519,9 @@ dependencies = [ + + [[package]] + name = "curve25519-dalek" +-version = "4.1.2" ++version = "4.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" ++checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" + dependencies = [ + "cfg-if", + "cpufeatures", +@@ -547,7 +542,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + ] + + [[package]] +@@ -631,9 +626,9 @@ dependencies = [ + + [[package]] + name = "ed25519-dalek" +-version = "2.1.1" ++version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" ++checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" + dependencies = [ + "curve25519-dalek", + "ed25519", +@@ -646,9 +641,9 @@ dependencies = [ + + [[package]] + name = "either" +-version = "1.10.0" ++version = "1.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" ++checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + + [[package]] + name = "encoding_rs" +@@ -700,9 +695,9 @@ dependencies = [ + + [[package]] + name = "fiat-crypto" +-version = "0.2.6" ++version = "0.2.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" ++checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" + + [[package]] + name = "figment" +@@ -809,7 +804,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + ] + + [[package]] +@@ -867,9 +862,9 @@ dependencies = [ + + [[package]] + name = "gif" +-version = "0.13.1" ++version = "0.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" ++checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" + dependencies = [ + "color_quant", + "weezl", +@@ -899,7 +894,7 @@ dependencies = [ + "futures-sink", + "futures-util", + "http", +- "indexmap 2.2.5", ++ "indexmap 2.2.1", + "slab", + "tokio", + "tokio-util", +@@ -963,9 +958,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + + [[package]] + name = "hermit-abi" +-version = "0.3.9" ++version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" ++checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" + + [[package]] + name = "hmac" +@@ -989,9 +984,9 @@ dependencies = [ + + [[package]] + name = "http" +-version = "0.2.12" ++version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" ++checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" + dependencies = [ + "bytes", + "fnv", +@@ -1088,9 +1083,9 @@ dependencies = [ + + [[package]] + name = "image" +-version = "0.24.9" ++version = "0.24.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" ++checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" + dependencies = [ + "bytemuck", + "byteorder", +@@ -1113,9 +1108,9 @@ dependencies = [ + + [[package]] + name = "indexmap" +-version = "2.2.5" ++version = "2.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" ++checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b" + dependencies = [ + "equivalent", + "hashbrown 0.14.3", +@@ -1161,15 +1156,6 @@ dependencies = [ + "either", + ] + +-[[package]] +-name = "itertools" +-version = "0.12.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +-dependencies = [ +- "either", +-] +- + [[package]] + name = "itoa" + version = "1.0.10" +@@ -1178,9 +1164,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + + [[package]] + name = "jobserver" +-version = "0.1.28" ++version = "0.1.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" ++checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" + dependencies = [ + "libc", + ] +@@ -1193,9 +1179,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + + [[package]] + name = "js-sys" +-version = "0.3.69" ++version = "0.3.67" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" ++checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" + dependencies = [ + "wasm-bindgen", + ] +@@ -1267,18 +1253,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.152" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + + [[package]] + name = "libloading" +-version = "0.8.3" ++version = "0.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" ++checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" + dependencies = [ + "cfg-if", +- "windows-targets 0.52.4", ++ "windows-sys 0.48.0", + ] + + [[package]] +@@ -1292,6 +1278,22 @@ dependencies = [ + "redox_syscall", + ] + ++[[package]] ++name = "librocksdb-sys" ++version = "0.11.0+8.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" ++dependencies = [ ++ "bindgen", ++ "bzip2-sys", ++ "cc", ++ "glob", ++ "libc", ++ "libz-sys", ++ "lz4-sys", ++ "zstd-sys", ++] ++ + [[package]] + name = "libsqlite3-sys" + version = "0.26.0" +@@ -1300,7 +1300,6 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" + dependencies = [ +- "cc", + "pkg-config", + "vcpkg", + ] +@@ -1311,6 +1310,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" + dependencies = [ ++ "cc", + "pkg-config", + "vcpkg", + ] +@@ -1332,9 +1334,9 @@ dependencies = [ + + [[package]] + name = "log" +-version = "0.4.21" ++version = "0.4.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" ++checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + + [[package]] + name = "lru-cache" +@@ -1408,9 +1410,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + + [[package]] + name = "miniz_oxide" +-version = "0.7.2" ++version = "0.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" ++checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" + dependencies = [ + "adler", + "simd-adler32", +@@ -1418,9 +1420,9 @@ dependencies = [ + + [[package]] + name = "mio" +-version = "0.8.11" ++version = "0.8.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" ++checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" + dependencies = [ + "libc", + "wasi", +@@ -1429,13 +1431,12 @@ dependencies = [ + + [[package]] + name = "nix" +-version = "0.28.0" ++version = "0.27.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" ++checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" + dependencies = [ + "bitflags 2.4.2", + "cfg-if", +- "cfg_aliases", + "libc", + ] + +@@ -1478,18 +1479,19 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + + [[package]] + name = "num-integer" +-version = "0.1.46" ++version = "0.1.45" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" ++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" + dependencies = [ ++ "autocfg", + "num-traits", + ] + + [[package]] + name = "num-traits" +-version = "0.2.18" ++version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" ++checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" + dependencies = [ + "autocfg", + ] +@@ -1663,9 +1665,15 @@ dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + ] + ++[[package]] ++name = "peeking_take_while" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" ++ + [[package]] + name = "pem" + version = "3.0.3" +@@ -1684,9 +1692,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + + [[package]] + name = "persy" +-version = "1.5.0" ++version = "1.4.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9ef4b7250ab3a90ded0e284b2633469c23ef01ea868fe7cbb64e2f0a7d6f6d02" ++checksum = "3cd38c602b23c2f451842d89f27cd5e0d4b292176daf40feeda859c658dcdc76" + dependencies = [ + "crc", + "data-encoding", +@@ -1700,22 +1708,22 @@ dependencies = [ + + [[package]] + name = "pin-project" +-version = "1.1.5" ++version = "1.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" ++checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" + dependencies = [ + "pin-project-internal", + ] + + [[package]] + name = "pin-project-internal" +-version = "1.1.5" ++version = "1.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" ++checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + ] + + [[package]] +@@ -1742,9 +1750,9 @@ dependencies = [ + + [[package]] + name = "pkg-config" +-version = "0.3.30" ++version = "0.3.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" ++checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" + + [[package]] + name = "platforms" +@@ -1754,9 +1762,9 @@ checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" + + [[package]] + name = "png" +-version = "0.17.13" ++version = "0.17.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" ++checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" + dependencies = [ + "bitflags 1.3.2", + "crc32fast", +@@ -1777,21 +1785,30 @@ version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + ++[[package]] ++name = "prettyplease" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" ++dependencies = [ ++ "proc-macro2", ++ "syn 2.0.48", ++] ++ + [[package]] + name = "proc-macro-crate" +-version = "2.0.2" ++version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" ++checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" + dependencies = [ +- "toml_datetime", +- "toml_edit", ++ "toml_edit 0.20.7", + ] + + [[package]] + name = "proc-macro2" +-version = "1.0.79" ++version = "1.0.78" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" ++checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" + dependencies = [ + "unicode-ident", + ] +@@ -1804,7 +1821,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + "version_check", + "yansi", + ] +@@ -1882,7 +1899,7 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" + dependencies = [ + "aho-corasick", + "memchr", +- "regex-automata 0.4.6", ++ "regex-automata 0.4.5", + "regex-syntax 0.8.2", + ] + +@@ -1897,9 +1914,9 @@ dependencies = [ + + [[package]] + name = "regex-automata" +-version = "0.4.6" ++version = "0.4.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" ++checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" + dependencies = [ + "aho-corasick", + "memchr", +@@ -1920,9 +1937,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + + [[package]] + name = "reqwest" +-version = "0.11.26" ++version = "0.11.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" ++checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" + dependencies = [ + "base64", + "bytes", +@@ -1947,7 +1964,6 @@ dependencies = [ + "serde", + "serde_json", + "serde_urlencoded", +- "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls", +@@ -1972,17 +1988,26 @@ dependencies = [ + + [[package]] + name = "ring" +-version = "0.17.8" ++version = "0.17.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" ++checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" + dependencies = [ + "cc", +- "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", +- "windows-sys 0.52.0", ++ "windows-sys 0.48.0", ++] ++ ++[[package]] ++name = "rocksdb" ++version = "0.21.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" ++dependencies = [ ++ "libc", ++ "librocksdb-sys", + ] + + [[package]] +@@ -2045,7 +2070,7 @@ dependencies = [ + "bytes", + "form_urlencoded", + "http", +- "indexmap 2.2.5", ++ "indexmap 2.2.1", + "js_int", + "konst", + "percent-encoding", +@@ -2071,7 +2096,7 @@ version = "0.27.11" + source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" + dependencies = [ + "as_variant", +- "indexmap 2.2.5", ++ "indexmap 2.2.1", + "js_int", + "js_option", + "percent-encoding", +@@ -2129,7 +2154,7 @@ dependencies = [ + "quote", + "ruma-identifiers-validation", + "serde", +- "syn 2.0.52", ++ "syn 2.0.48", + "toml", + ] + +@@ -2166,7 +2191,7 @@ name = "ruma-state-res" + version = "0.10.0" + source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" + dependencies = [ +- "itertools 0.11.0", ++ "itertools", + "js_int", + "ruma-common", + "ruma-events", +@@ -2202,32 +2227,6 @@ dependencies = [ + "crossbeam-utils", + ] + +-[[package]] +-name = "rust-librocksdb-sys" +-version = "0.20.0+9.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "48b14f4848d8574c074bb26445b43e63735d802ef2fc5cc40c1b015134baee0c" +-dependencies = [ +- "bindgen", +- "bzip2-sys", +- "cc", +- "glob", +- "libc", +- "libz-sys", +- "lz4-sys", +- "zstd-sys", +-] +- +-[[package]] +-name = "rust-rocksdb" +-version = "0.24.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d36eae38b1d3d0018e273191f791343bd3eb030d7da63aaa20350e41c0182881" +-dependencies = [ +- "libc", +- "rust-librocksdb-sys", +-] +- + [[package]] + name = "rustc-demangle" + version = "0.1.23" +@@ -2300,9 +2299,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + + [[package]] + name = "ryu" +-version = "1.0.17" ++version = "1.0.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" ++checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + + [[package]] + name = "schannel" +@@ -2360,38 +2359,38 @@ dependencies = [ + + [[package]] + name = "semver" +-version = "1.0.22" ++version = "1.0.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" ++checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" + + [[package]] + name = "serde" +-version = "1.0.197" ++version = "1.0.196" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" ++checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.197" ++version = "1.0.196" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" ++checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + ] + + [[package]] + name = "serde_html_form" +-version = "0.2.5" ++version = "0.2.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "50437e6a58912eecc08865e35ea2e8d365fbb2db0debb1c8bb43bf1faf055f25" ++checksum = "20e1066e1cfa6692a722cf40386a2caec36da5ddc4a2c16df592f0f609677e8c" + dependencies = [ + "form_urlencoded", +- "indexmap 2.2.5", ++ "indexmap 2.2.1", + "itoa", + "ryu", + "serde", +@@ -2399,9 +2398,9 @@ dependencies = [ + + [[package]] + name = "serde_json" +-version = "1.0.114" ++version = "1.0.113" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" ++checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" + dependencies = [ + "itoa", + "ryu", +@@ -2410,9 +2409,9 @@ dependencies = [ + + [[package]] + name = "serde_path_to_error" +-version = "0.1.16" ++version = "0.1.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" ++checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" + dependencies = [ + "itoa", + "serde", +@@ -2441,11 +2440,11 @@ dependencies = [ + + [[package]] + name = "serde_yaml" +-version = "0.9.32" ++version = "0.9.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" ++checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" + dependencies = [ +- "indexmap 2.2.5", ++ "indexmap 2.2.1", + "itoa", + "ryu", + "serde", +@@ -2553,12 +2552,12 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + + [[package]] + name = "socket2" +-version = "0.5.6" ++version = "0.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" ++checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" + dependencies = [ + "libc", +- "windows-sys 0.52.0", ++ "windows-sys 0.48.0", + ] + + [[package]] +@@ -2605,9 +2604,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.52" ++version = "2.0.48" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" ++checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" + dependencies = [ + "proc-macro2", + "quote", +@@ -2643,29 +2642,29 @@ dependencies = [ + + [[package]] + name = "thiserror" +-version = "1.0.58" ++version = "1.0.56" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" ++checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.58" ++version = "1.0.56" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" ++checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + ] + + [[package]] + name = "thread_local" +-version = "1.1.8" ++version = "1.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" ++checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" + dependencies = [ + "cfg-if", + "once_cell", +@@ -2726,9 +2725,9 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.34" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", +@@ -2747,9 +2746,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.17" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ + "num-conv", + "time-core", +@@ -2772,9 +2771,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + + [[package]] + name = "tokio" +-version = "1.36.0" ++version = "1.35.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" ++checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" + dependencies = [ + "backtrace", + "bytes", +@@ -2796,7 +2795,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + ] + + [[package]] +@@ -2848,32 +2847,43 @@ dependencies = [ + + [[package]] + name = "toml" +-version = "0.8.2" ++version = "0.8.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" ++checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" + dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", +- "toml_edit", ++ "toml_edit 0.21.0", + ] + + [[package]] + name = "toml_datetime" +-version = "0.6.3" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" ++checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + dependencies = [ + "serde", + ] + + [[package]] + name = "toml_edit" +-version = "0.20.2" ++version = "0.20.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" ++checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" + dependencies = [ +- "indexmap 2.2.5", ++ "indexmap 2.2.1", ++ "toml_datetime", ++ "winnow", ++] ++ ++[[package]] ++name = "toml_edit" ++version = "0.21.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" ++dependencies = [ ++ "indexmap 2.2.1", + "serde", + "serde_spanned", + "toml_datetime", +@@ -2947,7 +2957,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + ] + + [[package]] +@@ -3120,9 +3130,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + + [[package]] + name = "unicode-normalization" +-version = "0.1.23" ++version = "0.1.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" ++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" + dependencies = [ + "tinyvec", + ] +@@ -3135,9 +3145,9 @@ checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" + + [[package]] + name = "unsigned-varint" +-version = "0.8.0" ++version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" ++checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" + + [[package]] + name = "untrusted" +@@ -3200,9 +3210,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.92" ++version = "0.2.90" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" ++checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" + dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +@@ -3210,24 +3220,24 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.92" ++version = "0.2.90" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" ++checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" + dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-futures" +-version = "0.4.42" ++version = "0.4.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" ++checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" + dependencies = [ + "cfg-if", + "js-sys", +@@ -3237,9 +3247,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.92" ++version = "0.2.90" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" ++checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -3247,28 +3257,28 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.92" ++version = "0.2.90" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" ++checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.92" ++version = "0.2.90" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" ++checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" + + [[package]] + name = "web-sys" +-version = "0.3.69" ++version = "0.3.67" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" ++checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" + dependencies = [ + "js-sys", + "wasm-bindgen", +@@ -3298,9 +3308,9 @@ checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + + [[package]] + name = "wildmatch" +-version = "2.3.1" ++version = "2.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "017f0a8ed8331210d91b7a4c30d4edef8f21a65c02f2540496e2e79725f6d8a8" ++checksum = "495ec47bf3c1345005f40724f0269362c8556cbc43aed0526ed44cae1d35fceb" + + [[package]] + name = "winapi" +@@ -3339,7 +3349,7 @@ version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" + dependencies = [ +- "windows-targets 0.52.4", ++ "windows-targets 0.52.0", + ] + + [[package]] +@@ -3359,17 +3369,17 @@ dependencies = [ + + [[package]] + name = "windows-targets" +-version = "0.52.4" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" ++checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" + dependencies = [ +- "windows_aarch64_gnullvm 0.52.4", +- "windows_aarch64_msvc 0.52.4", +- "windows_i686_gnu 0.52.4", +- "windows_i686_msvc 0.52.4", +- "windows_x86_64_gnu 0.52.4", +- "windows_x86_64_gnullvm 0.52.4", +- "windows_x86_64_msvc 0.52.4", ++ "windows_aarch64_gnullvm 0.52.0", ++ "windows_aarch64_msvc 0.52.0", ++ "windows_i686_gnu 0.52.0", ++ "windows_i686_msvc 0.52.0", ++ "windows_x86_64_gnu 0.52.0", ++ "windows_x86_64_gnullvm 0.52.0", ++ "windows_x86_64_msvc 0.52.0", + ] + + [[package]] +@@ -3380,9 +3390,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + + [[package]] + name = "windows_aarch64_gnullvm" +-version = "0.52.4" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" ++checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + + [[package]] + name = "windows_aarch64_msvc" +@@ -3392,9 +3402,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + + [[package]] + name = "windows_aarch64_msvc" +-version = "0.52.4" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" ++checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + + [[package]] + name = "windows_i686_gnu" +@@ -3404,9 +3414,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + + [[package]] + name = "windows_i686_gnu" +-version = "0.52.4" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" ++checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + + [[package]] + name = "windows_i686_msvc" +@@ -3416,9 +3426,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + + [[package]] + name = "windows_i686_msvc" +-version = "0.52.4" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" ++checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + + [[package]] + name = "windows_x86_64_gnu" +@@ -3428,9 +3438,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + + [[package]] + name = "windows_x86_64_gnu" +-version = "0.52.4" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" ++checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + + [[package]] + name = "windows_x86_64_gnullvm" +@@ -3440,9 +3450,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + + [[package]] + name = "windows_x86_64_gnullvm" +-version = "0.52.4" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" ++checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + + [[package]] + name = "windows_x86_64_msvc" +@@ -3452,15 +3462,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + + [[package]] + name = "windows_x86_64_msvc" +-version = "0.52.4" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" ++checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + + [[package]] + name = "winnow" +-version = "0.5.40" ++version = "0.5.35" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" ++checksum = "1931d78a9c73861da0134f453bb1f790ce49b2e30eba8410b4b79bac72b46a2d" + dependencies = [ + "memchr", + ] +@@ -3477,9 +3487,9 @@ dependencies = [ + + [[package]] + name = "yansi" +-version = "1.0.1" ++version = "1.0.0-rc.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" ++checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377" + + [[package]] + name = "zerocopy" +@@ -3498,7 +3508,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.52", ++ "syn 2.0.48", + ] + + [[package]] +diff --git a/Cargo.toml b/Cargo.toml +index cc5b37e..affd704 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -97,6 +97,8 @@ threadpool = "1.8.1" + # Used for ruma wrapper + serde_html_form = "0.2.0" + ++rocksdb = { version = "0.21.0", default-features = true, features = ["multi-threaded-cf", "zstd", "lz4"], optional = true } ++ + thread_local = "1.1.7" + # used for TURN server authentication + hmac = "0.12.1" +@@ -114,18 +116,8 @@ async-trait = "0.1.68" + + sd-notify = { version = "0.4.1", optional = true } + +-[dependencies.rocksdb] +-package = "rust-rocksdb" +-version = "0.24.0" +-optional = true +-features = [ +- "multi-threaded-cf", +- "zstd", +- "lz4", +-] +- + [target.'cfg(unix)'.dependencies] +-nix = { version = "0.28", features = ["resource"] } ++nix = { version = "0.27", features = ["resource"] } + + [features] + default = ["conduit_bin", "backend_sqlite", "backend_rocksdb", "systemd"] +diff --git a/flake.nix b/flake.nix +index 114e221..5a4568b 100644 +--- a/flake.nix ++++ b/flake.nix +@@ -53,24 +53,10 @@ + pkgs.pkgsBuildHost.rustPlatform.bindgenHook + ]; + +- rocksdb' = pkgs: +- let +- version = "9.1.0"; +- in +- pkgs.rocksdb.overrideAttrs (old: { +- inherit version; +- src = pkgs.fetchFromGitHub { +- owner = "facebook"; +- repo = "rocksdb"; +- rev = "v${version}"; +- hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8="; +- }; +- }); +- + env = pkgs: { + CONDUIT_VERSION_EXTRA = self.shortRev or self.dirtyShortRev; +- ROCKSDB_INCLUDE_DIR = "${rocksdb' pkgs}/include"; +- ROCKSDB_LIB_DIR = "${rocksdb' pkgs}/lib"; ++ ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb}/include"; ++ ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib"; + } + // pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isStatic { + ROCKSDB_STATIC = ""; +diff --git a/src/database/abstraction/rocksdb.rs b/src/database/abstraction/rocksdb.rs +index 447ee03..7a93d78 100644 +--- a/src/database/abstraction/rocksdb.rs ++++ b/src/database/abstraction/rocksdb.rs +@@ -23,23 +23,29 @@ pub struct RocksDbEngineTree<'a> { + fn db_options(max_open_files: i32, rocksdb_cache: &rocksdb::Cache) -> rocksdb::Options { + let mut block_based_options = rocksdb::BlockBasedOptions::default(); + block_based_options.set_block_cache(rocksdb_cache); +- block_based_options.set_bloom_filter(10.0, false); ++ ++ // "Difference of spinning disk" ++ // https://zhangyuchi.gitbooks.io/rocksdbbook/content/RocksDB-Tuning-Guide.html + block_based_options.set_block_size(4 * 1024); + block_based_options.set_cache_index_and_filter_blocks(true); +- block_based_options.set_pin_l0_filter_and_index_blocks_in_cache(true); +- block_based_options.set_optimize_filters_for_memory(true); + + let mut db_opts = rocksdb::Options::default(); + db_opts.set_block_based_table_factory(&block_based_options); ++ db_opts.set_optimize_filters_for_hits(true); ++ db_opts.set_skip_stats_update_on_db_open(true); ++ db_opts.set_level_compaction_dynamic_level_bytes(true); ++ db_opts.set_target_file_size_base(256 * 1024 * 1024); ++ //db_opts.set_compaction_readahead_size(2 * 1024 * 1024); ++ //db_opts.set_use_direct_reads(true); ++ //db_opts.set_use_direct_io_for_flush_and_compaction(true); + db_opts.create_if_missing(true); + db_opts.increase_parallelism(num_cpus::get() as i32); + db_opts.set_max_open_files(max_open_files); +- db_opts.set_compression_type(rocksdb::DBCompressionType::Lz4); +- db_opts.set_bottommost_compression_type(rocksdb::DBCompressionType::Zstd); ++ db_opts.set_compression_type(rocksdb::DBCompressionType::Zstd); + db_opts.set_compaction_style(rocksdb::DBCompactionStyle::Level); ++ db_opts.optimize_level_style_compaction(10 * 1024 * 1024); + + // https://github.com/facebook/rocksdb/wiki/Setup-Options-and-Basic-Tuning +- db_opts.set_level_compaction_dynamic_level_bytes(true); + db_opts.set_max_background_jobs(6); + db_opts.set_bytes_per_sync(1048576); + +@@ -53,6 +59,9 @@ fn db_options(max_open_files: i32, rocksdb_cache: &rocksdb::Cache) -> rocksdb::O + // restored via federation. + db_opts.set_wal_recovery_mode(rocksdb::DBRecoveryMode::TolerateCorruptedTailRecords); + ++ let prefix_extractor = rocksdb::SliceTransform::create_fixed_prefix(1); ++ db_opts.set_prefix_extractor(prefix_extractor); ++ + db_opts + } + +@@ -138,17 +147,12 @@ impl RocksDbEngineTree<'_> { + + impl KvTree for RocksDbEngineTree<'_> { + fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> { +- let readoptions = rocksdb::ReadOptions::default(); +- +- Ok(self.db.rocks.get_cf_opt(&self.cf(), key, &readoptions)?) ++ Ok(self.db.rocks.get_cf(&self.cf(), key)?) + } + + fn insert(&self, key: &[u8], value: &[u8]) -> Result<()> { +- let writeoptions = rocksdb::WriteOptions::default(); + let lock = self.write_lock.read().unwrap(); +- self.db +- .rocks +- .put_cf_opt(&self.cf(), key, value, &writeoptions)?; ++ self.db.rocks.put_cf(&self.cf(), key, value)?; + drop(lock); + + self.watchers.wake(key); +@@ -157,31 +161,22 @@ impl KvTree for RocksDbEngineTree<'_> { + } + + fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> { +- let writeoptions = rocksdb::WriteOptions::default(); + for (key, value) in iter { +- self.db +- .rocks +- .put_cf_opt(&self.cf(), key, value, &writeoptions)?; ++ self.db.rocks.put_cf(&self.cf(), key, value)?; + } + + Ok(()) + } + + fn remove(&self, key: &[u8]) -> Result<()> { +- let writeoptions = rocksdb::WriteOptions::default(); +- Ok(self +- .db +- .rocks +- .delete_cf_opt(&self.cf(), key, &writeoptions)?) ++ Ok(self.db.rocks.delete_cf(&self.cf(), key)?) + } + + fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> { +- let readoptions = rocksdb::ReadOptions::default(); +- + Box::new( + self.db + .rocks +- .iterator_cf_opt(&self.cf(), readoptions, rocksdb::IteratorMode::Start) ++ .iterator_cf(&self.cf(), rocksdb::IteratorMode::Start) + .map(|r| r.unwrap()) + .map(|(k, v)| (Vec::from(k), Vec::from(v))), + ) +@@ -192,14 +187,11 @@ impl KvTree for RocksDbEngineTree<'_> { + from: &[u8], + backwards: bool, + ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> { +- let readoptions = rocksdb::ReadOptions::default(); +- + Box::new( + self.db + .rocks +- .iterator_cf_opt( ++ .iterator_cf( + &self.cf(), +- readoptions, + rocksdb::IteratorMode::From( + from, + if backwards { +@@ -215,33 +207,23 @@ impl KvTree for RocksDbEngineTree<'_> { + } + + fn increment(&self, key: &[u8]) -> Result<Vec<u8>> { +- let readoptions = rocksdb::ReadOptions::default(); +- let writeoptions = rocksdb::WriteOptions::default(); +- + let lock = self.write_lock.write().unwrap(); + +- let old = self.db.rocks.get_cf_opt(&self.cf(), key, &readoptions)?; ++ let old = self.db.rocks.get_cf(&self.cf(), key)?; + let new = utils::increment(old.as_deref()).unwrap(); +- self.db +- .rocks +- .put_cf_opt(&self.cf(), key, &new, &writeoptions)?; ++ self.db.rocks.put_cf(&self.cf(), key, &new)?; + + drop(lock); + Ok(new) + } + + fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> { +- let readoptions = rocksdb::ReadOptions::default(); +- let writeoptions = rocksdb::WriteOptions::default(); +- + let lock = self.write_lock.write().unwrap(); + + for key in iter { +- let old = self.db.rocks.get_cf_opt(&self.cf(), &key, &readoptions)?; ++ let old = self.db.rocks.get_cf(&self.cf(), &key)?; + let new = utils::increment(old.as_deref()).unwrap(); +- self.db +- .rocks +- .put_cf_opt(&self.cf(), key, new, &writeoptions)?; ++ self.db.rocks.put_cf(&self.cf(), key, new)?; + } + + drop(lock); +@@ -253,14 +235,11 @@ impl KvTree for RocksDbEngineTree<'_> { + &'a self, + prefix: Vec<u8>, + ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> { +- let readoptions = rocksdb::ReadOptions::default(); +- + Box::new( + self.db + .rocks +- .iterator_cf_opt( ++ .iterator_cf( + &self.cf(), +- readoptions, + rocksdb::IteratorMode::From(&prefix, rocksdb::Direction::Forward), + ) + .map(|r| r.unwrap()) diff --git a/testing/conduit/riscv64-ring.patch.noauto b/testing/conduit/riscv64-ring.patch.noauto deleted file mode 100644 index 86b51b8147a..00000000000 --- a/testing/conduit/riscv64-ring.patch.noauto +++ /dev/null @@ -1,52 +0,0 @@ -Required for riscv64 build. - -Upstream conduit needs to upgrade to patched versions of ring (done). -This patch can be removed once conduit releases a new version that builds against the patched version of the two library. - -diff --git a/Cargo.toml b/Cargo.toml -index 13ea007..03e7a30 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -17,6 +17,9 @@ rust-version = "1.70.0" - - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -+[patch.crates-io] -+ring = { path = "../ring-riscv64-support-0.16.20-compat" } -+ - [dependencies] - # Web framework - axum = { version = "0.6.18", default-features = false, features = ["form", "headers", "http1", "http2", "json", "matched-path"], optional = true } -diff --git a/Cargo.lock b/Cargo.lock -index 35a4208..17b7e9a 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2114,15 +2113,12 @@ dependencies = [ - [[package]] - name = "ring" - version = "0.16.20" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" - dependencies = [ - "cc", -+ "getrandom 0.2.10", - "libc", -- "once_cell", - "spin", - "untrusted", -- "web-sys", - "winapi", - ] - -@@ -2676,9 +2672,9 @@ dependencies = [ - - [[package]] - name = "spin" --version = "0.5.2" -+version = "0.9.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - - [[package]] - name = "spki" diff --git a/testing/cpu-x/APKBUILD b/testing/cpu-x/APKBUILD index 02247b8b1a7..842b1825bef 100644 --- a/testing/cpu-x/APKBUILD +++ b/testing/cpu-x/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Díaz Urbaneja Diego <sodomon2@gmail.com> # Maintainer: Díaz Urbaneja Diego <sodomon2@gmail.com> pkgname=cpu-x -pkgver=5.0.3 +pkgver=5.0.4 pkgrel=0 pkgdesc="CPU-X is a system profiling and monitoring application (similar to CPU-Z)" url="https://thetumultuousunicornofdarkness.github.io/CPU-X/" @@ -59,6 +59,6 @@ package() { } sha512sums=" -d9a29a5303101a6c00d9145265d85acec865833f175246bde550ba2dff24a924c1b2de7579b3d8e20aa163092d269af9bbb24e073585d3e18a2c726e48d9be41 cpu-x-5.0.3.tar.gz +134f8a8fe6782279f7288d891a66b3d426b0e173de3d5445367c94029aa9d33348d037f5bca25690aff16f00d261777a71de6847991e564578099b03ff398453 cpu-x-5.0.4.tar.gz 96f0e100a2ca2898b014ca5f52937a2de041743777fbf318e2d3f82240e9fe40106d295c2ce80478e1540ed35c96a98c70acd1549b89daae44f6d9ff88251734 no-bracktrace.patch " diff --git a/testing/create-tauri-app/APKBUILD b/testing/create-tauri-app/APKBUILD index 91a2594e182..f427dd6bce4 100644 --- a/testing/create-tauri-app/APKBUILD +++ b/testing/create-tauri-app/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=create-tauri-app -pkgver=3.13.17 +pkgver=3.14.0 pkgrel=0 pkgdesc="Build tool for Leptos" url="https://tauri.app" @@ -39,5 +39,5 @@ package() { } sha512sums=" -404446367f0de92837f4f43cb591f363363bd7d7345feecebb106db4579279c352a573915dcbf33748979b57c3567171d65c5c91e616b1d7ae8c8b74bc8eadcb create-tauri-app-3.13.17.tar.gz +d7afae650b09c5b79868d6f1b43977c9379af7aef1acddb33346090324f8da3afdc7a20909d969d1ccc50d2632c8bf07bfccd60a47c0c3aa0d03adf8052fb984 create-tauri-app-3.14.0.tar.gz " diff --git a/testing/criu/APKBUILD b/testing/criu/APKBUILD index 4492f1e2762..81961c6c268 100644 --- a/testing/criu/APKBUILD +++ b/testing/criu/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=criu pkgver=3.19 -pkgrel=0 +pkgrel=1 pkgdesc="Process tree checkpoint/restore utility" url="https://criu.org" arch="x86_64" diff --git a/testing/dapr-cli/APKBUILD b/testing/dapr-cli/APKBUILD deleted file mode 100644 index adf45d3bb01..00000000000 --- a/testing/dapr-cli/APKBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> -pkgname=dapr-cli -pkgver=1.12.0 -# API version described in https://docs.dapr.io/reference/api/ -_runtimever=1.0 -pkgrel=2 -pkgdesc="CLI tool for Dapr the portable, event-driven runtime to build distributed applications" -url="https://dapr.io/" -# 32-bit: not useful -arch="all !x86 !armhf !armv7" -license="Apache-2.0" -makedepends="go" -subpackages=" - $pkgname-bash-completion - $pkgname-fish-completion - $pkgname-zsh-completion - " -source="$pkgname-$pkgver.tar.gz::https://github.com/dapr/cli/archive/refs/tags/v$pkgver.tar.gz" -builddir="$srcdir/cli-$pkgver" - -build() { - local _goldflags=" - -X main.version=$pkgver - -X main.apiVersion=$_runtimever - -X github.com/dapr/cli/pkg/standalone.gitversion=0000000 - -X github.com/dapr/cli/pkg/standalone.gitcommit=AlpineLinux - " - - go build -v -ldflags "$_goldflags" -o dapr - - for shell in bash fish zsh; do - ./dapr completion $shell > dapr.$shell - done -} - -check() { - # Avoid integration tests that require a local Docker or Kubernetes instance - go test ./pkg/... -} - -package() { - install -Dm755 dapr -t "$pkgdir"/usr/bin/ - - install -Dm644 dapr.bash \ - "$pkgdir"/usr/share/bash-completion/completions/dapr - install -Dm644 dapr.fish \ - "$pkgdir"/usr/share/fish/vendor_completions.d/dapr.fish - install -Dm644 dapr.zsh \ - "$pkgdir"/usr/share/zsh/site-functions/_dapr -} - -sha512sums=" -766fe23d28172192a5308af13a72db9067a128a56c1658b48cd58c5cef6b458e37cbac4053798aec0fc416871da0f741c9e147aba0efb57292c86db5ad9ccd68 dapr-cli-1.12.0.tar.gz -" diff --git a/testing/darcs/APKBUILD b/testing/darcs/APKBUILD index ecf300fd00e..dd067e16355 100644 --- a/testing/darcs/APKBUILD +++ b/testing/darcs/APKBUILD @@ -1,10 +1,10 @@ # Contributor: gay <gay@disroot.org> -# Maintainer: gay <gay@disroot.org> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=darcs -pkgver=2.16.5 +pkgver=2.18.2 pkgrel=0 pkgdesc="Patch-based revision control system" -url="http://darcs.net" +url="https://darcs.net/" arch="aarch64 x86_64" # limited by ghc license="GPL-2.0-or-later" makedepends="cabal ghc curl-dev ncurses-dev zlib-dev" @@ -12,26 +12,43 @@ makedepends="cabal ghc curl-dev ncurses-dev zlib-dev" options="!check" # tests relying on presence of shell utils fail without giving detailed log subpackages="$pkgname-doc" source="https://hackage.haskell.org/package/darcs-$pkgver/darcs-$pkgver.tar.gz - cabal.config + cabal.project.freeze " -export CABAL_DIR="$srcdir"/cabal +# Directory where cabal files are stored. +export CABAL_DIR="$srcdir/dist" + +# Needed to fix build on aarch64. +export PATH="$PATH:/usr/lib/llvm15/bin" + +cabal_update() { + cd $builddir + cabal v2-update + ( + cd "$builddir" + cabal v2-freeze --shadow-installed-packages + mv cabal.project.freeze "$startdir/" + ) +} prepare() { default_prepare - cp "$srcdir"/cabal.config . - cabal update - cabal configure --prefix=/usr #--test-log=/dev/stdout + ln -sf "$srcdir/cabal.project.freeze" \ + "$builddir/cabal.project.freeze" } build() { - cabal build --jobs=${JOBS:-1} --enable-relocatable + cabal v2-update + cabal v2-build darcs:exes \ + --jobs=${JOBS:-1} \ + --prefix=/usr \ + --docdir=/usr/share/doc/$pkgname \ + --sysconfdir=/etc } -#check() { -# ulimit -n 4096 -# cabal test -#} +check() { + cabal test +} package() { cd dist-newstyle/build/*-linux/ghc-*/$pkgname-$pkgver/build/$pkgname @@ -40,6 +57,6 @@ package() { } sha512sums=" -9116043943315417ff314197f6a143435b5545f614c6e6210c3645987a68c69c31f53f823ee5269cb663ccba393f8caf1834120783f15128e43b132c731a0edb darcs-2.16.5.tar.gz -a54c0790e154105f3e96d19289a905b2b3666d61849ad69d6ed81b00a01ea30c7733ead989c02f1f782a95bcc7f0f2dff41ae1ffdd8eb0995fbbd5f54db232d7 cabal.config +f776b3b2efd73e9515a99bf154468aa4aef925d20c9de564a78f7a19bf302db31c6e4cdbca2c2c700a0d5cde1b62a426159554f543898712b1f603401c534a9c darcs-2.18.2.tar.gz +b177b661b37a907db1af30e6f796a5c2f600bc8b19411b3a741b071a45ee257a2371e160ea7c1cc31b07a288f2aa9966a14318ca1c0c0eede6aa11fe81798de9 cabal.project.freeze " diff --git a/testing/darcs/cabal.config b/testing/darcs/cabal.config deleted file mode 100644 index 6e9de3dc671..00000000000 --- a/testing/darcs/cabal.config +++ /dev/null @@ -1,2912 +0,0 @@ -remote-repo: stackage-lts-19.20:http://www.stackage.org/lts-19.20 -constraints: abstract-deque ==0.3, - abstract-deque-tests ==0.3, - abstract-par ==0.3.3, - AC-Angle ==1.0, - acc ==0.2.0.1, - ace ==0.6, - acid-state ==0.16.1.1, - action-permutations ==0.0.0.1, - active ==0.2.0.15, - ad ==4.5.2, - ad-delcont ==0.3.0.0, - adjunctions ==4.4.2, - adler32 ==0.1.2.0, - advent-of-code-api ==0.2.8.1, - aern2-mp ==0.2.10.0, - aern2-real ==0.2.10.0, - aeson ==2.0.3.0, - aeson-attoparsec ==0.0.0, - aeson-better-errors ==0.9.1.1, - aeson-casing ==0.2.0.0, - aeson-commit ==1.4, - aeson-compat ==0.3.10, - aeson-diff ==1.1.0.13, - aeson-extra ==0.5.1.1, - aeson-generic-compat ==0.0.1.3, - aeson-optics ==1.1.1, - aeson-pretty ==0.8.9, - aeson-qq ==0.8.4, - aeson-schemas ==1.3.5.1, - aeson-typescript ==0.3.0.1, - aeson-yak ==0.1.1.3, - aeson-yaml ==1.1.0.1, - Agda ==2.6.2.2, - agda2lagda ==0.2021.6.1, - al ==0.1.4.2, - alarmclock ==0.7.0.6, - alerts ==0.1.2.0, - alex ==3.2.7.1, - alex-meta ==0.3.0.13, - algebra ==4.3.1, - algebraic-graphs ==0.6.1, - align-audio ==0.0, - Allure ==0.11.0.0, - almost-fix ==0.0.2, - alsa-core ==0.5.0.1, - alsa-mixer ==0.3.0, - alsa-pcm ==0.6.1.1, - alsa-seq ==0.6.0.8, - alternative-vector ==0.0.0, - alternators ==1.0.0.0, - ALUT ==2.4.0.3, - amqp ==0.22.1, - amqp-utils ==0.6.3.2, - annotated-wl-pprint ==0.7.0, - ansi-terminal ==0.11.3, - ansi-terminal-game ==1.8.0.0, - ansi-wl-pprint ==0.6.9, - ANum ==0.2.0.2, - apecs ==0.9.4, - apecs-gloss ==0.2.4, - apecs-physics ==0.4.5, - api-field-json-th ==0.1.0.2, - api-maker ==0.1.0.6, - ap-normalize ==0.1.0.1, - appar ==0.1.8, - appendmap ==0.1.5, - apply-refact ==0.9.3.0, - apportionment ==0.0.0.4, - approximate ==0.3.5, - approximate-equality ==1.1.0.2, - app-settings ==0.2.0.12, - arbor-lru-cache ==0.1.1.1, - arithmoi ==0.12.0.2, - array installed, - array-memoize ==0.6.0, - arrow-extras ==0.1.0.1, - arrows ==0.4.4.2, - ascii ==1.1.3.0, - ascii-case ==1.0.0.10, - ascii-char ==1.0.0.14, - asciidiagram ==1.3.3.3, - ascii-group ==1.0.0.12, - ascii-numbers ==1.0.0.0, - ascii-predicates ==1.0.0.10, - ascii-progress ==0.3.3.0, - ascii-superset ==1.0.1.13, - ascii-th ==1.0.0.10, - asn1-encoding ==0.9.6, - asn1-parse ==0.9.5, - asn1-types ==0.3.4, - assert-failure ==0.1.2.6, - assoc ==1.0.2, - astro ==0.4.3.0, - async ==2.2.4, - async-extra ==0.2.0.0, - async-pool ==0.9.1, - async-refresh ==0.3.0.0, - async-refresh-tokens ==0.4.0.0, - atom-basic ==0.2.5, - atom-conduit ==0.9.0.1, - atomic-primops ==0.8.4, - atomic-write ==0.2.0.7, - attoparsec ==0.14.4, - attoparsec-base64 ==0.0.0, - attoparsec-binary ==0.2, - attoparsec-data ==1.0.5.2, - attoparsec-expr ==0.1.1.2, - attoparsec-iso8601 ==1.0.2.1, - attoparsec-path ==0.0.0.1, - attoparsec-time ==1.0.3, - audacity ==0.0.2.1, - aur ==7.0.7, - authenticate ==1.3.5.1, - authenticate-oauth ==1.7, - autoexporter ==2.0.0.1, - auto-update ==0.1.6, - aws-cloudfront-signed-cookies ==0.2.0.10, - aws-xray-client ==0.1.0.2, - aws-xray-client-persistent ==0.1.0.5, - aws-xray-client-wai ==0.1.0.2, - backtracking ==0.1.0, - bank-holidays-england ==0.2.0.7, - barbies ==2.0.3.1, - barrier ==0.1.1, - base installed, - base16 ==0.3.2.0, - base16-bytestring ==1.0.2.0, - base16-lens ==0.1.3.2, - base32 ==0.2.2.0, - base32-lens ==0.1.1.1, - base32string ==0.9.1, - base58-bytestring ==0.1.0, - base58string ==0.10.0, - base64 ==0.4.2.4, - base64-bytestring ==1.2.1.0, - base64-bytestring-type ==1.0.1, - base64-lens ==0.3.1, - base64-string ==0.2, - base-compat ==0.11.2, - base-compat-batteries ==0.11.2, - basement ==0.0.15, - base-orphans ==0.8.7, - base-prelude ==1.6.1, - base-unicode-symbols ==0.2.4.2, - basic-prelude ==0.7.0, - battleship-combinatorics ==0.0.1, - bazel-runfiles ==0.12, - bbdb ==0.8, - bcrypt ==0.0.11, - beam-core ==0.9.2.1, - beam-migrate ==0.5.1.2, - beam-postgres ==0.5.2.1, - beam-sqlite ==0.5.1.2, - bech32 ==1.1.2, - bech32-th ==1.1.1, - bench ==1.0.12, - benchpress ==0.2.2.21, - bencode ==0.6.1.1, - bencoding ==0.4.5.4, - between ==0.11.0.0, - bibtex ==0.1.0.6, - bifunctors ==5.5.12, - bimap ==0.4.0, - bimaps ==0.1.0.2, - bimap-server ==0.1.0.1, - bin ==0.1.2, - binance-exports ==0.1.1.0, - binary installed, - binary-conduit ==1.3.1, - binaryen ==0.0.6.0, - binary-generic-combinators ==0.4.4.0, - binary-ieee754 ==0.1.0.0, - binary-instances ==1.0.2, - binary-list ==1.1.1.2, - binary-orphans ==1.0.3, - binary-parser ==0.5.7.2, - binary-parsers ==0.2.4.0, - binary-search ==2.0.0, - binary-shared ==0.8.3, - binary-tagged ==0.3.1, - bindings-DSL ==1.0.25, - bindings-GLFW ==3.3.2.0, - bindings-libzip ==1.0.1, - bindings-uname ==0.1, - BiobaseENA ==0.0.0.2, - BiobaseEnsembl ==0.2.0.1, - BiobaseFasta ==0.4.0.1, - BiobaseTypes ==0.2.1.0, - BiobaseXNA ==0.11.1.1, - bitarray ==0.0.1.1, - bits ==0.6, - bitset-word8 ==0.1.1.2, - bits-extra ==0.0.2.3, - bitvec ==1.1.3.0, - bitwise-enum ==1.0.1.0, - blake2 ==0.3.0, - blanks ==0.5.0, - blas-carray ==0.1.0.1, - blas-comfort-array ==0.0.0.3, - blas-ffi ==0.1, - blas-hs ==0.1.1.0, - blaze-bootstrap ==0.1.0.1, - blaze-builder ==0.4.2.2, - blaze-colonnade ==1.2.2.1, - blaze-html ==0.9.1.2, - blaze-markup ==0.8.2.8, - blaze-svg ==0.3.6.1, - blaze-textual ==0.2.2.1, - bm ==0.1.0.2, - bmp ==1.2.6.3, - bnb-staking-csvs ==0.2.1.0, - BNFC ==2.9.4, - BNFC-meta ==0.6.1, - board-games ==0.3, - bodhi ==0.1.0, - boltzmann-samplers ==0.1.1.0, - bookkeeping ==0.4.0.1, - Boolean ==0.2.4, - boolean-like ==0.1.1.0, - boolsimplifier ==0.1.8, - boomerang ==1.4.8, - boots ==0.2.0.1, - bordacount ==0.1.0.0, - boring ==0.2, - both ==0.1.1.2, - bound ==2.0.5, - BoundedChan ==1.0.3.0, - bounded-queue ==1.0.0, - boxes ==0.1.5, - brick ==0.68.1, - brittany ==0.14.0.2, - broadcast-chan ==0.2.1.2, - brotli ==0.0.0.1, - brotli-streams ==0.0.0.0, - bsb-http-chunked ==0.0.0.4, - bson ==0.4.0.1, - bson-lens ==0.1.1, - buffer-builder ==0.2.4.8, - buffer-pipe ==0.0, - bugsnag-haskell ==0.0.4.4, - bugsnag-hs ==0.2.0.9, - bugzilla-redhat ==1.0.0, - burrito ==2.0.1.1, - butcher ==1.3.3.2, - buttplug-hs-core ==0.1.0.1, - bv ==0.5, - byteable ==0.1.1, - byte-count-reader ==0.10.1.9, - bytedump ==1.0, - byteorder ==1.0.4, - byte-order ==0.1.3.0, - bytes ==0.17.2, - byteset ==0.1.1.0, - bytestring installed, - bytestring-builder ==0.10.8.2.0, - bytestring-conversion ==0.3.2, - bytestring-lexing ==0.5.0.8, - bytestring-mmap ==0.2.2, - bytestring-strict-builder ==0.4.5.6, - bytestring-to-vector ==0.3.0.1, - bytestring-tree-builder ==0.2.7.10, - bytestring-trie ==0.2.7, - bz2 ==1.0.1.0, - bzlib ==0.5.1.0, - bzlib-conduit ==0.3.0.2, - c14n ==0.1.0.2, - c2hs ==0.28.8, - Cabal installed, - cabal2nix ==2.18.0, - cabal2spec ==2.6.2, - cabal-appimage ==0.3.0.5, - cabal-clean ==0.1.20220814, - cabal-doctest ==1.0.9, - cabal-file ==0.1.1, - cabal-file-th ==0.2.7, - cabal-flatpak ==0.1.0.3, - cabal-install ==3.4.1.0, - cabal-plan ==0.7.2.1, - cabal-rpm ==2.0.11.1, - Cabal-syntax ==3.6.0.0, - cache ==0.1.3.0, - cached-json-file ==0.1.1, - cacophony ==0.10.1, - calendar-recycling ==0.0.0.1, - call-alloy ==0.3.0.3, - call-stack ==0.4.0, - can-i-haz ==0.3.1.0, - capability ==0.5.0.1, - capataz ==0.2.1.0, - ca-province-codes ==1.0.0.0, - cardano-coin-selection ==1.0.1, - carray ==0.1.6.8, - casa-client ==0.0.1, - casa-types ==0.0.2, - cased ==0.1.0.0, - case-insensitive ==1.2.1.0, - cases ==0.1.4.1, - casing ==0.1.4.1, - cassava ==0.5.3.0, - cassava-conduit ==0.6.0, - cassava-megaparsec ==2.0.4, - cast ==0.1.0.2, - caster ==0.0.3.0, - cayley-client ==0.4.17, - cborg ==0.2.7.0, - cborg-json ==0.2.4.0, - cdar-mBound ==0.1.0.4, - c-enum ==0.1.1.3, - cereal ==0.5.8.3, - cereal-conduit ==0.8.0, - cereal-text ==0.1.0.2, - cereal-vector ==0.2.0.1, - cfenv ==0.1.0.0, - cgi ==3001.5.0.0, - chan ==0.0.4.1, - ChannelT ==0.0.0.7, - character-cases ==0.1.0.6, - charset ==0.3.9, - charsetdetect-ae ==1.1.0.4, - Chart ==1.9.4, - ChasingBottoms ==1.3.1.12, - cheapskate ==0.1.1.2, - cheapskate-highlight ==0.1.0.0, - cheapskate-lucid ==0.1.0.0, - check-email ==1.0.2, - checkers ==0.6.0, - checksum ==0.0, - chimera ==0.3.2.0, - chiphunk ==0.1.4.0, - choice ==0.2.2, - chronologique ==0.3.1.3, - chunked-data ==0.3.1, - cipher-aes ==0.2.11, - cipher-aes128 ==0.7.0.6, - cipher-camellia ==0.0.2, - cipher-des ==0.0.6, - cipher-rc4 ==0.1.4, - circle-packing ==0.1.0.6, - circular ==0.4.0.3, - citeproc ==0.6.0.1, - clash-ghc ==1.6.3, - clash-lib ==1.6.3, - clash-prelude ==1.6.3, - classy-prelude ==1.5.0.2, - classy-prelude-conduit ==1.5.0, - classy-prelude-yesod ==1.5.0, - clay ==0.14.0, - cleff ==0.3.3.0, - cleff-plugin ==0.1.0.0, - clientsession ==0.9.1.2, - climb ==0.3.3, - Clipboard ==2.3.2.0, - clock ==0.8.3, - closed ==0.2.0.2, - clumpiness ==0.17.0.2, - ClustalParser ==1.3.0, - cmark ==0.6, - cmark-gfm ==0.2.3, - cmark-lucid ==0.1.0.0, - cmdargs ==0.10.21, - codec-beam ==0.2.0, - code-conjure ==0.5.2, - code-page ==0.2.1, - coercible-utils ==0.1.0, - cointracking-imports ==0.1.0.1, - collect-errors ==0.1.5.0, - colonnade ==1.2.0.2, - Color ==0.3.3, - colorful-monoids ==0.2.1.3, - colorize-haskell ==1.0.1, - colour ==2.3.6, - columnar ==1.0.0.0, - combinatorial ==0.1.0.1, - comfort-array ==0.5.1.1, - comfort-array-shape ==0.0, - comfort-fftw ==0.0, - comfort-graph ==0.0.3.2, - commonmark ==0.2.2, - commonmark-extensions ==0.2.3.2, - commonmark-pandoc ==0.2.1.2, - commutative ==0.0.2, - comonad ==5.0.8, - comonad-extras ==4.0.1, - compact ==0.2.0.0, - compactmap ==0.1.4.2.1, - compensated ==0.8.3, - compiler-warnings ==0.1.0, - componentm ==0.0.0.2, - componentm-devel ==0.0.0.2, - composable-associations ==0.1.0.0, - composition ==1.0.2.2, - composition-extra ==2.0.0, - concise ==0.1.0.1, - concurrency ==1.11.0.2, - concurrent-extra ==0.7.0.12, - concurrent-output ==1.10.16, - concurrent-split ==0.0.1.1, - concurrent-supply ==0.1.8, - cond ==0.4.1.1, - conduino ==0.2.2.0, - conduit ==1.3.4.2, - conduit-aeson ==0.1.0.1, - conduit-algorithms ==0.0.13.0, - conduit-combinators ==1.3.0, - conduit-concurrent-map ==0.1.3, - conduit-connection ==0.1.0.5, - conduit-extra ==1.3.6, - conduit-parse ==0.2.1.1, - conduit-zstd ==0.0.2.0, - conferer ==1.1.0.0, - conferer-aeson ==1.1.0.2, - conferer-warp ==1.1.0.0, - ConfigFile ==1.1.4, - config-ini ==0.2.4.0, - configuration-tools ==0.6.1, - configurator ==0.3.0.0, - configurator-export ==0.1.0.1, - connection ==0.3.1, - connection-pool ==0.2.2, - console-style ==0.0.2.1, - constraints ==0.13.4, - constraints-extras ==0.3.2.1, - constraint-tuples ==0.1.2, - construct ==0.3.1, - containers installed, - containers-unicode-symbols ==0.3.1.3, - contravariant ==1.5.5, - contravariant-extras ==0.3.5.3, - control-bool ==0.2.1, - control-dsl ==0.2.1.3, - control-monad-free ==0.6.2, - control-monad-omega ==0.3.2, - convertible ==1.1.1.1, - cookie ==0.4.5, - copr-api ==0.1.0, - core-data ==0.3.6.0, - core-program ==0.4.6.4, - core-text ==0.3.8.0, - countable ==1.0, - covariance ==0.1.0.6, - cpphs ==1.20.9.1, - cprng-aes ==0.6.1, - cpu ==0.1.2, - cpuinfo ==0.1.0.2, - crackNum ==3.2, - crc32c ==0.0.0, - credential-store ==0.1.2, - criterion ==1.5.13.0, - criterion-measurement ==0.1.4.0, - cron ==0.7.0, - crypto-api ==0.13.3, - crypto-api-tests ==0.3, - crypto-cipher-tests ==0.0.11, - crypto-cipher-types ==0.0.9, - cryptocompare ==0.1.2, - crypto-enigma ==0.1.1.6, - cryptohash ==0.11.9, - cryptohash-cryptoapi ==0.1.4, - cryptohash-md5 ==0.11.101.0, - cryptohash-sha1 ==0.11.101.0, - cryptohash-sha256 ==0.11.102.1, - cryptohash-sha512 ==0.11.101.0, - cryptonite ==0.29, - cryptonite-conduit ==0.2.2, - cryptonite-openssl ==0.7, - crypto-pubkey-types ==0.4.3, - crypto-random ==0.0.9, - crypto-random-api ==0.2.0, - cryptostore ==0.2.2.0, - crypt-sha512 ==0, - csp ==1.4.0, - css-text ==0.1.3.0, - c-struct ==0.1.1.2, - csv ==0.1.2, - csv-conduit ==0.7.3.0, - ctrie ==0.2, - cubicbezier ==0.6.0.6, - cubicspline ==0.1.2, - cue-sheet ==2.0.2, - curl ==1.3.8, - curl-runnings ==0.17.0, - currencies ==0.2.0.0, - currency ==0.2.0.0, - cursor ==0.3.2.0, - cursor-brick ==0.1.0.1, - cursor-fuzzy-time ==0.0.0.0, - cursor-gen ==0.4.0.0, - cutter ==0.0, - cyclotomic ==1.1.1, - czipwith ==1.0.1.4, - d10 ==1.0.1.0, - data-accessor ==0.2.3, - data-accessor-mtl ==0.2.0.4, - data-accessor-transformers ==0.2.1.7, - data-binary-ieee754 ==0.4.4, - data-bword ==0.1.0.1, - data-checked ==0.3, - data-clist ==0.2, - data-default ==0.7.1.1, - data-default-class ==0.1.2.0, - data-default-extra ==0.1.0, - data-default-instances-base ==0.1.0.1, - data-default-instances-bytestring ==0.0.1, - data-default-instances-case-insensitive ==0.0.1, - data-default-instances-containers ==0.0.1, - data-default-instances-dlist ==0.0.1, - data-default-instances-new-base ==0.0.2, - data-default-instances-old-locale ==0.0.1, - data-default-instances-text ==0.0.1, - data-default-instances-unordered-containers ==0.0.1, - data-default-instances-vector ==0.0.1, - data-diverse ==4.7.0.0, - datadog ==0.3.0.0, - data-dword ==0.3.2.1, - data-endian ==0.1.1, - data-fix ==0.3.2, - data-forest ==0.1.0.9, - data-has ==0.4.0.0, - data-hash ==0.2.0.1, - data-interval ==2.1.1, - data-inttrie ==0.1.4, - data-lens-light ==0.1.2.3, - data-memocombinators ==0.5.1, - data-msgpack ==0.0.13, - data-msgpack-types ==0.0.3, - data-or ==1.0.0.7, - data-ordlist ==0.4.7.0, - data-ref ==0.0.2, - data-reify ==0.6.3, - data-serializer ==0.3.5, - datasets ==0.4.0, - data-sketches ==0.3.1.0, - data-sketches-core ==0.1.0.0, - data-textual ==0.3.0.3, - data-tree-print ==0.1.0.2, - dataurl ==0.1.0.0, - DAV ==1.3.4, - dawg-ord ==0.5.1.2, - dbcleaner ==0.1.3, - DBFunctor ==0.1.2.1, - dbus ==1.2.22, - dbus-hslogger ==0.1.0.1, - debian ==4.0.4, - debian-build ==0.10.2.1, - debug-trace-var ==0.2.0, - dec ==0.0.4, - Decimal ==0.5.2, - declarative ==0.5.4, - deepseq installed, - deepseq-generics ==0.2.0.0, - deferred-folds ==0.9.18.2, - dejafu ==2.4.0.3, - dense-linear-algebra ==0.1.0.0, - dependent-map ==0.4.0.0, - dependent-sum ==0.7.1.0, - dependent-sum-template ==0.1.1.1, - depq ==0.4.2, - deque ==0.4.4, - deriveJsonNoPrefix ==0.1.0.1, - derive-topdown ==0.0.3.0, - deriving-aeson ==0.2.8, - deriving-compat ==0.6.1, - derulo ==2.0.0.1, - detour-via-sci ==1.0.0, - df1 ==0.4, - dhall ==1.40.2, - dhall-bash ==1.0.39, - dhall-json ==1.7.9, - dhall-yaml ==1.2.10, - di ==1.3, - diagrams ==1.4.0.1, - diagrams-contrib ==1.4.4, - diagrams-core ==1.5.0, - diagrams-lib ==1.4.5.1, - diagrams-rasterific ==1.4.2.2, - diagrams-solve ==0.1.3, - diagrams-svg ==1.4.3.1, - di-core ==1.0.4, - dictionary-sharing ==0.1.0.0, - di-df1 ==1.2.1, - Diff ==0.4.1, - digest ==0.0.1.3, - digits ==0.3.1, - di-handle ==1.0.1, - dimensional ==1.4, - di-monad ==1.3.1, - directory installed, - directory-tree ==0.12.1, - direct-sqlite ==2.3.27, - dirichlet ==0.1.0.7, - discount ==0.1.1, - discover-instances ==0.1.0.0, - discrimination ==0.4.1, - disk-free-space ==0.1.0.1, - distributed-static ==0.3.9, - distribution-nixpkgs ==1.6.2, - distribution-opensuse ==1.1.3, - distributive ==0.6.2.1, - djinn-lib ==0.0.1.4, - dlist ==1.0, - dlist-instances ==0.1.1.1, - dlist-nonempty ==0.1.1, - dns ==4.0.1, - dockerfile ==0.2.0, - doclayout ==0.3.1.1, - docopt ==0.7.0.7, - doctemplates ==0.10.0.1, - doctest ==0.18.2, - doctest-discover ==0.2.0.0, - doctest-driver-gen ==0.3.0.5, - doctest-exitcode-stdio ==0.0, - doctest-extract ==0.1, - doctest-lib ==0.1, - doctest-parallel ==0.2.5, - doldol ==0.4.1.2, - do-list ==1.0.1, - domain ==0.1.1.3, - domain-core ==0.1.0.2, - domain-optics ==0.1.0.3, - do-notation ==0.1.0.2, - dot ==0.3, - dotenv ==0.9.0.2, - dotgen ==0.4.3, - dotnet-timespan ==0.0.1.0, - double-conversion ==2.0.4.1, - download ==0.3.2.7, - download-curl ==0.1.4, - DPutils ==0.1.1.0, - drifter ==0.3.0, - drifter-postgresql ==0.2.1, - drifter-sqlite ==0.1.0.0, - dsp ==0.2.5.1, - dual ==0.1.1.1, - dual-tree ==0.2.3.1, - dublincore-xml-conduit ==0.1.0.2, - dunai ==0.8.3, - duration ==0.2.0.0, - dvorak ==0.1.0.0, - dynamic-state ==0.3.1, - dyre ==0.9.1, - eap ==0.9.0.2, - Earley ==0.13.0.1, - easy-file ==0.2.2, - easy-logger ==0.1.0.7, - Ebnf2ps ==1.0.15, - echo ==0.1.4, - ecstasy ==0.2.1.0, - ed25519 ==0.0.5.0, - edit-distance ==0.2.2.1, - edit-distance-vector ==1.0.0.4, - editor-open ==0.6.0.0, - either ==5.0.2, - either-both ==0.1.1.1, - either-unwrap ==1.1, - ekg-core ==0.1.1.7, - elerea ==2.9.0, - elf ==0.31, - eliminators ==0.8, - elm-bridge ==0.8.0, - elm-core-sources ==1.0.0, - elm-export ==0.6.0.1, - elynx ==0.6.1.1, - elynx-markov ==0.6.1.1, - elynx-nexus ==0.6.1.1, - elynx-seq ==0.6.1.1, - elynx-tools ==0.6.1.1, - elynx-tree ==0.6.1.1, - email-validate ==2.3.2.16, - emd ==0.2.0.0, - emojis ==0.1.2, - enclosed-exceptions ==1.0.3, - ENIG ==0.0.1.0, - entropy ==0.4.1.7, - enummapset ==0.6.0.3, - enumset ==0.1, - enum-text ==0.5.3.0, - envelope ==0.2.2.0, - envparse ==0.4.1, - envy ==2.1.0.0, - eq ==4.3, - equal-files ==0.0.5.3, - equational-reasoning ==0.7.0.1, - equivalence ==0.4.1, - erf ==2.0.0.0, - errata ==0.4.0.0, - error ==0.3.0.0, - errorcall-eq-instance ==0.3.0, - error-or ==0.2.0.0, - error-or-utils ==0.2.0, - errors ==2.3.0, - errors-ext ==0.4.2, - ersatz ==0.4.12, - esqueleto ==3.5.7.0, - essence-of-live-coding ==0.2.6, - essence-of-live-coding-gloss ==0.2.6, - essence-of-live-coding-pulse ==0.2.6, - essence-of-live-coding-quickcheck ==0.2.6, - essence-of-live-coding-warp ==0.2.6, - eventful-core ==0.2.0, - eventful-memory ==0.2.0, - eventful-test-helpers ==0.2.0, - event-list ==0.1.2, - eventstore ==1.4.2, - every ==0.0.1, - evm-opcodes ==0.1.1, - exact-combinatorics ==0.2.0.11, - exact-pi ==0.5.0.2, - exception-hierarchy ==0.1.0.6, - exception-mtl ==0.4.0.1, - exceptions installed, - exception-transformers ==0.4.0.11, - exception-via ==0.1.0.0, - executable-hash ==0.2.0.4, - executable-path ==0.0.3.1, - exit-codes ==1.0.0, - exomizer ==1.0.0, - experimenter ==0.1.0.12, - expiring-cache-map ==0.0.6.1, - explainable-predicates ==0.1.2.2, - explicit-exception ==0.1.10, - exp-pairs ==0.2.1.0, - express ==1.0.10, - extended-reals ==0.2.4.0, - extensible-effects ==5.0.0.1, - extensible-exceptions ==0.1.1.4, - extra ==1.7.10, - extractable-singleton ==0.0.1, - extrapolate ==0.4.6, - fail ==4.9.0.0, - failable ==1.2.4.0, - fakedata ==1.0.3, - fakedata-parser ==0.1.0.0, - fakedata-quickcheck ==0.2.0, - fakefs ==0.3.0.2, - fakepull ==0.3.0.2, - faktory ==1.1.2.3, - fast-builder ==0.1.3.0, - fast-logger ==3.1.1, - fast-math ==1.0.2, - fastmemo ==0.1.0.1, - fclabels ==2.0.5.1, - feature-flags ==0.1.0.1, - fedora-dists ==2.0.0, - fedora-haskell-tools ==1.0, - feed ==1.3.2.1, - FenwickTree ==0.1.2.1, - fft ==0.1.8.7, - fftw-ffi ==0.1, - fgl ==5.7.0.3, - fields-json ==0.4.0.0, - file-embed ==0.0.15.0, - file-embed-lzma ==0, - filelock ==0.1.1.5, - filemanip ==0.3.6.3, - file-modules ==0.1.2.4, - filepath installed, - filepath-bytestring ==1.4.2.1.9, - file-path-th ==0.1.0.0, - filepattern ==0.1.2, - fileplow ==0.1.0.0, - filter-logger ==0.6.0.0, - filtrable ==0.1.6.0, - fin ==0.2.1, - FindBin ==0.0.5, - fingertree ==0.1.5.0, - finite-typelits ==0.1.6.0, - first-class-families ==0.8.0.1, - first-class-patterns ==0.3.2.5, - fitspec ==0.4.10, - fixed ==0.3, - fixed-length ==0.2.3, - fixed-vector ==1.2.1.0, - fixed-vector-hetero ==0.6.1.1, - fix-whitespace ==0.0.9, - flac ==0.2.0, - flac-picture ==0.1.2, - flags-applicative ==0.1.0.3, - flat ==0.4.4, - flat-mcmc ==1.5.2, - flay ==0.4, - flexible-defaults ==0.0.3, - FloatingHex ==0.5, - floatshow ==0.2.4, - flow ==2.0.0.0, - flush-queue ==1.0.0, - fmlist ==0.9.4, - fmt ==0.6.3.0, - fn ==0.3.0.2, - focus ==1.0.3, - focuslist ==0.1.1.0, - fold-debounce ==0.2.0.9, - fold-debounce-conduit ==0.2.0.6, - foldl ==1.4.12, - folds ==0.7.8, - follow-file ==0.0.3, - FontyFruity ==0.5.3.5, - force-layout ==0.4.0.6, - foreign-store ==0.2, - ForestStructures ==0.0.1.0, - forkable-monad ==0.2.0.3, - forma ==1.2.0, - format-numbers ==0.1.0.1, - formatting ==7.1.3, - fortran-src ==0.9.0, - foundation ==0.0.29, - fourmolu ==0.4.0.0, - Frames ==0.7.3, - free ==5.1.9, - free-categories ==0.2.0.2, - freenect ==1.2.1, - freer-simple ==1.2.1.2, - freetype2 ==0.2.0, - free-vl ==0.1.4, - friendly-time ==0.4.1, - frisby ==0.2.4, - from-sum ==0.2.3.0, - frontmatter ==0.1.0.2, - fsnotify ==0.3.0.1, - fsnotify-conduit ==0.1.1.1, - ftp-client ==0.5.1.4, - funcmp ==1.9, - function-builder ==0.3.0.1, - functor-classes-compat ==2.0.0.2, - functor-combinators ==0.4.1.0, - fused-effects ==1.1.2.0, - fusion-plugin ==0.2.4, - fusion-plugin-types ==0.1.0, - fuzzcheck ==0.1.1, - fuzzy ==0.1.0.1, - fuzzy-dates ==0.1.1.2, - fuzzyset ==0.2.3, - fuzzy-time ==0.2.0.1, - gauge ==0.2.5, - gd ==3000.7.3, - gdp ==0.0.3.0, - general-games ==1.1.1, - generic-aeson ==0.2.0.14, - generic-arbitrary ==0.2.2, - generic-constraints ==1.1.1.1, - generic-data ==0.9.2.1, - generic-data-surgery ==0.3.0.0, - generic-deriving ==1.14.2, - generic-functor ==0.2.0.0, - generic-lens ==2.2.1.0, - generic-lens-core ==2.2.1.0, - generic-monoid ==0.1.0.1, - generic-optics ==2.2.1.0, - GenericPretty ==1.2.2, - generic-random ==1.5.0.1, - generics-eot ==0.4.0.1, - generics-sop ==0.5.1.2, - generics-sop-lens ==0.2.0.1, - geniplate-mirror ==0.7.8, - genvalidity ==1.0.0.1, - genvalidity-bytestring ==1.0.0.0, - genvalidity-containers ==1.0.0.0, - genvalidity-criterion ==1.0.0.0, - genvalidity-hspec ==1.0.0.0, - genvalidity-hspec-aeson ==1.0.0.0, - genvalidity-hspec-binary ==1.0.0.0, - genvalidity-hspec-cereal ==1.0.0.0, - genvalidity-hspec-hashable ==1.0.0.0, - genvalidity-hspec-optics ==1.0.0.0, - genvalidity-hspec-persistent ==1.0.0.0, - genvalidity-mergeless ==0.3.0.0, - genvalidity-path ==1.0.0.0, - genvalidity-persistent ==1.0.0.0, - genvalidity-property ==1.0.0.0, - genvalidity-scientific ==1.0.0.0, - genvalidity-text ==1.0.0.1, - genvalidity-time ==1.0.0.0, - genvalidity-unordered-containers ==1.0.0.0, - genvalidity-uuid ==1.0.0.0, - genvalidity-vector ==1.0.0.0, - geodetics ==0.1.2, - geojson ==4.1.0, - getopt-generics ==0.13.0.4, - ghc installed, - ghc-bignum installed, - ghc-bignum-orphans ==0.1.1, - ghc-byteorder ==4.11.0.0.10, - ghc-check ==0.5.0.8, - ghc-compact ==0.1.0.0, - ghc-core ==0.5.6, - ghc-events ==0.17.0.3, - ghc-exactprint ==0.6.4, - ghcid ==0.8.7, - ghci-hexcalc ==0.1.1.0, - ghcjs-codemirror ==0.0.0.2, - ghcjs-perch ==0.3.3.3, - ghc-lib ==9.0.2.20211226, - ghc-lib-parser ==9.0.2.20211226, - ghc-lib-parser-ex ==9.0.0.6, - ghc-parser ==0.2.3.0, - ghc-paths ==0.1.0.12, - ghc-prim installed, - ghc-prof ==1.4.1.11, - ghc-source-gen ==0.4.3.0, - ghc-syntax-highlighter ==0.0.7.0, - ghc-tcplugins-extra ==0.4.2, - ghc-trace-events ==0.1.2.6, - ghc-typelits-extra ==0.4.3, - ghc-typelits-knownnat ==0.7.6, - ghc-typelits-natnormalise ==0.7.6, - ghc-typelits-presburger ==0.6.2.0, - ghost-buster ==0.1.1.0, - gi-atk ==2.0.24, - gi-cairo ==1.0.26, - gi-cairo-connector ==0.1.1, - gi-cairo-render ==0.1.1, - gi-dbusmenu ==0.4.10, - gi-dbusmenugtk3 ==0.4.11, - gi-freetype2 ==2.0.1, - gi-gdk ==3.0.25, - gi-gdkpixbuf ==2.0.28, - gi-gdkx11 ==3.0.12, - gi-gio ==2.0.29, - gi-glib ==2.0.26, - gi-gmodule ==2.0.2, - gi-gobject ==2.0.27, - gi-graphene ==1.0.4, - gi-gtk ==3.0.38, - gi-gtk-hs ==0.3.12, - gi-gtksource ==3.0.25, - gi-harfbuzz ==0.0.6, - gi-javascriptcore ==4.0.24, - ginger ==0.10.4.0, - gi-pango ==1.0.26, - githash ==0.1.6.2, - github ==0.27, - github-release ==2.0.0.1, - github-rest ==1.1.2, - github-types ==0.2.1, - github-webhooks ==0.15.0, - gitrev ==1.3.1, - gi-vte ==2.91.29, - gi-xlib ==2.0.11, - gl ==0.9, - glabrous ==2.0.5, - glasso ==0.1.0, - GLFW-b ==3.3.0.0, - Glob ==0.10.2, - glob-posix ==0.2.0.1, - gloss ==1.13.2.1, - gloss-algorithms ==1.13.0.3, - gloss-raster ==1.13.1.2, - gloss-rendering ==1.13.1.1, - GLURaw ==2.0.0.5, - GLUT ==2.7.0.16, - gmail-simple ==0.1.0.4, - gnuplot ==0.5.7, - goldplate ==0.2.0, - google-isbn ==1.0.3, - gopher-proxy ==0.1.1.3, - gothic ==0.1.8, - gotyno-hs ==1.1.0, - gpolyline ==0.1.0.1, - graph-core ==0.3.0.0, - graphite ==0.10.0.1, - graphs ==0.7.2, - graphula ==2.0.2.1, - graphviz ==2999.20.1.0, - graph-wrapper ==0.2.6.0, - gravatar ==0.8.1, - greskell ==2.0.0.0, - greskell-core ==1.0.0.0, - greskell-websocket ==1.0.0.0, - groom ==0.1.2.1, - groundhog ==0.12.0, - groundhog-postgresql ==0.12, - groundhog-sqlite ==0.12.0, - group-by-date ==0.1.0.4, - grouped-list ==0.2.3.0, - groups ==0.5.3, - gtk2hs-buildtools ==0.13.8.3, - gtk-sni-tray ==0.1.8.0, - gtk-strut ==0.1.3.0, - guarded-allocation ==0.0.1, - hackage-cli ==0.0.3.6, - hackage-db ==2.1.2, - hackage-security ==0.6.2.2, - haddock-library ==1.10.0, - hadoop-streaming ==0.2.0.3, - hakyll ==4.15.1.1, - hakyll-convert ==0.3.0.4, - hal ==0.4.10.1, - half ==0.3.1, - hall-symbols ==0.1.0.6, - hamilton ==0.1.0.3, - hamtsolo ==1.0.4, - HandsomeSoup ==0.4.2, - handwriting ==0.1.0.3, - happstack-server ==7.7.2, - happstack-server-tls ==7.2.1.3, - happy ==1.20.0, - happy-meta ==0.2.0.11, - HasBigDecimal ==0.1.1, - hasbolt ==0.1.6.2, - hashable ==1.3.5.0, - hashable-time ==0.3, - hashids ==1.0.2.7, - hashing ==0.1.0.1, - hashmap ==1.3.3, - hashtables ==1.2.4.2, - haskeline ==0.8.2, - haskell-awk ==1.2.0.1, - haskell-gi ==0.26.1, - haskell-gi-base ==0.26.1, - haskell-gi-overloading ==1.0, - haskell-lexer ==1.1, - haskell-lsp-types ==0.24.0.0, - haskell-src ==1.0.4, - haskell-src-exts ==1.23.1, - haskell-src-exts-util ==0.2.5, - haskell-src-meta ==0.8.10, - haskey-btree ==0.3.0.1, - haskintex ==0.8.0.0, - haskoin-core ==0.21.2, - hasktags ==0.72.0, - hasql ==1.5.1, - hasql-migration ==0.3.0, - hasql-notifications ==0.2.0.2, - hasql-optparse-applicative ==0.3.0.9, - hasql-pool ==0.5.2.2, - hasql-queue ==1.2.0.2, - hasql-th ==0.4.0.17, - hasql-transaction ==1.0.1.1, - has-transformers ==0.1.0.4, - hasty-hamiltonian ==1.3.4, - HaTeX ==3.22.3.1, - HaXml ==1.25.9, - haxr ==3000.11.4.1, - HCodecs ==0.5.2, - hdaemonize ==0.5.6, - HDBC ==2.4.0.4, - HDBC-session ==0.1.2.0, - headed-megaparsec ==0.2.1, - heap ==1.0.4, - heaps ==0.4, - heatshrink ==0.1.0.0, - hebrew-time ==0.1.2, - hedgehog ==1.0.5, - hedgehog-classes ==0.2.5.3, - hedgehog-corpus ==0.2.0, - hedgehog-fakedata ==0.0.1.5, - hedgehog-fn ==1.0, - hedgehog-quickcheck ==0.1.1, - hedis ==0.15.1, - hedn ==0.3.0.4, - here ==1.2.13, - heredoc ==0.2.0.0, - heterocephalus ==1.0.5.7, - hex ==0.2.0, - hexml ==0.3.4, - hexpat ==0.20.13, - hex-text ==0.1.0.6, - hformat ==0.3.3.1, - hfsevents ==0.1.6, - hgeometry ==0.14, - hgeometry-combinatorial ==0.14, - hid ==0.2.2, - hidapi ==0.1.8, - hie-bios ==0.9.1, - hi-file-parser ==0.1.3.0, - higher-leveldb ==0.6.0.0, - highlighting-kate ==0.6.4, - hindent ==5.3.4, - hinfo ==0.0.3.0, - hinotify ==0.4.1, - hint ==0.9.0.6, - histogram-fill ==0.9.1.0, - hjsmin ==0.2.0.4, - hkd-default ==1.1.0.0, - hkgr ==0.3, - hledger ==1.25, - hledger-iadd ==1.3.17, - hledger-interest ==1.6.3, - hledger-lib ==1.25, - hledger-stockquotes ==0.1.2.0, - hledger-ui ==1.25, - hledger-web ==1.25, - hlibcpuid ==0.2.0, - hlibgit2 ==0.18.0.16, - hlibsass ==0.1.10.1, - hlint ==3.3.6, - hmatrix ==0.20.2, - hmatrix-gsl ==0.19.0.1, - hmatrix-gsl-stats ==0.4.1.8, - hmatrix-morpheus ==0.1.1.2, - hmatrix-repa ==0.1.2.2, - hmatrix-vector-sized ==0.1.3.0, - hmm-lapack ==0.5, - HMock ==0.5.1.0, - hnock ==0.4.0, - hoauth2 ==2.3.0, - hocilib ==0.2.0, - hoogle ==5.0.18.3, - hopenssl ==2.2.4, - hopfli ==0.2.2.1, - horizontal-rule ==0.5.0.0, - hosc ==0.19.1, - hostname ==1.0, - hostname-validate ==1.0.0, - hourglass ==0.2.12, - hourglass-orphans ==0.1.0.0, - hp2pretty ==0.10, - hpack ==0.34.7, - hpack-dhall ==0.5.4, - hpc-codecov ==0.3.0.0, - HPDF ==1.6.0, - hpp ==0.6.5, - hpqtypes ==1.9.4.0, - hprotoc ==2.4.17, - hreader ==1.1.0, - hreader-lens ==0.1.3.0, - hruby ==0.5.0.0, - hsass ==0.8.0, - hs-bibutils ==6.10.0.0, - hsc2hs ==0.68.8, - hscolour ==1.24.4, - hsdns ==1.8, - hsemail ==2.2.1, - hset ==2.2.0, - hsexif ==0.6.1.9, - hs-GeoIP ==0.3, - hsignal ==0.2.7.5, - hsini ==0.5.1.2, - hsinstall ==2.7, - HSlippyMap ==3.0.1, - hslogger ==1.3.1.0, - hslua ==2.1.0, - hslua-aeson ==2.1.0, - hslua-classes ==2.1.0, - hslua-core ==2.1.0, - hslua-marshalling ==2.1.0, - hslua-module-doclayout ==1.0.4, - hslua-module-path ==1.0.3, - hslua-module-system ==1.0.2, - hslua-module-text ==1.0.2, - hslua-module-version ==1.0.2, - hslua-objectorientation ==2.1.0, - hslua-packaging ==2.1.0, - hsndfile ==0.8.0, - hsndfile-vector ==0.5.2, - HsOpenSSL ==0.11.7.2, - HsOpenSSL-x509-system ==0.1.0.4, - hsp ==0.10.0, - hspec ==2.8.5, - hspec-attoparsec ==0.1.0.2, - hspec-checkers ==0.1.0.2, - hspec-contrib ==0.5.1, - hspec-core ==2.8.5, - hspec-discover ==2.8.5, - hspec-expectations ==0.8.2, - hspec-expectations-json ==1.0.0.7, - hspec-expectations-lifted ==0.10.0, - hspec-expectations-pretty-diff ==0.7.2.6, - hspec-golden ==0.2.0.0, - hspec-golden-aeson ==0.9.0.0, - hspec-hedgehog ==0.0.1.2, - hspec-junit-formatter ==1.0.3.0, - hspec-leancheck ==0.0.6, - hspec-megaparsec ==2.2.0, - hspec-meta ==2.7.8, - hspec-need-env ==0.1.0.9, - hspec-parsec ==0, - hspec-smallcheck ==0.5.2, - hspec-tmp-proc ==0.5.1.2, - hspec-wai ==0.11.1, - hs-php-session ==0.0.9.3, - hsshellscript ==3.5.0, - hs-tags ==0.1.5.3, - hstatistics ==0.3.1, - HStringTemplate ==0.8.8, - HSvm ==0.1.1.3.25, - HsYAML ==0.2.1.1, - HsYAML-aeson ==0.2.0.1, - hsyslog ==5.0.2, - hsyslog-udp ==0.2.5, - htaglib ==1.2.0, - HTF ==0.15.0.0, - html ==1.0.1.2, - html-conduit ==1.3.2.2, - html-email-validate ==0.2.0.0, - html-entities ==1.1.4.6, - html-entity-map ==0.1.0.0, - HTTP ==4000.3.16, - http2 ==3.0.3, - http-api-data ==0.4.3, - http-api-data-qq ==0.1.0.0, - http-client ==0.7.13.1, - http-client-openssl ==0.3.3, - http-client-overrides ==0.1.1.0, - http-client-tls ==0.3.6.1, - http-common ==0.8.3.4, - http-conduit ==2.3.8, - http-date ==0.0.11, - http-directory ==0.1.10, - http-download ==0.2.0.0, - httpd-shed ==0.4.1.1, - http-io-streams ==0.1.6.1, - http-link-header ==1.2.1, - http-media ==0.8.0.0, - http-query ==0.1.3, - http-reverse-proxy ==0.6.0.1, - http-streams ==0.8.9.6, - http-types ==0.12.3, - human-readable-duration ==0.2.1.4, - HUnit ==1.6.2.0, - HUnit-approx ==1.1.1.1, - hunit-dejafu ==2.0.0.5, - hvect ==0.4.0.1, - hvega ==0.12.0.3, - hw-balancedparens ==0.4.1.2, - hw-bits ==0.7.2.2, - hw-conduit ==0.2.1.1, - hw-conduit-merges ==0.2.1.0, - hw-diagnostics ==0.0.1.0, - hw-dsv ==0.4.1.1, - hweblib ==0.6.3, - hw-eliasfano ==0.1.2.1, - hw-excess ==0.2.3.0, - hw-fingertree ==0.1.2.1, - hw-fingertree-strict ==0.1.2.1, - hw-hedgehog ==0.1.1.1, - hw-int ==0.0.2.0, - hw-ip ==2.4.2.1, - hw-json-simd ==0.1.1.1, - hw-json-simple-cursor ==0.1.1.1, - hw-json-standard-cursor ==0.2.3.2, - hwk ==0.6, - hw-kafka-client ==4.0.3, - hw-mquery ==0.2.1.1, - hworker ==0.1.0.1, - hw-packed-vector ==0.2.1.1, - hw-parser ==0.1.1.0, - hw-prim ==0.6.3.1, - hw-rankselect ==0.13.4.1, - hw-rankselect-base ==0.3.4.1, - hw-simd ==0.1.2.1, - hw-streams ==0.0.1.0, - hw-string-parse ==0.0.0.5, - hw-succinct ==0.1.0.1, - hw-xml ==0.5.1.1, - hxt ==9.3.1.22, - hxt-charproperties ==9.5.0.0, - hxt-css ==0.1.0.3, - hxt-curl ==9.1.1.1, - hxt-expat ==9.1.1, - hxt-http ==9.1.5.2, - hxt-regex-xmlschema ==9.2.0.7, - hxt-tagsoup ==9.1.4, - hxt-unicode ==9.0.2.4, - hybrid-vectors ==0.2.3, - hyper ==0.2.1.1, - hyperloglog ==0.4.6, - hyphenation ==0.8.2, - iconv ==0.4.1.3, - identicon ==0.2.2, - ieee754 ==0.8.0, - if ==0.1.0.0, - iff ==0.0.6, - ihaskell ==0.10.2.2, - ihaskell-hvega ==0.5.0.3, - ihs ==0.1.0.3, - ilist ==0.4.0.1, - imagesize-conduit ==1.1, - Imlib ==0.1.2, - immortal ==0.3, - immortal-queue ==0.1.0.1, - inbox ==0.2.0, - include-file ==0.1.0.4, - incremental-parser ==0.5.0.3, - indents ==0.5.0.1, - indexed ==0.1.3, - indexed-containers ==0.1.0.2, - indexed-list-literals ==0.2.1.3, - indexed-profunctors ==0.1.1, - indexed-traversable ==0.1.2, - indexed-traversable-instances ==0.1.1.1, - infer-license ==0.2.0, - inflections ==0.4.0.6, - influxdb ==1.9.2.2, - ini ==0.4.2, - inj ==1.0, - inline-c ==0.9.1.6, - inline-c-cpp ==0.5.0.0, - inliterate ==0.1.0, - input-parsers ==0.2.3.2, - insert-ordered-containers ==0.2.5.1, - inspection-testing ==0.4.6.1, - instance-control ==0.1.2.0, - int-cast ==0.2.0.0, - integer-gmp installed, - integer-logarithms ==1.0.3.1, - integer-roots ==1.0.2.0, - integration ==0.2.1, - intern ==0.9.4, - interpolate ==0.2.1, - interpolatedstring-perl6 ==1.0.2, - interpolation ==0.1.1.2, - IntervalMap ==0.6.1.2, - intervals ==0.9.2, - intro ==0.9.0.0, - intset-imperative ==0.1.0.0, - invariant ==0.5.6, - invert ==1.0.0.2, - invertible ==0.2.0.7, - invertible-grammar ==0.1.3.2, - io-machine ==0.2.0.0, - io-manager ==0.1.0.3, - io-memoize ==1.1.1.0, - io-region ==0.1.1, - io-storage ==0.3, - io-streams ==1.5.2.2, - ip6addr ==1.0.3, - iproute ==1.7.12, - IPv6Addr ==2.0.5, - ipynb ==0.2, - ipython-kernel ==0.10.2.2, - irc ==0.6.1.0, - irc-client ==1.1.2.2, - irc-conduit ==0.3.0.5, - irc-ctcp ==0.1.3.1, - isbn ==1.1.0.3, - islink ==0.1.0.0, - iso3166-country-codes ==0.20140203.8, - iso639 ==0.1.0.3, - iso8601-time ==0.1.5, - isocline ==1.0.9, - iterable ==3.0, - ix-shapable ==0.1.0, - jack ==0.7.2, - jailbreak-cabal ==1.3.6, - jalaali ==1.0.0.0, - java-adt ==0.2018.11.4, - jira-wiki-markup ==1.4.0, - jose ==0.9, - js-chart ==2.9.4.1, - js-dgtable ==0.5.2, - js-flot ==0.8.3, - js-jquery ==3.3.1, - json ==0.10, - json-feed ==2.0.0.3, - jsonifier ==0.2.1.1, - jsonpath ==0.2.1.0, - json-stream ==0.4.4.1, - JuicyPixels ==3.3.7, - JuicyPixels-blurhash ==0.1.0.3, - JuicyPixels-extra ==0.5.2, - JuicyPixels-scale-dct ==0.1.2, - junit-xml ==0.1.0.2, - justified-containers ==0.3.0.0, - jwt ==0.11.0, - kan-extensions ==5.2.5, - kanji ==3.5.0, - katip ==0.8.7.2, - katip-logstash ==0.1.0.2, - katip-wai ==0.1.2.0, - kazura-queue ==0.1.0.4, - keep-alive ==0.2.1.0, - keycode ==0.2.2, - keys ==3.12.3, - ki ==0.2.0.1, - kind-apply ==0.3.2.1, - kind-generics ==0.4.1.4, - kind-generics-th ==0.2.2.3, - kleene ==0.1, - kmeans ==0.1.3, - koji ==0.0.2, - krank ==0.2.3, - l10n ==0.1.0.1, - labels ==0.3.3, - lackey ==2.0.0.2, - LambdaHack ==0.11.0.0, - lame ==0.2.0, - language-bash ==0.9.2, - language-c ==0.9.1, - language-c-quote ==0.13, - language-docker ==10.4.3, - language-dot ==0.1.1, - language-glsl ==0.3.0, - language-java ==0.2.9, - language-javascript ==0.7.1.0, - language-nix ==2.2.0, - language-protobuf ==1.0.1, - language-python ==0.5.8, - language-thrift ==0.12.0.1, - lapack ==0.5, - lapack-carray ==0.0.3, - lapack-comfort-array ==0.0.1, - lapack-ffi ==0.0.3, - lapack-ffi-tools ==0.1.3, - lapack-hmatrix ==0.0.0.1, - largeword ==1.2.5, - latex ==0.1.0.4, - lattices ==2.0.3, - lawful ==0.1.0.0, - lazy-csv ==0.5.1, - lazyio ==0.1.0.4, - lazysmallcheck ==0.6, - lca ==0.4, - leancheck ==0.9.10, - leancheck-instances ==0.0.4, - leapseconds-announced ==2017.1.0.1, - learn-physics ==0.6.5, - lens ==5.0.1, - lens-action ==0.2.6, - lens-aeson ==1.1.3, - lens-csv ==0.1.1.0, - lens-family ==2.1.2, - lens-family-core ==2.1.2, - lens-family-th ==0.5.2.1, - lens-misc ==0.0.2.0, - lens-process ==0.4.0.0, - lens-properties ==4.11.1, - lens-regex ==0.1.3, - lens-regex-pcre ==1.1.0.0, - lentil ==1.5.4.0, - LetsBeRational ==1.0.0.0, - leveldb-haskell ==0.6.5, - lexer-applicative ==2.1.0.2, - libBF ==0.6.4, - libffi ==0.1, - libgit ==0.3.1, - libgraph ==1.14, - libmpd ==0.10.0.0, - liboath-hs ==0.0.1.2, - libyaml ==0.1.2, - LibZip ==1.0.1, - lifted-async ==0.10.2.3, - lifted-base ==0.2.3.12, - lift-generics ==0.2.1, - lift-type ==0.1.0.1, - line ==4.0.1, - linear ==1.21.10, - linear-base ==0.1.0, - linear-circuit ==0.1.0.4, - linebreak ==1.1.0.1, - linenoise ==0.3.2, - linux-capabilities ==0.1.1.0, - linux-file-extents ==0.2.0.0, - linux-namespaces ==0.1.3.0, - List ==0.6.2, - ListLike ==4.7.7, - list-predicate ==0.1.0.1, - listsafe ==0.1.0.1, - list-singleton ==2.0.0.0, - list-t ==1.0.5.3, - list-transformer ==1.0.8, - ListTree ==0.2.3, - ListZipper ==1.2.0.2, - literatex ==0.2.0.2, - little-rio ==0.2.2, - llvm-hs-pure ==9.0.0, - lmdb ==0.2.5, - load-env ==0.2.1.0, - loc ==0.1.3.16, - locators ==0.3.0.3, - loch-th ==0.2.2, - lockfree-queue ==0.2.3.1, - log-domain ==0.13.2, - logfloat ==0.13.4, - logging ==3.0.5, - logging-facade ==0.3.1, - logging-facade-syslog ==1, - logict ==0.7.1.0, - logstash ==0.1.0.3, - loop ==0.3.0, - lpeg ==1.0.3, - lrucache ==1.2.0.1, - lrucaching ==0.3.3, - lsp ==1.4.0.0, - lsp-test ==0.14.0.2, - lsp-types ==1.4.0.1, - lua ==2.1.0, - lua-arbitrary ==1.0.1, - lucid ==2.11.1, - lucid-cdn ==0.2.2.0, - lucid-extras ==0.2.2, - lukko ==0.1.1.3, - lxd-client-config ==0.1.0.1, - lz4 ==0.2.3.1, - lz4-frame-conduit ==0.1.0.1, - lzma ==0.0.0.3, - lzma-clib ==5.2.2, - lzma-conduit ==1.2.3, - machines ==0.7.3, - magic ==1.1, - magico ==0.0.2.3, - mainland-pretty ==0.7.1, - main-tester ==0.2.0.1, - managed ==1.0.9, - mandrill ==0.5.6.0, - markdown ==0.1.17.5, - markdown-unlit ==0.5.1, - markov-chain ==0.0.3.4, - massiv ==1.0.2.0, - massiv-io ==1.0.0.1, - massiv-persist ==1.0.0.3, - massiv-serialise ==1.0.0.2, - massiv-test ==1.0.0.0, - mathexpr ==0.3.1.0, - math-extras ==0.1.1.0, - math-functions ==0.3.4.2, - matplotlib ==0.7.7, - matrices ==0.5.0, - matrix ==0.3.6.1, - matrix-as-xyz ==0.1.2.2, - matrix-market-attoparsec ==0.1.1.3, - matrix-static ==0.3, - maximal-cliques ==0.1.1, - mbox ==0.3.4, - mbox-utility ==0.0.3.1, - mbtiles ==0.6.0.0, - mcmc ==0.6.2.2, - mcmc-types ==1.0.3, - median-stream ==0.7.0.0, - med-module ==0.1.2.2, - megaparsec ==9.2.1, - megaparsec-tests ==9.2.1, - mega-sdist ==0.4.2.1, - memory ==0.16.0, - MemoTrie ==0.6.10, - mercury-api ==0.1.0.2, - mergeless ==0.3.0.0, - mersenne-random ==1.0.0.1, - mersenne-random-pure64 ==0.2.2.0, - messagepack ==0.5.5, - metrics ==0.4.1.1, - mfsolve ==0.3.2.1, - microaeson ==0.1.0.1, - microlens ==0.4.12.0, - microlens-aeson ==2.4.1, - microlens-contra ==0.1.0.2, - microlens-ghc ==0.4.13.2, - microlens-mtl ==0.2.0.2, - microlens-platform ==0.4.2.1, - microlens-process ==0.2.0.2, - microlens-th ==0.4.3.10, - microspec ==0.2.1.3, - microstache ==1.0.2.2, - midair ==0.2.0.1, - midi ==0.2.2.3, - midi-alsa ==0.2.1, - mighty-metropolis ==2.0.0, - mime-mail ==0.5.1, - mime-mail-ses ==0.4.3, - mime-types ==0.1.0.9, - minimal-configuration ==0.1.4, - minimorph ==0.3.0.1, - minio-hs ==1.6.0, - miniutter ==0.5.1.2, - min-max-pqueue ==0.1.0.2, - mintty ==0.1.4, - missing-foreign ==0.1.1, - MissingH ==1.5.0.1, - mixed-types-num ==0.5.10, - mmap ==0.5.9, - mmark ==0.0.7.6, - mmark-cli ==0.0.5.1, - mmark-ext ==0.2.1.5, - mmorph ==1.1.5, - mnist-idx ==0.1.3.1, - mnist-idx-conduit ==0.4.0.0, - mockery ==0.3.5, - mock-time ==0.1.0, - mod ==0.1.2.2, - model ==0.5, - modern-uri ==0.3.4.4, - modular ==0.1.0.8, - monad-chronicle ==1.0.1, - monad-control ==1.0.3.1, - monad-control-aligned ==0.0.1.1, - monad-coroutine ==0.9.2, - monad-extras ==0.6.0, - monadic-arrays ==0.2.2, - monad-journal ==0.8.1, - monadlist ==0.0.2, - monad-logger ==0.3.36, - monad-logger-json ==0.1.0.0, - monad-logger-logstash ==0.2.0.2, - monad-logger-prefix ==0.1.12, - monad-loops ==0.4.3, - monad-memo ==0.5.4, - monadoid ==0.0.3, - monad-par ==0.3.5, - monad-parallel ==0.7.2.5, - monad-par-extras ==0.3.3, - monad-peel ==0.2.1.2, - monad-primitive ==0.1, - monad-products ==4.0.1, - MonadPrompt ==1.0.0.5, - MonadRandom ==0.5.3, - monad-resumption ==0.1.4.0, - monad-skeleton ==0.2, - monad-st ==0.2.4.1, - monads-tf ==0.1.0.3, - monad-time ==0.3.1.0, - mongoDB ==2.7.1.1, - monoidal-containers ==0.6.2.0, - monoid-extras ==0.6.1, - monoid-subclasses ==1.1.3, - monoid-transformer ==0.0.4, - monomer ==1.3.0.0, - mono-traversable ==1.0.15.3, - mono-traversable-instances ==0.1.1.0, - mono-traversable-keys ==0.2.0, - more-containers ==0.2.2.2, - morpheus-graphql-tests ==0.18.0, - moss ==0.2.0.1, - mountpoints ==1.0.2, - mpi-hs ==0.7.2.0, - mpi-hs-binary ==0.1.1.0, - mpi-hs-cereal ==0.1.0.0, - mtl installed, - mtl-compat ==0.2.2, - mtl-prelude ==2.0.3.1, - multiarg ==0.30.0.10, - multi-containers ==0.2, - multimap ==1.2.1, - multipart ==0.2.1, - multiset ==0.3.4.3, - multistate ==0.8.0.4, - murmur3 ==1.0.5, - murmur-hash ==0.1.0.10, - MusicBrainz ==0.4.1, - mutable-containers ==0.3.4, - mwc-probability ==2.3.1, - mwc-random ==0.15.0.2, - mwc-random-monad ==0.7.3.1, - mx-state-codes ==1.0.0.0, - mysql ==0.2.1, - mysql-simple ==0.4.8.1, - n2o ==0.11.1, - n2o-nitro ==0.11.2, - nagios-check ==0.3.2, - named ==0.3.0.1, - names-th ==0.3.0.1, - nano-erl ==0.1.0.1, - NanoID ==3.2.1, - nanospec ==0.2.2, - nanovg ==0.8.1.0, - nats ==1.1.2, - natural-arithmetic ==0.1.3.0, - natural-induction ==0.2.0.0, - natural-sort ==0.1.2, - natural-transformation ==0.4, - ndjson-conduit ==0.1.0.5, - neat-interpolation ==0.5.1.3, - netcode-io ==0.0.3, - netlib-carray ==0.1, - netlib-comfort-array ==0.0.0.2, - netlib-ffi ==0.1.1, - netpbm ==1.0.4, - netrc ==0.2.0.0, - nettle ==0.3.0, - netwire ==5.0.3, - netwire-input ==0.0.7, - netwire-input-glfw ==0.0.11, - network ==3.1.2.7, - network-bsd ==2.8.1.0, - network-byte-order ==0.1.6, - network-conduit-tls ==1.3.2, - network-info ==0.2.1, - network-ip ==0.3.0.3, - network-messagepack-rpc ==0.1.2.0, - network-messagepack-rpc-websocket ==0.1.1.1, - network-run ==0.2.4, - network-simple ==0.4.5, - network-simple-tls ==0.4, - network-transport ==0.5.4, - network-transport-composed ==0.2.1, - network-transport-tcp ==0.8.0, - network-transport-tests ==0.3.0, - network-uri ==2.6.4.1, - network-wait ==0.1.2.0, - newtype ==0.2.2.0, - newtype-generics ==0.6.2, - nfc ==0.1.1, - nicify-lib ==1.0.1, - NineP ==0.0.2.1, - nix-derivation ==1.1.2, - nix-paths ==1.0.1, - NoHoed ==0.1.1, - nonce ==1.0.7, - nondeterminism ==1.4, - non-empty ==0.3.3, - nonempty-containers ==0.3.4.4, - nonemptymap ==0.0.6.0, - non-empty-sequence ==0.2.0.4, - nonempty-vector ==0.2.1.0, - nonempty-zipper ==1.0.0.4, - non-negative ==0.1.2, - normalization-insensitive ==2.0.2, - not-gloss ==0.7.7.0, - no-value ==1.0.0.0, - nowdoc ==0.1.1.0, - nqe ==0.6.4, - nsis ==0.3.3, - numbers ==3000.2.0.2, - numeric-extras ==0.1, - numeric-limits ==0.1.0.0, - numeric-prelude ==0.4.4, - numeric-quest ==0.2.0.2, - numhask ==0.10.1.0, - numhask-array ==0.10.1, - numhask-space ==0.10.0.0, - NumInstances ==1.4, - numtype-dk ==0.5.0.3, - nuxeo ==0.3.2, - nvim-hs ==2.2.0.2, - ObjectName ==1.1.0.2, - ochintin-daicho ==0.3.4.2, - o-clock ==1.2.1.1, - oeis ==0.3.10, - ofx ==0.4.4.0, - old-locale ==1.0.0.7, - old-time ==1.1.0.3, - once ==0.4, - one-liner ==2.0, - one-liner-instances ==0.1.3.0, - OneTuple ==0.3.1, - Only ==0.1, - oo-prototypes ==0.1.0.0, - opaleye ==0.9.3.2, - OpenAL ==1.7.0.5, - openapi3 ==3.2.2, - open-browser ==0.2.1.0, - openexr-write ==0.1.0.2, - OpenGL ==3.0.3.0, - OpenGLRaw ==3.3.4.1, - openpgp-asciiarmor ==0.1.2, - opensource ==0.1.1.0, - openssl-streams ==1.2.3.0, - opentelemetry ==0.7.0, - opentelemetry-extra ==0.7.0, - opentelemetry-lightstep ==0.7.0, - opentelemetry-wai ==0.7.0, - operational ==0.2.4.1, - operational-class ==0.3.0.0, - opml-conduit ==0.9.0.0, - optics ==0.4.2, - optics-core ==0.4.1, - optics-extra ==0.4.2.1, - optics-th ==0.4.1, - optics-vl ==0.2.1, - optima ==0.4.0.3, - optional-args ==1.0.2, - options ==1.2.1.1, - optparse-applicative ==0.16.1.0, - optparse-enum ==1.0.0.0, - optparse-generic ==1.4.7, - optparse-simple ==0.1.1.4, - optparse-text ==0.1.1.0, - OrderedBits ==0.0.2.0, - ordered-containers ==0.2.2, - ormolu ==0.3.1.0, - overhang ==1.0.0, - packcheck ==0.6.0, - pager ==0.1.1.0, - pagination ==0.2.2, - pagure ==0.1.1, - pagure-cli ==0.2.1, - palette ==0.3.0.2, - pandoc ==2.17.1.1, - pandoc-csv2table ==1.0.9, - pandoc-dhall-decoder ==0.1.0.1, - pandoc-lua-marshal ==0.1.7, - pandoc-plot ==1.4.1, - pandoc-throw ==0.1.0.0, - pandoc-types ==1.22.2.1, - pantry ==0.5.6, - parallel ==3.2.2.0, - parallel-io ==0.3.5, - parameterized ==0.5.0.0, - parseargs ==0.2.0.9, - parsec installed, - parsec-class ==1.0.0.0, - parsec-numbers ==0.1.0, - parsec-numeric ==0.1.0.0, - ParsecTools ==0.0.2.0, - parser-combinators ==1.3.0, - parser-combinators-tests ==1.3.0, - parsers ==0.12.11, - partial-handler ==1.0.3, - partial-isomorphisms ==0.2.3.0, - partial-order ==0.2.0.0, - partial-semigroup ==0.5.1.14, - password ==3.0.1.0, - password-instances ==3.0.0.0, - password-types ==1.0.0.0, - path ==0.9.2, - path-binary-instance ==0.1.0.1, - path-dhall-instance ==0.2.1.0, - path-extensions ==0.1.1.0, - path-extra ==0.2.0, - path-formatting ==0.1.0.0, - path-io ==1.7.0, - path-like ==0.2.0.2, - path-pieces ==0.2.1, - pathtype ==0.8.1.1, - path-utils ==0.1.1.0, - pathwalk ==0.3.1.2, - pattern-arrows ==0.0.2, - pava ==0.1.1.4, - pcg-random ==0.1.3.7, - pcre2 ==2.1.1.1, - pcre-heavy ==1.0.0.2, - pcre-light ==0.4.1.0, - pcre-utils ==0.1.8.2, - pdc ==0.1.1, - pdfinfo ==1.5.4, - pdf-toolbox-content ==0.1.1, - pdf-toolbox-core ==0.1.1, - pdf-toolbox-document ==0.1.2, - peano ==0.1.0.1, - pem ==0.2.4, - percent-format ==0.0.2, - peregrin ==0.3.3, - perf ==0.9.0, - perfect-hash-generator ==0.2.0.6, - persist ==0.1.1.5, - persistent ==2.13.3.5, - persistent-discover ==0.1.0.5, - persistent-documentation ==0.1.0.4, - persistent-mongoDB ==2.13.0.1, - persistent-mtl ==0.4.0.0, - persistent-mysql ==2.13.1.3, - persistent-pagination ==0.1.1.2, - persistent-postgresql ==2.13.5.0, - persistent-qq ==2.12.0.2, - persistent-redis ==2.13.0.1, - persistent-refs ==0.4, - persistent-sqlite ==2.13.1.0, - persistent-template ==2.12.0.0, - persistent-test ==2.13.1.2, - pg-harness-client ==0.6.0, - pgp-wordlist ==0.1.0.3, - pg-transact ==0.3.2.0, - phantom-state ==0.2.1.2, - phatsort ==0.5.0.1, - picosat ==0.1.6, - pid1 ==0.1.3.0, - pinch ==0.4.1.2, - pipes ==4.3.16, - pipes-attoparsec ==0.5.1.5, - pipes-bytestring ==2.1.7, - pipes-concurrency ==2.0.14, - pipes-csv ==1.4.3, - pipes-extras ==1.0.15, - pipes-fastx ==0.3.0.0, - pipes-fluid ==0.6.0.1, - pipes-group ==1.0.12, - pipes-http ==1.0.6, - pipes-mongodb ==0.1.0.0, - pipes-ordered-zip ==1.2.1, - pipes-parse ==3.0.9, - pipes-random ==1.0.0.5, - pipes-safe ==2.3.4, - pipes-wai ==3.2.0, - pkgtreediff ==0.5.0, - place-cursor-at ==1.0.1, - placeholders ==0.1, - plaid ==0.1.0.4, - plotlyhs ==0.2.1, - pointed ==5.0.4, - pointedlist ==0.6.1, - pointless-fun ==1.1.0.8, - poll ==0.0.0.2, - poly ==0.5.0.0, - poly-arity ==0.1.0, - polynomials-bernstein ==1.1.2, - polyparse ==1.13, - polysemy ==1.6.0.0, - polysemy-extra ==0.2.0.0, - polysemy-fs ==0.1.0.0, - polysemy-fskvstore ==0.1.1.0, - polysemy-kvstore ==0.1.3.0, - polysemy-methodology ==0.2.1.0, - polysemy-path ==0.2.1.0, - polysemy-plugin ==0.4.1.1, - polysemy-several ==0.1.0.0, - polysemy-socket ==0.0.2.0, - polysemy-uncontrolled ==0.1.1.0, - polysemy-video ==0.2.0.1, - polysemy-vinyl ==0.1.5.0, - polysemy-webserver ==0.2.1.1, - pooled-io ==0.0.2.2, - port-utils ==0.2.1.0, - posix-paths ==0.3.0.0, - possibly ==1.0.0.0, - postgres-options ==0.2.0.0, - postgresql-binary ==0.12.4.4, - postgresql-libpq ==0.9.4.3, - postgresql-libpq-notify ==0.2.0.0, - postgresql-migration ==0.2.1.3, - postgresql-orm ==0.5.1, - postgresql-query ==3.9.0, - postgresql-schema ==0.1.14, - postgresql-simple ==0.6.4, - postgresql-simple-url ==0.2.1.0, - postgresql-syntax ==0.4.1, - postgresql-typed ==0.6.2.1, - post-mess-age ==0.2.1.0, - pptable ==0.3.0.0, - pqueue ==1.4.2.0, - prefix-units ==0.2.0, - prelude-compat ==0.0.0.2, - prelude-safeenum ==0.1.1.3, - pretty installed, - prettyclass ==1.0.0.0, - pretty-class ==1.0.1.1, - pretty-diff ==0.4.0.3, - pretty-hex ==1.1, - prettyprinter ==1.7.1, - prettyprinter-ansi-terminal ==1.1.3, - prettyprinter-compat-annotated-wl-pprint ==1.1, - prettyprinter-compat-ansi-wl-pprint ==1.0.2, - prettyprinter-compat-wl-pprint ==1.0.1, - prettyprinter-convert-ansi-wl-pprint ==1.1.2, - pretty-relative-time ==0.3.0.0, - pretty-show ==1.10, - pretty-simple ==4.0.0.0, - pretty-sop ==0.2.0.3, - pretty-terminal ==0.1.0.0, - pretty-types ==0.4.0.0, - primes ==0.2.1.0, - primitive ==0.7.3.0, - primitive-addr ==0.1.0.2, - PrimitiveArray ==0.10.1.1, - primitive-extras ==0.10.1.5, - primitive-offset ==0.2.0.0, - primitive-unaligned ==0.1.1.1, - primitive-unlifted ==0.1.3.1, - prim-uniq ==0.2, - print-console-colors ==0.1.0.0, - probability ==0.2.7, - process installed, - process-extras ==0.7.4, - product-profunctors ==0.11.0.3, - profiterole ==0.1, - profunctors ==5.6.2, - projectroot ==0.2.0.1, - project-template ==0.2.1.0, - prometheus ==2.2.3, - prometheus-client ==1.1.0, - prometheus-metrics-ghc ==1.0.1.2, - prometheus-wai-middleware ==1.0.1.0, - promises ==0.3, - prompt ==0.1.1.2, - prospect ==0.1.0.0, - protobuf ==0.2.1.3, - protobuf-simple ==0.1.1.1, - protocol-buffers ==2.4.17, - protocol-buffers-descriptor ==2.4.17, - protocol-radius ==0.0.1.1, - protocol-radius-test ==0.1.0.1, - proto-lens ==0.7.1.1, - proto-lens-arbitrary ==0.1.2.11, - proto-lens-optparse ==0.1.1.9, - proto-lens-protobuf-types ==0.7.1.2, - proto-lens-protoc ==0.7.1.1, - proto-lens-runtime ==0.7.0.2, - proto-lens-setup ==0.4.0.6, - protolude ==0.3.2, - proxied ==0.3.1, - psql-helpers ==0.1.0.0, - psqueues ==0.2.7.3, - pthread ==0.2.1, - ptr-poker ==0.1.2.8, - pulse-simple ==0.1.14, - pureMD5 ==2.1.4, - purescript-bridge ==0.14.0.0, - pusher-http-haskell ==2.1.0.11, - pvar ==1.0.0.0, - PyF ==0.10.2.0, - qchas ==1.1.0.1, - qm-interpolated-string ==0.3.1.0, - qrcode-core ==0.9.5, - qrcode-juicypixels ==0.8.3, - quadratic-irrational ==0.1.1, - QuasiText ==0.1.2.6, - queue-sheet ==0.7.0.2, - quickbench ==1.0.1, - QuickCheck ==2.14.2, - quickcheck-arbitrary-adt ==0.3.1.0, - quickcheck-assertions ==0.3.0, - quickcheck-classes ==0.6.5.0, - quickcheck-classes-base ==0.6.2.0, - quickcheck-higherorder ==0.1.0.1, - quickcheck-instances ==0.3.28, - quickcheck-io ==0.2.0, - quickcheck-simple ==0.1.1.1, - quickcheck-special ==0.1.0.6, - quickcheck-text ==0.1.2.1, - quickcheck-transformer ==0.3.1.1, - quickcheck-unicode ==1.0.1.0, - quicklz ==1.5.0.11, - quiet ==0.2, - quote-quot ==0.2.1.0, - radius ==0.7.1.0, - rainbow ==0.34.2.2, - rainbox ==0.26.0.0, - ral ==0.2.1, - rampart ==2.0.0.2, - ramus ==0.1.2, - rando ==0.0.0.4, - random ==1.2.1.1, - random-bytestring ==0.1.4, - random-fu ==0.3.0.0, - random-shuffle ==0.0.4, - random-source ==0.3.0.11, - random-tree ==0.6.0.5, - range ==0.3.0.2, - Ranged-sets ==0.4.0, - range-set-list ==0.1.3.1, - rank1dynamic ==0.4.1, - rank2classes ==1.4.4, - Rasterific ==0.7.5.4, - rasterific-svg ==0.3.3.2, - ratel ==2.0.0.3, - rate-limit ==1.4.2, - ratel-wai ==2.0.0.0, - rattle ==0.2, - rattletrap ==11.2.4, - Rattus ==0.5.0.1, - rawfilepath ==1.0.1, - rawstring-qm ==0.2.3.0, - raw-strings-qq ==1.1, - rcu ==0.2.6, - rdtsc ==1.3.0.1, - re2 ==0.3, - readable ==0.3.1, - read-editor ==0.1.0.2, - read-env-var ==1.0.0.0, - reanimate-svg ==0.13.0.1, - rebase ==1.15.0.3, - record-dot-preprocessor ==0.2.15, - record-hasfield ==1.0, - records-sop ==0.1.1.0, - record-wrangler ==0.1.1.0, - rec-smallarray ==0.1.0.0, - recursion-schemes ==5.2.2.2, - redact ==0.4.0.0, - reddit-scrape ==0.0.1, - redis-io ==1.1.0, - redis-resp ==1.0.0, - reducers ==3.12.4, - refact ==0.3.0.2, - ref-fd ==0.5, - refined ==0.6.3, - reflection ==2.1.6, - reform ==0.2.7.5, - reform-blaze ==0.2.4.4, - reform-hamlet ==0.0.5.3, - reform-happstack ==0.2.5.5, - RefSerialize ==0.4.0, - ref-tf ==0.5.0.1, - regex ==1.1.0.2, - regex-applicative ==0.3.4, - regex-applicative-text ==0.1.0.1, - regex-base ==0.94.0.2, - regex-compat ==0.95.2.1, - regex-pcre ==0.95.0.0, - regex-pcre-builtin ==0.95.2.3.8.44, - regex-posix ==0.96.0.1, - regex-posix-clib ==2.7, - regex-tdfa ==1.3.2, - regex-with-pcre ==1.1.0.2, - reinterpret-cast ==0.1.0, - rel8 ==1.3.1.0, - reliable-io ==0.0.2, - relude ==1.0.0.1, - renderable ==0.2.0.1, - reorder-expression ==0.1.0.0, - repa ==3.4.1.5, - repa-io ==3.4.1.2, - replace-attoparsec ==1.4.5.0, - replace-megaparsec ==1.4.5.0, - repline ==0.4.2.0, - req ==3.10.0, - req-conduit ==1.0.1, - require ==0.4.11, - rerebase ==1.15.0.3, - reroute ==0.6.0.0, - rescue ==0.4.2.1, - resistor-cube ==0.0.1.4, - resolv ==0.1.2.0, - resource-pool ==0.2.3.2, - resourcet ==1.2.6, - result ==0.2.6.0, - retry ==0.9.3.0, - rev-state ==0.1.2, - rfc1751 ==0.1.3, - rfc5051 ==0.2, - rg ==1.4.0.0, - rhbzquery ==0.4.4, - riak-protobuf ==0.25.0.0, - rio ==0.1.22.0, - rio-orphans ==0.1.2.0, - rio-prettyprint ==0.1.1.0, - rng-utils ==0.3.1, - roc-id ==0.1.0.0, - rocksdb-haskell ==1.0.1, - rocksdb-haskell-jprupp ==2.1.4, - rocksdb-query ==0.4.2, - roles ==0.2.1.0, - rollbar ==1.1.3, - rope-utf16-splay ==0.3.2.0, - rosezipper ==0.2, - rot13 ==0.2.0.1, - rpmbuild-order ==0.4.8, - rpm-nvr ==0.1.2, - rp-tree ==0.7.1, - RSA ==2.4.1, - rss-conduit ==0.6.0.1, - runmemo ==1.0.0.1, - rvar ==0.3.0.1, - s3-signer ==0.5.0.0, - safe ==0.3.19, - safe-coloured-text ==0.1.0.0, - safe-coloured-text-terminfo ==0.0.0.0, - safecopy ==0.10.4.2, - safe-decimal ==0.2.1.0, - safe-exceptions ==0.1.7.3, - safe-exceptions-checked ==0.1.0, - safe-foldable ==0.1.0.0, - safeio ==0.0.5.0, - safe-json ==1.1.3.1, - safe-money ==0.9.1, - SafeSemaphore ==0.10.1, - salak ==0.3.6, - salak-yaml ==0.3.5.3, - saltine ==0.1.1.1, - salve ==2.0.0.0, - sample-frame ==0.0.3, - sample-frame-np ==0.0.4.1, - sampling ==0.3.5, - sandwich ==0.1.0.10, - sandwich-quickcheck ==0.1.0.6, - sandwich-slack ==0.1.0.6, - say ==0.1.0.1, - sbp ==4.1.6, - sbv ==8.17, - scalpel ==0.6.2, - scalpel-core ==0.6.2, - scanf ==0.1.0.0, - scanner ==0.3.1, - scheduler ==2.0.0.1, - SciBaseTypes ==0.1.1.0, - scientific ==0.3.7.0, - scotty ==0.12, - scrypt ==0.5.0, - sdl2 ==2.5.3.0, - sdl2-ttf ==2.1.3, - search-algorithms ==0.3.2, - secp256k1-haskell ==0.6.1, - securemem ==0.1.10, - selda ==0.5.1.0, - selda-sqlite ==0.1.7.1, - selections ==0.3.0.0, - selective ==0.5, - semialign ==1.2.0.1, - semialign-indexed ==1.2, - semialign-optics ==1.2, - semigroupoid-extras ==5, - semigroupoids ==5.3.7, - semigroups ==0.19.2, - semirings ==0.6, - semiring-simple ==1.0.0.1, - semver ==0.4.0.1, - sendfile ==0.7.11.4, - seqalign ==0.2.0.4, - seqid ==0.6.2, - seqid-streams ==0.7.2, - sequence-formats ==1.6.6.1, - sequenceTools ==1.5.2, - serf ==0.1.1.0, - serialise ==0.2.5.0, - servant ==0.19, - servant-auth ==0.4.1.0, - servant-auth-client ==0.4.1.0, - servant-auth-docs ==0.2.10.0, - servant-auth-server ==0.4.7.0, - servant-auth-swagger ==0.2.10.1, - servant-auth-wordpress ==1.0.0.2, - servant-blaze ==0.9.1, - servant-checked-exceptions ==2.2.0.1, - servant-checked-exceptions-core ==2.2.0.1, - servant-client ==0.19, - servant-client-core ==0.19, - servant-conduit ==0.15.1, - servant-docs ==0.12, - servant-elm ==0.7.2, - servant-exceptions ==0.2.1, - servant-exceptions-server ==0.2.1, - servant-foreign ==0.15.4, - servant-JuicyPixels ==0.3.1.0, - servant-lucid ==0.9.0.5, - servant-machines ==0.15.1, - servant-multipart ==0.12.1, - servant-multipart-api ==0.12.1, - servant-multipart-client ==0.12.1, - servant-openapi3 ==2.0.1.5, - servant-pipes ==0.15.3, - servant-rawm ==1.0.0.0, - servant-ruby ==0.9.0.0, - servant-server ==0.19.1, - servant-static-th ==1.0.0.0, - servant-subscriber ==0.7.0.0, - servant-swagger ==1.1.11, - servant-swagger-ui ==0.3.5.4.5.0, - servant-swagger-ui-core ==0.3.5, - servant-swagger-ui-redoc ==0.3.4.1.22.3, - servant-websockets ==2.0.0, - servant-xml ==1.0.1.4, - serversession ==1.0.3, - serversession-frontend-wai ==1.0.1, - servius ==1.2.3.0, - ses-html ==0.4.0.0, - set-cover ==0.1.1, - setenv ==0.1.1.3, - setlocale ==1.0.0.10, - set-monad ==0.3.0.0, - sets ==0.0.6.2, - sexp-grammar ==2.3.3.1, - sexpr-parser ==0.2.2.0, - SHA ==1.6.4.4, - shake ==0.19.6, - shake-language-c ==0.12.0, - shake-plus ==0.3.4.0, - shakespeare ==2.0.30, - shared-memory ==0.2.0.0, - ShellCheck ==0.8.0, - shell-conduit ==5.0.0, - shell-escape ==0.2.0, - shellmet ==0.0.4.1, - shelltestrunner ==1.9, - shell-utility ==0.1, - shelly ==1.10.0, - shikensu ==0.4.1, - should-not-typecheck ==2.1.0, - show-combinators ==0.2.0.0, - siggy-chardust ==1.0.0, - signal ==0.1.0.4, - silently ==1.2.5.2, - simple-affine-space ==0.1.1, - simple-cabal ==0.1.3, - simple-cmd ==0.2.7, - simple-cmd-args ==0.1.8, - simple-log ==0.9.12, - simple-media-timestamp ==0.2.0.0, - simple-media-timestamp-attoparsec ==0.1.0.0, - simple-media-timestamp-formatting ==0.1.1.0, - simple-reflect ==0.3.3, - simple-sendfile ==0.2.30, - simple-vec3 ==0.6.0.1, - since ==0.0.0, - singleton-bool ==0.1.6, - singleton-nats ==0.4.6, - singletons ==3.0.1, - singletons-base ==3.0, - singletons-presburger ==0.6.1.0, - singletons-th ==3.0, - siphash ==1.0.3, - Sit ==0.2022.3.18, - sitemap-gen ==0.1.0.0, - sized ==1.0.0.1, - skein ==1.0.9.4, - skews ==0.1.0.3, - skip-var ==0.1.1.0, - skylighting ==0.12.3.1, - skylighting-core ==0.12.3.1, - slack-progressbar ==0.1.0.1, - slave-thread ==1.1.0.1, - slist ==0.2.0.0, - slynx ==0.6.1.1, - smallcheck ==1.2.1, - smash ==0.1.3, - smash-microlens ==0.1.0.2, - smtp-mail ==0.3.0.0, - snap-blaze ==0.2.1.5, - snap-core ==1.0.5.0, - snappy ==0.2.0.2, - snowflake ==0.1.1.1, - soap ==0.2.3.6, - soap-openssl ==0.1.0.2, - soap-tls ==0.1.1.4, - socket ==0.8.3.0, - socks ==0.6.1, - solana-staking-csvs ==0.1.2.0, - some ==1.0.3, - some-dict-of ==0.1.0.2, - sop-core ==0.5.0.2, - sort ==1.0.0.0, - sorted-list ==0.2.1.0, - sound-collage ==0.2.1, - sourcemap ==0.1.7, - sox ==0.2.3.1, - soxlib ==0.0.3.1, - spacecookie ==1.0.0.1, - sparse-linear-algebra ==0.3.1, - spatial-math ==0.5.0.1, - special-values ==0.1.0.0, - speculate ==0.4.14, - speedy-slice ==0.3.2, - Spintax ==0.3.6, - splice ==0.6.1.1, - splint ==1.0.2.0, - split ==0.2.3.5, - splitmix ==0.1.0.4, - splitmix-distributions ==0.9.0.0, - split-record ==0.1.1.4, - Spock-api ==0.14.0.0, - spoon ==0.3.1, - spreadsheet ==0.1.3.8, - sqlcli ==0.2.2.0, - sqlcli-odbc ==0.2.0.1, - sqlite-simple ==0.4.18.2, - sql-words ==0.1.6.4, - squeather ==0.8.0.0, - srcloc ==0.6.0.1, - srt ==0.1.1.0, - srt-attoparsec ==0.1.0.0, - srt-dhall ==0.1.0.0, - srt-formatting ==0.1.0.0, - stache ==2.3.3, - stack-all ==0.4.0.1, - stack-clean-old ==0.4.6, - stackcollapse-ghc ==0.0.1.4, - stack-templatizer ==0.1.0.2, - state-codes ==0.1.3, - stateref ==0.3, - StateVar ==1.2.2, - stateWriter ==0.3.0, - static-text ==0.2.0.7, - statistics ==0.16.1.0, - status-notifier-item ==0.3.1.0, - stb-image-redux ==0.2.1.2, - step-function ==0.2, - stitch ==0.6.0.0, - stm installed, - stm-chans ==3.0.0.6, - stm-conduit ==4.0.1, - stm-containers ==1.2, - stm-delay ==0.1.1.1, - stm-extras ==0.1.0.3, - stm-hamt ==1.2.0.8, - stm-lifted ==2.5.0.0, - STMonadTrans ==0.4.6, - stm-split ==0.0.2.1, - stm-supply ==0.2.0.0, - stopwatch ==0.1.0.6, - storable-complex ==0.2.3.0, - storable-endian ==0.2.6.1, - storable-record ==0.0.6, - storable-tuple ==0.0.3.3, - storablevector ==0.2.13.1, - store ==0.7.16, - store-core ==0.4.4.4, - store-streaming ==0.2.0.3, - Stream ==0.4.7.2, - streaming ==0.2.3.1, - streaming-attoparsec ==1.0.0.1, - streaming-bytestring ==0.2.3, - streaming-cassava ==0.2.0.0, - streaming-commons ==0.2.2.4, - streamly ==0.8.1.1, - streamly-bytestring ==0.1.4, - streams ==3.3, - streamt ==0.5.0.1, - strict ==0.4.0.1, - strict-concurrency ==0.2.4.3, - strict-list ==0.1.7, - strict-tuple ==0.1.5.1, - strict-tuple-lens ==0.2, - strict-wrapper ==0.0.0.0, - stringbuilder ==0.5.1, - string-class ==0.1.7.0, - string-combinators ==0.6.0.5, - string-conv ==0.2.0, - string-conversions ==0.4.0.1, - string-interpolate ==0.3.1.2, - string-qq ==0.0.4, - string-random ==0.1.4.2, - stringsearch ==0.3.6.6, - string-transform ==1.1.1, - stripe-concepts ==1.0.3.1, - stripe-scotty ==1.1.0.2, - stripe-signature ==1.0.0.14, - stripe-wreq ==1.0.1.14, - strive ==6.0.0.3, - strong-path ==1.1.4.0, - structs ==0.1.6, - structured ==0.1.1, - structured-cli ==2.7.0.1, - subcategories ==0.2.0.0, - sum-type-boilerplate ==0.1.1, - sundown ==0.6, - superbuffer ==0.3.1.2, - svg-builder ==0.1.1, - SVGFonts ==1.8.0.1, - svg-tree ==0.6.2.4, - swagger2 ==2.8.4, - swish ==0.10.2.0, - syb ==0.7.2.1, - sydtest-discover ==0.0.0.1, - symbol ==0.2.4, - symengine ==0.1.2.0, - symmetry-operations-symbols ==0.0.2.1, - synthesizer-alsa ==0.5.0.6, - synthesizer-core ==0.8.2.1, - synthesizer-dimensional ==0.8.1, - synthesizer-midi ==0.6.1.1, - sysinfo ==0.1.1, - system-argv0 ==0.1.1, - systemd ==2.3.0, - system-fileio ==0.3.16.4, - system-filepath ==0.4.14, - system-info ==0.5.2, - tabular ==0.2.2.8, - tagchup ==0.4.1.1, - tagged ==0.8.6.1, - tagged-binary ==0.2.0.1, - tagged-identity ==0.1.3, - tagged-transformer ==0.8.2, - tagshare ==0.0, - tagsoup ==0.14.8, - tagstream-conduit ==0.5.6, - tao ==1.0.0, - tao-example ==1.0.0, - tar ==0.5.1.1, - tar-conduit ==0.3.2, - tardis ==0.4.4.0, - tasty ==1.4.2.3, - tasty-ant-xml ==1.1.8, - tasty-bench ==0.3.2, - tasty-dejafu ==2.0.0.8, - tasty-discover ==4.2.4, - tasty-expected-failure ==0.12.3, - tasty-fail-fast ==0.0.3, - tasty-focus ==1.0.1, - tasty-golden ==2.3.5, - tasty-hedgehog ==1.1.0.0, - tasty-hslua ==1.0.2, - tasty-hspec ==1.2.0.1, - tasty-html ==0.4.1.4, - tasty-hunit ==0.10.0.3, - tasty-hunit-compat ==0.2.0.1, - tasty-inspection-testing ==0.1.0.1, - tasty-kat ==0.0.3, - tasty-leancheck ==0.0.2, - tasty-lua ==1.0.2, - tasty-program ==1.0.5, - tasty-quickcheck ==0.10.2, - tasty-rerun ==1.1.18, - tasty-silver ==3.3.1.1, - tasty-smallcheck ==0.8.2, - tasty-tap ==0.1.0, - tasty-test-reporter ==0.1.1.4, - tasty-th ==0.1.7, - tasty-wai ==0.1.2.0, - TCache ==0.12.1, - tce-conf ==1.3, - tcp-streams ==1.0.1.1, - tdigest ==0.2.1.1, - teardown ==0.5.0.1, - telegram-bot-simple ==0.4.5, - template-haskell installed, - template-haskell-compat-v0208 ==0.1.9, - temporary ==1.3, - temporary-rc ==1.2.0.3, - temporary-resourcet ==0.1.0.1, - tensorflow-test ==0.1.0.0, - tensors ==0.1.5, - termbox ==0.3.0, - terminal-progress-bar ==0.4.1, - terminal-size ==0.3.3, - terminfo installed, - termonad ==4.2.0.1, - test-framework ==0.8.2.0, - test-framework-hunit ==0.3.0.2, - test-framework-leancheck ==0.0.4, - test-framework-quickcheck2 ==0.3.0.5, - test-framework-smallcheck ==0.2, - test-fun ==0.1.0.0, - testing-type-modifiers ==0.1.0.1, - texmath ==0.12.4, - text installed, - text-ansi ==0.1.1, - text-binary ==0.2.1.1, - text-builder ==0.6.6.5, - text-builder-dev ==0.2.1, - text-conversions ==0.3.1.1, - text-icu ==0.7.1.0, - text-latin1 ==0.3.1, - text-ldap ==0.1.1.14, - textlocal ==0.1.0.5, - text-manipulate ==0.3.1.0, - text-metrics ==0.3.2, - text-postgresql ==0.0.3.1, - text-printer ==0.5.0.2, - text-regex-replace ==0.1.1.4, - text-rope ==0.1, - text-short ==0.1.5, - text-show ==3.9.7, - text-show-instances ==3.8.6, - text-zipper ==0.11, - tfp ==1.0.2, - tf-random ==0.5, - th-abstraction ==0.4.4.0, - th-bang-compat ==0.0.1.0, - th-compat ==0.1.4, - th-constraint-compat ==0.0.1.0, - th-desugar ==1.12, - th-env ==0.1.1, - these ==1.1.1.1, - these-lens ==1.0.1.2, - these-optics ==1.0.1.2, - these-skinny ==0.7.5, - th-expand-syns ==0.4.10.0, - th-extras ==0.0.0.6, - th-lego ==0.3.0.1, - th-lift ==0.8.2, - th-lift-instances ==0.1.19, - th-nowq ==0.1.0.5, - th-orphans ==0.13.13, - th-printf ==0.7, - thread-hierarchy ==0.3.0.2, - thread-local-storage ==0.2, - threads ==0.5.1.6, - thread-supervisor ==0.2.0.0, - th-reify-compat ==0.0.1.5, - th-reify-many ==0.1.10, - through-text ==0.1.0.0, - th-strict-compat ==0.1.0.1, - th-test-utils ==1.1.1, - th-utilities ==0.2.4.3, - tidal ==1.7.10, - tile ==0.3.0.0, - time installed, - time-compat ==1.9.6.1, - timeit ==2.0, - timelens ==0.2.0.2, - time-lens ==0.4.0.2, - time-locale-compat ==0.1.1.5, - time-locale-vietnamese ==1.0.0.0, - time-manager ==0.0.0, - time-parsers ==0.1.2.1, - timerep ==2.0.1.0, - timers-tick ==0.5.0.1, - timer-wheel ==0.3.0, - timespan ==0.4.0.0, - time-units ==1.0.0, - timezone-olson ==0.2.1, - timezone-olson-th ==0.1.0.11, - timezone-series ==0.1.13, - tinylog ==0.15.0, - titlecase ==1.0.1, - tldr ==0.9.2, - tls ==1.5.8, - tls-debug ==0.4.8, - tls-session-manager ==0.0.4, - tlynx ==0.6.1.1, - tmapchan ==0.0.3, - tmapmvar ==0.0.4, - tmp-postgres ==1.34.1.0, - tmp-proc ==0.5.1.2, - tophat ==1.0.5.1, - topograph ==1.0.0.1, - torsor ==0.1, - tostring ==0.2.1.1, - tracing ==0.0.7.3, - tracing-control ==0.0.7.3, - transaction ==0.1.1.3, - transformers installed, - transformers-base ==0.4.6, - transformers-bifunctors ==0.1, - transformers-compat ==0.6.6, - transformers-either ==0.1.2, - transformers-fix ==1.0, - transient ==0.7.0.0, - traverse-with-class ==1.0.1.1, - tree-diff ==0.2.1.1, - tree-fun ==0.8.1.0, - tree-view ==0.5.1, - trifecta ==2.1.2, - trimdent ==0.1.0.0, - triplesec ==0.2.2.1, - trivial-constraint ==0.7.0.0, - tsv2csv ==0.1.0.2, - ttc ==1.1.1.1, - ttl-hashtables ==1.4.1.0, - ttrie ==0.1.2.2, - tuple ==0.3.0.2, - tuples ==0.1.0.0, - tuples-homogenous-h98 ==0.1.1.0, - tuple-sop ==0.3.1.0, - tuple-th ==0.2.5, - turtle ==1.5.25, - twitter-conduit ==0.6.1, - twitter-types ==0.11.0, - twitter-types-lens ==0.11.0, - TypeCompose ==0.9.14, - typed-process ==0.2.10.1, - type-equality ==1, - type-errors ==0.2.0.0, - type-errors-pretty ==0.0.1.2, - type-fun ==0.1.3, - type-hint ==0.1, - type-level-integers ==0.0.1, - type-level-kv-list ==1.1.0, - type-level-natural-number ==2.0, - type-level-numbers ==0.1.1.2, - typelits-witnesses ==0.4.0.0, - type-map ==0.1.7.0, - type-natural ==1.1.0.1, - typenums ==0.1.4, - type-of-html ==1.6.2.0, - type-of-html-static ==0.1.0.2, - type-operators ==0.2.0.0, - type-spec ==0.4.0.0, - typography-geometry ==1.0.1.0, - tz ==0.1.3.6, - tzdata ==0.2.20220815.0, - ua-parser ==0.7.7.0, - uglymemo ==0.1.0.1, - unagi-chan ==0.4.1.4, - unbounded-delays ==0.1.1.1, - unbound-generics ==0.4.2, - unboxed-ref ==0.4.0.0, - unboxing-vector ==0.2.0.0, - uncaught-exception ==0.1.0, - unconstrained ==0.1.0.2, - unexceptionalio ==0.5.1, - unexceptionalio-trans ==0.5.1, - unicode ==0.0.1.1, - unicode-collation ==0.1.3.2, - unicode-data ==0.3.0, - unicode-show ==0.1.1.1, - unicode-transforms ==0.4.0.1, - unidecode ==0.1.0.4, - unification-fd ==0.11.2, - union ==0.1.2, - union-angle ==0.1.0.1, - union-find ==0.2, - unipatterns ==0.0.0.0, - uniplate ==1.6.13, - uniq-deep ==1.2.1, - unique ==0.0.1, - unique-logic ==0.4, - unique-logic-tf ==0.5.1, - unit-constraint ==0.0.0, - units-parser ==0.1.1.4, - universe ==1.2.2, - universe-base ==1.1.3, - universe-dependent-sum ==1.3, - universe-instances-extended ==1.1.3, - universe-reverse-instances ==1.1.1, - universe-some ==1.2.1, - universum ==1.7.3, - unix installed, - unix-bytestring ==0.3.7.7, - unix-compat ==0.5.4, - unix-time ==0.4.7, - unliftio ==0.2.22.0, - unliftio-core ==0.2.0.1, - unliftio-path ==0.0.2.0, - unliftio-pool ==0.2.2.0, - unliftio-streams ==0.1.1.1, - unlit ==0.4.0.0, - unordered-containers ==0.2.17.0, - unsafe ==0.0, - urbit-hob ==0.3.3, - uri-bytestring ==0.3.3.1, - uri-bytestring-aeson ==0.1.0.8, - uri-encode ==1.5.0.7, - url ==2.1.3, - users ==0.5.0.0, - users-postgresql-simple ==0.5.0.2, - users-test ==0.5.0.1, - utf8-light ==0.4.2, - utf8-string ==1.0.2, - utility-ht ==0.0.16, - uuid ==1.3.15, - uuid-types ==1.0.5, - valida ==1.1.0, - valida-base ==0.2.0, - validate-input ==0.5.0.0, - validation ==1.1.2, - validity ==0.12.0.1, - validity-bytestring ==0.4.1.1, - validity-containers ==0.5.0.4, - validity-path ==0.4.0.1, - validity-persistent ==0.0.0.0, - validity-primitive ==0.0.0.1, - validity-scientific ==0.2.0.3, - validity-text ==0.3.1.3, - validity-time ==0.5.0.0, - validity-unordered-containers ==0.2.0.3, - validity-uuid ==0.1.0.3, - validity-vector ==0.2.0.3, - valor ==1.0.0.0, - variable-media-field ==0.1.0.0, - variable-media-field-dhall ==0.1.0.0, - variable-media-field-optics ==0.1.0.0, - varying ==0.8.1.0, - vault ==0.3.1.5, - vcs-ignore ==0.0.2.0, - vec ==0.4.1, - vector ==0.12.3.1, - vector-algorithms ==0.8.0.4, - vector-binary-instances ==0.2.5.2, - vector-buffer ==0.4.1, - vector-builder ==0.3.8.4, - vector-bytes-instances ==0.1.1, - vector-circular ==0.1.4, - vector-instances ==3.4, - vector-mmap ==0.0.3, - vector-rotcev ==0.1.0.1, - vector-sized ==1.5.0, - vector-space ==0.16, - vector-split ==1.0.0.2, - vector-th-unbox ==0.2.2, - vectortiles ==1.5.1, - verbosity ==0.4.0.0, - versions ==5.0.3, - vformat ==0.14.1.0, - vformat-time ==0.1.0.0, - ViennaRNAParser ==1.3.3, - vinyl ==0.13.3, - vinyl-loeb ==0.0.1.0, - vivid ==0.5.2.0, - vivid-osc ==0.5.0.0, - vivid-supercollider ==0.4.1.2, - void ==0.7.3, - vty ==5.33, - wai ==3.2.3, - wai-app-static ==3.1.7.4, - wai-cli ==0.2.3, - wai-conduit ==3.0.0.4, - wai-cors ==0.2.7, - wai-enforce-https ==1.0.0.0, - wai-eventsource ==3.0.0, - wai-extra ==3.1.12.1, - wai-feature-flags ==0.1.0.4, - wai-handler-launch ==3.0.3.1, - wai-logger ==2.4.0, - wai-middleware-caching ==0.1.0.2, - wai-middleware-caching-lru ==0.1.0.0, - wai-middleware-caching-redis ==0.2.0.0, - wai-middleware-clacks ==0.1.0.1, - wai-middleware-delegate ==0.1.3.1, - wai-middleware-prometheus ==1.0.0.1, - wai-middleware-static ==0.9.2, - wai-rate-limit ==0.2.0.0, - wai-rate-limit-redis ==0.2.0.1, - wai-saml2 ==0.2.1.3, - wai-session ==0.3.3, - wai-session-postgresql ==0.2.1.3, - wai-session-redis ==0.1.0.5, - wai-slack-middleware ==0.2.0, - wai-transformers ==0.1.0, - wai-websockets ==3.0.1.2, - wakame ==0.1.0.0, - warp ==3.3.21, - warp-tls ==3.3.2, - warp-tls-uid ==0.2.0.6, - wave ==0.2.0, - wcwidth ==0.0.2, - webex-teams-api ==0.2.0.1, - webex-teams-conduit ==0.2.0.1, - webgear-core ==1.0.3, - webgear-openapi ==1.0.3, - webgear-server ==1.0.3, - webpage ==0.0.5.1, - web-plugins ==0.4.1, - web-routes ==0.27.14.4, - web-routes-boomerang ==0.28.4.3, - web-routes-happstack ==0.23.12.2, - web-routes-hsp ==0.24.6.2, - web-routes-wai ==0.24.3.2, - webrtc-vad ==0.1.0.3, - websockets ==0.12.7.3, - websockets-simple ==0.2.0, - weigh ==0.0.16, - wide-word ==0.1.1.2, - wikicfp-scraper ==0.1.0.12, - wild-bind ==0.1.2.8, - wild-bind-x11 ==0.2.0.14, - Win32 ==2.12.0.1, - Win32-notify ==0.3.0.3, - windns ==0.1.0.1, - wire-streams ==0.1.1.0, - witch ==1.0.0.2, - withdependencies ==0.3.0, - witherable ==0.4.2, - within ==0.2.0.1, - with-location ==0.1.0, - with-utf8 ==1.0.2.3, - witness ==0.5, - wizards ==1.0.3, - wl-pprint ==1.2.1, - wl-pprint-annotated ==0.1.0.1, - wl-pprint-console ==0.1.0.2, - wl-pprint-text ==1.2.0.2, - word8 ==0.1.3, - wordpress-auth ==1.0.0.1, - word-trie ==0.3.0, - word-wrap ==0.5, - world-peace ==1.0.2.0, - wrap ==0.0.0, - wreq ==0.5.3.3, - wreq-stringless ==0.5.9.1, - writer-cps-exceptions ==0.1.0.1, - writer-cps-mtl ==0.1.1.6, - writer-cps-transformers ==0.5.6.1, - wss-client ==0.3.0.0, - wuss ==1.1.19, - X11 ==1.10.2, - X11-xft ==0.3.4, - x11-xim ==0.0.9.0, - x509 ==1.7.7, - x509-store ==1.6.9, - x509-system ==1.6.7, - x509-validation ==1.6.12, - Xauth ==0.1, - xdg-basedir ==0.2.2, - xdg-desktop-entry ==0.1.1.1, - xdg-userdirs ==0.1.0.2, - xeno ==0.5, - xhtml installed, - xlsx ==0.8.4, - xlsx-tabular ==0.2.2.1, - xml ==1.3.14, - xml-basic ==0.1.3.1, - xmlbf ==0.6.1, - xmlbf-xeno ==0.2, - xmlbf-xmlhtml ==0.2, - xml-conduit ==1.9.1.1, - xml-conduit-writer ==0.1.1.2, - xmlgen ==0.6.2.2, - xml-hamlet ==0.5.0.2, - xml-helpers ==1.0.0, - xmlhtml ==0.2.5.2, - xml-html-qq ==0.1.0.1, - xml-indexed-cursor ==0.1.1.0, - xml-parser ==0.1.1, - xml-picklers ==0.3.6, - xml-to-json-fast ==2.0.0, - xml-types ==0.3.8, - xmonad ==0.17.0, - xmonad-contrib ==0.17.0, - xmonad-extras ==0.17.0, - xor ==0.0.1.1, - xss-sanitize ==0.3.7, - xxhash-ffi ==0.2.0.0, - yaml ==0.11.8.0, - yamlparse-applicative ==0.2.0.1, - yaml-unscrambler ==0.1.0.9, - yarn-lock ==0.6.5, - yeshql-core ==4.2.0.0, - yesod ==1.6.2, - yesod-alerts ==0.1.3.0, - yesod-auth ==1.6.11, - yesod-auth-basic ==0.1.0.3, - yesod-auth-hashdb ==1.7.1.7, - yesod-auth-oauth2 ==0.7.0.2, - yesod-bin ==1.6.2.1, - yesod-core ==1.6.24.0, - yesod-eventsource ==1.6.0.1, - yesod-form ==1.7.0, - yesod-form-bootstrap4 ==3.0.1, - yesod-gitrepo ==0.3.0, - yesod-gitrev ==0.2.2, - yesod-markdown ==0.12.6.13, - yesod-newsfeed ==1.7.0.0, - yesod-page-cursor ==2.0.1.0, - yesod-paginator ==1.1.2.2, - yesod-persistent ==1.6.0.8, - yesod-recaptcha2 ==1.0.2, - yesod-routes-flow ==3.0.0.2, - yesod-sitemap ==1.6.0, - yesod-static ==1.6.1.0, - yesod-test ==1.6.14, - yesod-websockets ==0.3.0.3, - yes-precure5-command ==5.5.3, - yi-rope ==0.11, - yjsvg ==0.2.0.1, - yjtools ==0.9.18, - yoga ==0.0.0.5, - youtube ==0.2.1.1, - zenacy-html ==2.0.4, - zenacy-unicode ==1.0.1, - zero ==0.1.5, - zeromq4-haskell ==0.8.0, - zeromq4-patterns ==0.3.1.0, - zim-parser ==0.2.1.0, - zio ==0.1.0.2, - zip ==1.7.2, - zip-archive ==0.4.2.1, - zipper-extra ==0.1.3.2, - zippers ==0.3.2, - zip-stream ==0.2.1.0, - zlib ==0.6.3.0, - zlib-bindings ==0.1.1.5, - zlib-lens ==0.1.2.1, - zot ==0.0.3, - zstd ==0.1.3.0, - ztail ==1.2.0.3 diff --git a/testing/darcs/cabal.project.freeze b/testing/darcs/cabal.project.freeze new file mode 100644 index 00000000000..c6677adac2a --- /dev/null +++ b/testing/darcs/cabal.project.freeze @@ -0,0 +1,217 @@ +active-repositories: hackage.haskell.org:merge +constraints: any.Cabal ==3.10.2.0, + any.Cabal-syntax ==3.10.2.0, + any.FindBin ==0.0.5, + any.HUnit ==1.6.2.0, + any.OneTuple ==0.4.1.1, + any.QuickCheck ==2.14.3, + QuickCheck -old-random +templatehaskell, + any.StateVar ==1.2.2, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, + any.ansi-terminal ==1.1, + ansi-terminal -example, + any.ansi-terminal-types ==1.1, + any.ansi-wl-pprint ==1.0.2, + ansi-wl-pprint -example, + any.appar ==0.1.8, + any.array ==0.5.6.0, + any.asn1-encoding ==0.9.6, + any.asn1-parse ==0.9.5, + any.asn1-types ==0.3.4, + any.assoc ==1.1, + assoc +tagged, + any.async ==2.2.5, + async -bench, + any.attoparsec ==0.14.4, + attoparsec -developer, + any.attoparsec-aeson ==2.2.0.1, + any.base ==4.19.1.0, + any.base-orphans ==0.9.1, + any.base16-bytestring ==1.0.2.0, + any.base64-bytestring ==1.2.1.0, + any.basement ==0.0.16, + any.bifunctors ==5.6.2, + bifunctors +tagged, + any.binary ==0.8.9.1, + any.bitvec ==1.1.5.0, + bitvec +simd, + any.blaze-builder ==0.4.2.3, + any.boring ==0.2.1, + boring +tagged, + any.byteorder ==1.0.4, + any.bytestring ==0.12.1.0, + any.call-stack ==0.4.0, + any.case-insensitive ==1.2.1.0, + any.cereal ==0.5.8.3, + cereal -bytestring-builder, + any.cmdargs ==0.10.22, + cmdargs +quotation -testprog, + any.colour ==2.3.6, + any.comonad ==5.0.8, + comonad +containers +distributive +indexed-traversable, + any.conduit ==1.3.5, + any.conduit-extra ==1.3.6, + any.constraints ==0.14, + any.containers ==0.6.8, + any.contravariant ==1.5.5, + contravariant +semigroups +statevar +tagged, + any.cookie ==0.5.0, + any.crypton ==0.34, + crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, + any.crypton-connection ==0.3.2, + any.crypton-x509 ==1.7.6, + any.crypton-x509-store ==1.6.9, + any.crypton-x509-system ==1.6.7, + any.crypton-x509-validation ==1.6.12, + any.cryptonite ==0.30, + cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes, + darcs +executable -rts -static +terminfo +threaded -warn-as-error, + any.data-default-class ==0.1.2.0, + any.data-fix ==0.3.2, + any.data-ordlist ==0.4.7.0, + any.deepseq ==1.5.0.0, + any.digest ==0.0.2.1, + digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval -pkg-config, + any.directory ==1.3.8.1, + any.distributive ==0.6.2.1, + distributive +semigroups +tagged, + any.dlist ==1.0, + dlist -werror, + any.exceptions ==0.10.7, + any.extensible-exceptions ==0.1.1.4, + any.fgl ==5.8.2.0, + fgl +containers042, + any.filepath ==1.4.200.1, + any.filtrable ==0.1.6.0, + filtrable +containers, + any.generically ==0.1.1, + any.ghc-bignum ==1.3, + any.ghc-boot-th ==9.8.2, + any.ghc-prim ==0.11.0, + any.hashable ==1.4.4.0, + hashable +integer-gmp -random-initial-seed, + any.haskeline ==0.8.2.1, + any.hostname ==1.0, + any.hourglass ==0.2.12, + any.hsc2hs ==0.68.10, + hsc2hs -in-ghc-tree, + any.html ==1.0.1.2, + any.http-client ==0.7.17, + http-client +network-uri, + any.http-client-tls ==0.3.6.3, + any.http-conduit ==2.3.8.3, + http-conduit +aeson, + any.http-types ==0.12.4, + any.indexed-traversable ==0.1.3, + any.indexed-traversable-instances ==0.1.1.2, + any.integer-conversion ==0.1.0.1, + any.integer-gmp ==1.1, + any.integer-logarithms ==1.0.3.1, + integer-logarithms -check-bounds +integer-gmp, + any.iproute ==1.7.12, + any.leancheck ==1.0.2, + any.memory ==0.18.0, + memory +support_bytestring +support_deepseq, + any.mime-types ==0.1.2.0, + any.mmap ==0.5.9, + mmap -mmaptest, + any.monad-control ==1.0.3.1, + any.mono-traversable ==1.0.17.0, + any.mtl ==2.3.1, + any.network ==3.1.4.0, + network -devel, + any.network-uri ==2.6.4.2, + any.old-locale ==1.0.0.7, + any.old-time ==1.1.0.4, + any.os-string ==2.0.2, + any.parsec ==3.1.17.0, + any.pem ==0.2.4, + any.pretty ==1.1.3.6, + any.prettyprinter ==1.7.1, + prettyprinter -buildreadme +text, + any.prettyprinter-ansi-terminal ==1.1.3, + any.prettyprinter-compat-ansi-wl-pprint ==1.0.2, + any.primitive ==0.9.0.0, + any.process ==1.6.18.0, + any.quickcheck-instances ==0.3.30, + quickcheck-instances -bytestring-builder, + any.random ==1.2.1.2, + any.regex-applicative ==0.3.4, + any.regex-base ==0.94.0.2, + any.regex-posix ==0.96.0.1, + regex-posix -_regex-posix-clib, + any.regex-tdfa ==1.3.2.2, + regex-tdfa +doctest -force-o2, + any.resourcet ==1.3.0, + any.rts ==1.0.2, + any.safe ==0.3.21, + any.scientific ==0.3.7.0, + scientific -bytestring-builder -integer-simple, + any.semialign ==1.3, + semialign +semigroupoids, + any.semigroupoids ==6.0.0.1, + semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, + any.socks ==0.6.1, + any.split ==0.2.5, + any.splitmix ==0.1.0.5, + splitmix -optimised-mixer, + any.stm ==2.5.2.1, + any.streaming-commons ==0.2.2.6, + streaming-commons -use-bytestring-builder, + any.strict ==0.5, + any.strict-identity ==0.1.0.0, + any.system-fileio ==0.3.16.4, + any.system-filepath ==0.4.14, + any.tagged ==0.8.8, + tagged +deepseq +transformers, + any.tar ==0.6.2.0, + any.template-haskell ==2.21.0.0, + any.temporary ==1.3, + any.terminal-size ==0.3.4, + any.terminfo ==0.4.1.6, + any.test-framework ==0.8.2.0, + any.test-framework-hunit ==0.3.0.2, + test-framework-hunit -base3 +base4, + any.test-framework-leancheck ==0.0.4, + any.test-framework-quickcheck2 ==0.3.0.5, + any.text ==2.1.1, + any.text-iso8601 ==0.1, + any.text-short ==0.1.5, + text-short -asserts, + any.th-abstraction ==0.6.0.0, + any.th-compat ==0.1.5, + any.these ==1.2, + any.time ==1.12.2, + any.time-compat ==1.9.6.1, + time-compat -old-locale, + any.tls ==1.9.0, + tls +compat -hans +network, + any.transformers ==0.6.1.0, + any.transformers-base ==0.4.6, + transformers-base +orphaninstances, + any.transformers-compat ==0.7.2, + transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, + any.type-equality ==1, + any.typed-process ==0.2.11.1, + any.unix ==2.8.4.0, + any.unix-compat ==0.7.1, + unix-compat -old-time, + any.unix-time ==0.4.12, + any.unliftio-core ==0.2.1.0, + any.unordered-containers ==0.2.20, + unordered-containers -debug, + any.utf8-string ==1.0.2, + any.uuid-types ==1.0.5.1, + any.vector ==0.13.1.0, + vector +boundschecks -internalchecks -unsafechecks -wall, + any.vector-algorithms ==0.9.0.1, + vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, + any.vector-stream ==0.1.0.1, + any.witherable ==0.4.2, + any.xml ==1.3.14, + any.zip-archive ==0.4.3.2, + zip-archive -executable, + any.zlib ==0.7.0.0, + zlib -bundled-c-zlib +non-blocking-ffi -pkg-config +index-state: hackage.haskell.org 2024-04-12T15:34:42Z diff --git a/testing/dart-sass/APKBUILD b/testing/dart-sass/APKBUILD index 84f37119774..8cfeb0198c3 100644 --- a/testing/dart-sass/APKBUILD +++ b/testing/dart-sass/APKBUILD @@ -1,7 +1,7 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=dart-sass -pkgver=1.75.0 +pkgver=1.77.1 pkgrel=0 pkgdesc="The primary implementation of Sass" url="https://sass-lang.com/dart-sass" @@ -13,7 +13,7 @@ makedepends=" buf dart-sdk " -_protocol_ver=2.6.0 +_protocol_ver=2.7.0 source=" https://github.com/sass/dart-sass/archive/refs/tags/$pkgver/dart-sass-$pkgver.tar.gz https://github.com/sass/sass/archive/refs/tags/embedded-protocol-$_protocol_ver.tar.gz @@ -49,8 +49,8 @@ package() { } sha512sums=" -63989e547e21de730781ea1207596c2318e4df86d63f2ed39186a370c95dfcc31a92b507746bafc4ef3cf8f72b5cfda77eba7ee40b62663b7aa0a92a814536bb dart-sass-1.75.0.tar.gz -0735d97d5fab04353d3bd82b765572481b3c04b263963f25511990e6be3c6b424ef86131d3f1cf1069bb8ed7b4f14db635fa9f4b9b44d0497274b9cacf6ca60f embedded-protocol-2.6.0.tar.gz +3c4565465a10219faf8173cc2c8274f1c1eb26441185871ae7446d45976b99a6eceec45229214d6b93497ab8fbe9c11eff9f5af98372ab94257f4dad053cd895 dart-sass-1.77.1.tar.gz +b6de0f1e716c82c33b4919dc9e6b78e2b4ec7e65204400db189c3c52aeae89b38e1de58e26824b2767c316951bb0989aa4d87593a943f0869ef6f4bcc7644a70 embedded-protocol-2.7.0.tar.gz e974b32f3ca9155868282c2259f693b49bd8c8b57772126efa6e29efedcf4acdb2b1359ae0cb5b0552dfd84daa0ae9273ebe90de7f66670a0a6abd75958cac6d sass 2c1aebfe586fc8388ab176daadd2ce245a41ef45e1eeade8f8f6438115ba3933a77b8da460eaeb7a31c2e4c32524bb9a7c1dacbbdb188ecde3d11c0c27bada29 lock.patch " diff --git a/testing/datamash/APKBUILD b/testing/datamash/APKBUILD index 7e69f73fc40..a9b3465ebbc 100644 --- a/testing/datamash/APKBUILD +++ b/testing/datamash/APKBUILD @@ -1,25 +1,27 @@ # Contributor: Assaf Gordon <assafgordon@gmail.com> -# Maintainer: Assaf Gordon <assafgordon@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=datamash pkgver=1.8 -pkgrel=0 -pkgdesc="command-line text/math procesing" +pkgrel=1 +pkgdesc="Command-line text/math processing" url="https://www.gnu.org/software/datamash/" arch="all" license="GPL-3.0-or-later" -source="https://ftpmirror.gnu.org/datamash/datamash-$pkgver.tar.gz" subpackages="$pkgname-doc $pkgname-bash-completion" +source="https://ftpmirror.gnu.org/datamash/datamash-$pkgver.tar.gz" build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ + --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ + --localstatedir=/var \ --disable-nls \ --disable-werror \ - --with-bash-completion-dir=local + --with-bash-completion-dir=/usr/share/bash-completion/completions make } @@ -29,13 +31,9 @@ check() { package() { make -j1 DESTDIR="$pkgdir" install - rm -rf "$pkgdir"/usr/share/datamash/examples \ - "$pkgdir"/usr/lib/charset.alias - mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ - mv "$pkgdir"/usr/share/datamash/bash-completion.d/datamash \ - "$pkgdir"/usr/share/bash-completion/completions/ - rm -r "$pkgdir"/usr/share/datamash/bash-completion.d || true + rm -vrf "$pkgdir"/usr/share/datamash/examples + rmdir -v "$pkgdir"/usr/share/datamash } sha512sums=" diff --git a/testing/ddnrs/APKBUILD b/testing/ddnrs/APKBUILD index 477ad596d7d..2be471323c5 100644 --- a/testing/ddnrs/APKBUILD +++ b/testing/ddnrs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=ddnrs -pkgver=0.2.0 +pkgver=0.3.0 pkgrel=0 pkgdesc="A simple tool to update dns records to match your current IP" url="https://codeberg.org/Kladky/ddnrs" @@ -34,5 +34,5 @@ package() { } sha512sums=" -e979b5fb2643cf297e82120f0dc297651f38ee24b0dfbbcbf0b0dcab5939b13dab234ced152f753d8b610425e25dc853ac9476b6597fab3c3d1d5d7b34f480c9 ddnrs-0.2.0.tar.gz +6ec533aec272bf826f572a67673f67292ee174816e2406934604cc20bf129a47708dea7f69f58c65c0f2125b8f07e5f4f68b47a918592d7c2e3d3225f0bbafd1 ddnrs-0.3.0.tar.gz " diff --git a/testing/dewduct/APKBUILD b/testing/dewduct/APKBUILD new file mode 100644 index 00000000000..5af26dae0d5 --- /dev/null +++ b/testing/dewduct/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: DaKnig <zannyknig@disroot.org> +# Maintainer: DaKnig <zannyknig@disroot.org> +pkgname=dewduct +pkgver=0.2.1 +pkgrel=0 +pkgdesc="A privacy-focused and mobile-friendly YouTube player, a NewPipe clone for GNOME, in Rust and GTK, based on Invidious" +source="$pkgname-$pkgver.zip::https://github.com/DaKnig/DewDuct/archive/refs/tags/v$pkgver.zip" +arch="all" +license="GPL-3.0-or-later" +depends="libadwaita mpv openssl yt-dlp" +makedepends="cargo-auditable libadwaita-dev openssl-dev rust" +url="https://github.com/DaKnig/DewDuct" +builddir="$srcdir/DewDuct-$pkgver" + +_appid=null.daknig.dewduct + +options="!check" # currently, no tests available. + +prepare() { + default_prepare + cargo fetch --target="$CTARGET" --locked +} + +build() { + appstreamcli make-desktop-file data/"$_appid".metainfo.xml "$_appid".desktop + cargo build --release --frozen +} + +package() { + install -D "$builddir"/target/release/"$pkgname" "$pkgdir"/usr/bin/"$pkgname" + install -D "$builddir"/data/"$_appid".metainfo.xml -t "$pkgdir"/usr/share/metainfo/ + install -D "$_appid".desktop "$pkgdir"/usr/share/applications/"$_appid".desktop +} +sha512sums=" +74a8c27029fa832fc07da40a5664844ddffeb5c83447135e3723ad35a80da5ed087773e1831699b136a8ca02e13d6e53fad9ac12a235152c58b11c5129425e09 dewduct-0.2.1.zip +" diff --git a/testing/dnscontrol/APKBUILD b/testing/dnscontrol/APKBUILD index f35cf0f9e5a..cac9b38a17c 100644 --- a/testing/dnscontrol/APKBUILD +++ b/testing/dnscontrol/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Nicolas Lorin <androw95220@gmail.com> # Maintainer: Nicolas Lorin <androw95220@gmail.com> pkgname=dnscontrol -pkgver=4.9.0 +pkgver=4.10.0 pkgrel=0 pkgdesc="Synchronize your DNS to multiple providers from a simple DSL" url="https://stackexchange.github.io/dnscontrol/" @@ -30,6 +30,6 @@ package() { } sha512sums=" -42dec7495e00595fb8d6ec174b45e87505a874a7f1ed286040a5ce0718cb9dee8b9a903f8c3f9f7c30a2e4e162a938b490667b397fe3ea6df79baa9df4036b58 dnscontrol-4.9.0.tar.gz +4ec4f56dea8b1e27079883d8cca55919f8e615e772e0e81d5205bcc34e5071c99531ae3fac2df919b9ea17757989174e0d9b8bc57eaad27f99f98fc164a8e966 dnscontrol-4.10.0.tar.gz 5503f149662dcf4d8548bc7e60bf566b2c4e7580593a15cca8f344f37103f413b860f4cb25ed38a620cf650528f133e4dc4d51824993b4e314acba5308a225d4 dnsconfig.js " diff --git a/testing/dnsenum/APKBUILD b/testing/dnsenum/APKBUILD index 2e0a972cdc3..895e4b421a2 100644 --- a/testing/dnsenum/APKBUILD +++ b/testing/dnsenum/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=dnsenum -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=0 pkgdesc="Tool to enumerate DNS info about domains" url="https://github.com/SparrowOchon/dnsenum2" @@ -25,5 +25,5 @@ package() { } sha512sums=" -26cec4056ae787ee297868e58ca384946e1edb80be36b0a92beca846a8abb9be21963295cb2cc3349d9ec765b30b308f3721347d24208481c35dce371c32db97 dnsenum-1.3.1.tar.gz +47915d3a61223898aa50b7d96993ac6dce26027e1ab6ed4f373d7e4df7e293583657f0c030fde00f6ec34e04a0d83a505abbcb0dbbf4db27cb29676cb3979156 dnsenum-1.3.2.tar.gz " diff --git a/testing/dolt/APKBUILD b/testing/dolt/APKBUILD index b3b25caf75c..44b2f2c6b5d 100644 --- a/testing/dolt/APKBUILD +++ b/testing/dolt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=dolt -pkgver=1.35.9 +pkgver=1.38.0 pkgrel=0 pkgdesc="Dolt – It's Git for Data" url="https://www.dolthub.com" @@ -30,5 +30,5 @@ package() { } sha512sums=" -faa25bb94a309ec26e0c7498f08aa38e958347e5256da5ee39130d20e8855b60b9d8070167704b4b7dd9353cb8d3ce373aa2c19661502261c45e1e8967dbf1f3 dolt-1.35.9.tar.gz +9122352d3bf2d6ec171576cdd687b557ef379335cce8f907180179ae9db3fdc173a999c08d83e3b4c7f6dd79f06188c4e6e71217b25369ba26967c693caf17e2 dolt-1.38.0.tar.gz " diff --git a/testing/drogon/APKBUILD b/testing/drogon/APKBUILD new file mode 100644 index 00000000000..df76e0bbf82 --- /dev/null +++ b/testing/drogon/APKBUILD @@ -0,0 +1,52 @@ +# Contributor: Díaz Urbaneja Diego <sodomon2@gmail.com> +# Maintainer: Díaz Urbaneja Diego <sodomon2@gmail.com> +pkgname=drogon +pkgver=1.9.4 +pkgrel=0 +pkgdesc="A C++14/17/20 based HTTP web application framework" +url="https://github.com/drogonframework/drogon" +arch="all" +license="MIT" +makedepends=" + brotli-dev + c-ares-dev + cmake + hiredis-dev + jsoncpp-dev + mariadb-dev + libpq-dev + samurai + trantor-dev + util-linux-dev + sqlite-dev + yaml-cpp-dev + " +subpackages="$pkgname-dev $pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/drogonframework/drogon/archive/refs/tags/v$pkgver.tar.gz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + local crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake -B build -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DUSE_SUBMODULE=OFF \ + $crossopts + cmake --build build +} + +check() { + ctest --test-dir build --output-on-failure +} + +package() { + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + DESTDIR="$pkgdir" cmake --install build +} + +sha512sums=" +0c58ed45aacbfd1916bbd9c52ecbd203abdc1032c7d6f908750a188443e293d749705d35c2b56eab54e30f36cc606b2437889e11a482ebda34d36035e8221499 drogon-1.9.4.tar.gz +" diff --git a/testing/dune-deps/APKBUILD b/testing/dune-deps/APKBUILD index 8e15f22d3ca..55c022a6ca2 100644 --- a/testing/dune-deps/APKBUILD +++ b/testing/dune-deps/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.3.0 pkgrel=2 pkgdesc="Show dependency graph of a multi-component dune project" url="https://github.com/mjambon/dune-deps" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends="graphviz" makedepends=" diff --git a/testing/eclib/APKBUILD b/testing/eclib/APKBUILD index 519d803acae..e2e50c9b332 100644 --- a/testing/eclib/APKBUILD +++ b/testing/eclib/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=eclib pkgver=20231212 -pkgrel=0 +pkgrel=1 pkgdesc="Tools for creating the elliptic curve databases" url="https://github.com/JohnCremona/eclib" # armhf, armv7, x86: blocked by pari diff --git a/testing/efl/APKBUILD b/testing/efl/APKBUILD index 83165ae5719..313037cefd3 100644 --- a/testing/efl/APKBUILD +++ b/testing/efl/APKBUILD @@ -5,8 +5,8 @@ pkgver=1.27.0 pkgrel=1 pkgdesc="Enlightenment Foundation Libraries" url="https://www.enlightenment.org" -# ppc64le, riscv64: luajit -arch="all !ppc64le !riscv64" +# ppc64le, riscv64, loongarch64: luajit +arch="all !ppc64le !riscv64 !loongarch64" license="LGPL-2.1-only" makedepends=" dbus-dev diff --git a/testing/elastic-beats/APKBUILD b/testing/elastic-beats/APKBUILD index 37f3a6fba10..dc9b9ab4f4c 100644 --- a/testing/elastic-beats/APKBUILD +++ b/testing/elastic-beats/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ramanathan Sivagurunathan <ramzthecoder@gmail.com> # Maintainer: pkgname=elastic-beats -pkgver=8.13.1 -pkgrel=1 +pkgver=8.13.3 +pkgrel=0 pkgdesc="Lightweight shippers for Elasticsearch & Logstash" url="https://www.elastic.co/products/beats" # riscv64: https://github.com/elastic/go-concert/issues/51 @@ -144,7 +144,7 @@ metricbeat_openrc() { } sha512sums=" -490081cedfab4bb19b62314106eb93ec2adb5ab53779c56aab630fd2d573a2d46f7476bf7cc3474eb5bfa5f33801303f955b82a456f21af477cfb2e0da782edf elastic-beats-8.13.1.tar.gz +f045768bf62e7a3dbb44a2e18042c25a1054e26466a803a95641342f4492c4f8ed2502a29c979a58b8bc6c29ee43b25a1b48c529035f4c5b62b155b277ce7fb9 elastic-beats-8.13.3.tar.gz 526b149419cf51e21ab4b7b49b208dbef81571afd04f2c40ab05297d5eb4b03e64e6c7a06d1acf8771b7b0664a552082ce6f50d5cbc4218aca810440d6185990 filebeat.initd f6168b10da75919cf16b2a32a5b25847e9e49aaea7415e49d2644960fc586c60714754cbe60f5a6d290cd7b9f8d3fd86287e46e63891825feb82f747e235d58d filebeat.confd 4736fab0119bea080cb5a938d0b40e803967cbfac373d1b714a43176032ea36b9865f3c6658e33ff6befa150ccdf6ddcbfcf59bd31e4ae961d075623eac80ea6 metricbeat.initd diff --git a/testing/electron/0001-src-fix-HasOnly-capability-in-node-credentials.patch b/testing/electron/0001-src-fix-HasOnly-capability-in-node-credentials.patch deleted file mode 100644 index 616f0f06c2b..00000000000 --- a/testing/electron/0001-src-fix-HasOnly-capability-in-node-credentials.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0a26dd24fd73f5f5a34b4ba8d1441dbf3a426b3c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de> -Date: Sat, 4 Nov 2023 00:39:57 +0000 -Subject: [PATCH 1/6] src: fix HasOnly(capability) in node::credentials - -SYS_capget with _LINUX_CAPABILITY_VERSION_3 returns the process's -permitted capabilities as two 32-bit values. To determine if the only -permitted capability is indeed CAP_NET_BIND_SERVICE, it is necessary to -check both of those values. - -Not doing so creates a vulnerability that potentially allows -unprivileged users to inject code into a privileged Node.js process -through environment variables such as NODE_OPTIONS. - -PR-URL: https://github.com/nodejs-private/node-private/pull/505 -Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> -CVE-ID: CVE-2024-21892 ---- - src/node_credentials.cc | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -diff --git a/third_party/electron_node/src/node_credentials.cc b/third_party/electron_node/src/node_credentials.cc -index 52abaab7a6..f2980007b9 100644 ---- a/third_party/electron_node/src/node_credentials.cc -+++ b/third_party/electron_node/src/node_credentials.cc -@@ -52,7 +52,7 @@ namespace credentials { - bool HasOnly(int capability) { - DCHECK(cap_valid(capability)); - -- struct __user_cap_data_struct cap_data[2]; -+ struct __user_cap_data_struct cap_data[_LINUX_CAPABILITY_U32S_3]; - struct __user_cap_header_struct cap_header_data = { - _LINUX_CAPABILITY_VERSION_3, - getpid()}; -@@ -61,12 +61,11 @@ bool HasOnly(int capability) { - if (syscall(SYS_capget, &cap_header_data, &cap_data) != 0) { - return false; - } -- if (capability < 32) { -- return cap_data[0].permitted == -- static_cast<unsigned int>(CAP_TO_MASK(capability)); -- } -- return cap_data[1].permitted == -- static_cast<unsigned int>(CAP_TO_MASK(capability)); -+ -+ static_assert(arraysize(cap_data) == 2); -+ return cap_data[CAP_TO_INDEX(capability)].permitted == -+ static_cast<unsigned int>(CAP_TO_MASK(capability)) && -+ cap_data[1 - CAP_TO_INDEX(capability)].permitted == 0; - } - #endif - --- -2.43.1 - diff --git a/testing/electron/0002-http-add-maximum-chunk-extension-size.patch b/testing/electron/0002-http-add-maximum-chunk-extension-size.patch deleted file mode 100644 index fec3ff67bd4..00000000000 --- a/testing/electron/0002-http-add-maximum-chunk-extension-size.patch +++ /dev/null @@ -1,273 +0,0 @@ -From 01d3bb793a5ef3bf0a36dde868626869e09fb558 Mon Sep 17 00:00:00 2001 -From: Paolo Insogna <paolo@cowtech.it> -Date: Wed, 3 Jan 2024 07:23:15 +0100 -Subject: [PATCH] http: add maximum chunk extension size - -PR-URL: https://github.com/nodejs-private/node-private/pull/519 -Fixes: https://hackerone.com/reports/2233486 -Reviewed-By: Matteo Collina <matteo.collina@gmail.com> -Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> -Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> -CVE-ID: CVE-2024-22019 ---- - doc/api/errors.md | 12 ++ - lib/_http_server.js | 8 ++ - src/node_http_parser.cc | 23 ++- - .../test-http-chunk-extensions-limit.js | 131 ++++++++++++++++++ - 4 files changed, 171 insertions(+), 3 deletions(-) - create mode 100644 test/parallel/test-http-chunk-extensions-limit.js - -diff --git a/third_party/electron_node/doc/api/errors.md b/third_party/electron_node/doc/api/errors.md -index 95ad3c9c671..9429baff516 100644 ---- a/third_party/electron_node/doc/api/errors.md -+++ b/third_party/electron_node/doc/api/errors.md -@@ -3140,6 +3140,18 @@ malconfigured clients, if more than 8 KiB of HTTP header data is received then - HTTP parsing will abort without a request or response object being created, and - an `Error` with this code will be emitted. - -+<a id="HPE_CHUNK_EXTENSIONS_OVERFLOW"></a> -+ -+### `HPE_CHUNK_EXTENSIONS_OVERFLOW` -+ -+<!-- YAML -+added: REPLACEME -+--> -+ -+Too much data was received for a chunk extensions. In order to protect against -+malicious or malconfigured clients, if more than 16 KiB of data is received -+then an `Error` with this code will be emitted. -+ - <a id="HPE_UNEXPECTED_CONTENT_LENGTH"></a> - - ### `HPE_UNEXPECTED_CONTENT_LENGTH` -diff --git a/third_party/electron_node/lib/_http_server.js b/third_party/electron_node/lib/_http_server.js -index c62ea175995..c512653e60e 100644 ---- a/third_party/electron_node/lib/_http_server.js -+++ b/third_party/electron_node/lib/_http_server.js -@@ -857,6 +857,11 @@ const requestHeaderFieldsTooLargeResponse = Buffer.from( - 'Connection: close\r\n\r\n', 'ascii', - ); - -+const requestChunkExtensionsTooLargeResponse = Buffer.from( -+ `HTTP/1.1 413 ${STATUS_CODES[413]}\r\n` + -+ 'Connection: close\r\n\r\n', 'ascii', -+); -+ - function warnUnclosedSocket() { - if (warnUnclosedSocket.emitted) { - return; -@@ -892,6 +897,9 @@ function socketOnError(e) { - case 'HPE_HEADER_OVERFLOW': - response = requestHeaderFieldsTooLargeResponse; - break; -+ case 'HPE_CHUNK_EXTENSIONS_OVERFLOW': -+ response = requestChunkExtensionsTooLargeResponse; -+ break; - case 'ERR_HTTP_REQUEST_TIMEOUT': - response = requestTimeoutResponse; - break; -diff --git a/third_party/electron_node/src/node_http_parser.cc b/third_party/electron_node/src/node_http_parser.cc -index a12d89c3cd6..c190eace435 100644 ---- a/third_party/electron_node/src/node_http_parser.cc -+++ b/third_party/electron_node/src/node_http_parser.cc -@@ -79,6 +79,8 @@ const uint32_t kOnExecute = 5; - const uint32_t kOnTimeout = 6; - // Any more fields than this will be flushed into JS - const size_t kMaxHeaderFieldsCount = 32; -+// Maximum size of chunk extensions -+const size_t kMaxChunkExtensionsSize = 16384; - - const uint32_t kLenientNone = 0; - const uint32_t kLenientHeaders = 1 << 0; -@@ -261,6 +263,7 @@ class Parser : public AsyncWrap, public StreamListener { - - num_fields_ = num_values_ = 0; - headers_completed_ = false; -+ chunk_extensions_nread_ = 0; - last_message_start_ = uv_hrtime(); - url_.Reset(); - status_message_.Reset(); -@@ -516,9 +519,22 @@ class Parser : public AsyncWrap, public StreamListener { - return 0; - } - -- // Reset nread for the next chunk -+ int on_chunk_extension(const char* at, size_t length) { -+ chunk_extensions_nread_ += length; -+ -+ if (chunk_extensions_nread_ > kMaxChunkExtensionsSize) { -+ llhttp_set_error_reason(&parser_, -+ "HPE_CHUNK_EXTENSIONS_OVERFLOW:Chunk extensions overflow"); -+ return HPE_USER; -+ } -+ -+ return 0; -+ } -+ -+ // Reset nread for the next chunk and also reset the extensions counter - int on_chunk_header() { - header_nread_ = 0; -+ chunk_extensions_nread_ = 0; - return 0; - } - -@@ -986,6 +1002,7 @@ class Parser : public AsyncWrap, public StreamListener { - bool headers_completed_ = false; - bool pending_pause_ = false; - uint64_t header_nread_ = 0; -+ uint64_t chunk_extensions_nread_ = 0; - uint64_t max_http_header_size_; - uint64_t last_message_start_; - ConnectionsList* connectionsList_; -@@ -1164,9 +1181,9 @@ const llhttp_settings_t Parser::settings = { - Proxy<DataCall, &Parser::on_header_value>::Raw, - - // on_chunk_extension_name -- nullptr, -+ Proxy<DataCall, &Parser::on_chunk_extension>::Raw, - // on_chunk_extension_value -- nullptr, -+ Proxy<DataCall, &Parser::on_chunk_extension>::Raw, - - Proxy<Call, &Parser::on_headers_complete>::Raw, - Proxy<DataCall, &Parser::on_body>::Raw, -diff --git a/third_party/electron_node/test/parallel/test-http-chunk-extensions-limit.js b/third_party/electron_node/test/parallel/test-http-chunk-extensions-limit.js -new file mode 100644 -index 00000000000..6868b3da6cb ---- /dev/null -+++ b/third_party/electron_node/test/parallel/test-http-chunk-extensions-limit.js -@@ -0,0 +1,131 @@ -+'use strict'; -+ -+const common = require('../common'); -+const http = require('http'); -+const net = require('net'); -+const assert = require('assert'); -+ -+// Verify that chunk extensions are limited in size when sent all together. -+{ -+ const server = http.createServer((req, res) => { -+ req.on('end', () => { -+ res.writeHead(200, { 'Content-Type': 'text/plain' }); -+ res.end('bye'); -+ }); -+ -+ req.resume(); -+ }); -+ -+ server.listen(0, () => { -+ const sock = net.connect(server.address().port); -+ let data = ''; -+ -+ sock.on('data', (chunk) => data += chunk.toString('utf-8')); -+ -+ sock.on('end', common.mustCall(function() { -+ assert.strictEqual(data, 'HTTP/1.1 413 Payload Too Large\r\nConnection: close\r\n\r\n'); -+ server.close(); -+ })); -+ -+ sock.end('' + -+ 'GET / HTTP/1.1\r\n' + -+ 'Host: localhost:8080\r\n' + -+ 'Transfer-Encoding: chunked\r\n\r\n' + -+ '2;' + 'A'.repeat(20000) + '=bar\r\nAA\r\n' + -+ '0\r\n\r\n' -+ ); -+ }); -+} -+ -+// Verify that chunk extensions are limited in size when sent in intervals. -+{ -+ const server = http.createServer((req, res) => { -+ req.on('end', () => { -+ res.writeHead(200, { 'Content-Type': 'text/plain' }); -+ res.end('bye'); -+ }); -+ -+ req.resume(); -+ }); -+ -+ server.listen(0, () => { -+ const sock = net.connect(server.address().port); -+ let remaining = 20000; -+ let data = ''; -+ -+ const interval = setInterval( -+ () => { -+ if (remaining > 0) { -+ sock.write('A'.repeat(1000)); -+ } else { -+ sock.write('=bar\r\nAA\r\n0\r\n\r\n'); -+ clearInterval(interval); -+ } -+ -+ remaining -= 1000; -+ }, -+ common.platformTimeout(20), -+ ).unref(); -+ -+ sock.on('data', (chunk) => data += chunk.toString('utf-8')); -+ -+ sock.on('end', common.mustCall(function() { -+ assert.strictEqual(data, 'HTTP/1.1 413 Payload Too Large\r\nConnection: close\r\n\r\n'); -+ server.close(); -+ })); -+ -+ sock.write('' + -+ 'GET / HTTP/1.1\r\n' + -+ 'Host: localhost:8080\r\n' + -+ 'Transfer-Encoding: chunked\r\n\r\n' + -+ '2;' -+ ); -+ }); -+} -+ -+// Verify the chunk extensions is correctly reset after a chunk -+{ -+ const server = http.createServer((req, res) => { -+ req.on('end', () => { -+ res.writeHead(200, { 'content-type': 'text/plain', 'connection': 'close', 'date': 'now' }); -+ res.end('bye'); -+ }); -+ -+ req.resume(); -+ }); -+ -+ server.listen(0, () => { -+ const sock = net.connect(server.address().port); -+ let data = ''; -+ -+ sock.on('data', (chunk) => data += chunk.toString('utf-8')); -+ -+ sock.on('end', common.mustCall(function() { -+ assert.strictEqual( -+ data, -+ 'HTTP/1.1 200 OK\r\n' + -+ 'content-type: text/plain\r\n' + -+ 'connection: close\r\n' + -+ 'date: now\r\n' + -+ 'Transfer-Encoding: chunked\r\n' + -+ '\r\n' + -+ '3\r\n' + -+ 'bye\r\n' + -+ '0\r\n' + -+ '\r\n', -+ ); -+ -+ server.close(); -+ })); -+ -+ sock.end('' + -+ 'GET / HTTP/1.1\r\n' + -+ 'Host: localhost:8080\r\n' + -+ 'Transfer-Encoding: chunked\r\n\r\n' + -+ '2;' + 'A'.repeat(10000) + '=bar\r\nAA\r\n' + -+ '2;' + 'A'.repeat(10000) + '=bar\r\nAA\r\n' + -+ '2;' + 'A'.repeat(10000) + '=bar\r\nAA\r\n' + -+ '0\r\n\r\n' -+ ); -+ }); -+} --- -2.44.0 - diff --git a/testing/electron/0004-lib-update-undici-to-v5.28.3.patch b/testing/electron/0004-lib-update-undici-to-v5.28.3.patch deleted file mode 100644 index a6719cdca88..00000000000 --- a/testing/electron/0004-lib-update-undici-to-v5.28.3.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 6027fadc38bd33317ac1f93629c72153741fbdc8 Mon Sep 17 00:00:00 2001 -From: Matteo Collina <hello@matteocollina.com> -Date: Mon, 5 Feb 2024 17:21:04 +0100 -Subject: [PATCH 4/6] lib: update undici to v5.28.3 - -Signed-off-by: Matteo Collina <hello@matteocollina.com> -PR-URL: https://github.com/nodejs-private/node-private/pull/536 -CVE-ID: CVE-2024-24758 - -backported (just secfix part) to v18.18.x -Co-developed-by: lauren n. liberda <lauren@selfisekai.rocks> -Signed-off-by: lauren n. liberda <lauren@selfisekai.rocks> ---- - deps/undici/src/lib/fetch/index.js | 3 +++ - deps/undici/undici.js | 1 + - 2 files changed, 4 insertions(+) - -diff --git a/third_party/electron_node/deps/undici/src/lib/fetch/index.js b/third_party/electron_node/deps/undici/src/lib/fetch/index.js -index 9f09670f82..5ef7a3f069 100644 ---- a/third_party/electron_node/deps/undici/src/lib/fetch/index.js -+++ b/third_party/electron_node/deps/undici/src/lib/fetch/index.js -@@ -1201,6 +1201,9 @@ async function httpRedirectFetch (fetchParams, response) { - // https://fetch.spec.whatwg.org/#cors-non-wildcard-request-header-name - request.headersList.delete('authorization') - -+ // https://fetch.spec.whatwg.org/#authentication-entries -+ request.headersList.delete('proxy-authorization', true) -+ - // "Cookie" and "Host" are forbidden request-headers, which undici doesn't implement. - request.headersList.delete('cookie') - request.headersList.delete('host') -diff --git a/third_party/electron_node/deps/undici/undici.js b/third_party/electron_node/deps/undici/undici.js -index 0c3dc7ebfc..84a3d63ca1 100644 ---- a/third_party/electron_node/deps/undici/undici.js -+++ b/third_party/electron_node/deps/undici/undici.js -@@ -9679,6 +9679,7 @@ var require_fetch = __commonJS({ - } - if (!sameOrigin(requestCurrentURL(request), locationURL)) { - request.headersList.delete("authorization"); -+ request.headersList.delete("proxy-authorization", true); - request.headersList.delete("cookie"); - request.headersList.delete("host"); - } --- -2.43.1 - diff --git a/testing/electron/0005-zlib-pause-stream-if-outgoing-buffer-is-full.patch b/testing/electron/0005-zlib-pause-stream-if-outgoing-buffer-is-full.patch deleted file mode 100644 index 96f55cbdb4b..00000000000 --- a/testing/electron/0005-zlib-pause-stream-if-outgoing-buffer-is-full.patch +++ /dev/null @@ -1,146 +0,0 @@ -From c7201faa5a436566c01f8fa60ad58d631430850b Mon Sep 17 00:00:00 2001 -From: Matteo Collina <hello@matteocollina.com> -Date: Tue, 6 Feb 2024 16:47:20 +0100 -Subject: [PATCH 5/6] zlib: pause stream if outgoing buffer is full - -Signed-off-by: Matteo Collina <hello@matteocollina.com> -PR-URL: https://github.com/nodejs-private/node-private/pull/540 -Reviewed-By: Robert Nagy <ronagy@icloud.com> -Ref: https://hackerone.com/reports/2284065 -PR-URL: https://github.com/nodejs-private/node-private/pull/542 -CVE-ID: CVE-2024-22025 ---- - lib/zlib.js | 33 +++++++++++++++++++------- - test/parallel/test-zlib-brotli-16GB.js | 22 +++++++++++++++++ - test/parallel/test-zlib-params.js | 24 ++++++++++++------- - 3 files changed, 62 insertions(+), 17 deletions(-) - create mode 100644 test/parallel/test-zlib-brotli-16GB.js - -diff --git a/third_party/electron_node/lib/zlib.js b/third_party/electron_node/lib/zlib.js -index 2b90c6f91f..5e6a979370 100644 ---- a/third_party/electron_node/lib/zlib.js -+++ b/third_party/electron_node/lib/zlib.js -@@ -560,10 +560,11 @@ function processCallback() { - self.bytesWritten += inDelta; - - const have = handle.availOutBefore - availOutAfter; -+ let streamBufferIsFull = false; - if (have > 0) { - const out = self._outBuffer.slice(self._outOffset, self._outOffset + have); - self._outOffset += have; -- self.push(out); -+ streamBufferIsFull = !self.push(out); - } else { - assert(have === 0, 'have should not go down'); - } -@@ -588,13 +589,29 @@ function processCallback() { - handle.inOff += inDelta; - handle.availInBefore = availInAfter; - -- this.write(handle.flushFlag, -- this.buffer, // in -- handle.inOff, // in_off -- handle.availInBefore, // in_len -- self._outBuffer, // out -- self._outOffset, // out_off -- self._chunkSize); // out_len -+ -+ if (!streamBufferIsFull) { -+ this.write(handle.flushFlag, -+ this.buffer, // in -+ handle.inOff, // in_off -+ handle.availInBefore, // in_len -+ self._outBuffer, // out -+ self._outOffset, // out_off -+ self._chunkSize); // out_len -+ } else { -+ const oldRead = self._read; -+ self._read = (n) => { -+ self._read = oldRead; -+ this.write(handle.flushFlag, -+ this.buffer, // in -+ handle.inOff, // in_off -+ handle.availInBefore, // in_len -+ self._outBuffer, // out -+ self._outOffset, // out_off -+ self._chunkSize); // out_len -+ self._read(n); -+ }; -+ } - return; - } - -diff --git a/third_party/electron_node/test/parallel/test-zlib-brotli-16GB.js b/third_party/electron_node/test/parallel/test-zlib-brotli-16GB.js -new file mode 100644 -index 0000000000..ba4f7ef5ae ---- /dev/null -+++ b/third_party/electron_node/test/parallel/test-zlib-brotli-16GB.js -@@ -0,0 +1,22 @@ -+'use strict'; -+ -+const common = require('../common'); -+const { createBrotliDecompress } = require('node:zlib'); -+const strictEqual = require('node:assert').strictEqual; -+ -+// This tiny HEX string is a 16GB file. -+// This test verifies that the stream actually stops. -+/* eslint-disable max-len */ -+const content = 'cfffff7ff82700e2b14020f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c32200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bffcfffff7ff82700e2b00040f7fe9ffffffff04f00c4610180eefd3fffffffe19f0088c30200ddfb7ffeffffc33f0110870500baf7fffcffff877f02200e0b0074effff9ffff0fff04401c1600e8defff3ffff1ffe0980382c00d0bdffe7ffff3ffc1300715800a07bff3f'; -+ -+const buf = Buffer.from(content, 'hex'); -+ -+const decoder = createBrotliDecompress(); -+decoder.end(buf); -+ -+// We need to wait to verify that the libuv thread pool had time -+// to process the data and the buffer is not empty. -+setTimeout(common.mustCall(() => { -+ // There is only one chunk in the buffer -+ strictEqual(decoder._readableState.buffer.length, 1); -+}), common.platformTimeout(100)); -diff --git a/third_party/electron_node/test/parallel/test-zlib-params.js b/third_party/electron_node/test/parallel/test-zlib-params.js -index 30d4f133ad..18271fe022 100644 ---- a/third_party/electron_node/test/parallel/test-zlib-params.js -+++ b/third_party/electron_node/test/parallel/test-zlib-params.js -@@ -12,23 +12,29 @@ const deflater = zlib.createDeflate(opts); - const chunk1 = file.slice(0, chunkSize); - const chunk2 = file.slice(chunkSize); - const blkhdr = Buffer.from([0x00, 0x5a, 0x82, 0xa5, 0x7d]); --const expected = Buffer.concat([blkhdr, chunk2]); --let actual; -+const blkftr = Buffer.from('010000ffff7dac3072', 'hex'); -+const expected = Buffer.concat([blkhdr, chunk2, blkftr]); -+const bufs = []; -+ -+function read() { -+ let buf; -+ while ((buf = deflater.read()) !== null) { -+ bufs.push(buf); -+ } -+} - - deflater.write(chunk1, function() { - deflater.params(0, zlib.constants.Z_DEFAULT_STRATEGY, function() { - while (deflater.read()); -- deflater.end(chunk2, function() { -- const bufs = []; -- let buf; -- while ((buf = deflater.read()) !== null) -- bufs.push(buf); -- actual = Buffer.concat(bufs); -- }); -+ -+ deflater.on('readable', read); -+ -+ deflater.end(chunk2); - }); - while (deflater.read()); - }); - - process.once('exit', function() { -+ const actual = Buffer.concat(bufs); - assert.deepStrictEqual(actual, expected); - }); --- -2.43.1 - diff --git a/testing/electron/0006-deps-fix-GHSA-f74f-cvh7-c6q6-CVE-2024-24806.patch b/testing/electron/0006-deps-fix-GHSA-f74f-cvh7-c6q6-CVE-2024-24806.patch deleted file mode 100644 index 2d7ba8cce6e..00000000000 --- a/testing/electron/0006-deps-fix-GHSA-f74f-cvh7-c6q6-CVE-2024-24806.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 4c475d0047768f2d3cec4fe628d85d601374c2fe Mon Sep 17 00:00:00 2001 -From: Santiago Gimeno <santiago.gimeno@gmail.com> -Date: Thu, 8 Feb 2024 00:17:40 +0100 -Subject: [PATCH 6/6] deps: fix GHSA-f74f-cvh7-c6q6/CVE-2024-24806 - -Refs: https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6 -PR-URL: https://github.com/nodejs/node/pull/51614 ---- - deps/uv/src/idna.c | 8 ++++++-- - deps/uv/test/test-idna.c | 7 ++++++- - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/third_party/electron_node/deps/uv/src/idna.c b/third_party/electron_node/deps/uv/src/idna.c -index 93d982ca01..858b19d00e 100644 ---- a/third_party/electron_node/deps/uv/src/idna.c -+++ b/third_party/electron_node/deps/uv/src/idna.c -@@ -274,6 +274,9 @@ long uv__idna_toascii(const char* s, const char* se, char* d, char* de) { - char* ds; - int rc; - -+ if (s == se) -+ return UV_EINVAL; -+ - ds = d; - - si = s; -@@ -308,8 +311,9 @@ long uv__idna_toascii(const char* s, const char* se, char* d, char* de) { - return rc; - } - -- if (d < de) -- *d++ = '\0'; -+ if (d >= de) -+ return UV_EINVAL; - -+ *d++ = '\0'; - return d - ds; /* Number of bytes written. */ - } -diff --git a/third_party/electron_node/deps/uv/test/test-idna.c b/third_party/electron_node/deps/uv/test/test-idna.c -index f4fad9653d..37da38de2d 100644 ---- a/third_party/electron_node/deps/uv/test/test-idna.c -+++ b/third_party/electron_node/deps/uv/test/test-idna.c -@@ -99,6 +99,7 @@ TEST_IMPL(utf8_decode1) { - TEST_IMPL(utf8_decode1_overrun) { - const char* p; - char b[1]; -+ char c[1]; - - /* Single byte. */ - p = b; -@@ -112,6 +113,10 @@ TEST_IMPL(utf8_decode1_overrun) { - ASSERT_EQ((unsigned) -1, uv__utf8_decode1(&p, b + 1)); - ASSERT_EQ(p, b + 1); - -+ b[0] = 0x7F; -+ ASSERT_EQ(UV_EINVAL, uv__idna_toascii(b, b + 0, c, c + 1)); -+ ASSERT_EQ(UV_EINVAL, uv__idna_toascii(b, b + 1, c, c + 1)); -+ - return 0; - } - -@@ -145,8 +150,8 @@ TEST_IMPL(idna_toascii) { - /* Illegal inputs. */ - F("\xC0\x80\xC1\x80", UV_EINVAL); /* Overlong UTF-8 sequence. */ - F("\xC0\x80\xC1\x80.com", UV_EINVAL); /* Overlong UTF-8 sequence. */ -+ F("", UV_EINVAL); - /* No conversion. */ -- T("", ""); - T(".", "."); - T(".com", ".com"); - T("example", "example"); --- -2.43.1 - diff --git a/testing/electron/APKBUILD b/testing/electron/APKBUILD index d3c5e699305..41d5dafa5d0 100644 --- a/testing/electron/APKBUILD +++ b/testing/electron/APKBUILD @@ -1,16 +1,18 @@ # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=electron -pkgver=29.3.0 +pkgver=30.0.2 _semver="${pkgver/_beta/-beta.}" -pkgrel=1 -_chromium=122.0.6261.156 -_depot_tools=b5509953468edd0906f2dc297886939abbd2bed5 +pkgrel=0 +_chromium=124.0.6367.91 +_copium_tag=124.5 +_depot_tools=495b23b39aaba2ca3b55dd27cadc523f1cb17ee6 pkgdesc="Electron cross-platform desktop toolkit" url="https://github.com/electron/electron" arch="aarch64 x86_64" # same as chromium license="MIT" depends="gtk+3.0 so:libudev.so.1 xdg-utils" makedepends=" + ada-dev alsa-lib-dev aom-dev base64-dev @@ -33,6 +35,7 @@ makedepends=" ffmpeg-dev findutils flac-dev + flatbuffers-dev flex freetype-dev gperf @@ -105,9 +108,10 @@ makedepends=" subpackages="$pkgname-lang $pkgname-dev" # the lower patches are specific to electron, the top ones are from the equivalent chromium version source="https://ab-sn.lnl.gay/electron-$_semver-$_chromium.tar.zst - chromium-icu-74.patch + copium-$_copium_tag.tar.gz::https://codeberg.org/selfisekai/copium/archive/$_copium_tag.tar.gz chromium-revert-drop-of-system-java.patch compiler.patch + disable-dns_config_service.patch disable-failing-tests.patch fc-cache-version.patch fix-missing-cstdint-include-musl.patch @@ -134,31 +138,26 @@ source="https://ab-sn.lnl.gay/electron-$_semver-$_chromium.tar.zst system-zstd.patch temp-failure-retry.patch yes-musl.patch - disable-dns_config_service.patch icon.patch python-jinja-3.10.patch webpack-hash.patch unbundle-node.patch - 0001-src-fix-HasOnly-capability-in-node-credentials.patch - 0002-http-add-maximum-chunk-extension-size.patch - 0004-lib-update-undici-to-v5.28.3.patch - 0005-zlib-pause-stream-if-outgoing-buffer-is-full.patch - 0006-deps-fix-GHSA-f74f-cvh7-c6q6-CVE-2024-24806.patch - node-configure-distutils.patch - node-gyp-distutils.patch default.conf electron.desktop electron-launcher.sh " +_copium_patches=" + cr124-iwyu-sys-select-dawn-terminal.patch + cr124-libwebp-shim-sharpyuv.patch + " # tests are todo for some base checks options="!check net suid" builddir="$srcdir/electron-$_semver-$_chromium" export PATH="$PATH:/usr/lib/qt5/bin" -# clang uses much less memory (and this doesn't support gcc) export CC=clang export CXX=clang++ @@ -168,8 +167,8 @@ export NM=llvm-nm export LD=clang++ # less log spam, reproducible -export CFLAGS="${CFLAGS/-g/} -O2 -Wno-unknown-warning-option -Wno-builtin-macro-redefined -Wno-deprecated-declarations" -export CXXFLAGS="${CXXFLAGS/-g/} -O2 -Wno-unknown-warning-option -Wno-builtin-macro-redefined -Wno-deprecated-declarations" +export CFLAGS="${CFLAGS/-g/} -O2 -Wno-builtin-macro-redefined -Wno-deprecated-declarations -Wno-shift-count-overflow -Wno-ignored-attributes" +export CXXFLAGS="${CXXFLAGS/-g/} -O2 -Wno-builtin-macro-redefined -Wno-deprecated-declarations -Wno-invalid-constexpr" export CPPFLAGS="${CPPFLAGS/-g/} -D__DATE__= -D__TIME__= -D__TIMESTAMP__=" case "$CARCH" in aarch64|arm*|riscv64) @@ -235,17 +234,6 @@ snapshot() { python3 src/electron/script/apply_all_patches.py \ src/electron/patches/config.json - python3 src/tools/update_pgo_profiles.py \ - --target=linux \ - update \ - --gs-url-base=chromium-optimization-profiles/pgo_profiles - - python3 src/tools/download_optimization_profile.py \ - --newest_state=src/chrome/android/profiles/newest.txt \ - --local_state=src/chrome/android/profiles/local.txt \ - --output_name=src/chrome/android/profiles/afdo.prof \ - --gs_url_base=chromeos-prebuilt/afdo-job/llvm - mv src $pkgname-$_semver-$_chromium # extra binaries are most likely things we don't want, so nuke them all @@ -269,10 +257,24 @@ snapshot() { } prepare() { - dos2unix third_party/vulkan_memory_allocator/include/vk_mem_alloc.h - default_prepare + for i in $_copium_patches; do + case "$i" in + *.patch) + msg "${i%::*}" + patch -p1 -i "$srcdir/copium/$i" || failed="$failed $i" + ;; + esac + done + if [ ! -z "$failed" ]; then + error "The following patches failed to apply:" + for i in $failed; do + printf " %s\n" "$i" >&2 + done + exit 1 + fi + git init -q . # link to system tools @@ -300,9 +302,10 @@ prepare() { ) # reusable system library settings - # libavif - https://github.com/AOMediaCodec/libavif/commit/4d2776a3 + # libavif - https://github.com/AOMediaCodec/libavif/commit/50a541469c98009016af8dcc9f83a1be79f3a7d9 # libaom - https://aomedia.googlesource.com/aom/+/706ee36dcc82%5E%21/ - # jsoncpp, re2, snappy, swiftshader-spirv, woff2 - requires use_custom_libcxx=false + # but watch this space: https://aomedia-review.googlesource.com/c/aom/+/188606 + # jsoncpp, re2, snappy, swiftshader, vulkan, woff2 - needs use_custom_libcxx=false local chromium_use_system=" brotli crc32c @@ -310,6 +313,7 @@ prepare() { double-conversion ffmpeg flac + flatbuffers fontconfig freetype harfbuzz-ng @@ -343,8 +347,8 @@ prepare() { -delete done - # ada - needs use_custom_libcxx=false # llhttp - 9.x needed, 8.x in repo (2023-12-17) + # ada - needs use_custom_libcxx=false local node_use_system=" base64 brotli @@ -416,61 +420,59 @@ _configure() { ;; esac + local maglev=true + local symbol_level=0 + local vaapi=true + # shellcheck disable=2089 local gn_config=" - cc_wrapper=\"$cc_wrapper\" - clang_base_path=\"/usr\" - custom_toolchain=\"//build/toolchain/linux/unbundle:default\" - host_toolchain=\"//build/toolchain/linux/unbundle:default\" import(\"//electron/build/args/release.gn\") blink_enable_generated_code_formatting=false + cc_wrapper=\"$cc_wrapper\" chrome_pgo_phase=0 + clang_base_path=\"/usr\" clang_use_chrome_plugins=false clang_version=\"${clang_ver%%.*}\" + custom_toolchain=\"//build/toolchain/linux/unbundle:default\" + disable_fieldtrial_testing_config=true + enable_hangout_services_extension=true + enable_nacl=false + enable_nocompile_tests=false + enable_stripping=false + enable_rust=true + enable_vr=false fatal_linker_warnings=false ffmpeg_branding=\"Chrome\" - icu_use_data_file=true + host_toolchain=\"//build/toolchain/linux/unbundle:default\" + icu_use_data_file=false is_cfi=false is_clang=true is_component_ffmpeg=true is_debug=false is_official_build=true - symbol_level=0 - treat_warnings_as_errors=false - rustc_version=\"yes\" - rust_sysroot_absolute=\"/usr\" - - angle_enable_gl_null=false - build_tflite_with_xnnpack=false - build_with_tflite_lib=true - disable_fieldtrial_testing_config=true - enable_hangout_services_extension=true - enable_library_cdms=false - enable_media_remoting=false - enable_nacl=false - enable_nocompile_tests=false - enable_paint_preview=false - enable_reading_list=false - enable_remoting=false - enable_reporting=false - enable_rust=true - enable_screen_ai_service=false - enable_service_discovery=false - enable_stripping=false - enable_vr=false - ozone_platform_headless=false - link_pulseaudio=true proprietary_codecs=true regenerate_x11_protos=true rtc_link_pipewire=true rtc_use_pipewire=true - skia_use_dawn=false + rustc_version=\"yes\" + rust_sysroot_absolute=\"/usr\" + symbol_level=$symbol_level + treat_warnings_as_errors=false use_custom_libcxx=true - use_dawn=false + use_lld=true use_pulseaudio=true + use_safe_libstdcxx=false + use_system_libffi=true use_sysroot=false + use_thin_lto=false + use_vaapi=$vaapi + v8_enable_maglev=$maglev + + skia_use_dawn=false + use_dawn=false + use_system_ada=false use_system_base64=true use_system_cares=true use_system_histogram=true @@ -478,8 +480,6 @@ _configure() { use_system_libffi=true use_system_llhttp=false use_system_nghttp2=true - use_thin_lto=false - use_vaapi=true " # shellcheck disable=2086,2090,2116 @@ -490,7 +490,10 @@ _configure() { build() { export PATH="$PATH:/usr/lib/qt5/bin" - ninja -C out/Release \ + # ~1 GB per concurrent job is not enough with gcc + _njobs="${NJOBS:-"$(python3 -c 'import os; print(max((os.cpu_count() - (10 if os.uname().machine == "aarch64" else 8), 1)))')"}" + + ninja -C out/Release -j$_njobs \ electron_dist_zip \ node_gypi_headers \ node_version_header @@ -541,10 +544,11 @@ lang() { } sha512sums=" -aef4dc07d9924892472637f95485ac0e9ab6216a9da5b290d105d82e8688fc45643515e43a41aee6e002ec4dbce512ae11c8ebe171d6629741cf1587bdda8a5b electron-29.3.0-122.0.6261.156.tar.zst -4c540972fa12acd9f0aafb8dc7e9987c3d6e4f28ff679dde522ebcec2dc5ae1a62d9d255bed0a30b9c79ae3b90ab0f5b9ae1ef5b7bf338612e28d9ef70250ca3 chromium-icu-74.patch +0c9bed5e291483e848d46ed827e0441a19bdb8ead8449e00aefb47df020c948399d1b68cb8bf39c7764c6edc79db8234ea81a81aa5bb1edeceec9706057f98e5 electron-30.0.2-124.0.6367.91.tar.zst +13c647dc2024e27ae8a4d7e8f1202037a342f4a7054477226665c332029e1b6f1d8b99004c2b2809bcf1e6c19b1359ef5e1c971552d7ced59c5b43d5a836af88 copium-124.5.tar.gz 29bb685e03356a77df5fd347cdf55194cc8b3265c421cc76e54d64edefc329dbcb052deb26b22e8f587ce68456876c071de1b7d258dd0fcc6ee66c875ec4a020 chromium-revert-drop-of-system-java.patch -c116ad6325a79b799b6c56312891d5b3d2f0d0c1c3e2c03f339144b3f93b871db190f83fe5eadc5542303d61849cc362299932a2f93661198e11ba0c1e492e48 compiler.patch +54eb147c0af2ba096d1df375a289b339ee855ab1a9114e7c747753f0274a6bafb7212c1859b7885454c4529d9a5e3bd9559fc14e8e006f23ccd381895fa68d15 compiler.patch +4057cc78f10bfd64092bc35a373869abb1d68b880cdbca70422f39ffd78a929c19c7728d4d4c40709aaba25581148a93ae5343e724849fd35323062ed68753fa disable-dns_config_service.patch 111bc22fb704d97759988268a40d6b356c51b0bd7a8119a694e905ffe21850ff64e91566cd0dd0c9d62fcb46dca8acc821436c34eb0ba78be872ee4f7ec88a7b disable-failing-tests.patch 5fc5c012c1db6cf1ba82f38c6f3f4f5ca3a209e47ac708a74de379b018e0649b7694877c9571ef79002dde875ffc07b458a3355425f1c01867f362c66c2bc1bf fc-cache-version.patch 9200f78bad70e95c648a5e8392d50642190600f655c6baa366ff6467ebad52d3b3f305dad58f3610da67136f4b723557653b174ec5c25be8d8737ee04d9ee09f fix-missing-cstdint-include-musl.patch @@ -553,13 +557,13 @@ c63dee5044353eb306a39ca1526158c0f003ab310ecb03d1c368dc2a979454590c84b8d3c1548451 33ee60863cc438ef57ffef92ba4cf67a856a5ffc16138bce241bcf87e47b15154aa86918e793c26f7ec4dc62a445257ad5673ed7001daf22c4043cf6cc57da7f gdbinit.patch 36a764fa73443b47d38050b52dbe6ad2fa8d67201ff4ccdbad13b52308ef165ca046aac6f9609fe35890a6485f0f3e672e78cc41e3e44f3cdc7f145e540524e8 generic-sensor-include.patch 8de65109ece27ea63bd469f2220c56b8c752ba0a50fdf390082a2d5ae74b8e010199126175569f6d5084270dd4e0571e68aec32c0bca8211a6699925b3a09124 import-version.patch -993ce46dcd2c9e406d18d7af834e6e8cc4227bdba32c0b1804bb0489e11b47467557895281facf110abdb6aacf493b97f23bfb4f72ee95a41a618c547bfcea1a libstdc++13.patch +c49a1b06e061faa430d66dd5b404ef6c843e4d8a6e9012e963009a161b4726f8eb92c4da8fa710f8861f6e4daa8be5f68abee41a7d9fc02f2a0eb61ce53b5fdd libstdc++13.patch e75f57ae34c97ca1caf15fa4b4106c6c1e79c31ed66869cf92ed9ea0c449886c9511e455047c17c1e9ad8b9a46ad4948511a4f2995a4b6030fb4d1c7ae21d038 mman.patch 99bcc7dd485b404a90c606a96addab1d900852128d44fb8cea8acc7303189ef87c89a7b0e749fd0e10c5ef5f6bf1fadeb5c16a34503cab6a59938ce2653d887e musl-auxv.patch 50c274a420bb8a7f14fcb56e40920dac8f708792a4520789b4987facea459bef88113d5a2b60fa8c57bee6e92bff3617d6b73fa305c8c44614c638971cffd440 musl-sandbox.patch e7163ac5810ac85366cef2447412287c856e3d67c6b77f219a6e5a418b1965b98e449c409424ad0704a5bded9355dd0aec3dc4585918ce5a2ab36c079707afe2 musl-tid-caching.patch 92eb002718026611f5542362ad69b67f0a398ff71b3fca5c05d55cb5c6f9f29334e5e127bb4860cfaa3fba0f0d4c901e2b98808217e7dc02e254a64a5c9521aa musl-v8-monotonic-pthread-cont_timedwait.patch -5eb0b83264e2c9213fb871838827eb7875c05131a42d901032d6d1f05eec98609fefac4772385046887a773daf4f1e0ee5a647e82c1c3d73aec3fcf76f887084 no-execinfo.patch +73bca6c6f9873f2f11cef04f3f41f71e0ae86e7e2d77e14db4298675fec390744c5081f6fdb14052e5ee2b5885be1198c3aa6068eb2b656d1a665c0c3f36e708 no-execinfo.patch 8e17101d69e23b456a9c03dc2fe95bcd56846389707ba6f4720192a9e9168406d20d9168dbebbb3a47d921ec92e478f0e390f46e6b9bb43a34dda217c6e6448b no-mallinfo.patch e4c4e5bc6f828f9c883dd418c0ba01887949c29c311f76206a1ec29f620b0c0ba0452949dc2778a9c46ea066405857536964a36436a68eecf7da7952736333cf no-res-ninit-nclose.patch 6dc4d8dc92e685dace62265a1ddb3aebc558aed54d20ff6d36b030be0c48d7e84662326c31363612492574d9a03c62653cdc21a60995b97dee1d75cae86a9f9b no-sandbox-settls.patch @@ -571,18 +575,10 @@ d4ac7f350806b4410ccb1df3b0ad7e90a7b6d724a16919761aa2d47a6f21008c7374da528b05b754 b3beb98b539fe160fbc493ba410ae0f68540cc4b6834f1f8ce9a22c3f4f59ef5d583ad48793e10549fd02a701f833a3969791ef4524322cd1e715ca5bf226bc8 system-zstd.patch e48693e6b7aeebf69a5acbf80d9a35defe4c23835121dfeb58b051ac7c527e758a41004f4d193274fe1b01c0bfb1dbc77b09cb6a404a3fdee507a2918afb0edb temp-failure-retry.patch 914ccf649d7771f19f209ab97f99c481aebc6f66174d68e8b539f6ad4a70bc8cb0fae2df6dadbf0415958ffb3574c420fe029079dcce45f5e5add4db2e903566 yes-musl.patch -4057cc78f10bfd64092bc35a373869abb1d68b880cdbca70422f39ffd78a929c19c7728d4d4c40709aaba25581148a93ae5343e724849fd35323062ed68753fa disable-dns_config_service.patch 465107da7818b237e3c144a318ab80c3c9343b51ed38b8971ef204692d13346929becbe94cefad4c153788d3a200642143584d5ca070f6304e768ba2139c19ec icon.patch e05180199ee1d559e4e577cedd3e589844ecf40d98a86321bf1bea5607b02eeb5feb486deddae40e1005b644550331f6b8500177aa7e79bcb3750d3c1ceb76c3 python-jinja-3.10.patch 2aa340854316f1284217c0ca17cbf44953684ad6c7da90815117df30928612eb9fb9ffb734b948dfc309cd25d1a67cd57f77aac2d052a3dd9aca07a3a58cbb30 webpack-hash.patch -c83914c11d9f8f6d53653f67f91020db3d25d0614380053380f85e870418e834bf590afa065b182006d535290cc91a940fe085c1200cae9ca17107faceae1989 unbundle-node.patch -85973875fb3acddabe2507e255b38fe498cf0b5fce7dcb93e389ccb7b1cae8acd5225f00fa61b7bd556f7cae5080ed03dca7263505fe8974e3fbf3a93937c555 0001-src-fix-HasOnly-capability-in-node-credentials.patch -4b32258cc05ffe43364dbb775df53d0e7749d108ac31b3642cc069860b6e28d370bcb0cee01c652baed668c2c3111fde714084d0a85acd80b5b86880a703c2b2 0002-http-add-maximum-chunk-extension-size.patch -b8ea46e2c0ad7bab6383fa3a42619be735eac67156e501b173b36e9522e8c384feb758b48276a16ac6a68b64cab8fb4cd4ed1841720ecf628bc55f45c05b58c4 0004-lib-update-undici-to-v5.28.3.patch -1dc578fad461f8dc876a1bbbd9fd8f9b235a010fcfb30986cc2654253cce84040dc6fed37fa9fa5e70933ffb9d812c677ba0150e7d6a9d2032d412f9eba7f168 0005-zlib-pause-stream-if-outgoing-buffer-is-full.patch -793d94cc5aec81eace96ca86bd70ad122d82918a521ecb8d30251c492818c19c7a020eed4dccb13d4129b61f0ca82972bd34f480ad094c45633042552bd39fe9 0006-deps-fix-GHSA-f74f-cvh7-c6q6-CVE-2024-24806.patch -45e9b3f520a9d343daddda21fd220d675fbbebaeae923a4afb59f8b8d3c35cfa172ab4fdaed6f835d66a8ef470e1a4ab9d6e27c5538f5ce49cc4c1772fa514ef node-configure-distutils.patch -e7e2f663e2c9329443fbaece2b3e37266bdb894f5764d9c4ef3720f1de84d13edee75a5e12210e4839912520c88332f4b231a6eacbc0e8dd5f7e3353d40fefba node-gyp-distutils.patch +ebb18a0e2eba4b4606e900fa82f4b57fe91dcbdc943e17544bccb3c9a011a49b4331cdbee59629e44b80184bad4ea54ec887c0bfcd00cda8d5686060dbf365e3 unbundle-node.patch e8ea87c547546011c4c8fc2de30e4f443b85cd4cfcff92808e2521d2f9ada03feefb8e1b0cf0f6b460919c146e56ef8d5ad4bb5e2461cc5247c30d92eb4d068e default.conf 191559fc7aa1ea0353c6fb0cc321ee1d5803a0e44848c8be941cfab96277b0de6a59962d373e2a2a1686c8f9be2bcf2d2f33706759a339a959e297d3f7fda463 electron.desktop 5f7ba5ad005f196facec1c0f26108356b64cafb1e5cfa462ff714a33b8a4c757ac00bfcb080da09eb5b65032f8eb245d9676a61ec554515d125ed63912708648 electron-launcher.sh diff --git a/testing/electron/chromium-icu-74.patch b/testing/electron/chromium-icu-74.patch deleted file mode 100644 index 02a44b7a141..00000000000 --- a/testing/electron/chromium-icu-74.patch +++ /dev/null @@ -1,20 +0,0 @@ -See ICU change https://github.com/unicode-org/icu/commit/2e45e6ec0e84a1c01812015a254ea31b286316fb - -Similar has happened in the past. See: -https://chromium.googlesource.com/chromium/src/+/e60b571faa3f14dd9119a6792dccf12f8bf80192 - -diff --git a/third_party/blink/renderer/platform/text/text_break_iterator.cc b/third_party/blink/renderer/platform/text/text_break_iterator.cc -index ddfbd51..247da06 100644 ---- a/third_party/blink/renderer/platform/text/text_break_iterator.cc -+++ b/third_party/blink/renderer/platform/text/text_break_iterator.cc -@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAsciiLineBreakTableLastChar - }; - // clang-format on - --#if U_ICU_VERSION_MAJOR_NUM >= 58 -+#if U_ICU_VERSION_MAJOR_NUM >= 74 -+#define BA_LB_COUNT (U_LB_COUNT - 8) -+#elif U_ICU_VERSION_MAJOR_NUM >= 58 - #define BA_LB_COUNT (U_LB_COUNT - 3) - #else - #define BA_LB_COUNT U_LB_COUNT diff --git a/testing/electron/compiler.patch b/testing/electron/compiler.patch index 2541d19992b..fedc978ae48 100644 --- a/testing/electron/compiler.patch +++ b/testing/electron/compiler.patch @@ -1,6 +1,6 @@ --- ./build/config/compiler/BUILD.gn.orig +++ ./build/config/compiler/BUILD.gn -@@ -616,24 +618,6 @@ +@@ -613,24 +613,6 @@ } } @@ -25,7 +25,7 @@ # TODO(crbug.com/1235145): Investigate why/if this should be needed. if (is_win) { cflags += [ "/clang:-ffp-contract=off" ] -@@ -1011,17 +998,6 @@ +@@ -1005,17 +987,6 @@ # `-nodefaultlibs` from the linker invocation from Rust, which would be used # to compile dylibs on Android, such as for constructing unit test APKs. "-Cdefault-linker-libraries", @@ -43,7 +43,7 @@ ] if (!is_win || force_rustc_color_output) { -@@ -1175,8 +1151,8 @@ +@@ -1182,8 +1153,8 @@ } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl && !(is_chromeos_lacros && is_chromeos_device)) { @@ -54,7 +54,7 @@ } if (!is_nacl) { cflags += [ -@@ -1190,8 +1166,8 @@ +@@ -1197,8 +1168,8 @@ } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia && !(is_chromeos_lacros && is_chromeos_device)) { @@ -65,6 +65,15 @@ } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] +@@ -1983,7 +1954,7 @@ + defines = [ "_HAS_NODISCARD" ] + } + } else { +- cflags = [ "-Wall" ] ++ cflags = [] + if (is_clang) { + # Enable extra warnings for chromium_code when we control the compiler. + cflags += [ "-Wextra" ] --- ./build/config/rust.gni.orig +++ ./build/config/rust.gni @@ -186,11 +186,11 @@ diff --git a/testing/electron/libstdc++13.patch b/testing/electron/libstdc++13.patch index b04fa3551ba..c49f7e8768e 100644 --- a/testing/electron/libstdc++13.patch +++ b/testing/electron/libstdc++13.patch @@ -1,15 +1,5 @@ missing libstdc++13 includes -- ---- a/third_party/ruy/src/ruy/profiler/instrumentation.h -+++ b/third_party/ruy/src/ruy/profiler/instrumentation.h -@@ -19,6 +19,7 @@ - #ifdef RUY_PROFILER - #include <cstdio> - #include <mutex> -+#include <string> - #include <vector> - #endif - --- a/third_party/openscreen/src/platform/base/error.h +++ b/third_party/openscreen/src/platform/base/error.h @@ -6,6 +6,7 @@ diff --git a/testing/electron/no-execinfo.patch b/testing/electron/no-execinfo.patch index 4b578976a3e..b1705f5d85f 100644 --- a/testing/electron/no-execinfo.patch +++ b/testing/electron/no-execinfo.patch @@ -37,25 +37,24 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1 #define HAVE_FCNTL_H 1 --- a/base/debug/stack_trace.cc +++ b/base/debug/stack_trace.cc -@@ -251,7 +253,9 @@ +@@ -291,7 +291,7 @@ } - - void StackTrace::OutputToStream(std::ostream* os) const { + std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { + std::stringstream stream; +-#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) - OutputToStreamWithPrefix(os, nullptr); -+#endif + if (ShouldSuppressOutput()) { + return "Backtrace suppressed."; + } +@@ -301,7 +301,7 @@ } - std::string StackTrace::ToString() const { -@@ -281,7 +281,7 @@ - } - std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { - std::stringstream stream; + std::ostream& operator<<(std::ostream& os, const StackTrace& s) { -#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) - OutputToStreamWithPrefix(&stream, prefix_string); - #endif - return stream.str(); + s.OutputToStream(&os); + #else + os << "StackTrace::OutputToStream not implemented."; --- a/base/debug/stack_trace_unittest.cc +++ b/base/debug/stack_trace_unittest.cc @@ -33,7 +33,7 @@ diff --git a/testing/electron/node-configure-distutils.patch b/testing/electron/node-configure-distutils.patch deleted file mode 100644 index add7a169c2d..00000000000 --- a/testing/electron/node-configure-distutils.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 95534ad82f4e33f53fd50efe633d43f8da70cba6 Mon Sep 17 00:00:00 2001 -From: Luigi Pinca <luigipinca@gmail.com> -Date: Wed, 8 Nov 2023 21:20:53 +0100 -Subject: [PATCH] build: fix build with Python 3.12 - -Replace `distutils.version.StrictVersion` with -`packaging.version.Version`. - -Refs: https://github.com/nodejs/node/pull/50209#issuecomment-1795852539 -PR-URL: https://github.com/nodejs/node/pull/50582 -Reviewed-By: Richard Lau <rlau@redhat.com> -Reviewed-By: Chengzhong Wu <legendecas@gmail.com> ---- - configure.py | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/third_party/electron_node/configure.py b/third_party/electron_node/configure.py -index 33671a034290df..be95decd5668f2 100755 ---- a/third_party/electron_node/configure.py -+++ b/third_party/electron_node/configure.py -@@ -14,8 +14,6 @@ - import io - from pathlib import Path - --from distutils.version import StrictVersion -- - # If not run from node/, cd to node/. - os.chdir(Path(__file__).parent) - -@@ -30,6 +28,7 @@ - - sys.path.insert(0, str(tools_path / 'gyp' / 'pylib')) - from gyp.common import GetFlavor -+from packaging.version import Version - - # imports in tools/configure.d - sys.path.insert(0, str(tools_path / 'configure.d')) -@@ -1566,10 +1565,10 @@ def without_ssl_error(option): - # supported asm compiler for AVX2. See https://github.com/openssl/openssl/ - # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69 - openssl110_asm_supported = \ -- ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \ -- ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \ -- ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \ -- ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10')) -+ ('gas_version' in variables and Version(variables['gas_version']) >= Version('2.23')) or \ -+ ('xcode_version' in variables and Version(variables['xcode_version']) >= Version('5.0')) or \ -+ ('llvm_version' in variables and Version(variables['llvm_version']) >= Version('3.3')) or \ -+ ('nasm_version' in variables and Version(variables['nasm_version']) >= Version('2.10')) - - if is_x86 and not openssl110_asm_supported: - error('''Did not find a new enough assembler, install one or build with diff --git a/testing/electron/node-gyp-distutils.patch b/testing/electron/node-gyp-distutils.patch deleted file mode 100644 index 80278b38812..00000000000 --- a/testing/electron/node-gyp-distutils.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./third_party/electron_node/tools/gyp/pylib/gyp/input.py.orig -+++ ./third_party/electron_node/tools/gyp/pylib/gyp/input.py -@@ -16,7 +16,7 @@ - import sys - import threading - import traceback --from distutils.version import StrictVersion -+from packaging.version import Version as StrictVersion - from gyp.common import GypError - from gyp.common import OrderedSet - diff --git a/testing/electron/unbundle-node.patch b/testing/electron/unbundle-node.patch index 58ec8145c8e..08122afca90 100644 --- a/testing/electron/unbundle-node.patch +++ b/testing/electron/unbundle-node.patch @@ -1,17 +1,23 @@ --- ./third_party/electron_node/BUILD.gn.orig +++ ./third_party/electron_node/BUILD.gn -@@ -39,6 +39,7 @@ +@@ -40,6 +40,8 @@ node_release_urlbase = "" # Allows downstream packagers (eg. Linux distributions) to build Electron against system shared libraries. ++ use_system_ada = false + use_system_base64 = false use_system_cares = false use_system_nghttp2 = false use_system_llhttp = false -@@ -47,6 +48,11 @@ +@@ -48,6 +50,16 @@ if (is_linux) { import("//build/config/linux/pkg_config.gni") ++ if (use_system_ada) { ++ config("ada") { ++ libs = [ "ada" ] ++ } ++ } + if (use_system_base64) { + pkg_config("base64") { + packages = [ "base64" ] @@ -20,18 +26,24 @@ if (use_system_cares) { pkg_config("cares") { packages = [ "libcares" ] -@@ -208,7 +214,6 @@ - ":node_js2c", +@@ -258,8 +270,6 @@ + deps = [ + ":node_js2c_exec", "deps/googletest:gtest", - "deps/ada", +- "deps/ada", - "deps/base64", "deps/simdutf", "deps/uvwasi", "//third_party/zlib", -@@ -216,6 +221,11 @@ +@@ -267,6 +277,16 @@ "//third_party/brotli:enc", "//v8:v8_libplatform", ] ++ if (use_system_ada) { ++ configs += [ ":ada" ] ++ } else { ++ deps += [ "deps/ada" ] ++ } + if (use_system_base64) { + configs += [ ":base64" ] + } else { diff --git a/testing/elektra/APKBUILD b/testing/elektra/APKBUILD index fa2f1c65906..7688227adb0 100644 --- a/testing/elektra/APKBUILD +++ b/testing/elektra/APKBUILD @@ -6,7 +6,7 @@ pkgname=elektra _pkgname=libelektra pkgver=0.8.21 -pkgrel=22 +pkgrel=23 pkgdesc="A universal and secure framework to access configuration parameters" url="https://www.libelektra.org" #arch="all !armhf" # armhf blocked by qt5-qtdeclarative diff --git a/testing/element-desktop/APKBUILD b/testing/element-desktop/APKBUILD index 8d030b59dad..6b3af65c5fa 100644 --- a/testing/element-desktop/APKBUILD +++ b/testing/element-desktop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=element-desktop pkgver=1.11.64 -pkgrel=0 +pkgrel=1 pkgdesc="Secure and independent communication, connected via Matrix" url="https://element.io/" arch="aarch64 x86_64" # same as electron @@ -24,6 +24,7 @@ makedepends=" nodejs npm python3 + py3-setuptools sqlcipher-dev yarn " diff --git a/testing/emacs-derl/APKBUILD b/testing/emacs-derl/APKBUILD new file mode 100644 index 00000000000..64a41b0cd89 --- /dev/null +++ b/testing/emacs-derl/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=emacs-derl +pkgver=0_git20231004 +_gitrev=6f31592bb3083de366cdb13a7db0ed69fc72de47 +pkgrel=0 +_pkgreal=derl +pkgdesc="Emacs implementation of the Erlang distribution protocol" +url="https://github.com/axelf4/derl.el" +arch="noarch" +license="GPL-3.0-or-later" +depends="cmd:emacs" +makedepends="emacs-nox" +source="https://github.com/axelf4/derl.el/archive/$_gitrev/emacs-derl-$_gitrev.tar.gz" +builddir="$srcdir/derl.el-$_gitrev" + +build() { + emacs -batch -q -no-site-file -L . \ + -eval '(setq byte-compile-error-on-warn t)' \ + -f batch-byte-compile \ + ./*.el +} + +check() { + emacs -batch -q -no-site-file -L . -L test \ + -l derl-tests -f ert-run-tests-batch-and-exit +} + +package() { + install -Dvm644 ./*.el ./*.elc \ + -t "$pkgdir"/usr/share/emacs/site-lisp/ + + cd "$pkgdir"/usr/share/emacs/site-lisp + emacs -batch -q -no-site-file \ + -eval "(loaddefs-generate \".\" \"$_pkgreal-loaddefs.el\")" +} + +sha512sums=" +02c1a1b4114f5ecb41d3977f2440bdd2b55ec4f590005b3d271a3e0d76d453b62515f25bb374718e5fa8b8096e8540460e74560e1c336b211e1e790cd89ba4f8 emacs-derl-6f31592bb3083de366cdb13a7db0ed69fc72de47.tar.gz +" diff --git a/testing/emacs-fossil/APKBUILD b/testing/emacs-fossil/APKBUILD new file mode 100644 index 00000000000..b65d44450f4 --- /dev/null +++ b/testing/emacs-fossil/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=emacs-fossil +pkgver=0_git20230504 +_fslhash=a5a35f440a +pkgrel=0 +_pkgreal=vc-fossil +pkgdesc="Emacs VC backend for Fossil SCM" +url="https://tumbleweed.nu/r/vc-fossil" +arch="noarch" +license="GPL-3.0-or-later" +depends="cmd:emacs fossil" +makedepends="emacs-nox" +source="https://tumbleweed.nu/r/vc-fossil/tarball/$_fslhash/emacs-fossil-$_fslhash.tar.gz" +builddir="$srcdir/$pkgname-$_fslhash" +options="!check" # no tests provided + +build() { + emacs -batch -q -no-site-file -L . \ + -f batch-byte-compile \ + ./*.el +} + +package() { + install -Dvm644 ./*.el ./*.elc \ + -t "$pkgdir"/usr/share/emacs/site-lisp/ + + cd "$pkgdir"/usr/share/emacs/site-lisp + emacs -batch -q -no-site-file \ + -eval "(loaddefs-generate \".\" \"$_pkgreal-loaddefs.el\")" +} + +sha512sums=" +88ed9872a8d7ebe79ef02130144059adbea484b1f3f183f201c5eab4e08062c7fbef7e60eb848b81f73979d970b7a36d875a8b298e4b7844d7895c336890ae09 emacs-fossil-a5a35f440a.tar.gz +" diff --git a/testing/extrace/APKBUILD b/testing/extrace/APKBUILD new file mode 100644 index 00000000000..f0c9d8e8cbd --- /dev/null +++ b/testing/extrace/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Patrycja Rosa <alpine@ptrcnull.me> +# Maintainer: Patrycja Rosa <alpine@ptrcnull.me> +pkgname=extrace +pkgver=0.9 +pkgrel=0 +pkgdesc="Trace exec() calls system-wide" +url="https://github.com/leahneukirchen/extrace" +arch="all" +license="BSD-2-Clause AND GPL-2.0-or-later" +makedepends="linux-headers" +subpackages="$pkgname-doc" +source="https://github.com/leahneukirchen/extrace/archive/v$pkgver/extrace-$pkgver.tar.gz" +options="!check" # no test suite + +build() { + make +} + +package() { + make DESTDIR="$pkgdir" PREFIX="/usr" install +} + +sha512sums=" +dfc2abaccf9e24428b1e3eacb12d11bb304d6a854f11d0be546d536369f8e0e9c81d52fd2a8f242f7d342c121693e7e3cadf5f9650cff5e81232b0853200b1bc extrace-0.9.tar.gz +" diff --git a/testing/fcitx5-anthy/APKBUILD b/testing/fcitx5-anthy/APKBUILD index 4cc3ceea443..db552421df7 100644 --- a/testing/fcitx5-anthy/APKBUILD +++ b/testing/fcitx5-anthy/APKBUILD @@ -1,6 +1,7 @@ -# Maintainer: +# Contributor: Lindsay Zhou <i@lin.moe> +# Maintainer: Lindsay Zhou <i@lin.moe> pkgname=fcitx5-anthy -pkgver=5.1.3 +pkgver=5.1.4 pkgrel=0 pkgdesc="anthy input method support for fcitx5" url="https://github.com/fcitx/fcitx5-anthy" @@ -34,5 +35,5 @@ package() { } sha512sums=" -dd1a9022424ea0fc45f27c17555eca15a475f5f9ac3dadba5c77d59d365eca959b52ee88293ff0fed72ecd90380e7d57c9eacbf6a26dcba5502588eb0c97dce7 fcitx5-anthy-5.1.3.tar.gz +e655e0ad33b6f6a86c30ce799c0fafb5485b6e8107758e98e36896bec0e853f033b70fd81c6a3518ec2e57521e3c2f827345fd2d100fe73c4926c746d375a9d1 fcitx5-anthy-5.1.4.tar.gz " diff --git a/testing/fcitx5-bamboo/APKBUILD b/testing/fcitx5-bamboo/APKBUILD index c2aeda613d4..d4a5ca8366c 100644 --- a/testing/fcitx5-bamboo/APKBUILD +++ b/testing/fcitx5-bamboo/APKBUILD @@ -1,7 +1,8 @@ -# Maintainer: +# Contributor: Lindsay Zhou <i@lin.moe> +# Maintainer: Lindsay Zhou <i@lin.moe> pkgname=fcitx5-bamboo -pkgver=1.0.4 -pkgrel=9 +pkgver=1.0.5 +pkgrel=0 _bamboo_core=f0ca534819fa84ee37df9277ff2449d82ed1ec3e pkgdesc="bamboo input method support for fcitx5" url="https://github.com/fcitx/fcitx5-bamboo" @@ -42,6 +43,6 @@ package() { } sha512sums=" -80d5e73ff35fd8308c9ce24cc7cb131239470957959109ee7115ae8cac8b1583046f024ae19a6a5a5a2f29ff7c0adef1a4cd0ed06bce9e1128bc478d34f54333 fcitx5-bamboo-1.0.4.tar.gz +2143d32903fdcbd87d4e8fcb7313a2162eb669feaede9c821dd694957381ffdce8efa2d63590725978339ac0ae4f5e659a967e9256836c403ec29563a81e089c fcitx5-bamboo-1.0.5.tar.gz 3d8034b20c1001500216f94c6e03d07831ce762fcf57cb7b8d238efeb17f8ed40cd5aa6965793384bd0e8f20dac82c74bc2e08d89b4e91ccf3a494d7b9da4ae7 bamboo-core-f0ca534819fa84ee37df9277ff2449d82ed1ec3e.tar.gz " diff --git a/testing/fcitx5-chewing/APKBUILD b/testing/fcitx5-chewing/APKBUILD index 5ba6499a85a..7c3efea1340 100644 --- a/testing/fcitx5-chewing/APKBUILD +++ b/testing/fcitx5-chewing/APKBUILD @@ -1,7 +1,7 @@ # Contributor: ProgCat <progcat@protonmail.com> # Maintainer: ProgCat <progcat@protonmail.com> pkgname=fcitx5-chewing -pkgver=5.1.1 +pkgver=5.1.2 pkgrel=0 pkgdesc="Chewing Wrapper for Fcitx" url="https://github.com/fcitx/fcitx5-chewing" @@ -43,5 +43,5 @@ package() { } sha512sums=" -d88aad759398bca9417a0d77f5a897212a52b3ce9b7d4a891bd0ba9a86c2e3db7b9dd5525ffbc72baaa951b0024085f6eade6cbf62591a628303397164fd5856 fcitx5-chewing-5.1.1.tar.gz +a6021eb5a7ed72d34d8a1d933d53c38c807c3d51d642e34451335d54ad825bbc1ffef4869ff35a375612b552e18438910c26e1b41d0d126a70f4270eb7989acc fcitx5-chewing-5.1.2.tar.gz " diff --git a/testing/fcitx5-chinese-addons/APKBUILD b/testing/fcitx5-chinese-addons/APKBUILD index a720de104c2..e1ed29b5a72 100644 --- a/testing/fcitx5-chinese-addons/APKBUILD +++ b/testing/fcitx5-chinese-addons/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Lindsay Zhou <i@lin.moe> # Maintainer: Lindsay Zhou <i@lin.moe> pkgname=fcitx5-chinese-addons -pkgver=5.1.4 +pkgver=5.1.5 pkgrel=0 pkgdesc="Chinese Addons for Fcitx" url="https://github.com/fcitx/fcitx5-chinese-addons" -# armhf, armv7, s390x, ppc64le, riscv64: qt6-qtwebengine -arch="all !armhf !armv7 !ppc64le !s390x !riscv64" +# armhf, s390x, ppc64le, riscv64: qt6-qtwebengine +arch="all !armhf !ppc64le !s390x !riscv64" license="LGPL-2.1-or-later AND GPL-2.0-or-later" makedepends=" boost-dev @@ -53,5 +53,5 @@ package() { } sha512sums=" -596d12a033b9f8cb252e7b630872b999df965e1a1cfcf872683df2c148996a0440ce6f78625436c998749d2e81599aa2a7fdebdbd787a8e20ac777a700815ba9 fcitx5-chinese-addons-5.1.4.tar.gz +e7078cbc2afa86bd728de83c1182b773269bf93d8c673a822cc96d08ab8cd5834281d44b2335f7b6262e51cbca1eeafb29471615e5f9ebca4d5375addb833069 fcitx5-chinese-addons-5.1.5.tar.gz " diff --git a/testing/fcitx5-configtool/APKBUILD b/testing/fcitx5-configtool/APKBUILD index 82b5d19e015..95f19f6e211 100644 --- a/testing/fcitx5-configtool/APKBUILD +++ b/testing/fcitx5-configtool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: ProgCat <progcat@protonmail.com> # Maintainer: ProgCat <progcat@protonmail.com> pkgname=fcitx5-configtool -pkgver=5.1.4 +pkgver=5.1.5 pkgrel=0 pkgdesc="A configure tool for Fcitx5" url="https://github.com/fcitx/fcitx5-configtool" @@ -57,5 +57,5 @@ package() { } sha512sums=" -2012882d1c4e58d69898d3b2b60f26124d9b87a05e91192e776db2738402423c3c6ac181185aa1ccd19984c2d3fdac9ededf6a7477d79588170934f24790be47 fcitx5-configtool-5.1.4.tar.gz +4be7455a90be1cbbe5b13f663cef6cdae5aebb2407f5c941b2c59daaddddc801463877a12843589631d5f6bb51dcc061f57bb1718428189f185dc08c7df97f62 fcitx5-configtool-5.1.5.tar.gz " diff --git a/testing/fcitx5-gtk/APKBUILD b/testing/fcitx5-gtk/APKBUILD index 078130bdd5c..b3da1a7ca32 100644 --- a/testing/fcitx5-gtk/APKBUILD +++ b/testing/fcitx5-gtk/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Lindsay Zhou <i@lin.moe> # Maintainer: Lindsay Zhou <i@lin.moe> pkgname=fcitx5-gtk -pkgver=5.1.2 +pkgver=5.1.3 pkgrel=0 pkgdesc="Fcitx5 GTK module" url="https://github.com/fcitx/fcitx5-gtk/" @@ -67,5 +67,5 @@ _gtk4() { } sha512sums=" -9be64cce50f48f57340a69164ae8878ebc05f2e637ac281e3b5ff4c09427b40347088c51e799e345a3c7866026061787116acd5e081c77491638b582d766c94d fcitx5-gtk-5.1.2.tar.gz +1b3a944c947fface27b6d590ecc02e0a427d658da4d8e57a2788b5d0a7c7da6e725156b120da683d0fa566452c9a9a17594ce61934d57dd9da01f49358c27304 fcitx5-gtk-5.1.3.tar.gz " diff --git a/testing/fcitx5-hangul/APKBUILD b/testing/fcitx5-hangul/APKBUILD index b4542a5fbc4..cd1c0362985 100644 --- a/testing/fcitx5-hangul/APKBUILD +++ b/testing/fcitx5-hangul/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Lindsay Zhou <i@lin.moe> # Maintainer: Lindsay Zhou <i@lin.moe> pkgname=fcitx5-hangul -pkgver=5.1.2 +pkgver=5.1.3 pkgrel=0 pkgdesc="libhangul input method support for fcitx5" url="https://github.com/fcitx/fcitx5-hangul" @@ -33,5 +33,5 @@ package() { } sha512sums=" -5e1ba80a29ee08200d4bb40ffb33fa7ad69f6f8476e00c10e9e4e800d6d29bc7f92346d6f377b2497e7080f780d913c1aee7042048a0a6099a812b1dec34abe0 fcitx5-hangul-5.1.2.tar.gz +fb54a322c6a622e097b89c3ed4181901c90d4d2ed303d7defa60d999a4f1e08229050ea5ba2a02160f5e06089010eb8cfee767b79b5650aa621bdc48190b1073 fcitx5-hangul-5.1.3.tar.gz " diff --git a/testing/fcitx5-kkc/APKBUILD b/testing/fcitx5-kkc/APKBUILD index a18620545a5..6ae87c78176 100644 --- a/testing/fcitx5-kkc/APKBUILD +++ b/testing/fcitx5-kkc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Lindsay Zhou <i@lin.moe> # Maintainer: Lindsay Zhou <i@lin.moe> pkgname=fcitx5-kkc -pkgver=5.1.2 +pkgver=5.1.3 pkgrel=0 pkgdesc="libkkc input method support for fcitx5" url="https://github.com/fcitx/fcitx5-kkc" @@ -37,6 +37,6 @@ package() { } sha512sums=" -ecf217da4c765dc8c10dd82fc5141bc51f8461624a4b45b2c2054b6775f424dfb3aa3c533d05f7595a3f63b4124ca5efebade2188ad6a47fcb553d61a6f3ccde fcitx5-kkc-5.1.2.tar.gz +d474ae70b63fd772cf8ff3c180ccadfc9724df18f1214607ab4695a6ec6c50311c2f9da6569703c77c607aa34c9bceba9d526d10312174545423a04aa7a7abc8 fcitx5-kkc-5.1.3.tar.gz e58e74bc15497462414d2fbb99c0685249de5f5a5850d39696dfde7e3c171d5932a9b2f4bfd3d4a9c2e2d103ad2456cd2e7d0545a254b55b79cecb08d953d779 cxx17.patch " diff --git a/testing/fcitx5-lua/APKBUILD b/testing/fcitx5-lua/APKBUILD index 44d07374842..bb26c776ea0 100644 --- a/testing/fcitx5-lua/APKBUILD +++ b/testing/fcitx5-lua/APKBUILD @@ -1,6 +1,7 @@ -# Maintainer: +# Contributor: Lindsay Zhou <i@lin.moe> +# Maintainer: Lindsay Zhou <i@lin.moe> pkgname=fcitx5-lua -pkgver=5.0.12 +pkgver=5.0.13 pkgrel=0 pkgdesc="Lua support for fcitx5" url="https://github.com/fcitx/fcitx5-lua" @@ -37,5 +38,5 @@ package() { } sha512sums=" -09a0d9e21d378c114dfda1ba89c5f9bc49dca9fc2c3241451b00a3629510f2d152eef5a5d4a055c4aaab036c1469b6aa210400f0ffd90f3a81bcad5ea114c291 fcitx5-lua-5.0.12.tar.gz +7c583fbf561ff5113100a62258db1afbc5eaa2bf51aec77c618947bc95affa0545077c9afda88353386c9e2414462ca18696ca6458255f1916a2dac83a267568 fcitx5-lua-5.0.13.tar.gz " diff --git a/testing/fcitx5-m17n/APKBUILD b/testing/fcitx5-m17n/APKBUILD index 3367cf55de5..6fb8dc73da2 100644 --- a/testing/fcitx5-m17n/APKBUILD +++ b/testing/fcitx5-m17n/APKBUILD @@ -1,7 +1,8 @@ -# Maintainer: +# Contributor: Lindsay Zhou <i@lin.moe> +# Maintainer: Lindsay Zhou <i@lin.moe> pkgname=fcitx5-m17n -pkgver=5.1.0 -pkgrel=1 +pkgver=5.1.1 +pkgrel=0 pkgdesc="m17n extra input method support for fcitx5" url="https://github.com/fcitx/fcitx5-m17n" arch="all" @@ -35,5 +36,5 @@ package() { } sha512sums=" -de273de4a01d0c9f23c6b96fe984c97881947907911e3ea60fefc5dcb50e23dcd64a28e891893ed058fe4ec2c2f7f2dbc4a0f8de2957052ff9c5ea5d88f5ff21 fcitx5-m17n-5.1.0.tar.gz +af9aae6c43cc667b910f766cf251c6249573537cca855130e502370aa7ca028f3916d67b55d2596390df8c1de668228e81281a03e34ec5e9e00ab07d4d176839 fcitx5-m17n-5.1.1.tar.gz " diff --git a/testing/fcitx5-qt/APKBUILD b/testing/fcitx5-qt/APKBUILD index a65adb4b0f2..96e13f61b89 100644 --- a/testing/fcitx5-qt/APKBUILD +++ b/testing/fcitx5-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: ProgCat <progcat@protonmail.com> # Maintainer: ProgCat <progcat@protonmail.com> pkgname=fcitx5-qt -pkgver=5.1.5 +pkgver=5.1.6 pkgrel=0 pkgdesc="Qt library and IM module for Fcitx5" url="https://github.com/fcitx/fcitx5-qt" @@ -76,5 +76,5 @@ qt6() { } sha512sums=" -a153571b9e393ab1fb355b6de840760e3fec186c62785ac2a8186e0a023d8f3b517a25ee251747ad457e12d649b55e8b558772b8c0b015b8ae459f3f66098a06 fcitx5-qt-5.1.5.tar.gz +cb6a92369340199b22e64525902e6eb71e4149bedc720eb087b4f8d59513c64c35a7adcd0a90b51440d1b48fd6a881d7ea07363d2da9767cc66c21b72f97916e fcitx5-qt-5.1.6.tar.gz " diff --git a/testing/fcitx5-rime/APKBUILD b/testing/fcitx5-rime/APKBUILD index ebd15bcfdbf..0a3155a96fa 100644 --- a/testing/fcitx5-rime/APKBUILD +++ b/testing/fcitx5-rime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Lindsay Zhou <i@lin.moe> # Maintainer: Lindsay Zhou <i@lin.moe> pkgname=fcitx5-rime -pkgver=5.1.5 +pkgver=5.1.6 pkgrel=0 pkgdesc="librime input method support for fcitx5" url="https://github.com/fcitx/fcitx5-rime" @@ -34,5 +34,5 @@ package() { } sha512sums=" -b80b86e3e984a7cba345087c6d7cdc88366297ab9027ee4767367454b65be870d4e5e53dd6214a856b9cf3b3edebaff75fa1d60faf9295f74a8a8706c0094f87 fcitx5-rime-5.1.5.tar.gz +c8618f3af6887cd163e17f851890fe50b7dd1cf4f37cb44b121c89bd572e8919fe7788264e6062a203d21ff3caeded88c1907b8ff2aeae0bface82e39262aac0 fcitx5-rime-5.1.6.tar.gz " diff --git a/testing/fcitx5-table-extra/APKBUILD b/testing/fcitx5-table-extra/APKBUILD index 3a9e3b75244..a72f75cda38 100644 --- a/testing/fcitx5-table-extra/APKBUILD +++ b/testing/fcitx5-table-extra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Lindsay Zhou <i@lin.moe> # Maintainer: Lindsay Zhou <i@lin.moe> pkgname=fcitx5-table-extra -pkgver=5.1.4 +pkgver=5.1.5 pkgrel=0 pkgdesc="extra-table input method support for fcitx5" url="https://github.com/fcitx/fcitx5-table-extra" @@ -30,5 +30,5 @@ package() { } sha512sums=" -12611d16f06aa28d82764feb7a0bab8114106519be3e5f011eed6da6354729432968354adb48ddc425b215295cb6d5006ea8da82cb1ac78e77ae76c4ba1f40c7 fcitx5-table-extra-5.1.4.tar.gz +6707e722360c53c4a738b9871fdd9174ddd161a9ccd754ad48fec57e32268e18b59bf05330af238515c1af6f11b2ceb50b4c660e1f9b36422a22a19cf9307e91 fcitx5-table-extra-5.1.5.tar.gz " diff --git a/testing/fcitx5-table-other/APKBUILD b/testing/fcitx5-table-other/APKBUILD index 77ed61001a1..ad3a097778c 100644 --- a/testing/fcitx5-table-other/APKBUILD +++ b/testing/fcitx5-table-other/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Lindsay Zhou <i@lin.moe> # Maintainer: Lindsay Zhou <i@lin.moe> pkgname=fcitx5-table-other -pkgver=5.1.1 +pkgver=5.1.2 pkgrel=0 pkgdesc="other-table input method support for fcitx5" url="https://github.com/fcitx/fcitx5-table-other" @@ -30,5 +30,5 @@ package() { } sha512sums=" -2447caebb5774d9157293c09729b63e3fc7bbd83ae32a39e2ed0b70a1979bb32dd757587da41b818d94ecd7c7c636c10a1fe0304b646e24fe6d8bda9b8774029 fcitx5-table-other-5.1.1.tar.gz +da6d531eeb23d8a2758365ccd9ba81fb6dabe5eb73b826424f77e751dc5a325197b277e7ec28eb3938054a34033fffb758a558d0da48986effa2ad46de78e159 fcitx5-table-other-5.1.2.tar.gz " diff --git a/testing/fcitx5-unikey/APKBUILD b/testing/fcitx5-unikey/APKBUILD index 8b2fc34ffbd..8de76236434 100644 --- a/testing/fcitx5-unikey/APKBUILD +++ b/testing/fcitx5-unikey/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Lindsay Zhou <i@lin.moe> # Maintainer: Lindsay Zhou <i@lin.moe> pkgname=fcitx5-unikey -pkgver=5.1.3 +pkgver=5.1.4 pkgrel=0 pkgdesc="Unikey Wrapper for Fcitx" url="https://github.com/fcitx/fcitx5-unikey" @@ -45,5 +45,5 @@ package() { } sha512sums=" -c74be9089bb8ef2e44678336b28ca397f2af06e2f69f66c94d55c2ab8325c97f01fa517398a4640e660dbe95b5090970c72adad39ba6d87276faa96b34b762e1 fcitx5-unikey-5.1.3.tar.gz +6d8f92e35acc23fe191e5600efe873ad3f774190d26a2c3fd1f60ac1392b11bcf1ff865a860babed79964188a7951aa81d3e9f3a962614feb4daebf754a031e1 fcitx5-unikey-5.1.4.tar.gz " diff --git a/testing/fcitx5/APKBUILD b/testing/fcitx5/APKBUILD index bfbb2fa6a1a..1bd8afc666a 100644 --- a/testing/fcitx5/APKBUILD +++ b/testing/fcitx5/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=fcitx5 -pkgver=5.1.8 +pkgver=5.1.9 pkgrel=0 pkgdesc="Generic input method framework" url="https://github.com/fcitx/fcitx5" @@ -55,5 +55,5 @@ package() { } sha512sums=" -e815e7a991c2f07b64d33c988b20e6051fa5ab5d0c25f3971d6b1689d50eee3dd57f58e521d8fa8619b10c800ede664f4642c1e6f7d9344e6f7c2bd65c1340d1 fcitx5-5.1.8.tar.gz +c6ae530f4725128ff2a89e19cb672bc781ccfb09dc3f8a32557c9710b39ce3ca145a9756c6fa1115b264898a992a26264045d4a55156094a2effecf3e4519f71 fcitx5-5.1.9.tar.gz " diff --git a/testing/featherpad/APKBUILD b/testing/featherpad/APKBUILD index a0dfc326d2d..2f1ac864ad2 100644 --- a/testing/featherpad/APKBUILD +++ b/testing/featherpad/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Antoni Aloy <aaloytorrens@gmail.com> # Maintainer: Pedram Pourang <tsujan2000@gmail.com> pkgname=featherpad -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=0 pkgdesc="Lightweight Qt plain-text editor" url="https://github.com/tsujan/FeatherPad" @@ -40,5 +40,5 @@ lang() { } sha512sums=" -5104fbcb2f83e3bdb9c1394cd546b1d6036d3e00e4e358da05affed895a426b1d63bd4d62edc5c65beed96fa3d4adcdadafb4f5b2eb84406ba651576e49c2bb6 FeatherPad-1.5.0.tar.xz +772b62a23c0631701fb9f676390578c6e05c05e07ff8e24bc5e783355e3f360b88564d98809ef4365fd8f081c41b34c017cf34212e14505fc1bc852a1a415f83 FeatherPad-1.5.1.tar.xz " diff --git a/testing/felix/APKBUILD b/testing/felix/APKBUILD index 536d4776e9e..0d16f47d81f 100644 --- a/testing/felix/APKBUILD +++ b/testing/felix/APKBUILD @@ -1,11 +1,12 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=felix -pkgver=2.12.1 +pkgver=2.13.0 pkgrel=0 pkgdesc="Simple TUI file manager with vim-like key mapping" url="https://kyoheiu.dev/felix/" # s390x: nix crate doesn't build yet -arch="all !s390x" +# riscv64: tests fail +arch="all !s390x !riscv64" license="MIT" makedepends=" bzip2-dev @@ -54,6 +55,6 @@ package() { } sha512sums=" -30ff3277d7e9c0c90387a91ed6c50ab1949905ccd645e9e95d2a56a0fd919e9e8bbb69ce4b72525f0e8ed775882840f3829e4387a39a2d2e760d8d1245d7e8c8 felix-2.12.1.tar.gz -3f9383877e8ad036a09c75d954ec4574e26b1b1aa660170d065867be9080aad9e4bb8ad63d86a684d4c1534c86ebe29a35b746f73e572485b17f26177319d461 use-system-libs.patch +545ccf207abbc606ea428edc363067c1976b34d54a0a175bb1cc60406b87b581ae68b1445735655e2ef24ad49a357b6e66f735f52e197f5a55b0bb8998c4ba89 felix-2.13.0.tar.gz +ef74e6a6d7e7ba4438e1fab7e3f9aee61c718b5873acc4c693dd5a02af9325073eb4cd42e5e5b2337698d7e048829dbf56d3e55adeadfcc969a4ffbc2d7811c8 use-system-libs.patch " diff --git a/testing/felix/use-system-libs.patch b/testing/felix/use-system-libs.patch index 30ad2a35e21..e1a43b9dc6a 100644 --- a/testing/felix/use-system-libs.patch +++ b/testing/felix/use-system-libs.patch @@ -1,5 +1,5 @@ diff --git a/Cargo.lock b/Cargo.lock -index b08d2aa..0fbd4a8 100644 +index 552a402..06b99ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,6 +147,15 @@ dependencies = [ @@ -18,7 +18,16 @@ index b08d2aa..0fbd4a8 100644 [[package]] name = "constant_time_eq" version = "0.1.5" -@@ -376,6 +385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -332,7 +341,7 @@ dependencies = [ + + [[package]] + name = "felix" +-version = "2.12.1" ++version = "2.13.0" + dependencies = [ + "bwrap", + "chrono", +@@ -377,6 +386,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", @@ -26,7 +35,7 @@ index b08d2aa..0fbd4a8 100644 "miniz_oxide", ] -@@ -542,6 +552,16 @@ dependencies = [ +@@ -543,6 +553,16 @@ dependencies = [ "redox_syscall", ] @@ -44,7 +53,7 @@ index b08d2aa..0fbd4a8 100644 name = "libz-sys" version = "1.1.15" diff --git a/Cargo.toml b/Cargo.toml -index 3ccaf0f..1aebeba 100644 +index 3772f0a..106ff14 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,9 +30,9 @@ crossterm = "0.26.1" @@ -58,4 +67,4 @@ index 3ccaf0f..1aebeba 100644 +zstd = {version = "0.12.4", default-features = false, features = ["pkg-config"]} unicode-width = "0.1.10" git2 = {version = "0.18.0", default-features = false } - + normpath = "1.2.0" diff --git a/testing/fileshelter/APKBUILD b/testing/fileshelter/APKBUILD index 3ea73fe2b5b..9f797af59ac 100644 --- a/testing/fileshelter/APKBUILD +++ b/testing/fileshelter/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kay Thomas <kaythomas@pm.me> pkgname=fileshelter pkgver=5.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="One-click file sharing web application" url="https://github.com/epoupon/fileshelter" arch="all" diff --git a/testing/firefox-developer-edition/APKBUILD b/testing/firefox-developer-edition/APKBUILD index 811f37ed41e..06e83b2791b 100644 --- a/testing/firefox-developer-edition/APKBUILD +++ b/testing/firefox-developer-edition/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=firefox-developer-edition -pkgver=125.0_beta9 +pkgver=126.0_beta9 _pkgver=${pkgver/_beta/b} -_releasedate=2024-04-06 +_releasedate=2024-05-04 pkgrel=0 pkgdesc="Firefox web browser" url="https://www.firefox.com/" @@ -252,7 +252,7 @@ package() { } sha512sums=" -66d1b27355c105714b926b5424badc01582e5ad7e979104d05fa50748ea961c7f1e081b88978fb94aee54ed281931b8d0f0bb0e16670cf89e7f10703711e7f4e firefox-125.0b9.source.tar.xz +e78c553ed1df36db7eb16d6f393e0afc88ab67dd74e84c30770f807027890ecb90414720b63dc69ec77696acfba674ed5e2730b3a3e524e6de4a335691b25163 firefox-126.0b9.source.tar.xz 3c28e243c1c74a9bd1ea13729926b1cae3ee35843b14be92ff3287a8cd745e95954e1bc842f2add165923d159bb8d2a7bcd92ba8fb2f4017ba1aef892d77aecf fix-fortify-system-wrappers.patch cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch 305c874fdea3096e9c4c6aa6520ac64bb1c347c4b59db8360096646593fe684c3b5377874d91cecd33d56d1410b4714fbdea2b514923723ecbeff79d51265d9b fix-webrtc-glibcisms.patch diff --git a/testing/firefox-developer-edition/res_nquery.patch b/testing/firefox-developer-edition/res_nquery.patch deleted file mode 100644 index 1b6474a926d..00000000000 --- a/testing/firefox-developer-edition/res_nquery.patch +++ /dev/null @@ -1,17 +0,0 @@ -musl doesn't have res_nquery - fall back to res_query ---- a/netwerk/dns/PlatformDNSUnix.cpp -+++ b/netwerk/dns/PlatformDNSUnix.cpp -@@ -32,11 +32,11 @@ - rv = packet.FillBuffer( - [&](unsigned char response[DNSPacket::MAX_SIZE]) -> int { - int len = 0; --#if defined(XP_LINUX) -+#if defined(__GLIBC__) - len = res_nquery(&_res, host.get(), ns_c_in, - nsIDNSService::RESOLVE_TYPE_HTTPSSVC, response, - DNSPacket::MAX_SIZE); --#elif defined(XP_MACOSX) -+#elif defined(XP_LINUX) || defined(XP_MACOSX) - len = - res_query(host.get(), ns_c_in, nsIDNSService::RESOLVE_TYPE_HTTPSSVC, - response, DNSPacket::MAX_SIZE); diff --git a/testing/flightgear/APKBUILD b/testing/flightgear/APKBUILD index faa8563b570..78c2491a231 100644 --- a/testing/flightgear/APKBUILD +++ b/testing/flightgear/APKBUILD @@ -3,7 +3,7 @@ pkgname=flightgear pkgver=2020.3.19 _pkgver=${pkgver%.*} -pkgrel=0 +pkgrel=1 pkgdesc="Flight Gear Flight Simulator" url="http://flightgear.org" arch="all !riscv64 !x86 !armhf !armv7" # limited by openscenegraph and build compatibility diff --git a/testing/fluent-bit/APKBUILD b/testing/fluent-bit/APKBUILD index c7387096b67..3f1472507d7 100644 --- a/testing/fluent-bit/APKBUILD +++ b/testing/fluent-bit/APKBUILD @@ -5,9 +5,9 @@ pkgver=2.1.10 pkgrel=0 pkgdesc="Fast and Lightweight Log processor and forwarder" url="https://fluentbit.io/" -# riscv64: does not support bundled luajit +# riscv64, loongarch64: does not support bundled luajit # arm: doesn't build -arch="all !armhf !armv7 !ppc64le !s390x !riscv64" +arch="all !armhf !armv7 !ppc64le !s390x !riscv64 !loongarch64" license="Apache-2.0" # XXX: # wamr, sqlite, rdkafka, c-ares, luajit are bundled diff --git a/testing/font-andika/APKBUILD b/testing/font-andika/APKBUILD new file mode 100644 index 00000000000..de2071eef71 --- /dev/null +++ b/testing/font-andika/APKBUILD @@ -0,0 +1,21 @@ +# Contributor: Amelia Clarke <selene@perilune.dev> +# Maintainer: Amelia Clarke <selene@perilune.dev> +pkgname=font-andika +pkgver=6.200 +pkgrel=0 +pkgdesc="A sans-serif font family designed and optimized especially for literacy use" +url="https://software.sil.org/andika/" +arch="noarch" +license="OFL-1.1-RFN" +source="https://github.com/silnrsi/font-andika/releases/download/v$pkgver/Andika-$pkgver.tar.xz" +builddir="$srcdir/Andika-$pkgver" +options="!check" # no test suite + +package() { + install -Dm644 "$builddir"/*.ttf \ + -t "$pkgdir"/usr/share/fonts/${pkgname#font-} +} + +sha512sums=" +bd29f63c8d5f73a8c3963dbbc97211bd095fb37c8641dc820942f3b21fbf7058f185a1b58a414730b26a1894d135d1def04840ccef1e3348b20fd4178c301cf6 Andika-6.200.tar.xz +" diff --git a/testing/forgejo/APKBUILD b/testing/forgejo/APKBUILD index 3aa2c903a38..d2ccc9b14d3 100644 --- a/testing/forgejo/APKBUILD +++ b/testing/forgejo/APKBUILD @@ -3,12 +3,12 @@ # Contributor: techknowlogick <techknowlogick@gitea.io> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=forgejo -_pkgver=1.21.7-0 -pkgver=${_pkgver/-/.} -pkgrel=2 +pkgver=7.0.2 +pkgrel=0 pkgdesc="Self-hosted Git service written in Go" url="https://forgejo.org" -arch="all" +# riscv64: builds fail https://codeberg.org/forgejo/forgejo/issues/3025 +arch="all !riscv64" license="MIT" depends="git git-lfs gnupg" makedepends="go nodejs npm" @@ -17,7 +17,7 @@ install="$pkgname.pre-install" pkgusers="forgejo" pkggroups="www-data" subpackages="$pkgname-openrc" -source="$pkgname-$pkgver.tar.gz::https://codeberg.org/forgejo/forgejo/archive/v$_pkgver.tar.gz +source="$pkgname-$pkgver.tar.gz::https://codeberg.org/forgejo/forgejo/archive/v$pkgver.tar.gz $pkgname.initd $pkgname.ini " @@ -25,6 +25,8 @@ builddir="$srcdir/forgejo" options="!check net chmod-clean" # broken with GIT_CEILING # secfixes: +# 1.21.10.0-r0: +# - CVE-2023-45288 # 1.21.3.0-r0: # - CVE-2023-48795 @@ -52,11 +54,11 @@ build() { export CGO_LDFLAGS="$LDFLAGS" unset LDFLAGS ## make FHS compliant - LDFLAGS="$LDFLAGS -X code.gitea.io/gitea/modules/setting.CustomConf=/etc/forgejo/app.ini" - LDFLAGS="$LDFLAGS -X code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/forgejo/" - export LDFLAGS + local setting="code.gitea.io/gitea/modules/setting" + export LDFLAGS="$LDFLAGS -X $setting.CustomConf=/etc/forgejo/app.ini" + export LDFLAGS="$LDFLAGS -X $setting.AppWorkPath=/var/lib/forgejo/" - make -j1 + make -j1 build } check() { @@ -65,15 +67,14 @@ check() { install -d -m700 "$home"/.ssh touch "$home"/.gitconfig - env GITEA_ROOT="$home" HOME="$home" GITEA_WORK_DIR="$(pwd)" timeout -s ABRT 20m make -j1 test-sqlite ## "make test" - modified (exclude broken tests) ## 'code.gitea.io/gitea/modules/migrations': github hase rate limits! 403 API - local tests=$(go list ./... | grep -v /vendor/ | \ - grep -v 'code.gitea.io/gitea/modules/migrations' | \ - grep -v 'code.gitea.io/gitea/modules/charset' | \ - grep -v 'code.gitea.io/gitea/models/migrations' | \ - grep -v 'code.gitea.io/gitea/services/migrations' | \ + local tests=$(go list ./... | grep -v /vendor/ | + grep -v 'code.gitea.io/gitea/modules/migrations' | + grep -v 'code.gitea.io/gitea/modules/charset' | + grep -v 'code.gitea.io/gitea/models/migrations' | + grep -v 'code.gitea.io/gitea/services/migrations' | grep -v 'code.gitea.io/gitea/integrations') env GITEA_CONF="$PWD/tests/sqlite.ini" GITEA_ROOT="$home" HOME="$home" GO111MODULE=on go test -mod=vendor -tags='sqlite sqlite_unlock_notify' $tests @@ -99,7 +100,7 @@ package() { } sha512sums=" -187dcda2120e9e35253f93a35bab50f92f6225c921e8c614ac9a44c30fd458906e384239d51b761363133a955f3f8993eb025355447219dfaa75bae7e9923564 forgejo-1.21.7.0.tar.gz +c5965f6d25c5964598b9e76e0dc9962d02b7ea9bc6a74e9151635b04e323233a014a332e4d4ad68359523abaeb4c40d223d2c9d93f636c1d3aabc43fe64bec67 forgejo-7.0.2.tar.gz eb93a9f6c8f204de5c813f58727015f53f9feaab546589e016c60743131559f04fc1518f487b6d2a0e7fa8fab6d4a67cd0cd9713a7ccd9dec767a8c1ddebe129 forgejo.initd b537b41b6b3a945274a6028800f39787b48c318425a37cf5d40ace0d1b305444fd07f17b4acafcd31a629bedd7d008b0bb3e30f82ffeb3d7e7e947bdbe0ff4f3 forgejo.ini " diff --git a/testing/freetube/APKBUILD b/testing/freetube/APKBUILD index 73d76afe70e..e1b9cae40a8 100644 --- a/testing/freetube/APKBUILD +++ b/testing/freetube/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=freetube pkgver=0.20.0 -pkgrel=0 +pkgrel=1 pkgdesc="An open source desktop YouTube player built with privacy in mind." arch="x86_64 aarch64" # blocked by electron license="AGPL-3.0-only" diff --git a/testing/g4music/APKBUILD b/testing/g4music/APKBUILD index d9155d61199..55cf8e4be01 100644 --- a/testing/g4music/APKBUILD +++ b/testing/g4music/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakob Meier <comcloudway@ccw.icu> # Maintainer: Jakob Meier <comcloudway@ccw.icu> pkgname=g4music -pkgver=3.5.1 +pkgver=3.5.2 pkgrel=0 pkgdesc="Fast fluent lightweight music player written in GTK4, with a beautiful and adaptive user interface" url="https://gitlab.gnome.org/neithern/g4music" @@ -35,5 +35,5 @@ package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output } sha512sums=" -1d992d791c9544e980829a00b00a528ba7d1c37adba327b2d20211e32eadcb1493bb0a77ada45748ea3219395a7a2d19d3fae78721f664aa6df92eecadcfc7ab g4music-v3.5.1.tar.gz +46f580672745a0374dd571f47396b3c7530d3ccb40afdbdf2640714a3151ad4e4152dd23274749f9cc2f3af6caf4315304530650a21bd67964d6833940c31a97 g4music-v3.5.2.tar.gz " diff --git a/testing/gdcm/70-vtk9.3.0.patch b/testing/gdcm/70-vtk9.3.0.patch new file mode 100644 index 00000000000..e9bf72577d1 --- /dev/null +++ b/testing/gdcm/70-vtk9.3.0.patch @@ -0,0 +1,94 @@ +Author: nilason +Summary: #552 Problem compiling with VTK 9.3.0 support +URL: https://sourceforge.net/p/gdcm/bugs/552/#9e8f +---- + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -698,6 +698,7 @@ + HEADERS_DESTINATION "${GDCM_INSTALL_INCLUDE_DIR}/vtk${vtk_version_suffix}" + CMAKE_DESTINATION "${GDCM_INSTALL_PACKAGE_DIR}" + LICENSE_DESTINATION "${GDCM_INSTALL_DATA_DIR}/vtkgdcm-${GDCM_SHORT_VERSION}" ++ SPDX_DESTINATION "${GDCM_INSTALL_DATA_DIR}/vtkgdcm-${GDCM_SHORT_VERSION}" + HIERARCHY_DESTINATION "${GDCM_INSTALL_LIB_DIR}/vtk${vtk_version_suffix}/hierarchy/vtkgdcm" + LIBRARY_NAME_SUFFIX "${vtkgdcm_library_suffix}" + VERSION "${GDCM_VERSION}" + + +--- a/Utilities/VTK/vtkImageColorViewer.h ++++ b/Utilities/VTK/vtkImageColorViewer.h +@@ -199,22 +199,6 @@ + virtual int GetOffScreenRendering(); + vtkBooleanMacro(OffScreenRendering,int); + +- // Description: +- // @deprecated Replaced by vtkImageColorViewer::GetSliceMin() as of VTK 5.0. +- VTK_LEGACY(int GetWholeZMin()); +- +- // Description: +- // @deprecated Replaced by vtkImageColorViewer::GetSliceMax() as of VTK 5.0. +- VTK_LEGACY(int GetWholeZMax()); +- +- // Description: +- // @deprecated Replaced by vtkImageColorViewer::GetSlice() as of VTK 5.0. +- VTK_LEGACY(int GetZSlice()); +- +- // Description: +- // @deprecated Replaced by vtkImageColorViewer::SetSlice() as of VTK 5.0. +- VTK_LEGACY(void SetZSlice(int)); +- + protected: + vtkImageColorViewer(); + ~vtkImageColorViewer(); + + + +--- a/Utilities/VTK/vtkImageColorViewer.cxx ++++ b/Utilities/VTK/vtkImageColorViewer.cxx +@@ -919,34 +919,6 @@ + } + + //---------------------------------------------------------------------------- +-#ifndef VTK_LEGACY_REMOVE +-int vtkImageColorViewer::GetWholeZMin() +-{ +- VTK_LEGACY_REPLACED_BODY(vtkImageColorViewer::GetWholeZMin, "VTK 5.0", +- vtkImageColorViewer::GetSliceMin); +- return this->GetSliceMin(); +-} +-int vtkImageColorViewer::GetWholeZMax() +-{ +- VTK_LEGACY_REPLACED_BODY(vtkImageColorViewer::GetWholeZMax, "VTK 5.0", +- vtkImageColorViewer::GetSliceMax); +- return this->GetSliceMax(); +-} +-int vtkImageColorViewer::GetZSlice() +-{ +- VTK_LEGACY_REPLACED_BODY(vtkImageColorViewer::GetZSlice, "VTK 5.0", +- vtkImageColorViewer::GetSlice); +- return this->GetSlice(); +-} +-void vtkImageColorViewer::SetZSlice(int s) +-{ +- VTK_LEGACY_REPLACED_BODY(vtkImageColorViewer::SetZSlice, "VTK 5.0", +- vtkImageColorViewer::SetSlice); +- this->SetSlice(s); +-} +-#endif +- +-//---------------------------------------------------------------------------- + void vtkImageColorViewer::PrintSelf(ostream& os, vtkIndent indent) + { + this->Superclass::PrintSelf(os, indent); + + + +--- a/Utilities/VTK/vtkGDCMTesting.cxx ++++ b/Utilities/VTK/vtkGDCMTesting.cxx +@@ -14,7 +14,6 @@ + #include "vtkGDCMTesting.h" + + #include "vtkObjectFactory.h" +-#include "vtkToolkits.h" + #include "gdcmTesting.h" + #include "gdcmFilename.h"
\ No newline at end of file diff --git a/testing/gdcm/APKBUILD b/testing/gdcm/APKBUILD index 914be3b4edf..511486b7fe5 100644 --- a/testing/gdcm/APKBUILD +++ b/testing/gdcm/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=gdcm -pkgver=3.0.23 -pkgrel=2 +pkgver=3.0.24 +pkgrel=0 pkgdesc="Grassroots DiCoM is a C++ library for DICOM medical files" url="https://gdcm.sourceforge.net/" # armhf, aarch64: dcmtk missing @@ -45,19 +45,20 @@ source="gdcm-$pkgver.tar.bz2::https://sourceforge.net/projects/gdcm/files/gdcm%2 40-java.patch 50-use_copyright.patch 60-fix_export_variables.patch + 70-vtk9.3.0.patch " # Optional dependency texlive is not available on ppc64le -#case "$CARCH" in -# ppc64le|riscv64) - _with_doc="OFF" -# ;; -# *) -# makedepends="$makedepends texlive texmf-dist-latexextra texlive-dvi" -# subpackages="$subpackages $pkgname-doc-html $pkgname-doc-pdf" -# _with_doc="ON" -# ;; -#esac +case "$CARCH" in + ppc64le|riscv64) + _with_doc="OFF" + ;; + *) + makedepends="$makedepends texlive texmf-dist-latexextra texlive-dvi texmf-dist-lang texmf-dist-plaingeneric texmf-dist-fontsrecommended" + subpackages="$subpackages $pkgname-doc-html $pkgname-doc-pdf" + _with_doc="ON" + ;; +esac subpackages="$subpackages $pkgname-doc py3-$pkgname:py3" # Optional dependency openjdk8-jdk is not available on riscv64 @@ -171,11 +172,12 @@ lib() { } sha512sums=" -2d62e6c023a9597fb086d015110b60bea8e73b21fabbb850a3abf574b75a301e64a7d756582d8832b946904ed795746bb75f79967700923dcd794de248154641 gdcm-3.0.23.tar.bz2 +727beb50df893bfc1f693da918d9aafe92df0328dd9a80f074dea43c4f82608999f2aea5f970c5410512fd2791a7159762e5e0c83cc6295bd35465b26dd5f376 gdcm-3.0.24.tar.bz2 ddc67a7a0b41b2d6e1e03defb6fb8a06ceeb2e9dd9bb47dfa4f7283d79df7c1e52577b799c00e930719ae6cdda46bded9497a67b8241359f238f5366085ec9ee gdcmData.tar.gz 87fcf6ea8f6eb34e27bf2ecf5cbd4501092d1f936341dfcf75085780da75fab9be7809521d5cb00a6c4a9e512bfbe7de20233104b19fab245391632e409498a3 10-docbook4.patch 15520cd087ea401744d46a55e83eb307742ee4b94256476531b9f209be4ffaa2b0653d4ab8266b8c82282a52fceaa1f887d5fdebf83c1da0551c51335f74a08e 30-off_t.patch 3254dd27821f9239c0379d8f9ca577a6f2a7ff14b55701cca9fb0ac47568c24d1e681bc404f1d97a9ed8ee00f2a11701c7d53eee7186e5ce9f7ca8eca7834326 40-java.patch da032530bd27b47ab4ec46652c4fcb65dda02ddeca4a3175f49cbf46efd43a1ff75b126475a694ce2df944e3970c67e378b1cf4db4cacf40d87bd999d37b4eed 50-use_copyright.patch 6994893b96069874bacc9285b994c7f93314b9570c7dd8b64ee51bb701fd5c8bd9892641e3b9d2d6f11fa4f2b7aebbbe25d72c1e689b5cccad34280f4c5199a5 60-fix_export_variables.patch +37514ff5c48e9ecbe9729229021adbbbbfa26c08df6a18b0e715a0a8f220ac0847c646ad091f9eb2f5b9026f5962599b35897057674a2807dd5cdcf4dd84d181 70-vtk9.3.0.patch " diff --git a/testing/gearmand/APKBUILD b/testing/gearmand/APKBUILD index 6b505c6a750..b61620764f6 100644 --- a/testing/gearmand/APKBUILD +++ b/testing/gearmand/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=gearmand pkgver=1.1.21 -pkgrel=0 +pkgrel=1 pkgdesc="A distributed job queue" url="http://gearman.org" arch="all" diff --git a/testing/ghostcloud/APKBUILD b/testing/ghostcloud/APKBUILD new file mode 100644 index 00000000000..39d5a23d5ea --- /dev/null +++ b/testing/ghostcloud/APKBUILD @@ -0,0 +1,73 @@ +# Contributor: Bart Ribbers <bribbers@disroot.org> +# Maintainer: Bart Ribbers <bribbers@disroot.org> +pkgname=ghostcloud +pkgver=0.9.9.5 +pkgrel=2 +_commit_qwebdavlib="0e9d02263b8ca7a8dd0330dd66515563108954be" +_commit_libqtcommandqueue="05ce5cfd42053da019b6636e7f57cebeeb83ebc4" +_commit_qml_ui_set="81b610b296f325f6b2607dd99f06bad2545783e4" +_commit_breeze_icons="e7058284a0106497d5f91e82a03acb159f87886e" +pkgdesc="A modern cross-platform client for Nextcloud, ownCloud & WebDav" +url="https://github.com/fredldotme/harbour-owncloud" +arch="all" +license="GPL-2.0-only AND LGPL-2.1-only" +depends="qt5-qtbase-sqlite" +makedepends=" + chrpath + qt5-qtbase-dev + qt5-qtdeclarative-dev + qt5-qtmultimedia-dev + qt5-qtquickcontrols2-dev + qt5-qtsvg-dev + " +source="$pkgname-$pkgver.tar.gz::https://github.com/fredldotme/harbour-owncloud/archive/refs/tags/$pkgver.tar.gz + $pkgname-qwebdavlib-$_commit_qwebdavlib.tar.gz::https://github.com/fredldotme/qwebdavlib/archive/$_commit_qwebdavlib.tar.gz + $pkgname-libqtcommandqueue-$_commit_libqtcommandqueue.tar.gz::https://github.com/fredldotme/libqtcommandqueue/archive/$_commit_libqtcommandqueue.tar.gz + $pkgname-qml-ui-set-$_commit_qml_ui_set.tar.gz::https://github.com/fredldotme/qml-ui-set/archive/$_commit_qml_ui_set.tar.gz + $pkgname-breeze_icons-$_commit_breeze_icons.tar.gz::https://invent.kde.org/frameworks/breeze-icons/-/archive/$_commit_breeze_icons.tar.gz + " +options="!check" # No tests +builddir="$srcdir/harbour-owncloud-$pkgver" + +prepare() { + default_prepare + + rmdir \ + 3rdparty/qwebdavlib \ + 3rdparty/libqtcommandqueue \ + 3rdparty/qml-ui-set \ + src/app/icons/breeze-icons + mv "$srcdir/qwebdavlib-$_commit_qwebdavlib" 3rdparty/qwebdavlib + mv "$srcdir/libqtcommandqueue-$_commit_libqtcommandqueue" 3rdparty/libqtcommandqueue + mv "$srcdir/qml-ui-set-$_commit_qml_ui_set" 3rdparty/qml-ui-set + mv "$srcdir/breeze-icons-$_commit_breeze_icons" src/app/icons/breeze-icons + + #ln -s src/app/icons/theme src/app/icons/breeze-icons/icons +} + +build() { + qmake-qt5 \ + CONFIG+=noadditionals \ + CONFIG+=quickcontrols + make +} + +package() { + INSTALL_ROOT="$pkgdir" make install + chrpath -d "$pkgdir"/usr/bin/harbour-owncloud + + install -Dm644 src/app/icons/harbour-owncloud.svg -t "$pkgdir"/usr/share/icons/hicolor/scalable/apps + install -Dm644 src/app/icons/86x86/harbour-owncloud.png -t "$pkgdir"/usr/share/icons/hicolor/86x86/apps + install -Dm644 src/app/icons/108x108/harbour-owncloud.png -t "$pkgdir"/usr/share/icons/hicolor/108x108/apps + install -Dm644 src/app/icons/128x128/harbour-owncloud.png -t "$pkgdir"/usr/share/icons/hicolor/128x128/apps + install -Dm644 src/app/icons/172x172/harbour-owncloud.png -t "$pkgdir"/usr/share/icons/hicolor/172x172/apps + install -Dm644 src/app/icons/harbour-owncloud_512.png "$pkgdir"/usr/share/icons/hicolor/512x512/apps/harbour-owncloud.png +} + +sha512sums=" +8485993a1129cca9e72dfb7767ba79f8412bd359af09cc5a9290d614127f57b24e71bda4fec65414d600719168aed06ba63e05f7d8e88f8440db9bf718e974cc ghostcloud-0.9.9.5.tar.gz +5e1957fcb6c53ac9a1c5d4321a389b93bada693502bd69094eb6e9dc1e08c438a020c626d3e8b19093c2163d8f3f22015866f51fcb5818888be0a1647d718e4a ghostcloud-qwebdavlib-0e9d02263b8ca7a8dd0330dd66515563108954be.tar.gz +d048eb7170e0c623f274927af8aacb8be695e129ddb1f2b48f38ec4acc163d328873b169d04a8430a47015aa0212ae969ea3f6d1ca140a1106b0534da9af1830 ghostcloud-libqtcommandqueue-05ce5cfd42053da019b6636e7f57cebeeb83ebc4.tar.gz +69236fd799624d45a2df0780bd9a16ce8e62715d6bd437d1fb20f0b340a8c67a3f0dddedd6ab9b17394a2df59701ce2a47b24bccbe345465c821db91dd51658f ghostcloud-qml-ui-set-81b610b296f325f6b2607dd99f06bad2545783e4.tar.gz +1f47a5a511eaac42db43242eb578aaf2e358277fe8d910e5ebe8dc09d9d514d14897c1c168c2dfca73336e885a9ed845f311507351bdb335bf594f1480e5cd65 ghostcloud-breeze_icons-e7058284a0106497d5f91e82a03acb159f87886e.tar.gz +" diff --git a/testing/ghq/APKBUILD b/testing/ghq/APKBUILD index f90e63f53ca..2422b869040 100644 --- a/testing/ghq/APKBUILD +++ b/testing/ghq/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=ghq -pkgver=1.5.0 -pkgrel=2 +pkgver=1.6.1 +pkgrel=0 pkgdesc="CLI to manage remote repository clones" url="https://github.com/x-motemen/ghq" arch="all" @@ -10,6 +10,7 @@ makedepends="asciidoctor go" subpackages=" $pkgname-doc $pkgname-bash-completion + $pkgname-fish-completion $pkgname-zsh-completion " source="$pkgname-$pkgver.tar.gz::https://github.com/x-motemen/ghq/archive/refs/tags/v$pkgver.tar.gz" @@ -37,10 +38,12 @@ package() { install -Dm644 misc/bash/_ghq \ "$pkgdir"/usr/share/bash-completion/completions/ghq + install -Dm644 misc/fish/ghq.fish \ + "$pkgdir"/usr/share/fish/vendor_completions.d/ghq.fish install -Dm644 misc/zsh/_ghq \ "$pkgdir"/usr/share/zsh/site-functions/_ghq } sha512sums=" -b626b86bbad033252902c2f6978d767e33d51e5f5643c39daea930b65b253824ff9b777688d36bc178117bcbe40de6d2d9f3322f38ed1d195d2eacf5e15ec625 ghq-1.5.0.tar.gz +fd3071e666b31a7ae79908c9ff64ab18ac7c3ee452bcef1745d2f281dd111aa6b81d81ff0b29d76963c478380fb6dc330c3ee4fe325dfbbb121b407373f3be43 ghq-1.6.1.tar.gz " diff --git a/testing/git-extras/APKBUILD b/testing/git-extras/APKBUILD index 0810196e54b..6270e64a92e 100644 --- a/testing/git-extras/APKBUILD +++ b/testing/git-extras/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=git-extras -pkgver=7.1.0 +pkgver=7.2.0 pkgrel=0 pkgdesc="Little git extras" url="https://github.com/tj/git-extras" @@ -29,5 +29,5 @@ package() { } sha512sums=" -955161b40c48ab92578efe487db78ea8d0fff499aaf8d4da2b13e8194a7f9297a84542c8642dd3a7c61c9a4d1e92342b5c586d341e4a003c9838d5e9731127b9 git-extras-7.1.0.tar.gz +c97c00bab24415574c8b38f259a0becd5da2edafe8cb5ff373de50917bc2854e39b1c396c42b603d4f203af2853d0ebaefe074bfe353f7692af7b1a13e744586 git-extras-7.2.0.tar.gz " diff --git a/testing/git-quick-stats/APKBUILD b/testing/git-quick-stats/APKBUILD new file mode 100644 index 00000000000..954cfaa9c30 --- /dev/null +++ b/testing/git-quick-stats/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Guy Godfroy <guy.godfroy@gugod.fr> +# Maintainer: Guy Godfroy <guy.godfroy@gugod.fr> +pkgname=git-quick-stats +pkgver=2.5.5 +pkgrel=0 +pkgdesc="Access various statistics in git repository" +url="https://git-quick-stats.sh" +arch="noarch" +license="MIT" +depends="bash git util-linux ncurses coreutils" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/arzzen/git-quick-stats/archive/refs/tags/$pkgver.tar.gz" + +check() { + bash tests/commands_test.sh +} + +package() { + install -Dm0755 git-quick-stats -t "$pkgdir"/usr/bin/ + install -Dm0644 git-quick-stats.1 -t "$pkgdir"/usr/share/man/man1/ +} + +sha512sums=" +d7df73b3bf0953e334ace67aea7328f183405384df26f2b54f5b7c311c76adcfd38de52b5898094796c0b4abe1835c69b9aa664905efd27e5cc8f71f75c31f1b git-quick-stats-2.5.5.tar.gz +" diff --git a/testing/gmic/APKBUILD b/testing/gmic/APKBUILD index 9205ab2dcf1..60eabd8db08 100644 --- a/testing/gmic/APKBUILD +++ b/testing/gmic/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Antoni Aloy <aaloytorrens@gmail.com> pkgname=gmic -pkgver=3.3.3 +pkgver=3.3.5 pkgrel=0 pkgdesc="GREYC's Magic for Image Computing" url="https://gmic.eu/" @@ -61,7 +61,7 @@ gimp() { } sha512sums=" -3bdfb8d8c935ead77ea0e6927a25e78d3b45236d1dd3cb515a64b4f04206380da471031d8a3bb7bc6b177ac607b2ca1622a11fe35cd8c5ea29c69fccfbdfb90e gmic_3.3.3.tar.gz +bf8f6cc171014c16bc15effa10e7e7dfba95de6a8ccb35edb064f05b838fda59d7922bee8d484d8219f06dec8e83d0734a05acaf7ccd72aad667441bfea3218e gmic_3.3.5.tar.gz 663773af7c6cd7a06d9bc84972dea60d40b0d2eb6fb9f5aef2da482ebf9ed8218f82f998f4e1846051365307a6740308e793abcc60d34f534e40080d0710c7bf notune.patch e9184cac37360d1da22b996c2e44b25ad26ae64d64c114b792b0a83c4383ebd1a698e8dc40f8d003334ed8a45b32b01e32413a14b8ed8976569fd9dc00359bb2 rpath.patch " diff --git a/testing/gmsh/APKBUILD b/testing/gmsh/APKBUILD index 7ba5c2584dd..cf0f5fd7528 100644 --- a/testing/gmsh/APKBUILD +++ b/testing/gmsh/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=gmsh pkgver=4.12.2 -pkgrel=0 +pkgrel=1 pkgdesc="Automatic 3D finite element mesh generator" url="https://gmsh.info/" # s390x: opencascade @@ -23,7 +23,10 @@ makedepends=" samurai " subpackages="$pkgname-dbg $pkgname-doc gmsh-py:py:noarch" -source="https://gmsh.info/src/gmsh-$pkgver-source.tgz" +source=" + https://gmsh.info/src/gmsh-$pkgver-source.tgz + gmsh-3e841c3943fbb47f29bb582deb298ca33ffe9d25.patch::https://gitlab.onelab.info/gmsh/gmsh/-/commit/3e841c3943fbb47f29bb582deb298ca33ffe9d25.patch + " builddir="$srcdir/$pkgname-$pkgver-source" build() { @@ -38,8 +41,7 @@ build() { } check() { - ctest -j $JOBS --test-dir build --output-on-failure \ - -E '../tutorials/t12.geo' + ctest -j $JOBS --test-dir build --output-on-failure } package() { @@ -56,4 +58,5 @@ py() { sha512sums=" 935148aff89b608f9d671d5fd4f12aed52b5c8ba4453e978d0febcc6934c045f2bba0078b13a64b2cbf4e852b413bbd05873335099ea7a967cc81ef58a7f8367 gmsh-4.12.2-source.tgz +9bb54084d78097b7f27f222e135d3bbeb13263b5cb7a1bb180edfedde5a960ab8db40df7bcb4f3420044727fd25e2e3f1c1f79d890666245cbc0bbbe286f04ee gmsh-3e841c3943fbb47f29bb582deb298ca33ffe9d25.patch " diff --git a/testing/gr-satellites/APKBUILD b/testing/gr-satellites/APKBUILD index 8709db57239..126ce68b905 100644 --- a/testing/gr-satellites/APKBUILD +++ b/testing/gr-satellites/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Edd Salkield <edd@salkield.uk> # Maintainer: Edd Salkield <edd@salkield.uk> pkgname=gr-satellites -pkgver=5.3.0 -pkgrel=5 +pkgver=5.5.0 +pkgrel=1 pkgdesc="satellite decoder blocks for GNURadio" url="https://github.com/daniestevez/gr-satellites" # gnuradio @@ -34,6 +34,6 @@ package() { } sha512sums=" -cefe7b7795c74f99b8388d3aa9d60749bc00d804ee3e843d9a5d32c41eb6e6fcd2ec2cb4693a872aee7984433e3cae5e4ab592efa402ec010eb009326c1f60ab gr-satellites-v5.3.0.tar.gz +8006cd7418e51b98079fd27716117d647c71d1c178e3d7de3aae900a479cb4669018721bb721bb37f23ea2cd8e416aed615db6d3b6e3adc13bc25d2147591c34 gr-satellites-v5.5.0.tar.gz 344ec6352da59e95492f70e389c9317c6e5700bb4cf05f4574aca841fa3660e6c00586124493a9822b1c47d4c28f0b59be2c9bc3ad1d6fc8790d764a3af04da1 no-zip-man.patch " diff --git a/testing/grafana-image-renderer/APKBUILD b/testing/grafana-image-renderer/APKBUILD index a424a4150dd..039b7f20787 100644 --- a/testing/grafana-image-renderer/APKBUILD +++ b/testing/grafana-image-renderer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Konstantin Kulikov <k.kulikov2@gmail.com> # Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com> pkgname=grafana-image-renderer -pkgver=3.10.2 +pkgver=3.10.4 pkgrel=0 pkgdesc="Grafana Backend Plugin that handles rendering of panels & dashboards to PNGs using headless chrome" url="https://github.com/grafana/grafana-image-renderer" @@ -49,7 +49,7 @@ package() { } sha512sums=" -c83f38caca013517febc8c52a2c2aa0d1d9346e084b3305f3ffe5d15fc1bae19a971751cb69554096afd22bdba98037b5a6cd36ba634e00d7a2bab89cffa576a grafana-image-renderer-3.10.2.tar.gz +ac5e81ce28f65cfd61291cca7bfe97d6dfb86e4a50d505f04108191167c9523dd81301a9ab9e447780fb16afc089a0284ea9675f37e9ac993e2a2f8e57f92f96 grafana-image-renderer-3.10.4.tar.gz 06faad0f5abecf434c014ca91dccf3f07f18d96a8f526c3c1d2384cba8db44db5fe2b2165d8fc12a8fe8d121135077b0c70158ee29ebb1bfba8dd2a3110b349c grafana-image-renderer.initd 88a119ad18fbde490ab9213487ae16b8aeeb65437275a1112f7423fa581a7470e6fb68654c2fd439afa68c0333aeefd0711f3fffd53615fa51d0702c80ed1c1b grafana-image-renderer.confd 8fc756536a429dc3343216e64fa33af8c601d83d03d81bd6096e46b33e5d1249f95be719ea489b13bd1af936771e8eeffd3ff7d8c5cdf622c3188b342c8fbdbd grafana-image-renderer.json diff --git a/testing/greetd-wlgreet/APKBUILD b/testing/greetd-wlgreet/APKBUILD index 842d9ada316..95407dffd0c 100644 --- a/testing/greetd-wlgreet/APKBUILD +++ b/testing/greetd-wlgreet/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=greetd-wlgreet _projname=wlgreet -pkgver=0.4.1 +pkgver=0.5.0 pkgrel=0 pkgdesc="Raw wayland greeter for greetd" url="https://git.sr.ht/~kennylevinsen/wlgreet" @@ -39,5 +39,5 @@ package() { } sha512sums=" -f5259992a43af751e91a328433594cc4c97805ad5a7c2bd81a0b455128994b8f925fe9e314759f08ce409a186c1e8942a77a60becbca5d974da647c8a045dcfb greetd-wlgreet-0.4.1.tar.gz +4e84dee56b69285139cbc4ac50a03022bc2e1b44aea2ce31a66a2ca2e54562bb511761315a4a6dd7bb343552dac6a24530b318549acc0f7f876f993948e44ef7 greetd-wlgreet-0.5.0.tar.gz " diff --git a/testing/grommunio-admin-api/0001-makefile.patch b/testing/grommunio-admin-api/0001-makefile.patch new file mode 100644 index 00000000000..1fd14b87dcc --- /dev/null +++ b/testing/grommunio-admin-api/0001-makefile.patch @@ -0,0 +1,13 @@ +diff -ruN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2024-03-06 20:12:27.339495351 +0100 ++++ b/CMakeLists.txt 2024-03-06 20:16:05.869420274 +0100 +@@ -41,7 +41,7 @@ + install(FILES data/api.conf DESTINATION ${NGINXDIR}) + + install(FILES data/autocomplete.sh DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/bash-completion/completions RENAME grommunio-admin) +-install(FILES data/grommunio-admin-api.service data/grommunio-admin-api.socket DESTINATION ${UNITDIR}) ++#install(FILES data/grommunio-admin-api.service data/grommunio-admin-api.socket DESTINATION ${UNITDIR}) + install(FILES data/portrait.jpg DESTINATION ${COMMONDIR}) +-install(FILES data/tmpfiles-grommunio-admin-api.conf DESTINATION ${TMPFILESDIR} RENAME grommunio-admin-api.conf) ++#install(FILES data/tmpfiles-grommunio-admin-api.conf DESTINATION ${TMPFILESDIR} RENAME grommunio-admin-api.conf) + install(FILES data/grommunio-sudo DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/sudoers.d) diff --git a/testing/grommunio-admin-api/APKBUILD b/testing/grommunio-admin-api/APKBUILD new file mode 100644 index 00000000000..e87cb59f09b --- /dev/null +++ b/testing/grommunio-admin-api/APKBUILD @@ -0,0 +1,74 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=grommunio-admin-api +pkgdesc="Backend for grommunio management" +pkgver=1.14 +pkgrel=0 +arch="noarch !riscv64" +url="http://www.grommunio.com" +license="AGPL-3.0-only" +options="!check" # No test suite +subpackages="$pkgname-doc $pkgname-openrc $pkgname-bash-completion" +makedepends="cmake py3-yaml ninja nginx" +depends="grommunio-admin-common + grommunio-gromox + libexmdbpp + py3-ldap3 + py3-mysqlclient + py3-redis + py3-sqlalchemy + py3-argcomplete + py3-jsonschema + py3-idna + py3-dnspython + py3-cryptography + py3-psutil + py3-yaml + py3-flask + py3-jwt + py3-multidict + py3-openapi-codec + py3-requests + uwsgi + " + +pkgusers="grommunio" +pkggroups="grommunio" + +source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/admin-api/archive/refs/tags/$pkgver.tar.gz + 0001-makefile.patch + grommunio-admin-api.initd + grommunio-admin-api.confd + database.yaml + " + +builddir="$srcdir/admin-api-$pkgver" + +build() { + cmake -B build -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCONFDIR=/usr/share/examples/grommunio-admin-api \ + -DCOMMONCONFDIR=/usr/share/examples/grommunio-admin-common \ + -DCMAKE_BUILD_TYPE=MinSizeRel + + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build + + # create first dummy service to get the directory and overwrite it with symlink to uwsgi + install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + ln -sf "/etc/init.d/uwsgi" "$pkgdir/etc/init.d/$pkgname" + install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname + install -m644 -D "$srcdir"/database.yaml "$pkgdir"/etc/grommunio-admin-api/conf.d/database.yaml + install -d -m0775 -o grommunio -g nginx "$pkgdir"/var/run/grommunio +} + +sha512sums=" +3dfb6a0c194d862f0358dd854830b52f84730b8944940aa5a3ec200f50a3a5cef03184347684a08978b146ed0214d969962ac8d299b68f146551b3be3446f693 grommunio-admin-api-1.14.tar.gz +47dc0698ca3d107b9a37f4778c386d099bd24bfaa6104e9512166b0266898dfcb1a63eb1eb2b1bb27d7d54b56560c4cfb6f3a48c7e56e5a61c21cb445aa830ea 0001-makefile.patch +b87910a731ad58b86679b08674632fffb4d76a94ad67602906200acf7e36fb23508ec19f56ca2f8a1e257a7ef3a32c4dbfa7b27d9d902006eff3d92d8816c067 grommunio-admin-api.initd +b634a1d20372f45e9f9e347d9f0b0785dca561849920381e223b2a7f356d7e9a37299087b8b6e69d8caf1af87313f14d8e0ac85699bafd9258c6e7153c590cf5 grommunio-admin-api.confd +bf166f9f46d3a6755c2273502576c63060b17d2eb7a4abbac9da5ed1b74a4ed47baf6269eda58adf04657a78028e862572cd7b24d9c8b5b6497b778338def12f database.yaml +" diff --git a/testing/grommunio-admin-api/database.yaml b/testing/grommunio-admin-api/database.yaml new file mode 100644 index 00000000000..b579e888081 --- /dev/null +++ b/testing/grommunio-admin-api/database.yaml @@ -0,0 +1,6 @@ +DB: + host: 'localhost' + user: 'grommunio' + pass: '<password>' + database: 'grommunio' + diff --git a/testing/grommunio-admin-api/grommunio-admin-api.confd b/testing/grommunio-admin-api/grommunio-admin-api.confd new file mode 100644 index 00000000000..4746d7a3641 --- /dev/null +++ b/testing/grommunio-admin-api/grommunio-admin-api.confd @@ -0,0 +1,3 @@ +# Configuration for /etc/init.d/grommunio-admin-api + +uwsgi_opts="--ini /usr/share/grommunio-admin-api/api-config.ini" diff --git a/testing/grommunio-admin-api/grommunio-admin-api.initd b/testing/grommunio-admin-api/grommunio-admin-api.initd new file mode 100644 index 00000000000..b2fb3138cda --- /dev/null +++ b/testing/grommunio-admin-api/grommunio-admin-api.initd @@ -0,0 +1,3 @@ +#!/sbin/openrc-run + +# dummy init file which is overwritten with symlink to uwsgi diff --git a/testing/grommunio-admin-common/APKBUILD b/testing/grommunio-admin-common/APKBUILD new file mode 100644 index 00000000000..97e2257b4d3 --- /dev/null +++ b/testing/grommunio-admin-common/APKBUILD @@ -0,0 +1,24 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=grommunio-admin-common +pkgdesc="Common files for grommunio management" +pkgver=1.0_git20240118 +pkgrel=0 +arch="noarch !riscv64" +url="http://www.grommunio.com" +license="AGPL-3.0-only" +options="!check" # No test suite + +_commithash=2a1dca824ed1a9e1dc5f5280dc559bcddde215a7 + +source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/admin-configs/archive/$_commithash.tar.gz" + +builddir="$srcdir/admin-configs-$_commithash" + +package() { + mkdir -p "$pkgdir" + cp -rp . "$pkgdir" +} + +sha512sums=" +f238f91c942b7f88b4aef524b2259df2724bb41c1b33c04a2f9533315e3b0714ddbbcb6b4097107689ac79879952ce8811d51824671ee7c69b19a487c9593858 grommunio-admin-common-1.0_git20240118.tar.gz +" diff --git a/testing/grommunio-admin-web/0001-makefile.patch b/testing/grommunio-admin-web/0001-makefile.patch new file mode 100644 index 00000000000..64a8752ac10 --- /dev/null +++ b/testing/grommunio-admin-web/0001-makefile.patch @@ -0,0 +1,12 @@ +diff -ruN a/Makefile b/Makefile +--- a/Makefile 2024-03-06 23:03:07.225271807 +0100 ++++ b/Makefile 2024-03-06 23:03:21.095265944 +0100 +@@ -2,7 +2,7 @@ + + # Tools + +-YARN ?= yarn ++YARN ?= npm + + # Variables + diff --git a/testing/grommunio-admin-web/APKBUILD b/testing/grommunio-admin-web/APKBUILD new file mode 100644 index 00000000000..a20480b82e4 --- /dev/null +++ b/testing/grommunio-admin-web/APKBUILD @@ -0,0 +1,48 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=grommunio-admin-web +pkgdesc="Frontend for grommunio management" +pkgver=2.9.0 +pkgrel=0 +arch="noarch !riscv64" +url="http://www.grommunio.com" +license="AGPL-3.0-only" +options="!check" # No test suite +depends="grommunio-admin-api grommunio-admin-common" +makedepends="npm" + +source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/admin-web/archive/refs/tags/$pkgver.tar.gz + 0001-makefile.patch + config.json + " + +builddir="$srcdir/admin-web-$pkgver" + +build() { + make +} + +package() { + # webapp + install -dm0755 "$pkgdir/usr/share/webapps/" + cp -rp build "$pkgdir/usr/share/webapps/$pkgname" + + # license + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # nginx conf + sed -i "s@/usr/share/grommunio-admin-web@/usr/share/webapps/grommunio-admin-web@" conf/web.conf + install -Dpm644 conf/web.conf "$pkgdir/usr/share/grommunio-admin-common/nginx.d/web.conf" + + # config.json + install -Dm644 "$srcdir/config.json" "$pkgdir/etc/grommunio-admin-common/config.json" + + # npm gives ownership of ALL FILES to build user + # https://bugs.archlinux.org/task/63396 + chown -R root:root "$pkgdir" +} + +sha512sums=" +c0dccb101de6acb6b54e1f839b62417a9d7cd45687d715e193e318b3d73dfd978afd80729cd2bfb1a2b7409985da721fa9aa5a7f22f65dbf920dd205a0d2bf64 grommunio-admin-web-2.9.0.tar.gz +5faa04f1f95cccdbb79a1e09f569a915794e236cb5738b25fd2e9f85b346875b6c1a8f20c3b53ccf823921eca0708a05da5c72f3b0971847ec34bfdbebf0f26e 0001-makefile.patch +c40b0722996b9d0449c3e11f2b56f59e1109b59253ffdf13422c21c56584924fe93a381250ce915656837c1c7799821bc6b6bcf463f867d6e529e59e3a899744 config.json +" diff --git a/testing/grommunio-admin-web/config.json b/testing/grommunio-admin-web/config.json new file mode 100644 index 00000000000..d913eb2fcfd --- /dev/null +++ b/testing/grommunio-admin-web/config.json @@ -0,0 +1,7 @@ +{ + "mailWebAddress": "https://mail.example.com/web", + "chatWebAddress": "https://mail.example.com/chat", + "videoWebAddress": "https://mail.example.com/meet", + "fileWebAddress": "https://mail.example.com/files", + "archiveWebAddress": "https://mail.example.com/archive" +} diff --git a/testing/grommunio-common/0001-redis-grommunio.patch b/testing/grommunio-common/0001-redis-grommunio.patch new file mode 100644 index 00000000000..98fddd46761 --- /dev/null +++ b/testing/grommunio-common/0001-redis-grommunio.patch @@ -0,0 +1,12 @@ +diff -ruN a/etc/redis/grommunio.conf b/etc/redis/grommunio.conf +--- a/etc/redis/grommunio.conf 2024-03-11 14:29:12.239145778 +0100 ++++ b/etc/redis/grommunio.conf 2024-03-11 14:30:41.639114270 +0100 +@@ -5,7 +5,7 @@ + timeout 0 + tcp-keepalive 300 + daemonize no +-supervised systemd ++supervised no + pidfile /var/run/redis/default.pid + loglevel notice + logfile /var/log/redis/default.log diff --git a/testing/grommunio-common/APKBUILD b/testing/grommunio-common/APKBUILD new file mode 100644 index 00000000000..b212594d24c --- /dev/null +++ b/testing/grommunio-common/APKBUILD @@ -0,0 +1,38 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=grommunio-common +pkgdesc="Common configuration package for grommunio" +pkgver=1.0 +pkgrel=0 +arch="noarch !riscv64" +url="https://grommunio.com/" +license="AGPL-3.0-only" +options="!check" # No test suite +subpackages="$pkgname-openrc" + +source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/configs/archive/refs/tags/v$pkgver.tar.gz + 0001-redis-grommunio.patch + + grommunio@redis.initd + grommunio@redis.confd + " + +builddir="$srcdir/configs-$pkgver" + +package() { + mkdir -p "$pkgdir" + cp -rp -- * "$pkgdir" + + install -dm755 "$pkgdir"/etc/init.d/ + ln -sf "/etc/init.d/redis" "$pkgdir/etc/init.d/grommunio@redis" + install -Dm644 "$srcdir"/grommunio@redis.confd "$pkgdir"/etc/conf.d/grommunio@redis + + # remove unnecessary files + rm -rf "$pkgdir/etc/zypp" +} + +sha512sums=" +1e2db173a73012948be3b829919ab3092ba0399228355d7a157398bb5b4b9d6c4150b1f2aaf38cfb857dba710765408a54cf2aab09e369c28d1971a29f221b26 grommunio-common-1.0.tar.gz +89bad8ea9d28bab8815cf57c8539b49a7d1e59b01409b89539a863e74ca90d8def8a89dc5bed19bf99c0fc38a3ba45707ad33386ed94412403a779e5c71a1831 0001-redis-grommunio.patch +5aa23f4ad715bfc9cf0b8b020b55a3802aedaab0e813250a0fcf50ffa5d792c3c04d1ceb2985cf5d5be71f078b6c5704232ee5a0f891826536f72ba494e57e03 grommunio@redis.initd +1412f11520c5ebce4bdd491e6fe34254fc0e36f79acaae0d1495e77ad2fe799ec6b135d28b92aa68f3486d8ecd329e462230bc2d447aac1353226b8c28b49ccf grommunio@redis.confd +" diff --git a/testing/grommunio-common/grommunio@redis.confd b/testing/grommunio-common/grommunio@redis.confd new file mode 100644 index 00000000000..b31955502ee --- /dev/null +++ b/testing/grommunio-common/grommunio@redis.confd @@ -0,0 +1,7 @@ +# Configuration for /etc/init.d/grommunio@redis + +# User (and group) to run redis as +#command_user="redis:redis" + +# Configuration file +cfgfile="/etc/redis/grommunio.conf" diff --git a/testing/grommunio-common/grommunio@redis.initd b/testing/grommunio-common/grommunio@redis.initd new file mode 100644 index 00000000000..e76026b945d --- /dev/null +++ b/testing/grommunio-common/grommunio@redis.initd @@ -0,0 +1,3 @@ +#!/sbin/openrc-run + +# dummy init file which is overwritten with symlink to redis diff --git a/testing/grommunio-dav/APKBUILD b/testing/grommunio-dav/APKBUILD new file mode 100755 index 00000000000..c538f678086 --- /dev/null +++ b/testing/grommunio-dav/APKBUILD @@ -0,0 +1,79 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=grommunio-dav +pkgdesc="CalDAV and CardDAV interface for grommunio" +pkgver=2.0_git20240118 +pkgrel=0 +arch="noarch !riscv64" +url="http://www.kopano.com/" +license="AGPL-3.0-only" +options="!check" # No test suite +_php=php83 +install="$pkgname.pre-install" +depends="grommunio-gromox + grommunio-mapi-header-php + $_php + $_php-ctype + $_php-curl + $_php-dom + $_php-iconv + $_php-mbstring + $_php-pdo_sqlite + $_php-xml + $_php-xmlreader + $_php-xmlwriter + " + +_commithash=e16f8a2e909c0b064a456266034696949218e5df +#_commithash=45e9e18483bc5ad840e15c464b954ffb1c14ce40 + +source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/grommunio-dav/archive/$_commithash.tar.gz + $pkgname-$pkgver-vendor.tar.gz::https://nerd.hu/distfiles/grommunio-dav-$_commithash-vendor.tar.gz +" + +builddir="$srcdir/grommunio-dav-$_commithash/" + +build() { + : +} + +package() { + # webapp + install -dm755 "$pkgdir/usr/share/webapps/$pkgname/" + cp -rp -- * "$pkgdir/usr/share/webapps/$pkgname/" + + # vendor libraries + cp -rp "$srcdir/vendor" "$pkgdir/usr/share/webapps/$pkgname/" + + # license + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # nginx conf + sed -i "s@/usr/share/grommunio-dav/@/usr/share/webapps/grommunio-dav/@" build/grommunio-dav.conf + install -Dpm644 build/grommunio-dav.conf "$pkgdir/usr/share/grommunio-common/nginx/locations.d/grommunio-dav.conf" + install -Dpm644 build/grommunio-dav-upstream.conf "$pkgdir/usr/share/grommunio-common/nginx/upstreams.d/grommunio-dav.conf" + + # php-fpm + install -Dpm644 build/pool-grommunio-dav.conf "$pkgdir/etc/$_php/php-fpm.d/pool-grommunio-dav.conf" + + # logrotate + install -Dm644 build/grommunio-dav.lr "$pkgdir/etc/logrotate.d/grommunio-dav" + + # config + install -Dm644 config.php "$pkgdir/etc/grommunio-dav/config.php" + ln -sf "/etc/grommunio-dav/config.php" "$pkgdir/usr/share/webapps/grommunio-dav/config.php" + install -Dm644 glogger.ini "$pkgdir/etc/grommunio-dav/glogger.ini" + ln -sf "/etc/grommunio-dav/glogger.ini" "$pkgdir/usr/share/webapps/grommunio-dav/glogger.ini" + + # remove unnecessary files + rm -rf "$pkgdir/usr/share/webapps/grommunio-dav/build" + rm -rf "$pkgdir/usr/share/webapps/grommunio-dav/tests" + rm -f "$pkgdir/usr/share/webapps/grommunio-dav/LICENSE" + rm -f "$pkgdir/usr/share/webapps/grommunio-dav/README.rst" + rm -f "$pkgdir/usr/share/webapps/grommunio-dav/composer.*" + +} + +sha512sums=" +f7a16566053650c8b1d7a7e8ebd062e74317f93a728f0ee4409476363dc679d9998485ee0bf8db8bbe1f6443eb5d39d7c20c1eba39846a18d4eb88bf37b5f698 grommunio-dav-2.0_git20240118.tar.gz +b44a1b8a7c8276c319d9fa2f283d59c11fde060d0ec6364a5b587157f1fd2c5bbda6cd0d596a081815556f4da0adf6f854ce116b0f21eaa95ac9f60e4fd72f5c grommunio-dav-2.0_git20240118-vendor.tar.gz +" diff --git a/testing/grommunio-dav/grommunio-dav.pre-install b/testing/grommunio-dav/grommunio-dav.pre-install new file mode 100644 index 00000000000..90ca5677f1c --- /dev/null +++ b/testing/grommunio-dav/grommunio-dav.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S grodav 2>/dev/null +adduser -S -D -H -h /usr/share/grommunio-dav -s /sbin/nologin -G grodav -g "Grommunio DAV" grodav 2>/dev/null + +exit 0 diff --git a/testing/grommunio-error-pages/0001-makefile.patch b/testing/grommunio-error-pages/0001-makefile.patch new file mode 100644 index 00000000000..a40b006f672 --- /dev/null +++ b/testing/grommunio-error-pages/0001-makefile.patch @@ -0,0 +1,14 @@ +diff -ruN a/Makefile b/Makefile +--- a/Makefile 2024-03-11 14:57:43.678248621 +0100 ++++ b/Makefile 2024-03-11 15:04:24.448068860 +0100 +@@ -1,8 +1,8 @@ + prefix = /usr +-datadir = ${prefix}/share ++datadir = ${prefix}/share/webapps + gepdir = ${datadir}/grommunio-error-pages + cssdir = ${gepdir}/_errors +-nglocdir = ${datadir}/grommunio-common/nginx/locations.d ++nglocdir = ${prefix}/share/grommunio-common/nginx/locations.d + INSTALL = install + MKDIR_P = mkdir -p + diff --git a/testing/grommunio-error-pages/0002-conf-webapps-path.patch b/testing/grommunio-error-pages/0002-conf-webapps-path.patch new file mode 100644 index 00000000000..e9bbc1a79fd --- /dev/null +++ b/testing/grommunio-error-pages/0002-conf-webapps-path.patch @@ -0,0 +1,18 @@ +diff -ruN a/snippets/grommunio-error-pages.conf b/snippets/grommunio-error-pages.conf +--- a/snippets/grommunio-error-pages.conf 2024-03-11 14:56:08.558291887 +0100 ++++ b/snippets/grommunio-error-pages.conf 2024-03-11 14:56:47.038274390 +0100 +@@ -42,12 +42,12 @@ + fastcgi_intercept_errors on; + + location ~* /_errors/ { +- root /usr/share/grommunio-error-pages; ++ root /usr/share/webapps/grommunio-error-pages; + allow all; + } + + location ^~ /grommunio-error-pages/ { +- root /usr/share/; ++ root /usr/share/webapps/; + sub_filter '%{HOSTNAME}' $host; + sub_filter '_errors/' '/_errors/'; + sub_filter_once off; diff --git a/testing/grommunio-error-pages/APKBUILD b/testing/grommunio-error-pages/APKBUILD new file mode 100644 index 00000000000..59a466f9f34 --- /dev/null +++ b/testing/grommunio-error-pages/APKBUILD @@ -0,0 +1,41 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=grommunio-error-pages +pkgdesc="Grommunio-branded error pages for web servers" +pkgver=1.0_git20231031 +pkgrel=0 +arch="noarch !riscv64" +url="https://grommunio.com/" +license="AGPL-3.0-only" +options="!check" # No test suite +makedepends="python3" + +_commithash=bb2df37c0856363764e3289e2ac0e5df74ef0c1f + +source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/grommunio-error-pages/archive/$_commithash.tar.gz + 0001-makefile.patch + 0002-conf-webapps-path.patch + " + +builddir="$srcdir/$pkgname-$_commithash/" + +build() { + make +} + +check() { + make check +} + +package() { + mkdir -p "$pkgdir" + make install DESTDIR="$(realpath $pkgdir)" + + # license + install -Dm0644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +sha512sums=" +a2b8c2531efaae2538c97b595921c9fb62983846fae65bea55a4b234dab5240b0ac78e5a97a4cfcd5e085d318f123239669e311850a3995ad3c7a922e7c4ec43 grommunio-error-pages-1.0_git20231031.tar.gz +db9b919f3eadcf283bae64ea0f6505f355dd3bec7f4e46119de6fa1f6d36ccac65215988a9a35bff6d90a727ade253dbf720e0ec498fb27bab95d2a5e68dcf71 0001-makefile.patch +6f5567f662cb1fd97028806486287df84c01894fa5454bc04e0e67df5e31166aa17e920e385b200420127a0a1f4caf376e51e1a3eeac5edeec4adb8affacdd15 0002-conf-webapps-path.patch +" diff --git a/testing/grommunio-gromox/APKBUILD b/testing/grommunio-gromox/APKBUILD new file mode 100644 index 00000000000..efc91b068a6 --- /dev/null +++ b/testing/grommunio-gromox/APKBUILD @@ -0,0 +1,168 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=grommunio-gromox +subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-openrc" +pkgver=2.27 +pkgrel=0 +pkgdesc="Open Source Groupware Solution" +arch="all !riscv64" +url="https://grommunio.com/" +license="AGPL-3.0-or-later" +_php=php83 +install="$pkgname.pre-install" +depends=" + grommunio-common + mariadb + $_php + $_php-fpm + postfix + redis + !kopano-core +" + +makedepends=" + autoconf + automake + curl-dev + gumbo-parser-dev + jsoncpp-dev + libhx-dev + libtool + libvmime-dev + libxml2-dev + linux-pam-dev + linux-headers + mariadb-dev + musl-dev + openldap-dev + openssl-dev + $_php + $_php-dev + sqlite-dev + tinyxml2-dev + zlib-dev + zstd-dev +" + +pkgusers="grommunio gromox" +pkggroups="grommunio gromox gromoxcf" + +source=" + https://github.com/grommunio/gromox/archive/refs/tags/gromox-$pkgver.tar.gz + + gromox-delivery-queue.initd + gromox-delivery.initd + gromox-event.initd + gromox-http.initd + gromox-imap.initd + gromox-midb.initd + gromox-pop3.initd + gromox-timer.initd + gromox-zcore.initd + gromox-fpm.conf + http.cfg + imap.cfg + mysql_adaptor.cfg + pop3.cfg + smtp.cfg + zcore.cfg + autodiscover.ini +" + +builddir="$srcdir/gromox-gromox-$pkgver/" + +prepare() { + default_prepare + autoreconf -fiv +} + +build() { + export CXXFLAGS="$CXXFLAGS -fpermissive" + ./configure --prefix=/usr + + make +} + +check() { + make check +} + +package() { + mkdir -p "$pkgdir" + make install DESTDIR="$(realpath $pkgdir)" + + # prepare services + for item in delivery-queue delivery event http imap midb pop3 timer zcore; do + install -Dm 0755 "$srcdir/gromox-$item.initd" "$pkgdir/etc/init.d/$item" + done + + # prepare configuration. some files are predefined, others are generated + x500_org_name=$(awk 'BEGIN { srand(); print int(rand()*32768) }' /dev/null | md5sum | head -c 10) + #sed -i.bak "s/RANDOM/$(echo $RANDOM | md5sum | head -c 10)/" "$srcdir/zcore.cfg" + sed -i.bak "s/<x500_org_name>/$x500_org_name/" "$srcdir/zcore.cfg" + sed -i.bak "s/<x500_org_name>/$x500_org_name/" "$srcdir/autodiscover.ini" + install -dm 0750 "$srcdir/gromox" + install -Dm 0640 "$srcdir/zcore.cfg" "$pkgdir/etc/gromox/zcore.cfg" + grep x500_org_name > "$pkgdir/etc/gromox/exchange_emsmdb.cfg" < "$srcdir/zcore.cfg" + grep x500_org_name > "$pkgdir/etc/gromox/exchange_nsp.cfg" < "$srcdir/zcore.cfg" + grep x500_org_name > "$pkgdir/etc/gromox/exmdb_local.cfg" < "$srcdir/zcore.cfg" + grep x500_org_name > "$pkgdir/etc/gromox/exmdb_provider.cfg" < "$srcdir/zcore.cfg" + grep default_dom > "$pkgdir/etc/gromox/delivery.cfg" < "$srcdir/zcore.cfg" + install -Dm 0640 "$srcdir/zcore.cfg" "$pkgdir/etc/gromox/midb.cfg" + + + for item in http imap mysql_adaptor pop3 smtp; do + install -Dm 0640 "$srcdir/$item.cfg" "$pkgdir/etc/gromox/$item.cfg" + done + + # autodiscover.ini + install -Dm 0640 "$srcdir/autodiscover.ini" "$pkgdir/etc/gromox/autodiscover.ini" + + # php-fpm + install -Dm 0644 "$srcdir/gromox-fpm.conf" "$pkgdir/etc/$_php/php-fpm.d/gromox.conf" + rm -f "$pkgdir/usr/share/gromox/fpm-gromox.conf.sample" + + # license + install -Dm 0644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # create database directories + for i in /var/lib/gromox \ + /var/lib/gromox/domain \ + /var/lib/gromox/user \ + /var/lib/gromox/queue \ + /var/lib/gromox/queue/cache \ + /var/lib/gromox/queue/mess \ + /var/lib/gromox/queue/save \ + /var/lib/gromox/queue/timer; do + install -dm 0770 -g gromox -o gromox "$pkgdir/$i" + done + + # make sure all files in /etc/gromox are owned by grommunio:grmoxcf + chown -R grommunio:gromoxcf "$pkgdir/etc/gromox" + find "$pkgdir/etc/gromox" -type f -exec chmod 0640 {} ';' + find "$pkgdir/etc/gromox" -type d -exec chmod 0750 {} ';' + + # remove unnecessary folders + rm -Rf "$pkgdir/usr/lib/systemd" "$pkgdir/usr/lib/sysusers.d/" "$pkgdir/usr/lib/tmpfiles.d/" + +} + +sha512sums=" +98dcfc16f64a440a1efda8501f4d72636e7ab570946f5f573895c347a9f451573ac2b55c9032ad6b06e9e29a123e0dbe386a96556f0448ef7b8ac36ce28f2f18 gromox-2.27.tar.gz +444ddd5ff60eff1bbfeaccc96aaa98aaf7c2d0122d5fec3f9faa3339ebd90e423718113853787c57aea8354fa83e68e455938e5a1294d35445b06d54074f2e60 gromox-delivery-queue.initd +afdf55901ac406ccb8ddb87a337cf87af9b67f5fb850dd66ee58b12ee817c7ecd6bd25e349d70fd53940e7c79516fe7dde473c738f1c834b3a558988bf0a7e8a gromox-delivery.initd +ee95b1f8397a270f434ae343fbb2187915b658198a09749b794e1811ca697f6cf2465e8b58ad0ba9ea3d8b14b7cc21355d0123845f6f9fecd751957a4bab2cfe gromox-event.initd +3be4aba7806c37da9618e5b9abefed9aad15ec752ae7ff306e998a4a445efcfd89d4b6498924104feb915258e5a1869171f3420a71dad0f1d913ad1d071f603d gromox-http.initd +390723a599e9805bf9de5f6dfe61ef9c9d2e37389ecf08869eee4a8192d3b4f3848e9b847a75e55fb9022f577fad43db7993c5430d4f8c81f39658d2093a4a13 gromox-imap.initd +cd1b1e9c14485d9fa2c4ac1db3095e5a29cc210324b190a68ff51899e8a92f27d7caa0cb4aa8b9cbb2e355aff95bf47f1e7b3811deff316245c07222168badc5 gromox-midb.initd +db91aa7e775a2b8c8756b48c1a7c2b3b2241b3b69d13486584b42c24da92420b65571b0d6b3fdb95dac6cc95bf9f2dffb894357511d084c5bff5bf2a5f74975e gromox-pop3.initd +011d24cd10f113646cf0f13cc65198b0df862e59908e1f4dcd931d410954ab817b48fe818c6fe845d5c62228d6373380ba4afa8aefc85c57886004b84df0be76 gromox-timer.initd +cb3cf8b1d155ebdfdf948ff2104838b17ff8d915ac5bd2945a6fca2bba1b8a76fd54345cc865ea86a957f3d11e1b32c0b5c0f4f69ab4b1a3bac9116e616b060e gromox-zcore.initd +adb0da75223284a1081166597ef42d267d2187f663b7da7c66eae517e0af179217464a1e7ec6b2d082f7dd0b506e1e980724cf1fec081719b253e8ea44a37558 gromox-fpm.conf +768b63b8d6431b47546753481e67cbd27797e8813dce4ba5109b511ee751972b9b7a137d0c933f29156e5d5b1f1d9b3d1c4733d522be6141b1b56b0b7a90b2e0 http.cfg +f6bfdf6e44ed1cb7718a71fc75920d0a92b22fd17166d85c43273b53c57931344aaa1be0b61b713f2f7d586ea621c1077b6585a4fc553198e49069db8e6a0396 imap.cfg +a4b54f32a4f8b932ea93dd71c1eaccac50a445d960f3ab37913481db3b80daad51238f4b826331111e939f5a75d522619fff9566042670b578c65c477754bd64 mysql_adaptor.cfg +1612fb72fa8417ef54670f82e829c1307256ab87b8ee478d9bddf32599888de407749ee4cd97c52e55dc72138964db531af061d9c8426d6dacb692a48b4bfbef pop3.cfg +04e234844466beff40a67d8b0f1eeea93ca1d801c88127ccb4f4475665c16c3b3cc11077e32fc34e010b63af2557e9b3a214213ee5382b3c1ffa4c3ae131dc4a smtp.cfg +b7f86af6b5a7f0d075c4c46c33c513db41ebd59a59a6e53613c2f1fcb09a03080eaede57e6040d609892d5c910dbbe03de3bf70035ecd8ed63f3161acb3425ab zcore.cfg +1323813c698159340436c7023309abc26bef3dbfa17b6ea331f172cd26c6d7eb207fcfe4a8b4ff88042f7895ea49c6d09cfa247cb6586d97928b211d91528e24 autodiscover.ini +" diff --git a/testing/grommunio-gromox/autodiscover.ini b/testing/grommunio-gromox/autodiscover.ini new file mode 100644 index 00000000000..dd24e4dc950 --- /dev/null +++ b/testing/grommunio-gromox/autodiscover.ini @@ -0,0 +1,19 @@ +[database] +host = localhost +username = 'grommunio' +password = <password> +dbname = 'grommunio' + +[exchange] +organization = <x500_org_name> +hostname = mail.example.local +mapihttp = 1 + +[default] +timezone = 'Europe/Vienna' + +[system] + +[http-proxy] +/var/lib/gromox/user = mail.example.local +/var/lib/gromox/domain = mail.example.local diff --git a/testing/grommunio-gromox/grommunio-gromox.pre-install b/testing/grommunio-gromox/grommunio-gromox.pre-install new file mode 100644 index 00000000000..038d45b912f --- /dev/null +++ b/testing/grommunio-gromox/grommunio-gromox.pre-install @@ -0,0 +1,17 @@ +#!/bin/sh + +# user/group for gromox services +addgroup -S gromox 2>/dev/null +adduser -S -D -H -h /var/run/gromox -s /sbin/nologin -G gromox -g "Gromox services" gromox 2>/dev/null + +# group for configuration files +addgroup -S gromoxcf 2>/dev/null +addgroup gromox gromoxcf 2>/dev/null + +# user/group for administration services +addgroup -S grommunio 2>/dev/null +adduser -S -D -H -h /var/run/grommunio -s /sbin/nologin -G grommunio -g "Grommunio administration" grommunio 2>/dev/null +addgroup grommunio gromox 2>/dev/null +addgroup grommunio gromoxcf 2>/dev/null + +exit 0 diff --git a/testing/grommunio-gromox/gromox-delivery-queue.initd b/testing/grommunio-gromox/gromox-delivery-queue.initd new file mode 100644 index 00000000000..c60317fe3e0 --- /dev/null +++ b/testing/grommunio-gromox/gromox-delivery-queue.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon +name=$RC_SVCNAME +command="/usr/libexec/gromox/delivery-queue" + +depend() { + need mariadb +} + +start_pre() { + checkpath -d -m 750 -o gromox:gromox /run/gromox +} diff --git a/testing/grommunio-gromox/gromox-delivery.initd b/testing/grommunio-gromox/gromox-delivery.initd new file mode 100644 index 00000000000..a1f946e7654 --- /dev/null +++ b/testing/grommunio-gromox/gromox-delivery.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon +name=$RC_SVCNAME +command="/usr/libexec/gromox/delivery" + +depend() { + need mariadb +} + +start_pre() { + checkpath -d -m 750 -o gromox:gromox /run/gromox +} diff --git a/testing/grommunio-gromox/gromox-event.initd b/testing/grommunio-gromox/gromox-event.initd new file mode 100644 index 00000000000..d90afbb5cad --- /dev/null +++ b/testing/grommunio-gromox/gromox-event.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon +name=$RC_SVCNAME +command="/usr/libexec/gromox/event" + +depend() { + need mariadb +} + +start_pre() { + checkpath -d -m 750 -o gromox:gromox /run/gromox +} diff --git a/testing/grommunio-gromox/gromox-fpm.conf b/testing/grommunio-gromox/gromox-fpm.conf new file mode 100644 index 00000000000..09d930a5baf --- /dev/null +++ b/testing/grommunio-gromox/gromox-fpm.conf @@ -0,0 +1,15 @@ +[gromox] +user = gromox +group = gromox +listen = /run/gromox/php-fpm.sock +listen.owner = gromox +listen.group = gromox +listen.mode = 0660 +pm = dynamic +pm.max_children = 100 +pm.start_servers = 10 +pm.min_spare_servers = 10 +pm.max_spare_servers = 20 +catch_workers_output = yes +php_admin_value[error_log] = /var/log/gromox/php-fpm.log +php_admin_value[memory_limit] = 256M diff --git a/testing/grommunio-gromox/gromox-http.initd b/testing/grommunio-gromox/gromox-http.initd new file mode 100644 index 00000000000..9ec73476238 --- /dev/null +++ b/testing/grommunio-gromox/gromox-http.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon +name=$RC_SVCNAME +command="/usr/libexec/gromox/http" + +depend() { + need mariadb atd +} + +start_pre() { + checkpath -d -m 750 -o gromox:gromox /run/gromox +} diff --git a/testing/grommunio-gromox/gromox-imap.initd b/testing/grommunio-gromox/gromox-imap.initd new file mode 100644 index 00000000000..82e43ba0857 --- /dev/null +++ b/testing/grommunio-gromox/gromox-imap.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon +name=$RC_SVCNAME +command="/usr/libexec/gromox/imap" + +depend() { + need mariadb +} + +start_pre() { + checkpath -d -m 750 -o gromox:gromox /run/gromox +} diff --git a/testing/grommunio-gromox/gromox-midb.initd b/testing/grommunio-gromox/gromox-midb.initd new file mode 100644 index 00000000000..5f1902e9de7 --- /dev/null +++ b/testing/grommunio-gromox/gromox-midb.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon +name=$RC_SVCNAME +command="/usr/libexec/gromox/midb" + +depend() { + need mariadb +} + +start_pre() { + checkpath -d -m 750 -o gromox:gromox /run/gromox +} diff --git a/testing/grommunio-gromox/gromox-pop3.initd b/testing/grommunio-gromox/gromox-pop3.initd new file mode 100644 index 00000000000..a39f3728f61 --- /dev/null +++ b/testing/grommunio-gromox/gromox-pop3.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon +name=$RC_SVCNAME +command="/usr/libexec/gromox/pop3" + +depend() { + need mariadb +} + +start_pre() { + checkpath -d -m 750 -o gromox:gromox /run/gromox +} diff --git a/testing/grommunio-gromox/gromox-timer.initd b/testing/grommunio-gromox/gromox-timer.initd new file mode 100644 index 00000000000..ac4ae0c301c --- /dev/null +++ b/testing/grommunio-gromox/gromox-timer.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon +name=$RC_SVCNAME +command="/usr/libexec/gromox/timer" + +depend() { + need mariadb +} + +start_pre() { + checkpath -d -m 750 -o gromox:gromox /run/gromox +} diff --git a/testing/grommunio-gromox/gromox-zcore.initd b/testing/grommunio-gromox/gromox-zcore.initd new file mode 100644 index 00000000000..31075307576 --- /dev/null +++ b/testing/grommunio-gromox/gromox-zcore.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon +name=$RC_SVCNAME +command="/usr/libexec/gromox/zcore" + +depend() { + need mariadb atd +} + +start_pre() { + checkpath -d -m 750 -o gromox:gromox /run/gromox +} diff --git a/testing/grommunio-gromox/http.cfg b/testing/grommunio-gromox/http.cfg new file mode 100644 index 00000000000..e6512397cc4 --- /dev/null +++ b/testing/grommunio-gromox/http.cfg @@ -0,0 +1,8 @@ +listen_port=10080 +http_support_ssl=true +listen_ssl_port=10443 +host_id=mail.example.local +#http_certificate_path=/etc/grommunio-common/ssl/server-bundle.pem +#http_private_key_path=/etc/grommunio-common/ssl/server.key +default_domain=example.com + diff --git a/testing/grommunio-gromox/imap.cfg b/testing/grommunio-gromox/imap.cfg new file mode 100644 index 00000000000..2a7ab23f8fa --- /dev/null +++ b/testing/grommunio-gromox/imap.cfg @@ -0,0 +1,6 @@ +imap_support_starttls=true +listen_ssl_port=993 +#imap_certificate_path=/etc/grommunio-common/ssl/server-bundle.pem +#imap_private_key_path=/etc/grommunio-common/ssl/server.key +default_domain=example.com + diff --git a/testing/grommunio-gromox/mysql_adaptor.cfg b/testing/grommunio-gromox/mysql_adaptor.cfg new file mode 100644 index 00000000000..e9c91f5f308 --- /dev/null +++ b/testing/grommunio-gromox/mysql_adaptor.cfg @@ -0,0 +1,5 @@ +mysql_host=localhost +mysql_username=grommunio +mysql_password=<password> +mysql_dbname=grommunio +schema_upgrade=host:mail.example.local diff --git a/testing/grommunio-gromox/pop3.cfg b/testing/grommunio-gromox/pop3.cfg new file mode 100644 index 00000000000..4ad30bfadc2 --- /dev/null +++ b/testing/grommunio-gromox/pop3.cfg @@ -0,0 +1,5 @@ +pop3_support_stls=true +listen_ssl_port=995 +#pop3_certificate_path=/etc/grommunio-common/ssl/server-bundle.pem +#pop3_private_key_path=/etc/grommunio-common/ssl/server.key +default_domain=example.com diff --git a/testing/grommunio-gromox/smtp.cfg b/testing/grommunio-gromox/smtp.cfg new file mode 100644 index 00000000000..0f689b292b1 --- /dev/null +++ b/testing/grommunio-gromox/smtp.cfg @@ -0,0 +1,2 @@ +listen_port=24 +default_domain=example.com diff --git a/testing/grommunio-gromox/zcore.cfg b/testing/grommunio-gromox/zcore.cfg new file mode 100644 index 00000000000..2e56f0aef94 --- /dev/null +++ b/testing/grommunio-gromox/zcore.cfg @@ -0,0 +1,2 @@ +default_domain=example.com +x500_org_name=<x500_org_name> diff --git a/testing/grommunio-index/0001-makefile.patch b/testing/grommunio-index/0001-makefile.patch new file mode 100644 index 00000000000..d75c9841eed --- /dev/null +++ b/testing/grommunio-index/0001-makefile.patch @@ -0,0 +1,9 @@ +diff -ruN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2024-03-11 13:19:20.150711607 +0100 ++++ b/CMakeLists.txt 2024-03-11 13:19:39.040705013 +0100 +@@ -25,4 +25,4 @@ + endif() + + install(TARGETS grommunio-index RUNTIME) +-install(FILES grommunio-index.service grommunio-index.timer DESTINATION ${UNITDIR}) ++#install(FILES grommunio-index.service grommunio-index.timer DESTINATION ${UNITDIR}) diff --git a/testing/grommunio-index/APKBUILD b/testing/grommunio-index/APKBUILD new file mode 100644 index 00000000000..bf1ef39811d --- /dev/null +++ b/testing/grommunio-index/APKBUILD @@ -0,0 +1,42 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=grommunio-index +pkgdesc="Generator for grommunio-web search indexes" +pkgver=1.0 +pkgrel=0 +arch="all !riscv64" +url="https://grommunio.com" +license="AGPL-3.0-only" +options="!check" # No test suite +makedepends="cmake ninja libexmdbpp-dev libhx-dev sqlite-dev>=3.27 mariadb-connector-c-dev" + +source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/grommunio-index/archive/refs/tags/$pkgver.tar.gz + 0001-makefile.patch + + $pkgname.cron + " + +build() { + cmake -B build -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=MinSizeRel \ + -DCMAKE_SKIP_INSTALL_RPATH=ON + + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build + + # license + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # install cronjob + install -Dm755 "$srcdir"/$pkgname.cron "$pkgdir"/etc/periodic/15min/$pkgname + +} + +sha512sums=" +8e11ff019c124ce8cf54116bff288411942f9da0661a7e88d66cb9d7354b6eb4bf7a1583f353920318b9c75dfccf5b3e88a7f3141da112ba4d676e57533d93e4 grommunio-index-1.0.tar.gz +b20690bc3e275d083e69a62e883d3b3da02d8a9bbbbd2df736e40915005ef1029056e7d9bdc1f9bc8047439f48b0dcf4868abeb64ec191a04c41a1d818c02f81 0001-makefile.patch +972dea2faa155dd9f62ce1724190c0b3cd2c506bd0d250512e10a6ca54a7b3b0afe25d2ed5739df30d2acbe8c6ee1baf539b23600bd7f2b3f11466bc8c7f3c7e grommunio-index.cron +" diff --git a/testing/grommunio-index/grommunio-index.cron b/testing/grommunio-index/grommunio-index.cron new file mode 100644 index 00000000000..c0cb726ca29 --- /dev/null +++ b/testing/grommunio-index/grommunio-index.cron @@ -0,0 +1,4 @@ +#!/bin/sh +# Recurrent regeneration of grommunio FTS indexes + +/usr/bin/grommunio-index -Aq diff --git a/testing/grommunio-mapi-header-php/APKBUILD b/testing/grommunio-mapi-header-php/APKBUILD new file mode 100644 index 00000000000..91bfb2fb551 --- /dev/null +++ b/testing/grommunio-mapi-header-php/APKBUILD @@ -0,0 +1,21 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=grommunio-mapi-header-php +pkgver=1.3 +pkgrel=0 +pkgdesc="Common PHP MAPI header files for grommunio" +arch="noarch !riscv64" +url="https://grommunio.com/" +license="AGPL-3.0-or-later" +source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/mapi-header-php/archive/refs/tags/$pkgver.tar.gz" +builddir="$srcdir/mapi-header-php-$pkgver/" +options="!check" # No test suite + +package() { + mkdir -p "$pkgdir" + make install DESTDIR="$(realpath $pkgdir)" + +} + +sha512sums=" +99eacabb0d33e7c2fb1e4a13fc14eb1dee669cdeeebd9cced6e2b1c60e335fa0e9f2a3304d20b84c7a0dacf7424f368d76c2dbba0a6f77b2e0253cc337b97106 grommunio-mapi-header-php-1.3.tar.gz +" diff --git a/testing/grommunio-sync/APKBUILD b/testing/grommunio-sync/APKBUILD new file mode 100644 index 00000000000..d647dfe8b54 --- /dev/null +++ b/testing/grommunio-sync/APKBUILD @@ -0,0 +1,69 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=grommunio-sync +pkgdesc="Exchange ActiveSync interface for grommunio" +pkgver=2.0_git20240226 +pkgrel=0 +arch="noarch !riscv64" +url="http://www.kopano.com/" +license="AGPL-3.0-only" +options="!check" # No test suite +_php=php83 +install="$pkgname.pre-install" +depends="grommunio-gromox + grommunio-mapi-header-php + $_php + $_php-curl + $_php-gettext + $_php-iconv + $_php-json + $_php-mbstring + $_php-openssl + $_php-pecl-redis + $_php-pdo_sqlite + $_php-posix + $_php-session + $_php-simplexml + $_php-soap" + +_commithash=316257884382020bebfb4e3a2853cb560f3b208b + +source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/grommunio-sync/archive/$_commithash.tar.gz" + +builddir="$srcdir/grommunio-sync-$_commithash/" + +build() { + : +} + +package() { + # webapp + install -dm755 "$pkgdir/usr/share/webapps/$pkgname/" + cp -rp -- * "$pkgdir/usr/share/webapps/$pkgname/" + + # license + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # nginx conf + sed -i "s@/var/log/grommunio/@/var/log/nginx/@" build/grommunio-sync.conf + install -Dpm644 build/grommunio-sync.conf "$pkgdir/usr/share/grommunio-common/nginx/locations.d/grommunio-sync.conf" + install -Dpm644 build/grommunio-sync-upstream.conf "$pkgdir/usr/share/grommunio-common/nginx/upstreams.d/grommunio-sync.conf" + + # php-fpm + install -Dpm644 build/pool-grommunio-sync.conf "$pkgdir/etc/$_php/php-fpm.d/pool-grommunio-sync.conf" + + # logrotate + install -Dm644 build/grommunio-sync.lr "$pkgdir/etc/logrotate.d/grommunio-sync" + + # web config + install -Dm644 config.php "$pkgdir/etc/grommunio-sync/config.php" + ln -sf "/etc/grommunio-sync/config.php" "$pkgdir/usr/share/webapps/grommunio-sync/config.php" + + # remove unnecessary files + rm -rf "$pkgdir/usr/share/webapps/grommunio-sync/build" + rm -f "$pkgdir/usr/share/webapps/grommunio-sync/LICENSE" + +} + +sha512sums=" +6df33c39e114c5439548d6c465a57d0b2885acac77349cde7de7f3a0a6a3fb339747f62b77c46f25300a60ffafa1be690ebaeff5c6625e11aa9a51fba2f7d67a grommunio-sync-2.0_git20240226.tar.gz +" diff --git a/testing/grommunio-sync/grommunio-sync.pre-install b/testing/grommunio-sync/grommunio-sync.pre-install new file mode 100644 index 00000000000..1332c267f4e --- /dev/null +++ b/testing/grommunio-sync/grommunio-sync.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S grosync 2>/dev/null +adduser -S -D -H -h /usr/share/grommunio-sync -s /sbin/nologin -G grosync -g "Grommunio ActiveSync" grosync 2>/dev/null + +exit 0 diff --git a/testing/grommunio-web/0001-makefile.patch b/testing/grommunio-web/0001-makefile.patch new file mode 100644 index 00000000000..871e9d62981 --- /dev/null +++ b/testing/grommunio-web/0001-makefile.patch @@ -0,0 +1,20 @@ +diff -ruN a/Makefile b/Makefile +--- a/Makefile 2024-03-06 10:42:16.333816043 +0100 ++++ b/Makefile 2024-03-06 10:42:34.613808357 +0100 +@@ -95,11 +95,11 @@ + find $(DESTDIR) -iname "*gpl*.txt" -exec rm -f {} \; + + js: $(JSDEPLOY)/fingerprint.js $(JSDEPLOY)/resize.js $(JSDEPLOY)/grommunio.js $(JSDEPLOY)/extjs-mod/extjs-mod.js $(JSDEPLOY)/extjs/ext-base-all.js $(DESTDIR)/client/third-party/ux-thirdparty.js $(DEPLOYPURIFYJS) $(JSDEPLOY)/filepreviewer/pdfjs/build/pdf.sandbox.js $(JSDEPLOY)/filepreviewer/pdfjs/build/pdf.worker.js $(JSDEPLOY)/filepreviewer/pdfjs/build/pdf.js $(JSDEPLOY)/filepreviewer/pdfjs/web/viewer.js $(JSDEPLOY)/filepreviewer/ViewerJS/ImageViewerPlugin.js $(JSDEPLOY)/filepreviewer/ViewerJS/MultimediaViewerPlugin.js $(JSDEPLOY)/filepreviewer/ViewerJS/ODFViewerPlugin.js $(JSDEPLOY)/filepreviewer/ViewerJS/UnknownFilePlugin.js $(JSDEPLOY)/filepreviewer/ViewerJS/viewer.js $(JSDEPLOY)/filepreviewer/ViewerJS/video-js/video.js +- cp -rn client/tinymce $(DESTDIR)/client/ +- cp -rn client/tinymce-languages $(DESTDIR)/client/ +- cp -rn client/tinymce-plugins $(DESTDIR)/client/ +- cp -rn client/extjs $(DESTDIR)/client/ +- cp -rn client/filepreviewer $(DESTDIR)/client/ ++ cp -r client/tinymce $(DESTDIR)/client/ ++ cp -r client/tinymce-languages $(DESTDIR)/client/ ++ cp -r client/tinymce-plugins $(DESTDIR)/client/ ++ cp -r client/extjs $(DESTDIR)/client/ ++ cp -r client/filepreviewer $(DESTDIR)/client/ + rm $(DESTDIR)/client/extjs/ext-base.js $(DESTDIR)/client/extjs/ext-base-debug.js $(DESTDIR)/client/extjs/ext-all.js $(DESTDIR)/client/filepreviewer/pdfjs/web/debugger.js + + $(DESTDIR)/%.php: %.php diff --git a/testing/grommunio-web/0002-config-php-dist.patch b/testing/grommunio-web/0002-config-php-dist.patch new file mode 100644 index 00000000000..eb4b7a048b5 --- /dev/null +++ b/testing/grommunio-web/0002-config-php-dist.patch @@ -0,0 +1,21 @@ +diff -ruN a/config.php.dist b/config.php.dist +--- a/config.php.dist 2024-03-06 10:53:34.113527229 +0100 ++++ b/config.php.dist 2024-03-06 10:55:15.483483870 +0100 +@@ -49,7 +49,7 @@ + + // Defines the temp path (absolute). Here uploaded attachments will be saved. + // The web client doesn't work without this directory. +- define("TMP_PATH", "/var/lib/grommunio-web/tmp"); ++ define("TMP_PATH", "/var/tmp/grommunio-web"); + + // Define the path to the plugin directory (No slash at the end) + define("PATH_PLUGIN_DIR", "plugins"); +@@ -67,7 +67,7 @@ + define("APPDATA_DIR", "appdata"); + + // Path used for full text index of every user +- define("SQLITE_INDEX_PATH", "/var/lib/grommunio-web/sqlite-index"); ++ define("SQLITE_INDEX_PATH", "/var/cache/grommunio-web/sqlite-index"); + + // General grommunio Web theme. This will be loaded by default for every user + // (if the theme is installed as a plugin) diff --git a/testing/grommunio-web/0003-plugins-files-config-php.patch b/testing/grommunio-web/0003-plugins-files-config-php.patch new file mode 100644 index 00000000000..95059d0e41f --- /dev/null +++ b/testing/grommunio-web/0003-plugins-files-config-php.patch @@ -0,0 +1,12 @@ +diff -ruN a/plugins/files/config.php b/plugins/files/config.php +--- a/plugins/files/config.php 2024-03-06 11:00:28.653349922 +0100 ++++ b/plugins/files/config.php 2024-03-06 11:01:01.823335725 +0100 +@@ -28,7 +28,7 @@ + * The directory where to save cache files for phpfastcache. + * This is a fallback setting, redis should be always available. + */ +-define('PLUGIN_FILES_CACHE_DIR', "/var/lib/grommunio-web/plugin_files"); ++define('PLUGIN_FILES_CACHE_DIR', "/var/cache/grommunio-web/plugin_files"); + + /* + * Set the verbosity of the plugin. diff --git a/testing/grommunio-web/APKBUILD b/testing/grommunio-web/APKBUILD new file mode 100644 index 00000000000..cda77b2d0a5 --- /dev/null +++ b/testing/grommunio-web/APKBUILD @@ -0,0 +1,87 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=grommunio-web +pkgdesc="Web user interface for grommunio" +pkgver=3.7 +pkgrel=0 +arch="noarch !riscv64" +url="http://www.grommunio.com" +license="AGPL-3.0-only" +options="!check" # No test suite +_php=php83 +install="$pkgname.pre-install" +depends="grommunio-gromox + grommunio-mapi-header-php + $_php + $_php-gettext + $_php-bcmath + $_php-ctype + $_php-curl + $_php-dom + $_php-gd + $_php-gettext + $_php-iconv + $_php-mbstring + $_php-openssl + $_php-sodium + $_php-sqlite3 + $_php-sysvshm + $_php-zip + " + +makedepends="libxml2-utils $_php-gettext npm gettext" + +source="https://github.com/grommunio/grommunio-web/archive/refs/tags/grommunio-web-$pkgver.tar.gz + 0001-makefile.patch + 0002-config-php-dist.patch + 0003-plugins-files-config-php.patch + " + +builddir="$srcdir/grommunio-web-grommunio-web-$pkgver" + +build() { + make -j1 +} + +package() { + # webapp + install -dm0755 "$pkgdir/usr/share/webapps/" + cp -rp deploy "$pkgdir/usr/share/webapps/$pkgname" + + # license + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # nginx conf + sed -i "s@/var/lib/grommunio-web@/var/tmp/grommunio-web@" build/grommunio-web.conf + install -Dpm644 build/grommunio-web.conf "$pkgdir/usr/share/grommunio-common/nginx/locations.d/grommunio-web.conf" + install -Dpm644 build/grommunio-web-upstream.conf "$pkgdir/usr/share/grommunio-common/nginx/upstreams.d/grommunio-web.conf" + + # php-fpm + install -Dpm644 build/pool-grommunio-web.conf "$pkgdir/etc/$_php/php-fpm.d/pool-grommunio-web.conf" + + # web config + install -Dm644 config.php.dist "$pkgdir/etc/grommunio-web/config.php" + ln -sf "/etc/grommunio-web/config.php" "$pkgdir/usr/share/webapps/grommunio-web/config.php" + rm -f "$pkgdir/usr/share/webapps/grommunio-web/config.php.dist" + rm -f "$pkgdir/usr/share/webapps/grommunio-web/debug.php.dist" + + # plugin config + for dir in "$pkgdir/usr/share/webapps/grommunio-web/plugins"/*; do + plugindir=$(basename "$dir") + if [ -f "$pkgdir/usr/share/webapps/grommunio-web/plugins/$plugindir/config.php" ]; then + mv "$pkgdir/usr/share/webapps/grommunio-web/plugins/$plugindir/config.php" "$pkgdir/etc/grommunio-web/config-$plugindir.php" + ln -s "/etc/grommunio-web/config-$plugindir.php" "$pkgdir/usr/share/webapps/grommunio-web/plugins/$plugindir/config.php" + fi + done + + # npm gives ownership of ALL FILES to build user + # https://bugs.archlinux.org/task/63396 + chown -R root:root "$pkgdir" + +} + +sha512sums=" +4bd72cbfbe7dd156c8a8a6b4f58e8c78c1fe457eb5b90a159a56613e209f7fdde5c2a7dd315c8375f5030a938257602d1b9cb503df521a8f30956a343fc14d73 grommunio-web-3.7.tar.gz +fcfb070ab0bb8cca6f24221fe66eeac7e0c33981c16fff947db7509cc73d39b086710e5fd75bce34a230fa18bc10828d87410d98d147d31cc6ae1c16c41b48ae 0001-makefile.patch +aaf924c834454078e512a7dff44fca647416eabb328e90e7cc1d78873c2ecb8f5f4a139284f8a4a4c9119ea8aec61d34d343ec1e8bced77f3dfbcdabae32d0d7 0002-config-php-dist.patch +2e3f55bc799c712ecf453cacd9da74893b07f8cf9ec1b6954993ae15a229219c612b632b372f9bc69ae6f8eb010c65484b7b55c3e90af3a0049c525321ba606e 0003-plugins-files-config-php.patch +" diff --git a/testing/grommunio-web/grommunio-web.pre-install b/testing/grommunio-web/grommunio-web.pre-install new file mode 100644 index 00000000000..c94c36a2e80 --- /dev/null +++ b/testing/grommunio-web/grommunio-web.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S groweb 2>/dev/null +adduser -S -D -H -h /usr/share/grommunio-web -s /sbin/nologin -G groweb -g "Grommunio web" groweb 2>/dev/null + +exit 0 diff --git a/testing/grpcui/APKBUILD b/testing/grpcui/APKBUILD index 2964313436d..2a60915d19a 100644 --- a/testing/grpcui/APKBUILD +++ b/testing/grpcui/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jonas <3426-spameier@users.gitlab.alpinelinux.org> # Maintainer: Jonas <3426-spameier@users.gitlab.alpinelinux.org> pkgname=grpcui -pkgver=1.3.3 -pkgrel=2 +pkgver=1.4.1 +pkgrel=0 pkgdesc="Interactive web UI for gRPC, along the lines of postman" url="https://github.com/fullstorydev/grpcui" arch="all" @@ -27,5 +27,5 @@ package() { } sha512sums=" -ad4b715ee51dc0bfc592c84fa046b03f77a038f15feb58e8b869934360359e928016efda5aa101b22a2b7441f35dd497b863a4ef56922b0f9bc8dc391c10a1ff grpcui-1.3.3.tar.gz +f7b54888480a028b728a12bb1ca7bbd744e3e29b1f41bc658eefa8e4aaf121c07aca3a98823b876cae5fd70e247e50839424f83831de895f7e1b3dca27e28588 grpcui-1.4.1.tar.gz " diff --git a/testing/grpcurl/APKBUILD b/testing/grpcurl/APKBUILD index 365d3b0f54d..36b3a16577d 100644 --- a/testing/grpcurl/APKBUILD +++ b/testing/grpcurl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=grpcurl -pkgver=1.8.9 -pkgrel=2 +pkgver=1.9.1 +pkgrel=0 pkgdesc="CLI tool to interact with gRPC servers" url="https://github.com/fullstorydev/grpcurl" arch="all" @@ -27,5 +27,5 @@ package() { } sha512sums=" -5ef0e918a10ce8fcefebe4d77c6efd73830c9159c423e6fe54da54e4c2942665861bf7b5235b72317aa157328bf0b3681984873a70c39264f8060f9ab927fb99 grpcurl-1.8.9.tar.gz +0af24ad50dc6b2aa1d2ad1a0f3349d3946dca6137fa2f6b248a3a69ff6dc4bda5d79dd8c38333e795182e15286c7d77b882d96f1d87b5b7940144cd2233a3a44 grpcurl-1.9.1.tar.gz " diff --git a/testing/gst-rtsp-server/APKBUILD b/testing/gst-rtsp-server/APKBUILD index 66c62e25a09..a9059ab1bf5 100644 --- a/testing/gst-rtsp-server/APKBUILD +++ b/testing/gst-rtsp-server/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Andrew Panteleyev <insonifi@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gst-rtsp-server -pkgver=1.22.11 +pkgver=1.24.3 pkgrel=0 pkgdesc="GStreamer RTSP server" url="https://gstreamer.freedesktop.org" @@ -42,5 +42,5 @@ package() { } sha512sums=" -cf3c698dbbcaa790b6bb1b1df4bae88be5f54fb70ba4bce5a4a0f907d693616d52b1cf67e73f694dcd7c9588b63a6303949f9f36fde952011a2d2ff80f9b44de gst-rtsp-server-1.22.11.tar.xz +f308cad27e9f72da9d186f9a6079a3e279c6ecb5f1cde5945403228da0877e480376a2fc4f0bccd341f29fba7b541cf26cb00168e3cf7850f7f0fb3413e867cf gst-rtsp-server-1.24.3.tar.xz " diff --git a/testing/h4h5tools/APKBUILD b/testing/h4h5tools/APKBUILD index 5caf23cee8b..d6046614896 100644 --- a/testing/h4h5tools/APKBUILD +++ b/testing/h4h5tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Edd Salkield <edd@salkield.uk> pkgname=h4h5tools pkgver=2.2.5 -pkgrel=2 +pkgrel=3 pkgdesc="Conversion utilities between hdf4 and hdf5" url="https://support.hdfgroup.org/products/hdf5_tools/h4toh5/" arch="all !riscv64" # limited by hdf4 diff --git a/testing/hare-compress/APKBUILD b/testing/hare-compress/APKBUILD new file mode 100644 index 00000000000..6b5146b0505 --- /dev/null +++ b/testing/hare-compress/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: fossdd <fossdd@pwned.life> +# Maintainer: fossdd <fossdd@pwned.life> +pkgname=hare-compress +pkgver=0_git20231101 +_commit=562706946871d1c994f60361883269916cbaa08e +pkgrel=0 +pkgdesc="Compression algorithms for Hare" +url="https://git.sr.ht/~sircmpwn/hare-compress" +arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" # blocked by hare +license="MPL-2.0" +makedepends="hare" +source="$pkgname-$_commit.tar.gz::https://git.sr.ht/~sircmpwn/hare-compress/archive/$_commit.tar.gz" +builddir="$srcdir/$pkgname-$_commit" + +build() { + make -j1 PREFIX=/usr +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" PREFIX=/usr install +} + +sha512sums=" +7afc3727ff198c4284bedd92f3e6b6a1e1eaa536616adb28d4cda523d740b6882a4cb7a708fa418d0ddda9616232353c13e1a0afe3bbefe67c59246d77270d15 hare-compress-562706946871d1c994f60361883269916cbaa08e.tar.gz +" diff --git a/testing/hare-http/APKBUILD b/testing/hare-http/APKBUILD new file mode 100644 index 00000000000..c25440dcfd2 --- /dev/null +++ b/testing/hare-http/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: fossdd <fossdd@pwned.life> +# Maintainer: fossdd <fossdd@pwned.life> +pkgname=hare-http +pkgver=0_git20240304 +_commit=cfdb921520a19c8b3ea8cc23f9f27d803b4f5eab +pkgrel=0 +pkgdesc="HTTP(s) support for Hare" +url="https://git.sr.ht/~sircmpwn/hare-http" +arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" # blocked by hare +license="MPL-2.0" +checkdepends="hare" +source="$pkgname-$_commit.tar.gz::https://git.sr.ht/~sircmpwn/hare-http/archive/$_commit.tar.gz" +builddir="$srcdir/$pkgname-$_commit" + +check() { + hare test +} + +package() { + install -vdm755 "$pkgdir/usr/src/hare/third-party" + cp -Rdv "net" "$pkgdir/usr/src/hare/third-party" +} + +sha512sums=" +193107536260e1c89727657cb299fa75639ef73591ed430668fa2ef6b491ee59b88ac1dd6b40dd0efe35d62deddcb6ea7cb8b7e0b9a868d6e3524912adc941fc hare-http-cfdb921520a19c8b3ea8cc23f9f27d803b4f5eab.tar.gz +" diff --git a/testing/hare-madeline/APKBUILD b/testing/hare-madeline/APKBUILD index 06f4917d3a1..c9e8cdabec1 100644 --- a/testing/hare-madeline/APKBUILD +++ b/testing/hare-madeline/APKBUILD @@ -1,17 +1,22 @@ # Maintainer: Hugo Osvaldo Barrera <hugo@whynothugo.nl> pkgname=hare-madeline -pkgver=0.1 +pkgver=0.1_git20240315 +_commit=54dcf14b67f34da392be837d01889e2956905d68 pkgrel=0 pkgdesc="tiny readline-alike with some batteries included" -url="https://git.d2evs.net/~ecs/madeline" -arch="noarch" +url="https://git.sr.ht/~ecs/madeline" +arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" # blocked by hare license="WTFPL" +checkdepends="hare" source=" - $pkgname-$pkgver.tar.gz::https://git.d2evs.net/~ecs/madeline/archive/v$pkgver.tar.gz + $pkgname-$_commit.tar.gz::https://git.sr.ht/~ecs/madeline/archive/$_commit.tar.gz " subpackages="$pkgname-doc" -builddir="$srcdir/madeline-v$pkgver" -options="!check" # no tests +builddir="$srcdir/madeline-$_commit" + +check() { + hare test +} package() { install -dm755 "$pkgdir/usr/src/hare/third-party" @@ -22,5 +27,5 @@ package() { } sha512sums=" -00c4e48472f5d2e1428d9f4c7c905a00a6aab8c6f3ef9b3d2475e042640c86c9112acf745a84da44bbfe2a695fa25fc92d17083249fa647e1de7486099e19d25 hare-madeline-0.1.tar.gz +8c20384f93f3ff8ab9e51d1608d85bfc8c123598a88f74d5252af468cb076452f781da0d9f8329b9f3c65cd1edb77c42f3cf8390508731df6e9f7f6e4b204c4a hare-madeline-54dcf14b67f34da392be837d01889e2956905d68.tar.gz " diff --git a/testing/hare-message/APKBUILD b/testing/hare-message/APKBUILD new file mode 100644 index 00000000000..b398cab4001 --- /dev/null +++ b/testing/hare-message/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: fossdd <fossdd@pwned.life> +# Maintainer: fossdd <fossdd@pwned.life> +pkgname=hare-message +pkgver=0_git20231204 +_commit=06013521c6c365bc4f6b02d172e236ef1a4acb28 +pkgrel=0 +pkgdesc="Internet message format implementation for Hare" +url="https://git.sr.ht/~sircmpwn/hare-message" +arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" # blocked by hare +license="MIT AND MPL-2.0" +checkdepends="hare" +source="$pkgname-$_commit.tar.gz::https://git.sr.ht/~sircmpwn/hare-message/archive/$_commit.tar.gz" +builddir="$srcdir/$pkgname-$_commit" + +check() { + hare test +} + +package() { + install -vdm755 "$pkgdir/usr/src/hare/third-party" + cp -Rdv "message" "$pkgdir/usr/src/hare/third-party" +} + +sha512sums=" +b646985ddb94ee1ab077b14da303309b2faea135464a3c7c3f9604cb68ac8cc73c4964bc845fab876dccbd3c9a29dcc343ba532264dd2894c2d92b71965b9815 hare-message-06013521c6c365bc4f6b02d172e236ef1a4acb28.tar.gz +" diff --git a/testing/hare-scfg/APKBUILD b/testing/hare-scfg/APKBUILD index 007fee496b5..c314c3ee8f9 100644 --- a/testing/hare-scfg/APKBUILD +++ b/testing/hare-scfg/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.24.0 pkgrel=0 pkgdesc="scfg implementation for Hare" url="https://git.sr.ht/~chrisppy/hare-scfg" -arch="noarch !armhf !armv7 !ppc64le !s390x !x86" # blocked by hare +arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" # blocked by hare license="MPL-2.0" makedepends="hare" source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~chrisppy/hare-scfg/archive/$pkgver.tar.gz" diff --git a/testing/hare-unicode/APKBUILD b/testing/hare-unicode/APKBUILD new file mode 100644 index 00000000000..7df29be033f --- /dev/null +++ b/testing/hare-unicode/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: fossdd <fossdd@pwned.life> +# Maintainer: fossdd <fossdd@pwned.life> +pkgname=hare-unicode +pkgver=0_git20240416 +_commit=c56f5d40afd5a5303707febe1cfd346d89dae7ae +pkgrel=0 +pkgdesc="Hare unicode database" +url="https://git.sr.ht/~sircmpwn/hare-unicode" +arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" # blocked by hare +license="MPL-2.0" +checkdepends="hare" +source="$pkgname-$_commit.tar.gz::https://git.sr.ht/~sircmpwn/hare-unicode/archive/$_commit.tar.gz" +builddir="$srcdir/$pkgname-$_commit" + +check() { + hare test +} + +package() { + install -vdm755 "$pkgdir/usr/src/hare/third-party" + cp -Rdv "unicode" "$pkgdir/usr/src/hare/third-party" +} + +sha512sums=" +1fe9e3adbf3daa79586ceb84068f146b395ee88ffbcf7605d58e884bd9c6987efa1c5877649dc8aa8bd0dfdd1852a5b028f85d37bf4597172f2589691af9dd46 hare-unicode-c56f5d40afd5a5303707febe1cfd346d89dae7ae.tar.gz +" diff --git a/testing/hari/APKBUILD b/testing/hari/APKBUILD index a053b03e383..32a0b592369 100644 --- a/testing/hari/APKBUILD +++ b/testing/hari/APKBUILD @@ -5,7 +5,7 @@ _commit=f4ea1c986fa7431710f203e3443c533cdc753285 pkgrel=0 pkgdesc="UI toolkit for Hare" url="https://git.sr.ht/~sircmpwn/hari" -arch="noarch !armhf !ppc64le !s390x !armv7 !x86" # hare +arch="noarch !armhf !ppc64le !s390x !armv7 !x86 !loongarch64" # hare license="MPL-2.0" makedepends="hare" options="!check" # no test suite diff --git a/testing/heplify/heplify.initd b/testing/heplify/heplify.initd deleted file mode 100644 index 8a9199748bc..00000000000 --- a/testing/heplify/heplify.initd +++ /dev/null @@ -1,13 +0,0 @@ -#!/sbin/openrc-run - -description="Multi-Protocol Go HEP Capture Agent" -command=/usr/bin/heplify -command_args=${CMD_OPTS:="-i lo"} -command_background=yes -pidfile="/run/homer/${RC_SVCNAME}.pid" - -depend() { - need net - after firewall -} - diff --git a/testing/highctidh/APKBUILD b/testing/highctidh/APKBUILD new file mode 100644 index 00000000000..d98c2884121 --- /dev/null +++ b/testing/highctidh/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: omni <omni+alpine@hack.org> +# Maintainer: omni <omni+alpine@hack.org> +pkgname=highctidh +pkgver=1.0.2024050500 +pkgrel=0 +pkgdesc="high-ctidh fork as a portable shared library" +url="https://codeberg.org/vula/highctidh" +arch="all !armhf !armv7 !x86" # 32bit architectures fail to build +license="LicenseRef-PD-2" +makedepends="clang py3-gpep517 py3-setuptools py3-wheel" +checkdepends="py3-pytest" +subpackages="$pkgname-dev py3-$pkgname-pyc py3-$pkgname:py3" +source="$pkgname-$pkgver.tar.gz::https://codeberg.org/vula/highctidh/archive/v$pkgver.tar.gz" +builddir="$srcdir/$pkgname/src" + +build() { + export CC=clang + make + + gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2 +} + +check() { + # TODO: run c library tests + + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest +} + +package() { + DESTDIR="$pkgdir"/usr make install + + python3 -m installer -d "$pkgdir" .dist/*.whl +} + +py3() { + pkgdesc="$pkgdesc Python bindings" + + local pyver="$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')" + amove usr/lib/python"$pyver" +} + +sha512sums=" +8b78a23e19f696f8749c5f7f449d1fdf481ae4971203519d6114ff083315bad656da722bfcfd45853815dd5f537b73418ede2796f94a773f853a66bf6b9f55ba highctidh-1.0.2024050500.tar.gz +" diff --git a/testing/hilbish/APKBUILD b/testing/hilbish/APKBUILD index b8ef6d3234b..9f50ae05ff8 100644 --- a/testing/hilbish/APKBUILD +++ b/testing/hilbish/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Hoang Nguyen <folliekazetani@protonmail.com> # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=hilbish -pkgver=2.2.1 +pkgver=2.2.3 _lunacolors_commit=34a57c964590f89aa065188a588c7b38aff99c28 _succulent_commit=fc31cc91d9be1c1fa6209477118e8d35a4aab996 -pkgrel=2 +pkgrel=0 pkgdesc="Extensible shell configured in Lua" url="https://rosettea.github.io/Hilbish/" arch="all" @@ -52,7 +52,7 @@ _doc() { } sha512sums=" -7ab726fa31d337eff48d9465ed1850cf086bd9d8e08f6fa7c60cab1ee4f0449f617fa32411e6fbdabb067fdb5de175621d16cca015d59edef6b2fb0b89424961 hilbish-2.2.1.tar.gz +6c0461ffec516a99489e96d1034bef0f98329d16f5e9817f8c0455874bd146ef45eabac3b4c7cb0788976d78d61363228ce4ed8004f2362d47b34226c0b36398 hilbish-2.2.3.tar.gz 19c21fa66460254774ac795410b4771157d26be98790d94afa9dff4402904bbfa24556a88b9ae391f012536ba02c032857715352ad7b72d7b3175ee670edcad8 lunacolors-34a57c964590f89aa065188a588c7b38aff99c28.lua ce34e68fd4ab18267268d476b656946c6aad6530526c73ba8482180215a351255dc6b97ba3fc92bcedad0d27ac7b390e19602129e387326fac0eaf6a61718bc8 succulent-fc31cc91d9be1c1fa6209477118e8d35a4aab996.lua " diff --git a/testing/horizon/APKBUILD b/testing/horizon/APKBUILD index 4d8fd3387ba..656625a7804 100644 --- a/testing/horizon/APKBUILD +++ b/testing/horizon/APKBUILD @@ -7,7 +7,7 @@ pkgname=horizon pkgver=0.9.6 -pkgrel=8 +pkgrel=9 pkgdesc="installation environment and image mastering tools for APK-based distributions" url="https://horizon.adelielinux.org/" arch="all !s390x" diff --git a/testing/hpnssh/APKBUILD b/testing/hpnssh/APKBUILD new file mode 100644 index 00000000000..74dce2f2d48 --- /dev/null +++ b/testing/hpnssh/APKBUILD @@ -0,0 +1,49 @@ +# Contributor: Lukas Franek <lukas.franek@ui.com> +# Maintainer: Lukas Franek <lukas.franek@ui.com> +pkgname=hpnssh +pkgver=18.4.1 +pkgrel=0 +pkgdesc="HPNSSH: High performance SSH/SCP" +url="https://psc.edu/hpn-ssh-home" +# s390x: libssh is failing to build +arch="all !s390x" +license="custom" +makedepends=" + autoconf + automake + libtool + linux-headers + cmake + openssl-dev>3 + zlib-dev + " +subpackages="$pkgname-doc" +source="https://github.com/rapier1/hpn-ssh/archive/refs/tags/hpn-$pkgver.tar.gz" +builddir="$srcdir/hpn-ssh-hpn-$pkgver" +# hpnssh-keysign need suid +options="suid" + +build() { + autoreconf -fi + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --with-mantype=man + make +} + +check() { + make -j1 file-tests interop-tests unit +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums=" +46b84dc2a23a20d86c770109ee20b170546966ee55b1636863d92873c2e42a68accfdf4ee6a77cfa1b0af71cee8e2f8e77cbc126330280dd4ca4a572c3cc0626 hpn-18.4.1.tar.gz +" diff --git a/testing/hubble-cli/APKBUILD b/testing/hubble-cli/APKBUILD index c1e06a5b7f0..877bcd1b24e 100644 --- a/testing/hubble-cli/APKBUILD +++ b/testing/hubble-cli/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=hubble-cli -pkgver=0.13.0 -pkgrel=2 +pkgver=0.13.3 +pkgrel=0 pkgdesc="CLI for the distributed networking and security observability platform" url="https://github.com/cilium/hubble" arch="all" @@ -52,6 +52,6 @@ package() { } sha512sums=" -6ff073dcbb66c6015cb13065cec5620fec7292324df63b5bfbc7af80ea54435588157bce9ddc0cf6a5ecb437ffee60e2bc44a31a0733cf8ee48bd82ac4afab71 hubble-cli-0.13.0.tar.gz +d23c30948910d9b32c5d7ff67851f8192af3ab87d2232337ad16f15c4ac51e7414114e9ce0843b16bee7fd1dc257f010f057718426c905d45fbb3e62888bf29e hubble-cli-0.13.3.tar.gz 872ccb44ac714420f87c476743d7be1b644c3a5c7e2a975d47720dc970c632ce82bb678421b053ebbc219d4a3b1f2c9f37aa74f3733a055b0f8c1dbe15fed23f byteorder-add-s390x-support.patch " diff --git a/testing/hurl/APKBUILD b/testing/hurl/APKBUILD index c5bedf02a46..d520672757a 100644 --- a/testing/hurl/APKBUILD +++ b/testing/hurl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=hurl -pkgver=4.2.0 +pkgver=4.3.0 pkgrel=0 pkgdesc="CLI to run HTTP requests defined in simple plain text format" url="https://hurl.dev/" @@ -26,5 +26,5 @@ package() { } sha512sums=" -a1f2f83cb41baec4efa498899145008b159510db0d9447d4f0c2856df7eb80feb36483dd3842ef059a55593a6d1fb1ea19faaf18a29752327e8f0667435d3c25 hurl-4.2.0.tar.gz +3d775beda4908bdd313d95c732d4a00aa7005bb41f960ee1cef709a997a9436f42d69fc5b35ebb6dac7a562667c1e45cff667fe8276296d1378187b3dbb20898 hurl-4.3.0.tar.gz " diff --git a/testing/hyprcursor/APKBUILD b/testing/hyprcursor/APKBUILD index e0a4fb17eaf..522cb213790 100644 --- a/testing/hyprcursor/APKBUILD +++ b/testing/hyprcursor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Zach DeCook <zachdecook@librem.one> # Maintainer: Zach DeCook <zachdecook@librem.one> pkgname=hyprcursor -pkgver=0.1.5 +pkgver=0.1.7 pkgrel=0 pkgdesc="The hyprland cursor format, library and utilities." url="https://github.com/hyprwm/Hyprcursor" @@ -15,7 +15,9 @@ makedepends=" hyprlang librsvg-dev libzip-dev + tomlplusplus-dev " +checkdepends="adwaita-icon-theme" subpackages="$pkgname-dev $pkgname-doc $pkgname-util" build() { @@ -28,8 +30,13 @@ build() { check() { cd build - # Test won't work unless environment has a hyprcursor that can be loaded. - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # Create a hyprcursor, so that the tests will work + ./hyprcursor-util -x /usr/share/icons/Adwaita/ -o ./ + # Put this in one of the paths it will search + ./hyprcursor-util -c ./extracted_Adwaita -o ~/.local/share/icons/ + # run the tests + LD_LIBRARY_PATH=./ CTEST_OUTPUT_ON_FAILURE=TRUE ctest + # 2/3 of the tests don't work. } package() { @@ -40,11 +47,11 @@ package() { } util() { - # TODO: Depend on xcur2png for -x option + depends="xcur2png" amove usr/bin/hyprcursor-util } sha512sums=" -3092b6773a34fa1cab10f83fa48274d79a50cd373dfe8a89d0170a78767a66b5e0cbe57cd1b86bc4bb85371c23ac7425f59e61fb50723a895fef4e7f6039fdfc Hyprcursor-v0.1.5.tar.gz +dd506860fc7a0d5b1f9602330becc7f9a37fda19d92fcc10150e6e23680124d63451b98a92e33b9a820db385fdba29a7f306d0c1639426aa06c749fa1dfad04e Hyprcursor-v0.1.7.tar.gz " diff --git a/testing/hyprland/APKBUILD b/testing/hyprland/APKBUILD index 6c47294ded3..c6645578734 100644 --- a/testing/hyprland/APKBUILD +++ b/testing/hyprland/APKBUILD @@ -1,20 +1,19 @@ # Contributor: Zach DeCook <zachdecook@librem.one> # Maintainer: Zach DeCook <zachdecook@librem.one> pkgname=hyprland -pkgver=0.38.1 +pkgver=0.39.1 pkgrel=0 -_commit="360ede79d124ffdeebbe8401f1ac4bc0dbec2c91" -_wlroots_commit="50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b" -_wlroots_date=20240302 +_commit="fe7b748eb668136dd0558b7c8279bfcd7ab4d759" +_wlroots_commit="611a4f24cd2384378f6e500253983107c6656c64" +_wlroots_date=20240414 pkgdesc="Highly customizable dynamic tiling Wayland compositor that doesn't sacrifice on its looks." url="https://hyprland.org" arch="all" license="BSD-3-Clause" source=" https://github.com/hyprwm/Hyprland/archive/v$pkgver/Hyprland-v$pkgver.tar.gz - https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/$_wlroots_commit/wlroots-$_wlroots_commit.tar.gz + https://github.com/hyprwm/wlroots-hyprland/archive/$_wlroots_commit/wlroots-hyprland-$_wlroots_commit.tar.gz use-system-installed-udis86.patch - bump-soversion.patch.wlroots " builddir="$srcdir/Hyprland-$pkgver" makedepends=" @@ -24,7 +23,7 @@ makedepends=" eudev-dev glslang-dev hwdata-dev - hyprcursor-dev + hyprcursor-dev>=0.1.7 hyprland-protocols hyprlang jq @@ -57,13 +56,12 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-wallpapers::noarch" prepare() { default_prepare # Use downloaded wlroots (instead of git submodule) - rmdir subprojects/wlroots - mv "$srcdir/wlroots-$_wlroots_commit" "$builddir"/subprojects/wlroots + rmdir subprojects/wlroots-hyprland + mv "$srcdir/wlroots-hyprland-$_wlroots_commit" "$builddir"/subprojects/wlroots-hyprland # Change the soversion (appending current hyprland version) - cd "$builddir"/subprojects/wlroots - git apply "$srcdir"/bump-soversion.patch.wlroots + cd "$builddir"/subprojects/wlroots-hyprland # Make the version number valid - sed -i "s/-dev/_git$_wlroots_date/" "$builddir"/subprojects/wlroots/meson.build + sed -i "s/-dev/_git$_wlroots_date/" "$builddir"/subprojects/wlroots-hyprland/meson.build # Set some variables in version.h.in sed -i "s/@HASH@/$_commit/" "$builddir"/src/version.h.in sed -i "s/@BRANCH@/build-alpine/" "$builddir"/src/version.h.in @@ -92,8 +90,7 @@ wallpapers() { } sha512sums=" -a84c7c7e2b634032eb79d7c73efefaa99fb506f36eed7cea9dac09bfe53b46accef9145ae062b4a9fd3f8121d3abb52fe2465d176c950d498115da8ae111127e Hyprland-v0.38.1.tar.gz -ce09d175f12cf25021caf18c0eac56aad97d238b3e2c4bfcc071d12d1bb8a44ee5c3aceab72ce3002928ca3c2c833bb5992b4820b44e0d0985c343ae903d056e wlroots-50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b.tar.gz +173dc2baea68e301fad13b1634779f859263abdba7ab60233791c6c8c8ed2def24afdfb51d3db1820646b391530f1f6aeca82d8cf6de1ef178810c11fbdef37b Hyprland-v0.39.1.tar.gz +157c94643bc630b1c97f05f620c2adb21f744cac16ed8c53ab377820ce8af2ec6b826197a41b6814a838b6e032b92a790f4214210831f8e91a6aff0346f54027 wlroots-hyprland-611a4f24cd2384378f6e500253983107c6656c64.tar.gz d2f7b35552fa0a3e992b9050f7066d983b3b7c193a888018b2e0d6fa9e17fc3deff922fa3989d0bb79e8bd82df2bc16ff0c27a82759ad0ce2e72789506eb07db use-system-installed-udis86.patch -ca673fbb7a7c91a4902e6357ad90854070e9c7d16dc298787a819aac9d6f4832d4657029427b144709e56bead604d4df162d81892d23d6a2b94634e3bd2380ab bump-soversion.patch.wlroots " diff --git a/testing/hyprland/bump-soversion.patch.wlroots b/testing/hyprland/bump-soversion.patch.wlroots deleted file mode 100644 index fad516896e8..00000000000 --- a/testing/hyprland/bump-soversion.patch.wlroots +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 95803a22..fd1bb7be 100644 ---- a/meson.build -+++ b/meson.build -@@ -15,7 +15,7 @@ version = meson.project_version().split('-')[0] - version_major = version.split('.')[0] - version_minor = version.split('.')[1] - assert(version_major == '0') --soversion = version_minor.to_int() - 5 -+soversion = 13037 - - little_endian = target_machine.endian() == 'little' - big_endian = target_machine.endian() == 'big' diff --git a/testing/interception-tools/APKBUILD b/testing/interception-tools/APKBUILD index 4ede7550cc9..a2d7c61aa5e 100644 --- a/testing/interception-tools/APKBUILD +++ b/testing/interception-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Evan Johnston <evan@d2evs.net> pkgname=interception-tools pkgver=0.6.8 -pkgrel=1 +pkgrel=2 pkgdesc="Minimal composable infrastructure on top of libudev and libevdev" url="https://gitlab.com/interception/linux/tools" arch="all" diff --git a/testing/intiface-central/APKBUILD b/testing/intiface-central/APKBUILD index c2bac14c82e..7a11abe940f 100644 --- a/testing/intiface-central/APKBUILD +++ b/testing/intiface-central/APKBUILD @@ -1,7 +1,7 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=intiface-central -pkgver=2.5.6 +pkgver=2.5.7 pkgrel=0 pkgdesc="Frontend application for the Buttplug Sex Toy Control Library" url="https://intiface.com/central/" @@ -75,7 +75,7 @@ package() { } sha512sums=" -b34be496b653bea69ec421ee7af23670da0a43fbea3c069009da23cb770c658831984ce25ed7e86b6fc572a768e87eb4fad5151667c795d0ef372b874a4b665a intiface-central-2.5.6.tar.gz +c5262f62e5fb9de934986d12e01701ce5959d9beeb40a3e9ce08141afe9a3ccf0ccb84a5fc9022d3dabdaa8f449bf37add765de658d3bfcc0b070964537e2f81 intiface-central-2.5.7.tar.gz ecad3c5cee9c53fc88b539d3088907539aff0b28980a89d4be2acb3c329a7a2154cb12743c0786e5c4a33de78af06b61b5b35f8eee633989cc943dc14e87dba6 system-corrosion.patch 91014708ab7bb81518ce93db0612209d6479dfa503064d9e9d3186cd5e861165a3f63e286d271d5aac8a1d676868fc3acf51648ac01c16a215062a317ccb6623 system-flutter.patch a090ec306117675c555683a836a5368b7165423509439c5d4a75ffcf9a125ab5d7a2598f2c2253f044fc77785276f696b495aece74d4ab8eea9126404966e061 pmos-fit-screen.patch diff --git a/testing/jackett/APKBUILD b/testing/jackett/APKBUILD index 3d52c2501e0..98353d8c4ec 100644 --- a/testing/jackett/APKBUILD +++ b/testing/jackett/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=jackett -pkgver=0.21.1946 +pkgver=0.21.2458 pkgrel=0 pkgdesc="API Support for your favorite torrent trackers" url="https://github.com/Jackett/Jackett" @@ -64,7 +64,7 @@ package() { } sha512sums=" -1a8728a84f711140cdfa88ec00523ddc47b2c1e1baceec8b492430209ad987787cf5244c5d01900b92332f2b9581487915bf4c92045eeabae63fa86ec0be363a jackett-0.21.1946.tar.gz +8113b8774a8202b9411b948870b6eab3265ae6a715a68f04dc1445668b7a613e1fe402374a4c4945bbe434d6c6c55128cc8ec3470152d362100dac3c1bf060ae jackett-0.21.2458.tar.gz 71dc80cee88d0166bcd18a784e9beda0eda6f5b34cf256f65a364375e6407bcf0f6b3eedadc2d1148d48acff9e5489134c28462d92a07c98fb5363e6adf4154a jackett.initd c9963ddf11e8ebb35891172226c2486d56f9bafdf7e40c99fab5d34489a5afc37902af55d9cf097d5f9cb713a6bff8b5ce4d04c3d4553b647315ba0d847dbc20 jackett.confd " diff --git a/testing/jackline/APKBUILD b/testing/jackline/APKBUILD index 26c3a05d31f..9fc4b656335 100644 --- a/testing/jackline/APKBUILD +++ b/testing/jackline/APKBUILD @@ -5,8 +5,7 @@ pkgver=0.1.0 pkgrel=3 pkgdesc="Minimalistic and secure XMPP client written in OCaml" url="https://github.com/hannesm/jackline" -# limited by riscv64: ocaml, ppc64le: ocaml-uucp and ocaml-erm_xmpp -arch="all !riscv64 !ppc64le" +arch="all !riscv64 !loongarch64" # ocaml license="BSD-2-Clause" makedepends=" ocaml-ppx_deriving-dev diff --git a/testing/jreleaser/APKBUILD b/testing/jreleaser/APKBUILD index a026fa086aa..1a517aab580 100644 --- a/testing/jreleaser/APKBUILD +++ b/testing/jreleaser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Andres Almiray <aalmiray@yahoo.com> # Maintainer: Andres Almiray <aalmiray@yahoo.com> pkgname=jreleaser -pkgver=1.11.0 +pkgver=1.12.0 pkgrel=0 pkgdesc="Release projects quickly and easily with JReleaser" url="https://jreleaser.org/" @@ -24,7 +24,7 @@ prepare() { cd "$srcdir"/temp echo "rootProject.name = 'wrapper-project'" > settings.gradle # this will fetch an older version of gradle - gradle --no-daemon wrapper --gradle-version 8.6 + gradle --no-daemon wrapper --gradle-version 8.7 cd "$builddir" @@ -56,6 +56,6 @@ package() { } sha512sums=" -b3b777b51cbcc103d2fa57ab5807f1ad198415f8582415c8565516c0f70de2df6ba7d7814105f2a570cf713c13ceef4bab1a6bf5bbc6677385a747c4cac21c82 jreleaser-1.11.0.tar.gz +fa1740332a7306c32e4995f4a2fd80fcfe7f11c5a49eeea1afd060657d9f8806d1366960b2914afbebe6a2610ff8720ee355c214e904e4479f04b4f398b5bee5 jreleaser-1.12.0.tar.gz " diff --git a/testing/kanister-tools/APKBUILD b/testing/kanister-tools/APKBUILD index 07e4536b58b..dc0907a67ab 100644 --- a/testing/kanister-tools/APKBUILD +++ b/testing/kanister-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=kanister-tools -pkgver=0.105.0 -pkgrel=2 +pkgver=0.107.0 +pkgrel=0 pkgdesc="CLI tools for application-level data management on Kubernetes" url="https://kanister.io/" arch="all" @@ -14,6 +14,7 @@ subpackages=" " source="$pkgname-$pkgver.tar.gz::https://github.com/kanisterio/kanister/archive/refs/tags/$pkgver.tar.gz" builddir="$srcdir/kanister-$pkgver" +options="net" # download Go modules export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -58,5 +59,5 @@ package() { } sha512sums=" -ed11dbf2049d864bac41fd774150e0f44645aab8ff4edc4399465342099ab5eb7fd25a3c78d3b5174c0c6a445b7a35b4c50ecbf371fc668fd2e11f90c22468a6 kanister-tools-0.105.0.tar.gz +859a7b93148be2058e9a94c7f38e079f2c4741ff2e7f8f417b6728cae2ec6621be42d68fc31fdb22a0a95673b410a7945774570e4a840c520118513e78f70d95 kanister-tools-0.107.0.tar.gz " diff --git a/testing/kgraphviewer/APKBUILD b/testing/kgraphviewer/APKBUILD new file mode 100644 index 00000000000..32e88cec2e1 --- /dev/null +++ b/testing/kgraphviewer/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: Bart Ribbers <bribbers@disroot.org> +# Maintainer: team/kde <bribbers@disroot.org> + +# The group tag is just to easily find this APKBUILD by some scripts for automation +# group=kde-other +pkgname=kgraphviewer +pkgver=2.5.0 +pkgrel=0 +pkgdesc="GraphViz dot graph viewer" +# armhf blocked by extra-cmake-modules +arch="all !armhf" +url="https://apps.kde.org/kgraphviewer/" +license="GPL-2.0-only" +makedepends=" + boost-dev + extra-cmake-modules + graphviz-dev + kcoreaddons-dev + kdoctools-dev + ki18n-dev + kparts-dev + kwidgetsaddons-dev + qt6-qt5compat-dev + qt6-qtbase-dev + qt6-qtsvg-dev + samurai + " +checkdepends="xvfb-run" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/kgraphviewer/$pkgver/kgraphviewer-$pkgver.tar.xz" + +build() { + cmake -B build -G Ninja \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib + cmake --build build +} + +check() { + xvfb-run ctest --test-dir build --output-on-failure +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} + +sha512sums=" +80056703cd42b709925b771fe4bafe17771954705a607d6c352a0818c726bc7b48d299fffd7f3d2f75ac498059f79923d4de468db20f8538554c4d6b8baffedb kgraphviewer-2.5.0.tar.xz +" diff --git a/testing/knative-client/APKBUILD b/testing/knative-client/APKBUILD index a3ac5b1105b..188af4d56ff 100644 --- a/testing/knative-client/APKBUILD +++ b/testing/knative-client/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=knative-client -pkgver=1.13.0 -pkgrel=2 +pkgver=1.14.0 +pkgrel=0 pkgdesc="CLI client for Knative the serverless container platform in Kubernetes" url="https://knative.dev/" arch="all" @@ -45,5 +45,5 @@ package() { } sha512sums=" -97c35c3711f9025f7c4cfd155ff1b9d51ee0c31c7f8d08dc8d6844ec07dd22d9b6d98da4410564f62087818fe96bae7f9016f5325ed3252bbe4a6a61fecade55 knative-v1.13.0.tar.gz +ead9c964183347b40db32f29e4cd8a45e57474eb1f184688e16ddafb6ddf1c82c59899845ca6380243ac1cef775943f508d608d1add76c1be7ab00133b03554d knative-v1.14.0.tar.gz " diff --git a/testing/knxd/APKBUILD b/testing/knxd/APKBUILD index 5d560a1b693..076b4ac7f98 100644 --- a/testing/knxd/APKBUILD +++ b/testing/knxd/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Cían Hughes <Ci@nHugh.es> pkgname=knxd -pkgver=0.14.59 +pkgver=0.14.61 pkgrel=0 pkgdesc="Knxd is an advanced KNX router/gateway; it can talk to all known KNX interfaces" arch="all" @@ -19,8 +19,7 @@ makedepends=" m4 " subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/knxd/knxd/tar.gz/$pkgver - $pkgname-$pkgver-fmt10.patch::https://github.com/knxd/knxd/commit/797283251470786bffd6586571407337da899d30.patch" +source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/knxd/knxd/tar.gz/$pkgver" options="!check" # no tests prepare() { @@ -44,6 +43,5 @@ package() { } sha512sums=" -0ae842bf9d753cb793df486a76a4830b702bc3c1e9af12a8e6ba603a8b419b40ad711d4db73c5b581b15bbe938026c7ae28953fc0b18b485c64f72ff99996fda knxd-0.14.59.tar.gz -9aae4a071272f1bf654a38d98d29879180df04caabf25f5e3a493d38ae4cf357c2d0b2acd7e328ebc4eddaaaeb92441ea79d696c6c86455087efa34c932acb35 knxd-0.14.59-fmt10.patch +40b4b0d2e3730a148863253d17ee413cc6897c1e7289f93635582fa137db58cbbf05bab7807f6a8af017a6dbd02b74aa3f4ed9f9f4567f9f011aef78e315faf1 knxd-0.14.61.tar.gz " diff --git a/testing/komikku/APKBUILD b/testing/komikku/APKBUILD index 84b374503ac..523c95057fc 100644 --- a/testing/komikku/APKBUILD +++ b/testing/komikku/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakob Meier <comcloudway@ccw.icu> # Maintainer: Jakob Meier <comcloudway@ccw.icu> pkgname=komikku -pkgver=1.41.1 +pkgver=1.39.0 pkgrel=1 pkgdesc="manga reader for GNOME" url="https://codeberg.org/valos/Komikku" @@ -55,5 +55,5 @@ package() { } sha512sums=" -b9f5e0212215c6e379afbf8dbdea86c6ed2a4a9c5c6bd15fccae83dab8c211a534eab764b0367557b79cfe428095163bc89d21097c049884479b56f20365b52e komikku-1.41.1.tar.gz +c8c8c2d6cb4beadb7eba22d6764bd49c469614ae49c345723a22cf68376262516d733495f1530206fce20333c408062c50fd88533ef841ff8cbaef7ab06e121a komikku-1.39.0.tar.gz " diff --git a/testing/kopia/APKBUILD b/testing/kopia/APKBUILD index c140219a936..d85b840bdf4 100644 --- a/testing/kopia/APKBUILD +++ b/testing/kopia/APKBUILD @@ -35,7 +35,8 @@ build() { check() { # XXX: end to end restore_test fails to get same buffer from backup # shellcheck disable=2046 - go test $(go list -tags testing ./... | grep -Ev 'end_to_end_test') + go test -timeout=30m \ + $(go list -tags testing ./... | grep -Ev 'end_to_end_test') } package() { diff --git a/testing/krita-plugin-gmic/APKBUILD b/testing/krita-plugin-gmic/APKBUILD index d0139f76c69..5f257fd7cf5 100644 --- a/testing/krita-plugin-gmic/APKBUILD +++ b/testing/krita-plugin-gmic/APKBUILD @@ -6,7 +6,7 @@ pkgrel=3 pkgdesc="Krita plugin for GMIC" url="https://github.com/amyspark/gmic" # krita -arch="all !s390x !armhf !armv7" +arch="all !s390x !armhf !armv7 !riscv64" license="CECILL-2.1" depends="gmic" makedepends=" diff --git a/testing/kubeone/APKBUILD b/testing/kubeone/APKBUILD index 7da1e6d9d7e..12546781ad6 100644 --- a/testing/kubeone/APKBUILD +++ b/testing/kubeone/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=kubeone -pkgver=1.7.3 +pkgver=1.7.4 # Use the latest stable Kubernetes version at the time as the default (https://dl.k8s.io/release/stable-1.27.txt). # See https://docs.kubermatic.com/kubeone/main/tutorials/creating-clusters/#step-5--provisioning-the-cluster for # the table of compatible Kubernetes versions. -_k8sver=1.27.11 -pkgrel=2 +_k8sver=1.27.13 +pkgrel=0 pkgdesc="Automate Kubernetes cluster operations on all platforms" url="https://kubeone.io/" arch="all" @@ -57,5 +57,5 @@ package() { } sha512sums=" -0fe36eeb3fd9ad14a831c48dcd4c22f76d7e7274522c4e6b6623588294a1fd820cd8d795b0135295f40d66bcefcba479546556d079313feb8ec734cb5710081d kubeone-1.7.3.tar.gz +b32b277b9fd0ea0495ac8712c378e22f38ac3a6d84b98bf38ca43ee801ac75818d214c518b41a1bc047b09bc1e8f145fc6bf435d334b15ed3fd5a20dee8493e6 kubeone-1.7.4.tar.gz " diff --git a/testing/kumactl/APKBUILD b/testing/kumactl/APKBUILD index 8dd8be59b98..d38f177141d 100644 --- a/testing/kumactl/APKBUILD +++ b/testing/kumactl/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=kumactl -pkgver=2.6.1 +pkgver=2.7.2 # Keep this in sync with the version of envoyproxy package -_envoyver=1.28.1 -pkgrel=2 +_envoyver=1.30.1 +pkgrel=0 pkgdesc="CLI for the multi-zone service mesh Kuma" -url="https://kuma.io" +url="https://kuma.io/" # The only build targets for eBPF module # https://github.com/kumahq/kuma/tree/master/pkg/transparentproxy/ebpf/programs arch="x86_64 aarch64" @@ -106,7 +106,7 @@ _dataplane_openrc() { } sha512sums=" -2b71ed354f4631723100682e79e7f30fd3e51f296c330142f04f5833fdb9ce1d2608ffb512551e9aef14d50b2a84e6e87210d707321e0c591d4f3e3ae9d91137 kumactl-2.6.1.tar.gz +c351a74b92fe25b1f4b13e21dd169b5642a0a4823050ac9b2d5d765a0e602863b8baaf7ed2b8d519ba773f8b26bf8472847813e3010f6d92872db63eb2ee3918 kumactl-2.7.2.tar.gz 001e46b18ab4c1d0b131667d07567d0ec13fcadcc850265f97c4e82a0342285a5607191e0225e9fe8f683ce62551af833286b867e1df784f19935eca779ada79 kuma-cp.initd a3285adff02e44f2ae8e38e94fea91d0039d1edd4b42fbe598d60e1d46495fbf7b38cab3a60eb331590f791ad83701094f7f7e331bcc54921746430ed0abd749 kuma-cp.confd d9c3fc8c4f8bfe488db871551d632009733c65318a73c8ebca13d216a69de1f11f3a68d782b8c34b7d3258f65acc39bd8d7bb5b2d012d2b7b9f0e727797edf66 kuma-dp.initd diff --git a/testing/laminar/APKBUILD b/testing/laminar/APKBUILD index 6e96d5267e2..337b80a96f2 100644 --- a/testing/laminar/APKBUILD +++ b/testing/laminar/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=laminar pkgver=1.3 -pkgrel=3 +pkgrel=4 pkgdesc="Fast and lightweight Continuous Integration server" url="https://laminar.ohwg.net/" license="GPL-3.0-or-later" diff --git a/testing/lem/APKBUILD b/testing/lem/APKBUILD new file mode 100644 index 00000000000..44dfa8ac130 --- /dev/null +++ b/testing/lem/APKBUILD @@ -0,0 +1,143 @@ +# Based on AUR's lem-editor-git & qlot +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=lem +pkgver=2.2.0 +pkgrel=0 +pkgdesc="Common Lisp editor/IDE with high expansibility" +url="https://lem-project.github.io/" +arch="aarch64 x86_64" +license="MIT" +makedepends=" + libdecor-dev + ncurses-dev + sbcl + sdl2-dev + sdl2_image-dev + sdl2_ttf-dev + " +checkdepends="roswell" +subpackages=" + $pkgname-common + $pkgname-gui + " +_qlotver=1.5.1 +source="https://github.com/lem-project/lem/archive/refs/tags/v$pkgver/lem-$pkgver.tar.gz + https://github.com/fukamachi/qlot/releases/download/$_qlotver/qlot-$_qlotver.tar.gz + aarch64-disable-timer-tests_patch + build-ncurses.lisp + build-sdl2.lisp + general.lisp + lem.desktop + " +options="!strip" + +prepare() { + default_prepare + + cd "$srcdir"/qlot + sbcl --noinform --no-sysinit --no-userinit --non-interactive \ + --load .bundle-libs/bundle.lisp \ + --eval "(asdf:load-asd #P\"$srcdir/qlot/qlot.asd\")" \ + --eval '(let ((*standard-output* (make-broadcast-stream)) + (*trace-output* (make-broadcast-stream))) + (mapc (function asdf:load-system) + (list :qlot :qlot/subcommands :qlot/cli :qlot/fetch)))' + + cd "$builddir" + "$srcdir"/qlot/scripts/run.sh install + + case "$CARCH" in + aarch64) + patch lem-tests.asd \ + "$srcdir"/aarch64-disable-timer-tests_patch + ;; + esac +} + +build() { + msg "Building lem" + sbcl --noinform --no-sysinit --no-userinit \ + --load .qlot/setup.lisp \ + --load "$srcdir"/build-ncurses.lisp + + msg "Building lem-gui" + sbcl --noinform --no-sysinit --no-userinit \ + --load .qlot/setup.lisp \ + --load "$srcdir"/build-sdl2.lisp +} + +check() { + .qlot/bin/rove lem-tests.asd +} + +package() { + depends=" + $pkgname-common=$pkgver-r$pkgrel + libcrypto3 + libssl3 + so:libncursesw.so.6 + " + + install -dvm755 "$pkgdir"/usr/share/lem + cp -vr frontends/sdl2/resources "$pkgdir"/usr/share/lem/ + + # Devendor Noto fonts + rm -v "$pkgdir"/usr/share/lem/resources/fonts/NotoColorEmoji.ttf \ + "$pkgdir"/usr/share/lem/resources/fonts/NotoSansCJK-Bold.ttc \ + "$pkgdir"/usr/share/lem/resources/fonts/NotoSansCJK-Regular.ttc + ln -sv /usr/share/fonts/noto/NotoColorEmoji.ttf \ + "$pkgdir"/usr/share/lem/resources/fonts/ + ln -sv /usr/share/fonts/noto/NotoSansCJK-Bold.ttc \ + "$pkgdir"/usr/share/lem/resources/fonts/ + ln -sv /usr/share/fonts/noto/NotoSansCJK-Regular.ttc \ + "$pkgdir"/usr/share/lem/resources/fonts/ + + install -Dvm755 lem lem-gui -t "$pkgdir"/usr/bin/ + install -Dvm755 "$srcdir"/libasyncprocess.so \ + -t "$pkgdir"/usr/share/lem/ + install -Dvm644 "$srcdir"/lem.desktop \ + -t "$pkgdir"/usr/share/applications/ + install -Dvm644 LICENCE \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +common() { + pkgdesc="$pkgdesc (common files)" + depends= + + amove usr/share/lem/libasyncprocess.so + amove usr/share/licenses/$pkgname +} + +gui() { + pkgdesc="$pkgdesc (graphical variant)" + depends=" + $pkgname-common=$pkgver-r$pkgrel + font-noto-cjk + font-noto-emoji + libcrypto3 + libssl3 + so:libdecor-0.so.0 + so:libffi.so.8 + so:libsamplerate.so.0 + so:libtiff.so.6 + so:libSDL2-2.0.so.0 + so:libSDL2_image-2.0.so.0 + so:libSDL2_ttf-2.0.so.0 + " + + amove usr/bin/lem-gui + amove usr/share/applications/lem.desktop + amove usr/share/lem/resources +} + +sha512sums=" +db4ea4bf1f4cf5dbc6f29c8e528bf05214e58d520dd11c9eab032e2e478b9612f2378827796e56133e6d58bf2297c8f1a8f693ae77bb4d85bb63369480573301 lem-2.2.0.tar.gz +6bc3b1f0f3e4e745af08f47249aa8693539ae441478db46c95140caa757561e161f06492a73b0fff366fffab3c2e5303c74dc2d3a8686a2450106bd27ce50c6e qlot-1.5.1.tar.gz +7f7f3a2d5d6fd4fab567e9c07284e6b9919857802ecdeffa4dd1e42078ba7b51133c8db7c8efcf2c33448c2d741f734c96b3ed8f68059489b2c32de1ccc2060c aarch64-disable-timer-tests_patch +44ad20459851217cf5c5cc9d1a75583b5ebf1de1de6cece44f0073042420c4d6533838ae5f785d40c25cfd7d71b589d39be076f3ad7c6ef2e53e9a574e134d91 build-ncurses.lisp +b4f4786cd9ae1e122d142f9957b758b0c2a5bb4ef444570a682298c22b58c92f8966684c1aeb306ee13e834539daadfa13a84663adab3fb1604681b8a66d82bf build-sdl2.lisp +07094800689a2cba48c21de6c9086961eebab8a47f21f153041d76f3d6a85ea98653fb21ef6a81a2e4aa07a25f1f36736e50ca858614135ba07586062b0d5364 general.lisp +e78665b79229caf77b432fff89241de7fab1746ba6e5a27de9fafbe8ffebc8fae858e0653d29ff47db205b7e07b64526efb21fae416ef83913ac0fd804a78916 lem.desktop +" diff --git a/testing/lem/aarch64-disable-timer-tests_patch b/testing/lem/aarch64-disable-timer-tests_patch new file mode 100644 index 00000000000..e51e17773d0 --- /dev/null +++ b/testing/lem/aarch64-disable-timer-tests_patch @@ -0,0 +1,12 @@ +--- a/lem-tests.asd ++++ b/lem-tests.asd +@@ -11,8 +11,7 @@ + (:module "common" + :components ((:file "ring") + (:file "killring") +- (:file "history") +- (:file "timer"))) ++ (:file "history"))) + #+sbcl + (:module "language-server" + :components ((:file "utils") diff --git a/testing/lem/build-ncurses.lisp b/testing/lem/build-ncurses.lisp new file mode 100644 index 00000000000..0bd48d54f4c --- /dev/null +++ b/testing/lem/build-ncurses.lisp @@ -0,0 +1,18 @@ +(ql:quickload :lem-ncurses) + +(cffi:close-foreign-library 'async-process::async-process) + +(defun setup-foreign-library-directories () + (setf cffi:*foreign-library-directories* '()) + (cffi:load-foreign-library "/usr/share/lem/libasyncprocess.so")) + +(load (merge-pathnames "general.lisp" *load-pathname*)) + +(apply #'sb-ext:save-lisp-and-die + "lem" + :toplevel 'launch + :executable t + #+sb-core-compression + '(:compression -1) + #-sb-core-compression + '()) diff --git a/testing/lem/build-sdl2.lisp b/testing/lem/build-sdl2.lisp new file mode 100644 index 00000000000..a6de68892f4 --- /dev/null +++ b/testing/lem/build-sdl2.lisp @@ -0,0 +1,29 @@ +(ql:quickload :lem-sdl2) + +(cffi:close-foreign-library 'async-process::async-process) +(cffi:close-foreign-library 'sdl2::libsdl2) +(cffi:close-foreign-library 'sdl2-ttf::libsdl2-ttf) +(cffi:close-foreign-library 'sdl2-image::libsdl2-image) + +(defun setup-foreign-library-directories () + (setf cffi:*foreign-library-directories* '()) + (cffi:load-foreign-library "/usr/share/lem/libasyncprocess.so") + (cffi:load-foreign-library "libdecor-0.so.0") + (cffi:load-foreign-library "libtiff.so.6") + (cffi:load-foreign-library "libsamplerate.so.0") + (cffi:load-foreign-library "libSDL2-2.0.so.0") + (cffi:load-foreign-library "libSDL2_image-2.0.so.0") + (cffi:load-foreign-library "libSDL2_ttf-2.0.so.0")) + +(load (merge-pathnames "general.lisp" *load-pathname*)) + +(setf lem-sdl2/resource::*resource-directory* #p"/usr/share/lem/") + +(apply #'sb-ext:save-lisp-and-die + "lem-gui" + :toplevel 'launch + :executable t + #+sb-core-compression + '(:compression -1) + #-sb-core-compression + '()) diff --git a/testing/lem/general.lisp b/testing/lem/general.lisp new file mode 100644 index 00000000000..50b2207337c --- /dev/null +++ b/testing/lem/general.lisp @@ -0,0 +1,53 @@ +(in-package :cl-user) + +(setq lem-core::*deployed* t) + +(dolist (module sb-impl::*modules*) + (require module)) + +(setq asdf:*output-translations-parameter* nil + asdf/output-translations:*output-translations* nil) + +;; XXX: +;; (ql:quickload :drakma) causes sb-bsd-sockets require to fail. +;; Override this method to work around it. +(defmethod asdf:perform ((o asdf:load-op) (s asdf:require-system)) + nil) + +(defmethod asdf:output-files :around ((operation t) (component t)) + (call-next-method) + ;; XXX: + ;; Disable the following code defined in asdf + ;; because the target environment may refer to directories in the host environment + #+(or) + (do-asdf-cache `(output-files ,operation ,component) + (values + (multiple-value-bind (pathnames fixedp) (call-next-method) + ;; 1- Make sure we have absolute pathnames + (let* ((directory (pathname-directory-pathname + (component-pathname (find-component () component)))) + (absolute-pathnames + (loop + :for pathname :in pathnames + :collect (ensure-absolute-pathname pathname directory)))) + ;; 2- Translate those pathnames as required + (if fixedp + absolute-pathnames + (mapcar *output-translation-function* absolute-pathnames)))) + t))) + +(uiop:copy-file (cffi:foreign-library-pathname (cffi::get-foreign-library 'async-process::async-process)) + (merge-pathnames #p"libasyncprocess.so" *load-pathname*)) + +(maphash (lambda (key value) + (declare (ignore value)) + (unless (or (equal key "asdf") + (equal key "asdf-package-system") + (equal key "uiop") + (uiop:string-prefix-p "sb-" key)) + (remhash key asdf::*registered-systems*))) + asdf::*registered-systems*) + +(defun launch (&optional (args (uiop:command-line-arguments))) + (setup-foreign-library-directories) + (apply #'lem:lem args)) diff --git a/testing/lem/lem.desktop b/testing/lem/lem.desktop new file mode 100644 index 00000000000..273dfeac145 --- /dev/null +++ b/testing/lem/lem.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Lem +GenericName=Text Editor +Exec=/usr/bin/lem-gui %F +Comment=An extensible editor written in Common Lisp +Terminal=false +Icon=/usr/share/lem/resources/icon.png +Type=Application +Category=Development;TextEditor;
\ No newline at end of file diff --git a/testing/level-zero/APKBUILD b/testing/level-zero/APKBUILD index b156c930942..cd7cdae6f30 100644 --- a/testing/level-zero/APKBUILD +++ b/testing/level-zero/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leon Marz <main@lmarz.org> # Maintainer: Leon Marz <main@lmarz.org> pkgname=level-zero -pkgver=1.16.14 +pkgver=1.17.0 pkgrel=0 pkgdesc="oneAPI Level Zero Loader" url="https://spec.oneapi.com/versions/latest/elements/l0/source/index.html" @@ -33,5 +33,5 @@ dev() { } sha512sums=" -8c80d75909398245c0173a4198748d1a1e469e21a09138f60b314061ff556e7f529807e02c6ec1f3a47f2871e17c24b7be6d363810a25fee11e73b5c97c7c62a level-zero-1.16.14.tar.gz +97b9d06b5cd84b1644ca252ac5009d1350f8c72aeb908a3b93bf8e07f91354589ce4fffdd8069b301eac6b704489ca04022aa4a44a7269bc0da3ace7103b5802 level-zero-1.17.0.tar.gz " diff --git a/testing/lgogdownloader/APKBUILD b/testing/lgogdownloader/APKBUILD index 0ec648ee664..847249d4c97 100644 --- a/testing/lgogdownloader/APKBUILD +++ b/testing/lgogdownloader/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: shum <shum@posteo.net> pkgname=lgogdownloader pkgver=3.12 -pkgrel=1 +pkgrel=2 pkgdesc="Open source downloader for GOG.com games" url="https://github.com/Sude-/lgogdownloader" arch="all" diff --git a/testing/libeantic/APKBUILD b/testing/libeantic/APKBUILD index 4e5ab08e273..9642615d737 100644 --- a/testing/libeantic/APKBUILD +++ b/testing/libeantic/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakob Meier <comcloudway@ccw.icu> pkgname=libeantic pkgver=2.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Embedded algebraic number fields" url="https://github.com/flatsurf/e-antic" arch="all !s390x" # flint-dev diff --git a/testing/libexmdbpp/0001-musl-ulong.patch b/testing/libexmdbpp/0001-musl-ulong.patch new file mode 100755 index 00000000000..11472934380 --- /dev/null +++ b/testing/libexmdbpp/0001-musl-ulong.patch @@ -0,0 +1,13 @@ +diff -ruN a/src/requests.cpp b/src/requests.cpp +--- a/src/requests.cpp 2024-03-06 19:19:25.370737482 +0100 ++++ b/src/requests.cpp 2024-03-06 19:20:40.600711937 +0100 +@@ -9,6 +9,9 @@ + #include <random> + #include <chrono> + ++// Definition needed for musl ++typedef unsigned long ulong; ++ + using namespace exmdbpp::structures; + using namespace exmdbpp::constants; + diff --git a/testing/libexmdbpp/APKBUILD b/testing/libexmdbpp/APKBUILD new file mode 100755 index 00000000000..a6fb19b9dcc --- /dev/null +++ b/testing/libexmdbpp/APKBUILD @@ -0,0 +1,40 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=libexmdbpp +pkgver=1.11 +pkgrel=0 +pkgdesc="C++ implementation of the exmdb wire protocol for grommunio" +arch="all" +url="https://grommunio.com/" +license="AGPL-3.0-or-later" +makedepends="cmake ninja python3-dev py3-pybind11-dev py3-pkgconfig" +subpackages="$pkgname-dev py3-pyexmdb:py3" +source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/libexmdbpp/archive/refs/tags/$pkgver.tar.gz + 0001-musl-ulong.patch + " +#builddir="$srcdir/libexmdbpp-$pkgver/" +options="!check" # No test suite + +build() { + cmake -B build -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=MinSizeRel \ + -DCMAKE_SKIP_INSTALL_RPATH=ON + + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} + +py3() { + pkgdesc="$pkgdesc (python bindings)" + + amove usr/lib/python* +} + +sha512sums=" +757c2f789b892f6cd2e8681d74a215328415e18440da852f41cc5185b2aad350247fab5e65188e516fbb7cd35d05a0663ab59bcf0a18d5a35178f63c29f522e7 libexmdbpp-1.11.tar.gz +69ec05633818ad1ced643b09fda13ada3d36dc95e01fda0984c49ee4825446daceaf2163ea36a6ecf3cf378bd5539890bfafb756dc6a4e45ea84b5b3e3e82c04 0001-musl-ulong.patch +" diff --git a/testing/libguestfs/APKBUILD b/testing/libguestfs/APKBUILD index 6970e73aa68..cec13a5d2b0 100644 --- a/testing/libguestfs/APKBUILD +++ b/testing/libguestfs/APKBUILD @@ -1,12 +1,14 @@ # Contributor: Fathi Boudra <fathi.boudra@linaro.org> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=libguestfs +# NOTE: Upgrade only to even-numbered versions (e.g. 1.50.x, 1.52.x)! +# Odd-numbered versions are development versions. pkgver=1.52.0 pkgrel=1 pkgdesc="Access and modify virtual machine disk images" url="https://libguestfs.org/" -# riscv64: blocked by ocaml -arch="all !riscv64" +# riscv64, loongarch64: blocked by ocaml +arch="all !riscv64 !loongarch64" license="GPL-2.0-or-later" depends=" cmd:mkisofs diff --git a/testing/libigraph/APKBUILD b/testing/libigraph/APKBUILD index 8d835e5e900..c10365b95a0 100644 --- a/testing/libigraph/APKBUILD +++ b/testing/libigraph/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Grigory Kirillov <txgk@bk.ru> # Maintainer: Jonas <3426-spameier@users.gitlab.alpinelinux.org> pkgname=libigraph -pkgver=0.10.11 +pkgver=0.10.12 pkgrel=0 pkgdesc="Library for creating and manipulating graphs" url="https://igraph.org" @@ -42,5 +42,5 @@ package() { } sha512sums=" -d6978589f12ed20b87777394b46f47b4ffc045ef693e5b4fc90163b9482361b2bf0ed2bb04aa99bf4a0653f7e4355cd480b0a165213d90ff7188ef6c86147c86 igraph-0.10.11.tar.gz +1a7b055ab2148fdf04187d785895b930ae2a54ae0240ea9656e129a38347b1caeb28dda5a3a7e34282462363150d7afd25acf8cd335577ed441b8a5cecc0dd25 igraph-0.10.12.tar.gz " diff --git a/testing/libime/APKBUILD b/testing/libime/APKBUILD index f51d22d09f0..3e27a1c77cd 100644 --- a/testing/libime/APKBUILD +++ b/testing/libime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Lindsay Zhou <i@lin.moe> # Maintainer: Lindsay Zhou <i@lin.moe> pkgname=libime -pkgver=1.1.6 +pkgver=1.1.7 pkgrel=0 _kenlm=bcd4af619a2fa45f5876d8855f7876cc09f663af pkgdesc="Fcitx input method engine library" @@ -71,6 +71,6 @@ table() { } sha512sums=" -0c9ed4fcb545fee19a7333b1cf6157a95f8498e1322773b526a9e1469e18091c2458ee2410383a1c23dea051cb1dabceb190664e43a806902a91a050cce44c30 libime-1.1.6.tar.gz +904052530f9799b7434adfe77c7bd1623bbf1bffc02caa4177dab050765c1ace1bd5866d467c400baf99d5da514151adbd9a9453cfa54c5a9ce1796c8d04ec48 libime-1.1.7.tar.gz 0ed68ed3b927b8c8353ab3815d17d0706b3357dce8a446176bd48ef6b73989bcf142983008e2b2b5e44769428a684dc1abcf3973f9f99c76b9bfc5f80a3aa363 kenlm-bcd4af619a2fa45f5876d8855f7876cc09f663af.tar.gz " diff --git a/testing/libkkc/APKBUILD b/testing/libkkc/APKBUILD index 12004bdb8a7..09904b002e8 100644 --- a/testing/libkkc/APKBUILD +++ b/testing/libkkc/APKBUILD @@ -1,7 +1,7 @@ -# Maintainer: +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=libkkc pkgver=0.3.5 -pkgrel=2 +pkgrel=3 pkgdesc="Japanese Kana Kanji conversion input method library" url="https://github.com/ueno/libkkc" arch="all" @@ -13,22 +13,30 @@ makedepends=" libmarisa-dev py3-marisa " -subpackages="$pkgname-dev $pkgname-lang kkc-package-data" +subpackages=" + $pkgname-dev + $pkgname-lang + kkc-package-data + " source="https://github.com/ueno/libkkc/releases/download/v$pkgver/libkkc-$pkgver.tar.gz - $pkgname-py3.patch::https://github.com/ueno/libkkc/commit/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch + $pkgname-py3.patch " prepare() { default_prepare + update_config_guess update_config_sub } build() { ./configure \ - --prefix=/usr \ - --host=$CHOST \ --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ --disable-static \ --disable-silent-rules \ --disable-vapigen @@ -41,18 +49,15 @@ check() { package() { make DESTDIR="$pkgdir" install + + mkdir -vp "$pkgdir"/usr/share + mv -v "$pkgdir"/usr/lib/locale "$pkgdir"/usr/share/ } data() { pkgdesc="$pkgdesc (data downloader script)" - amove usr/bin -} -lang() { - pkgdesc="translations for $pkgname" - - mkdir -p "$subpkgdir"/usr/share - mv "$pkgdir"/usr/lib/locale "$subpkgdir"/usr/share/ + amove usr/bin } sha512sums=" diff --git a/testing/libkkc/libkkc-py3.patch b/testing/libkkc/libkkc-py3.patch new file mode 100644 index 00000000000..91d3f6956e8 --- /dev/null +++ b/testing/libkkc/libkkc-py3.patch @@ -0,0 +1,138 @@ +From ba1c1bd3eb86d887fc3689c3142732658071b5f7 Mon Sep 17 00:00:00 2001 +From: Takao Fujiwara <tfujiwar@redhat.com> +Date: Mon, 30 Jul 2018 15:26:37 +0900 +Subject: [PATCH] build: Enable python3 + +--- + data/templates/libkkc-data/tools/genfilter.py | 18 +++++++-------- + data/templates/libkkc-data/tools/sortlm.py | 23 ++++++++----------- + 2 files changed, 19 insertions(+), 22 deletions(-) + +diff --git a/data/templates/libkkc-data/tools/genfilter.py b/data/templates/libkkc-data/tools/genfilter.py +index 5ffab32..0c5f75a 100644 +--- a/data/templates/libkkc-data/tools/genfilter.py ++++ b/data/templates/libkkc-data/tools/genfilter.py +@@ -84,24 +84,24 @@ def __init__(self, infile, outfile, record_size): + + def generate(self): + size = os.fstat(self.infile.fileno()).st_size +- n = size / self.record_size ++ n = size // self.record_size + m = int(math.ceil(-n*math.log10(ERROR_RATE) / + math.pow(math.log10(2), 2))) +- m = (m/8 + 1)*8 ++ m = (m//8 + 1)*8 + inmem = mmap.mmap(self.infile.fileno(), + size, + access=mmap.ACCESS_READ) +- outmem = bytearray(m/8) +- for i in xrange(0, n): ++ outmem = bytearray(m//8) ++ for i in range(0, n): + offset = i*self.record_size + b0, b1 = struct.unpack("=LL", inmem[offset:offset+8]) +- for k in xrange(0, 4): ++ for k in range(0, 4): + h = murmur_hash3_32(b0, b1, k) + h = int(h * (m / float(0xFFFFFFFF))) +- outmem[h/8] |= (1 << (h%8)) ++ outmem[h//8] |= (1 << (h%8)) + inmem.close() +- # Convert bytearray to str, for Python 2.6 compatibility. +- self.outfile.write(str(outmem)) ++ # Convert bytearray to bytes, for Python 3 compatibility. ++ self.outfile.write(bytes(outmem)) + + if __name__ == '__main__': + import sys +@@ -110,7 +110,7 @@ def generate(self): + parser = argparse.ArgumentParser(description='filter') + parser.add_argument('infile', type=argparse.FileType('r'), + help='input file') +- parser.add_argument('outfile', type=argparse.FileType('w'), ++ parser.add_argument('outfile', type=argparse.FileType('wb'), + help='output file') + parser.add_argument('record_size', type=int, + help='record size') +diff --git a/data/templates/libkkc-data/tools/sortlm.py b/data/templates/libkkc-data/tools/sortlm.py +index a0dd8fe..40f0837 100644 +--- a/data/templates/libkkc-data/tools/sortlm.py ++++ b/data/templates/libkkc-data/tools/sortlm.py +@@ -40,10 +40,10 @@ def __init__(self, infile, output_prefix): + self.__min_cost = 0.0 + + def read(self): +- print "reading N-grams" ++ print("reading N-grams") + self.__read_tries() + self.__read_ngrams() +- print "min cost = %lf" % self.__min_cost ++ print("min cost = %lf" % self.__min_cost) + + def __read_tries(self): + while True: +@@ -58,7 +58,7 @@ def __read_tries(self): + line = self.__infile.readline() + if line == "": + break +- line = line.strip() ++ line = line.strip('\n') + if line == "": + break + match = self.__ngram_line_regex.match(line) +@@ -89,7 +89,7 @@ def __read_ngrams(self): + line = self.__infile.readline() + if line == "": + break +- line = line.strip() ++ line = line.strip('\n') + if line == "": + break + match = self.__ngram_line_regex.match(line) +@@ -125,14 +125,11 @@ def __write_ngrams(self): + def quantize(cost, min_cost): + return max(0, min(65535, int(cost * 65535 / min_cost))) + +- def cmp_header(a, b): +- return cmp(a[0], b[0]) +- +- print "writing 1-gram file" ++ print("writing 1-gram file") + unigram_offsets = {} + unigram_file = open("%s.1gram" % self.__output_prefix, "wb") + offset = 0 +- for ids, value in sorted(self.__ngram_entries[0].iteritems()): ++ for ids, value in sorted(self.__ngram_entries[0].items()): + unigram_offsets[ids[0]] = offset + s = struct.pack("=HHH", + quantize(value[0], self.__min_cost), +@@ -143,13 +140,13 @@ def cmp_header(a, b): + offset += 1 + unigram_file.close() + +- print "writing 2-gram file" ++ print("writing 2-gram file") + bigram_offsets = {} + bigram_file = open("%s.2gram" % self.__output_prefix, "wb") + keys = self.__ngram_entries[1].keys() + items = [(struct.pack("=LL", ids[1], unigram_offsets[ids[0]]), ids) for ids in keys] + offset = 0 +- for header, ids in sorted(items, cmp=cmp_header): ++ for header, ids in sorted(items, key=lambda x: x[0]): + value = self.__ngram_entries[1][ids] + bigram_offsets[ids] = offset + s = struct.pack("=HH", +@@ -160,11 +157,11 @@ def cmp_header(a, b): + bigram_file.close() + + if len(self.__ngram_entries[2]) > 0: +- print "writing 3-gram file" ++ print("writing 3-gram file") + trigram_file = open("%s.3gram" % self.__output_prefix, "wb") + keys = self.__ngram_entries[2].keys() + items = [(struct.pack("=LL", ids[2], bigram_offsets[(ids[0], ids[1])]), ids) for ids in keys] +- for header, ids in sorted(items, cmp=cmp_header): ++ for header, ids in sorted(items, key=lambda x: x[0]): + value = self.__ngram_entries[2][ids] + s = struct.pack("=H", + quantize(value[0], self.__min_cost)) diff --git a/testing/liblastfm-qt/APKBUILD b/testing/liblastfm-qt/APKBUILD index b392cb4fc9d..e98a7ee0c34 100644 --- a/testing/liblastfm-qt/APKBUILD +++ b/testing/liblastfm-qt/APKBUILD @@ -1,8 +1,8 @@ # Contributor: knuxify <knuxify@gmail.com> -# Maintainer: knuxify <knuxify@gmail.com> +# Maintainer: pkgname=liblastfm-qt pkgver=1.1.10_git20190823 -pkgrel=2 +pkgrel=3 _commit=2ce2bfe1879227af8ffafddb82b218faff813db9 pkgdesc="A Qt C++ library for the Last.fm webservices " url="https://last.fm" diff --git a/testing/libmanticore-columnar/0001-include-cstdint.patch b/testing/libmanticore-columnar/0001-include-cstdint.patch new file mode 100644 index 00000000000..44f2e4a5914 --- /dev/null +++ b/testing/libmanticore-columnar/0001-include-cstdint.patch @@ -0,0 +1,11 @@ +diff -ruN a/common/schema.h b/common/schema.h +--- a/common/schema.h 2024-04-19 10:17:30.432373942 +0200 ++++ b/common/schema.h 2024-04-19 10:18:40.222357156 +0200 +@@ -20,6 +20,7 @@ + #pragma once + + #include <vector> ++#include <cstdint> // for std::uint32_t and std::uint64_t + #include <string> + + namespace common diff --git a/testing/libmanticore-columnar/APKBUILD b/testing/libmanticore-columnar/APKBUILD new file mode 100644 index 00000000000..eeae2a84ab8 --- /dev/null +++ b/testing/libmanticore-columnar/APKBUILD @@ -0,0 +1,38 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=libmanticore-columnar +pkgver=2.2.4 +pkgrel=0 +pkgdesc="Column-oriented storage library" +url="https://manticoresearch.com/" +arch="x86_64 aarch64" +license="Apache-2.0" +source="$pkgname-$pkgver.tar.gz::https://github.com/manticoresoftware/columnar/archive/refs/tags/$pkgver.tar.gz + 0001-include-cstdint.patch + " +makedepends=" + cmake + samurai + " +builddir="$srcdir/columnar-$pkgver/" + +build() { + cmake -B build -G Ninja \ + -DCMAKE_BUILD_TYPE=MinSizeRel \ + -DDISTR_BUILD=default \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib + cmake --build build +} + +check() { + ctest --test-dir build --output-on-failure -j1 +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} + +sha512sums=" +f374799a61f86b6532c94d6ed647a7f435df3b1df7076b34915eae6d22a3e8271649f2e413640556dc6b72a55786a1ce89fd51aa123b0939034b5a8207b786f1 libmanticore-columnar-2.2.4.tar.gz +ed65bd8195861ce02f21e4ef2d143aae50bc7c135504859713e33a00ec8cd4a54727c36343578ca347c7393c9a3283b803f978c70d4b265ca5b5023e1af0608a 0001-include-cstdint.patch +" diff --git a/testing/libmedc/APKBUILD b/testing/libmedc/APKBUILD index b0d7e48db99..ffc22e4cef1 100644 --- a/testing/libmedc/APKBUILD +++ b/testing/libmedc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=libmedc pkgver=4.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Open source library for numerical simulation" url="https://www.salome-platform.org/" arch="all" diff --git a/testing/libmygpo-qt/APKBUILD b/testing/libmygpo-qt/APKBUILD index 99c0ad18deb..4754b11a608 100644 --- a/testing/libmygpo-qt/APKBUILD +++ b/testing/libmygpo-qt/APKBUILD @@ -1,8 +1,8 @@ # Contributor: knuxify <knuxify@gmail.com> -# Maintainer: knuxify <knuxify@gmail.com> +# Maintainer: pkgname=libmygpo-qt pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A C++/Qt client library for gpodder.net" url="http://wiki.gpodder.org/wiki/Libmygpo-qt" arch="all" diff --git a/testing/libnest2d/APKBUILD b/testing/libnest2d/APKBUILD index 3cb42f7fe31..bc8059b5dc0 100644 --- a/testing/libnest2d/APKBUILD +++ b/testing/libnest2d/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Anjandev Momi <anjan@momi.ca> pkgname=libnest2d pkgver=0.4 -pkgrel=5 +pkgrel=6 pkgdesc="2D irregular bin packaging and nesting library written in modern C++" url="https://github.com/tamasmeszaros/libnest2d" arch="noarch" diff --git a/testing/libopensles-standalone/APKBUILD b/testing/libopensles-standalone/APKBUILD index 4402033b496..4da74347c61 100644 --- a/testing/libopensles-standalone/APKBUILD +++ b/testing/libopensles-standalone/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=libopensles-standalone -pkgver=0_git20231019 -pkgrel=2 -_commit="6e6e8e5bfa9f53deaa947e8ec4f1a70b892b764f" +pkgver=0_git20240221 +pkgrel=0 +_commit="605a83f47263a022427afb6e95801bd39b459b78" pkgdesc="A lightly patched version of Google's libOpenSLES implementation" url="https://gitlab.com/android_translation_layer/libopensles-standalone" arch="x86_64 aarch64 armv7" @@ -34,5 +34,5 @@ package() { } sha512sums=" -9f26cf3814c1066c8e670753cb2ce8ee6781a656b91d3745df621feb905df60139254ec7baa5257548de538a6c4ace8a414cac699e44e02a15777d8c20c68577 libopensles-standalone-6e6e8e5bfa9f53deaa947e8ec4f1a70b892b764f.tar.gz +327d458f243ff4aeb058c60b70454d74995c86168f8290b1902d6c6d4cfc7624bc356dad69e6b556ee77edf96a528ce0de29749a580432e519fea23e4378c733 libopensles-standalone-605a83f47263a022427afb6e95801bd39b459b78.tar.gz " diff --git a/testing/libretro-cannonball/APKBUILD b/testing/libretro-cannonball/APKBUILD index a29e43dbeaa..d819dc47aa7 100644 --- a/testing/libretro-cannonball/APKBUILD +++ b/testing/libretro-cannonball/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: David Demelier <markand@malikania.fr> pkgname=libretro-cannonball pkgver=0_git20220309 -pkgrel=5 +pkgrel=6 _commit="8fb0d9561ee110f31f45610661649f0c1ff068ee" pkgdesc="an enhanced OutRun Engine" url="https://github.com/libretro/cannonball" diff --git a/testing/librewolf/APKBUILD b/testing/librewolf/APKBUILD index 32c172403ec..fbc3b882451 100644 --- a/testing/librewolf/APKBUILD +++ b/testing/librewolf/APKBUILD @@ -4,10 +4,9 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Contributor: Sertonix <sertonix@posteo.net> # Maintainer: Sertonix <sertonix@posteo.net> -_pkgname=Librewolf pkgname=librewolf -pkgver=124.0.2_p1 -_releasedate=2024-04-03 +pkgver=125.0.3_p1 +_releasedate=2024-04-23 pkgrel=0 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom." url="https://librewolf.net/" @@ -79,7 +78,6 @@ riscv64) ;; *) subpackages="$subpackages $pkgname-dbg" ;; esac -# The source has to change once the codeberg migration is done. source="$pkgname-$pkgver.tar.gz::https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${pkgver/_p/-}/librewolf-${pkgver/_p/-}.source.tar.gz disable-moz-stackwalk.patch fix-fortify-system-wrappers.patch @@ -91,7 +89,6 @@ source="$pkgname-$pkgver.tar.gz::https://gitlab.com/api/v4/projects/32320088/pac no-ccache-stats.patch ppc-musttail.patch python-deps.patch - res_nquery.patch rust-lto-thin.patch riscv64-no-lto.patch sandbox-fork.patch @@ -515,7 +512,7 @@ prepare() { cat > base-mozconfig <<-EOF ac_add_options --with-app-name=$pkgname - export MOZ_APP_REMOTINGNAME=$_pkgname + export MOZ_APP_REMOTINGNAME=$pkgname ac_add_options --with-branding=browser/branding/librewolf # disable unwanted things @@ -728,7 +725,7 @@ intl() { } sha512sums=" -117106622d8f342a80d56619720b9ccdc20c04f1d3758cfb7fa1b24416f2f9e86182176ca96e8bf78dfa19272edbbca15846978f96daef747e25f619bc8a3266 librewolf-124.0.2_p1.tar.gz +ebb832c60760945a55fed6eb4bb5a40ca2ca75e1a23ab4ee848400481cfd2818a61cbcede29da1fcc01097ffba3e25fa4ca68e7623e5d334746004d11e91f4f9 librewolf-125.0.3_p1.tar.gz eb49b791280a8d765e6b056816ad6d7ec20a3b13723ebe648a8ecd2c086a5bc83277a3b4c127a470e7bb7105cfa4ed7611c19ac683545140190cafaa880ad515 disable-moz-stackwalk.patch 19eea840aa9c1c21e7bd1f832ec078989fe6f08fca40baa271be7e74f1cffeb5ab8d3218a93e664b8d90a41506dede524e2a5174cd47580866109bc6711ea969 fix-fortify-system-wrappers.patch cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch @@ -739,7 +736,6 @@ b7a2beef126569d71242198f2503bb6a32acd1ea89080ef7bed6ba0f0d10819282c2c346c6f729d8 c0437a6753f3f350968fa12d250efdfe1bea77baf0e4c06b072b5cc9e78c774dbf4506bc536337030d349fb3ba4460097b75b0c7c5b8fb2d39d8b0a392948936 no-ccache-stats.patch 2d8dff86212d6d2a904cbb5a5a1d6c17b89adc929fc6a3f4c6cb669f5e83ecddff5a799225319ba445a187b04d111251af75dd3ce8a039164bc14d2a432a2a04 ppc-musttail.patch 4de65266f5fc1c5bf1d7cd00a0e4728a1ec96b7680b5ea72d6e9ed463b7a0bba11792b3411d25ef1e26f62408eb7f8b06dc62209dbb0454c779d8858d8d59725 python-deps.patch -f635243e587b5be2c82e96d8ad11e93f99e3130765e4b9e329ff7424f685d8f7bf385de66ca2698084e95da422d55192053a45412e75915423b327f2415f581d res_nquery.patch 1c6918dd6655d3a1251bfd4af2e1c561cbb00d540a883b4c1ebf7f5de530d754d9ac07b4b5f56cdab6c511d25c8910ec94043f5733e97501a67abffe1bafaeb1 rust-lto-thin.patch b12dbff6513ac8c231d91c257a9accecc034d9ea9c31d99ca0454334ccf80fe7b50d6a356182dc46a9f25064366ea9a177f463cb2544b1cf5368ee6bd71bc095 riscv64-no-lto.patch 2518f2fc75b5db30058e0735f47d60fdf1e7adfaeee4b33fb2afb1bd9a616ce943fd88f4404d0802d4083703f4acf1d5ad42377218d025bc768807fbaf7e1609 sandbox-fork.patch diff --git a/testing/librewolf/res_nquery.patch b/testing/librewolf/res_nquery.patch deleted file mode 100644 index 1b6474a926d..00000000000 --- a/testing/librewolf/res_nquery.patch +++ /dev/null @@ -1,17 +0,0 @@ -musl doesn't have res_nquery - fall back to res_query ---- a/netwerk/dns/PlatformDNSUnix.cpp -+++ b/netwerk/dns/PlatformDNSUnix.cpp -@@ -32,11 +32,11 @@ - rv = packet.FillBuffer( - [&](unsigned char response[DNSPacket::MAX_SIZE]) -> int { - int len = 0; --#if defined(XP_LINUX) -+#if defined(__GLIBC__) - len = res_nquery(&_res, host.get(), ns_c_in, - nsIDNSService::RESOLVE_TYPE_HTTPSSVC, response, - DNSPacket::MAX_SIZE); --#elif defined(XP_MACOSX) -+#elif defined(XP_LINUX) || defined(XP_MACOSX) - len = - res_query(host.get(), ns_c_in, nsIDNSService::RESOLVE_TYPE_HTTPSSVC, - response, DNSPacket::MAX_SIZE); diff --git a/testing/libtins/APKBUILD b/testing/libtins/APKBUILD index 8241c00f381..4d41e0232c9 100644 --- a/testing/libtins/APKBUILD +++ b/testing/libtins/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=libtins pkgver=4.5 -pkgrel=0 +pkgrel=1 pkgdesc="A high-level, multiplatform C++ network packet sniffing and crafting library" url="http://libtins.github.io/" arch="all" diff --git a/testing/libvmime/APKBUILD b/testing/libvmime/APKBUILD index 80ecd5cca6f..4ac3d2b0238 100644 --- a/testing/libvmime/APKBUILD +++ b/testing/libvmime/APKBUILD @@ -1,12 +1,11 @@ # Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting> pkgname=libvmime -pkgver=0.9.2_p4 -_pkgver=${pkgver//_p/k} -pkgrel=10 +pkgver=0.9.2.175 +_commithash=d03ad5f0f6d3b2d54009ccdc7d1f7670218b263c +pkgrel=0 pkgdesc="Library for working with RFC 5322, MIME messages and IMAP/POP/SMTP" -# ftbfs -#arch="all" url="https://www.vmime.org/" +arch="all" license="GPL-3.0-only" # cmake config file isn't suitable for explicitely setting the TLS lib when it finds gnutls makedepends=" @@ -23,21 +22,23 @@ makedepends=" " checkdepends="icu-data-full" subpackages="$pkgname-dbg $pkgname-dev" -source="libvmime-$pkgver.tar.gz::https://github.com/Kopano-dev/vmime/archive/v$_pkgver.tar.gz - fix-icu-70-1.patch - gsasl-2.2.0.patch::https://github.com/kisli/vmime/commit/c750e899b8b3a76379167148468e164b7e52f6e2.patch - " +source="$pkgname-$pkgver-$_commithash.tar.gz::https://github.com/kisli/vmime/archive/$_commithash.tar.gz" + +options="!check" # test suite fails -builddir="$srcdir/vmime-$_pkgver" +builddir="$srcdir/vmime-$_commithash" -# can't build in other directory because cmake config is broken here. -# library will not exist at package time. build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi cmake -B . -G Ninja \ -DCMAKE_BUILD_TYPE=MinSizeRel \ - -DCMAKE_INSTALL_PREFIX=/usr/ \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DVMIME_BUILD_TESTS=ON \ - -DVMIME_TLS_SUPPORT_LIB=openssl + -DVMIME_TLS_SUPPORT_LIB=openssl \ + $CMAKE_CROSSOPTS . cmake --build . } @@ -47,11 +48,7 @@ check() { package() { DESTDIR="$pkgdir" cmake --install . - mv "$pkgdir/usr/cmake" "$pkgdir/usr/lib/cmake" } - sha512sums=" -90ebce51151944fe9cf09a8385b4ffe4db199c87e79579f66d70221f45a4bf4b048f3115077cff83536119af40ebe89eddacc301b54b7fb017438f44bd0f273c libvmime-0.9.2_p4.tar.gz -65c0c1ec56a9a56167bb8b18e01feee4ea65fa958f5e2f233aa13d0472a803574d8b2751b2e6011edcd1db119f91c66e2401fd4916eecbb3af04dc2e527c125c fix-icu-70-1.patch -6a07daff1b3830a913df722ed736465e8bbe022ee18b3ba1b704d58d3db16d8bbaeba5daa2e0705792b69aa2ced96b7d3c21a5e43a87b6585eaa318db069054e gsasl-2.2.0.patch +a7bf716d23f5f3af05929be31cc68dfd90fa6d3b60d01f38ebfb3c4934263745d62b5f22e654e7176f2edf36e489d3ac0feec81e0f74e7cb43afa615640c4136 libvmime-0.9.2.175-d03ad5f0f6d3b2d54009ccdc7d1f7670218b263c.tar.gz " diff --git a/testing/libvmime/fix-icu-70-1.patch b/testing/libvmime/fix-icu-70-1.patch deleted file mode 100644 index 4b362e1c834..00000000000 --- a/testing/libvmime/fix-icu-70-1.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/src/vmime/charsetConverter_icu.cpp -+++ b/src/vmime/charsetConverter_icu.cpp -@@ -413,7 +413,7 @@ -
- ucnv_toUnicode(
- m_from, &uniTarget, uniTargetLimit,
-- &uniSource, uniSourceLimit, NULL, /* flush */ FALSE, &toErr
-+ &uniSource, uniSourceLimit, NULL, /* flush */ UBool(0), &toErr
- );
-
- if (U_FAILURE(toErr) && toErr != U_BUFFER_OVERFLOW_ERROR) {
-@@ -453,7 +453,7 @@ -
- ucnv_fromUnicode(
- m_to, &cpTarget, cpTargetLimit,
-- &cpSource, cpSourceLimit, NULL, /* flush */ FALSE, &fromErr
-+ &cpSource, cpSourceLimit, NULL, /* flush */ UBool(0), &fromErr
- );
-
- if (fromErr != U_BUFFER_OVERFLOW_ERROR && U_FAILURE(fromErr)) {
-@@ -509,7 +509,7 @@ -
- ucnv_toUnicode(
- m_from, &uniTarget, uniTargetLimit,
-- &uniSource, uniSourceLimit, NULL, /* flush */ TRUE, &toErr
-+ &uniSource, uniSourceLimit, NULL, /* flush */ UBool(1), &toErr
- );
-
- if (U_FAILURE(toErr) && toErr != U_BUFFER_OVERFLOW_ERROR) {
-@@ -540,7 +540,7 @@ -
- ucnv_fromUnicode(
- m_to, &cpTarget, cpTargetLimit,
-- &cpSource, cpSourceLimit, NULL, /* flush */ TRUE, &fromErr
-+ &cpSource, cpSourceLimit, NULL, /* flush */ UBool(1), &fromErr
- );
-
- if (fromErr != U_BUFFER_OVERFLOW_ERROR && U_FAILURE(fromErr)) {
diff --git a/testing/lidarr/APKBUILD b/testing/lidarr/APKBUILD index 7d933812801..55ac591841c 100644 --- a/testing/lidarr/APKBUILD +++ b/testing/lidarr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabricio Silva <hi@fabricio.dev> # Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=lidarr -pkgver=2.1.7.4030 +pkgver=2.2.5.4141 pkgrel=0 pkgdesc="Music download automation for usenet and torrents." url="https://github.com/Lidarr/Lidarr" @@ -80,21 +80,21 @@ build() { } package() { - local DESTDIR="$pkgdir"/usr/lib/lidarr + local destdir="$pkgdir"/usr/lib/lidarr # use package_info to disable update feature - install -Dm644 "$srcdir"/package_info "$DESTDIR"/package_info - echo "PackageVersion=$pkgver-r$pkgrel" >>"$DESTDIR"/package_info + install -Dm644 "$srcdir"/package_info "$destdir"/package_info + echo "PackageVersion=$pkgver-r$pkgrel" >>"$destdir"/package_info - cp -af "$_artifacts" "$DESTDIR"/bin - chown -R "$pkgusers:$pkggroups" "$DESTDIR" + cp -af "$_artifacts" "$destdir"/bin + chown -R "$pkgusers:$pkggroups" "$destdir" install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } sha512sums=" -0f3a1ba1f0f8675c1a445e015583e443e51a0f4355df753cb2607d449e585cbded788644c7040a81b420334fcc79d61ae7755e63c1901292b7b2c847f7ba818c lidarr-2.1.7.4030.tar.gz +6bda1ea54ae0fc78e5dc2b4b944e335e3f76e8c2b4756f9875a2d931466a9de381c6276b50117ad79c7d70442af410a4cbaefb2878f47caa335dfee09864aeb6 lidarr-2.2.5.4141.tar.gz 753520379a6c5f2899b4ddfd820d5573598a32cb105f74c6fd978a3f2c98895cf709ef2d9afe2bae8c4856da86cb6a1364f5713ea7ef6a36bb21b5a5840c1471 0001-disable-restart.patch 194dce13e5220d71ffe262d40dbd1b124166f158500a420a8032279baa8f046c1772857cb7f4ab9428384481b962ff4939de0e2cdc6197f91cd35d1c0871a8e4 lidarr.initd babbb145648ad296b53271db5c642edddb9d0a5173479c4e383c48aab1d6b616c176e1ef73ae78078f41b4e6ca0e5768a96b36d844a3669f59179226ba8e97ad lidarr.confd diff --git a/testing/links-graphics/APKBUILD b/testing/links-graphics/APKBUILD index acd4f6bfb16..fd1ca8757dd 100644 --- a/testing/links-graphics/APKBUILD +++ b/testing/links-graphics/APKBUILD @@ -1,26 +1,38 @@ # Contributor: Jeremy O'Brien <neutral@fastmail.com> -# Maintainer: Jeremy O'Brien <neutral@fastmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=links-graphics pkgver=2.29 -pkgrel=0 +pkgrel=1 pkgdesc="Web browser running in both graphics and text mode" -builddir="$srcdir"/links-$pkgver url="http://links.twibright.com/" arch="all" -options="!check" # No test suite. license="GPL-2.0-or-later" +makedepends=" + bzip2-dev + jpeg-dev + libevent-dev + libpng-dev + openssl-dev + xorg-server-dev + zlib-dev + zstd-dev + " subpackages="$pkgname-doc" -makedepends="bzip2-dev openssl-dev>3 zlib-dev libevent-dev zstd-dev xorg-server-dev jpeg-dev libpng-dev" +source="http://links.twibright.com/download/links-$pkgver.tar.bz2" +builddir="$srcdir/links-$pkgver" +options="!check" # No test suite. + provides="links" provider_priority=20 -source="http://links.twibright.com/download/links-$pkgver.tar.bz2" build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ + --sysconfdir=/etc \ --mandir=/usr/share/man \ + --localstatedir=/var \ --disable-javascript \ --enable-graphics \ --with-x \ diff --git a/testing/linux-gru/APKBUILD b/testing/linux-gru/APKBUILD index a74f662ee76..7d15e4da4b7 100644 --- a/testing/linux-gru/APKBUILD +++ b/testing/linux-gru/APKBUILD @@ -4,7 +4,7 @@ _flavor=gru pkgname=linux-${_flavor} # NOTE: this kernel is intended for testing # please resist urge to upgrade it blindly -pkgver=6.8.1 +pkgver=6.8.9 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -211,8 +211,8 @@ _dev() { sha512sums=" 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068 linux-6.8.tar.xz -33ddb70a2df5ce51e23a82616e02197e4b812e0c094d0c88dd6ea6e2f00d843c2ff124fc15548e0ae3853fc1a6ea605e6b94eff7aa49a34961d7b20b7d27ff6c patch-6.8.1.xz -cb2e4b59b4eeaff3efdb90da5cd6ef6c8bb6a3dd2e1f8d8ed903ac54fab37176612e6fa085d6a7cc9cb8c7da491f1160830f3436e050a17020fe5f57bd145f71 config +89c036fac161c5df8c594d62ccc7c841ae2ea19b9e0c66cdb2a4404101e39bef765c0ccc774bd81a281ab160cdff83f3a64beac7b616eb337cdef908de10ad65 patch-6.8.9.xz +54e51ba6cef0c553a9f01af060882c4fa346743b5bef9c922cd740047e9f76d043a9756af080d8d7c0da0996abd032815bad1861b45e2f74b6bccf632b92c352 config b5a2fbc0560201b4ec1d21e890cc5290c58d0544105a5bfabfe04e76bdf54b64dc07076c40414cedb38b12687cf1ae3f773ecfcac02e3d1edd84f6ef80c951da kernel.its.gru 1653cd164857fb433c32203df8254d27c28bcf64e4bd5d0291ce95a8d7e5b48815ea6e81e32060b9a4c0cb13c302f9accc8e77451e30138669337f0d20910a76 fix-rk3399-gru-mmc-order.patch 476188e5a6967fe061293a6d5b540158869f7f09eba3b0eb651bb7948003c050aa7e419c90f3135316f2ce8c1bb4a411bd3c82cde85dddbf17d971c5198893fe fix-gru-analogix_dp_core.patch diff --git a/testing/linux-gru/config b/testing/linux-gru/config index 7420227fcf2..c9aea32c9c3 100644 --- a/testing/linux-gru/config +++ b/testing/linux-gru/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.8.1 Kernel Configuration +# Linux/arm64 6.8.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" CONFIG_CC_IS_GCC=y @@ -11,7 +11,6 @@ CONFIG_AS_VERSION=24200 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=24200 CONFIG_LLD_VERSION=0 -CONFIG_RUST_IS_AVAILABLE=y CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y @@ -599,6 +598,7 @@ CONFIG_KVM_GENERIC_MMU_NOTIFIER=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y # CONFIG_NVHE_EL2_DEBUG is not set +CONFIG_CPU_MITIGATIONS=y # # General architecture-dependent options @@ -732,6 +732,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_SIG=y # CONFIG_MODULE_SIG_FORCE is not set CONFIG_MODULE_SIG_ALL=y +# CONFIG_MODULE_SIG_SHA1 is not set CONFIG_MODULE_SIG_SHA256=y # CONFIG_MODULE_SIG_SHA384 is not set # CONFIG_MODULE_SIG_SHA512 is not set @@ -1561,7 +1562,6 @@ CONFIG_BT_RFCOMM=m # CONFIG_BT_RFCOMM_TTY is not set # CONFIG_BT_BNEP is not set CONFIG_BT_HIDP=m -CONFIG_BT_HS=y CONFIG_BT_LE=y # CONFIG_BT_LE_L2CAP_ECRED is not set # CONFIG_BT_LEDS is not set diff --git a/testing/linux-sophgo/APKBUILD b/testing/linux-sophgo/APKBUILD index 73cb04ad5e5..5abc674abf3 100644 --- a/testing/linux-sophgo/APKBUILD +++ b/testing/linux-sophgo/APKBUILD @@ -2,8 +2,11 @@ _flavor=sophgo pkgname=linux-$_flavor -pkgver=6.1.80_git20240328 -_commit=83ab3eda46e651464f2715455ae66711882be116 +pkgver=6.1.90 +case $pkgver in + *.*.*) _kernver=${pkgver%.*};; + *.*) _kernver=$pkgver;; +esac pkgrel=0 arch=riscv64 pkgdesc="Linux Sophgo kernel" @@ -15,11 +18,56 @@ makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any diffutils findutils zstd pahole python3 gcc>=13.1.1_git20230624" options="!strip !check" license="GPL-2.0-only" -source="$pkgname-$pkgver.tar.gz::https://github.com/sophgo/linux-riscv/archive/$_commit.tar.gz +source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz + https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz + https://dev.alpinelinux.org/archive/sophgo-patches/sophgo-$pkgver-alpine.patch sophgo.riscv64.config " -builddir="$srcdir"/linux-riscv-$_commit -arch=riscv64 +builddir="$srcdir"/linux-$_kernver + +prepare() { + local _patch_failed= + cd "$srcdir"/linux-$_kernver + if [ "${pkgver%.0}" = "$pkgver" ]; then + msg "Applying patch-$pkgver.xz" + unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N + fi + + # first apply patches in specified order + for i in $source; do + case $i in + *.patch) + msg "Applying $i..." + if ! patch -s -p1 -N -i "$srcdir"/${i##*/}; then + echo $i >>failed + _patch_failed=1 + fi + ;; + esac + done + + if ! [ -z "$_patch_failed" ]; then + error "The following patches failed:" + cat failed + return 1 + fi + + # remove localversion from patch if any + rm -f localversion* + + local flavor= + for flavor in $_flavors; do + local _builddir="$srcdir"/build-$flavor.$CARCH + mkdir -p "$_builddir" + echo "-$pkgrel-$flavor" > "$_builddir"/localversion-alpine + _genconfig $flavor + make -C "$srcdir"/linux-$_kernver \ + O="$_builddir" \ + ARCH="$_carch" \ + olddefconfig + _verifyconfig $flavor + done +} build() { unset LDFLAGS CFLAGS CPPFLAGS CXXFLAGS @@ -145,6 +193,8 @@ dev() { "$subpkgdir"/lib/modules/"$_abi_release"/build } sha512sums=" -24a4f4ec9857fcca62b43b0bc62a0ec3b4fb361308fd98075a9f8ba976c10f43add551482a03d27a381b688698fc0a7435d307b015d024c7c18f13d4d040de05 linux-sophgo-6.1.80_git20240328.tar.gz +6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 linux-6.1.tar.xz +d7df5d40a61204a31056e152cc4841a3ff9390e356d4b9f73eca496a1a57f2278c2b2341e4f95e0416bb80c81d4251acc4527c1a3b819baf225174cf8f24c562 patch-6.1.90.xz +54b5149ddb17396b127b0d5d5595fa5301bcbb68c7a0c5e95b6e4e4d7e2e59f2dd17e5dc20b5e8756644f5d9df89cbec7227e9136c197845fe1d7597cec33709 sophgo-6.1.90-alpine.patch c06c0822898247a247bdb6cc9ebe954c1edd15376fe8ffc2c595dfd1cb2e7b63cf52b7a25fc0227b6f9681d546d690134b43e2d3bfb972e6b65696b0ff45e188 sophgo.riscv64.config " diff --git a/testing/linux-starfive/APKBUILD b/testing/linux-starfive/APKBUILD index 881fc9535c2..1f156653cd3 100644 --- a/testing/linux-starfive/APKBUILD +++ b/testing/linux-starfive/APKBUILD @@ -2,7 +2,7 @@ _flavor=starfive pkgname=linux-${_flavor} -pkgver=6.8.4 +pkgver=6.8.9 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -245,7 +245,7 @@ echo "***********************************" sha512sums=" 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068 linux-6.8.tar.xz -d1ad67a5eea41159d0eac0b236a733e53a9df67b58296e832e8fdf1064a5b55708a7901c294a765765b6c90f6b115f045f55b4500a4a2a3b11c8999e32bf8214 patch-6.8.4.xz -236ef08923d0698e129d543955ee8cf84b4234385331cd1bed1b8f6acf24aac7f08178cedfe8716a9382acc72feb61036ee1430ffed87e48433ca9690646c200 config-starfive.riscv64 +89c036fac161c5df8c594d62ccc7c841ae2ea19b9e0c66cdb2a4404101e39bef765c0ccc774bd81a281ab160cdff83f3a64beac7b616eb337cdef908de10ad65 patch-6.8.9.xz +89a944966844af282da0728c7e092627acf665f1fb409cbe3ab180cf08662f33094d87208711e90df4b2e39ca7e7c8b50bcc0163ab2292c0f972ad910693c6ec config-starfive.riscv64 6031bfd1d002e7e12a32ca7d0f91ed642045c2ff205a8c256d9818cd16688c8ca44bd22fec4daa345b896cc86744efb19d41711a6c14241baddd2b19ff3bc6a9 aurel32.6.7.y.patch " diff --git a/testing/linux-starfive/config-starfive.riscv64 b/testing/linux-starfive/config-starfive.riscv64 index 148d1f0ca5a..b05c646de29 100644 --- a/testing/linux-starfive/config-starfive.riscv64 +++ b/testing/linux-starfive/config-starfive.riscv64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.8.4 Kernel Configuration +# Linux/riscv 6.8.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" CONFIG_CC_IS_GCC=y @@ -458,6 +458,7 @@ CONFIG_CPUFREQ_DT_PLATDEV=y # CONFIG_VIRTUALIZATION is not set CONFIG_ARCH_SUPPORTS_ACPI=y # CONFIG_ACPI is not set +CONFIG_CPU_MITIGATIONS=y # # General architecture-dependent options diff --git a/testing/listenbrainz-mpd/APKBUILD b/testing/listenbrainz-mpd/APKBUILD index 9af9bb61f1d..b6bde336fcc 100644 --- a/testing/listenbrainz-mpd/APKBUILD +++ b/testing/listenbrainz-mpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=listenbrainz-mpd -pkgver=2.3.4 +pkgver=2.3.5 pkgrel=0 pkgdesc="ListenBrainz submission client for MPD written in Rust" url="https://codeberg.org/elomatreb/listenbrainz-mpd" @@ -44,5 +44,5 @@ package() { } sha512sums=" -d2523b9194e992fa6c50e9819adbb462e9f5b2921ef1cc9b2680a3dcd38f72e80f5eab123363f33ebd7ff044cf6519bbee9ff270d1bdbc8d64046005d7431b8d listenbrainz-mpd-2.3.4.tar.gz +d7a590a07646e7384b7f4a557163b16fc210d36a6343ee3d79b4a113e22a16bb2a09abc428deac7279a5a9c5461587da74e7e45ddc014faa17674e1093d1dca4 listenbrainz-mpd-2.3.5.tar.gz " diff --git a/testing/lizardfs/APKBUILD b/testing/lizardfs/APKBUILD index 2cbde1fa54d..b9ab14c9e29 100644 --- a/testing/lizardfs/APKBUILD +++ b/testing/lizardfs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Pirogov <vbnet.ru@gmail.com> pkgname=lizardfs pkgver=3.13.0 -pkgrel=12 +pkgrel=13 pkgdesc="Highly reliable, scalable and efficient distributed file system" url="https://github.com/lizardfs/lizardfs/" arch="all" diff --git a/testing/logwatch/APKBUILD b/testing/logwatch/APKBUILD index 1d8c4164117..d836cedbaf1 100644 --- a/testing/logwatch/APKBUILD +++ b/testing/logwatch/APKBUILD @@ -2,13 +2,23 @@ # Maintainer: Valery Kartel <valery.kartel@gmail.com> pkgname=logwatch pkgver=7.10 -pkgrel=0 +pkgrel=1 pkgdesc="Customizable, pluggable log-monitoring system" url="https://sourceforge.net/projects/logwatch/" arch="noarch" license="MIT" options="!check" -depends="perl" +# perl-doc: diagnostic data used by sendmail script +# perl-date-manip: enables use of full --range of dates +# perl-html-parser: HTML::Entities used in logwatch.pl +# perl-net-cidr: needed when iptables_list_by_cidr_mask env var is set +depends=" + perl + perl-doc + perl-date-manip + perl-html-parser + perl-net-cidr + " subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/project/logwatch/logwatch-$pkgver/logwatch-$pkgver.tar.gz" diff --git a/testing/lomiri-app-launch/0001-liblomiri-app-launch-jobs-posix.cpp-pass-more-enviro.patch b/testing/lomiri-app-launch/0001-liblomiri-app-launch-jobs-posix.cpp-pass-more-enviro.patch index 276df5b4445..01358c18ff3 100644 --- a/testing/lomiri-app-launch/0001-liblomiri-app-launch-jobs-posix.cpp-pass-more-enviro.patch +++ b/testing/lomiri-app-launch/0001-liblomiri-app-launch-jobs-posix.cpp-pass-more-enviro.patch @@ -1,27 +1,28 @@ -From 9ae05ed4263e0c61724e2613101f89759d1b1f09 Mon Sep 17 00:00:00 2001 +From 57874224cd52b59568def736c45a7f16a5283f4c Mon Sep 17 00:00:00 2001 From: Brandon Boese <brandonboese@protonmail.com> -Date: Thu, 14 Mar 2024 19:38:29 -0400 +Date: Thu, 14 Mar 2024 20:56:04 -0400 Subject: [PATCH] liblomiri-app-launch/jobs-posix.cpp: pass more environment variables --- - liblomiri-app-launch/jobs-posix.cpp | 3 +++ - 1 file changed, 3 insertions(+) + liblomiri-app-launch/jobs-posix.cpp | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/liblomiri-app-launch/jobs-posix.cpp b/liblomiri-app-launch/jobs-posix.cpp -index e1639fe..f5b9518 100644 +index e1639fe..1ced23d 100644 --- a/liblomiri-app-launch/jobs-posix.cpp +++ b/liblomiri-app-launch/jobs-posix.cpp -@@ -211,6 +211,9 @@ std::shared_ptr<Application::Instance> POSIX::launch( +@@ -211,6 +211,10 @@ std::shared_ptr<Application::Instance> POSIX::launch( { copyEnvByPrefix("QT_", env); copyEnvByPrefix("XDG_", env); + copyEnv("HOME", env); + copyEnv("DISPLAY", env); + copyEnv("WAYLAND_DISPLAY", env); ++ copyEnv("UITK_ICON_THEME", env); /* If we're in Lomiri we don't want to pass it's platform, we want * an application platform. */ -- -2.43.2 +2.42.0 diff --git a/testing/lomiri-app-launch/APKBUILD b/testing/lomiri-app-launch/APKBUILD index 71bc7b558fa..2c7cbd2bf7f 100644 --- a/testing/lomiri-app-launch/APKBUILD +++ b/testing/lomiri-app-launch/APKBUILD @@ -1,9 +1,9 @@ -# Maintainer: Luca Weiss <luca@z3ntu.xyz> # Contributor: Bart Ribbers <bribbers@disroot.org> # Contributor: Antoni Aloy <aaloytorrens@gmail.com> +# Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=lomiri-app-launch pkgver=0.1.9 -pkgrel=1 +pkgrel=2 pkgdesc="User space daemon for launching applications" arch="all" url="https://gitlab.com/ubports/development/core/lomiri-app-launch" @@ -64,5 +64,5 @@ package() { sha512sums=" b00ae1009f9b10126d9d9abc4961d9315e6d1fa086e9c010cf752826a166cb2aa9a3f3aa915900ee1156081e409f3df93be970c23c9e5a31f8ab2fa2b9bbf6c9 lomiri-app-launch-0.1.9.tar.gz -e8228226e3b4436333dd74869167417a0deaaf9c9c3e62a8b07c7478ccadb44d232320da6389e4aeba737f93adb7b348d077e694410d4d225d9b888a947eb98b 0001-liblomiri-app-launch-jobs-posix.cpp-pass-more-enviro.patch +28da576336d151e3d79137164b80201499f2a020fe7a17925ed604d4aaa0e3e89aa0e1f512aee61ae002fbf48c1a80de65d8acf5f78ba86a506696d4fb2d5718 0001-liblomiri-app-launch-jobs-posix.cpp-pass-more-enviro.patch " diff --git a/testing/lomiri-download-manager/APKBUILD b/testing/lomiri-download-manager/APKBUILD index 9d84a0b05f1..10af07359c2 100644 --- a/testing/lomiri-download-manager/APKBUILD +++ b/testing/lomiri-download-manager/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Antoni Aloy <aaloytorrens@gmail.com> pkgname=lomiri-download-manager pkgver=0.1.3 -pkgrel=0 +pkgrel=1 pkgdesc="Provides a service for downloading files while an application is suspended" arch="all" url="https://gitlab.com/ubports/development/core/lomiri-download-manager" diff --git a/testing/lomiri-history-service/APKBUILD b/testing/lomiri-history-service/APKBUILD index bc4d7102f25..e1e792024af 100644 --- a/testing/lomiri-history-service/APKBUILD +++ b/testing/lomiri-history-service/APKBUILD @@ -2,27 +2,27 @@ # Contributor: Brandon Boese <brandonboese@protonmail.com> pkgname=lomiri-history-service pkgver=0.4 -pkgrel=0 +pkgrel=1 pkgdesc="Service that provides call log and conversation history" url="https://gitlab.com/ubports/development/core/history-service" arch="all" license="GPL-3.0-only" depends=" - libphonenumber-dev - qt5-qtbase-dev qt5-qtbase-sqlite - qt5-qtdeclarative-dev - qt5-qtpim-dev - sqlite-dev telepathy-mission-control - telepathy-qt-dev " makedepends=" cmake cmake-extras dconf + libphonenumber-dev libqtdbustest + qt5-qtbase-dev + qt5-qtdeclarative-dev + qt5-qtpim-dev samurai + sqlite-dev + telepathy-qt-dev " checkdepends=" dbus-test-runner diff --git a/testing/lomiri-thumbnailer/APKBUILD b/testing/lomiri-thumbnailer/APKBUILD index 1f5cadf7dff..0b868377d30 100644 --- a/testing/lomiri-thumbnailer/APKBUILD +++ b/testing/lomiri-thumbnailer/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Brandon Boese <brandonboese@protonmail.com> pkgname=lomiri-thumbnailer pkgver=3.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="D-Bus service for out of process thumbnailing" url="https://gitlab.com/ubports/development/core/lomiri-thumbnailer" arch="all" diff --git a/testing/lpac/APKBUILD b/testing/lpac/APKBUILD new file mode 100644 index 00000000000..5d940d9bf12 --- /dev/null +++ b/testing/lpac/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Luca Weiss <luca@z3ntu.xyz> +# Maintainer: Luca Weiss <luca@z3ntu.xyz> +pkgname=lpac +pkgver=2.0.1 +pkgrel=0 +pkgdesc="C-based eUICC LPA" +url="https://github.com/estkme-group/lpac" +# x86: textrels +arch="all !x86" +license="AGPL-3.0-only AND LGPL-2.0-only AND MIT" +makedepends=" + cmake + curl-dev + pcsc-lite-dev + samurai + " +subpackages="$pkgname-dbg" +source="$pkgname-$pkgver.tar.gz::https://github.com/estkme-group/lpac/archive/refs/tags/v$pkgver.tar.gz" +options="!check" # no tests + +build() { + cmake -B build -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_RPATH=/usr/lib/lpac + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} + +sha512sums=" +8c4981bba9d32b86321b425455b08ed7e44d0a7e4fed8761adc17dec36768b879ad30015b727d750705f29ed405f2c22edd5aa43d7527a20ceb7ad25f9e71a15 lpac-2.0.1.tar.gz +" diff --git a/testing/lua-language-server/APKBUILD b/testing/lua-language-server/APKBUILD index 1f76228ed57..0d0eab3cbf6 100644 --- a/testing/lua-language-server/APKBUILD +++ b/testing/lua-language-server/APKBUILD @@ -1,19 +1,18 @@ # Maintainer: Jordan Christiansen <xordspar0@gmail.com> pkgname=lua-language-server -pkgver=3.7.4 +pkgver=3.8.3 pkgrel=0 pkgdesc="Language Server for Lua" url="https://github.com/LuaLS/lua-language-server" # s390x/ppc64le: ftbfs -# 32-bit: not useful there -arch="all !x86 !armhf !armv7 !s390x !ppc64le" +arch="all !s390x !ppc64le" license="MIT" makedepends="bash linux-headers samurai" +subpackages="$pkgname-doc" source="https://github.com/LuaLS/lua-language-server/archive/refs/tags/$pkgver/lua-language-server-$pkgver.tar.gz lua-language-server-submodules-$pkgver.zip.noauto::https://github.com/LuaLS/lua-language-server/releases/download/$pkgver/lua-language-server-$pkgver-submodules.zip wrapper " -options="!check" # tests run in build prepare() { unzip -o "$srcdir"/lua-language-server-submodules-$pkgver.zip.noauto \ @@ -23,7 +22,11 @@ prepare() { build() { ninja -C 3rd/luamake -f compile/ninja/linux.ninja - ./3rd/luamake/luamake rebuild + ./3rd/luamake/luamake all +} + +check() { + ./3rd/luamake/luamake unit-test } package() { @@ -35,10 +38,12 @@ package() { install -Dm644 debugger.lua main.lua \ -t "$pkgdir"/usr/lib/lua-language-server cp -a locale meta script "$pkgdir"/usr/lib/lua-language-server + + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } sha512sums=" -1efaa72b597bd3be7da9c7d4ef57163621a75fcd933fae8407df0fda4a2014c810fc149326ce30e325cc122c942444ef8cc7c4f29454653b172931560a33372c lua-language-server-3.7.4.tar.gz -29894c4c01eeb03c5c474a3e353f47a4033ee3dad145be601b15c905a2a117363a4c3c810b976668002ffb968452ad30a019b606ab40387db35cf9e7f5f042b5 lua-language-server-submodules-3.7.4.zip.noauto +d9335aef8fe36e6369aa32f042d521ea9234e2c1354e4731aa58003f9c81b3392b8315cd35a69ec980224647cc74e26216ab399a1a3a079d96a5351868a75492 lua-language-server-3.8.3.tar.gz +3f2bc7369c66f71556a45004d30b0d9926bf2b6ef692068dcbd347393b9e6599a503ee5fde9682fce870c556b88c1af3a5c9e0cd10b2c8f80341b0b3368a048d lua-language-server-submodules-3.8.3.zip.noauto d8d34d2ae8073c256b5f98f4cc7db058fbb92d63a5709894fca898ab47fcfcfca2d1419a1060c29464fbad937e3d09f0cde404b4d98609eec934ea4392044849 wrapper " diff --git a/testing/lua-resty-openssl/APKBUILD b/testing/lua-resty-openssl/APKBUILD index e2a5b4f9f93..0a10d00ea09 100644 --- a/testing/lua-resty-openssl/APKBUILD +++ b/testing/lua-resty-openssl/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.8.22 pkgrel=0 pkgdesc="FFI-based OpenSSL binding for OpenResty" url="https://github.com/fffonion/lua-resty-openssl" -# ppc64le, riscv64: no luajit/openresty +# ppc64le, riscv64, loongarch64: no luajit/openresty # armhf, armv7, s390x, x86: failing tests arch="aarch64 x86_64" license="BSD-2-Clause" diff --git a/testing/lua-resty-redis/APKBUILD b/testing/lua-resty-redis/APKBUILD index b902f843e71..f72651f9b57 100644 --- a/testing/lua-resty-redis/APKBUILD +++ b/testing/lua-resty-redis/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.29 pkgrel=0 pkgdesc="Lua redis client driver for the ngx_lua based on the cosocket API" url="https://github.com/openresty/lua-resty-redis" -arch="noarch !riscv64 !ppc64le" # blocked by luajit +arch="noarch !riscv64 !ppc64le !loongarch64" # blocked by luajit license="BSD-2-Clause" depends="luajit" source="https://github.com/openresty/lua-resty-redis/archive/v$pkgver/lua-resty-redis-$pkgver.tar.gz" diff --git a/testing/lua-resty-upload/APKBUILD b/testing/lua-resty-upload/APKBUILD index 6b8bc503b1c..5ad7caf7dcd 100644 --- a/testing/lua-resty-upload/APKBUILD +++ b/testing/lua-resty-upload/APKBUILD @@ -4,8 +4,8 @@ pkgver=0.11 pkgrel=0 pkgdesc="Streaming reader and parser for HTTP file uploading based on ngx_lua cosocket" url="https://github.com/openresty/lua-resty-upload" -# riscv64, ppc64le: no luajit -arch="all !riscv64 !ppc64le" +# riscv64, ppc64le, loongarch64: no luajit +arch="all !riscv64 !ppc64le !loongarch64" license="BSD-2-Clause" depends="luajit" source="https://github.com/openresty/lua-resty-upload/archive/v$pkgver/lua-resty-upload-$pkgver.tar.gz" diff --git a/testing/lua-xml/APKBUILD b/testing/lua-xml/APKBUILD index 0e57ff24bbe..38887c7de0c 100644 --- a/testing/lua-xml/APKBUILD +++ b/testing/lua-xml/APKBUILD @@ -14,7 +14,7 @@ source="https://github.com/lubyk/$_rockname/archive/REL-$pkgver/lua-xml-$pkgver. builddir="$srcdir/$_rockname-REL-$pkgver" case "$CARCH" in -ppc64le|riscv64) +ppc64le|riscv64|loongarch64) # blocked by luajit options="$options !check" ;; diff --git a/testing/lychee/APKBUILD b/testing/lychee/APKBUILD new file mode 100644 index 00000000000..27ba51e138d --- /dev/null +++ b/testing/lychee/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: Orhun Parmaksız <orhunparmaksiz@gmail.com> +# Maintainer: Orhun Parmaksız <orhunparmaksiz@gmail.com> +pkgname=lychee +pkgver=0.15.1 +pkgrel=0 +pkgdesc="Fast, async, resource-friendly link checker written in Rust" +url=https://lychee.cli.rs +# !s390x !armhf !riscv64: openssl fails to build +arch="all !s390x !armhf !riscv64" +license="MIT OR Apache-2.0" +makedepends=" + cargo + cargo-auditable + perl + make + pkgconf + " +subpackages="$pkgname-doc" +options="net" +source="$pkgname-$pkgver.tar.gz::https://github.com/lycheeverse/lychee/archive/v$pkgver/lychee-$pkgver.tar.gz" + +prepare() { + default_prepare + cargo fetch --target="$CTARGET" --locked +} + +build() { + cargo auditable build --frozen --release --features vendored-openssl +} + +check() { + cargo test --features vendored-openssl -- --test-threads 1 +} + +package() { + install -Dm 755 "target/release/$pkgname" -t "$pkgdir/usr/bin" + install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname" + install -Dm 644 LICENSE-MIT -t "$pkgdir/usr/share/licenses/$pkgname" +} + +sha512sums=" +642d0a35461e6fd2e22d518e984767fb54425f0b03b5b2ee5ccf019f91ec0fb5668231f54311c10140e96be13bb4cc2d1ef1be4c74b062992d46e6b3a54a0084 lychee-0.15.1.tar.gz +" diff --git a/testing/ma1sd/APKBUILD b/testing/ma1sd/APKBUILD index b94026dbb99..cfcb51ed9d6 100644 --- a/testing/ma1sd/APKBUILD +++ b/testing/ma1sd/APKBUILD @@ -2,13 +2,15 @@ # Maintainer: pkgname=ma1sd pkgver=2.5.0 -pkgrel=2 +pkgrel=3 pkgdesc="Federated Matrix Identity Server" url="https://github.com/ma1uta/ma1sd/" arch="noarch !riscv64" # openjdk8-jre missing license="AGPL-3.0-or-later" install="$pkgname.pre-install" depends="java-jre-headless" +# Fix java-jre-headless not autoselected +makedepends="openjdk8-jre" subpackages="$pkgname-openrc" source="$pkgname-$pkgver.tar::https://github.com/ma1uta/ma1sd/releases/download/$pkgver/ma1sd-shadow.tar ma1sd.initd @@ -26,6 +28,6 @@ package() { sha512sums=" f686195ace341fbafd2877e875bc8823c5b0be9903440a8f7561dfc743b493e5aa148ada7b29f659b505ae7f6c3a02f367bb235ea65b2d48aafcc5f81b8d1e0c ma1sd-2.5.0.tar -4225641b2c7dcaa18ee5ee9a544c4299c6cb11b263da007e101f44394d90aeea86e98b273526bdf121f370d4cf60290d72a9364f953ced0ec9d5deb4da96bd13 ma1sd.initd +8be8b1e6425d9cefc1c871448c62069078079b0da8c7760c6d1ce8eec9807be7fb0c628e7c303ca3559d9571b9ebae3bd0bd6582829c63f80befcd9edfc0c862 ma1sd.initd 7c3cef61c4d414903ea68de83127c21503875a39a5b4408747862479e8107bf3e6f454af0f1d096d5f69f3524fca9d3802e812d9e81576c271e109e048473bd5 ma1sd.confd " diff --git a/testing/ma1sd/ma1sd.initd b/testing/ma1sd/ma1sd.initd index a815c0f1b30..81eff89a825 100644 --- a/testing/ma1sd/ma1sd.initd +++ b/testing/ma1sd/ma1sd.initd @@ -10,7 +10,7 @@ description="Daemon for ma1sd, the federated Matrix identity server" command="/usr/bin/ma1sd" command_args="-c $config $command_args" -depends() { +depend() { need net } diff --git a/testing/makeclapman/APKBUILD b/testing/makeclapman/APKBUILD new file mode 100644 index 00000000000..76c2ab70ff3 --- /dev/null +++ b/testing/makeclapman/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: Sean E. Russell <ser@ser1.net> +# Maintainer: Sean E. Russell <ser@ser1.net> +pkgname=makeclapman +pkgver=2.4.1 +pkgrel=0 +pkgdesc="makeclapman generates man page(s) from programs that use the Go Claptrap flags library." +url="https://hg.sr.ht/~ser/claphelp" +arch="all" +license="BSD-3-Clause" +options="net" +makedepends="go" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://hg.sr.ht/~ser/claphelp/archive/v$pkgver.tar.gz" +builddir="$srcdir/claphelp-v$pkgver" +_pkgdate=2024-05-03 # The tag date, for the manpage + +build() { + go build -ldflags "-X main.Version=$pkgver" -v ./cmd/makeclapman + + mkdir man1 + CLAPTRAP_USAGE_JSON=true ./makeclapman | ./makeclapman -d man1 \ + --version $pkgver \ + --date $_pkgdate \ + --author "Sean E. Russell" \ + --description "makeclapman generates man page(s) from programs that use the Claptrap library. To use it, call the program with the environment variable CLAPTRAP_USAGE_JSON set and pipe the output to makeclapman. For example, + +CLAPTRAP_USAGE_JSON=true yourprog | makeclapman" +} + +check() { + [ "$(./makeclapman version)" = "$pkgver" ] +} + +package() { + install -Dm755 makeclapman -t "$pkgdir"/usr/bin/ + install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/"$pkgname"/ + install -Dm644 man1/* -t "$pkgdir"/usr/share/man/man1/ +} + +sha512sums=" +2965680dce3903c119b6c887356dee8e5991433e6ace60ded22b20d7effea30ff00df11a2b67be5958a4fe64aec9732a81c8c8eb52e96285953fa50c3768cd30 makeclapman-2.4.1.tar.gz +" diff --git a/testing/mapserver/20-libxml.patch b/testing/mapserver/20-libxml.patch new file mode 100644 index 00000000000..b8d54c40754 --- /dev/null +++ b/testing/mapserver/20-libxml.patch @@ -0,0 +1,50 @@ +From 2cea5a12a35b396800296cb1c3ea08eb00b29760 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Sat, 18 Nov 2023 22:13:46 +0100 +Subject: [PATCH] Fix compilation errors with libxml2 2.12 + +--- + mapows.c | 2 +- + mapwcs.cpp | 2 +- + mapwcs20.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mapows.c b/mapows.c +index 734f432d3..6686ce3e4 100644 +--- a/mapows.c ++++ b/mapows.c +@@ -168,7 +168,7 @@ static int msOWSPreParseRequest(cgiRequestObj *request, + #endif + if (ows_request->document == NULL + || (root = xmlDocGetRootElement(ows_request->document)) == NULL) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + msSetError(MS_OWSERR, "XML parsing error: %s", + "msOWSPreParseRequest()", error->message); + return MS_FAILURE; +diff --git a/mapwcs.cpp b/mapwcs.cpp +index 5459f5bb1..817c8a784 100644 +--- a/mapwcs.cpp ++++ b/mapwcs.cpp +@@ -362,7 +362,7 @@ static int msWCSParseRequest(cgiRequestObj *request, wcsParamsObj *params, mapOb + /* parse to DOM-Structure and get root element */ + if((doc = xmlParseMemory(request->postrequest, strlen(request->postrequest))) + == NULL) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + msSetError(MS_WCSERR, "XML parsing error: %s", + "msWCSParseRequest()", error->message); + return MS_FAILURE; +diff --git a/mapwcs20.cpp b/mapwcs20.cpp +index fd69e23e8..4c1f76083 100644 +--- a/mapwcs20.cpp ++++ b/mapwcs20.cpp +@@ -1446,7 +1446,7 @@ int msWCSParseRequest20(mapObj *map, + + /* parse to DOM-Structure and get root element */ + if(doc == NULL) { +- xmlErrorPtr error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + msSetError(MS_WCSERR, "XML parsing error: %s", + "msWCSParseRequest20()", error->message); + return MS_FAILURE; diff --git a/testing/mapserver/APKBUILD b/testing/mapserver/APKBUILD index 70ad25fd488..1c579db8eec 100644 --- a/testing/mapserver/APKBUILD +++ b/testing/mapserver/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bjoern Schilberg <bjoern@intevation.de> pkgname=mapserver pkgver=8.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="CGI-based platform for publishing spatial data and interactive mapping applications to the web" url="https://mapserver.org/" # s390x: blocked by exempi-dev @@ -38,6 +38,7 @@ subpackages=" source=" https://download.osgeo.org/mapserver/mapserver-$pkgver.tar.gz 10-musl.patch + 20-libxml.patch " build() { @@ -78,4 +79,5 @@ package() { sha512sums=" dae14a7eb6b09f5461c19bff83ca8ed6c21ae84d451b2c854794efb25b144b7edbf2a33479dc53e78aa646e5196e81219b4a1f393ff824db4508204a2d0301d1 mapserver-8.0.1.tar.gz 12743afabee45bc77788b699cfc8ac50cf11629e0041b7b9aac3ba1c966d14fa0280044b72ac1b7520e99124d9b4627a6b5d005a486ae9ad03bc86b0775ad547 10-musl.patch +e48aeabe8e96b8fb20006672812441218c7b8ff7f765e03c36a5a6a1a8196b847df8d8d18b9164d090cf574a9c7226e4512686773345686be2f0b2819aa4a50a 20-libxml.patch " diff --git a/testing/mattermost-desktop/APKBUILD b/testing/mattermost-desktop/APKBUILD index 47eb9dbaf4f..35ec8ad5a14 100644 --- a/testing/mattermost-desktop/APKBUILD +++ b/testing/mattermost-desktop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=mattermost-desktop pkgver=5.7.0 -pkgrel=0 +pkgrel=1 _pkgver="${pkgver/_rc/-rc.}" pkgdesc="Open source collaboration for developers" url="https://mattermost.com/" diff --git a/testing/mautrix-discord/APKBUILD b/testing/mautrix-discord/APKBUILD index 491c0f2e533..0f2260f36d2 100644 --- a/testing/mautrix-discord/APKBUILD +++ b/testing/mautrix-discord/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=mautrix-discord pkgver=0.6.5 -pkgrel=2 +pkgrel=3 pkgdesc="Matrix-Discord puppeting bridge" url="https://go.mau.fi/mautrix-discord/" arch="all" @@ -50,7 +50,7 @@ package() { sha512sums=" b52bc3a963c52970a6af334e985b959efc04e3181cac6d2c1f404b06ee94d19a2ed4a7edfcbe2248eb2ee5196e19f917c9451326593fc5b95724bdc7dd6fd936 mautrix-discord-0.6.5.tar.gz -772c39fd22eccf4116ebe0b496a055a2807ef3b500a7bbc8838e2fc1fef8b05e20be80b7e7b515304914ca244349093a21cdcf42b2e6dd0bcbd45fef3358fd89 mautrix-discord.initd +1d5dd1ab6fb9ef88466ea60af8fa271e2f46d9ec71f0d0404c92edab70f4fc348a9f9ba696d2e90eb4a21436070f6ba2cc80631a025214829e06a7124a43ccbd mautrix-discord.initd 46c472289880a631389dbc7f40062858f7a11e2987f1183cb16d426aa50f57d4b57e4857e4f9852b1c930fc03ccf304bcd27a452681a570e97ec8174808cbf01 mautrix-discord.confd f2317ccd91959c2d6b6937ab09bbcb5e2472847c5b880c4a37a4dd96784705a503a5cfcb183017656d716dfceabbc55c33d1083f1cb26c7964bf6dd4dd57f364 default-log-dir.patch " diff --git a/testing/mautrix-discord/mautrix-discord.initd b/testing/mautrix-discord/mautrix-discord.initd index b5d33392208..6e342c3dcce 100644 --- a/testing/mautrix-discord/mautrix-discord.initd +++ b/testing/mautrix-discord/mautrix-discord.initd @@ -10,7 +10,7 @@ description="Daemon for Mautrix-Discord, a Matrix-Discord puppeting bridge" command="/usr/bin/mautrix-discord" command_args="-c $config $command_args" -depends() { +depend() { need net } diff --git a/testing/mautrix-gmessages/APKBUILD b/testing/mautrix-gmessages/APKBUILD index 459665c403a..50791b97cd7 100644 --- a/testing/mautrix-gmessages/APKBUILD +++ b/testing/mautrix-gmessages/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=mautrix-gmessages pkgver=0.4.0 -pkgrel=0 +pkgrel=1 pkgdesc="Matrix-Google Messages puppeting bridge" url="https://go.mau.fi/mautrix-gmessages/" arch="all" @@ -49,7 +49,7 @@ package() { sha512sums=" 5155910eff8f5da6f28ab264439dd1990eb07116f25744f4681e41c9bb794ae73ef997760193e439674c55bcb26c5d457c1c07b2e9b277afd61c07aed6a0b10f mautrix-gmessages-0.4.0.tar.gz -4d8d9752b97a64b1b0d97031aced7d202f9bf3462d1362a137853987de6b870b5f8a599943b63b730024ca477665f27f611090ac8c03e5fc24b5ed719d589e0a mautrix-gmessages.initd +ed957641bdc1c56f7bea90db0fe4b845e5823323801033c710706116a9a06f98f2a808b8daa244f04b78676d595f12822040ff0b0863457a05222aac0c76750b mautrix-gmessages.initd 3332b10948fc07845b3b9a775bbb01057d2e6c768e25b429a451dbfb668195eb9f2c1d6b435a944aa7e5618b6ae609fb16e471696176fe3ae0768dffec6618e5 mautrix-gmessages.confd 336298e0506bb3056733499098c291376e1777a24c994bdb92e4b2d62e954a59cddb66e60ce04100a86bc9ef4b7eb95353e003f9a3db2971040b72c9df0cc21b default-log-dir.patch " diff --git a/testing/mautrix-gmessages/mautrix-gmessages.initd b/testing/mautrix-gmessages/mautrix-gmessages.initd index 6d8804b63fc..dd4eb6cf1e8 100644 --- a/testing/mautrix-gmessages/mautrix-gmessages.initd +++ b/testing/mautrix-gmessages/mautrix-gmessages.initd @@ -10,7 +10,7 @@ description="Daemon for Mautrix-GMessages, a Matrix-Google Messages puppeting br command="/usr/bin/mautrix-gmessages" command_args="-c $config $command_args" -depends() { +depend() { need net } diff --git a/testing/mautrix-meta/APKBUILD b/testing/mautrix-meta/APKBUILD index 9334f19e271..d23b6d89eb4 100644 --- a/testing/mautrix-meta/APKBUILD +++ b/testing/mautrix-meta/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=mautrix-meta pkgver=0.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Matrix-Facebook Messenger and Instagram DM puppeting bridge" url="https://go.mau.fi/mautrix-meta/" arch="all" @@ -45,7 +45,7 @@ package() { sha512sums=" 099c105ad8834f585215d0d9e3db16c1fe6d6064fe480b944e895527e44c069623f7667db8e84f90004df72dd49bdd1e1359b46e7987814e7c41a0b344ec3a67 mautrix-meta-0.3.0.tar.gz -9b870d61aa277ae3434df0167b64bb7cdff8f29bd3493f305cef40e2c132089a9a106d30161e81ec76a09c608c652caf83e1c3d481589cdf4f4791965d9fe435 mautrix-meta.initd +c607f0071c03d7c72df3950ac2a8b50aafec9cbe9972d1da7adcb79ce65942fc44faa9574e38843a83eae5fb9b1c84b31510ea5566a3c4d7f813d0bb41ab9cd6 mautrix-meta.initd 473d1ba73d1e311f8ebb364d495bab5289a167414ab4aa824c9ed7a37ea93cd3dd4ef0262963c9e300eb748b0dff6a030add39cbf636acb6db208b6c01aaec3d mautrix-meta.confd c95f99af50ef5841af7f654fd37ca34470eb3c918cec2ea624a149942901350b1b154207b8b0a1ddb763d4c65850379a44898b5b208afd01812c9993c7621ada default-log-dir.patch " diff --git a/testing/mautrix-meta/mautrix-meta.initd b/testing/mautrix-meta/mautrix-meta.initd index 5dee6c217c9..2f8d600b58f 100644 --- a/testing/mautrix-meta/mautrix-meta.initd +++ b/testing/mautrix-meta/mautrix-meta.initd @@ -10,7 +10,7 @@ description="Daemon for Mautrix-Meta, a Matrix-Facebook Messenger and Instagram command="/usr/bin/mautrix-meta" command_args="-c $config $command_args" -depends() { +depend() { need net } diff --git a/testing/mautrix-signal/APKBUILD b/testing/mautrix-signal/APKBUILD index c0cc794ed5d..8e6fa768864 100644 --- a/testing/mautrix-signal/APKBUILD +++ b/testing/mautrix-signal/APKBUILD @@ -3,7 +3,7 @@ pkgname=mautrix-signal pkgver=0.6.0 _libsignalver=0.44.0 -pkgrel=0 +pkgrel=1 pkgdesc="A Matrix-Signal puppeting bridge" url="https://go.mau.fi/mautrix-signal/" arch="all !armhf !armv7 !x86 !ppc64le !s390x" # boring ssl only supports 64 bit, and doesn't set OPENSSL_64_BIT for ppc64le and s390x @@ -74,7 +74,7 @@ package() { sha512sums=" ac55ed462b442bc28045bd639359151b5717fef374f74a150c6597f4252cfb406c16de2b7989cb49b5e0e3c29f447427e19ac860048f7a9b2b020823694ffdba signal-0.6.0.tar.gz ef5bb03e2ebf37aefb31eb7c2e6c5196d07ca90f056e834a580f6293505789cd56268296a4ebc44b60b7550f2d6995ff1d8e4d27e73e783dedc29d097135d784 libsignal-0.44.0.tar.gz -90555c016fc9d9aa90b5115b898c3e2f365d277390862fa6de693970db53d6ae41e0e55ca1ca5315d52fc14f61a58e7d8713aefd4eb4050241cfdbb27f9a8213 mautrix-signal.initd +6a4878bd732db4442418b1cedbecd901cb9633846943cf98ebfe09aafa9da341168be7bafdb0a88015f0bbcafd665295364797efcd2d88855301341b996415b0 mautrix-signal.initd ffcfed000e4ca779a055ddf4374753e23e424501a70a148e9785a4c4f6f2d32e94e2275a766ac9435b2509a1d621821a2baad8c5e4964ef08cbd13045cb430df mautrix-signal.confd 8c355de5a4a6714afa2aec594f9035b8cb25fab153e83a2222a17f2068d10a970f9ef2e1854085a122494df152831dfcdeb5612f648dc685fe6d9c0b4b4107f4 default-log-dir.patch " diff --git a/testing/mautrix-signal/mautrix-signal.initd b/testing/mautrix-signal/mautrix-signal.initd index f8146da2461..7dc6aa9565c 100644 --- a/testing/mautrix-signal/mautrix-signal.initd +++ b/testing/mautrix-signal/mautrix-signal.initd @@ -10,7 +10,7 @@ description="Daemon for Mautrix-Signal, a Matrix-Signal puppeting bridge" command="/usr/bin/mautrix-signal" command_args="-c $config $command_args" -depends() { +depend() { need net } diff --git a/testing/mautrix-slack/APKBUILD b/testing/mautrix-slack/APKBUILD index b56d9bd3d9c..3f9af8baae2 100644 --- a/testing/mautrix-slack/APKBUILD +++ b/testing/mautrix-slack/APKBUILD @@ -3,7 +3,7 @@ pkgname=mautrix-slack pkgver=0_git20230925 _gitrev=4530ff397d08d93b673cd71da4c2a75d969ca0df -pkgrel=2 +pkgrel=3 pkgdesc="Matrix-Slack puppeting bridge" url="https://go.mau.fi/mautrix-slack/" arch="all" @@ -50,7 +50,7 @@ package() { sha512sums=" d2bd2b4a52233d2ce59c7fde956ae253c97c6e28913b479fd64708759fceae8154dc71d54dadb8d515fccf6a5a43c0b77a94d0938e4c2a8333a18ac9b7965a7f mautrix-slack-4530ff397d08d93b673cd71da4c2a75d969ca0df.tar.gz -84d1b9d35eab5345f236571830f0d18c1028c82e596f7c2ff17036bbc46ef1d2a11a214f2a5b28e4774045d6f0369381097c445479bd45f0f1e0157f0bf12040 mautrix-slack.initd +d27fbc6c7ebe9d42eb8226e035649239e6a3e9fbdea21fd9930666da68be375df577fdf9fd6989152e3bee76c924cf77119c57056aff6def84408c4548e8c42a mautrix-slack.initd cda8cd828fa1e4e4c302adc79a51d9af99fb428a81639691afefad6b575f6d2ac75730ea2cc455be514fe65a9836bdeb530a86b553c34a47e4a56796ce843fe1 mautrix-slack.confd 9444fec2555b1a4a1a4db2f0d08179fdd7a9d725e0a7414cea35591dbaea642978ce2020b6889f54c40f69627b167eaa1a796abcaf216ade5a6457584c38f8dc default-log-dir.patch " diff --git a/testing/mautrix-slack/mautrix-slack.initd b/testing/mautrix-slack/mautrix-slack.initd index ffd5da54eb7..4b518e2a672 100644 --- a/testing/mautrix-slack/mautrix-slack.initd +++ b/testing/mautrix-slack/mautrix-slack.initd @@ -10,7 +10,7 @@ description="Daemon for Mautrix-Slack, a Matrix-Slack puppeting bridge" command="/usr/bin/mautrix-slack" command_args="-c $config $command_args" -depends() { +depend() { need net } diff --git a/testing/maxima/APKBUILD b/testing/maxima/APKBUILD index 407d2bdc205..9d2efdec9a6 100644 --- a/testing/maxima/APKBUILD +++ b/testing/maxima/APKBUILD @@ -3,16 +3,24 @@ # Contributor: Grigory Kirillov <txgk@bk.ru> pkgname=maxima pkgver=5.47.0 -pkgrel=6 +pkgrel=7 pkgdesc="Sophisticated computer algebra system" url="http://maxima.sourceforge.net" -# ppc64le, s390x, riscv64: blocked by sbcl -# arm*, x86: not useful on 32-bit -# aarch64: fails to build -arch="x86_64" +# riscv64: TODO after Alpine 3.20 +arch="all !riscv64" license="GPL-2.0-or-later" -depends="texinfo shared-mime-info sbcl" -makedepends="python3 perl gmp-dev" +_ecl_version="23.9.9" +depends="texinfo shared-mime-info" +makedepends=" + autoconf + automake + ecl-dev~=$_ecl_version + gc-dev + gmp-dev + libffi-dev + perl + python3 + " checkdepends="gnuplot" subpackages=" $pkgname-doc @@ -20,9 +28,17 @@ subpackages=" $pkgname-bash-completion $pkgname-emacs " -source="maxima-$pkgver.tar.gz::https://sourceforge.net/projects/maxima/files/Maxima-source/$pkgver-source/maxima-$pkgver.tar.gz/download" +source=" + maxima-$pkgver.tar.gz::https://sourceforge.net/projects/maxima/files/Maxima-source/$pkgver-source/maxima-$pkgver.tar.gz/download + handle-multiple-ldflags.patch + " options="!check" # take hours +prepare() { + default_prepare + autoreconf -fi +} + build() { ./configure \ --build=$CBUILD \ @@ -33,8 +49,8 @@ build() { --infodir=/usr/share/info \ --libexecdir=/usr/lib \ --localstatedir=/var \ - --enable-sbcl \ - --with-default-lisp=sbcl + --enable-ecl \ + --with-default-lisp=ecl make } @@ -47,6 +63,8 @@ package() { # remove unused files find "$pkgdir" -type d -iname tests -exec rm -r {} \+ + + install -Dm664 src/binary-ecl/maxima.fas -t "$pkgdir"/usr/lib/ecl-$_ecl_version/ } extra() { @@ -66,4 +84,5 @@ emacs() { sha512sums=" 953b98336eb086069edaa917981372450ce165dedd7a7b39b181d3f2d8b089551eea943e0084148eaa3ded395dcba9135509d3d11d9132ab7a3ad8bb800d3a11 maxima-5.47.0.tar.gz +58b574a91f14aa1568b43ce96ac847babed75e91b68be25f40d7da1f09d1e4c8a37f549d33d7566c54e546f4825e8f8f9038777460beea0d3f9282e1ead27eb0 handle-multiple-ldflags.patch " diff --git a/testing/maxima/handle-multiple-ldflags.patch b/testing/maxima/handle-multiple-ldflags.patch new file mode 100644 index 00000000000..799fc15f918 --- /dev/null +++ b/testing/maxima/handle-multiple-ldflags.patch @@ -0,0 +1,43 @@ +Description: Handle multiple LDFLAGS + Without this patch, building with LDFLAGS containing more than one flag results + in flags being dropped. +Author: Graham Inggs <ginggs@debian.org> +Bug-Debian: http://bugs.debian.org/847925 + +--- a/src/maxima.system ++++ b/src/maxima.system +@@ -58,6 +58,19 @@ + (and (apply #'compile-file file :output-file object-output args) + (c:build-fasl output :lisp-files (list object-output))))) + ++(defun split-string (string &key (item #\space) (test #'char=)) ++ ;; Splits the string into substrings at spaces. ++ (let ((len (length string)) ++ (index 0) result) ++ (dotimes (i len ++ (progn (unless (= index len) ++ (push (subseq string index) result)) ++ (reverse result))) ++ (when (funcall test (char string i) item) ++ (unless (= index i);; two spaces in a row ++ (push (subseq string index i) result)) ++ (setf index (1+ i)))))) ++ + #+ecl + (defun build-maxima-lib () + (labels ((list-all-objects (module) +@@ -79,12 +92,12 @@ + :ld-flags + (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" + (find-package "MAXIMA"))))) +- (if (and x (not (string= x ""))) (list x)))) ++ (if (and x (not (string= x ""))) (split-string x)))) + (c::build-program "binary-ecl/maxima" :lisp-files obj + :ld-flags + (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" + (find-package "MAXIMA"))))) +- (if (and x (not (string= x ""))) (list x))) ++ (if (and x (not (string= x ""))) (split-string x))) + :epilogue-code '(progn (cl-user::run))))))) + + (defun maxima-binary-pathname () diff --git a/testing/mdcat/APKBUILD b/testing/mdcat/APKBUILD deleted file mode 100644 index f5f95b57590..00000000000 --- a/testing/mdcat/APKBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Contributor: Leo <thinkabit.ukim@gmail.com> -# Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> -pkgname=mdcat -pkgver=2.1.1 -pkgrel=0 -pkgdesc="Cat for markdown" -url="https://github.com/swsnr/mdcat" -#Undefined temporary symbol .LBB16_2 -arch="all !armhf" -license="Apache-2.0" -makedepends="asciidoctor cargo shared-mime-info openssl-dev>3 cargo-auditable" -subpackages=" - $pkgname-doc - $pkgname-bash-completion - $pkgname-zsh-completion - $pkgname-fish-completion - " -source="https://github.com/swsnr/mdcat/archive/refs/tags/mdcat-$pkgver.tar.gz" -builddir="$srcdir/mdcat-mdcat-$pkgver" - -prepare() { - default_prepare - cargo fetch --target="$CTARGET" --locked -} - -build() { - cargo auditable build --release --frozen -} - -check() { - cargo test --frozen -} - -package() { - install -Dm755 target/release/mdcat -t "$pkgdir"/usr/bin/ - ln -s /usr/bin/mdcat "$pkgdir"/usr/bin/mdless - - # Install the generated shell completion files - install -Dm644 target/release/build/mdcat-*/out/completions/mdcat.bash \ - "$pkgdir"/usr/share/bash-completion/completions/mdcat - install -Dm644 target/release/build/mdcat-*/out/completions/mdless.bash \ - "$pkgdir"/usr/share/bash-completion/completions/mdless - install -Dm644 target/release/build/mdcat-*/out/completions/_mdcat \ - -t "$pkgdir"/usr/share/zsh/site-functions - install -Dm644 target/release/build/mdcat-*/out/completions/_mdless \ - -t "$pkgdir"/usr/share/zsh/site-functions - install -Dm644 target/release/build/mdcat-*/out/completions/mdcat.fish \ - -t "$pkgdir"/usr/share/fish/vendor_completions.d - install -Dm644 target/release/build/mdcat-*/out/completions/mdless.fish \ - -t "$pkgdir"/usr/share/fish/vendor_completions.d - - # Install the generated man-page - install -Dm644 "$builddir"/target/release/build/mdcat-*/out/mdcat.1 \ - -t "$pkgdir"/usr/share/man/man1/ -} - -sha512sums=" -8bff3c1e696311fc39bfb5a89e8aaf45986acab3f06a4c905682af233720940f4b1193c36907474ea8d94491148fba72b098dd23166adb56d7ebaac37c861d82 mdcat-2.1.1.tar.gz -" diff --git a/testing/meep/APKBUILD b/testing/meep/APKBUILD index ed6ba607786..132c25eb627 100644 --- a/testing/meep/APKBUILD +++ b/testing/meep/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=meep pkgver=1.28.0 -pkgrel=0 +pkgrel=1 pkgdesc="FDTD finite-difference time-domain solver" url="https://meep.readthedocs.io/" arch="x86_64 ppc64le s390x" diff --git a/testing/meowdict/APKBUILD b/testing/meowdict/APKBUILD new file mode 100644 index 00000000000..97211639a93 --- /dev/null +++ b/testing/meowdict/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=meowdict +pkgver=0.10.5 +pkgrel=0 +pkgdesc="CLI web client for moedict.tw" +url="https://github.com/eatradish/meowdict" +arch="all" +license="MIT" +depends="opencc" +makedepends=" + cargo + cargo-auditable + opencc-dev + openssl-dev + " +source="https://github.com/eatradish/meowdict/archive/v$pkgver/meowdict-$pkgver.tar.gz + getrandom-0.2.14.patch + nix-0.28.0.patch + update-test_wordshk_api_result.patch + " + +prepare() { + default_prepare + + cargo fetch --target="$CTARGET" --locked +} + +build() { + cargo auditable build --frozen --release +} + +check() { + cargo test --frozen +} + +package() { + install -Dvm755 target/release/meowdict -t "$pkgdir"/usr/bin/ + + install -Dvm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/ +} + +sha512sums=" +2af8e39e6fa6c3dc54a38993f59bef4b893255b9dc05c47af6bd3fd2f61654f8768b748c33f9f623a255e73e0d06f9301d15390cfeee09466015daaaab457698 meowdict-0.10.5.tar.gz +d1eadfb6b000be2a020b5430793a81bd880ec0be4de2604aa96fa74757e16c9dff22c0c46b87ef417f33d03c22ec3d1a784f20c71ec0d31a58fafafe9194408e getrandom-0.2.14.patch +a4ecda37f88cc2ea6bcf799ec76246ad9b7fa680c4c92431494bd371859386a3b26b95e10ddda85702796f050212e4e2124380948813b8539fea19c701ab4fc8 nix-0.28.0.patch +8ba5e8e9be32009a55813cb9d891374bbcc8267fd06bd727f228b03e4d3da754d7ecf7b3b412b8b9a0601437bc980021867d7432caa33011220f3cd0849643d3 update-test_wordshk_api_result.patch +" diff --git a/testing/meowdict/getrandom-0.2.14.patch b/testing/meowdict/getrandom-0.2.14.patch new file mode 100644 index 00000000000..318cf13433c --- /dev/null +++ b/testing/meowdict/getrandom-0.2.14.patch @@ -0,0 +1,26 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -332,9 +332,9 @@ + + [[package]] + name = "getrandom" +-version = "0.2.8" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" ++checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" + dependencies = [ + "cfg-if", + "libc", +@@ -558,9 +558,9 @@ + + [[package]] + name = "libc" +-version = "0.2.140" ++version = "0.2.153" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" ++checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + + [[package]] + name = "linux-raw-sys" diff --git a/testing/meowdict/nix-0.28.0.patch b/testing/meowdict/nix-0.28.0.patch new file mode 100644 index 00000000000..5e0ca58c3e1 --- /dev/null +++ b/testing/meowdict/nix-0.28.0.patch @@ -0,0 +1,439 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -28,9 +28,9 @@ + + [[package]] + name = "bitflags" +-version = "2.0.2" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" ++checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + + [[package]] + name = "bumpalo" +@@ -57,12 +57,18 @@ + checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] ++name = "cfg_aliases" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" ++ ++[[package]] + name = "clap" + version = "4.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "42dfd32784433290c51d92c438bb72ea5063797fc3cc9a21a8c4346bebbb2098" + dependencies = [ +- "bitflags 2.0.2", ++ "bitflags 2.5.0", + "clap_lex", + "is-terminal", + "strsim", +@@ -80,13 +86,11 @@ + + [[package]] + name = "clipboard-win" +-version = "4.5.0" ++version = "5.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" ++checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" + dependencies = [ + "error-code", +- "str-buf", +- "winapi", + ] + + [[package]] +@@ -172,6 +176,16 @@ + ] + + [[package]] ++name = "errno" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" ++dependencies = [ ++ "libc", ++ "windows-sys 0.52.0", ++] ++ ++[[package]] + name = "errno-dragonfly" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -183,13 +197,9 @@ + + [[package]] + name = "error-code" +-version = "2.3.1" ++version = "3.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" +-dependencies = [ +- "libc", +- "str-buf", +-] ++checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + + [[package]] + name = "fastrand" +@@ -202,13 +212,13 @@ + + [[package]] + name = "fd-lock" +-version = "3.0.10" ++version = "4.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ef1a30ae415c3a691a4f41afddc2dbcd6d70baf338368d85ebc1e8ed92cedb9" ++checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" + dependencies = [ + "cfg-if", +- "rustix", +- "windows-sys 0.45.0", ++ "rustix 0.38.34", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -382,6 +392,15 @@ + checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + + [[package]] ++name = "home" ++version = "0.5.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" ++dependencies = [ ++ "windows-sys 0.52.0", ++] ++ ++[[package]] + name = "http" + version = "0.2.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -520,7 +539,7 @@ + dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", +- "rustix", ++ "rustix 0.36.10", + "windows-sys 0.45.0", + ] + +@@ -569,6 +588,12 @@ + checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + + [[package]] ++name = "linux-raw-sys" ++version = "0.4.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" ++ ++[[package]] + name = "log" + version = "0.4.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -665,14 +690,14 @@ + + [[package]] + name = "nix" +-version = "0.26.2" ++version = "0.28.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" ++checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.5.0", + "cfg-if", ++ "cfg_aliases", + "libc", +- "static_assertions", + ] + + [[package]] +@@ -932,14 +957,27 @@ + checksum = "2fe885c3a125aa45213b68cc1472a49880cb5923dc23f522ad2791b882228778" + dependencies = [ + "bitflags 1.3.2", +- "errno", ++ "errno 0.2.8", + "io-lifetimes", + "libc", +- "linux-raw-sys", ++ "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", + ] + + [[package]] ++name = "rustix" ++version = "0.38.34" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" ++dependencies = [ ++ "bitflags 2.5.0", ++ "errno 0.3.8", ++ "libc", ++ "linux-raw-sys 0.4.13", ++ "windows-sys 0.52.0", ++] ++ ++[[package]] + name = "rustls" + version = "0.20.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -962,25 +1000,24 @@ + + [[package]] + name = "rustyline" +-version = "11.0.0" ++version = "14.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece" ++checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.5.0", + "cfg-if", + "clipboard-win", +- "dirs-next", + "fd-lock", ++ "home", + "libc", + "log", + "memchr", + "nix", + "radix_trie", +- "scopeguard", + "unicode-segmentation", + "unicode-width", + "utf8parse", +- "winapi", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -999,12 +1036,6 @@ + ] + + [[package]] +-name = "scopeguard" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +- +-[[package]] + name = "sct" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1121,18 +1152,6 @@ + checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + + [[package]] +-name = "static_assertions" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +- +-[[package]] +-name = "str-buf" +-version = "1.0.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" +- +-[[package]] + name = "strsim" + version = "0.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1169,7 +1188,7 @@ + "cfg-if", + "fastrand", + "redox_syscall", +- "rustix", ++ "rustix 0.36.10", + "windows-sys 0.42.0", + ] + +@@ -1557,13 +1576,13 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" + dependencies = [ +- "windows_aarch64_gnullvm", +- "windows_aarch64_msvc", +- "windows_i686_gnu", +- "windows_i686_msvc", +- "windows_x86_64_gnu", +- "windows_x86_64_gnullvm", +- "windows_x86_64_msvc", ++ "windows_aarch64_gnullvm 0.42.2", ++ "windows_aarch64_msvc 0.42.2", ++ "windows_i686_gnu 0.42.2", ++ "windows_i686_msvc 0.42.2", ++ "windows_x86_64_gnu 0.42.2", ++ "windows_x86_64_gnullvm 0.42.2", ++ "windows_x86_64_msvc 0.42.2", + ] + + [[package]] +@@ -1572,65 +1591,138 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" + dependencies = [ +- "windows-targets", ++ "windows-targets 0.42.2", + ] + + [[package]] ++name = "windows-sys" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" ++dependencies = [ ++ "windows-targets 0.52.5", ++] ++ ++[[package]] + name = "windows-targets" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" + dependencies = [ +- "windows_aarch64_gnullvm", +- "windows_aarch64_msvc", +- "windows_i686_gnu", +- "windows_i686_msvc", +- "windows_x86_64_gnu", +- "windows_x86_64_gnullvm", +- "windows_x86_64_msvc", ++ "windows_aarch64_gnullvm 0.42.2", ++ "windows_aarch64_msvc 0.42.2", ++ "windows_i686_gnu 0.42.2", ++ "windows_i686_msvc 0.42.2", ++ "windows_x86_64_gnu 0.42.2", ++ "windows_x86_64_gnullvm 0.42.2", ++ "windows_x86_64_msvc 0.42.2", + ] + + [[package]] ++name = "windows-targets" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.52.5", ++ "windows_aarch64_msvc 0.52.5", ++ "windows_i686_gnu 0.52.5", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc 0.52.5", ++ "windows_x86_64_gnu 0.52.5", ++ "windows_x86_64_gnullvm 0.52.5", ++ "windows_x86_64_msvc 0.52.5", ++] ++ ++[[package]] + name = "windows_aarch64_gnullvm" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + + [[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" ++ ++[[package]] + name = "windows_aarch64_msvc" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + + [[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" ++ ++[[package]] + name = "windows_i686_gnu" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + + [[package]] ++name = "windows_i686_gnu" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" ++ ++[[package]] + name = "windows_i686_msvc" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + + [[package]] ++name = "windows_i686_msvc" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" ++ ++[[package]] + name = "windows_x86_64_gnu" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + + [[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" ++ ++[[package]] + name = "windows_x86_64_gnullvm" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + + [[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" ++ ++[[package]] + name = "windows_x86_64_msvc" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + + [[package]] + name = "winnow" +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -15,7 +15,7 @@ + owo-colors = "3" + console = "0.15" + indexmap = { version = "1.9", features = ["serde-1"] } +-rustyline = "11.0" ++rustyline = "14.0" + opencc-rust = "1.1.14" + tokio = {version = "1.26", features = ["rt-multi-thread", "rt", "time", "macros"]} + futures = "0.3" diff --git a/testing/meowdict/update-test_wordshk_api_result.patch b/testing/meowdict/update-test_wordshk_api_result.patch new file mode 100644 index 00000000000..0fb08da68c1 --- /dev/null +++ b/testing/meowdict/update-test_wordshk_api_result.patch @@ -0,0 +1,11 @@ +--- a/src/api.rs ++++ b/src/api.rs +@@ -332,7 +332,7 @@ + let word_2 = "我哋"; + let (wordshk_charlist, wordshk_wordlist) = request_wordshk(&client).await.unwrap(); + let mut result_1 = HashMap::new(); +- result_1.insert("ngo5".to_string(), 41usize); ++ result_1.insert("ngo5".to_string(), 51usize); + let result_2 = vec!["ngo5 dei6".to_string()]; + + assert_eq!(wordshk_charlist[word_1], result_1); diff --git a/testing/mepo/APKBUILD b/testing/mepo/APKBUILD index a0a02f57bdc..f9af77482e8 100644 --- a/testing/mepo/APKBUILD +++ b/testing/mepo/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Miles Alan <m@milesalan.com> pkgname=mepo -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=0 _pkgdescbase="Fast, simple, and hackable OSM map viewer for Linux" pkgdesc="$_pkgdescbase (base SDL application)" @@ -13,7 +13,7 @@ makedepends=" sdl2_gfx-dev sdl2_image-dev sdl2_ttf-dev - zig>=0.11.0 + zig>=0.12.0 " source=" $pkgname-$pkgver.tar.gz::https://git.sr.ht/~mil/mepo/archive/$pkgver.tar.gz @@ -52,5 +52,5 @@ scripts() { } sha512sums=" -e01b19a578f9ffa340eac62e1db75495b424fe9bff98b9d25cf2c3cd6a402e8c756463582757bbd979aa927cd2e8c1ded2c25f6746851fb2a39a1257794fbbf3 mepo-1.2.0.tar.gz +1db1218a1cc43e4c4838f2b96c47ed3c0589efef2bff3aa7175a658e227b339032c22c0af3a4c95eb6b95a759d62315fd2a3fdf5e11706847c7fa02db5c7d63e mepo-1.2.1.tar.gz " diff --git a/testing/merlin/APKBUILD b/testing/merlin/APKBUILD index 8b9ec7fd346..9e39c0b49ce 100644 --- a/testing/merlin/APKBUILD +++ b/testing/merlin/APKBUILD @@ -7,7 +7,7 @@ _pkgver="$pkgver-${_ocamlver//./}" pkgrel=0 pkgdesc="Context sensitive completion for OCaml" url="https://ocaml.github.io/merlin/" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/mimir/APKBUILD b/testing/mimir/APKBUILD index cda60b643ed..48dbcdc76e3 100644 --- a/testing/mimir/APKBUILD +++ b/testing/mimir/APKBUILD @@ -8,7 +8,8 @@ options="net" url="https://github.com/grafana/mimir" license="AGPL-3.0-or-later" # others: needs 64 bits -arch="x86_64 aarch64 ppc64le riscv64" +# riscv64: tests fails +arch="x86_64 aarch64 ppc64le" makedepends="go bash" checkdepends="tzdata" subpackages="$pkgname-openrc" @@ -41,7 +42,8 @@ check() { # shell check suggests to break it # shellcheck disable=SC2046 # TestHelp fails because we build on a different path - TZ=UTC GOGC=10 go test -p=2 -skip 'fluent-bit|stores/tsdb/index|TestAlertmanager_StateReplication|TestHelp|TestConfigDescriptorIsUpToDate|TestIngester_compactBlocksToReduceInMemorySeries_Concurrency' ./... + TZ=UTC GOGC=10 go test -p=2 -timeout=30m \ + -skip 'fluent-bit|stores/tsdb/index|TestAlertmanager_StateReplication|TestHelp|TestConfigDescriptorIsUpToDate|TestIngester_compactBlocksToReduceInMemorySeries_Concurrency' ./... } package() { diff --git a/testing/mir/APKBUILD b/testing/mir/APKBUILD index ea77d920617..e63516927c6 100644 --- a/testing/mir/APKBUILD +++ b/testing/mir/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=mir pkgver=2.15.0 -pkgrel=0 +pkgrel=1 pkgdesc="Mir Display Server" url="https://mir-server.io" arch="all" diff --git a/testing/mitra/APKBUILD b/testing/mitra/APKBUILD index 31a634d6891..8602b8a4bcf 100644 --- a/testing/mitra/APKBUILD +++ b/testing/mitra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=mitra -pkgver=2.16.0 +pkgver=2.18.0 pkgrel=0 _mitraweb=$pkgver #"${pkgver%.*}.0" pkgdesc="ActivityPub microblogging platform written in Rust" @@ -64,7 +64,8 @@ check() { --skip test_get_jrd \ --skip test_filter_mentions_none \ --skip test_filter_mentions_only_known \ - --skip test_prepare_instance_ed25519_key + --skip test_prepare_instance_ed25519_key \ + --skip test_mute cd "$srcdir/mitra-web" @@ -92,9 +93,9 @@ package() { } sha512sums=" -11ccb4162e5d35f774438c964f174c28d89e67be1d0789cb0320997c149739ade73388ebf18fdc1d5bf476f8b589e41f83b5a9a3e587ee7383fb39e6f4201af1 mitra-2.16.0.tar.gz -59935e83c4c462d6d44774d3780844962c7a5c34bc1aa335cfb6565a8f32d7af55344a61d45d4cbcb7fed9a6ce68925ec9982feaa171e895bed8fef9d9a38447 mitra-web-2.16.0.tar.gz +af75e15dcf30baebc2749822c307350faa0b26aa5deb451c97472d107732dd810da2c2c04332fb8ddda9dc2af67aee23bc1792c9a10e45555cfb02391e8fbaad mitra-2.18.0.tar.gz +0ad3129576c9e20adf2c61b27d67af1e39446b964fee1fc6f6e2145b3416f1cd4e5d52cc230e0cdce0fab25ff0a9774545cb732d49b010b800d93b29c867b650 mitra-web-2.18.0.tar.gz 691f84f5dfdddc176e75792ab03ff167054246e75ced51be47a89f405ae55ebe5eb6280b73c1b467b5ecbe8539f6108fb3d86873d50fcc4f4b8c5b182632acb0 mitra.initd 180a47f5072534418b4aac3ce7c885a4f7e4dc38aca80d6d81c79848d12fbe24799788c3575bd195030a10da5e0372f87fa2809a4ef99a48eaa6df52f4d053dd init.sql -c958bcd6c96cb40d7369b7dcd13d1722ed23afb856c2569630b47cf5fe8a94105bb5e7ed7421c169e08f3764d9e60e05bed0b861ab117292d715600c852b15b0 config.yaml +ccc0b8efaefdb3ad08838b027895c358595429d511b2ad76502030988485bc86fa53a581bd4afdeedd8967a3d82ada6c30343c826c5dc77e5621e9154b84cee3 config.yaml " diff --git a/testing/mitra/config.yaml b/testing/mitra/config.yaml index 7f93b570260..f8a7b426959 100644 --- a/testing/mitra/config.yaml +++ b/testing/mitra/config.yaml @@ -58,6 +58,7 @@ registration: #limits: # media: # file_size_limit: 20M +# emoji_size_limit: 500K # posts: # character_limit: 5000 diff --git a/testing/mnemosyne/APKBUILD b/testing/mnemosyne/APKBUILD index 89afe7ded34..055327cf09b 100644 --- a/testing/mnemosyne/APKBUILD +++ b/testing/mnemosyne/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Eloi Torrents <eloitor@disroot.org> pkgname=mnemosyne pkgver=2.10.1 -pkgrel=0 +pkgrel=1 pkgdesc="Flash-card tool with a sophisticated card review algorithm" url="https://mnemosyne-proj.org" # py3-pyqt6-webengine diff --git a/testing/morph-browser/APKBUILD b/testing/morph-browser/APKBUILD index 6436f3ee515..2e466f077eb 100644 --- a/testing/morph-browser/APKBUILD +++ b/testing/morph-browser/APKBUILD @@ -6,8 +6,8 @@ pkgrel=0 pkgdesc="Lightweight web browser tailored for Ubuntu Touch" url="https://gitlab.com/ubports/development/core/morph-browser" # armhf: blocked by lomiri-ui-toolkit -# ppc64le/riscv64/s390x: blocked by qt5-qtwebengine -arch="all !armhf !ppc64le !riscv64 !s390x" +# ppc64le/riscv64/s390x/loongarch64: blocked by qt5-qtwebengine +arch="all !armhf !ppc64le !riscv64 !s390x !loongarch64" license="GPL-3.0-only" depends=" font-liberation diff --git a/testing/mpvpaper/APKBUILD b/testing/mpvpaper/APKBUILD index 673e50f04f7..829880d7c1c 100644 --- a/testing/mpvpaper/APKBUILD +++ b/testing/mpvpaper/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=mpvpaper -pkgver=1.4 +pkgver=1.5 pkgrel=0 pkgdesc="Video wallpaper setter for wlroots based compositors using mpv" url="https://github.com/GhostNaN/mpvpaper" @@ -29,5 +29,5 @@ package() { } sha512sums=" -23a5859705319bea6508a09df3ea791b976326dcaa8a7df86e0b38754017a1bcb0c594b967db91abe2d631fe9f07454399f57f447fd14192c6f9ede4d479f1d2 mpvpaper-1.4.tar.gz +34af18e84e92eadc96ec605846d52758b237cc6391a07ef4517646cc3c0650b4c103718a9c6a7c90bbf8b0dc9edda02f6a4fd46d91e1515c5f78299a4b32550e mpvpaper-1.5.tar.gz " diff --git a/testing/ncdu2/APKBUILD b/testing/ncdu2/APKBUILD index d7030241bd2..6cf208d8159 100644 --- a/testing/ncdu2/APKBUILD +++ b/testing/ncdu2/APKBUILD @@ -1,7 +1,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=ncdu2 -pkgver=2.3 +pkgver=2.3_git20240412 +_commit=5944b738d04f768b36d05e6011d1284b49a08749 pkgrel=0 pkgdesc="Disk usage analyzer with an ncurses interface" url="https://dev.yorhel.nl/ncdu" @@ -9,8 +10,9 @@ license="MIT" arch="x86_64 aarch64" # Limited by zig aport makedepends="chrpath zig ncurses-dev" subpackages="$pkgname-doc" -source="https://dev.yorhel.nl/download/ncdu-$pkgver.tar.gz" -builddir="$srcdir/ncdu-$pkgver" +#source="https://dev.yorhel.nl/download/ncdu-$pkgver.tar.gz" +source="$pkgname-$_commit.tar.gz::https://code.blicky.net/yorhel/ncdu/archive/$_commit.tar.gz" +builddir="$srcdir/ncdu" replaces=ncdu # We may want other than "baseline" for other targets, when enabled by zig @@ -36,5 +38,5 @@ package() { } sha512sums=" -283f78761b225883e090c4d0d1325bffc70049477087df3e8d1afcebc3136930c2636b2bba4aa6e43d53626668519c26a1528ba5c75489d3b5924e8974184e47 ncdu-2.3.tar.gz +6ce41386061d6cb88df3bd29ef103d118393e72c44d08f75f705f837dcddb235f3564c41c30b1209597b8982b6a233a47f708c0291db7150a1b38a329fcb0f53 ncdu2-5944b738d04f768b36d05e6011d1284b49a08749.tar.gz " diff --git a/testing/netscanner/APKBUILD b/testing/netscanner/APKBUILD new file mode 100644 index 00000000000..fd806e511d2 --- /dev/null +++ b/testing/netscanner/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Chleba <chlebik@gmail.com> +# Maintainer: Chleba <chlebik@gmail.com> +pkgname=netscanner +pkgver=0.4.4 +pkgrel=0 +pkgdesc="Network scanning tool" +url="https://github.com/Chleba/netscanner" +# s390x, ppc64le, riscv64: not supported +arch="all !s390x !ppc64le !riscv64" +license="MIT" +makedepends="cargo cargo-auditable" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/Chleba/netscanner/archive/v$pkgver.tar.gz" +options="net" + +prepare() { + default_prepare + cargo fetch --target="$CTARGET" --locked +} + +build() { + cargo auditable build --frozen --release +} + +check() { + cargo test --frozen +} + +package() { + install -Dm 755 "target/release/$pkgname" -t "$pkgdir/usr/bin" + install -Dm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname" + install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +sha512sums=" +03e72d38d303626edbdcdd640deaf8a19638716cb3e7d45735e77f4b09f93d4a5333bc152a256bd2e1a95615e853463707ad1157c8182b972a1b79e39bd0c09b netscanner-0.4.4.tar.gz +" diff --git a/testing/nextpnr/APKBUILD b/testing/nextpnr/APKBUILD index 27c31b4dbc6..50b9934f365 100644 --- a/testing/nextpnr/APKBUILD +++ b/testing/nextpnr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@posteo.net> pkgname=nextpnr pkgver=0.6 -pkgrel=1 +pkgrel=2 pkgdesc="portable FPGA place and route tool" url="https://github.com/YosysHQ/nextpnr" arch="all" diff --git a/testing/nil/APKBUILD b/testing/nil/APKBUILD new file mode 100644 index 00000000000..14329d5e4d7 --- /dev/null +++ b/testing/nil/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: Matthias Ahouansou <matthias@ahouansou.cz> +# Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> +pkgname=nil +pkgver=2023.08.09 +_pkgver=${pkgver//./-} +pkgrel=0 +pkgdesc="An incremental analysis assistant for writing in Nix" +url="https://github.com/oxalica/nil" +arch="x86 x86_64 aarch64" # nix (aports) +license="MIT OR Apache-2.0" +makedepends=" + cargo + cargo-auditable + nix +" +source=" + $pkgname-$_pkgver.tar.gz::https://github.com/oxalica/nil/archive/refs/tags/$_pkgver.tar.gz +" +builddir="$srcdir/$pkgname-$_pkgver" +options="net" + +prepare() { + default_prepare + cargo fetch --target="$CTARGET" --locked +} + +build() { + cargo auditable build --release --frozen +} + +check() { + cargo test --frozen +} + +package() { + install -Dm 755 target/release/nil "$pkgdir"/usr/bin/nil + + for l in APACHE MIT + do + install -Dm 644 LICENSE-"$l" "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE-"$l" + done +} + +sha512sums=" +44e93b06ee90503e79e41d137d14d7c576fafd889a41436aca0ddaa58eecd0cff329bd8a884baca2984a750fbb984000ef79b56981209d6692d564e0a587406c nil-2023-08-09.tar.gz +" diff --git a/testing/nmon/APKBUILD b/testing/nmon/APKBUILD index e50fe4583f9..bd2f66ffb8a 100644 --- a/testing/nmon/APKBUILD +++ b/testing/nmon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Mike Crute <mike@crute.us> # Maintainer: Mike Crute <mike@crute.us> pkgname=nmon -pkgver=16p +pkgver=16q pkgrel=0 pkgdesc="Nigel's performance Monitor for Linux" url="https://nmon.sourceforge.net/" @@ -40,5 +40,5 @@ package() { sha512sums=" c6749baeeefbb5fa781badcf0a3b1a77792498663155b70f00ae8da751eb72ac38f1f734fd9e2eb32cb364938e366453f50e29928f247b945b684021fbde9af5 glibc.patch -137a54e49a43f0197dc1edc039bcba7e0a51965c8e49b0034123e1d1d540fb7cec8203bca691dcbe0621b8667a73c572bd9b7b3f7e20948d62d8b9b76124edba lmon16p.c +06386a4c4b77d029b7cbbbc7f4f8b22028787d286e725257b5daef6d77551c5d3d2c26d303adfab8a953455e51ae308ffb5b1170856ff7b391e696f677bafeef lmon16q.c " diff --git a/testing/normaliz/APKBUILD b/testing/normaliz/APKBUILD index 1f93b257b19..eb2229ae98b 100644 --- a/testing/normaliz/APKBUILD +++ b/testing/normaliz/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakob Meier <comcloudway@ccw.icu> pkgname=normaliz pkgver=3.10.2 -pkgrel=0 +pkgrel=1 pkgdesc="Normaliz is an open source tool for computations." url="https://www.normaliz.uni-osnabrueck.de/" # s390x: flint, libarb, libantic diff --git a/testing/ntfy-alertmanager/APKBUILD b/testing/ntfy-alertmanager/APKBUILD new file mode 100644 index 00000000000..373bbabc1ca --- /dev/null +++ b/testing/ntfy-alertmanager/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: fossdd <fossdd@pwned.life> +# Maintainer: fossdd <fossdd@pwned.life> +pkgname=ntfy-alertmanager +pkgver=0.3.0 +pkgrel=0 +pkgdesc="A bridge between ntfy and Alertmanager" +url="https://hub.xenrox.net/~xenrox/ntfy-alertmanager" +arch="all" +license="AGPL3" +makedepends="go" +install="$pkgname.pre-install" +subpackages="$pkgname-openrc" +source="https://git.xenrox.net/~xenrox/ntfy-alertmanager/refs/download/v$pkgver/ntfy-alertmanager-$pkgver.tar.gz + ntfy-alertmanager.initd + " + +export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" +export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" +export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" + +build() { + go build -o ntfy-alertmanager +} + +check() { + go test ./... +} + +package() { + install -Dm755 ntfy-alertmanager "$pkgdir"/usr/bin/ntfy-alertmanager + install -Dm644 config.scfg "$pkgdir"/etc/ntfy-alertmanager/config + install -Dm755 "$srcdir"/ntfy-alertmanager.initd "$pkgdir"/etc/init.d/ntfy-alertmanager +} + +sha512sums=" +8bde22778aae862a8fbde0c5fc8f966ee55b39cbc9f28b7983af356ea8ab8522030a4477df2bd47f3e6aea295a5c2f18a69657977b6760b78355eeb748646ddf ntfy-alertmanager-0.3.0.tar.gz +843b3e00af5019d1af9330717598631cf76d8876bb373cc31419173897e01d889ffa3dab0c29ac91e15eec6677ca629b199d0dfc1ffe4e00c5ae895364cbfd7c ntfy-alertmanager.initd +" diff --git a/testing/ntfy-alertmanager/ntfy-alertmanager.initd b/testing/ntfy-alertmanager/ntfy-alertmanager.initd new file mode 100644 index 00000000000..318c4ab4bad --- /dev/null +++ b/testing/ntfy-alertmanager/ntfy-alertmanager.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run + +name=ntfy-alertmanager +command="/usr/bin/ntfy-alertmanager" +command_user="ntfy-alertmanager:ntfy-alertmanager" +command_background=true +pidfile="/run/$RC_SVCNAME.pid" + +depend() { + need net + after firewall +} diff --git a/testing/ntfy-alertmanager/ntfy-alertmanager.pre-install b/testing/ntfy-alertmanager/ntfy-alertmanager.pre-install new file mode 100644 index 00000000000..11829150d6d --- /dev/null +++ b/testing/ntfy-alertmanager/ntfy-alertmanager.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S ntfy-alertmanager 2>/dev/null +adduser -S -D -h /dev/null -s /sbin/nologin -G ntfy-alertmanager -g ntfy-alertmanager ntfy-alertmanager 2>/dev/null + +exit 0 diff --git a/testing/ocaml-alcotest/APKBUILD b/testing/ocaml-alcotest/APKBUILD index a5e934c527c..d1c0d4fd25a 100644 --- a/testing/ocaml-alcotest/APKBUILD +++ b/testing/ocaml-alcotest/APKBUILD @@ -1,37 +1,36 @@ # Contributor: rubicon <rubicon@mailo.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=ocaml-alcotest -_pkgname=alcotest-js pkgver=1.5.0 -pkgrel=3 +pkgrel=4 +_pkgreal=alcotest-js pkgdesc="Lightweight and colourful test framework" url="https://github.com/mirage/alcotest" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="ISC" -depends_dev="$pkgname=$pkgver-r$pkgrel" -makedepends=" - dune - ocaml +depends_dev=" + $pkgname=$pkgver-r$pkgrel ocaml-astring-dev ocaml-cmdliner-dev - ocaml-findlib ocaml-fmt-dev - ocaml-logs-dev ocaml-re-dev - ocaml-seq-dev ocaml-stdlib-shims ocaml-uutf-dev + " +makedepends=" + $depends_dev + dune + ocaml + ocaml-logs-dev ocaml-lwt-dev - ocaml-ocplib-endian-dev - ocaml-mmap-dev - ocaml-bigarray-compat-dev " -options="!check" checkdepends="ocaml-result-dev" provides="$pkgname-lwt=$pkgver-r$pkgrel" subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.bz2::https://github.com/mirage/alcotest/releases/download/$pkgver/alcotest-js-$pkgver.tbz" -builddir="$srcdir/$_pkgname-$pkgver" +source="$pkgname-$pkgver.tar.bz2::https://github.com/mirage/alcotest/releases/download/$pkgver/alcotest-js-$pkgver.tbz + test-expected-output.patch + " +builddir="$srcdir/$_pkgreal-$pkgver" # 32-bit archs case "$CARCH" in @@ -46,7 +45,8 @@ build() { } check() { - dune runtest --no-buffer --verbose + dune runtest --build-dir=.testenv \ + -p alcotest,alcotest-lwt } package() { @@ -99,4 +99,5 @@ scan_python3_dependency() { sha512sums=" 1aea91de40795ec4f6603d510107e4b663c1a94bd223f162ad231316d8595e9e098cabbe28a46bdcb588942f3d103d8377373d533bcc7413ba3868a577469b45 ocaml-alcotest-1.5.0.tar.bz2 +d379be678e86467573067bac990ea683c627f4d16c1c4d31e7803ab4b5623164f1bf35c908b44e5e434df938b9902a601e998d4e9cd7c4be888e421048b57fda test-expected-output.patch " diff --git a/testing/ocaml-alcotest/test-expected-output.patch b/testing/ocaml-alcotest/test-expected-output.patch new file mode 100644 index 00000000000..f737cf4362b --- /dev/null +++ b/testing/ocaml-alcotest/test-expected-output.patch @@ -0,0 +1,9 @@ +--- a/test/e2e/alcotest/failing/unknown_option.expected ++++ b/test/e2e/alcotest/failing/unknown_option.expected +@@ -1,3 +1,3 @@ +-unknown_option.<ext>: unknown option `--dry-runn'. +-Usage: unknown_option.<ext> COMMAND ... +-Try `unknown_option.<ext> --help' for more information. ++unknown_option.<ext>: unknown option '--dry-runn'. ++Usage: unknown_option.<ext> [COMMAND] … ++Try 'unknown_option.<ext> --help' for more information. diff --git a/testing/ocaml-amqp-client/APKBUILD b/testing/ocaml-amqp-client/APKBUILD new file mode 100644 index 00000000000..bb26395ed85 --- /dev/null +++ b/testing/ocaml-amqp-client/APKBUILD @@ -0,0 +1,86 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-amqp-client +pkgver=2.3.0 +pkgrel=0 +_pkgreal=amqp-client +pkgdesc="AMQP 0.9.1 client library" +url="https://github.com/andersfugmann/amqp-client" +arch="all !riscv64 !loongarch64" # ocaml +license="BSD-3-Clause" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-lwt-dev + ocaml-lwt_log-dev + ocaml-uri-dev + " +makedepends=" + $depends_dev + dune + ocaml + ocaml-ezxmlm-dev + " +subpackages="$pkgname-dev" +source="https://github.com/andersfugmann/amqp-client/archive/$pkgver/amqp-client-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --verbose \ + -p amqp-client,amqp-client-lwt +} + +check() { + dune runtest --build-dir=.testenv --verbose \ + -p amqp-client,amqp-client-lwt +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit \ + amqp-client amqp-client-lwt +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +921c3f4d0d655dc5caa5c89fe8c4309a6e22d91167676062e0e73f3007b0b5de20e7b461aefdddca6dbdf716d57d90eaefb7e974ae218cce0f0a20fb461c965d amqp-client-2.3.0.tar.gz +" diff --git a/testing/ocaml-angstrom/APKBUILD b/testing/ocaml-angstrom/APKBUILD index 4d521e4c8f6..a42f7378ad6 100644 --- a/testing/ocaml-angstrom/APKBUILD +++ b/testing/ocaml-angstrom/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.16.0 pkgrel=0 pkgdesc="Parser combinators built for speed and memory-efficiency" url="https://github.com/inhabitedtype/angstrom" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-bigstringaf-dev ocaml-lwt-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-arp/APKBUILD b/testing/ocaml-arp/APKBUILD index 7045d346f9f..c22a298123e 100644 --- a/testing/ocaml-arp/APKBUILD +++ b/testing/ocaml-arp/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.0.0 pkgrel=3 pkgdesc="Address Resolution Protocol purely in OCaml" url="https://github.com/mirage/arp" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" # ocaml-bisect_ppx only needed for dev depends_dev=" diff --git a/testing/ocaml-asn1-combinators/APKBUILD b/testing/ocaml-asn1-combinators/APKBUILD index aee2592c501..12a7420c85b 100644 --- a/testing/ocaml-asn1-combinators/APKBUILD +++ b/testing/ocaml-asn1-combinators/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.2.6 pkgrel=2 pkgdesc="Embed typed ASN.1 grammars in OCaml" url="https://github.com/mirleft/ocaml-asn1-combinators" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" # ocaml-zarith is not separated into a -dev subpackage depends_dev=" diff --git a/testing/ocaml-astring/APKBUILD b/testing/ocaml-astring/APKBUILD index e33243d33b2..7b84534b292 100644 --- a/testing/ocaml-astring/APKBUILD +++ b/testing/ocaml-astring/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.8.5 pkgrel=2 pkgdesc="Alternative String module for OCaml" url="https://erratique.ch/software/astring" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-atd/APKBUILD b/testing/ocaml-atd/APKBUILD new file mode 100644 index 00000000000..37b049e44b1 --- /dev/null +++ b/testing/ocaml-atd/APKBUILD @@ -0,0 +1,93 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-atd +pkgver=2.15.0 +pkgrel=0 +_pkgreal=atd +pkgdesc="Adjustable Type Definitions" +url="https://github.com/ahrefs/atd" +arch="all !riscv64 !loongarch64" # ocaml +license="MIT" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-biniou-dev + ocaml-easy-format-dev + ocaml-re-dev + ocaml-yojson-dev + " +makedepends=" + $depends_dev + dune + ocaml + ocaml-cmdliner-dev + ocaml-menhir + " +checkdepends=" + ocaml-alcotest-dev + py3-jsonschema + " +subpackages="$pkgname-dev" +source="$_pkgreal-$pkgver.tar.bz2::https://github.com/ahrefs/atd/releases/download/$pkgver/atd-$pkgver.tbz + disable-ocaml-internals-test.patch + " +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv \ + -p atd,atdgen,atdgen-codec-runtime,atdgen-runtime,atdts +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +33b7943ae6afd14e5a0709d9131d288e663d3f2b962caa065f1b11db8f6adfe081becba7968c8596b3ff2420577295ac248d521858cb0748e95971390eb29829 atd-2.15.0.tar.bz2 +0b41d1224f770ca868c09548716c01a8c8f4508cd790f4d8b39afbc602365e197369d4d2fd766a6ab06d002e376e112525768b6b20b732ace6b56037f0b9f71d disable-ocaml-internals-test.patch +" diff --git a/testing/ocaml-atd/disable-ocaml-internals-test.patch b/testing/ocaml-atd/disable-ocaml-internals-test.patch new file mode 100644 index 00000000000..13789ce7f80 --- /dev/null +++ b/testing/ocaml-atd/disable-ocaml-internals-test.patch @@ -0,0 +1,11 @@ +--- a/atdgen/test/test_atdgen_main.ml ++++ b/atdgen/test/test_atdgen_main.ml +@@ -675,7 +675,7 @@ + check (encoded = input) + + let all_tests : (string * (unit -> unit)) list = [ +- "ocaml internals", test_ocaml_internals; ++(*"ocaml internals", test_ocaml_internals;*) + "biniou missing record fields", test_biniou_missing_field; + "biniou missing tuple fields", test_biniou_missing_cell; + "biniou read/write unit", test_biniou_read_write_unit; diff --git a/testing/ocaml-base/APKBUILD b/testing/ocaml-base/APKBUILD index 569c466e3b1..43fd9208c68 100644 --- a/testing/ocaml-base/APKBUILD +++ b/testing/ocaml-base/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.16.3 pkgrel=0 pkgdesc="Full standard library replacement for OCaml" url="https://github.com/janestreet/base" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-sexplib0-dev" makedepends="$depends_dev dune dune-configurator ocaml ocaml-compiler-libs" diff --git a/testing/ocaml-base64/APKBUILD b/testing/ocaml-base64/APKBUILD index 24ef16c4250..272311c991d 100644 --- a/testing/ocaml-base64/APKBUILD +++ b/testing/ocaml-base64/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.5.0 pkgrel=2 pkgdesc="Base64 encoding for OCaml" url="https://github.com/mirage/ocaml-base64" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml" diff --git a/testing/ocaml-bigarray-compat/APKBUILD b/testing/ocaml-bigarray-compat/APKBUILD index 8acb35c4a68..c2946c7961d 100644 --- a/testing/ocaml-bigarray-compat/APKBUILD +++ b/testing/ocaml-bigarray-compat/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.1.0 pkgrel=2 pkgdesc="Compatibility library to use Stdlib.Bigarray when possible" url="https://github.com/mirage/bigarray-compat" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" options="!check" diff --git a/testing/ocaml-bigstringaf/APKBUILD b/testing/ocaml-bigstringaf/APKBUILD index c2c9b1d875c..3f67f25a426 100644 --- a/testing/ocaml-bigstringaf/APKBUILD +++ b/testing/ocaml-bigstringaf/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.9.0 pkgrel=2 pkgdesc="Bigstring intrinsics and fast blits based on memcpy/memmove" url="https://github.com/inhabitedtype/bigstringaf" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml" diff --git a/testing/ocaml-biniou/APKBUILD b/testing/ocaml-biniou/APKBUILD index 782e14b56d5..79a3a58f6f9 100644 --- a/testing/ocaml-biniou/APKBUILD +++ b/testing/ocaml-biniou/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.2.1 pkgrel=5 pkgdesc="Extensible binary data format, like JSON but faster" url="https://github.com/ocaml-community/biniou" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml ocaml-easy-format-dev ocaml-findlib" diff --git a/testing/ocaml-bisect_ppx/APKBUILD b/testing/ocaml-bisect_ppx/APKBUILD index 326fdb4929c..dee6025c47e 100644 --- a/testing/ocaml-bisect_ppx/APKBUILD +++ b/testing/ocaml-bisect_ppx/APKBUILD @@ -6,7 +6,7 @@ pkgver=2.8.3 pkgrel=0 pkgdesc="Code coverage for OCaml" url="https://github.com/aantron/bisect_ppx" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-bitstring/APKBUILD b/testing/ocaml-bitstring/APKBUILD index f00fe1bc8b0..697f54c3c86 100644 --- a/testing/ocaml-bitstring/APKBUILD +++ b/testing/ocaml-bitstring/APKBUILD @@ -6,7 +6,7 @@ pkgver=4.1.0 pkgrel=3 pkgdesc="Erlang-style bitstrings for OCaml" url="https://github.com/xguerin/bitstring" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.0-or-later" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-bos/APKBUILD b/testing/ocaml-bos/APKBUILD index 56f27f9f62f..0e0859abc27 100644 --- a/testing/ocaml-bos/APKBUILD +++ b/testing/ocaml-bos/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.2.1 pkgrel=2 pkgdesc="Basic OS interaction for OCaml" url="https://erratique.ch/software/bos" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-ca-certs-nss/APKBUILD b/testing/ocaml-ca-certs-nss/APKBUILD index 2c666c191ce..17a16aaf261 100644 --- a/testing/ocaml-ca-certs-nss/APKBUILD +++ b/testing/ocaml-ca-certs-nss/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.89.1 pkgrel=1 pkgdesc="X.509 trust anchors extracted from Mozilla's NSS" url="https://github.com/mirage/ca-certs-nss" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-ca-certs/APKBUILD b/testing/ocaml-ca-certs/APKBUILD index e0e1822dcd3..834292bc984 100644 --- a/testing/ocaml-ca-certs/APKBUILD +++ b/testing/ocaml-ca-certs/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.2.2 pkgrel=2 pkgdesc="Detect root CA certificates from the operating system" url="https://github.com/mirage/ca-certs" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-cairo2/APKBUILD b/testing/ocaml-cairo2/APKBUILD index e60284dcbb5..0ff0a866016 100644 --- a/testing/ocaml-cairo2/APKBUILD +++ b/testing/ocaml-cairo2/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.6.2 pkgrel=2 pkgdesc="OCaml bindings to Cairo, a 2D Vector Graphics Library" url="https://github.com/Chris00/ocaml-cairo" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-3.0-only" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-calendar/APKBUILD b/testing/ocaml-calendar/APKBUILD index a80eb730913..d58c15b9095 100644 --- a/testing/ocaml-calendar/APKBUILD +++ b/testing/ocaml-calendar/APKBUILD @@ -6,7 +6,7 @@ pkgver=2.04 pkgrel=4 pkgdesc="Objective Caml library for managing dates and times" url="https://forge.ocamlcore.org/projects/calendar/" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" makedepends="ocaml ocaml-findlib-dev ocaml-ocamldoc gawk" subpackages="$pkgname-dev $pkgname-doc" diff --git a/testing/ocaml-camlzip/APKBUILD b/testing/ocaml-camlzip/APKBUILD index 91635e3bda3..4b24ebb8cc4 100644 --- a/testing/ocaml-camlzip/APKBUILD +++ b/testing/ocaml-camlzip/APKBUILD @@ -7,7 +7,7 @@ _pkgver="rel${pkgver//./}" pkgrel=2 pkgdesc="Access compressed files in ZIP, GZIP and JAR format" url="https://github.com/xavierleroy/camlzip" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="ocaml ocaml-findlib zlib-dev" diff --git a/testing/ocaml-camomile/APKBUILD b/testing/ocaml-camomile/APKBUILD index 8143e67d2f1..1ac56963d75 100644 --- a/testing/ocaml-camomile/APKBUILD +++ b/testing/ocaml-camomile/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.0.2 pkgrel=3 pkgdesc="A Unicode library for OCaml" url="https://github.com/yoriyuki/Camomile" -arch="all !riscv64" # restricted by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.0-or-later" depends="$pkgname-data=$pkgver-r$pkgrel" depends_dev="$pkgname=$pkgver-r$pkgrel" diff --git a/testing/ocaml-charinfo_width/APKBUILD b/testing/ocaml-charinfo_width/APKBUILD index 68a06dfd27d..cd984f54d78 100644 --- a/testing/ocaml-charinfo_width/APKBUILD +++ b/testing/ocaml-charinfo_width/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.1.0 pkgrel=3 pkgdesc="Determine column width for a character in OCaml" url="https://github.com/kandu/charinfo_width/" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-camomile-dev ocaml-result-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-cmdliner/APKBUILD b/testing/ocaml-cmdliner/APKBUILD index de667af8de6..a029a7768c2 100644 --- a/testing/ocaml-cmdliner/APKBUILD +++ b/testing/ocaml-cmdliner/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.1.1 pkgrel=3 pkgdesc="Declarative definition of command line interfaces for OCaml" url="https://erratique.ch/software/cmdliner" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="ocaml" diff --git a/testing/ocaml-cohttp/APKBUILD b/testing/ocaml-cohttp/APKBUILD new file mode 100644 index 00000000000..0875b73fabf --- /dev/null +++ b/testing/ocaml-cohttp/APKBUILD @@ -0,0 +1,107 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-cohttp +pkgver=5.3.1 +pkgrel=0 +_pkgreal=cohttp +pkgdesc="Library for HTTP clients and servers" +url="https://github.com/mirage/ocaml-cohttp" +arch="all !riscv64 !loongarch64" # ocaml +license="ISC" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-base64-dev + ocaml-conduit-dev + ocaml-fmt-dev + ocaml-logs-dev + ocaml-lwt-dev + ocaml-magic-mime-dev + ocaml-ppx_sexp_conv-dev + ocaml-uri-dev + " +makedepends=" + $depends_dev + dune + ocaml + ocaml-cmdliner-dev + ocaml-jsonm-dev + " +checkdepends=" + ocaml-alcotest-dev + ocaml-ounit-dev + " +options="!check" # requires unpackaged crowbar +subpackages=" + $pkgname-dev + $pkgname-tools + " +source="$_pkgreal-$pkgver.tar.bz2::https://github.com/mirage/ocaml-cohttp/releases/download/v$pkgver/cohttp-$pkgver.tbz" +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --verbose \ + -p cohttp,cohttp-top,cohttp-lwt,cohttp-lwt-unix +} + +check() { + dune runtest --build-dir=.testenv --verbose \ + -p cohttp,cohttp-top,cohttp-lwt,cohttp-lwt-unix +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit \ + cohttp cohttp-top cohttp-lwt cohttp-lwt-unix +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +tools() { + pkgdesc="$pkgdesc (command line utilities)" + depends= + + amove usr/bin +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +26580405fc33cd7e05b2c91732df97da9ba609d7392e5779be601aa65e34f1991d2b0ae2870ac29e57567f583dc0e13e61d3c4a74c7ac21012453acb33a37ae3 cohttp-5.3.1.tar.bz2 +" diff --git a/testing/ocaml-compiler-libs-repackaged/APKBUILD b/testing/ocaml-compiler-libs-repackaged/APKBUILD index 5d6eacdd7c1..bbf75db047e 100644 --- a/testing/ocaml-compiler-libs-repackaged/APKBUILD +++ b/testing/ocaml-compiler-libs-repackaged/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.12.4 pkgrel=3 pkgdesc="OCaml compiler libraries repackaged to not expose everything at toplevel" url="https://github.com/janestreet/ocaml-compiler-libs" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-compiler-libs" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-conduit/APKBUILD b/testing/ocaml-conduit/APKBUILD new file mode 100644 index 00000000000..e4286e73fbf --- /dev/null +++ b/testing/ocaml-conduit/APKBUILD @@ -0,0 +1,93 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-conduit +pkgver=6.1.0 +pkgrel=0 +_pkgreal=conduit +pkgdesc="Network connection establishment library" +url="https://github.com/mirage/ocaml-conduit" +arch="all !riscv64 !loongarch64" # ocaml +license="ISC" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-astring-dev + ocaml-ca-certs-dev + ocaml-ipaddr-dev + ocaml-logs-dev + ocaml-lwt-dev + ocaml-lwt_ssl-dev + ocaml-ppx_sexp_conv-dev + ocaml-sexplib-dev + ocaml-tls-dev + ocaml-uri-dev + " +makedepends=" + $depends_dev + dune + ocaml + " +checkdepends="ocaml-lwt_log-dev" +subpackages="$pkgname-dev" +source="$_pkgreal-$pkgver.tar.bz2::https://github.com/mirage/ocaml-conduit/releases/download/v$pkgver/conduit-$pkgver.tbz" +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --verbose \ + -p conduit,conduit-lwt,conduit-lwt-unix +} + +check() { + dune runtest --build-dir=.testenv --verbose \ + -p conduit,conduit-lwt,conduit-lwt-unix +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit \ + conduit conduit-lwt conduit-lwt-unix +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +308041a9cccf5b01827365ae9e75915bf33c812658ff1a802b275827f4c9af98dd991df9106a5b8d70374cc0d41398621bbafd8de829acfef4cb86e6b9523712 conduit-6.1.0.tar.bz2 +" diff --git a/testing/ocaml-containers/APKBUILD b/testing/ocaml-containers/APKBUILD index f38b6b5b006..e2a05ef6ed4 100644 --- a/testing/ocaml-containers/APKBUILD +++ b/testing/ocaml-containers/APKBUILD @@ -5,7 +5,7 @@ pkgver=3.7 pkgrel=2 pkgdesc="Modular, clean and powerful extension of the OCaml standard library" url="https://github.com/c-cube/ocaml-containers/" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-2-Clause" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-compiler-libs" makedepends="$depends_dev dune dune-configurator ocaml" diff --git a/testing/ocaml-cstruct/APKBUILD b/testing/ocaml-cstruct/APKBUILD index 067709d3b76..6d7a231db6a 100644 --- a/testing/ocaml-cstruct/APKBUILD +++ b/testing/ocaml-cstruct/APKBUILD @@ -6,7 +6,7 @@ pkgver=6.1.0 pkgrel=3 pkgdesc="Access C-like structures directly from OCaml" url="https://github.com/mirage/ocaml-cstruct" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-ctypes/APKBUILD b/testing/ocaml-ctypes/APKBUILD index c349b681ad3..af036b48ce3 100644 --- a/testing/ocaml-ctypes/APKBUILD +++ b/testing/ocaml-ctypes/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.20.1 pkgrel=2 pkgdesc="Combinators for binding to C libraries without writing any C" url="https://github.com/ocamllabs/ocaml-ctypes" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-curses/APKBUILD b/testing/ocaml-curses/APKBUILD index c2ff33099e8..db32edee067 100644 --- a/testing/ocaml-curses/APKBUILD +++ b/testing/ocaml-curses/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.0.10 pkgrel=2 pkgdesc="OCaml bindings for ncurses" url="https://github.com/mbacarella/curses" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune dune-configurator-dev ncurses-dev ocaml ocaml-csexp-dev" diff --git a/testing/ocaml-dns/APKBUILD b/testing/ocaml-dns/APKBUILD index 8af9412d7c9..041acd874ec 100644 --- a/testing/ocaml-dns/APKBUILD +++ b/testing/ocaml-dns/APKBUILD @@ -6,7 +6,7 @@ pkgver=6.2.2 pkgrel=3 pkgdesc="An opinionated Domain Name System (DNS) library" url="https://github.com/mirage/ocaml-dns" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-2-Clause" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-domain-name/APKBUILD b/testing/ocaml-domain-name/APKBUILD index f733e41da15..2ebe82a1a7b 100644 --- a/testing/ocaml-domain-name/APKBUILD +++ b/testing/ocaml-domain-name/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.4.0 pkgrel=2 pkgdesc="RFC 1035 Internet domain names" url="https://github.com/hannesm/domain-name" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml" diff --git a/testing/ocaml-down/APKBUILD b/testing/ocaml-down/APKBUILD index d2bf591036e..c2ad2432cf4 100644 --- a/testing/ocaml-down/APKBUILD +++ b/testing/ocaml-down/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.1.0 pkgrel=3 pkgdesc="OCaml toplevel (REPL) upgrade" url="https://erratique.ch/software/down" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-duration/APKBUILD b/testing/ocaml-duration/APKBUILD index e89c9e9e70b..40bdfe125bc 100644 --- a/testing/ocaml-duration/APKBUILD +++ b/testing/ocaml-duration/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.2.0 pkgrel=2 pkgdesc="Conversions to various time units" url="https://github.com/hannesm/duration" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml" diff --git a/testing/ocaml-easy-format/APKBUILD b/testing/ocaml-easy-format/APKBUILD index 6bc689d0ddd..c3368797c34 100644 --- a/testing/ocaml-easy-format/APKBUILD +++ b/testing/ocaml-easy-format/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.3.4 pkgrel=1 pkgdesc="Pretty-printing library for OCaml" url="https://mjambon.github.io/mjambon2016/easy-format.html" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml ocaml-findlib" diff --git a/testing/ocaml-eqaf/APKBUILD b/testing/ocaml-eqaf/APKBUILD index 33d9d353745..3370a6d549d 100644 --- a/testing/ocaml-eqaf/APKBUILD +++ b/testing/ocaml-eqaf/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.8 pkgrel=2 pkgdesc="Constant-time equal function on string" url="https://github.com/mirage/eqaf" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-cstruct-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-erm_xml/APKBUILD b/testing/ocaml-erm_xml/APKBUILD index c7419151f2b..547f3f71e78 100644 --- a/testing/ocaml-erm_xml/APKBUILD +++ b/testing/ocaml-erm_xml/APKBUILD @@ -7,7 +7,7 @@ _commit=a2b4db61ca93dc265ca47b51d01fa147d3b267c3 pkgrel=2 pkgdesc="XML stream parser for OCaml" url="https://github.com/hannesm/xml" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-erm_xmpp/APKBUILD b/testing/ocaml-erm_xmpp/APKBUILD index 21e629edc71..adf56522a1d 100644 --- a/testing/ocaml-erm_xmpp/APKBUILD +++ b/testing/ocaml-erm_xmpp/APKBUILD @@ -7,9 +7,7 @@ _commit=e54d54e142ac9770c37e144693473692bf473530 pkgrel=2 pkgdesc="XMPP protocol implementation for OCaml" url="https://github.com/hannesm/xmpp" -# riscv64: restricted by ocaml aport -# ppc64le: ocamlbuild terminated with error code 10 -arch="all !riscv64 !ppc64le" +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends_dev=" $pkgname=$pkgver-r$pkgrel @@ -36,6 +34,12 @@ case "$CARCH" in esac build() { + # Workaround ocamlbuild terminating with error code 10 + if [ "$CARCH" = ppc64le ]; then + ulimit -Hs unlimited + ulimit -Ss 65536 + fi + ocaml setup.ml -configure --prefix /usr ocaml setup.ml -build } diff --git a/testing/ocaml-ethernet/APKBUILD b/testing/ocaml-ethernet/APKBUILD index dfbf2529c87..da3a5cdd1a0 100644 --- a/testing/ocaml-ethernet/APKBUILD +++ b/testing/ocaml-ethernet/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.0.0 pkgrel=3 pkgdesc="OCaml Ethernet (IEEE 802.3) layer, used in MirageOS" url="https://github.com/mirage/ethernet" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-extlib/APKBUILD b/testing/ocaml-extlib/APKBUILD index 51f0755db60..51bcf7a895a 100644 --- a/testing/ocaml-extlib/APKBUILD +++ b/testing/ocaml-extlib/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.7.9 pkgrel=2 pkgdesc="OCaml ExtLib additions to the standard library" url="https://github.com/ygrek/ocaml-extlib" -arch="all !riscv64" # limited by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" makedepends="ocaml ocaml-findlib-dev ocaml-ocamldoc ocaml-cppo gawk" subpackages="$pkgname-dev $pkgname-doc" diff --git a/testing/ocaml-ezxmlm/APKBUILD b/testing/ocaml-ezxmlm/APKBUILD new file mode 100644 index 00000000000..96ae526feef --- /dev/null +++ b/testing/ocaml-ezxmlm/APKBUILD @@ -0,0 +1,80 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-ezxmlm +pkgver=1.1.0 +pkgrel=0 +_pkgreal=ezxmlm +pkgdesc="Combinators for parsing and selection of XML structures" +url="https://github.com/mirage/ezxmlm" +arch="all !riscv64 !loongarch64" # ocaml +license="ISC" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-xmlm-dev + " +makedepends=" + $depends_dev + dune + ocaml + " +subpackages="$pkgname-dev" +source="$_pkgreal-$pkgver.tar.bz2::https://github.com/mirage/ezxmlm/releases/download/v$pkgver/ezxmlm-v$pkgver.tbz" +builddir="$srcdir/$_pkgreal-v$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv --verbose +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +fe2cc062197730f07b62443b068e67c23e53e984dee9e864bea808a2cdd3a2922c892e6f34867620aa1d5a837c8f4f96f2c187c348d1991b7383a2579860c96f ezxmlm-1.1.0.tar.bz2 +" diff --git a/testing/ocaml-fileutils/APKBUILD b/testing/ocaml-fileutils/APKBUILD index c8270af31fe..cfae1523bb4 100644 --- a/testing/ocaml-fileutils/APKBUILD +++ b/testing/ocaml-fileutils/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.6.4 pkgrel=2 pkgdesc="OCaml library for common file and filename operations" url="https://github.com/gildor478/ocaml-fileutils" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" makedepends=" dune diff --git a/testing/ocaml-fix/APKBUILD b/testing/ocaml-fix/APKBUILD index 401bff3cb85..74418e51f52 100644 --- a/testing/ocaml-fix/APKBUILD +++ b/testing/ocaml-fix/APKBUILD @@ -7,7 +7,7 @@ _commit=a288f05de716bcc9e82527f4cf440f9aebe965ae pkgrel=2 pkgdesc="Algorithmic building blocks for memoization, recursion, and more" url="https://gitlab.inria.fr/fpottier/fix" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.0-only" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml" diff --git a/testing/ocaml-fmt/APKBUILD b/testing/ocaml-fmt/APKBUILD index 96a891ac51d..2b7d09c157e 100644 --- a/testing/ocaml-fmt/APKBUILD +++ b/testing/ocaml-fmt/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.9.0 pkgrel=2 pkgdesc="OCaml Format pretty-printer combinators" url="https://erratique.ch/software/fmt" -arch="all !riscv64" # restricted by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-fpath/APKBUILD b/testing/ocaml-fpath/APKBUILD index 2243b11b49c..c9ff5554f74 100644 --- a/testing/ocaml-fpath/APKBUILD +++ b/testing/ocaml-fpath/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.7.3 pkgrel=2 pkgdesc="File system paths for OCaml" url="https://erratique.ch/software/fpath" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-astring-dev" makedepends=" diff --git a/testing/ocaml-gen/APKBUILD b/testing/ocaml-gen/APKBUILD index b2605c9f89d..8ba01db9d2e 100644 --- a/testing/ocaml-gen/APKBUILD +++ b/testing/ocaml-gen/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.1 pkgrel=1 pkgdesc="Simple, efficient iterators for OCaml" url="https://github.com/c-cube/gen/" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-2-Clause" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-seq-dev" makedepends="$depends_dev dune dune-configurator ocaml" diff --git a/testing/ocaml-gettext/APKBUILD b/testing/ocaml-gettext/APKBUILD index f2f46586365..7869035f1c4 100644 --- a/testing/ocaml-gettext/APKBUILD +++ b/testing/ocaml-gettext/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.4.2 pkgrel=3 pkgdesc="OCaml library for i18n" url="https://github.com/gildor478/ocaml-gettext" -arch="all !riscv64" # limited by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" makedepends=" autoconf diff --git a/testing/ocaml-gitlab/APKBUILD b/testing/ocaml-gitlab/APKBUILD new file mode 100644 index 00000000000..1dfcc2c339a --- /dev/null +++ b/testing/ocaml-gitlab/APKBUILD @@ -0,0 +1,107 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-gitlab +pkgver=0.1.8 +pkgrel=0 +_pkgreal=gitlab +pkgdesc="GitLab APIv4 OCaml library" +url="https://github.com/tmcgilchrist/ocaml-gitlab" +arch="all !riscv64 !loongarch64" # ocaml +license="BSD-3-Clause" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-atd-dev + ocaml-cmdliner-dev + ocaml-cohttp-dev + ocaml-fmt-dev + ocaml-iso8601-dev + ocaml-otoml-dev + ocaml-stringext-dev + ocaml-uri-dev + ocaml-yojson-dev + " +makedepends=" + $depends_dev + dune + ocaml + ocaml-menhir + " +checkdepends="ocaml-alcotest-dev" +options="!check" # requires unpackaged ocaml-mdx +subpackages=" + olab + $pkgname-dev + " +source="$pkgname-$pkgver.tar.bz2::https://github.com/tmcgilchrist/ocaml-gitlab/releases/download/$pkgver/gitlab-$pkgver.tbz + rename-to-olab.patch + " +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --verbose \ + -p gitlab,gitlab-unix,lab +} + +check() { + dune runtest --build-dir=.testenv --verbose \ + -p gitlab,gitlab-unix,lab +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit \ + gitlab gitlab-unix lab +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +olab() { + pkgdesc="$pkgdesc (command line tool)" + depends= + + amove usr/bin/olab +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +04c5c7131fa5a630edd0d2c605084fb37bb6a4d875b208450bf3b3fb70dc17da0f9ed8de04271e4eea62168d77dbcdda139aa7fe1a40f06f6c6cfb4407c47680 ocaml-gitlab-0.1.8.tar.bz2 +c4d765e2824e72acab9b0b810ac8c6b1a8a25c46477009bebaf8572319fa9d5ba83b5c9296d24fb41162ed20f8ebc2dfe5c9467135b25865ee4fdfdf2b481660 rename-to-olab.patch +" diff --git a/testing/ocaml-gitlab/rename-to-olab.patch b/testing/ocaml-gitlab/rename-to-olab.patch new file mode 100644 index 00000000000..c29bc92a512 --- /dev/null +++ b/testing/ocaml-gitlab/rename-to-olab.patch @@ -0,0 +1,36 @@ +--- a/cli/dune ++++ b/cli/dune +@@ -1,7 +1,7 @@ + (executable + (libraries cohttp-lwt-unix gitlab-unix cmdliner otoml fmt) + (package lab) +- (public_name lab) ++ (public_name olab) + (modules main api config issue merge_request project user runner project_hook) + (name main)) + +--- a/cli/main.ml ++++ b/cli/main.ml +@@ -9,7 +9,7 @@ + [ + `S "DESCRIPTION"; + `P +- "Lab is a tool that wraps git in order to extend it with extra \ ++ "OLab is a tool that wraps git in order to extend it with extra \ + functionality that makes it better when working with GitLab."; + `S "BUGS"; + `P "<https://github.com/tmcgilchrist/ocaml-gitlab/issues>"; +@@ -17,11 +17,11 @@ + `P "<https://github.com/tmcgilchrist/ocaml-gitlab>"; + `S "FEEDBACK"; + `P +- "Open an issue using 'lab issue create -R \ ++ "Open an issue using 'gh issue create -R \ + github.com/tmcgilchrist/ocaml-gitlab' "; + ] + in +- let info = Cmd.info ~envs "lab" ~version:"0.1.8" ~doc ~man in ++ let info = Cmd.info ~envs "olab" ~version:"0.1.8" ~doc ~man in + let config = Config.from_file in + Cmd.group ~default info + [ diff --git a/testing/ocaml-gmap/APKBUILD b/testing/ocaml-gmap/APKBUILD index deb195ce11c..11989d3cb1c 100644 --- a/testing/ocaml-gmap/APKBUILD +++ b/testing/ocaml-gmap/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.3.0 pkgrel=2 pkgdesc="Heterogenous maps over a GADT" url="https://github.com/hannesm/gmap" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml" diff --git a/testing/ocaml-happy-eyeballs-lwt/APKBUILD b/testing/ocaml-happy-eyeballs-lwt/APKBUILD index e7f36c002cc..4613bce1c02 100644 --- a/testing/ocaml-happy-eyeballs-lwt/APKBUILD +++ b/testing/ocaml-happy-eyeballs-lwt/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.3.0 pkgrel=3 pkgdesc="Connecting to a remote host via IP version 4 or 6 using Lwt_unix" url="https://github.com/roburio/happy-eyeballs" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-happy-eyeballs/APKBUILD b/testing/ocaml-happy-eyeballs/APKBUILD index 79fb13c622c..f54e500f047 100644 --- a/testing/ocaml-happy-eyeballs/APKBUILD +++ b/testing/ocaml-happy-eyeballs/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.3.0 pkgrel=2 pkgdesc="Connecting to a remote host via IP version 4 or 6" url="https://github.com/roburio/happy-eyeballs" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-hex/APKBUILD b/testing/ocaml-hex/APKBUILD index 872839acaca..e9a1c509dea 100644 --- a/testing/ocaml-hex/APKBUILD +++ b/testing/ocaml-hex/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.5.0 pkgrel=2 pkgdesc="Library providing hexadecimal converters" url="https://github.com/mirage/ocaml-hex" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-cstruct-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-higlo/APKBUILD b/testing/ocaml-higlo/APKBUILD new file mode 100644 index 00000000000..a34f4f3d30f --- /dev/null +++ b/testing/ocaml-higlo/APKBUILD @@ -0,0 +1,81 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-higlo +pkgver=0.9 +pkgrel=0 +_pkgreal=higlo +pkgdesc="Syntax highlighting library" +url="https://framagit.org/zoggy/higlo" +arch="all !riscv64 !loongarch64" # ocaml +license="LGPL-3.0-only" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-sedlex-dev + ocaml-xtmpl-dev + " +makedepends=" + $depends_dev + dune + ocaml + " +subpackages="$pkgname-dev" +source="https://framagit.org/zoggy/higlo/-/archive/$pkgver/higlo-$pkgver.tar.bz2" +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv --verbose +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +725257959797b13814e5ba90ccf500770bc8cfba58916c07c64babf84d76074195a7c38e3e0593719f20b02888d7316df2c9451343c30af8a20a07868c076255 higlo-0.9.tar.bz2 +" diff --git a/testing/ocaml-hkdf/APKBUILD b/testing/ocaml-hkdf/APKBUILD index 4c22201ccdb..9b54721127c 100644 --- a/testing/ocaml-hkdf/APKBUILD +++ b/testing/ocaml-hkdf/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.0.4 pkgrel=2 pkgdesc="HMAC-based Extract-and-Expand Key Derivation Function (RFC 5869)" url="https://github.com/hannesm/ocaml-hkdf" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-2-Clause" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-integers/APKBUILD b/testing/ocaml-integers/APKBUILD index f954a617718..53b4709dab8 100644 --- a/testing/ocaml-integers/APKBUILD +++ b/testing/ocaml-integers/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.7.0 pkgrel=2 pkgdesc="Various signed and unsigned integer types for OCaml" url="https://github.com/ocamllabs/ocaml-integers" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml ocaml-compiler-libs ocaml-stdlib-shims" diff --git a/testing/ocaml-ipaddr/APKBUILD b/testing/ocaml-ipaddr/APKBUILD index 8b2794044cd..ad0ffb7b618 100644 --- a/testing/ocaml-ipaddr/APKBUILD +++ b/testing/ocaml-ipaddr/APKBUILD @@ -7,7 +7,7 @@ pkgrel=2 pkgdesc="A library for manipulation of IP (and MAC) address representations" provides="ocaml-macaddr=$pkgver-r$pkgrel" url="https://github.com/mirage/ocaml-ipaddr" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-iri/APKBUILD b/testing/ocaml-iri/APKBUILD new file mode 100644 index 00000000000..2a64f0ace28 --- /dev/null +++ b/testing/ocaml-iri/APKBUILD @@ -0,0 +1,80 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-iri +pkgver=1.0.0 +pkgrel=0 +pkgdesc="Implementation of Internationalized Resource Identifiers (IRIs)" +url="https://framagit.org/zoggy/ocaml-iri" +arch="all !riscv64 !loongarch64" # ocaml +license="LGPL-3.0-only" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-sedlex-dev + ocaml-uunf-dev + ocaml-uutf-dev + " +makedepends=" + $depends_dev + dune + ocaml + " +subpackages="$pkgname-dev" +source="https://zoggy.frama.io/ocaml-iri/releases/ocaml-iri-$pkgver.tar.bz2" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv --verbose +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +dad58975f1f601a56c113c5646a7b3c29ae5eb1c505e17c6120f492634d867d961f3f5cda8198b6e2a3cd84d23b04e4d230683a325c3935da1655c129a328eee ocaml-iri-1.0.0.tar.bz2 +" diff --git a/testing/ocaml-iso8601/APKBUILD b/testing/ocaml-iso8601/APKBUILD new file mode 100644 index 00000000000..a67917eb52e --- /dev/null +++ b/testing/ocaml-iso8601/APKBUILD @@ -0,0 +1,74 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-iso8601 +pkgver=0.2.6 +pkgrel=0 +_pkgreal=ISO8601.ml +pkgdesc="ISO 8601 and RFC 3999 date parsing" +url="https://github.com/ocaml-community/ISO8601.ml" +arch="all !riscv64 !loongarch64" # ocaml +license="MIT" +depends_dev="$pkgname=$pkgver-r$pkgrel" +makedepends="dune ocaml" +checkdepends="ocaml-ounit-dev" +subpackages="$pkgname-dev" +source="$_pkgreal-$pkgver.tar.gz::https://github.com/ocaml-community/ISO8601.ml/archive/$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv --verbose +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +82b5cbbb636346e8d010ee569c0fad2f00bef31c3177cfee80fc02a081c5fcfb7880bf2670fe4f46423e3ae99370626c7efffc9d332cae5cbd6377c975517b3f ISO8601.ml-0.2.6.tar.gz +" diff --git a/testing/ocaml-jsonm/APKBUILD b/testing/ocaml-jsonm/APKBUILD new file mode 100644 index 00000000000..c9ef6db0d7c --- /dev/null +++ b/testing/ocaml-jsonm/APKBUILD @@ -0,0 +1,99 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-jsonm +pkgver=1.0.2 +pkgrel=0 +_pkgreal=jsonm +pkgdesc="Non-blocking streaming JSON codec" +url="https://erratique.ch/software/jsonm" +arch="all !riscv64 !loongarch64" # ocaml +license="ISC" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-uutf-dev + " +makedepends=" + $depends_dev + ocaml + ocamlbuild + ocaml-findlib + ocaml-topkg + cmd:opam-installer + " +subpackages=" + $pkgname-dev + $pkgname-tools + " +source="$_pkgreal-$pkgver.tar.bz2::https://erratique.ch/software/jsonm/releases/jsonm-$pkgver.tbz" +builddir="$srcdir/$_pkgreal-$pkgver" +_ocamldir=usr/lib/ocaml + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + ocaml pkg/pkg.ml build -v \ + --tests "$(want_check && echo true || echo false)" +} + +check() { + ocaml pkg/pkg.ml test -v +} + +package() { + opam-installer -i \ + --prefix="$pkgdir/usr" \ + --libdir="$pkgdir/$_ocamldir" \ + --docdir="$builddir/.omit" \ + $_pkgreal.install +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find $_ocamldir \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +tools() { + pkgdesc="$pkgdesc (command line utilities)" + depends= + + amove usr/bin +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +0072f5c31080202ed1cb996a8530d72c882723f26b597f784441033f59338ba8c0cbabf901794d5b1ae749a54af4d7ebf7b47987db43488c7f6ac7fe191a042f jsonm-1.0.2.tar.bz2 +" diff --git a/testing/ocaml-lablgtk3-extras/APKBUILD b/testing/ocaml-lablgtk3-extras/APKBUILD index 3441386d4c6..92685d3da4d 100644 --- a/testing/ocaml-lablgtk3-extras/APKBUILD +++ b/testing/ocaml-lablgtk3-extras/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.0.1 pkgrel=2 pkgdesc="Additional tools and libraries for ocaml-lablgtk3" url="https://zoggy.frama.io/lablgtk-extras/" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-3.0-only" # lablgtk3-sourceview3 is bundled together in ocaml-lablgtk3 depends_dev=" diff --git a/testing/ocaml-lablgtk3/APKBUILD b/testing/ocaml-lablgtk3/APKBUILD index 80c7dbf211e..fcb65971d71 100644 --- a/testing/ocaml-lablgtk3/APKBUILD +++ b/testing/ocaml-lablgtk3/APKBUILD @@ -7,7 +7,7 @@ pkgrel=3 pkgdesc="OCaml interface to GTK+3" provides="$pkgname-sourceview3=$pkgver-r$pkgrel" url="https://github.com/garrigue/lablgtk" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-labltk/APKBUILD b/testing/ocaml-labltk/APKBUILD index fcd4cece26a..be36cb6d40a 100644 --- a/testing/ocaml-labltk/APKBUILD +++ b/testing/ocaml-labltk/APKBUILD @@ -7,7 +7,7 @@ pkgrel=2 _ocamlver=4.14 pkgdesc="Tcl/Tk interface for OCaml" url="https://garrigue.github.io/labltk/" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-lambda-term/APKBUILD b/testing/ocaml-lambda-term/APKBUILD index c790440b94a..922fd1a07b7 100644 --- a/testing/ocaml-lambda-term/APKBUILD +++ b/testing/ocaml-lambda-term/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.2.0 pkgrel=4 pkgdesc="Terminal manipulation library for OCaml" url="https://github.com/ocaml-community/lambda-term" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" # ocaml-lwt_react-dev is provided by ocaml-lwt-dev depends_dev=" diff --git a/testing/ocaml-lambdasoup/APKBUILD b/testing/ocaml-lambdasoup/APKBUILD index d8b2c00cf11..c5466e26b31 100644 --- a/testing/ocaml-lambdasoup/APKBUILD +++ b/testing/ocaml-lambdasoup/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.7.3 pkgrel=2 pkgdesc="Easy functional HTML scraping and manipulation with CSS selectors" url="https://github.com/aantron/lambdasoup" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel" checkdepends="ocaml-result-dev ocaml-ounit-dev" diff --git a/testing/ocaml-libvirt/APKBUILD b/testing/ocaml-libvirt/APKBUILD index b77bd6ebea6..644bc4311b3 100644 --- a/testing/ocaml-libvirt/APKBUILD +++ b/testing/ocaml-libvirt/APKBUILD @@ -6,8 +6,7 @@ pkgver=0.6.1.7 pkgrel=0 pkgdesc="OCaml binding for libvirt" url="https://libvirt.org/ocaml/" -# riscv64: limited by ocaml aport -arch="all !riscv64" +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" makedepends="autoconf automake ocaml ocaml-findlib-dev libvirt-dev perl gawk" subpackages="$pkgname-dev $pkgname-doc" diff --git a/testing/ocaml-logs/APKBUILD b/testing/ocaml-logs/APKBUILD index b32ba37b00f..955f628897d 100644 --- a/testing/ocaml-logs/APKBUILD +++ b/testing/ocaml-logs/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.7.0 pkgrel=3 pkgdesc="Logging infrastructure for OCaml" url="https://erratique.ch/software/logs" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-lru/APKBUILD b/testing/ocaml-lru/APKBUILD index 973a027fa7e..20c73e74cd5 100644 --- a/testing/ocaml-lru/APKBUILD +++ b/testing/ocaml-lru/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.3.0 pkgrel=2 pkgdesc="Scalable LRU caches" url="https://github.com/pqwy/lru" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-psq-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-lwd/APKBUILD b/testing/ocaml-lwd/APKBUILD index 4806db47b13..63b250ca342 100644 --- a/testing/ocaml-lwd/APKBUILD +++ b/testing/ocaml-lwd/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.3 pkgrel=0 pkgdesc="Lightweight reactive documents" url="https://github.com/let-def/lwd" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-lwt-dllist/APKBUILD b/testing/ocaml-lwt-dllist/APKBUILD index eef608cca45..450aa169833 100644 --- a/testing/ocaml-lwt-dllist/APKBUILD +++ b/testing/ocaml-lwt-dllist/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.0.1 pkgrel=3 pkgdesc="Mutable doubly-linked list with Lwt iterators" url="https://github.com/mirage/lwt-dllist" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-lwt-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-lwt/APKBUILD b/testing/ocaml-lwt/APKBUILD index 31238be27f3..d989c294f6b 100644 --- a/testing/ocaml-lwt/APKBUILD +++ b/testing/ocaml-lwt/APKBUILD @@ -6,7 +6,7 @@ pkgver=5.7.0 pkgrel=0 pkgdesc="OCaml promises and concurrent I/O" url="https://github.com/ocsigen/lwt" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev=" libev-dev diff --git a/testing/ocaml-lwt_log/APKBUILD b/testing/ocaml-lwt_log/APKBUILD index 6895e5abbba..002c445b700 100644 --- a/testing/ocaml-lwt_log/APKBUILD +++ b/testing/ocaml-lwt_log/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.1.1 pkgrel=5 pkgdesc="Lwt-friendly logger" url="https://github.com/ocsigen/lwt_log" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.0-or-later" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-lwt-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-lwt_ssl/APKBUILD b/testing/ocaml-lwt_ssl/APKBUILD new file mode 100644 index 00000000000..74e19cd9809 --- /dev/null +++ b/testing/ocaml-lwt_ssl/APKBUILD @@ -0,0 +1,81 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-lwt_ssl +pkgver=1.2.0 +pkgrel=0 +_pkgreal=lwt_ssl +pkgdesc="OpenSSL binding with concurrent I/O" +url="https://github.com/ocsigen/lwt_ssl" +arch="all !riscv64 !loongarch64" # ocaml +license="LGPL-2.1-or-later WITH OpenSSL-Exception" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-lwt-dev + ocaml-ssl-dev + " +makedepends=" + $depends_dev + dune + ocaml + " +subpackages="$pkgname-dev" +source="$_pkgreal-$pkgver.tar.bz2::https://github.com/ocsigen/lwt_ssl/releases/download/$pkgver/lwt_ssl-$pkgver.tbz" +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv --verbose +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +cf2ef7d4db26e40c044e743ce85849a10eb57c916cbd7d6291bf4458291689098293bfb4cd7f1023f3ae8bc8e9a68cb2c7470669501a9b44695659405a75aa00 lwt_ssl-1.2.0.tar.bz2 +" diff --git a/testing/ocaml-magic-mime/APKBUILD b/testing/ocaml-magic-mime/APKBUILD new file mode 100644 index 00000000000..1fcb49802fd --- /dev/null +++ b/testing/ocaml-magic-mime/APKBUILD @@ -0,0 +1,73 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-magic-mime +pkgver=1.3.1 +pkgrel=0 +_pkgreal=magic-mime +pkgdesc="Map filenames to common MIME types" +url="https://github.com/mirage/ocaml-magic-mime" +arch="all !riscv64 !loongarch64" # ocaml +license="ISC" +depends_dev="$pkgname=$pkgver-r$pkgrel" +makedepends="dune ocaml" +subpackages="$pkgname-dev" +source="$_pkgreal-$pkgver.tar.bz2::https://github.com/mirage/ocaml-magic-mime/releases/download/v$pkgver/magic-mime-$pkgver.tbz" +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv --verbose +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +607f7469caa2e800a92e3c5248125108fad5e0513f4230a37ed774c86112eacdae0ee533c5c78ec2752e939e83e2201dd4ee02cbbff92ae32e25683710d7b365 magic-mime-1.3.1.tar.bz2 +" diff --git a/testing/ocaml-markup/APKBUILD b/testing/ocaml-markup/APKBUILD index 6eaa319767c..5e10202d1cc 100644 --- a/testing/ocaml-markup/APKBUILD +++ b/testing/ocaml-markup/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.0.3 pkgrel=3 pkgdesc="Error-recovering functional HTML5 and XML parsers and writers for OCaml" url="https://aantron.github.io/markup.ml" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel" checkdepends="ocaml-result-dev ocaml-ounit-dev" diff --git a/testing/ocaml-menhir/APKBUILD b/testing/ocaml-menhir/APKBUILD index 22bdfd1e869..6a98029c8d9 100644 --- a/testing/ocaml-menhir/APKBUILD +++ b/testing/ocaml-menhir/APKBUILD @@ -8,7 +8,7 @@ _commit=4f8151679e73cdfe598c42220ae869f904dfaa9a pkgrel=2 pkgdesc="LR(1) parser generator for OCaml" url="http://gallium.inria.fr/~fpottier/menhir/" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="GPL-2.0-only" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-merlin-extend/APKBUILD b/testing/ocaml-merlin-extend/APKBUILD index 59144b2cda5..00e66758dc6 100644 --- a/testing/ocaml-merlin-extend/APKBUILD +++ b/testing/ocaml-merlin-extend/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.6.1 pkgrel=2 pkgdesc="SDK to extend Merlin" url="https://github.com/let-def/merlin-extend" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-metrics/APKBUILD b/testing/ocaml-metrics/APKBUILD index a78ebfcc31e..1ba361924fe 100644 --- a/testing/ocaml-metrics/APKBUILD +++ b/testing/ocaml-metrics/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.4.0 pkgrel=3 pkgdesc="Metrics infrastructure for OCaml" url="https://github.com/mirage/metrics" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-mew/APKBUILD b/testing/ocaml-mew/APKBUILD index d18100ed94b..0c19eb64994 100644 --- a/testing/ocaml-mew/APKBUILD +++ b/testing/ocaml-mew/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.1.0 pkgrel=3 pkgdesc="Modal editing witch" url="https://github.com/kandu/mew" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-trie-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-mew_vi/APKBUILD b/testing/ocaml-mew_vi/APKBUILD index 3cf9d45c343..acb72641993 100644 --- a/testing/ocaml-mew_vi/APKBUILD +++ b/testing/ocaml-mew_vi/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.5.0 pkgrel=3 pkgdesc="Modal editing witch (VI interpreter)" url="https://github.com/kandu/mew_vi" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-mew-dev ocaml-react-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-mikmatch/APKBUILD b/testing/ocaml-mikmatch/APKBUILD index d3b6697c5b2..bebef618e2d 100644 --- a/testing/ocaml-mikmatch/APKBUILD +++ b/testing/ocaml-mikmatch/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.0.9 pkgrel=2 pkgdesc="OCaml syntax extension for regexps" url="https://mjambon.github.io/mjambon2016/micmatch.html" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends="ocaml-tophide" makedepends=" diff --git a/testing/ocaml-mirage-clock/APKBUILD b/testing/ocaml-mirage-clock/APKBUILD index 83a1e637c9b..6bfa659f66e 100644 --- a/testing/ocaml-mirage-clock/APKBUILD +++ b/testing/ocaml-mirage-clock/APKBUILD @@ -6,7 +6,7 @@ pkgver=4.2.0 pkgrel=2 pkgdesc="Libraries and module types for portable clocks" url="https://github.com/mirage/mirage-clock" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml dune-configurator" diff --git a/testing/ocaml-mirage-crypto/APKBUILD b/testing/ocaml-mirage-crypto/APKBUILD index 5b821c5dbc7..781de27360a 100644 --- a/testing/ocaml-mirage-crypto/APKBUILD +++ b/testing/ocaml-mirage-crypto/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.10.6 pkgrel=3 pkgdesc="Simple symmetric cryptography for the modern age" url="https://github.com/mirage/mirage-crypto" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" # ocaml-zarith is not separated into a -dev subpackage depends_dev=" diff --git a/testing/ocaml-mirage-flow/APKBUILD b/testing/ocaml-mirage-flow/APKBUILD index 3fcca9aaa43..78e0bcdf8f1 100644 --- a/testing/ocaml-mirage-flow/APKBUILD +++ b/testing/ocaml-mirage-flow/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.0.0 pkgrel=3 pkgdesc="Flow implementations and combinators for MirageOS" url="https://github.com/mirage/mirage-flow" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-mirage-kv/APKBUILD b/testing/ocaml-mirage-kv/APKBUILD index c61172e2b75..5389fb98990 100644 --- a/testing/ocaml-mirage-kv/APKBUILD +++ b/testing/ocaml-mirage-kv/APKBUILD @@ -6,7 +6,7 @@ pkgver=4.0.1 pkgrel=3 pkgdesc="MirageOS signatures for key/value devices" url="https://github.com/mirage/mirage-kv" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-fmt-dev ocaml-lwt-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-mirage-net/APKBUILD b/testing/ocaml-mirage-net/APKBUILD index c9b4fee279f..f06cbebc51d 100644 --- a/testing/ocaml-mirage-net/APKBUILD +++ b/testing/ocaml-mirage-net/APKBUILD @@ -6,7 +6,7 @@ pkgver=4.0.0 pkgrel=3 pkgdesc="Network signatures for MirageOS" url="https://github.com/mirage/mirage-net" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-mirage-profile/APKBUILD b/testing/ocaml-mirage-profile/APKBUILD index d7b2f54ad62..081d2123a41 100644 --- a/testing/ocaml-mirage-profile/APKBUILD +++ b/testing/ocaml-mirage-profile/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.9.1 pkgrel=3 pkgdesc="Collect runtime profiling information in CTF format" url="https://github.com/mirage/mirage-profile" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-2-Clause" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-mirage-random/APKBUILD b/testing/ocaml-mirage-random/APKBUILD index 99c936ce489..81207eedb38 100644 --- a/testing/ocaml-mirage-random/APKBUILD +++ b/testing/ocaml-mirage-random/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.0.0 pkgrel=3 pkgdesc="Random-related devices for MirageOS" url="https://github.com/mirage/mirage-random" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-cstruct-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-mirage-time/APKBUILD b/testing/ocaml-mirage-time/APKBUILD index 1e0721afda0..2a895232083 100644 --- a/testing/ocaml-mirage-time/APKBUILD +++ b/testing/ocaml-mirage-time/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.0.0 pkgrel=4 pkgdesc="Time operations for MirageOS" url="https://github.com/mirage/mirage-time" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-lwt-dev ocaml-duration-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-mmap/APKBUILD b/testing/ocaml-mmap/APKBUILD index dd48e63cea4..169af019aac 100644 --- a/testing/ocaml-mmap/APKBUILD +++ b/testing/ocaml-mmap/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.2.0 pkgrel=3 pkgdesc="File mapping functionality" url="https://github.com/mirage/mmap" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-only WITH OCaml-LGPL-linking-exception" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-bigarray-compat-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-mqtt/APKBUILD b/testing/ocaml-mqtt/APKBUILD new file mode 100644 index 00000000000..3d94b19b6d5 --- /dev/null +++ b/testing/ocaml-mqtt/APKBUILD @@ -0,0 +1,89 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-mqtt +pkgver=0.2.2 +pkgrel=0 +pkgdesc="MQTT v3 client library" +url="https://github.com/hyper-systems/ocaml-mqtt" +arch="all !riscv64 !loongarch64" # ocaml +license="BSD-3-Clause" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-fmt-dev + ocaml-logs-dev + ocaml-lwt-dev + ocaml-ocplib-endian-dev + ocaml-tls-dev + " +makedepends=" + $depends_dev + dune + ocaml + " +checkdepends=" + ocaml-alcotest-dev + ocaml-cohttp-dev + " +subpackages="$pkgname-dev" +source="https://github.com/hyper-systems/ocaml-mqtt/archive/refs/tags/$pkgver/ocaml-mqtt-$pkgver.tar.gz + tls-lwt.patch + " + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv --verbose +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +f2640262b929bece15b51abd3bfcd708eb495fb7371c23e30c2a69f12a1633385d8de90153ee11aaeacb71b3f782f59b3a2f1ce9d783b20c959d9ce6f2f9d96a ocaml-mqtt-0.2.2.tar.gz +109bfa182d8ca03d2822cc05ae9534676be024b77265ec64fecee45f6ebe7685a869071cb7dcf2e615f36273d739541918fd922e4ef3f1ccb5ab928f4c3f06d6 tls-lwt.patch +" diff --git a/testing/ocaml-mqtt/tls-lwt.patch b/testing/ocaml-mqtt/tls-lwt.patch new file mode 100644 index 00000000000..2b45331de20 --- /dev/null +++ b/testing/ocaml-mqtt/tls-lwt.patch @@ -0,0 +1,8 @@ +--- a/lib/mqtt_client/dune ++++ b/lib/mqtt_client/dune +@@ -3,4 +3,4 @@ + (public_name mqtt.client) + (preprocess + (pps lwt_ppx)) +- (libraries fmt lwt lwt.unix logs logs.lwt tls tls-lwt ocplib-endian)) ++ (libraries fmt lwt lwt.unix logs logs.lwt tls tls.lwt ocplib-endian)) diff --git a/testing/ocaml-mtime/APKBUILD b/testing/ocaml-mtime/APKBUILD index 44d11af8c5d..fe65f63dfe4 100644 --- a/testing/ocaml-mtime/APKBUILD +++ b/testing/ocaml-mtime/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.4.0 pkgrel=2 pkgdesc="Monotonic wall-clock time for OCaml" url="https://erratique.ch/software/mtime" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-notty/APKBUILD b/testing/ocaml-notty/APKBUILD index c6a14cffca2..1e588d0fb42 100644 --- a/testing/ocaml-notty/APKBUILD +++ b/testing/ocaml-notty/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.2.3 pkgrel=0 pkgdesc="Declarative terminal library for OCaml" url="https://github.com/pqwy/notty" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-num/APKBUILD b/testing/ocaml-num/APKBUILD index f8fda59e449..38c6f0a7fec 100644 --- a/testing/ocaml-num/APKBUILD +++ b/testing/ocaml-num/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.4 pkgrel=3 pkgdesc="Arbitray-precision rational arithmetic for OCaml" url="https://github.com/ocaml/num" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-only WITH OCaml-LGPL-linking-exception AND MIT" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="ocaml ocaml-compiler-libs ocaml-findlib" diff --git a/testing/ocaml-obuild/APKBUILD b/testing/ocaml-obuild/APKBUILD index a5a54bd5059..2de2c398b31 100644 --- a/testing/ocaml-obuild/APKBUILD +++ b/testing/ocaml-obuild/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.1.11 pkgrel=0 pkgdesc="Simple package build system for ocaml" url="https://github.com/ocaml-obuild/obuild" -arch="all !riscv64" # restricted by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-2-Clause" makedepends="bash ocaml ocaml-findlib cmd:opam-installer" options="!check" # no tests provided diff --git a/testing/ocaml-ocf/APKBUILD b/testing/ocaml-ocf/APKBUILD index 48eeeebab47..4e3c574b8ca 100644 --- a/testing/ocaml-ocf/APKBUILD +++ b/testing/ocaml-ocf/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.8.0 pkgrel=3 pkgdesc="OCaml library to read and write configuration files in JSON syntax" url="https://zoggy.frama.io/ocf/" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-3.0-only" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-ocplib-endian/APKBUILD b/testing/ocaml-ocplib-endian/APKBUILD index f2b3ba44667..ed95e33dd13 100644 --- a/testing/ocaml-ocplib-endian/APKBUILD +++ b/testing/ocaml-ocplib-endian/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.2 pkgrel=3 pkgdesc="Optimised functions to read and write int16/32/64 from strings and bigarrays" url="https://github.com/OCamlPro/ocplib-endian" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="$depends_dev dune ocaml ocaml-cppo" diff --git a/testing/ocaml-omake/APKBUILD b/testing/ocaml-omake/APKBUILD index 5ae0db3f1c9..72dad33b4f3 100644 --- a/testing/ocaml-omake/APKBUILD +++ b/testing/ocaml-omake/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.10.6 pkgrel=0 pkgdesc="Build system designed for scalability and portability" url="http://projects.camlcity.org/projects/omake.html" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="GPL-2.0-only" makedepends="ocaml ocaml-findlib" options="!check" diff --git a/testing/ocaml-omod/APKBUILD b/testing/ocaml-omod/APKBUILD index 119540f575e..01f6b2d1071 100644 --- a/testing/ocaml-omod/APKBUILD +++ b/testing/ocaml-omod/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.0.3 pkgrel=3 pkgdesc="Lookup and load installed OCaml modules" url="https://erratique.ch/software/omod" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends="$pkgname-bin" depends_dev="$pkgname=$pkgver-r$pkgrel" diff --git a/testing/ocaml-otoml/APKBUILD b/testing/ocaml-otoml/APKBUILD new file mode 100644 index 00000000000..ae9a2f974d5 --- /dev/null +++ b/testing/ocaml-otoml/APKBUILD @@ -0,0 +1,83 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-otoml +pkgver=1.0.5 +pkgrel=0 +_pkgreal=otoml +pkgdesc="TOML parsing, manipulation, and pretty-printing library" +url="https://github.com/dmbaturin/otoml" +arch="all !riscv64 !loongarch64" # ocaml +license="MIT" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-menhir-dev + ocaml-uutf-dev + " +makedepends=" + $depends_dev + dune + ocaml + ocaml-menhir + " +checkdepends="ocaml-ounit-dev" +subpackages="$pkgname-dev" +source="$_pkgreal-$pkgver.tar.gz::https://github.com/dmbaturin/otoml/archive/refs/tags/$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv --verbose +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +a287bf40ec7bc1458fa74bf88cd30c2f93e0092f962858fa70acdb0e01978cd187cb1135aef66a5b5775cce31353901516ecdb6822a4c29a0a99f077f30a2149 otoml-1.0.5.tar.gz +" diff --git a/testing/ocaml-otr/APKBUILD b/testing/ocaml-otr/APKBUILD index d589ca1c0c3..7f44cd86157 100644 --- a/testing/ocaml-otr/APKBUILD +++ b/testing/ocaml-otr/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.3.10 pkgrel=2 pkgdesc="Off the record implementation purely in OCaml" url="https://github.com/hannesm/ocaml-otr" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-2-Clause" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-ounit/APKBUILD b/testing/ocaml-ounit/APKBUILD index 55bda0d473c..dcc971f3712 100644 --- a/testing/ocaml-ounit/APKBUILD +++ b/testing/ocaml-ounit/APKBUILD @@ -6,7 +6,7 @@ pkgver=2.2.7 pkgrel=3 pkgdesc="A unit test framework for OCaml" url="https://github.com/gildor478/ounit" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-parsexp/APKBUILD b/testing/ocaml-parsexp/APKBUILD index ac6a71fb055..f303215ff73 100644 --- a/testing/ocaml-parsexp/APKBUILD +++ b/testing/ocaml-parsexp/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.16.0 pkgrel=0 pkgdesc="S-expression parsing library" url="https://github.com/janestreet/parsexp" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml ocaml-sexplib0-dev" diff --git a/testing/ocaml-pbkdf/APKBUILD b/testing/ocaml-pbkdf/APKBUILD index a128432b6c6..fe9445379d7 100644 --- a/testing/ocaml-pbkdf/APKBUILD +++ b/testing/ocaml-pbkdf/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.2.0 pkgrel=2 pkgdesc="Password based key derivation functions (PBKDF) from PKCS#5" url="https://github.com/abeaumont/ocaml-pbkdf" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-2-Clause" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-pcre/APKBUILD b/testing/ocaml-pcre/APKBUILD index 034a92ac17c..c99134c1c23 100644 --- a/testing/ocaml-pcre/APKBUILD +++ b/testing/ocaml-pcre/APKBUILD @@ -6,7 +6,7 @@ pkgver=7.5.0 pkgrel=4 pkgdesc="OCaml bindings to the Perl Compatibility Regular Expressions (PCRE) library" url="https://mmottl.github.io/pcre-ocaml" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" depends_dev="$pkgname=$pkgver-r$pkgrel pcre-dev" makedepends="$depends_dev dune dune-configurator ocaml" diff --git a/testing/ocaml-ppx_blob/APKBUILD b/testing/ocaml-ppx_blob/APKBUILD new file mode 100644 index 00000000000..4b1fe1c1428 --- /dev/null +++ b/testing/ocaml-ppx_blob/APKBUILD @@ -0,0 +1,81 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-ppx_blob +pkgver=0.8.0 +pkgrel=0 +_pkgreal=ppx_blob +pkgdesc="Include a file as a string at compile time" +url="https://github.com/johnwhitington/ppx_blob" +arch="all !riscv64 !loongarch64" # ocaml +license="Unlicense" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-ppxlib-dev + " +makedepends=" + $depends_dev + dune + ocaml + " +checkdepends="ocaml-alcotest-dev" +subpackages="$pkgname-dev" +source="$_pkgreal-$pkgver.tar.bz2::https://github.com/johnwhitington/ppx_blob/releases/download/$pkgver/ppx_blob-$pkgver.tbz" +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv --verbose +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +bcbd58f7b0505063eaf4799792696f633a11ee734ce57d75b8f24b53d05fafbda8330bbf577a1d7a6149bb936b535216ae83574c1d40a61434e8d3bc6b6fd973 ppx_blob-0.8.0.tar.bz2 +" diff --git a/testing/ocaml-ppx_derivers/APKBUILD b/testing/ocaml-ppx_derivers/APKBUILD index c9edf61921d..0183b0cfea4 100644 --- a/testing/ocaml-ppx_derivers/APKBUILD +++ b/testing/ocaml-ppx_derivers/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.2.1 pkgrel=2 pkgdesc="Shared [@@deriving] plugins registry" url="https://github.com/ocaml-ppx/ppx_derivers" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml ocaml-findlib" diff --git a/testing/ocaml-ppx_deriving/APKBUILD b/testing/ocaml-ppx_deriving/APKBUILD index 06c8302e220..cf82ad49131 100644 --- a/testing/ocaml-ppx_deriving/APKBUILD +++ b/testing/ocaml-ppx_deriving/APKBUILD @@ -6,7 +6,7 @@ pkgver=5.3.0 pkgrel=0 pkgdesc="Type-driven code generation for OCaml" url="https://github.com/ocaml-ppx/ppx_deriving" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-ppxlib-dev ocaml-result-dev" makedepends="$depends_dev dune ocaml ocaml-cppo ocaml-findlib-dev" diff --git a/testing/ocaml-ppx_sexp_conv/APKBUILD b/testing/ocaml-ppx_sexp_conv/APKBUILD index febe91be430..4b94b427778 100644 --- a/testing/ocaml-ppx_sexp_conv/APKBUILD +++ b/testing/ocaml-ppx_sexp_conv/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.16.0 pkgrel=0 pkgdesc="[@@deriving] plugin to generate S-expression conversion functions" url="https://github.com/janestreet/ppx_sexp_conv" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-ppxlib/APKBUILD b/testing/ocaml-ppxlib/APKBUILD index d52db078f60..3a9c8c89ed7 100644 --- a/testing/ocaml-ppxlib/APKBUILD +++ b/testing/ocaml-ppxlib/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.32.0 pkgrel=0 pkgdesc="Standard library for ppx rewriters" url="https://github.com/ocaml-ppx/ppxlib" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-psq/APKBUILD b/testing/ocaml-psq/APKBUILD index 33306683150..5a6b0aaa443 100644 --- a/testing/ocaml-psq/APKBUILD +++ b/testing/ocaml-psq/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.2.0 pkgrel=2 pkgdesc="Functional Priority Search Queues" url="https://github.com/pqwy/psq" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-seq-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-ptime/APKBUILD b/testing/ocaml-ptime/APKBUILD index d332e8d299f..065b9342d6b 100644 --- a/testing/ocaml-ptime/APKBUILD +++ b/testing/ocaml-ptime/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.0.0 pkgrel=2 pkgdesc="POSIX time for OCaml" url="https://erratique.ch/software/ptime" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-ptmap/APKBUILD b/testing/ocaml-ptmap/APKBUILD index 350402052b6..f99d3ec1cc3 100644 --- a/testing/ocaml-ptmap/APKBUILD +++ b/testing/ocaml-ptmap/APKBUILD @@ -6,7 +6,7 @@ pkgver=2.0.5 pkgrel=3 pkgdesc="Maps over integers implemented as Patricia trees" url="https://github.com/backtracking/ptmap" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-qcheck/APKBUILD b/testing/ocaml-qcheck/APKBUILD index 043646b8d6c..38ed0d5627c 100644 --- a/testing/ocaml-qcheck/APKBUILD +++ b/testing/ocaml-qcheck/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.18.1 pkgrel=3 pkgdesc="QuickCheck inspired property-based testing for OCaml" url="https://github.com/c-cube/qcheck" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-2-Clause" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml ocaml-findlib ocaml-ounit-dev ocaml-seq-dev ocaml-stdlib-shims" diff --git a/testing/ocaml-qtest/APKBUILD b/testing/ocaml-qtest/APKBUILD index 79dcb0a8cb9..788f4022353 100644 --- a/testing/ocaml-qtest/APKBUILD +++ b/testing/ocaml-qtest/APKBUILD @@ -6,7 +6,7 @@ pkgver=2.11.2 pkgrel=3 pkgdesc="Lightweight inline test extraction from comments" url="https://github.com/vincent-hugot/qtest" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="GPL-3.0-or-later" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml ocaml-findlib ocaml-qcheck-dev ocaml-ounit-dev" diff --git a/testing/ocaml-randomconv/APKBUILD b/testing/ocaml-randomconv/APKBUILD index d37638a383a..caa5187691a 100644 --- a/testing/ocaml-randomconv/APKBUILD +++ b/testing/ocaml-randomconv/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.1.3 pkgrel=2 pkgdesc="Convert from random byte vectors (Cstruct.t) to random native numbers" url="https://github.com/hannesm/randomconv" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-cstruct-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-re/APKBUILD b/testing/ocaml-re/APKBUILD index 3d441b9dfe4..f055d15b97e 100644 --- a/testing/ocaml-re/APKBUILD +++ b/testing/ocaml-re/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.11.0 pkgrel=1 pkgdesc="Pure OCaml regular expressions, with support for Perl and POSIX-style strings" url="https://github.com/ocaml/ocaml-re" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-seq-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-react/APKBUILD b/testing/ocaml-react/APKBUILD index 924fd5bb110..add2fc698c1 100644 --- a/testing/ocaml-react/APKBUILD +++ b/testing/ocaml-react/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.2.2 pkgrel=2 pkgdesc="OCaml framework for Functional Reactive Programming (FRP)" url="https://erratique.ch/software/react" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-result/APKBUILD b/testing/ocaml-result/APKBUILD index a3cb512e3b4..198c23063e5 100644 --- a/testing/ocaml-result/APKBUILD +++ b/testing/ocaml-result/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.5 pkgrel=2 pkgdesc="Compatibility Result module" url="https://github.com/janestreet/result" -arch="all !riscv64" # limited by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml ocaml-findlib" diff --git a/testing/ocaml-rresult/APKBUILD b/testing/ocaml-rresult/APKBUILD index 44b35118421..602510a5e2e 100644 --- a/testing/ocaml-rresult/APKBUILD +++ b/testing/ocaml-rresult/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.7.0 pkgrel=2 pkgdesc="Result value combinators for OCaml" url="https://erratique.ch/software/rresult" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-sedlex/APKBUILD b/testing/ocaml-sedlex/APKBUILD index 81f2416228c..04d60305023 100644 --- a/testing/ocaml-sedlex/APKBUILD +++ b/testing/ocaml-sedlex/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.2 pkgrel=0 pkgdesc="An OCaml lexer generator for Unicode" url="https://github.com/ocaml-community/sedlex" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-gen-dev ocaml-ppxlib-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocaml-seq/APKBUILD b/testing/ocaml-seq/APKBUILD index 8d036944723..a500cad0f0d 100644 --- a/testing/ocaml-seq/APKBUILD +++ b/testing/ocaml-seq/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.3.1 pkgrel=2 pkgdesc="Compatibility package for the standard OCaml iterator type" url="https://github.com/c-cube/seq" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-only" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml ocaml-findlib" diff --git a/testing/ocaml-sexplib/APKBUILD b/testing/ocaml-sexplib/APKBUILD index 8059a5af4ed..75e9434a8e5 100644 --- a/testing/ocaml-sexplib/APKBUILD +++ b/testing/ocaml-sexplib/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.16.0 pkgrel=0 pkgdesc="Library for serializing OCaml values to and from S-expressions" url="https://github.com/janestreet/sexplib" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-sexplib0/APKBUILD b/testing/ocaml-sexplib0/APKBUILD index 5964fff7a02..e14a9650f8c 100644 --- a/testing/ocaml-sexplib0/APKBUILD +++ b/testing/ocaml-sexplib0/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.16.0 pkgrel=0 pkgdesc="Library containing the definition of S-expressions and some base converters" url="https://github.com/janestreet/sexplib0" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml" diff --git a/testing/ocaml-sha/APKBUILD b/testing/ocaml-sha/APKBUILD index 32a5c361e40..55e80867211 100644 --- a/testing/ocaml-sha/APKBUILD +++ b/testing/ocaml-sha/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.15.4 pkgrel=0 pkgdesc="Binding to the SHA cryptographic functions" url="https://github.com/djs55/ocaml-sha" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml ocaml-findlib ocaml-ounit-dev ocaml-stdlib-shims ocaml-seq-dev" diff --git a/testing/ocaml-ssl/APKBUILD b/testing/ocaml-ssl/APKBUILD new file mode 100644 index 00000000000..27990edc20b --- /dev/null +++ b/testing/ocaml-ssl/APKBUILD @@ -0,0 +1,87 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-ssl +pkgver=0.7.0 +pkgrel=0 +pkgdesc="Bindings for OpenSSL" +url="https://github.com/savonet/ocaml-ssl" +arch="all !riscv64 !loongarch64" # ocaml +license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + openssl-dev + " +makedepends=" + $depends_dev + dune + dune-configurator + ocaml + " +checkdepends="ocaml-alcotest-dev" +subpackages="$pkgname-dev" +source="https://github.com/savonet/ocaml-ssl/archive/refs/tags/v$pkgver/ocaml-ssl-$pkgver.tar.gz" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + # ssl_sock test sometimes requires multiple retries to succeed + # dune runtest re-runs the tests that failed only, not all tests + local i; for i in $(seq 0 3); do + [ $i -eq 0 ] || msg "Retrying ($i/3)..." + dune runtest --build-dir=.testenv --verbose && return 0 + sleep 1 + done + return 1 +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +969c4d64828449a49bdef26ca5f8faa72d2fe2a2304ccbf589a3ff097c2bf8ae9eb83ae1c90216f6b4d6f359e462ea47e0106a7386e26848d14910138fcb07f8 ocaml-ssl-0.7.0.tar.gz +" diff --git a/testing/ocaml-stdlib-shims/APKBUILD b/testing/ocaml-stdlib-shims/APKBUILD index 0cd77c2422a..847f4053534 100644 --- a/testing/ocaml-stdlib-shims/APKBUILD +++ b/testing/ocaml-stdlib-shims/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.3.0 pkgrel=2 pkgdesc="OCaml Shims to substitute Pervasives with Stdlib" url="https://github.com/ocaml/stdlib-shims" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-only WITH OCaml-LGPL-linking-exception" makedepends="dune ocaml ocaml-findlib ocaml-compiler-libs" source="$pkgname-$pkgver.tar.gz::https://github.com/ocaml/stdlib-shims/archive/$pkgver.tar.gz" diff --git a/testing/ocaml-stk/APKBUILD b/testing/ocaml-stk/APKBUILD new file mode 100644 index 00000000000..dcd40873cc1 --- /dev/null +++ b/testing/ocaml-stk/APKBUILD @@ -0,0 +1,95 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-stk +pkgver=0.1.0 +pkgrel=0 +pkgdesc="SDL-based GUI toolkit" +url="https://framagit.org/zoggy/ocaml-stk" +arch="all !riscv64 !loongarch64" # ocaml +license="GPL-3.0-only" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-ctypes-dev + ocaml-fmt-dev + ocaml-higlo-dev + ocaml-logs-dev + ocaml-lwt-dev + ocaml-ocf-dev + ocaml-pcre-dev + ocaml-ppx_blob-dev + ocaml-sedlex-dev + ocaml-tsdl-dev + ocaml-tsdl-image-dev + ocaml-tsdl-ttf-dev + ocaml-uunf-dev + ocaml-uutf-dev + " +makedepends=" + $depends_dev + dune + ocaml + " +subpackages="$pkgname-dev" +source="https://framagit.org/zoggy/ocaml-stk/-/archive/$pkgver/ocaml-stk-$pkgver.tar.bz2 + font.patch + " +options="!check" # requires unpackaged landmarks-ppx + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv --verbose +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +7978e3f10bc196ee6177ded9ae0313a5ba65e1a74e501fbecbe5ebc216ca6ee7117deaff5bc4c414083a4a55851a81e5dedaa8d0a880ad72689b3f56f3b064f5 ocaml-stk-0.1.0.tar.bz2 +34fda34bdc19b8421429c3f01d6a4c4a0edf3dc4294b6d3c61b45483a2f88f497ab6b7401a25eb34001d334f1bfdc1cf8e50ce1205c97f8909d89b0f63db1671 font.patch +" diff --git a/testing/ocaml-stk/font.patch b/testing/ocaml-stk/font.patch new file mode 100644 index 00000000000..30c6159f7c7 --- /dev/null +++ b/testing/ocaml-stk/font.patch @@ -0,0 +1,33 @@ +--- a/lib/default_theme.json ++++ b/lib/default_theme.json +@@ -179,7 +179,7 @@ + fg_color_selected: "red", + fill: true, + focusable: true, +- font_desc: { family:"Bitstream Vera Sans Mono", size:14 }, ++ font_desc: { family:"DejaVu Sans Mono", size:14 }, + cursor_width: 2, + cursor_color: "pink", + active_cursor_color: "0xff0000cc", +--- a/lib/font.ml ++++ b/lib/font.ml +@@ -74,7 +74,7 @@ + let font_exts = ref [".ttf"] + let font_dirs = ref + [ Filename.current_dir_name, false ; +- "/usr/share/fonts/truetype", true ; ++ "/usr/share/fonts", true ; + ] + + let fonts = ref SMap.empty +--- a/lib/font.mli ++++ b/lib/font.mli +@@ -85,7 +85,7 @@ + {!App.init} will call {!val-load_fonts} which uses [font_dirs] to look + for available fonts, + so additional directories must be set before initializing application. +- Default value is [[ Filename.current_dir_name, false ; "/usr/share/fonts/truetype", true ]]. ++ Default value is [[ Filename.current_dir_name, false ; "/usr/share/fonts", true ]]. + *) + val font_dirs : (string * bool) list ref + diff --git a/testing/ocaml-stringext/APKBUILD b/testing/ocaml-stringext/APKBUILD index 3a3d66e1f6a..c305028d691 100644 --- a/testing/ocaml-stringext/APKBUILD +++ b/testing/ocaml-stringext/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.6.0 pkgrel=2 pkgdesc="Extra string functions for OCaml" url="https://github.com/rgrinberg/stringext" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml" diff --git a/testing/ocaml-tcpip/APKBUILD b/testing/ocaml-tcpip/APKBUILD index aa4d0fa5ea9..8a191430c73 100644 --- a/testing/ocaml-tcpip/APKBUILD +++ b/testing/ocaml-tcpip/APKBUILD @@ -6,7 +6,7 @@ pkgver=7.1.2 pkgrel=3 pkgdesc="OCaml TCP/IP networking stack, used in MirageOS" url="https://github.com/mirage/mirage-tcpip" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" # ocaml-bisect_ppx only needed for dev depends_dev=" diff --git a/testing/ocaml-tls/APKBUILD b/testing/ocaml-tls/APKBUILD index 8492034df6c..79ccbe53eba 100644 --- a/testing/ocaml-tls/APKBUILD +++ b/testing/ocaml-tls/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.15.3 pkgrel=4 pkgdesc="Transport Layer Security purely in OCaml" url="https://github.com/mirleft/ocaml-tls" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-2-Clause" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-tophide/APKBUILD b/testing/ocaml-tophide/APKBUILD index c1a01764524..feca779f93b 100644 --- a/testing/ocaml-tophide/APKBUILD +++ b/testing/ocaml-tophide/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.0.4 pkgrel=2 pkgdesc="Hide OCaml toplevel values whose name starts with an underscore" url="https://github.com/mjambon/tophide" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" makedepends="ocaml ocaml-compiler-libs ocaml-findlib" options="!check" diff --git a/testing/ocaml-topkg/APKBUILD b/testing/ocaml-topkg/APKBUILD index 2582e2af871..aed4ef05edf 100644 --- a/testing/ocaml-topkg/APKBUILD +++ b/testing/ocaml-topkg/APKBUILD @@ -7,7 +7,7 @@ pkgver=1.0.5 pkgrel=2 pkgdesc="The transitory OCaml software packager" url="https://erratique.ch/software/topkg" -arch="all !riscv64" # restricted by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-trie/APKBUILD b/testing/ocaml-trie/APKBUILD index e4a900ece60..051486a7811 100644 --- a/testing/ocaml-trie/APKBUILD +++ b/testing/ocaml-trie/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.0.0 pkgrel=2 pkgdesc="Strict impure trie tree OCaml module" url="https://github.com/kandu/trie/" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="MIT" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml" diff --git a/testing/ocaml-tsdl-image/APKBUILD b/testing/ocaml-tsdl-image/APKBUILD new file mode 100644 index 00000000000..667f7e18655 --- /dev/null +++ b/testing/ocaml-tsdl-image/APKBUILD @@ -0,0 +1,88 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-tsdl-image +pkgver=0.6 +pkgrel=0 +_pkgreal=tsdl-image +pkgdesc="SDL2_Image bindings to go with ocaml-tsdl" +url="https://github.com/sanette/tsdl-image" +arch="all !riscv64 !loongarch64" # ocaml +license="BSD-3-Clause" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-ctypes-dev + ocaml-tsdl-dev + sdl2_image-dev + " +makedepends=" + $depends_dev + dune + dune-configurator + ocaml + " +checkdepends=" + libffi-dev + ocaml-bigarray-compat-dev + ocaml-integers-dev + " +subpackages="$pkgname-dev" +source="$_pkgreal-$pkgver.tar.gz::https://github.com/sanette/tsdl-image/archive/$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv --verbose +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +af350af0591197bb3a670c1ed93a00f4bc514a7c2d60da309b574756200b6e34b91bf1886fa36f4eb43529cb0c2f715a2bc2c80b66fae6bdcee87e156ffc4f35 tsdl-image-0.6.tar.gz +" diff --git a/testing/ocaml-tsdl-ttf/APKBUILD b/testing/ocaml-tsdl-ttf/APKBUILD new file mode 100644 index 00000000000..2fd38ad3e26 --- /dev/null +++ b/testing/ocaml-tsdl-ttf/APKBUILD @@ -0,0 +1,88 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-tsdl-ttf +pkgver=0.6 +pkgrel=0 +_pkgreal=tsdl-ttf +pkgdesc="SDL2_Ttf bindings to go with ocaml-tsdl" +url="https://github.com/sanette/tsdl-ttf" +arch="all !riscv64 !loongarch64" # ocaml +license="BSD-3-Clause" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-ctypes-dev + ocaml-tsdl-dev + sdl2_ttf-dev + " +makedepends=" + $depends_dev + dune + dune-configurator + ocaml + " +checkdepends=" + libffi-dev + ocaml-bigarray-compat-dev + ocaml-integers-dev + " +subpackages="$pkgname-dev" +source="$_pkgreal-$pkgver.tar.gz::https://github.com/sanette/tsdl-ttf/archive/$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --release --verbose +} + +check() { + dune runtest --build-dir=.testenv --verbose +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +3184207a273869db6c208b37e41d09121ec124fdab6675d5c2fcbe2592f0104d2bfd8afeeee2b7c6ac12d94ec9bdf89d8bb2f581e3ac2767a5c95814dbbe7db3 tsdl-ttf-0.6.tar.gz +" diff --git a/testing/ocaml-tsdl/APKBUILD b/testing/ocaml-tsdl/APKBUILD new file mode 100644 index 00000000000..3f4f5245319 --- /dev/null +++ b/testing/ocaml-tsdl/APKBUILD @@ -0,0 +1,100 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-tsdl +pkgver=1.0.0 +pkgrel=0 +_pkgreal=tsdl +pkgdesc="Thin bindings to SDL" +url="https://erratique.ch/software/tsdl" +arch="all !riscv64 !loongarch64" # ocaml +license="ISC" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-ctypes-dev + ocaml-stdlib-shims + sdl2-dev + " +makedepends=" + $depends_dev + ocaml + ocamlbuild + ocaml-findlib + ocaml-topkg + cmd:opam-installer + " +checkdepends=" + libffi-dev + mesa-dri-gallium + ocaml-bigarray-compat-dev + ocaml-integers-dev + vulkan-loader + xvfb-run + " +options="!check" # sdlevents test seems to hang +subpackages="$pkgname-dev" +source="$_pkgreal-$pkgver.tar.bz2::https://erratique.ch/software/tsdl/releases/tsdl-$pkgver.tbz" +builddir="$srcdir/$_pkgreal-$pkgver" +_ocamldir=usr/lib/ocaml + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + ocaml pkg/pkg.ml build -v \ + --tests "$(want_check && echo true || echo false)" +} + +check() { + xvfb-run -a ocaml pkg/pkg.ml test -v +} + +package() { + opam-installer -i \ + --prefix="$pkgdir/usr" \ + --libdir="$pkgdir/$_ocamldir" \ + --docdir="$builddir/.omit" \ + $_pkgreal.install +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find $_ocamldir \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +70ba93a07d8add11d29cf94ce173c022a52a7d57af7b9dad3abdae7fde6314d4690d3aacc8f75e598b6af2e692568399638813664db0331e0a898bdc14bfe670 tsdl-1.0.0.tar.bz2 +" diff --git a/testing/ocaml-uri/APKBUILD b/testing/ocaml-uri/APKBUILD index df220153573..e06be9b1ef3 100644 --- a/testing/ocaml-uri/APKBUILD +++ b/testing/ocaml-uri/APKBUILD @@ -6,7 +6,7 @@ pkgver=4.2.0 pkgrel=2 pkgdesc="RFC3986 URI/URL parsing library for OCaml" url="https://github.com/mirage/ocaml-uri" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-uucd/APKBUILD b/testing/ocaml-uucd/APKBUILD index e75a6cdabc8..e9018dacf53 100644 --- a/testing/ocaml-uucd/APKBUILD +++ b/testing/ocaml-uucd/APKBUILD @@ -6,7 +6,7 @@ pkgver=14.0.0 pkgrel=2 pkgdesc="Unicode character database decoder for OCaml" url="https://erratique.ch/software/uucd" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-uucp/APKBUILD b/testing/ocaml-uucp/APKBUILD index 39784f1b27f..d3751330845 100644 --- a/testing/ocaml-uucp/APKBUILD +++ b/testing/ocaml-uucp/APKBUILD @@ -6,8 +6,7 @@ pkgver=14.0.0 pkgrel=2 pkgdesc="Unicode character properties for OCaml" url="https://erratique.ch/software/uucp" -# limited by riscv64: ocaml, ppc64le: ocaml-uunf -arch="all !riscv64 !ppc64le" +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-uuidm/APKBUILD b/testing/ocaml-uuidm/APKBUILD index a8ad83a6cf2..62ec82a94b8 100644 --- a/testing/ocaml-uuidm/APKBUILD +++ b/testing/ocaml-uuidm/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.9.8 pkgrel=2 pkgdesc="Universally unique identifiers (UUIDs) for OCaml" url="https://erratique.ch/software/uuidm" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-cmdliner-dev" makedepends=" diff --git a/testing/ocaml-uunf/APKBUILD b/testing/ocaml-uunf/APKBUILD index 49838c02558..404a20a9074 100644 --- a/testing/ocaml-uunf/APKBUILD +++ b/testing/ocaml-uunf/APKBUILD @@ -6,9 +6,7 @@ pkgver=14.0.0 pkgrel=2 pkgdesc="Unicode text normalization for OCaml" url="https://erratique.ch/software/uunf" -# riscv64: restricted by ocaml aport -# ppc64le: ocamlopt exited with code 2 while compiling uunf_data.ml -arch="all !riscv64 !ppc64le" +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" @@ -34,6 +32,12 @@ case "$CARCH" in esac build() { + # Workaround ocamlopt exiting with code 2 while compiling uunf_data.ml + if [ "$CARCH" = ppc64le ]; then + ulimit -Hs unlimited + ulimit -Ss 65536 + fi + ocaml pkg/pkg.ml build \ --with-uutf true \ --with-cmdliner true diff --git a/testing/ocaml-uuseg/APKBUILD b/testing/ocaml-uuseg/APKBUILD index f55e00cdfa4..e2935f71294 100644 --- a/testing/ocaml-uuseg/APKBUILD +++ b/testing/ocaml-uuseg/APKBUILD @@ -6,8 +6,7 @@ pkgver=14.0.0 pkgrel=2 pkgdesc="Unicode text segmentation for OCaml" url="https://erratique.ch/software/uuseg" -# limited by riscv64: ocaml, ppc64le: ocaml-uucp -arch="all !riscv64 !ppc64le" +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-uucp-dev ocaml-uutf-dev" makedepends=" diff --git a/testing/ocaml-uutf/APKBUILD b/testing/ocaml-uutf/APKBUILD index bd2d6f5ac99..6c44a08fc1c 100644 --- a/testing/ocaml-uutf/APKBUILD +++ b/testing/ocaml-uutf/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.0.3 pkgrel=2 pkgdesc="Non-blocking streaming Unicode codec for OCaml" url="https://erratique.ch/software/uutf" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-x509/APKBUILD b/testing/ocaml-x509/APKBUILD index 89bbf91be80..f1a1ca7df42 100644 --- a/testing/ocaml-x509/APKBUILD +++ b/testing/ocaml-x509/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.16.0 pkgrel=2 pkgdesc="Public Key Infrastructure (RFC 5280, PKCS) purely in OCaml" url="https://github.com/mirleft/ocaml-x509" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-2-Clause" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocaml-xml-light/APKBUILD b/testing/ocaml-xml-light/APKBUILD index c79f93e14a3..5edd35d5da7 100644 --- a/testing/ocaml-xml-light/APKBUILD +++ b/testing/ocaml-xml-light/APKBUILD @@ -6,7 +6,7 @@ pkgver=2.5 pkgrel=0 pkgdesc="Minimal XML parser and printer for OCaml" url="https://github.com/ncannasse/xml-light" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="dune ocaml" diff --git a/testing/ocaml-xmlm/APKBUILD b/testing/ocaml-xmlm/APKBUILD index 048add6733e..0399de29789 100644 --- a/testing/ocaml-xmlm/APKBUILD +++ b/testing/ocaml-xmlm/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.4.0 pkgrel=2 pkgdesc="Streaming XML codec for OCaml" url="https://erratique.ch/software/xmlm" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="ISC" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocaml-xtmpl/APKBUILD b/testing/ocaml-xtmpl/APKBUILD new file mode 100644 index 00000000000..34a29fbabc3 --- /dev/null +++ b/testing/ocaml-xtmpl/APKBUILD @@ -0,0 +1,87 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=ocaml-xtmpl +pkgver=0.19.0 +pkgrel=0 +_pkgreal=xtmpl +pkgdesc="XML templating library" +url="https://framagit.org/zoggy/xtmpl" +arch="all !riscv64 !loongarch64" # ocaml +license="LGPL-3.0-only" +depends_dev=" + $pkgname=$pkgver-r$pkgrel + ocaml-iri-dev + ocaml-ppxlib-dev + ocaml-re-dev + ocaml-sedlex-dev + ocaml-uutf-dev + " +makedepends=" + $depends_dev + dune + ocaml + " +subpackages="$pkgname-dev" +source="https://framagit.org/zoggy/xtmpl/-/archive/$pkgver/xtmpl-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +# 32-bit archs +case "$CARCH" in + arm*|x86) options="$options textrels" ;; +esac + +build() { + dune build --verbose \ + -p xtmpl,xtmpl_ppx +} + +check() { + dune runtest --build-dir=.testenv --verbose \ + -p xtmpl,xtmpl_ppx +} + +package() { + dune install --destdir="$pkgdir" --docdir=/.omit \ + xtmpl xtmpl_ppx +} + +dev() { + default_dev + + cd "$pkgdir" + + local path; find usr/lib/ocaml \( \ + -name '*.cmt' -o \ + -name '*.cmti' -o \ + -name '*.ml' -o \ + -name '*.mli' \ + \) | while read -r path + do + amove "$path" + done +} + +prepare_py_provides() { + local datadir="${subpkgdir:-$pkgdir}" + local pkgbasedir=${pkgbasedir:-"$startdir/pkg"} + local controldir="$pkgbasedir"/.control.${subpkgname:-$pkgname} + + options_has "!tracedeps" && return 0 + + ocaml4-abuild-find provides \ + "$datadir"/usr/lib/ocaml \ + "$controldir" \ + "$pkgver-r$pkgrel" +} + +scan_python3_dependency() { + local controldir="$2" datadir="$3" + + ocaml4-abuild-find requires \ + "$datadir"/usr/lib/ocaml \ + "$controldir" +} + +sha512sums=" +d0ab7fe67f2534a5c91d9c7e55efbcbcb4fa9269cfa2016e5793efbfe76abe33d3dac28eb44cfb940f121d167b88b14a0d3ba042bbd53a5d4dd379c27fae2328 xtmpl-0.19.0.tar.gz +" diff --git a/testing/ocaml-yojson/APKBUILD b/testing/ocaml-yojson/APKBUILD index e09cc416270..c74cfa9ae02 100644 --- a/testing/ocaml-yojson/APKBUILD +++ b/testing/ocaml-yojson/APKBUILD @@ -6,7 +6,7 @@ pkgver=2.1.2 pkgrel=0 pkgdesc="JSON parsing and pretty-printing library for OCaml" url="https://github.com/ocaml-community/yojson" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-seq-dev" makedepends="$depends_dev dune ocaml ocaml-cppo ocaml-findlib" diff --git a/testing/ocaml-zed/APKBUILD b/testing/ocaml-zed/APKBUILD index bdc73dca1dd..70ca41ded48 100644 --- a/testing/ocaml-zed/APKBUILD +++ b/testing/ocaml-zed/APKBUILD @@ -6,7 +6,7 @@ pkgver=3.1.0 pkgrel=3 pkgdesc="Abstract engine for text edition in OCaml" url="https://github.com/ocaml-community/zed" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends_dev=" $pkgname=$pkgver-r$pkgrel diff --git a/testing/ocamlnet/APKBUILD b/testing/ocamlnet/APKBUILD index 4d76c4c832c..5df97c3fc4e 100644 --- a/testing/ocamlnet/APKBUILD +++ b/testing/ocamlnet/APKBUILD @@ -5,7 +5,7 @@ pkgver=4.1.9 pkgrel=2 pkgdesc="Network and system programming library for OCaml" url="http://projects.camlcity.org/projects/ocamlnet.html" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="zlib-acknowledgement AND BSD-3-Clause AND GPL-2.0-only" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends=" diff --git a/testing/ocp-indent/APKBUILD b/testing/ocp-indent/APKBUILD index c1648de081e..4316deb5e66 100644 --- a/testing/ocp-indent/APKBUILD +++ b/testing/ocp-indent/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.8.2 pkgrel=2 pkgdesc="OCaml source code indenter" url="http://www.typerex.org/ocp-indent.html" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-only WITH OCaml-LGPL-linking-exception" depends_dev="ocaml-cmdliner-dev ocaml-findlib-dev" makedepends="$depends_dev dune ocaml" diff --git a/testing/ocp-index/APKBUILD b/testing/ocp-index/APKBUILD index 8ca84e017ea..5f08f93f5d3 100644 --- a/testing/ocp-index/APKBUILD +++ b/testing/ocp-index/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.3.6 pkgrel=0 pkgdesc="Lightweight completion and documentation browsing for OCaml libraries" url="http://www.typerex.org/ocp-index.html" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # ocaml license="LGPL-2.1-only WITH OCaml-LGPL-linking-exception AND GPL-3.0-only" depends_dev=" ocaml-cmdliner-dev diff --git a/testing/octoprint/APKBUILD b/testing/octoprint/APKBUILD index 66944a2e52f..aaec2c0c2db 100644 --- a/testing/octoprint/APKBUILD +++ b/testing/octoprint/APKBUILD @@ -1,8 +1,8 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=octoprint -pkgver=1.9.3 -pkgrel=4 +pkgver=1.10.0 +pkgrel=0 pkgdesc="Snappy web interface for your 3D printer" url="https://octoprint.org/" arch="noarch" @@ -54,7 +54,6 @@ depends=" makedepends=" py3-gpep517 py3-wheel - py3-python-versioneer " checkdepends=" py3-ddt @@ -67,10 +66,8 @@ subpackages=" $pkgname-openrc $pkgname-pyc " -# upstream produces volatile tarballs: https://github.com/OctoPrint/OctoPrint/issues/4908 -# https://github.com/OctoPrint/OctoPrint/archive/refs/tags/$pkgver/OctoPrint-$pkgver.tar.gz source=" - https://dev.alpinelinux.org/archive/octoprint/OctoPrint-$pkgver.tar.gz + https://github.com/OctoPrint/OctoPrint/releases/download/$pkgver/OctoPrint-$pkgver.source.tar.gz config.yaml octoprint.initd @@ -78,15 +75,9 @@ source=" fix-tests.patch netaddr-0.10.patch pydantic-2.0.patch - py3.12-typeparams.patch " builddir="$srcdir/OctoPrint-$pkgver" -prepare() { - default_prepare - rm versioneer.py -} - build() { gpep517 build-wheel \ --wheel-dir .dist \ @@ -109,11 +100,10 @@ package() { } sha512sums=" -ec2cc8e73c3ff4855c3e389259d87d196aadf4a55f35ccef87b1ef59a0d832a29c52c4ab28db833b5ec275c5270fefb35e4c4769d692e004828b58aa6241c044 OctoPrint-1.9.3.tar.gz +e7aece7014e2c7b3c202a2fcbb6a2c43b6b15c2ae9d2534b454d4240e58512d94c66d556d8852e0c0c666864c075fa9cc4b0027ce7a5ce9239bdb97d2d1f8106 OctoPrint-1.10.0.source.tar.gz b56a37d1225d37caff1288b9c943ee86ed1f36653bbb311c835031e53e5f68e95be3ad9b53d333aad65508ba2a3ba786f80601bd74fef8efb1c3364a8fd85010 config.yaml 3edd9971cc59fb66126f063ecac50a77792c5a3f5b718e03b7cbff74ff9f842c7784e7de2a56fb2e847a2bcb8e1c4fcfc52f8d236cdf3ecd511b230eea001162 octoprint.initd d678b87aaee4529b4d96f496862e5bec86df98491330328848ac06fec8d1f4571cfac995b2e9de26dcd2efc43b9dc24578d7f50cae1893fefc76470aee074f14 fix-tests.patch f99c752dccdee4821a88ac6e7ea98ac906002d734d2672bbd513b30d596b0c54b699071679581cdc46bfcd0eb98d6d032243a6d940f64620a69623a65db229bf netaddr-0.10.patch ed0bebc3632519b0adab58f6ef4666e0192ab72021f2c127146eec9c566551f04c49f05ace5a4056177f21605064146ac6259a88db15faaf88853fd3750abe88 pydantic-2.0.patch -6845a07fbe7776b7f29a2d2a532fe5f230d40ab74705aa6dff50b777e2ac603fd88e1f5434323285895e2a8705f54c8a2970228ee1309a746e7a921229e8de4b py3.12-typeparams.patch " diff --git a/testing/octoprint/py3.12-typeparams.patch b/testing/octoprint/py3.12-typeparams.patch deleted file mode 100644 index f1f7d6ceb2c..00000000000 --- a/testing/octoprint/py3.12-typeparams.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0718dfb68eaae5d9547690458c6f33b3243d9d44 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <gina@octoprint.org> -Date: Wed, 4 Oct 2023 13:35:56 +0200 -Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20Fix=203.12=20unit=20tests?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - src/octoprint/plugin/core.py | 5 ++++- - tests/plugin/test_settings.py | 2 ++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/octoprint/plugin/core.py b/src/octoprint/plugin/core.py -index 297386e4a9..b793f401d0 100644 ---- a/src/octoprint/plugin/core.py -+++ b/src/octoprint/plugin/core.py -@@ -115,7 +115,10 @@ def extract_names(node): - for a in reversed(assignments): - targets = extract_target_ids(a) - if key in targets: -- if isinstance(a.value, ast.Str): -+ if isinstance(a.value, ast.Constant): -+ result[key] = a.value.value -+ -+ elif isinstance(a.value, ast.Str): - result[key] = a.value.s - - elif ( -diff --git a/tests/plugin/test_settings.py b/tests/plugin/test_settings.py -index 6d5a3d4281..36f52182d1 100644 ---- a/tests/plugin/test_settings.py -+++ b/tests/plugin/test_settings.py -@@ -111,6 +111,7 @@ def test_deprecated_forwarded_getter( - called_method.__name__ = forwarded - called_method.__qualname__ = forwarded - called_method.__annotations__ = {} -+ called_method.__type_params__ = () - - method = getattr(plugin_settings, deprecated) - assert callable(method) -@@ -330,6 +331,7 @@ def test_deprecated_forwarded_setter( - called_method.__name__ = forwarded - called_method.__qualname__ = forwarded - called_method.__annotations__ = {} -+ called_method.__type_params__ = () - - method = getattr(plugin_settings, deprecated) - assert callable(method) diff --git a/testing/onnxruntime/APKBUILD b/testing/onnxruntime/APKBUILD index d48fe7f86be..8728e79a6bd 100644 --- a/testing/onnxruntime/APKBUILD +++ b/testing/onnxruntime/APKBUILD @@ -5,7 +5,8 @@ pkgrel=1 pkgdesc="Cross-platform, high performance ML inferencing and training accelerator" url="https://onnxruntime.ai" # x86, s390x: fails to build -arch="all !x86 !s390x" +# riscv64: tests fails +arch="all !x86 !s390x !riscv64" license="MIT" makedepends=" abseil-cpp-dev diff --git a/testing/opcr-policy/APKBUILD b/testing/opcr-policy/APKBUILD index 4d3333a11d6..e7024644427 100644 --- a/testing/opcr-policy/APKBUILD +++ b/testing/opcr-policy/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=opcr-policy -pkgver=0.2.9 -pkgrel=2 +pkgver=0.2.13 +pkgrel=0 pkgdesc="CLI for building, versioning and publishing authorization policies" url="https://www.openpolicycontainers.com/" arch="all" @@ -9,6 +9,7 @@ license="Apache-2.0" makedepends="go" source="$pkgname-$pkgver.tar.gz::https://github.com/opcr-io/policy/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir/policy-$pkgver" +options="net" # download Go modules export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -33,5 +34,5 @@ package() { } sha512sums=" -761d650b69c1eebc166b66660a3ac28686e3c69121890bc2c691db5ce0c116e6dc12343927b3302da8ded9be250721d3eeef423dbfeed08de7bb27e98e6ec589 opcr-policy-0.2.9.tar.gz +45f52b0c048e10690ff41279fffc1644c30b406a3ca6da43d1bce46d649b7b83e05e7e4b9cbf0fa165069f97b18510dd765de148020b2daceae36bd05bbd9fb9 opcr-policy-0.2.13.tar.gz " diff --git a/testing/openjdk22/APKBUILD b/testing/openjdk22/APKBUILD new file mode 100644 index 00000000000..3cd5418aba7 --- /dev/null +++ b/testing/openjdk22/APKBUILD @@ -0,0 +1,293 @@ +# Contributor: Simon Frankenberger <simon-alpine@fraho.eu> +# Maintainer: Simon Frankenberger <simon-alpine@fraho.eu> +pkgname=openjdk22 +pkgver=22.0.1_p8 +_pkgver=${pkgver%_p*}-ga +pkgrel=2 +pkgdesc="Oracle OpenJDK 22" +provider_priority=22 +url="https://github.com/openjdk/jdk22u" +# oracle dropped support for 32 bit +arch="all !x86 !armhf !armv7" +license="GPL-2.0-with-classpath-exception" +makedepends=" + openjdk21-jdk + autoconf + bash + gawk + grep + make + zip + alsa-lib-dev + cups-dev + elfutils-dev + fontconfig-dev + freetype-dev + giflib-dev + lcms2-dev + libffi-dev + libjpeg-turbo-dev + libx11-dev + libxext-dev + libxrandr-dev + libxrender-dev + libxt-dev + libxtst-dev + linux-headers + zlib-dev + " +depends="$pkgname-jdk $pkgname-demos $pkgname-doc" # for the virtual openjdk18 package +subpackages="$pkgname-jmods:_jmods:noarch + $pkgname-demos:_demos:noarch + $pkgname-doc:_doc:noarch + $pkgname-jre:_jre + $pkgname-src:_src:noarch + $pkgname-static-libs:_static_libs + $pkgname-jre-headless:_jre_headless + $pkgname-jdk:_jdk + " +source="jdk-$_pkgver.tar.gz::https://github.com/openjdk/jdk22u/archive/jdk-$_pkgver.tar.gz + gtest-1.14.0.tar.gz::https://github.com/google/googletest/archive/v1.14.0.tar.gz + + ppc64le.patch + riscv64.patch + JDK-8299245_disable-tests.patch + JDK-8218814_Wformat-security.patch +" +builddir="$srcdir/jdk22u-jdk-${_pkgver/+/-}" + +provides="$pkgname-bootstrap=$pkgver-r$pkgrel" + +_java_home="/usr/lib/jvm/java-22-openjdk" + +ldpath="$_java_home/lib:$_java_home/lib/server" +sonameprefix="$pkgname:" + +# enable running the JTReg tests in check? +# see comment in that function for explanation +_run_jtreg=${_run_jtreg:-0} +if [ $_run_jtreg -ne 0 ]; then + makedepends="$makedepends java-jtreg" + checkdepends="$checkdepends ttf-freefont xvfb-run" +fi + +build() { + if [ $_run_jtreg -ne 0 ]; then + _with_jtreg="--with-jtreg=/usr/share/java/jtreg" + else + _with_jtreg="--with-jtreg=no" + fi + + if [ -n "$USE_CCACHE" ]; then + # workaround ccache being disallowed + export PATH="/usr/bin:/bin:/sbin:/usr/sbin" + local ccache="--enable-ccache" + fi + + # CFLAGS, CXXFLAGS and LDFLAGS are ignored as shown by a warning + # in the output of ./configure unless used like such: + # --with-extra-cflags="$CFLAGS" + # --with-extra-cxxflags="$CXXFLAGS" + # --with-extra-ldflags="$LDFLAGS" + # See also paragraph "Configure Control Variables" from "common/doc/building.md" + # shellcheck disable=2097 disable=2098 + CFLAGS='' CXXFLAGS='' LDFLAGS='' \ + bash ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --target=$CTARGET \ + --prefix="$_java_home" \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --with-extra-cflags="$CFLAGS -D_LARGEFILE64_SOURCE" \ + --with-extra-cxxflags="$CXXFLAGS -D_LARGEFILE64_SOURCE" \ + --with-extra-ldflags="$LDFLAGS" \ + --with-zlib=system \ + --with-libjpeg=system \ + --with-giflib=system \ + --with-libpng=system \ + --with-lcms=system \ + --with-jobs=${JOBS:-4} \ + --with-test-jobs=${JOBS:-4} \ + --with-native-debug-symbols=none \ + --with-gtest=../googletest-1.14.0 \ + $ccache \ + $_with_jtreg \ + --disable-warnings-as-errors \ + --disable-precompiled-headers \ + --enable-dtrace=no \ + --with-jvm-variants=server \ + --with-debug-level=release \ + --with-version-pre= \ + --with-version-opt="alpine-r$pkgrel" \ + --with-version-build="${pkgver##*p}" \ + --with-vendor-name="Alpine" \ + --with-vendor-url="https://alpinelinux.org/" \ + --with-vendor-bug-url="https://gitlab.alpinelinux.org/alpine/aports/issues" \ + --with-vendor-vm-bug-url="https://gitlab.alpinelinux.org/alpine/aports/issues" + MAKEFLAGS='' make jdk-image + MAKEFLAGS='' make static-libs-image +} + +check() { + # run the gtest unittest suites + # they don't take long, DO NOT DISABLE THEM! + # override make variable, disable -Werror + MAKEFLAGS='' make test-hotspot-gtest + + # The jtreg tests take very, very long to finish and show some failures (9 - 12 on my machine, varying between runs) + # I think these are not critical and can be safely ignored. + # As the tests take too long, they are disabled by default. + # When updating this aport please let them run at least once on your machine to see if the failure count changes. + if [ $_run_jtreg -ne 0 ]; then + _logfile=$( mktemp -p "$builddir" ) + MAKEFLAGS='' xvfb-run make \ + run-test-tier1 \ + run-test-tier2 \ + run-test-tier3 \ + | tee "$_logfile" + msg "---------------------------------------" + msg "The build log can be found at $_logfile" + # abort the build so you may take a look at the logfile + false + return 1 + fi +} + +package() { + local libstaticdir="lib/static/linux-${CARCH/x86_64/amd64}/musl" + + mkdir -p "$pkgdir/$_java_home/$libstaticdir" + + cd build/linux-*-server-release/images/ + cp -r jdk/* "$pkgdir/$_java_home" + cp -r static-libs/lib/* "$pkgdir/$_java_home/$libstaticdir" +} + +_jmods() { + pkgdesc="Oracle OpenJDK 22 (jmods)" + depends="" + _fromroot="$pkgdir/$_java_home" + _toroot="$subpkgdir/$_java_home" + + mkdir -p "$_toroot" + mv "$_fromroot/jmods" "$_toroot" +} + +_demos() { + pkgdesc="Oracle OpenJDK 22 (demos)" + depends="" + _fromroot="$pkgdir/$_java_home" + _toroot="$subpkgdir/$_java_home" + + mkdir -p "$_toroot" + mv "$_fromroot/demo" "$_toroot" +} + +_doc() { + pkgdesc="Oracle OpenJDK 22 (Documentation)" + depends="" + _fromroot="$pkgdir/$_java_home" + _toroot="$subpkgdir/$_java_home" + + mkdir -p "$_toroot" + mv "$_fromroot/man" "$_toroot" +} + +_jre() { + pkgdesc="Oracle OpenJDK 22 (JRE)" + depends="$pkgname-jre-headless" + provides=java-jre + _fromroot="$pkgdir/$_java_home" + _toroot="$subpkgdir/$_java_home" + + mkdir -p "$_toroot/lib" + mv "$_fromroot/lib/libawt_xawt.so" \ + "$_fromroot/lib/libfontmanager.so" \ + "$_fromroot/lib/libjavajpeg.so" \ + "$_fromroot/lib/libjawt.so" \ + "$_fromroot/lib/libjsound.so" \ + "$_fromroot/lib/liblcms.so" \ + "$_fromroot/lib/libsplashscreen.so" \ + "$_toroot/lib" +} + +_src() { + pkgdesc="Oracle OpenJDK 22 (sources)" + depends="$pkgname-jre-headless" + mkdir -p "$subpkgdir/$_java_home"/lib + mv "$pkgdir"/$_java_home/lib/src.zip \ + "$subpkgdir"/$_java_home/lib/ +} + +_static_libs() { + pkgdesc="Oracle OpenJDK 22 libraries for static linking" + provides="java-jdk-static-libs" + depends="$pkgname=$pkgver-r$pkgrel" + + amove $_java_home/lib/static +} + +_jre_headless() { + pkgdesc="Oracle OpenJDK 22 (JRE headless)" + depends="java-common java-cacerts" + provides=java-jre-headless + _fromroot="$pkgdir/$_java_home" + _toroot="$subpkgdir/$_java_home" + + mkdir -p "$_toroot" + mv "$_fromroot/lib" "$_toroot" + + # ct.sym should stay in -jdk + mkdir "$_fromroot/lib" + mv "$_toroot/lib/ct.sym" "$_fromroot/lib" + + mkdir -p "$_toroot/bin" + for i in java \ + jfr \ + jrunscript \ + jwebserver \ + keytool \ + rmiregistry; do + mv "$_fromroot/bin/$i" "$_toroot/bin/$i" + done + + mv "$_fromroot/legal" "$_toroot" + mv "$_fromroot/conf" "$_toroot" + mv "$_fromroot/release" "$_toroot" + cp "$builddir/ASSEMBLY_EXCEPTION" "$_toroot" + cp "$builddir/LICENSE" "$_toroot" + cp "$builddir/README.md" "$_toroot" + + # symlink to shared cacerts store + rm "$_toroot/lib/security/cacerts" + ln -sf /etc/ssl/certs/java/cacerts \ + "$_toroot/lib/security/cacerts" + + # symlink for java-common to work (expects jre in $_java_home/jre) + ln -sf . "$_toroot/jre" +} + +_jdk() { + pkgdesc="Oracle OpenJDK 22 (JDK)" + depends="$pkgname-jre $pkgname-jmods" + provides=java-jdk + _fromroot="$pkgdir/$_java_home" + _toroot="$subpkgdir/$_java_home" + + mkdir -p "$_toroot" + mv "$_fromroot/bin" "$_toroot" + mv "$_fromroot/lib" "$_toroot" + mv "$_fromroot/include" "$_toroot" +} + +sha512sums=" +81df3fcc20105fe5b4df820566925b6b1abc0dba1875c214738767e5cda12d8faeab7d2854ecee9d91402b660c9de93814e83f4192ad837cd2aa8e162b4ac06d jdk-22.0.1-ga.tar.gz +765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c gtest-1.14.0.tar.gz +df49e32ddc56393869e792ae8347bfd63f29515e6aea94aabbc1e05d9e7c4d9e035d794c8dd031fc39627b0e07830927cb3e498ff6278932f6724c5ac6bb51eb ppc64le.patch +73c8aeb77e2b1f105c62d1739a19f973cb34a16380fbff142605ee7e93cbc388613fa693d96b779ce73e82cd5fc4e46ffb09c3e3a522a8d459088dd47388ac23 riscv64.patch +403862d6e6919f40d705c59463e9d6ecc5ac5b3f95e107a7e91f84d64068176e4abe7b63f15ba8fc9b4ab2f1ab58f3a489e07716e4c370356e40c2699e870b4f JDK-8299245_disable-tests.patch +66f9d80d189ee2cd3658a5d4f744247731ee2659c3bae2f3e8e4ca29d834170aa265b7db9376d80c3050d10defc8247c2d8ed690d06707fe86691a6c2066c320 JDK-8218814_Wformat-security.patch +" diff --git a/testing/openjdk22/JDK-8218814_Wformat-security.patch b/testing/openjdk22/JDK-8218814_Wformat-security.patch new file mode 100644 index 00000000000..95218e9785c --- /dev/null +++ b/testing/openjdk22/JDK-8218814_Wformat-security.patch @@ -0,0 +1,17 @@ +Author: Simon Frankenberger <simon-alpine@fraho.eu> +Subject: Fix compilation of jtreg / gtest objects with -Werror=format-security CFLAGS +Upstream: Yes / closed unresolved (https://bugs.openjdk.org/browse/JDK-8218814) + +Remove the -Wno-format CLFAG for test objects + +--- old/make/common/TestFilesCompilation.gmk ++++ new/make/common/TestFilesCompilation.gmk +@@ -100,7 +100,7 @@ + CFLAGS := $$($1_BASE_CFLAGS) $$($1_CFLAGS) $$($1_CFLAGS_$$(name)), \ + CXXFLAGS := $$($1_BASE_CXXFLAGS) $$($1_CFLAGS) $$($1_CFLAGS_$$(name)), \ + LDFLAGS := $$($1_LDFLAGS) $$($1_LDFLAGS_$$(name)), \ +- DISABLED_WARNINGS_gcc := format undef unused-function unused-value, \ ++ DISABLED_WARNINGS_gcc := undef unused-function unused-value, \ + DISABLED_WARNINGS_clang := undef format-nonliteral \ + missing-field-initializers sometimes-uninitialized, \ + LIBS := $$($1_LIBS_$$(name)), \ diff --git a/testing/openjdk22/JDK-8299245_disable-tests.patch b/testing/openjdk22/JDK-8299245_disable-tests.patch new file mode 100644 index 00000000000..907fd3a6ede --- /dev/null +++ b/testing/openjdk22/JDK-8299245_disable-tests.patch @@ -0,0 +1,53 @@ +Author: Simon Frankenberger <simon-alpine@fraho.eu> +Subject: Disable failing tests +Upstream: Yes (https://bugs.openjdk.org/browse/JDK-8299245) + +"Some gtests do not work well in non-debug build" +Disable failing tests as workaround + +--- old/test/hotspot/gtest/runtime/test_os_linux.cpp ++++ new/test/hotspot/gtest/runtime/test_os_linux.cpp +@@ -439,6 +439,7 @@ + + #if !defined(__clang_major__) || (__clang_major__ >= 5) // DWARF does not support Clang versions older than 5.0. + // Test valid address of method ReportJNIFatalError in jniCheck.hpp. We should get "jniCheck.hpp" in the buffer and a valid line number. ++#if 0 + TEST_VM(os_linux, decoder_get_source_info_valid) { + char buf[128] = ""; + int line = -1; +@@ -447,6 +448,7 @@ + ASSERT_TRUE(strcmp(buf, "jniCheck.hpp") == 0); + ASSERT_TRUE(line > 0); + } ++#endif + + // Test invalid addresses. Should not cause harm and output buffer and line must contain "" and -1, respectively. + TEST_VM(os_linux, decoder_get_source_info_invalid) { +@@ -466,6 +468,7 @@ + + // Test with valid address but a too small buffer to store the entire filename. Should find generic <OVERFLOW> message + // and a valid line number. ++#if 0 + TEST_VM(os_linux, decoder_get_source_info_valid_overflow) { + char buf[11] = ""; + int line = -1; +@@ -474,9 +477,11 @@ + ASSERT_TRUE(strcmp(buf, "<OVERFLOW>") == 0); + ASSERT_TRUE(line > 0); + } ++#endif + + // Test with valid address but a too small buffer that can neither store the entire filename nor the generic <OVERFLOW> + // message. We should find "L" as filename and a valid line number. ++#if 0 + TEST_VM(os_linux, decoder_get_source_info_valid_overflow_minimal) { + char buf[2] = ""; + int line = -1; +@@ -485,6 +490,7 @@ + ASSERT_TRUE(strcmp(buf, "L") == 0); // Overflow message does not fit, so we fall back to "L:line_number" + ASSERT_TRUE(line > 0); // Line should correctly be found and returned + } ++#endif + #endif // clang + + #ifdef __GLIBC__ diff --git a/testing/openjdk22/ppc64le.patch b/testing/openjdk22/ppc64le.patch new file mode 100644 index 00000000000..3254e5d45db --- /dev/null +++ b/testing/openjdk22/ppc64le.patch @@ -0,0 +1,226 @@ +Subject: Fix compilation with different ucontext_t on musl +Upstream: No +Author: Simon Frankenberger <simon-alpine@fraho.eu> + +The machine state registers have to be accessed differently when +running on musl libc. This patch fix this by replacing +"uc_mcontext.regs->grp" with "uc_mcontext.gp_regs" +and accessing the named fields (like "->nip") by the array index constants. + +diff -ru old/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp new/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp +--- old/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp ++++ new/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp +@@ -47,6 +47,10 @@ + #include "utilities/macros.hpp" + #include "utilities/powerOfTwo.hpp" + ++#if ! (defined(__GLIBC__) || defined(__UCLIBC__)) ++#include <asm/ptrace.h> ++#endif ++ + #ifdef PRODUCT + #define BLOCK_COMMENT(str) // nothing + #else +diff -ru old/src/hotspot/cpu/ppc/vm_version_ppc.cpp new/src/hotspot/cpu/ppc/vm_version_ppc.cpp +--- old/src/hotspot/cpu/ppc/vm_version_ppc.cpp ++++ new/src/hotspot/cpu/ppc/vm_version_ppc.cpp +@@ -53,6 +53,10 @@ + #endif + #endif + ++#if ! (defined(__GLIBC__) || defined(__UCLIBC__)) ++#include <asm/ptrace.h> ++#endif ++ + bool VM_Version::_is_determine_features_test_running = false; + uint64_t VM_Version::_dscr_val = 0; + +diff -ru old/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp new/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp +--- old/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp ++++ new/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp +@@ -28,6 +28,10 @@ + #include "runtime/frame.inline.hpp" + #include "runtime/javaThread.hpp" + ++#if ! (defined(__GLIBC__) || defined(__UCLIBC__)) ++#include <asm/ptrace.h> ++#endif ++ + frame JavaThread::pd_last_frame() { + assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); + +@@ -58,14 +62,22 @@ + // if we were running Java code when SIGPROF came in. + if (isInJava) { + ucontext_t* uc = (ucontext_t*) ucontext; ++#if defined(__GLIBC__) || defined(__UCLIBC__) + address pc = (address)uc->uc_mcontext.regs->nip; ++#else // Musl ++ address pc = (address)uc->uc_mcontext.gp_regs[PT_NIP]; ++#endif + + if (pc == nullptr) { + // ucontext wasn't useful + return false; + } + ++#if defined(__GLIBC__) || defined(__UCLIBC__) + frame ret_frame((intptr_t*)uc->uc_mcontext.regs->gpr[1/*REG_SP*/], pc); ++#else // Musl ++ frame ret_frame((intptr_t*)uc->uc_mcontext.gp_regs[1/*REG_SP*/], pc); ++#endif + + if (ret_frame.fp() == nullptr) { + // The found frame does not have a valid frame pointer. +@@ -84,7 +96,11 @@ + if (!Method::is_valid_method(m)) return false; + if (!Metaspace::contains(m->constMethod())) return false; + ++#if defined(__GLIBC__) || defined(__UCLIBC__) + uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/]; ++#else // Musl ++ uint64_t reg_bcp = uc->uc_mcontext.gp_regs[14/*R14_bcp*/]; ++#endif + uint64_t istate_bcp = istate->bcp; + uint64_t code_start = (uint64_t)(m->code_base()); + uint64_t code_end = (uint64_t)(m->code_base() + m->code_size()); +diff -ru old/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp new/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp +--- old/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp ++++ new/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp +@@ -78,6 +78,10 @@ + # include <poll.h> + # include <ucontext.h> + ++#if ! (defined(__GLIBC__) || defined(__UCLIBC__)) ++#include <asm/ptrace.h> ++#endif ++ + + address os::current_stack_pointer() { + return (address)__builtin_frame_address(0); +@@ -105,24 +109,42 @@ + // - if uc was filled by getcontext(), it is undefined - getcontext() does not fill + // it because the volatile registers are not needed to make setcontext() work. + // Hopefully it was zero'd out beforehand. ++#if defined(__GLIBC__) || defined(__UCLIBC__) + guarantee(uc->uc_mcontext.regs != nullptr, "only use ucontext_get_pc in sigaction context"); + return (address)uc->uc_mcontext.regs->nip; ++#else // Musl ++ guarantee(uc->uc_mcontext.gp_regs != NULL, "only use ucontext_get_pc in sigaction context"); ++ return (address)uc->uc_mcontext.gp_regs[PT_NIP]; ++#endif + } + + // modify PC in ucontext. + // Note: Only use this for an ucontext handed down to a signal handler. See comment + // in ucontext_get_pc. + void os::Posix::ucontext_set_pc(ucontext_t * uc, address pc) { ++#if defined(__GLIBC__) || defined(__UCLIBC__) + guarantee(uc->uc_mcontext.regs != nullptr, "only use ucontext_set_pc in sigaction context"); + uc->uc_mcontext.regs->nip = (unsigned long)pc; ++#else // Musl ++ guarantee(uc->uc_mcontext.gp_regs != NULL, "only use ucontext_set_pc in sigaction context"); ++ uc->uc_mcontext.gp_regs[PT_NIP] = (unsigned long)pc; ++#endif + } + + static address ucontext_get_lr(const ucontext_t * uc) { ++#if defined(__GLIBC__) || defined(__UCLIBC__) + return (address)uc->uc_mcontext.regs->link; ++#else // Musl ++ return (address)uc->uc_mcontext.gp_regs[PT_LNK]; ++#endif + } + + intptr_t* os::Linux::ucontext_get_sp(const ucontext_t * uc) { ++#if defined(__GLIBC__) || defined(__UCLIBC__) + return (intptr_t*)uc->uc_mcontext.regs->gpr[1/*REG_SP*/]; ++#else // Musl ++ return (intptr_t*)uc->uc_mcontext.gp_regs[1/*REG_SP*/]; ++#endif + } + + intptr_t* os::Linux::ucontext_get_fp(const ucontext_t * uc) { +@@ -130,7 +152,11 @@ + } + + static unsigned long ucontext_get_trap(const ucontext_t * uc) { ++#if defined(__GLIBC__) || defined(__UCLIBC__) + return uc->uc_mcontext.regs->trap; ++#else // Musl ++ return uc->uc_mcontext.gp_regs[PT_TRAP]; ++#endif + } + + address os::fetch_frame_from_context(const void* ucVoid, +@@ -196,7 +222,11 @@ + // 3.2.1 "Machine State Register"), however note that ISA notation for bit + // numbering is MSB 0, so for normal bit numbering (LSB 0) they come to be + // bits 33 and 34. It's not related to endianness, just a notation matter. ++#if defined(__GLIBC__) || defined(__UCLIBC__) + if (second_uc->uc_mcontext.regs->msr & 0x600000000) { ++#else // Musl ++ if (second_uc->uc_mcontext.gp_regs[PT_MSR] & 0x600000000) { ++#endif + if (TraceTraps) { + tty->print_cr("caught signal in transaction, " + "ignoring to jump to abort handler"); +@@ -452,6 +482,7 @@ + const ucontext_t* uc = (const ucontext_t*)context; + + st->print_cr("Registers:"); ++#if defined(__GLIBC__) || defined(__UCLIBC__) + st->print("pc =" INTPTR_FORMAT " ", uc->uc_mcontext.regs->nip); + st->print("lr =" INTPTR_FORMAT " ", uc->uc_mcontext.regs->link); + st->print("ctr=" INTPTR_FORMAT " ", uc->uc_mcontext.regs->ctr); +@@ -460,6 +491,16 @@ + st->print("r%-2d=" INTPTR_FORMAT " ", i, uc->uc_mcontext.regs->gpr[i]); + if (i % 3 == 2) st->cr(); + } ++#else // Musl ++ st->print("pc =" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[PT_NIP]); ++ st->print("lr =" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[PT_LNK]); ++ st->print("ctr=" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[PT_CTR]); ++ st->cr(); ++ for (int i = 0; i < 32; i++) { ++ st->print("r%-2d=" INTPTR_FORMAT " ", i, uc->uc_mcontext.gp_regs[i]); ++ if (i % 3 == 2) st->cr(); ++ } ++#endif + st->cr(); + st->cr(); + } +@@ -495,17 +536,33 @@ + continuation = n + 1; + switch (n) { + case 0: ++#if defined(__GLIBC__) || defined(__UCLIBC__) + st->print("pc ="); print_location(st, (intptr_t)uc->uc_mcontext.regs->nip); ++#else // Musl ++ st->print("pc ="); print_location(st, (intptr_t)uc->uc_mcontext.gp_regs[PT_NIP]); ++#endif + break; + case 1: ++#if defined(__GLIBC__) || defined(__UCLIBC__) + st->print("lr ="); print_location(st, (intptr_t)uc->uc_mcontext.regs->link); ++#else // Musl ++ st->print("pc ="); print_location(st, (intptr_t)uc->uc_mcontext.gp_regs[PT_LNK]); ++#endif + break; + case 2: ++#if defined(__GLIBC__) || defined(__UCLIBC__) + st->print("ctr ="); print_location(st, (intptr_t)uc->uc_mcontext.regs->ctr); ++#else // Musl ++ st->print("pc ="); print_location(st, (intptr_t)uc->uc_mcontext.gp_regs[PT_CTR]); ++#endif + break; + default: + st->print("r%-2d=", n-3); ++#if defined(__GLIBC__) || defined(__UCLIBC__) + print_location(st, (intptr_t)uc->uc_mcontext.regs->gpr[n-3]); ++#else // Musl ++ print_location(st, (intptr_t)uc->uc_mcontext.gp_regs[n-3]); ++#endif + break; + } + ++n; diff --git a/testing/openjdk22/riscv64.patch b/testing/openjdk22/riscv64.patch new file mode 100644 index 00000000000..aff4666e661 --- /dev/null +++ b/testing/openjdk22/riscv64.patch @@ -0,0 +1,17 @@ +Subject: Remove fpu_control.h include +Upstream: No +Author: Simon Frankenberger <simon-alpine@fraho.eu> + +The header is not present with musl and including it results in build error. +It's not needed anyways. + +--- old/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp ++++ new/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp +@@ -56,7 +56,6 @@ + + // put OS-includes here + # include <dlfcn.h> +-# include <fpu_control.h> + # include <errno.h> + # include <pthread.h> + # include <signal.h> diff --git a/testing/ovos-shell/APKBUILD b/testing/ovos-shell/APKBUILD index 2dfc807a504..4ed3d54b467 100644 --- a/testing/ovos-shell/APKBUILD +++ b/testing/ovos-shell/APKBUILD @@ -7,9 +7,9 @@ _commit="d98c91ac82e2aa5984a4dd616f2d072ae9767395" pkgdesc="OpenVoiceOS Shell with Mycroft GUI embedded view for Wayland and EGLFS platforms" url="https://github.com/OpenVoiceOS/ovos-shell" # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> qt5-qtwebview +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt5-qtwebengine -> qt5-qtwebview # armv7 blocked by mycroft-gui -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" license="Apache-2.0" depends=" kirigami2 diff --git a/testing/passt/APKBUILD b/testing/passt/APKBUILD deleted file mode 100644 index 1bc9d9d4d46..00000000000 --- a/testing/passt/APKBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> -pkgname=passt -pkgver=2024.02.20 -_commit=1e6f92b -_tag=${pkgver//./_}.$_commit -pkgrel=0 -pkgdesc="Plug a simple socket transport" -url="https://passt.top/" -arch="all" -license="BSD-3-Clause AND GPL-2.0-or-later" -makedepends="coreutils-fmt linux-headers" -subpackages="$pkgname-doc" -source="https://passt.top/passt/snapshot/passt-$_tag.tar.gz" -builddir="$srcdir/$pkgname-$_tag" -# complicated test setup, requires qemu and a lot of VM images -options="!check" - -build() { - make -} - -package() { - make DESTDIR="$pkgdir" prefix=/usr install - install -Dm644 LICENSES/*.txt -t "$pkgdir"/usr/share/licenses/$pkgname/ -} - -sha512sums=" -bd47321cb727a15310b9c02622e8d5f983ca52e996c1e80a58fba0212845beddd4060d7a78585b5e13a2cb02206ef16bf13c9edb325bb2be4b4fafed5a609bd7 passt-2024_02_20.1e6f92b.tar.gz -" diff --git a/testing/pcl/APKBUILD b/testing/pcl/APKBUILD index e7ba223769f..c50e4d08c56 100644 --- a/testing/pcl/APKBUILD +++ b/testing/pcl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bradley J Chambers <brad.chambers@gmail.com> # Maintainer: Daniel Tobon <danieltobonco@gmail.com> pkgname=pcl -pkgver=1.13.1 +pkgver=1.14.0 pkgrel=1 _gtestver=1.12.1 pkgdesc="Point Cloud Library (PCL)" @@ -12,6 +12,7 @@ depends_dev=" boost-dev eigen-dev flann-dev + freeglut-dev hdf5-dev libpcap-dev libusb-dev @@ -20,7 +21,6 @@ depends_dev=" qhull-static qt5-qtbase-dev vtk-dev - freeglut-dev " makedepends=" $depends_dev @@ -99,7 +99,7 @@ check() { } sha512sums=" -0259b6c4b63976847e41c45b17a00fcc64d8be53106d1edbaf4c06f7665cd71383f2b9d3676ca45f0ace0aa131feaf760e640a7849c450300048ef274174dd80 pcl-1.13.1.tar.gz +bbcd15cf1ae620d46163c7639238bff34a871916d36d275fededbccca2bacd8da6ffda477607c4ef0eb795c140c5e1677b8239cbe2f7576f5ff92035c9c36b3f pcl-1.14.0.tar.gz a9104dc6c53747e36e7dd7bb93dfce51a558bd31b487a9ef08def095518e1296da140e0db263e0644d9055dbd903c0cb69380cb2322941dbfb04780ef247df9c gtest-release-1.12.1.tar.gz f866bf3c5eb8cf02b3531dff527f103b2f9c2bb454df6455b66e6d2f425e37d938f86efe7ba534d09a5f10a2830178e01853dc73769775d1faa9d049a5c5cc4b fix-broken-flags.patch " diff --git a/testing/pcsc-perl/APKBUILD b/testing/pcsc-perl/APKBUILD index 536f2f1a593..b83c79b9ff6 100644 --- a/testing/pcsc-perl/APKBUILD +++ b/testing/pcsc-perl/APKBUILD @@ -11,17 +11,14 @@ depends="perl" makedepends="pcsc-lite-dev perl-dev" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/LudovicRousseau/pcsc-perl/archive/refs/tags/$pkgver.tar.gz" -builddir="$srcdir/pcsc-perl-$pkgver" options="!check" # no tests available build() { - cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } diff --git a/testing/pebble-le/APKBUILD b/testing/pebble-le/APKBUILD index 72806d9339e..57ccaade81d 100644 --- a/testing/pebble-le/APKBUILD +++ b/testing/pebble-le/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: leso-kn <info@lesosoftware.com> pkgname=pebble-le pkgver=0.3.0 -pkgrel=0 +pkgrel=1 _bluez_inc="41bdc1a5d98d929764600c14d0654c9ff5112f86" pkgdesc="Library to talk to Pebble Smartwatches via Bluetooth Low Energy (BLE)" url="https://github.com/leso-kn/pebble-le" diff --git a/testing/perl-autobox/APKBUILD b/testing/perl-autobox/APKBUILD index 20a57d9b0e1..3aec412f5a5 100644 --- a/testing/perl-autobox/APKBUILD +++ b/testing/perl-autobox/APKBUILD @@ -9,15 +9,15 @@ pkgdesc="call methods on native types" url="https://metacpan.org/release/autobox" arch="all" license="GPL-1.0-or-later OR Artistic-1.0-Perl" -cpandepends="perl-scope-guard" -cpanmakedepends="perl-ipc-system-simple perl-test-fatal" -depends="$cpandepends" -makedepends="perl-dev perl-test-pod $cpanmakedepends" +depends="perl-scope-guard" +makedepends="perl-dev perl-test-pod perl-ipc-system-simple perl-test-fatal" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/$_pkgreal-v$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/autobox-v$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-v$pkgver" prepare() { + default_prepare + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } @@ -36,4 +36,6 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="401d5e87e15cf26362a88e5d23d8c9e842b951c03ac7010da2317af5ea897fa1fe2e4862cc5c691f25851fd5ba5398935c27f6d9f87fbc2fe52bb68a25d3d3a0 autobox-v3.0.1.tar.gz" +sha512sums=" +401d5e87e15cf26362a88e5d23d8c9e842b951c03ac7010da2317af5ea897fa1fe2e4862cc5c691f25851fd5ba5398935c27f6d9f87fbc2fe52bb68a25d3d3a0 autobox-v3.0.1.tar.gz +" diff --git a/testing/perl-devel-leak/APKBUILD b/testing/perl-devel-leak/APKBUILD index 93ff0abed38..43d3c259ca0 100644 --- a/testing/perl-devel-leak/APKBUILD +++ b/testing/perl-devel-leak/APKBUILD @@ -10,11 +10,12 @@ arch="all" license="GPL-1.0-or-later OR Artistic-1.0-Perl" makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/N/NI/NI-S/$_pkgreal-$pkgver.tar.gz" - +source="https://cpan.metacpan.org/authors/id/N/NI/NI-S/Devel-Leak-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" prepare() { + default_prepare + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } @@ -33,4 +34,6 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="177f64b87fa6ab08b93f7c5bfcbaf4421e8431bf795976a0a7efa0120828984fed29a2bc12918e5bea9ea3edccf6316ba8daf704f349aece84b45bdd11f57707 Devel-Leak-0.03.tar.gz" +sha512sums=" +177f64b87fa6ab08b93f7c5bfcbaf4421e8431bf795976a0a7efa0120828984fed29a2bc12918e5bea9ea3edccf6316ba8daf704f349aece84b45bdd11f57707 Devel-Leak-0.03.tar.gz +" diff --git a/testing/perl-html-object/APKBUILD b/testing/perl-html-object/APKBUILD index 67fd06c8e9f..9570a9f41ef 100644 --- a/testing/perl-html-object/APKBUILD +++ b/testing/perl-html-object/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-html-object -pkgver=0.3.1 +pkgver=0.5.0 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=HTML-Object @@ -47,5 +47,5 @@ doc() { } sha512sums=" -f1a96523f57cf30045b44871536980ca16cf57450c14fa60a64d908d881f3822f348f19998533c1406ddf97a9f7edd3bd14c472fd68536db8b3592ca08207fa9 HTML-Object-v0.3.1.tar.gz +50d5da8dd3e7aeb55605d8810f0eab04a79f94f5b6915c22f786c9216f47c9f51ec1f3b783843bf9f930965cf87d419fad26e8cb44f7b001cdd9c2fe7b5d93e2 HTML-Object-v0.5.0.tar.gz " diff --git a/testing/perl-json-path/APKBUILD b/testing/perl-json-path/APKBUILD index 16a1ad84c1b..cf8b4e0ac3c 100644 --- a/testing/perl-json-path/APKBUILD +++ b/testing/perl-json-path/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-json-path +pkgver=1.0.6 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=JSON-Path -pkgver=1.0.4 -pkgrel=0 pkgdesc="Search nested hashref/arrayref structures using JSONPath" url="https://metacpan.org/release/JSON-Path/" arch="noarch" @@ -16,9 +16,7 @@ depends=" " checkdepends="perl-test2-suite" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/P/PO/POPEFELIX/JSON-Path-$pkgver.tar.gz - no-tie-ixhash.patch - " +source="https://cpan.metacpan.org/authors/id/P/PO/POPEFELIX/JSON-Path-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { @@ -40,6 +38,5 @@ package() { } sha512sums=" -89819d9afb8302f1b07d5d8376614f406c6e47017aef42fa0a4064a2d843d21d5aec83451f05ef66e62cd9118ebed12761d601c498efe43fcf1fce60308ff15f JSON-Path-1.0.4.tar.gz -77471715204552bd6c49b8ce0e7082b4cc4ea94a7d6c23bb9d32a04453a541de76ca7a40df82f3b2325bcb60e3ff05a5f0f79123184706b269bb6cb2f92e8358 no-tie-ixhash.patch +f3190d4b5392f93677bddcea6a1fe352e7bd184c35a4c878b1fa02eb7a5ca5e6f19f71c5dc7a8548df77e57720975f9f5485b7c4c13a0f5a8d0a63a820389946 JSON-Path-1.0.6.tar.gz " diff --git a/testing/perl-json-path/no-tie-ixhash.patch b/testing/perl-json-path/no-tie-ixhash.patch deleted file mode 100644 index f943faeb3af..00000000000 --- a/testing/perl-json-path/no-tie-ixhash.patch +++ /dev/null @@ -1,36 +0,0 @@ -Patch-Source: https://github.com/PopeFelix/p5-json-path/commit/a042749fb2e0103c3fa58fc02b70992fe34be7a9.patch --- -From a042749fb2e0103c3fa58fc02b70992fe34be7a9 Mon Sep 17 00:00:00 2001 -From: bernhard <Bernhard.Schmalhofer@gmx.de> -Date: Mon, 11 Dec 2023 21:03:21 +0100 -Subject: [PATCH] Do not require Tie::IxHash - ---- - cpanfile | 1 - - t/evaluator/paths.t | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/cpanfile b/cpanfile -index b1e5ff8..85eb5be 100644 ---- a/cpanfile -+++ b/cpanfile -@@ -6,7 +6,6 @@ requires 'List::Util' => '1.45'; # For uniq. - requires 'Readonly'; - requires 'Try::Tiny'; - requires 'perl' => '5.010'; --requires 'Tie::IxHash'; - - on test => sub { - requires 'Test2::V0'; -diff --git a/t/evaluator/paths.t b/t/evaluator/paths.t -index 6db78ae..3e301af 100644 ---- a/t/evaluator/paths.t -+++ b/t/evaluator/paths.t -@@ -2,7 +2,6 @@ use Test2::V0; - use JSON::MaybeXS qw/encode_json decode_json/; - use JSON::Path::Evaluator; - use Storable qw(dclone); --use Tie::IxHash; - - my $json = sample_json(); - my %data = %{ decode_json($json) }; diff --git a/testing/perl-module-generic/APKBUILD b/testing/perl-module-generic/APKBUILD index c703e2e37c8..34d03a8591c 100644 --- a/testing/perl-module-generic/APKBUILD +++ b/testing/perl-module-generic/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-module-generic -pkgver=0.35.3 +pkgver=0.37.1 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Module-Generic @@ -51,6 +51,6 @@ doc() { } sha512sums=" -0e329640655e9338ed57621aaebbbb0874500b5e6428d2c7fb794d33d32821857572dddfe72ab52f131f776e908f38cdcd7e2f3c1534c226156495198223b134 Module-Generic-v0.35.3.tar.gz +8bd8a9503a7717593651ad9abd1be2a2b66dac0130e835e5d5e168c2ebf85374243389be02b59986b8b2752025e092610ddc2affb295b099d1cde18d16cd01de Module-Generic-v0.37.1.tar.gz af467da801c0884a5994a61c205d4c522cf40905eebc4733ea4deaa755b19bab824879f91866e7622440d9ab823eed207fbe02092559da9660081423585504b3 skip-broken-tests.patch " diff --git a/testing/perl-promise-me/APKBUILD b/testing/perl-promise-me/APKBUILD index 7b24bd3f06e..dc212da5acf 100644 --- a/testing/perl-promise-me/APKBUILD +++ b/testing/perl-promise-me/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-promise-me -pkgver=0.4.10 +pkgver=0.4.11 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Promise-Me @@ -38,5 +38,5 @@ package() { } sha512sums=" -72d05a2df146e81e7eb452ac33ad99e2e399e279d610ca7d78e25875276d5d9e5298420b46024ed01aaaaa63aad98daa602a0d04cfec9ea44693c194ebc03648 Promise-Me-v0.4.10.tar.gz +c1b33505f3ab59e2a63ceee270a4d6c15e52ae0832db4bd2323695133ae038abe831ce662a6bc4f0f58c6346924e145671a636a77942d78beb672c4b30d649b1 Promise-Me-v0.4.11.tar.gz " diff --git a/testing/perl-snmp/APKBUILD b/testing/perl-snmp/APKBUILD index 00484c6a456..30ed9947aff 100644 --- a/testing/perl-snmp/APKBUILD +++ b/testing/perl-snmp/APKBUILD @@ -9,14 +9,14 @@ pkgdesc="Perl module for SNMP" url="https://metacpan.org/release/SNMP" arch="all" license="GPL-1.0-or-later OR Artistic-1.0-Perl" -cpanmakedepends="net-snmp-dev" -makedepends="perl-dev $cpanmakedepends" +makedepends="perl-dev net-snmp-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/H/HA/HARDAKER/$_pkgreal-$pkgver.tar.gz" - +source="https://cpan.metacpan.org/authors/id/H/HA/HARDAKER/SNMP-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" prepare() { + default_prepare + PERL_MM_USE_DEFAULT=1 NETSNMP_DONT_CHECK_VERSION=1 perl Makefile.PL INSTALLDIRS=vendor } @@ -29,4 +29,6 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="f836c1c346a8ccc0e9aaee6b005bb1cdf108e58143db77e017c318c0f8d05b5a7eeacabe17d2d0f063fc9c0a99367418fa00d6b91b005b3c0c923e63bb2e0c75 SNMP-5.0404.tar.gz" +sha512sums=" +f836c1c346a8ccc0e9aaee6b005bb1cdf108e58143db77e017c318c0f8d05b5a7eeacabe17d2d0f063fc9c0a99367418fa00d6b91b005b3c0c923e63bb2e0c75 SNMP-5.0404.tar.gz +" diff --git a/testing/perl-syntax-keyword-match/APKBUILD b/testing/perl-syntax-keyword-match/APKBUILD index 61f5e9f4525..17f1f737582 100644 --- a/testing/perl-syntax-keyword-match/APKBUILD +++ b/testing/perl-syntax-keyword-match/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Timothy Legge <timlegge@gmail.com> # Maintainer: Timothy Legge <timlegge@gmail.com> pkgname=perl-syntax-keyword-match +pkgver=0.14 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Syntax-Keyword-Match -pkgver=0.13 -pkgrel=0 pkgdesc="a C<match/case> syntax for perl" url="https://metacpan.org/release/Syntax-Keyword-Match/" arch="all" @@ -19,7 +19,9 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - perl Build.PL --installdirs=vendor + perl Build.PL \ + --installdirs=vendor \ + --create_packlist=0 ./Build } @@ -29,9 +31,8 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -472a0b25b8f19a09f0a7d51963bb76382a6273e505b4141148353f0375610e77d2d458fc7cf6e1cb02aa127f252f882559b186bc35b441af5fa1dad7e3aa4e25 Syntax-Keyword-Match-0.13.tar.gz +bdfa94c17893203a9489914602f9e1595aba4ecc18bc5401a21228c2c218a2af3c4141b776d8d45d7f154b6d95a7516fff5c6e3ac91b5576a0cefd3a43ba85d7 Syntax-Keyword-Match-0.14.tar.gz " diff --git a/testing/persistent-cache-cpp/APKBUILD b/testing/persistent-cache-cpp/APKBUILD index e9d6205666f..59bdd98cc49 100644 --- a/testing/persistent-cache-cpp/APKBUILD +++ b/testing/persistent-cache-cpp/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Brandon Boese <brandonboese@protonmail.com> pkgname=persistent-cache-cpp pkgver=1.0.7 -pkgrel=0 +pkgrel=1 pkgdesc="Cache of key-value pairs with persistent storage for C++ 11" url="https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp" arch="all" diff --git a/testing/php81-pecl-couchbase/APKBUILD b/testing/php81-pecl-couchbase/APKBUILD index 6ef77aebff0..0b4f4a8c2cb 100644 --- a/testing/php81-pecl-couchbase/APKBUILD +++ b/testing/php81-pecl-couchbase/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php81-pecl-couchbase _extname=couchbase -pkgver=4.2.0 +pkgver=4.2.1 pkgrel=0 pkgdesc="PHP 8.1 extension for Couchbase - PECL" url="https://pecl.php.net/package/couchbase" @@ -35,5 +35,5 @@ package() { } sha512sums=" -4e5f26d5181aad5df3162b172bda9776b2c564d5f3c0dd8aaa087091eaf3c3ebcff9044e0ccb122f34d55265f94923eb0fb37efe6a7e66c752e47ead6bde23b3 php-pecl-couchbase-4.2.0.tgz +92ab3170cb231a4c6663daf15d8749386a84e3fa31fb19b3bda39dfa28eaf50365df9c2eab229b69c630b511af8015598e4babea79d70ba4f9c721821727eb03 php-pecl-couchbase-4.2.1.tgz " diff --git a/testing/php81-pecl-mongodb/APKBUILD b/testing/php81-pecl-mongodb/APKBUILD index a4cb09478c6..49ead1c490f 100644 --- a/testing/php81-pecl-mongodb/APKBUILD +++ b/testing/php81-pecl-mongodb/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php81-pecl-mongodb _extname=mongodb -pkgver=1.18.1 +pkgver=1.19.0 pkgrel=0 pkgdesc="PHP 8.1 MongoDB driver - PECL" url="https://pecl.php.net/package/mongodb" @@ -36,5 +36,5 @@ package() { } sha512sums=" -3224ea4efac1063bea58c55c2defbb149982b88387917a1301e08b65c2bbb070d962a17bc84d187abeed8950a52e5e5d24e5517524d8bf0892ecd3f6c9f815f0 php-pecl-mongodb-1.18.1.tgz +178fb501c36b1fc0a4859f3ce7feab42e4841ef64433c2760ea60af2e0e523cd767c6380ce9c3406b3fea640ae4e45aed20f22046071b3bd0b9d84105dacdb9b php-pecl-mongodb-1.19.0.tgz " diff --git a/testing/php81-pecl-opentelemetry/APKBUILD b/testing/php81-pecl-opentelemetry/APKBUILD index d244c94d7fc..17a760b205f 100644 --- a/testing/php81-pecl-opentelemetry/APKBUILD +++ b/testing/php81-pecl-opentelemetry/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php81-pecl-opentelemetry _extname=opentelemetry -pkgver=1.0.2 +pkgver=1.0.3 _pkgver=${pkgver/_/} pkgrel=0 pkgdesc="PHP 8.1 extension for OpenTelemetry auto-instrumentation support - PECL" @@ -34,5 +34,5 @@ package() { } sha512sums=" -98f3b9ccd8296bcab79af3f1554abc6e60d89aa9fac80775496a09e7a85eae7c8be44bcfa9a35a91157675b58c02dbd1fbdfc55ab96b05852d33232b8aa44e81 php-pecl-opentelemetry-1.0.2.tgz +3873bb118116ec3cecfea825f20656144b999dd8cd140f82694562de95da64d4ea7959a749a7e07478149c1b9c2787b235e9000614ba360dea8c76c40e5ad2a9 php-pecl-opentelemetry-1.0.3.tgz " diff --git a/testing/php81-pecl-swoole/APKBUILD b/testing/php81-pecl-swoole/APKBUILD index fb88fcf5298..619073982be 100644 --- a/testing/php81-pecl-swoole/APKBUILD +++ b/testing/php81-pecl-swoole/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php81-pecl-swoole _extname=swoole -pkgver=5.1.1 +pkgver=5.1.2 pkgrel=0 pkgdesc="Event-driven asynchronous and concurrent networking engine with high performance for PHP 8.1 - PECL" url="https://pecl.php.net/package/swoole" @@ -59,5 +59,5 @@ package() { } sha512sums=" -ac5f6a737a42123417de33219f56c1ce95b7217d1e66d5021cb6f0126c9fead7917aa38f577330e3391e7780e3a2117b53dff72069680c1c3d0780b52d8d1f61 php-pecl-swoole-5.1.1.tgz +211a39c40ac9f4a58daf38a99723a21b5ad972f9aeb83f0b9fa1c5c58f78fa9c38e4ead3207b77c319436d702a9c294275289287cd121d66469c02c669cc6f2a php-pecl-swoole-5.1.2.tgz " diff --git a/testing/php81/APKBUILD b/testing/php81/APKBUILD index 6c6a83dafc1..3077df1550b 100644 --- a/testing/php81/APKBUILD +++ b/testing/php81/APKBUILD @@ -652,7 +652,7 @@ d56ecac164e00e9514cd3c6c8c453598b323118dc7d7ae7cc14ba0847d50a2e455b2391f52e0d81a 7dc9f55b12998355a6a6b5cf277285058e66928215f8d0109448d06fb696a74c674f83d18a81bf03f4f0bee06e77979e9a4ee5c81c7fdebff91447f8e697cc69 php81-fpm.initd 98bb27864f1ece80fef18cb286885c8c18de8f9d1076507b6a24df07e33aa400623b90401375e7ebe55d9ff802069d281642ec7d3a58ef8727121aabe7643241 php81-fpm.logrotate 2e3b22b4adbc81c6120757095c89e56642f3e8bf7724af2926f2667759ef082cdcff416334aad87f704a61fcb5b2c11830f17759ac771a3dd4e47d9bc5c7cf72 php81-module.conf -20e5cd0cfd76265f168240891f2b774181947d623467ed729199e7750fe1613592a152eeb452cab8e8822e79ed0a1c3ec686e21e74fd8097af69b89db53e2f44 disabled-tests.list +35dd9eb6b913c7a6e236200fdee74fb168cd08cac5448090964176a70b0ee188b60a85b401bc16832821b08a765b139e3e5281aab710d5ba2bf8aa3384ee6f73 disabled-tests.list 65676dea36ff8823dd1e8d7165e48c2719133ca8cf5287d6051f35f70e4bc57f1c93fe9b0196c9307c072187deb08409731f1eef281387ae4367655472f882d3 disabled-tests.ppc64le.list 378db19d08cec29c4e56f2c82ee0a99b31e5ec3eaac56c40597de442da36a4d7efcc7551577e37a6ca22649d612d42714c93e16e3f7579aeb85a44090bde80fc disabled-tests.riscv64.list 54930246f22034e6a73020aa95915d14b2a2fcfe121df57eb17fdc663aceeb94c5c4b1800347149a8fb4eaa0edda4224a11133bdb7e0cd34a2065a2de121db0d disabled-tests.s390x.list diff --git a/testing/php81/disabled-tests.list b/testing/php81/disabled-tests.list index 26914cf0bb4..3d6c6cbe1e2 100644 --- a/testing/php81/disabled-tests.list +++ b/testing/php81/disabled-tests.list @@ -188,3 +188,6 @@ ext/openssl/tests/openssl_error_string_basic.phpt ext/openssl/tests/openssl_error_string_basic_openssl3.phpt ext/openssl/tests/openssl_private_decrypt_basic.phpt ext/openssl/tests/openssl_x509_parse_basic.phpt + +# openssl 3.3.0 +ext/openssl/tests/bug74341.phpt diff --git a/testing/pigpio/APKBUILD b/testing/pigpio/APKBUILD index 47141d569e4..f18c87d364f 100644 --- a/testing/pigpio/APKBUILD +++ b/testing/pigpio/APKBUILD @@ -1,8 +1,8 @@ # Contributor: knuxify <knuxify@gmail.com> -# Maintainer: knuxify <knuxify@gmail.com> +# Maintainer: pkgname=pigpio pkgver=79 -pkgrel=3 +pkgrel=4 pkgdesc="C library for the Raspberry Pi which allows control of the GPIO" url="https://abyz.me.uk/rpi/pigpio/" arch="armhf armv7 aarch64" # only runs on the Raspberry Pi diff --git a/testing/piper-phonemize/APKBUILD b/testing/piper-phonemize/APKBUILD index 0292235936b..6b3444e4260 100644 --- a/testing/piper-phonemize/APKBUILD +++ b/testing/piper-phonemize/APKBUILD @@ -5,8 +5,8 @@ pkgver=${_pkgver/-/.} pkgrel=1 pkgdesc="C++ library for converting text to phonemes for piper-tts" url="https://github.com/rhasspy/piper-phonemize" -# x86, s390x: not supported by onnxruntime -arch="all !x86 !s390x" +# x86, riscv64, s390x: not supported by onnxruntime +arch="all !x86 !riscv64 !s390x" license="MIT AND GPL-3.0-only" depends_dev="$pkgname-libs" makedepends=" diff --git a/testing/piper-tts/APKBUILD b/testing/piper-tts/APKBUILD index 965abc240fb..756f3b79ce4 100644 --- a/testing/piper-tts/APKBUILD +++ b/testing/piper-tts/APKBUILD @@ -7,8 +7,8 @@ pkgdesc="Fast, local neural text to speech system" url="https://github.com/rhasspy/piper" provides="larynx2=$pkgver-r$pkgrel" replaces=larynx2 -# x86, s390x: not supported by onnxruntime -arch="all !x86 !s390x" +# x86, riscv64, s390x: not supported by onnxruntime +arch="all !x86 !riscv64 !s390x" license="MIT" depends_dev=" espeak-ng-dev diff --git a/testing/piping-server/APKBUILD b/testing/piping-server/APKBUILD index d91533c5800..763eb9d5e49 100644 --- a/testing/piping-server/APKBUILD +++ b/testing/piping-server/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=piping-server -pkgver=0.17.0 +pkgver=0.18.0 pkgrel=0 pkgdesc="Infinitely transfer data between devices over HTTP" url="https://github.com/nwtgck/piping-server-rust" @@ -35,6 +35,6 @@ package() { } sha512sums=" -c68a7e14a6eaadeaec3f72864a0cd1d605b7e65d09ee2f17bd424d955028a6cc616085da04fef0766ddc4a383d0c74b50267c9f967b6a02038ca9726862eff51 piping-server-rust-0.17.0.tar.gz +bd91aaab533b152d3137cbc8f6cd09da69fae01750f79afeee17df6ce25bf426aaf07ce4f1d69e8a74d645fbb97affd78417fa2d8c4bc456fcdd5d092e4aaed2 piping-server-rust-0.18.0.tar.gz 88fe822b7d98f9d1d63a24e30c11a39504641b664bd26eb5ff3a834ad343bbc46140762dfcc63131d1dc6938c9e4d82131ebc7249283ac3f288cc8aebd6dbe4c piping-server.initd " diff --git a/testing/pixi/APKBUILD b/testing/pixi/APKBUILD index 104282e9bab..3a04487c1d3 100644 --- a/testing/pixi/APKBUILD +++ b/testing/pixi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Orhun Parmaksız <orhunparmaksiz@gmail.com> # Maintainer: Orhun Parmaksız <orhunparmaksiz@gmail.com> pkgname=pixi -pkgver=0.19.1 +pkgver=0.21.1 pkgrel=0 pkgdesc="A package management and workflow tool" url="https://github.com/prefix-dev/pixi" @@ -49,5 +49,5 @@ package() { } sha512sums=" -dcb5b23e1395bea6424a831f190eab1368bdb29ffd2ad6f4c4a3398260eb851021a955e8d7d19b4ecbbd3f57ccd0f46186e9ff80de7807e1cb83df4bd3de87c6 pixi-0.19.1.tar.gz +e90d2ad5dc78b0a9e99dfd45e332df5ff71ad0db983b76348d7e51bdb3ada30978faa68e2f77986a1112b77fd26400e47c2e270f5e71f5ebe089c0a57b6e024e pixi-0.21.1.tar.gz " diff --git a/testing/platformio-core/APKBUILD b/testing/platformio-core/APKBUILD index 6df80f2f11a..82d2163a626 100644 --- a/testing/platformio-core/APKBUILD +++ b/testing/platformio-core/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Marten Ringwelski <git+alpine@maringuu.de> -# Maintainer: Marten Ringwelski <git+alpine@maringuu.de> +# Maintainer: pkgname=platformio-core pkgver=6.1.7 -pkgrel=1 +pkgrel=2 pkgdesc="An open source ecosystem for IoT development" url="https://platformio.org" arch="noarch !armhf !ppc64le" # limited by py3-starlette diff --git a/testing/plattenalbum/APKBUILD b/testing/plattenalbum/APKBUILD new file mode 100644 index 00000000000..3377268b48b --- /dev/null +++ b/testing/plattenalbum/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: fossdd <fossdd@pwned.life> +# Maintainer: fossdd <fossdd@pwned.life> +pkgname=plattenalbum +pkgver=2.1.0 +pkgrel=0 +pkgdesc="Browse music with MPD" +url="https://github.com/SoongNoonien/plattenalbum" +arch="noarch" +license="GPL-3.0-only" +depends=" + gettext + libadwaita + py3-gobject3 + py3-mpd2 + python3 + " +makedepends=" + desktop-file-utils + glib-dev + gtk-update-icon-cache + meson + " +subpackages="$pkgname-lang" +source="$pkgname-$pkgver.tar.gz::https://github.com/SoongNoonien/plattenalbum/archive/refs/tags/v$pkgver.tar.gz" + +build() { + abuild-meson . output + meson compile -C output +} + +check() { + meson test --no-rebuild -C output +} + +package() { + meson install --no-rebuild --destdir "$pkgdir" -C output +} + +sha512sums=" +2f91424dd5e70b9a99fccc131c93016724b4da1df41c695ece22dcf911003528c5d050b2c57c3b47c2f86d6fb07f31b610a353f5a1dd3c7febd22aa164da00cd plattenalbum-2.1.0.tar.gz +" diff --git a/testing/please-build/APKBUILD b/testing/please-build/APKBUILD index f5b57742917..60c67b6a88e 100644 --- a/testing/please-build/APKBUILD +++ b/testing/please-build/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=please-build -pkgver=17.8.0 -pkgrel=2 +pkgver=17.8.7 +pkgrel=0 pkgdesc="High-performance, extensible build system for reproducible multi-language builds" url="https://please.build/" # The only architectures supported upstream @@ -16,9 +16,9 @@ subpackages=" source=" $pkgname-$pkgver.tar.gz::https://github.com/thought-machine/please/archive/refs/tags/v$pkgver.tar.gz fix-test.patch - go-1.22.patch " builddir="$srcdir/please-$pkgver" +options="net" # download Go modules export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -74,7 +74,6 @@ tools() { } sha512sums=" -862b9791989e6dc742b3dcab12a70a596ae149802206bdc44e0845fb41ba6655a89b2019e966082373e06b31cf5ab83f2f39935e2e2edd4fb7c87f1e3e2914ff please-build-17.8.0.tar.gz +7a047a6cdc090e91ddd584d5363298e472b9dece4df28b1e8dabff14007b150afa3d81c5daf921af78793d5364e81c36e55b7973905633d53efb6d588dafda95 please-build-17.8.7.tar.gz e628c001a45daacfa19eacb99b79b51bc2d8ba4957a1fa56da6d524c553bfef9422fe54c0551403b675c761367627312579cafdaf0944c7122d3b2ba9edc3719 fix-test.patch -9610694cd38a93b01e9fbb2b1dde3af300bef02f47f38dbd74bd6f25b98c92019bc2c9b6d78248a4d2a4e748c6ebf592d8340f3974b7d9916a615aa8c78eb7cf go-1.22.patch " diff --git a/testing/please-build/go-1.22.patch b/testing/please-build/go-1.22.patch deleted file mode 100644 index 396e3eb48a8..00000000000 --- a/testing/please-build/go-1.22.patch +++ /dev/null @@ -1,564 +0,0 @@ -From 744bb45cb0af9476cd1477bfa2be8be46daa21ca Mon Sep 17 00:00:00 2001 -From: Peter Ebden <peter.ebden@gmail.com> -Date: Mon, 12 Feb 2024 11:40:15 +0000 -Subject: [PATCH] Update to Go 1.22.0 (#3070) - -* Update images to Go 1.22 - -* update toolchain - -* update go.mod - -* bump this for my sanity - -* update plugin - -* revert this - -* update image; the base used for the old one appears to incorrectly have been an x86 image (pretty sure this must be an upstream bug) - -* Update test repos too - -* update - -* migrate this bastard to go_repo - -* Use a tagged release - -* Update moar - -* Fine, disable this for now - -* fine i'll do the docs thing ---- - .circleci/config.yml | 14 +- - docs/BUILD | 2 +- - plugins/BUILD | 2 +- - test/plugins/test_repo/plugins/BUILD_FILE | 2 +- - test/plz_exec/test_repo/plugins/BUILD_FILE | 3 +- - test/proto_plugin/BUILD | 1 + - test/proto_plugin/test_repo/.plzconfig | 6 +- - .../proto_plugin/test_repo/plugins/BUILD_FILE | 4 +- - .../test_repo/third_party/go/BUILD_FILE | 181 ++---------------- - third_party/go/BUILD | 16 +- - tools/images/alpine/Dockerfile | 2 +- - tools/images/ubuntu/Dockerfile | 2 +- - tools/images/ubuntu_alt/Dockerfile | 2 +- - 13 files changed, 47 insertions(+), 190 deletions(-) - -diff --git a/.circleci/config.yml b/.circleci/config.yml -index b751280998..c928a6e121 100644 ---- a/.circleci/config.yml -+++ b/.circleci/config.yml -@@ -3,7 +3,7 @@ jobs: - build-alpine: - working_directory: ~/please - docker: -- - image: thoughtmachine/please_alpine:20240111 -+ - image: thoughtmachine/please_alpine:20240209 - resource_class: large - environment: - PLZ_ARGS: "-p --profile ci --profile alpine --exclude no-musl" -@@ -43,7 +43,7 @@ jobs: - build-linux: - working_directory: ~/please - docker: -- - image: thoughtmachine/please_ubuntu:20240103 -+ - image: thoughtmachine/please_ubuntu:20240207 - resource_class: large - environment: - PLZ_ARGS: "-p --profile ci" -@@ -91,7 +91,7 @@ jobs: - build-linux-alt: - working_directory: ~/please - docker: -- - image: thoughtmachine/please_ubuntu_alt:20240103 -+ - image: thoughtmachine/please_ubuntu_alt:20240207 - resource_class: large - environment: - PLZ_ARGS: "-p -c cover --profile ci-alt" -@@ -176,7 +176,7 @@ jobs: - build-linux-arm64: - working_directory: ~/please - docker: -- - image: thoughtmachine/please_ubuntu:20240103 -+ - image: thoughtmachine/please_ubuntu:20240207 - resource_class: large - steps: - - checkout -@@ -245,7 +245,7 @@ jobs: - test-rex: - working_directory: ~/please - docker: -- - image: thoughtmachine/please_ubuntu:20240103 -+ - image: thoughtmachine/please_ubuntu:20240207 - resource_class: xlarge - steps: - - checkout -@@ -262,7 +262,7 @@ jobs: - test-http-cache: - working_directory: ~/please - docker: -- - image: thoughtmachine/please_ubuntu:20240103 -+ - image: thoughtmachine/please_ubuntu:20240207 - resource_class: large - steps: - - checkout -@@ -305,7 +305,7 @@ jobs: - # Runs a benchmarking test and records some performance results. - perf-test: - docker: -- - image: thoughtmachine/please_ubuntu:20240103 -+ - image: thoughtmachine/please_ubuntu:20240207 - resource_class: xlarge # Want to run these tests with a significant amount of parallelism - steps: - - checkout -diff --git a/docs/BUILD b/docs/BUILD -index bcc3e12b92..2c15da331d 100644 ---- a/docs/BUILD -+++ b/docs/BUILD -@@ -59,7 +59,7 @@ genrule( - plugins = { - "python": "v1.5.0", - "java": "v0.4.0", -- "go": "v1.16.3", -+ "go": "v1.16.5", - "cc": "v0.4.0", - "shell": "v0.2.0", - "go-proto": "v0.3.0", -diff --git a/plugins/BUILD b/plugins/BUILD -index 13348ef2e0..a0338de522 100644 ---- a/plugins/BUILD -+++ b/plugins/BUILD -@@ -1,7 +1,7 @@ - plugin_repo( - name = "go", - plugin = "go-rules", -- revision = "v1.16.3", -+ revision = "v1.16.5", - ) - - plugin_repo( -diff --git a/test/plugins/test_repo/plugins/BUILD_FILE b/test/plugins/test_repo/plugins/BUILD_FILE -index c4ceaa968f..f3f451a3ab 100644 ---- a/test/plugins/test_repo/plugins/BUILD_FILE -+++ b/test/plugins/test_repo/plugins/BUILD_FILE -@@ -5,5 +5,5 @@ plugin_repo( - - plugin_repo( - name = "go", -- revision = "v1.2.1", -+ revision = "v1.16.5", - ) -\ No newline at end of file -diff --git a/test/plz_exec/test_repo/plugins/BUILD_FILE b/test/plz_exec/test_repo/plugins/BUILD_FILE -index 08f8bf9927..8b6aa87432 100644 ---- a/test/plz_exec/test_repo/plugins/BUILD_FILE -+++ b/test/plz_exec/test_repo/plugins/BUILD_FILE -@@ -3,8 +3,7 @@ plugin_repo( - revision = "v0.1.1", - ) - -- - plugin_repo( - name = "go", -- revision = "v1.2.0", -+ revision = "v1.16.5", - ) -diff --git a/test/proto_plugin/BUILD b/test/proto_plugin/BUILD -index 08f4ad4581..c1ee32d020 100644 ---- a/test/proto_plugin/BUILD -+++ b/test/proto_plugin/BUILD -@@ -6,6 +6,7 @@ please_repo_e2e_test( - labels = [ - "no_cirrus", - "no-musl", -+ "manual", - ], - plz_command = "plz -o plugin.go.gotool:$TOOLS_GO test", - repo = "test_repo", -diff --git a/test/proto_plugin/test_repo/.plzconfig b/test/proto_plugin/test_repo/.plzconfig -index b2cb9b90f9..883d4272cd 100644 ---- a/test/proto_plugin/test_repo/.plzconfig -+++ b/test/proto_plugin/test_repo/.plzconfig -@@ -6,7 +6,7 @@ ImportPath = github.com/thought-machine/please/test/proto_plugin - - [Plugin "proto"] - Target = //plugins:proto --LanguageDef = ///go_proto//build_defs:go -+LanguageDef = ///go_proto//build_defs:go_proto - ProtocTool = ///proto//third_party/proto:protoc - - [Plugin "go"] -@@ -15,5 +15,5 @@ ImportPath = github.com/thought-machine/please/test/proto_plugin - - [Plugin "go_proto"] - Target = //plugins:go-proto --GrpcPlugin = //third_party/go:protoc-gen-go-grpc --ProtoPlugin = //third_party/go:protoc-gen-go -+GrpcPlugin = ///third_party/go/google.golang.org_grpc_cmd_protoc-gen-go-grpc//:protoc-gen-go-grpc -+ProtoPlugin = ///third_party/go/google.golang.org_protobuf//cmd/protoc-gen-go -diff --git a/test/proto_plugin/test_repo/plugins/BUILD_FILE b/test/proto_plugin/test_repo/plugins/BUILD_FILE -index 00be4f8494..793049b4b9 100644 ---- a/test/proto_plugin/test_repo/plugins/BUILD_FILE -+++ b/test/proto_plugin/test_repo/plugins/BUILD_FILE -@@ -5,10 +5,10 @@ plugin_repo( - - plugin_repo( - name = "go", -- revision = "v1.4.1", -+ revision = "v1.16.5", - ) - - plugin_repo( - name = "go-proto", -- revision = "v0.2.0", -+ revision = "v0.3.0", - ) -diff --git a/test/proto_plugin/test_repo/third_party/go/BUILD_FILE b/test/proto_plugin/test_repo/third_party/go/BUILD_FILE -index 4fa9134750..c9d1def735 100644 ---- a/test/proto_plugin/test_repo/third_party/go/BUILD_FILE -+++ b/test/proto_plugin/test_repo/third_party/go/BUILD_FILE -@@ -1,6 +1,6 @@ - subinclude("///go//build_defs:go") - --go_module( -+go_repo( - name = "go-spew", - install = ["spew"], - module = "github.com/davecgh/go-spew", -@@ -8,7 +8,7 @@ go_module( - visibility = ["PUBLIC"], - ) - --go_module( -+go_repo( - name = "go-difflib", - install = ["difflib"], - module = "github.com/pmezard/go-difflib", -@@ -16,229 +16,86 @@ go_module( - visibility = ["PUBLIC"], - ) - --go_module( -+go_repo( - name = "yaml.v3", - module = "gopkg.in/yaml.v3", - version = "v3.0.0-20200313102051-9f266ea9e77c", - visibility = ["PUBLIC"], - ) - --go_module( -+go_repo( - name = "testify", -- install = [ -- ".", -- "assert", -- "http", -- "mock", -- "require", -- "suite", -- ], - module = "github.com/stretchr/testify", - version = "v1.7.0", - visibility = ["PUBLIC"], -- deps = [ -- ":go-difflib", -- ":go-spew", -- ":objx", -- ":yaml.v3", -- ], - ) - --go_module( -+go_repo( - name = "objx", - module = "github.com/stretchr/objx", - version = "v0.1.0", - visibility = ["PUBLIC"], - ) - --go_module( -+go_repo( - name = "text", -- install = [ -- "secure/bidirule", -- "transform", -- "unicode/bidi", -- "unicode/norm", -- ], - module = "golang.org/x/text", - version = "v0.3.0", - visibility = ["PUBLIC"], - ) - --go_module( -+go_repo( - name = "protobuf", -- exported_deps = [":google.golang.org.protobuf"], -- install = [ -- "proto", -- "ptypes", -- "ptypes/any", -- "ptypes/duration", -- "ptypes/timestamp", -- ], - module = "github.com/golang/protobuf", - version = "v1.4.3", - visibility = ["PUBLIC"], - ) - --go_module( -+go_repo( - name = "grpc", -- install = [ -- ".", -- "attributes", -- "backoff", -- "balancer", -- "balancer/base", -- "balancer/grpclb/state", -- "balancer/roundrobin", -- "binarylog/grpc_binarylog_v1", -- "codes", -- "connectivity", -- "credentials", -- "encoding", -- "encoding/proto", -- "grpclog", -- "internal", -- "internal/backoff", -- "internal/balancerload", -- "internal/binarylog", -- "internal/buffer", -- "internal/channelz", -- "internal/credentials", -- "internal/envconfig", -- "internal/grpclog", -- "internal/grpcrand", -- "internal/grpcsync", -- "internal/grpcutil", -- "internal/metadata", -- "internal/resolver", -- "internal/resolver/dns", -- "internal/resolver/passthrough", -- "internal/resolver/unix", -- "internal/serviceconfig", -- "internal/status", -- "internal/syscall", -- "internal/transport", -- "internal/transport/networktype", -- "internal/xds/env", -- "keepalive", -- "metadata", -- "peer", -- "resolver", -- "serviceconfig", -- "stats", -- "status", -- "tap", -- ], - module = "google.golang.org/grpc", - version = "v1.42.0", - visibility = ["PUBLIC"], -- deps = [ -- ":genproto", -- ":google.golang.org.protobuf", -- ":net", -- ":protobuf", -- ":sys", -- ], - ) - --go_mod_download( -- name = "protobuf_dl", -- module = "google.golang.org/protobuf", -- version = "v1.27.1", --) -- --go_module( -- name = "google.golang.org.protobuf", -- download = ":protobuf_dl", -- install = [ -- "cmd/protoc-gen-go/internal_gengo", -- "compiler/protogen", -- "encoding/prototext", -- "encoding/protowire", -- "internal/...", -- "proto", -- "reflect/protodesc", -- "reflect/protoreflect", -- "reflect/protoregistry", -- "runtime/protoiface", -- "runtime/protoimpl", -- "types/descriptorpb", -- "types/known/anypb", -- "types/known/durationpb", -- "types/known/timestamppb", -- "types/pluginpb", -- ], -- module = "google.golang.org/protobuf", --) -- --go_module( -+go_repo( - name = "protoc-gen-go-grpc", -- binary = True, - module = "google.golang.org/grpc/cmd/protoc-gen-go-grpc", -- version = "v1.1.0", -+ version = "v1.3.0", - visibility = ["PUBLIC"], -- deps = [":google.golang.org.protobuf"], - ) - --go_module( -- name = "protoc-gen-go", -- binary = True, -- download = ":protobuf_dl", -- install = ["cmd/protoc-gen-go"], -+go_repo( -+ name = "google.golang.org.protobuf", - module = "google.golang.org/protobuf", -+ version = "v1.27.1", - visibility = ["PUBLIC"], -- deps = [":google.golang.org.protobuf"], - ) - --go_module( -+go_repo( - name = "net", -- install = [ -- "http/httpguts", -- "http2", -- "http2/hpack", -- "idna", -- "internal/timeseries", -- "trace", -- ], - module = "golang.org/x/net", -- version = "v0.0.0-20200822124328-c89045814202", -+ version = "v0.21.0", - visibility = ["PUBLIC"], - deps = [":text"], - ) - --go_module( -+go_repo( - name = "sys", -- install = ["unix"], - module = "golang.org/x/sys", -- version = "v0.0.0-20220315194320-039c03cc5b86", -+ version = "v0.17.0", - visibility = ["PUBLIC"], - ) - --go_module( -+go_repo( - name = "genproto", -- install = ["googleapis/rpc/status"], - module = "google.golang.org/genproto", - version = "v0.0.0-20200526211855-cb27e3aa2013", - visibility = ["PUBLIC"], -- deps = [ -- ":google.golang.org.protobuf", -- ":protobuf", -- ], - ) - --go_module( -+go_repo( - name = "go-cmp", -- install = [ -- "cmp", -- "cmp/cmpopts", -- "cmp/internal/diff", -- "cmp/internal/flags", -- "cmp/internal/function", -- "cmp/internal/testprotos", -- "cmp/internal/teststructs", -- "cmp/internal/teststructs/foo1", -- "cmp/internal/teststructs/foo2", -- "cmp/internal/value", -- ], - module = "github.com/google/go-cmp", - version = "v0.5.6", - visibility = ["PUBLIC"], -diff --git a/third_party/go/BUILD b/third_party/go/BUILD -index 6ba84d0441..28a754d342 100644 ---- a/third_party/go/BUILD -+++ b/third_party/go/BUILD -@@ -5,14 +5,14 @@ package(default_visibility = ["PUBLIC"]) - go_toolchain( - name = "toolchain", - hashes = [ -- "27014fc69e301d7588a169ca239b3cc609f0aa1abf38528bf0d20d3b259211eb", # darwin-amd64 -- "65302a7a9f7a4834932b3a7a14cb8be51beddda757b567a2f9e0cbd0d7b5a6ab", # darwin-arm64 -- "6e74f65f586e93d1f3947894766f69e9b2ebda488592a09df61f36f06bfe58a8", # freebsd-amd64 -- "1241381b2843fae5a9707eec1f8fb2ef94d827990582c7c7c32f5bdfbfd420c8", # linux-amd64 -- "fc90fa48ae97ba6368eecb914343590bbb61b388089510d0c56c2dde52987ef3", # linux-arm64 -+ "ebca81df938d2d1047cc992be6c6c759543cf309d401b86af38a6aed3d4090f4", # darwin-amd64 -+ "bf8e388b09134164717cd52d3285a4ab3b68691b80515212da0e9f56f518fb1e", # darwin-arm64 -+ "50f421c7f217083ac94aab1e09400cb9c2fea7d337679ec11f1638a11460da30", # freebsd-amd64 -+ "f6c8a87aa03b92c4b0bf3d558e28ea03006eb29db78917daec5cfb6ec1046265", # linux-amd64 -+ "6a63fef0e050146f275bf02a0896badfe77c11b6f05499bb647e7bd613a45a10", # linux-arm64 - ], - install_std = True, -- version = "1.21.3", -+ version = "1.22.0", - ) - - go_stdlib( -@@ -352,7 +352,7 @@ go_repo( - - go_repo( - module = "golang.org/x/sys", -- version = "v0.0.0-20220315194320-039c03cc5b86", -+ version = "v0.17.0", - ) - - go_repo( -@@ -387,7 +387,7 @@ go_repo( - - go_repo( - module = "github.com/cespare/xxhash/v2", -- version = "v2.1.2", -+ version = "v2.2.0", - ) - - go_repo( -diff --git a/tools/images/alpine/Dockerfile b/tools/images/alpine/Dockerfile -index 74ad14b32b..48b84506ef 100644 ---- a/tools/images/alpine/Dockerfile -+++ b/tools/images/alpine/Dockerfile -@@ -1,4 +1,4 @@ --FROM golang:1.21-alpine -+FROM golang:1.22-alpine - MAINTAINER peter.ebden@gmail.com - - RUN apk update && apk add --no-cache git patch gcc g++ libc-dev bash libgcc xz protoc protobuf-dev perl-utils -diff --git a/tools/images/ubuntu/Dockerfile b/tools/images/ubuntu/Dockerfile -index a37cafb84a..9da3df1c0e 100644 ---- a/tools/images/ubuntu/Dockerfile -+++ b/tools/images/ubuntu/Dockerfile -@@ -15,7 +15,7 @@ RUN truncate -s0 /tmp/preseed.cfg; \ - apt-get clean - - # Go - we want a specific package version here. --RUN curl -fsSL https://dl.google.com/go/go1.21.5.linux-amd64.tar.gz | tar -xzC /usr/local -+RUN curl -fsSL https://dl.google.com/go/go1.22.0.linux-amd64.tar.gz | tar -xzC /usr/local - RUN ln -s /usr/local/go/bin/go /usr/local/bin/go && ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt - - # Locale -diff --git a/tools/images/ubuntu_alt/Dockerfile b/tools/images/ubuntu_alt/Dockerfile -index 15d4ae8207..7d80e363a1 100644 ---- a/tools/images/ubuntu_alt/Dockerfile -+++ b/tools/images/ubuntu_alt/Dockerfile -@@ -10,7 +10,7 @@ RUN apt-get update && \ - apt-get clean - - # Go --RUN curl -fsSL https://dl.google.com/go/go1.21.5.linux-amd64.tar.gz | tar -xzC /usr/local -+RUN curl -fsSL https://dl.google.com/go/go1.21.7.linux-amd64.tar.gz | tar -xzC /usr/local - RUN ln -s /usr/local/go/bin/go /usr/local/bin/go && ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt - - # Locale diff --git a/testing/pnpm/APKBUILD b/testing/pnpm/APKBUILD index 757cfe4e1c4..4ca5f3099d3 100644 --- a/testing/pnpm/APKBUILD +++ b/testing/pnpm/APKBUILD @@ -2,15 +2,20 @@ # Contributor: Fabricio Silva <hi@fabricio.dev> # Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=pnpm -pkgver=9.0.1 +pkgver=9.1.1 pkgrel=0 pkgdesc="Fast, disk space efficient package manager" url="https://pnpm.io" arch="noarch" license="MIT" -depends="nodejs" +depends="cmd:node" # works with nodejs and nodejs-current +subpackages=" + $pkgname-doc + $pkgname-bash-completion + $pkgname-zsh-completion + $pkgname-fish-completion + " source="https://registry.npmjs.org/pnpm/-/pnpm-$pkgver.tgz" -options="!check" # not implemented builddir="$srcdir/package" prepare() { @@ -33,11 +38,25 @@ prepare() { -iname 'README*' \) -delete } +check() { + ./bin/pnpm.cjs --help +} + package() { - local destdir="$pkgdir"/usr/share/node_modules/pnpm + local destdir="$pkgdir"/usr/share/node_modules/$pkgname + + install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname + + install -Dm644 dist/templates/completion.bash \ + "$pkgdir"/usr/share/bash-completion/completions/$pkgname + install -Dm644 dist/templates/completion.zsh \ + "$pkgdir"/usr/share/zsh/site-functions/_$pkgname + install -Dm644 dist/templates/completion.fish \ + "$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish - mkdir -p "$destdir" - cp -R "$builddir"/* "$destdir"/ + install -Dm644 package.json -t "$destdir" + install -Dm755 bin/pnpm.cjs bin/pnpx.cjs -t "$destdir"/bin + cp -r dist "$destdir"/dist mkdir -p "$pkgdir"/usr/bin ln -sf ../share/node_modules/pnpm/bin/pnpm.cjs "$pkgdir"/usr/bin/pnpm @@ -45,5 +64,5 @@ package() { } sha512sums=" -f904b133d699415b0d997ee3f05a269affbdb02cf6b227fa03d85483a8f3dfced0b9160a7d477dc051ab67af8be44705b9fdf15f2ae33bc83b76886529fb4b1d pnpm-9.0.1.tgz +14e915759c11f77eac07faba4d019c193ec8637229e62ec99eefb7cf3c3b75c64447882b7c485142451ee3a6b408059cdfb7b7fa0341b975f12d0f7629c71195 pnpm-9.1.1.tgz " diff --git a/testing/podman-compose/APKBUILD b/testing/podman-compose/APKBUILD deleted file mode 100644 index 4f2139eff26..00000000000 --- a/testing/podman-compose/APKBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Contributor: TBK <alpine@jjtc.eu> -# Maintainer: TBK <alpine@jjtc.eu> -pkgname=podman-compose -pkgver=1.0.6 -pkgrel=2 -pkgdesc="Script to run docker-compose.yml using podman" -url="https://github.com/containers/podman-compose" -arch="noarch !armv7 !armhf !x86 !s390x !riscv64" # podman -license="GPL-2.0-or-later" -options="!check" # Requires running docker env -depends="podman python3 py3-yaml py3-dotenv" -makedepends="py3-setuptools" -subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://github.com/containers/podman-compose/archive/v$pkgver.tar.gz" - -build() { - python3 setup.py build -} - -package() { - python3 setup.py install --skip-build --root="$pkgdir" -} - -sha512sums=" -eb6972c51fd02c7a7dec364d18417c4f093f12ab90ba7061be189de7130c8eb0becb5a1653ebf7db0611470b52257a4a1eaae52891f434ca73fbc6dd30da5f56 podman-compose-1.0.6.tar.gz -" diff --git a/testing/poke/APKBUILD b/testing/poke/APKBUILD index 26a6b7fe189..92c7e80e0eb 100644 --- a/testing/poke/APKBUILD +++ b/testing/poke/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=poke -pkgver=3.3 +pkgver=4.0 pkgrel=0 pkgdesc="extensible editor for binary data" url="https://www.jemarch.net/poke.html" @@ -32,5 +32,5 @@ package() { } sha512sums=" -b00dca38d27bddee6ea131d45988aaead1d11d29b757c048f3b2be8013575cedc591844d4d99870f90964fd4f517d500cbb42aae5aff57e9fe07aac8273aa236 poke-3.3.tar.gz +3b6a15bf5542b34a794efd31bd575b5024c14f71474581b845097f38b43cef178ee2078f680ab9ec329b4336d1b99cc5832818bd4e7a6372fec6f95e9a11534a poke-4.0.tar.gz " diff --git a/testing/popeye/APKBUILD b/testing/popeye/APKBUILD index 7ff54a325ce..50d84bbc36b 100644 --- a/testing/popeye/APKBUILD +++ b/testing/popeye/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Hoang Nguyen <folliekazetani@protonmail.com> # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=popeye -pkgver=0.20.4 -pkgrel=2 +pkgver=0.21.3 +pkgrel=0 pkgdesc="Kubernetes cluster resource sanitizer" url="https://popeyecli.io/" arch="all" @@ -32,5 +32,5 @@ package() { } sha512sums=" -3f5ba8875dd2b7e005472ade518ae8f14550c6f292619550fbd0b2065ef635586d75910517a9a6efb066232297756a0fa239e6ca163532a9d413458833f2cbd8 popeye-0.20.4.tar.gz +d43c7b3022ca5f3560a9709f535bbdb7fc71545dc773ec2334d6a914f91f0c7a1476ec97b44c8e3a7e3c81f97f7c3d803054a2d4c8106816436e800c5419483f popeye-0.21.3.tar.gz " diff --git a/testing/powder-toy/APKBUILD b/testing/powder-toy/APKBUILD index 5ded4fd3f74..9d93d7cc351 100644 --- a/testing/powder-toy/APKBUILD +++ b/testing/powder-toy/APKBUILD @@ -6,8 +6,8 @@ pkgrel=0 pkgdesc="Desktop version of the classic falling sand physics sandbox, simulates air pressure, velocity & heat!" url="http://powdertoy.co.uk/" # riscv64: textrels -# ppc64le: luajit -arch="all !ppc64le !riscv64" +# ppc64le, loongarch64: luajit +arch="all !ppc64le !riscv64 !loongarch64" license="GPL-3.0-only" makedepends=" bzip2-dev diff --git a/testing/primecount/APKBUILD b/testing/primecount/APKBUILD index 128c1c30c9c..138af02e9c6 100644 --- a/testing/primecount/APKBUILD +++ b/testing/primecount/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Hoang Nguyen <folliekazetani@protonmail.com> # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=primecount -pkgver=7.11 +pkgver=7.13 pkgrel=0 pkgdesc="Fast prime counting C/C++ library" url="https://github.com/kimwalisch/primecount" -arch="all !aarch64 !s390x" # iroot test failed +arch="all" license="BSD-2-Clause" makedepends=" cmake @@ -37,5 +37,5 @@ package() { } sha512sums=" -2e58bc7214b0ff506086ab36b8840fbcd2a1f27e61dc134787bb5ce084d3f81e2c5190f69b47ad8ee970bb364fdc30354826b70db6c418f533d0bd521515717c primecount-7.11.tar.gz +836c181e586a691708049d3ba04672e1dd4922160e17b3b03737ea55512186d3a529e003af08ff2e78f7bf7349cce0819c98144cfb89bd8208e4bad8124ae17b primecount-7.13.tar.gz " diff --git a/testing/primesieve/APKBUILD b/testing/primesieve/APKBUILD index 432dc9255d6..62b84d5059e 100644 --- a/testing/primesieve/APKBUILD +++ b/testing/primesieve/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Curt Tilmes <Curt.Tilmes@nasa.gov> # Maintainer: Curt Tilmes <Curt.Tilmes@nasa.gov> pkgname=primesieve -pkgver=12.1 +pkgver=12.3 pkgrel=0 pkgdesc="Program and library for generating prime numbers" url="http://primesieve.org" @@ -30,5 +30,5 @@ package() { } sha512sums=" -8a78b0db6750a2f00b78aa2e525d3061f2e287514469c14b3e2232874cc120242272ebc33070b91d74ce7fc98273bf08a192b38cf5078c8c9f95981a1187a1b3 primesieve-12.1.tar.gz +b7bd74223ca9abe41de9f6a48102e6cfd1b1989fb291292c13f5c751a31f8df93e1faaadee318f169cfe81fa4dc4d5b0678fe7556f77043941d8ae749c6e8cc7 primesieve-12.3.tar.gz " diff --git a/testing/prjtrellis/APKBUILD b/testing/prjtrellis/APKBUILD index d62685cc7d5..db80d2feb31 100644 --- a/testing/prjtrellis/APKBUILD +++ b/testing/prjtrellis/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@posteo.net> pkgname=prjtrellis pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Documentation of the Lattice ECP5 bit-stream format" url="https://github.com/YosysHQ/prjtrellis" arch="all" diff --git a/testing/projectm/APKBUILD b/testing/projectm/APKBUILD index 5a780da4eb2..6ec78a727be 100644 --- a/testing/projectm/APKBUILD +++ b/testing/projectm/APKBUILD @@ -1,8 +1,8 @@ # Contributor: knuxify <knuxify@gmail.com> -# Maintainer: knuxify <knuxify@gmail.com> +# Maintainer: pkgname=projectm pkgver=3.1.12 -pkgrel=1 +pkgrel=2 pkgdesc="Music visualizer which uses 3D accelerated iterative image based rendering" url="https://github.com/projectM-visualizer/projectm" arch="all" diff --git a/testing/prometheus-podman-exporter/APKBUILD b/testing/prometheus-podman-exporter/APKBUILD new file mode 100644 index 00000000000..5e0b5282098 --- /dev/null +++ b/testing/prometheus-podman-exporter/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Tuan Anh Tran <me@tuananh.org> +# Maintainer: Tuan Anh Tran <me@tuananh.org> +pkgname=prometheus-podman-exporter +pkgver=1.11.0 +pkgrel=0 +pkgdesc="Prometheus exporter for podman environments exposing containers, pods, images, volumes and networks information" +url="https://github.com/containers/prometheus-podman-exporter" +arch="all" +license="Apache-2.0" +makedepends="go bash device-mapper lvm2-dev gpgme-dev linux-headers btrfs-progs-dev" +options="!check" # tests require root privileges (clone, etc...) +source="$pkgname-$pkgver.tar.gz::https://github.com/containers/prometheus-podman-exporter/archive/refs/tags/v$pkgver.tar.gz + basename.patch + " + +export GOFLAGS="$GOFLAGS -modcacherw" +export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" +export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" +export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" + +build() { + make binary +} + +package() { + install -Dm0755 bin/prometheus-podman-exporter -t "$pkgdir"/usr/bin/ + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 -t "$pkgdir"/usr/share/doc/"$pkgname" README.md +} + +sha512sums=" +f976d77940c08202e629c27ba91810f1d9b03ee6b3ebbbcd1568491aec70eba2fae70e6e5ec261105bcd503e5508a95f75eb5a0e5e7916bcbb17205d8a17f7da prometheus-podman-exporter-1.11.0.tar.gz +ee4cbe8e73e88f5a31d838dd9739f7c55d16020589e758f9c2198d37129bd58d1fef993e501fc911a5bca3ce9267b128a9d0ab91ecfa2cedbaee42baa7ea9e7a basename.patch +" diff --git a/testing/prometheus-podman-exporter/basename.patch b/testing/prometheus-podman-exporter/basename.patch new file mode 100644 index 00000000000..653eec8e223 --- /dev/null +++ b/testing/prometheus-podman-exporter/basename.patch @@ -0,0 +1,12 @@ +diff --git a/vendor/github.com/containers/storage/pkg/unshare/unshare.c b/vendor/github.com/containers/storage/pkg/unshare/unshare.c +index f5a7c3a2..c2528357 100644 +--- a/vendor/github.com/containers/storage/pkg/unshare/unshare.c ++++ b/vendor/github.com/containers/storage/pkg/unshare/unshare.c +@@ -18,6 +18,7 @@ + #include <sys/vfs.h> + #include <sys/mount.h> + #include <linux/limits.h> ++#include <libgen.h> + + /* Open Source projects like conda-forge, want to package podman and are based + off of centos:6, Conda-force has minimal libc requirements and is lacking diff --git a/testing/protoc-gen-go/APKBUILD b/testing/protoc-gen-go/APKBUILD index bc728f74b75..295329f5c1e 100644 --- a/testing/protoc-gen-go/APKBUILD +++ b/testing/protoc-gen-go/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=protoc-gen-go -pkgver=1.32.0 -pkgrel=2 +pkgver=1.34.0 +pkgrel=0 pkgdesc="Protocol Buffers Go generator" url="https://github.com/protocolbuffers/protobuf-go" arch="all" @@ -30,5 +30,5 @@ package() { } sha512sums=" -dffb159952282db426af8759346441003b461c6c1dde3a84671f644892a8bce6d0a57bfd6f19ad9d48852bdd4bf52544aae3f8cce66d498eb15be0a3acb276ae protoc-gen-go-1.32.0.tar.gz +f0ad6681104c145617a8c4e716481a426b6757bde3a57177b50b6842ede9a5bb1488621743a33495fb88183120fc651f958dae09188d1b893d625e9f849a39aa protoc-gen-go-1.34.0.tar.gz " diff --git a/testing/prowlarr/0002-bump-npgsql.patch b/testing/prowlarr/0002-bump-npgsql.patch new file mode 100644 index 00000000000..5a1bdf64171 --- /dev/null +++ b/testing/prowlarr/0002-bump-npgsql.patch @@ -0,0 +1,34 @@ +It got merged after the release, needs patch until next release. +Fixes CVE-2024-32655 + +--- + src/NzbDrone.Common/Prowlarr.Common.csproj | 2 +- + src/NzbDrone.Core/Prowlarr.Core.csproj | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/NzbDrone.Common/Prowlarr.Common.csproj b/src/NzbDrone.Common/Prowlarr.Common.csproj +index d90f7738ecb..6ab426c9854 100644 +--- a/src/NzbDrone.Common/Prowlarr.Common.csproj ++++ b/src/NzbDrone.Common/Prowlarr.Common.csproj +@@ -10,7 +10,7 @@ + <PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> + <PackageReference Include="NLog" Version="5.2.0" /> + <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" /> +- <PackageReference Include="Npgsql" Version="7.0.6" /> ++ <PackageReference Include="Npgsql" Version="7.0.7" /> + <PackageReference Include="Sentry" Version="4.0.2" /> + <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" /> + <PackageReference Include="SharpZipLib" Version="1.4.2" /> +diff --git a/src/NzbDrone.Core/Prowlarr.Core.csproj b/src/NzbDrone.Core/Prowlarr.Core.csproj +index 50fdb89e849..4a676a26b4c 100644 +--- a/src/NzbDrone.Core/Prowlarr.Core.csproj ++++ b/src/NzbDrone.Core/Prowlarr.Core.csproj +@@ -9,7 +9,7 @@ + <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="6.0.29" /> + <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" /> + <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" /> +- <PackageReference Include="Npgsql" Version="7.0.6" /> ++ <PackageReference Include="Npgsql" Version="7.0.7" /> + <PackageReference Include="Polly" Version="8.3.1" /> + <PackageReference Include="Servarr.FluentMigrator.Runner" Version="3.3.2.9" /> + <PackageReference Include="Servarr.FluentMigrator.Runner.Postgres" Version="3.3.2.9" /> diff --git a/testing/prowlarr/APKBUILD b/testing/prowlarr/APKBUILD index 132372132bc..b6b10b8f044 100644 --- a/testing/prowlarr/APKBUILD +++ b/testing/prowlarr/APKBUILD @@ -1,26 +1,21 @@ # Contributor: Fabricio Silva <hi@fabricio.dev> # Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=prowlarr -pkgver=1.15.0.4361 +pkgver=1.17.2.4511 pkgrel=0 pkgdesc="Aggregator for usenet index and torrent tracker" url="https://github.com/Prowlarr/Prowlarr" -arch="x86_64 aarch64 armv7" +arch="x86_64 aarch64 armv7" # limited by dotnet license="GPL-3.0-only" -options="net !check" # no tests -depends=" - aspnetcore6-runtime - sqlite-libs - " -makedepends=" - dotnet6-sdk - yarn - " +options="net" # net for nuget +depends="aspnetcore6-runtime sqlite-libs" +makedepends="dotnet6-sdk yarn" subpackages="$pkgname-openrc" install="$pkgname.pre-install" source=" $pkgname-$pkgver.tar.gz::https://github.com/Prowlarr/Prowlarr/archive/refs/tags/v$pkgver.tar.gz 0001-disable-restart.patch + 0002-bump-npgsql.patch prowlarr.initd prowlarr.confd package_info @@ -29,6 +24,10 @@ builddir="$srcdir/Prowlarr-$pkgver" pkgusers="prowlarr" pkggroups="prowlarr" +# secfixes: +# 1.17.2.4511-r0: +# - CVE-2024-32655 + # map arch to dotnet case $CARCH in x86_64) _dotnet_arch="x64" ;; @@ -75,23 +74,38 @@ build() { mv "$_output"/UI "$_artifacts" } +check() { + local _files="Prowlarr.Api.V1.Test.dll Prowlarr.Common.Test.dll \ + Prowlarr.Core.Test.dll Prowlarr.Host.Test.dll Prowlarr.Libraries.Test.dll" + local _filters="Category!=ManualTest&Category!=WINDOWS&Category!=IntegrationTest&Category!=AutomationTest" + + # skipping: + # DiskTransferServiceFixture: CI fails due disk permission (shouldnt exist on this project) + _filters="$_filters&FullyQualifiedName!~DiskTransferServiceFixture" + + cd _tests/$_framework/$_runtime + mkdir -p ~/.config/Prowlarr + dotnet test --filter "$_filters" $_files +} + package() { - local DESTDIR="$pkgdir"/usr/lib/prowlarr + local destdir="$pkgdir"/usr/lib/prowlarr # use package_info to disable update feature - install -Dm644 "$srcdir"/package_info "$DESTDIR"/package_info - echo "PackageVersion=$pkgver-r$pkgrel" >>"$DESTDIR"/package_info + install -Dm644 "$srcdir"/package_info "$destdir"/package_info + echo "PackageVersion=$pkgver-r$pkgrel" >>"$destdir"/package_info - cp -af "$_artifacts" "$DESTDIR"/bin - chown -R "$pkgusers:$pkggroups" "$DESTDIR" + cp -af "$_artifacts" "$destdir"/bin + chown -R "$pkgusers:$pkggroups" "$destdir" install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } sha512sums=" -f82144968d778b2935b09ddef0246c9211909350a10d538745ae6fc08c2af0567f0992653937d1afdb8c13075ece8a65921459c51bd0a8e728a1aedfb64e74a3 prowlarr-1.15.0.4361.tar.gz +f14c2a11a718b4d9583ceb9affb120a9579c00cdf002133a6568e6c8418883f74e65f71dea12db79870f6c86874e8df0df09d5eb97680bba6c549a6fbeddb728 prowlarr-1.17.2.4511.tar.gz 753520379a6c5f2899b4ddfd820d5573598a32cb105f74c6fd978a3f2c98895cf709ef2d9afe2bae8c4856da86cb6a1364f5713ea7ef6a36bb21b5a5840c1471 0001-disable-restart.patch +6659b3fe65b6b4704f6da3abf3c79116a172ea0747c04e61c7cde6d2a48fc2ddfadc9a811f3feb3050d74685e9ab70eefad757bd32471f15fbf088f95cb7db72 0002-bump-npgsql.patch 33de66749dc613a430ce00abcff070b646c80f158de2bf70c7078e5526f93348f24bb5d45ff55e3e06123aa4c849a8eebfebf941c8f9c54db87fa614bda679c7 prowlarr.initd 1f073dd820a890e7d24d84e18763b04f07abd86a0370f56f7319c3e7c9da9d3e2be484e0cef2fb5fc4050be1cbb1e0445080d702d217393633256ed3758fc593 prowlarr.confd 67c4dd1cf8259296d994c350dfd3962d23333071889ce0b4ef6b2f4cbb4349490c5dbe4dcc202c99bab7a5c4b7611be56d7c8835b2b13924526c45311db1c3fb package_info diff --git a/testing/psi-plus/APKBUILD b/testing/psi-plus/APKBUILD index e1eae3171a7..38ac51075f6 100644 --- a/testing/psi-plus/APKBUILD +++ b/testing/psi-plus/APKBUILD @@ -4,8 +4,8 @@ pkgver=1.5.1653 pkgrel=0 pkgdesc="Powerful XMPP (Jabber) client (Qt, C++) designed for power users" url="https://psi-plus.com/" -# ppc64le, s390x, riscv64: qt5-qtwebengine missing -arch="all !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64, loongarch64: qt5-qtwebengine missing +arch="all !ppc64le !s390x !riscv64 !loongarch64" license="GPL-2.0" makedepends=" cmake diff --git a/testing/pulsar-client-cpp/APKBUILD b/testing/pulsar-client-cpp/APKBUILD index eaa7cb62958..1db10661f1f 100644 --- a/testing/pulsar-client-cpp/APKBUILD +++ b/testing/pulsar-client-cpp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Alex Yam <alex@alexyam.com> pkgname=pulsar-client-cpp pkgver=3.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="Apache Pulsar C++ client" url="https://github.com/apache/pulsar-client-cpp" arch="all" diff --git a/testing/pulseview/APKBUILD b/testing/pulseview/APKBUILD index 9c11617d3ae..036ab062479 100644 --- a/testing/pulseview/APKBUILD +++ b/testing/pulseview/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=pulseview pkgver=0.4.2 -pkgrel=7 +pkgrel=8 pkgdesc="QT-based GUI frontend for sigrok" url="https://sigrok.org/wiki/PulseView" makedepends=" diff --git a/testing/pwru/APKBUILD b/testing/pwru/APKBUILD index 160e3086b7c..b37d62d2f58 100644 --- a/testing/pwru/APKBUILD +++ b/testing/pwru/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=pwru -pkgver=1.0.5 -pkgrel=2 +pkgver=1.0.6 +pkgrel=0 pkgdesc="eBPF-based Linux kernel networking debugger" url="https://github.com/cilium/pwru" arch="x86_64 aarch64" # the only platforms supported upstream @@ -9,7 +9,6 @@ license="GPL-2.0-or-later" makedepends="go clang llvm libpcap-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/cilium/pwru/archive/refs/tags/v$pkgver.tar.gz" -export CGO_ENABLED=1 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" @@ -31,5 +30,5 @@ package() { } sha512sums=" -17ea7f106498735804947feeac94458551a847a2b8b409421c68c9d7035b13124a0382812f7b6ff5e8f0567fb013d4b68b9924613c0a3c60577a8cacb05f3de1 pwru-1.0.5.tar.gz +074485e6a29c42a5a8e0ee86e159169254a6b929e380979b65f33120edb7c4d4b8808435a735b02df691e8dc79ea34f2d3d8defe78c943544c540f0e5368b75b pwru-1.0.6.tar.gz " diff --git a/testing/pxalarm/APKBUILD b/testing/pxalarm/APKBUILD index 5bcfae1c68d..11d7b65511e 100644 --- a/testing/pxalarm/APKBUILD +++ b/testing/pxalarm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sam Nystrom <sam@samnystrom.dev> # Maintainer: Sam Nystrom <sam@samnystrom.dev> pkgname=pxalarm -pkgver=2.0.0a +pkgver=3.0.0 pkgrel=0 pkgdesc="POSIX sh simple alarm" url="https://github.com/iruzo/pxalarm" @@ -15,5 +15,5 @@ package() { } sha512sums=" -bbdabb3a71371703b0d92281727997e2889f90437b2d7a4d59b4da263f6d7dca1e8e0f0ce0c2cf080f4a7558a34fd760e4b2d2c631ae053bc3ed6b6397ec330b pxalarm-2.0.0a.tar.gz +23c1123159cee68df501e143764eea8460eea36878fbec7ddc19dac9d91c5d96d11881b14916135b75791d79b7e76b807311710b0e77d5531583625e0a42c239 pxalarm-3.0.0.tar.gz " diff --git a/testing/py3-aiowinreg/APKBUILD b/testing/py3-aiowinreg/APKBUILD index 2cabdce6829..3d72e9ec1f6 100644 --- a/testing/py3-aiowinreg/APKBUILD +++ b/testing/py3-aiowinreg/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jonas <3426-spameier@users.gitlab.alpinelinux.org> pkgname=py3-aiowinreg _pyname=aiowinreg -pkgver=0.0.10 -pkgrel=1 +pkgver=0.0.12 +pkgrel=0 pkgdesc="Windows registry file reader" url="https://github.com/skelsec/aiowinreg" arch="noarch" @@ -44,5 +44,5 @@ package() { } sha512sums=" -7842812dbe7455b8c560e8062bd4371cf89e9600f037caadf7a65c049be38f4263c5bf5923f57c49cdb19ea34f394d203ee9db029ac6d6b6d114a45ba7c93ea2 py3-aiowinreg-0.0.10.tar.gz +98fe29865ca7936ee65596b1e5d1bc281b2699f1f11240f2a51439a364f6ddedba83513539ffc6931c36b2dff5dd07744f63af5d513be4d4dfbf9c6768ab89d6 py3-aiowinreg-0.0.12.tar.gz " diff --git a/testing/py3-ajsonrpc/APKBUILD b/testing/py3-ajsonrpc/APKBUILD index 05caf58f471..886ca8e8de6 100644 --- a/testing/py3-ajsonrpc/APKBUILD +++ b/testing/py3-ajsonrpc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Marten Ringwelski <git+alpine@maringuu.de> -# Maintainer: Marten Ringwelski <git+alpine@maringuu.de> +# Maintainer: fossdd <fossdd@pwned.life> pkgname=py3-ajsonrpc pkgver=1.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="Lightweight JSON-RPC 2.0 protocol implementation and asynchronous server powered by asyncio" url="https://github.com/pavlov99/ajsonrpc" arch="noarch" diff --git a/testing/py3-arcus/APKBUILD b/testing/py3-arcus/APKBUILD index de241556aa8..0a045359e59 100644 --- a/testing/py3-arcus/APKBUILD +++ b/testing/py3-arcus/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=py3-arcus # Needs to be upgraded in sync with libarcus -pkgver=5.2.2 -pkgrel=4 +pkgver=5.3.0 +pkgrel=0 pkgdesc="Python bindings for libarcus" url="https://github.com/Ultimaker/pyArcus" arch="all" @@ -35,7 +35,7 @@ package() { } sha512sums=" -b24cbb9a5d7aa917b1b21e46f935b1293645e731d4e475a5abe364237f35708e8e96a1c6f06fe78e2e0e381737f4a27a6db87e42a5f4de9d48091d9de096f9b0 py3-arcus-5.2.2.tar.gz +d4a114994fa3e3156eae95dde58df13237b8bb0571a1219d6dee6b6338fd65f911f27887d6ab32b7a3cb32bc45ca6c25147e7c2d246cb0707326b88246abfbcd py3-arcus-5.3.0.tar.gz f14e55cd31c13051981f26364e34da8c94e8eb5227b1cfd6fe44b9f97b5a4dcf6142a1751fa62eb0514a47583e6ec2d51dc253f23cf72c3fe6a1cb5dca136f21 cmake.patch de75b985607feae0a9c511742915814e9c3d4bc467183f010ccc334ce4d0d952b6ff86020360b78558c4738cc03cf62c386b44ed76bcec12075c4a93dd03eeb7 cmake-helpers.patch ef593230d5c78da8ba0fc6ea83225c4543857de1837d3151c45e59ffd7c98063b8f97f25d01c15b6a8f90c26c919206f9f7fa26c9650117f4ce7be49ebca876f pyproject.patch diff --git a/testing/py3-beartype/APKBUILD b/testing/py3-beartype/APKBUILD index 4d331648f7c..30f10a0cdbf 100644 --- a/testing/py3-beartype/APKBUILD +++ b/testing/py3-beartype/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Galen Abell <galen@galenabell.com> pkgname=py3-beartype _pyname=beartype -pkgver=0.18.2 -pkgrel=1 +pkgver=0.18.5 +pkgrel=0 pkgdesc="Fast, pure-Python type checker" url="https://github.com/beartype/beartype" arch="noarch" @@ -40,5 +40,5 @@ package() { } sha512sums=" -fedaacd2b93adb738f706711c086e7b852dc3cf50e98a92429f2542c11b8b7be3192eb705da6a93393db3a92d8f0ab98dec1c3659e70fdd252d250472e169bea beartype-0.18.2.tar.gz +4805ccc618795f100d018e5fd5d1234254ea182d1e43aa1559655b73bf259c5b93f6804fd803e5e281942235019469c252f02ddf8136674b9399efe61ef98d71 beartype-0.18.5.tar.gz " diff --git a/testing/py3-codecov/APKBUILD b/testing/py3-codecov/APKBUILD index 5c391d850f1..d26ced99c7f 100644 --- a/testing/py3-codecov/APKBUILD +++ b/testing/py3-codecov/APKBUILD @@ -4,13 +4,12 @@ pkgname=py3-codecov pkgver=2.1.13 pkgrel=2 pkgdesc="Report uploader for Codecov" -options="!check" # Requires unpackaged 'ddt' url="https://github.com/codecov/codecov-python" arch="noarch" license="Apache-2.0" depends="python3 py3-coverage py3-requests" makedepends="py3-setuptools" -checkdepends="py3-pytest" +checkdepends="py3-pytest py3-ddt py3-mock" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/codecov/codecov-python/archive/v$pkgver.tar.gz" builddir="$srcdir"/codecov-python-$pkgver @@ -23,7 +22,8 @@ build() { } check() { - py.test-3 tests/test.py + # Disable tests that require git history (the last one fails only on gitlab CI). + py.test tests/test.py -k 'not test_bowerrc_none and not test_prefix and not test_send and not test_ci_gitlab_pre9' } package() { diff --git a/testing/py3-confluent-kafka/APKBUILD b/testing/py3-confluent-kafka/APKBUILD index 8250513ed02..fdc24bcab15 100644 --- a/testing/py3-confluent-kafka/APKBUILD +++ b/testing/py3-confluent-kafka/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.8.2 pkgrel=4 pkgdesc="Confluent's Apache Kafka Python clien" url="https://github.com/confluentinc/confluent-kafka-python" -arch="all !x86" # Restricted by py3-fastavro +arch="all !x86 !armhf !armv7" # Restricted by py3-fastavro license="Apache-2.0" depends="py3-avro py3-fastavro py3-jsonschema py3-protobuf py3-requests" makedepends="py3-setuptools python3-dev librdkafka-dev>=1.0.1" diff --git a/testing/py3-cssutils/APKBUILD b/testing/py3-cssutils/APKBUILD index 3f8e0fe3dd7..b7b91ea2442 100644 --- a/testing/py3-cssutils/APKBUILD +++ b/testing/py3-cssutils/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py3-cssutils _pkgname=cssutils -pkgver=2.9.0 +pkgver=2.10.2 pkgrel=0 pkgdesc="CSS Cascading Style Sheets library for Python" url="http://cthedot.de/cssutils/" @@ -35,5 +35,5 @@ package() { } sha512sums=" -d13d53b3e4f133afb5b72faba1e41a95cf2b146efb075dd3b328fc424eccd371194e1e14fd9e607b207b5c7d473e64f1e4c63975173d8491fa8036a16dc94d38 cssutils-2.9.0.tar.gz +c678b6953b13e8a7ac7b2abbe0b8be26283973537089071828e618b359bcce27df636f382d8b0dc50b13962e0d2dffcce991a47f678954ec018849e57026446d cssutils-2.10.2.tar.gz " diff --git a/testing/py3-cython-test-exception-raiser/APKBUILD b/testing/py3-cython-test-exception-raiser/APKBUILD new file mode 100644 index 00000000000..cbb7e1a628b --- /dev/null +++ b/testing/py3-cython-test-exception-raiser/APKBUILD @@ -0,0 +1,33 @@ +# Automatically generated by apkbuild-pypi, template 4 +# Contributor: Guy Godfroy <guy.godfroy@gugod.fr> +# Maintainer: Guy Godfroy <guy.godfroy@gugod.fr> +pkgname=py3-cython-test-exception-raiser +pkgver=1.0.2 +pkgrel=0 +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=cython-test-exception-raiser +pkgdesc="A trivial extension that just raises an exception." +url="https://github.com/twisted/cython-test-exception-raiser" +arch="all" +license="MIT" +depends="cython" +makedepends="py3-gpep517 py3-setuptools py3-wheel python3-dev" +subpackages="$pkgname-pyc" +source="$_pkgreal-$pkgver.tar.gz::https://github.com/twisted/cython-test-exception-raiser/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" +options="!check" # No test suite + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +ad245eb87fe2d4d93d244b125d80f17fe6deeac86ae9a9129d211d9ff1738da39dc30d49a80f33d50a6fa52029403018c87a8637db9c21098ef8b0e3afe20ea7 cython-test-exception-raiser-1.0.2.tar.gz +" diff --git a/testing/py3-dkimpy/APKBUILD b/testing/py3-dkimpy/APKBUILD index e608b626590..099d2b68a23 100644 --- a/testing/py3-dkimpy/APKBUILD +++ b/testing/py3-dkimpy/APKBUILD @@ -1,8 +1,8 @@ # Contributor: knuxify <knuxify@gmail.com> # Maintainer: knuxify <knuxify@gmail.com> pkgname=py3-dkimpy -pkgver=1.1.5 -pkgrel=1 +pkgver=1.1.6 +pkgrel=0 pkgdesc="DKIM, ARC, and TLSRPT email signing and verification" url="https://launchpad.net/dkimpy/" arch="noarch" @@ -28,5 +28,5 @@ package() { } sha512sums=" -650476a54cb39d72fefe05a6fdd8167694cd6f1cf521efb7807713ccfa868dd5458732ee8501c4edea203f9726689c9632a92473698ee31889208d19891b7a13 dkimpy-1.1.5.tar.gz +d61331cc7baa3bd5156d919a4a88ad792ac3c3077381585f8b5aa1a35dc50761b86286312e13f3514496ab50bdc6f2dac469f4b5419b49053c1c9204d569d317 dkimpy-1.1.6.tar.gz " diff --git a/testing/py3-dt-schema/APKBUILD b/testing/py3-dt-schema/APKBUILD index eb9d144c300..9627fea3ac8 100644 --- a/testing/py3-dt-schema/APKBUILD +++ b/testing/py3-dt-schema/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Iskren Chernev <me@iskren.info> # Maintainer: Iskren Chernev <me@iskren.info> pkgname=py3-dt-schema -pkgver=2024.02 -pkgrel=1 +pkgver=2024.04 +pkgrel=0 pkgdesc="Devicetree schema tools" url="https://github.com/devicetree-org/dt-schema" arch="noarch" @@ -57,5 +57,5 @@ package() { } sha512sums=" -9d1bb062541ea422e6551fed7fa2d5a7e80e7af2cad4ac66ea0f3b3f6bd4e15fbc7b27052556a61b32c35044fde6339b01a7b6679a314f9b17cc29a7a6f02cab dt-schema-2024.02.tar.gz +10d3e997bff72caff4bfe7b5af148eec9628a159f7e133dc6cba3f8e2413d6d4b268492c8d412a9e26c7454bbf8fdac99a326cffcddd747605f68bd72c764a4b dt-schema-2024.04.tar.gz " diff --git a/testing/py3-dunamai/APKBUILD b/testing/py3-dunamai/APKBUILD index 6ecc5942e75..a447aab3155 100644 --- a/testing/py3-dunamai/APKBUILD +++ b/testing/py3-dunamai/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-dunamai -pkgver=1.20.0 +pkgver=1.21.0 pkgrel=0 pkgdesc="Dynamic versioning library and CLI" url="https://github.com/mtkennerly/dunamai" @@ -32,5 +32,5 @@ package() { } sha512sums=" -ec29e737203034178387a8b11cb82f331cf5094d43e3d5934cef8551b8a979df7774613271312d2a8db6a721e37b004d493aa466aa414748e5fd0a1dd71e733b dunamai-1.20.0.tar.gz +7f22fc442a419e6952a7754c51133d7d0e68c154fa34095bf033f0e44e96c096080c9f89bd5328584c5127114ebe37142c292a3e0b724bf294ce1752d87406b2 dunamai-1.21.0.tar.gz " diff --git a/testing/py3-eventlet/APKBUILD b/testing/py3-eventlet/APKBUILD index f12f4a5f38c..6588aa04e9c 100644 --- a/testing/py3-eventlet/APKBUILD +++ b/testing/py3-eventlet/APKBUILD @@ -5,7 +5,8 @@ pkgver=0.36.1 pkgrel=0 pkgdesc="Python library for seamless coroutine-based concurrency" url="https://eventlet.net/" -arch="noarch" +# riscv: tests fails +arch="noarch !riscv64" license="MIT" depends=" py3-dnspython diff --git a/testing/py3-fastavro/APKBUILD b/testing/py3-fastavro/APKBUILD index b9b0c4f3da1..e5eaf1a7fb9 100644 --- a/testing/py3-fastavro/APKBUILD +++ b/testing/py3-fastavro/APKBUILD @@ -4,13 +4,15 @@ pkgname=py3-fastavro _pkgname=fastavro pkgver=1.9.4 -pkgrel=1 +pkgrel=2 pkgdesc="Fast Avro for Python" # Tests for optional zstd and snappy codecs require # unpackaged python modules 'zstandard' and 'python-snappy' options="!check" url="https://github.com/fastavro/fastavro" -arch="all !x86" # _tz_ tests fail +# Upstream does not test 32 bit systems anymore +# Issue: https://github.com/fastavro/fastavro/issues/526 +arch="all !x86 !armhf !armv7" # _tz_ tests fail license="MIT" depends="python3" makedepends="py3-gpep517 py3-setuptools python3-dev cython py3-wheel" diff --git a/testing/py3-findpython/APKBUILD b/testing/py3-findpython/APKBUILD index d941dbda3a2..0456049f50c 100644 --- a/testing/py3-findpython/APKBUILD +++ b/testing/py3-findpython/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-findpython -pkgver=0.6.0 -pkgrel=1 +pkgver=0.6.1 +pkgrel=0 pkgdesc="Utility to find python versions on your system" url="https://github.com/frostming/findpython" arch="noarch" @@ -33,5 +33,5 @@ package() { } sha512sums=" -e6651fe040042ca1f7b75fd8fed899be91fa5d3e51b898ff6e9cb59a0d0155a9cdc2af26321681d51326b7f7900c1048bc813aad7ad201269b8bb5a2775427c2 py3-findpython-0.6.0.tar.gz +ec6bb95fe19f3b1c5408c91948dc8b9aaa4516c664d5a810bff80a658b03df0d40b1e077b170b247293ccc0375156b9c010632b07dac57d435cb5d006ac4b6e6 py3-findpython-0.6.1.tar.gz " diff --git a/testing/py3-flask-limiter/APKBUILD b/testing/py3-flask-limiter/APKBUILD index 491f4cfba09..800380743c3 100644 --- a/testing/py3-flask-limiter/APKBUILD +++ b/testing/py3-flask-limiter/APKBUILD @@ -1,8 +1,8 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=py3-flask-limiter -pkgver=3.5.0 -pkgrel=1 +pkgver=3.6.0 +pkgrel=0 pkgdesc="Rate Limiting extension for Flask" url="https://github.com/alisaifee/flask-limiter" arch="noarch" @@ -45,6 +45,6 @@ package() { } sha512sums=" -f97fd830fd0bbb2186c82451643413420be93872ed17d71d20c830a76ec3aee999bcda3a07b9d27d4602ef5fcd33f78888dc5d75c220eae5cb83ef02853151e6 flask-limiter-3.5.0.tar.gz +95bb2af7ff9d317821235212818718f7e5a13cf18f9991fa4e392a99bdc7b4aafbe510e67dd9d56860c987f954c7c4f3f0a6d29cab51bfb55606319b549e839f flask-limiter-3.6.0.tar.gz 1b90e9134076cda249695d5ea741db9d205a2ae452c7d6edfe01eb37a221ce6f64b0e8ddcdbbee9b0e0fb16a28e5eabf14f1c1e41e965c7e3b93ea4f42caf553 our-std-is-good-enough.patch " diff --git a/testing/py3-hatch-openzim-bootstrap/APKBUILD b/testing/py3-hatch-openzim-bootstrap/APKBUILD new file mode 100644 index 00000000000..363cf9c4aff --- /dev/null +++ b/testing/py3-hatch-openzim-bootstrap/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Oleg Titov <oleg.titov@gmail.com> +# Maintainer: Oleg Titov <oleg.titov@gmail.com> +pkgname=py3-hatch-openzim-bootstrap +pkgver=0.1.0 +pkgrel=0 +pkgdesc="Bootstrap for py3-hatch-plugin" +url="https://github.com/openzim/hatch-openzim/" +arch="noarch" +license="GPL-3.0-or-later" +makedepends="py3-gpep517 py3-hatchling py3-setuptools py3-wheel" +checkdepends="py3-pytest py3-pytest-cov" +subpackages="$pkgname-pyc" +source="py3-hatch-openzim-$pkgver.tar.gz::https://github.com/openzim/hatch-openzim/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/hatch-openzim-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + + # it is expected that test_metadata_nominal will fail + # (git tarball in use), + # reported upstream: + # https://github.com/openzim/hatch-openzim/issues/13 + .testenv/bin/python3 -m pytest \ + -k "not test_metadata_nominal" +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +5d7a0c75de7517c2e1f9649fd04d43577373f28dfcaa12dc15788e045226ef93f1cb7346a806169c5131749970fbe45a582006189c47daa60d9769cb2fab15db py3-hatch-openzim-0.1.0.tar.gz +" diff --git a/testing/py3-hatch-openzim/APKBUILD b/testing/py3-hatch-openzim/APKBUILD new file mode 100644 index 00000000000..f753a39fd6e --- /dev/null +++ b/testing/py3-hatch-openzim/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Oleg Titov <oleg.titov@gmail.com> +# Maintainer: Oleg Titov <oleg.titov@gmail.com> +pkgname=py3-hatch-openzim +pkgver=0.2.0 +pkgrel=0 +pkgdesc="Hhatch(ling) plugin for generic openZIM operations" +url="https://github.com/openzim/hatch-openzim/" +arch="noarch" +license="GPL-3.0-or-later" +makedepends=" + py3-gpep517 + py3-hatch-openzim-bootstrap + py3-hatchling + py3-setuptools + py3-wheel + " +checkdepends="py3-pytest py3-pytest-cov" +subpackages="$pkgname-pyc" +source="py3-hatch-openzim-$pkgver.tar.gz::https://github.com/openzim/hatch-openzim/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/hatch-openzim-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +f14dc236a482495b9d96f9c2a8d9b56c3c39d019caec37304129fab118bdaf7a5f2fa0ed545e874c44515345715049c1ba981abfebb6b57dae995c4d840fdc20 py3-hatch-openzim-0.2.0.tar.gz +" diff --git a/testing/py3-igraph/APKBUILD b/testing/py3-igraph/APKBUILD index 9683d3e2424..7c72aec4754 100644 --- a/testing/py3-igraph/APKBUILD +++ b/testing/py3-igraph/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jonas <3426-spameier@users.gitlab.alpinelinux.org> pkgname=py3-igraph _pyname=python-igraph -pkgver=0.11.4 -pkgrel=1 +pkgver=0.11.5 +pkgrel=0 pkgdesc="Python interface for igraph" url="https://github.com/igraph/python-igraph" # s390x: libigraph-dev @@ -45,5 +45,5 @@ package() { } sha512sums=" -aca2482967fd440da52299c82a949961ccfed20a347d08b74a19eb223a516ed76aaca47f587960ec42a15828038ce180d810d83d48367a08a858879f54d072ab py3-igraph-0.11.4.tar.gz +4545688f712912f2fbad2d17da69045ee44d5bde357e146873b23758aae8f17b5156e82a919713b61ebfe08c9eff0f197318cf3e4188c74570e6b2b4816fb775 py3-igraph-0.11.5.tar.gz " diff --git a/testing/py3-iso639-lang/APKBUILD b/testing/py3-iso639-lang/APKBUILD new file mode 100644 index 00000000000..f01efd82b13 --- /dev/null +++ b/testing/py3-iso639-lang/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Oleg Titov <oleg.titov@gmail.com> +# Maintainer: Oleg Titov <oleg.titov@gmail.com> +pkgname=py3-iso639-lang +pkgver=2.2.3 +pkgrel=0 +pkgdesc="Easy-to-use library for the ISO 639 language representation standards" +url="https://github.com/LBeaudoux/iso639" +arch="noarch" +license="MIT" +makedepends="py3-gpep517 py3-setuptools py3-wheel" +checkdepends="py3-pytest" +subpackages="$pkgname-pyc" +source="py3-iso639-lang-$pkgver.tar.gz::https://github.com/LBeaudoux/iso639/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/iso639-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest test.py +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +4846c73b9a8f7e6e5d258c7408f6c4a7eb64ed0b64733f813cbf4e4945acaac55075a5030541629dafce0bc20c98eb1a7fac82c39f96c12309d096e9ef42e629 py3-iso639-lang-2.2.3.tar.gz +" diff --git a/testing/py3-itemloaders/APKBUILD b/testing/py3-itemloaders/APKBUILD index 8bdc888bbdc..57f5218232a 100644 --- a/testing/py3-itemloaders/APKBUILD +++ b/testing/py3-itemloaders/APKBUILD @@ -1,7 +1,7 @@ -# Maintainer: +# Maintainer: fossdd <fossdd@pwned.life> pkgname=py3-itemloaders -pkgver=1.1.0 -pkgrel=2 +pkgver=1.2.0 +pkgrel=0 pkgdesc="Library to populate items using XPath and CSS with a convenient API" url="https://github.com/scrapy/itemloaders" arch="noarch" @@ -26,9 +26,7 @@ build() { check() { python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest \ - --ignore tests/test_utils_python.py - # https://github.com/scrapy/itemloaders/issues/76 + .testenv/bin/python3 -m pytest } package() { @@ -36,5 +34,5 @@ package() { } sha512sums=" -4a52e75405409124a3c1f7e7079fedf36e34a76877b04d754006743a2f403602de9b463e1f338bead3a68a0c1cf32f2a50b4cbe4cc57a10539ec529a93b81607 py3-itemloaders-1.1.0.tar.gz +2e15053b20e01500a496133257200f34c430ed27ae3c5f8c49fe226cffe357fbd35d561d78c2478a621d5cdb3c08631d39ceeb91d114626ffe8fdc6ef4a664ff py3-itemloaders-1.2.0.tar.gz " diff --git a/testing/py3-jaraco.path/APKBUILD b/testing/py3-jaraco.path/APKBUILD new file mode 100644 index 00000000000..192d73fc768 --- /dev/null +++ b/testing/py3-jaraco.path/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: Duncan Bellamy <dunk@denkimushi.com> +# Maintainer: Duncan Bellamy <dunk@denkimushi.com> +pkgname=py3-jaraco.path +pkgver=3.7.0 +pkgrel=0 +pkgdesc="Cross platform hidden file detection" +url="https://github.com/jaraco/jaraco.path" +arch="noarch" +license="MIT" +makedepends="py3-gpep517 py3-installer py3-setuptools_scm py3-wheel" +checkdepends="py3-pytest" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/jaraco/jaraco.path/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/jaraco.path-$pkgver" + +build() { + export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +31a33545629212d796c5b22f73f9f4185e77e2207aee3baa5d404c7dce8537ebd69cc08bfb941ffa331a500ae0be35d592f7dee021841bf79ed251215e50c20a py3-jaraco.path-3.7.0.tar.gz +" diff --git a/testing/py3-jaraco.vcs/APKBUILD b/testing/py3-jaraco.vcs/APKBUILD new file mode 100644 index 00000000000..03b7bc5d01f --- /dev/null +++ b/testing/py3-jaraco.vcs/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Duncan Bellamy <dunk@denkimushi.com> +# Maintainer: Duncan Bellamy <dunk@denkimushi.com> +pkgname=py3-jaraco.vcs +pkgver=2.2.0 +pkgrel=0 +pkgdesc="Classes for inspecting and working with repositories in the Mercurial and Git version control systems" +url="https://github.com/jaraco/jaraco.vcs" +arch="noarch" +license="MIT" +depends="py3-dateutil py3-jaraco.classes py3-jaraco.versioning py3-more-itertools py3-packaging" +makedepends="py3-gpep517 py3-installer py3-setuptools_scm py3-wheel" +checkdepends="py3-jaraco.path py3-pytest" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/jaraco/jaraco.vcs/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/jaraco.vcs-$pkgver" + +build() { + export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest --ignore jaraco/vcs/__init__.py +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +1edd6387d8a7bccb4938283d550e5de53a68cc62c000cb3dfac17828490d6cbc1b263aa937ffafed88fbec3ff6cfd242c140de5114bf0e8d39dfe7a8f6f80671 py3-jaraco.vcs-2.2.0.tar.gz +" diff --git a/testing/py3-jaraco.versioning/APKBUILD b/testing/py3-jaraco.versioning/APKBUILD new file mode 100644 index 00000000000..897cd95b0aa --- /dev/null +++ b/testing/py3-jaraco.versioning/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Duncan Bellamy <dunk@denkimushi.com> +# Maintainer: Duncan Bellamy <dunk@denkimushi.com> +pkgname=py3-jaraco.versioning +pkgver=1.1.0 +pkgrel=0 +pkgdesc="Jaraco versioning module" +url="https://github.com/jaraco/jaraco.versioning" +arch="noarch" +license="MIT" +depends="py3-packaging" +makedepends="py3-gpep517 py3-installer py3-setuptools_scm py3-wheel" +checkdepends="py3-pytest" +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/jaraco/jaraco.versioning/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/jaraco.versioning-$pkgver" + +build() { + export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +36567a7d95f07ea470ad3a637758865451e6d17d50e05504755333f8ded037d7876573929063e3a7a506a07620ae4c4ded581108a9ae43ef5b8e8aa17271a437 py3-jaraco.versioning-1.1.0.tar.gz +" diff --git a/testing/py3-libmdbx/APKBUILD b/testing/py3-libmdbx/APKBUILD index 194fd298a00..acae458fc51 100644 --- a/testing/py3-libmdbx/APKBUILD +++ b/testing/py3-libmdbx/APKBUILD @@ -19,7 +19,21 @@ build() { } check() { - PYTHONPATH="$PWD" python3 -m pytest . + case "$CARCH" in + riscv64) + PYTHONPATH="$PWD" python3 -m pytest . \ + --deselect libmdbx/tests/mdbx_test.py::TestMdbx::test_db_iter \ + --deselect libmdbx/tests/mdbx_test.py::TestMdbx::test_db_readitem_writeitem \ + --deselect libmdbx/tests/mdbx_test.py::TestMdbx::test_env \ + --deselect libmdbx/tests/mdbx_test.py::TestMdbx::test_multi_write \ + --deselect libmdbx/tests/mdbx_test.py::TestMdbx::test_replace \ + --deselect libmdbx/tests/mdbx_test.py::TestMdbx::test_success_close_written_map \ + --deselect libmdbx/tests/mdbx_test.py::TestMdbx::test_write + ;; + *) + PYTHONPATH="$PWD" python3 -m pytest . + ;; + esac } package() { diff --git a/testing/py3-limits/APKBUILD b/testing/py3-limits/APKBUILD index 89bcddf8bc5..ed4a82efd6b 100644 --- a/testing/py3-limits/APKBUILD +++ b/testing/py3-limits/APKBUILD @@ -1,8 +1,8 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=py3-limits -pkgver=3.10.1 -pkgrel=1 +pkgver=3.12.0 +pkgrel=0 pkgdesc="Rate limiting using various strategies and storage backends such as redis & memcached" url="https://github.com/alisaifee/limits" arch="noarch" @@ -45,6 +45,6 @@ package() { } sha512sums=" -5daa23a2a53dc56ba8e24fe72000bd69bfade9956a159c02731ef3a240682f467c4ae1f58878139fd9d0f67806bf115f6f97999160a2f66f34c64fdad1503d70 limits-3.10.1.tar.gz -8db0d96f860a07bbc554504a6e94b61546a6be22c0b9736c6b5aca628db9b618efc30609fce3702ee8e3812e1e34329c04d2f34bd69fdaecaa7c7fa0a2bde8a7 our-std-is-good-enough.patch +2803dc26b18015e177342ed89e879f4dd680908579c99f9069d695edfa2beb3008b5bc47454ea2120a425bbcbc8a08928ab93a3058b33e11a2ae29431dfd9cd1 limits-3.12.0.tar.gz +0364d51f9f879b95c6a4a3c9e9fd3d7d1e15ea214c50ae98cd36826b8c0b2d903cf1128741ac83738e305a207dae8955a0b2c8679484d2d6643e334595bdb1d7 our-std-is-good-enough.patch " diff --git a/testing/py3-limits/our-std-is-good-enough.patch b/testing/py3-limits/our-std-is-good-enough.patch index f2247e70e6e..94c0c3096f3 100644 --- a/testing/py3-limits/our-std-is-good-enough.patch +++ b/testing/py3-limits/our-std-is-good-enough.patch @@ -11,12 +11,12 @@ from limits.typing import Dict, List, NamedTuple, Optional, Tuple, Type, Union --- ./limits/typing.py.orig +++ ./limits/typing.py -@@ -11,7 +11,7 @@ +@@ -13,7 +13,7 @@ Union, ) --from typing_extensions import ClassVar, Counter, ParamSpec, Protocol -+from typing import ClassVar, Counter, ParamSpec, Protocol +-from typing_extensions import ClassVar, Counter, ParamSpec, Protocol, TypeAlias ++from typing import ClassVar, Counter, ParamSpec, Protocol, TypeAlias Serializable = Union[int, str, float] diff --git a/testing/py3-mbedtls/APKBUILD b/testing/py3-mbedtls/APKBUILD index def90e568d2..6d29cf6935c 100644 --- a/testing/py3-mbedtls/APKBUILD +++ b/testing/py3-mbedtls/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jonas <3426-spameier@users.gitlab.alpinelinux.org> pkgname=py3-mbedtls _pyname=python-mbedtls -pkgver=2.9.2 +pkgver=2.10.1 pkgrel=1 pkgdesc="hash, hmac, RSA, ECC, X.509, TLS, DTLS, handshakes, and secrets with an mbed TLS back end" url="https://github.com/Synss/python-mbedtls" @@ -48,5 +48,5 @@ package() { } sha512sums=" -3b71f3e2c898d9fec01bf5b2a3e97bc2fa3688efc80e096bd57b902bf8e34ea5ba0cb221ea46c0fa844d01610918da61bf6ac118b5262b4c11f22bef80a5ce04 py3-mbedtls-2.9.2.tar.gz +c0100c621bc0a0e9d16557902c5f059229ce30143bb8b93f2d916c90a78c4b4911b548d9829b2b1ebbc34f379129c8ab9b6ae471f1e8556785321c5978bc6a3d py3-mbedtls-2.10.1.tar.gz " diff --git a/testing/py3-microdata/APKBUILD b/testing/py3-microdata/APKBUILD new file mode 100644 index 00000000000..ecc0268d76a --- /dev/null +++ b/testing/py3-microdata/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-microdata +#_pkgreal is used by apkbuild-pypi to find modules at PyPI +_pkgreal=microdata +pkgver=0.8.0 +pkgrel=0 +pkgdesc="html5lib extension for parsing microdata" +url="https://pypi.python.org/project/microdata" +license="CC0-1.0" +arch="noarch" +depends="py3-html5lib" +makedepends="py3-setuptools py3-gpep517 py3-wheel" +source="$pkgname-$pkgver.tar.gz::https://github.com/edsu/microdata/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" +subpackages="$pkgname-pyc" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 setup.py test +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +e48c8c267f595faec97397fae470a3aa1f4f33d9f4ea7d186f07b104166b373ea768db7d73423aedd28af3e310f6b9fa268d946420c6aed9676d15f38396b07e py3-microdata-0.8.0.tar.gz +" diff --git a/testing/py3-ovos-ww-plugin-vosk/APKBUILD b/testing/py3-ovos-ww-plugin-vosk/APKBUILD index 14192c8c64d..cb431485c68 100644 --- a/testing/py3-ovos-ww-plugin-vosk/APKBUILD +++ b/testing/py3-ovos-ww-plugin-vosk/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=py3-ovos-ww-plugin-vosk pkgver=0.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="Vosk wake word plugin for OVOS" url="https://github.com/OpenVoiceOS/ovos-ww-plugin-vosk" # only x86_64 and aarch64 supported by vosk-api diff --git a/testing/py3-owslib/APKBUILD b/testing/py3-owslib/APKBUILD index e5af59275bf..42443101141 100644 --- a/testing/py3-owslib/APKBUILD +++ b/testing/py3-owslib/APKBUILD @@ -3,8 +3,8 @@ pkgname=py3-owslib #_pkgreal is used by apkbuild-pypi to find modules at PyPI _pkgreal=OWSLib -pkgver=0.29.3 -pkgrel=1 +pkgver=0.30.0 +pkgrel=0 pkgdesc="OGC Web Service utility library" url="http://packages.python.org/pypi/OWSLib" arch="noarch" @@ -32,5 +32,5 @@ package() { } sha512sums=" -fc503be2b2e7d7f539283c7602831097bda680a74133debacb0a51116a25c261b972e3497e69ccea27329672183b447e6e299e7e8cc3853be1341db2cef427e2 OWSLib-0.29.3.tar.gz +254b9ffa0f003d5f2ddf8934942f6501cc36db60db2bf54ccc3f4294112148e61e5bd1c3df3d233bc0008e266b3e83390b045004c1a77fb146333f6a5ea27353 OWSLib-0.30.0.tar.gz " diff --git a/testing/py3-pivy/APKBUILD b/testing/py3-pivy/APKBUILD index ec0324e0587..86d311220a2 100644 --- a/testing/py3-pivy/APKBUILD +++ b/testing/py3-pivy/APKBUILD @@ -1,23 +1,19 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=py3-pivy -_pkgname=pivy -pkgver=0.6.8 -pkgrel=2 +pkgver=0.6.9_alpha0 +pkgrel=0 pkgdesc="Python3 bindings for coin" url="https://github.com/coin3d/pivy" -# riscv64 blocked by qt5-qtwebengine via py3-pyside2 -# py3-pyside2 is not available on armhf -arch="all !armhf !riscv64" +# riscv64 blocked by py3-pyside6 +arch="all !riscv64" license="ISC" -depends="py3-pyside2" -makedepends="swig soqt-dev qt5-qtbase-dev python3-dev glu-dev cmake samurai" +depends="py3-pyside6" +makedepends="swig soqt-dev qt6-qtbase-dev python3-dev glu-dev cmake samurai" checkdepends="py3-pytest" options="!check" # test suite is interactive and requires full installation -source="$pkgname-$pkgver.tar.gz::https://github.com/coin3d/pivy/archive/refs/tags/$pkgver.tar.gz - qt5.patch - " -builddir="$srcdir/$_pkgname-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/coin3d/pivy/archive/refs/tags/${pkgver//_alpha/.a}.tar.gz" +builddir="$srcdir/pivy-${pkgver//_alpha/.a}" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -36,6 +32,5 @@ package() { } sha512sums=" -723b09028f2e3075056b9588cebad0ddccbc98d0c15552b9565c177b0de764b9645f88ea2bc534ccf606f2e0b59f91e1d03551b55ece66c0654ce9cdf09a1a7c py3-pivy-0.6.8.tar.gz -7750ded3eb09da510ba5f84e7957c2ae1f92be0df280901fd9c9eba4164758a8f2d436e2d6ae7634a91aed12609f4eefd181922e6caed0b4906c6bc9dbd7b562 qt5.patch +1bfefd58d2921c8be170a97efa30cad53b01f636ea0cf236acca242be4f691669a4c310cd61c64d3e0c55e55e8be96d36945cd244380ddc0b3a06170d0f8b691 py3-pivy-0.6.9_alpha0.tar.gz " diff --git a/testing/py3-pivy/qt5.patch b/testing/py3-pivy/qt5.patch deleted file mode 100644 index 7dfdc97658a..00000000000 --- a/testing/py3-pivy/qt5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./qtinfo.py -+++ ./qtinfo.py -@@ -7,7 +7,7 @@ - if qmake_command: - self._qmake_command = qmake_command - else: -- self._qmake_command = [find_executable("qmake"),] -+ self._qmake_command = [find_executable("qmake-qt5"),] - self._dict = {} - # bind all variables early at __init__ time. - for thing in self.__class__.__dict__: diff --git a/testing/py3-plexapi/APKBUILD b/testing/py3-plexapi/APKBUILD index 0629a98d1c1..895721b4f23 100644 --- a/testing/py3-plexapi/APKBUILD +++ b/testing/py3-plexapi/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=py3-plexapi _pkgname=python-plexapi -pkgver=4.15.11 -pkgrel=1 +pkgver=4.15.12 +pkgrel=0 pkgdesc="Python bindings for the Plex API" url="https://github.com/pkkid/python-plexapi" arch="noarch" @@ -40,5 +40,5 @@ package() { } sha512sums=" -c68b414aa9262c3505dc2490c38e8d5dd896970f4df7fe8d382a0c5f2276ecc9833767e243b596c4f0f625e6d8984f5f89790fe7a71e9b6cab1c439f26b9cde1 py3-plexapi-4.15.11.tar.gz +8b5f36076b87e2941c4293aa94017c7cc00b680e207374c5ae5f8b8ab12ce83d1c9331bc174042095bd3461eb3926cb52635757e2099e63ffa660255fbbbaeb4 py3-plexapi-4.15.12.tar.gz " diff --git a/testing/py3-pyinstaller/APKBUILD b/testing/py3-pyinstaller/APKBUILD new file mode 100644 index 00000000000..6386ef436e7 --- /dev/null +++ b/testing/py3-pyinstaller/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org> +pkgname=py3-pyinstaller +pkgver=6.6.0 +pkgrel=0 +pkgdesc="PyInstaller bundles a Python application and all its dependencies into a single package" +url="https://pyinstaller.org/" +arch="noarch" +license="(GPL-2.0-or-later WITH Bootloader-exception) AND Apache-2.0" +depends="py3-altgraph py3-setuptools" +makedepends="py3-gpep517 py3-wheel zlib-dev" +options="!archcheck !check" +subpackages="$pkgname-pyc" +source="https://files.pythonhosted.org/packages/source/p/pyinstaller/pyinstaller-$pkgver.tar.gz" +builddir="$srcdir/pyinstaller-$pkgver" + +build() { + gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2 +} + +package() { + python3 -m installer -d "$pkgdir" .dist/*.whl +} + +sha512sums=" +074658825ced3bd371fb34eea79fc62d9810da87a8ef88fbae7c68d38205c9956e9332c7eebaf94af9e1d337d3eca3df05ea6e9771e8497cfa6263b92dd44252 pyinstaller-6.6.0.tar.gz +" diff --git a/testing/py3-pynest2d/APKBUILD b/testing/py3-pynest2d/APKBUILD index 4c046dc1d07..357a1c3ff6d 100644 --- a/testing/py3-pynest2d/APKBUILD +++ b/testing/py3-pynest2d/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Anjandev Momi <anjan@momi.ca> pkgname=py3-pynest2d pkgver=5.2.2 -pkgrel=3 +pkgrel=4 pkgdesc="Python bindings for libnest2d" url="https://github.com/Ultimaker/pynest2d" arch="all" diff --git a/testing/py3-pypandoc/APKBUILD b/testing/py3-pypandoc/APKBUILD index b246a90867e..40287133888 100644 --- a/testing/py3-pypandoc/APKBUILD +++ b/testing/py3-pypandoc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=py3-pypandoc -pkgver=1.12 -pkgrel=3 +pkgver=1.13 +pkgrel=0 pkgdesc="Thin wrapper for pandoc" url="https://github.com/NicklasTegner/pypandoc" arch="aarch64 x86_64" # pandoc @@ -30,5 +30,5 @@ package() { } sha512sums=" -9b6e3e8402928e5ff43a014135a3eeca25034e5519bdf1a1e17e46812115544a63373337b204bb5ce05cded407b76181599657e582b9042a3a0b8eaf02064c2d pypandoc-1.12.tar.gz +b4b39fc94dea3ad45f8f33cff9e291ea2a9aa52aece5e092e5fdded4b95a9bf8c7047744d7fd6ec03dc53044a7261033deeec648a7d5530026580fc18ababdeb pypandoc-1.13.tar.gz " diff --git a/testing/py3-pypubsub/APKBUILD b/testing/py3-pypubsub/APKBUILD new file mode 100644 index 00000000000..a0fd9fc0964 --- /dev/null +++ b/testing/py3-pypubsub/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Oleg Titov <oleg.titov@gmail.com> +# Maintainer: Oleg Titov <oleg.titov@gmail.com> +pkgname=py3-pypubsub +pkgver=4.0.3 +pkgrel=0 +pkgdesc="A Python publish-subcribe library" +url="https://github.com/schollii/pypubsub" +arch="noarch" +license="BSD-2-Clause" +makedepends="py3-gpep517 py3-setuptools py3-wheel" +checkdepends="py3-pytest" +subpackages="$pkgname-doc $pkgname-pyc" +source="py3-pypubsub-$pkgver.tar.gz::https://github.com/schollii/pypubsub/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/pypubsub-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + + # otherwise unable to read local data files from tests/suite/ + cd tests/suite/ + ../../.testenv/bin/python3 -m pytest +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl + + install -Dm644 README.rst -t "$pkgdir"/usr/share/doc/$pkgname +} + +sha512sums=" +cf9aca44e91a5d0e5ecf6739deabf2980f9464395c89e3c5335c5248e47c570701e0534bb660c5005325a994d9f8e7f261f36bc8bea74cfc7eb760b73c572652 py3-pypubsub-4.0.3.tar.gz +" diff --git a/testing/py3-pyqrcode/APKBUILD b/testing/py3-pyqrcode/APKBUILD new file mode 100644 index 00000000000..61942195ed0 --- /dev/null +++ b/testing/py3-pyqrcode/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Oleg Titov <oleg.titov@gmail.com> +# Maintainer: Oleg Titov <oleg.titov@gmail.com> +pkgname=py3-pyqrcode +_gitcommit=674a77b5eaf850d063f518bd90c243ee34ad6b5d +pkgver=1.2.1 +pkgrel=0 +pkgdesc="Python 3 module to generate QR Codes" +url="https://github.com/mnooner256/pyqrcode/" +arch="noarch" +license="BSD-3-Clause" +makedepends="py3-gpep517 py3-setuptools py3-wheel" +checkdepends="py3-nose py3-pypng" +subpackages="$pkgname-doc $pkgname-pyc" +source="py3-pyqrcode-$pkgver.tar.gz::https://github.com/mnooner256/pyqrcode/archive/$_gitcommit.tar.gz" +builddir="$srcdir/pyqrcode-${_gitcommit}" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + nosetests -sv tests +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl + + install -Dm644 README.md -t "$pkgdir"/usr/share/doc/$pkgname +} + +sha512sums=" +87a307e57d470153b37cccd3e79c8e04fc8de63cc7ffce313a7cc7d7e7f53b2979125ac3680a4b261fe0eeffd476e7934fa189a679f9370d690113811cc750b8 py3-pyqrcode-1.2.1.tar.gz +" diff --git a/testing/py3-pytap2/APKBUILD b/testing/py3-pytap2/APKBUILD new file mode 100644 index 00000000000..0de41c3eac0 --- /dev/null +++ b/testing/py3-pytap2/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Oleg Titov <oleg.titov@gmail.com> +# Maintainer: Oleg Titov <oleg.titov@gmail.com> +pkgname=py3-pytap2 +pkgver=2.3.0 +pkgrel=0 +pkgdesc="Object oriented interface to Linux Tun/Tap devices" +url="https://github.com/johnthagen/pytap2/" +arch="noarch" +license="MIT" +depends="net-tools" +makedepends="py3-gpep517 py3-setuptools py3-wheel" +checkdepends="py3-pytest" +subpackages="$pkgname-doc $pkgname-pyc" +source="py3-pytap2-$pkgver.tar.gz::https://github.com/johnthagen/pytap2/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/pytap2-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl + + install -Dm644 README.rst -t "$pkgdir"/usr/share/doc/$pkgname +} + +sha512sums=" +3b5640f54b43b7350262bec09b744eca6f435564d1dc18d1228043eddf490ff4014689426e3015e3bd21890e66f274708aaabe9732bfb5deea8732c8e7f2e6d1 py3-pytap2-2.3.0.tar.gz +" diff --git a/testing/py3-pytest-mypy/APKBUILD b/testing/py3-pytest-mypy/APKBUILD index 3bfbbc6f45e..29ec60f4325 100644 --- a/testing/py3-pytest-mypy/APKBUILD +++ b/testing/py3-pytest-mypy/APKBUILD @@ -4,7 +4,8 @@ pkgver=0.10.3 pkgrel=2 pkgdesc="Pytest plugin for mypy" url="https://github.com/realpython/pytest-mypy" -arch="noarch" +# riscv64: tests fails +arch="noarch !riscv64" license="MIT" depends=" py3-attrs diff --git a/testing/py3-rst.linker/APKBUILD b/testing/py3-rst.linker/APKBUILD index 27a866c6665..a7ec8b05a24 100644 --- a/testing/py3-rst.linker/APKBUILD +++ b/testing/py3-rst.linker/APKBUILD @@ -1,20 +1,22 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-rst.linker -pkgver=2.4.0 -pkgrel=2 +pkgver=2.6.0 +pkgrel=0 pkgdesc="Tools for adding metadata and hyperlinks to reStructuredText" url="https://github.com/jaraco/rst.linker" arch="noarch" license="MIT" -depends="py3-dateutil py3-sphinx" +depends="py3-jaraco.context py3-jaraco.vcs" makedepends="py3-gpep517 py3-installer py3-setuptools_scm py3-wheel" -checkdepends="py3-path py3-pytest" +checkdepends="py3-path py3-pytest py3-pytest-subprocess" subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/r/rst.linker/rst.linker-$pkgver.tar.gz" +#source="https://files.pythonhosted.org/packages/source/r/rst.linker/rst_linker-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/jaraco/rst.linker/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir/rst.linker-$pkgver" build() { + export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver gpep517 build-wheel \ --wheel-dir .dist \ --output-fd 3 3>&1 >&2 @@ -32,5 +34,5 @@ package() { } sha512sums=" -31e3427ecf35b433cc9650138ee36090e99003b72c69b60b530835eb624d7eb13aae4cf81cc0044b36750798a4b8aa676e53e3b9eb335430076593640a243940 rst.linker-2.4.0.tar.gz +7f0996858e164a71ce99e543bc2b5d78ab4a7e238f298127e60409b71e3a90400960093358df5dc5598c6fdeb41fb87a7d6fe8575954098c259040067e382a56 py3-rst.linker-2.6.0.tar.gz " diff --git a/testing/py3-snapshottest/APKBUILD b/testing/py3-snapshottest/APKBUILD index 994327719b5..ab8ae36b0bd 100644 --- a/testing/py3-snapshottest/APKBUILD +++ b/testing/py3-snapshottest/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=py3-snapshottest pkgver=0.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="Snapshot testing for pytest, unittest, Django, and Nose" url="https://github.com/syrusakbary/snapshottest" arch="noarch" @@ -21,7 +21,9 @@ checkdepends=" py3-six " subpackages="$pkgname-pyc" -source="https://pypi.python.org/packages/source/s/snapshottest/snapshottest-$pkgver.tar.gz" +source="https://pypi.python.org/packages/source/s/snapshottest/snapshottest-$pkgver.tar.gz + importlib.patch + " builddir="$srcdir/snapshottest-$pkgver" build() { @@ -38,4 +40,5 @@ package() { sha512sums=" 0f39ec0b2255291d35bcc873b73b3802b427efd53b8d12ab373a76193dfe9d108534980f8081be38fadbf2392915e8e0d63547e5bf0479ea06d8d79cde4016ce snapshottest-0.6.0.tar.gz +2ee20d34f7db1a736401d0b217576dad1b308bb69b578a17123cfeab3e363c0cfc0348e321c2f299f01324997034230c61ed3eba6145da1f726f64474d5aa39a importlib.patch " diff --git a/testing/py3-snapshottest/importlib.patch b/testing/py3-snapshottest/importlib.patch new file mode 100644 index 00000000000..bf4d2572d82 --- /dev/null +++ b/testing/py3-snapshottest/importlib.patch @@ -0,0 +1,24 @@ +replace deprecated imp module + +diff --git a/snapshottest/module.py b/snapshottest/module.py +index 2f02c83..b0959ed 100644 +--- a/snapshottest/module.py ++++ b/snapshottest/module.py +@@ -1,7 +1,7 @@ + import codecs + import errno + import os +-import imp ++from importlib.machinery import SourceFileLoader + from collections import defaultdict + import logging + +@@ -29,7 +29,7 @@ class SnapshotModule(object): + + def load_snapshots(self): + try: +- source = imp.load_source(self.module, self.filepath) ++ source = SourceFileLoader(self.module, self.filepath).load_module() + # except FileNotFoundError: # Python 3 + except (IOError, OSError) as err: + if err.errno == errno.ENOENT: diff --git a/testing/py3-solidpython/APKBUILD b/testing/py3-solidpython/APKBUILD index bee98aec33e..7b29f25c6a3 100644 --- a/testing/py3-solidpython/APKBUILD +++ b/testing/py3-solidpython/APKBUILD @@ -4,7 +4,7 @@ pkgver=1.1.2 pkgrel=2 pkgdesc="Python library to generated OpenSCAD code" url="https://github.com/SolidCode/SolidPython" -arch="noarch !aarch64 !armv7 !armhf" # openscad +arch="noarch !aarch64 !armv7 !armhf !s390x !riscv64" # openscad license="LGPL-2.1-or-later" depends=" openscad diff --git a/testing/py3-sportydatagen/APKBUILD b/testing/py3-sportydatagen/APKBUILD deleted file mode 100644 index 7dd26123e0d..00000000000 --- a/testing/py3-sportydatagen/APKBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Contributor: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> -# Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> -pkgname=py3-sportydatagen -pkgver=0.2.2 -pkgrel=3 -pkgdesc="Generator of Endurance Sports Activity Collections (datasets)" -url="https://gitlab.com/firefly-cpp/sportydatagen" -arch="noarch !ppc64le !s390x !riscv64" # py3-sport-activities-features -license="MIT" -depends="python3 py3-niapy py3-numpy py3-pandas py3-scikit-learn py3-sport-activities-features" -makedepends="py3-poetry-core py3-gpep517" -checkdepends="py3-pytest" -subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://gitlab.com/firefly-cpp/sportydatagen/-/archive/$pkgver/sportydatagen-$pkgver.tar.gz" -builddir="$srcdir/sportydatagen-$pkgver" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -# problems with test collection | missing deps; use smoke tests now -check() { - PYTHONPATH=build/lib python3 -c "from sportydatagen import *" -} - - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/sportydatagen-$pkgver-py3-none-any.whl -} - -sha512sums=" -8ae9801bbcec2cab63b1e8600f28c0da74008cedbb38b98ba8d59b636265b0f93ab13514ffd778cd15abec71731e1aa9fd30aa88f5be3e513c8c4059a691291d py3-sportydatagen-0.2.2.tar.gz -" diff --git a/testing/py3-timeago/APKBUILD b/testing/py3-timeago/APKBUILD new file mode 100644 index 00000000000..7374b619c1b --- /dev/null +++ b/testing/py3-timeago/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Oleg Titov <oleg.titov@gmail.com> +# Maintainer: Oleg Titov <oleg.titov@gmail.com> +pkgname=py3-timeago +pkgver=1.0.16 +pkgrel=0 +pkgdesc="Python library, used to format datetime with *** time ago statement" +url="https://github.com/hustcc/timeago" +arch="noarch" +license="MIT" +makedepends="py3-gpep517 py3-setuptools py3-wheel" +checkdepends="py3-pytest" +subpackages="$pkgname-doc $pkgname-pyc" +source="py3-timeago-$pkgver.tar.gz::https://github.com/hustcc/timeago/archive/refs/tags/$pkgver.tar.gz" +builddir="$srcdir/timeago-$pkgver" + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest test/testcase.py +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl + + install -Dm644 README.md -t "$pkgdir"/usr/share/doc/$pkgname +} + +sha512sums=" +1106abe17cfb34324ee9194141598698abbe1c0ed36273d449fdc9047aa42e369845be0041bdffc4470f00602df20bf981de3ad16f10c22d65de4c0a41d65e73 py3-timeago-1.0.16.tar.gz +" diff --git a/testing/py3-unearth/APKBUILD b/testing/py3-unearth/APKBUILD index 802a9ee9f20..baca00f23e2 100644 --- a/testing/py3-unearth/APKBUILD +++ b/testing/py3-unearth/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-unearth -pkgver=0.15.1 -pkgrel=1 +pkgver=0.15.2 +pkgrel=0 pkgdesc="Utility to fetch and download python packages" url="https://github.com/frostming/unearth" arch="noarch" @@ -38,5 +38,5 @@ package() { } sha512sums=" -d4c4bd15c29ab7a172ded4db04dbc56187b5f3d5cf9c47433958240b5c475ee6708c16f7c606ae9998e0fe10e6570e02a57238d38a7cd83e6fc8e24b1aaa8180 py3-unearth-0.15.1.tar.gz +46d0ecb7831a4d19e0efe182b3c9af3074a960ebb1f388106649b58c3f9fc8d65a64ee86f31d72dae0f37a7a2b667c00dce4a3fcae7e186c88e3b57b2ca7a7bc py3-unearth-0.15.2.tar.gz " diff --git a/testing/py3-winacl/APKBUILD b/testing/py3-winacl/APKBUILD index 5b826f472cd..336e2cd8057 100644 --- a/testing/py3-winacl/APKBUILD +++ b/testing/py3-winacl/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jonas <3426-spameier@users.gitlab.alpinelinux.org> pkgname=py3-winacl _pyname=winacl -pkgver=0.1.8 -pkgrel=1 +pkgver=0.1.9 +pkgrel=0 pkgdesc="ACL/ACE/Security Descriptor manipulation library in pure Python" url="https://github.com/skelsec/winacl" arch="noarch" @@ -33,5 +33,5 @@ package() { } sha512sums=" -fd28579e1a524c0bdea28e5a3f12722513f9c0aa413e31dc4e54238c15f778fa769ab1e8992b028d265da6dadd512b7e56aa524d14d8a326b7927a4cf52786a1 py3-winacl-0.1.8.tar.gz +d7906d05c3b7a9bf07ea007a5f07427acf33b093cf1f30465c0c9a5ca4b7e65761dd405a59b756cab296edb84cdd318307b9620bb8d38dfca00145c84adfcafa py3-winacl-0.1.9.tar.gz " diff --git a/testing/py3-xsdata/APKBUILD b/testing/py3-xsdata/APKBUILD index 8fa5e91f2b1..ffb1c249e0d 100644 --- a/testing/py3-xsdata/APKBUILD +++ b/testing/py3-xsdata/APKBUILD @@ -1,13 +1,11 @@ # Contributor: Guy Godfroy <guy.godfroy@gugod.fr> # Maintainer: Guy Godfroy <guy.godfroy@gugod.fr> pkgname=py3-xsdata -pkgver=24.4 -pkgrel=1 +pkgver=24.5 +pkgrel=0 pkgdesc="Naive XML & JSON Bindings for python" url="https://github.com/tefra/xsdata" -arch="noarch !s390x" -# s390x: because of ruff -# see https://gitlab.alpinelinux.org/alpine/aports/-/issues/15642 +arch="noarch" license="MIT" depends=" py3-click @@ -52,6 +50,6 @@ package() { } sha512sums=" -6b346c40855662171747e1759bbe58880c668a3ee134eaef1dbe9b57c939a3813da10e5ccf68ec6923b097a1e518bcc7f19dfde27c79f7bc73530ccecdfee52e py3-xsdata-24.4.tar.gz -3140a89f223a57cafb3c8e331e937188c22abceee1c3492da08e59f7b9928f8fef74a7fa6c348766c41cfe852057beb68639c3c04af09c717569da00f0fb6ea8 typing.patch +554da863993042d1242beb8e69c7e1e2124453f7cefa10604677ab5027ccbdbe0d495edfed6967df931c5b73f7a9c3956de98b46f9e6f122dc25102ee01f8d48 py3-xsdata-24.5.tar.gz +b5f3740ef356e501652d1370b2ea527f69e4ce8624721e88bcdaeb98e665e00c585dcc9d2ba3da93ac80a90011a6ea451530fb87d9bcb5aa10303df9d078fde0 typing.patch " diff --git a/testing/py3-xsdata/typing.patch b/testing/py3-xsdata/typing.patch index a6579eefb17..879b08478f8 100644 --- a/testing/py3-xsdata/typing.patch +++ b/testing/py3-xsdata/typing.patch @@ -1,26 +1,46 @@ +diff --git a/xsdata/formats/dataclass/parsers/dict.py b/xsdata/formats/dataclass/parsers/dict.py +index 9e469cd..b6a6b58 100644 +--- a/xsdata/formats/dataclass/parsers/dict.py ++++ b/xsdata/formats/dataclass/parsers/dict.py +@@ -2,7 +2,7 @@ import warnings + from dataclasses import dataclass, field + from typing import Any, Dict, Iterable, List, Optional, Type, Union + +-from typing_extensions import get_args, get_origin ++from typing import get_args, get_origin + + from xsdata.exceptions import ConverterWarning, ParserError + from xsdata.formats.converter import converter diff --git a/xsdata/formats/dataclass/serializers/mixins.py b/xsdata/formats/dataclass/serializers/mixins.py -index 4ab8509..31f4643 100644 +index da3a0f4..9960f9e 100644 --- a/xsdata/formats/dataclass/serializers/mixins.py +++ b/xsdata/formats/dataclass/serializers/mixins.py -@@ -14,7 +14,7 @@ from typing import ( +@@ -18,7 +18,7 @@ from typing import ( from xml.etree.ElementTree import QName from xml.sax.handler import ContentHandler -from typing_extensions import TypeAlias +from typing import TypeAlias - from xsdata.exceptions import XmlWriterError + from xsdata.exceptions import SerializerError, XmlWriterError from xsdata.formats.converter import converter diff --git a/xsdata/formats/dataclass/typing.py b/xsdata/formats/dataclass/typing.py -index a375346..defaf1b 100644 +index 542aaf1..ce57e29 100644 --- a/xsdata/formats/dataclass/typing.py +++ b/xsdata/formats/dataclass/typing.py -@@ -1,7 +1,7 @@ - import sys - from typing import Any, Iterator, Tuple, Type, TypeVar, Union +@@ -9,13 +9,13 @@ from typing import ( + Union, + ) -from typing_extensions import get_args, get_origin +from typing import get_args, get_origin - NONE_TYPE = type(None) + try: + from types import UnionType # type: ignore + except ImportError: + UnionType = () # type: ignore +-from typing_extensions import ForwardRef ++from typing import ForwardRef + if (3, 9) <= sys.version_info[:2] <= (3, 10): + # Backport this fix for python 3.9 and 3.10 diff --git a/testing/pyradio/APKBUILD b/testing/pyradio/APKBUILD index a75c5e03743..8a088cf8f4f 100644 --- a/testing/pyradio/APKBUILD +++ b/testing/pyradio/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=pyradio -pkgver=0.9.2.25 -pkgrel=1 +pkgver=0.9.3.4 +pkgrel=0 pkgdesc="Curses based internet radio player" url="https://www.coderholic.com/pyradio" arch="noarch" @@ -48,5 +48,5 @@ package() { } sha512sums=" -103c89754310a04d952ab962d5bef92e057de65f84394b3f040804fae2ae848a91b6fd3f5bfdfcc587ae495e569efe36ee2179d5f4d5ea03989480c55b7b599b pyradio-0.9.2.25.tar.gz +1dee6c72f8f6d5986b6f71cc7f9b085a9c98843a413463e8852bfc83de79824fe7b0add9c070914055ae82fae5d8395b4cc03e90c8361f09d58246a5ee34963b pyradio-0.9.3.4.tar.gz " diff --git a/testing/qgis/APKBUILD b/testing/qgis/APKBUILD index 970d36bc9eb..e42ab2d5323 100644 --- a/testing/qgis/APKBUILD +++ b/testing/qgis/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=qgis pkgver=3.28.12 -pkgrel=3 +pkgrel=5 pkgdesc="Geographic Information System (GIS) that supports vector, raster & database formats" url="https://qgis.org/" # armhf: py3-qscintilla qt5-qt3d-dev qt5-qtlocation-dev missing -# ppc64le and riscv64: qt5-qtwebengine-dev missing +# ppc64le, riscv64 and loongarch64: qt5-qtwebengine-dev missing # s390x: grass-gis-dev netcdf-dev qt5-qtwebengine-dev missing -arch="all !armhf !ppc64le !riscv64 !s390x" +arch="all !armhf !ppc64le !riscv64 !s390x !loongarch64" license="GPL-2.0-or-later" depends="font-opensans font-cantarell qt5-qtbase-sqlite postgresql-client" makedepends=" diff --git a/testing/qt-creator/APKBUILD b/testing/qt-creator/APKBUILD index e2bbbb0b5b1..e0a3693127a 100644 --- a/testing/qt-creator/APKBUILD +++ b/testing/qt-creator/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Alexey Minnekhanov <alexeymin@postmarketos.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt-creator -pkgver=13.0.0 +pkgver=13.0.1 pkgrel=0 pkgdesc="Lightweight and cross-platform C++ IDE" url="https://qt-project.org/wiki/Category:Tools::QtCreator" @@ -75,7 +75,7 @@ package() { } sha512sums=" -26fea156becc136fb55702a65c29dad825fd3fa60d8e19d8d142ab6518dc8e40fbddfe70d79d2b71f14f76c8a1d9bca34fb65e565702e67c9276aec9758bf345 qt-creator-opensource-src-13.0.0.tar.xz +8af971d86a958b6a04da0bec78f5706d8ecf8c14621a5f9c83b415409288a0eccfecc237534288414cea5e620758d8daa104620c42fcaac718e9713e8c29afa4 qt-creator-opensource-src-13.0.1.tar.xz 43d73c9cd272ee849a5d85490d351c71b786d7ce6b5b46c6ec13642329c14bacc84a122f0bfbb445841aedef8d1cc9fe2485c0c8db24080b5a9dd4380e36c58d fix-execinfo.patch efb137318e7005beb4c01cb27dcfc49d63b5c6faa66b0a6d6989bb6533ca94875e34880c482ce36f699dadf920b55a3de43eeed4fa5cf98d1b56405ee2ff0aa5 fix-malloc-trim.patch " diff --git a/testing/qt-jdenticon/APKBUILD b/testing/qt-jdenticon/APKBUILD new file mode 100644 index 00000000000..e39e37f5775 --- /dev/null +++ b/testing/qt-jdenticon/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Matthias Ahouansou <matthias@ahouansou.cz> +# Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> +pkgname=qt-jdenticon +pkgver=0.3.0 +pkgrel=0 +pkgdesc="Qt5 / C++14 Port of Jdenticon" +url="https://github.com/Nheko-Reborn/qt-jdenticon" +arch="all" +license="MIT" +makedepends="qt5-qtbase-dev" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/Nheko-Reborn/qt-jdenticon/archive/refs/tags/v$pkgver.tar.gz" +options="!check" # no tests + +build() { + qmake + make +} + +package() { + make INSTALL_ROOT="$pkgdir" install + + install -Dm 644 LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE +} + +sha512sums=" +a3477ce8fd26de563c1397a07895dcd0ec8210c62fe82e808a8c322c298111c48570ce23df639d648d86a0627b455dc7d1772e985197351251d49abd461b8c23 qt-jdenticon-0.3.0.tar.gz +" diff --git a/testing/radarr/0002-bump-npgsql.patch b/testing/radarr/0002-bump-npgsql.patch new file mode 100644 index 00000000000..e4873378fe4 --- /dev/null +++ b/testing/radarr/0002-bump-npgsql.patch @@ -0,0 +1,34 @@ +It got merged after the release, needs patch until next release. +Fixes CVE-2024-32655 + +--- + src/NzbDrone.Common/Radarr.Common.csproj | 2 +- + src/NzbDrone.Core/Radarr.Core.csproj | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/NzbDrone.Common/Radarr.Common.csproj b/src/NzbDrone.Common/Radarr.Common.csproj +index f6c13069efd..4764b2d0755 100644 +--- a/src/NzbDrone.Common/Radarr.Common.csproj ++++ b/src/NzbDrone.Common/Radarr.Common.csproj +@@ -10,7 +10,7 @@ + <PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> + <PackageReference Include="NLog" Version="5.2.3" /> + <PackageReference Include="NLog.Extensions.Logging" Version="5.3.3" /> +- <PackageReference Include="Npgsql" Version="7.0.6" /> ++ <PackageReference Include="Npgsql" Version="7.0.7" /> + <PackageReference Include="Sentry" Version="4.0.2" /> + <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" /> + <PackageReference Include="SharpZipLib" Version="1.3.3" /> +diff --git a/src/NzbDrone.Core/Radarr.Core.csproj b/src/NzbDrone.Core/Radarr.Core.csproj +index b44d8e69ac4..04f777055fc 100644 +--- a/src/NzbDrone.Core/Radarr.Core.csproj ++++ b/src/NzbDrone.Core/Radarr.Core.csproj +@@ -7,7 +7,7 @@ + <PackageReference Include="Diacritical.Net" Version="1.0.4" /> + <PackageReference Include="Equ" Version="2.3.0" /> + <PackageReference Include="MailKit" Version="3.6.0" /> +- <PackageReference Include="Npgsql" Version="7.0.6" /> ++ <PackageReference Include="Npgsql" Version="7.0.7" /> + <PackageReference Include="Polly" Version="8.3.1" /> + <PackageReference Include="Servarr.FFMpegCore" Version="4.7.0-26" /> + <PackageReference Include="Servarr.FFprobe" Version="5.1.4.112" /> diff --git a/testing/radarr/APKBUILD b/testing/radarr/APKBUILD index bc6e8d9cfbc..ed8bbeb9eb0 100644 --- a/testing/radarr/APKBUILD +++ b/testing/radarr/APKBUILD @@ -1,26 +1,21 @@ # Contributor: Fabricio Silva <hi@fabricio.dev> # Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=radarr -pkgver=5.4.6.8723 +pkgver=5.5.3.8819 pkgrel=0 pkgdesc="Movie download automation for usenet and torrents." url="https://github.com/Radarr/Radarr" -arch="x86_64 aarch64 armv7" +arch="x86_64 aarch64 armv7" # limited by dotnet license="GPL-3.0-only" -options="net !check" # no tests -depends=" - aspnetcore6-runtime - sqlite-libs - " -makedepends=" - dotnet6-sdk - yarn - " +options="net" # net for nuget +depends="aspnetcore6-runtime sqlite-libs" +makedepends="dotnet6-sdk yarn" subpackages="$pkgname-openrc" install="$pkgname.pre-install" source=" $pkgname-$pkgver.tar.gz::https://github.com/Radarr/Radarr/archive/refs/tags/v$pkgver.tar.gz 0001-disable-restart.patch + 0002-bump-npgsql.patch radarr.initd radarr.confd package_info @@ -29,6 +24,10 @@ builddir="$srcdir/Radarr-$pkgver" pkgusers="radarr" pkggroups="radarr" +# secfixes: +# 5.5.3.8819-r0: +# - CVE-2024-32655 + # map arch to dotnet case $CARCH in x86_64) _dotnet_arch="x64" ;; @@ -78,6 +77,20 @@ build() { mv "$_output"/UI "$_artifacts" } +check() { + local _files="Radarr.Api.Test.dll Radarr.Common.Test.dll \ + Radarr.Core.Test.dll Radarr.Host.Test.dll Radarr.Libraries.Test.dll" + local _filters="Category!=ManualTest&Category!=WINDOWS&Category!=IntegrationTest&Category!=AutomationTest" + + # skipping: + # DiskTransferServiceFixture: CI fails due disk permission + _filters="$_filters&FullyQualifiedName!~DiskTransferServiceFixture" + + cd _tests/$_framework/$_runtime + mkdir -p ~/.config/Radarr + dotnet test --filter "$_filters" $_files +} + package() { local destdir="$pkgdir"/usr/lib/radarr @@ -93,8 +106,9 @@ package() { } sha512sums=" -c67d4dfb318ff7d5b837684775f1301cc8232cc1fc82d741e91a2e33ce2cf7c68e51dc1c060d39d1773d99a7d48f2d3fec51837fd963171f540fb9d2edee9563 radarr-5.4.6.8723.tar.gz +9e03c8c0bed20fba932ac87aa516237a1da0f8b3b29d449b6ddce40f10db0cc9055ad9130f922be7e071eb0830ab0678ec5fc298918bc3fd073a3f4f1e93575a radarr-5.5.3.8819.tar.gz 753520379a6c5f2899b4ddfd820d5573598a32cb105f74c6fd978a3f2c98895cf709ef2d9afe2bae8c4856da86cb6a1364f5713ea7ef6a36bb21b5a5840c1471 0001-disable-restart.patch +c728f59cf09a4b5409ffb75eef33fac0a492f6c5f0c539a2e4e9121c8d4bb824a3040f435ee31fe6791553a95acaccdd2f3fe6f3963bb0627451daa1f9abe3cc 0002-bump-npgsql.patch fc61194f8cf6d87cb8ec13db39e7d953bdcd2fae0fdf47ebe7701e52bfad5a92313f76a7bdbb04608170dbaec0e5895788079d284f988fd99fe19f7e61f2e836 radarr.initd 7f30d17b9a66b34786ff9f62954eda1677296fc724dde9e2b4f1edb6f19bce8b3df5806d661e48751bd4ebdf6faecd9632d89c1fb35d41ad01ea892fdad71ded radarr.confd 67c4dd1cf8259296d994c350dfd3962d23333071889ce0b4ef6b2f4cbb4349490c5dbe4dcc202c99bab7a5c4b7611be56d7c8835b2b13924526c45311db1c3fb package_info diff --git a/testing/diebahn/APKBUILD b/testing/railway/APKBUILD index 3f9a83b4675..c76e6efc628 100644 --- a/testing/diebahn/APKBUILD +++ b/testing/railway/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Usia Bechtle <usia@bechtlebox.de> -# Maintainer: Usia Bechtle <usia@bechtlebox.de> -pkgname=diebahn -pkgver=2.0.0 +# Maintainer: jane400 <alpine@j4ne.de> +pkgname=railway +pkgver=2.5.0 pkgrel=0 -pkgdesc="GTK4 frontend for the travel information of the german railway" +pkgdesc="Railway lets you look up travel information for many different railways" url="https://gitlab.com/schmiddi-on-mobile/railway" # s390x, ppc64le, riscv64: rust-ring arch="all !s390x !ppc64le !riscv64" @@ -16,10 +16,12 @@ makedepends=" libglibutil-dev meson " -source="$pkgname-$pkgver.tar.gz::https://gitlab.com/schmiddi-on-mobile/railway/-/archive/$pkgver/railway-$pkgver.tar.gz" subpackages="$pkgname-lang" +source="https://gitlab.com/schmiddi-on-mobile/railway/-/archive/$pkgver/railway-$pkgver.tar.gz" options="!check" # no tests -builddir="$srcdir/railway-$pkgver" + +provides="diebahn=$pkgver-r$pkgrel" +replaces="diebahn" prepare() { default_prepare @@ -35,8 +37,11 @@ build() { package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output + + cd "$pkgdir"/usr/bin + ln -sv diebahn railway } sha512sums=" -227650042752567bedcbef3eee1cb29dbb23b162f38934d3c51cfd2ff75ae58dbc7d3365083732b46013ba1b2d71c3f2be5d49cb7b2d96b66b6e405104516618 diebahn-2.0.0.tar.gz +6e5760fbab354795f6ddd9b5de65ba7207afb8c7c5004797443b5850364b012837192a1282166089d58d177eb7ba98aaefc869e43352e988a672c8463dc02f11 railway-2.5.0.tar.gz " diff --git a/testing/rancher-cli/APKBUILD b/testing/rancher-cli/APKBUILD deleted file mode 100644 index 20f6671781d..00000000000 --- a/testing/rancher-cli/APKBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> -pkgname=rancher-cli -pkgver=2.8.0 -pkgrel=2 -pkgdesc="The Rancher CLI" -url="https://www.rancher.com/" -arch="all" -license="Apache-2.0" -makedepends="go" -source="$pkgname-$pkgver.tar.gz::https://github.com/rancher/cli/archive/refs/tags/v$pkgver.tar.gz" -builddir="$srcdir/cli-$pkgver" - -export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" -export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" -export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" - -build() { - go build -v -o bin/rancher -ldflags "-X main.VERSION=v$pkgver" -} - -check() { - go test ./... -} - -package() { - install -Dm755 bin/rancher -t "$pkgdir"/usr/bin -} - -sha512sums=" -9a2c3c4c7a2a8210a30414e2efdf25fcc0e55ffea2ecdd07d7427deab8d3aaf2eb2b3560b7cb8bc14ad678ac73dd98230ca40024d58e757de5f2e40becd4d28c rancher-cli-2.8.0.tar.gz -" diff --git a/testing/rattler-build/APKBUILD b/testing/rattler-build/APKBUILD index b72e9b891a4..0271658d4e1 100644 --- a/testing/rattler-build/APKBUILD +++ b/testing/rattler-build/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Orhun Parmaksız <orhunparmaksiz@gmail.com> # Maintainer: Orhun Parmaksız <orhunparmaksiz@gmail.com> pkgname=rattler-build -pkgver=0.14.2 +pkgver=0.16.0 pkgrel=0 pkgdesc="A fast conda-package builder" url="https://github.com/prefix-dev/rattler-build" @@ -57,5 +57,5 @@ package() { } sha512sums=" -5e6b023fd1ea8a6b4f3b2858b4a24fe9c60ba1b36e8cced5bd4990db13a69461cf4822a02acff73d4ac1381575db2d22c1128ac1f62a00befa57a170a0bc7891 rattler-build-0.14.2.tar.gz +925dc67954aa6cedda9bc4c7a04e4cebd7749a25224dc80ec911db327e22ee5ac8430f7c1ab064413ccccd34bc313c76a85802de2d3c700297474c9499b83687 rattler-build-0.16.0.tar.gz " diff --git a/testing/rbw/APKBUILD b/testing/rbw/APKBUILD index fd888eea90f..d7057a2cfd1 100644 --- a/testing/rbw/APKBUILD +++ b/testing/rbw/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: crapStone <crapstone01@gmail.com> pkgname=rbw -pkgver=1.9.0 +pkgver=1.10.0 pkgrel=0 pkgdesc="Unofficial command line client for Bitwarden." url="https://git.tozt.net/rbw" @@ -47,5 +47,5 @@ package() { } sha512sums=" -1ebe9837574b51e32c645b26c0c47f11fbcf1893adf76ada7b56e3d0b18271594f6047ba5f9acf9aa4d4ff970ad999b42febb070ec687766c035cc5a39748f8b rbw-1.9.0.tar.gz +83e45f32323445fbcb4196120179771d31cf71065f3a1ab921d0dcf194d33a3bd57a149869a467c7120024c4745f837488662f52e0311c2fb43782b2d6c7d92b rbw-1.10.0.tar.gz " diff --git a/testing/reason/APKBUILD b/testing/reason/APKBUILD index 4759f994763..8c0c9164f2f 100644 --- a/testing/reason/APKBUILD +++ b/testing/reason/APKBUILD @@ -5,7 +5,7 @@ pkgver=3.8.2 pkgrel=1 pkgdesc="Simple, fast & type safe code that leverages the JavaScript & OCaml ecosystems" url="https://reasonml.github.io/" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="MIT" checkdepends="nodejs utop-full" makedepends=" diff --git a/testing/refind/APKBUILD b/testing/refind/APKBUILD index 166cb478c24..dc7cc18d468 100644 --- a/testing/refind/APKBUILD +++ b/testing/refind/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Eric Molitor <eric@molitor.org> pkgname=refind -pkgver=0.14.0.2 -pkgrel=2 +pkgver=0.14.2 +pkgrel=0 pkgdesc="rEFInd EFI Boot Manager" url="https://www.rodsbooks.com/refind" arch="x86_64" @@ -42,7 +42,7 @@ package() { cp -r icons $pkgdir/usr/share/refind } sha512sums=" -41c120c1afec37c508aa5c0ec09a6563c3047ef84932308c91701795b950431dfad17d25cf664039b490a302d475add98441b75f90ff71cadce41febedc68a9e refind-src-0.14.0.2.tar.gz +76a52ed422ab3d431e6530fae4d13a51e8ed100568d4290207aaee87a84700b077bb79c4f4917027f5286de422954e1872fca288252ec756072d6c075b102e1e refind-src-0.14.2.tar.gz cb466feb8b8b1a3c039224866df7e8f4c575cf2c81a1520449e38a6fc5f5b9cfd924944f97780c68addaab7b943dced4ed9c5e668d91e85d6ea49bcd9359e19c 01-missing-always-inline.patch ccb61e6e5ae0d762932941d7edd5b9a3506db42cfce70ebc57468837799e60fee73b3c568ae603a6ebb677ae702fb5beb5d13b16daf976b954b35047b6f4ecc0 10-refind-disable-fortify.patch " diff --git a/testing/regal/APKBUILD b/testing/regal/APKBUILD index f4782d72b9c..d2e745fa2b2 100644 --- a/testing/regal/APKBUILD +++ b/testing/regal/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=regal -pkgver=0.19.0 -pkgrel=1 +pkgver=0.21.3 +pkgrel=0 pkgdesc="Linter for Rego files" url="https://docs.styra.com/regal" # riscv64: TestLanguageServerMultipleFiles test times out @@ -51,5 +51,5 @@ package() { } sha512sums=" -702a7f46708e3708f8fbc9529282f19eb4dfb2f14cc5425da273436da4abb1caac071e041b16832b1b1b670a53687cd80280cf8445a1952c394009b43e6b065b regal-0.19.0.tar.gz +766a723060074c26d19402e0e1ee17f25619a22d9eec50444a1eeaa02308c3e6dee4657e665c0e0122641f54c4cea422e9153ec0d741ef974f82320cd714be04 regal-0.21.3.tar.gz " diff --git a/testing/release-plz/APKBUILD b/testing/release-plz/APKBUILD index 4e1f3ccc526..5ce806ca9a0 100644 --- a/testing/release-plz/APKBUILD +++ b/testing/release-plz/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Orhun Parmaksız <orhunparmaksiz@gmail.com> pkgname=release-plz -pkgver=0.3.60 +pkgver=0.3.67 pkgrel=0 pkgdesc="Release Rust packages without using the command line" url="https://github.com/MarcoIeni/release-plz" @@ -51,5 +51,5 @@ package() { } sha512sums=" -3e177bdead19bef4a20d028b60d0ff13305d798a9eb94a835ef92ab17ef6057ac558fc921d6d13b7a3bf4ecc10dfcba4dcd2a0b1fbf2723a95ebd48502bc0d03 release-plz-v0.3.60.tar.gz +4a00e732582c45d299dc8de9d3dfebbf6aeb10b2a5135f3803850d80fe20378544517e48b7aabdf816270723d9c3cd51b3af64dfc28172f52f1458afe30a265b release-plz-v0.3.67.tar.gz " diff --git a/testing/repowerd/APKBUILD b/testing/repowerd/APKBUILD index 614d2a531db..de43cd5855c 100644 --- a/testing/repowerd/APKBUILD +++ b/testing/repowerd/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Brandon Boese <brandonboese@protonmail.com> pkgname=repowerd pkgver=2023.07 -pkgrel=0 +pkgrel=1 pkgdesc="Power daemon to monitor and control system power state" url="https://gitlab.com/ubports/development/core/repowerd" arch="all !s390x" # blocked by libgbinder @@ -50,6 +50,6 @@ package() { sha512sums=" 2cbf879956e049c6c197516c23e43bfeafee13f0e354dbf0032f7a9b97bf849255d5dd204f4178759837fd06601fc9ebbdf3a409af3d79da1fe8b3a9c77bb059 repowerd-2023.07.tar.gz -d8c4dd351a7bf2bcc66b0eb8b0d17d602661f7defb857be5a28f694e4977b634b7d101f738058ce0ccaa313c4e316f7222c753610500ddbd68f8e42de7c57f29 repowerd.initd +8a2bf0b131ddec8eebe6566477f43b5b1c6331fecab0a156042bceacce660a0fde70a6f515c6d7fb6f0566d49ce29cd680356c2fdeae4f682a820a5e8622e1ed repowerd.initd f6212991bd4ea6704a74f71615fa5d0b9b738144c2448f03d90a0d2c6dd320e17c3c070add7f7877ca3f6f4c2526d44dd5277f8cefbd05ad08d99204c61d6766 0001-dbus-Remove-at_console-filtering.patch " diff --git a/testing/repowerd/repowerd.initd b/testing/repowerd/repowerd.initd index dc05a497326..3a6fffef162 100644 --- a/testing/repowerd/repowerd.initd +++ b/testing/repowerd/repowerd.initd @@ -7,6 +7,6 @@ command=/usr/sbin/repowerd command_background=true pidfile="/run/${RC_SVCNAME}.pid" -depends() { +depend() { need udev } diff --git a/testing/reprotest/APKBUILD b/testing/reprotest/APKBUILD index 14e1e0df1f0..af1ca8eaeea 100644 --- a/testing/reprotest/APKBUILD +++ b/testing/reprotest/APKBUILD @@ -1,9 +1,10 @@ # Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch> -# Maintainer: +# Contributor: fossdd <fossdd@pwned.life> +# Maintainer: fossdd <fossdd@pwned.life> pkgname=reprotest _pyname=reprotest -pkgver=0.7.26 -pkgrel=2 +pkgver=0.7.27 +pkgrel=0 pkgdesc="Build packages and check them for reproducibility" url="https://salsa.debian.org/reproducible-builds/reprotest" arch="noarch !armv7 !x86 !armhf" # diffoscope @@ -37,5 +38,5 @@ package() { } sha512sums=" -f66d99253c38867918a88893ad553b72cf394c2da71823cebbdeab2d0038ab5d82d55838edc1e4534f80d1e534235b6d3ff945ad3dc21aff9059a0ff54a84aae reprotest-0.7.26.tar.gz +5dfbaaffeaf40c56355a61509590c134921e6697e05c25b1436239f42a522ea17c34076600d3ff69b5eae4b6b9578d4e2b79bb5e88e65d2f1e4641adbb842e79 reprotest-0.7.27.tar.gz " diff --git a/testing/restinio/APKBUILD b/testing/restinio/APKBUILD index 33533e4999d..caca7886923 100644 --- a/testing/restinio/APKBUILD +++ b/testing/restinio/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Anjandev Momi <anjan@momi.ca> pkgname=restinio pkgver=0.6.17 -pkgrel=5 +pkgrel=6 pkgdesc="Header-only C++14 library that gives you an embedded HTTP/Websocket server" url="https://stiffstream.com/en/products/restinio.html" arch="noarch" diff --git a/testing/rime-ls/APKBUILD b/testing/rime-ls/APKBUILD new file mode 100644 index 00000000000..21f58bba7bb --- /dev/null +++ b/testing/rime-ls/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=rime-ls +pkgver=0.3.0 +pkgrel=0 +pkgdesc="Language server for Rime input method engine" +url="https://github.com/wlh320/rime-ls" +arch="all" +license="BSD-3-Clause" +_llvmver=17 # keep in sync with main/rust +makedepends=" + cargo + cargo-auditable + clang$_llvmver-libclang + librime-dev + " +checkdepends="rime-plum-data" +source="https://github.com/wlh320/rime-ls/archive/v$pkgver/rime-ls-$pkgver.tar.gz + Cargo.lock + " + +prepare() { + default_prepare + + cp -v "$srcdir"/Cargo.lock . + + cargo fetch --target="$CTARGET" --locked +} + +build() { + cargo auditable build --frozen --release +} + +check() { + cargo test --frozen +} + +package() { + install -Dvm755 target/release/rime_ls \ + -t "$pkgdir"/usr/bin/ +} + +sha512sums=" +0769fe803715c67c025c301a4152b97165995f667f918759f152776879aa85d4f0ed967dbc5abe5cdb11bd177abb9a9a54ba4c38964d50b6589450a28e2c237e rime-ls-0.3.0.tar.gz +802d9106cba3dc2b832ca64883dfe4e8b4b9c83c9a53010a8297e2bd54f0171d512c4907c142128f1ed84103aaac25ecf955ebfcefcf3f84abcaa9156992a6e5 Cargo.lock +" diff --git a/testing/rime-ls/Cargo.lock b/testing/rime-ls/Cargo.lock new file mode 100644 index 00000000000..bf8f67f70e1 --- /dev/null +++ b/testing/rime-ls/Cargo.lock @@ -0,0 +1,1226 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "auto_impl" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.5.0", + "cexpr", + "clang-sys", + "itertools", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "cc" +version = "1.0.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clang-sys" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "either" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" + +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.5", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[package]] +name = "librime-sys" +version = "0.1.0" +source = "git+https://github.com/lotem/librime-sys#0c51d64eadb2e9cfa5b997ef58e79c63fac9c05a" +dependencies = [ + "bindgen", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lsp-types" +version = "0.94.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" +dependencies = [ + "bitflags 1.3.2", + "serde", + "serde_json", + "serde_repr", + "url", +] + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ouroboros" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33" +dependencies = [ + "heck", + "itertools", + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.5", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "version_check", + "yansi", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "rime_ls" +version = "0.3.0" +dependencies = [ + "dashmap", + "directories", + "librime-sys", + "once_cell", + "ouroboros", + "regex", + "ropey", + "serde", + "serde_json", + "thiserror", + "tokio", + "tower-lsp", +] + +[[package]] +name = "ropey" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5" +dependencies = [ + "smallvec", + "str_indices", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "serde" +version = "1.0.201" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.201" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.117" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "str_indices" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9557cb6521e8d009c51a8666f09356f4b817ba9ba0981a305bd86aee47bd35c" + +[[package]] +name = "syn" +version = "2.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "thiserror" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-lsp" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508" +dependencies = [ + "async-trait", + "auto_impl", + "bytes", + "dashmap", + "futures", + "httparse", + "lsp-types", + "memchr", + "serde", + "serde_json", + "tokio", + "tokio-util", + "tower", + "tower-lsp-macros", + "tracing", +] + +[[package]] +name = "tower-lsp-macros" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" diff --git a/testing/ripdrag/APKBUILD b/testing/ripdrag/APKBUILD index 2de2e5f9d5a..761a683c2a0 100644 --- a/testing/ripdrag/APKBUILD +++ b/testing/ripdrag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=ripdrag -pkgver=0.4.7 +pkgver=0.4.8 pkgrel=0 pkgdesc="Drag and Drop utilty written in Rust and GTK4" url="https://github.com/nik012003/ripdrag" @@ -31,5 +31,5 @@ package() { } sha512sums=" -70dd2edcd498798aa9095516992e7cc8f3b3df56ae504bd116e54579a7dbc825e4b3194babe73e5d359902cf993b39379c82ba56645a490ee9584978955d0756 ripdrag-0.4.7.tar.gz +25d2594aef94d9d87dad0ece9b73522612d9c34db48db451d5229d639d9187d1d068c940377487c3b95cd200ca10b62b38ffe1d012d7d8fc5c2e04dff3972c1a ripdrag-0.4.8.tar.gz " diff --git a/testing/rss-email/APKBUILD b/testing/rss-email/APKBUILD index c7a11a7507e..ad9c374172c 100644 --- a/testing/rss-email/APKBUILD +++ b/testing/rss-email/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Hugo Osvaldo Barrera <hugo@whynothugo.nl> pkgname=rss-email pkgdesc="Send RSS/Atom posts as email" -pkgver=0.4.5 +pkgver=0.5.0 pkgrel=0 url="https://git.sr.ht/~witcher/rss-email" # ppc64le, s390x, riscv64: rust-ring @@ -42,5 +42,5 @@ package() { sha512sums=" -e12715288789240a81ac48d6e81dca63ebb4ca08ff82ea16e49a785e1c673c08e3da18635df94fc4f2165e68a0323454d627a172ed4ae1a1ef1735186a3f9e17 rss-email-0.4.5.tar.gz +6560ba4bad5bd4f81ebcbd507bc87024d4c26966018e5e33c4e189560377bab61daa7be02c61ddf05bd0bedce6b16d9eb8de0f733ddfe821e28325933d997702 rss-email-0.5.0.tar.gz " diff --git a/testing/rtl-power-fftw/APKBUILD b/testing/rtl-power-fftw/APKBUILD index 5f2b4e54494..bf05aa929d2 100644 --- a/testing/rtl-power-fftw/APKBUILD +++ b/testing/rtl-power-fftw/APKBUILD @@ -3,7 +3,7 @@ pkgname=rtl-power-fftw pkgver=20200601 _commit="cee9a22207ea995bd12adbc6bcfbec92521548b1" -pkgrel=3 +pkgrel=4 pkgdesc="A program that obtains a power spectrum from RTL devices using FFTW" url="https://github.com/AD-Vega/rtl-power-fftw" arch="all" diff --git a/testing/ruby-build/APKBUILD b/testing/ruby-build/APKBUILD index 51ef784fbc2..c6e5dc0aa9a 100644 --- a/testing/ruby-build/APKBUILD +++ b/testing/ruby-build/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Thomas Kienlen <kommander@laposte.net> # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=ruby-build -pkgver=20240319 +pkgver=20240423 pkgrel=0 pkgdesc="Compile and install Ruby" url="https://github.com/rbenv/ruby-build" @@ -44,5 +44,5 @@ runtime() { } sha512sums=" -f6f02de61677fcb5146aadd5970c90a0fdad7519a714feb7ad06e5f76c78055a91d4a3c14e1ba8ddc47968ace271842090e02ea4b6f09b32691040fc385403d5 ruby-build-20240319.tar.gz +f476bdbc3f800944ca5af1b0b4259f7551ca4d21e773cea0608688099a4d2a976b7713d61ecbad8b84577d4a90b63083a9e185d9a3b7348ff06615c4da84b429 ruby-build-20240423.tar.gz " diff --git a/testing/rustscan/APKBUILD b/testing/rustscan/APKBUILD index c6a8d30da9b..69a9aa60348 100644 --- a/testing/rustscan/APKBUILD +++ b/testing/rustscan/APKBUILD @@ -1,8 +1,8 @@ # Contributor: guddaff <guddaff@protonmail.com> # Maintainer: guddaff <guddaff@protonmail.com> pkgname=rustscan -pkgver=2.1.1 -pkgrel=1 +pkgver=2.2.3 +pkgrel=0 pkgdesc="Modern Port Scanner" url="https://github.com/RustScan/RustScan" license="GPL-3.0-or-later" @@ -11,9 +11,7 @@ license="GPL-3.0-or-later" arch="all !ppc64le !armhf !s390x !riscv64" makedepends="cargo cargo-auditable" checkdepends="bash perl python3" -source="https://github.com/RustScan/RustScan/archive/$pkgver/rustscan-$pkgver.tar.gz - Cargo.lock.patch - " +source="https://github.com/RustScan/RustScan/archive/$pkgver/rustscan-$pkgver.tar.gz" options="net" builddir="$srcdir/RustScan-$pkgver" @@ -37,6 +35,5 @@ package() { } sha512sums=" -b435e03575cb6b9989615574beed537a47a92a17566df9cb678d8ea1d8aeaf651c4b1e1700b72af5c78a00921e99df59d0f4bfc34e698a8066cabcf42a4c867d rustscan-2.1.1.tar.gz -8733e358eb6c3a0f2e155f6f779331c5f074eb0d83c55eb49caf4e579946dde7c27f941da8f28824b2f522fadf3ff47255d0e7a68b1904a49336b63405e5f31d Cargo.lock.patch +12a32c689aae378c4328164da4bdcc1fff8a9b0b6958ec40ffa9477a4281c58f39646359f6b6022c8b86e2240d65c24c39cb22d97f2ad1bd015757bf6c8d3407 rustscan-2.2.3.tar.gz " diff --git a/testing/rustscan/Cargo.lock.patch b/testing/rustscan/Cargo.lock.patch deleted file mode 100644 index fc344f627e7..00000000000 --- a/testing/rustscan/Cargo.lock.patch +++ /dev/null @@ -1,1159 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index f8ce9c2..2381061 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - - [[package]] - name = "aho-corasick" --version = "0.7.18" -+version = "0.7.20" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" - dependencies = [ - "memchr", - ] -@@ -37,15 +37,15 @@ dependencies = [ - - [[package]] - name = "anyhow" --version = "1.0.56" -+version = "1.0.66" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" -+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" - - [[package]] - name = "async-channel" --version = "1.6.1" -+version = "1.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" -+checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" - dependencies = [ - "concurrent-queue", - "event-listener", -@@ -54,76 +54,68 @@ dependencies = [ - - [[package]] - name = "async-executor" --version = "1.4.1" -+version = "1.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" -+checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" - dependencies = [ -+ "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", -- "once_cell", - "slab", - ] - - [[package]] - name = "async-global-executor" --version = "2.0.4" -+version = "2.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c290043c9a95b05d45e952fb6383c67bcb61471f60cfa21e890dba6654234f43" -+checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" - dependencies = [ - "async-channel", - "async-executor", - "async-io", -- "async-mutex", -+ "async-lock", - "blocking", - "futures-lite", -- "num_cpus", - "once_cell", - ] - - [[package]] - name = "async-io" --version = "1.6.0" -+version = "1.12.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" -+checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" - dependencies = [ -+ "async-lock", -+ "autocfg", - "concurrent-queue", - "futures-lite", - "libc", - "log", -- "once_cell", - "parking", - "polling", - "slab", -- "socket2 0.4.4", -+ "socket2 0.4.7", - "waker-fn", -- "winapi 0.3.9", -+ "windows-sys", - ] - - [[package]] - name = "async-lock" --version = "2.5.0" -+version = "2.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" --dependencies = [ -- "event-listener", --] -- --[[package]] --name = "async-mutex" --version = "1.4.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -+checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" - dependencies = [ - "event-listener", -+ "futures-lite", - ] - - [[package]] - name = "async-std" --version = "1.11.0" -+version = "1.12.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "52580991739c5cdb36cde8b2a516371c0a3b70dda36d916cc08b82372916808c" -+checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" - dependencies = [ - "async-channel", - "async-global-executor", -@@ -138,9 +130,8 @@ dependencies = [ - "kv-log-macro", - "log", - "memchr", -- "num_cpus", - "once_cell", -- "pin-project-lite 0.2.8", -+ "pin-project-lite 0.2.9", - "pin-utils", - "slab", - "wasm-bindgen-futures", -@@ -148,15 +139,15 @@ dependencies = [ - - [[package]] - name = "async-task" --version = "4.2.0" -+version = "4.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" -+checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - - [[package]] - name = "async-trait" --version = "0.1.53" -+version = "0.1.59" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" -+checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" - dependencies = [ - "proc-macro2", - "quote", -@@ -188,9 +179,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - - [[package]] - name = "backtrace" --version = "0.3.65" -+version = "0.3.66" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" -+checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" - dependencies = [ - "addr2line", - "cc", -@@ -215,23 +206,23 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - - [[package]] - name = "blocking" --version = "1.2.0" -+version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" -+checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" - dependencies = [ - "async-channel", -+ "async-lock", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", -- "once_cell", - ] - - [[package]] - name = "bumpalo" --version = "3.9.1" -+version = "3.11.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" -+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - - [[package]] - name = "bytes" -@@ -239,17 +230,11 @@ version = "0.5.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - --[[package]] --name = "cache-padded" --version = "1.2.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" -- - [[package]] - name = "cc" --version = "1.0.73" -+version = "1.0.77" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" - - [[package]] - name = "cfg-if" -@@ -265,9 +250,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "cidr-utils" --version = "0.5.6" -+version = "0.5.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "aee37eff22e119e0acb33e6e81f85d87a9abf612b82efbcb5fba31b6a74554fb" -+checksum = "355d5b5df67e58b523953d0c1a8d3d2c05f5af51f1332b0199b9c92263614ed0" - dependencies = [ - "debug-helper", - "num-bigint", -@@ -310,28 +295,27 @@ checksum = "0bca1619ff57dd7a56b58a8e25ef4199f123e78e503fe1653410350a1b98ae65" - - [[package]] - name = "concurrent-queue" --version = "1.2.2" -+version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" -+checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" - dependencies = [ -- "cache-padded", -+ "crossbeam-utils", - ] - - [[package]] - name = "crossbeam-utils" --version = "0.8.8" -+version = "0.8.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" -+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" - dependencies = [ - "cfg-if 1.0.0", -- "lazy_static", - ] - - [[package]] - name = "ctor" --version = "0.1.22" -+version = "0.1.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" -+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" - dependencies = [ - "quote", - "syn", -@@ -365,9 +349,9 @@ dependencies = [ - - [[package]] - name = "either" --version = "1.6.1" -+version = "1.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - - [[package]] - name = "enum-as-inner" -@@ -396,26 +380,25 @@ dependencies = [ - - [[package]] - name = "event-listener" --version = "2.5.2" -+version = "2.5.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" -+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - - [[package]] - name = "fastrand" --version = "1.7.0" -+version = "1.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" -+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" - dependencies = [ - "instant", - ] - - [[package]] - name = "form_urlencoded" --version = "1.0.1" -+version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" - dependencies = [ -- "matches", - "percent-encoding", - ] - -@@ -437,9 +420,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - - [[package]] - name = "futures" --version = "0.3.21" -+version = "0.3.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" -+checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" - dependencies = [ - "futures-channel", - "futures-core", -@@ -452,9 +435,9 @@ dependencies = [ - - [[package]] - name = "futures-channel" --version = "0.3.21" -+version = "0.3.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" -+checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" - dependencies = [ - "futures-core", - "futures-sink", -@@ -462,15 +445,15 @@ dependencies = [ - - [[package]] - name = "futures-core" --version = "0.3.21" -+version = "0.3.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" -+checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" - - [[package]] - name = "futures-executor" --version = "0.3.21" -+version = "0.3.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -+checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" - dependencies = [ - "futures-core", - "futures-task", -@@ -479,9 +462,9 @@ dependencies = [ - - [[package]] - name = "futures-io" --version = "0.3.21" -+version = "0.3.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" -+checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" - - [[package]] - name = "futures-lite" -@@ -494,15 +477,15 @@ dependencies = [ - "futures-io", - "memchr", - "parking", -- "pin-project-lite 0.2.8", -+ "pin-project-lite 0.2.9", - "waker-fn", - ] - - [[package]] - name = "futures-macro" --version = "0.3.21" -+version = "0.3.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" -+checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" - dependencies = [ - "proc-macro2", - "quote", -@@ -511,21 +494,21 @@ dependencies = [ - - [[package]] - name = "futures-sink" --version = "0.3.21" -+version = "0.3.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" -+checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" - - [[package]] - name = "futures-task" --version = "0.3.21" -+version = "0.3.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" -+checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" - - [[package]] - name = "futures-util" --version = "0.3.21" -+version = "0.3.25" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" -+checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" - dependencies = [ - "futures-channel", - "futures-core", -@@ -534,19 +517,16 @@ dependencies = [ - "futures-sink", - "futures-task", - "memchr", -- "pin-project-lite 0.2.8", -+ "pin-project-lite 0.2.9", - "pin-utils", - "slab", - ] - - [[package]] - name = "gcd" --version = "2.1.0" -+version = "2.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f37978dab2ca789938a83b2f8bc1ef32db6633af9051a6cd409eff72cbaaa79a" --dependencies = [ -- "paste", --] -+checksum = "a4b1b088ad0a967aa29540456b82fc8903f854775d33f71e9709c4efb3dfbfd2" - - [[package]] - name = "getrandom" -@@ -561,26 +541,26 @@ dependencies = [ - - [[package]] - name = "getrandom" --version = "0.2.6" -+version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" -+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" - dependencies = [ - "cfg-if 1.0.0", - "libc", -- "wasi 0.10.2+wasi-snapshot-preview1", -+ "wasi 0.11.0+wasi-snapshot-preview1", - ] - - [[package]] - name = "gimli" --version = "0.26.1" -+version = "0.26.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" -+checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" - - [[package]] - name = "gloo-timers" --version = "0.2.4" -+version = "0.2.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" -+checksum = "98c4a8d6391675c6b2ee1a6c8d06e8e2d03605c44cec1270675985a4c2a5500b" - dependencies = [ - "futures-channel", - "futures-core", -@@ -640,6 +620,16 @@ dependencies = [ - "unicode-normalization", - ] - -+[[package]] -+name = "idna" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -+dependencies = [ -+ "unicode-bidi", -+ "unicode-normalization", -+] -+ - [[package]] - name = "instant" - version = "0.1.12" -@@ -681,15 +671,15 @@ dependencies = [ - - [[package]] - name = "itoa" --version = "1.0.1" -+version = "1.0.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" -+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - - [[package]] - name = "js-sys" --version = "0.3.57" -+version = "0.3.60" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" -+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" - dependencies = [ - "wasm-bindgen", - ] -@@ -721,21 +711,21 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "libc" --version = "0.2.124" -+version = "0.2.138" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50" -+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" - - [[package]] - name = "linked-hash-map" --version = "0.5.4" -+version = "0.5.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" -+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - - [[package]] - name = "log" --version = "0.4.16" -+version = "0.4.17" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" -+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" - dependencies = [ - "cfg-if 1.0.0", - "value-bag", -@@ -764,15 +754,15 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - - [[package]] - name = "memchr" --version = "2.4.1" -+version = "2.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" -+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - - [[package]] - name = "miniz_oxide" --version = "0.5.1" -+version = "0.5.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" -+checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" - dependencies = [ - "adler", - ] -@@ -810,9 +800,9 @@ dependencies = [ - - [[package]] - name = "net2" --version = "0.2.37" -+version = "0.2.38" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -+checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" - dependencies = [ - "cfg-if 0.1.10", - "libc", -@@ -832,9 +822,9 @@ dependencies = [ - - [[package]] - name = "num-integer" --version = "0.1.44" -+version = "0.1.45" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" - dependencies = [ - "autocfg", - "num-traits", -@@ -842,37 +832,27 @@ dependencies = [ - - [[package]] - name = "num-traits" --version = "0.2.14" -+version = "0.2.15" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" - dependencies = [ - "autocfg", - ] - --[[package]] --name = "num_cpus" --version = "1.13.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" --dependencies = [ -- "hermit-abi", -- "libc", --] -- - [[package]] - name = "object" --version = "0.28.3" -+version = "0.29.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" -+checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" - dependencies = [ - "memchr", - ] - - [[package]] - name = "once_cell" --version = "1.10.0" -+version = "1.16.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" -+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - - [[package]] - name = "parking" -@@ -880,17 +860,11 @@ version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - --[[package]] --name = "paste" --version = "1.0.7" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" -- - [[package]] - name = "percent-encoding" --version = "2.1.0" -+version = "2.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - - [[package]] - name = "pin-project-lite" -@@ -900,9 +874,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - - [[package]] - name = "pin-project-lite" --version = "0.2.8" -+version = "0.2.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" -+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - - [[package]] - name = "pin-utils" -@@ -912,22 +886,23 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - - [[package]] - name = "polling" --version = "2.2.0" -+version = "2.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" -+checksum = "166ca89eb77fd403230b9c156612965a81e094ec6ec3aa13663d4c8b113fa748" - dependencies = [ -+ "autocfg", - "cfg-if 1.0.0", - "libc", - "log", - "wepoll-ffi", -- "winapi 0.3.9", -+ "windows-sys", - ] - - [[package]] - name = "ppv-lite86" --version = "0.2.16" -+version = "0.2.17" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" -+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - - [[package]] - name = "proc-macro-error" -@@ -955,11 +930,11 @@ dependencies = [ - - [[package]] - name = "proc-macro2" --version = "1.0.37" -+version = "1.0.47" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" -+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" - dependencies = [ -- "unicode-xid", -+ "unicode-ident", - ] - - [[package]] -@@ -970,9 +945,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - - [[package]] - name = "quote" --version = "1.0.18" -+version = "1.0.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" -+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" - dependencies = [ - "proc-macro2", - ] -@@ -1020,9 +995,9 @@ dependencies = [ - - [[package]] - name = "redox_syscall" --version = "0.2.13" -+version = "0.2.16" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" -+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" - dependencies = [ - "bitflags", - ] -@@ -1033,16 +1008,16 @@ version = "0.4.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" - dependencies = [ -- "getrandom 0.2.6", -+ "getrandom 0.2.8", - "redox_syscall", - "thiserror", - ] - - [[package]] - name = "regex" --version = "1.5.5" -+version = "1.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" -+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" - dependencies = [ - "aho-corasick", - "memchr", -@@ -1051,9 +1026,9 @@ dependencies = [ - - [[package]] - name = "regex-syntax" --version = "0.6.25" -+version = "0.6.28" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" -+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - - [[package]] - name = "resolv-conf" -@@ -1110,7 +1085,7 @@ dependencies = [ - - [[package]] - name = "rustscan" --version = "2.1.0" -+version = "2.1.1" - dependencies = [ - "ansi_term", - "anyhow", -@@ -1139,9 +1114,9 @@ dependencies = [ - - [[package]] - name = "ryu" --version = "1.0.9" -+version = "1.0.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" -+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - - [[package]] - name = "sct" -@@ -1155,18 +1130,18 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.136" -+version = "1.0.150" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" -+checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.136" -+version = "1.0.150" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" -+checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" - dependencies = [ - "proc-macro2", - "quote", -@@ -1175,9 +1150,9 @@ dependencies = [ - - [[package]] - name = "serde_json" --version = "1.0.79" -+version = "1.0.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" -+checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" - dependencies = [ - "itoa", - "ryu", -@@ -1192,15 +1167,18 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - - [[package]] - name = "slab" --version = "0.4.6" -+version = "0.4.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" -+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -+dependencies = [ -+ "autocfg", -+] - - [[package]] - name = "smallvec" --version = "1.8.0" -+version = "1.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" -+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - - [[package]] - name = "socket2" -@@ -1215,9 +1193,9 @@ dependencies = [ - - [[package]] - name = "socket2" --version = "0.4.4" -+version = "0.4.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" -+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" - dependencies = [ - "libc", - "winapi 0.3.9", -@@ -1261,9 +1239,9 @@ dependencies = [ - - [[package]] - name = "subprocess" --version = "0.2.8" -+version = "0.2.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "055cf3ebc2981ad8f0a5a17ef6652f652d87831f79fddcba2ac57bcb9a0aa407" -+checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" - dependencies = [ - "libc", - "winapi 0.3.9", -@@ -1271,13 +1249,13 @@ dependencies = [ - - [[package]] - name = "syn" --version = "1.0.91" -+version = "1.0.105" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" -+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" - dependencies = [ - "proc-macro2", - "quote", -- "unicode-xid", -+ "unicode-ident", - ] - - [[package]] -@@ -1310,18 +1288,18 @@ dependencies = [ - - [[package]] - name = "thiserror" --version = "1.0.30" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" -+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" - dependencies = [ - "thiserror-impl", - ] - - [[package]] - name = "thiserror-impl" --version = "1.0.30" -+version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" -+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" - dependencies = [ - "proc-macro2", - "quote", -@@ -1330,9 +1308,9 @@ dependencies = [ - - [[package]] - name = "tinyvec" --version = "1.5.1" -+version = "1.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" -+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" - dependencies = [ - "tinyvec_macros", - ] -@@ -1390,7 +1368,7 @@ dependencies = [ - "cfg-if 1.0.0", - "enum-as-inner", - "futures", -- "idna", -+ "idna 0.2.3", - "lazy_static", - "log", - "rand", -@@ -1440,36 +1418,36 @@ dependencies = [ - - [[package]] - name = "unicode-bidi" --version = "0.3.7" -+version = "0.3.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" -+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - - [[package]] - name = "unicode-normalization" --version = "0.1.19" -+version = "0.1.22" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" - dependencies = [ - "tinyvec", - ] - - [[package]] - name = "unicode-segmentation" --version = "1.9.0" -+version = "1.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" -+checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" - - [[package]] - name = "unicode-width" --version = "0.1.9" -+version = "0.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" -- --[[package]] --name = "unicode-xid" --version = "0.2.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - - [[package]] - name = "untrusted" -@@ -1479,21 +1457,20 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - - [[package]] - name = "url" --version = "2.2.2" -+version = "2.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" - dependencies = [ - "form_urlencoded", -- "idna", -- "matches", -+ "idna 0.3.0", - "percent-encoding", - ] - - [[package]] - name = "value-bag" --version = "1.0.0-alpha.8" -+version = "1.0.0-alpha.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" -+checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" - dependencies = [ - "ctor", - "version_check", -@@ -1534,15 +1511,15 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - - [[package]] - name = "wasi" --version = "0.10.2+wasi-snapshot-preview1" -+version = "0.11.0+wasi-snapshot-preview1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" -+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - - [[package]] - name = "wasm-bindgen" --version = "0.2.80" -+version = "0.2.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" -+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" - dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -@@ -1550,13 +1527,13 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-backend" --version = "0.2.80" -+version = "0.2.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" -+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" - dependencies = [ - "bumpalo", -- "lazy_static", - "log", -+ "once_cell", - "proc-macro2", - "quote", - "syn", -@@ -1565,9 +1542,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-futures" --version = "0.4.30" -+version = "0.4.33" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" -+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" - dependencies = [ - "cfg-if 1.0.0", - "js-sys", -@@ -1577,9 +1554,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-macro" --version = "0.2.80" -+version = "0.2.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" -+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" - dependencies = [ - "quote", - "wasm-bindgen-macro-support", -@@ -1587,9 +1564,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-macro-support" --version = "0.2.80" -+version = "0.2.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" -+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" - dependencies = [ - "proc-macro2", - "quote", -@@ -1600,15 +1577,15 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-shared" --version = "0.2.80" -+version = "0.2.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" -+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - - [[package]] - name = "web-sys" --version = "0.3.57" -+version = "0.3.60" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" -+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" - dependencies = [ - "js-sys", - "wasm-bindgen", -@@ -1691,6 +1668,63 @@ version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -+[[package]] -+name = "windows-sys" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -+dependencies = [ -+ "windows_aarch64_gnullvm", -+ "windows_aarch64_msvc", -+ "windows_i686_gnu", -+ "windows_i686_msvc", -+ "windows_x86_64_gnu", -+ "windows_x86_64_gnullvm", -+ "windows_x86_64_msvc", -+] -+ -+[[package]] -+name = "windows_aarch64_gnullvm" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" -+ -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" -+ -+[[package]] -+name = "windows_i686_gnu" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" -+ -+[[package]] -+name = "windows_i686_msvc" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" -+ -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" -+ -+[[package]] -+name = "windows_x86_64_gnullvm" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" -+ -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.42.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" -+ - [[package]] - name = "winreg" - version = "0.6.2" diff --git a/testing/sdrangel/APKBUILD b/testing/sdrangel/APKBUILD index a003fc6b3d0..d490bfa8a71 100644 --- a/testing/sdrangel/APKBUILD +++ b/testing/sdrangel/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leon ROUX <leon.roux@federate.us> # Maintainer: Leon ROUX <leon.roux@federate.us> pkgname=sdrangel -pkgver=7.15.0 -pkgrel=4 +pkgver=7.20.0 +pkgrel=0 pkgdesc="SDR Rx/Tx software and analyzer for various hardware" url="https://github.com/f4exb/sdrangel" license="GPL-3.0-or-later" @@ -33,6 +33,7 @@ makedepends=" qt5-qtmultimedia-dev qt5-qtserialport-dev qt5-qtspeech-dev + qt5-qtsvg-dev qt5-qtwebengine-dev qt5-qtwebsockets-dev samurai @@ -79,6 +80,6 @@ package() { } sha512sums=" -078c49eb9f073dc28fd2b6b8205a0f03bd5d08c7b98d833aa04504d45d17d4711714e985b47919b1d70f2139b5c767e7449a0160cdd1c575a27f84febc72e9aa sdrangel-7.15.0.tar.gz +e808cf5a564d1c90c27c2eaf663268686de854d054b77419e34d20613990abad64484a8a46a7ca6777aeadf420e098693758783eb36872da0472e1338b68c54a sdrangel-7.20.0.tar.gz 8779ed53c83505df3dac7a0b0a485c939f439a01f5aed203e25652cdb7d17c10ee629fab75b22b1ac9de882bfefbddcf2af5a3a8da75c5fdefc007a8fb9480f8 no-march-magic.patch " diff --git a/testing/sequoia-sqv/APKBUILD b/testing/sequoia-sqv/APKBUILD index 48679b5d674..90b1c97c355 100644 --- a/testing/sequoia-sqv/APKBUILD +++ b/testing/sequoia-sqv/APKBUILD @@ -1,8 +1,8 @@ # Contributor: tcely <sequoia-sqv+aports@tcely.33mail.com> # Maintainer: Simon Rupf <simon@rupf.net> pkgname=sequoia-sqv -pkgver=1.1.0 -pkgrel=5 +pkgver=1.2.1 +pkgrel=0 pkgdesc="simple signature verification program" url="https://sequoia-pgp.org/" arch="all" @@ -15,15 +15,12 @@ makedepends=" " source=" https://gitlab.com/sequoia-pgp/sequoia-sqv/-/archive/v$pkgver/sequoia-sqv-v$pkgver.tar.gz - cargo-update-sha1collisiondetection.patch " builddir="$srcdir/sequoia-sqv-v$pkgver" prepare() { default_prepare - cargo update -p buffered-reader --precise 1.2.0 - cargo update -p sequoia-openpgp --precise 1.16.0 cargo fetch --target="$CTARGET" --locked } @@ -40,6 +37,5 @@ package() { } sha512sums=" -8a39ba244fcca61635bd633ebbcd0aa102dcb8139984f3e6db9a5e011e7cbc47f4dad1d5606730ac66ec6dac42b1c372f2fd022d55c9a989a5ef6430922b8fb5 sequoia-sqv-v1.1.0.tar.gz -f0a590f4ba9ce934edfe6620bace5f46d77666fb0aeb93af5358f8a5ddb1db8967e17340536ed9e7eecc1a15ee09ea7acd8cab1f39e699a4ddc29d4ccef3b139 cargo-update-sha1collisiondetection.patch +015a4ad6de6dd56321d7d1d8ac652e75c0c16b55693004e4952fd1e935284d2388b1e42e22140da348e776b5caa58c5add5972f43d594ec12a3bf3bca1440405 sequoia-sqv-v1.2.1.tar.gz " diff --git a/testing/sequoia-sqv/cargo-update-sha1collisiondetection.patch b/testing/sequoia-sqv/cargo-update-sha1collisiondetection.patch deleted file mode 100644 index 8096e4198ee..00000000000 --- a/testing/sequoia-sqv/cargo-update-sha1collisiondetection.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fixes test error: - -> misaligned pointer dereference: address must be a multiple of 0x4 but is 0xf7d92505 - -Which occurs when building with rust >=1.70 - -sha1collisiondetection >=0.2.7 fixes that. -diff --git a/Cargo.lock b/Cargo.lock -index e41780e..fc34d4f 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1030,9 +1030,9 @@ dependencies = [ - - [[package]] - name = "sha1collisiondetection" --version = "0.2.5" -+version = "0.2.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f31bf4e9fe5cd8cea8e0887e2e4eb1b4d736ff11b776c8537bf0912a4b381285" -+checksum = "b20793cf8330b2c7da4c438116660fed24e380bcb8a1bcfff2581b5593a0b38e" - dependencies = [ - "digest", - "generic-array", diff --git a/testing/sigil/APKBUILD b/testing/sigil/APKBUILD index 6d23f8ab24d..20a7421c55a 100644 --- a/testing/sigil/APKBUILD +++ b/testing/sigil/APKBUILD @@ -1,8 +1,8 @@ # Contributor: OIS <mistresssilvara@hotmail.com> # Maintainer: OIS <mistresssilvara@hotmail.com> pkgname=sigil -pkgver=1.9.30 -pkgrel=2 +pkgver=2.1.0 +pkgrel=0 pkgdesc="EPUB editor" url="https://sigil-ebook.com/sigil" # qt6-qtwebengine (XXX: momentarily qt5 for aarch64) @@ -12,7 +12,6 @@ depends=" py3-css-parser py3-dulwich py3-lxml - qt5-qtsvg " makedepends=" cmake @@ -20,15 +19,15 @@ makedepends=" minizip-dev pcre2-dev python3-dev - qt5-qttools-dev - qt5-qtwebengine-dev + qt6-qtsvg-dev + qt6-qt5compat-dev + qt6-qttools-dev + qt6-qtwebengine-dev samurai zlib-dev " subpackages="$pkgname-lang" -source="$pkgname-$pkgver.tar.gz::https://github.com/Sigil-Ebook/Sigil/archive/refs/tags/$pkgver.tar.gz - $pkgname-assert.patch::https://github.com/Sigil-Ebook/Sigil/commit/8e21405f5d2dfdc7da60f845ae7cf5e2bca6d029.diff - " +source="$pkgname-$pkgver.tar.gz::https://github.com/Sigil-Ebook/Sigil/archive/refs/tags/$pkgver.tar.gz" builddir="$srcdir/Sigil-$pkgver/" # no tests options="!check" @@ -44,7 +43,7 @@ build() { -DUSE_SYSTEM_LIBS=1 \ -DINSTALL_BUNDLED_DICTS=0 \ -DDISABLE_UPDATE_CHECK=1 \ - -DUSE_QT6=OFF \ + -DUSE_QT6=1 \ $CMAKE_CROSSOPTS cmake --build build @@ -62,6 +61,5 @@ lang() { } sha512sums=" -80dcaa9dcee51c36a42bcd57fc87acda94002af74602d934c7e9bfd275339d9ac200cd1f141fb9e2709ac054569bc22f1869623498ce16c636a3fab8dae4e70f sigil-1.9.30.tar.gz -eb6a1d6c4cc94833b0356b5ce7b1a168d70dcb77a381b539ce8c5b75ef7cb1f7e5a62ad1c22a5d68105a08758035c654747c1a6e4f638cbc80fd897084db958a sigil-assert.patch +542d6fc71b0353e3b5440d40e4c9f205c5205fb3e409935015b8f3689f8dcc74d8a96035963a740791f3a8acd63b2e0d81afe9be7716098e0727be6daf6c8ceb sigil-2.1.0.tar.gz " diff --git a/testing/signal-desktop/APKBUILD b/testing/signal-desktop/APKBUILD index aebfd3b610f..94eaf3b84b8 100644 --- a/testing/signal-desktop/APKBUILD +++ b/testing/signal-desktop/APKBUILD @@ -1,13 +1,12 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=signal-desktop -pkgver=7.4.0 +pkgver=7.8.0 pkgrel=0 pkgdesc="A messaging app for simple private communication with friends" url="https://github.com/signalapp/Signal-Desktop/" # same as electron -# aarch64: polyval-0.5.3 crate subdep uses unstable stdsimd feature -arch="x86_64" +arch="aarch64 x86_64" license="AGPL-3.0-only" depends=" electron @@ -64,14 +63,14 @@ makedepends=" options="net !check" # follow signal-desktop package.json -> @signalapp/libsignal-client -_libsignalver=0.41.2 +_libsignalver=0.45.0 # follow signal-desktop package.json -> @signalapp/ringrtc -_ringrtcver=2.39.2 +_ringrtcver=2.41.0 # follow ringrtc (on version above) -> config/version.properties -> webrtc.version # downloading tarball generated with abuild snapshot (with gclient dependencies fetched) -_webrtcver=6261c +_webrtcver=6261g # follow @signalapp/better-sqlite3 (on version in package.json) -> deps/download.js -> TOKENIZER_VERSION # last bsqlite version: 8.7.1 @@ -472,14 +471,14 @@ package() { } sha512sums=" -51edb647832a1f9658abb7fddb4c35e8c84f5ea73c36f52bb02cf3460b871ace5bc6a86b439df738d6fbc418f0753e717962a0edefa95a0d4b2ca846fa11371e Signal-Desktop-7.4.0.tar.gz -a311dd8d61d6c072a76e247bf4e4d752f1fe9dfcf0993d1b14790dc2eeec65d3c1bf8b8288156dee5ff89cbed9e282b73a58fcdd69bda9b49441fc9c443a83ec libsignal-0.41.2.tar.gz -c36eb4f3ab02cfa341ccb42a80d5fed53bf21bf495eb3627712db912c97bd76f4fb8fa1951ecfeff1b64c36fdfe72aec59bf459b27a612da5b4e16a885c225e4 ringrtc-2.39.2.tar.gz -341144563eafbd6e263c46cca5cf4954c9d8c72ba4caea1c9342b5b5311e7f618f3e595051195f9894662928cc5015641303aae2c5d5bbc18b22fb36651ee2e8 webrtc-6261c.tar.zst +817f6a2178b2ac756c1c4a585f9c59733de55db3d640981026f576e588ca1f81ed947f276c49cfe5e666c9ede0e34412b24941b32758de6a65f9ecc43697df5b Signal-Desktop-7.8.0.tar.gz +70f2cb7d05e019235cd044c401bcf072a934fdfea4a161ef5be988d2e3932ba5233110b4b06525e6f33ea9cad036def442e70adad15eab883903d9246969896e libsignal-0.45.0.tar.gz +3adccc33d4efa29e003175d0e00cceb169426a73f467ea32406e9cd721c72aeaa45a7816985e484b8adceb2de2a6405f306f6d609b43a25c950b18dd49a14476 ringrtc-2.41.0.tar.gz +6dc8c709986816e724a57d056a165cf72db70644593e8de8e3026e511d1f8f3d6d5e171d500cfabe760309c5a81795b667b4399c9885be30163d326cbc82c1b4 webrtc-6261g.tar.zst 84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28 stokenizer-0.2.1.tar.gz be5b4e823543b79175a12314f10c6326d9f0d59f470136962daed4665887006acc05b48b40dc1b67747396d8f6f7d23be298c1e110ccdd35ff9b09d5e6b80bab bettersqlite-use-system-sqlcipher.patch 92de6fc7cc5f2b6d65bedbd74cc733dd86dafc9cbfb9b727c3267aef63a71a07247cde9b163c68fddfeb9096dcd7f554d36d0b2de078d8905e3825645ddbd6eb libsignal-auditable.patch -f13389dd7a1360022d919fa1350210a92e5b832aa32b0ac278b63b1f41462c7807ac28c7867eecf71dac8f3ca699fd0fb0d87de8d1244c3e65cc4b78304e8ef4 signal-disable-updates.patch +152435231cdcf52a17a9e24aadf95d77511258e818172941ba074a73a90a541f0136feb58868674f2bcb19191a6d12933fe6cd5baf3ee99e508915c72523163b signal-disable-updates.patch d50eb5724502df9ea4d795db8cfc27af767c25168d7db2af512e615be7cc2ca290210a9ae78e1abb153c0198677e858ad3d74926c958099d0319295e7d9e7f1d signal-update-links.patch 646d303fe58cae3f0896ae0275a66695b902fae6ddde7c568cc9798157dee9f45ceff907bc951fadc4c511d512a73d114b4e4f7c8914e2311c63929d29e1621a signal-show-window-please.patch ab51b8fdcda1d8811213d2c5d8cb5d8457b478a02e23ce40f36b38ec56d45a3bd7a2d184720c27046f98a27771551cfad93c1290fe93856cc02695d318b33e47 ringrtc-webrtc-renamed.patch diff --git a/testing/signal-desktop/signal-disable-updates.patch b/testing/signal-desktop/signal-disable-updates.patch index 1e38199c001..9b9c1341bd0 100644 --- a/testing/signal-desktop/signal-disable-updates.patch +++ b/testing/signal-desktop/signal-disable-updates.patch @@ -1,9 +1,9 @@ --- a/config/production.json +++ b/config/production.json -@@ -15,5 +15,5 @@ - "serverPublicParams": "AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P+NameAZYOD12qRkxosQQP5uux6B2nRyZ7sAV54DgFyLiRcq1FvwKw2EPQdk4HDoePrO/RNUbyNddnM/mMgj4FW65xCoT1LmjrIjsv/Ggdlx46ueczhMgtBunx1/w8k8V+l8LVZ8gAT6wkU5J+DPQalQguMg12Jzug3q4TbdHiGCmD9EunCwOmsLuLJkz6EcSYXtrlDEnAM+hicw7iergYLLlMXpfTdGxJCWJmP4zqUFeTTmsmhsjGBt7NiEB/9pFFEB3pSbf4iiUukw63Eo8Aqnf4iwob6X1QviCWuc8t0I=", +@@ -16,5 +16,5 @@ "serverTrustRoot": "BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF", "genericServerPublicParams": "AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN", + "backupServerPublicParams": "AJwNSU55fsFCbgaxGRD11wO1juAs8Yr5GF8FPlGzzvdJJIKH5/4CC7ZJSOe3yL2vturVaRU2Cx0n751Vt8wkj1bozK3CBV1UokxV09GWf+hdVImLGjXGYLLhnI1J2TWEe7iWHyb553EEnRb5oxr9n3lUbNAJuRmFM7hrr0Al0F0wrDD4S8lo2mGaXe0MJCOM166F8oYRQqpFeEHfiLnxA1O8ZLh7vMdv4g9jI5phpRBTsJ5IjiJrWeP0zdIGHEssUeprDZ9OUJ14m0v61eYJMKsf59Bn+mAT2a7YfB+Don9O", - "updatesEnabled": true + "updatesEnabled": false } diff --git a/testing/simgear/APKBUILD b/testing/simgear/APKBUILD index f530a7bc8bc..82de0c571c2 100644 --- a/testing/simgear/APKBUILD +++ b/testing/simgear/APKBUILD @@ -2,7 +2,7 @@ pkgname=simgear pkgver=2020.3.19 _pkgver=${pkgver%.*} -pkgrel=0 +pkgrel=1 pkgdesc="Sim library for FlightGear" options="!check" # Accepts boost only up to 1.71.0 url="https://github.com/FlightGear/simgear" diff --git a/testing/sipgrep/APKBUILD b/testing/sipgrep/APKBUILD index 75d2dd99056..82572215951 100644 --- a/testing/sipgrep/APKBUILD +++ b/testing/sipgrep/APKBUILD @@ -1,25 +1,34 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> -pkgname="sipgrep" -pkgver="2.1.0" -pkgrel=1 +pkgname=sipgrep +pkgver=2.2.0 +pkgrel=0 pkgdesc="Display and Troubleshoot SIP signaling over IP networks in console" url="https://www.sipcapture.org/" arch="all" -license="GPL-3.0" -makedepends="pcre-dev libpcap-dev" +license="GPL-3.0-only" +makedepends="pcre2-dev libpcap-dev ncurses-dev openssl-dev hiredis-dev +autoconf automake libtool m4" options="!check" #no test provided -subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/sipcapture/sipgrep/archive/$pkgver.tar.gz" -builddir="$srcdir/$pkgname-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/sipcapture/sipgrep/archive/$pkgver.tar.gz +aclocal.patch" prepare() { - update_config_guess && update_config_sub + sh build.sh + libtoolize default_prepare } build() { - ./configure --prefix=/usr + ./configure \ + --prefix=/usr \ + --enable-ncurses \ + --enable-ssl \ + --enable-ipv6 \ + --enable-redis \ + --enable-shared \ + --disable-static \ + --with-gnu-ld make } @@ -27,4 +36,7 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="81b7941f973f95239fe348846118031b0e6eba1f404d9568fd100fe6e4b51968fb29097f1ab3f0e079ef9e03d362e5e1e71bcafca87ed1e72941bb2df466eecd sipgrep-2.1.0.tar.gz" +sha512sums=" +fe146622e87012641648ef8a19f9d1477354059e60e5e15eaabbd6c4067c776dbcb8aafb0eb4c8ce096058a6f43edb929135a475c2c3afd847b46638c83339e5 sipgrep-2.2.0.tar.gz +44662d2696841cfb93ceb265d9f2201a73c01882894b179c02dc5e7040c39d19e66d56760fe752fe631796b099dee0b89a746c72742f634b54a7be4bab43b2fb aclocal.patch +" diff --git a/testing/sipgrep/aclocal.patch b/testing/sipgrep/aclocal.patch new file mode 100644 index 00000000000..5ad3172f5d2 --- /dev/null +++ b/testing/sipgrep/aclocal.patch @@ -0,0 +1,20 @@ +diff --git a/configure b/configure +index fa86303..9b05046 100755 +--- a/configure ++++ b/configure +@@ -2899,13 +2899,13 @@ _ACEOF + + # Some tools Automake needs. + +-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} ++ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} + + + AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} ++AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} + + + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} diff --git a/testing/smlsharp/APKBUILD b/testing/smlsharp/APKBUILD deleted file mode 100644 index d4855ad8a5c..00000000000 --- a/testing/smlsharp/APKBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Contributor: Hazem <hazem-alpine@riseup.net> -# Maintainer: Hazem <hazem-alpine@riseup.net> -pkgname=smlsharp -pkgver=4.0.0 -pkgrel=1 -pkgdesc="A new programming language in the Standard ML family" -url="https://smlsharp.github.io" -arch="x86_64" -license="MIT" -_llvmver=14 -depends="massivethreads-dev llvm$_llvmver" -makedepends="gmp-dev xz llvm$_llvmver-dev yajl chrpath" -source="https://github.com/smlsharp/smlsharp/releases/download/v$pkgver/smlsharp-$pkgver.tar.gz - llvm14.patch - " -subpackages="$pkgname-doc" - -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --with-llvm=/usr/lib/llvm$_llvmver \ - --with-incompatible-llvm - make -} - -check() { - make test -} - -package() { - chrpath -d src/compiler/smlsharp - make DESTDIR="$pkgdir" install -} - -sha512sums=" -d3c37c2c1ae4cdf75e96f7a50ae37d74b689e66f1c4db2ad9ba11ec9f5d71af37ff91a3d8d93012ba155d8674bb3c62aeec1bb4437ca8b66fbcbd958ecdf9c4d smlsharp-4.0.0.tar.gz -c222b41db552e523d61404f9ec1bf71a37f3b6a6212b9a2e0f4c7df7efea850aa68cb7dc0a5de10fce967b4228129a4504dda0471ab4445eeb780808acc1e875 llvm14.patch -" diff --git a/testing/smlsharp/llvm14.patch b/testing/smlsharp/llvm14.patch deleted file mode 100644 index a80e6be41b3..00000000000 --- a/testing/smlsharp/llvm14.patch +++ /dev/null @@ -1,18 +0,0 @@ -partly taken from https://github.com/smlsharp/smlsharp/commit/351e863ae30b66af10158557f6869e2531944304 --- -diff --git a/src/llvm/main/smlsharp_gc.cpp b/src/llvm/main/smlsharp_gc.cpp -index 17bbfd3..0081e49 100644 ---- a/src/llvm/main/smlsharp_gc.cpp -+++ b/src/llvm/main/smlsharp_gc.cpp -@@ -8,7 +8,11 @@ - - #include <llvm/Config/llvm-config.h> - #include <llvm/CodeGen/AsmPrinter.h> -+#if LLVM_VERSION_MAJOR >= 13 -+#include <llvm/IR/GCStrategy.h> -+#else - #include <llvm/CodeGen/GCStrategy.h> -+#endif - #include <llvm/CodeGen/GCMetadata.h> - #include <llvm/CodeGen/GCMetadataPrinter.h> - #include <llvm/MC/MCStreamer.h> diff --git a/testing/smplxmpp/APKBUILD b/testing/smplxmpp/APKBUILD index 6c812c049b7..3ea00f830bc 100644 --- a/testing/smplxmpp/APKBUILD +++ b/testing/smplxmpp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=smplxmpp pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="Simple XMPP command line client" url="https://codeberg.org/tropf/smplxmpp" arch="all" diff --git a/testing/snapper/APKBUILD b/testing/snapper/APKBUILD index ba7c130bf2e..66ba0019d6f 100644 --- a/testing/snapper/APKBUILD +++ b/testing/snapper/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=snapper -pkgver=0.10.7 +pkgver=0.11.0 pkgrel=0 pkgdesc="Manage filesystem snapshots and allow undo of system modifications" url="http://snapper.io" @@ -35,6 +35,7 @@ subpackages=" " source="$pkgname-$pkgver.tar.gz::https://github.com/openSUSE/snapper/archive/v$pkgver.tar.gz miss-tinfo-link-to-ncurses.patch + miss-uint-includes.patch drift-file-path.patch skip-locale-tests.patch statvfs64.patch @@ -48,7 +49,6 @@ prepare() { # copy cron scripts to /etc/periodic/* instead of /etc/cron.* sed -i -e 's/cron\./periodic\//g' scripts/Makefile.am # fix config location in cron scripts - sed -i -e 's@/etc/sysconfig/@/etc/snapper/@g' scripts/snapper-daily sed -i -e 's@/etc/sysconfig/@/etc/snapper/@g' scripts/snapper-hourly autoreconf -fvi } @@ -79,8 +79,9 @@ package() { } sha512sums=" -bf098c941735b60554ff0711fa43b30ef3634e01178f5ee8ad44c65b757c3366bd5bf568cef3a787b2ddcc2fc63090056109250480e6bd360ebf27a8343373b8 snapper-0.10.7.tar.gz -3d264f7f9156342d5bad2ac78db9c8a30ea1ac25648245631a47d1495bb6610c6b39c28a5013741063df3c08f459388c0467caaedde5ad7cebb433eb432b7a70 miss-tinfo-link-to-ncurses.patch +fe86be4ceb1439b5be3fa61f5bc037bc51a5fe47451d0698851f83e2783d6c245ef8d40a33f79b03e8d1d8b63433743c35938ad7dca0747e0e1f650a5a766c40 snapper-0.11.0.tar.gz +9f03cf2de78407e2b1002f6b9fd644cbe61ef0762c938afcedd620456b8a97e593df3df8f878f06d2caf4297e5125c9be86ea5e43ce9991634bb59cbf3b2831e miss-tinfo-link-to-ncurses.patch +1a451aca0d94e95995c4ee373b915f5f78bcd17df12370e5e1ed77022be9e98e836e4fa142f81242f67d6ace5444fb89e8eaacd5740c62c051b37017c93c078c miss-uint-includes.patch c2470da8a5d62a37babdacd361051bae8fb3e1be157cb7eec1563a40825d41702f6f10bb619ffcab2ea8d7407405a543b0c47997c70a744c20cc3135c0532c1f drift-file-path.patch 16f9991b0688c959977876e39e8ed9214627d3b3eacdf01a8aaef9540fc8add7d7c4f50abc4225183495acb161a4c6e5f6ee3790bf685fc845a6782647269a53 skip-locale-tests.patch dc77db919fc4bd64929e784d09c4a6ed50530b6a88b3a26f4ea341f09e71dbd74e07d1e9fea37f85305d0f251a5c302e1dbb700084d04a16dc2e7687ecc83815 statvfs64.patch diff --git a/testing/snapper/miss-tinfo-link-to-ncurses.patch b/testing/snapper/miss-tinfo-link-to-ncurses.patch index 821700803e6..19be49bf69f 100644 --- a/testing/snapper/miss-tinfo-link-to-ncurses.patch +++ b/testing/snapper/miss-tinfo-link-to-ncurses.patch @@ -1,11 +1,10 @@ diff --git a/client/utils/Makefile.am b/client/utils/Makefile.am -index c55fc4a..21aeaae 100644 +index e6a9968..aeeea5a 100644 --- a/client/utils/Makefile.am +++ b/client/utils/Makefile.am -@@ -18,5 +18,5 @@ libutils_la_SOURCES = \ - CsvFormatter.cc CsvFormatter.h \ - JsonFormatter.cc JsonFormatter.h +@@ -20,4 +20,4 @@ libutils_la_SOURCES = \ + CsvFormatter.cc CsvFormatter.h \ + JsonFormatter.cc JsonFormatter.h -libutils_la_LIBADD = ../../snapper/libsnapper.la -ltinfo +libutils_la_LIBADD = ../../snapper/libsnapper.la -lncurses - diff --git a/testing/snapper/miss-uint-includes.patch b/testing/snapper/miss-uint-includes.patch new file mode 100644 index 00000000000..9e6bde915a6 --- /dev/null +++ b/testing/snapper/miss-uint-includes.patch @@ -0,0 +1,12 @@ +diff --git a/snapper/BcachefsUtils.cc b/snapper/BcachefsUtils.cc +index e9163ff..4a510d5 100644 +--- a/snapper/BcachefsUtils.cc ++++ b/snapper/BcachefsUtils.cc +@@ -22,6 +22,7 @@ + + #include "config.h" + ++#include <asm/types.h> + #include <cstring> + #include <cerrno> + #include <sys/stat.h> diff --git a/testing/solarus-engine/APKBUILD b/testing/solarus-engine/APKBUILD index 77786629316..fc2d435d1f9 100644 --- a/testing/solarus-engine/APKBUILD +++ b/testing/solarus-engine/APKBUILD @@ -7,7 +7,7 @@ _commit_ver=a44ae4b2a2f5289dc00bdf123eee239c99fab3b5 pkgrel=0 pkgdesc="Solarus is an open-source adventure 2D game engine written in C++" url="https://solarus-games.org/" -arch="all !ppc64le !riscv64" # no luajit found +arch="all !ppc64le !riscv64 !loongarch64" # no luajit found license="GPL-3.0-Only" depends=" libvorbis diff --git a/testing/solarus-quest-editor/APKBUILD b/testing/solarus-quest-editor/APKBUILD index c1196ea5437..fbd84ba55bf 100644 --- a/testing/solarus-quest-editor/APKBUILD +++ b/testing/solarus-quest-editor/APKBUILD @@ -6,9 +6,9 @@ _commit_ver=c6861dead576c5ed18dfdd33a8082101683c0324 pkgrel=0 pkgdesc="Game editor for the Solarus engine." url="https://www.solarus-games.org/" -#ppc64le, riscv64: # no luajit found +#ppc64le, riscv64, loongarch64: # no luajit found #aarch64, armhf, armv7: OpenGL/ES3 error while compiling -arch="all !aarch64 !armhf !armv7 !ppc64le !riscv64" +arch="all !aarch64 !armhf !armv7 !ppc64le !riscv64 !loongarch64" license="GPL-3.0-Only" depends="solarus-engine" makedepends=" diff --git a/testing/sopwith/APKBUILD b/testing/sopwith/APKBUILD index 9ad9c2225ba..e69bf133dfb 100644 --- a/testing/sopwith/APKBUILD +++ b/testing/sopwith/APKBUILD @@ -1,7 +1,7 @@ # Contributor: John Gebbie <me@johngebbie.com> # Maintainer: John Gebbie <me@johngebbie.com> pkgname=sopwith -pkgver=2.4.0 +pkgver=2.5.0 pkgrel=0 pkgdesc="Classic bi-plane shoot-'em up game" url="https://fragglet.github.io/sdl-sopwith" @@ -31,6 +31,6 @@ package() { } sha512sums=" -3d47033d7e491417caaeb78dbb7e3acd8d9e1d7fe3197a0c9d83d3a8c5ef002df2880bc6787418aa15ac214242c64a652f0d1d343196ab5b77fe984f9370211a sdl-sopwith-2.4.0.tar.gz +12e8f7fe499e45a49c7455ce4293b57742daf653b774e87d8081227b264dffd55150f6df01e81c2f30e813f7e67409e08cabc7c0761ccb86409232d3e00d5801 sdl-sopwith-2.5.0.tar.gz eb67432e23eacec9f53c35da25af4b5ca8018de1be9b40094dd5f98d0614415481df2fbf2f9c22f4b4fc71fd20b838f806f4d1e71b327fb4af670f5cd2a3adc8 select.patch " diff --git a/testing/spotify-player/APKBUILD b/testing/spotify-player/APKBUILD index c6f2067f5e5..e89cdb3cd25 100644 --- a/testing/spotify-player/APKBUILD +++ b/testing/spotify-player/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Thomas Kienlen <kommander@laposte.net> # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=spotify-player -pkgver=0.16.3 +pkgver=0.18.1 pkgrel=0 pkgdesc="Command driven spotify player" url="https://github.com/aome510/spotify-player" @@ -38,5 +38,5 @@ package() { } sha512sums=" -01c9f3bfa93e410531bc3e070090c7a29bbed815ed2be1e4dbd48b70697198d522a336089e0533d404c7c1c13af59a49263727bd9d0aaf5753773f817e7aa876 spotify-player-0.16.3.tar.gz +9c7ef072f47ab45acc05bf67025e51446db746b81287adbe3dcbde9185c6ba740f2d5f794c1b1e1e378dd0121dcf28bd56084ff692b7b1e7081a4dda6ef32072 spotify-player-0.18.1.tar.gz " diff --git a/testing/squashfs-tools-ng/APKBUILD b/testing/squashfs-tools-ng/APKBUILD index 55972f693d5..3843d6953db 100644 --- a/testing/squashfs-tools-ng/APKBUILD +++ b/testing/squashfs-tools-ng/APKBUILD @@ -1,14 +1,26 @@ # Contributor: Ryan Barnett <ryanbarnett3@gmail.com> -# Maintainer: Ryan Barnett <ryanbarnett3@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=squashfs-tools-ng -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=0 pkgdesc="New set of tools and libraries for working with SquashFS images" -url="https://infraroot.at/projects/squashfs-tools-ng/index.html" +url="https://infraroot.at/projects/squashfs-tools-ng/" arch="all" license="GPL-3.0-or-later" -makedepends="automake libselinux-dev lz4-dev lzo-dev xz-dev zlib-dev zstd-dev" -subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" +makedepends=" + automake + libselinux-dev + lz4-dev + lzo-dev + xz-dev + zlib-dev + zstd-dev + " +subpackages=" + $pkgname-dev + $pkgname-libs + $pkgname-doc + " source="https://infraroot.at/pub/squashfs/squashfs-tools-ng-$pkgver.tar.gz" build() { @@ -31,5 +43,5 @@ package() { } sha512sums=" -a55a954e24149248ca3ca1dafe9fd132401a6abf869e53e1b74719af813de00bee393dc1da7f392c1e37331a3354e997984839e30603f5aef999319870b75013 squashfs-tools-ng-1.3.0.tar.gz +4a7bb8b764e2f25ff8c41ec404018dd91cbf461eed60993a9945604bfe479bd5e07eaae8277a2493c7fd17a49724b62887d4def82952366588d0ef10a88207fb squashfs-tools-ng-1.3.1.tar.gz " diff --git a/testing/srain/APKBUILD b/testing/srain/APKBUILD index 214e2658e69..a49b41a2786 100644 --- a/testing/srain/APKBUILD +++ b/testing/srain/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=srain -pkgver=1.6.0 +pkgver=1.7.0 pkgrel=0 pkgdesc="Modern IRC client written in GTK" url="https://srain.silverrainz.me/" @@ -15,7 +15,7 @@ makedepends=" libayatana-appindicator-dev libconfig-dev libsecret-dev - libsoup-dev + libsoup3-dev meson ninja openssl-dev>3 @@ -38,5 +38,5 @@ package() { } sha512sums=" -59d962ddbf71724d5f68decc1e3b873cea6c6bd2ca23b21a1a6fe937d53f2871398fdcda906840755efc6b454d2d5116ca620c047f1634fb68b45ab2c0443a57 srain-1.6.0.tar.gz +0549a08379946cc4ea0c331f212f03b08a0c7248964984d01a64744058d116ec1af05b2aefd0d689438dafa9df4e70179bb8957d9992f02414a462577c5d99dc srain-1.7.0.tar.gz " diff --git a/testing/stern/APKBUILD b/testing/stern/APKBUILD index 590fdce6b5d..a49a2b0380e 100644 --- a/testing/stern/APKBUILD +++ b/testing/stern/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Hoang Nguyen <folliekazetani@protonmail.com> # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=stern -pkgver=1.28.0 -pkgrel=2 +pkgver=1.29.0 +pkgrel=0 pkgdesc="Multi pod and container log tailing for Kubernetes" url="https://github.com/stern/stern" arch="all" @@ -15,18 +15,19 @@ subpackages=" $pkgname-fish-completion " source="$pkgname-$pkgver.tar.gz::https://github.com/stern/stern/archive/refs/tags/v$pkgver.tar.gz" +options="net" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" build() { - GOLDFLAGS=" + _goldflags=" -X github.com/stern/stern/cmd.version=$pkgver -X github.com/stern/stern/cmd.commit=AlpineLinux -X github.com/stern/stern/cmd.date=$(date +%FT%T%Z) " - go build -v -o bin/$pkgname -ldflags "$GOLDFLAGS" + go build -v -o bin/$pkgname -ldflags "$_goldflags" for shell in bash fish zsh; do ./bin/stern --completion $shell > stern.$shell @@ -49,5 +50,5 @@ package() { } sha512sums=" -cae6aab0da301448352c346d4797c8e34b64411fccb1e925ef26ad918b355008d17bba1146074cea299019af33470a778a0481773c0867242699d4ba63a6531f stern-1.28.0.tar.gz +6eee8b950b6dc225d2c6ffa7d47803af6e5e810d3dca548658c532c3f62a182ed23022f28f13da7c3747fc1b5242015239ba059f59ef9b74e60b05a1307b08bb stern-1.29.0.tar.gz " diff --git a/testing/supermin/APKBUILD b/testing/supermin/APKBUILD index f351df3404f..9059e660578 100644 --- a/testing/supermin/APKBUILD +++ b/testing/supermin/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: Fathi Boudra <fathi.boudra@linaro.org> pkgname=supermin pkgver=5.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="tool for building supermin appliances" url="https://libguestfs.org/" -arch="all !riscv64" # limited by ocaml aport +arch="all !riscv64 !loongarch64" # limited by ocaml aport license="GPL-2.0-or-later" depends="cpio e2fsprogs" makedepends=" diff --git a/testing/surf/APKBUILD b/testing/surf/APKBUILD index afd9a346fdf..a78b4368419 100644 --- a/testing/surf/APKBUILD +++ b/testing/surf/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Orson Teodoro <orsonteodoro@hotmail.com> pkgname=surf pkgver=2.1 -pkgrel=2 +pkgrel=3 pkgdesc="surf is a simple web browser based on WebKit2/GTK+." url="https://surf.suckless.org/" arch="all" diff --git a/testing/swi-prolog/APKBUILD b/testing/swi-prolog/APKBUILD index 95f3ece5647..a65d5df1120 100644 --- a/testing/swi-prolog/APKBUILD +++ b/testing/swi-prolog/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Paul Bredbury <brebs@sent.com> pkgname=swi-prolog -pkgver=9.2.3 +pkgver=9.2.4 pkgrel=0 pkgdesc="Versatile implementation of the Prolog programming language" url="https://www.swi-prolog.org" @@ -87,5 +87,5 @@ pyc() { } sha512sums=" -5fa84255aedd9eaa8adfa1ae1367d12470f536b40908481d5a5bb1754a997c23433b24e8a2802af3381983ca2c347dae508a47a8dd4de3b713b9fbbfa988023b swipl-9.2.3.tar.gz +06a02d5853dbbc80eb1ad2e8160136168c1a9efce7f5b78a44adc4dead9e8bd1b4cbefbc0967505c940bd1bdf89233a7f376c71b5f098941fbcd7c36f884e54f swipl-9.2.4.tar.gz " diff --git a/testing/swig3/APKBUILD b/testing/swig3/APKBUILD index a5cd51781a5..4fa2f8d9dce 100644 --- a/testing/swig3/APKBUILD +++ b/testing/swig3/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Noel Kuntze <noel.kuntze@contauro.com> pkgname=swig3 pkgver=3.0.12 -pkgrel=2 +pkgrel=3 pkgdesc="A compiler that makes it easy to integrate C and C++ code with scripting languages" url="https://www.swig.org/" arch="all" diff --git a/testing/sydbox/APKBUILD b/testing/sydbox/APKBUILD new file mode 100644 index 00000000000..b975ce6b837 --- /dev/null +++ b/testing/sydbox/APKBUILD @@ -0,0 +1,95 @@ +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Jakub Jirutka <jakub@jirutka.cz> +pkgname=sydbox +pkgver=3.18.4 +pkgrel=0 +pkgdesc="Rock-solid user-space kernel to sandbox applications on Linux" +url="https://gitlab.exherbo.org/sydbox/sydbox" +# armv7,ppc64le: fails to build "nc" crate +# s390x: fails to build "nix" crate +arch="all !armv7 !ppc64le !s390x" +license="GPL-3.0-or-later" +depends="" +makedepends=" + cargo + cargo-auditable + libseccomp-dev + linux-headers + scdoc + " +checkdepends="coreutils" +subpackages=" + $pkgname-oci + $pkgname-utils + $pkgname-vim::noarch + $pkgname-doc + " +source="https://gitlab.exherbo.org/sydbox/sydbox/-/archive/v$pkgver/sydbox-v$pkgver.tar.gz + make-install-no-build.patch + make-fix-install.patch + no-systemd.patch + " +builddir="$srcdir/$pkgname-v$pkgver" +options="!check" # FIXME: tests don't work on CI + +# Disable mimalloc and inline-more features. +_cargo_opts="--frozen --no-default-features --features elf,oci,utils" + +prepare() { + default_prepare + + # NOTE: --targetu="$CTARGET" doesn't work here. + cargo fetch --locked +} + +build() { + cargo auditable build $_cargo_opts --release + + cd lib + cargo auditable build --frozen --release +} + +check() { + cargo test $_cargo_opts +} + +package() { + make install DESTDIR="$pkgdir" PREFIX=/usr + + # Delete utils for running integration tests. + rm -rf "$pkgdir"/usr/bin/syd-test* + + install -D -m644 src/esyd.sh -t "$pkgdir"/usr/libexec/ + install -D -m644 data/user.syd-3 "$pkgdir"/usr/share/doc/$pkgname/user.syd-3.sample +} + +oci() { + pkgdesc="OCI container runtime from sydbox" + depends="$pkgname=$pkgver-r$pkgrel" + + amove usr/bin/syd-oci +} + +utils() { + pkgdesc="Sydbox utilities" + + local bin; for bin in $(ls -1 "$pkgdir"/usr/bin/); do + case "$bin" in + syd | syd-chk | syd-exec | syd-oci) ;; # main programs + *) amove usr/bin/$bin;; + esac + done +} + +vim() { + pkgdesc="$pkgdesc (vim syntax)" + + amove usr/share/vim +} + +sha512sums=" +e30c85d03cb079f7aa1ec2b936484eda4ee17ff9325de4bf49e13a0cba8920c0b22d601de916c962dcfdfd867cae0c5e034041f3c303b0a781cff8be2cc11098 sydbox-v3.18.4.tar.gz +12c413eeee89626ab28a1527a6a6dbbe2e981d6c18c7d1ad298336a29092261c537ae3bca3bc3390f50273d735918152ada98ec17bb821150ba6a2472598c4f0 make-install-no-build.patch +d5137c97556713289fb483c07ac75b0864678cb668b833c618abad1c8385baa28d4f948c8d65e7e304727134cfad9e1b5ef6488944c8c71cf93eab24ba4e3ae3 make-fix-install.patch +72a88b4df8f94e0d84e5fe48541d62a02f323d3f651db15b86068c676aaf12c10612027c6c9084b7c8372989c34cfb4060d1c96bc8b359a733b346459a3d2605 no-systemd.patch +" diff --git a/testing/sydbox/make-fix-install.patch b/testing/sydbox/make-fix-install.patch new file mode 100644 index 00000000000..3cfd04e4e00 --- /dev/null +++ b/testing/sydbox/make-fix-install.patch @@ -0,0 +1,34 @@ +--- a/Makefile ++++ b/Makefile +@@ -181,25 +181,25 @@ + $(MAKE) install-vim + install-man: $(MANS) + for man in $(MANS1); do \ +- $(INSTALL) -pm 0644 $$man $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/; \ ++ $(INSTALL) -D -pm 0644 $$man -t $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/; \ + done + for man in $(MANS2); do \ +- $(INSTALL) -pm 0644 $$man $(DESTDIR)$(PREFIX)/$(MANDIR)/man2/; \ ++ $(INSTALL) -D -pm 0644 $$man -t $(DESTDIR)$(PREFIX)/$(MANDIR)/man2/; \ + done + for man in $(MANS5); do \ +- $(INSTALL) -pm 0644 $$man $(DESTDIR)$(PREFIX)/$(MANDIR)/man5/; \ ++ $(INSTALL) -D -pm 0644 $$man -t $(DESTDIR)$(PREFIX)/$(MANDIR)/man5/; \ + done + for man in $(MANS7); do \ +- $(INSTALL) -pm 0644 $$man $(DESTDIR)$(PREFIX)/$(MANDIR)/man7/; \ ++ $(INSTALL) -D -pm 0644 $$man -t $(DESTDIR)$(PREFIX)/$(MANDIR)/man7/; \ + done + install-vim: $(VIMS) + $(INSTALL) -d $(DESTDIR)$(PREFIX)/$(VIMDIR)/ftdetect + for f in $(VIMS_FTD); do \ +- $(INSTALL) -pm 0644 $$f $(DESTDIR)$(PREFIX)/$(VIMDIR)/ftdetect/; \ ++ $(INSTALL) -D -pm 0644 $$f -t $(DESTDIR)$(PREFIX)/$(VIMDIR)/ftdetect/; \ + done + $(INSTALL) -d $(DESTDIR)$(PREFIX)/$(VIMDIR)/syntax + for f in $(VIMS_SYN); do \ +- $(INSTALL) -pm 0644 $$f $(DESTDIR)$(PREFIX)/$(VIMDIR)/syntax/; \ ++ $(INSTALL) -D -pm 0644 $$f -t $(DESTDIR)$(PREFIX)/$(VIMDIR)/syntax/; \ + done + uninstall: + for program in $(PROGRAMS); do \ diff --git a/testing/sydbox/make-install-no-build.patch b/testing/sydbox/make-install-no-build.patch new file mode 100644 index 00000000000..1cce85aec4b --- /dev/null +++ b/testing/sydbox/make-install-no-build.patch @@ -0,0 +1,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -161,3 +161,3 @@ + done +-install: release ++install: + $(INSTALL) -d $(DESTDIR)$(PREFIX)/$(BINDIR)/ diff --git a/testing/sydbox/no-systemd.patch b/testing/sydbox/no-systemd.patch new file mode 100644 index 00000000000..416444a25ef --- /dev/null +++ b/testing/sydbox/no-systemd.patch @@ -0,0 +1,9 @@ +Disable "systemd" feature and also "v1" feature (legacy version of cgroups). + +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -93,2 +93,2 @@ +-libcgroups = { version = "0.3", optional = true } +-libcontainer = { version = "0.3", optional = true } ++libcgroups = { version = "0.3", optional = true, default-features = false, features = ["v2"] } ++libcontainer = { version = "0.3", optional = true, default-features = false, features = ["v2", "libseccomp"] } diff --git a/testing/tartube/APKBUILD b/testing/tartube/APKBUILD index 1eb84ce7c2e..68cc4c424a1 100644 --- a/testing/tartube/APKBUILD +++ b/testing/tartube/APKBUILD @@ -5,7 +5,8 @@ pkgver=2.5.0 pkgrel=0 pkgdesc="GUI front-end for youtube-dl, partly based on youtube-dl-gui and written in Python 3 / Gtk 3" url="https://github.com/axcore/tartube" -arch="noarch !s390x" # freeimage +# blocked by streamlink +#arch="noarch !s390x" # freeimage license="LGPL-2.1-or-later" depends=" aria2 diff --git a/testing/td-agent-bit/0001-lib-flb_libco-Fix-ppc64-function-arguments.patch b/testing/td-agent-bit/0001-lib-flb_libco-Fix-ppc64-function-arguments.patch deleted file mode 100644 index fd0578a054d..00000000000 --- a/testing/td-agent-bit/0001-lib-flb_libco-Fix-ppc64-function-arguments.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a0dfda11ab576da7b3c931f7512fa77b86d95209 Mon Sep 17 00:00:00 2001 -From: Breno Leitao <breno.leitao@gmail.com> -Date: Mon, 8 May 2017 19:36:43 +0000 -Subject: [PATCH] lib: flb_libco: Fix ppc64 function arguments - -This software currently does not built on Power due to duplicated -function. - - lib/flb_libco/ppc.c:282:12: error: conflicting types for 'co_create' - cothread_t co_create(unsigned int size, void (*entry_)(void)) { - - lib/flb_libco/libco.h:19:12: note: previous declaration of 'co_create' was here - cothread_t co_create(unsigned int, void (*)(void), size_t *); - -This is happening because commit -b2bb2227cd2712df1946c438ec733b5956e9ecd8 forgot to change the function -name on ppc source code. - -Signed-off-by: Breno Leitao <breno.leitao@gmail.com> ---- - lib/flb_libco/ppc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/flb_libco/ppc.c b/lib/flb_libco/ppc.c -index e6536d56..8b70ad77 100755 ---- a/lib/flb_libco/ppc.c -+++ b/lib/flb_libco/ppc.c -@@ -279,7 +279,8 @@ static uint32_t* co_create_(unsigned size, uintptr_t entry) { - return t; - } - --cothread_t co_create(unsigned int size, void (*entry_)(void)) { -+cothread_t co_create(unsigned int size, void (*entry_)(void), -+ size_t *out_size) { - uintptr_t entry = (uintptr_t)entry_; - uint32_t* t = 0; - -@@ -289,6 +290,7 @@ cothread_t co_create(unsigned int size, void (*entry_)(void)) { - t = co_create_(size, entry); - } - -+ *out_size = size; - if(t) { - uintptr_t sp; - int shift; --- -2.12.2 - diff --git a/testing/td-agent-bit/APKBUILD b/testing/td-agent-bit/APKBUILD deleted file mode 100644 index 3d6bc513f6e..00000000000 --- a/testing/td-agent-bit/APKBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# Contributor: Stuart Cardall <developer@it-offshore.co.uk> -# Maintainer: Stuart Cardall <developer@it-offshore.co.uk> -pkgname=td-agent-bit -_pkgname=fluent-bit -pkgver=0.10.1 -pkgrel=4 -pkgdesc="Fast and Lightweight Log/Data Forwarder [fluent-bit]" -url="http://fluentbit.io" -#arch="all !aarch64 !s390x !riscv64" -# fails to build -arch="" -license="Apache-2.0" -makedepends="cmake linux-headers zlib-dev mbedtls-dev" -subpackages="$pkgname-dev $pkgname-doc" -source="http://fluentbit.io/releases/0.10/$_pkgname-$pkgver.tar.gz - $pkgname.confd - $pkgname.initd - disable-jemalloc.patch - 0001-lib-flb_libco-Fix-ppc64-function-arguments.patch - " -builddir="$srcdir/"$_pkgname-$pkgver - -build() { - cd "$builddir"/build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DCMAKE_INSTALL_LIBDIR:PATH=lib \ - -DCMAKE_C_FLAGS="$CFLAGS -Wno-implicit-fallthrough" \ - -DFLB_ALL=ON \ - -DFLB_TD=ON .. - make || return 1 -} - -package() { - cd "$builddir"/build - - make DESTDIR="$pkgdir" install || return 1 - - install -m644 -D ../README.md \ - "$pkgdir"/usr/share/doc/$pkgname/README.md || return 1 - install -m644 -D ../LICENSE \ - "$pkgdir"/usr/share/licenses/$pkgname/LICENSE || return 1 - - install -m644 -D "$srcdir"/$pkgname.confd \ - "$pkgdir"/etc/conf.d/$pkgname || return 1 - install -m755 -D "$srcdir"/$pkgname.initd \ - "$pkgdir"/etc/init.d/$pkgname || return 1 -} - -sha512sums="93b1e6c277ebecb65e40d078d98f1942dcda7fa02abd1f8c2d95e4c73d20ec36bee0d0d072b7624894a5b75a455d5c25b91a08c6a05e391b40a03a63a15e3096 fluent-bit-0.10.1.tar.gz -6c1c67ac965fb9f54e362a7de8864afbffb9a22bffb5b5ca3a68f3950b9a27ccaee29d4bfb223035ccf5276e3fe09d0873685c58c47e055ad4bea57ccf80d90e td-agent-bit.confd -5103ab108bf0bafec2ca34db6e3a629977cd0a6ffb3f213b3885af5e2c08218ede4784d64310d6acdc7a09a9bc1e29330eaf692dbebdc6619de5a69cb1f80948 td-agent-bit.initd -bf41aa1eef5ae0239acb2f54356d090d71611eb021de5b0d92be10079ef3bc5c7cc1dade1de98fd60354b883e53652a6f3f54a7a03acd00471e1f65d654aac32 disable-jemalloc.patch -cf78d431e23c9c14d1564b6c4f6bc6d1645a2d3a74a276eb1a0a50f9d1725b04cb83f368337293f2493b9940459fa3ee7c59bbd2b2f3f67faeb4c5ac20787ddb 0001-lib-flb_libco-Fix-ppc64-function-arguments.patch" diff --git a/testing/td-agent-bit/disable-jemalloc.patch b/testing/td-agent-bit/disable-jemalloc.patch deleted file mode 100644 index d71f932c479..00000000000 --- a/testing/td-agent-bit/disable-jemalloc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- fluent-bit-0.10.1/CMakeLists.txt -+++ fluent-bit-0.10.1/CMakeLists.txt.new -@@ -306,7 +306,7 @@ - - if(FLB_TD) - FLB_DEFINITION(FLB_IS_TD_AGENT) -- FLB_OPTION(FLB_JEMALLOC ON) -+ FLB_OPTION(FLB_JEMALLOC OFF) - set(FLB_PROG_NAME "TD Agent Bit") - set(FLB_OUT_NAME "td-agent-bit") - set(WITHOUT_HEADERS On) diff --git a/testing/td-agent-bit/td-agent-bit.confd b/testing/td-agent-bit/td-agent-bit.confd deleted file mode 100644 index c909913a4e5..00000000000 --- a/testing/td-agent-bit/td-agent-bit.confd +++ /dev/null @@ -1,4 +0,0 @@ -# config file for td-agent-bit [fluent-bit] - -TD_CONFIG=/etc/td-agent-bit/td-agent-bit.conf -TD_OPTS="-c $TD_CONFIG" diff --git a/testing/td-agent-bit/td-agent-bit.initd b/testing/td-agent-bit/td-agent-bit.initd deleted file mode 100644 index 6a84c19ddfe..00000000000 --- a/testing/td-agent-bit/td-agent-bit.initd +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -supervisor=supervise-daemon - -description="Fast and Lightweight Log/Data Forwarder [fluent-bit]" - -nice=19 -pidfile="/run/$SVCNAME.sd.pid" -supervise_daemon_args="-p $pidfile -N $nice" -command=/usr/bin/td-agent-bit -command_args=${TD_OPTS} - -depends() { - use net -} diff --git a/testing/templ/APKBUILD b/testing/templ/APKBUILD index b8b8686dbc4..01cf56f1e8e 100644 --- a/testing/templ/APKBUILD +++ b/testing/templ/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=templ -pkgver=0.2.598 -pkgrel=2 +pkgver=0.2.663 +pkgrel=0 pkgdesc="Language for writing HTML user interface in Go" url="https://templ.guide/" arch="all" @@ -11,10 +11,10 @@ checkdepends="gopls" source="$pkgname-$pkgver.tar.gz::https://github.com/a-h/templ/archive/refs/tags/v$pkgver.tar.gz" options="net" # download Go modules -# /cmd/templ/lspcmd: hangs on s390x +# /cmd/templ/lspcmd: hangs on s390x, fails on riscv64 # /cmd/templ/generatecmd/testwatch: panics on 32-bit platforms (unaligned 64-bit atomic operation) case "$CARCH" in - s390x|x86|armhf|armv7) options="$options !check";; + s390x|riscv64|x86|armhf|armv7) options="$options !check";; esac export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" @@ -36,5 +36,5 @@ package() { } sha512sums=" -7c7988e27498e391701c7df29663c3a44c2a50f97ea668a6fd84e54ee30dd47f3c52fe904f27b0dd184718f5518bee284e4899da48e6a00109691eaa65da6092 templ-0.2.598.tar.gz +ea70cbae3dda39c1af331d4cecdd8690a09223892d5a3992fa52ffaeab4d165981cc0359abd9d08d269f936ceab70e998320ee64c8a4ffe984370e6099011df5 templ-0.2.663.tar.gz " diff --git a/testing/tetragon-client/APKBUILD b/testing/tetragon-client/APKBUILD index 0e7900fd0ca..7e4badbdf2c 100644 --- a/testing/tetragon-client/APKBUILD +++ b/testing/tetragon-client/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=tetragon-client -pkgver=1.0.2 -pkgrel=2 +pkgver=1.1.0 +pkgrel=0 pkgdesc="CLI client for eBPF-based Security Observability and Runtime Enforcement" url="https://github.com/cilium/tetragon" arch="x86_64 aarch64" # fails to build on other platforms @@ -39,6 +39,7 @@ check() { # /pkg/alignchecker: fails to build bpf/objs/bpf_alignchecker.o # /pkg/sensors/{tracing,exec}, /pkg/{tracepoint,btf,bugtool}: try to access /sys/kernel # /pkg/sensors/exec/procevents, /pkg/cgroups: fail on CI (lacking cgroup controller "pids") + # /pkg/pidfile: try to create /var/run/tetragon directory # shellcheck disable=2046 GOFLAGS="${GOFLAGS/-trimpath/}" go test $(go list ./... | grep -v \ -e '/bpf/tests$' \ @@ -46,6 +47,7 @@ check() { -e '/pkg/btf$' \ -e '/pkg/bugtool$' \ -e '/pkg/cgroups$' \ + -e '/pkg/pidfile$' \ -e '/pkg/reader/proc$' \ -e '/pkg/selectors$' \ -e '/pkg/sensors/exec$' \ @@ -68,5 +70,5 @@ package() { } sha512sums=" -73404cb1900f451d80b0d0295a2c3f5ef529eb4da76406aca4b889a9dab60e4a0cb578363ee689311b8be33fa5ac902441f79e02220d567b1bf37a9bf582d7ce tetragon-client-1.0.2.tar.gz +cd8d5964e9488b12fccc34e62a26cd735af3608a9709cda556b12bd9d094fe5e2982daf375bc3d233b5f29b49412d2a66708d00b480efa31fc748264cd3580c0 tetragon-client-1.1.0.tar.gz " diff --git a/testing/texlab/APKBUILD b/testing/texlab/APKBUILD index 3f630a6533d..6c2c7a06672 100644 --- a/testing/texlab/APKBUILD +++ b/testing/texlab/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Dominika Liberda <ja@sdomi.pl> # Contributor: Dominika Liberda <ja@sdomi.pl> pkgname=texlab -pkgver=5.12.3 +pkgver=5.15.0 pkgrel=0 pkgdesc="Implementation of the Language Server Protocol for LaTeX" url="https://github.com/latex-lsp/texlab" @@ -38,5 +38,5 @@ package() { } sha512sums=" -ab00f03dae00540225a2e87fad466bf6031916483bcb0953160dbd3003548bbf9c28212c701be887f70bdb269752f4d8818d235c5341e4c9488540b121cd5bc4 texlab-v5.12.3.tar.gz +c45af7395f7fd140f5b64d245a54c7c771692c6ed8ce5ae28bff6c3d013cf66a53c4d99e1bf525cfc2017e6e9b00ef26aa57db8a9d4c0815f564e6092bd38eb9 texlab-v5.15.0.tar.gz " diff --git a/testing/texstudio/APKBUILD b/testing/texstudio/APKBUILD index 298716d5398..72e6c6db394 100644 --- a/testing/texstudio/APKBUILD +++ b/testing/texstudio/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jonas <3426-spameier@users.gitlab.alpinelinux.org> # Maintainer: Jonas <3426-spameier@users.gitlab.alpinelinux.org> pkgname=texstudio -pkgver=4.7.3 -pkgrel=1 +pkgver=4.8.0 +pkgrel=0 pkgdesc="A fully featured editor for LaTeX documents" url="https://www.texstudio.org" # disabled elsewhere due to huge size, request if you need it @@ -39,6 +39,6 @@ package() { } sha512sums=" -45537cbb585f3d0053f81a7257e8c18a091a09fbecdc09a5da7be5e7233ccbad4c23fd6679a379a6ab2a7543a58c0589249ec082e990d14354b37c5ea906e8e0 texstudio-4.7.3.tar.gz +a743b34ab6ed69ecc1192853aa6cc23febed7fd2ace4bfd387e3e670f6f01608bd26c776471a8265778a6aca030037dc929e572bd9bff96984cb23d81a27e03d texstudio-4.8.0.tar.gz 60380c7e962ea9deb9117c95153dc7f827b0534adeeb59b6de123d57264b74dba3c960744433686c68fac34f11d788125ba7bc08d36882b10f1282bfa597829d qt6.patch " diff --git a/testing/thumbdrives/0001-Migrate-from-libhandy-0.1-to-libhandy-1.patch b/testing/thumbdrives/0001-Migrate-from-libhandy-0.1-to-libhandy-1.patch new file mode 100644 index 00000000000..e80d4d4bdc6 --- /dev/null +++ b/testing/thumbdrives/0001-Migrate-from-libhandy-0.1-to-libhandy-1.patch @@ -0,0 +1,50 @@ +From 872d05e296709d1133bd8dbc26ae4cf31f03ac89 Mon Sep 17 00:00:00 2001 +From: Stefan Hansson <newbyte@postmarketos.org> +Date: Mon, 1 Apr 2024 18:13:59 +0200 +Subject: [PATCH thumbdrives 1/2] Migrate from libhandy-0.1 to libhandy-1 + +libhandy-0.1 is a really old version and most apps have migrated to +libhandy-1 by now. In Alpine in particular, Thumbdrives is the only +package which still depends on libhandy-0.1. As such, migrate it to the +newer version. +--- + meson.build | 2 +- + src/window.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index a44ec0c..39a5d35 100644 +--- a/meson.build ++++ b/meson.build +@@ -5,7 +5,7 @@ project('thumbdrives', + ], + ) + +-dependency('libhandy-0.0', version: '>=0.0.10') ++dependency('libhandy-1') + + i18n = import('i18n') + +diff --git a/src/window.py b/src/window.py +index 6223ccc..81d4097 100644 +--- a/src/window.py ++++ b/src/window.py +@@ -4,13 +4,13 @@ from pathlib import Path + + import gi + gi.require_version('Gtk', '3.0') +-gi.require_version('Handy', '0.0') ++gi.require_version('Handy', '1') + from gi.repository import Gtk, Handy + import xdg.BaseDirectory + + import thumbdrives.vdisk as vdisk + +-Handy.Column() ++Handy.Clamp() + + @Gtk.Template(resource_path='/nl/brixit/Thumbdrives/window.ui') + class ThumbdrivesWindow(Gtk.ApplicationWindow): +-- +2.44.0 + diff --git a/testing/thumbdrives/APKBUILD b/testing/thumbdrives/APKBUILD index 9a368a3edd1..2c681110a28 100644 --- a/testing/thumbdrives/APKBUILD +++ b/testing/thumbdrives/APKBUILD @@ -1,14 +1,16 @@ # Maintainer: Martijn Braam <martijn@brixit.nl> pkgname=thumbdrives pkgver=0.3.2 -pkgrel=0 +pkgrel=2 pkgdesc="Mass storage and iso emulator" url="https://git.sr.ht/~martijnbraam/thumbdrives" arch="noarch" license="MIT" -depends="python3 py3-gobject3 py3-xdg py3-setuptools gtk+3.0 libhandy" -makedepends="glib-dev libhandy-dev meson ninja" -source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~martijnbraam/thumbdrives/archive/$pkgver.tar.gz" +depends="python3 py3-gobject3 py3-xdg py3-setuptools gtk+3.0 libhandy1" +makedepends="glib-dev libhandy1-dev meson ninja" +source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~martijnbraam/thumbdrives/archive/$pkgver.tar.gz + 0001-Migrate-from-libhandy-0.1-to-libhandy-1.patch + " options="!check" # There's no testsuite build() { @@ -22,4 +24,5 @@ package() { sha512sums=" 1594a303e375ca489fbe671e6917013c6d32239d8dfe325616ba94da81ca95cbe82fe0cb719f91a0f78e1b18d59713048899442749ead0a0cdd29508a0bea1d6 thumbdrives-0.3.2.tar.gz +b2149a2c12020d329642be7300ce23a3fc67c21214b099c1edac3429db58a7637d20bfcab07a2e3e269f444d51ba26853455d4acc303f4a6b6896b529928fc0c 0001-Migrate-from-libhandy-0.1-to-libhandy-1.patch " diff --git a/testing/tick/APKBUILD b/testing/tick/APKBUILD new file mode 100644 index 00000000000..0fa67f8f313 --- /dev/null +++ b/testing/tick/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Coco Liliace <coco@liliace.dev> +# Maintainer: Coco Liliace <coco@liliace.dev> +pkgname=tick +pkgver=1.1.0 +pkgrel=0 +pkgdesc="A preset-oriented TUI metronome" +url="https://sr.ht/~liliace/tick/" +arch="all" +license="GPL-3.0-only" +makedepends="alsa-lib-dev scdoc" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~liliace/tick/archive/$pkgver.tar.gz" + +build() { + make release + make doc +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" PREFIX="/usr" install +} + +sha512sums=" +f30c3ec8d561cb0bb8969bb9bf5e5e6a9bcc316838657ef3a81808f0731dbc8c28ad1ac43f15cb6b12bd8bcd22eb0e9591b16ed4a3cfd0a90a1593e1339ecd4d tick-1.1.0.tar.gz +" diff --git a/testing/tomcat9/APKBUILD b/testing/tomcat9/APKBUILD index 60f49da4776..384fcfbf513 100644 --- a/testing/tomcat9/APKBUILD +++ b/testing/tomcat9/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=tomcat9 -pkgver=9.0.87 +pkgver=9.0.89 pkgrel=0 pkgdesc="Open source implementation of the Java Servlet 4.0 and JavaServer Pages 2.3 technologies" url="https://tomcat.apache.org/" @@ -125,6 +125,6 @@ openrc() { } sha512sums=" -71a64fe805aab89ef4798571d860a3c9a4f751f808921559a9249305abb205836de33ab89bb33b625a77f799f193d6bffbe94aadf293866df756d708f5bfb933 apache-tomcat-9.0.87.tar.gz +aaa2851bdc7a2476b6793e95174965c1c861531f161d8a138e87f8532b1af4d4b3d92dd1ae890614a692e5f13fb2e6946a1ada888f21e9d7db1964616b4181f0 apache-tomcat-9.0.89.tar.gz 7d16b14977c22e1ae998d15a0a83a574624b62c722a0adbfd05a4105581eee347d38e366a269ebca4c8fa894c3718d6fbdcea0e0974d20407075ec2af6ea07a4 10-daemon.patch " diff --git a/testing/tootik/APKBUILD b/testing/tootik/APKBUILD index f907d782ef6..c811cdeb020 100644 --- a/testing/tootik/APKBUILD +++ b/testing/tootik/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=tootik -pkgver=0.9.5 -pkgrel=1 +pkgver=0.10.4 +pkgrel=0 pkgdesc="Federated nanoblogging service with Gemini frontend" url="https://github.com/dimkr/tootik" arch="all" @@ -17,8 +17,6 @@ source="https://github.com/dimkr/tootik/archive/refs/tags/$pkgver/tootik-$pkgver tootik.cfg tootik.initd tootik.confd - - fix-32bit-maxint.patch " export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" @@ -60,9 +58,8 @@ package() { } sha512sums=" -1f2a75d7abbf730637152037498b8b6872c8f165a7b52c5603c89a10900b4875e6bb09f9c89864fd966294403b4fae19cc468dc87e84c0582f966f2e82ca76a5 tootik-0.9.5.tar.gz -b86a8d3fe428244b05a93d137ea38253801ccc8a72e5e941083158d7f7323c3bb25a1e00d5b1d084ee18f486c7e24a2076a6aae69a2a99812ee21fb1c6d6922f tootik.cfg +827317c0b9e968bd1a2dac3c09cf4e24b20c40d7c21a7e9b2328ddc6d7cdf5c574bbe28df2e385e7748ebb5db51dec77944f2ccc53337f57a8a0a5f56f3b2316 tootik-0.10.4.tar.gz +2e106abb178f0918a18c48039f46d8de8886a1c5457ddc735de152da75b561a9f4c4c5e89955becc3edeceea3f8e80285593183a277c9ada6122c872dfb29114 tootik.cfg 7999e43dc50604cc0d0d97292aed9ee5fc658b08b46fc4d92b21916246ee43b54b79ba9306b6196ac8b86d6d53498266a499cd31e90f22749f78bc5d5c404b19 tootik.initd 11fa51d25baaeb295c80cf3e154eb1eab67f9633e23f01cc0a25c427af368746d536bff17de2153b5be925489e3f84ca5ba492a4a43c32aaf33b8c4d00d14fd6 tootik.confd -b1a49015c1e5115e420d04b33290b5726fda492fcca71b71bf9083f5ea66259c38cda308df1abb0c033042ea0da9f910cb64f7be242f7ba4cfc6fda8ff576275 fix-32bit-maxint.patch " diff --git a/testing/tootik/fix-32bit-maxint.patch b/testing/tootik/fix-32bit-maxint.patch deleted file mode 100644 index c119e880fac..00000000000 --- a/testing/tootik/fix-32bit-maxint.patch +++ /dev/null @@ -1,24 +0,0 @@ -Patch-Source: https://github.com/dimkr/tootik/commit/eba68e3c0f3eaeeb02d2fd25553fcdb61cd814ee.patch --- -From eba68e3c0f3eaeeb02d2fd25553fcdb61cd814ee Mon Sep 17 00:00:00 2001 -From: Dima Krasner <dima@dimakrasner.com> -Date: Sun, 31 Mar 2024 09:18:28 +0300 -Subject: [PATCH] fix build failure on 32-bit architectures (fixes #56) - ---- - cfg/cfg.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cfg/cfg.go b/cfg/cfg.go -index 8cd17bb..3db5662 100644 ---- a/cfg/cfg.go -+++ b/cfg/cfg.go -@@ -262,7 +262,7 @@ func (c *Config) FillDefaults() { - c.DeliveryTimeout = time.Minute * 5 - } - -- if c.DeliveryWorkers <= 0 || c.DeliveryWorkers > math.MaxUint32 { -+ if c.DeliveryWorkers <= 0 || c.DeliveryWorkers > math.MaxInt { - c.DeliveryWorkers = 4 - } - diff --git a/testing/tootik/tootik.cfg b/testing/tootik/tootik.cfg index 0dca7f4f02e..2b28b0bdfeb 100644 --- a/testing/tootik/tootik.cfg +++ b/testing/tootik/tootik.cfg @@ -13,6 +13,11 @@ "PollDuration": 2592000000000000, "MaxDisplayNameLength": 30, "MaxBioLength": 500, + "MaxAvatarSize": 2097152, + "MaxAvatarWidth": 1024, + "MaxAvatarHeight": 1024, + "AvatarWidth": 400, + "AvatarHeight": 400, "MinActorEditInterval": 1800000000000, "MaxFollowsPerUser": 150, "FollowAcceptTimeout": 172800000000000, diff --git a/testing/toybox/APKBUILD b/testing/toybox/APKBUILD index 224f441cd31..ce756bd8e03 100644 --- a/testing/toybox/APKBUILD +++ b/testing/toybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: André Klitzing <aklitzing@gmail.com> # Contributor: André Klitzing <aklitzing@gmail.com> pkgname=toybox -pkgver=0.8.10 +pkgver=0.8.11 pkgrel=0 pkgdesc="A BSD-licensed alternative to busybox" arch="all" @@ -29,5 +29,5 @@ package() { } sha512sums=" -b2c36bc4e41741893a4fe039dd653f552ab987b948f78c1e5d04abb13ffbb8f898af636967739067877afef9ac0af10c259f674acdc4a80084a846fb02742461 toybox-0.8.10.tar.gz +ec442a65666e2e9dc46b3cd1e49d2c69eae62df9e10ccf15632b75529d4381a3f828b05f48a7e24844d386fd94f015e338705550fb2a1ecc57eb96268515162c toybox-0.8.11.tar.gz " diff --git a/testing/trafficserver9/APKBUILD b/testing/trafficserver9/APKBUILD index 43c6f7b1fa9..74fe47ab235 100644 --- a/testing/trafficserver9/APKBUILD +++ b/testing/trafficserver9/APKBUILD @@ -8,7 +8,7 @@ provides="trafficserver=$pkgver-r$pkgrel" pkgdesc="Fast, scalable and extensible HTTP/1.1 and HTTP/2 compliant caching proxy server" url="https://trafficserver.apache.org/" # other platforms are unsupported -# ppc64le: luajit +# ppc64le, loongarch64: luajit arch="x86_64 aarch64" license="Apache-2.0" makedepends=" diff --git a/testing/trantor/APKBUILD b/testing/trantor/APKBUILD new file mode 100644 index 00000000000..9eda74f730a --- /dev/null +++ b/testing/trantor/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Díaz Urbaneja Diego <sodomon2@gmail.com> +# Maintainer: Díaz Urbaneja Diego <sodomon2@gmail.com> +pkgname=trantor +pkgver=1.5.18 +pkgrel=0 +pkgdesc="A non-blocking I/O tcp network lib based on c++14/17." +url="https://github.com/an-tao/trantor" +arch="all" +license="BSD-3-Clause" +makedepends=" + cmake + c-ares-dev + doxygen + openssl-dev + samurai + " +subpackages="$pkgname-dev $pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/an-tao/trantor/archive/v$pkgver.tar.gz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + local crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake -B build -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + $crossopts + cmake --build build +} + +check() { + ctest --test-dir build --output-on-failure +} + +package() { + install -Dm644 License "$pkgdir/usr/share/licenses/$pkgname/License" + DESTDIR="$pkgdir" cmake --install build +} + +sha512sums=" +2dba27efad95155a76968959d9bd2510be8502b9424716493f385aebbce2481553cc8fae283076029aed4bef6f0aadb0bec3f9acb98fbca3ef4d49b936558f8c trantor-1.5.18.tar.gz +" diff --git a/testing/tree-sitter-c-sharp/APKBUILD b/testing/tree-sitter-c-sharp/APKBUILD index 0ad08acd4be..f8e468ee26b 100644 --- a/testing/tree-sitter-c-sharp/APKBUILD +++ b/testing/tree-sitter-c-sharp/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=tree-sitter-c-sharp -pkgver=0.20.0 -pkgrel=1 +pkgver=0.21.2 +pkgrel=0 pkgdesc="C# Grammar for tree-sitter" url="https://github.com/tree-sitter/tree-sitter-c-sharp" arch="all" @@ -21,5 +21,5 @@ package() { } sha512sums=" -31530ff57d02b84c8e7e7183abb927c40839500afc225cfdbe685495962c3f129ea459efaf73abbb76951bfc14b890cbdfa9a847b3ae92c8db495d173d0e0e08 tree-sitter-c-sharp-0.20.0.tar.gz +7bab224ad23c33a982f8690c5887f7904e7498cac94cf7a28a313d2666f62d84c68035b15f6812c21aecb89c42d77f3bd697d208081dd9b11d1e3b55a5cbcf6b tree-sitter-c-sharp-0.21.2.tar.gz " diff --git a/testing/tree-sitter-elixir/APKBUILD b/testing/tree-sitter-elixir/APKBUILD index 3e2c757160b..cd621effd6c 100644 --- a/testing/tree-sitter-elixir/APKBUILD +++ b/testing/tree-sitter-elixir/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=tree-sitter-elixir -pkgver=0.1.1 +pkgver=0.2.0 pkgrel=0 pkgdesc="Elixir grammar for tree-sitter" url="https://github.com/elixir-lang/tree-sitter-elixir" @@ -21,5 +21,5 @@ package() { } sha512sums=" -d1ba3c9755004a281fa18785fe0d7d419f25fd50adcfb325724965dfcfb511043e3e385f79b71b7d0d35355767031575fad2c9f9eb3034cf93ff89eb61aa70c2 tree-sitter-elixir-0.1.1.tar.gz +c23b679e23ae3403c9e2741b5ceefce54e96fa5d9ce97d0975776340bbbac321324ed5930fd76fd525b4a06a702143715e366b8a043d243f8a60307716639feb tree-sitter-elixir-0.2.0.tar.gz " diff --git a/testing/tree-sitter-kotlin/APKBUILD b/testing/tree-sitter-kotlin/APKBUILD index 910061e90d7..640b0132743 100644 --- a/testing/tree-sitter-kotlin/APKBUILD +++ b/testing/tree-sitter-kotlin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=tree-sitter-kotlin -pkgver=0.3.5 +pkgver=0.3.6 pkgrel=0 pkgdesc="Kotlin grammar for Tree-Sitter" url="https://github.com/fwcd/tree-sitter-kotlin" @@ -21,5 +21,5 @@ package() { } sha512sums=" -b699463391cc811abb9368b59a789e8574e065573d93627e5a41590effe99f2318bda3bb1026e80435dc3cdd5998dc70955da15f57251394a0bbfcb5f60b8672 tree-sitter-kotlin-0.3.5.tar.gz +adff74105333087380285096f3bb2a1f43efa52df732d266cf5a714a1e3c77aa1d59c12415c07f3b8c17d46352359874f50fce9946c91ba9b812576e2e2cd93c tree-sitter-kotlin-0.3.6.tar.gz " diff --git a/testing/tree-sitter-ssh-client-config/APKBUILD b/testing/tree-sitter-ssh-client-config/APKBUILD index c901f7b3e49..0eec979b723 100644 --- a/testing/tree-sitter-ssh-client-config/APKBUILD +++ b/testing/tree-sitter-ssh-client-config/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=tree-sitter-ssh-client-config -pkgver=2024.4.11 +pkgver=2024.5.9 pkgrel=0 pkgdesc="tree-sitter grammar for SSH client configuration files" url="https://github.com/metio/tree-sitter-ssh-client-config" @@ -21,5 +21,5 @@ package() { } sha512sums=" -3c47cfbf8f00bc568b3d93ce4945ff46ebb2025cc469d9022231b96fee60febf7e90b93a3f03adb3fef214798012f60944253a28cf941b064a83694b9c7f8892 tree-sitter-ssh-client-config-2024.4.11.tar.gz +b95090dd11de9ac5599419c873080ad867434d58adf84fc64df031086f3a0955c4b4fb9e2bc1825189f67c515f2137399204063070dd97ece20a343a41aca20a tree-sitter-ssh-client-config-2024.5.9.tar.gz " diff --git a/testing/tree-sitter-xml/APKBUILD b/testing/tree-sitter-xml/APKBUILD index 03162e7457e..0ca3d463ce1 100644 --- a/testing/tree-sitter-xml/APKBUILD +++ b/testing/tree-sitter-xml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=tree-sitter-xml -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=0 pkgdesc="XML & DTD grammars for tree-sitter" url="https://github.com/ObserverOfTime/tree-sitter-xml" @@ -30,5 +30,5 @@ package() { } sha512sums=" -5034affe959b3fb5112f8074dce196eab09f3d3e1ec154e77f0bfb119110c3cd5edaddbb11495b0f393d0dbc735e56ae25a968fa5bc6897ee8bb6a281e3c0fe8 tree-sitter-xml-0.6.2.tar.gz +f2d53a6ce48b6c0b9de2c063a19d96e11b868a26135f1e94a24593d35f1c58e5ce6212a86e3a88d9a4308c3a98e3fb936109703901e2746279cb1af27a92dcb1 tree-sitter-xml-0.6.3.tar.gz " diff --git a/testing/trivy/APKBUILD b/testing/trivy/APKBUILD index 7aaf9db023c..ae5ae82e8dc 100644 --- a/testing/trivy/APKBUILD +++ b/testing/trivy/APKBUILD @@ -1,8 +1,8 @@ # Contributor: TBK <alpine@jjtc.eu> # Maintainer: TBK <alpine@jjtc.eu> pkgname=trivy -pkgver=0.50.1 -pkgrel=2 +pkgver=0.50.4 +pkgrel=0 pkgdesc="Simple and comprehensive vulnerability scanner for containers" url="https://github.com/aquasecurity/trivy" arch="all" @@ -30,5 +30,5 @@ package() { } sha512sums=" -b2ef68484f2102325c60cfae45ff7b1aaa61b73b52d0904380bd623980631bb83ad28f42bb1a15a26a2966bb00433280412503ba47e8bf65ee70618dc842d812 trivy-0.50.1.tar.gz +0ab12656ca567b15cd8154c80425a98393cf33212e11474ad84be6160b4a8fa8235187f9777e317ddb28893d3e31919903805513b12d92ab6a7b1a75720eb9b2 trivy-0.50.4.tar.gz " diff --git a/testing/trunk/APKBUILD b/testing/trunk/APKBUILD index 81f17ea9380..fff7979a814 100644 --- a/testing/trunk/APKBUILD +++ b/testing/trunk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=trunk -pkgver=0.19.2 +pkgver=0.20.1 pkgrel=0 pkgdesc="Build, bundle & ship your Rust WASM application to the web" url="https://trunkrs.dev" @@ -45,5 +45,5 @@ package() { } sha512sums=" -0b107f5fb9ab96a3738d614efae38da254f57a36715d5591c2d8b5542b028152f48cf3f27edb715b5dc072014514e620e776d0774e937152b8df213c2619b7ba trunk-0.19.2.tar.gz +7888984bcbca7d6448db3c73260fb9cf45390a4c394ca1c699e1c3e615d1f58e807f005f4518c572f5a166472f835660fdeaed970a4d2985087c6ee98972440b trunk-0.20.1.tar.gz " diff --git a/testing/ttdl/APKBUILD b/testing/ttdl/APKBUILD index c7545c6113e..2f49327d443 100644 --- a/testing/ttdl/APKBUILD +++ b/testing/ttdl/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Thomas Böhler <witcher@wiredspace.de> # Maintainer: Thomas Böhler <witcher@wiredspace.de> pkgname=ttdl -pkgver=4.2.1 +pkgver=4.3.0 pkgrel=0 pkgdesc="Terminal Todo List Manager" url="https://github.com/VladimirMarkelov/ttdl" @@ -35,5 +35,5 @@ package() { } sha512sums=" -b00f8952546f533cf26d0d16f04469d7537d96af4e553452b7030991e962b881f46e1911a1b00a14af590c280fd5e2dbdf844fb953df3135cd24e55900a00ea5 ttdl-4.2.1.tar.gz +63394c6838b0fc9cd108109c1e552dad832fe05dc7ad3a9a6b758f8f5455aee963948442e5cc4ba54d9e2987a5734bbb2f67b3168aa4e5f3a7e7848c880627b8 ttdl-4.3.0.tar.gz " diff --git a/testing/ttfautohint/APKBUILD b/testing/ttfautohint/APKBUILD new file mode 100644 index 00000000000..343afd87d86 --- /dev/null +++ b/testing/ttfautohint/APKBUILD @@ -0,0 +1,67 @@ +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Jakub Jirutka <jakub@jirutka.cz> +pkgname=ttfautohint +pkgver=1.8.4 +pkgrel=0 +pkgdesc="Automated hinting utility for TrueType fonts" +url="https://freetype.org/ttfautohint/" +arch="all" +license="FTL OR GPL-2.0-only" +makedepends=" + autoconf + automake + freetype-dev + harfbuzz-dev + libtool + qt5-qtbase-dev + " +subpackages=" + $pkgname-dev + $pkgname-gui + $pkgname-libs + $pkgname-doc + " +source="https://download.savannah.gnu.org/releases/freetype/ttfautohint-$pkgver.tar.gz + musl-compat.patch + " +options="!check" # no tests provided + +prepare() { + default_prepare + + echo "$pkgver" > VERSION + sed -i \ + -e '/dist_man_MANS/d' \ + -e 's/manpages/dist_man_MANS/' \ + frontend/local.mk + + autoreconf -fiv +} + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --without-doc \ + --disable-silent-rules + make +} + +package() { + make DESTDIR="$pkgdir" install +} + +gui() { + pkgdesc="$pkgdesc (Qt GUI)" + + amove usr/bin/ttfautohintGUI +} + +sha512sums=" +983517c360f8e65ccbf17f28f045f1c0a45078707f2e30f465a7b6df4014f0ec212780ea2703bc16be1a3c6ede70f71ea3051c067fbfd06eff40ae3b20840eec ttfautohint-1.8.4.tar.gz +6d6443f45130681a1cfe506ddf78a050de5d787c91fff8830bea41c20037d23c51839b73b39fb3209a11852aad595937ea7783b95cca7e18829b15f89da2f460 musl-compat.patch +" diff --git a/testing/ttfautohint/musl-compat.patch b/testing/ttfautohint/musl-compat.patch new file mode 100644 index 00000000000..c9fe5124f48 --- /dev/null +++ b/testing/ttfautohint/musl-compat.patch @@ -0,0 +1,15 @@ +Patch-Source: https://github.com/void-linux/void-packages/blob/635e02124f328366b150e94e4335427189722226/srcpkgs/ttfautohint/patches/musl_bool.patch +--- a/lib/llrb.h 2018-01-13 08:59:09.826617752 -0800 ++++ b/lib/llrb.h 2018-01-13 09:19:04.165564680 -0800 +@@ -52,6 +52,11 @@ + #ifndef LLRB_H + #define LLRB_H + ++#ifndef _Bool ++#include <stdbool.h> ++#define _Bool bool ++#endif ++ + #define LLRB_VENDOR "william@25thandClement.com" + #define LLRB_VERSION 0x20130925 + diff --git a/testing/turn-rs/APKBUILD b/testing/turn-rs/APKBUILD new file mode 100644 index 00000000000..ccd24d0cb63 --- /dev/null +++ b/testing/turn-rs/APKBUILD @@ -0,0 +1,66 @@ +# Contributor: Matthias Ahouansou <matthias@ahouansou.cz> +# Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> +pkgname=turn-rs +pkgver=2.1.3 +pkgrel=0 +pkgdesc="A pure rust implemented turn server" +url="https://github.com/mycrl/turn-rs" +arch="all" +license="GPL-3.0-only" +makedepends=" + cargo + cargo-auditable + protobuf-dev +" +install="turn-rs.pre-install" +subpackages=" + $pkgname-openrc + $pkgname-doc + $pkgname-cli + $pkgname-balance +" +source=" + $pkgname-$pkgver.tar.gz::https://github.com/mycrl/turn-rs/archive/refs/tags/v$pkgver.tar.gz + turn-rs.initd + turn-rs.confd +" +options="net" + +prepare() { + default_prepare + cargo fetch --target="$CTARGET" --locked +} + +build() { + cargo auditable build --release --frozen +} + +check() { + cargo test --frozen +} + +package() { + install -Dm 755 target/release/turn-server "$pkgdir"/usr/bin/turn-server + install -Dm 600 turn-server.toml "$pkgdir"/etc/turn-rs/turn-server.toml + + install -Dm 755 "$srcdir"/turn-rs.initd "$pkgdir"/etc/init.d/turn-rs + install -Dm 644 "$srcdir"/turn-rs.confd "$pkgdir"/etc/conf.d/turn-rs + + install -Dm 644 LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE +} + +cli() { + pkgdesc="$pkgdesc (command line monitoring tool)" + install -Dm 755 "$builddir"/target/release/turn-cli "$subpkgdir"/usr/bin/turn-cli +} + +balance() { + pkgdesc="$pkgdesc (distributed load balancing service)" + install -Dm 755 "$builddir"/target/release/turn-balance-server "$subpkgdir"/usr/bin/turn-balance-server +} + +sha512sums=" +01c5d978bbe70c018bf37e817a71b5e3bd030beba342f7567780feb837412bccd0fc56baeee1ff4abfb7ace092f71ca73be2b596091979110e3bbf72487508c1 turn-rs-2.1.3.tar.gz +0be3a81c5c9c13e2ba36a867282b3cae90e311d314c6e3f05855ce743fb2457ca12c0b7540e800bfe48a8e2129eb3acc970bc85b9b22dac70648b1637ccfb80f turn-rs.initd +cc6b17c4efe13d0cc100e20c2d855cb5aa1cb4c7a65ccfa91757f0e667aac77ea020a17fdbcf67ef0de9a32c6133705e1bca2fe239d5ac19234d4de6f425e89e turn-rs.confd +" diff --git a/testing/turn-rs/turn-rs.confd b/testing/turn-rs/turn-rs.confd new file mode 100644 index 00000000000..6eeea7ffcad --- /dev/null +++ b/testing/turn-rs/turn-rs.confd @@ -0,0 +1,3 @@ +#config=/etc/turn-server/config.toml +#logdir=/var/log/turn-rs +#_conf_path=/etc/turn-rs/turn-server.toml diff --git a/testing/turn-rs/turn-rs.initd b/testing/turn-rs/turn-rs.initd new file mode 100644 index 00000000000..306c6149ba8 --- /dev/null +++ b/testing/turn-rs/turn-rs.initd @@ -0,0 +1,25 @@ +#!/sbin/openrc-run +supervisor="supervise-daemon" + +: ${command_user:=turn-rs:turn-rs} +: ${logdir=/var/log/turn-rs} +: ${_conf_path=/etc/turn-rs/turn-server.toml} + +name=turn-server +description="Pure Rust turn server implementation" +command="/usr/bin/turn-server" +command_args="--config $_conf_path" +command_background=true + +pidfile="/run/$RC_SVCNAME.pid" +output_log="$logdir/output.log" +error_log="$logdir/error.log" + +depend() { + need net +} + +start_pre() { + checkpath -f -m 0644 -o "$command_user" "$output_log" "$error_log" + checkpath -f -m 0600 -o "$command_user" "$_conf_path" +} diff --git a/testing/turn-rs/turn-rs.pre-install b/testing/turn-rs/turn-rs.pre-install new file mode 100644 index 00000000000..dc0cae739c8 --- /dev/null +++ b/testing/turn-rs/turn-rs.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S turn-rs 2>/dev/null +adduser -S -D -s /sbin/nologin -H -G turn-rs -g turn-rs turn-rs 2>/dev/null + +exit 0 diff --git a/testing/unicorn/APKBUILD b/testing/unicorn/APKBUILD index 7b204655408..e94f7a25189 100644 --- a/testing/unicorn/APKBUILD +++ b/testing/unicorn/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=unicorn pkgver=2.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Unicorn CPU emulator engine" url="https://www.unicorn-engine.org/" # ppc: fails check diff --git a/testing/upterm/APKBUILD b/testing/upterm/APKBUILD index 02feffefb8f..6e79c43153f 100644 --- a/testing/upterm/APKBUILD +++ b/testing/upterm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=upterm -pkgver=0.13.2 -pkgrel=2 +pkgver=0.13.5 +pkgrel=0 pkgdesc="Secure terminal sharing" url="https://upterm.dev/" arch="all" @@ -58,7 +58,7 @@ server() { } sha512sums=" -a0563f148bb8ab3d5222fed5644aefadb980c22f1368736f33438e9ecd0ef807cdedebc29b6035249b307eb41c80d910062965742ae0631646054cf6d7a9e378 upterm-0.13.2.tar.gz +c3317b56e7912e74fd98f83dcfc92ddd322afd659d49c4d84555de10d90f7b4de54b09d69ec224087390712d99269096470edfd2df6d8eb61134d0cb6bb869a5 upterm-0.13.5.tar.gz 45165ca78a4f399583baaf151588d046b075c9632574720ec49887e542f8874fb63907ce390f40505d13499f2f35caa4b9aca5a10163c12c838fc9621ec897bd uptermd.initd 8ffec044a02b1a0cd5ca7b5e31fdb6f1ee958b16e346c913b9387d6a5ef4fb8b9e7ac881d0b449eeb1e0fca945f401a5db0572cfcc5684028d1709588ff8e61b uptermd.confd " diff --git a/testing/utop/APKBUILD b/testing/utop/APKBUILD index 0f570efc76c..ad78e473f97 100644 --- a/testing/utop/APKBUILD +++ b/testing/utop/APKBUILD @@ -5,7 +5,7 @@ pkgver=2.9.1 pkgrel=4 pkgdesc="Universal toplevel for OCaml" url="https://github.com/ocaml-community/utop" -arch="all !riscv64" # restricted by ocaml +arch="all !riscv64 !loongarch64" # ocaml license="BSD-3-Clause" depends=" ocaml-$pkgname=$pkgver-r$pkgrel diff --git a/testing/uv/APKBUILD b/testing/uv/APKBUILD new file mode 100644 index 00000000000..a4ddc3c66fb --- /dev/null +++ b/testing/uv/APKBUILD @@ -0,0 +1,76 @@ +# Maintainer: Andy Postnikov <apostnikov@gmail.com> +pkgname=uv +pkgver=0.1.44 +pkgrel=0 +pkgdesc="Extremely fast Python package installer and resolver, written in Rust" +url="https://github.com/astral-sh/uv" +arch="all" +license="Apache-2.0 MIT" +makedepends=" + cargo + cmake + libgit2-dev + libssh2-dev + openssl-dev + zlib-dev + zstd-dev + py3-gpep517 + py3-setuptools + py3-wheel + py3-maturin + " +subpackages=" + $pkgname-bash-completion + $pkgname-zsh-completion + $pkgname-fish-completion + py3-$pkgname-pyc + py3-$pkgname:py3:noarch + " +source="$pkgname-$pkgver.tar.gz::https://github.com/astral-sh/uv/archive/refs/tags/$pkgver.tar.gz" +options="net" + +export OPENSSL_NO_VENDOR=1 + +prepare() { + default_prepare + cargo fetch --target="$CTARGET" --locked +} + +build() { + gpep517 build-wheel \ + --wheel-dir .dist \ + --config-json '{"build-args": "--locked"}' \ + --output-fd 3 3>&1 >&2 + + mkdir -p completions + local _uv="target/release/uv --generate-shell-completion" + $_uv bash > completions/$pkgname + $_uv fish > completions/$pkgname.fish + $_uv zsh > completions/_$pkgname +} + +check() { + cargo test --frozen --bin uv +} + +package() { + python3 -m installer -d "$pkgdir" .dist/*.whl + + install -Dm 644 "completions/$pkgname" -t "$pkgdir/usr/share/bash-completion/completions/" + install -Dm 644 "completions/$pkgname.fish" -t "$pkgdir/usr/share/fish/vendor_completions.d/" + install -Dm 644 "completions/_$pkgname" -t "$pkgdir/usr/share/zsh/site-functions/" + + install -Dm0644 LICENSE-APACHE "$pkgdir/usr/share/licenses/$pkgname/LICENSE-APACHE" + install -Dm0644 LICENSE-MIT "$pkgdir/usr/share/licenses/$pkgname/LICENSE-MIT" +} + +py3() { + pkgdesc="$pkgdesc (python module)" + depends="$pkgname=$pkgver-r$pkgrel" + + amove usr/lib/python3* +} + +sha512sums=" +d9f0ecf7a0b30855c69b9a135d76c53e077dd427c39d1dec9fe499cfe9afb1f0c6a528f451d3bc0eab5b29a43df5795f876b1ce61fa28b8913b114834c915b3b uv-0.1.44.tar.gz +" diff --git a/testing/vale/APKBUILD b/testing/vale/APKBUILD index f05df856f74..d9977f312fa 100644 --- a/testing/vale/APKBUILD +++ b/testing/vale/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Andrej Kolchin <KAAtheWise@protonmail.com> # Maintainer: Andrej Kolchin <KAAtheWise@protonmail.com> pkgname=vale -pkgver=3.4.1 -pkgrel=1 +pkgver=3.4.2 +pkgrel=0 pkgdesc="A markup-aware linter for prose built with speed and extensibility in mind" url="https://vale.sh/" arch="all" @@ -31,5 +31,5 @@ package() { } sha512sums=" -93a70954fa67e8f1a7c3c3c8681784b06c32388c70eb6c75ae90292ae3a913dbb89a0539361b689470ee6a77fd9e0419312a98f64af4d1236d32dc436e3a4d9d vale-3.4.1.tar.gz +e6d6ec06d968ac35abf7f08eb5938b46f2e0162c511acef89f0307ba8a917cd7b9b9c3e0ddee50b720e845252991a88a5fa52f9cc3f9415130147db7c2256dac vale-3.4.2.tar.gz " diff --git a/testing/vcmi/APKBUILD b/testing/vcmi/APKBUILD index 6f84d1ca83f..1dc5d7ff045 100644 --- a/testing/vcmi/APKBUILD +++ b/testing/vcmi/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: ovf <ovf@mm.st> pkgname=vcmi pkgver=1.4.5 -pkgrel=0 +pkgrel=1 pkgdesc="Open-source engine for Heroes of Might and Magic III" url="https://vcmi.eu" -# ppc64le, riscv64: no luajit +# ppc64le, riscv64, loongarch64: no luajit # game engine arch="aarch64 x86_64" license="GPL-2.0-or-later" diff --git a/testing/vera++/APKBUILD b/testing/vera++/APKBUILD index 3347c64568e..f86fc03244d 100644 --- a/testing/vera++/APKBUILD +++ b/testing/vera++/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=vera++ pkgver=1.3.0 -pkgrel=9 +pkgrel=10 pkgdesc="tool for verification, analysis and transformation of C++ source code" url="https://bitbucket.org/verateam/vera" arch="all" diff --git a/testing/virtctl/APKBUILD b/testing/virtctl/APKBUILD index a1f3947acb3..e734c29a525 100644 --- a/testing/virtctl/APKBUILD +++ b/testing/virtctl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=virtctl -pkgver=1.1.1 -pkgrel=2 +pkgver=1.2.0 +pkgrel=0 pkgdesc="CLI client for KubeVirt - the Kubernetes Virtualization API" url="https://kubevirt.io/" arch="all" @@ -50,5 +50,5 @@ package() { } sha512sums=" -ad74d916784ae06ff1395700d5d2d600348f06bc2e236d1614a57dc16ae339b480190a67bb65f943a64e4ceafd7b34e3ec6fe6622fa138ae2b78ab9c3228fc9a virtctl-1.1.1.tar.gz +18c567f6d8f8154b34ccd6f4b4f87d18e9cd85793ca93bb420c648762556b37057614c00be347472e05e4efd871073a24804e39cb2e2629f85da012bf36ffb08 virtctl-1.2.0.tar.gz " diff --git a/testing/virter/APKBUILD b/testing/virter/APKBUILD index c2ffd90aff6..262edcb27ff 100644 --- a/testing/virter/APKBUILD +++ b/testing/virter/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=virter -pkgver=0.26.0 -pkgrel=3 +pkgver=0.27.0 +pkgrel=0 pkgdesc="CLI tool for simple creation and cloning of libvirt virtual machines" url="https://github.com/LINBIT/virter" arch="all" @@ -53,6 +53,6 @@ package() { } sha512sums=" -c06885759beb9c8cb3310b070afb378413ec205ab1d503a08958b38f18d69789d4735a02528e329e823c250afde9e94a77ef4dc3297e315ad8aebafbf762e799 virter-0.26.0.tar.gz +4f6edd24eaf84b7fc08efcf2155e5e82c111cda36c380fee01094ecf5e41897fcec76306ffdd2a2e160591faf1d0776c49f6f47340b6960346a882c08dd34fd0 virter-0.27.0.tar.gz 8e383f190f0f9489e328257cb974d50be9b1f2cf862f2454beb89866ebb79c4745a08850b964ad5da7bac0c39059fdc643fcc8ce58c6af7b1216112fbb50582b update-mockery.patch " diff --git a/testing/virtme-ng/APKBUILD b/testing/virtme-ng/APKBUILD index 1d032416575..54ea1c8989f 100644 --- a/testing/virtme-ng/APKBUILD +++ b/testing/virtme-ng/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=virtme-ng -pkgver=1.23 -pkgrel=1 +pkgver=1.24 +pkgrel=0 pkgdesc="tool that allows to easily and quickly recompile and test a Linux kernel" url="https://github.com/arighi/virtme-ng" arch="all" @@ -18,5 +18,5 @@ package() { } sha512sums=" -44e516c42e2fea074d2b7d81bdf9bf628d37531f388b17a38e2c025e2198b3625dcdd0092c8abbba07a610e5856af55eb8c7aea7dcbf90a8dce7a1e3063b4880 virtme-ng-1.23.tar.gz +af6a1b4a84f4ee8bb80697d439ca5742b434dff5b26d49bfb7bcc02ff90db847225d3d4ba4f7fb4391cb4de57c1842dcc28f9d501eeb1846f0d6e951c2a797c2 virtme-ng-1.24.tar.gz " diff --git a/testing/waylock/APKBUILD b/testing/waylock/APKBUILD index 8ec016c3be8..b15f8173f38 100644 --- a/testing/waylock/APKBUILD +++ b/testing/waylock/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=waylock -pkgver=0.6.5 +pkgver=1.0.0 pkgrel=0 pkgdesc="A small screenlocker for Wayland compositors" url="https://codeberg.org/ifreund/waylock" @@ -17,7 +17,6 @@ makedepends=" " subpackages="$pkgname-doc" source="https://codeberg.org/ifreund/waylock/releases/download/v$pkgver/waylock-$pkgver.tar.gz - fix-version-string.patch pam-base-auth.patch " @@ -37,7 +36,6 @@ package() { } sha512sums=" -1a158205c12c51946178ede06eded9f54aff03aefdb5c3e306b1570ef786a611405cfcb96bafb4bd29a82016077fce0630c406d56431ad7dc5cbfb9a5696b589 waylock-0.6.5.tar.gz -c1782ce8f6e2a2eab4bc5cdfdba22e0e9b14e89c319737bd0c331a9b8c4b09cc9debafa33c6936631f6db14331ebecf0d327dc05d8c8a77a36ef45de35639750 fix-version-string.patch +ceb5920c1ca3e7e46185e8f438a73fecc4245bf1293628775998d4b1e1dbf5cf682ffff9ca6e801135873cf278ae2fccedb3dc418641db3bac282047fccce4cb waylock-1.0.0.tar.gz e3f5aa479908babbeea2febecdf7c57a5cf6b9153c4cd63731721cdf6d50bd0417077b37effec1520064918a422c4313d24ee9c2b2a77c328be931ffbeb03161 pam-base-auth.patch " diff --git a/testing/waylock/fix-version-string.patch b/testing/waylock/fix-version-string.patch deleted file mode 100644 index d2d345f3fce..00000000000 --- a/testing/waylock/fix-version-string.patch +++ /dev/null @@ -1,15 +0,0 @@ -This is a bug with the waylock 0.6.5 release tarball. The Git tag for 0.6.5 -does not have this problem. This patch can be removed on the next release. - -diff -upr waylock-0.6.5.orig/build.zig waylock-0.6.5/build.zig ---- waylock-0.6.5.orig/build.zig 2024-03-03 10:47:47.439903112 +0100 -+++ waylock-0.6.5/build.zig 2024-03-03 10:47:55.963263085 +0100 -@@ -10,7 +10,7 @@ const Scanner = @import("deps/zig-waylan - /// development with the "-dev" suffix. - /// When a release is tagged, the "-dev" suffix should be removed for the commit that gets tagged. - /// Directly after the tagged commit, the version should be bumped and the "-dev" suffix added. --const version = "0.6.6-dev"; -+const version = "0.6.5"; - - pub fn build(b: *Build) !void { - const target = b.standardTargetOptions(.{}); diff --git a/testing/waynergy/APKBUILD b/testing/waynergy/APKBUILD index a9dcac09041..795fcabf616 100644 --- a/testing/waynergy/APKBUILD +++ b/testing/waynergy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: pkgname=waynergy -pkgver=0.0.16 +pkgver=0.0.17 pkgrel=0 pkgdesc="A synergy client for Wayland compositors" url="https://github.com/r-c-f/waynergy" @@ -31,5 +31,5 @@ package() { } sha512sums=" -00b1e47da70960120baba0e195ea4806254bf1ab73261340d1d9947681b5590eb3a6dd4bc82af724dbe03c777e9986fbfdb91e0054acd77f3b4b2d76a40942c3 waynergy-0.0.16.tar.gz +1e33465b2db6b2fa82e2646f57f5a06fe7294e885b1693dfcd6f81c2f8b955b2093ece203d506ab163c2fd4d8e806c546f54259ec41e41a7474a11abef707262 waynergy-0.0.17.tar.gz " diff --git a/testing/welle-io/APKBUILD b/testing/welle-io/APKBUILD index 40d5ae84b55..ddb8b45f227 100644 --- a/testing/welle-io/APKBUILD +++ b/testing/welle-io/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakob Meier <comcloudway@ccw.icu> pkgname=welle-io pkgver=2.4 -pkgrel=4 +pkgrel=5 pkgdesc="A DAB/DAB+ Software Defined Radio (SDR)" url="https://www.welle.io/" arch="all" diff --git a/testing/wgcf/APKBUILD b/testing/wgcf/APKBUILD index 42e907924a5..c4fbd42deb8 100644 --- a/testing/wgcf/APKBUILD +++ b/testing/wgcf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=wgcf -pkgver=2.2.21 -pkgrel=2 +pkgver=2.2.22 +pkgrel=0 pkgdesc="Unofficial CLI for Cloudflare Warp" url="https://github.com/ViRb3/wgcf" arch="all" @@ -43,5 +43,5 @@ package() { } sha512sums=" -595c08cf266e06014d2978db94d452368a7ea86aa4fe90906903ac4a18aea2108329b4029b8909a9737e97e9f828112b04efc91aa61169fe07dc7ef364d4ec17 wgcf-2.2.21.tar.gz +5be00f5a4caed493fc4443d8c0249398e1025e168d4d14181cee93f008a6251e4f0433d43d37c92f701c3188bd61337a2a60d6338a7ed29afceba413440006b8 wgcf-2.2.22.tar.gz " diff --git a/testing/wine-staging/APKBUILD b/testing/wine-staging/APKBUILD index 31dc6a96ce8..75cbc2d6f83 100644 --- a/testing/wine-staging/APKBUILD +++ b/testing/wine-staging/APKBUILD @@ -8,7 +8,7 @@ # Contributor: sewn <sewn@disroot.org> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=wine-staging -pkgver=9.6 +pkgver=9.7 _pkgver="${pkgver%".${pkgver#*.*.}"}" pkgrel=0 pkgdesc="Compatibility layer for running Windows programs -- Staging patchset" @@ -59,6 +59,7 @@ makedepends=" vulkan-loader-dev wayland-dev " +provides="wine=$pkgver-r$pkgrel" subpackages="$pkgname-dev $pkgname-doc" checkdepends="xvfb-run" source="https://dl.winehq.org/wine/source/${pkgver/.[1-9]*/.x}/wine-$_pkgver.tar.xz @@ -168,7 +169,7 @@ doc() { } sha512sums=" -cc2ea5597636da8d392d1d63b9c135679eff69ea671dc6b53b6f2d44a890aee0e17275174485f6e8dd99c7db737eb82a800a2b05c4966f15e28167c5a6098922 wine-9.6.tar.xz -ed7d4bc5e834b79a15815971d12d5b27aa33a2f4104207724400e6c29f7d8a466944d889c98833787a1db8bbf3770f1b74b10705711cdac55e918d5026eb8d76 wine-staging-9.6.tar.gz +0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80 wine-9.7.tar.xz +eebd079eefcaed9e021de2e00741a76b0b2f4dacbf05763de9dab94624e1ae934a7b0b391f6c5efffcb3bcadd09790609cbe77ab1a4f3cfff880352ee040c5c5 wine-staging-9.7.tar.gz 9881abfd0e7e4589cd5724291f9ec06ccb9d88b842c69abb5ea7865b6c27c778a060e60a9776c3620a030555cf61b8cceded55db9f04d5e45d9c627306763bff rpath.patch " diff --git a/testing/wlrobs/APKBUILD b/testing/wlrobs/APKBUILD index fa346994603..b2f1c1aa227 100644 --- a/testing/wlrobs/APKBUILD +++ b/testing/wlrobs/APKBUILD @@ -4,7 +4,7 @@ pkgver=1.0 pkgrel=4 pkgdesc="obs-studio plugin that allows you to screen capture on wlroots" url="https://hg.sr.ht/~scoopta/wlrobs" -arch="all !riscv64 !ppc64le" # obs -> luajit +arch="all !riscv64 !ppc64le !loongarch64" # obs -> luajit license="GPL-3.0-only" makedepends=" libdrm-dev diff --git a/testing/xcaddy/APKBUILD b/testing/xcaddy/APKBUILD index 165695b3a42..f2567d09c5d 100644 --- a/testing/xcaddy/APKBUILD +++ b/testing/xcaddy/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Fabricio Silva <hi@fabricio.dev> # Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=xcaddy -pkgver=0.3.5 -pkgrel=4 +pkgver=0.4.1 +pkgrel=0 pkgdesc="Build Caddy with plugins" url="https://github.com/caddyserver/xcaddy" license="Apache-2.0" arch="all" depends="go" -source="https://github.com/caddyserver/xcaddy/archive/v$pkgver/caddy-$pkgver.tar.gz" +source="https://github.com/caddyserver/xcaddy/archive/v$pkgver/xcaddy-$pkgver.tar.gz" options="net" # for downloading Go modules export GOFLAGS="$GOFLAGS -modcacherw" @@ -29,5 +29,5 @@ package() { } sha512sums=" -7f37bf819618d51dcc4dfd89a90403c0841f277bcf5f9f3cf548ed89d486faf92608522df161ad3a2daf9f046feb91c4b4feb6f7ddeb336c9e0946576052b34e caddy-0.3.5.tar.gz +7e85695155f013c547ac47674a285d43ccc5b75a3bd2283477dc4cd4ec38682c908725a7bf8d4a1d29b4b16967e706120891014302e913d8859b152624fdbc52 xcaddy-0.4.1.tar.gz " diff --git a/testing/xcur2png/APKBUILD b/testing/xcur2png/APKBUILD new file mode 100644 index 00000000000..e659e4cfa0e --- /dev/null +++ b/testing/xcur2png/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Zach DeCook <zachdecook@librem.one> +# Maintainer: Zach DeCook <zachdecook@librem.one> +pkgname=xcur2png +pkgver=0.7.1 +pkgrel=0 +pkgdesc="Convert X cursors to PNG images and xcursorgen config-file" +url="https://github.com/eworm-de/xcur2png" +arch="all" +license="GPL-3.0" +subpackages="$pkgname-doc" +source="https://github.com/eworm-de/xcur2png/archive/$pkgver/xcur2png-$pkgver.tar.gz" +makedepends="autoconf automake libpng-dev libxcursor-dev" +checkdepends="adwaita-icon-theme" + +build() { + aclocal + autoheader + autoconf + automake --add-missing + ./configure --prefix=/usr + make +} + +check() { + ./xcur2png /usr/share/icons/Adwaita/cursors/default +} + +package() { + make -j1 DESTDIR="$pkgdir" install +} + + +sha512sums=" +3964546602c902674732e47e81e2998171fe37cef08a94c6d3375a7ef905d02141cf312f9c005f506bfac12ce82cd9af1a9d553d6cfb9f8cf1a4f59951fdea1c xcur2png-0.7.1.tar.gz +" diff --git a/testing/xonsh/APKBUILD b/testing/xonsh/APKBUILD index 8d4e5a899c6..f7284107c5e 100644 --- a/testing/xonsh/APKBUILD +++ b/testing/xonsh/APKBUILD @@ -2,8 +2,8 @@ # Contributor: vinnie <fz12345@gmail.com> # Maintainer: vinnie <fz12345@gmail.com> pkgname=xonsh -pkgver=0.15.1 -pkgrel=1 +pkgver=0.16.0 +pkgrel=0 pkgdesc="Python-powered, cross-platform, Unix-gazing shell" url="https://xon.sh" arch="noarch" @@ -26,6 +26,7 @@ checkdepends=" py3-pytest-rerunfailures py3-pytest-subprocess py3-pytest-timeout + py3-requests py3-virtualenv " subpackages="$pkgname-pyc" @@ -62,6 +63,6 @@ package() { } sha512sums=" -5a8640a80c8aa1a08cabcd643880603ddf9d1181ca1dfb396b5970fb59205a19be4fbd5ff8f0a36779fd25d7204748ad2426f311b7a9e7b954fc3a541a1e2131 xonsh-0.15.1.tar.gz +74f98c6532b7bdacdf936edafda3e36a442dc45c3c46bcc0697cb9215f6a6943f6d822aec5cd27868c7c9ce3fb8dd8b30788e83fb5acb89ba29a362c79c24342 xonsh-0.16.0.tar.gz 56e6548dde6faaa70e000f0d49a260ca0fe5297b0ec0abb1ab2cb0c22154479a957155f06037b91d9fda3736f3c7935d019a6c45adf506334e5940dfd8ac37d1 no-col.patch " diff --git a/testing/xplr/remove-vendored-lua.patch b/testing/xplr/remove-vendored-lua.patch deleted file mode 100644 index bea10dc954b..00000000000 --- a/testing/xplr/remove-vendored-lua.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -774,25 +774,6 @@ - ] - - [[package]] --name = "lua-src" --version = "546.0.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2da0daa7eee611a4c30c8f5ee31af55266e26e573971ba9336d2993e2da129b2" --dependencies = [ -- "cc", --] -- --[[package]] --name = "luajit-src" --version = "210.5.3+29b0b28" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0c2bb89013916ce5c949f01a1fbd6d435a58e1d980767a791d755911211d792d" --dependencies = [ -- "cc", -- "which", --] -- --[[package]] - name = "memchr" - version = "2.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -865,8 +846,6 @@ - dependencies = [ - "cc", - "cfg-if", -- "lua-src", -- "luajit-src", - "pkg-config", - ] - ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -73,7 +73,7 @@ - - [dependencies.mlua] - version = "0.9.2" --features = ['luajit', 'vendored', 'serialize', 'send'] -+features = ['lua54', 'serialize', 'send'] - - [dependencies.tui-input] - version = "0.8.0" diff --git a/testing/yaegi/APKBUILD b/testing/yaegi/APKBUILD index 7c8f1fabdb3..11ebde5c850 100644 --- a/testing/yaegi/APKBUILD +++ b/testing/yaegi/APKBUILD @@ -1,12 +1,11 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=yaegi -pkgver=0.16.0 -pkgrel=2 +pkgver=0.16.1 +pkgrel=0 pkgdesc="Elegant Go interpreter" url="https://github.com/traefik/yaegi" # 32bit: TestEvalBuiltin test fails -# riscv64: interp tests time out -arch="all !x86 !armhf !armv7 !riscv64" +arch="all !x86 !armhf !armv7" license="Apache-2.0" makedepends="go" source="$pkgname-$pkgver.tar.gz::https://github.com/traefik/yaegi/archive/refs/tags/v$pkgver.tar.gz" @@ -32,8 +31,8 @@ build() { } check() { - # extract_test.go:157: cannot find package "math" - GOFLAGS="${GOFLAGS/-trimpath/}" go test ./... + # Tests in interp module time out on riscv64 after the default 10 minutes. + GOFLAGS="${GOFLAGS/-trimpath/}" go test -timeout=30m ./... } package() { @@ -41,5 +40,5 @@ package() { } sha512sums=" -68962e276c64ec9b681d183b48f179960709397233e4062b8338d35adf526a3ac14ecb52d45e5f0a5aaada206b184bd650a917110db962522bc0b83afd3a60b7 yaegi-0.16.0.tar.gz +44db8b3748980c60873aef6b2aa7198e34e9c3aec9141ba56c9c91120e38e4d587c4bbfd09b250b52b607c88d1da41b82b31859d90636bf62cfe6d07bd30fea8 yaegi-0.16.1.tar.gz " diff --git a/testing/yaru-common/APKBUILD b/testing/yaru-common/APKBUILD new file mode 100644 index 00000000000..d0232b74216 --- /dev/null +++ b/testing/yaru-common/APKBUILD @@ -0,0 +1,334 @@ +# Contributor: Leo <thinkabit.ukim@gmail.com> +# Maintainer: Brandon Boese <brandonboese@protonmail.com> +pkgname=yaru-common +_pkgname=yaru +pkgver=23.10.0 +_minorpkgver=-0ubuntu2 +pkgrel=0 +pkgdesc="Ubuntu community theme" +options="!check" # No testsuite +url="https://community.ubuntu.com/c/desktop/theme-refresh" +arch="noarch" +license="GPL-3.0-or-later AND CC-BY-SA-4.0" +makedepends=" + bash + coreutils + dbus + glib-dev + meson + sassc + xvfb-run + " +subpackages=" + $_pkgname-icon-theme-bark:_icon_theme_bark + $_pkgname-icon-theme-blue:_icon_theme_blue + $_pkgname-icon-theme-magenta:_icon_theme_magenta + $_pkgname-icon-theme-mate:_icon_theme_mate + $_pkgname-icon-theme-olive:_icon_theme_olive + $_pkgname-icon-theme-prussiangreen:_icon_theme_prussiangreen + $_pkgname-icon-theme-purple:_icon_theme_purple + $_pkgname-icon-theme-red:_icon_theme_red + $_pkgname-icon-theme-sage:_icon_theme_sage + $_pkgname-icon-theme-viridian:_icon_theme_viridian + $_pkgname-icon-theme:_icon_theme + $_pkgname-schemas:_schemas + $_pkgname-shell:_shell + $_pkgname-sounds:_sounds + $_pkgname-theme-bark:_theme_bark + $_pkgname-theme-blue:_theme_blue + $_pkgname-theme-hdpi:_theme_hdpi + $_pkgname-theme-magenta:_theme_magenta + $_pkgname-theme-mate:_theme_mate + $_pkgname-theme-olive:_theme_olive + $_pkgname-theme-prussiangreen:_theme_prussiangreen + $_pkgname-theme-purple:_theme_purple + $_pkgname-theme-red:_theme_red + $_pkgname-theme-sage:_theme_sage + $_pkgname-theme-viridian:_theme_viridian + $_pkgname-theme:_theme + " +source="$_pkgname-$pkgver.tar.gz::https://github.com/ubuntu/yaru/archive/$pkgver$_minorpkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver$_minorpkgver" + +build() { + abuild-meson \ + -Dmate=true \ + -Dmate-dark=true \ + -Dubuntu-unity=true \ + -Dxfwm4=true \ + -Dcinnamon=true \ + -Dcinnamon-dark=true \ + -Dcinnamon-shell=true \ + . output + meson compile -C output +} + +package() { + DESTDIR="$pkgdir" meson install --no-rebuild -C output +} + +_icon_theme_bark() { + depends="" + pkgdesc="Bark variant of Yaru icon theme" + + mkdir -p "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-bark "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-bark-dark "$subpkgdir"/usr/share/icons +} + +_theme_bark() { + depends="yaru-common" + pkgdesc="Bark variant of Yaru theme" + + mkdir -p "$subpkgdir"/usr/share/themes + mv "$pkgdir"/usr/share/themes/Yaru-bark \ + "$subpkgdir"/usr/share/themes/Yaru-bark + mv "$pkgdir"/usr/share/themes/Yaru-bark-dark \ + "$subpkgdir"/usr/share/themes/Yaru-bark-dark +} + +_icon_theme_blue() { + depends="" + pkgdesc="Blue variant of Yaru icon theme" + + mkdir -p "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-blue "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-blue-dark "$subpkgdir"/usr/share/icons +} + +_theme_blue() { + depends="yaru-common" + pkgdesc="Blue variant of Yaru theme" + + mkdir -p "$subpkgdir"/usr/share/themes + mv "$pkgdir"/usr/share/themes/Yaru-blue \ + "$subpkgdir"/usr/share/themes/Yaru-blue + mv "$pkgdir"/usr/share/themes/Yaru-blue-dark \ + "$subpkgdir"/usr/share/themes/Yaru-blue-dark +} + +_theme_hdpi() { + depends="yaru-common" + pkgdesc="Hdpi variant of Yaru theme" + + mkdir -p "$subpkgdir"/usr/share/themes + mv "$pkgdir"/usr/share/themes/Yaru-hdpi \ + "$subpkgdir"/usr/share/themes/Yaru-hdpi + mv "$pkgdir"/usr/share/themes/Yaru-dark-hdpi \ + "$subpkgdir"/usr/share/themes/Yaru-dark-hdpi + mv "$pkgdir"/usr/share/themes/Yaru-xhdpi \ + "$subpkgdir"/usr/share/themes/Yaru-xhdpi + mv "$pkgdir"/usr/share/themes/Yaru-dark-xhdpi \ + "$subpkgdir"/usr/share/themes/Yaru-dark-xhdpi +} + +_icon_theme_magenta() { + depends="" + pkgdesc="Magenta variant of Yaru icon theme" + + mkdir -p "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-magenta "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-magenta-dark "$subpkgdir"/usr/share/icons +} + +_theme_magenta() { + depends="yaru-common" + pkgdesc="Magenta variant of Yaru theme" + + mkdir -p "$subpkgdir"/usr/share/themes + mv "$pkgdir"/usr/share/themes/Yaru-magenta \ + "$subpkgdir"/usr/share/themes/Yaru-magenta + mv "$pkgdir"/usr/share/themes/Yaru-magenta-dark \ + "$subpkgdir"/usr/share/themes/Yaru-magenta-dark +} + +_icon_theme_mate() { + depends="" + pkgdesc="Mate variant of Yaru icon theme" + + mkdir -p "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-mate "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-mate-dark "$subpkgdir"/usr/share/icons +} + +_theme_mate() { + depends="yaru-common" + pkgdesc="Mate variant of Yaru theme" + + mkdir -p "$subpkgdir"/usr/share/themes + mv "$pkgdir"/usr/share/themes/Yaru-mate \ + "$subpkgdir"/usr/share/themes/Yaru-mate + mv "$pkgdir"/usr/share/themes/Yaru-mate-dark \ + "$subpkgdir"/usr/share/themes/Yaru-mate-dark +} + +_icon_theme_olive() { + depends="" + pkgdesc="Olive variant of Yaru icon theme" + + mkdir -p "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-olive "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-olive-dark "$subpkgdir"/usr/share/icons +} + +_theme_olive() { + depends="yaru-common" + pkgdesc="Olive variant of Yaru theme" + + mkdir -p "$subpkgdir"/usr/share/themes + mv "$pkgdir"/usr/share/themes/Yaru-olive \ + "$subpkgdir"/usr/share/themes/Yaru-olive + mv "$pkgdir"/usr/share/themes/Yaru-olive-dark \ + "$subpkgdir"/usr/share/themes/Yaru-olive-dark +} + +_icon_theme_prussiangreen() { + depends="" + pkgdesc="Prussian green variant of Yaru icon theme" + + mkdir -p "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-prussiangreen "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-prussiangreen-dark "$subpkgdir"/usr/share/icons +} + +_theme_prussiangreen() { + depends="yaru-common" + pkgdesc="Prussian green variant of Yaru theme" + + mkdir -p "$subpkgdir"/usr/share/themes + mv "$pkgdir"/usr/share/themes/Yaru-prussiangreen \ + "$subpkgdir"/usr/share/themes/Yaru-prussiangreen + mv "$pkgdir"/usr/share/themes/Yaru-prussiangreen-dark \ + "$subpkgdir"/usr/share/themes/Yaru-prussiangreen-dark +} + +_icon_theme_purple() { + depends="" + pkgdesc="Purple variant of Yaru icon theme" + + mkdir -p "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-purple "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-purple-dark "$subpkgdir"/usr/share/icons +} + +_theme_purple() { + depends="yaru-common" + pkgdesc="Purple variant of Yaru theme" + + mkdir -p "$subpkgdir"/usr/share/themes + mv "$pkgdir"/usr/share/themes/Yaru-purple \ + "$subpkgdir"/usr/share/themes/Yaru-purple + mv "$pkgdir"/usr/share/themes/Yaru-purple-dark \ + "$subpkgdir"/usr/share/themes/Yaru-purple-dark +} + +_icon_theme_red() { + depends="" + pkgdesc="Red variant of Yaru icon theme" + + mkdir -p "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-red "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-red-dark "$subpkgdir"/usr/share/icons +} + +_theme_red() { + depends="yaru-common" + pkgdesc="Red variant of Yaru theme" + + mkdir -p "$subpkgdir"/usr/share/themes + mv "$pkgdir"/usr/share/themes/Yaru-red \ + "$subpkgdir"/usr/share/themes/Yaru-red + mv "$pkgdir"/usr/share/themes/Yaru-red-dark \ + "$subpkgdir"/usr/share/themes/Yaru-red-dark +} + +_icon_theme_sage() { + depends="" + pkgdesc="Sage variant of Yaru icon theme" + + mkdir -p "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-sage "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-sage-dark "$subpkgdir"/usr/share/icons +} + +_theme_sage() { + depends="yaru-common" + pkgdesc="Sage variant of Yaru theme" + + mkdir -p "$subpkgdir"/usr/share/themes + mv "$pkgdir"/usr/share/themes/Yaru-sage \ + "$subpkgdir"/usr/share/themes/Yaru-sage + mv "$pkgdir"/usr/share/themes/Yaru-sage-dark \ + "$subpkgdir"/usr/share/themes/Yaru-sage-dark +} + +_icon_theme_viridian() { + depends="" + pkgdesc="Viridian variant of Yaru icon theme" + + mkdir -p "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-viridian "$subpkgdir"/usr/share/icons + mv "$pkgdir"/usr/share/icons/Yaru-viridian-dark "$subpkgdir"/usr/share/icons +} + +_theme_viridian() { + depends="yaru-common" + pkgdesc="Viridian variant of Yaru theme" + + mkdir -p "$subpkgdir"/usr/share/themes + mv "$pkgdir"/usr/share/themes/Yaru-viridian \ + "$subpkgdir"/usr/share/themes/Yaru-viridian + mv "$pkgdir"/usr/share/themes/Yaru-viridian-dark \ + "$subpkgdir"/usr/share/themes/Yaru-viridian-dark +} + +_schemas() { + depends="yaru-common yaru-icon-theme yaru-theme" + pkgdesc="Schema files for Yaru theme" + + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/glib-2.0 "$subpkgdir"/usr/share +} + +_shell() { + depends="yaru-common yaru-icon-theme yaru-schemas yaru-sounds yaru-theme" + pkgdesc="Yaru shell theme for the GNOME Desktop Environment" + + install_if="yaru-common=$pkgver-r$pkgrel gnome-shell" + + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/gnome-shell "$subpkgdir"/usr/share + + mv "$pkgdir"/usr/share/wayland-sessions \ + "$pkgdir"/usr/share/xsessions \ + "$subpkgdir"/usr/share +} + +_sounds() { + depends="" + pkgdesc="Yaru sound resources" + + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/sounds "$subpkgdir"/usr/share +} + +_icon_theme() { + depends="" + pkgdesc="Yaru icon theme" + + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/icons "$subpkgdir"/usr/share +} + +_theme() { + depends="yaru-common" + pkgdesc="Yaru, the Ubuntu community theme" + + mkdir -p "$subpkgdir"/usr/share + mv "$pkgdir"/usr/share/themes \ + "$subpkgdir"/usr/share +} + +sha512sums=" +4047df97026d79f4fcd541a0afea6c39294956761c9face9d5506cd188b05b52c6d627d2e25226bce09a6dcb682f4e1aff7411dc69ae4770c8cd9c19783f30de yaru-23.10.0.tar.gz +" diff --git a/testing/yazi/APKBUILD b/testing/yazi/APKBUILD index f135367246c..86938ea320a 100644 --- a/testing/yazi/APKBUILD +++ b/testing/yazi/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=yazi -pkgver=0.2.4 -pkgrel=1 +pkgver=0.2.5 +pkgrel=0 pkgdesc="Blazing fast terminal file manager written in Rust, based on async I/O" url="https://yazi-rs.github.io" arch="all" @@ -12,7 +12,9 @@ makedepends=" cargo-auditable lua5.4-dev " -subpackages="$pkgname-doc +subpackages=" + $pkgname-doc + $pkgname-cli $pkgname-bash-completion $pkgname-fish-completion $pkgname-zsh-completion @@ -29,11 +31,11 @@ prepare() { } build() { - YAZI_GEN_COMPLETIONS=true cargo auditable build --release --frozen + YAZI_GEN_COMPLETIONS=true cargo auditable build --release --frozen --workspace --no-default-features } check() { - cargo test --frozen + cargo test --frozen --workspace --no-default-features } package() { @@ -44,7 +46,14 @@ package() { install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } +cli() { + pkgdesc="$pkgdesc - CLI" + depends="yazi=$pkgver-r$pkgrel" + + install -Dm755 "$builddir"/target/release/ya "$subpkgdir"/usr/bin/ya +} + sha512sums=" -185d0b35489907fae68b41381fbbbdcdded7536d6084bbd897e0c49f19e2e999b7a98537a840adbf768995af793727ad6607f026df5de2263c6469c72eac5e5a yazi-0.2.4.tar.gz -6aea3e201908144142ae2b8bf21c1c8bef8721ed876ca77749742a87d6d5ace0bb2266e016c2656d72a92cae13cb82d14b4683ed8393622c79b93966606e9bb2 system-lua.patch +25228725f7ba9a769a3b699d86bd747d72363be132855bbcfd7ced4e31bd7d86a2efbcef83eb49439727c651a95eb95f000954175f1d6cdbd7b40fbeaa49c250 yazi-0.2.5.tar.gz +5255ffc371017055f5cdf4ef5eee52bd5879fc647d84f39323a43244275e397f996267417c29eea70f7f15d18b456143a28a14e4973cf4832854d4fc20f692ae system-lua.patch " diff --git a/testing/yazi/system-lua.patch b/testing/yazi/system-lua.patch index 7be8002f98a..af31ad34530 100644 --- a/testing/yazi/system-lua.patch +++ b/testing/yazi/system-lua.patch @@ -1,40 +1,12 @@ ---- a/yazi-fm/Cargo.toml -+++ b/yazi-fm/Cargo.toml -@@ -23,7 +23,7 @@ - crossterm = { version = "^0", features = [ "event-stream" ] } - fdlimit = "^0" - futures = "^0" --mlua = { version = "^0", features = [ "lua54", "vendored" ] } -+mlua = { version = "^0", features = [ "lua54" ] } - ratatui = "^0" - tokio = { version = "^1", features = [ "parking_lot" ] } - unicode-width = "^0" ---- a/yazi-plugin/Cargo.toml -+++ b/yazi-plugin/Cargo.toml -@@ -19,7 +19,7 @@ - crossterm = "^0" - futures = "^0" - md-5 = "^0" --mlua = { version = "^0", features = [ "lua54", "vendored", "serialize", "macros", "async" ] } -+mlua = { version = "^0", features = [ "lua54", "serialize", "macros", "async" ] } - parking_lot = "^0" - ratatui = "^0" - serde = "^1" ---- a/yazi-proxy/Cargo.toml -+++ b/yazi-proxy/Cargo.toml -@@ -14,5 +14,5 @@ - - # External dependencies - anyhow = "^1" --mlua = { version = "^0", features = [ "lua54", "vendored" ] } -+mlua = { version = "^0", features = [ "lua54" ] } - tokio = { version = "^1", features = [ "parking_lot" ] } -+++ a/Cargo.lock ---- b/Cargo.lock -@@ -611,16 +611,6 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 64898c5..9a1ee8a 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -608,16 +608,6 @@ dependencies = [ + "serde", ] - [[package]] +-[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" @@ -44,14 +16,14 @@ - "windows-sys 0.52.0", -] - --[[package]] + [[package]] name = "error-code" - version = "2.3.1" + version = "3.2.0" +@@ -902,15 +892,6 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -896,15 +886,6 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - [[package]] +-[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" @@ -60,27 +32,27 @@ - "windows-sys 0.52.0", -] - --[[package]] + [[package]] name = "iana-time-zone" version = "0.1.60" +@@ -1106,12 +1087,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1104,12 +1085,6 @@ - ] + checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - [[package]] +-[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - --[[package]] + [[package]] name = "lock_api" version = "0.4.11" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1135,25 +1110,6 @@ +@@ -1137,25 +1112,6 @@ dependencies = [ + "hashbrown", ] - [[package]] +-[[package]] -name = "lua-src" -version = "546.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" @@ -91,19 +63,18 @@ - -[[package]] -name = "luajit-src" --version = "210.5.6+9cc2e42" +-version = "210.5.7+d06beb0" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "23b365d859c9ffc187f48bb3e25ec80c3b40cf3f68f53544f4adeaee70554157" +-checksum = "0d251fdacdabbf87704cf48ac1f8b1eb23d6e10855c3ee08e5beb25b4be2e9e4" -dependencies = [ - "cc", - "which", -] - --[[package]] + [[package]] name = "malloc_buf" version = "0.0.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1232,8 +1188,6 @@ +@@ -1235,8 +1191,6 @@ checksum = "d16a9ba1dd2c6ac971b204262d434c24d65067038598f0638b64e5dca28d52b8" dependencies = [ "cc", "cfg-if", @@ -112,43 +83,105 @@ "pkg-config", ] -@@ -1651,19 +1605,6 @@ +@@ -1653,19 +1607,6 @@ version = "1.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] +-[[package]] -name = "rustix" --version = "0.38.31" +-version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ -- "bitflags 2.4.2", +- "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - --[[package]] + [[package]] name = "rustversion" - version = "1.0.14" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -2426,19 +2367,6 @@ - version = "0.1.8" + version = "1.0.15" +@@ -2418,18 +2359,6 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" -- + -[[package]] -name = "which" --version = "6.0.0" +-version = "6.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c" +-checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" -dependencies = [ - "either", - "home", -- "once_cell", - "rustix", -- "windows-sys 0.52.0", +- "winsafe", -] - +- [[package]] name = "winapi" + version = "0.3.9" +@@ -2684,12 +2613,6 @@ dependencies = [ + "memchr", + ] + +-[[package]] +-name = "winsafe" +-version = "0.0.19" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" +- + [[package]] + name = "yazi-adaptor" + version = "0.2.5" +diff --git a/yazi-dds/Cargo.toml b/yazi-dds/Cargo.toml +index e502ecc..6658844 100644 +--- a/yazi-dds/Cargo.toml ++++ b/yazi-dds/Cargo.toml +@@ -14,7 +14,7 @@ yazi-shared = { path = "../yazi-shared", version = "0.2.5" } + + # External dependencies + anyhow = "1.0.82" +-mlua = { version = "0.9.7", features = [ "lua54", "vendored" ] } ++mlua = { version = "0.9.7", features = [ "lua54" ] } + parking_lot = "0.12.1" + serde = { version = "1.0.198", features = [ "derive" ] } + serde_json = "1.0.116" +diff --git a/yazi-fm/Cargo.toml b/yazi-fm/Cargo.toml +index 07f3af9..7e69d6f 100644 +--- a/yazi-fm/Cargo.toml ++++ b/yazi-fm/Cargo.toml +@@ -24,7 +24,7 @@ better-panic = "0.3.0" + crossterm = { version = "0.27.0", features = [ "event-stream" ] } + fdlimit = "0.3.0" + futures = "0.3.30" +-mlua = { version = "0.9.7", features = [ "lua54", "vendored" ] } ++mlua = { version = "0.9.7", features = [ "lua54" ] } + ratatui = "=0.26.1" + scopeguard = "1.2.0" + syntect = { version = "5.2.0", default-features = false, features = [ "parsing", "plist-load", "regex-onig" ] } +diff --git a/yazi-plugin/Cargo.toml b/yazi-plugin/Cargo.toml +index 2e0a299..22f22da 100644 +--- a/yazi-plugin/Cargo.toml ++++ b/yazi-plugin/Cargo.toml +@@ -21,7 +21,7 @@ ansi-to-tui = "3.1.0" + anyhow = "1.0.82" + futures = "0.3.30" + md-5 = "0.10.6" +-mlua = { version = "0.9.7", features = [ "lua54", "vendored", "serialize", "macros", "async" ] } ++mlua = { version = "0.9.7", features = [ "lua54", "serialize", "macros", "async" ] } + parking_lot = "0.12.1" + ratatui = "=0.26.1" + serde = "1.0.198" +diff --git a/yazi-proxy/Cargo.toml b/yazi-proxy/Cargo.toml +index c65553a..85cb219 100644 +--- a/yazi-proxy/Cargo.toml ++++ b/yazi-proxy/Cargo.toml +@@ -14,5 +14,5 @@ yazi-shared = { path = "../yazi-shared", version = "0.2.5" } + + # External dependencies + anyhow = "1.0.82" +-mlua = { version = "0.9.7", features = [ "lua54", "vendored" ] } ++mlua = { version = "0.9.7", features = [ "lua54" ] } + tokio = { version = "1.37.0", features = [ "full" ] } diff --git a/testing/yoshimi/APKBUILD b/testing/yoshimi/APKBUILD index 1f4bdc9a12a..763caddcd6e 100644 --- a/testing/yoshimi/APKBUILD +++ b/testing/yoshimi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=yoshimi -pkgver=2.3.1.3 +pkgver=2.3.2 pkgrel=0 pkgdesc="Sophisticated software synthesizer" url="https://yoshimi.github.io/" @@ -40,5 +40,5 @@ package() { } sha512sums=" -5c8dd0fc7207d3356bbc5c5eae80a0ba9699fe5e6ff79eb889bf44be430e48e4bb959a43a88287e7e867f778e8870dc11927860b213e6bfd72a0309a77e15bb7 yoshimi-2.3.1.3.tar.gz +6ddca4a5cffc609880fcbb625eca471b9926cb3cc0bef9f349ef3fafe6280f5e3957e62db0c103856c680d0a3dde0b15225569d7171553ae74ee4c78c848b598 yoshimi-2.3.2.tar.gz " diff --git a/testing/yosys/APKBUILD b/testing/yosys/APKBUILD index 17bc8e86b40..17815d7c5ed 100644 --- a/testing/yosys/APKBUILD +++ b/testing/yosys/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dominika Liberda <ja@sdomi.pl> pkgname=yosys pkgver=0.36 -pkgrel=2 +pkgrel=3 pkgdesc="Yosys Open SYnthesis Suite" url="https://yosyshq.net" # doesn't build diff --git a/testing/ytmdl/APKBUILD b/testing/ytmdl/APKBUILD index c2f3805a1a0..ea779d8e757 100644 --- a/testing/ytmdl/APKBUILD +++ b/testing/ytmdl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Dmitry Zakharchenko <dmitz@disroot.org> # Maintainer: Dmitry Zakharchenko <dmitz@disroot.org> pkgname=ytmdl -pkgver=2023.11.26 -pkgrel=1 +pkgver=2024.04.14 +pkgrel=0 pkgdesc="Download songs with metadata from Youtube" url="https://github.com/deepjyoti30/ytmdl" arch="noarch !armhf !ppc64le" # limited by py3-youtube-search @@ -32,18 +32,16 @@ depends="python3 makedepends="py3-setuptools" options="!check" # no test suite subpackages="$pkgname-bash-completion $pkgname-zsh-completion $pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/y/ytmdl/ytmdl-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/deepjyoti30/ytmdl/archive/refs/tags/$pkgver.tar.gz" prepare() { default_prepare sed -e '/install_requires/d/setup_requires/d' -i setup.py -# -e 's|etc/bash_completion.d|usr/share/bash-completion/completions|' \ -# -e 's|zsh/functions/Completion/Unix|zsh/site-functions|' \ -# setup.py } build() { python3 setup.py build + python3 utils/completion.py } package() { @@ -57,5 +55,5 @@ package() { } sha512sums=" -cc2452eabff7727168bca3a37458985c8a664b9365ba11a74b921777a484221cad687637cf95a1ca6d4ba942442fc1120d5930139778c894bf4872c8c4afd40d ytmdl-2023.11.26.tar.gz +2d8b2e2189c6f0483dd32466f98281d8f173ad5d8a717ff9d828a7b08fc7f6313f108fb11da4b18ae66336c754c1c00f14010fe823c0a182387578db01795760 ytmdl-2024.04.14.tar.gz " diff --git a/testing/zfsbootmenu/APKBUILD b/testing/zfsbootmenu/APKBUILD new file mode 100644 index 00000000000..396dd718590 --- /dev/null +++ b/testing/zfsbootmenu/APKBUILD @@ -0,0 +1,43 @@ +# Maintainer: omni <omni+alpine@hack.org> +pkgname=zfsbootmenu +pkgver=2.3.0 +pkgrel=1 +pkgdesc="ZFS Bootloader for root-on-ZFS systems, this aport is work in progress" +#pkgdesc="ZFS Bootloader for root-on-ZFS systems with support for snapshots and native full disk encryption" +url="https://zfsbootmenu.org/" +arch="all !riscv64" # riscv64 blocked by dracut & kexec-tools +license="MIT" +depends="bash + fzf + kexec-tools + ncurses + perl-boolean + perl-sort-versions + perl-yaml-pp + pigz + zfs + " +makedepends="dracut" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/zbm-dev/zfsbootmenu/archive/refs/tags/v$pkgver.tar.gz" +options="!check" + +case "$CARCH" in +arm*) + # no mbuffer + ;; +*) + depends="$depends mbuffer" + ;; +esac + +package() { + # Makefile: + # install: core dracut initcpio zbm-release + make DESTDIR="$pkgdir" core dracut zbm-release + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +sha512sums=" +9b8e2d5ea258a32cd09a9382faaa21beea54f2ed825fa747f10ffe0b9f191c257b023019ec76dc882e649e8ea6fcd8e310632bba6c783228c594e3d0fee2c9c8 zfsbootmenu-2.3.0.tar.gz +" diff --git a/testing/zls/APKBUILD b/testing/zls/APKBUILD index 7df2a3b7077..d57071cdbc2 100644 --- a/testing/zls/APKBUILD +++ b/testing/zls/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Rabindra Dhakal <contact@qaidvoid.dev> pkgname=zls -pkgver=0.11.0 -pkgrel=1 +pkgver=0.12.0 +pkgrel=0 _knownfolders=a564f582122326328dad6b59209d070d57c4e6ae _diffz=90353d401c59e2ca5ed0abe5444c29ad3d7489aa _binned_allocator=6c3321e0969ff2463f8335da5601986cf2108690 @@ -47,7 +47,7 @@ package() { } sha512sums=" -88a754cdd110997736ceda1c6f145267d1c72c83ff0d5946d8d0b40ec64668f2e6b826b9d3ca1c2f195b304097968a4fe61ae4778e3f571638dde87d8f03c21d zls-0.11.0.tar.gz +d27653ae57c89f5fea03ecaaefa4c273a6a3694db24a1ebdf735c7ef0ca145e2d61c8f19d18bd5434659ac8ed0f5f715e6d15e4252db87ad89ac9402f580a860 zls-0.12.0.tar.gz 4aa0148e859fb9cb0bc816906dedd204f16ce3001f07f13ad688b1307036d2517373a5bc9184a9aa3634be51851658f4da9b4484718e089c6cc65a30c725fe00 known-folders-a564f582122326328dad6b59209d070d57c4e6ae.tar.gz 387ee728bdc96ba44e3a7a1974e109377f0ca8a4802198a3dc1d5160af682b9a8613309e105ab4f65e76fe1fae08b88463aa692f643e7d8cc03db4de2f94b847 diffz-90353d401c59e2ca5ed0abe5444c29ad3d7489aa.tar.gz 62c7ed619b7cda6ca197c13066c3b6320baa16ff0f8e48b6ed1dd6dde26fd9cd652c78b8e975a43055fc5fad8b014531f32d95efc878ed863cf2b80b06668897 binned_allocator-6c3321e0969ff2463f8335da5601986cf2108690 diff --git a/testing/zot/APKBUILD b/testing/zot/APKBUILD index 7cc8c40ae51..65c163a1428 100644 --- a/testing/zot/APKBUILD +++ b/testing/zot/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=zot -pkgver=2.0.1 -_zui_commit=f4a6030d93c4111af699a3ea0c154bd212e5aa06 -pkgrel=3 +pkgver=2.0.4 +_zui_commit=c78b303ee88555b39b9f21f136e702724b1725b0 +pkgrel=1 pkgdesc="Vendor-neutral OCI-native container image registry" -url="https://zotregistry.io/" +url="https://zotregistry.dev/" # 32-bit, s390x, riscv64: tests fail to build arch="all !armv7 !armhf !x86 !s390x !riscv64" license="Apache-2.0" @@ -25,7 +25,6 @@ source=" zot.confd basename_patch - bump-go-sqlite3.patch " options="net" # download Go modules @@ -123,10 +122,9 @@ _zshcomp() { } sha512sums=" -47fb6a87d6d9548c5add65ba9a3ba3b5bcd6e28a12989967c67ad491c0753521ba9b453d418cef32ecc4de6929868718a9cb4734c4dbadc1602bd9cd0ce9e81a zot-2.0.1.tar.gz -8b0f168193c664bb9f22f3340c8fcf934cf20cb53f89e25be417efb5633deb01f2dcedbd4960b03a94490f89a44ac2e53def839e2aa9489eab6ca52759d02c18 zui-f4a6030d93c4111af699a3ea0c154bd212e5aa06.tar.gz +18f54b091082fd2cb7f5aecdf2a961c1ae2131258e060071c73c42a7eb0f8effecb0e688c30fed4234129bf73e805aefa72f4ee92f5d8f3140cf302b69c8637d zot-2.0.4.tar.gz +5f71e5162e52ce0b2bb524d74b577fee56e026c880b353b0bd5f0ba82e9eb74ed56dfffd0f8e38a318dcd3740aab8b3485534b2d2d3e77277a4666f6c70d355d zui-c78b303ee88555b39b9f21f136e702724b1725b0.tar.gz 86dfa273e97110b703fbc368757520ef6169dead185ff54b5b8ba45e764949bc3a21a51d53a1605d7163faef8c83c066e688577f5315b8c0afb09f69a2bbe3bb zot.initd b128ecaf3e35cfdab8069da9a8267a9faed50b892ae07b6a4a22a4108236d6cdbc10cc4cf0105c728e9e6da6ac773f56d1dd84de1ba4463110058b6c2f190b30 zot.confd 640526de31a5eb21112c3d3fd30ce78331e5f5998166c9af9405ebad919a9a895ee82e3eed7067c2ce7e3e558e31907398fec1ad895be708e9f8ada696076216 basename_patch -f7efef45062db2418d6b78d7767876ff9d37204ba66da764e94cff9492fc4c2807600f1d6574d2446db7f936a5bafdf4476d4ade400910f62d30ff675ee330e3 bump-go-sqlite3.patch " diff --git a/testing/zot/bump-go-sqlite3.patch b/testing/zot/bump-go-sqlite3.patch deleted file mode 100644 index da05ad0fb43..00000000000 --- a/testing/zot/bump-go-sqlite3.patch +++ /dev/null @@ -1,800 +0,0 @@ ---- a/go.mod -+++ b/go.mod -@@ -1,7 +1,9 @@ - module zotregistry.io/zot - --go 1.20 -+go 1.21 - -+toolchain go1.22.0 -+ - require ( - github.com/99designs/gqlgen v0.17.41 - github.com/Masterminds/semver v1.5.0 -@@ -38,7 +40,7 @@ - github.com/swaggo/swag v1.16.2 - github.com/vektah/gqlparser/v2 v2.5.10 - go.etcd.io/bbolt v1.3.8 -- golang.org/x/crypto v0.17.0 -+ golang.org/x/crypto v0.18.0 - gopkg.in/resty.v1 v1.12.0 - gopkg.in/yaml.v2 v2.4.0 - ) -@@ -60,13 +62,13 @@ - github.com/swaggo/http-swagger v1.3.4 - github.com/zitadel/oidc v1.13.5 - golang.org/x/oauth2 v0.15.0 -- modernc.org/sqlite v1.27.0 -+ modernc.org/sqlite v1.29.3 - oras.land/oras-go/v2 v2.3.1 - ) - - require ( -- golang.org/x/sync v0.5.0 // indirect -- golang.org/x/sys v0.15.0 // indirect -+ golang.org/x/sync v0.6.0 // indirect -+ golang.org/x/sys v0.16.0 // indirect - golang.org/x/text v0.14.0 // indirect - ) - -@@ -142,7 +144,6 @@ - github.com/gosuri/uitable v0.0.4 // indirect - github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect - github.com/jmoiron/sqlx v1.3.5 // indirect -- github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect - github.com/kylelemons/godebug v1.1.0 // indirect - github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect - github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect -@@ -157,7 +158,7 @@ - github.com/masahiro331/go-ext4-filesystem v0.0.0-20230612143131-27ccd485b7a1 // indirect - github.com/masahiro331/go-vmdk-parser v0.0.0-20221225061455-612096e4bbbd // indirect - github.com/masahiro331/go-xfs-filesystem v0.0.0-20230608043311-a335f4599b70 // indirect -- github.com/mattn/go-sqlite3 v1.14.18 // indirect -+ github.com/mattn/go-sqlite3 v1.14.22 // indirect - github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect - github.com/microsoft/go-rustaudit v0.0.0-20220808201409-204dfee52032 // indirect - github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect -@@ -169,6 +170,7 @@ - github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect - github.com/morikuni/aec v1.0.0 // indirect - github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect -+ github.com/ncruces/go-strftime v0.1.9 // indirect - github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481 // indirect - github.com/oleiade/reflections v1.0.1 // indirect - github.com/opencontainers/selinux v1.11.0 // indirect -@@ -212,15 +214,12 @@ - k8s.io/cli-runtime v0.28.2 // indirect - k8s.io/component-base v0.28.2 // indirect - k8s.io/kubectl v0.28.2 // indirect -- lukechampine.com/uint128 v1.2.0 // indirect -- modernc.org/cc/v3 v3.40.0 // indirect -- modernc.org/ccgo/v3 v3.16.13 // indirect -- modernc.org/libc v1.29.0 // indirect -+ modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect -+ modernc.org/libc v1.41.0 // indirect - modernc.org/mathutil v1.6.0 // indirect - modernc.org/memory v1.7.2 // indirect -- modernc.org/opt v0.1.3 // indirect -- modernc.org/strutil v1.1.3 // indirect -- modernc.org/token v1.0.1 // indirect -+ modernc.org/strutil v1.2.0 // indirect -+ modernc.org/token v1.1.0 // indirect - oras.land/oras-go v1.2.4-0.20230829103011-4d0bf161925b // indirect - sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect - sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect -@@ -469,10 +468,10 @@ - go.uber.org/zap v1.26.0 // indirect - golang.org/x/exp v0.0.0-20231108232855-2478ac86f678 - golang.org/x/mod v0.14.0 // indirect -- golang.org/x/net v0.19.0 // indirect -- golang.org/x/term v0.15.0 // indirect -+ golang.org/x/net v0.20.0 // indirect -+ golang.org/x/term v0.16.0 // indirect - golang.org/x/time v0.5.0 // indirect -- golang.org/x/tools v0.15.0 // indirect -+ golang.org/x/tools v0.17.0 // indirect - golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - google.golang.org/api v0.152.0 // indirect - google.golang.org/appengine v1.6.8 // indirect -@@ -499,3 +498,5 @@ - - // https://github.com/gorilla/mux/issues/739 - replace github.com/gorilla/mux => github.com/gorilla/mux v1.8.0 -+ -+replace modernc.org/sqlite v1.27.0 => modernc.org/sqlite v1.29.3 ---- a/go.sum -+++ b/go.sum -@@ -115,6 +115,7 @@ - cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI= - cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= - cloud.google.com/go/kms v1.15.5 h1:pj1sRfut2eRbD9pFRjNnPNg/CzJPuQAzUujMIM1vVeM= -+cloud.google.com/go/kms v1.15.5/go.mod h1:cU2H5jnp6G2TDpUGZyqTCoy1n16fbubHZjmVXSMtwDI= - cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= - cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= - cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= -@@ -203,6 +204,7 @@ - github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 h1:59MxjQVfjXsBpLy+dbd2/ELV5ofnUkUZBvWSC85sheA= - github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0/go.mod h1:OahwfttHWG6eJ0clwcfBAHoDI6X/LV/15hx/wlMZSrU= - github.com/AdamKorcz/go-fuzz-headers-1 v0.0.0-20230618160516-e936619f9f18 h1:rd389Q26LMy03gG4anandGFC2LW/xvjga5GezeeaxQk= -+github.com/AdamKorcz/go-fuzz-headers-1 v0.0.0-20230618160516-e936619f9f18/go.mod h1:fgJuSBrJP5qZtKqaMJE0hmhS2tmRH+44IkfZvjtaf1M= - github.com/AliyunContainerService/ack-ram-tool/pkg/credentials/alibabacloudsdkgo/helper v0.2.0 h1:8+4G8JaejP8Xa6W46PzJEwisNgBXMvFcz78N6zG/ARw= - github.com/AliyunContainerService/ack-ram-tool/pkg/credentials/alibabacloudsdkgo/helper v0.2.0/go.mod h1:GgeIE+1be8Ivm7Sh4RgwI42aTtC9qrcj+Y9Y6CjJhJs= - github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU= -@@ -214,7 +216,9 @@ - github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 h1:d81/ng9rET2YqdVkVwkb6EXeRrLJIwyGnJcAlAWKwhs= - github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI= - github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1 h1:MyVTgWR8qd/Jw1Le0NZebGBUCLbtak3bJ3z1OlqZBpw= -+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1/go.mod h1:GpPjLhVR9dnUoJMyHWSPy71xY9/lcmpzIPZXmF0FCVY= - github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occbWoio4EBLkbkevetNMAVX197GkzbUMtqjGWn80= -+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI= - github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= - github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= - github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= -@@ -251,6 +255,7 @@ - github.com/CycloneDX/cyclonedx-go v0.7.2 h1:kKQ0t1dPOlugSIYVOMiMtFqeXI2wp/f5DBIdfux8gnQ= - github.com/CycloneDX/cyclonedx-go v0.7.2/go.mod h1:K2bA+324+Og0X84fA8HhN2X066K7Bxz4rpMQ4ZhjtSk= - github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= -+github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= - github.com/GoogleCloudPlatform/docker-credential-gcr v2.0.5+incompatible h1:juIaKLLVhqzP55d8x4cSVgwyQv76Z55/fRv/UBr2KkQ= - github.com/GoogleCloudPlatform/docker-credential-gcr v2.0.5+incompatible/go.mod h1:BB1eHdMLYEFuFdBlRMb0N7YGVdM5s6Pt0njxgvfbGGs= - github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= -@@ -281,6 +286,7 @@ - github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c h1:kMFnB0vCcX7IL/m9Y5LO+KQYv+t1CQOiFe6+SV2J7bE= - github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= - github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= -+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= - github.com/ThalesIgnite/crypto11 v1.2.5 h1:1IiIIEqYmBvUYFeMnHqRft4bwf/O36jryEUpY+9ef8E= - github.com/ThalesIgnite/crypto11 v1.2.5/go.mod h1:ILDKtnCKiQ7zRoNxcp36Y1ZR8LBPmR2E23+wTQe/MlE= - github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow= -@@ -297,6 +303,7 @@ - github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= - github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= - github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0= -+github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= - github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 h1:Kk6a4nehpJ3UuJRqlA3JxYxBZEqCeOmATOvrbT4p9RA= - github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= - github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.2/go.mod h1:sCavSAvdzOjul4cEqeVtvlSaSScfNsTQ+46HwlTL1hc= -@@ -339,20 +346,25 @@ - github.com/alibabacloud-go/tea-xml v1.1.3 h1:7LYnm+JbOq2B+T/B0fHC4Ies4/FofC4zHzYtqw7dgt0= - github.com/alibabacloud-go/tea-xml v1.1.3/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8= - github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk= -+github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= - github.com/alicebob/miniredis/v2 v2.30.4 h1:8S4/o1/KoUArAGbGwPxcwf0krlzceva2XVOSchFS7Eo= -+github.com/alicebob/miniredis/v2 v2.30.4/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg= - github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw= - github.com/aliyun/credentials-go v1.3.1 h1:uq/0v7kWrxmoLGpqjx7vtQ/s03f0zR//0br/xWDTE28= - github.com/aliyun/credentials-go v1.3.1/go.mod h1:8jKYhQuDawt8x2+fusqa1Y6mPxemTsBEN04dgcAcYz0= - github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 h1:aM1rlcoLz8y5B2r4tTLMiVTrMtpfY0O8EScKJxaSaEc= - github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092/go.mod h1:rYqSE9HbjzpHTI74vwPvae4ZVYZd1lue2ta6xHPdblA= - github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= -+github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= - github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= -+github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= - github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= - github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU= - github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= - github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= - github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= - github.com/aquasecurity/bolt-fixtures v0.0.0-20200903104109-d34e7f983986 h1:2a30xLN2sUZcMXl50hg+PJCIDdJgIvIbVcKqLJ/ZrtM= -+github.com/aquasecurity/bolt-fixtures v0.0.0-20200903104109-d34e7f983986/go.mod h1:NT+jyeCzXk6vXR5MTkdn4z64TgGfE5HMLC8qfj5unl8= - github.com/aquasecurity/defsec v0.93.1 h1:y4XgRknjs2M58XVLANBT1wulO7N6Rz1oyfwNuzID+h4= - github.com/aquasecurity/defsec v0.93.1/go.mod h1:i80K4WRNbcIWDOQDWnTHkutBwplzw/uZD4laKbhu4sE= - github.com/aquasecurity/go-dep-parser v0.0.0-20231030050624-4548cca9a5c9 h1:AYees+PQjw47SEdM6e/xxgrFzHA+UWxQl6WndDzILNY= -@@ -369,6 +381,7 @@ - github.com/aquasecurity/table v1.8.0 h1:9ntpSwrUfjrM6/YviArlx/ZBGd6ix8W+MtojQcM7tv0= - github.com/aquasecurity/table v1.8.0/go.mod h1:eqOmvjjB7AhXFgFqpJUEE/ietg7RrMSJZXyTN8E/wZw= - github.com/aquasecurity/testdocker v0.0.0-20230111101738-e741bda259da h1:pj/adfN0Wbzc0H8YkI1nX5K92wOU5/1/1TRuuc0y5Nw= -+github.com/aquasecurity/testdocker v0.0.0-20230111101738-e741bda259da/go.mod h1:852lbQLpK2nCwlR4ZLYIccxYCfoQao6q9Nl6tjz54v8= - github.com/aquasecurity/tml v0.6.1 h1:y2ZlGSfrhnn7t4ZJ/0rotuH+v5Jgv6BDDO5jB6A9gwo= - github.com/aquasecurity/tml v0.6.1/go.mod h1:OnYMWY5lvI9ejU7yH9LCberWaaTBW7hBFsITiIMY2yY= - github.com/aquasecurity/trivy v0.47.0 h1:Nlo5x5vCoBvPTz6QkHXgpYS7jT3WoCU7n7FHQ+A8FOk= -@@ -385,6 +398,7 @@ - github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= - github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= - github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= -+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= - github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= - github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= - github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -@@ -453,6 +467,7 @@ - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.6 h1:9ulSU5ClouoPIYhDQdg9tpl83d5Yb91PXTKK+17q+ow= - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.6/go.mod h1:lnc2taBsR9nTlz9meD+lhFZZ9EWY712QHrRflWpTcOA= - github.com/aws/aws-sdk-go-v2/service/kms v1.27.2 h1:I0NiSQiZu1UzP0akJWXSacjckEpYdN4VN7XYYfW6EYs= -+github.com/aws/aws-sdk-go-v2/service/kms v1.27.2/go.mod h1:E2IzqbIZfYuYUgib2KxlaweBbkxHCb3ZIgnp85TjKic= - github.com/aws/aws-sdk-go-v2/service/s3 v1.40.2 h1:Ll5/YVCOzRB+gxPqs2uD0R7/MyATC0w85626glSKmp4= - github.com/aws/aws-sdk-go-v2/service/s3 v1.40.2/go.mod h1:Zjfqt7KhQK+PO1bbOsFNzKgaq7TcxzmEoDWN8lM0qzQ= - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.25.2 h1:JKbfiLwEqJp8zaOAOn6AVSMS96gdwP3TjBMvZYsbxqE= -@@ -488,13 +503,18 @@ - github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I= - github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= - github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= -+github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= - github.com/briandowns/spinner v1.23.0 h1:alDF2guRWqa/FOZZYWjlMIx2L6H0wyewPxo/CH4Pt2A= - github.com/briandowns/spinner v1.23.0/go.mod h1:rPG4gmXeN3wQV/TsAY4w8lPdIM6RX3yqeBQJSrbXjuE= - github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= -+github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= - github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= - github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd h1:rFt+Y/IK1aEZkEHchZRSq9OQbsSzIT/OrI8YFFmRIng= -+github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= - github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ= -+github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= - github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o= -+github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= - github.com/buildkite/agent/v3 v3.59.0 h1:4+4gnl5DAgmDXs2JomzlVcYAiWJWkb6U9631Nh3wr0A= - github.com/buildkite/agent/v3 v3.59.0/go.mod h1:htNkEYNyaN7sNK63I1AIMJ30kR3l7IwxF5OCDh25jHY= - github.com/buildkite/go-pipeline v0.2.0 h1:+abnWSScMhJscxYgom2z0dzuXbjnYOz4RPeHmrfy31k= -@@ -503,10 +523,13 @@ - github.com/buildkite/interpolate v0.0.0-20200526001904-07f35b4ae251/go.mod h1:gbPR1gPu9dB96mucYIR7T3B7p/78hRVSOuzIWLHK2Y4= - github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= - github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 h1:3uZCA/BLTIu+DqCfguByNMJa2HVHpXvjfy0Dy7g6fuA= -+github.com/bytecodealliance/wasmtime-go/v3 v3.0.2/go.mod h1:RnUjnIXxEJcL6BgCvNyzCCRzZcxCgsZCi+RNlvYor5Q= - github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= - github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= - github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M= -+github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= - github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= -+github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= - github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= - github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= - github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -@@ -544,6 +567,7 @@ - github.com/cockroachdb/apd/v3 v3.2.1 h1:U+8j7t0axsIgvQUqthuNm82HIrYXodOV2iWLWtEaIwg= - github.com/cockroachdb/apd/v3 v3.2.1/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc= - github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE= -+github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= - github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be h1:J5BL2kskAlV9ckgEsNQXscjIaLiOYiZ75d4e94E6dcQ= - github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be/go.mod h1:mk5IQ+Y0ZeO87b858TlA645sVcEcbiX6YqP98kt+7+w= - github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= -@@ -590,19 +614,24 @@ - github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= - github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= - github.com/creack/pty v1.1.20 h1:VIPb/a2s17qNeQgDnkfZC35RScx+blkKF8GV68n80J4= -+github.com/creack/pty v1.1.20/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= - github.com/cyberphone/json-canonicalization v0.0.0-20231011164504-785e29786b46 h1:2Dx4IHfC1yHWI12AxQDJM1QbRCDfk6M+blLzlZCXdrc= - github.com/cyberphone/json-canonicalization v0.0.0-20231011164504-785e29786b46/go.mod h1:uzvlm1mxhHkdfqitSA92i7Se+S9ksOn3a3qmv/kyOCw= - github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= - github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= - github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE= -+github.com/danieljoos/wincred v1.2.0/go.mod h1:FzQLLMKBFdvu+osBrnFODiv32YGwCfx0SkRa/eYHgec= - github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= - github.com/depcheck-test/depcheck-test v0.0.0-20220607135614-199033aaa936 h1:foGzavPWwtoyBvjWyKJYDYsyzy+23iBV7NKTwdk+LRY= -+github.com/depcheck-test/depcheck-test v0.0.0-20220607135614-199033aaa936/go.mod h1:ttKPnOepYt4LLzD+loXQ1rT6EmpyIYHro7TAJuIIlHo= - github.com/dgraph-io/badger/v3 v3.2103.5 h1:ylPa6qzbjYRQMU6jokoj4wzcaweHylt//CH0AKt0akg= -+github.com/dgraph-io/badger/v3 v3.2103.5/go.mod h1:4MPiseMeDQ3FNCYwRbbcBOGJLf5jsE0PPFzRiKjtcdw= - github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= -+github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= - github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= - github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= - github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= -@@ -619,11 +648,13 @@ - github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U= - github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= - github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 h1:aBfCb7iqHmDEIp6fBvC/hQUddQfg+3qdYjwzaiP9Hnc= -+github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2/go.mod h1:WHNsWjnIn2V1LYOrME7e8KxSeKunYHsxEm4am0BUtcI= - github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= - github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= - github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E= - github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= - github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= -+github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= - github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg= - github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= - github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= -@@ -641,9 +672,11 @@ - github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= - github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= - github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4= -+github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= - github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= - github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= - github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= -+github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= - github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= - github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= - github.com/emicklei/proto v1.12.1 h1:6n/Z2pZAnBwuhU66Gs8160B8rrrYKo7h2F2sCOnNceE= -@@ -672,18 +705,24 @@ - github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= - github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= - github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= -+github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= - github.com/foxcpp/go-mockdns v1.0.0 h1:7jBqxd3WDWwi/6WhDvacvH1XsN3rOLXyHM1uhvIx6FI= -+github.com/foxcpp/go-mockdns v1.0.0/go.mod h1:lgRN6+KxQBawyIghpnl5CezHFGS9VLzvtVlwxvzXTQ4= - github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= - github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= -+github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= - github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= - github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= - github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= - github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= - github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= - github.com/fxamacker/cbor/v2 v2.5.0 h1:oHsG0V/Q6E/wqTS2O1Cozzsy69nqCiguo5Q1a1ADivE= -+github.com/fxamacker/cbor/v2 v2.5.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= - github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= - github.com/glebarez/go-sqlite v1.20.3 h1:89BkqGOXR9oRmG58ZrzgoY/Fhy5x0M+/WV48U5zVrZ4= -+github.com/glebarez/go-sqlite v1.20.3/go.mod h1:u3N6D/wftiAzIOJtZl6BmedqxmmkDfH3q+ihjqxC9u0= - github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= -+github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= - github.com/go-asn1-ber/asn1-ber v1.5.5 h1:MNHlNMBDgEKD4TcKr36vQN68BA00aDfjIt3/bD50WnA= - github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= - github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec= -@@ -695,6 +734,7 @@ - github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= - github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= - github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= -+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= - github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4= - github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY= - github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -@@ -756,15 +796,20 @@ - github.com/go-pkgz/expirable-cache v0.0.3 h1:rTh6qNPp78z0bQE6HDhXBHUwqnV9i09Vm6dksJLXQDc= - github.com/go-pkgz/expirable-cache v0.0.3/go.mod h1:+IauqN00R2FqNRLCLA+X5YljQJrwB179PfiAoMPlTlQ= - github.com/go-quicktest/qt v1.100.0 h1:I7iSLgIwNp0E0UnSvKJzs7ig0jg/Iq83zsZjtQNW7jY= -+github.com/go-quicktest/qt v1.100.0/go.mod h1:leyLsQ4jksGmF1KaQEyabnqGIiJTbOU5S46QegToEj4= - github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= - github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= - github.com/go-rod/rod v0.114.5 h1:1x6oqnslwFVuXJbJifgxspJUd3O4ntaGhRLHt+4Er9c= -+github.com/go-rod/rod v0.114.5/go.mod h1:aiedSEFg5DwG/fnNbUOTPMTTWX3MRj6vIs/a684Mthw= - github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= - github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= -+github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= - github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= - github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= - github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= - github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg= -+github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= - github.com/gobuffalo/logger v1.0.6 h1:nnZNpxYo0zx+Aj9RfMPBm+x9zAU2OayFh/xrAWi34HU= - github.com/gobuffalo/logger v1.0.6/go.mod h1:J31TBEHR1QLV2683OXTAItYIg8pv2JMHnF/quuAbMjs= - github.com/gobuffalo/packd v1.0.1 h1:U2wXfRr4E9DH8IdsDLlRFwTZTK7hLfq9qT/QHXGVe/0= -@@ -774,8 +819,10 @@ - github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= - github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= - github.com/goccy/go-yaml v1.8.1 h1:JuZRFlqLM5cWF6A+waL8AKVuCcqvKOuhJtUQI+L3ez0= -+github.com/goccy/go-yaml v1.8.1/go.mod h1:wS4gNoLalDSJxo/SpngzPQ2BN4uuZVLCmbM4S3vd4+Y= - github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= - github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= -+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= - github.com/godror/godror v0.24.2/go.mod h1:wZv/9vPiUib6tkoDl+AZ/QLf5YZgMravZ7jxH2eQWAE= - github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= - github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -@@ -794,6 +841,7 @@ - github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= - github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= -+github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= - github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= - github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= - github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -@@ -842,6 +890,7 @@ - github.com/google/certificate-transparency-go v1.1.7 h1:IASD+NtgSTJLPdzkthwvAG1ZVbF2WtFg4IvoA68XGSw= - github.com/google/certificate-transparency-go v1.1.7/go.mod h1:FSSBo8fyMVgqptbfF6j5p/XNdgQftAhSmXcIxV9iphE= - github.com/google/flatbuffers v2.0.8+incompatible h1:ivUb1cGomAB101ZM1T0nOiWz9pSrTMoa9+EiY7igmkM= -+github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= - github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 h1:0VpGH+cDhbDtdcweoyCVsF3fhN8kejK6rFe/2FFX2nU= - github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49/go.mod h1:BkkQ4L1KS1xMt2aWSPStnn55ChGC0DPOn2FQYj+f25M= - github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -@@ -882,6 +931,7 @@ - github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= - github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= - github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= -+github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= - github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= - github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= - github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -@@ -899,6 +949,7 @@ - github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= - github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= - github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b h1:RMpPgZTSApbPf7xaVel+QkoGPRLFLrwFO89uDUHEGf0= -+github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= - github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= - github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= - github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= -@@ -906,7 +957,9 @@ - github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= - github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= - github.com/google/tink/go v1.7.0 h1:6Eox8zONGebBFcCBqkVmt60LaWZa6xg1cl/DwAh/J1w= -+github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcgTJZStM= - github.com/google/trillian v1.5.3 h1:3ioA5p09qz+U9/t2riklZtaQdZclaStp0/eQNfewNRg= -+github.com/google/trillian v1.5.3/go.mod h1:p4tcg7eBr7aT6DxrAoILpc3uXNfcuAvZSnQKonVg+Eo= - github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= - github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= - github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -@@ -962,6 +1015,7 @@ - github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= - github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= - github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk= -+github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0/go.mod h1:TzP6duP4Py2pHLVPPQp42aoYI92+PCrVotyR5e8Vqlk= - github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= - github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= - github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -@@ -974,6 +1028,7 @@ - github.com/hashicorp/go-getter v1.7.2/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= - github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= - github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= -+github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= - github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= - github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= - github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -@@ -983,12 +1038,16 @@ - github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= - github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= - github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= -+github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= - github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= - github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= - github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 h1:UpiO20jno/eV1eVZcxqWnUohyKRe1g8FPV/xH1s/2qs= -+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8= - github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts= -+github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4= - github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= - github.com/hashicorp/go-sockaddr v1.0.5 h1:dvk7TIXCZpmfOlM+9mlcrWmWjw/wlKT+VDq2wMvfPJU= -+github.com/hashicorp/go-sockaddr v1.0.5/go.mod h1:uoUUmtwU7n9Dv3O4SNLeFvg0SxQ3lyjsj6+CCykpaxI= - github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= - github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= - github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -@@ -1000,6 +1059,7 @@ - github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= - github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= - github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= -+github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= - github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= - github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= - github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -@@ -1012,7 +1072,9 @@ - github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= - github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= - github.com/hashicorp/vault/api v1.10.0 h1:/US7sIjWN6Imp4o/Rj1Ce2Nr5bki/AXi9vAW3p2tOJQ= -+github.com/hashicorp/vault/api v1.10.0/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8= - github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef h1:A9HsByNhogrvm9cWb28sjiS3i7tcKCkflWFEkHfuAgM= -+github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= - github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= - github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= - github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -@@ -1035,12 +1097,15 @@ - github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 h1:TMtDYDHKYY15rFihtRfck/bfFqNfvcabqvXAFQfAUpY= - github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267/go.mod h1:h1nSAbGFqGVzn6Jyl1R/iCcBUHN4g+gW1u9CoBTrb9E= - github.com/jellydator/ttlcache/v3 v3.1.0 h1:0gPFG0IHHP6xyUyXq+JaD8fwkDCqgqwohXNJBcYE71g= -+github.com/jellydator/ttlcache/v3 v3.1.0/go.mod h1:hi7MGFdMAwZna5n2tuvh63DvFLzVKySzCVW6+0gA2n4= - github.com/jeremija/gosubmit v0.2.7 h1:At0OhGCFGPXyjPYAsCchoBUhE099pcBXmsb4iZqROIc= -+github.com/jeremija/gosubmit v0.2.7/go.mod h1:Ui+HS073lCFREXBbdfrJzMB57OI/bdxTiLtrDHHhFPI= - github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= - github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= - github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= - github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= - github.com/jmhodges/clock v1.2.0 h1:eq4kys+NI0PLngzaHEe7AmPT90XMGIEySD1JfV1PDIs= -+github.com/jmhodges/clock v1.2.0/go.mod h1:qKjhA7x7u/lQpPB1XAqX1b1lCI/w3/fNuYpI/ZjLynI= - github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= - github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= - github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -@@ -1059,8 +1124,6 @@ - github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= - github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= - github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= --github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= --github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= - github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= - github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= - github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -@@ -1167,8 +1230,8 @@ - github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= - github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= - github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= --github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI= --github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= -+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= -+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= - github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= - github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= - github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= -@@ -1176,6 +1239,7 @@ - github.com/microsoft/go-rustaudit v0.0.0-20220808201409-204dfee52032/go.mod h1:vYT9HE7WCvL64iVeZylKmCsWKfE+JZ8105iuh2Trk8g= - github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= - github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo= -+github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY= - github.com/miekg/pkcs11 v1.0.3-0.20190429190417-a667d056470f/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= - github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU= - github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -@@ -1240,6 +1304,8 @@ - github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= - github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= - github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -+github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4= -+github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= - github.com/nelsam/hel/v2 v2.3.2/go.mod h1:1ZTGfU2PFTOd5mx22i5O0Lc2GY933lQ2wb/ggy+rL3w= - github.com/nelsam/hel/v2 v2.3.3/go.mod h1:1ZTGfU2PFTOd5mx22i5O0Lc2GY933lQ2wb/ggy+rL3w= - github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -@@ -1269,11 +1335,13 @@ - github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= - github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= - github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU= -+github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= - github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= - github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= - github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= - github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= - github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= -+github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= - github.com/open-policy-agent/opa v0.59.0 h1:1WFU/KUhJAr3qatm0Lf8Ea5jp10ZmlE2M07oaLiHypg= - github.com/open-policy-agent/opa v0.59.0/go.mod h1:rdJSkEc4oQ+0074/3Fsgno5bkPsYxTjU5aLNmMujIvI= - github.com/opencontainers/distribution-spec/specs-go v0.0.0-20230117141039-067a0f5b0e25 h1:DpApB9YKcjGF1Lc8FmEAD5Xa1LRhVftJGgpe3+47Vc0= -@@ -1295,6 +1363,7 @@ - github.com/oras-project/artifacts-spec v1.0.0-rc.2 h1:9SMCNSxkJEHqWGDiMCuy6TXHgvjgwXGdXZZGXLKQvVE= - github.com/oras-project/artifacts-spec v1.0.0-rc.2/go.mod h1:Xch2aLzSwtkhbFFN6LUzTfLtukYvMMdXJ4oZ8O7BOdc= - github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU= -+github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w= - github.com/owenrumney/go-sarif v1.1.1/go.mod h1:dNDiPlF04ESR/6fHlPyq7gHKmrM0sHUvAGjsoh8ZH0U= - github.com/owenrumney/go-sarif/v2 v2.3.0 h1:wP5yEpI53zr0v5cBmagXzLbHZp9Oylyo3AJDpfLBITs= - github.com/owenrumney/go-sarif/v2 v2.3.0/go.mod h1:MSqMMx9WqlBSY7pXoOZWgEsVB4FDNfhcaXDA1j6Sr+w= -@@ -1377,18 +1446,22 @@ - github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= - github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= - github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= - github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= -+github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= - github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= - github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= - github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= - github.com/rubenv/sql-migrate v1.3.1 h1:Vx+n4Du8X8VTYuXbhNxdEUoh6wiJERA0GlWocR5FrbA= - github.com/rubenv/sql-migrate v1.3.1/go.mod h1:YzG/Vh82CwyhTFXy+Mf5ahAiiEOpAlHurg+23VEzcsk= - github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww= -+github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= - github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= - github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= - github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= - github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= - github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= -+github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= - github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ= - github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U= - github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= -@@ -1400,6 +1473,7 @@ - github.com/sassoftware/relic v7.2.1+incompatible h1:Pwyh1F3I0r4clFJXkSI8bOyJINGqpgjJU3DYAZeI05A= - github.com/sassoftware/relic v7.2.1+incompatible/go.mod h1:CWfAxv73/iLZ17rbyhIEq3K9hs5w6FpNMdUT//qR+zk= - github.com/sassoftware/relic/v7 v7.6.1 h1:O5s8ewCgq5QYNpv45dK4u6IpBmDM9RIcsbf/G1uXepQ= -+github.com/sassoftware/relic/v7 v7.6.1/go.mod h1:NxwtWxWxlUa9as2qZi635Ye6bBT/tGnMALLq7dSfOOU= - github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= - github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAjPbcMsODrTQUpJ02eNLUoxBg= - github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= -@@ -1423,9 +1497,13 @@ - github.com/sigstore/sigstore v1.7.6 h1:zB0woXx+3Bp7dk7AjklHF1VhXBdCs84VXkZbp0IHLv8= - github.com/sigstore/sigstore v1.7.6/go.mod h1:FJE+NpEZIs4QKqZl4B2RtaVLVDcDtocAwTiNlexeBkY= - github.com/sigstore/sigstore/pkg/signature/kms/aws v1.7.6 h1:WzZExOcFanrFfCi7SUgkBtJicWnSNziBD9nSSQIrqhc= -+github.com/sigstore/sigstore/pkg/signature/kms/aws v1.7.6/go.mod h1:3zOHOLHnCE6EXyVH+6Z/lC9O1RDsbmR045NQ1DogiHw= - github.com/sigstore/sigstore/pkg/signature/kms/azure v1.7.6 h1:wsPt9kNXF1ZZyae2wO35NLsK+cjWqPGpuPaDdXzRe0g= -+github.com/sigstore/sigstore/pkg/signature/kms/azure v1.7.6/go.mod h1:LH+ct6D77J8Ks6PXijMYYhmlQ1mbqKHbmy7+Sw5/Woc= - github.com/sigstore/sigstore/pkg/signature/kms/gcp v1.7.6 h1:aMVT9XXFQEnBtJ6szzanyAdKT5gFK4emN+jLSlFlOso= -+github.com/sigstore/sigstore/pkg/signature/kms/gcp v1.7.6/go.mod h1:Hwhlx8JSZJF1R27JlwW/Bl2h40reG3MfKANREtBI0L8= - github.com/sigstore/sigstore/pkg/signature/kms/hashivault v1.7.6 h1:TdSHzcFtPJxbk4B+huWC6GDq7OpgHmLg18inRo9u70I= -+github.com/sigstore/sigstore/pkg/signature/kms/hashivault v1.7.6/go.mod h1:/l/PzSbTOuIAtglOwUdlzzYvjIZ2WyaBpt5722JTmLY= - github.com/sigstore/timestamp-authority v1.2.0 h1:Ffk10QsHxu6aLwySQ7WuaoWkD63QkmcKtozlEFot/VI= - github.com/sigstore/timestamp-authority v1.2.0/go.mod h1:ojKaftH78Ovfow9DzuNl5WgTCEYSa4m5622UkKDHRXc= - github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -@@ -1438,6 +1516,7 @@ - github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA= - github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= - github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262 h1:unQFBIznI+VYD1/1fApl1A+9VcBk+9dcqGfnePY87LY= -+github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262/go.mod h1:MyOHs9Po2fbM1LHej6sBUT8ozbxmMOFG+E+rx/GSGuc= - github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY= - github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec= - github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -@@ -1447,6 +1526,7 @@ - github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60= - github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= - github.com/sosedoff/gitkit v0.4.0 h1:opyQJ/h9xMRLsz2ca/2CRXtstePcpldiZN8DpLLF8Os= -+github.com/sosedoff/gitkit v0.4.0/go.mod h1:V3EpGZ0nvCBhXerPsbDeqtyReNb48cwP9KtkUYTKT5I= - github.com/sosodev/duration v1.1.0 h1:kQcaiGbJaIsRqgQy7VGlZrVw1giWO+lDoX3MCPnpVO4= - github.com/sosodev/duration v1.1.0/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg= - github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= -@@ -1517,6 +1597,7 @@ - github.com/tchap/go-patricia/v2 v2.3.1 h1:6rQp39lgIYZ+MHmdEq4xzuk1t7OdC35z/xm0BGhTkes= - github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= - github.com/terminalstatic/go-xsd-validate v0.1.5 h1:RqpJnf6HGE2CB/lZB1A8BYguk8uRtcvYAPLCF15qguo= -+github.com/terminalstatic/go-xsd-validate v0.1.5/go.mod h1:18lsvYFofBflqCrvo1umpABZ99+GneNTw2kEEc8UPJw= - github.com/tetratelabs/wazero v1.2.1 h1:J4X2hrGzJvt+wqltuvcSjHQ7ujQxA9gb6PeMs4qlUWs= - github.com/tetratelabs/wazero v1.2.1/go.mod h1:wYx2gNRg8/WihJfSDxA1TIL8H+GkfLYm+bIfbblu9VQ= - github.com/thales-e-security/pool v0.0.2 h1:RAPs4q2EbWsTit6tpzuvTFlgFRJ3S8Evf5gtvVDbmPg= -@@ -1548,9 +1629,11 @@ - github.com/vektah/gqlparser/v2 v2.5.10 h1:6zSM4azXC9u4Nxy5YmdmGu4uKamfwsdKTwp5zsEealU= - github.com/vektah/gqlparser/v2 v2.5.10/go.mod h1:1rCcfwB2ekJofmluGWXMSEnPMZgbxzwj6FaZ/4OT8Cc= - github.com/veraison/go-cose v1.2.0 h1:Ok0Hr3GMAf8K/1NB4sV65QGgCiukG1w1QD+H5tmt0Ow= -+github.com/veraison/go-cose v1.2.0/go.mod h1:7ziE85vSq4ScFTg6wyoMXjucIGOf4JkFEZi/an96Ct4= - github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= - github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= - github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= -+github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= - github.com/xanzy/go-gitlab v0.94.0 h1:GmBl2T5zqUHqyjkxFSvsT7CbelGdAH/dmBqUBqS+4BE= - github.com/xanzy/go-gitlab v0.94.0/go.mod h1:ETg8tcj4OhrB84UEgeE8dSuV/0h4BBL1uOV/qK0vlyI= - github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= -@@ -1577,10 +1660,15 @@ - github.com/yashtewari/glob-intersection v0.2.0/go.mod h1:LK7pIC3piUjovexikBbJ26Yml7g8xa5bsjfx2v1fwok= - github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= - github.com/ysmood/fetchup v0.2.3 h1:ulX+SonA0Vma5zUFXtv52Kzip/xe7aj4vqT5AJwQ+ZQ= -+github.com/ysmood/fetchup v0.2.3/go.mod h1:xhibcRKziSvol0H1/pj33dnKrYyI2ebIvz5cOOkYGns= - github.com/ysmood/goob v0.4.0 h1:HsxXhyLBeGzWXnqVKtmT9qM7EuVs/XOgkX7T6r1o1AQ= -+github.com/ysmood/goob v0.4.0/go.mod h1:u6yx7ZhS4Exf2MwciFr6nIM8knHQIE22lFpWHnfql18= - github.com/ysmood/got v0.34.1 h1:IrV2uWLs45VXNvZqhJ6g2nIhY+pgIG1CUoOcqfXFl1s= -+github.com/ysmood/got v0.34.1/go.mod h1:yddyjq/PmAf08RMLSwDjPyCvHvYed+WjHnQxpH851LM= - github.com/ysmood/gson v0.7.3 h1:QFkWbTH8MxyUTKPkVWAENJhxqdBa4lYTQWqZCiLG6kE= -+github.com/ysmood/gson v0.7.3/go.mod h1:3Kzs5zDl21g5F/BlLTNcuAGAYLKt2lV5G8D1zF3RNmg= - github.com/ysmood/leakless v0.8.0 h1:BzLrVoiwxikpgEQR0Lk8NyBN5Cit2b1z+u0mgL4ZJak= -+github.com/ysmood/leakless v0.8.0/go.mod h1:R8iAXPRaG97QJwqxs74RdwzcRHT1SWCGTNqY8q0JvMQ= - github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= - github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= - github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -@@ -1590,10 +1678,15 @@ - github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= - github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= - github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE= -+github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= - github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI= -+github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= - github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE= -+github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= - github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY= -+github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= - github.com/zalando/go-keyring v0.2.2 h1:f0xmpYiSrHtSNAVgwip93Cg8tuF45HJM6rHq/A5RI/4= -+github.com/zalando/go-keyring v0.2.2/go.mod h1:sI3evg9Wvpw3+n4SqplGSJUMwtDeROfD4nsFz4z9PG0= - github.com/zclconf/go-cty v1.10.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= - github.com/zclconf/go-cty v1.13.0 h1:It5dfKTTZHe9aeppbNOda3mN7Ag7sg6QkBNm6TkyFa0= - github.com/zclconf/go-cty v1.13.0/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= -@@ -1602,6 +1695,7 @@ - github.com/zeebo/errs v1.3.0 h1:hmiaKqgYZzcVgRL1Vkc1Mn2914BbzB0IBxs+ebeutGs= - github.com/zeebo/errs v1.3.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4= - github.com/zitadel/logging v0.3.4 h1:9hZsTjMMTE3X2LUi0xcF9Q9EdLo+FAezeu52ireBbHM= -+github.com/zitadel/logging v0.3.4/go.mod h1:aPpLQhE+v6ocNK0TWrBrd363hZ95KcI17Q1ixAQwZF0= - github.com/zitadel/oidc v1.13.5 h1:7jhh68NGZitLqwLiVU9Dtwa4IraJPFF1vS+4UupO93U= - github.com/zitadel/oidc v1.13.5/go.mod h1:rHs1DhU3Sv3tnI6bQRVlFa3u0lCwtR7S21WHY+yXgPA= - go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -@@ -1629,7 +1723,9 @@ - go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= - go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw= -+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg= - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqheXEFWAZ7O8A7m+J0aPTmpJN3YQ7qetUAdkkkKpk= -+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0= - go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= - go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= - go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= -@@ -1638,6 +1734,7 @@ - go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= - go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= - go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= -+go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= - go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY= - go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= - go.step.sm/crypto v0.38.0 h1:kRVtzOjplP5xDh9UlenXdDAtXWCfVL6GevZgpiom1Zg= -@@ -1645,6 +1742,7 @@ - go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= - go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= - go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= -+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= - go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= - go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= - go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= -@@ -1682,8 +1780,8 @@ - golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= - golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= - golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= --golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= --golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -+golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= - golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= - golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= - golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -@@ -1794,8 +1892,8 @@ - golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= - golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= - golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= --golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= --golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= - golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= - golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= - golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -@@ -1839,8 +1937,8 @@ - golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= --golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= - golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -@@ -1939,8 +2037,8 @@ - golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= --golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= --golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= - golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= - golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -@@ -1954,8 +2052,8 @@ - golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= - golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= - golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= --golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= --golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= -+golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= - golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -@@ -2046,8 +2144,8 @@ - golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= - golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= - golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= --golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= --golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= -+golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -+golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= - golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -@@ -2329,6 +2427,7 @@ - gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= - gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= -+gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= - helm.sh/helm/v3 v3.12.3 h1:5y1+Sbty12t48T/t/CGNYUIME5BJ0WKfmW/sobYqkFg= - helm.sh/helm/v3 v3.12.3/go.mod h1:KPKQiX9IP5HX7o5YnnhViMnNuKiL/lJBVQ47GHe1R0k= - honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -@@ -2360,30 +2459,22 @@ - k8s.io/kubectl v0.28.2/go.mod h1:6EQWTPySF1fn7yKoQZHYf9TPwIl2AygHEcJoxFekr64= - k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= - k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= --lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI= --lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= --modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw= --modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0= --modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw= --modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY= --modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk= --modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM= --modernc.org/libc v1.29.0 h1:tTFRFq69YKCF2QyGNuRUQxKBm1uZZLubf6Cjh/pVHXs= --modernc.org/libc v1.29.0/go.mod h1:DaG/4Q3LRRdqpiLyP0C2m1B8ZMGkQ+cCgOIjEtQlYhQ= -+modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE= -+modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ= -+modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI= -+modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4= -+modernc.org/libc v1.41.0 h1:g9YAc6BkKlgORsUWj+JwqoB1wU3o4DE3bM3yvA3k+Gk= -+modernc.org/libc v1.41.0/go.mod h1:w0eszPsiXoOnoMJgrXjglgLuDy/bt5RR4y3QzUUeodY= - modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4= - modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo= - modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E= - modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E= --modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= --modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= --modernc.org/sqlite v1.27.0 h1:MpKAHoyYB7xqcwnUwkuD+npwEa0fojF0B5QRbN+auJ8= --modernc.org/sqlite v1.27.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0= --modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY= --modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw= --modernc.org/tcl v1.15.2 h1:C4ybAYCGJw968e+Me18oW55kD/FexcHbqH2xak1ROSY= --modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg= --modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= --modernc.org/z v1.7.3 h1:zDJf6iHjrnB+WRD88stbXokugjyc0/pB91ri1gO6LZY= -+modernc.org/sqlite v1.29.3 h1:6L71d3zXVB8oubdVSuwiurNyYRetQ3It8l1FSwylwQ0= -+modernc.org/sqlite v1.29.3/go.mod h1:MjUIBKZ+tU/lqjNLbVAAMjsQPdWdA/ciwdhsT9kBwk8= -+modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA= -+modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0= -+modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= -+modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= - oras.land/oras-go v1.2.4-0.20230829103011-4d0bf161925b h1:l686f99tTmPu2ivMXCQeEup0BRgl+JH9IPNEbqAude0= - oras.land/oras-go v1.2.4-0.20230829103011-4d0bf161925b/go.mod h1:3epPRss3O+fN+y5SrffVQuubeSpw9atz1gcaAX+V0Tw= - oras.land/oras-go/v2 v2.3.1 h1:lUC6q8RkeRReANEERLfH86iwGn55lbSWP20egdFHVec= -@@ -2405,3 +2496,4 @@ - sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= - sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= - software.sslmate.com/src/go-pkcs12 v0.2.0 h1:nlFkj7bTysH6VkC4fGphtjXRbezREPgrHuJG20hBGPE= -+software.sslmate.com/src/go-pkcs12 v0.2.0/go.mod h1:23rNcYsMabIc1otwLpTkCCPwUq6kQsTyowttG/as0kQ= diff --git a/testing/zsh-history-search-multi-word/APKBUILD b/testing/zsh-history-search-multi-word/APKBUILD new file mode 100644 index 00000000000..c37276a402f --- /dev/null +++ b/testing/zsh-history-search-multi-word/APKBUILD @@ -0,0 +1,28 @@ +# Maintainer: omni <omni+alpine@hack.org> +pkgname=zsh-history-search-multi-word +pkgver=0_git20230705 +_gitrev=c4dcddc1cd17e7e0909471703f3526170db0f475 +pkgrel=0 +pkgdesc="Binds Ctrl-R to a widget that searches for multiple keywords in an AND fashion" +url="https://github.com/zdharma-continuum/history-search-multi-word" +arch="noarch" +license="MIT AND GPL-3.0-or-later" +depends="zsh" +subpackages="$pkgname-doc" +source="history-search-multi-word-$_gitrev.tar.gz::https://github.com/zdharma-continuum/history-search-multi-word/archive/$_gitrev.tar.gz" +builddir="$srcdir/history-search-multi-word-$_gitrev" +options="!check" + +package() { + mkdir -p "$pkgdir"/usr/share/zsh/plugins + install -Dm 644 LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE + install -Dm 644 README.md -t "$pkgdir"/usr/share/doc/"$pkgname"/ + install -Dm 644 CHANGELOG.md -t "$pkgdir"/usr/share/doc/"$pkgname"/ + + mkdir -p "$pkgdir"/usr/share/zsh/plugins/history-search-multi-word + mv ./h* "$pkgdir"/usr/share/zsh/plugins/history-search-multi-word +} + +sha512sums=" +e28d6ae272c03dd2e61c842d6257a1a3c8c6133621c00a39e4951944135a6a3e1ed2edaa9d9dbadb8965733d5e9eeee8d9e97ace65685a197afa3b717c87d02d history-search-multi-word-c4dcddc1cd17e7e0909471703f3526170db0f475.tar.gz +" |