diff options
2536 files changed, 28819 insertions, 15402 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/aaaaxy/APKBUILD b/community/aaaaxy/APKBUILD index 0c8d21920b6..bd9dd67d7ef 100644 --- a/community/aaaaxy/APKBUILD +++ b/community/aaaaxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Rudolf Polzer <divVerent@gmail.com> pkgname=aaaaxy pkgver=1.5.129 -pkgrel=0 +pkgrel=1 pkgdesc="A nonlinear puzzle platformer taking place in impossible spaces" url="https://divVerent.github.io/aaaaxy/" arch="all !s390x !armhf !armv7 !riscv64" diff --git a/community/aardvark-dns/APKBUILD b/community/aardvark-dns/APKBUILD index 32672fe727f..a56ec9514ed 100644 --- a/community/aardvark-dns/APKBUILD +++ b/community/aardvark-dns/APKBUILD @@ -7,7 +7,8 @@ pkgdesc="Authoritative DNS server for A/AAAA container records" url="https://github.com/containers/aardvark-dns" license="Apache-2.0" # s390x: fails to build due to nix crate -arch="all !s390x" +# loongarch64: rust nix does not support +arch="all !s390x !loongarch64" makedepends="cargo" source="https://github.com/containers/aardvark-dns/archive/v$pkgver/aardvark-dns-$pkgver.tar.gz" options="net" diff --git a/community/acme-redirect/APKBUILD b/community/acme-redirect/APKBUILD index bd26f01cb6a..cf6fcbd2618 100644 --- a/community/acme-redirect/APKBUILD +++ b/community/acme-redirect/APKBUILD @@ -6,7 +6,7 @@ pkgrel=4 pkgdesc="Tiny http daemon that answers acme challenges and redirects everything else to https" url="https://github.com/kpcyrd/acme-redirect" # ppc64le and s390x and riscv64 blocked by ring crate -arch="all !ppc64le !s390x !riscv64" +arch="all !ppc64le !s390x !riscv64 !loongarch64" license="GPL-3.0-or-later" makedepends=" cargo diff --git a/community/acmed/APKBUILD b/community/acmed/APKBUILD index 5be29db4953..9d21f6cec84 100644 --- a/community/acmed/APKBUILD +++ b/community/acmed/APKBUILD @@ -14,6 +14,7 @@ makedepends="cargo openssl-dev>3 cargo-auditable" subpackages="$pkgname-doc $pkgname-openrc $pkgname-tacd $pkgname-tacd-doc:tacd_doc" install="acmed.pre-install" source="https://github.com/breard-r/acmed/archive/refs/tags/v$pkgver/acmed-$pkgver.tar.gz + upgrade-rust-libc-to-support-loongarch64.patch acmed.confd acmed.initd " @@ -21,6 +22,7 @@ source="https://github.com/breard-r/acmed/archive/refs/tags/v$pkgver/acmed-$pkgv prepare() { default_prepare cargo fetch --target="$CTARGET" --locked + } build() { @@ -66,6 +68,7 @@ tacd_doc() { sha512sums=" 2b66008f63668bb78e4e903ee65765354af6b5c281eeae16684c99624861781f3efd2e95dd6d38f53d488e31cd9f68d7400dd3af0ad969588a34f2fda0e41004 acmed-0.23.0.tar.gz +6794a749ff759f659029a9e307bab1ec2a73d97b822cc36374d8979d94baa6b9b54710398c261b231efca69e5e92dbf9e1c1e929e201978eda6c0f584bdcc1c7 upgrade-rust-libc-to-support-loongarch64.patch 2fb5cb330ba4f91c49e34e5808034cbeeb23a9637f4b03cff80ea26338b0a4a232042d7888ee7305afac945402520433828db4064c4274d8ead431aa16a668c1 acmed.confd 126ce93a32c4eace6d41635947c7ecfa3fea3fd731f5ef2b528e911259305e2fdfa115bc78475d6fba57e0717facc27ac4cc341a4c24511c75ef96772e354c1b acmed.initd " diff --git a/community/acmed/upgrade-rust-libc-to-support-loongarch64.patch b/community/acmed/upgrade-rust-libc-to-support-loongarch64.patch new file mode 100644 index 00000000000..05cf362bdd5 --- /dev/null +++ b/community/acmed/upgrade-rust-libc-to-support-loongarch64.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 4a744e1..ef24203 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -831,9 +831,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[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 = "linux-raw-sys" diff --git a/testing/actionlint/APKBUILD b/community/actionlint/APKBUILD index ca38e6fcfaf..37aaa013724 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.1 +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 +66bbbc1559996df7469d9f62e0c400e07292d18593e5ff2d6a6b191655767ae060e0cd999fba426693430e35d3ce7635261160c0b8ad735e6b879a9d67aa063b actionlint-1.7.1.tar.gz " diff --git a/community/adbtuifm/APKBUILD b/community/adbtuifm/APKBUILD index 1c5de3f0d75..5c16698d617 100644 --- a/community/adbtuifm/APKBUILD +++ b/community/adbtuifm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=adbtuifm pkgver=0.5.8 -pkgrel=2 +pkgrel=3 pkgdesc="A TUI File Manager for Android Debug Bridge (ADB)" url="https://github.com/darkhz/adbtuifm" license="MIT" diff --git a/community/aerc/APKBUILD b/community/aerc/APKBUILD index 75465e2b326..9a1cb8b6503 100644 --- a/community/aerc/APKBUILD +++ b/community/aerc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Steven Guikal <void@fluix.one> pkgname=aerc pkgver=0.17.0 -pkgrel=2 +pkgrel=3 pkgdesc="email client for your terminal" url="https://aerc-mail.org" arch="all" diff --git a/community/age/APKBUILD b/community/age/APKBUILD index a76843f1cf2..7c3aa5533d2 100644 --- a/community/age/APKBUILD +++ b/community/age/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=age pkgver=1.1.1 -pkgrel=11 +pkgrel=12 pkgdesc="Simple, modern and secure encryption tool" url="https://github.com/FiloSottile/age" license="BSD-3-Clause" diff --git a/community/aisleriot/APKBUILD b/community/aisleriot/APKBUILD index c3a8360a395..8e5bca27cd4 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.33 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 +d3b20ddc4f53a0fd40227b60e2cce3fb52f93eef6ceaf4453e397766a55de68233ddbb08d2e0c2e8a92b7fc4040e37afa872b93907251e5284985e3ebe1ebf68 aisleriot-3.22.33.tar.gz " diff --git a/community/akonadi-calendar-tools/APKBUILD b/community/akonadi-calendar-tools/APKBUILD index f06ec8006a5..06bfcc06bb0 100644 --- a/community/akonadi-calendar-tools/APKBUILD +++ b/community/akonadi-calendar-tools/APKBUILD @@ -4,11 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=akonadi-calendar-tools -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -45,5 +46,5 @@ package() { } sha512sums=" -3d727a38922cacaca1b9d0d8ffbfbafdf4b4c20f5c2e3e63ef8abf5ce633c282bea0ee1fd57fef41d694f76874eecd25576b2aa61123e86791018862ad06e192 akonadi-calendar-tools-24.02.2.tar.xz +05959eb63c28f158af04f6506bc2b8a2bcdd960b21e1677089df8e0011c37bb0440a0719ed0cc07e9a7fe18be48d306d85dfd7a1718645b3af56e150fc9dbcbc akonadi-calendar-tools-24.05.0.tar.xz " diff --git a/community/akonadi-calendar/APKBUILD b/community/akonadi-calendar/APKBUILD index 281b2cf3351..13571811a25 100644 --- a/community/akonadi-calendar/APKBUILD +++ b/community/akonadi-calendar/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=akonadi-calendar -pkgver=24.02.2 +pkgver=24.05.0 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=" @@ -55,5 +56,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -ff1baa1080e759b42412ec996f47aa5dae7152bba9e1a8a845e2b16337a43c8d5f31214db5f581c38dc5ca9c3b5a072a6c2b3d50fa277d1540ce626ab5b202b6 akonadi-calendar-24.02.2.tar.xz +7892f932088d153086fba0e6f41b03e22787267e2c6903405c52e340700cdd5087e07c3c31b62accc2325e8bb060d251b11b27490412e81e7d1e22680b969bf2 akonadi-calendar-24.05.0.tar.xz " diff --git a/community/akonadi-contacts/APKBUILD b/community/akonadi-contacts/APKBUILD index b0b3b62f035..804bfa3d377 100644 --- a/community/akonadi-contacts/APKBUILD +++ b/community/akonadi-contacts/APKBUILD @@ -4,13 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=akonadi-contacts -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Libraries and daemons to implement Contact Management in Akonadi" # armhf blocked by extra-cmake-modules -# s390x and riscv64 blocked by akonadi +# s390x, riscv64 and loongarch64 blocked by akonadi # ppc64le blocked by qt6-qtwebengine -> akonadi -arch="all !armhf !s390x !riscv64 !ppc64le" +arch="all !armhf !s390x !riscv64 !ppc64le !loongarch64" url="https://community.kde.org/KDE_PIM" license="LGPL-2.0-or-later AND GPL-2.0-or-later AND BSD-3-Clause" depends_dev=" @@ -62,5 +62,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -2e93db90e91ebc108006beac962636c7448b418b4229fb76bf4fe165506e7b4aa7c9b70054a6ce8caf4f7846d61e47a9a7072d631f9c0ab8da9f43b66127d82e akonadi-contacts-24.02.2.tar.xz +33b654e3c24795349c8f949d0a06f757935cbab82ff7cf952f33dc3ca244d33fc3edf951a3f65308f6381f9bcacda6ea67a2a62e9710f332215100e9d93162c3 akonadi-contacts-24.05.0.tar.xz " diff --git a/community/akonadi-import-wizard/APKBUILD b/community/akonadi-import-wizard/APKBUILD index a3f4aaaf714..8765269ca6c 100644 --- a/community/akonadi-import-wizard/APKBUILD +++ b/community/akonadi-import-wizard/APKBUILD @@ -4,11 +4,11 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=akonadi-import-wizard -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -53,5 +53,5 @@ package() { } sha512sums=" -2c46c3e23d10ff8a56418d5fe454ca543f2fc24f045f20dfe0eed45ace07ee7d04e4c6dc87e296fc71f2c1cb3f02b8f24d6ea5e883ba57da7c06b2a38543210b akonadi-import-wizard-24.02.2.tar.xz +6c77a488fc6c6aab08cb8450f798333e36760c86bdc198f5751963ebcde75e740b00570980eb83f8e90318eea0100a33a311910350c374716f14b19f7aaec98d akonadi-import-wizard-24.05.0.tar.xz " diff --git a/community/akonadi-mime/APKBUILD b/community/akonadi-mime/APKBUILD index 8ee88d10110..36d0f419362 100644 --- a/community/akonadi-mime/APKBUILD +++ b/community/akonadi-mime/APKBUILD @@ -4,13 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=akonadi-mime -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Libraries and daemons to implement basic email handling" # armhf blocked by extra-cmake-modules -# s390x and riscv64 blocked by akonadi +# s390x, riscv64 and loongarch64 blocked by akonadi # ppc64le blocked by qt6-qtwebengine -> kaccounts-integration -arch="all !armhf !s390x !riscv64 !ppc64le" +arch="all !armhf !s390x !riscv64 !ppc64le !loongarch64" url="https://community.kde.org/KDE_PIM" license="LGPL-2.0-or-later" depends_dev=" @@ -52,5 +52,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -5e86f7a204390a94fff8029dc5269a5672605705b3b86300b017925bbc971992b9046cb48b6cb5fc5e0b62cdd6448b9bf0a58d631bcd328cc221770cd7a54f15 akonadi-mime-24.02.2.tar.xz +c33945436b1c915639cb9b2230a65bcb163c92c7e6c31906b6dac60d5f64d170cd532a6d166ee81cc45725452abe75d1e912b8a92b6ee70029e635df203b82c1 akonadi-mime-24.05.0.tar.xz " diff --git a/community/akonadi-notes/APKBUILD b/community/akonadi-notes/APKBUILD index 88da84d05c1..7681077196e 100644 --- a/community/akonadi-notes/APKBUILD +++ b/community/akonadi-notes/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=akonadi-notes -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Libraries and daemons to implement management of notes" # armhf blocked by extra-cmake-modules @@ -41,5 +41,5 @@ package() { } sha512sums=" -38cc2e0c1d10ce47708d8f255a48162bcb51c4a053aa1ffc9124a9307b53d0bec5abe7133bfd8a207cf27ff06caf74347c8f35c0c84dd2b6d358d1a164698a61 akonadi-notes-24.02.2.tar.xz +063112a914da08a7b94f8a2f7fe21361050e35094d4f17edd03d2e83aa99a964b79c62f6379945eac968db0d9b9bfa8ae2f03d56635267f12cbd9f5cdb3a469f akonadi-notes-24.05.0.tar.xz " diff --git a/community/akonadi-search/APKBUILD b/community/akonadi-search/APKBUILD index 178fa78f0fe..f318a087413 100644 --- a/community/akonadi-search/APKBUILD +++ b/community/akonadi-search/APKBUILD @@ -4,14 +4,14 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=akonadi-search -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Libraries and daemons to implement searching in Akonadi" # armhf blocked by extra-cmake-modules -# riscv64 blocked by akonadi +# riscv64 and loongarch64 blocked by akonadi # s390x blocked by multiple KDE Frameworks # ppc64le blocked by qt6-qtwebengine -> akonadi -arch="all !armhf !s390x !riscv64 !ppc64le" +arch="all !armhf !s390x !riscv64 !ppc64le !loongarch64" url="https://community.kde.org/KDE_PIM" license="( GPL-2.0-only OR GPL-3.0-only ) AND ( LGPL-2.1-only OR LGPL-3.0-only )" depends_dev=" @@ -78,5 +78,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -9c157bc1fbc231f84ef5ccd37eb50e80207e794d0971a3c65fce438491000cf05b7f9b9da34f7285bf7c7323a1195b4cbbde1044436c785f408cec7d8e30d679 akonadi-search-24.02.2.tar.xz +05bcadf270ce38e031f732cffaf01af4e941017e282e2c103a666763e9da522e8f6f9055c1f85ac749bb06da57939a2b3698eae9237b0d8a9b90abe2b8bde539 akonadi-search-24.05.0.tar.xz " diff --git a/community/akonadi/APKBUILD b/community/akonadi/APKBUILD index 6133772edfd..ec3e767110f 100644 --- a/community/akonadi/APKBUILD +++ b/community/akonadi/APKBUILD @@ -4,12 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=akonadi -pkgver=24.02.2 -pkgrel=1 +pkgver=24.05.0 +pkgrel=0 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 -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by kaccounts-integration +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://community.kde.org/KDE_PIM" license="LGPL-2.0-or-later" depends=" @@ -96,5 +96,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -ca59ba8d69f24296c8ae8f991310df0a5a96f5712924cc1bb6e35c6031d0209d65a91b45fa5c3509c4bc2c0242fc53afe5df69600c9152bec999239798b06067 akonadi-24.02.2.tar.xz +e512dcf3d212c6227b031e30567b9f1c13a33222f56ae653f061486f5aa50abbb9d8929b4575470cd529840ff9199ff7811d3b41f29d841f29d4f8d43c3f0ac1 akonadi-24.05.0.tar.xz " diff --git a/community/akonadiconsole/APKBUILD b/community/akonadiconsole/APKBUILD index 6bf4fbfe86d..bff5d028f4e 100644 --- a/community/akonadiconsole/APKBUILD +++ b/community/akonadiconsole/APKBUILD @@ -4,12 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=akonadiconsole -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -63,5 +63,5 @@ package() { } sha512sums=" -c45a23185083fc16e7f4406b16e35a9bcdb9975d3e3a40e6bc58af64ea745fd7f141ad3de4b03df056833a119fdf17467fe7b20e612efaf44df9b2528548f768 akonadiconsole-24.02.2.tar.xz +b9d0356eba00e9b97b605ed4c75ed55485f942f0f5fb4dedc7934f3d46ece1f19b2613857358fbe8c8d2bcd041de7505fa17d2d9e561d06cec5031b2e644a493 akonadiconsole-24.05.0.tar.xz " diff --git a/community/akregator/APKBUILD b/community/akregator/APKBUILD index 359cc5def1e..63fc685b953 100644 --- a/community/akregator/APKBUILD +++ b/community/akregator/APKBUILD @@ -4,11 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=akregator -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -61,5 +62,5 @@ package() { } sha512sums=" -9b9a042a9b740775567e580d94c408df32ef816e582a7f1a63ebb6620ffc4460cee884a9939cec731f5eed2b3bd202fa1866a61825ac90eccc5b2def6c63b817 akregator-24.02.2.tar.xz +a0f33d5540ff511ad48f083a9d00155a0ab49f057fb7865c0df5ea956090341752fed5a8d4687757fe3d00442db3adfd532a3cf393d4f4593c1ed39fe525e40a akregator-24.05.0.tar.xz " diff --git a/community/alacritty/APKBUILD b/community/alacritty/APKBUILD index 2bbed9c3184..1f8f7c3e323 100644 --- a/community/alacritty/APKBUILD +++ b/community/alacritty/APKBUILD @@ -29,6 +29,7 @@ subpackages=" " options="net" source="$pkgname-$pkgver.tar.gz::https://github.com/alacritty/alacritty/archive/refs/tags/v$pkgver.tar.gz + upgrade-rust-libc-to-support-loongarch64.patch " prepare() { @@ -82,4 +83,5 @@ package() { sha512sums=" 945ed27355bf16b0ce78be26a6a525104a7db9160590fa3dc7769d4e9b3db5d3cfd5e6a2a4f95364c95c132a3ea545b6b72286130c3d2fcfd1400042dd2bbe5c alacritty-0.13.2.tar.gz +880c18be90ff07117dcdc63e246fe098a38574bb8a3e8ce608ac88d05720dbcfc5b502c190b34f6680ea2586aa11b57cb4b6080f1599ba4ba5104bb30c2b7739 upgrade-rust-libc-to-support-loongarch64.patch " diff --git a/community/alacritty/upgrade-rust-libc-to-support-loongarch64.patch b/community/alacritty/upgrade-rust-libc-to-support-loongarch64.patch new file mode 100644 index 00000000000..ef1e5571d53 --- /dev/null +++ b/community/alacritty/upgrade-rust-libc-to-support-loongarch64.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index b322b16..baa5b90 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1019,9 +1019,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[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/alertmanager/APKBUILD b/community/alertmanager/APKBUILD index cadbfa5834f..cb87e1c6fc9 100644 --- a/community/alertmanager/APKBUILD +++ b/community/alertmanager/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=alertmanager pkgver=0.27.0 -pkgrel=2 +pkgrel=3 pkgdesc="Prometheus Alertmanager" url="https://github.com/prometheus/alertmanager" #riscv64: aws dependency fails to build diff --git a/community/ali/APKBUILD b/community/ali/APKBUILD index 2b932c08990..b3fb6bf5815 100644 --- a/community/ali/APKBUILD +++ b/community/ali/APKBUILD @@ -5,14 +5,15 @@ pkgver=0.7.5 # this is used for the help command to print the commit. # needs to be changed on every release. _rev=c0aa677 -pkgrel=21 +pkgrel=22 pkgdesc="Generate HTTP load and plot the results in real-time" url="https://github.com/nakabonne/ali" arch="all" license="MIT" options="chmod-clean" makedepends="go" -source="$pkgname-$pkgver.tar.gz::https://github.com/nakabonne/ali/archive/refs/tags/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/nakabonne/ali/archive/refs/tags/v$pkgver.tar.gz + upgrade-gomod.patch" export GOFLAGS="$GOFLAGS -modcacherw" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" @@ -37,4 +38,5 @@ package() { } sha512sums=" 6ae745556bec663abcb2a8d6c5e090fdd5e6b5a8bb889f85c528f749de79eb0e33d794265a801983f8de81629e19a1a38fe147e5095108310b1a353766866ff3 ali-0.7.5.tar.gz +cf0155e69fc8557669691761683bbf2ff159f16ca50c7b7a54978aa94bbdcb67788fe7db7f83ba8878def192e20fbf2ef3896169ee89d7a6b9cb698ece90d03f upgrade-gomod.patch " diff --git a/community/ali/upgrade-gomod.patch b/community/ali/upgrade-gomod.patch new file mode 100644 index 00000000000..1b42a53e4cc --- /dev/null +++ b/community/ali/upgrade-gomod.patch @@ -0,0 +1,98 @@ +diff --git a/go.mod b/go.mod +index 4a8ea23..081bd3f 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,30 +1,33 @@ + module github.com/nakabonne/ali + +-go 1.17 ++go 1.18 ++ ++require ( ++ github.com/golang/mock v1.6.0 ++ github.com/miekg/dns v1.1.43 ++ github.com/mum4k/termdash v0.16.0 ++ github.com/nakabonne/tstorage v0.3.5 ++ github.com/spf13/pflag v1.0.5 ++ github.com/stretchr/testify v1.7.0 ++ github.com/tsenart/vegeta/v12 v12.8.4 ++ go.uber.org/atomic v1.9.0 ++ go.uber.org/goleak v1.1.12 ++) + + require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/gdamore/encoding v1.0.0 // indirect + github.com/gdamore/tcell/v2 v2.2.0 // indirect +- github.com/golang/mock v1.6.0 + github.com/influxdata/tdigest v0.0.0-20180711151920-a7d76c6f093a // indirect + github.com/lucasb-eyer/go-colorful v1.0.3 // indirect + github.com/mailru/easyjson v0.7.0 // indirect + github.com/mattn/go-runewidth v0.0.12 // indirect +- github.com/miekg/dns v1.1.43 +- github.com/mum4k/termdash v0.16.0 +- github.com/nakabonne/tstorage v0.3.5 + github.com/nsf/termbox-go v0.0.0-20201107200903-9b52a5faed9e // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rivo/uniseg v0.1.0 // indirect +- github.com/spf13/pflag v1.0.5 +- github.com/stretchr/testify v1.7.0 +- github.com/tsenart/vegeta/v12 v12.8.4 +- go.uber.org/atomic v1.9.0 +- go.uber.org/goleak v1.1.12 +- golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect +- golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect +- golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect +- golang.org/x/text v0.3.4 // indirect ++ golang.org/x/net v0.6.0 // indirect ++ golang.org/x/sys v0.6.0 // indirect ++ golang.org/x/term v0.5.0 // indirect ++ golang.org/x/text v0.7.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect + ) +diff --git a/go.sum b/go.sum +index bbbb3f6..0eaf2be 100644 +--- a/go.sum ++++ b/go.sum +@@ -88,8 +88,9 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn + golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= + golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0= + golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= ++golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= ++golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= + golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +@@ -99,23 +100,26 @@ golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7w + golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= + golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= ++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +-golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M= + golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= ++golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= ++golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= + golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +-golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= + golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= ++golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= ++golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= + golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= + golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= + golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= + golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +-golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= + golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= ++golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= + 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-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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/alligator/APKBUILD b/community/alligator/APKBUILD index 64b6271f465..87e86613366 100644 --- a/community/alligator/APKBUILD +++ b/community/alligator/APKBUILD @@ -3,7 +3,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=alligator -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A convergent RSS/Atom feed reader" url="https://invent.kde.org/plasma-mobile/alligator/" @@ -44,5 +44,5 @@ package() { } sha512sums=" -8142b2568f303610a0d36ab3b118892c2ca23c52ffdc3f2b5d4c78b7658f6e7a7ef6e21d0e3d4c857c41b719550c69a7c86fea6c815ec0ec3009ee718582dd16 alligator-24.02.2.tar.xz +780adb665b8d510afee54a76a1ac275f30bf39309f444e45647b589e3b8845db872aeff2cc1ff53816200a9ec4547302e5b60c382a6fd68a76b622c393d6e569 alligator-24.05.0.tar.xz " diff --git a/community/alpine-repo-tools/APKBUILD b/community/alpine-repo-tools/APKBUILD index 6013556b21d..907b4801496 100644 --- a/community/alpine-repo-tools/APKBUILD +++ b/community/alpine-repo-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=alpine-repo-tools pkgver=0.3.0 -pkgrel=7 +pkgrel=8 pkgdesc="utilities to interact with Alpine Linux repositories" url="https://gitlab.alpinelinux.org/alpine/infra/repo-tools" arch="all" diff --git a/community/alsa-tools/APKBUILD b/community/alsa-tools/APKBUILD index 315edec9cc2..52b537debbb 100644 --- a/community/alsa-tools/APKBUILD +++ b/community/alsa-tools/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alsa-tools -pkgver=1.2.5 -pkgrel=4 +pkgver=1.2.11 +pkgrel=0 pkgdesc="Advanced tools for certain sound cards" url="https://alsa-project.org/" arch="all" @@ -45,5 +45,5 @@ _gui() { } sha512sums=" -1c4ff947d9f2424056a6748e04a1250fb73443a3f470f61d0b563c91be082bc42d56e550d6cc27eaed3edcea2066a107e20455c959b053b5deafa2d811b7e498 alsa-tools-1.2.5.tar.bz2 +b5a29a83121a637eaa16d225875feeabaea893eabc61b97d0c18a5852d851ff2e6932bd732786bb43525b410c2bb9185261cc4509fd3ee5fd8536557f12b2154 alsa-tools-1.2.11.tar.bz2 " diff --git a/community/amfora/APKBUILD b/community/amfora/APKBUILD index b9d78fe3f25..f81a2e9e815 100644 --- a/community/amfora/APKBUILD +++ b/community/amfora/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: omni <omni@gitlab.alpinelinux.org> pkgname=amfora pkgver=1.10.0 # Don't forget to update main.commit below -pkgrel=1 +pkgrel=2 pkgdesc="terminal browser for the Gemini protocol" url="https://github.com/makeworld-the-better-one/amfora" license="GPL-3.0-or-later" diff --git a/community/analitza/APKBUILD b/community/analitza/APKBUILD index 49ace8a8a0e..cfcbed2e17d 100644 --- a/community/analitza/APKBUILD +++ b/community/analitza/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=analitza -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -45,5 +45,5 @@ package() { } sha512sums=" -c6267cbec4c1abd3661785fb36004db6a13f0819de1dd2d69f6870450e0dce43fa6b10908a915850a0f6872da01882729734de1e9fefa6f8fb00fab7b64bcb3e analitza-24.02.2.tar.xz +c06decf3e3c664912b39f293a9b54921a5f350c219f07497b958b1035140ae55b4beca4ca6b89e4518bcb4335d05ce97102b1fa91a4aa6eedca388055e76d2a3 analitza-24.05.0.tar.xz " diff --git a/community/android-tools/APKBUILD b/community/android-tools/APKBUILD index aa1b551cc27..03385afa3cc 100644 --- a/community/android-tools/APKBUILD +++ b/community/android-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=android-tools -pkgver=34.0.5 +pkgver=35.0.1 pkgrel=1 pkgdesc="Android platform tools" url="https://sites.google.com/a/android.com/tools/" @@ -14,7 +14,7 @@ makedepends="pcre2-dev linux-headers libusb-dev gtest-dev go perl cmake protobuf-dev brotli-dev zstd-dev lz4-dev samurai abseil-cpp-dev" subpackages="$pkgname-bash-completion:bashcomp:noarch" source="https://github.com/nmeum/android-tools/releases/download/$pkgver/android-tools-$pkgver.tar.xz - " + fix-armhf.patch" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -39,5 +39,6 @@ bashcomp() { } sha512sums=" -2edea0c7a4c2f63531a8b5f518ed4dc9c315d08d8b23d3fac3b7024e2297860465f6df9fad43c9925fb80b5a50f5f3f4744886b552818bf3e961ba0372212496 android-tools-34.0.5.tar.xz +2dc3831f29a2c5ffc57978e4a6fa6d1469bcb0740750779b3e4f8239eaec87864f3474254a2d649ab630062be091d8b44a4e45c7e7b7e033f3b4481f81d76296 android-tools-35.0.1.tar.xz +0a68c8ea7d0ff825777b5bac04f958294e49ca32181cfe3e88195d023c821d1be9665135e3ba246ae439b729bc521db555b8f2c1f6e4cd0a57f1fe9d2923b6cb fix-armhf.patch " diff --git a/community/android-tools/fix-armhf.patch b/community/android-tools/fix-armhf.patch new file mode 100644 index 00000000000..d149c669658 --- /dev/null +++ b/community/android-tools/fix-armhf.patch @@ -0,0 +1,78 @@ +This fixes the build on armhf by backporting the following boringssl patches: + +* https://github.com/google/boringssl/commit/af3c8953274748404ca8235d6cc31a2e1189e64f +* https://github.com/google/boringssl/commit/12316ab445eef5317391a94bef733fa6ff175173 + +diff -upr android-tools-35.0.1.orig/vendor/boringssl/crypto/fipsmodule/sha/asm/sha256-armv4.pl android-tools-35.0.1/vendor/boringssl/crypto/fipsmodule/sha/asm/sha256-armv4.pl +--- android-tools-35.0.1.orig/vendor/boringssl/crypto/fipsmodule/sha/asm/sha256-armv4.pl 2024-05-17 16:29:30.474793795 +0200 ++++ android-tools-35.0.1/vendor/boringssl/crypto/fipsmodule/sha/asm/sha256-armv4.pl 2024-05-17 16:30:35.428396067 +0200 +@@ -459,6 +459,14 @@ $code.=<<___; + .arch armv7-a + .fpu neon + ++.LK256_shortcut_neon: ++@ PC is 8 bytes ahead in Arm mode and 4 bytes ahead in Thumb mode. ++#if defined(__thumb2__) ++.word K256-(.LK256_add_neon+4) ++#else ++.word K256-(.LK256_add_neon+8) ++#endif ++ + .global sha256_block_data_order_neon + .type sha256_block_data_order_neon,%function + .align 5 +@@ -467,10 +475,21 @@ sha256_block_data_order_neon: + stmdb sp!,{r4-r12,lr} + + sub $H,sp,#16*4+16 +- @ In Arm mode, the following ADR runs up against the limits of encodable +- @ offsets. It only fits because the offset, when the ADR is placed here, +- @ is a multiple of 16. +- adr $Ktbl,K256 ++ ++ @ K256 is just at the boundary of being easily referenced by an ADR from ++ @ this function. In Arm mode, when building with __ARM_ARCH=6, it does ++ @ not fit. By moving code around, we could make it fit, but this is too ++ @ fragile. For simplicity, just load the offset from ++ @ .LK256_shortcut_neon. ++ @ ++ @ TODO(davidben): adrl would avoid a load, but clang-assembler does not ++ @ support it. We might be able to emulate it with a macro, but Android's ++ @ did not work when I tried it. ++ @ https://android.googlesource.com/platform/ndk/+/refs/heads/master/docs/ClangMigration.md#arm ++ ldr $Ktbl,.LK256_shortcut_neon ++.LK256_add_neon: ++ add $Ktbl,pc,$Ktbl ++ + bic $H,$H,#15 @ align for 128-bit stores + mov $t2,sp + mov sp,$H @ alloca +@@ -596,12 +615,12 @@ $code.=<<___; + # define INST(a,b,c,d) .byte a,b,c,d + # endif + +-.LK256_shortcut: ++.LK256_shortcut_hw: + @ PC is 8 bytes ahead in Arm mode and 4 bytes ahead in Thumb mode. + #if defined(__thumb2__) +-.word K256-(.LK256_add+4) ++.word K256-(.LK256_add_hw+4) + #else +-.word K256-(.LK256_add+8) ++.word K256-(.LK256_add_hw+8) + #endif + + .global sha256_block_data_order_hw +@@ -610,9 +629,9 @@ $code.=<<___; + sha256_block_data_order_hw: + @ K256 is too far to reference from one ADR command in Thumb mode. In + @ Arm mode, we could make it fit by aligning the ADR offset to a 64-byte +- @ boundary. For simplicity, just load the offset from .LK256_shortcut. +- ldr $Ktbl,.LK256_shortcut +-.LK256_add: ++ @ boundary. For simplicity, just load the offset from .LK256_shortcut_hw. ++ ldr $Ktbl,.LK256_shortcut_hw ++.LK256_add_hw: + add $Ktbl,pc,$Ktbl + + vld1.32 {$ABCD,$EFGH},[$ctx] diff --git a/community/angelfish/APKBUILD b/community/angelfish/APKBUILD index 45b67411b5e..a086726d3ca 100644 --- a/community/angelfish/APKBUILD +++ b/community/angelfish/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=angelfish -pkgver=24.02.2 +pkgver=24.05.0 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 \ @@ -59,5 +60,5 @@ package() { } sha512sums=" -b08243cc0a13b68d03df96e724248f8dd76612b0ea0c5dabc57c5849082a131e5b84bcc64233ca88962ca57768d11d45e2ccc1873cfb816df4a572a30b24876b angelfish-24.02.2.tar.xz +910925abff15302bb426344e6ba9a335140e1ac0f4e38cebedfd445fa8ad393c8ab316439b9e3e10a27412f8da8cdd91f81162ebc6762af1021a1c96642cf4c2 angelfish-24.05.0.tar.xz " diff --git a/community/ansible-core/APKBUILD b/community/ansible-core/APKBUILD index 90eda5f22ad..fded7a577ce 100644 --- a/community/ansible-core/APKBUILD +++ b/community/ansible-core/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Sean McAvoy <seanmcavoy@gmail.com> pkgname=ansible-core _pkgname=${pkgname/-/_} -pkgver=2.16.6 +pkgver=2.17.0 pkgrel=0 pkgdesc="core components of ansible: A configuration-management, deployment, task-execution, and multinode orchestration framework" url="https://ansible.com" @@ -39,5 +39,5 @@ package() { install -Dm644 man/ansible*1 -t "$pkgdir"/usr/share/man/man1/ } sha512sums=" -cd9cc8783e13b073cbfaef889e20c8a7dfb732c91de4bae2b496a64ef47b0325c637b4ab2eadbd0c56cb004e95f5294aa1e1548675a90f06193d62defd553409 ansible-core-2.16.6.tar.gz +32206982158c060254c3b2d470e96c67b3cd91dae83f9888ac236395f540fa3b15bafa7a56e355e3bedbcc9726d78a8fc78a84468805acc8c06c6c3af7abf9aa ansible-core-2.17.0.tar.gz " diff --git a/community/ansible-lint/APKBUILD b/community/ansible-lint/APKBUILD index 12bb2983d7e..812d4ecefcd 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.3 -pkgrel=1 +pkgver=24.5.0 +pkgrel=0 pkgdesc="check ansible playbooks" url="https://github.com/ansible/ansible-lint" arch="noarch" @@ -15,6 +15,7 @@ depends=" git py3-ansible-compat py3-filelock + py3-importlib-metadata py3-jinja2 py3-jsonschema py3-packaging @@ -36,8 +37,10 @@ makedepends=" checkdepends=" py3-flaky py3-psutil + py3-pylint py3-pytest py3-pytest-cov + py3-pytest-mypy py3-pytest-xdist yamllint " @@ -66,6 +69,6 @@ package() { } sha512sums=" -65d221ef0d64692d1af3fb099a65d2326f7736e8890ef8aae885f341ae6be4d9021c89332ba44b1fc65fc74a815deaaf48e2941ab988e6e464ba45dc540ac6dc ansible_lint-24.2.3.tar.gz +b390743bbb09c03c9b402c35644c2b2e29b9a94fce842bf42b8938f7094b145ea75275f643949383bdad694408c606c0bc3038d5ca733a39ac08ef77cc7dc459 ansible_lint-24.5.0.tar.gz 314fa02e0b30db8a8886824b0cce825ae4ffe227e2c5be434bc96e1c3ab8a6239548574d9ed0869def67b94c684a67abbf594f78aadbc64286fe8187502ba275 no-version-check.patch " diff --git a/community/ansible/APKBUILD b/community/ansible/APKBUILD index 57a1c2fdb5d..ebeee7abec0 100644 --- a/community/ansible/APKBUILD +++ b/community/ansible/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Sean McAvoy <seanmcavoy@gmail.com> pkgname=ansible -pkgver=9.5.1 +pkgver=9.6.0 pkgrel=0 pkgdesc="core components for Ansible" url="https://ansible.com/" @@ -38,5 +38,5 @@ package() { } sha512sums=" -8a95f0e41987a1ab423ebd6be8483681c30f31dfd24056d729c4e0cc870775d3a59f9790bcd0bf578538ba24752b9dc6401fe467f4f8b12acdd50878555bc8c1 ansible-9.5.1.tar.gz +36306cc167d463d934b33fec65470b005963e306acbf29249214f38aa155e926db2cee6abe99612b1b7b66f87cd37bb29e0489618476bcb2562183f380758cf7 ansible-9.6.0.tar.gz " diff --git a/community/apache-arrow/APKBUILD b/community/apache-arrow/APKBUILD index 636666d25bb..d8cc56e3167 100644 --- a/community/apache-arrow/APKBUILD +++ b/community/apache-arrow/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Duncan Bellamy <dunk@denkimushi.com> # based on arch linux PKGBUILD pkgname=apache-arrow -pkgver=16.0.0 +pkgver=16.1.0 pkgrel=0 pkgdesc="multi-language toolbox for accelerated data interchange and in-memory processing" url="https://arrow.apache.org/" @@ -213,7 +213,7 @@ lib() { } sha512sums=" -773f4f3eef603032c8ba0cfdc023bfd2a24bb5e41c82da354a22d7854ab153294ede1f4782cc32b27451cf1b58303f105bac61ceeb3568faea747b93e21d79e4 apache-arrow-16.0.0.tar.gz +28975f59e1fdde2dba4afaf4a5ba934b63db3a7f27656e2aa0af0f0d2a046c9dbfa9a6082de94629c36d03809b296566a37ea65ec5a2fc17fedac7d21e272d31 apache-arrow-16.1.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-orc/APKBUILD b/community/apache-orc/APKBUILD index 031f4b74895..fa3e5bd88f4 100644 --- a/community/apache-orc/APKBUILD +++ b/community/apache-orc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Duncan Bellamy <dunk@denkimushi.com> # based on arch linux PKGBUILD pkgname=apache-orc -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=0 pkgdesc="the smallest, fastest columnar storage for Hadoop workloads" url="https://orc.apache.org/" @@ -54,5 +54,5 @@ package() { } sha512sums=" -96f5a9ec0b4c7bb920e2eaa001fd47087c989fdb8c4fff511597d7ac0d2213abd4d4f4d41089ee0933e8ff28d09da587844eaa89c40d0f0d22d8ad92f98f3097 orc-2.0.0.tar.gz +c9c2a656714a7b9767cc489f91257af1d13d9284b7745522c72354290aa4253195035ed129d472c702e14a8ae8040745b37ca7d0b7473511bdaec63fae24625b orc-2.0.1.tar.gz " diff --git a/testing/aparte/APKBUILD b/community/aparte/APKBUILD index a540a642fa0..a540a642fa0 100644 --- a/testing/aparte/APKBUILD +++ b/community/aparte/APKBUILD diff --git a/community/apk-file/APKBUILD b/community/apk-file/APKBUILD index cebc86347b2..f9adabaf89e 100644 --- a/community/apk-file/APKBUILD +++ b/community/apk-file/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Daniele Debernardi <drebrez@gmail.com> pkgname=apk-file pkgver=0.3.6 -pkgrel=24 +pkgrel=25 pkgdesc="Command line front end for pkgs.alpinelinux.org" options="chmod-clean" url="https://github.com/genuinetools/apk-file" diff --git a/community/apko/APKBUILD b/community/apko/APKBUILD index 6d63bb3986d..4f1d9216ed1 100644 --- a/community/apko/APKBUILD +++ b/community/apko/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Ariadne Conill <ariadne@dereferenced.org> pkgname=apko pkgver=0.9.0 -pkgrel=7 +pkgrel=8 pkgdesc="declarative APK-based container building tool with support for Sigstore signatures" url="https://github.com/chainguard-dev/apko" arch="all" diff --git a/community/apptainer/APKBUILD b/community/apptainer/APKBUILD index 5db959aaf91..f81bfad15a4 100644 --- a/community/apptainer/APKBUILD +++ b/community/apptainer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=apptainer pkgver=1.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Application containers for Linux" url="https://apptainer.org/" arch="all" diff --git a/community/apt/APKBUILD b/community/apt/APKBUILD index 55dffffb97c..fb60811bce5 100644 --- a/community/apt/APKBUILD +++ b/community/apt/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=apt -pkgver=2.9.2 +pkgver=2.9.4 pkgrel=0 pkgdesc="APT package management tool" url="https://salsa.debian.org/apt-team/apt" @@ -10,6 +10,7 @@ makedepends=" bzip2-dev db-dev cmake + dpkg dpkg-dev eudev-dev gettext-dev @@ -28,7 +29,9 @@ subpackages=" $pkgname-dev $pkgname-libs " -source="https://salsa.debian.org/apt-team/apt/-/archive/$pkgver/apt-$pkgver.tar.bz2" +source="https://salsa.debian.org/apt-team/apt/-/archive/$pkgver/apt-$pkgver.tar.bz2 + fix-basename.patch + " options="!check" # todo build() { @@ -54,5 +57,6 @@ package() { } sha512sums=" -3df939adddbeddf6766aa29b0f729bedda8de4ccad191aef8dd9a99dc411d7e22efce09a57c1b525a07f5d5492aba1d96d295e9012568a45a507c5e027c9158d apt-2.9.2.tar.bz2 +64a698d183ad358538059df74e375d6d7950843e7a8f26231738b4e93d937af4e0da02ec19bc53c73c0becb252ea3974981687ec375608568c6d746b615d3fef apt-2.9.4.tar.bz2 +27d7e1516915bbae025c4c943c7427421662e7c3bee8f1821565ac3cd823e8a823c4ac99efb9cc9a27e338c73b49e2628f0a88c5c2c1d2e935b1c89b9209d18c fix-basename.patch " diff --git a/community/apt/fix-basename.patch b/community/apt/fix-basename.patch new file mode 100644 index 00000000000..f0cb0c76777 --- /dev/null +++ b/community/apt/fix-basename.patch @@ -0,0 +1,12 @@ +--- a/cmdline/apt-internal-solver.cc ++++ b/cmdline/apt-internal-solver.cc +@@ -38,6 +38,9 @@ + #include <unistd.h> + + #include <apti18n.h> ++ ++#define basename(name) (strrchr((name),'/') ? strrchr((name),'/')+1 : (name)) ++ + /*}}}*/ + + static bool ShowHelp(CommandLine &) /*{{{*/ diff --git a/community/apx/APKBUILD b/community/apx/APKBUILD index dba1c58316b..b4acc4a56fd 100644 --- a/community/apx/APKBUILD +++ b/community/apx/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=apx -pkgver=2.4.0 -pkgrel=2 +pkgver=2.4.2 +pkgrel=0 pkgdesc="A package manager that can install packages from multiple sources without altering the root filesystem" url="https://github.com/Vanilla-OS/apx" license="GPL-3.0-only" @@ -34,6 +34,6 @@ package() { } sha512sums=" -5e220c911894f7f54084966078495abadb424778f1a86fa767da8adba0d8e90e317a54ec86b22f1948f4123f7f0d817d6bd1c25a15af21f794c10b8945ce5c80 apx-2.4.0.tar.gz +a76ab53a09f8454e0eb1a1ff8df8e01dfaa263b3d1a9c40f7ac84771526faf5acc1f500fec99c3b3523c82f5c4e55f734343853bc21cf5679065615fe9b81a36 apx-2.4.2.tar.gz 0d0e999b5b2e714bcd63e69357740a805cf3670c2e9d03c36700de17aec0445e56cb1da27b1b192fe11287beb98833d616fcc51937872b845bdb693ea9901929 config.json " diff --git a/community/arianna/APKBUILD b/community/arianna/APKBUILD index e37a20aea89..ea8d5896764 100644 --- a/community/arianna/APKBUILD +++ b/community/arianna/APKBUILD @@ -4,14 +4,14 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=arianna -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="EPub Reader for mobile devices" url="https://invent.kde.org/graphics/arianna/" # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt6-qtwebengine +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt6-qtwebengine # x86 blocked by limited featureset of qt6-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64 !x86" +arch="all !armhf !ppc64le !s390x !riscv64 !x86 !loongarch64" license="(BSD-2-Clause OR BSD-3-Clause) AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.0-or-later OR LGPL-2.1-or-later OR LGPL-3.0-or-later)" depends=" kirigami-addons @@ -56,5 +56,5 @@ package() { } sha512sums=" -3795e5562d8a24e3791796c62f394b787cfefc7fd62411e323f2ffffb8f27ea7463aad5d3028da1060dfe2e4f64651f9402fceeb317f20d96573924be5367107 arianna-24.02.2.tar.xz +2b165eb957e9ba3fbfe508320a53b7dc012b0174a73971b7e31f3dbb421c323a76bd8d94995dc205f860c9101ea752646097496068c86d26b9e01b1c3373c391 arianna-24.05.0.tar.xz " diff --git a/community/ark/APKBUILD b/community/ark/APKBUILD index 342459536c4..528a5fc8eb7 100644 --- a/community/ark/APKBUILD +++ b/community/ark/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=ark -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" # armhf blocked by extra-cmake-modules @@ -68,5 +68,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -419769f9bd3644670c7cb4d53bc9c683c92fb92e2dae117953791e0074093814d455676aa25237fa2209453c730156c40b7082ad3683e69c7dd619d222c9469b ark-24.02.2.tar.xz +10da4a893d664fbf2c004312770f44c11932281d65535da58309d3602412c50049ba4f6eb4ed264a4ff779e5fe887538091abfc2f0d00d3380cf8af26abac70c ark-24.05.0.tar.xz " diff --git a/community/arti/APKBUILD b/community/arti/APKBUILD index 10d9ae4ed77..d412f8fac1c 100644 --- a/community/arti/APKBUILD +++ b/community/arti/APKBUILD @@ -1,13 +1,14 @@ # Contributor: omni <omni+alpine@hack.org> # Maintainer: omni <omni+alpine@hack.org> pkgname=arti -pkgver=1.2.1 +pkgver=1.2.3 pkgrel=0 pkgdesc="An implementation of Tor, in Rust" url="https://docs.rs/arti/latest/arti/" license="GPL-3.0-or-later" # s390x: merlin crate doesn't support big-endian targets -arch="all !s390x" +# riscv64: https://gitlab.torproject.org/tpo/core/arti/-/issues/1398 +arch="all !s390x !riscv64" makedepends="cargo openssl-dev>3 sqlite-dev zstd-dev xz-dev cargo-auditable" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v$pkgver/arti-arti-v$pkgver.tar.gz @@ -39,21 +40,32 @@ prepare() { } build() { - cargo auditable build --release --frozen --bin arti + cargo auditable build --release --frozen --features=full --package arti } check() { - cargo test --frozen + case "$CARCH" in + riscv64) + RUST_BACKTRACE=1 cargo test --frozen + ;; + *) + cargo test --frozen + ;; + esac } package() { install -Dm755 -t "$pkgdir"/usr/bin/ target/release/arti install -Dm755 -t "$pkgdir"/usr/share/doc/"$pkgname"/ \ - doc/bridges.md doc/Compatibility.md doc/FAQ.md doc/SupportPolicy.md \ + doc/bridges.md \ + doc/Compatibility.md \ + doc/FAQ.md \ + doc/OnionService.md \ + doc/SupportPolicy.md \ CHANGELOG.md README.md } sha512sums=" -49c3a134cbddd6b8044a5d4c3a28aed28c3729b14500981be616efc348805e2c7ef6e1f7ab291cf531b612b1893fadfa3d818214c3617c1acdd5a433cdc59095 arti-1.2.1.tar.gz +54852969f34e24b7a34e17b7c323a7a788a1807eed0483e99519fe8bd57372ce82efcc1a4934876bdd75b2c3dc9ccfa1dca9a36225e9ba3d057924098535c36d arti-1.2.3.tar.gz a68d7c99b1d1d73b4c8c725d7c69486bb732b3b2c28df339f2e56f842c17417aa89fe8ba41f1017bd4c7e550e1e8a2b886071b8f96c0e2863855698cb8767810 disable_system_time_conversion_patch " diff --git a/community/artikulate/APKBUILD b/community/artikulate/APKBUILD index 37017645fc3..c8ec5310925 100644 --- a/community/artikulate/APKBUILD +++ b/community/artikulate/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=artikulate -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -49,5 +49,5 @@ package() { } sha512sums=" -dcfe24e211a3058c8860e767422c7a0549fa19d29ae965b7aea5fb6d0c4972b4b671e0cc23e4ac471f17131316757cf674608b0bdd38b1ed2136b86cf5196d22 artikulate-24.02.2.tar.xz +6ad82176f8b547c905683c082e63cd72d2bfeae8900a0bd93d80c5c2123a0b875b2ad2b4c63d53cd4d3dddee0843c71e109171c75a25bb562a6ae094f37f0076 artikulate-24.05.0.tar.xz " diff --git a/community/astyle/APKBUILD b/community/astyle/APKBUILD index 8da1a823969..0bccffc40b0 100644 --- a/community/astyle/APKBUILD +++ b/community/astyle/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=astyle -pkgver=3.4.14 +pkgver=3.4.15 pkgrel=0 pkgdesc="Automatic code formatter" url="https://sourceforge.net/projects/astyle/" @@ -26,6 +26,6 @@ package() { } sha512sums=" -1e43d54889c86783720a8839ee3e949a5c9f3268ec6d281974d9037f8299d40e3be729925c71dcbe415eca70549ee8ef647a0a300c91b86634cd8db8f7c9f2ec astyle-3.4.14.tar.bz2 +a956a707e1723de1d68d88b9e21d05620cab4de10765629c54820bf7c1a7f74b08d9ba75bab60d1d42c13010faaa4ee5aee1c921fa3826372d2a388166f8964d astyle-3.4.15.tar.bz2 92c184e6a4061a02c520b0593b74a67f3e1805c877d5799c6cdc8f1abb70b0f05a78bbbe9c6e2157a01afeee3ac2febb63a0d777e89a01d1478e206c7afb22c0 makefile-install.patch " diff --git a/community/asuran-cli/APKBUILD b/community/asuran-cli/APKBUILD index 3f257ff45d8..84788dae653 100644 --- a/community/asuran-cli/APKBUILD +++ b/community/asuran-cli/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=asuran-cli pkgver=0.1.6 -pkgrel=6 +pkgrel=7 pkgdesc="Asuran is a new archive format and rust implementation" url="https://gitlab.com/asuran-rs/asuran" arch="all !s390x !riscv64" @@ -55,5 +55,5 @@ sha512sums=" d2a9d1415bf7caf95448d3068298d162359c76b27faf5ea2c62c7da9854f536bdcc7f0a3eabe95474a5f11926109978ba47a2b1aaf2dfa5d8d529c8e535457e0 openssl3.patch 4b60c0928c7485436031cf933888cf2dfc9ce7c7f13b93b0845d2b6867a5be49a3ae18892c89c2e84a346c6c351e659c678dfda6683ea4547c738d30da669e3d new-rust.patch 7eef6f1a720c86705ee2fc0606ead13a1b7619ac0550a2783d1a480ab3c84c6d194ba9b51907f3ab203f43f34c2a8382d2d5067ec0da8ee7671ac75aac34cab1 system-zstd.patch -c512916af415c89f9fa7f1d971eee199679e2258af630e75398575c4a2e23002a7c3b3867f1f15470c36453396fdc3952adfcae0ce3f6c1de99586be0354eb4e libc.patch +0a9f0fbdd9a3a95716b2d4bc787e311bf3e02fb9e3ee140073503011ab1931016e42ddbe88a7777450ced8d9374d18230bb588440094cf633ddc8fb2d4b2ce82 libc.patch " diff --git a/community/asuran-cli/libc.patch b/community/asuran-cli/libc.patch index 87d767949c4..90463ddc777 100644 --- a/community/asuran-cli/libc.patch +++ b/community/asuran-cli/libc.patch @@ -1,15 +1,16 @@ -diff -Nurp a/Cargo.lock b/Cargo.lock ---- a/Cargo.lock 2023-11-14 16:34:23.800972275 +0000 -+++ b/Cargo.lock 2023-11-14 16:34:41.085194033 +0000 -@@ -909,9 +909,9 @@ checksum = "e2abad23fbc42b3700f2f279844d +diff --git a/Cargo.lock b/Cargo.lock +index 7f52194..623deca 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -909,9 +909,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.71" -+version = "0.2.150" ++version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" -+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" ++checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libssh2-sys" 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/atools/APKBUILD b/community/atools/APKBUILD index 19e19816236..9dd38f4b0ae 100644 --- a/community/atools/APKBUILD +++ b/community/atools/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=atools pkgver=20.2.2 -pkgrel=6 +pkgrel=7 pkgdesc="Auxilary scripts for abuild" url="https://gitlab.alpinelinux.org/Leo/atools" arch="all" 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/attica5/APKBUILD b/community/attica5/APKBUILD index c0cb4cf56b3..dfc8a6d036e 100644 --- a/community/attica5/APKBUILD +++ b/community/attica5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=attica5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Freedesktop OCS binding for Qt" url="https://www.kde.org/" @@ -43,5 +43,5 @@ package() { } sha512sums=" -9d530ae6425b0edf7831fa9aa25573da66c8813fbf7776c6d300445c54ec175e91b6c4abbfc6f4985a0f003b41c5e3218ca560466a6b0fc3177d3951151e6cab attica-5.115.0.tar.xz +79a2378d7c8019d16692c7286e079cd29155e5f17256f189aa31e47a6b81e9b7f6ad0d5412388065b309bdc71b4efb72ebb043d587fc41d8ef2a918571c64306 attica-5.116.0.tar.xz " diff --git a/community/atuin/APKBUILD b/community/atuin/APKBUILD index 318fc95d13d..a25937ca9bf 100644 --- a/community/atuin/APKBUILD +++ b/community/atuin/APKBUILD @@ -9,7 +9,8 @@ pkgdesc="Magical shell history" url="https://github.com/ellie/atuin" # armhf: build getting stuck on CI # riscv64, s390x: blocked by rust/cargo -arch="all !armhf !riscv64 !s390x" +# loongarch64: blocked by linux-raw-sys +arch="all !armhf !riscv64 !s390x !loongarch64" license="MIT" makedepends=" cargo diff --git a/community/aubio/APKBUILD b/community/aubio/APKBUILD index e9ad64517fc..c2a658423e8 100644 --- a/community/aubio/APKBUILD +++ b/community/aubio/APKBUILD @@ -19,6 +19,7 @@ makedepends=" subpackages="$pkgname-static $pkgname-dev" source="https://aubio.org/pub/aubio-$pkgver.tar.bz2 unversioned-python.patch + waf-2.1.0-compat.patch $pkgname-ffmpeg5.patch::https://github.com/aubio/aubio/commit/8a05420e5dd8c7b8b2447f82dc919765876511b3.patch " @@ -31,20 +32,22 @@ prepare() { 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 +10a19f724740de1bbae3c1dcb08f0046b9096673111c2f1a3f98ec32a6b64db20040a4048bd668307cba5cb946f6385158cb34f1279a4b30bd09b5cb6e8ec8f0 waf-2.1.0-compat.patch 8ce2a1fc35f73586d92e637d76354843c8cd1bdd5cda2b8e56db6b05ddcea4d2297500f9039f53d9482bff68fc1ee9e60c9459799a900e85f373745b3258b7ef aubio-ffmpeg5.patch " 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/audiocd-kio/APKBUILD b/community/audiocd-kio/APKBUILD index 6fa838e137c..7250a23f1a5 100644 --- a/community/audiocd-kio/APKBUILD +++ b/community/audiocd-kio/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=audiocd-kio -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -47,5 +47,5 @@ package() { } sha512sums=" -1da6fd53fea689dd58794a6190fc0b759feb45bc3fb2cbb0295f8f4207c59c92390341a1d78b516970e51f11c7ed79cd5feb081814ceb9c8d1107a850f29b265 audiocd-kio-24.02.2.tar.xz +4e1832f24ddcc2a7aff5b18cf8c90bfcdb0a52d7cb0628c934f34d241485a5236239f2174c01ddb2cf0d33ca29c9710309ca1aba9068bf79b7cdc53a15b5f2d7 audiocd-kio-24.05.0.tar.xz " diff --git a/community/audiotube/APKBUILD b/community/audiotube/APKBUILD index e624547da80..52848bc4260 100644 --- a/community/audiotube/APKBUILD +++ b/community/audiotube/APKBUILD @@ -4,13 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=audiotube -pkgver=24.02.2 +pkgver=24.05.0 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 @@ -57,5 +57,5 @@ package() { } sha512sums=" -8b316b94ea704ec96a285d6760623102da8371d8ff75c78a3ac5a59c5db6f38ba69fd3f2b9c512315782866db2093da5a54ab29a994b52a2b4764ce550cb8385 audiotube-24.02.2.tar.xz +7412bb20d921dd215f9dc5b37e373b8f9cf2992b49844f1b05355f7288ad1b6366e527294627c55b682a9abe541c883b9a0da870e9ac3a6d023812a935805bc2 audiotube-24.05.0.tar.xz " diff --git a/community/avr-libc/APKBUILD b/community/avr-libc/APKBUILD index b68b9831ef3..90ea58c4425 100644 --- a/community/avr-libc/APKBUILD +++ b/community/avr-libc/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Stefan Wagner <stw@bit-strickerei.de> -# Maintainer: Stefan Wagner <stw@bit-strickerei.de> +# Maintainer: Marian Buschsieweke <marian.buschsieweke@posteo.net> pkgname=avr-libc pkgver=2.1.0 _atmelver=3.7.0.1796 -pkgrel=4 +pkgrel=5 pkgdesc="The C runtime library for the AVR family of microcontrollers" url="https://github.com/avrdudes/avr-libc" depends="gcc-avr" diff --git a/community/avrdude/APKBUILD b/community/avrdude/APKBUILD index 4e0eb633ec6..efabffce08a 100644 --- a/community/avrdude/APKBUILD +++ b/community/avrdude/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Stefan Wagner <stw@bit-strickerei.de> -# Maintainer: Stefan Wagner <stw@bit-strickerei.de> +# Maintainer: Marian Buschsieweke <marian.buschsieweke@posteo.net> pkgname=avrdude pkgver=7.3 -pkgrel=0 +pkgrel=1 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers" url="https://github.com/avrdudes/avrdude" arch="all" diff --git a/community/aws-c-auth/APKBUILD b/community/aws-c-auth/APKBUILD index 21baa8bea4e..7a16270cd2d 100644 --- a/community/aws-c-auth/APKBUILD +++ b/community/aws-c-auth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: pkgname=aws-c-auth -pkgver=0.7.15 +pkgver=0.7.22 pkgrel=0 pkgdesc="C99 library implementation of AWS client-side authentication: standard credentials providers and signing" url="https://github.com/awslabs/aws-c-auth" @@ -55,5 +55,5 @@ dev() { } sha512sums=" -635fb9440fb9107344adafe55755f1fa64f9396d0908a88abbac7b94bf87f7608d44e119684a1f145aad9878a84aad90ee0337170afe551e86a6edf5efd8e98a aws-c-auth-0.7.15.tar.gz +c207e104f2fbb28277c41a37b7f95b279a4a6d76c76a23ee57f7f4e6215637b5ec873b3d012153080a59cf2641748894c0b9ddbf93e3dd9307d779c9c1f960d3 aws-c-auth-0.7.22.tar.gz " diff --git a/community/aws-c-cal/APKBUILD b/community/aws-c-cal/APKBUILD index 2acb4756ae8..01b7bb6e8ca 100644 --- a/community/aws-c-cal/APKBUILD +++ b/community/aws-c-cal/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: pkgname=aws-c-cal -pkgver=0.6.9 +pkgver=0.6.14 pkgrel=0 pkgdesc="AWS Crypto Abstraction Layer: Cross-Platform, C99 wrapper for cryptography primitives" url="https://github.com/awslabs/aws-c-cal" @@ -50,5 +50,5 @@ dev() { } sha512sums=" -deee106b366522e6781974c92b1aa06542b7857b91a8d4cb59eb0e17247ce7fc3ffacb044c032ff7f2a0f9baca807d4c2d9a14934d4576966f48bfc0661e5edb aws-c-cal-0.6.9.tar.gz +a723b465b361db77c0324a9c30fe6358ac58c30f595bc637bfc569b2b0fc6658f7452e90a6b89fc03c877333c19b4c19ec53ee58ebfe32148854e23d122207c7 aws-c-cal-0.6.14.tar.gz " diff --git a/community/aws-c-common/APKBUILD b/community/aws-c-common/APKBUILD index 930ce9e6def..426bb23fab1 100644 --- a/community/aws-c-common/APKBUILD +++ b/community/aws-c-common/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: pkgname=aws-c-common -pkgver=0.9.12 -pkgrel=1 +pkgver=0.9.19 +pkgrel=0 pkgdesc="Core c99 package for AWS SDK for C including cross-platform primitives, configuration, data structures, and error handling" url="https://github.com/awslabs/aws-c-common" # s390x: fails tests @@ -46,5 +46,5 @@ dev() { } sha512sums=" -8bcada7b7b89f25b9469a3f21dad250f9e1ffde185f3202ba32cc47c27ade1994505f8b5bd19ccefb6ef905d2ffbd985f406c5c0337fbd8a936f71798710ff0e aws-c-common-0.9.12.tar.gz +4d7be9337659ec68f624e2f09da51e8fed8d8810f572a38751507b8c98379f8e7485c06a5920f033ebef809a5b7848d114543abde37c44cb1bbb5cf089c9b8d3 aws-c-common-0.9.19.tar.gz " diff --git a/community/aws-c-compression/APKBUILD b/community/aws-c-compression/APKBUILD index 12355865e36..a1817b76785 100644 --- a/community/aws-c-compression/APKBUILD +++ b/community/aws-c-compression/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: pkgname=aws-c-compression -pkgver=0.2.17 -pkgrel=1 +pkgver=0.2.18 +pkgrel=0 pkgdesc="C99 implementation of huffman encoding/decoding" url="https://github.com/awslabs/aws-c-compression" # s390x: aws-c-common @@ -46,5 +46,5 @@ dev() { } sha512sums=" -7813ae3d19336a187dd218d22748a09b397aea68f344e44ce0472490babdd7c7a4bb94d586a38d7f0c7d3b6f29502ec9ccf080b020e15fd24891ec1b3cdb4663 aws-c-compression-0.2.17.tar.gz +1f955719fbaa40a7b57b2a6cffac485ce0008fdcbddcea10785456458d16a402b43f8129dd9fd4d057031c3aa83f5e65b9e0b72879e2a56ad23235ab048d0646 aws-c-compression-0.2.18.tar.gz " diff --git a/community/aws-c-event-stream/APKBUILD b/community/aws-c-event-stream/APKBUILD index 523b985fd34..e7a028775bd 100644 --- a/community/aws-c-event-stream/APKBUILD +++ b/community/aws-c-event-stream/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: pkgname=aws-c-event-stream -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=0 pkgdesc="AWS C99 implementation of the vnd.amazon.eventstream content-type" url="https://github.com/awslabs/aws-c-event-stream" @@ -52,5 +52,5 @@ dev() { } sha512sums=" -839dbdd6878481aebdbb44a273e42009898256bed63cc10414f0a4fc9e207feeeb8191b60196f6d0c936d70d8035cd0e8e2fff35864b2c0f546714d41b401067 aws-c-event-stream-0.4.1.tar.gz +5ae252c4b774f988ad81163a6e7ed8d971b7ffabcbc4ee1fc950cce3f5986f6ee57454178ee52dbdda1ff3ee74716fcfe0ac9349feb67b5bc10961fb92cf7ff9 aws-c-event-stream-0.4.2.tar.gz " diff --git a/community/aws-c-http/APKBUILD b/community/aws-c-http/APKBUILD index fe764c97b71..276bcafd9b0 100644 --- a/community/aws-c-http/APKBUILD +++ b/community/aws-c-http/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: pkgname=aws-c-http -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=0 pkgdesc="AWS C99 implementation of the HTTP/1.1 and HTTP/2 specifications" url="https://github.com/awslabs/aws-c-http" @@ -56,5 +56,5 @@ dev() { } sha512sums=" -c440ad1590c050c45634f0245fb26e9193b00e3020d26e132715ca1321fa4a36f1cc765753950c2f220a05ec7a6fe3ffa31c07ed0e83d40447714c65cbd36fb9 aws-c-http-0.8.0.tar.gz +2697b728d3bebaf1013a6568899ae41c3b93590079ec2d61c8b9718f3195c5662a8c27bf64f28fa8ccbc6b58660aa0cf9e7e0922a17fe257d20431a393f24abe aws-c-http-0.8.1.tar.gz " diff --git a/community/aws-c-io/APKBUILD b/community/aws-c-io/APKBUILD index b4a6bd80d6a..a240f2f1f35 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.7 +pkgver=0.14.8 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=" -a5aaafa936855dfc636e2cc18426488995023d8db9170e361bb6cbea6a169edcecd7b8e26c2a41b1511bd844b1494898089364b0fa1fffdc74e961a87543f223 aws-c-io-0.14.7.tar.gz +dd689f03629b174612af004afb8e1af7e403bc120560725cb4cc308ccd5535814ae0365696000f1f31545d1b44770edd3c9cad91af22090618f8e675b0314523 aws-c-io-0.14.8.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/aws-c-mqtt/APKBUILD b/community/aws-c-mqtt/APKBUILD index 6e87d23ce96..b36e898b94c 100644 --- a/community/aws-c-mqtt/APKBUILD +++ b/community/aws-c-mqtt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: pkgname=aws-c-mqtt -pkgver=0.10.1 +pkgver=0.10.4 pkgrel=0 pkgdesc="AWS C99 implementation of the MQTT 3.1.1 specification" url="https://github.com/awslabs/aws-c-mqtt" @@ -56,5 +56,5 @@ dev() { } sha512sums=" -05c435b1310ecc3ab1ef38ec65b3ec483c0923f12d83d9cc73e20bf78068421de7d254cef763deddcf128d34a8d0126b22a6e98009c851aea30d8dd65af9b72b aws-c-mqtt-0.10.1.tar.gz +0d6b884e40845173623e2561191f7ba7d67a88797f56b43ce80986ad09f05bb88ad9b290990e4c62db39e67c4e5abdf89e2c8be6176b53f65c617c158aab7767 aws-c-mqtt-0.10.4.tar.gz " diff --git a/community/aws-c-s3/APKBUILD b/community/aws-c-s3/APKBUILD index 69c603777ab..3e993d29894 100644 --- a/community/aws-c-s3/APKBUILD +++ b/community/aws-c-s3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: pkgname=aws-c-s3 -pkgver=0.5.0 +pkgver=0.5.9 pkgrel=0 pkgdesc="AWS C99 library implementation for communicating with the S3 service" url="https://github.com/awslabs/aws-c-s3" @@ -57,5 +57,5 @@ dev() { } sha512sums=" -9c97327ce06e3977b7cce409a679c1f815fb6b315c61b2c2cb8912b76fc7a19e0bbe5d2733630fa7dccb76a9d8f61236d60191c57b896eb9bf6ae3961dda39d1 aws-c-s3-0.5.0.tar.gz +aa636a36b21d58a8c151303365b5bec2c3086970f6b734ce9f2df1520059a6a75312c1c4f9682163b033bb2f756a4324f2a0e2923d77799bc5134c6bc336d85f aws-c-s3-0.5.9.tar.gz " diff --git a/community/aws-c-sdkutils/APKBUILD b/community/aws-c-sdkutils/APKBUILD index 66e514a531c..9f512fabeba 100644 --- a/community/aws-c-sdkutils/APKBUILD +++ b/community/aws-c-sdkutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel <holger.jaekel@gmx.de> # Maintainer: pkgname=aws-c-sdkutils -pkgver=0.1.14 +pkgver=0.1.16 pkgrel=0 pkgdesc="C99 library implementing AWS SDK specific utilities" url="https://github.com/awslabs/aws-c-sdkutils" @@ -46,5 +46,5 @@ dev() { } sha512sums=" -e364613363c6dd50a97209bd4fa7b926fec2ca5eb4bac07fb0c44eecbf847d2d1a671ffa7edda613bbbab4eaf27973945be61d66b32b851ae31c8f3508e7137a aws-c-sdkutils-0.1.14.tar.gz +c625d5b0a3e3f68ae442b0a0ce90008dd002d57f07bb985c1dd239f8234e220b08604d64e2def0a0ce56e06404554c38f64e944dc2938eba64f68619af1c1f14 aws-c-sdkutils-0.1.16.tar.gz " diff --git a/community/aws-cli/APKBUILD b/community/aws-cli/APKBUILD index c2f831cb3a5..350e9353f7f 100644 --- a/community/aws-cli/APKBUILD +++ b/community/aws-cli/APKBUILD @@ -1,15 +1,14 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: pkgname=aws-cli -pkgver=2.15.30 +pkgver=2.15.57 pkgrel=0 pkgdesc="Universal Command Line Interface for Amazon Web Services (v2)" url="https://github.com/aws/aws-cli" # s390x: py3-awscrt doesn't support big-endian # arm*, ppc64le: py3-awscrt # x86: fails check, so most likely not supported on 32-bit anymore -# no python 3.12 support: https://github.com/aws/aws-cli/issues/8342 -#arch="all !x86 !armhf !armv7 !ppc64le !s390x" +arch="all !x86 !armhf !armv7 !ppc64le !s390x" license="Apache-2.0" depends=" py3-awscrt @@ -45,6 +44,14 @@ subpackages=" $pkgname-bash-completion:bashcomp " source="$pkgname-$pkgver.tar.gz::https://github.com/aws/aws-cli/archive/$pkgver.tar.gz + allow-egg-info.patch + aws-cli-v2-ruamel-yaml-v4.patch + aws-cli-v2-tz-fix.patch + botocore-2551.patch + botocore-2922.patch + botocore-2924.patch + botocore-2967.patch + botocore-2990-rebased.patch fix-env.patch tmpfile-index.patch " @@ -74,7 +81,7 @@ check() { # each core takes like 2gb, so be a little conservative local cores cores="$(nproc)" - cores="$((cores / 2))" + cores="$((cores / 3))" python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl @@ -130,7 +137,15 @@ doc() { } sha512sums=" -eedf2027a36122bad94e6090a4511fc9438f509a19d97b57fc79ec9b4f7df88003f04584fc9ecbf499b7d37430bf00d2eba333f1354dea8c69805b7bdffa8406 aws-cli-2.15.30.tar.gz +cd35ed602d9a06a58fb16ded5f1f559c9d1841fc96fdad8402e625aa56b2ca246a5b631f0915ec091591ac63cce296842f0a87b26c77c9b83a81bcbb2e1d0e15 aws-cli-2.15.57.tar.gz +ed05961344a0acb8c7b8aaf913f8e782c90ece23aa89006112e9b1c2ea6d0cfa21efc6b38ac1f6b604182b09824675fe6ef68f6394c3b10dfa9e75f82c7cd387 aws-cli-v2-ruamel-yaml-v4.patch +66c813b52d1fa402d89cd4381237175b3c8f52546e60f4a9703c27281f4a27d579751b90468a84208f94743b3c58e041cf9e9c9f28387ea06897575db8e46946 aws-cli-v2-tz-fix.patch +e0647b8690c139617da696318124b74a19b938c56d836f6531a86e031ec9fd9e43798807a3519d78c9abba59aa8b6679623dc75b579ce57ebb4dff55569fa18d botocore-2551.patch +0b47b8329863dd71e4aeac18eb1175b47a68e45df0becae738ec3bf72f908cf96f99dffd7714c3835e014b1c100701a6652e1db3d2e415162fcc9c8a098cf201 botocore-2922.patch +99d8e7755149033fa86ae246de07f6c320991d111affd9a98618182fa1fdebf466e3be693671bb1dda4d5ac514f001446ff68cf156b98f33dc48c9a541d89c53 botocore-2924.patch +506733c13d1034684baf771c872aadbc4bad8037e05f588acde68071b73bd2d8fcf41a21562324210316cbdd1929c44ceca3273f174caf7af6470d8b27518fb1 botocore-2967.patch +79ff2138a7b9dbddedd059f0e1e3ef8f92708a93e2c65293de33298de65e5a3360e6e8af05c18b4763f1a7221198f4aa1ca2afd901fd748ad545ffea5fe8471a botocore-2990-rebased.patch 850b4ca6e09f96cba8968d2d7a3b60bd5206d7c4c257ba927b576336a992796b51263506cdd100314604ec7ad493a26326bf059ccd7f96772ad9326aa68ee41e fix-env.patch ecfad03dafbdc8cdc73f41a432f0acb53ce3636f58a8b3d0cfcef06617f24ee8588e0648ee7290148bcfc8a3007d00b865899d473a6653d970a55be63760551f tmpfile-index.patch +3780a1b8af4d0098315beacd9a6a7cb4ebac08d4c1194dc55b5db6f0a28c46e45da85f0b94da2e005c5327686f8c4a2b99ee45b3cf847b3bbf5d82c80b433f50 allow-egg-info.patch " diff --git a/community/aws-cli/allow-egg-info.patch b/community/aws-cli/allow-egg-info.patch new file mode 100644 index 00000000000..145ef7f40ec --- /dev/null +++ b/community/aws-cli/allow-egg-info.patch @@ -0,0 +1,13 @@ +diff --git a/tests/dependencies/test_closure.py b/tests/dependencies/test_closure.py +index 6231438cd..b5f2b0515 100644 +--- a/tests/dependencies/test_closure.py ++++ b/tests/dependencies/test_closure.py +@@ -83,7 +83,7 @@ class Package: + snake_case_name = name.replace("-", "_") + for sitepackages in site.getsitepackages(): + for filename in os.listdir(sitepackages): +- if fnmatch.fnmatch(filename, f"{snake_case_name}-*.dist-info"): ++ if fnmatch.fnmatch(filename, f"{snake_case_name}-*.dist-info") or fnmatch.fnmatch(filename, f"{snake_case_name}-*.egg-info"): + return importlib.metadata.Distribution.at( + os.path.join(sitepackages, filename) + ) diff --git a/community/aws-cli/aws-cli-v2-ruamel-yaml-v4.patch b/community/aws-cli/aws-cli-v2-ruamel-yaml-v4.patch new file mode 100644 index 00000000000..0972e8d3707 --- /dev/null +++ b/community/aws-cli/aws-cli-v2-ruamel-yaml-v4.patch @@ -0,0 +1,111 @@ +From 0331e399231b6cdb54b7b3bdd01a793647053cdd Mon Sep 17 00:00:00 2001 +From: Chih-Hsuan Yen <645432-yan12125@users.noreply.gitlab.com> +Date: Sat, 29 Jul 2023 17:32:06 +0800 +Subject: [PATCH] Support newer ruamel-yaml + +* ruamel-yaml 0.17.22 comes with a style change that affects test results. + From https://sourceforge.net/p/ruamel-yaml/code/ci/0.17.22/tree/CHANGES + +> plain scalars: put single words longer than width on a line of their own, instead of after the previous line + +* ruamel-yaml 0.17.29 introduces an issue with add_constructor and + DEFAULT_MAPPING_TAG, and the issue is fixed with 0.17.36 [1], hence the + new lower bound. + +[1] https://sourceforge.net/p/ruamel-yaml/tickets/482/ +--- + pyproject.toml | 4 ++-- + tests/functional/eks/testdata/output_combined | 6 ++++-- + .../eks/testdata/output_combined_changed_ordering | 6 ++++-- + tests/functional/eks/testdata/output_single | 3 ++- + tests/functional/eks/testdata/valid_old_api_version_updated | 3 ++- + 5 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index fef9a3068d5..1e436a88149 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -31,7 +31,7 @@ dependencies = [ + "colorama>=0.2.5,<0.4.7", + "docutils>=0.10,<0.20", + "cryptography>=3.3.2,<40.0.2", +- "ruamel.yaml>=0.15.0,<=0.17.21", ++ "ruamel.yaml>=0.17.36,<=0.17.39", + # ruamel.yaml only requires ruamel.yaml.clib for Python versions + # less than or equal to Python 3.10. In order to ensure we have + # a consistent dependency closure across all Python versions, +@@ -98,4 +98,4 @@ filterwarnings = [ + ] + + [tool.black] +-line-length = 80 +\ No newline at end of file ++line-length = 80 +diff --git a/tests/functional/eks/testdata/output_combined b/tests/functional/eks/testdata/output_combined +index 8e9ce098f72..8e30727da6e 100644 +--- a/tests/functional/eks/testdata/output_combined ++++ b/tests/functional/eks/testdata/output_combined +@@ -1,11 +1,13 @@ + apiVersion: v1 + clusters: + - cluster: +- certificate-authority-data: DATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATA= ++ certificate-authority-data: ++ DATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATA= + server: https://existingEndpoint.eks.amazonaws.com + name: arn:aws:eks:us-west-2:111222333444:cluster/Existing + - cluster: +- certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpWR1Z6ZEdsdVp5QkVZWFJoRFFwVVpYTjBhVzVuSUVSaGRHRU5DbFJsYzNScGJtY2dSR0YwWVEwS2EzVmlaWEp1WlhSbGN6QWVGdzBLVkdWemRHbHVaeUJFWVhSaERRcFVaWE4wYVc1bklFUmhkR0ZWQkFNVERRcHJkV0psY201bGRHVnpNQUVpTUEwS1ZHVnpkR2x1WnlCRVlYUmhEUXBVWlhOMGFXNW5JRVJoZEdFTkNsUmxjM1JwYm1jZ1JHRjBZY3UvR1FnbmFTcDNZaHBDTWhGVVpYTjBhVzVuSUVSaGRHRXl3clZqeEpWNjNwNFVHRmpZdHdGR1drUldJVkV1VkdWemRHbHVaeUJFWVhSaGJzT0MxSVJiTDhPd0lpMVhiWGg2VkdWemRHbHVaeUJFWVhSaFpXVndTTk9VVUZKNmN5QWJaaFpnWVNkTUV3MEtGMVJsYzNScGJtY2dSR0YwWVFZRFZSMFBBUUVFQkFNQ0FsUmxjM1JwYm1jZ1JHRjBZUUV3RFFvR0NTcElEUXBVWlhOMGFXNW5JRVJoZEdGcEgxc1pPRTNMa3lrMU9DWUNHUloyTEZjM3paOCtHell3WEZSbGMzUnBibWNnUkdGMFlYMUR5NjFNMVlGV1AxWVRIMVJsYzNScGJtY2dSR0YwWVd0aE5oMVphM2dWUDBGaGNSWjdKaW9oZVc4N1JsUmxjM1JwYm1jZ1JHRjBZUVpIVHd4NE9IdzZmZz09DQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t ++ certificate-authority-data: ++ LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpWR1Z6ZEdsdVp5QkVZWFJoRFFwVVpYTjBhVzVuSUVSaGRHRU5DbFJsYzNScGJtY2dSR0YwWVEwS2EzVmlaWEp1WlhSbGN6QWVGdzBLVkdWemRHbHVaeUJFWVhSaERRcFVaWE4wYVc1bklFUmhkR0ZWQkFNVERRcHJkV0psY201bGRHVnpNQUVpTUEwS1ZHVnpkR2x1WnlCRVlYUmhEUXBVWlhOMGFXNW5JRVJoZEdFTkNsUmxjM1JwYm1jZ1JHRjBZY3UvR1FnbmFTcDNZaHBDTWhGVVpYTjBhVzVuSUVSaGRHRXl3clZqeEpWNjNwNFVHRmpZdHdGR1drUldJVkV1VkdWemRHbHVaeUJFWVhSaGJzT0MxSVJiTDhPd0lpMVhiWGg2VkdWemRHbHVaeUJFWVhSaFpXVndTTk9VVUZKNmN5QWJaaFpnWVNkTUV3MEtGMVJsYzNScGJtY2dSR0YwWVFZRFZSMFBBUUVFQkFNQ0FsUmxjM1JwYm1jZ1JHRjBZUUV3RFFvR0NTcElEUXBVWlhOMGFXNW5JRVJoZEdGcEgxc1pPRTNMa3lrMU9DWUNHUloyTEZjM3paOCtHell3WEZSbGMzUnBibWNnUkdGMFlYMUR5NjFNMVlGV1AxWVRIMVJsYzNScGJtY2dSR0YwWVd0aE5oMVphM2dWUDBGaGNSWjdKaW9oZVc4N1JsUmxjM1JwYm1jZ1JHRjBZUVpIVHd4NE9IdzZmZz09DQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t + server: https://endpoint.amazonaws.com + name: arn:aws:eks:region:111222333444:cluster/ExampleCluster + contexts: +diff --git a/tests/functional/eks/testdata/output_combined_changed_ordering b/tests/functional/eks/testdata/output_combined_changed_ordering +index 79da5622cb0..d016d87d72b 100644 +--- a/tests/functional/eks/testdata/output_combined_changed_ordering ++++ b/tests/functional/eks/testdata/output_combined_changed_ordering +@@ -29,11 +29,13 @@ users: + command: aws + clusters: + - cluster: +- certificate-authority-data: DATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATA= ++ certificate-authority-data: ++ DATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATA= + server: https://existingEndpoint.eks.amazonaws.com + name: arn:aws:eks:us-west-2:111222333444:cluster/Existing + - cluster: +- certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpWR1Z6ZEdsdVp5QkVZWFJoRFFwVVpYTjBhVzVuSUVSaGRHRU5DbFJsYzNScGJtY2dSR0YwWVEwS2EzVmlaWEp1WlhSbGN6QWVGdzBLVkdWemRHbHVaeUJFWVhSaERRcFVaWE4wYVc1bklFUmhkR0ZWQkFNVERRcHJkV0psY201bGRHVnpNQUVpTUEwS1ZHVnpkR2x1WnlCRVlYUmhEUXBVWlhOMGFXNW5JRVJoZEdFTkNsUmxjM1JwYm1jZ1JHRjBZY3UvR1FnbmFTcDNZaHBDTWhGVVpYTjBhVzVuSUVSaGRHRXl3clZqeEpWNjNwNFVHRmpZdHdGR1drUldJVkV1VkdWemRHbHVaeUJFWVhSaGJzT0MxSVJiTDhPd0lpMVhiWGg2VkdWemRHbHVaeUJFWVhSaFpXVndTTk9VVUZKNmN5QWJaaFpnWVNkTUV3MEtGMVJsYzNScGJtY2dSR0YwWVFZRFZSMFBBUUVFQkFNQ0FsUmxjM1JwYm1jZ1JHRjBZUUV3RFFvR0NTcElEUXBVWlhOMGFXNW5JRVJoZEdGcEgxc1pPRTNMa3lrMU9DWUNHUloyTEZjM3paOCtHell3WEZSbGMzUnBibWNnUkdGMFlYMUR5NjFNMVlGV1AxWVRIMVJsYzNScGJtY2dSR0YwWVd0aE5oMVphM2dWUDBGaGNSWjdKaW9oZVc4N1JsUmxjM1JwYm1jZ1JHRjBZUVpIVHd4NE9IdzZmZz09DQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t ++ certificate-authority-data: ++ LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpWR1Z6ZEdsdVp5QkVZWFJoRFFwVVpYTjBhVzVuSUVSaGRHRU5DbFJsYzNScGJtY2dSR0YwWVEwS2EzVmlaWEp1WlhSbGN6QWVGdzBLVkdWemRHbHVaeUJFWVhSaERRcFVaWE4wYVc1bklFUmhkR0ZWQkFNVERRcHJkV0psY201bGRHVnpNQUVpTUEwS1ZHVnpkR2x1WnlCRVlYUmhEUXBVWlhOMGFXNW5JRVJoZEdFTkNsUmxjM1JwYm1jZ1JHRjBZY3UvR1FnbmFTcDNZaHBDTWhGVVpYTjBhVzVuSUVSaGRHRXl3clZqeEpWNjNwNFVHRmpZdHdGR1drUldJVkV1VkdWemRHbHVaeUJFWVhSaGJzT0MxSVJiTDhPd0lpMVhiWGg2VkdWemRHbHVaeUJFWVhSaFpXVndTTk9VVUZKNmN5QWJaaFpnWVNkTUV3MEtGMVJsYzNScGJtY2dSR0YwWVFZRFZSMFBBUUVFQkFNQ0FsUmxjM1JwYm1jZ1JHRjBZUUV3RFFvR0NTcElEUXBVWlhOMGFXNW5JRVJoZEdGcEgxc1pPRTNMa3lrMU9DWUNHUloyTEZjM3paOCtHell3WEZSbGMzUnBibWNnUkdGMFlYMUR5NjFNMVlGV1AxWVRIMVJsYzNScGJtY2dSR0YwWVd0aE5oMVphM2dWUDBGaGNSWjdKaW9oZVc4N1JsUmxjM1JwYm1jZ1JHRjBZUVpIVHd4NE9IdzZmZz09DQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t + server: https://endpoint.amazonaws.com + name: arn:aws:eks:region:111222333444:cluster/ExampleCluster + kind: Config +diff --git a/tests/functional/eks/testdata/output_single b/tests/functional/eks/testdata/output_single +index fb1e0b9b1ef..cdf5fb6523e 100644 +--- a/tests/functional/eks/testdata/output_single ++++ b/tests/functional/eks/testdata/output_single +@@ -1,7 +1,8 @@ + apiVersion: v1 + clusters: + - cluster: +- certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpWR1Z6ZEdsdVp5QkVZWFJoRFFwVVpYTjBhVzVuSUVSaGRHRU5DbFJsYzNScGJtY2dSR0YwWVEwS2EzVmlaWEp1WlhSbGN6QWVGdzBLVkdWemRHbHVaeUJFWVhSaERRcFVaWE4wYVc1bklFUmhkR0ZWQkFNVERRcHJkV0psY201bGRHVnpNQUVpTUEwS1ZHVnpkR2x1WnlCRVlYUmhEUXBVWlhOMGFXNW5JRVJoZEdFTkNsUmxjM1JwYm1jZ1JHRjBZY3UvR1FnbmFTcDNZaHBDTWhGVVpYTjBhVzVuSUVSaGRHRXl3clZqeEpWNjNwNFVHRmpZdHdGR1drUldJVkV1VkdWemRHbHVaeUJFWVhSaGJzT0MxSVJiTDhPd0lpMVhiWGg2VkdWemRHbHVaeUJFWVhSaFpXVndTTk9VVUZKNmN5QWJaaFpnWVNkTUV3MEtGMVJsYzNScGJtY2dSR0YwWVFZRFZSMFBBUUVFQkFNQ0FsUmxjM1JwYm1jZ1JHRjBZUUV3RFFvR0NTcElEUXBVWlhOMGFXNW5JRVJoZEdGcEgxc1pPRTNMa3lrMU9DWUNHUloyTEZjM3paOCtHell3WEZSbGMzUnBibWNnUkdGMFlYMUR5NjFNMVlGV1AxWVRIMVJsYzNScGJtY2dSR0YwWVd0aE5oMVphM2dWUDBGaGNSWjdKaW9oZVc4N1JsUmxjM1JwYm1jZ1JHRjBZUVpIVHd4NE9IdzZmZz09DQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t ++ certificate-authority-data: ++ LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpWR1Z6ZEdsdVp5QkVZWFJoRFFwVVpYTjBhVzVuSUVSaGRHRU5DbFJsYzNScGJtY2dSR0YwWVEwS2EzVmlaWEp1WlhSbGN6QWVGdzBLVkdWemRHbHVaeUJFWVhSaERRcFVaWE4wYVc1bklFUmhkR0ZWQkFNVERRcHJkV0psY201bGRHVnpNQUVpTUEwS1ZHVnpkR2x1WnlCRVlYUmhEUXBVWlhOMGFXNW5JRVJoZEdFTkNsUmxjM1JwYm1jZ1JHRjBZY3UvR1FnbmFTcDNZaHBDTWhGVVpYTjBhVzVuSUVSaGRHRXl3clZqeEpWNjNwNFVHRmpZdHdGR1drUldJVkV1VkdWemRHbHVaeUJFWVhSaGJzT0MxSVJiTDhPd0lpMVhiWGg2VkdWemRHbHVaeUJFWVhSaFpXVndTTk9VVUZKNmN5QWJaaFpnWVNkTUV3MEtGMVJsYzNScGJtY2dSR0YwWVFZRFZSMFBBUUVFQkFNQ0FsUmxjM1JwYm1jZ1JHRjBZUUV3RFFvR0NTcElEUXBVWlhOMGFXNW5JRVJoZEdGcEgxc1pPRTNMa3lrMU9DWUNHUloyTEZjM3paOCtHell3WEZSbGMzUnBibWNnUkdGMFlYMUR5NjFNMVlGV1AxWVRIMVJsYzNScGJtY2dSR0YwWVd0aE5oMVphM2dWUDBGaGNSWjdKaW9oZVc4N1JsUmxjM1JwYm1jZ1JHRjBZUVpIVHd4NE9IdzZmZz09DQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t + server: https://endpoint.amazonaws.com + name: arn:aws:eks:region:111222333444:cluster/ExampleCluster + contexts: +diff --git a/tests/functional/eks/testdata/valid_old_api_version_updated b/tests/functional/eks/testdata/valid_old_api_version_updated +index fb1e0b9b1ef..cdf5fb6523e 100644 +--- a/tests/functional/eks/testdata/valid_old_api_version_updated ++++ b/tests/functional/eks/testdata/valid_old_api_version_updated +@@ -1,7 +1,8 @@ + apiVersion: v1 + clusters: + - cluster: +- certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpWR1Z6ZEdsdVp5QkVZWFJoRFFwVVpYTjBhVzVuSUVSaGRHRU5DbFJsYzNScGJtY2dSR0YwWVEwS2EzVmlaWEp1WlhSbGN6QWVGdzBLVkdWemRHbHVaeUJFWVhSaERRcFVaWE4wYVc1bklFUmhkR0ZWQkFNVERRcHJkV0psY201bGRHVnpNQUVpTUEwS1ZHVnpkR2x1WnlCRVlYUmhEUXBVWlhOMGFXNW5JRVJoZEdFTkNsUmxjM1JwYm1jZ1JHRjBZY3UvR1FnbmFTcDNZaHBDTWhGVVpYTjBhVzVuSUVSaGRHRXl3clZqeEpWNjNwNFVHRmpZdHdGR1drUldJVkV1VkdWemRHbHVaeUJFWVhSaGJzT0MxSVJiTDhPd0lpMVhiWGg2VkdWemRHbHVaeUJFWVhSaFpXVndTTk9VVUZKNmN5QWJaaFpnWVNkTUV3MEtGMVJsYzNScGJtY2dSR0YwWVFZRFZSMFBBUUVFQkFNQ0FsUmxjM1JwYm1jZ1JHRjBZUUV3RFFvR0NTcElEUXBVWlhOMGFXNW5JRVJoZEdGcEgxc1pPRTNMa3lrMU9DWUNHUloyTEZjM3paOCtHell3WEZSbGMzUnBibWNnUkdGMFlYMUR5NjFNMVlGV1AxWVRIMVJsYzNScGJtY2dSR0YwWVd0aE5oMVphM2dWUDBGaGNSWjdKaW9oZVc4N1JsUmxjM1JwYm1jZ1JHRjBZUVpIVHd4NE9IdzZmZz09DQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t ++ certificate-authority-data: ++ LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpWR1Z6ZEdsdVp5QkVZWFJoRFFwVVpYTjBhVzVuSUVSaGRHRU5DbFJsYzNScGJtY2dSR0YwWVEwS2EzVmlaWEp1WlhSbGN6QWVGdzBLVkdWemRHbHVaeUJFWVhSaERRcFVaWE4wYVc1bklFUmhkR0ZWQkFNVERRcHJkV0psY201bGRHVnpNQUVpTUEwS1ZHVnpkR2x1WnlCRVlYUmhEUXBVWlhOMGFXNW5JRVJoZEdFTkNsUmxjM1JwYm1jZ1JHRjBZY3UvR1FnbmFTcDNZaHBDTWhGVVpYTjBhVzVuSUVSaGRHRXl3clZqeEpWNjNwNFVHRmpZdHdGR1drUldJVkV1VkdWemRHbHVaeUJFWVhSaGJzT0MxSVJiTDhPd0lpMVhiWGg2VkdWemRHbHVaeUJFWVhSaFpXVndTTk9VVUZKNmN5QWJaaFpnWVNkTUV3MEtGMVJsYzNScGJtY2dSR0YwWVFZRFZSMFBBUUVFQkFNQ0FsUmxjM1JwYm1jZ1JHRjBZUUV3RFFvR0NTcElEUXBVWlhOMGFXNW5JRVJoZEdGcEgxc1pPRTNMa3lrMU9DWUNHUloyTEZjM3paOCtHell3WEZSbGMzUnBibWNnUkdGMFlYMUR5NjFNMVlGV1AxWVRIMVJsYzNScGJtY2dSR0YwWVd0aE5oMVphM2dWUDBGaGNSWjdKaW9oZVc4N1JsUmxjM1JwYm1jZ1JHRjBZUVpIVHd4NE9IdzZmZz09DQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t + server: https://endpoint.amazonaws.com + name: arn:aws:eks:region:111222333444:cluster/ExampleCluster + contexts: diff --git a/community/aws-cli/aws-cli-v2-tz-fix.patch b/community/aws-cli/aws-cli-v2-tz-fix.patch new file mode 100644 index 00000000000..a9db045ce2c --- /dev/null +++ b/community/aws-cli/aws-cli-v2-tz-fix.patch @@ -0,0 +1,42 @@ +From 95aa5ccc7bfaeafc0373e8472c8459030ac18920 Mon Sep 17 00:00:00 2001 +From: Avimitin <dev@avimit.in> +Date: Tue, 21 Mar 2023 12:36:48 +0800 +Subject: [PATCH] Force timezone info to fix possible test failure + +This commit will affects the test +`test_credentials.py::SSOSessionTest::test_token_chosen_from_provider`. +This test will throw a `RuntimeError: Credentials were refreshed, but +the refreshed credentials are still expired` because the timestamp call +uses system local time, which is different from UTC time. And this will +cause an unexpected failure if the test is not run in a system configured +with `TZ=UTC`. + +Signed-off-by: Avimitin <dev@avimit.in> +--- + tests/functional/botocore/test_credentials.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/functional/botocore/test_credentials.py b/tests/functional/botocore/test_credentials.py +index 843be90e484..9da9bf2b443 100644 +--- a/tests/functional/botocore/test_credentials.py ++++ b/tests/functional/botocore/test_credentials.py +@@ -19,7 +19,7 @@ + import mock + import tempfile + import shutil +-from datetime import datetime, timedelta ++from datetime import datetime, timedelta, timezone + import sys + + import pytest +@@ -47,8 +47,8 @@ + from botocore.tokens import SSOTokenProvider + from botocore.utils import datetime2timestamp + +-TIME_IN_ONE_HOUR = datetime.utcnow() + timedelta(hours=1) +-TIME_IN_SIX_MONTHS = datetime.utcnow() + timedelta(hours=4320) ++TIME_IN_ONE_HOUR = datetime.now(tz=timezone.utc) + timedelta(hours=1) ++TIME_IN_SIX_MONTHS = datetime.now(tz=timezone.utc) + timedelta(hours=4320) + + + class TestCredentialRefreshRaces(unittest.TestCase): diff --git a/community/aws-cli/botocore-2551.patch b/community/aws-cli/botocore-2551.patch new file mode 100644 index 00000000000..2ce7efbfbb9 --- /dev/null +++ b/community/aws-cli/botocore-2551.patch @@ -0,0 +1,367 @@ +From c6c63e7b7e248966503d8ff4ac2dfe9e43f1862d Mon Sep 17 00:00:00 2001 +From: Nate Prewitt <nate.prewitt@gmail.com> +Date: Mon, 1 Nov 2021 11:32:35 -0700 +Subject: [PATCH] Update six from 1.10.0 to 1.16.0 + +--- + .changes/next-release/feature-six-62143.json | 5 + + awscli/botocore/vendored/six.py | 186 ++++++++++++++++--- + 2 files changed, 163 insertions(+), 28 deletions(-) + create mode 100644 .changes/next-release/feature-six-62143.json + +diff --git a/.changes/next-release/feature-six-62143.json b/.changes/next-release/feature-six-62143.json +new file mode 100644 +index 0000000000..c4393201ee +--- /dev/null ++++ b/.changes/next-release/feature-six-62143.json +@@ -0,0 +1,5 @@ ++{ ++ "type": "feature", ++ "category": "``six``", ++ "description": "Updated vendored version of ``six`` from 1.10.0 to 1.16.0" ++} +diff --git a/awscli/botocore/vendored/six.py b/awscli/botocore/vendored/six.py +index 190c0239cd..4e15675d8b 100644 +--- a/awscli/botocore/vendored/six.py ++++ b/awscli/botocore/vendored/six.py +@@ -1,6 +1,4 @@ +-"""Utilities for writing code that runs on Python 2 and 3""" +- +-# Copyright (c) 2010-2015 Benjamin Peterson ++# Copyright (c) 2010-2020 Benjamin Peterson + # + # Permission is hereby granted, free of charge, to any person obtaining a copy + # of this software and associated documentation files (the "Software"), to deal +@@ -20,6 +18,8 @@ + # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + # SOFTWARE. + ++"""Utilities for writing code that runs on Python 2 and 3""" ++ + from __future__ import absolute_import + + import functools +@@ -29,7 +29,7 @@ + import types + + __author__ = "Benjamin Peterson <benjamin@python.org>" +-__version__ = "1.10.0" ++__version__ = "1.16.0" + + + # Useful for very coarse version differentiation. +@@ -71,6 +71,11 @@ def __len__(self): + 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 @@ def find_module(self, fullname, path=None): + 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] +@@ -223,6 +233,12 @@ def get_code(self, fullname): + return None + get_source = get_code # same as get_code + ++ def create_module(self, spec): ++ return self.load_module(spec.name) ++ ++ def exec_module(self, module): ++ pass ++ + _importer = _SixMetaPathImporter(__name__) + + +@@ -241,6 +257,7 @@ class _MovedItems(_LazyModule): + MovedAttribute("map", "itertools", "builtins", "imap", "map"), + MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"), + MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"), ++ MovedAttribute("getoutput", "commands", "subprocess"), + MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"), + MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"), + MovedAttribute("reduce", "__builtin__", "functools"), +@@ -254,18 +271,21 @@ class _MovedItems(_LazyModule): + MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"), + MovedModule("builtins", "__builtin__"), + MovedModule("configparser", "ConfigParser"), ++ MovedModule("collections_abc", "collections", "collections.abc" if sys.version_info >= (3, 3) else "collections"), + MovedModule("copyreg", "copy_reg"), + MovedModule("dbm_gnu", "gdbm", "dbm.gnu"), +- MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"), ++ MovedModule("dbm_ndbm", "dbm", "dbm.ndbm"), ++ MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread" if sys.version_info < (3, 9) else "_thread"), + MovedModule("http_cookiejar", "cookielib", "http.cookiejar"), + MovedModule("http_cookies", "Cookie", "http.cookies"), + MovedModule("html_entities", "htmlentitydefs", "html.entities"), + MovedModule("html_parser", "HTMLParser", "html.parser"), + MovedModule("http_client", "httplib", "http.client"), ++ MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"), ++ MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"), + MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"), + MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"), + MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"), +- MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"), + MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"), + MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"), + MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"), +@@ -337,10 +357,12 @@ class Module_six_moves_urllib_parse(_LazyModule): + MovedAttribute("quote_plus", "urllib", "urllib.parse"), + MovedAttribute("unquote", "urllib", "urllib.parse"), + MovedAttribute("unquote_plus", "urllib", "urllib.parse"), ++ MovedAttribute("unquote_to_bytes", "urllib", "urllib.parse", "unquote", "unquote_to_bytes"), + MovedAttribute("urlencode", "urllib", "urllib.parse"), + MovedAttribute("splitquery", "urllib", "urllib.parse"), + MovedAttribute("splittag", "urllib", "urllib.parse"), + MovedAttribute("splituser", "urllib", "urllib.parse"), ++ MovedAttribute("splitvalue", "urllib", "urllib.parse"), + MovedAttribute("uses_fragment", "urlparse", "urllib.parse"), + MovedAttribute("uses_netloc", "urlparse", "urllib.parse"), + MovedAttribute("uses_params", "urlparse", "urllib.parse"), +@@ -416,6 +438,8 @@ class Module_six_moves_urllib_request(_LazyModule): + MovedAttribute("URLopener", "urllib", "urllib.request"), + MovedAttribute("FancyURLopener", "urllib", "urllib.request"), + MovedAttribute("proxy_bypass", "urllib", "urllib.request"), ++ MovedAttribute("parse_http_list", "urllib2", "urllib.request"), ++ MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"), + ] + for attr in _urllib_request_moved_attributes: + setattr(Module_six_moves_urllib_request, attr.name, attr) +@@ -631,13 +655,16 @@ def u(s): + import io + StringIO = io.StringIO + BytesIO = io.BytesIO ++ del io + _assertCountEqual = "assertCountEqual" + if sys.version_info[1] <= 1: + _assertRaisesRegex = "assertRaisesRegexp" + _assertRegex = "assertRegexpMatches" ++ _assertNotRegex = "assertNotRegexpMatches" + else: + _assertRaisesRegex = "assertRaisesRegex" + _assertRegex = "assertRegex" ++ _assertNotRegex = "assertNotRegex" + else: + def b(s): + return s +@@ -659,6 +686,7 @@ def indexbytes(buf, i): + _assertCountEqual = "assertItemsEqual" + _assertRaisesRegex = "assertRaisesRegexp" + _assertRegex = "assertRegexpMatches" ++ _assertNotRegex = "assertNotRegexpMatches" + _add_doc(b, """Byte literal""") + _add_doc(u, """Text literal""") + +@@ -675,15 +703,23 @@ def assertRegex(self, *args, **kwargs): + return getattr(self, _assertRegex)(*args, **kwargs) + + ++def assertNotRegex(self, *args, **kwargs): ++ return getattr(self, _assertNotRegex)(*args, **kwargs) ++ ++ + if PY3: + exec_ = getattr(moves.builtins, "exec") + + def reraise(tp, value, tb=None): +- if value is None: +- value = tp() +- if value.__traceback__ is not tb: +- raise value.with_traceback(tb) +- raise value ++ try: ++ if value is None: ++ value = tp() ++ if value.__traceback__ is not tb: ++ raise value.with_traceback(tb) ++ raise value ++ finally: ++ value = None ++ tb = None + + else: + def exec_(_code_, _globs_=None, _locs_=None): +@@ -699,19 +735,19 @@ def exec_(_code_, _globs_=None, _locs_=None): + exec("""exec _code_ in _globs_, _locs_""") + + exec_("""def reraise(tp, value, tb=None): +- raise tp, value, tb ++ try: ++ raise tp, value, tb ++ finally: ++ tb = None + """) + + +-if sys.version_info[:2] == (3, 2): ++if sys.version_info[:2] > (3,): + exec_("""def raise_from(value, from_value): +- if from_value is None: +- raise value +- raise value from from_value +-""") +-elif sys.version_info[:2] > (3, 2): +- exec_("""def raise_from(value, from_value): +- raise value from from_value ++ try: ++ raise value from from_value ++ finally: ++ value = None + """) + else: + def raise_from(value, from_value): +@@ -786,13 +822,33 @@ def print_(*args, **kwargs): + _add_doc(reraise, """Reraise an exception.""") + + if sys.version_info[0:2] < (3, 4): ++ # This does exactly the same what the :func:`py3:functools.update_wrapper` ++ # function does on Python versions after 3.2. It sets the ``__wrapped__`` ++ # attribute on ``wrapper`` object and it doesn't raise an error if any of ++ # the attributes mentioned in ``assigned`` and ``updated`` are missing on ++ # ``wrapped`` object. ++ def _update_wrapper(wrapper, wrapped, ++ assigned=functools.WRAPPER_ASSIGNMENTS, ++ updated=functools.WRAPPER_UPDATES): ++ for attr in assigned: ++ try: ++ value = getattr(wrapped, attr) ++ except AttributeError: ++ continue ++ else: ++ setattr(wrapper, attr, value) ++ for attr in updated: ++ getattr(wrapper, attr).update(getattr(wrapped, attr, {})) ++ wrapper.__wrapped__ = wrapped ++ return wrapper ++ _update_wrapper.__doc__ = functools.update_wrapper.__doc__ ++ + def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS, + updated=functools.WRAPPER_UPDATES): +- def wrapper(f): +- f = functools.wraps(wrapped, assigned, updated)(f) +- f.__wrapped__ = wrapped +- return f +- return wrapper ++ return functools.partial(_update_wrapper, wrapped=wrapped, ++ assigned=assigned, updated=updated) ++ wraps.__doc__ = functools.wraps.__doc__ ++ + else: + wraps = functools.wraps + +@@ -802,10 +858,22 @@ def with_metaclass(meta, *bases): + # This requires a bit of explanation: the basic idea is to make a dummy + # metaclass for one level of class instantiation that replaces itself with + # the actual metaclass. +- class metaclass(meta): ++ class metaclass(type): + + def __new__(cls, name, this_bases, d): +- return meta(name, bases, d) ++ if sys.version_info[:2] >= (3, 7): ++ # This version introduced PEP 560 that requires a bit ++ # of extra care (we mimic what is done by __build_class__). ++ resolved_bases = types.resolve_bases(bases) ++ if resolved_bases is not bases: ++ d['__orig_bases__'] = bases ++ else: ++ resolved_bases = bases ++ return meta(name, resolved_bases, d) ++ ++ @classmethod ++ def __prepare__(cls, name, this_bases): ++ return meta.__prepare__(name, bases) + return type.__new__(metaclass, 'temporary_class', (), {}) + + +@@ -821,13 +889,75 @@ def wrapper(cls): + orig_vars.pop(slots_var) + orig_vars.pop('__dict__', None) + orig_vars.pop('__weakref__', None) ++ if hasattr(cls, '__qualname__'): ++ orig_vars['__qualname__'] = cls.__qualname__ + return metaclass(cls.__name__, cls.__bases__, orig_vars) + return wrapper + + ++def ensure_binary(s, encoding='utf-8', errors='strict'): ++ """Coerce **s** to six.binary_type. ++ ++ For Python 2: ++ - `unicode` -> encoded to `str` ++ - `str` -> `str` ++ ++ For Python 3: ++ - `str` -> encoded to `bytes` ++ - `bytes` -> `bytes` ++ """ ++ if isinstance(s, binary_type): ++ return s ++ if isinstance(s, text_type): ++ return s.encode(encoding, errors) ++ raise TypeError("not expecting type '%s'" % type(s)) ++ ++ ++def ensure_str(s, encoding='utf-8', errors='strict'): ++ """Coerce *s* to `str`. ++ ++ For Python 2: ++ - `unicode` -> encoded to `str` ++ - `str` -> `str` ++ ++ For Python 3: ++ - `str` -> `str` ++ - `bytes` -> decoded to `str` ++ """ ++ # Optimization: Fast return for the common case. ++ if type(s) is str: ++ return s ++ if PY2 and isinstance(s, text_type): ++ return s.encode(encoding, errors) ++ elif PY3 and isinstance(s, binary_type): ++ return s.decode(encoding, errors) ++ elif not isinstance(s, (text_type, binary_type)): ++ raise TypeError("not expecting type '%s'" % type(s)) ++ return s ++ ++ ++def ensure_text(s, encoding='utf-8', errors='strict'): ++ """Coerce *s* to six.text_type. ++ ++ For Python 2: ++ - `unicode` -> `unicode` ++ - `str` -> `unicode` ++ ++ For Python 3: ++ - `str` -> `str` ++ - `bytes` -> decoded to `str` ++ """ ++ if isinstance(s, binary_type): ++ return s.decode(encoding, errors) ++ elif isinstance(s, text_type): ++ return s ++ else: ++ raise TypeError("not expecting type '%s'" % type(s)) ++ ++ + def python_2_unicode_compatible(klass): + """ +- A decorator that defines __unicode__ and __str__ methods under Python 2. ++ A class decorator that defines __unicode__ and __str__ methods under Python 2. + Under Python 3 it does nothing. + + To support Python 2 and 3 with a single code base, define a __str__ method diff --git a/community/aws-cli/botocore-2922.patch b/community/aws-cli/botocore-2922.patch new file mode 100644 index 00000000000..f761a84b964 --- /dev/null +++ b/community/aws-cli/botocore-2922.patch @@ -0,0 +1,36 @@ +From 59489584f929b2893a5909c9009d3bdd556552a9 Mon Sep 17 00:00:00 2001 +From: Nate Prewitt <nate.prewitt@gmail.com> +Date: Mon, 20 Feb 2023 11:17:51 -0700 +Subject: [PATCH] Defer to system defaults for cipher suites with urllib3 2.0+ + +--- + awscli/botocore/httpsession.py | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/awscli/botocore/httpsession.py b/awscli/botocore/httpsession.py +index 97a03644d6..48e2e5d269 100644 +--- a/awscli/botocore/httpsession.py ++++ b/awscli/botocore/httpsession.py +@@ -20,7 +20,6 @@ + from urllib3.exceptions import SSLError as URLLib3SSLError + from urllib3.util.retry import Retry + from urllib3.util.ssl_ import ( +- DEFAULT_CIPHERS, + OP_NO_COMPRESSION, + PROTOCOL_TLS, + OP_NO_SSLv2, +@@ -49,6 +48,14 @@ + except ImportError: + from urllib3.util.ssl_ import SSLContext + ++try: ++ from urllib3.util.ssl_ import DEFAULT_CIPHERS ++except ImportError: ++ # Defer to system configuration starting with ++ # urllib3 2.0. This will choose the ciphers provided by ++ # Openssl 1.1.1+ or secure system defaults. ++ DEFAULT_CIPHERS = None ++ + import botocore.awsrequest + from botocore.compat import ( + IPV6_ADDRZ_RE, diff --git a/community/aws-cli/botocore-2924.patch b/community/aws-cli/botocore-2924.patch new file mode 100644 index 00000000000..2c7cae35042 --- /dev/null +++ b/community/aws-cli/botocore-2924.patch @@ -0,0 +1,27 @@ +From 5ec04be95d1531bf551056f80d3f7d84d48e5138 Mon Sep 17 00:00:00 2001 +From: Thomas Grainger <tagrain@gmail.com> +Date: Fri, 28 Apr 2023 12:06:22 +0100 +Subject: [PATCH] Do not set_ciphers(DEFAULT_CIPHERS) if DEFAULT_CIPHERS is + None + +Fixes #2921 +--- + awscli/botocore/httpsession.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/awscli/botocore/httpsession.py b/awscli/botocore/httpsession.py +index 48e2e5d269..b3fe6e6c0c 100644 +--- a/awscli/botocore/httpsession.py ++++ b/awscli/botocore/httpsession.py +@@ -113,7 +113,10 @@ def create_urllib3_context( + + context = SSLContext(ssl_version) + +- context.set_ciphers(ciphers or DEFAULT_CIPHERS) ++ if ciphers: ++ context.set_ciphers(ciphers) ++ elif DEFAULT_CIPHERS: ++ context.set_ciphers(DEFAULT_CIPHERS) + + # Setting the default here, as we may have no ssl module on import + cert_reqs = ssl.CERT_REQUIRED if cert_reqs is None else cert_reqs diff --git a/community/aws-cli/botocore-2967.patch b/community/aws-cli/botocore-2967.patch new file mode 100644 index 00000000000..5045015a8cd --- /dev/null +++ b/community/aws-cli/botocore-2967.patch @@ -0,0 +1,85 @@ +diff -Naur tests/unit/botocore/test_client.py awscli-2.15.40_/tests/unit/botocore/test_client.py +--- tests/unit/botocore/test_client.py 2024-04-20 15:00:39.465686191 +0800 ++++ awscli-2.15.40_/tests/unit/botocore/test_client.py 2024-04-20 15:07:29.335115713 +0800 +@@ -960,7 +960,7 @@ + lines = [ + (' Creates an iterator that will paginate through responses ' + 'from :py:meth:`MyService.Client.test_operation`.'), +- ' **Request Syntax** ', ++ ' **Request Syntax**', + ' ::', + ' response_iterator = paginator.paginate(', + " Foo='string',", +@@ -976,17 +976,17 @@ + ' :type Bar: string', + ' :param Bar: Documents Bar', + ' :type PaginationConfig: dict', +- ' :param PaginationConfig: ', ++ ' :param PaginationConfig:', + (' A dictionary that provides parameters to control ' + 'pagination.'), +- ' - **MaxItems** *(integer) --* ', ++ ' - **MaxItems** *(integer) --*', + (' The total number of items to return. If the total ' + 'number of items available is more than the value specified ' + 'in max-items then a ``NextToken`` will be provided in the ' + 'output that you can use to resume pagination.'), +- ' - **PageSize** *(integer) --* ', ++ ' - **PageSize** *(integer) --*', + ' The size of each page.', +- ' - **StartingToken** *(string) --* ', ++ ' - **StartingToken** *(string) --*', + (' A token to specify where to start paginating. This is ' + 'the ``NextToken`` from a previous response.'), + ' :returns: None', +diff -Naur tests/unit/botocore/test_waiters.py awscli-2.15.40_/tests/unit/botocore/test_waiters.py +--- tests/unit/botocore/test_waiters.py 2024-04-20 15:00:39.469019486 +0800 ++++ awscli-2.15.40_/tests/unit/botocore/test_waiters.py 2024-04-20 15:04:08.810188250 +0800 +@@ -648,7 +648,7 @@ + (' Polls :py:meth:`MyService.Client.foo` every 1 ' + 'seconds until a successful state is reached. An error ' + 'is returned after 1 failed checks.'), +- ' **Request Syntax** ', ++ ' **Request Syntax**', + ' ::', + ' waiter.wait(', + " bar='string'", +diff -Naur tests/unit/botocore/test_utils.py awscli-2.15.40_/tests/unit/botocore/test_utils.py +--- tests/unit/botocore/test_utils.py 2024-04-20 12:09:38.883650919 +0800 ++++ awscli-2.15.40_/tests/unit/botocore/test_utils.py 2024-04-20 12:11:56.434812142 +0800 +@@ -1000,17 +1000,24 @@ + 'https://bucket.s3.amazonaws.com/key.txt') + + +-class TestSwitchToChunkedEncodingForNonSeekableObjects(unittest.TestCase): +- def test_switch_to_chunked_encodeing_for_stream_like_object(self): +- request = AWSRequest( +- method='POST', headers={}, +- data=io.BufferedIOBase(b"some initial binary data"), +- url='https://foo.amazonaws.com/bucket/key.txt' +- ) +- prepared_request = request.prepare() +- self.assertEqual( +- prepared_request.headers, {'Transfer-Encoding': 'chunked'} +- ) ++def test_chunked_encoding_used_for_stream_like_object(): ++ class BufferedStream(io.BufferedIOBase): ++ """Class to ensure seek/tell don't work, but read is implemented.""" ++ ++ def __init__(self, value): ++ self.value = io.BytesIO(value) ++ ++ def read(self, size=-1): ++ return self.value.read(size) ++ ++ request = AWSRequest( ++ method='POST', ++ headers={}, ++ data=BufferedStream(b"some initial binary data"), ++ url='https://foo.amazonaws.com/bucket/key.txt', ++ ) ++ prepared_request = request.prepare() ++ assert prepared_request.headers == {'Transfer-Encoding': 'chunked'} + + + class TestInstanceCache(unittest.TestCase): diff --git a/community/aws-cli/botocore-2990-rebased.patch b/community/aws-cli/botocore-2990-rebased.patch new file mode 100644 index 00000000000..5bc154e3b88 --- /dev/null +++ b/community/aws-cli/botocore-2990-rebased.patch @@ -0,0 +1,77 @@ +From 86564e713ba922feafe3feb7883d5305cb6a0ec2 Mon Sep 17 00:00:00 2001 +From: Nate Prewitt <nate.prewitt@gmail.com> +Date: Wed, 26 Jul 2023 17:36:30 -0600 +Subject: [PATCH 1/3] Move 100-continue behavior to use request API + +--- + awscli/botocore/awsrequest.py | 37 +++++++++++++++++++++---------------- + 1 file changed, 21 insertions(+), 16 deletions(-) + +diff --git a/awscli/botocore/awsrequest.py b/awscli/botocore/awsrequest.py +index f00a0dde57..9123e65c9d 100644 +--- a/awscli/botocore/awsrequest.py ++++ b/awscli/botocore/awsrequest.py +@@ -66,33 +66,34 @@ class AWSConnection: + def __init__(self, *args, **kwargs): + super(AWSConnection, self).__init__(*args, **kwargs) + self._original_response_cls = self.response_class +- # We'd ideally hook into httplib's states, but they're all +- # __mangled_vars so we use our own state var. This variable is set +- # when we receive an early response from the server. If this value is +- # set to True, any calls to send() are noops. This value is reset to +- # false every time _send_request is called. This is to workaround the +- # fact that py2.6 (and only py2.6) has a separate send() call for the +- # body in _send_request, as opposed to endheaders(), which is where the +- # body is sent in all versions > 2.6. ++ # This variable is set when we receive an early response from the ++ # server. If this value is set to True, any calls to send() are noops. ++ # This value is reset to false every time _send_request is called. ++ # This is to workaround changes in urllib3 2.0 which uses separate ++ # send() calls in request() instead of delegating to endheaders(), ++ # which is where the body is sent in CPython's HTTPConnection. + self._response_received = False + self._expect_header_set = False ++ self._send_called = False + + def close(self): + super(AWSConnection, self).close() + # Reset all of our instance state we were tracking. + self._response_received = False + self._expect_header_set = False ++ self._send_called = False + self.response_class = self._original_response_cls + +- def _send_request(self, method, url, body, headers, *args, **kwargs): ++ def request(self, method, url, body=None, headers=None, *args, **kwargs): ++ if headers is None: ++ headers = {} + self._response_received = False + if headers.get('Expect', b'') == b'100-continue': + self._expect_header_set = True + else: + self._expect_header_set = False + self.response_class = self._original_response_cls +- rval = super(AWSConnection, self)._send_request( +- method, url, body, headers, *args, **kwargs) ++ rval = super().request(method, url, body, headers, *args, **kwargs) + self._expect_header_set = False + return rval + +@@ -210,8 +210,15 @@ def _send_message_body(self, message_body): + + def send(self, str): + if self._response_received: +- logger.debug("send() called, but reseponse already received. " +- "Not sending data.") ++ if not self._send_called: ++ # urllib3 2.0 chunks and calls send potentially ++ # thousands of times inside `request` unlike the ++ # standard library. Only log this once for sanity. ++ logger.debug( ++ "send() called, but response already received. " ++ "Not sending data." ++ ) ++ self._send_called = True + return + return super(AWSConnection, self).send(str) + diff --git a/community/ax25-apps/APKBUILD b/community/ax25-apps/APKBUILD index 891b67e5e3c..bed89b7b1e2 100644 --- a/community/ax25-apps/APKBUILD +++ b/community/ax25-apps/APKBUILD @@ -18,6 +18,11 @@ source="https://linux-ax25.in-berlin.de/pub/ax25-apps/ax25-apps-$_ver.tar.gz " builddir="$srcdir/"$pkgname-$_ver +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/ayatana-indicator-display/APKBUILD b/community/ayatana-indicator-display/APKBUILD index fa8e9b52385..4b74c4c8cee 100644 --- a/community/ayatana-indicator-display/APKBUILD +++ b/community/ayatana-indicator-display/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luca Weiss <luca@z3ntu.xyz> # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=ayatana-indicator-display -pkgver=24.4.0 +pkgver=24.4.1 pkgrel=0 pkgdesc="Ayatana Indicator Display" url="https://github.com/AyatanaIndicators/ayatana-indicator-display" @@ -46,5 +46,5 @@ package() { } sha512sums=" -d0ed75063f34db09a8e5e1b14882b34e97cf30592e8859d43ca75816cba543478872aadc946c19a013b2f4b0533426cfc4d465ac2b98aad18b82b85b5e141d8f ayatana-indicator-display-24.4.0.tar.gz +f44846bd7f25d0218f63cd208dfcbd7662928b38b68ce653cb21bce6edf0e527c91a771174d7655f92687591aca4b4c5978f73b321bf00c44152131b316845f7 ayatana-indicator-display-24.4.1.tar.gz " diff --git a/community/ayatana-indicator-sound/APKBUILD b/community/ayatana-indicator-sound/APKBUILD index ba3cead7eca..e1628d08bc2 100644 --- a/community/ayatana-indicator-sound/APKBUILD +++ b/community/ayatana-indicator-sound/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luca Weiss <luca@z3ntu.xyz> # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=ayatana-indicator-sound -pkgver=24.4.0 +pkgver=24.4.1 pkgrel=0 pkgdesc="Ayatana Indicator Sound Applet" url="https://github.com/AyatanaIndicators/ayatana-indicator-sound" @@ -52,5 +52,5 @@ package() { } sha512sums=" -589788447c421a34134448f3e615ced8e92baf4dd3aab60d7b3360f97cdc801069b8f4f92bfd3de2caf6bb57a6c70f996b42cf6d7d30424674aa6d0175e14984 ayatana-indicator-sound-24.4.0.tar.gz +92d1669b84105202b88c132e61693e4873f5642882acfdf08adf86eae79053896cb213f28ec6d3e0910a8966396c001c7483190a713da3b902e79f52797d06d2 ayatana-indicator-sound-24.4.1.tar.gz " diff --git a/testing/azorius/APKBUILD b/community/azorius/APKBUILD index 629891b181a..9da04f96233 100644 --- a/testing/azorius/APKBUILD +++ b/community/azorius/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=azorius pkgver=0.3.4 -pkgrel=2 +pkgrel=3 pkgdesc="Social link aggregator and comment forum with ActivityPub" url="https://azorius.net/" arch="all" @@ -70,5 +70,5 @@ sha512sums=" 6475846d8f6972d34a6672eee62ce7fbcce7524fd6e980c60e874699b714c4ce550b35806625e6b60f00b9e2fb85175998d715644993fb169809b60343642725 azorius-0.3.4.tgz aa8641ef0a4c6b27d4ac21f2dd974dcd090f5867ee314c4322f39284a8e80b430f522fcb75c51db8dd0c00791a2c76652827eda091183ee57a2b3f8c97d8b88c azorius.initd fb522c19c7debd64c57087d5a77f03f0418e0eb929c570cbb0cb5fb36a97e63b09b34bc4137aff36fe625fb3ced8b1d16529a8ba1af79cffa67a9033acfa7a1d azorius.confd -45878a9c132bfa2faa6e142b2b7494bb64a183112356481b651e90fec5f011fc3da3a882316034ffd73ec00d913aa2b678806684ed2eb334704e6aa1a8245b80 upgradedb.patch +29d2855ae37fdea1d001c327fa882e726af3b8eac0dc3b17beceedfae37eece2337cc5d12f80d9ac79fd704bcd19103470ae8f6f2beb3e3854b8b349dd106fff upgradedb.patch " diff --git a/testing/azorius/azorius.confd b/community/azorius/azorius.confd index 287194b0af3..287194b0af3 100644 --- a/testing/azorius/azorius.confd +++ b/community/azorius/azorius.confd diff --git a/testing/azorius/azorius.initd b/community/azorius/azorius.initd index 5a03bdbbf8a..5a03bdbbf8a 100644 --- a/testing/azorius/azorius.initd +++ b/community/azorius/azorius.initd diff --git a/testing/azorius/azorius.pre-install b/community/azorius/azorius.pre-install index 1ecc926660b..1ecc926660b 100644 --- a/testing/azorius/azorius.pre-install +++ b/community/azorius/azorius.pre-install diff --git a/community/azorius/upgradedb.patch b/community/azorius/upgradedb.patch new file mode 100644 index 00000000000..8663e44ad4c --- /dev/null +++ b/community/azorius/upgradedb.patch @@ -0,0 +1,20 @@ +Patch-Source: https://humungus.tedunangst.com/r/azorius/v/cfe9c246e9e5 +-- +changeset: 537:cfe9c246e9e5 +user: Ted Unangst <tedu@tedunangst.com> +files: upgradedb.go +description: + fix format string + +diff -r f3e5d259c544 -r cfe9c246e9e5 upgradedb.go +--- a/upgradedb.go 2024-05-06 00:44:17 -0400 EDT ++++ b/upgradedb.go 2024-05-08 01:27:44 -0400 EDT +@@ -116,7 +116,7 @@ func upgradedb() { + var lnk string + err := rows.Scan(&postid, &lnk) + if err != nil { +- elog.Fatalf("can't scan link: %s") ++ elog.Fatalf("can't scan link: %s", err) + } + m := re_linkhost.FindStringSubmatch(lnk) + if len(m) > 1 { diff --git a/community/b3sum/APKBUILD b/community/b3sum/APKBUILD index a69046280ab..f6419397656 100644 --- a/community/b3sum/APKBUILD +++ b/community/b3sum/APKBUILD @@ -8,7 +8,9 @@ url="https://github.com/BLAKE3-team/BLAKE3" arch="all" license="CC0-1.0 OR Apache-2.0" makedepends="cargo cargo-auditable" -source="$pkgname-$pkgver.tar.gz::https://crates.io/api/v1/crates/b3sum/$pkgver/download" +source="$pkgname-$pkgver.tar.gz::https://crates.io/api/v1/crates/b3sum/$pkgver/download + libc.patch + " case "$CARCH" in armhf) @@ -41,4 +43,5 @@ package() { sha512sums=" 13108cee43f416ff1f2ff62be69e49fcb463b5816aef8e30120e6e238ce5527dac4b5fe505262b880dfda179dfb0e09179cd663f3a150af49e8d864a6597d5f0 b3sum-1.5.1.tar.gz +ab558cb6a27fb80985be79e1cc3f3030eb82643aadd44342c7898b5c8df84d8c560dfee5d30d9d0e583ea860a67c9f53b4eae23ea0c07366034ff777fc83a3c0 libc.patch " diff --git a/community/b3sum/libc.patch b/community/b3sum/libc.patch new file mode 100644 index 00000000000..ae1ef209fa2 --- /dev/null +++ b/community/b3sum/libc.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index bd7019b..0e2b6aa 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -247,9 +247,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "linux-raw-sys" diff --git a/community/baloo-widgets/APKBUILD b/community/baloo-widgets/APKBUILD index d2a4c7207cd..77e92de21bc 100644 --- a/community/baloo-widgets/APKBUILD +++ b/community/baloo-widgets/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=baloo-widgets -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Widgets for Baloo" # armhf blocked by extra-cmake-modules @@ -56,5 +56,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -291c6940b7554ea62e1fa4659635544513ab4ccc09428571029584657b93f1e7240eaea19a28e43d0ffbf7f4db567d2793200c14e006a1a4ec7d5d0e559fa8d5 baloo-widgets-24.02.2.tar.xz +a1ae7fb7f509f3a89d69afeb27d7236e2673f11d065cb0e94c41f596da5f0510ab930019c34b19acdb5f77e162ee7327eae60c0c4ca81a3fe2f42cd72d68e60c baloo-widgets-24.05.0.tar.xz " 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/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 03889ba4875..4166adbb956 100644 --- a/community/bear/APKBUILD +++ b/community/bear/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=bear -pkgver=3.1.3 -pkgrel=4 +pkgver=3.1.4 +pkgrel=0 pkgdesc="Tool which generates a compilation database for clang tooling" url="https://github.com/rizsotto/Bear" # s390x: segfaults in check @@ -61,5 +61,5 @@ package() { } sha512sums=" -34039b51a7cd636bdb7fb716f69d6c70de3e7bfc5e2c83a3040942010fb7effe49b0afa0d29be182eb550d57b024fbe5bea779a7fda5f86201865bf491ba1672 bear-3.1.3.tar.gz +c63da7586d25a64dd8b3ff82f37505b36071dd064deb973c012840bc52ff6aec861fca21422b86b11629e86dc43d156b233d21b01e689369f0726799083afa98 bear-3.1.4.tar.gz " diff --git a/community/benchmark/APKBUILD b/community/benchmark/APKBUILD index 8e126ae095a..abea78d6e77 100644 --- a/community/benchmark/APKBUILD +++ b/community/benchmark/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=benchmark -pkgver=1.8.3 +pkgver=1.8.4 pkgrel=0 pkgdesc="microbenchmark support library" url="https://github.com/google/benchmark" @@ -40,5 +40,5 @@ package() { } sha512sums=" -4e12114251c79a426873cfba6e27270b69fc980cef9a68e9cb3170f8e2e203f77dee19ab1e65cad51cd67e60991d3bbfdd52553f22522ce5e6c611b5aa07602c benchmark-1.8.3.tar.gz +835d12b88fe52309ce6b2ffbc8b3c178ac594be7d249b5daca0373d1d03ec83ea3c7b94224f67f22d21919376985867eeff0d1c0721501cfd8a9e9b8a9c48882 benchmark-1.8.4.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/bird-lg-go/APKBUILD b/community/bird-lg-go/APKBUILD index e61ef857a7b..8b60e915ee3 100644 --- a/community/bird-lg-go/APKBUILD +++ b/community/bird-lg-go/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Thomas Liske <thomas@fiasko-nw.net> pkgname=bird-lg-go pkgver=1.3.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="BIRD looking glass in Go" url="https://github.com/xddxdd/bird-lg-go" arch="all" diff --git a/community/bird_exporter/APKBUILD b/community/bird_exporter/APKBUILD index fd48c5c2d76..c5312d60263 100644 --- a/community/bird_exporter/APKBUILD +++ b/community/bird_exporter/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Thomas Liske <thomas@fiasko-nw.net> pkgname=bird_exporter pkgver=1.4.3 -pkgrel=2 +pkgrel=3 pkgdesc="Metric exporter for bird routing daemon to use with Prometheus" url="https://github.com/czerwonk/bird_exporter" arch="all" diff --git a/community/birdwatcher/APKBUILD b/community/birdwatcher/APKBUILD index 482aed9319d..4ae33d8334f 100644 --- a/community/birdwatcher/APKBUILD +++ b/community/birdwatcher/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Thomas Liske <thomas@fiasko-nw.net> pkgname=birdwatcher pkgver=2.2.5 -pkgrel=3 +pkgrel=4 pkgdesc="A JSON API for BIRD" url="https://github.com/alice-lg/birdwatcher" arch="all" diff --git a/community/bitcoin/APKBUILD b/community/bitcoin/APKBUILD index b8e815be1de..664a7062749 100644 --- a/community/bitcoin/APKBUILD +++ b/community/bitcoin/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=bitcoin -pkgver=26.1 -pkgrel=1 +pkgver=27.0 +pkgrel=0 pkgdesc="Decentralized P2P electronic cash system" url="https://www.bitcoincore.org/" # x86: segfault in check @@ -91,7 +91,7 @@ dev() { } sha512sums=" -5aa99d97493d220acf10c806fa3386f26e1cf7357ec590bed9f5b42881e764656eecb938c0f7cfbc1d9c254f04138f3919b3dc803b7863e0dfd846a7cd809e8c bitcoin-26.1.tar.gz +47dc917f315b397d850d98a0a2440141b11d59ed7267ec283b7c4fb475ba223f11482d2f5eaca02ebbfd3f09fa1721902f3f97c563a642d0359c3265784d15f6 bitcoin-27.0.tar.gz b150ed46dc8ae230acd1ac1930936670f4195bf1bdd3fefaf743919b99a2de3a8ec5d0012df3b1b1280f3f31abf961ab02de461742799bffbeda7bfe5e0adb14 ssize_t.patch 7868c3cd34ce7c7340d68e8d2bc357f24a8ba82e968a37be949d4edf4f63edf32feff644ad26bf178eaa1eee28b9d43bd2abaf71ff6a9bdea91b57b5e4c80578 use-c-locale.patch c88ca4f0c8a3179dbac274db1719983352caa5074b236e59d8fe31ab45ffa99bd90c1a566c4459261a9dcdcc990b826f3466c77aa7a32cf9fb15529a510ac7fd bitcoin.initd diff --git a/community/blinken/APKBUILD b/community/blinken/APKBUILD index 4b3efc10c7f..ac205ffb86a 100644 --- a/community/blinken/APKBUILD +++ b/community/blinken/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=blinken -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules # s390x blocked by kxmlgui @@ -46,5 +46,5 @@ package() { } sha512sums=" -b339869fa1571a86818bc7445885aaa919b9ba22b3cbf51d7f8f317104b346b83dc39c730a7de24eb4baf9a2a059eaa4ea699f05cc362b6f377a241ce39eaa11 blinken-24.02.2.tar.xz +bd7c1caa8c90b38218e6bdde39e6534ebb4549df0e44464c1ed975bbd6b988e42a5fb9e8e6bddde3c14b2502db2107c87daca7a3c8b3dcd3b2494e2ab186f304 blinken-24.05.0.tar.xz " diff --git a/community/blocky/APKBUILD b/community/blocky/APKBUILD index 311234c142d..0e09e040dbc 100644 --- a/community/blocky/APKBUILD +++ b/community/blocky/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=blocky # Also update documentation links in blocky.example.yml -pkgver=0.23 -pkgrel=3 +pkgver=0.24 +pkgrel=0 pkgdesc="DNS proxy as ad-blocker for local network" pkggroups="blocky" pkgusers="blocky" @@ -46,9 +46,9 @@ package() { } sha512sums=" -22431da4c2f259411b7eb790e8f05a7264d0aa96fe4774722bbe71cf9459a3ed7f434b4b295c95b80f2efc6de55ff645f860443838fe793bc413d74b77e395be blocky-0.23.tar.gz +d89e417157a2f45232f264eed597849bf38e4ad7407d215e5ebe9b2bd84e2b31f1c434b9df915c295272214a3398fb73302814503bca5ca41b748363ecc656e6 blocky-0.24.tar.gz 2f1e60037229ad2730f3d51a16e79f0ef93baf80fa73948d08d1216de5db454f10ea4081558f1c86db2e394948cfce62af20b802278dd89241b591e77bce8b4c busybox-date.patch d5507cedb0dab49c139ab4366d3b6428b23c8aa891a7f7d6caad567cfca53f8434f055d4c15d03899712b164a5f2a9e00e9df75ab0e428d205a4bd5bdc50b973 blocky.initd 3ddd8cd400f9c0f9999430e7fe2507ef5f9ac43bc2e9acbc1bf1b558d383bc891e36a6bf75e2031cd28da69e9dc875f0ac5ad3dac0cf35ce2076651d000e7981 blocky.confd -05f2cae2282a6b36239b012e02978731e28de9af6955315c96257093a24a85713b3abd9f9d1ba3de6452e1bb85e4b8c834dd1aca428b5d7466cc1153c314f667 blocky.example.yml +a9a5ba48e10cc17c579ceccbf4e77bbe815e8879d094af2b5ed7191aafdd65efd583d31900748380b5e7c19d869ace82c76347a4e9a1e9aa2bed868b0e9c50dd blocky.example.yml " diff --git a/community/blocky/blocky.example.yml b/community/blocky/blocky.example.yml index e0c9f95c4db..a38c9459184 100644 --- a/community/blocky/blocky.example.yml +++ b/community/blocky/blocky.example.yml @@ -1,7 +1,7 @@ -# Reference configuration file: https://0xerr0r.github.io/blocky/v0.23/configuration/ +# Reference configuration file: https://0xerr0r.github.io/blocky/v0.24/configuration/ # A list of some public DNS servers can be found at: -# https://0xerr0r.github.io/blocky/v0.23/additional_information/#list-of-public-dns-servers +# https://0xerr0r.github.io/blocky/v0.24/additional_information/#list-of-public-dns-servers upstream: default: - 46.182.19.48 diff --git a/community/bluedevil/APKBUILD b/community/bluedevil/APKBUILD index c0cd3fe984d..acf11a0d884 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.4 +pkgver=6.0.5.1 pkgrel=0 pkgdesc="Integrate the Bluetooth technology within KDE workspace and applications" # armhf blocked by qt6-qtdeclarative @@ -43,7 +43,7 @@ case "$pkgver" in esac subpackages="$pkgname-doc $pkgname-lang" _repo_url="https://invent.kde.org/plasma/bluedevil.git" -source="https://download.kde.org/stable/plasma/$pkgver/bluedevil-$pkgver.tar.xz" +source="https://download.kde.org/stable/plasma/${pkgver%.*}/bluedevil-$pkgver.tar.xz" build() { cmake -B build -G Ninja \ @@ -62,5 +62,5 @@ package() { } sha512sums=" -7f87519d561038d2b6fc06588b25ae3df50f419a0c44bec94525a44a2b9387d12495c88af9c6e780ad607065e927e7cdb1e5d5757a20307ff6e237b87fd82b14 bluedevil-6.0.4.tar.xz +9aab7e0ec355d2db8812fd8483f137a8f4c64444b0102222eeb9b40f7047a8ba7211e3cec0839c33150db83254ba2ab7814ccc2ba51574464a9439d36bcb4318 bluedevil-6.0.5.1.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/bluetuith/APKBUILD b/community/bluetuith/APKBUILD index 83719227d22..b5d8c6e0adc 100644 --- a/community/bluetuith/APKBUILD +++ b/community/bluetuith/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adam Thiede <me@adamthiede.com> pkgname=bluetuith pkgver=0.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="TUI-based bluetooth connection manager" url="https://github.com/darkhz/bluetuith" arch="all" diff --git a/community/bluez-alsa/APKBUILD b/community/bluez-alsa/APKBUILD index 44e67dd883a..0d9dbba9320 100644 --- a/community/bluez-alsa/APKBUILD +++ b/community/bluez-alsa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Bradley Saulteaux <-@bradso.to> pkgname=bluez-alsa -pkgver=4.1.1 +pkgver=4.2.0 pkgrel=0 pkgdesc="Bluetooth Audio ALSA Backend" url="https://github.com/Arkq/bluez-alsa" @@ -71,7 +71,7 @@ utils() { } sha512sums=" -5e43846af5c7c30a3d81a704514076a73b1d8994db5ee8925a59b1b328f684c15188d45caf9358f59e57a0c200d644dc673bd1c44f7d48a51452776e01f022f8 bluez-alsa-4.1.1.tar.gz +1c8816d0baf031c5823fb49fac1409f4034f2f5cc8506ba1f377260cfc6437baa3f6ff1611eac72751f9d56c08f525dc43db05d30820baf394c75f3537d65162 bluez-alsa-4.2.0.tar.gz 3a631e940cc56f3f7b9a49f5e69d057be08e876334d29ec9e0839ad80e8829d970e099d01f180a1e4fef237f324bcb16abdc702dbb6d0b46e3d318625e805cae bluealsa.initd ae50f9c39b8f725f793f362336d1823b1c20ebf877b1ae736601ef48e030b8c79094018d270e098476dc98ef888aae577e7a0ebda70451c3168d79c5e2baf859 bluealsa.confd " 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..60d88932385 100644 --- a/community/bluez-qt5/APKBUILD +++ b/community/bluez-qt5/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 +# group=kde-frameworks-old pkgname=bluez-qt5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 arch="all !armhf" # armhf blocked by qt5-qtdeclarative pkgdesc="Qt wrapper for Bluez 5 DBus API" @@ -47,5 +47,5 @@ package() { } sha512sums=" -b56ffb59d1fdabfc5bc76ae888a591eb24b1b7d145d9a1efd7c0aafb51f47c49ba98f375ab461a141f321e7e4811b8c6928faeef07001a4ee46b49540441b985 bluez-qt-5.115.0.tar.xz +f5bccdb75d18b2cdc66de76b23acae9821335eeec0b1f53abf009008f7aa6fe9ddee5428f366be9af872666a3a7de79daac5ee930116f554e1c9d1e664fe574b bluez-qt-5.116.0.tar.xz " diff --git a/community/bmake/APKBUILD b/community/bmake/APKBUILD index 74ec968e876..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=20240430 +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=" -c71f30fb4a32455bb9157e6c813cd4025831cf52ff1481d3d8a1a62de06dbf8f26b8cae30a3dcc2c26741ff08302d866fc8a2aaa7ca42af14fcfa38dd7bbe769 bmake-20240430.tar.gz +b2e65a8a58b1ca93f8e64403c3f408c9d0c47125597babf3090a5341e219aa9fd897313a2a21bd780351e92cb89dbf75aa34a10527b68f00f1c18cd3cf77a056 bmake-20240508.tar.gz 320a0175107ed683ef1772a6884be3e0c503ec4d46b0901ae8a9e8cec4c4a5236bec934d9f451142e56addd9e2fe2ea1bc4712b7304570141230e0e1997e7a65 separate-tests.patch " diff --git a/community/bolt/APKBUILD b/community/bolt/APKBUILD index 64d0db26864..ecdb5d38ef4 100644 --- a/community/bolt/APKBUILD +++ b/community/bolt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bolt -pkgver=0.9.7 +pkgver=0.9.8 pkgrel=0 pkgdesc="Thunderbolt 3 device manager" url="https://gitlab.freedesktop.org/bolt/bolt" @@ -45,5 +45,5 @@ package() { } sha512sums=" -a9ae0425cdba8932356ec4dcf3f6b3469478c01d47ef3b741c0a841117c81b354f35860be6011ea3b43b28ae10164909a82e2bdbcf92e8541c637cf44277a36c bolt-0.9.7.tar.gz +ca3f1859b01f1370f508696192050231f5ced9a3c10eaa8d508b130f9202cc9161eb50e6884a8818c284f23bdc9d7cb6662442cd04d9d7eb8aeca1a1c0d5c060 bolt-0.9.8.tar.gz " diff --git a/community/bombadillo/APKBUILD b/community/bombadillo/APKBUILD index 9ad18bd3fa7..67b5002b00d 100644 --- a/community/bombadillo/APKBUILD +++ b/community/bombadillo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: mio <miyopan@e.email> pkgname=bombadillo pkgver=2.4.0 -pkgrel=19 +pkgrel=20 pkgdesc="Non-web (gopher, gemini, finger) browser for the terminal" url="https://bombadillo.colorfield.space/" license="GPL-3.0-or-later" diff --git a/community/booster/APKBUILD b/community/booster/APKBUILD index 5c3af34a43c..1a94a4d5ac4 100644 --- a/community/booster/APKBUILD +++ b/community/booster/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=booster pkgver=0.11 -pkgrel=6 +pkgrel=7 pkgdesc="Fast and secure initramfs generator" url="https://github.com/anatol/booster" arch="all" diff --git a/community/boringproxy/APKBUILD b/community/boringproxy/APKBUILD index 6fe1a1f99ac..80918903b26 100644 --- a/community/boringproxy/APKBUILD +++ b/community/boringproxy/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=boringproxy pkgver=0.10.0 -pkgrel=12 +pkgrel=13 pkgdesc="Simple tunneling reverse proxy with a fast web UI and auto HTTPS" url="https://github.com/boringproxy/boringproxy" options="!check" # no tests diff --git a/community/bovo/APKBUILD b/community/bovo/APKBUILD index 0c13821122e..4972fa7be7d 100644 --- a/community/bovo/APKBUILD +++ b/community/bovo/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=bovo -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A Gomoku like game for two players" # armhf blocked by extra-cmake-modules @@ -44,5 +44,5 @@ package() { } sha512sums=" -d7fdcb5f4fec650438b20aabb4e961014c18ec4557c844926bff90f4639c907291f33c37f8401e1c684caf7bfc444db3b17f7005ab92e1e712767d6385821ab4 bovo-24.02.2.tar.xz +03ac85622c7db24b3f1cb7d0450e63f107b11ed492b00f23399f10e12b78a184d8c6ce4140acf37b7940ee8b3ece915bc05641f6ed0df22b3cbbe50cfa336d33 bovo-24.05.0.tar.xz " diff --git a/community/bower/APKBUILD b/community/bower/APKBUILD index 88758fd0bdc..39ed12e1fde 100644 --- a/community/bower/APKBUILD +++ b/community/bower/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.0 pkgrel=2 pkgdesc="curses frontend for the Notmuch email system" url="https://github.com/wangp/bower" -arch="all" +arch="all !loongarch64" # blocked by mercury license="GPL-3.0-or-later" makedepends=" coreutils diff --git a/community/bpftrace/APKBUILD b/community/bpftrace/APKBUILD index ad8f7cea109..cb107b4a5ae 100644 --- a/community/bpftrace/APKBUILD +++ b/community/bpftrace/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Konstantin Kulikov <k.kulikov2@gmail.com> # Maintainer: Adam Jensen <adam@acj.sh> pkgname=bpftrace -pkgver=0.20.3 +pkgver=0.20.4 pkgrel=0 pkgdesc="High-level tracing language for Linux eBPF" url="https://github.com/iovisor/bpftrace" @@ -82,7 +82,7 @@ tools_doc() { } sha512sums=" -218a1bfac7e1a2b7eef5b0ed3e7403eed4bc932f2aa03c5f4c8924246c09088f5074ab3d54031e582cb4f8e7d0c7df1bb30007c2421c44d2c2506364f0ba5a0e bpftrace-0.20.3.tar.gz +a8d5b5bd7d35f9bb308cd7d0ae4eaee899312d3e6540164d3b29eac61159983ea01350311f53b7b6c5023844bde9a2cd3a2d50459116261a536c0e6e52963462 bpftrace-0.20.4.tar.gz 1f884e75ee7df8d28e8f613eca64cc56f859806c5a8d0f491c07709b0000be3a29be62a3eab6dfb04fcf9aadd1a4c3fde26e212ea0c40e5a54e59a197f148ed4 10-link-libbpf.patch 45aab5507ca1b8d4a8914cef5d771f9769c2984e5d7fc03a4c509948b2864170c58dc255d96ddf92defde5c76f41003ee653887f7036833c135481449781f251 20-zlib.patch " diff --git a/community/breeze-grub/APKBUILD b/community/breeze-grub/APKBUILD index 3cd7ba7043e..32a62f26a34 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.4 +pkgver=6.0.5 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=" -8030f8312b4d96a220575faa7b88c25b7840652d67fc38e9ea0b4e9e978c0bf66bf8175f8585d700e89897bb5822929016c34049f7f2b59bae9be6e7c12a414e breeze-grub-6.0.4.tar.xz +bc88f78204083f244ea38960beefef229f8d7473707f8280f10bb65a95d7f83b2d008baec0c350fd975ea83bd6a1b8429e12a636126dd75d4b1d0a117f9dd2a5 breeze-grub-6.0.5.tar.xz " diff --git a/community/breeze-gtk/APKBUILD b/community/breeze-gtk/APKBUILD index 9c7096cbaae..04834bf5368 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.4.1 +pkgver=6.0.5 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=" -3a9fd0b9cded7e32a9acc463f00e5a7827f1754f7da44a525de4bfa6e906e2fe002aa22773dc0c9f4a7740409b3eb2a6773ac540fed152952dbef83e86c337f3 breeze-gtk-6.0.4.1.tar.xz +36f3c4b6ad2cd6d45f5b9c6eb6b854c62177cb869b3ee7865c3e525fdeae150167fdd24726f24b2b370073090a3b7ebb4d7ed121c33b1adfdf33d8fc467670ef breeze-gtk-6.0.5.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 b1e76100b17..d3af6b4cbe7 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.4.1 +pkgver=6.0.5 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=" -8adaee96f55544d904f16fb871bd1969e467cd892d2b15c84324a7538fa8064b3594ea858443907f27a75458c6832d48ec7ea059077c44de945f5a337b1ad110 breeze-plymouth-6.0.4.1.tar.xz +3fcdd12400b85c5342affbd6916f6297c23d660cd67640d0f90266ca511e2681ccf19ab280de33da40fee0e2389bd2bfbc27d0009da1aa0de151689199e10bb0 breeze-plymouth-6.0.5.tar.xz " diff --git a/community/breeze/APKBUILD b/community/breeze/APKBUILD index 7228a1aa084..02f2252e4d3 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.4 +pkgver=6.0.5 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=" -47e7d94d4c7acbd350e1698361774534de2f0306716930fe38128fc80231f86614ed153471937eecd6cdab8df2f98f4e27747b2c2ff23d23ccb6b18aa2633b9a breeze-6.0.4.tar.xz +3c7a79431aa918f891da8a59ef9f11b024425d4bfaa48e92730117f9d0b0ae85750456f13def90dc0c1a949cded674bff91d822028f54449aca49a9e19444ecd breeze-6.0.5.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/browserpass/APKBUILD b/community/browserpass/APKBUILD index eae10357ef8..11b6c585605 100644 --- a/community/browserpass/APKBUILD +++ b/community/browserpass/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=browserpass pkgver=3.1.0 -pkgrel=8 +pkgrel=9 pkgdesc="Browser extension for pass" url="https://github.com/browserpass/browserpass-native" arch="all" 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/buildah/APKBUILD b/community/buildah/APKBUILD index ae11761202f..37bf75e5303 100644 --- a/community/buildah/APKBUILD +++ b/community/buildah/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=buildah -pkgver=1.34.1 -pkgrel=3 +pkgver=1.35.4 +pkgrel=0 pkgdesc="tool that facilitates building OCI container images" url="https://github.com/containers/buildah" license="Apache-2.0" @@ -17,6 +17,11 @@ source="https://github.com/containers/buildah/archive/v$pkgver/buildah-$pkgver.t " # secfixes: +# 1.35.4-r0: +# - CVE-2024-1753 +# - CVE-2024-3727 +# - CVE-2024-24786 +# - CVE-2024-28180 # 1.34.0-r1: # - CVE-2023-48795 # 1.28.0-r0: @@ -33,9 +38,6 @@ export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" build() { - # https://github.com/mattn/go-sqlite3/issues/1164 - export CGO_CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE" - GIT_COMMIT="$pkgver" make buildah GIT_COMMIT="$pkgver" make -C docs GOMD2MAN="$(which go-md2man)" } @@ -45,6 +47,6 @@ package() { } sha512sums=" -2d229ead1149b66d1b7d91f596809e97e5316356ab0997ea335eb3e246ed8bc6879e0e260bb478b4d7ec7c42c7dbf33d0e91086a34e89a3b79eb27322da06c1e buildah-1.34.1.tar.gz +679f2328f675a39f9965128d51a6e8a3f82d64a6d3c3cdcb862cfcb7691eba272d869b6718147da1590aa573534081329ef05e879875024a11aa9ad52b2f292f buildah-1.35.4.tar.gz 640526de31a5eb21112c3d3fd30ce78331e5f5998166c9af9405ebad919a9a895ee82e3eed7067c2ce7e3e558e31907398fec1ad895be708e9f8ada696076216 basename.patch " diff --git a/community/buildkit/APKBUILD b/community/buildkit/APKBUILD index 13eac4916b1..8e9bdc7c977 100644 --- a/community/buildkit/APKBUILD +++ b/community/buildkit/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=buildkit pkgver=0.13.2 -pkgrel=0 +pkgrel=1 pkgdesc="Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit" url="https://github.com/moby/buildkit" arch="all" diff --git a/community/cacti/APKBUILD b/community/cacti/APKBUILD index 8f4b96b1edd..677c3f22eeb 100644 --- a/community/cacti/APKBUILD +++ b/community/cacti/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Jeff Bilyk <jbilyk@gmail.com> pkgname=cacti -pkgver=1.2.26 +pkgver=1.2.27 pkgrel=0 pkgdesc="The complete rrdtool-based graphing solution" url="https://www.cacti.net/" @@ -21,6 +21,16 @@ source="cacti-src-$pkgver.tar.gz::https://www.cacti.net/downloads/cacti-$pkgver. " # secfixes: +# 1.2.27-r0: +# - CVE-2024-25641 +# - CVE-2024-29894 +# - CVE-2024-31443 +# - CVE-2024-31444 +# - CVE-2024-31445 +# - CVE-2024-31458 +# - CVE-2024-31459 +# - CVE-2024-31460 +# - CVE-2024-34340 # 1.2.26-r0: # - CVE-2023-46490 # - CVE-2023-49084 @@ -177,7 +187,7 @@ _php() { } sha512sums=" -43bfa2fa5b87267191f845de8be38025b795509eb12817e5ff9884b20676655ec4e5230e015abe2afa9f10354317eec39081613e5c9fec4f6a6f314bedf873ab cacti-src-1.2.26.tar.gz +e080912d2878d217ab8224eb6b7481047e339199fc0142394a640746f04fabbed60a0a8ae226e9d1d6c06a579fd351dbf5c24c4110204996b9f17444e2c876e9 cacti-src-1.2.27.tar.gz 2ff197a75e366b4fdb2f651643a08b5b14140225edd5aea673cfbedeb92aab0b4625c789896990cc023e35fb20c2370c917253c92f51568b293f39452f1a6b74 cacti.crontab 9b3fe765c6196c0e4988efaa7236d8a8b945725548371b4a0e2a371de374c9577a908d58dcef5a4e59e089ca923cfeb7c5ddea9ee983a5115239052cf9b8ab59 cacti.nginx.conf 056358fc69752fb5129729db91a22d06c97ca452068017ccfe0ede8f2bf42f62e5072415c7db2eb5b9346d6bc54092bc147044e40b2156d8037dfee4a7e55e5b cacti.php-fpm.conf diff --git a/community/caddy/APKBUILD b/community/caddy/APKBUILD index fdaa635cb3f..addb8ce6e08 100644 --- a/community/caddy/APKBUILD +++ b/community/caddy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=caddy pkgver=2.7.6 -pkgrel=3 +pkgrel=5 pkgdesc="Fast, multi-platform web server with automatic HTTPS" url="https://caddyserver.com/" license="Apache-2.0" @@ -13,33 +13,37 @@ subpackages="$pkgname-openrc" pkgusers="$pkgname" pkggroups="$pkgname" install="$pkgname.pre-install" -source="https://github.com/caddyserver/caddy/archive/v$pkgver/caddy-$pkgver.tar.gz +source="https://github.com/caddyserver/caddy/releases/download/v$pkgver/caddy_${pkgver}_buildable-artifact.tar.gz $pkgname.initd Caddyfile " -options="net" # for downloading Go modules - export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" +builddir="$srcdir" + build() { - go build -o bin/caddy ./cmd/caddy + go build } check() { go test ./... + if [ "$(./bin/caddy --version)" = "unknown" ]; then + error "caddy built without version info" + return 1 + fi } package() { - install -Dm755 bin/caddy -t "$pkgdir"/usr/sbin/ + install -Dm755 caddy -t "$pkgdir"/usr/sbin/ install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -Dm644 "$srcdir"/Caddyfile -t "$pkgdir"/etc/$pkgname/ } sha512sums=" -ef0cb6fd7f6f2a296290b4bb520300e043ad31cc612e734632ffa25cdaa23fd7d601ac4ceaa1c76285d54a07ee773360f795103ef3c2ec79516a4f18a5e844b5 caddy-2.7.6.tar.gz +9c0f10f48562c43c532a5041b7aef7a6fab017bb9bdec66328e90ee0cf4fef290dd9c363fa0c984f2e35903e867097a2fae53341175c60a22313d1f5efb2fc45 caddy_2.7.6_buildable-artifact.tar.gz 5dec305ee9b51d59a25d2c9c02d6d4e60bfc83ce3329f750f3c7d59ff7b5a4e844b0d999fa989cdaa37dbf086fefe82aec9351b08620fe8da9818ececc1436f0 caddy.initd d3110dd79f7d5e602a34d42569104dc97603994e42daf5f6b105303a3d034b52b91ef5fb156d5bf7b7a3a58ec0aeff58afc402618d0555af053771952a866f76 Caddyfile " diff --git a/community/calendarsupport/APKBUILD b/community/calendarsupport/APKBUILD index 016632e1b98..d8a15bfda59 100644 --- a/community/calendarsupport/APKBUILD +++ b/community/calendarsupport/APKBUILD @@ -4,13 +4,14 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=calendarsupport -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 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=" @@ -56,5 +57,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -d935970af4c76621cc8351700b7290b5d43db846c50b99854c2286bc99a7bcd553ddb7d89322bb64517356abcaf3d75ed94511d04e4ce7453aa5a725a5a3d957 calendarsupport-24.02.2.tar.xz +8d582ecbc5649200522eb04eecc91bba1ceb2e1a81acb444cf25a4a99d6cd543c40419afd4eca9d2a97237948f05ef073af9eba726dff34733d64d1ac010113f calendarsupport-24.05.0.tar.xz " diff --git a/community/calindori/APKBUILD b/community/calindori/APKBUILD index 4e103fb3392..ad972210135 100644 --- a/community/calindori/APKBUILD +++ b/community/calindori/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=calindori -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Calendar for Plasma Mobile" # armhf blocked by qt6-qtdeclarative @@ -45,5 +45,5 @@ package() { } sha512sums=" -c3da8768e8e9606d29cb308f944366ad60bfd0b33d74bde41382568577d469fb3e3f4e806e0d081d5f361940a8844e7e94be24be579ab819fb9271e8c9bc459e calindori-24.02.2.tar.xz +0f6f66edc5ec76f3ac5a029d5e796c3540460f033dc759c4b14a21c8c14438accdd7d12998bcb11a541699f0d92753fa91ad9186b69da4ee67dcb2e9137ed980 calindori-24.05.0.tar.xz " diff --git a/community/cantor/APKBUILD b/community/cantor/APKBUILD index 0ed1a65dcec..7972f51eaa3 100644 --- a/community/cantor/APKBUILD +++ b/community/cantor/APKBUILD @@ -4,11 +4,11 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=cantor -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -61,5 +61,5 @@ package() { } sha512sums=" -98647569ef979a88941e5cd3e77653b36209b2c20333a9af4f369d4bf9d702d53bbe458bc6a935b99b8ed51e90437523ec9c9373ef180a06b34202806b31598b cantor-24.02.2.tar.xz +29e74495703494857b93c810cffd8fce1035b5376f1a21beb4b2f032c86e52e9f6be1549d640f754cb09d3a4e5748240a75274aac61d90f7ca830cb1d584aaec cantor-24.05.0.tar.xz " diff --git a/community/cargo-bloat/APKBUILD b/community/cargo-bloat/APKBUILD index d2a16e2fb45..8f9ace0c2d2 100644 --- a/community/cargo-bloat/APKBUILD +++ b/community/cargo-bloat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=cargo-bloat -pkgver=0.12.0 +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" @@ -31,5 +31,5 @@ package() { } sha512sums=" -ae28ee5a179745b76b358c39984184a6b36fa5e5486749f0c1e750b25fb75ac1745eefa5c6fae5b4200ce9e6304d29c075bee2f76cc549e921b385c56c5b0a03 cargo-bloat-0.12.0.tar.gz +cd9d196e9016d51798a9268e10fbec69472b91fe76df64fc8cdf47027914d2f15bf99902d105a80b9f86d117513c41d4b04a48275e61f34460e7d0677e816e59 cargo-bloat-0.12.1.tar.gz " diff --git a/community/cargo-edit/APKBUILD b/community/cargo-edit/APKBUILD index c5cff3c4d42..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 diff --git a/community/cargo-gra/APKBUILD b/community/cargo-gra/APKBUILD index ca41996dd4b..fdeb1261509 100644 --- a/community/cargo-gra/APKBUILD +++ b/community/cargo-gra/APKBUILD @@ -5,7 +5,8 @@ pkgver=0.6.0 pkgrel=0 pkgdesc="gtk-rust-app CLI for building Flatpak apps with ease" url="https://gitlab.com/floers/cargo-gra" -arch="all !s390x" # not interested in debugging issues on s390x +# loongarch64: fails to build nix crate on loongarch64 +arch="all !s390x !loongarch64" # not interested in debugging issues on s390x license="GPL-3.0-or-later" makedepends="cargo cargo-auditable" source="https://gitlab.com/floers/cargo-gra/-/archive/v$pkgver/cargo-gra-v$pkgver.tar.gz" diff --git a/community/cargo-modules/APKBUILD b/community/cargo-modules/APKBUILD index 2f751f4880f..965ba753a32 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.5 +pkgver=0.16.0 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=" -301d348c61a9d805d52e30cb8320aeab9e741e0bc91f1dc74ed683b6b3fe64276866200c4f7344a50a18e175766baad1ccb06d381ea72208a42e23312f3d65ad cargo-modules-0.15.5.tar.gz +a83c2d4e4861f5a5e9a3485d4373b7fd9f0d69b7ba6cb5cd34c91b8bf13cf179213438abf46d3ada376819ea8e4ac3c7e869e1febb37e532b89e74264ab09872 cargo-modules-0.16.0.tar.gz " diff --git a/community/cargo-release/APKBUILD b/community/cargo-release/APKBUILD index ffc4defb8f6..7f61b5ace1b 100644 --- a/community/cargo-release/APKBUILD +++ b/community/cargo-release/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=cargo-release -pkgver=0.25.6 +pkgver=0.25.7 pkgrel=0 pkgdesc="Everything about releasing a rust crate" url="https://github.com/crate-ci/cargo-release" @@ -30,5 +30,5 @@ package() { } sha512sums=" -519679e28ab95d7f2a6ae7b9d11a87c96b0ece4c8f712e07b5822a1bac08668dec7956e7d0ce8a642d00d3bbbfffd53bc9b820d92eb6c284435f849c0b34dc18 cargo-release-0.25.6.tar.gz +2fad0d243833d6badca9adb9619c116f5cf28088855cb784241281eaaf1bd8308f6236e210dd3156cf6f42f0ad46be91e7680e32e7a275afc3ec01c010ed02b9 cargo-release-0.25.7.tar.gz " diff --git a/community/catgirl/APKBUILD b/community/catgirl/APKBUILD index 2c78789319f..a90a3483b1e 100644 --- a/community/catgirl/APKBUILD +++ b/community/catgirl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: TBK <alpine@jjtc.eu> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=catgirl -pkgver=2.2 -pkgrel=3 +pkgver=2.2a +pkgrel=0 pkgdesc="TLS-only terminal IRC client" arch="all" url="https://git.causal.agency/catgirl/" @@ -25,5 +25,5 @@ package() { } sha512sums=" -a963a469635f5cc1c28112e35028ea2b550886ff9ca4fea82286ff3c5222f18c5271c4055fcd351b2fcdfbb41bd9e52d19854f81262591acdc90d992e49a3ede catgirl-2.2.tar.gz +988750c960630ec8314ebde7b9802f8b6a3087f733359f61f49c4f83cb6e327c03cde9ad88f2cb535d56ead1376cd121a7124c367c90394a6d4d7f80b25e329f catgirl-2.2a.tar.gz " diff --git a/community/celery/APKBUILD b/community/celery/APKBUILD index 3739ca317ca..42e5fa5eef7 100644 --- a/community/celery/APKBUILD +++ b/community/celery/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=celery pkgver=5.4.0 -pkgrel=0 +pkgrel=1 pkgdesc="An asynchronous task queue/job queue based on distributed message passing" url="http://www.celeryproject.org/" arch="noarch" @@ -73,5 +73,5 @@ package() { sha512sums=" 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 9e92749b4ff..439a7e43993 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=7 +pkgrel=8 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver pkgdesc="Ceph is a distributed object store and file system, version $_majorver" @@ -12,8 +12,8 @@ pkgusers="ceph" pkggroups="ceph" url="https://ceph.io/en/" # 32-bit: doesn't build ui + useless -# riscv64: doesn't build -arch="all !armhf !armv7 !x86 !riscv64" +# riscv64 and loongarch64: doesn't build +arch="all !armhf !armv7 !x86 !riscv64 !loongarch64" # https://github.com/ceph/ceph/blob/master/COPYING license="LGPL-2.1-only AND LGPL-2.0-or-later AND GPL-2.0-only AND GPL-3.0-only AND CC-BY-SA-1.0 AND BSL-1.0 AND GPL-2.0-or-later WITH Autoconf-exception-2.0 AND BSD-3-Clause AND MIT AND custom" depends="$pkgname-mds=$pkgver-r$pkgrel $pkgname-mgr=$pkgver-r$pkgrel $pkgname-mon=$pkgver-r$pkgrel $pkgname-osd=$pkgver-r$pkgrel" diff --git a/community/ceph18/APKBUILD b/community/ceph18/APKBUILD index b0e025eb389..bfb3d12de7e 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=3 +pkgrel=4 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver pkgdesc="Ceph is a distributed object store and file system, version $_majorver" diff --git a/community/cervisia/APKBUILD b/community/cervisia/APKBUILD index a9fbf861da4..57db737dc74 100644 --- a/community/cervisia/APKBUILD +++ b/community/cervisia/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=cervisia -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -45,5 +45,5 @@ package() { } sha512sums=" -62da0365344b70470cdc4c36c48a730121866b33c4a9aaa5a582f5c98a317c1cf2fe17d4283ba612776f54a96943f8983ae437bde9a3a8d1317ee204b5ec3c59 cervisia-24.02.2.tar.xz +fa7b48479a89b85aff96091e8e9fc8dc614e62082e66f44a0bad2cf92218c5cbb21903377ef8db85c8fdb3ac5051db2f26f63f7d665fefd9abd344e55f2cde48 cervisia-24.05.0.tar.xz " 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/chathistorysync/APKBUILD b/community/chathistorysync/APKBUILD index 49efdef0609..559522ef244 100644 --- a/community/chathistorysync/APKBUILD +++ b/community/chathistorysync/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Pedro Lucas Porcellis <porcellis@eletrotupi.com> pkgname=chathistorysync pkgver=0.2.0 -pkgrel=14 +pkgrel=15 pkgdesc="A tool for syncing IRC logs via the CHATHISTORY extension" url="https://sr.ht/~emersion/chathistorysync" arch="all" diff --git a/community/check-jsonschema/APKBUILD b/community/check-jsonschema/APKBUILD index 22b6554e3e7..119e172ae2d 100644 --- a/community/check-jsonschema/APKBUILD +++ b/community/check-jsonschema/APKBUILD @@ -1,8 +1,8 @@ # Contributor: 6543 <6543@obermui.de> # Maintainer: 6543 <6543@obermui.de> pkgname=check-jsonschema -pkgver=0.27.3 -pkgrel=1 +pkgver=0.28.4 +pkgrel=0 pkgdesc="A JSON Schema CLI built on jsonschema. The schema may be specified as a local or remote (HTTP or HTTPS) file" url="https://github.com/python-jsonschema/check-jsonschema" arch="all !s390x" # s390x is not supported because py3-regress is missing for that arch @@ -46,5 +46,5 @@ package() { } sha512sums=" -edc4ac65a13acd1a29c0ccf6498d3e6269d4509a72fde2ae5527a3c9236e3d2dbb4ba10cb47c0e228ac79b11dc73b1c80aa71b38f090c9eabf970fef0293993a check-jsonschema-0.27.3.tar.gz +f4c693ea0951c246814775f26d5c3e5de8020484a92ae15e2a13e284ccb2c58f2bdf7dbdb66612661304f5ff9e6ba88eb3f89e7f0ad23a3f6fc8fcc61372ceea check-jsonschema-0.28.4.tar.gz " diff --git a/community/chezmoi/APKBUILD b/community/chezmoi/APKBUILD index f866ba74b4e..c59347c0c4e 100644 --- a/community/chezmoi/APKBUILD +++ b/community/chezmoi/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=chezmoi -pkgver=2.48.0 -pkgrel=0 +pkgver=2.48.1 +pkgrel=1 pkgdesc="Manage your dotfiles across multiple machines, securely." url="https://www.chezmoi.io/" arch="all" @@ -57,6 +57,6 @@ doc() { } sha512sums=" -9c8b4de4d66b92de5cfcb870c8c0675364c200e34e7259db367b9e7b4433cbedbe51decd796212d33e1594e9510a173e5e6f65c8a553bb0dd9b1ceafca1b52a8 chezmoi-2.48.0.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 92e69e5e906..d09ba045016 100644 --- a/community/chromium/APKBUILD +++ b/community/chromium/APKBUILD @@ -3,9 +3,9 @@ # Contributor: Elly Fong-Jones <elly@elly.town> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=chromium -pkgver=124.0.6367.78 +pkgver=125.0.6422.112 pkgrel=0 -_copium_tag=124.6 +_copium_tag=125.0 # 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 @@ -146,14 +146,13 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/chrom pvalloc.patch random-fixes.patch quiche-array.patch - system-zstd.patch temp-failure-retry.patch yes-musl.patch " _copium_patches=" - cr124-fix-ozone-platform-hint.patch cr124-iwyu-sys-select-dawn-terminal.patch cr124-libwebp-shim-sharpyuv.patch + cr125-unbundle-add-zstd-replacement.patch " # chrome-sandbox can use suid when user namespaces aren't available, but uses only userns and drops privileges normally options="suid" @@ -525,6 +524,7 @@ prepare() { ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ # reusable system library settings + # flatbuffers - tensorflow has a few static_asserts for a specific patch version # libavif - https://github.com/AOMediaCodec/libavif/commit/50a541469c98009016af8dcc9f83a1be79f3a7d9 # libaom - https://aomedia.googlesource.com/aom/+/706ee36dcc82%5E%21/ # but watch this space: https://aomedia-review.googlesource.com/c/aom/+/188606 @@ -536,7 +536,6 @@ prepare() { double-conversion ffmpeg flac - flatbuffers fontconfig freetype harfbuzz-ng @@ -876,10 +875,10 @@ swiftshader() { } sha512sums=" -ff8d3161568875661ae343c40826dab62fc05e83c97a2d194da1b388d1ed3eaa233939c60df97a4dfc0857d3145c4db7779d3a34c65473880d8f9e15b6052629 chromium-124.0.6367.78.tar.xz -2285730acfd1d515c197d284739e56afadd00db13b2da5ec22341e2cdbaea58f3c949572774709389f405ef82c8966131819d7e89d4f34f9fa8b80aa66717748 chromium-124.0.6367.78-testdata.tar.xz +755fa9b0ddbe40eb37b21dc156ca9265036d6a5dc8b29f04abd9bc31de68cad32f5973ae9a3409f601a894335e1c811c0e40aaac796796e079df5e97d0538e09 chromium-125.0.6422.112.tar.xz +387ebe7dda983835825c949e8f77da3e8ea1d09ab6229133522f88dc20cc38eca85d87e4ff36475420a50656c43d1d5573966b25a94346bc4520502520f73646 chromium-125.0.6422.112-testdata.tar.xz bbc928e99ebcd4d953b982688b01526cb754bad018f67be9e777a4f8ac51cdd3e01374e5a63faf55b12e7cee0d52816c88062e012b5bcc4f9bb41f28d8e0b7f7 test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz -c6293916e1780ba69686a5c629063c14b22cb1773aa207487e46ee74f4d1da61b47fffb8b9a2bc6f389d062882d5a8f9212693ed9b28f2c314364bb5e3c08e20 copium-124.6.tar.gz +05284d7af82502127cff6f2e5c7cbac30147152a74ee1ed79684a27b119f3fb50d3d3759dade63f7775f48d9ef12a425bf4fcea2a38feafdc059cdaf347b2845 copium-125.0.tar.gz 1b16564f85a03f3eb934ec51289dc6159e2454202d40f48354f947d6ceffac8889e9eb4c0f4dfaafb3a15101566d54039f832bc9a8433c3c463e2d1dac2d2acc chromium-launcher.sh 9cfcb41d69c5a515b6f9fe2a629579fa499e1f48eb58a0ce4ec8e5029d450bcafb6d963019aaac9a6838244bee9f9ba7fe5ef6146a0ca6b20fcda4ab7f059476 chromium.conf 2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac google-api.keys @@ -900,7 +899,7 @@ e75f57ae34c97ca1caf15fa4b4106c6c1e79c31ed66869cf92ed9ea0c449886c9511e455047c17c1 50c274a420bb8a7f14fcb56e40920dac8f708792a4520789b4987facea459bef88113d5a2b60fa8c57bee6e92bff3617d6b73fa305c8c44614c638971cffd440 musl-sandbox.patch e7163ac5810ac85366cef2447412287c856e3d67c6b77f219a6e5a418b1965b98e449c409424ad0704a5bded9355dd0aec3dc4585918ce5a2ab36c079707afe2 musl-tid-caching.patch 92eb002718026611f5542362ad69b67f0a398ff71b3fca5c05d55cb5c6f9f29334e5e127bb4860cfaa3fba0f0d4c901e2b98808217e7dc02e254a64a5c9521aa musl-v8-monotonic-pthread-cont_timedwait.patch -73bca6c6f9873f2f11cef04f3f41f71e0ae86e7e2d77e14db4298675fec390744c5081f6fdb14052e5ee2b5885be1198c3aa6068eb2b656d1a665c0c3f36e708 no-execinfo.patch +a250cff50d282b02ce0f28880d0a2b4fb8e7df51bc072bfeeddc561c29a7c76453dbcbc7b17b82966a7b30a31409d2555720d1dcf963e1b3fb8a2a06a6abcf46 no-execinfo.patch 8e17101d69e23b456a9c03dc2fe95bcd56846389707ba6f4720192a9e9168406d20d9168dbebbb3a47d921ec92e478f0e390f46e6b9bb43a34dda217c6e6448b no-mallinfo.patch e4c4e5bc6f828f9c883dd418c0ba01887949c29c311f76206a1ec29f620b0c0ba0452949dc2778a9c46ea066405857536964a36436a68eecf7da7952736333cf no-res-ninit-nclose.patch 6dc4d8dc92e685dace62265a1ddb3aebc558aed54d20ff6d36b030be0c48d7e84662326c31363612492574d9a03c62653cdc21a60995b97dee1d75cae86a9f9b no-sandbox-settls.patch @@ -909,7 +908,6 @@ d4ac7f350806b4410ccb1df3b0ad7e90a7b6d724a16919761aa2d47a6f21008c7374da528b05b754 2eb434b4fc6aee77026492644cd86772a543d9845f112a75cd4c3e1f25c9435cc31f8454c1c73223451fc9be69b86e822ff68821978f67f2fc8bcba50296d8e0 pvalloc.patch 803b8117c65132f76bec42054a4b2257a078b15b07fd08645fec2dfd51aa4e0075a9015300cd579d4ae0d757d9850b9988e080cfc2eea093f6684fdf82c4722c random-fixes.patch 86f612dd2b39602984a75b1b11c2ab8bc8cc6b4e78fae998570a777a6901ae45fdcdb22e46dd006dab703a0674e64c72cf8120af2dc5b9e78004f402c7e65358 quiche-array.patch -b3beb98b539fe160fbc493ba410ae0f68540cc4b6834f1f8ce9a22c3f4f59ef5d583ad48793e10549fd02a701f833a3969791ef4524322cd1e715ca5bf226bc8 system-zstd.patch e48693e6b7aeebf69a5acbf80d9a35defe4c23835121dfeb58b051ac7c527e758a41004f4d193274fe1b01c0bfb1dbc77b09cb6a404a3fdee507a2918afb0edb temp-failure-retry.patch 914ccf649d7771f19f209ab97f99c481aebc6f66174d68e8b539f6ad4a70bc8cb0fae2df6dadbf0415958ffb3574c420fe029079dcce45f5e5add4db2e903566 yes-musl.patch " diff --git a/community/chromium/no-execinfo.patch b/community/chromium/no-execinfo.patch index b1705f5d85f..12064bad0a3 100644 --- a/community/chromium/no-execinfo.patch +++ b/community/chromium/no-execinfo.patch @@ -37,16 +37,16 @@ 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 -@@ -291,7 +291,7 @@ - } - std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { +@@ -311,7 +311,7 @@ + + std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const { std::stringstream stream; -#if !defined(__UCLIBC__) && !defined(_AIX) +#if defined(__GLIBC__) && !defined(_AIX) - if (ShouldSuppressOutput()) { - return "Backtrace suppressed."; - } -@@ -301,7 +301,7 @@ + OutputToStreamWithPrefix(&stream, prefix_string); + #endif + return stream.str(); +@@ -335,7 +335,7 @@ } std::ostream& operator<<(std::ostream& os, const StackTrace& s) { diff --git a/community/chromium/system-zstd.patch b/community/chromium/system-zstd.patch deleted file mode 100644 index 0fcd3efc3a0..00000000000 --- a/community/chromium/system-zstd.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ae3ae3711784865bdc38bf119a6182a7b8dae91c Mon Sep 17 00:00:00 2001 -From: Matt Jolly <Matt.Jolly@footclan.ninja> -Date: Sun, 17 Sep 2023 16:51:42 +1000 -Subject: [PATCH] Add system-zstd - ---- a/build/linux/unbundle/replace_gn_files.py -+++ b/build/linux/unbundle/replace_gn_files.py -@@ -74,6 +74,7 @@ REPLACEMENTS = { - # - 'woff2': 'third_party/woff2/BUILD.gn', - 'zlib': 'third_party/zlib/BUILD.gn', -+ 'zstd': 'third_party/zstd/BUILD.gn', - } - - ---- /dev/null -+++ b/build/linux/unbundle/zstd.gn -@@ -0,0 +1,25 @@ -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") -+ -+pkg_config("system_zstd") { -+ packages = [ "libzstd" ] -+} -+ -+shim_headers("zstd_shim") { -+ root_path = "src/lib" -+ headers = [ -+ "zdict.h", -+ "zstd.h", -+ "zstd_errors.h", -+ ] -+} -+ -+source_set("zstd") { -+ deps = [ ":zstd_shim" ] -+ public_configs = [ ":system_zstd" ] -+} -+ -+source_set("decompress") { -+ deps = [ ":zstd_shim" ] -+ public_configs = [ ":system_zstd" ] -+} --- -2.42.0 - diff --git a/community/clipman/APKBUILD b/community/clipman/APKBUILD index 8c55484d3fe..72b956c3778 100644 --- a/community/clipman/APKBUILD +++ b/community/clipman/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Galen Abell <galen@galenabell.com> pkgname=clipman pkgver=1.6.4 -pkgrel=0 +pkgrel=1 pkgdesc="A simple clipboard manager for Wayland" url="https://github.com/chmouel/clipman" arch="all" diff --git a/community/cloudi/APKBUILD b/community/cloudi/APKBUILD index 5ed89649c7b..e64eadaeb7d 100644 --- a/community/cloudi/APKBUILD +++ b/community/cloudi/APKBUILD @@ -29,7 +29,7 @@ pkgname=cloudi pkgver=2.0.7 -pkgrel=7 +pkgrel=8 pkgdesc="Cloud computing framework for efficient, scalable, and stable soft-realtime event processing." url="https://cloudi.org/" license="MIT" diff --git a/community/cmus/1172.patch b/community/cmus/1172.patch deleted file mode 100644 index 0abc5dc31c7..00000000000 --- a/community/cmus/1172.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 8d754c1c0664dfe7caaf7d571710f74ae19b0f01 Mon Sep 17 00:00:00 2001 -From: Erfan Khadem <erfankhademerkh@gmail.com> -Date: Tue, 15 Feb 2022 14:50:41 +0330 -Subject: [PATCH 1/2] Fixed hanging on exit for pipewire - ---- - op/pulse.c | 28 +++++++++++++++++++++++++++- - 1 file changed, 27 insertions(+), 1 deletion(-) - -diff --git a/op/pulse.c b/op/pulse.c -index c8a6d6a4..c785bfc3 100644 ---- a/op/pulse.c -+++ b/op/pulse.c -@@ -17,7 +17,9 @@ - */ - - #include <string.h> -+#include <stdbool.h> - -+#include <pulse/introspect.h> - #include <pulse/pulseaudio.h> - - #include "../op.h" -@@ -33,6 +35,8 @@ static pa_channel_map pa_cmap; - static pa_cvolume pa_vol; - static pa_sample_spec pa_ss; - -+static bool is_pipewire = false; -+ - static int mixer_notify_in; - static int mixer_notify_out; - -@@ -175,6 +179,20 @@ static void _pa_sink_input_info_cb(pa_context *c, - } - } - -+static void _pa_server_info_cb(pa_context *c, -+ const pa_server_info *i, -+ void *data) -+{ -+ is_pipewire = false; -+ if (i) { -+ if (strstr(i->server_name, "PipeWire") != NULL) { -+ // server is PipeWire -+ d_print("Pulseaudio server is pipewire. Disabling _pa_stream_drain()\n"); -+ is_pipewire = true; -+ } -+ } -+} -+ - static void _pa_stream_success_cb(pa_stream *s, int success, void *data) - { - pa_threaded_mainloop_signal(pa_ml, 0); -@@ -246,6 +264,10 @@ static int _pa_stream_cork(int pause_) - - static int _pa_stream_drain(void) - { -+ if (is_pipewire) { -+ return OP_ERROR_SUCCESS; -+ } -+ - pa_threaded_mainloop_lock(pa_ml); - - return _pa_wait_unlock(pa_stream_drain(pa_s, _pa_stream_success_cb, NULL)); -@@ -422,6 +444,8 @@ static int op_pulse_open(sample_format_t sf, const channel_position_t *channel_m - pa_context_get_sink_input_info(pa_ctx, pa_stream_get_index(pa_s), - _pa_sink_input_info_cb, NULL); - -+ pa_context_get_server_info(pa_ctx, _pa_server_info_cb, NULL); -+ - pa_threaded_mainloop_unlock(pa_ml); - - return OP_ERROR_SUCCESS; -@@ -440,8 +464,10 @@ static int op_pulse_close(void) - * If this _pa_stream_drain() will be moved below following - * pa_threaded_mainloop_lock(), PulseAudio 0.9.19 will hang. - */ -- if (pa_s) -+ -+ if (pa_s && !is_pipewire){ - _pa_stream_drain(); -+ } - - pa_threaded_mainloop_lock(pa_ml); - - -From 58ef25fe9125584884598bc29f50bcd83239a7b5 Mon Sep 17 00:00:00 2001 -From: Erfan Khadem <erfankhademerkh@gmail.com> -Date: Mon, 27 Jun 2022 11:34:52 +0430 -Subject: [PATCH 2/2] Fix formatting - ---- - op/pulse.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/op/pulse.c b/op/pulse.c -index c785bfc3..78ec0661 100644 ---- a/op/pulse.c -+++ b/op/pulse.c -@@ -35,7 +35,7 @@ static pa_channel_map pa_cmap; - static pa_cvolume pa_vol; - static pa_sample_spec pa_ss; - --static bool is_pipewire = false; -+static bool is_pipewire = false; - - static int mixer_notify_in; - static int mixer_notify_out; -@@ -180,8 +180,8 @@ static void _pa_sink_input_info_cb(pa_context *c, - } - - static void _pa_server_info_cb(pa_context *c, -- const pa_server_info *i, -- void *data) -+ const pa_server_info *i, -+ void *data) - { - is_pipewire = false; - if (i) { -@@ -264,10 +264,6 @@ static int _pa_stream_cork(int pause_) - - static int _pa_stream_drain(void) - { -- if (is_pipewire) { -- return OP_ERROR_SUCCESS; -- } -- - pa_threaded_mainloop_lock(pa_ml); - - return _pa_wait_unlock(pa_stream_drain(pa_s, _pa_stream_success_cb, NULL)); diff --git a/community/cmus/APKBUILD b/community/cmus/APKBUILD index d7d0dd9592a..d4abfa714f1 100644 --- a/community/cmus/APKBUILD +++ b/community/cmus/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgname=cmus -pkgver=2.10.0 -pkgrel=7 +pkgver=2.11.0 +pkgrel=0 pkgdesc="feature-rich ncurses-based music player" url="https://cmus.github.io/" arch="all" @@ -30,8 +30,6 @@ subpackages=" $pkgname-bash-completion " source="$pkgname-$pkgver.tar.gz::https://github.com/cmus/cmus/archive/v$pkgver.tar.gz - ffmpeg6.patch - 1172.patch cmus.desktop " @@ -55,8 +53,6 @@ package() { } sha512sums=" -c055dc974a88f32c7f19fb2e4260ede37fbddc3f23707a98e7f669032c1b4fd9a1032eb5c808cf5ee635617d3abf176e78d1e8596cbe669bbad95cd5c50dde7c cmus-2.10.0.tar.gz -a8dc2e8e51020289ea4be227b9265297024da6ef3c79b666b8ea381fe413053354229d4ecfe45daa7b3e676c9c5f87525663266f840f21a462fbb91daf8ec68f ffmpeg6.patch -f4d1e27bfbedd0f34b8852c7ca36d52d86d3b09cbe8b06ea709323d0d7a94e02135ac4c563f8bf311ffcccd23333350a19c6fa81c617e355c3d067072e9e2356 1172.patch +370c8eea6e67b328befb24d98ef3945fabc65b33d0bb9ae09cedd1c453b18a307061c042b2119f37f3684a4a39b86b3535efaa2c955e58c8e680628ef0a03452 cmus-2.11.0.tar.gz 1adaaab23d9e74ac086ad74ecb8cac335c966b8321abf164d424148920f072020ea23406b0577f109f8bcf41dd27ce2b66f00a050a7341745df98559bb384725 cmus.desktop " diff --git a/community/cmus/ffmpeg6.patch b/community/cmus/ffmpeg6.patch deleted file mode 100644 index f5dac49d45e..00000000000 --- a/community/cmus/ffmpeg6.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/FFmpeg/FFmpeg/commit/dd846bc4a9163f875cc2c4e99325c1a7b4ab8e7d -diff --git a/ip/ffmpeg.c b/ip/ffmpeg.c -index 09ed3fc..ea0b26f 100644 ---- a/ip/ffmpeg.c -+++ b/ip/ffmpeg.c -@@ -202,9 +202,6 @@ static int ffmpeg_open(struct input_plugin_data *ip_data) - break; - } - -- if (codec->capabilities & AV_CODEC_CAP_TRUNCATED) -- cc->flags |= AV_CODEC_FLAG_TRUNCATED; -- - if (avcodec_open2(cc, codec, NULL) < 0) { - d_print("could not open codec: %d, %s\n", cc->codec_id, avcodec_get_name(cc->codec_id)); - err = -IP_ERROR_UNSUPPORTED_FILE_TYPE; diff --git a/community/cni-plugin-flannel/APKBUILD b/community/cni-plugin-flannel/APKBUILD index d7e10069a84..71e04b7b094 100644 --- a/community/cni-plugin-flannel/APKBUILD +++ b/community/cni-plugin-flannel/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Lucas Ramage <lucas.ramage@infinite-omicron.com> pkgname=cni-plugin-flannel pkgver=1.1.2 -pkgrel=9 +pkgrel=10 pkgdesc="networking plugin, designed to work with flannel network fabric" url="https://github.com/flannel-io/cni-plugin/" arch="all" diff --git a/community/cni-plugins/APKBUILD b/community/cni-plugins/APKBUILD index de1e2458a48..af2821c444e 100644 --- a/community/cni-plugins/APKBUILD +++ b/community/cni-plugins/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=cni-plugins pkgver=1.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Some standard networking plugins, maintained by the CNI team" options="!check" url="https://www.cni.dev/" diff --git a/community/codeblocks/APKBUILD b/community/codeblocks/APKBUILD index e9cffa73b4a..219d0b942b6 100644 --- a/community/codeblocks/APKBUILD +++ b/community/codeblocks/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Antoni Aloy <aaloytorrens@gmail.com> pkgname=codeblocks pkgver=20.03 -pkgrel=6 +pkgrel=8 pkgdesc="Cross-platform C/C++ and Fortran IDE" url="https://codeblocks.org" # riscv64: ftbfs @@ -26,19 +26,19 @@ source="https://sourceforge.net/projects/codeblocks/files/Sources/$pkgver/codebl gcc11.patch make-order.patch wxwidgets-3.2.patch - $pkgname-wxwidgets-3.2-01.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/2345b020b862ec855038dd32a51ebb072647f28d.patch - $pkgname-wxwidgets-3.2-02.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/40eb88e3f2b933f19f9933e06c8d0899c54f5e25.patch - $pkgname-wxwidgets-3.2-03.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/56ac0396fad7a5b4bbb40bb8c4b5fe1755078aef.patch - $pkgname-wxwidgets-3.2-04.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/a4aacc92640b587ad049cd6aa68c637e536e9ab5.patch - $pkgname-wxwidgets-3.2-05.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/f2f127cf5cd97c7da6a957a3f7764cb25cc9017e.patch - $pkgname-wxwidgets-3.2-06.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/dbdf5c5ea9e3161233f0588a7616b7e4fedc7870.patch - $pkgname-wxwidgets-3.2-07.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/04b7c50fb8c6a29b2d84579ee448d2498414d855.patch - $pkgname-wxwidgets-3.2-08.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/8035dfdff321754819f79e3165401aa59bd8c7f7.patch - $pkgname-wxwidgets-3.2-09.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/9a9c6a9d5e3e0f6eff5594ecd61a2222f073be9c.patch - $pkgname-wxwidgets-3.2-10.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/c28746f4887f10e6f9f10eeafae0fb22ecdbf9c7.patch - $pkgname-wxwidgets-3.2-11.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/b2e4f1279804e1d11b71bc75eeb37072c3589296.patch - $pkgname-wxwidgets-3.2-12.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/29315df024251850832583f73e67e515dae10830.patch - $pkgname-wxwidgets-3.2-13.patch::https://github.com/arnholm/codeblocks_sfmirror/commit/46720043319758cb0e798eb23520063583c40eaa.patch + codeblocks-wxwidgets-3.2-01.patch + codeblocks-wxwidgets-3.2-02.patch + codeblocks-wxwidgets-3.2-03.patch + codeblocks-wxwidgets-3.2-04.patch + codeblocks-wxwidgets-3.2-05.patch + codeblocks-wxwidgets-3.2-06.patch + codeblocks-wxwidgets-3.2-07.patch + codeblocks-wxwidgets-3.2-08.patch + codeblocks-wxwidgets-3.2-09.patch + codeblocks-wxwidgets-3.2-10.patch + codeblocks-wxwidgets-3.2-11.patch + codeblocks-wxwidgets-3.2-12.patch + codeblocks-wxwidgets-3.2-13.patch " options="!check" # No test suite patch_args="-p1 -F3" diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-01.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-01.patch new file mode 100644 index 00000000000..551d70f9749 --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-01.patch @@ -0,0 +1,45 @@ +From 2345b020b862ec855038dd32a51ebb072647f28d Mon Sep 17 00:00:00 2001 +From: fuscated <fuscated@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Sun, 22 Mar 2020 20:02:49 +0000 +Subject: [PATCH] - build: Fixes to make it compile when using wx-master + +> Paint events aren't no longer allowed to be created. We've used this in a + single place in the code. I'm not sure what is the idea behind this, + probably to redraw something. For now I'm removing it and we'll see if + something breaks. +> The second change is the removal of a c-tor in wxPGWindowList, I've + replaced it with the non-generic two parameter one. + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@11991 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + src/src/main.cpp | 2 -- + src/src/watchesdlg.cpp | 3 +-- + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/src/main.cpp b/src/src/main.cpp +index 7d0b317eb2..3234577610 100644 +--- a/src/src/main.cpp ++++ b/src/src/main.cpp +@@ -2680,8 +2680,6 @@ bool MainFrame::OnDropFiles(wxCoord /*x*/, wxCoord /*y*/, const wxArrayString& f + else + { + wxBusyCursor useless; +- wxPaintEvent e; +- ProcessEvent(e); + for (unsigned int i = 0; i < files.GetCount(); ++i) + success &= OpenGeneric(files[i]); + } +diff --git a/src/src/watchesdlg.cpp b/src/src/watchesdlg.cpp +index 9ff3e8655f..ca4fd979ab 100644 +--- a/src/src/watchesdlg.cpp ++++ b/src/src/watchesdlg.cpp +@@ -103,8 +103,7 @@ class cbDummyEditor : public wxPGEditor + cb_unused const wxPoint& pos, + cb_unused const wxSize& sz) const override + { +- wxPGWindowList const list; +- return list; ++ return wxPGWindowList(nullptr, nullptr); + } + void UpdateControl(cb_unused wxPGProperty* property, cb_unused wxWindow* ctrl) const override {} + bool OnEvent(cb_unused wxPropertyGrid* propgrid, cb_unused wxPGProperty* property, diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-02.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-02.patch new file mode 100644 index 00000000000..0e8433a4cad --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-02.patch @@ -0,0 +1,213 @@ +From 40eb88e3f2b933f19f9933e06c8d0899c54f5e25 Mon Sep 17 00:00:00 2001 +From: mortenmacfly <mortenmacfly@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Sat, 4 Jan 2020 15:41:53 +0000 +Subject: [PATCH] * applied patch #805: Flashing icons in Windows' taskbar + while starting C::B. Thanks Miguel Gimenez. + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@11938 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + src/include/compiler.h | 15 +-- + src/plugins/compilergcc/compilerMINGW.cpp | 13 +-- + src/sdk/compiler.cpp | 106 +++++++++++++++++++--- + 3 files changed, 104 insertions(+), 30 deletions(-) + +diff --git a/src/include/compiler.h b/src/include/compiler.h +index f151ef62f6..8d18c8ffca 100644 +--- a/src/include/compiler.h ++++ b/src/include/compiler.h +@@ -100,12 +100,12 @@ struct RegExStruct + } + RegExStruct& operator=(const RegExStruct &obj) + { +- desc=obj.desc; +- lt=obj.lt; +- regex=obj.regex; +- regexCompiled=false; +- filename=obj.filename; +- line=obj.line; ++ desc = obj.desc; ++ lt = obj.lt; ++ regex = obj.regex; ++ regexCompiled = false; ++ filename = obj.filename; ++ line = obj.line; + memcpy(msg, obj.msg, sizeof(msg)); + + return *this; +@@ -404,6 +404,9 @@ class DLLIMPORT Compiler : public CompileOptionsBase + // keeps a copy of current settings (works only the first time it's called) + void MirrorCurrentSettings(); + ++ // execute without creating taskbar icon ++ long Execute(const wxString& cmd, wxArrayString& output); ++ + // set the following members in your class + wxString m_Name; + wxString m_MasterPath; +diff --git a/src/plugins/compilergcc/compilerMINGW.cpp b/src/plugins/compilergcc/compilerMINGW.cpp +index 1c6cd88a7d..5f5509229e 100644 +--- a/src/plugins/compilergcc/compilerMINGW.cpp ++++ b/src/plugins/compilergcc/compilerMINGW.cpp +@@ -173,7 +173,7 @@ void CompilerMINGW::SetVersionString() + { + // Manager::Get()->GetLogManager()->DebugLog(_T("Compiler detection for compiler ID: '") + GetID() + _T("' (parent ID= '") + GetParentID() + _T("')")); + +- wxArrayString output, errors; ++ wxArrayString output; + wxString sep = wxFileName::GetPathSeparator(); + wxString master_path = m_MasterPath; + wxString compiler_exe = m_Programs.C; +@@ -223,16 +223,7 @@ void CompilerMINGW::SetVersionString() + + // Manager::Get()->GetLogManager()->DebugLog(_T("Compiler version detection: Issuing command: ") + gcc_command); + +- int flags = wxEXEC_SYNC; +-#if wxCHECK_VERSION(3, 0, 0) +- // Stop event-loop while wxExecute runs, to avoid a deadlock on startup, +- // that occurs from time to time on wx3 +- flags |= wxEXEC_NOEVENTS; +-#else +- flags |= wxEXEC_NODISABLE; +-#endif +- long result = wxExecute(gcc_command + _T(" --version"), output, errors, flags ); +- if(result != 0) ++ if ( Execute(gcc_command + _T(" --version"), output) != 0 ) + { + // Manager::Get()->GetLogManager()->DebugLog(_T("Compiler version detection: Error executing command.")); + } +diff --git a/src/sdk/compiler.cpp b/src/sdk/compiler.cpp +index b356de3821..c80bbbd615 100644 +--- a/src/sdk/compiler.cpp ++++ b/src/sdk/compiler.cpp +@@ -20,7 +20,9 @@ + #include "compilerfactory.h" + + #include <wx/intl.h> ++ #include <wx/process.h> + #include <wx/regex.h> ++ #include <wx/txtstrm.h> + #endif + + #include "compilercommandgenerator.h" +@@ -28,7 +30,6 @@ + #include <wx/filefn.h> + #include <wx/xml/xml.h> + +- + // static + wxArrayString Compiler::m_CompilerIDs; // map to guarantee unique IDs + +@@ -1229,18 +1230,7 @@ bool Compiler::EvalXMLCondition(const wxXmlNode* node) + + long ret = -1; + if ( !cmd[0].IsEmpty() ) // should never be empty +- { +- int flags = wxEXEC_SYNC; +- #if wxCHECK_VERSION(3, 0, 0) +- // Stop event-loop while wxExecute runs, to avoid a deadlock on startup, +- // that occurs from time to time on wx3 +- flags |= wxEXEC_NOEVENTS; +- #else +- flags |= wxEXEC_NODISABLE; +- #endif +- wxLogNull logNo; // do not warn if execution fails +- ret = wxExecute(GetStringFromArray(cmd, wxT(" "), false), cmd, flags); +- } ++ ret = Execute(GetStringFromArray(cmd, wxT(" "), false), cmd); + + if (ret != 0) // execution failed + val = (node->GetAttribute(wxT("default"), wxEmptyString) == wxT("true")); +@@ -1284,3 +1274,93 @@ wxString Compiler::GetExecName(const wxString& name) + ret = m_Programs.MAKE; + return ret; + } ++ ++#ifdef __WXMSW__ ++ ++// In MSW calling wxExecute in synchronous mode while the main window is not visible makes ++// the system show a C::B icon in the taskbar. When this is made repeatedly (as in compiler ++// loading) the result is a stream of flashing icons. ++// However, wxExecute in asynchronous mode does not do this. The caveat is that we must wait ++// in a loop for the end of the task and extract the command output in a separate step. ++ ++// This auxiliary class is needed for detecting the end of the task and retrieving the ouput. ++// OnTerminate() will be called when the task ends with the return code of the task, and then ++// the task output can be retrieved (as a stream). ++ ++class ExecProcess : public wxProcess ++{ ++ public: ++ ExecProcess(cb_unused wxEvtHandler *parent = NULL, cb_unused int id = -1) ++ { ++ m_status = 0; ++ } ++ ++ long GetStatus() const {return m_status;} ++ wxSemaphore &GetSemaphore() {return m_semaphore;} ++ void OnTerminate(cb_unused int pid, int status) ++ { ++ m_status = status; ++ m_semaphore.Post(); ++ } ++ ++ protected: ++ long m_status; ++ wxSemaphore m_semaphore; ++}; ++ ++// Emulates wxExecute() in synchronous mode using asynchronous mode ++ ++long Compiler::Execute(const wxString &cmd, wxArrayString &output) ++{ ++ wxLogNull logNo; // do not warn if execution fails ++ ++ output.Clear(); ++ ++ ExecProcess process; ++ process.Redirect(); // capture task input/output streams ++ ++ // wxExecute in asynchronous mode returns 0 if execution failed. ++ // Return -1 emulating the behaviour of wxExecute in synchronous mode ++ if ( !wxExecute(cmd, wxEXEC_ASYNC, &process) ) ++ return -1; ++ ++ // Wait for the end of the task ++ for (;;) ++ { ++ Manager::Yield(); // needed for semaphore update ++ if (process.GetSemaphore().WaitTimeout(25) == wxSEMA_NO_ERROR) ++ break; ++ } ++ ++ // Loads the wxArrayString with the task output (returned in a wxInputStream) ++ wxInputStream *inputStream = process.GetInputStream(); ++ wxTextInputStream text(*inputStream); ++#if wxCHECK_VERSION(3, 0, 0) ++ while (!text.GetInputStream().Eof()) ++#else ++ while (!inputStream->Eof()) ++#endif ++ { ++ output.Add(text.ReadLine()); ++ } ++ ++ // Return task exit code emulating the behaviour of wxExecute in synchronous mode ++ return process.GetStatus(); ++} ++ ++#else // __WXMSW__ ++ ++long Compiler::Execute(const wxString &cmd, wxArrayString &output) ++{ ++ wxLogNull logNo; // do not warn if execution fails ++ int flags = wxEXEC_SYNC; ++ #if wxCHECK_VERSION(3, 0, 0) ++ // Stop event-loop while wxExecute runs, to avoid a deadlock on startup, ++ // that occurs from time to time on wx3 ++ flags |= wxEXEC_NOEVENTS; ++ #else ++ flags |= wxEXEC_NODISABLE; ++ #endif ++ return wxExecute(cmd, output, flags); ++} ++#endif // __WXMSW__ diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-03.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-03.patch new file mode 100644 index 00000000000..99384a6ae2b --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-03.patch @@ -0,0 +1,3215 @@ +From 56ac0396fad7a5b4bbb40bb8c4b5fe1755078aef Mon Sep 17 00:00:00 2001 +From: fuscated <fuscated@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Wed, 29 Jul 2020 21:09:40 +0000 +Subject: [PATCH] * build: Fix many -Wsuggest-override warnings for the core + and core plugins + +> This warning is emitted by GCC starting with version 5.1. + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12190 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + src/include/cbauibook.h | 4 +- + src/plugins/abbreviations/abbreviations.h | 12 +- + .../abbreviations/abbreviationsconfigpanel.h | 10 +- + src/plugins/astyle/astyleconfigdlg.h | 8 +- + src/plugins/autosave/autosave.h | 20 +-- + src/plugins/classwizard/classwizard.h | 8 +- + src/plugins/codecompletion/ccoptionsdlg.h | 10 +- + src/plugins/codecompletion/ccoptionsprjdlg.h | 10 +- + src/plugins/codecompletion/cctreectrl.h | 2 +- + .../classbrowserbuilderthread.h | 4 +- + src/plugins/codecompletion/codecompletion.h | 34 ++--- + src/plugins/codecompletion/parser/parser.h | 43 +++--- + .../codecompletion/parser/parserthread.h | 2 +- + .../parser/parserthreadedtask.h | 4 +- + .../codecompletion/parser/searchtree.h | 8 +- + .../codecompletion/systemheadersthread.h | 4 +- + .../compilergcc/advancedcompileroptionsdlg.h | 4 +- + src/plugins/compilergcc/compilerCYGWIN.h | 6 +- + src/plugins/compilergcc/compilerG95.h | 6 +- + src/plugins/compilergcc/compilerGDC.h | 6 +- + src/plugins/compilergcc/compilerGNUARM.h | 6 +- + src/plugins/compilergcc/compilerGNUFortran.h | 6 +- + src/plugins/compilergcc/compilerIAR.h | 6 +- + src/plugins/compilergcc/compilerICC.h | 6 +- + src/plugins/compilergcc/compilerKeilC51.h | 10 +- + src/plugins/compilergcc/compilerLCC.h | 10 +- + src/plugins/compilergcc/compilerMINGW.h | 10 +- + src/plugins/compilergcc/compilerMSVC.h | 6 +- + src/plugins/compilergcc/compilerMSVC10.h | 6 +- + src/plugins/compilergcc/compilerMSVC8.h | 6 +- + src/plugins/compilergcc/compilerOW.h | 12 +- + src/plugins/compilergcc/compilerXML.h | 6 +- + src/plugins/compilergcc/compilerflagdlg.h | 4 +- + src/plugins/compilergcc/compilergcc.h | 58 ++++---- + src/plugins/compilergcc/compilermessages.h | 8 +- + src/plugins/compilergcc/compileroptionsdlg.h | 10 +- + src/plugins/debuggergdb/cdb_commands.h | 34 ++--- + src/plugins/debuggergdb/cdb_driver.h | 95 ++++++------- + src/plugins/debuggergdb/debugger_defs.h | 40 +++--- + src/plugins/debuggergdb/debuggergdb.h | 132 +++++++++--------- + src/plugins/debuggergdb/debuggeroptionsdlg.h | 6 +- + .../debuggergdb/debuggeroptionsprjdlg.h | 10 +- + src/plugins/debuggergdb/editbreakpointdlg.h | 4 +- + src/plugins/debuggergdb/editwatchdlg.h | 4 +- + src/plugins/debuggergdb/gdb_commands.h | 66 ++++----- + src/plugins/debuggergdb/gdb_driver.h | 110 +++++++-------- + .../defaultmimehandler/defaultmimehandler.h | 16 +-- + .../defaultmimehandler/editmimetypesdlg.h | 10 +- + .../occurrenceshighlighting.h | 19 +-- + ...ccurrenceshighlightingconfigurationpanel.h | 10 +- + .../openfileslist/openfileslistplugin.h | 10 +- + src/plugins/projectsimporter/devcpploader.h | 6 +- + src/plugins/projectsimporter/msvc10loader.h | 6 +- + src/plugins/projectsimporter/msvc7loader.h | 6 +- + .../projectsimporter/msvc7workspaceloader.h | 6 +- + src/plugins/projectsimporter/msvcloader.h | 6 +- + .../projectsimporter/msvcworkspaceloader.h | 6 +- + .../projectsimporter/projectsimporter.h | 10 +- + src/plugins/scriptedwizard/projectpathpanel.h | 6 +- + src/plugins/scriptedwizard/wiz.h | 20 +-- + src/plugins/scriptedwizard/wizpage.h | 38 ++--- + src/plugins/todo/addtododlg.h | 3 +- + src/plugins/todo/todolist.h | 13 +- + src/plugins/todo/todolistview.h | 4 +- + src/plugins/todo/todosettingsdlg.h | 10 +- + src/src/app.cpp | 2 +- + src/src/app.h | 10 +- + src/src/backtracedlg.h | 6 +- + src/src/batchbuild.h | 2 +- + src/src/breakpointsdlg.h | 14 +- + src/src/compilersettingsdlg.h | 4 +- + src/src/cpuregistersdlg.h | 9 +- + src/src/debugger_interface_creator.h | 36 ++--- + src/src/debuggermenu.h | 12 +- + src/src/disassemblydlg.h | 20 +-- + src/src/editorconfigurationdlg.h | 2 +- + src/src/environmentsettingsdlg.h | 4 +- + src/src/examinememorydlg.h | 22 +-- + src/src/notebookstyles.h | 12 +- + src/src/printdlg.h | 4 +- + src/src/projectdepsdlg.h | 4 +- + src/src/projectmanagerui.h | 43 +++--- + src/src/projectoptionsdlg.h | 4 +- + src/src/scriptingsettingsdlg.h | 4 +- + src/src/startherepage.h | 4 +- + src/src/switcherdlg.h | 2 +- + src/src/threadsdlg.h | 6 +- + src/src/watchesdlg.h | 4 +- + 88 files changed, 660 insertions(+), 651 deletions(-) + +diff --git a/src/include/cbauibook.h b/src/include/cbauibook.h +index 2e1840bd13..d0bf79a3a1 100644 +--- a/src/include/cbauibook.h ++++ b/src/include/cbauibook.h +@@ -112,7 +112,7 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook + * \param The index of the tab to be closed + * \return true if successfull + */ +- bool DeletePage(size_t page); ++ bool DeletePage(size_t page) override; + /** \brief Remove Page + * + * Calls the base-class function and after that +@@ -122,7 +122,7 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook + * \param The index of the tab to be closed + * \return true if successfull + */ +- bool RemovePage(size_t page); ++ bool RemovePage(size_t page) override; + /** \brief Move page + * + * Moves the tab containing page to new_idx +diff --git a/src/plugins/abbreviations/abbreviations.h b/src/plugins/abbreviations/abbreviations.h +index 2edd069bf5..b71cf8d34a 100644 +--- a/src/plugins/abbreviations/abbreviations.h ++++ b/src/plugins/abbreviations/abbreviations.h +@@ -34,19 +34,19 @@ class Abbreviations : public cbPlugin + * in configuration dialogs. Lower numbers mean the plugin's + * configuration is put higher in the list. + */ +- virtual int GetConfigurationPriority() const { return 50; } ++ int GetConfigurationPriority() const override { return 50; } + + /** Return the configuration group for this plugin. Default is cgUnknown. + * Notice that you can logically OR more than one configuration groups, + * so you could set it, for example, as "cgCompiler | cgContribPlugin". + */ +- virtual int GetConfigurationGroup() const { return cgEditor; } ++ int GetConfigurationGroup() const override { return cgEditor; } + + /** Return plugin's configuration panel. + * @param parent The parent window. + * @return A pointer to the plugin's cbConfigurationPanel. It is deleted by the caller. + */ +- virtual cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent); ++ cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent) override; + + /** This method is called by Code::Blocks and is used by the plugin + * to add any menu items it needs on Code::Blocks's menu bar.\n +@@ -55,7 +55,7 @@ class Abbreviations : public cbPlugin + * just do nothing ;) + * @param menuBar the wxMenuBar to create items in + */ +- virtual void BuildMenu(wxMenuBar* menuBar); ++ void BuildMenu(wxMenuBar* menuBar) override; + + protected: + /** Any descendent plugin should override this virtual method and +@@ -68,7 +68,7 @@ class Abbreviations : public cbPlugin + * This means that a plugin might be loaded but <b>not</b> activated...\n + * Think of this method as the actual constructor... + */ +- virtual void OnAttach(); ++ void OnAttach() override; + + /** Any descendent plugin should override this virtual method and + * perform any necessary de-initialization. This method is called by +@@ -79,7 +79,7 @@ class Abbreviations : public cbPlugin + * case *don't* use Manager::Get()->Get...() functions or the + * behaviour is undefined... + */ +- virtual void OnRelease(bool appShutDown); ++ void OnRelease(bool appShutDown) override; + + public: + /** Try to auto-complete the current word. +diff --git a/src/plugins/abbreviations/abbreviationsconfigpanel.h b/src/plugins/abbreviations/abbreviationsconfigpanel.h +index 8724f69be7..38df93ef6b 100644 +--- a/src/plugins/abbreviations/abbreviationsconfigpanel.h ++++ b/src/plugins/abbreviations/abbreviationsconfigpanel.h +@@ -20,16 +20,16 @@ class AbbreviationsConfigPanel: public cbConfigurationPanel + { + public: + AbbreviationsConfigPanel(wxWindow* parent, Abbreviations* plugin); +- virtual ~AbbreviationsConfigPanel(); ++ ~AbbreviationsConfigPanel() override; + + /// @return the panel's title. +- virtual wxString GetTitle() const; ++ wxString GetTitle() const override; + /// @return the panel's bitmap base name. You must supply two bitmaps: \<basename\>.png and \<basename\>-off.png... +- virtual wxString GetBitmapBaseName() const; ++ wxString GetBitmapBaseName() const override; + /// Called when the user chooses to apply the configuration. +- virtual void OnApply(); ++ void OnApply() override; + /// Called when the user chooses to cancel the configuration. +- virtual void OnCancel(); ++ void OnCancel() override; + + private: + void InitCompText(); +diff --git a/src/plugins/astyle/astyleconfigdlg.h b/src/plugins/astyle/astyleconfigdlg.h +index ecab74ff05..8adce2a11b 100644 +--- a/src/plugins/astyle/astyleconfigdlg.h ++++ b/src/plugins/astyle/astyleconfigdlg.h +@@ -22,10 +22,10 @@ class AstyleConfigDlg : public cbConfigurationPanel + void OnBreakLineChange(wxCommandEvent& event); + void OnBreakBlocksChange(wxCommandEvent& event); + +- virtual wxString GetTitle() const { return _("Source formatter"); } +- virtual wxString GetBitmapBaseName() const { return _T("astyle-plugin"); } +- virtual void OnApply(){ SaveSettings(); } +- virtual void OnCancel(){} ++ wxString GetTitle() const override { return _("Source formatter"); } ++ wxString GetBitmapBaseName() const override { return _T("astyle-plugin"); } ++ void OnApply() override { SaveSettings(); } ++ void OnCancel() override {} + + void LoadSettings(); + void SaveSettings(); +diff --git a/src/plugins/autosave/autosave.h b/src/plugins/autosave/autosave.h +index 8471528056..95d156b4ff 100644 +--- a/src/plugins/autosave/autosave.h ++++ b/src/plugins/autosave/autosave.h +@@ -22,13 +22,13 @@ class Autosave : public cbPlugin + + public: + Autosave(); +- ~Autosave(); +- int GetConfigurationPriority() const{ return 50; } +- int GetConfigurationGroup() const{ return cgUnknown; } +- void OnAttach(); // fires when the plugin is attached to the application ++ ~Autosave() override; ++ int GetConfigurationPriority() const override { return 50; } ++ int GetConfigurationGroup() const override { return cgUnknown; } ++ void OnAttach() override; // fires when the plugin is attached to the application + void Start(); +- void OnRelease(bool appShutDown); // fires when the plugin is released from the application +- virtual cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent); ++ void OnRelease(bool appShutDown) override; // fires when the plugin is released from the application ++ cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent) override; + void OnTimer(wxTimerEvent& event); + void SaveProject(cbProject *p, int method); + DECLARE_EVENT_TABLE() +@@ -43,10 +43,10 @@ class AutosaveConfigDlg : public cbConfigurationPanel + AutosaveConfigDlg(wxWindow* parent, Autosave* plug); + virtual ~AutosaveConfigDlg(){}; + +- virtual wxString GetTitle() const { return _("Autosave"); } +- virtual wxString GetBitmapBaseName() const { return _T("autosave"); } +- virtual void OnApply(){ SaveSettings(); } +- virtual void OnCancel(){} ++ wxString GetTitle() const override { return _("Autosave"); } ++ wxString GetBitmapBaseName() const override { return _T("autosave"); } ++ void OnApply() override { SaveSettings(); } ++ void OnCancel() override {} + private: + void OnProjectsChecked(wxCommandEvent &event); + void OnSourceChecked(wxCommandEvent &event); +diff --git a/src/plugins/classwizard/classwizard.h b/src/plugins/classwizard/classwizard.h +index 8852eb967e..3f865db6d5 100644 +--- a/src/plugins/classwizard/classwizard.h ++++ b/src/plugins/classwizard/classwizard.h +@@ -12,12 +12,12 @@ class ClassWizard : public cbPlugin + { + public: + ClassWizard(); +- ~ClassWizard(); ++ ~ClassWizard() override; + +- virtual void OnAttach(); +- virtual void OnRelease(bool appShutDown); ++ void OnAttach() override; ++ void OnRelease(bool appShutDown) override; + +- virtual void BuildMenu(wxMenuBar* menuBar); ++ void BuildMenu(wxMenuBar* menuBar) override; + + void OnLaunch(wxCommandEvent& event); + +diff --git a/src/plugins/codecompletion/ccoptionsdlg.h b/src/plugins/codecompletion/ccoptionsdlg.h +index 8e324ebf75..66bdd4aefc 100644 +--- a/src/plugins/codecompletion/ccoptionsdlg.h ++++ b/src/plugins/codecompletion/ccoptionsdlg.h +@@ -19,12 +19,12 @@ class CCOptionsDlg : public cbConfigurationPanel + { + public: + CCOptionsDlg(wxWindow* parent, NativeParser* np, CodeCompletion* cc, DocumentationHelper* dh); +- virtual ~CCOptionsDlg(); ++ ~CCOptionsDlg() override; + +- virtual wxString GetTitle() const { return _("Code completion"); } +- virtual wxString GetBitmapBaseName() const { return _T("codecompletion"); } +- virtual void OnApply(); +- virtual void OnCancel() { ; } ++ wxString GetTitle() const override { return _("Code completion"); } ++ wxString GetBitmapBaseName() const override { return _T("codecompletion"); } ++ void OnApply() override; ++ void OnCancel() override {} + + protected: + void OnChooseColour(wxCommandEvent& event); +diff --git a/src/plugins/codecompletion/ccoptionsprjdlg.h b/src/plugins/codecompletion/ccoptionsprjdlg.h +index de6c6c5600..496f186fde 100644 +--- a/src/plugins/codecompletion/ccoptionsprjdlg.h ++++ b/src/plugins/codecompletion/ccoptionsprjdlg.h +@@ -18,12 +18,12 @@ class CCOptionsProjectDlg : public cbConfigurationPanel + { + public: + CCOptionsProjectDlg(wxWindow* parent, cbProject* project, NativeParser* np); +- virtual ~CCOptionsProjectDlg(); ++ ~CCOptionsProjectDlg() override; + +- virtual wxString GetTitle() const { return _("C/C++ parser options"); } +- virtual wxString GetBitmapBaseName() const { return _T("generic-plugin"); } +- virtual void OnApply(); +- virtual void OnCancel(){} ++ wxString GetTitle() const override { return _("C/C++ parser options"); } ++ wxString GetBitmapBaseName() const override { return _T("generic-plugin"); } ++ void OnApply() override; ++ void OnCancel() override {} + + protected: + void OnAdd(wxCommandEvent& event); +diff --git a/src/plugins/codecompletion/cctreectrl.h b/src/plugins/codecompletion/cctreectrl.h +index ca93673a36..df8838b17d 100644 +--- a/src/plugins/codecompletion/cctreectrl.h ++++ b/src/plugins/codecompletion/cctreectrl.h +@@ -105,7 +105,7 @@ class CCTreeCtrl : public wxTreeCtrl + static int CBLineCompare (CCTreeCtrlData* lhs, CCTreeCtrlData* rhs); + static int CBNoCompare (CCTreeCtrlData* lhs, CCTreeCtrlData* rhs); + +- int OnCompareItems(const wxTreeItemId& item1, const wxTreeItemId& item2); ++ int OnCompareItems(const wxTreeItemId& item1, const wxTreeItemId& item2) override; + int (*Compare)(CCTreeCtrlData* lhs, CCTreeCtrlData* rhs); + + DECLARE_DYNAMIC_CLASS(CCTreeCtrl) +diff --git a/src/plugins/codecompletion/classbrowserbuilderthread.h b/src/plugins/codecompletion/classbrowserbuilderthread.h +index 315cb8911e..4f2acc284f 100644 +--- a/src/plugins/codecompletion/classbrowserbuilderthread.h ++++ b/src/plugins/codecompletion/classbrowserbuilderthread.h +@@ -36,7 +36,7 @@ class ClassBrowserBuilderThread : public wxThread + ClassBrowserBuilderThread(wxEvtHandler* evtHandler, wxSemaphore& sem); + + /** destructor */ +- virtual ~ClassBrowserBuilderThread(); ++ ~ClassBrowserBuilderThread() override; + + // Called from external: + void Init(NativeParser* np, CCTreeCtrl* treeTop, CCTreeCtrl* treeBottom, +@@ -68,7 +68,7 @@ class ClassBrowserBuilderThread : public wxThread + void RequestTermination(bool terminate = true) { m_TerminationRequested = terminate; } + + protected: +- virtual void* Entry(); ++ void* Entry() override; + + // Called from Entry(): + void BuildTree(); +diff --git a/src/plugins/codecompletion/codecompletion.h b/src/plugins/codecompletion/codecompletion.h +index fb0976bf01..83cc146b3d 100644 +--- a/src/plugins/codecompletion/codecompletion.h ++++ b/src/plugins/codecompletion/codecompletion.h +@@ -82,34 +82,34 @@ class CodeCompletion : public cbCodeCompletionPlugin + /** Constructor */ + CodeCompletion(); + /** Destructor */ +- virtual ~CodeCompletion(); ++ ~CodeCompletion() override; + + // the function below were virtual functions from the base class +- virtual void OnAttach(); +- virtual void OnRelease(bool appShutDown); +- virtual int GetConfigurationGroup() const { return cgEditor; } ++ void OnAttach() override; ++ void OnRelease(bool appShutDown) override; ++ int GetConfigurationGroup() const override { return cgEditor; } + + /** CC's config dialog */ +- virtual cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent); ++ cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent) override; + /** CC's config dialog which show in the project options panel */ +- virtual cbConfigurationPanel* GetProjectConfigurationPanel(wxWindow* parent, cbProject* project); ++ cbConfigurationPanel* GetProjectConfigurationPanel(wxWindow* parent, cbProject* project) override; + /** build menus in the main frame */ +- virtual void BuildMenu(wxMenuBar* menuBar); ++ void BuildMenu(wxMenuBar* menuBar) override; + /** build context popup menu */ +- virtual void BuildModuleMenu(const ModuleType type, wxMenu* menu, const FileTreeData* data = 0); ++ void BuildModuleMenu(const ModuleType type, wxMenu* menu, const FileTreeData* data = 0) override; + /** build CC Toolbar */ +- virtual bool BuildToolBar(wxToolBar* toolBar); ++ bool BuildToolBar(wxToolBar* toolBar) override; + /** toolbar priority value */ +- virtual int GetToolBarPriority() { return 10; } ++ int GetToolBarPriority() override { return 10; } + + // override virtual functions in cbCodeCompletionPlugin class +- virtual CCProviderStatus GetProviderStatusFor(cbEditor* ed); +- virtual std::vector<CCToken> GetAutocompList(bool isAuto, cbEditor* ed, int& tknStart, int& tknEnd); +- virtual std::vector<CCCallTip> GetCallTips(int pos, int style, cbEditor* ed, int& argsPos); +- virtual wxString GetDocumentation(const CCToken& token); +- virtual std::vector<CCToken> GetTokenAt(int pos, cbEditor* ed, bool& allowCallTip); +- virtual wxString OnDocumentationLink(wxHtmlLinkEvent& event, bool& dismissPopup); +- virtual void DoAutocomplete(const CCToken& token, cbEditor* ed); ++ CCProviderStatus GetProviderStatusFor(cbEditor* ed) override; ++ std::vector<CCToken> GetAutocompList(bool isAuto, cbEditor* ed, int& tknStart, int& tknEnd) override; ++ std::vector<CCCallTip> GetCallTips(int pos, int style, cbEditor* ed, int& argsPos) override; ++ wxString GetDocumentation(const CCToken& token) override; ++ std::vector<CCToken> GetTokenAt(int pos, cbEditor* ed, bool& allowCallTip) override; ++ wxString OnDocumentationLink(wxHtmlLinkEvent& event, bool& dismissPopup) override; ++ void DoAutocomplete(const CCToken& token, cbEditor* ed) override; + + /** Get the include paths setting (usually set by user for each C::B project). + * If it finds some system level include search dirs which haven't been scanned, it will start a +diff --git a/src/plugins/codecompletion/parser/parser.h b/src/plugins/codecompletion/parser/parser.h +index 70796fcb9c..ab2f7add4d 100644 +--- a/src/plugins/codecompletion/parser/parser.h ++++ b/src/plugins/codecompletion/parser/parser.h +@@ -125,82 +125,83 @@ class Parser : public ParserBase + */ + Parser(wxEvtHandler* parent, cbProject* project); + /** destructor */ +- virtual ~Parser(); ++ ~Parser() override; + + /** Add files to batch parse mode, internally. The files will be parsed sequentially. + * @param filenames input files name array + */ +- virtual void AddBatchParse(const StringList& filenames); ++ void AddBatchParse(const StringList& filenames) override; + + /** Add one file to Batch mode Parsing, this is the bridge between the main thread and the + * thread pool, after this function call, the file(Parserthread) will be run from the thread + * pool. + * @param filenames input file name + */ +- virtual void AddParse(const wxString& filename); ++ void AddParse(const wxString& filename) override; + + /** set the predefined macro definition string was collected from the GCC command line, + * this function adds the string to an internal m_PredefinedMacros, and switch the ParserState + */ +- virtual void AddPredefinedMacros(const wxString& defs); ++ void AddPredefinedMacros(const wxString& defs) override; + + /** clears the list of predefined macros after it has been parsed */ + virtual void ClearPredefinedMacros(); + + /** return the predefined macro definition string that has been collected */ +- virtual const wxString GetPredefinedMacros() const; ++ const wxString GetPredefinedMacros() const override; + + /** set the associated C::B project pointer. (only used by one parser for whole workspace) + * @return true if it can do the switch, other wise, return false, and print some debug logs. + */ +- virtual bool UpdateParsingProject(cbProject* project); ++ bool UpdateParsingProject(cbProject* project) override; + + /** Must add a locker before call all named ParseBufferXXX functions, ParseBuffer function will + * directly run the parsing in the same thread as the caller. So, take care if the time is limited. + * this function usually used to parse the function body to fetch the local variable information. + */ +- virtual bool ParseBuffer(const wxString& buffer, bool isLocal, bool bufferSkipBlocks = false, +- bool isTemp = false, const wxString& filename = wxEmptyString, +- int parentIdx = -1, int initLine = 0); ++ bool ParseBuffer(const wxString& buffer, bool isLocal, bool bufferSkipBlocks = false, ++ bool isTemp = false, const wxString& filename = wxEmptyString, ++ int parentIdx = -1, int initLine = 0) override; + + /** parser the current editor control, this function is used to list all the functions in the + * current code editor + */ +- virtual bool ParseBufferForFunctions(const wxString& buffer); ++ bool ParseBufferForFunctions(const wxString& buffer) override; + + /** parse the buffer for collecting exposed namespace scopes*/ +- virtual bool ParseBufferForNamespaces(const wxString& buffer, NameSpaceVec& result); ++ bool ParseBufferForNamespaces(const wxString& buffer, NameSpaceVec& result) override; + + /** parse the buffer for collecting using namespace directive*/ +- virtual bool ParseBufferForUsingNamespace(const wxString& buffer, wxArrayString& result, bool bufferSkipBlocks = true); ++ bool ParseBufferForUsingNamespace(const wxString& buffer, wxArrayString& result, ++ bool bufferSkipBlocks = true) override; + + /** mark this file to be re-parsed in the TokenTree, tick the reparse timer, note it looks like + * the isLocal parameter is not used in Parser::Reparse function. + * A better function name could be: MarkFileNeedToBeReParsed() + */ +- virtual bool Reparse(const wxString& filename, bool isLocal = true); ++ bool Reparse(const wxString& filename, bool isLocal = true) override; + + /** this usually happens when user adds some files to an existing project, it just use AddParse() + * function internally to add the file. and switch the ParserState to ParserCommon::ptAddFileToParser. + */ +- virtual bool AddFile(const wxString& filename, cbProject* project, bool isLocal = true); ++ bool AddFile(const wxString& filename, cbProject* project, bool isLocal = true) override; + + /** this usually happens when the user removes a file from the existing project, it will remove + * all the tokens belong to the file. + */ +- virtual bool RemoveFile(const wxString& filename); ++ bool RemoveFile(const wxString& filename) override; + + /** check to see a file is parsed already, it first check the TokenTree to see whether it has + * the specified file, but if a file is already queued (put in m_BatchParseFiles), we regard it + * as already parsed. + */ +- virtual bool IsFileParsed(const wxString& filename); ++ bool IsFileParsed(const wxString& filename) override; + + /** check to see whether Parser is in Idle mode, there is no work need to be done in the Parser*/ +- virtual bool Done(); ++ bool Done() override; + + /** if the Parser is not in Idle mode, show which need to be done */ +- virtual wxString NotDoneReason(); ++ wxString NotDoneReason() override; + + protected: + // used for measuring the batch parsing time +@@ -258,9 +259,9 @@ class Parser : public ParserBase + void ProcessParserEvent(ParserCommon::ParserState state, int id, const wxString& info = wxEmptyString); + + /** read Parser options from configure file */ +- virtual void ReadOptions(); ++ void ReadOptions() override; + /** write Parse options to configure file */ +- virtual void WriteOptions(); ++ void WriteOptions() override; + + private: + /** the only usage of this function is in the Parserthread class, when handling include directives +@@ -273,7 +274,7 @@ class Parser : public ParserBase + * the locked should be set as false, but if you want to recursive parse to an include file + * the locked value should be set as true. + */ +- virtual bool ParseFile(const wxString& filename, bool isGlobal, bool locked = false); ++ bool ParseFile(const wxString& filename, bool isGlobal, bool locked = false) override; + + /** connect event handlers of the timers and thread pool */ + void ConnectEvents(); +diff --git a/src/plugins/codecompletion/parser/parserthread.h b/src/plugins/codecompletion/parser/parserthread.h +index 5747d394f2..26eec7dd36 100644 +--- a/src/plugins/codecompletion/parser/parserthread.h ++++ b/src/plugins/codecompletion/parser/parserthread.h +@@ -185,7 +185,7 @@ class ParserThread : public cbThreadedTask + * often happens when user open a project. Every parserthread task will firstly be added to the thread pool, later + * called automatically from the thread pool. + */ +- int Execute() ++ int Execute() override + { + CC_LOCKER_TRACK_TT_MTX_LOCK(s_TokenTreeMutex) + +diff --git a/src/plugins/codecompletion/parser/parserthreadedtask.h b/src/plugins/codecompletion/parser/parserthreadedtask.h +index f71141a822..5bd8e028ab 100644 +--- a/src/plugins/codecompletion/parser/parserthreadedtask.h ++++ b/src/plugins/codecompletion/parser/parserthreadedtask.h +@@ -26,7 +26,7 @@ class ParserThreadedTask : public cbThreadedTask + // run sequence parsing jobs in a single thread, those include + // 1, parsing predefined macro buffers + // 2, parsing project files(mainly the implementation source files) +- virtual int Execute(); ++ int Execute() override; + + private: + Parser* m_Parser; /// a Parser object which contain TokenTree +@@ -43,7 +43,7 @@ class MarkFileAsLocalThreadedTask : public cbThreadedTask + public: + MarkFileAsLocalThreadedTask(Parser* parser, cbProject* project); + +- virtual int Execute(); ++ int Execute() override; + + private: + Parser* m_Parser; /// a Parser object which contain TokenTree +diff --git a/src/plugins/codecompletion/parser/searchtree.h b/src/plugins/codecompletion/parser/searchtree.h +index 418f6fa4f1..6db13cc66d 100644 +--- a/src/plugins/codecompletion/parser/searchtree.h ++++ b/src/plugins/codecompletion/parser/searchtree.h +@@ -375,10 +375,10 @@ template <class T> class SearchTree : public BasicSearchTree + { + public: + SearchTree(); +- virtual ~SearchTree(); +- virtual void clear(); /// Clears the tree +- size_t GetCount() const; /// Gets the number of items stored +- virtual size_t size() const; /// Same as GetCount ++ ~SearchTree() override; ++ void clear() override; /// Clears the tree ++ size_t GetCount() const override; /// Gets the number of items stored ++ size_t size() const override; /// Same as GetCount + bool SaveCacheTo(const wxString& filename); /// Stores the Tree and items into a file + bool LoadCacheFrom(const wxString& filename); /// Loads the Tree and items from a file + wxString Serialize(); +diff --git a/src/plugins/codecompletion/systemheadersthread.h b/src/plugins/codecompletion/systemheadersthread.h +index fd6955e107..9e6ac1f990 100644 +--- a/src/plugins/codecompletion/systemheadersthread.h ++++ b/src/plugins/codecompletion/systemheadersthread.h +@@ -35,9 +35,9 @@ class SystemHeadersThread : public wxThread + public: + SystemHeadersThread(wxEvtHandler* parent, wxCriticalSection* critSect, + SystemHeadersMap& headersMap, const wxArrayString& incDirs); +- virtual ~SystemHeadersThread(); ++ ~SystemHeadersThread() override; + +- virtual void* Entry(); ++ void* Entry() override; + + private: + wxEvtHandler* m_Parent; /// this is the target the thread will sent any event to +diff --git a/src/plugins/compilergcc/advancedcompileroptionsdlg.h b/src/plugins/compilergcc/advancedcompileroptionsdlg.h +index 1ded3feaaf..0e29770dee 100644 +--- a/src/plugins/compilergcc/advancedcompileroptionsdlg.h ++++ b/src/plugins/compilergcc/advancedcompileroptionsdlg.h +@@ -17,7 +17,7 @@ class AdvancedCompilerOptionsDlg : public wxScrollingDialog + { + public: + AdvancedCompilerOptionsDlg(wxWindow* parent, const wxString& compilerId); +- virtual ~AdvancedCompilerOptionsDlg(); ++ ~AdvancedCompilerOptionsDlg() override; + bool IsDirty() const {return m_bDirty;} + private: + void OnCommandsChange(wxCommandEvent& event); +@@ -32,7 +32,7 @@ class AdvancedCompilerOptionsDlg : public wxScrollingDialog + void OnRegexUp(wxSpinEvent& event); + void OnRegexDown(wxSpinEvent& event); + +- void EndModal(int retCode); ++ void EndModal(int retCode) override; + void ReadCompilerOptions(); + void WriteCompilerOptions(); + void ReadExtensions(int nr); +diff --git a/src/plugins/compilergcc/compilerCYGWIN.h b/src/plugins/compilergcc/compilerCYGWIN.h +index d24ec4cfdf..93ec9bd112 100644 +--- a/src/plugins/compilergcc/compilerCYGWIN.h ++++ b/src/plugins/compilergcc/compilerCYGWIN.h +@@ -12,10 +12,10 @@ class CompilerCYGWIN : public CompilerMINGW + { + public: + CompilerCYGWIN(); +- ~CompilerCYGWIN(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ ~CompilerCYGWIN() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + protected: +- virtual Compiler* CreateCopy(); ++ Compiler* CreateCopy() override; + private: + + }; +diff --git a/src/plugins/compilergcc/compilerG95.h b/src/plugins/compilergcc/compilerG95.h +index 52cffed162..ba594b8cfb 100644 +--- a/src/plugins/compilergcc/compilerG95.h ++++ b/src/plugins/compilergcc/compilerG95.h +@@ -13,10 +13,10 @@ class CompilerG95 : public Compiler + { + public: + CompilerG95(); +- virtual ~CompilerG95(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ ~CompilerG95() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + protected: +- virtual Compiler* CreateCopy(); ++ Compiler* CreateCopy() override; + private: + }; + +diff --git a/src/plugins/compilergcc/compilerGDC.h b/src/plugins/compilergcc/compilerGDC.h +index fb37863821..b2b9598e0a 100644 +--- a/src/plugins/compilergcc/compilerGDC.h ++++ b/src/plugins/compilergcc/compilerGDC.h +@@ -12,10 +12,10 @@ class CompilerGDC : public Compiler + { + public: + CompilerGDC(); +- virtual ~CompilerGDC(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ ~CompilerGDC() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + protected: +- virtual Compiler* CreateCopy(); ++ Compiler* CreateCopy() override; + private: + }; + +diff --git a/src/plugins/compilergcc/compilerGNUARM.h b/src/plugins/compilergcc/compilerGNUARM.h +index 101d3c25b4..899a772053 100644 +--- a/src/plugins/compilergcc/compilerGNUARM.h ++++ b/src/plugins/compilergcc/compilerGNUARM.h +@@ -12,10 +12,10 @@ class CompilerGNUARM : public Compiler + { + public: + CompilerGNUARM(); +- virtual ~CompilerGNUARM(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ ~CompilerGNUARM() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + protected: +- virtual Compiler* CreateCopy(); ++ Compiler* CreateCopy() override; + private: + }; + +diff --git a/src/plugins/compilergcc/compilerGNUFortran.h b/src/plugins/compilergcc/compilerGNUFortran.h +index 38bc1a6caa..4a7807f90f 100644 +--- a/src/plugins/compilergcc/compilerGNUFortran.h ++++ b/src/plugins/compilergcc/compilerGNUFortran.h +@@ -12,10 +12,10 @@ class CompilerGNUFortran : public Compiler + { + public: + CompilerGNUFortran(); +- virtual ~CompilerGNUFortran(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ ~CompilerGNUFortran() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + protected: +- virtual Compiler* CreateCopy(); ++ Compiler* CreateCopy() override; + private: + }; + +diff --git a/src/plugins/compilergcc/compilerIAR.h b/src/plugins/compilergcc/compilerIAR.h +index fafc3618e7..1400bc5b1c 100644 +--- a/src/plugins/compilergcc/compilerIAR.h ++++ b/src/plugins/compilergcc/compilerIAR.h +@@ -12,10 +12,10 @@ class CompilerIAR : public Compiler + { + public: + CompilerIAR(wxString arch); +- virtual ~CompilerIAR(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ ~CompilerIAR() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + protected: +- virtual Compiler* CreateCopy(); ++ Compiler* CreateCopy() override; + wxString m_Arch; + private: + }; +diff --git a/src/plugins/compilergcc/compilerICC.h b/src/plugins/compilergcc/compilerICC.h +index 6123d9b4de..cc3afbb1ff 100644 +--- a/src/plugins/compilergcc/compilerICC.h ++++ b/src/plugins/compilergcc/compilerICC.h +@@ -16,10 +16,10 @@ class CompilerICC : public Compiler + { + public: + CompilerICC(); +- virtual ~CompilerICC(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ ~CompilerICC() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + protected: +- virtual Compiler* CreateCopy(); ++ Compiler* CreateCopy() override; + private: + }; + +diff --git a/src/plugins/compilergcc/compilerKeilC51.h b/src/plugins/compilergcc/compilerKeilC51.h +index e8088809ec..a76b2d60a3 100644 +--- a/src/plugins/compilergcc/compilerKeilC51.h ++++ b/src/plugins/compilergcc/compilerKeilC51.h +@@ -12,11 +12,11 @@ class CompilerKeilC51 : public Compiler + { + public: + CompilerKeilC51(); +- virtual ~CompilerKeilC51(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ ~CompilerKeilC51() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + protected: + CompilerKeilC51(const wxString& name, const wxString& ID); +- virtual Compiler* CreateCopy(); ++ Compiler* CreateCopy() override; + AutoDetectResult AutoDetectInstallationDir(bool keilx); + private: + }; +@@ -25,9 +25,9 @@ class CompilerKeilCX51 : public CompilerKeilC51 + { + public: + CompilerKeilCX51(); +- virtual ~CompilerKeilCX51(); ++ ~CompilerKeilCX51() override; + protected: +- virtual Compiler* CreateCopy(); ++ Compiler* CreateCopy() override; + private: + }; + +diff --git a/src/plugins/compilergcc/compilerLCC.h b/src/plugins/compilergcc/compilerLCC.h +index aa496f9f19..063d8a19da 100644 +--- a/src/plugins/compilergcc/compilerLCC.h ++++ b/src/plugins/compilergcc/compilerLCC.h +@@ -7,14 +7,14 @@ class CompilerLCC : public Compiler + { + public: + CompilerLCC(); +- virtual ~CompilerLCC(); ++ ~CompilerLCC() override; + #ifdef __WXMSW__ +- virtual bool IsValid(); ++ bool IsValid() override; + #endif // __WXMSW__ +- virtual void Reset(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ void Reset() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + protected: +- virtual Compiler* CreateCopy(); ++ Compiler* CreateCopy() override; + private: + bool m_RegistryUpdated; + }; +diff --git a/src/plugins/compilergcc/compilerMINGW.h b/src/plugins/compilergcc/compilerMINGW.h +index 9c04e2b227..7d5c47171f 100644 +--- a/src/plugins/compilergcc/compilerMINGW.h ++++ b/src/plugins/compilergcc/compilerMINGW.h +@@ -15,12 +15,12 @@ class CompilerMINGW : public Compiler + // added arguments to ctor so we can derive other gcc-flavours directly + // from MinGW (e.g. the cygwin compiler is derived from this one). + CompilerMINGW(const wxString& name = _("GNU GCC Compiler"), const wxString& ID = _T("gcc")); +- virtual ~CompilerMINGW(); +- virtual AutoDetectResult AutoDetectInstallationDir(); +- virtual CompilerCommandGenerator* GetCommandGenerator(cbProject *project); ++ ~CompilerMINGW() override; ++ AutoDetectResult AutoDetectInstallationDir() override; ++ CompilerCommandGenerator* GetCommandGenerator(cbProject *project) override; + protected: +- virtual Compiler* CreateCopy(); +- virtual void SetVersionString(); ++ Compiler* CreateCopy() override; ++ void SetVersionString() override; + private: + }; + +diff --git a/src/plugins/compilergcc/compilerMSVC.h b/src/plugins/compilergcc/compilerMSVC.h +index d84ed4d14a..5b9eb572b8 100644 +--- a/src/plugins/compilergcc/compilerMSVC.h ++++ b/src/plugins/compilergcc/compilerMSVC.h +@@ -12,10 +12,10 @@ class CompilerMSVC : public Compiler + { + public: + CompilerMSVC(); +- virtual ~CompilerMSVC(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ ~CompilerMSVC() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + protected: +- Compiler * CreateCopy(); ++ Compiler * CreateCopy() override; + private: + }; + +diff --git a/src/plugins/compilergcc/compilerMSVC10.h b/src/plugins/compilergcc/compilerMSVC10.h +index d2bbb5b7ff..346fcc8d3e 100644 +--- a/src/plugins/compilergcc/compilerMSVC10.h ++++ b/src/plugins/compilergcc/compilerMSVC10.h +@@ -12,11 +12,11 @@ class CompilerMSVC10 : public Compiler + { + public: + CompilerMSVC10(); +- virtual ~CompilerMSVC10(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ ~CompilerMSVC10() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + + protected: +- Compiler* CreateCopy(); ++ Compiler* CreateCopy() override; + }; + + #endif // COMPILERMSVC10_H_ +diff --git a/src/plugins/compilergcc/compilerMSVC8.h b/src/plugins/compilergcc/compilerMSVC8.h +index 7345b64a4c..81aef9358c 100644 +--- a/src/plugins/compilergcc/compilerMSVC8.h ++++ b/src/plugins/compilergcc/compilerMSVC8.h +@@ -12,10 +12,10 @@ class CompilerMSVC8 : public Compiler + { + public: + CompilerMSVC8(); +- virtual ~CompilerMSVC8(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ ~CompilerMSVC8() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + protected: +- Compiler * CreateCopy(); ++ Compiler * CreateCopy() override; + private: + }; + +diff --git a/src/plugins/compilergcc/compilerOW.h b/src/plugins/compilergcc/compilerOW.h +index 8e0c9a417f..734b43fa3a 100644 +--- a/src/plugins/compilergcc/compilerOW.h ++++ b/src/plugins/compilergcc/compilerOW.h +@@ -12,14 +12,14 @@ class CompilerOW : public Compiler + { + public: + CompilerOW(); +- virtual ~CompilerOW(); +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ ~CompilerOW() override; ++ AutoDetectResult AutoDetectInstallationDir() override; + +- virtual void LoadSettings(const wxString& baseKey); +- virtual void SetMasterPath(const wxString& path); +- virtual CompilerCommandGenerator* GetCommandGenerator(cbProject *project); ++ void LoadSettings(const wxString& baseKey) override; ++ void SetMasterPath(const wxString& path) override; ++ CompilerCommandGenerator* GetCommandGenerator(cbProject *project) override; + protected: +- Compiler * CreateCopy(); ++ Compiler * CreateCopy() override; + private: + }; + +diff --git a/src/plugins/compilergcc/compilerXML.h b/src/plugins/compilergcc/compilerXML.h +index af0665e746..db2aca08cd 100644 +--- a/src/plugins/compilergcc/compilerXML.h ++++ b/src/plugins/compilergcc/compilerXML.h +@@ -9,12 +9,12 @@ class CompilerXML : public Compiler + { + public: + CompilerXML(const wxString& name, const wxString& ID, const wxString& file); +- virtual ~CompilerXML(); ++ ~CompilerXML() override; + +- virtual AutoDetectResult AutoDetectInstallationDir(); ++ AutoDetectResult AutoDetectInstallationDir() override; + + protected: +- virtual Compiler* CreateCopy(); ++ Compiler* CreateCopy() override; + + private: + +diff --git a/src/plugins/compilergcc/compilerflagdlg.h b/src/plugins/compilergcc/compilerflagdlg.h +index f356c6cd34..761ea78fbd 100644 +--- a/src/plugins/compilergcc/compilerflagdlg.h ++++ b/src/plugins/compilergcc/compilerflagdlg.h +@@ -13,9 +13,9 @@ class CompilerFlagDlg: public wxDialog + public: + + CompilerFlagDlg(wxWindow* parent, CompOption* opt, wxArrayString& categ, const wxString &selectedCategory); +- virtual ~CompilerFlagDlg(); ++ virtual ~CompilerFlagDlg() override; + +- void EndModal(int retCode); ++ void EndModal(int retCode) override; + + protected: + +diff --git a/src/plugins/compilergcc/compilergcc.h b/src/plugins/compilergcc/compilergcc.h +index 36abee10be..11fd30122c 100644 +--- a/src/plugins/compilergcc/compilergcc.h ++++ b/src/plugins/compilergcc/compilergcc.h +@@ -89,40 +89,40 @@ class CompilerGCC : public cbCompilerPlugin + { + public: + CompilerGCC(); +- virtual ~CompilerGCC(); ++ ~CompilerGCC() override; + +- virtual void OnAttach(); +- virtual void OnRelease(bool appShutDown); +- virtual void BuildMenu(wxMenuBar* menuBar); // offer for menu space by host +- virtual void BuildModuleMenu(const ModuleType type, wxMenu* menu, const FileTreeData* data = 0); // offer for menu space by a module +- virtual bool BuildToolBar(wxToolBar* toolBar); +- virtual int GetToolBarPriority() { return 1; } ++ void OnAttach() override; ++ void OnRelease(bool appShutDown) override; ++ void BuildMenu(wxMenuBar* menuBar) override; // offer for menu space by host ++ void BuildModuleMenu(const ModuleType type, wxMenu* menu, const FileTreeData* data = 0) override; // offer for menu space by a module ++ bool BuildToolBar(wxToolBar* toolBar) override; ++ int GetToolBarPriority() override { return 1; } + +- virtual int Run(ProjectBuildTarget* target = 0L); +- virtual int Run(const wxString& target); ++ int Run(ProjectBuildTarget* target = 0L) override; ++ int Run(const wxString& target) override; + virtual int RunSingleFile(const wxString& filename); +- virtual int Clean(const wxString& target); +- virtual int Clean(ProjectBuildTarget* target = 0L); +- virtual int DistClean(ProjectBuildTarget* target = 0L); +- virtual int DistClean(const wxString& target); +- virtual int Build(ProjectBuildTarget* target = 0L); +- virtual int Build(const wxString& target); +- virtual int Rebuild(ProjectBuildTarget* target = 0L); +- virtual int Rebuild(const wxString& target); +- virtual int CleanWorkspace(const wxString& target = wxEmptyString); +- virtual int BuildWorkspace(const wxString& target = wxEmptyString); +- virtual int RebuildWorkspace(const wxString& target = wxEmptyString); +- virtual int CompileFile(const wxString& file); ++ int Clean(const wxString& target) override; ++ int Clean(ProjectBuildTarget* target = 0L) override; ++ int DistClean(ProjectBuildTarget* target = 0L) override; ++ int DistClean(const wxString& target) override; ++ int Build(ProjectBuildTarget* target = 0L) override; ++ int Build(const wxString& target) override; ++ int Rebuild(ProjectBuildTarget* target = 0L) override; ++ int Rebuild(const wxString& target) override; ++ int CleanWorkspace(const wxString& target = wxEmptyString) override; ++ int BuildWorkspace(const wxString& target = wxEmptyString) override; ++ int RebuildWorkspace(const wxString& target = wxEmptyString) override; ++ int CompileFile(const wxString& file) override; + virtual int CompileFileWithoutProject(const wxString& file); + virtual int CompileFileDefault(cbProject* project, ProjectFile* pf, ProjectBuildTarget* bt); +- virtual int KillProcess(); +- virtual bool IsRunning() const; +- virtual int GetExitCode() const { return m_LastExitCode; } +- virtual int Configure(cbProject* project, ProjectBuildTarget* target, wxWindow *parent); +- +- int GetConfigurationPriority() const { return 0; } +- int GetConfigurationGroup() const { return cgCompiler; } +- cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent); ++ int KillProcess() override; ++ bool IsRunning() const override; ++ int GetExitCode() const override { return m_LastExitCode; } ++ int Configure(cbProject* project, ProjectBuildTarget* target, wxWindow *parent) override; ++ ++ int GetConfigurationPriority() const override { return 0; } ++ int GetConfigurationGroup() const override { return cgCompiler; } ++ cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent) override; + + bool IsValidTarget(const wxString& target) const; + +diff --git a/src/plugins/compilergcc/compilermessages.h b/src/plugins/compilergcc/compilermessages.h +index 130c7caca2..19b338cd7c 100644 +--- a/src/plugins/compilergcc/compilermessages.h ++++ b/src/plugins/compilergcc/compilermessages.h +@@ -20,13 +20,13 @@ class CompilerMessages : public wxEvtHandler, public ListCtrlLogger + virtual void SetCompilerErrors(CompilerErrors* errors){ m_pErrors = errors; } + virtual void FocusError(int nr); + +- void AutoFitColumns(int column); ++ void AutoFitColumns(int column) override; + +- virtual wxWindow* CreateControl(wxWindow* parent); ++ wxWindow* CreateControl(wxWindow* parent) override; + void DestroyControls(); + +- virtual bool HasFeature(Feature::Enum feature) const; +- virtual void AppendAdditionalMenuItems(wxMenu &menu); ++ bool HasFeature(Feature::Enum feature) const override; ++ void AppendAdditionalMenuItems(wxMenu &menu) override; + private: + void OnClick(wxCommandEvent& event); + void OnDoubleClick(wxCommandEvent& event); +diff --git a/src/plugins/compilergcc/compileroptionsdlg.h b/src/plugins/compilergcc/compileroptionsdlg.h +index 756370fc36..fa90a947e1 100644 +--- a/src/plugins/compilergcc/compileroptionsdlg.h ++++ b/src/plugins/compilergcc/compileroptionsdlg.h +@@ -29,12 +29,12 @@ class CompilerOptionsDlg : public cbConfigurationPanel + { + public: + CompilerOptionsDlg(wxWindow* parent, CompilerGCC* compiler, cbProject* project = 0L, ProjectBuildTarget* target = 0L); +- ~CompilerOptionsDlg(); ++ ~CompilerOptionsDlg() override; + +- virtual wxString GetTitle() const { return _("Global compiler settings"); } +- virtual wxString GetBitmapBaseName() const { return _T("compiler"); } +- virtual void OnApply(); +- virtual void OnCancel(){} ++ wxString GetTitle() const override { return _("Global compiler settings"); } ++ wxString GetBitmapBaseName() const override { return _T("compiler"); } ++ void OnApply() override; ++ void OnCancel() override {} + private: + enum CustomVarActionType + { +diff --git a/src/plugins/debuggergdb/cdb_commands.h b/src/plugins/debuggergdb/cdb_commands.h +index 617a054805..bb71a11d52 100644 +--- a/src/plugins/debuggergdb/cdb_commands.h ++++ b/src/plugins/debuggergdb/cdb_commands.h +@@ -49,7 +49,7 @@ class CdbCmd_AddSourceDir : public DebuggerCmd + { + m_Cmd << _T("directory ") << dir; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // Output: + // Warning: C:\Devel\tmp\console\111: No such file or directory. +@@ -71,7 +71,7 @@ class CdbCmd_SetDebuggee : public DebuggerCmd + { + m_Cmd << _T("file ") << file; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // Output: + // Reading symbols from C:\Devel\tmp\console/console.exe...done. +@@ -95,7 +95,7 @@ class CdbCmd_AddSymbolFile : public DebuggerCmd + { + m_Cmd << _T("add-symbol-file ") << file; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // Output: + // +@@ -123,7 +123,7 @@ class CdbCmd_SetArguments : public DebuggerCmd + { + m_Cmd << _T("set args ") << args; + } +- void ParseOutput(cb_unused const wxString& output) ++ void ParseOutput(cb_unused const wxString& output) override + { + // No output + } +@@ -141,7 +141,7 @@ class CdbCmd_GetPID : public DebuggerCmd + { + m_Cmd << _T("|."); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // Output: + // <decimal process num> id: <hex PID> create name: <process name> +@@ -177,7 +177,7 @@ class CdbCmd_AttachToProcess : public DebuggerCmd + { + m_Cmd << _T("attach ") << wxString::Format(_T("%d"), pid); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // Output: + // Attaching to process <pid> +@@ -214,7 +214,7 @@ class CdbCmd_Detach : public DebuggerCmd + { + m_Cmd << _T(".detach"); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // output any return, usually "Detached" + m_pDriver->Log(output); +@@ -232,7 +232,7 @@ class CdbCmd_Continue : public DebuggerContinueBaseCmd + : DebuggerContinueBaseCmd(driver,_T("g")) + { + } +- virtual void Action() ++ void Action() override + { + m_pDriver->NotifyDebuggeeContinued(); + } +@@ -269,7 +269,7 @@ class CdbCmd_AddBreakpoint : public DebuggerCmd + bp->alreadySet = true; + } + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // possible outputs (only output lines starting with ***): + // +@@ -305,7 +305,7 @@ class CdbCmd_RemoveBreakpoint : public DebuggerCmd + else + m_Cmd << _T("bc ") << wxString::Format(_T("%d"), (int) bp->index); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // usually no output, so display whatever comes in + if (!output.IsEmpty()) +@@ -331,7 +331,7 @@ class CdbCmd_Watch : public DebuggerCmd + m_Cmd << wxT("?? ") << symbol; + } + +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + if(!ParseCDBWatchValue(m_watch, output)) + { +@@ -365,7 +365,7 @@ class CdbCmd_TooltipEvaluation : public DebuggerCmd + { + m_Cmd << _T("?? ") << what; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // struct HWND__ * 0x7ffd8000 + // +@@ -407,7 +407,7 @@ class CdbCmd_Backtrace : public DebuggerCmd + { + m_Cmd << _T("k n"); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // output is: + // # ChildEBP RetAddr +@@ -486,7 +486,7 @@ class CdbCmd_SwitchFrame : public DebuggerCmd + m_Cmd = wxString::Format(wxT(".frame %d"), frameNumber); + } + +- virtual void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + wxArrayString lines = GetArrayFromString(output, wxT('\n')); + +@@ -529,7 +529,7 @@ class CdbCmd_InfoRegisters : public DebuggerCmd + { + m_Cmd << _T("r"); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // output is: + // +@@ -564,7 +564,7 @@ class CdbCmd_Disassembly : public DebuggerCmd + { + m_Cmd << _T("uf ") << StopAddress; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // output is a series of: + // +@@ -601,7 +601,7 @@ class CdbCmd_DisassemblyInit : public DebuggerCmd + // print stack frame and nearest symbol (start of function) + m_Cmd << _T("k n 1; ln"); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // m_pDriver->QueueCommand(new CdbCmd_Disassembly(m_pDriver, m_pDlg, StopAddress)); // chain call + +diff --git a/src/plugins/debuggergdb/cdb_driver.h b/src/plugins/debuggergdb/cdb_driver.h +index 014b33f3c7..e0a23f82c6 100644 +--- a/src/plugins/debuggergdb/cdb_driver.h ++++ b/src/plugins/debuggergdb/cdb_driver.h +@@ -12,60 +12,61 @@ class CDB_driver : public DebuggerDriver + { + public: + CDB_driver(DebuggerGDB* plugin); +- virtual ~CDB_driver(); ++ ~CDB_driver() override; + +- virtual wxString GetCommandLine(const wxString& debugger, +- const wxString& debuggee, +- const wxString &userArguments); +- virtual wxString GetCommandLine(const wxString& debugger, int pid, const wxString &userArguments); +- virtual void SetTarget(ProjectBuildTarget* target); +- virtual void Prepare(bool isConsole, int printElements, const RemoteDebugging &remoteDebugging); +- virtual void Start(bool breakOnEntry); +- virtual void Stop(); ++ wxString GetCommandLine(const wxString& debugger, const wxString& debuggee, ++ const wxString &userArguments) override; ++ wxString GetCommandLine(const wxString& debugger, int pid, ++ const wxString &userArguments) override; ++ void SetTarget(ProjectBuildTarget* target) override; ++ void Prepare(bool isConsole, int printElements, ++ const RemoteDebugging &remoteDebugging) override; ++ void Start(bool breakOnEntry) override; ++ void Stop() override; + +- virtual void Continue(); +- virtual void Step(); +- virtual void StepInstruction(); +- virtual void StepIntoInstruction(); +- virtual void StepIn(); +- virtual void StepOut(); +- virtual void SetNextStatement(const wxString& filename, int line); +- virtual void Backtrace(); +- virtual void Disassemble(); +- virtual void CPURegisters(); +- virtual void SwitchToFrame(size_t number); +- virtual void SetVarValue(const wxString& var, const wxString& value); +- virtual void SetMemoryRangeValue(uint64_t addr, const wxString& value); +- virtual void MemoryDump(); +- virtual void Attach(int pid); +- virtual void Detach(); +- virtual void RunningThreads(); ++ void Continue() override; ++ void Step() override; ++ void StepInstruction() override; ++ void StepIntoInstruction() override; ++ void StepIn() override; ++ void StepOut() override; ++ void SetNextStatement(const wxString& filename, int line) override; ++ void Backtrace() override; ++ void Disassemble() override; ++ void CPURegisters() override; ++ void SwitchToFrame(size_t number) override; ++ void SetVarValue(const wxString& var, const wxString& value) override; ++ void SetMemoryRangeValue(uint64_t addr, const wxString& value) override; ++ void MemoryDump() override; ++ void Attach(int pid) override; ++ void Detach() override; ++ void RunningThreads() override; + +- void InfoFrame(); +- void InfoDLL(); +- void InfoFiles(); +- void InfoFPU(); +- void InfoSignals(); ++ void InfoFrame() override; ++ void InfoDLL() override; ++ void InfoFiles() override; ++ void InfoFPU() override; ++ void InfoSignals() override; + +- void EnableCatchingThrow(bool enable); ++ void EnableCatchingThrow(bool enable) override; + +- virtual void SwitchThread(cb_unused size_t threadIndex){} // not implemented ++ void SwitchThread(cb_unused size_t threadIndex) override {} // not implemented + +- virtual void AddBreakpoint(cb::shared_ptr<DebuggerBreakpoint> bp); +- virtual void RemoveBreakpoint(cb::shared_ptr<DebuggerBreakpoint> bp); +- virtual void EvaluateSymbol(const wxString& symbol, const wxRect& tipRect); +- virtual void UpdateWatches(cb::shared_ptr<GDBWatch> localsWatch, +- cb::shared_ptr<GDBWatch> funcArgsWatch, +- WatchesContainer &watches, bool ignoreAutoUpdate); +- virtual void UpdateWatch(cb::shared_ptr<GDBWatch> const &watch); +- virtual void UpdateMemoryRangeWatches(MemoryRangeWatchesContainer &watches, +- bool ignoreAutoUpdate); +- virtual void UpdateMemoryRangeWatch(const cb::shared_ptr<GDBMemoryRangeWatch> &watch); +- virtual void UpdateWatchLocalsArgs(cb::shared_ptr<GDBWatch> const &watch, bool locals); +- virtual void ParseOutput(const wxString& output); +- virtual bool IsDebuggingStarted() const; ++ void AddBreakpoint(cb::shared_ptr<DebuggerBreakpoint> bp) override; ++ void RemoveBreakpoint(cb::shared_ptr<DebuggerBreakpoint> bp) override; ++ void EvaluateSymbol(const wxString& symbol, const wxRect& tipRect) override; ++ void UpdateWatches(cb::shared_ptr<GDBWatch> localsWatch, ++ cb::shared_ptr<GDBWatch> funcArgsWatch, ++ WatchesContainer &watches, bool ignoreAutoUpdate) override; ++ void UpdateWatch(cb::shared_ptr<GDBWatch> const &watch) override; ++ void UpdateMemoryRangeWatches(MemoryRangeWatchesContainer &watches, ++ bool ignoreAutoUpdate) override; ++ void UpdateMemoryRangeWatch(const cb::shared_ptr<GDBMemoryRangeWatch> &watch) override; ++ void UpdateWatchLocalsArgs(cb::shared_ptr<GDBWatch> const &watch, bool locals) override; ++ void ParseOutput(const wxString& output) override; ++ bool IsDebuggingStarted() const override; + #ifdef __WXMSW__ +- virtual bool UseDebugBreakProcess() { return true; } ++ bool UseDebugBreakProcess() override { return true; } + #endif + protected: + private: +diff --git a/src/plugins/debuggergdb/debugger_defs.h b/src/plugins/debuggergdb/debugger_defs.h +index 4564f364f6..d73f0768cd 100644 +--- a/src/plugins/debuggergdb/debugger_defs.h ++++ b/src/plugins/debuggergdb/debugger_defs.h +@@ -95,9 +95,9 @@ class DebuggerInfoCmd : public DebuggerCmd + { + m_Cmd = cmd; + } +- virtual ~DebuggerInfoCmd(){} ++ ~DebuggerInfoCmd() override {} + +- virtual void ParseOutput(const wxString& output); ++ void ParseOutput(const wxString& output) override; + wxString m_Title; + }; + +@@ -110,7 +110,7 @@ class DebuggerContinueBaseCmd : public DebuggerCmd + { + } + +- bool IsContinueCommand() const { return true; } ++ bool IsContinueCommand() const override { return true; } + }; + + /** Action-only debugger command to signal the watches tree to update. */ +@@ -160,15 +160,15 @@ struct DebuggerBreakpoint : cbBreakpoint + {} + + // from cbBreakpoint +- virtual void SetEnabled(bool flag); +- virtual wxString GetLocation() const; +- virtual int GetLine() const; +- virtual wxString GetLineString() const; +- virtual wxString GetType() const; +- virtual wxString GetInfo() const; +- virtual bool IsEnabled() const; +- virtual bool IsVisibleInEditor() const; +- virtual bool IsTemporary() const; ++ void SetEnabled(bool flag) override; ++ wxString GetLocation() const override; ++ int GetLine() const override; ++ wxString GetLineString() const override; ++ wxString GetType() const override; ++ wxString GetInfo() const override; ++ bool IsEnabled() const override; ++ bool IsVisibleInEditor() const override; ++ bool IsTemporary() const override; + + BreakpointType type; ///< The type of this breakpoint. + wxString filename; ///< The filename for the breakpoint (kept as relative). +@@ -217,17 +217,17 @@ class GDBWatch : public cbWatch + { + public: + GDBWatch(wxString const &symbol); +- virtual ~GDBWatch(); ++ ~GDBWatch() override; + public: + +- virtual void GetSymbol(wxString &symbol) const; +- virtual void GetValue(wxString &value) const; +- virtual bool SetValue(const wxString &value); +- virtual void GetFullWatchString(wxString &full_watch) const; +- virtual void GetType(wxString &type) const; +- virtual void SetType(const wxString &type); ++ void GetSymbol(wxString &symbol) const override; ++ void GetValue(wxString &value) const override; ++ bool SetValue(const wxString &value) override; ++ void GetFullWatchString(wxString &full_watch) const override; ++ void GetType(wxString &type) const override; ++ void SetType(const wxString &type) override; + +- virtual wxString GetDebugString() const; ++ wxString GetDebugString() const override; + + wxString MakeSymbolToAddress() const override; + bool IsPointerType() const override; +diff --git a/src/plugins/debuggergdb/debuggergdb.h b/src/plugins/debuggergdb/debuggergdb.h +index f862685cc5..89df6f42f1 100644 +--- a/src/plugins/debuggergdb/debuggergdb.h ++++ b/src/plugins/debuggergdb/debuggergdb.h +@@ -34,90 +34,92 @@ class DebuggerGDB : public cbDebuggerPlugin + DebuggerState m_State; + public: + DebuggerGDB(); +- ~DebuggerGDB(); ++ ~DebuggerGDB() override; + +- cbConfigurationPanel* GetProjectConfigurationPanel(wxWindow* parent, cbProject* project); +- void OnAttachReal(); // fires when the plugin is attached to the application +- void OnReleaseReal(bool appShutDown); // fires when the plugin is released from the application ++ cbConfigurationPanel* GetProjectConfigurationPanel(wxWindow* parent, ++ cbProject* project) override; ++ void OnAttachReal() override; // fires when the plugin is attached to the application ++ void OnReleaseReal(bool appShutDown) override; // fires when the plugin is released from the application + +- bool SupportsFeature(cbDebuggerFeature::Flags flag); ++ bool SupportsFeature(cbDebuggerFeature::Flags flag) override; + +- cbDebuggerConfiguration* LoadConfig(const ConfigManagerWrapper &config); ++ cbDebuggerConfiguration* LoadConfig(const ConfigManagerWrapper &config) override; + + DebuggerConfiguration& GetActiveConfigEx(); + + void RunCommand(int cmd); + +- cb::shared_ptr<cbBreakpoint> AddBreakpoint(const wxString& filename, int line); +- cb::shared_ptr<cbBreakpoint> AddDataBreakpoint(const wxString& dataExpression); +- int GetBreakpointsCount() const; +- cb::shared_ptr<cbBreakpoint> GetBreakpoint(int index); +- cb::shared_ptr<const cbBreakpoint> GetBreakpoint(int index) const; +- void UpdateBreakpoint(cb::shared_ptr<cbBreakpoint> breakpoint); +- void DeleteBreakpoint(cb::shared_ptr<cbBreakpoint> breakpoint); +- void DeleteAllBreakpoints(); +- void ShiftBreakpoint(int index, int lines_to_shift); +- void EnableBreakpoint(cb::shared_ptr<cbBreakpoint> breakpoint, bool enable); ++ cb::shared_ptr<cbBreakpoint> AddBreakpoint(const wxString& filename, int line) override; ++ cb::shared_ptr<cbBreakpoint> AddDataBreakpoint(const wxString& dataExpression) override; ++ int GetBreakpointsCount() const override; ++ cb::shared_ptr<cbBreakpoint> GetBreakpoint(int index) override; ++ cb::shared_ptr<const cbBreakpoint> GetBreakpoint(int index) const override; ++ void UpdateBreakpoint(cb::shared_ptr<cbBreakpoint> breakpoint) override; ++ void DeleteBreakpoint(cb::shared_ptr<cbBreakpoint> breakpoint) override; ++ void DeleteAllBreakpoints() override; ++ void ShiftBreakpoint(int index, int lines_to_shift) override; ++ void EnableBreakpoint(cb::shared_ptr<cbBreakpoint> breakpoint, bool enable) override; + + // stack frame calls; +- int GetStackFrameCount() const; +- cb::shared_ptr<const cbStackFrame> GetStackFrame(int index) const; +- void SwitchToFrame(int number); +- int GetActiveStackFrame() const; ++ int GetStackFrameCount() const override; ++ cb::shared_ptr<const cbStackFrame> GetStackFrame(int index) const override; ++ void SwitchToFrame(int number) override; ++ int GetActiveStackFrame() const override; + + // threads +- int GetThreadsCount() const; +- cb::shared_ptr<const cbThread> GetThread(int index) const; +- bool SwitchToThread(int thread_number); +- +- bool Debug(bool breakOnEntry); +- void Continue(); +- void Next(); +- void NextInstruction(); +- void StepIntoInstruction(); +- void Step(); +- void StepOut(); +- bool RunToCursor(const wxString& filename, int line, const wxString& line_text); +- void SetNextStatement(const wxString& filename, int line); +- void Break(); +- void Stop(); ++ int GetThreadsCount() const override; ++ cb::shared_ptr<const cbThread> GetThread(int index) const override; ++ bool SwitchToThread(int thread_number) override; ++ ++ bool Debug(bool breakOnEntry) override; ++ void Continue() override; ++ void Next() override; ++ void NextInstruction() override; ++ void StepIntoInstruction() override; ++ void Step() override; ++ void StepOut() override; ++ bool RunToCursor(const wxString& filename, int line, const wxString& line_text) override; ++ void SetNextStatement(const wxString& filename, int line) override; ++ void Break() override; ++ void Stop() override; + bool Validate(const wxString& line, const char cb); +- bool IsRunning() const { return m_pProcess; } +- bool IsStopped() const; +- bool IsBusy() const; ++ bool IsRunning() const override { return m_pProcess; } ++ bool IsStopped() const override; ++ bool IsBusy() const override; + bool IsTemporaryBreak() const {return m_TemporaryBreak;} +- int GetExitCode() const { return m_LastExitCode; } ++ int GetExitCode() const override { return m_LastExitCode; } + +- cb::shared_ptr<cbWatch> AddWatch(const wxString& symbol, bool update); ++ cb::shared_ptr<cbWatch> AddWatch(const wxString& symbol, bool update) override; + cb::shared_ptr<cbWatch> AddMemoryRange(uint64_t address, uint64_t size, +- const wxString &symbol, bool update); +- void DeleteWatch(cb::shared_ptr<cbWatch> watch); +- bool HasWatch(cb::shared_ptr<cbWatch> watch); ++ const wxString &symbol, bool update) override; ++ void DeleteWatch(cb::shared_ptr<cbWatch> watch) override; ++ bool HasWatch(cb::shared_ptr<cbWatch> watch) override; + bool IsMemoryRangeWatch(const cb::shared_ptr<cbWatch> &watch); +- void ShowWatchProperties(cb::shared_ptr<cbWatch> watch); +- bool SetWatchValue(cb::shared_ptr<cbWatch> watch, const wxString &value); +- void ExpandWatch(cb::shared_ptr<cbWatch> watch); +- void CollapseWatch(cb::shared_ptr<cbWatch> watch); +- void UpdateWatch(cb::shared_ptr<cbWatch> watch); +- void UpdateWatches(const std::vector<cb::shared_ptr<cbWatch>> &watches); ++ void ShowWatchProperties(cb::shared_ptr<cbWatch> watch) override; ++ bool SetWatchValue(cb::shared_ptr<cbWatch> watch, const wxString &value) override; ++ void ExpandWatch(cb::shared_ptr<cbWatch> watch) override; ++ void CollapseWatch(cb::shared_ptr<cbWatch> watch) override; ++ void UpdateWatch(cb::shared_ptr<cbWatch> watch) override; ++ void UpdateWatches(const std::vector<cb::shared_ptr<cbWatch>> &watches) override; + + void AddWatchNoUpdate(const cb::shared_ptr<GDBWatch> &watch); + +- void OnWatchesContextMenu(wxMenu &menu, const cbWatch &watch, wxObject *property, int &disabledMenus); ++ void OnWatchesContextMenu(wxMenu &menu, const cbWatch &watch, wxObject *property, ++ int &disabledMenus) override; + +- void GetCurrentPosition(wxString &filename, int &line); +- void RequestUpdate(DebugWindows window); ++ void GetCurrentPosition(wxString &filename, int &line) override; ++ void RequestUpdate(DebugWindows window) override; + +- void AttachToProcess(const wxString& pid); +- void DetachFromProcess(); +- bool IsAttachedToProcess() const; ++ void AttachToProcess(const wxString& pid) override; ++ void DetachFromProcess() override; ++ bool IsAttachedToProcess() const override; + +- void SendCommand(const wxString& cmd, bool debugLog); ++ void SendCommand(const wxString& cmd, bool debugLog) override; + void DoSendCommand(const wxString& cmd); + + DebuggerState& GetState(){ return m_State; } + +- void OnConfigurationChange(bool isActive); ++ void OnConfigurationChange(bool isActive) override; + + static wxArrayString ParseSearchDirs(const cbProject &project); + static void SetSearchDirs(cbProject &project, const wxArrayString &dirs); +@@ -125,8 +127,8 @@ class DebuggerGDB : public cbDebuggerPlugin + static RemoteDebuggingMap ParseRemoteDebuggingMap(cbProject &project); + static void SetRemoteDebuggingMap(cbProject &project, const RemoteDebuggingMap &map); + +- void OnValueTooltip(const wxString &token, const wxRect &evalRect); +- bool ShowValueTooltip(int style); ++ void OnValueTooltip(const wxString &token, const wxRect &evalRect) override; ++ bool ShowValueTooltip(int style) override; + + static void ConvertToGDBFriendly(wxString& str); + static void ConvertToGDBFile(wxString& str); +@@ -138,11 +140,11 @@ class DebuggerGDB : public cbDebuggerPlugin + void DetermineLanguage(); + + protected: +- cbProject* GetProject() { return m_pProject; } +- void ResetProject() { m_pProcess = NULL; } +- void ConvertDirectory(wxString& str, wxString base, bool relative); +- void CleanupWhenProjectClosed(cbProject *project); +- bool CompilerFinished(bool compilerFailed, StartType startType); ++ cbProject* GetProject() override { return m_pProject; } ++ void ResetProject() override { m_pProcess = NULL; } ++ void ConvertDirectory(wxString& str, wxString base, bool relative) override; ++ void CleanupWhenProjectClosed(cbProject *project) override; ++ bool CompilerFinished(bool compilerFailed, StartType startType) override; + protected: + void AddSourceDir(const wxString& dir); + private: +@@ -166,7 +168,7 @@ class DebuggerGDB : public cbDebuggerPlugin + void OnShowFile(wxCommandEvent& event); + void OnCursorChanged(wxCommandEvent& event); + +- void SetupToolsMenu(wxMenu &menu); ++ void SetupToolsMenu(wxMenu &menu) override; + void KillConsole(); + void CheckIfConsoleIsClosed(); + +diff --git a/src/plugins/debuggergdb/debuggeroptionsdlg.h b/src/plugins/debuggergdb/debuggeroptionsdlg.h +index 1b358a2094..f5bad3db0f 100644 +--- a/src/plugins/debuggergdb/debuggeroptionsdlg.h ++++ b/src/plugins/debuggergdb/debuggeroptionsdlg.h +@@ -15,9 +15,9 @@ class DebuggerConfiguration : public cbDebuggerConfiguration + public: + explicit DebuggerConfiguration(const ConfigManagerWrapper &config); + +- virtual cbDebuggerConfiguration* Clone() const; +- virtual wxPanel* MakePanel(wxWindow *parent); +- virtual bool SaveChanges(wxPanel *panel); ++ cbDebuggerConfiguration* Clone() const override; ++ wxPanel* MakePanel(wxWindow *parent) override; ++ bool SaveChanges(wxPanel *panel) override; + public: + enum Flags + { +diff --git a/src/plugins/debuggergdb/debuggeroptionsprjdlg.h b/src/plugins/debuggergdb/debuggeroptionsprjdlg.h +index 70aa74bef2..5ceb142441 100644 +--- a/src/plugins/debuggergdb/debuggeroptionsprjdlg.h ++++ b/src/plugins/debuggergdb/debuggeroptionsprjdlg.h +@@ -21,12 +21,12 @@ class DebuggerOptionsProjectDlg : public cbConfigurationPanel + { + public: + DebuggerOptionsProjectDlg(wxWindow* parent, DebuggerGDB* debugger, cbProject* project); +- virtual ~DebuggerOptionsProjectDlg(); ++ ~DebuggerOptionsProjectDlg() override; + +- virtual wxString GetTitle() const { return _("Debugger"); } +- virtual wxString GetBitmapBaseName() const { return _T("debugger"); } +- virtual void OnApply(); +- virtual void OnCancel(){} ++ wxString GetTitle() const override { return _("Debugger"); } ++ wxString GetBitmapBaseName() const override { return _T("debugger"); } ++ void OnApply() override; ++ void OnCancel() override {} + protected: + void OnTargetSel(wxCommandEvent& event); + void OnAdd(wxCommandEvent& event); +diff --git a/src/plugins/debuggergdb/editbreakpointdlg.h b/src/plugins/debuggergdb/editbreakpointdlg.h +index a1949a61da..054485c3f3 100644 +--- a/src/plugins/debuggergdb/editbreakpointdlg.h ++++ b/src/plugins/debuggergdb/editbreakpointdlg.h +@@ -13,12 +13,12 @@ class EditBreakpointDlg : public wxScrollingDialog + { + public: + EditBreakpointDlg(const DebuggerBreakpoint &breakpoint, wxWindow* parent = 0); +- virtual ~EditBreakpointDlg(); ++ ~EditBreakpointDlg() override; + + const DebuggerBreakpoint& GetBreakpoint() const { return m_breakpoint; } + protected: + void OnUpdateUI(wxUpdateUIEvent& event); +- void EndModal(int retCode); ++ void EndModal(int retCode) override; + + DebuggerBreakpoint m_breakpoint; + private: +diff --git a/src/plugins/debuggergdb/editwatchdlg.h b/src/plugins/debuggergdb/editwatchdlg.h +index c157009e7c..561dcbc87b 100644 +--- a/src/plugins/debuggergdb/editwatchdlg.h ++++ b/src/plugins/debuggergdb/editwatchdlg.h +@@ -14,10 +14,10 @@ class EditWatchDlg : public wxScrollingDialog + { + public: + EditWatchDlg(cb::shared_ptr<GDBWatch> w, wxWindow* parent); +- virtual ~EditWatchDlg(); ++ ~EditWatchDlg() override; + + protected: +- void EndModal(int retCode); ++ void EndModal(int retCode) override; + + cb::shared_ptr<GDBWatch> m_watch; + }; +diff --git a/src/plugins/debuggergdb/gdb_commands.h b/src/plugins/debuggergdb/gdb_commands.h +index bceb51ada7..cd564b29c9 100644 +--- a/src/plugins/debuggergdb/gdb_commands.h ++++ b/src/plugins/debuggergdb/gdb_commands.h +@@ -232,7 +232,7 @@ class GdbCmd_AddSourceDir : public DebuggerCmd + { + m_Cmd << _T("directory ") << dir; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // Output: + // Warning: C:\Devel\tmp\console\111: No such file or directory. +@@ -254,7 +254,7 @@ class GdbCmd_SetDebuggee : public DebuggerCmd + { + m_Cmd << _T("file ") << file; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // Output: + // Reading symbols from C:\Devel\tmp\console/console.exe...done. +@@ -278,7 +278,7 @@ class GdbCmd_AddSymbolFile : public DebuggerCmd + { + m_Cmd << _T("add-symbol-file ") << file; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // Output: + // +@@ -306,7 +306,7 @@ class GdbCmd_SetArguments : public DebuggerCmd + { + m_Cmd << _T("set args ") << args; + } +- void ParseOutput(cb_unused const wxString& output) ++ void ParseOutput(cb_unused const wxString& output) override + { + // No output + } +@@ -325,7 +325,7 @@ class GdbCmd_AttachToProcess : public DebuggerCmd + m_Cmd << _T("attach ") << wxString::Format(_T("%d"), pid); + m_pDriver->Log(wxString::Format(_("Attaching to program with pid: %d"), pid)); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // Output: + // Attaching to process <pid> +@@ -364,7 +364,7 @@ class GdbCmd_Detach : public DebuggerCmd + { + m_Cmd << _T("detach"); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // Output: + // Attaching to process <pid> +@@ -397,7 +397,7 @@ class GdbCmd_AddBreakpointCondition : public DebuggerCmd + if (m_BP->useCondition) + m_Cmd << _T(" ") << m_BP->condition; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + if (output.StartsWith(_T("No symbol "))) + { +@@ -478,7 +478,7 @@ class GdbCmd_AddBreakpoint : public DebuggerCmd + // condition and ignore count will be set in ParseOutput, where we 'll have the bp number + } + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // possible outputs (we 're only interested in 1st and 2nd samples): + // +@@ -564,7 +564,7 @@ class GdbCmd_AddDataBreakpoint : public DebuggerCmd + if (m_BP->enabled) + m_Cmd << _T("output &") << m_BP->breakAddress; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // Hardware watchpoint 1: expr + if (output.StartsWith(_T("No symbol ")) || output.StartsWith(_T("Attempt to "))) +@@ -605,7 +605,7 @@ class GdbCmd_RemoveBreakpoint : public DebuggerCmd + m_Cmd << _T("delete breakpoints ") << wxString::Format(_T("%d"), (int) bp->index); + } + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + if (!m_BP) + return; +@@ -643,7 +643,7 @@ class GdbCmd_SetCatch : public DebuggerCmd + m_Cmd = wxT("catch ") + type; + } + +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + if (m_regExp.Matches(output)) + { +@@ -666,7 +666,7 @@ class GdbCmd_Continue : public DebuggerContinueBaseCmd + { + } + +- virtual void Action() ++ void Action() override + { + m_pDriver->NotifyDebuggeeContinued(); + } +@@ -680,7 +680,7 @@ class GdbCmd_Start : public DebuggerContinueBaseCmd + { + } + +- virtual void ParseOutput(const wxString &output) ++ void ParseOutput(const wxString &output) override + { + const wxArrayString &lines = GetArrayFromString(output, _T('\n')); + for (size_t ii = 0; ii < lines.GetCount(); ++ii) +@@ -710,7 +710,7 @@ class GdbCmd_InfoProgram : public DebuggerCmd + { + m_Cmd << _T("info program"); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + wxString pid_str; + if (reInfoProgramThread.Matches(output)) +@@ -739,7 +739,7 @@ class GdbCmd_Threads : public DebuggerCmd + { + m_Cmd << _T("info threads"); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + m_pDriver->GetThreads().clear(); + wxArrayString lines = GetArrayFromString(output, _T('\n')); +@@ -831,7 +831,7 @@ class GdbCmd_Watch : public DebuggerCmd + m_Cmd << symbol; + } + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + wxString w = output; + w.Trim(true); +@@ -873,7 +873,7 @@ class GdbCmd_MemoryRangeWatch : public DebuggerCmd + m_Cmd = wxString(wxT("x /")) << wxString::FromUTF8(tmpSize) << wxT("xb ") << wxString::FromUTF8(tmpAddr); + } + +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + wxArrayString lines = GetArrayFromString(output, _T('\n')); + wxString addr; +@@ -915,7 +915,7 @@ class GdbCmd_FindWatchType : public DebuggerCmd + m_watch->GetSymbol(symbol); + m_Cmd << symbol; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // happens, when wxString is passed as const reference parameter + if (m_firstTry && output == wxT("Attempt to take contents of a non-pointer value.")) +@@ -988,7 +988,7 @@ class GdbCmd_TooltipEvaluation : public DebuggerCmd + m_Cmd << wxT("output "); + m_Cmd << m_What; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + wxString contents = output; + contents.Trim(true); +@@ -1044,7 +1044,7 @@ class GdbCmd_FindTooltipAddress : public DebuggerCmd + m_Cmd << _T('&'); + m_Cmd << m_What; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // examples: + // type = wxString +@@ -1087,7 +1087,7 @@ class GdbCmd_FindTooltipType : public DebuggerCmd + { + singleUsage = false; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // examples: + // type = wxString +@@ -1119,7 +1119,7 @@ class GdbCmd_LocalsFuncArgs : public DebuggerCmd + else + m_Cmd = wxT("info args"); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + if ((m_doLocals && output == wxT("No locals.")) || (!m_doLocals && output == wxT("No arguments."))) + { +@@ -1158,7 +1158,7 @@ class GdbCmd_ChangeFrame : public DebuggerCmd + { + m_Cmd << _T("frame ") << frameno; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + m_pDriver->Log(output); + } +@@ -1175,7 +1175,7 @@ class GdbCmd_Backtrace : public DebuggerCmd + { + m_Cmd << _T("bt 30"); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + int validFrameNumber = -1; + cbStackFrame validSF; +@@ -1321,7 +1321,7 @@ class GdbCmd_InfoRegisters : public DebuggerCmd + m_Cmd << _T("info registers"); + }; + +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // output is a series of: + // +@@ -1468,7 +1468,7 @@ class GdbCmd_Disassembly : public DebuggerCmd + else + m_Cmd << wxT(" 0x") << hexAddrStr; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // output for "disassemble" is a series of: + // +@@ -1559,7 +1559,7 @@ class GdbCmd_DisassemblyInit : public DebuggerCmd + m_Cmd << _T("info frame\n") << _T("end\n"); + }; + +- void ParseOutput(const wxString& p_output) ++ void ParseOutput(const wxString& p_output) override + { + cbDisassemblyDlg *dialog = Manager::Get()->GetDebuggerManager()->GetDisassemblyDialog(); + +@@ -1652,7 +1652,7 @@ class GdbCmd_ExamineMemory : public DebuggerCmd + const wxString &address = CleanStringValue(dialog->GetBaseAddress()); + m_Cmd.Printf(_T("x/%dxb %s"), dialog->GetBytes(), address.c_str()); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + cbExamineMemoryDlg *dialog = Manager::Get()->GetDebuggerManager()->GetExamineMemoryDialog(); + +@@ -1693,7 +1693,7 @@ class GdbCmd_RemoteBaud : public DebuggerCmd + m_Cmd << _T("set remotebaud ") << baud; + driver->Log(_("Setting serial connection speed to ") + baud); + } +- void ParseOutput(cb_unused const wxString& output) ++ void ParseOutput(cb_unused const wxString& output) override + { + } + }; +@@ -1738,7 +1738,7 @@ class GdbCmd_RemoteTarget : public DebuggerCmd + else + m_pDriver->Log(_("Invalid settings for remote debugging!")); + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + // This command will either output an error or a breakpoint address info + // Connection errors are of the form: +@@ -1802,7 +1802,7 @@ class GdbCmd_StepOrNextInstruction : public DebuggerContinueBaseCmd + { + m_Cmd << command; + } +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + DebuggerManager *manager = Manager::Get()->GetDebuggerManager(); + if (!manager->UpdateDisassembly()) +@@ -1867,7 +1867,7 @@ class GdbCmd_FindCursor : public DebuggerCmd + { + } + +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + const wxArrayString &lines = GetArrayFromString(output, _T('\n')); + if (lines.Count() <= 2) +@@ -1915,7 +1915,7 @@ class GdbCmd_DebugLanguage : public DebuggerCmd + m_Cmd << _T("show language"); + } + +- void ParseOutput(const wxString& output) ++ void ParseOutput(const wxString& output) override + { + if (output.Lower().Find(wxT("fortran")) != wxNOT_FOUND) + g_DebugLanguage = dl_Fortran; +diff --git a/src/plugins/debuggergdb/gdb_driver.h b/src/plugins/debuggergdb/gdb_driver.h +index e3617cffbc..16ecb6e924 100644 +--- a/src/plugins/debuggergdb/gdb_driver.h ++++ b/src/plugins/debuggergdb/gdb_driver.h +@@ -14,62 +14,62 @@ class GDB_driver : public DebuggerDriver + { + public: + GDB_driver(DebuggerGDB* plugin); +- virtual ~GDB_driver(); +- +- virtual wxString GetCommandLine(const wxString& debugger, +- const wxString& debuggee, +- const wxString &userArguments); +- virtual wxString GetCommandLine(const wxString& debugger, int pid, const wxString &userArguments); +- virtual void SetTarget(ProjectBuildTarget* target); +- virtual void Prepare(bool isConsole, int printElements, const RemoteDebugging &remoteDebugging); +- virtual void Start(bool breakOnEntry); +- virtual void Stop(); +- +- virtual void Continue(); +- virtual void Step(); +- virtual void StepInstruction(); +- virtual void StepIntoInstruction(); +- virtual void StepIn(); +- virtual void StepOut(); +- virtual void SetNextStatement(const wxString& filename, int line); +- virtual void Backtrace(); +- virtual void Disassemble(); +- virtual void CPURegisters(); +- virtual void SwitchToFrame(size_t number); +- virtual void SetVarValue(const wxString& var, const wxString& value); +- virtual void SetMemoryRangeValue(uint64_t addr, const wxString& value); +- virtual void MemoryDump(); +- virtual void Attach(int pid); +- virtual void Detach(); +- virtual void RunningThreads(); +- +- void InfoFrame(); +- void InfoDLL(); +- void InfoFiles(); +- void InfoFPU(); +- void InfoSignals(); +- +- void EnableCatchingThrow(bool enable); +- +- virtual void SwitchThread(size_t threadIndex); +- +- virtual void AddBreakpoint(cb::shared_ptr<DebuggerBreakpoint> bp); +- virtual void RemoveBreakpoint(cb::shared_ptr<DebuggerBreakpoint> bp); +- virtual void EvaluateSymbol(const wxString& symbol, const wxRect& tipRect); +- virtual void UpdateWatches(cb::shared_ptr<GDBWatch> localsWatch, +- cb::shared_ptr<GDBWatch> funcArgsWatch, +- WatchesContainer &watches, bool ignoreAutoUpdate); +- virtual void UpdateMemoryRangeWatches(MemoryRangeWatchesContainer &watches, +- bool ignoreAutoUpdate); +- virtual void UpdateWatch(const cb::shared_ptr<GDBWatch> &watch); +- virtual void UpdateMemoryRangeWatch(const cb::shared_ptr<GDBMemoryRangeWatch> &watch); +- virtual void UpdateWatchLocalsArgs(cb::shared_ptr<GDBWatch> const &watch, bool locals); +- virtual void ParseOutput(const wxString& output); +- virtual bool IsDebuggingStarted() const { return m_IsStarted; } +- +- virtual void DetermineLanguage(); ++ ~GDB_driver() override; ++ ++ wxString GetCommandLine(const wxString& debugger, const wxString& debuggee, ++ const wxString &userArguments) override; ++ wxString GetCommandLine(const wxString& debugger, int pid, ++ const wxString &userArguments) override; ++ void SetTarget(ProjectBuildTarget* target) override; ++ void Prepare(bool isConsole, int printElements, const RemoteDebugging &remoteDebugging) override; ++ void Start(bool breakOnEntry) override; ++ void Stop() override; ++ ++ void Continue() override; ++ void Step() override; ++ void StepInstruction() override; ++ void StepIntoInstruction() override; ++ void StepIn() override; ++ void StepOut() override; ++ void SetNextStatement(const wxString& filename, int line) override; ++ void Backtrace() override; ++ void Disassemble() override; ++ void CPURegisters() override; ++ void SwitchToFrame(size_t number) override; ++ void SetVarValue(const wxString& var, const wxString& value) override; ++ void SetMemoryRangeValue(uint64_t addr, const wxString& value) override; ++ void MemoryDump() override; ++ void Attach(int pid) override; ++ void Detach() override; ++ void RunningThreads() override; ++ ++ void InfoFrame() override; ++ void InfoDLL() override; ++ void InfoFiles() override; ++ void InfoFPU() override; ++ void InfoSignals() override; ++ ++ void EnableCatchingThrow(bool enable) override; ++ ++ void SwitchThread(size_t threadIndex) override; ++ ++ void AddBreakpoint(cb::shared_ptr<DebuggerBreakpoint> bp) override; ++ void RemoveBreakpoint(cb::shared_ptr<DebuggerBreakpoint> bp) override; ++ void EvaluateSymbol(const wxString& symbol, const wxRect& tipRect) override; ++ void UpdateWatches(cb::shared_ptr<GDBWatch> localsWatch, ++ cb::shared_ptr<GDBWatch> funcArgsWatch, WatchesContainer &watches, ++ bool ignoreAutoUpdate) override; ++ void UpdateMemoryRangeWatches(MemoryRangeWatchesContainer &watches, ++ bool ignoreAutoUpdate) override; ++ void UpdateWatch(const cb::shared_ptr<GDBWatch> &watch) override; ++ void UpdateMemoryRangeWatch(const cb::shared_ptr<GDBMemoryRangeWatch> &watch) override; ++ void UpdateWatchLocalsArgs(cb::shared_ptr<GDBWatch> const &watch, bool locals) override; ++ void ParseOutput(const wxString& output) override; ++ bool IsDebuggingStarted() const override { return m_IsStarted; } ++ ++ void DetermineLanguage() override; + #ifdef __WXMSW__ +- virtual bool UseDebugBreakProcess(); ++ bool UseDebugBreakProcess() override; + #endif + virtual wxString GetDisassemblyFlavour(void); + +diff --git a/src/plugins/defaultmimehandler/defaultmimehandler.h b/src/plugins/defaultmimehandler/defaultmimehandler.h +index 916d95dee1..d1cb928b59 100644 +--- a/src/plugins/defaultmimehandler/defaultmimehandler.h ++++ b/src/plugins/defaultmimehandler/defaultmimehandler.h +@@ -15,14 +15,14 @@ class DefaultMimeHandler : public cbMimePlugin + { + public: + DefaultMimeHandler(); +- ~DefaultMimeHandler(); +- int GetConfigurationGroup() const { return cgCorePlugin; } +- cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent); +- bool HandlesEverything() const { return true; } +- bool CanHandleFile(const wxString& filename) const; +- int OpenFile(const wxString& filename); +- void OnAttach(); // fires when the plugin is attached to the application +- void OnRelease(bool appShutDown); // fires when the plugin is released from the application ++ ~DefaultMimeHandler() override; ++ int GetConfigurationGroup() const override { return cgCorePlugin; } ++ cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent) override; ++ bool HandlesEverything() const override { return true; } ++ bool CanHandleFile(const wxString& filename) const override; ++ int OpenFile(const wxString& filename) override; ++ void OnAttach() override; // fires when the plugin is attached to the application ++ void OnRelease(bool appShutDown) override; // fires when the plugin is released from the application + private: + cbMimeType* FindMimeTypeFor(const wxString& filename); + wxString ChooseExternalProgram(); +diff --git a/src/plugins/defaultmimehandler/editmimetypesdlg.h b/src/plugins/defaultmimehandler/editmimetypesdlg.h +index 62f00fbaeb..9744a8d5d4 100644 +--- a/src/plugins/defaultmimehandler/editmimetypesdlg.h ++++ b/src/plugins/defaultmimehandler/editmimetypesdlg.h +@@ -14,12 +14,12 @@ class EditMimeTypesDlg : public cbConfigurationPanel + { + public: + EditMimeTypesDlg(wxWindow* parent, MimeTypesArray& array); +- virtual ~EditMimeTypesDlg(); ++ ~EditMimeTypesDlg() override; + +- virtual wxString GetTitle() const { return _("Files extension handling"); } +- virtual wxString GetBitmapBaseName() const { return _T("extensions"); } +- virtual void OnApply(); +- virtual void OnCancel(){} ++ wxString GetTitle() const override { return _("Files extension handling"); } ++ wxString GetBitmapBaseName() const override { return _T("extensions"); } ++ void OnApply() override; ++ void OnCancel() override {} + private: + void FillList(); + void UpdateDisplay(); +diff --git a/src/plugins/occurrenceshighlighting/occurrenceshighlighting.h b/src/plugins/occurrenceshighlighting/occurrenceshighlighting.h +index 8337a4a482..675979a6d9 100644 +--- a/src/plugins/occurrenceshighlighting/occurrenceshighlighting.h ++++ b/src/plugins/occurrenceshighlighting/occurrenceshighlighting.h +@@ -24,19 +24,20 @@ class OccurrencesHighlighting : public cbPlugin + { + public: + OccurrencesHighlighting(); +- virtual ~OccurrencesHighlighting(); ++ ~OccurrencesHighlighting() override; + +- virtual void BuildMenu(wxMenuBar* menuBar); +- virtual void BuildModuleMenu(const ModuleType type, wxMenu* menu, const FileTreeData* data = 0); +- virtual bool BuildToolBar(cb_unused wxToolBar* toolBar){ return false; } +- virtual cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent); +- virtual int GetConfigurationPriority() const { return 50; } +- virtual int GetConfigurationGroup() const { return cgEditor; } ++ void BuildMenu(wxMenuBar* menuBar) override; ++ void BuildModuleMenu(const ModuleType type, wxMenu* menu, ++ const FileTreeData* data = nullptr) override; ++ bool BuildToolBar(cb_unused wxToolBar* toolBar) override { return false; } ++ cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent) override; ++ int GetConfigurationPriority() const override { return 50; } ++ int GetConfigurationGroup() const override { return cgEditor; } + + + protected: +- virtual void OnAttach(); +- virtual void OnRelease(bool appShutDown); ++ void OnAttach() override; ++ void OnRelease(bool appShutDown) override; + + private: + void OnListKeyDown(wxListEvent &event); +diff --git a/src/plugins/occurrenceshighlighting/occurrenceshighlightingconfigurationpanel.h b/src/plugins/occurrenceshighlighting/occurrenceshighlightingconfigurationpanel.h +index 2b6a6b68b0..bcd4c5bfcd 100644 +--- a/src/plugins/occurrenceshighlighting/occurrenceshighlightingconfigurationpanel.h ++++ b/src/plugins/occurrenceshighlighting/occurrenceshighlightingconfigurationpanel.h +@@ -17,16 +17,16 @@ class OccurrencesHighlightingConfigurationPanel : public cbConfigurationPanel + { + public: + OccurrencesHighlightingConfigurationPanel(wxWindow* parent); +- virtual ~OccurrencesHighlightingConfigurationPanel(); ++ ~OccurrencesHighlightingConfigurationPanel() override; + + /// @return the panel's title. +- virtual wxString GetTitle() const; ++ wxString GetTitle() const override; + /// @return the panel's bitmap base name. You must supply two bitmaps: \<basename\>.png and \<basename\>-off.png... +- virtual wxString GetBitmapBaseName() const; ++ wxString GetBitmapBaseName() const override; + /// Called when the user chooses to apply the configuration. +- virtual void OnApply(); ++ void OnApply() override; + /// Called when the user chooses to cancel the configuration. +- virtual void OnCancel(); ++ void OnCancel() override; + + private: + void OnChooseColour(wxCommandEvent& event); +diff --git a/src/plugins/openfileslist/openfileslistplugin.h b/src/plugins/openfileslist/openfileslistplugin.h +index 7fd7a951af..c59d67ba1e 100644 +--- a/src/plugins/openfileslist/openfileslistplugin.h ++++ b/src/plugins/openfileslist/openfileslistplugin.h +@@ -38,14 +38,14 @@ class OpenFilesListPlugin : public cbPlugin + { + public: + OpenFilesListPlugin(); +- virtual ~OpenFilesListPlugin(); ++ ~OpenFilesListPlugin() override; + +- virtual int GetConfigurationGroup() const { return cgEditor; } ++ int GetConfigurationGroup() const override { return cgEditor; } + +- virtual void BuildMenu(wxMenuBar* menuBar); ++ void BuildMenu(wxMenuBar* menuBar) override; + +- virtual void OnAttach(); +- virtual void OnRelease(bool appShutDown); ++ void OnAttach() override; ++ void OnRelease(bool appShutDown) override; + protected: + int GetOpenFilesListIcon(EditorBase* ed); + void RebuildOpenFilesTree(); +diff --git a/src/plugins/projectsimporter/devcpploader.h b/src/plugins/projectsimporter/devcpploader.h +index ffdbebd20d..3870d8d318 100644 +--- a/src/plugins/projectsimporter/devcpploader.h ++++ b/src/plugins/projectsimporter/devcpploader.h +@@ -15,10 +15,10 @@ class DevCppLoader : public IBaseLoader + { + public: + DevCppLoader(cbProject* project); +- virtual ~DevCppLoader(); ++ ~DevCppLoader() override; + +- bool Open(const wxString& filename); +- bool Save(const wxString& filename); ++ bool Open(const wxString& filename) override; ++ bool Save(const wxString& filename) override; + protected: + cbProject* m_pProject; + private: +diff --git a/src/plugins/projectsimporter/msvc10loader.h b/src/plugins/projectsimporter/msvc10loader.h +index f1c2bab827..26ccfe1379 100644 +--- a/src/plugins/projectsimporter/msvc10loader.h ++++ b/src/plugins/projectsimporter/msvc10loader.h +@@ -20,10 +20,10 @@ class MSVC10Loader : public IBaseLoader + // default %(AdditionalDependencies), not sure if "winmm" and "comctl32" are part of them + static const wxString g_AdditionalDependencies; + MSVC10Loader(cbProject* project); +- virtual ~MSVC10Loader(); ++ ~MSVC10Loader() override; + +- bool Open(const wxString& filename); +- bool Save(const wxString& filename); ++ bool Open(const wxString& filename) override; ++ bool Save(const wxString& filename) override; + protected: + cbProject* m_pProject; + char m_ConvertSwitches; +diff --git a/src/plugins/projectsimporter/msvc7loader.h b/src/plugins/projectsimporter/msvc7loader.h +index aaf76727c1..9b17438615 100644 +--- a/src/plugins/projectsimporter/msvc7loader.h ++++ b/src/plugins/projectsimporter/msvc7loader.h +@@ -21,10 +21,10 @@ class MSVC7Loader : public IBaseLoader + { + public: + MSVC7Loader(cbProject* project); +- virtual ~MSVC7Loader(); ++ ~MSVC7Loader() override; + +- bool Open(const wxString& filename); +- bool Save(const wxString& filename); ++ bool Open(const wxString& filename) override; ++ bool Save(const wxString& filename) override; + protected: + cbProject* m_pProject; + bool m_ConvertSwitches; +diff --git a/src/plugins/projectsimporter/msvc7workspaceloader.h b/src/plugins/projectsimporter/msvc7workspaceloader.h +index 2a4a19d52b..4e417383c7 100644 +--- a/src/plugins/projectsimporter/msvc7workspaceloader.h ++++ b/src/plugins/projectsimporter/msvc7workspaceloader.h +@@ -14,10 +14,10 @@ class MSVC7WorkspaceLoader : public IBaseWorkspaceLoader, public MSVCWorkspaceBa + public: + static wxString g_WorkspacePath; //!< @note : maybe put into ImportersGlobals (importers_globals.h in SDK include, who ever put it there...) + MSVC7WorkspaceLoader(); +- virtual ~MSVC7WorkspaceLoader(); ++ ~MSVC7WorkspaceLoader() override; + +- bool Open(const wxString& filename, wxString& Title); +- bool Save(const wxString& title, const wxString& filename); ++ bool Open(const wxString& filename, wxString& Title) override; ++ bool Save(const wxString& title, const wxString& filename) override; + }; + + #endif // MSVC7WORKSPACELOADER_H +diff --git a/src/plugins/projectsimporter/msvcloader.h b/src/plugins/projectsimporter/msvcloader.h +index 95149e83e5..86958a03b4 100644 +--- a/src/plugins/projectsimporter/msvcloader.h ++++ b/src/plugins/projectsimporter/msvcloader.h +@@ -20,10 +20,10 @@ class MSVCLoader : public IBaseLoader + { + public: + MSVCLoader(cbProject* project); +- virtual ~MSVCLoader(); ++ ~MSVCLoader() override; + +- bool Open(const wxString& filename); +- bool Save(const wxString& filename); ++ bool Open(const wxString& filename) override; ++ bool Save(const wxString& filename) override; + protected: + bool ReadConfigurations(); + bool ParseConfiguration(int index); +diff --git a/src/plugins/projectsimporter/msvcworkspaceloader.h b/src/plugins/projectsimporter/msvcworkspaceloader.h +index 8236fe7fec..3257878071 100644 +--- a/src/plugins/projectsimporter/msvcworkspaceloader.h ++++ b/src/plugins/projectsimporter/msvcworkspaceloader.h +@@ -13,10 +13,10 @@ class MSVCWorkspaceLoader : public IBaseWorkspaceLoader, public MSVCWorkspaceBas + { + public: + MSVCWorkspaceLoader(); +- virtual ~MSVCWorkspaceLoader(); ++ ~MSVCWorkspaceLoader() override; + +- bool Open(const wxString& filename, wxString& Title); +- bool Save(const wxString& title, const wxString& filename); ++ bool Open(const wxString& filename, wxString& Title) override; ++ bool Save(const wxString& title, const wxString& filename) override; + }; + + #endif // MSVCWORKSPACELOADER_H +diff --git a/src/plugins/projectsimporter/projectsimporter.h b/src/plugins/projectsimporter/projectsimporter.h +index fd580aa740..19805f4a10 100644 +--- a/src/plugins/projectsimporter/projectsimporter.h ++++ b/src/plugins/projectsimporter/projectsimporter.h +@@ -12,11 +12,11 @@ class ProjectsImporter : public cbMimePlugin + { + public: + ProjectsImporter(); +- ~ProjectsImporter(); +- bool HandlesEverything() const { return false; } +- bool CanHandleFile(const wxString& filename) const; +- int OpenFile(const wxString& filename); +- void BuildMenu(wxMenuBar* menuBar); ++ ~ProjectsImporter() override; ++ bool HandlesEverything() const override { return false; } ++ bool CanHandleFile(const wxString& filename) const override; ++ int OpenFile(const wxString& filename) override; ++ void BuildMenu(wxMenuBar* menuBar) override; + private: + int LoadProject(const wxString& filename); + int LoadWorkspace(const wxString& filename); +diff --git a/src/plugins/scriptedwizard/projectpathpanel.h b/src/plugins/scriptedwizard/projectpathpanel.h +index aa21f83984..6822aa5a39 100644 +--- a/src/plugins/scriptedwizard/projectpathpanel.h ++++ b/src/plugins/scriptedwizard/projectpathpanel.h +@@ -22,7 +22,7 @@ class ProjectPathPanel: public wxPanel + public: + + ProjectPathPanel(wxWindow* parent,wxWindowID id = -1); +- virtual ~ProjectPathPanel(); ++ ~ProjectPathPanel() override; + + void SetPath(const wxString& path) + { +@@ -35,7 +35,7 @@ class ProjectPathPanel: public wxPanel + //wxString GetName(){ return txtPrjName->GetValue(); } + // NOTE (Biplab#1#): This is a temporary fix. This function + // need to be renamed according to it's visual representation +- wxString GetName() const { return txtPrjTitle->GetValue(); } ++ wxString GetName() const override { return txtPrjTitle->GetValue(); } + wxString GetFullFileName() const { return txtFinalDir->GetValue(); } + wxString GetTitle() const { return txtPrjTitle->GetValue(); } + +@@ -54,7 +54,7 @@ class ProjectPathPanel: public wxPanel + + private: + +- void Update(); ++ void Update() override; + void UpdateFromResulting(); + bool m_LockUpdates; + +diff --git a/src/plugins/scriptedwizard/wiz.h b/src/plugins/scriptedwizard/wiz.h +index bd6c8e65a9..aaa60b5545 100644 +--- a/src/plugins/scriptedwizard/wiz.h ++++ b/src/plugins/scriptedwizard/wiz.h +@@ -39,7 +39,7 @@ class Wiz : public cbWizardPlugin + { + public: + Wiz(); +- ~Wiz(); ++ ~Wiz() override; + + Wiz& operator=(cb_unused const Wiz& rhs) // prevent assignment operator + { +@@ -47,14 +47,14 @@ class Wiz : public cbWizardPlugin + return *this; + } + +- int GetCount() const; +- TemplateOutputType GetOutputType(int index) const; +- wxString GetTitle(int index) const; +- wxString GetDescription(int index) const; +- wxString GetCategory(int index) const; +- const wxBitmap& GetBitmap(int index) const; +- wxString GetScriptFilename(int index) const; +- CompileTargetBase* Launch(int index, wxString* pFilename = 0); ++ int GetCount() const override; ++ TemplateOutputType GetOutputType(int index) const override; ++ wxString GetTitle(int index) const override; ++ wxString GetDescription(int index) const override; ++ wxString GetCategory(int index) const override; ++ const wxBitmap& GetBitmap(int index) const override; ++ wxString GetScriptFilename(int index) const override; ++ CompileTargetBase* Launch(int index, wxString* pFilename = 0) override; + + CompileTargetBase* RunProjectWizard(wxString* pFilename); // called by Launch() for otProject wizards + CompileTargetBase* RunTargetWizard(wxString* pFilename); // called by Launch() for otTarget wizards (always returns NULL) +@@ -171,7 +171,7 @@ class Wiz : public cbWizardPlugin + void RegisterWizard(); + wxString FindTemplateFile(const wxString& filename); + protected: +- void OnAttach(); ++ void OnAttach() override; + void Clear(); + void CopyFiles(cbProject* theproject, const wxString& prjdir, const wxString& srcdir); + wxString GenerateFile(const wxString& basePath, const wxString& filename, const wxString& contents); +diff --git a/src/plugins/scriptedwizard/wizpage.h b/src/plugins/scriptedwizard/wizpage.h +index 5ac6204c45..7aff6d7393 100644 +--- a/src/plugins/scriptedwizard/wizpage.h ++++ b/src/plugins/scriptedwizard/wizpage.h +@@ -34,15 +34,15 @@ class WizPageBase : public wxWizardPageSimple + { + public: + WizPageBase(const wxString& pageName, wxWizard* parent, const wxBitmap& bitmap = wxNullBitmap); +- ~WizPageBase(); ++ ~WizPageBase() override; + + virtual bool SkipPage() const { return m_SkipPage; } // default: false + + virtual void OnPageChanging(wxWizardEvent& event); + virtual void OnPageChanged(wxWizardEvent& event); + +- virtual wxWizardPage* GetPrev() const; +- virtual wxWizardPage* GetNext() const; ++ wxWizardPage* GetPrev() const override; ++ wxWizardPage* GetNext() const override; + wxString GetPageName() const {return m_PageName;} + bool GetSkipPage() const {return m_SkipPage;} + void SetSkipPage(bool skip) {m_SkipPage = skip;} +@@ -69,9 +69,9 @@ class WizInfoPanel : public WizPageBase + { + public: + WizInfoPanel(const wxString& pageId, const wxString& intro_msg, wxWizard* parent, const wxBitmap& bitmap = wxNullBitmap); +- ~WizInfoPanel(); ++ ~WizInfoPanel() override; + +- virtual void OnPageChanging(wxWizardEvent& event); ++ void OnPageChanging(wxWizardEvent& event) override; + private: + InfoPanel* m_InfoPanel; + }; +@@ -80,7 +80,7 @@ class WizFilePathPanel : public WizPageBase + { + public: + WizFilePathPanel(bool showHeaderGuard, wxWizard* parent, const wxBitmap& bitmap = wxNullBitmap); +- ~WizFilePathPanel(); ++ ~WizFilePathPanel() override; + + wxString GetFilename() const { return m_Filename; } + wxString GetHeaderGuard() const { return m_HeaderGuard; } +@@ -88,7 +88,7 @@ class WizFilePathPanel : public WizPageBase + int GetTargetIndex() const; + void SetFilePathSelectionFilter(const wxString& filter); + +- void OnPageChanging(wxWizardEvent& event); ++ void OnPageChanging(wxWizardEvent& event) override; + private: + FilePathPanel* m_pFilePathPanel; + wxString m_Filename; +@@ -100,16 +100,16 @@ class WizProjectPathPanel : public WizPageBase + { + public: + WizProjectPathPanel(wxWizard* parent, const wxBitmap& bitmap = wxNullBitmap); +- ~WizProjectPathPanel(); ++ ~WizProjectPathPanel() override; + + wxString GetPath() const; +- wxString GetName() const; ++ wxString GetName() const override; + wxString GetFullFileName() const; + wxString GetTitle() const; + + void OnButton(wxCommandEvent& event); +- virtual void OnPageChanging(wxWizardEvent& event); +- virtual void OnPageChanged(wxWizardEvent& event); ++ void OnPageChanging(wxWizardEvent& event) override; ++ void OnPageChanged(wxWizardEvent& event) override; + private: + ProjectPathPanel* m_pProjectPathPanel; + +@@ -121,10 +121,10 @@ class WizGenericSelectPathPanel : public WizPageBase + public: + WizGenericSelectPathPanel(const wxString& pageId, const wxString& descr, const wxString& label, const wxString& defValue, + wxWizard* parent, const wxBitmap& bitmap = wxNullBitmap); +- ~WizGenericSelectPathPanel(); ++ ~WizGenericSelectPathPanel() override; + + void OnButton(wxCommandEvent& event); +- virtual void OnPageChanging(wxWizardEvent& event); ++ void OnPageChanging(wxWizardEvent& event) override; + private: + GenericSelectPath* m_pGenericSelectPath; + +@@ -136,7 +136,7 @@ class WizCompilerPanel : public WizPageBase + public: + WizCompilerPanel(const wxString& compilerID, const wxString& validCompilerIDs, wxWizard* parent, const wxBitmap& bitmap = wxNullBitmap, + bool allowCompilerChange = true, bool allowConfigChange = true); +- ~WizCompilerPanel(); ++ ~WizCompilerPanel() override; + + wxString GetCompilerID() const; + bool GetWantDebug() const; +@@ -148,7 +148,7 @@ class WizCompilerPanel : public WizPageBase + wxString GetReleaseOutputDir() const; + wxString GetReleaseObjectOutputDir() const; + +- void OnPageChanging(wxWizardEvent& event); ++ void OnPageChanging(wxWizardEvent& event) override; + private: + CompilerPanel* m_pCompilerPanel; + bool m_AllowConfigChange; +@@ -162,7 +162,7 @@ class WizBuildTargetPanel : public WizPageBase + bool showCompiler = false, + const wxString& compilerID = wxEmptyString, const wxString& validCompilerIDs = _T("*"), + bool allowCompilerChange = true); +- ~WizBuildTargetPanel(); ++ ~WizBuildTargetPanel() override; + + wxString GetCompilerID() const; + bool GetEnableDebug() const; +@@ -170,7 +170,7 @@ class WizBuildTargetPanel : public WizPageBase + wxString GetTargetOutputDir() const; + wxString GetTargetObjectOutputDir() const; + +- void OnPageChanging(wxWizardEvent& event); ++ void OnPageChanging(wxWizardEvent& event) override; + private: + BuildTargetPanel* m_pBuildTargetPanel; + }; +@@ -179,12 +179,12 @@ class WizGenericSingleChoiceList : public WizPageBase + { + public: + WizGenericSingleChoiceList(const wxString& pageId, const wxString& descr, const wxArrayString& choices, int defChoice, wxWizard* parent, const wxBitmap& bitmap = wxNullBitmap); +- ~WizGenericSingleChoiceList(); ++ ~WizGenericSingleChoiceList() override; + + int GetChoice() const; + void SetChoice(int choice); + +- void OnPageChanging(wxWizardEvent& event); ++ void OnPageChanging(wxWizardEvent& event) override; + private: + GenericSingleChoiceList* m_pGenericSingleChoiceList; + }; +diff --git a/src/plugins/todo/addtododlg.h b/src/plugins/todo/addtododlg.h +index 42eb6075bd..b51565d8f1 100644 +--- a/src/plugins/todo/addtododlg.h ++++ b/src/plugins/todo/addtododlg.h +@@ -37,7 +37,6 @@ class AddTodoDlg : public wxScrollingDialog + { + public: + AddTodoDlg(wxWindow* parent, const wxArrayString& users, const wxArrayString& types, std::bitset<(int)tdctError+1> supportedTdcts); +- virtual ~AddTodoDlg() {}; + + wxString GetText() const; + wxString GetUser() const; +@@ -47,7 +46,7 @@ class AddTodoDlg : public wxScrollingDialog + wxString GetType() const; + ToDoCommentType GetCommentType() const; + +- void EndModal(int retVal); ++ void EndModal(int retVal) override; + + private: + void OnAddUser(wxCommandEvent&); +diff --git a/src/plugins/todo/todolist.h b/src/plugins/todo/todolist.h +index 960b6165f3..1c868ebc19 100644 +--- a/src/plugins/todo/todolist.h ++++ b/src/plugins/todo/todolist.h +@@ -28,12 +28,13 @@ class ToDoList : public cbPlugin + { + public: + ToDoList(); +- ~ToDoList(); +- virtual cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent); +- void BuildMenu(wxMenuBar* menuBar); +- void BuildModuleMenu(const ModuleType type, wxMenu* menu, const FileTreeData* data = 0); +- void OnAttach(); // fires when the plugin is attached to the application +- void OnRelease(bool appShutDown); // fires when the plugin is released from the application ++ ~ToDoList() override; ++ cbConfigurationPanel* GetConfigurationPanel(wxWindow* parent) override; ++ void BuildMenu(wxMenuBar* menuBar) override; ++ void BuildModuleMenu(const ModuleType type, wxMenu* menu, ++ const FileTreeData* data = nullptr) override; ++ void OnAttach() override; // fires when the plugin is attached to the application ++ void OnRelease(bool appShutDown) override; // fires when the plugin is released from the application + private: + // only parse files when C::B app is already start up + void OnAppDoneStartup(CodeBlocksEvent& event); +diff --git a/src/plugins/todo/todolistview.h b/src/plugins/todo/todolistview.h +index 2d9b3426f4..5232786824 100644 +--- a/src/plugins/todo/todolistview.h ++++ b/src/plugins/todo/todolistview.h +@@ -76,8 +76,8 @@ class ToDoListView : public wxEvtHandler, public ListCtrlLogger + { + public: + ToDoListView(const wxArrayString& titles, const wxArrayInt& widths, const wxArrayString& types); +- ~ToDoListView(); +- virtual wxWindow* CreateControl(wxWindow* parent); ++ ~ToDoListView() override; ++ wxWindow* CreateControl(wxWindow* parent) override; + void DestroyControls(bool control); + + // parse all the sources +diff --git a/src/plugins/todo/todosettingsdlg.h b/src/plugins/todo/todosettingsdlg.h +index c216b482fa..c098514545 100644 +--- a/src/plugins/todo/todosettingsdlg.h ++++ b/src/plugins/todo/todosettingsdlg.h +@@ -14,12 +14,12 @@ class ToDoSettingsDlg : public cbConfigurationPanel + { + public: + ToDoSettingsDlg(wxWindow* parent); +- ~ToDoSettingsDlg(); ++ ~ToDoSettingsDlg() override; + +- virtual wxString GetTitle() const { return _("Todo list"); } +- virtual wxString GetBitmapBaseName() const { return _T("todo"); } +- virtual void OnApply(); +- virtual void OnCancel(){} ++ wxString GetTitle() const override { return _("Todo list"); } ++ wxString GetBitmapBaseName() const override { return _T("todo"); } ++ void OnApply() override; ++ void OnCancel() override {} + }; + + #endif // TODOSETTINGSDLG_H +diff --git a/src/src/app.cpp b/src/src/app.cpp +index 10f278ff3e..9437c71694 100644 +--- a/src/src/app.cpp ++++ b/src/src/app.cpp +@@ -319,7 +319,7 @@ class cbMessageOutputNull : public wxMessageOutput + public: + + #if wxCHECK_VERSION(3, 0, 0) +- virtual void Output(const wxString &str); ++ virtual void Output(const wxString &str) override; + #else + #ifdef WX_ATTRIBUTE_PRINTF + virtual void Printf(const wxChar* format, ...) WX_ATTRIBUTE_PRINTF_2; +diff --git a/src/src/app.h b/src/src/app.h +index d9808a93f2..4348b4688a 100644 +--- a/src/src/app.h ++++ b/src/src/app.h +@@ -107,17 +107,17 @@ class cbSplashScreen; + class CodeBlocksApp : public wxApp + { + public: +- virtual bool OnInit(); +- virtual int OnExit(); +- virtual int OnRun(); ++ bool OnInit() override; ++ int OnExit() override; ++ int OnRun() override; + wxString GetAppPath() const; + int ParseCmdLine(MainFrame* handlerFrame, const wxString& CmdLine = wxEmptyString); + #if wxCHECK_VERSION(3,0,0) + void OnCloseBatchBuildWindow(wxCloseEvent& evt); + #endif // wxCHECK_VERSION + void OnAppActivate(wxActivateEvent& event); +- bool OnCmdLineParsed(wxCmdLineParser& parser); +- void OnFatalException(); ++ bool OnCmdLineParsed(wxCmdLineParser& parser) override; ++ void OnFatalException() override; + void LoadDelayedFiles(MainFrame* frame); // command line or DDE (if available) files + void SetAutoFile(wxString& file); // method to set m_AutoFile + void AttachDebugger(); +diff --git a/src/src/backtracedlg.h b/src/src/backtracedlg.h +index 7c0c12f61e..9a7e888697 100644 +--- a/src/src/backtracedlg.h ++++ b/src/src/backtracedlg.h +@@ -21,10 +21,10 @@ class BacktraceDlg : public wxPanel, public cbBacktraceDlg + public: + BacktraceDlg(wxWindow* parent); + +- wxWindow* GetWindow() { return this; } ++ wxWindow* GetWindow() override { return this; } + +- void Reload(); +- void EnableWindow(bool enable); ++ void Reload() override; ++ void EnableWindow(bool enable) override; + private: + void OnListRightClick(wxListEvent& event); + void OnDoubleClick(wxListEvent& event); +diff --git a/src/src/batchbuild.h b/src/src/batchbuild.h +index b352d06fd3..bb2ce5ac5d 100644 +--- a/src/src/batchbuild.h ++++ b/src/src/batchbuild.h +@@ -23,7 +23,7 @@ class BatchLogWindow : public wxScrollingDialog + size.SetHeight(Manager::Get()->GetConfigManager(_T("message_manager"))->ReadInt(_T("/batch_build_log/height"), wxDefaultSize.GetHeight())); + SetSize(size); + } +- void EndModal(int retCode) ++ void EndModal(int retCode) override + { + // allowed to close? + // find compiler plugin +diff --git a/src/src/breakpointsdlg.h b/src/src/breakpointsdlg.h +index 37cc4b0ee1..36efcb2e8a 100644 +--- a/src/src/breakpointsdlg.h ++++ b/src/src/breakpointsdlg.h +@@ -26,15 +26,15 @@ class BreakpointsDlg : public wxPanel, public cbBreakpointsDlg + public: + BreakpointsDlg(); + +- wxWindow* GetWindow() { return this; } ++ wxWindow* GetWindow() override { return this; } + +- bool AddBreakpoint(cbDebuggerPlugin *plugin, const wxString& filename, int line); +- bool RemoveBreakpoint(cbDebuggerPlugin *plugin, const wxString& filename, int line); +- void RemoveAllBreakpoints(); +- void EditBreakpoint(const wxString& filename, int line); +- void EnableBreakpoint(const wxString& filename, int line, bool enable); ++ bool AddBreakpoint(cbDebuggerPlugin *plugin, const wxString& filename, int line) override; ++ bool RemoveBreakpoint(cbDebuggerPlugin *plugin, const wxString& filename, int line) override; ++ void RemoveAllBreakpoints() override; ++ void EditBreakpoint(const wxString& filename, int line) override; ++ void EnableBreakpoint(const wxString& filename, int line, bool enable) override; + +- void Reload(); ++ void Reload() override; + private: + + void OnRemove(wxCommandEvent& event); +diff --git a/src/src/compilersettingsdlg.h b/src/src/compilersettingsdlg.h +index 7927b842b0..4d702175d2 100644 +--- a/src/src/compilersettingsdlg.h ++++ b/src/src/compilersettingsdlg.h +@@ -15,8 +15,8 @@ class CompilerSettingsDlg : public wxScrollingDialog + { + public: + CompilerSettingsDlg(wxWindow* parent); +- virtual ~CompilerSettingsDlg(); +- virtual void EndModal(int retCode); ++ ~CompilerSettingsDlg() override; ++ void EndModal(int retCode) override; + protected: + void OnPageChanging(wxListbookEvent& event); + void OnPageChanged(wxListbookEvent& event); +diff --git a/src/src/cpuregistersdlg.h b/src/src/cpuregistersdlg.h +index 35e6db3005..1aa2617657 100644 +--- a/src/src/cpuregistersdlg.h ++++ b/src/src/cpuregistersdlg.h +@@ -16,11 +16,12 @@ class CPURegistersDlg : public wxPanel, public cbCPURegistersDlg + public: + CPURegistersDlg(wxWindow* parent); + +- wxWindow* GetWindow() { return this; } ++ wxWindow* GetWindow() override { return this; } + +- void Clear(); +- void SetRegisterValue(const wxString& reg_name, const wxString& hexValue, const wxString& interpreted); +- void EnableWindow(bool enable); ++ void Clear() override; ++ void SetRegisterValue(const wxString& reg_name, const wxString& hexValue, ++ const wxString& interpreted) override; ++ void EnableWindow(bool enable) override; + protected: + int RegisterIndex(const wxString& reg_name); + void OnRefresh(wxCommandEvent& event); +diff --git a/src/src/debugger_interface_creator.h b/src/src/debugger_interface_creator.h +index 232292647d..5f51a99404 100644 +--- a/src/src/debugger_interface_creator.h ++++ b/src/src/debugger_interface_creator.h +@@ -17,31 +17,31 @@ class DebugInterfaceFactory : public cbDebugInterfaceFactory + ~DebugInterfaceFactory(); + + public: +- virtual cbBacktraceDlg* CreateBacktrace(); +- virtual void DeleteBacktrace(cbBacktraceDlg *dialog); ++ cbBacktraceDlg* CreateBacktrace() override; ++ void DeleteBacktrace(cbBacktraceDlg *dialog) override; + +- virtual cbBreakpointsDlg* CreateBreapoints(); +- virtual void DeleteBreakpoints(cbBreakpointsDlg *dialog); ++ cbBreakpointsDlg* CreateBreapoints() override; ++ void DeleteBreakpoints(cbBreakpointsDlg *dialog) override; + +- virtual cbCPURegistersDlg* CreateCPURegisters(); +- virtual void DeleteCPURegisters(cbCPURegistersDlg *dialog); ++ cbCPURegistersDlg* CreateCPURegisters() override; ++ void DeleteCPURegisters(cbCPURegistersDlg *dialog) override; + +- virtual cbDisassemblyDlg* CreateDisassembly(); +- virtual void DeleteDisassembly(cbDisassemblyDlg *dialog); ++ cbDisassemblyDlg* CreateDisassembly() override; ++ void DeleteDisassembly(cbDisassemblyDlg *dialog) override; + +- virtual cbExamineMemoryDlg* CreateMemory(); +- virtual void DeleteMemory(cbExamineMemoryDlg *dialog); ++ cbExamineMemoryDlg* CreateMemory() override; ++ void DeleteMemory(cbExamineMemoryDlg *dialog) override; + +- virtual cbThreadsDlg* CreateThreads(); +- virtual void DeleteThreads(cbThreadsDlg *dialog); ++ cbThreadsDlg* CreateThreads() override; ++ void DeleteThreads(cbThreadsDlg *dialog) override; + +- virtual cbWatchesDlg* CreateWatches(); +- virtual void DeleteWatches(cbWatchesDlg *dialog); ++ cbWatchesDlg* CreateWatches() override; ++ void DeleteWatches(cbWatchesDlg *dialog) override; + +- virtual bool ShowValueTooltip(const cb::shared_ptr<cbWatch> &watch, const wxRect &rect); +- virtual void HideValueTooltip(); +- virtual bool IsValueTooltipShown(); +- virtual void UpdateValueTooltip(); ++ bool ShowValueTooltip(const cb::shared_ptr<cbWatch> &watch, const wxRect &rect) override; ++ void HideValueTooltip() override; ++ bool IsValueTooltipShown() override; ++ void UpdateValueTooltip() override; + private: + void OnEditorDeactivate(CodeBlocksEvent &event); + private: +diff --git a/src/src/debuggermenu.h b/src/src/debuggermenu.h +index 68db401a4a..2332ce2db2 100644 +--- a/src/src/debuggermenu.h ++++ b/src/src/debuggermenu.h +@@ -21,13 +21,13 @@ class DebuggerMenuHandler : public wxEvtHandler, public cbDebuggerMenuHandler + void AppendWindowMenuItems(wxMenu &menu); + + public: // derived from cbDebuggerMenuHandler +- virtual void SetActiveDebugger(cbDebuggerPlugin *active); +- virtual void MarkActiveTargetAsValid(bool valid); +- virtual void RebuildMenus(); +- virtual void BuildContextMenu(wxMenu &menu, const wxString& word_at_caret, bool is_running); ++ void SetActiveDebugger(cbDebuggerPlugin *active) override; ++ void MarkActiveTargetAsValid(bool valid) override; ++ void RebuildMenus() override; ++ void BuildContextMenu(wxMenu &menu, const wxString& word_at_caret, bool is_running) override; + +- virtual bool RegisterWindowMenu(const wxString &name, const wxString &help, cbDebuggerWindowMenuItem *item); +- virtual void UnregisterWindowMenu(const wxString &name); ++ bool RegisterWindowMenu(const wxString &name, const wxString &help, cbDebuggerWindowMenuItem *item) override; ++ void UnregisterWindowMenu(const wxString &name) override; + private: + void OnUpdateUI(wxUpdateUIEvent& event); + void OnUpdateUIActive(wxUpdateUIEvent &event); +diff --git a/src/src/disassemblydlg.h b/src/src/disassemblydlg.h +index 8ef9b65829..2e74d53fd8 100644 +--- a/src/src/disassemblydlg.h ++++ b/src/src/disassemblydlg.h +@@ -20,16 +20,16 @@ class DisassemblyDlg : public wxPanel, public cbDisassemblyDlg + public: + DisassemblyDlg(wxWindow* parent); + +- wxWindow* GetWindow() { return this; } +- +- void Clear(const cbStackFrame& frame); +- void AddAssemblerLine(uint64_t addr, const wxString& line); +- void AddSourceLine(int lineno, const wxString& line); +- bool SetActiveAddress(uint64_t addr); +- void CenterLine(int lineno); +- void CenterCurrentLine(); +- bool HasActiveAddr() { return m_HasActiveAddr; } +- void EnableWindow(bool enable); ++ wxWindow* GetWindow() override { return this; } ++ ++ void Clear(const cbStackFrame& frame) override; ++ void AddAssemblerLine(uint64_t addr, const wxString& line) override; ++ void AddSourceLine(int lineno, const wxString& line) override; ++ bool SetActiveAddress(uint64_t addr) override; ++ void CenterLine(int lineno) override; ++ void CenterCurrentLine() override; ++ bool HasActiveAddr() override { return m_HasActiveAddr; } ++ void EnableWindow(bool enable) override; + + protected: + void OnSave(wxCommandEvent& event); +diff --git a/src/src/editorconfigurationdlg.h b/src/src/editorconfigurationdlg.h +index 83fcac888e..170f710abb 100644 +--- a/src/src/editorconfigurationdlg.h ++++ b/src/src/editorconfigurationdlg.h +@@ -48,7 +48,7 @@ class EditorConfigurationDlg : public wxScrollingDialog + void OnCaretStyle(wxCommandEvent& event); + void OnUpdateUIFontQuality(wxUpdateUIEvent& event); + +- void EndModal(int retCode); ++ void EndModal(int retCode) override; + private: + void OnPageChanging(wxListbookEvent& event); + void OnPageChanged(wxListbookEvent& event); +diff --git a/src/src/environmentsettingsdlg.h b/src/src/environmentsettingsdlg.h +index 2e92e60a32..3a1b15784a 100644 +--- a/src/src/environmentsettingsdlg.h ++++ b/src/src/environmentsettingsdlg.h +@@ -19,8 +19,8 @@ class EnvironmentSettingsDlg : public wxScrollingDialog, public cbConfigurationP + { + public: + EnvironmentSettingsDlg(wxWindow* parent, wxAuiDockArt* art); +- virtual ~EnvironmentSettingsDlg(); +- virtual void EndModal(int retCode); ++ ~EnvironmentSettingsDlg() override; ++ void EndModal(int retCode) override; + + public: + // From cbConfigurationPanelColoursInterface +diff --git a/src/src/examinememorydlg.h b/src/src/examinememorydlg.h +index d9793320b3..051ea1f710 100644 +--- a/src/src/examinememorydlg.h ++++ b/src/src/examinememorydlg.h +@@ -16,19 +16,19 @@ class ExamineMemoryDlg : public wxPanel, public cbExamineMemoryDlg + public: + ExamineMemoryDlg(wxWindow* parent); + +- wxWindow* GetWindow() { return this; } ++ wxWindow* GetWindow() override { return this; } + + // used for Freeze()/Thaw() calls +- void Begin(); +- void End(); +- +- void Clear(); +- wxString GetBaseAddress(); +- void SetBaseAddress(const wxString &addr); +- int GetBytes(); +- void AddError(const wxString& err); +- void AddHexByte(const wxString& addr, const wxString& hexbyte); +- void EnableWindow(bool enable); ++ void Begin() override; ++ void End() override; ++ ++ void Clear() override; ++ wxString GetBaseAddress() override; ++ void SetBaseAddress(const wxString &addr) override; ++ int GetBytes() override; ++ void AddError(const wxString& err) override; ++ void AddHexByte(const wxString& addr, const wxString& hexbyte) override; ++ void EnableWindow(bool enable) override; + protected: + void OnGo(wxCommandEvent& event); + +diff --git a/src/src/notebookstyles.h b/src/src/notebookstyles.h +index 80ef2f6938..1a49428478 100644 +--- a/src/src/notebookstyles.h ++++ b/src/src/notebookstyles.h +@@ -28,29 +28,29 @@ class NbStyleVC71 : public wxAuiDefaultTabArt + { + public: + NbStyleVC71(); +- wxAuiTabArt* Clone(); ++ wxAuiTabArt* Clone() override; + + void DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& page, + const wxRect& in_rect, int close_button_state, + wxRect* out_tab_rect, wxRect* out_button_rect, +- int* x_extent); ++ int* x_extent) override; + + int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, +- const wxSize& required_bmp_size); ++ const wxSize& required_bmp_size) override; + }; + + class NbStyleFF2 : public wxAuiDefaultTabArt + { + public: + NbStyleFF2(); +- wxAuiTabArt* Clone(); ++ wxAuiTabArt* Clone() override; + void DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& page, + const wxRect& in_rect, int close_button_state, + wxRect* out_tab_rect, wxRect* out_button_rect, +- int* x_extent); ++ int* x_extent) override; + + int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, +- const wxSize& required_bmp_size); ++ const wxSize& required_bmp_size) override; + }; + + #if defined(__WXGTK__) && (USE_GTK_NOTEBOOK) && !wxCHECK_VERSION(3, 0, 0) +diff --git a/src/src/printdlg.h b/src/src/printdlg.h +index 8cb554c5fd..5289a240e7 100644 +--- a/src/src/printdlg.h ++++ b/src/src/printdlg.h +@@ -13,9 +13,9 @@ class PrintDialog : public wxScrollingDialog + { + public: + PrintDialog(wxWindow* parent); +- virtual ~PrintDialog(); ++ ~PrintDialog() override; + +- virtual void EndModal(int retCode); ++ void EndModal(int retCode) override; + + PrintScope GetPrintScope() const; + PrintColourMode GetPrintColourMode() const; +diff --git a/src/src/projectdepsdlg.h b/src/src/projectdepsdlg.h +index 2665cbbd6d..f04dafe1b5 100644 +--- a/src/src/projectdepsdlg.h ++++ b/src/src/projectdepsdlg.h +@@ -14,8 +14,8 @@ class ProjectDepsDlg : public wxScrollingDialog + { + public: + ProjectDepsDlg(wxWindow* parent, cbProject* sel = nullptr); +- virtual ~ProjectDepsDlg(); +- virtual void EndModal(int retCode); ++ ~ProjectDepsDlg() override; ++ void EndModal(int retCode) override; + protected: + void FillList(); + bool SaveList(); +diff --git a/src/src/projectmanagerui.h b/src/src/projectmanagerui.h +index 851708bfef..97e175c360 100644 +--- a/src/src/projectmanagerui.h ++++ b/src/src/projectmanagerui.h +@@ -20,43 +20,46 @@ class ProjectManagerUI : public wxEvtHandler, public cbProjectManagerUI + ProjectManagerUI(); + ~ProjectManagerUI(); + +- cbAuiNotebook* GetNotebook() { return m_pNotebook; } ++ cbAuiNotebook* GetNotebook() override { return m_pNotebook; } + + /** Retrieve a pointer to the project manager's tree (GUI). + * @return A pointer to a wxTreeCtrl window. + */ +- cbTreeCtrl* GetTree(){ return m_pTree; } ++ cbTreeCtrl* GetTree() override { return m_pTree; } + +- wxTreeItemId GetTreeSelection(); ++ wxTreeItemId GetTreeSelection() override; + +- void RebuildTree(); +- void FreezeTree(); +- void UnfreezeTree(bool force = false); ++ void RebuildTree() override; ++ void FreezeTree() override; ++ void UnfreezeTree(bool force = false) override; + + +- void UpdateActiveProject(cbProject* oldProject, cbProject* newProject, bool refresh); +- void RemoveProject(cbProject* project); +- void BeginLoadingWorkspace(); +- void CloseWorkspace(); +- void FinishLoadingProject(cbProject* project, bool newAddition, cb_unused FilesGroupsAndMasks* fgam); +- void FinishLoadingWorkspace(cbProject* activeProject, const wxString &workspaceTitle); ++ void UpdateActiveProject(cbProject* oldProject, cbProject* newProject, ++ bool refresh) override; ++ void RemoveProject(cbProject* project) override; ++ void BeginLoadingWorkspace() override; ++ void CloseWorkspace() override; ++ void FinishLoadingProject(cbProject* project, bool newAddition, ++ cb_unused FilesGroupsAndMasks* fgam) override; ++ void FinishLoadingWorkspace(cbProject* activeProject, ++ const wxString &workspaceTitle) override; + +- void ShowFileInTree(ProjectFile &projectFile); ++ void ShowFileInTree(ProjectFile &projectFile) override; + + void CreateMenu(wxMenuBar* menuBar); + +- bool QueryCloseAllProjects(); +- bool QueryCloseProject(cbProject* project, bool dontsavefiles); +- bool QueryCloseWorkspace(); ++ bool QueryCloseAllProjects() override; ++ bool QueryCloseProject(cbProject* project, bool dontsavefiles) override; ++ bool QueryCloseWorkspace() override; + +- int AskForBuildTargetIndex(cbProject* project); +- wxArrayInt AskForMultiBuildTargetIndex(cbProject* project); +- void ConfigureProjectDependencies(cbProject* base, wxWindow *parent); ++ int AskForBuildTargetIndex(cbProject* project) override; ++ wxArrayInt AskForMultiBuildTargetIndex(cbProject* project) override; ++ void ConfigureProjectDependencies(cbProject* base, wxWindow *parent) override; + void CheckForExternallyModifiedProjects(); + + private: + void InitPane(); +- void SwitchToProjectsPage(); ++ void SwitchToProjectsPage() override; + void ShowMenu(wxTreeItemId id, const wxPoint& pt); + void CreateMenuTreeProps(wxMenu* menu, bool popup); + +diff --git a/src/src/projectoptionsdlg.h b/src/src/projectoptionsdlg.h +index 3826cc8094..01264d405c 100644 +--- a/src/src/projectoptionsdlg.h ++++ b/src/src/projectoptionsdlg.h +@@ -23,9 +23,9 @@ class ProjectOptionsDlg : public wxScrollingDialog + // class constructor + ProjectOptionsDlg(wxWindow* parent, cbProject* project); + // class destructor +- ~ProjectOptionsDlg(); ++ ~ProjectOptionsDlg() override; + +- void EndModal(int retCode); ++ void EndModal(int retCode) override; + void OnFileOptionsClick(wxCommandEvent& event); + void OnFileToggleMarkClick(wxCommandEvent& event); + void OnFileMarkOnClick(wxCommandEvent& event); +diff --git a/src/src/scriptingsettingsdlg.h b/src/src/scriptingsettingsdlg.h +index 66878dcad0..527ff63e33 100644 +--- a/src/src/scriptingsettingsdlg.h ++++ b/src/src/scriptingsettingsdlg.h +@@ -41,9 +41,9 @@ class ScriptingSettingsDlg : public wxScrollingDialog + { + public: + ScriptingSettingsDlg(wxWindow* parent); +- ~ScriptingSettingsDlg(); ++ ~ScriptingSettingsDlg() override; + +- void EndModal(int retCode); ++ void EndModal(int retCode) override; + protected: + void FillScripts(); + void UpdateState(); +diff --git a/src/src/startherepage.h b/src/src/startherepage.h +index 8b9ef614fe..4bc29a1996 100644 +--- a/src/src/startherepage.h ++++ b/src/src/startherepage.h +@@ -23,10 +23,10 @@ class StartHerePage : public EditorBase + public: + StartHerePage(wxEvtHandler* owner, const RecentItemsList &projects, + const RecentItemsList &files, wxWindow* parent); +- virtual ~StartHerePage(); ++ ~StartHerePage() override; + + bool LinkClicked(const wxHtmlLinkInfo& link); +- virtual bool VisibleToTree() const { return false; } ++ bool VisibleToTree() const override { return false; } + void Reload(); + private: + void RegisterColours(); +diff --git a/src/src/switcherdlg.h b/src/src/switcherdlg.h +index b23e516c63..8020adac58 100644 +--- a/src/src/switcherdlg.h ++++ b/src/src/switcherdlg.h +@@ -235,7 +235,7 @@ class wxMultiColumnListCtrl: public wxControl + void OnEraseBackground(wxEraseEvent& event); + + // Overrides +- virtual wxSize DoGetBestSize() const ; ++ wxSize DoGetBestSize() const override; + + // Implementation + +diff --git a/src/src/threadsdlg.h b/src/src/threadsdlg.h +index 2cfa551223..31054c7699 100644 +--- a/src/src/threadsdlg.h ++++ b/src/src/threadsdlg.h +@@ -18,10 +18,10 @@ class ThreadsDlg : public wxPanel, public cbThreadsDlg + public: + ThreadsDlg(wxWindow* parent); + +- wxWindow* GetWindow() { return this; } ++ wxWindow* GetWindow() override { return this; } + +- void Reload(); +- void EnableWindow(bool enable); ++ void Reload() override; ++ void EnableWindow(bool enable) override; + protected: + void OnListRightClick(wxListEvent& event); + void OnListDoubleClick(wxListEvent& event); +diff --git a/src/src/watchesdlg.h b/src/src/watchesdlg.h +index 6bf827910f..2803f4b3b3 100644 +--- a/src/src/watchesdlg.h ++++ b/src/src/watchesdlg.h +@@ -24,7 +24,7 @@ class WatchesDlg : public wxPanel, public cbWatchesDlg + public: + WatchesDlg(); + +- wxWindow* GetWindow() { return this; } ++ wxWindow* GetWindow() override { return this; } + + void AddWatch(cb::shared_ptr<cbWatch> watch) override; + void AddSpecialWatch(cb::shared_ptr<cbWatch> watch, bool readonly) override; +@@ -93,7 +93,7 @@ class ValueTooltip : + protected: + virtual void OnDismiss(); + private: +- void Fit(); ++ void Fit() override; + void ClearWatch(); + private: + diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-04.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-04.patch new file mode 100644 index 00000000000..0ee7080056c --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-04.patch @@ -0,0 +1,84 @@ +From a4aacc92640b587ad049cd6aa68c637e536e9ab5 Mon Sep 17 00:00:00 2001 +From: mortenmacfly <mortenmacfly@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Tue, 29 Dec 2020 09:51:54 +0000 +Subject: [PATCH] * updated AUTHORS file and about dialog to better reflect + current developers/contribters + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12281 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + AUTHORS | 13 +++++++++++-- + src/src/dlgabout.cpp | 4 +++- + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/AUTHORS b/AUTHORS +index 07fa7d5c47..b0d6aab5da 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -12,6 +12,8 @@ Teodor Petrov : Developer + Daniel Anselmi : Developer + Yuanhui Zhang : Developer + Damien Moore : Developer ++Micah Ng : Developer ++BlueHazzard : Developer + Ricardo Garcia : All-hands person + Paul A. Jimenez : Help and AStyle plugins + Thomas Lorblanches : CodeStat and Profiler plugins +@@ -20,13 +22,16 @@ Jerome Antoine : ThreadSearch plugin + Pecan Heber : Keybinder, BrowseTracker, DragScroll + CodeSnippets plugins + Arto Jonsson : CodeSnippets plugin (passed on to Pecan) +-Mario Cupelli : User's manual ++Darius Markauskas : Fortran support ++Mario Cupelli : Compiler support for embedded systems ++ User's manual ++Jonas Zinn : Misc. wxSmith AddOns and plugins ++Mirai Computing : cbp2make tool + Anders F Bjoerklund : wxMac compatibility + + Contributors (in no special order): + ----------------------------------- + Daniel Orb : RPM spec file and packages +-Mario Cupelli : Compiler support for embedded systems + byo,elvstone, me22 : Conversion to Unicode + pasgui : Providing Ubuntu nightly packages + Hakki Dogusan : DigitalMars compiler support +@@ -37,6 +42,10 @@ David Perfors : Unicode tester and future documentation writer + Sylvain Prat : Initial MSVC workspace and project importers + Chris Raschko : Design of the 3D logo for Code::Blocks + J.A. Ortega : 3D Icon based on the above ++Alexandr Efremo : Providing OpenSuSe packages ++Huki : Misc. Code-Completion improvements ++stahta01 : Misc. patches for several enhancements ++Miguel Gimenez : Misc. patches for several enhancements + + All contributors that provided patches. + +diff --git a/src/src/dlgabout.cpp b/src/src/dlgabout.cpp +index 5c66794ecb..2afeeabac3 100644 +--- a/src/src/dlgabout.cpp ++++ b/src/src/dlgabout.cpp +@@ -84,6 +84,7 @@ dlgAbout::dlgAbout(wxWindow* parent) + txtDescription->SetValue(description); + + wxTextCtrl *txtThanksTo = XRCCTRL(*this, "txtThanksTo", wxTextCtrl); ++ // Note: Keep this is sync with the AUTHORS file in SVN. + txtThanksTo->SetValue(_( + "Developers:\n" + "--------------\n" +@@ -100,6 +101,7 @@ dlgAbout::dlgAbout(wxWindow* parent) + "Yuanhui Zhang : Developer\n" + "Damien Moore : Developer\n" + "Micah Ng : Developer\n" ++ "BlueHazzard : Developer\n" + "Ricardo Garcia : All-hands person\n" + "Paul A. Jimenez : Help and AStyle plugins\n" + "Thomas Lorblanches : CodeStat and Profiler plugins\n" +@@ -131,7 +133,7 @@ dlgAbout::dlgAbout(wxWindow* parent) + "Alexandr Efremo : Providing OpenSuSe packages\n" + "Huki : Misc. Code-Completion improvements\n" + "stahta01 : Misc. patches for several enhancements\n" +- "BlueHazzard : Misc. patches for several enhancements\n" ++ "Miguel Gimenez : Misc. patches for several enhancements\n" + "\n" + "All contributors that provided patches.\n" + "The wxWidgets project (http://www.wxwidgets.org).\n" diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-05.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-05.patch new file mode 100644 index 00000000000..4352b4ef0b4 --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-05.patch @@ -0,0 +1,70 @@ +From f2f127cf5cd97c7da6a957a3f7764cb25cc9017e Mon Sep 17 00:00:00 2001 +From: fuscated <fuscated@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Tue, 16 Mar 2021 23:28:35 +0000 +Subject: [PATCH] * UI: Add display info in the Help -> About -> Information + dialog + +> There are many reports of people having trouble with either multi monitor + setups or HiDPI setups. It would be a lot easier if they could gather + the information form one single place. +> Note0: The scaling factors are based on the scaling factors of the About + dialog. In a system which supports monitors with different PPIs it might + report the incorrect value. +> Note1: wxGetDisplayPPI is also some global and not per display. + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12305 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + src/src/dlgabout.cpp | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +diff --git a/src/src/dlgabout.cpp b/src/src/dlgabout.cpp +index 2afeeabac3..1df51142aa 100644 +--- a/src/src/dlgabout.cpp ++++ b/src/src/dlgabout.cpp +@@ -31,6 +31,7 @@ + + #include <wx/bitmap.h> + #include <wx/dcmemory.h> // wxMemoryDC ++#include <wx/display.h> + #include <wx/statbmp.h> + + #include "appglobals.h" +@@ -164,10 +165,38 @@ dlgAbout::dlgAbout(wxWindow* parent) + items.push_back({_("Version"), appglobals::AppActualVersion}); + items.push_back({_("SDK Version"), appglobals::AppSDKVersion}); + items.push_back({_("Scintilla Version"), scintillaStr}); ++ + items.push_back({_("Author"), _("The Code::Blocks Team")}); + items.push_back({_("E-mail"), appglobals::AppContactEmail}); + items.push_back({_("Website"), appglobals::AppUrl}); + ++ items.push_back({_("Scaling factor"), wxString::Format("%f", GetContentScaleFactor())}); ++ items.push_back({_("Detected scaling factor"), ++ wxString::Format("%f", cbGetActualContentScaleFactor(*this))}); ++ const wxSize displayPPI = wxGetDisplayPPI(); ++ items.push_back({_("Display PPI"), wxString::Format("%dx%d", displayPPI.x, displayPPI.y)}); ++ ++ unsigned displays = wxDisplay::GetCount(); ++ items.push_back({_("Display count"), wxString::Format("%u", displays)}); ++ ++ for (unsigned ii = 0; ii < displays; ++ii) ++ { ++ wxDisplay display(ii); ++ ++ Item item; ++ item.name = wxString::Format(_("Display %u"), ii); ++ ++ const wxString &name = display.GetName(); ++ if (!name.empty()) ++ item.name += " (" + name + ")"; ++ ++ const wxRect geometry = display.GetGeometry(); ++ item.value= wxString::Format(_("XY=[%d,%d]; Size=[%d,%d]; %s"), geometry.GetLeft(), ++ geometry.GetTop(), geometry.GetWidth(), geometry.GetHeight(), ++ (display.IsPrimary() ? _("Primary") : wxString())); ++ items.push_back(item); ++ } ++ + int maxNameLength = 0; + for (const Item &item : items) + { diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-06.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-06.patch new file mode 100644 index 00000000000..7d7dbe990df --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-06.patch @@ -0,0 +1,54 @@ +From dbdf5c5ea9e3161233f0588a7616b7e4fedc7870 Mon Sep 17 00:00:00 2001 +From: mortenmacfly <mortenmacfly@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Sat, 3 Apr 2021 05:14:39 +0000 +Subject: [PATCH] * applied patch #1079 Don't call wxChoice::GetString() with + wxNOT_FOUND (thanks Miguel Gimenez) + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12312 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + .../FileManager/FileExplorerUpdater.cpp | 20 +++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/src/plugins/contrib/FileManager/FileExplorerUpdater.cpp b/src/plugins/contrib/FileManager/FileExplorerUpdater.cpp +index 5a0b3a9ee6..9dee80696a 100644 +--- a/src/plugins/contrib/FileManager/FileExplorerUpdater.cpp ++++ b/src/plugins/contrib/FileManager/FileExplorerUpdater.cpp +@@ -150,10 +150,16 @@ void FileExplorerUpdater::Update(const wxTreeItemId &ti) + m_path=wxString(m_fe->GetFullPath(ti).c_str()); + m_wildcard=wxString(m_fe->m_WildCards->GetValue().c_str()); + m_vcs_type=wxString(m_fe->m_VCS_Type->GetLabel().c_str()); +- m_vcs_commit_string=wxString(m_fe->m_VCS_Control->GetString(m_fe->m_VCS_Control->GetSelection()).c_str()); ++ const int selection = m_fe->m_VCS_Control->GetSelection(); ++ if (selection == wxNOT_FOUND) ++ m_vcs_commit_string.clear(); ++ else ++ m_vcs_commit_string = wxString(m_fe->m_VCS_Control->GetString(selection).c_str()); ++ + m_vcs_changes_only = m_fe->m_VCS_ChangesOnly->IsChecked(); +- if (m_vcs_type != wxEmptyString) ++ if (!m_vcs_type.empty()) + m_repo_path=wxString(m_fe->GetRootFolder().c_str()); ++ + GetTreeState(ti); + if (Create()==wxTHREAD_NO_ERROR) + { +@@ -1262,11 +1268,17 @@ void VCSFileLoader::Update(const wxString &op, const wxString &source_path, cons + m_source_path=wxString(source_path.c_str()); + m_destination_path=wxString(destination_path.c_str()); + m_vcs_type=wxString(m_fe->m_VCS_Type->GetLabel().c_str()); +- m_vcs_commit_string=wxString(m_fe->m_VCS_Control->GetString(m_fe->m_VCS_Control->GetSelection()).c_str()); ++ const int selection = m_fe->m_VCS_Control->GetSelection(); ++ if (selection == wxNOT_FOUND) ++ m_vcs_commit_string.clear(); ++ else ++ m_vcs_commit_string = wxString(m_fe->m_VCS_Control->GetString(selection).c_str()); ++ + m_vcs_op = wxString(op.c_str()); + m_vcs_comp_commit = wxString(comp_commit.c_str()); +- if (m_vcs_type != wxEmptyString) ++ if (!m_vcs_type.empty()) + m_repo_path=wxString(m_fe->GetRootFolder().c_str()); ++ + if (Create()==wxTHREAD_NO_ERROR) + { + SetPriority(20); diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-07.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-07.patch new file mode 100644 index 00000000000..ff4a7f3b0dd --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-07.patch @@ -0,0 +1,27 @@ +From 04b7c50fb8c6a29b2d84579ee448d2498414d855 Mon Sep 17 00:00:00 2001 +From: ollydbg <ollydbg@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Wed, 6 Oct 2021 14:29:21 +0000 +Subject: [PATCH] * Fix CCManager compilation with C++17(apply patch #1142, + thanks Miguel Gimenez) + +See details in: https://sourceforge.net/p/codeblocks/tickets/1142/ +and forum discussion: https://forums.codeblocks.org/index.php/topic,24643.0.html + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12532 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + src/include/ccmanager.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/ccmanager.h b/src/include/ccmanager.h +index 1f471001db..57318bf6f7 100644 +--- a/src/include/ccmanager.h ++++ b/src/include/ccmanager.h +@@ -44,7 +44,7 @@ class wxScintillaEvent; + * list or the doxygen popup, the scroll event is instead sent there (and skipped for the editor + * window). + */ +-class DLLIMPORT CCManager : public Mgr<CCManager>, wxEvtHandler ++class DLLIMPORT CCManager : public Mgr<CCManager>, public wxEvtHandler + { + public: + friend class Mgr<CCManager>; diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-08.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-08.patch new file mode 100644 index 00000000000..073f9a8d13b --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-08.patch @@ -0,0 +1,724 @@ +From 8035dfdff321754819f79e3165401aa59bd8c7f7 Mon Sep 17 00:00:00 2001 +From: wh11204 <wh11204@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Tue, 14 Dec 2021 08:57:56 +0000 +Subject: [PATCH] - Remove code for wxWidgets < 3.0.0 (part I). Includes: + src\include\cbart_provider.h src\include\cbauibook.h + src\include\globals.h src\include\logmanager.h + src\include\scrollingdialog.h src\plugins\debuggergdb\debuggergdb.cpp + src\plugins\debuggergdb\gdb_commands.h src\sdk\base64.cpp + src\sdk\cbauibook.cpp src\sdk\crc32.cpp src\sdk\editorcolourset.cpp + src\sdk\editorlexerloader.cpp + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12578 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + src/include/cbart_provider.h | 18 +-- + src/include/cbauibook.h | 41 ------ + src/include/globals.h | 4 - + src/include/logmanager.h | 4 +- + src/include/scrollingdialog.h | 184 ------------------------ + src/plugins/debuggergdb/debuggergdb.cpp | 10 -- + src/plugins/debuggergdb/gdb_commands.h | 4 - + src/sdk/base64.cpp | 22 --- + src/sdk/cbauibook.cpp | 84 +---------- + src/sdk/crc32.cpp | 4 - + src/sdk/editorcolourset.cpp | 4 - + src/sdk/editorlexerloader.cpp | 4 - + 12 files changed, 10 insertions(+), 373 deletions(-) + +diff --git a/src/include/cbart_provider.h b/src/include/cbart_provider.h +index ed04be85f5..272b6d6b5e 100644 +--- a/src/include/cbart_provider.h ++++ b/src/include/cbart_provider.h +@@ -34,17 +34,13 @@ class DLLIMPORT cbArtProvider : public wxArtProvider + wxString m_prefix; + + struct StringHash +- { +- size_t operator()(const wxString& s) const +- { +-#if wxCHECK_VERSION(3, 0, 0) +- return std::hash<std::wstring>()(s.ToStdWstring()); +-#else +- return std::hash<std::wstring>()(s.wc_str()); +-#endif // wxCHECK_VERSION +- } +- }; +- ++ {
++ size_t operator()(const wxString& s) const
++ {
++ return std::hash<std::wstring>()(s.ToStdWstring());
++ }
++ };
++
+ struct Data + { + Data() : hasFormatting(false) {} +diff --git a/src/include/cbauibook.h b/src/include/cbauibook.h +index d0bf79a3a1..4e90a65e5c 100644 +--- a/src/include/cbauibook.h ++++ b/src/include/cbauibook.h +@@ -78,25 +78,6 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook + * \return int the visible position + */ + int GetTabPositionFromIndex(int index); +-#if !wxCHECK_VERSION(3, 0, 0) +- /** \brief Set a tab tooltip +- * +- * Sets the tooltip for the tab belonging to win. +- * Starts the dwell timer and the stopwatch if it is not already done. +- * \param idx the index of the pane that belongs to the tab +- * \param text the tooltip +- * @remarks Uses the name of the wxWindow to store the message +- * \return bool true if tooltip was updated +- */ +- bool SetPageToolTip(size_t idx, const wxString & text ); +- /** \brief Get a tab tooltip +- * +- * Returns the tooltip for the tab label of the page. +- * @remarks Uses the name of the wxWindow to store the message +- * \return wxString the tooltip of the page with the given index +- */ +- wxString GetPageToolTip(size_t idx ); +-#endif // !wxCHECK_VERSION(3, 0, 0) + /** \brief Minmize free horizontal page + * + * Moves the active tab of all tabCtrl's to the rightmost place, +@@ -205,25 +186,12 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook + * \param event + * @remarks Works not reliable, due to OS/wxWidgets-limitations + */ +-#if wxCHECK_VERSION(3, 0, 0) + void OnNavigationKeyNotebook(wxNavigationKeyEvent& event); +-#else +- void OnNavigationKey(wxNavigationKeyEvent& event); +-#endif // wxCHECK_VERSION(3, 0, 0) + /** \brief OnIdle + * + * \param event unused + */ + void OnIdle(cb_unused wxIdleEvent& event); +-#if !wxCHECK_VERSION(3, 0, 0) +- /** \brief Catch mousemotion-events +- * +- * Needed for the backport of tabtooltip from wx2.9 +- * +- * \param event holds the wxTabCtrl, that sends the event +- */ +- void OnMotion(wxMouseEvent& event); +-#endif // !wxCHECK_VERSION(3, 0, 0) + /** \brief Catch doubleclick-events from wxTabCtrl + * + * Sends cbEVT_CBAUIBOOK_LEFT_DCLICK, if doubleclick was on a tab, +@@ -318,15 +286,6 @@ class DLLIMPORT cbAuiNotebook : public wxAuiNotebook + */ + long m_LastId; + #endif // __WXMSW__ +-#if !wxCHECK_VERSION(3, 0, 0) +- /** \brief If false, tooltips are not shown +- * +- * Needed to only show tooltips, if they have been explicitely set. +- * We store the tooltip-text in the tabs name, without this flag, we +- * get the wxWidgets default-names as tooltips. +- */ +- bool m_HasToolTip; +-#endif // !wxCHECK_VERSION(3, 0, 0) + /** \brief If true, zoom for all editors + * is set in next OnIdle-call + */ +diff --git a/src/include/globals.h b/src/include/globals.h +index c2924cb7fe..f5086b643a 100644 +--- a/src/include/globals.h ++++ b/src/include/globals.h +@@ -441,11 +441,7 @@ extern DLLIMPORT wxArrayInt cbGetMultiChoiceDialog(const wxString& message, cons + const wxSize& size = wxSize(300, 300), + const wxArrayInt& initialSelection = wxArrayInt()); + +-#if wxCHECK_VERSION(3, 0, 0) + extern DLLIMPORT const char *cbGetTextFromUserPromptStr; +-#else +-extern DLLIMPORT const wxChar *cbGetTextFromUserPromptStr; +-#endif // wxCHECK_VERSION + + extern DLLIMPORT wxString cbGetTextFromUser(const wxString &message, + const wxString &caption = cbGetTextFromUserPromptStr, +diff --git a/src/include/logmanager.h b/src/include/logmanager.h +index 704698f27a..29af5fe24a 100644 +--- a/src/include/logmanager.h ++++ b/src/include/logmanager.h +@@ -21,7 +21,7 @@ + { + va_list arg_list; + va_start(arg_list, msg); +-#if wxCHECK_VERSION(3, 0, 0) && wxUSE_UNICODE ++#if wxUSE_UNICODE + // in wx >= 3.0 unicode-build (default) we need the %ls here, or the strings get + // cut after the first character + ::temp_string = msg; +@@ -38,7 +38,7 @@ + { + va_list arg_list; + va_start(arg_list, msg); +-#if wxCHECK_VERSION(2,9,0) && wxUSE_UNICODE ++#if wxUSE_UNICODE + // in wx >= 2.9 unicode-build (default) we need the %ls here, or the strings get + // cut after the first character + ::temp_string = msg; +diff --git a/src/include/scrollingdialog.h b/src/include/scrollingdialog.h +index 06f3a1b607..17173f9709 100644 +--- a/src/include/scrollingdialog.h ++++ b/src/include/scrollingdialog.h +@@ -30,151 +30,18 @@ class wxBoxSizer; + class wxButton; + class wxScrolledWindow; + +-#if !wxCHECK_VERSION(3, 0, 0) +-class wxDialogLayoutAdapter: public wxObject +-{ +- DECLARE_CLASS(wxDialogLayoutAdapter) +-public: +- wxDialogLayoutAdapter() {} +- +- /// Override this function to indicate that adaptation should be done +- virtual bool CanDoLayoutAdaptation(wxDialogHelper* dialog) = 0; +- +- /// Override this function to do the adaptation +- virtual bool DoLayoutAdaptation(wxDialogHelper* dialog) = 0; +-}; +- +-/*! +- * Standard adapter. Does scrolling adaptation for paged and regular dialogs. +- * +- */ +- +-class wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter +-{ +- DECLARE_CLASS(wxStandardDialogLayoutAdapter) +-public: +- wxStandardDialogLayoutAdapter() {} +- +-// Overrides +- +- /// Indicate that adaptation should be done +- bool CanDoLayoutAdaptation(wxDialogHelper* dialog) override; +- +- /// Do layout adaptation +- bool DoLayoutAdaptation(wxDialogHelper* dialog) override; +- +-// Implementation +- +- /// Find a standard or horizontal box sizer +- virtual wxSizer* FindButtonSizer(bool stdButtonSizer, wxDialogHelper* dialog, wxSizer* sizer, int& retBorder, int accumlatedBorder = 0); +- +- /// Check if this sizer contains standard buttons, and so can be repositioned in the dialog +- virtual bool IsOrdinaryButtonSizer(wxDialogHelper* dialog, wxBoxSizer* sizer); +- +- /// Check if this is a standard button +- virtual bool IsStandardButton(wxDialogHelper* dialog, wxButton* button); +- +- /// Find 'loose' main buttons in the existing layout and add them to the standard dialog sizer +- virtual bool FindLooseButtons(wxDialogHelper* dialog, wxStdDialogButtonSizer* buttonSizer, wxSizer* sizer, int& count); +- +- /// Reparent the controls to the scrolled window, except those in buttonSizer +- virtual void ReparentControls(wxWindow* parent, wxWindow* reparentTo, wxSizer* buttonSizer = NULL); +- +- /// A function to fit the dialog around its contents, and then adjust for screen size. +- /// If scrolled windows are passed, scrolling is enabled in the required orientation(s). +- virtual bool FitWithScrolling(wxDialog* dialog, wxScrolledWindow* scrolledWindow); +- virtual bool FitWithScrolling(wxDialog* dialog, wxWindowList& windows); +- +- /// Find whether scrolling will be necessary for the dialog, returning wxVERTICAL, wxHORIZONTAL or both +- virtual int MustScroll(wxDialog* dialog, wxSize& windowSize, wxSize& displaySize); +-}; +- +-/*! +- * A base class for dialogs that have adaptation. In wxWidgets 3.0, this will not +- * be needed since the new functionality will be implemented in wxDialogBase. +- */ +- +-class wxDialogHelper +-{ +-public: +- +- wxDialogHelper(wxDialog* dialog = NULL) { Init(); m_dialog = dialog; } +- virtual ~wxDialogHelper() {} +- +- void Init(); +- +- void SetDialog(wxDialog* dialog) { m_dialog = dialog; } +- wxDialog* GetDialog() const { return m_dialog; } +- +- /// Do the adaptation +- virtual bool DoLayoutAdaptation(); +- +- /// Can we do the adaptation? +- virtual bool CanDoLayoutAdaptation(); +- +- /// Returns a content window if there is one +- virtual wxWindow* GetContentWindow() const { return NULL; } +- +- /// Add an id to the list of custom button identifiers that should be in the button sizer +- void AddButtonId(wxWindowID id) { m_buttonIds.Add((int) id); } +- wxArrayInt& GetButtonIds() { return m_buttonIds; } +- +- /// Is this id in the custom button id array? +- bool IsUserButtonId(wxWindowID id) { return (m_buttonIds.Index((int) id) != wxNOT_FOUND); } +- +-// ACCESSORS +- +- /// Level of adaptation, from none (Level 0) to full (Level 3). To disable adaptation, +- /// set level 0, for example in your dialog constructor. You might +- /// do this if you know that you are displaying on a large screen and you don't want the +- /// dialog changed. +- void SetLayoutAdaptationLevel(int level) { m_layoutAdaptationLevel = level; } +- +- /// Get level of adaptation +- int GetLayoutAdaptationLevel() const { return m_layoutAdaptationLevel; } +- +- /// Returns true if the adaptation has been done +- void SetLayoutAdaptationDone(bool adaptationDone) { m_layoutLayoutAdaptationDone = adaptationDone; } +- bool GetLayoutAdaptationDone() const { return m_layoutLayoutAdaptationDone; } +- +- /// Set layout adapter class, returning old adapter +- static wxDialogLayoutAdapter* SetLayoutAdapter(wxDialogLayoutAdapter* adapter); +- static wxDialogLayoutAdapter* GetLayoutAdapter() { return sm_layoutAdapter; } +- +- /// Global switch for layout adaptation +- static bool GetLayoutAdaptation() { return sm_layoutAdaptation; } +- static void SetLayoutAdaptation(bool enable) { sm_layoutAdaptation = enable; } +- +-protected: +- +- wxDialog* m_dialog; +- bool m_layoutLayoutAdaptationDone; +- wxArrayInt m_buttonIds; +- int m_layoutAdaptationLevel; +- static wxDialogLayoutAdapter* sm_layoutAdapter; +- static bool sm_layoutAdaptation; +-}; +-#endif //#if !wxCHECK_VERSION(3, 0, 0) +- + /*! + * A class that makes its content scroll if necessary + */ + + class DLLIMPORT wxScrollingDialog: public wxDialog +-#if !wxCHECK_VERSION(3, 0, 0) +- , public wxDialogHelper +-#endif + { + DECLARE_CLASS(wxScrollingDialog) + public: + + wxScrollingDialog() + { +-#if !wxCHECK_VERSION(3, 0, 0) +- Init(); +-#else + SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED); +-#endif + } + wxScrollingDialog(wxWindow *parent, + int id = wxID_ANY, +@@ -184,30 +51,9 @@ class DLLIMPORT wxScrollingDialog: public wxDialog + long style = wxDEFAULT_DIALOG_STYLE, + const wxString& name = _("dialogBox")) + { +-#if !wxCHECK_VERSION(3, 0, 0) +- Init(); +-#else + SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED); +-#endif + Create(parent, id, title, pos, size, style, name); + } +-#if !wxCHECK_VERSION(3, 0, 0) +- bool Create(wxWindow *parent, +- int id = wxID_ANY, +- const wxString& title = wxEmptyString, +- const wxPoint& pos = wxDefaultPosition, +- const wxSize& size = wxDefaultSize, +- long style = wxDEFAULT_DIALOG_STYLE, +- const wxString& name = _("dialogBox")); +- +- void Init(); +- +- /// Override Show to rejig the control and sizer hierarchy if necessary +- bool Show(bool show = true) override; +- +- /// Override ShowModal to rejig the control and sizer hierarchy if necessary +- int ShowModal() override; +-#endif + }; + + /*! +@@ -215,19 +61,11 @@ class DLLIMPORT wxScrollingDialog: public wxDialog + */ + + class wxScrollingPropertySheetDialog : public wxPropertySheetDialog +-#if !wxCHECK_VERSION(3, 0, 0) +- , public wxDialogHelper +-#endif +- + { + public: + wxScrollingPropertySheetDialog() : wxPropertySheetDialog() + { +-#if !wxCHECK_VERSION(3, 0, 0) +- Init(); +-#else + SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED); +-#endif + } + + wxScrollingPropertySheetDialog(wxWindow* parent, wxWindowID id, +@@ -237,32 +75,10 @@ class wxScrollingPropertySheetDialog : public wxPropertySheetDialog + long style = wxDEFAULT_DIALOG_STYLE, + const wxString& name = wxDialogNameStr) + { +-#if !wxCHECK_VERSION(3, 0, 0) +- Init(); +-#else + SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED); +-#endif + Create(parent, id, title, pos, sz, style, name); + } + +-#if !wxCHECK_VERSION(3, 0, 0) +-//// Accessors +- +- /// Returns the content window +- wxWindow* GetContentWindow() const override; +- +-/// Operations +- +- /// Override Show to rejig the control and sizer hierarchy if necessary +- bool Show(bool show = true) override; +- +- /// Override ShowModal to rejig the control and sizer hierarchy if necessary +- int ShowModal() override; +- +-private: +- void Init(); +-#endif +- + protected: + + DECLARE_DYNAMIC_CLASS(wxScrollingPropertySheetDialog) +diff --git a/src/plugins/debuggergdb/debuggergdb.cpp b/src/plugins/debuggergdb/debuggergdb.cpp +index 4d1dabba54..845de0bb3b 100644 +--- a/src/plugins/debuggergdb/debuggergdb.cpp ++++ b/src/plugins/debuggergdb/debuggergdb.cpp +@@ -554,7 +554,6 @@ int DebuggerGDB::LaunchProcessWithShell(const wxString &cmd, wxProcess *process, + const wxString &cwd) + { + wxString shell = GetShellString(); +-#if wxCHECK_VERSION(3, 0, 0) + wxExecuteEnv execEnv; + execEnv.cwd = cwd; + // Read the current environment variables and then make changes to them. +@@ -565,15 +564,6 @@ int DebuggerGDB::LaunchProcessWithShell(const wxString &cmd, wxProcess *process, + execEnv.env["SHELL"] = shell; + } + return wxExecute(cmd, wxEXEC_ASYNC, process, &execEnv); +-#else +- if (!shell.empty()) +- { +- Log(wxString::Format(wxT("Setting SHELL to '%s'"), shell.wx_str())); +- wxSetEnv(wxT("SHELL"), shell); +- } +- (void)cwd; +- return wxExecute(cmd, wxEXEC_ASYNC, process); +-#endif // !wxCHECK_VERSION(3, 0, 0) + } + + int DebuggerGDB::LaunchProcess(const wxString& cmd, const wxString& cwd) +diff --git a/src/plugins/debuggergdb/gdb_commands.h b/src/plugins/debuggergdb/gdb_commands.h +index cd564b29c9..5a77fbb5e4 100644 +--- a/src/plugins/debuggergdb/gdb_commands.h ++++ b/src/plugins/debuggergdb/gdb_commands.h +@@ -63,11 +63,7 @@ namespace + + while (count < sizeof(T) * 2) // be sure we don't keep adding more to ret + { +- #if wxCHECK_VERSION(3, 0, 0) + switch (str[pos].GetValue()) +- #else +- switch (str[pos]) +- #endif + { + case _T('0'): + case _T('1'): +diff --git a/src/sdk/base64.cpp b/src/sdk/base64.cpp +index 3837cb55f8..c4593f17fb 100644 +--- a/src/sdk/base64.cpp ++++ b/src/sdk/base64.cpp +@@ -22,9 +22,7 @@ + + #include "base64.h" + +-#if wxCHECK_VERSION(3, 0, 0) + #include <wx/unichar.h> +-#endif + + const wxChar fillchar = '='; + +@@ -105,29 +103,17 @@ wxString wxBase64::Decode(const wxString& data) + c1 = cvt.Find(data[i]); + wxASSERT_MSG(c1 >= 0, _T("invalid base64 input")); + c = (c << 2) | ((c1 >> 4) & 0x3); +- #if wxCHECK_VERSION(3, 0, 0) + ret.Append(static_cast<wxUniChar>(c), 1); +- #else +- ret.Append(c, 1); +- #endif + if (++i < len) + { + c = data[i]; + if ((char)fillchar == c) + break; + +- #if wxCHECK_VERSION(3, 0, 0) + c = cvt.Find(static_cast<wxUniChar>(c)); +- #else +- c = cvt.Find(c); +- #endif + wxASSERT_MSG(c >= 0, _T("invalid base64 input")); + c1 = ((c1 << 4) & 0xf0) | ((c >> 2) & 0xf); +- #if wxCHECK_VERSION(3, 0, 0) + ret.Append(static_cast<wxUniChar>(c1), 1); +- #else +- ret.Append(c1, 1); +- #endif + } + + if (++i < len) +@@ -136,18 +122,10 @@ wxString wxBase64::Decode(const wxString& data) + if ((char)fillchar == c1) + break; + +- #if wxCHECK_VERSION(3, 0, 0) + c1 = cvt.Find(static_cast<wxUniChar>(c1)); +- #else +- c1 = cvt.Find(c1); +- #endif + wxASSERT_MSG(c1 >= 0, _T("invalid base64 input")); + c = ((c << 6) & 0xc0) | c1; +- #if wxCHECK_VERSION(3, 0, 0) + ret.Append(static_cast<wxUniChar>(c), 1); +- #else +- ret.Append(c, 1); +- #endif + } + } + +diff --git a/src/sdk/cbauibook.cpp b/src/sdk/cbauibook.cpp +index b1841b669c..ae4776a3db 100644 +--- a/src/sdk/cbauibook.cpp ++++ b/src/sdk/cbauibook.cpp +@@ -37,11 +37,7 @@ int cbAuiNotebook::s_moveDirection = 1; + + + BEGIN_EVENT_TABLE(cbAuiNotebook, wxAuiNotebook) +-#if wxCHECK_VERSION(3, 0, 0) + EVT_NAVIGATION_KEY(cbAuiNotebook::OnNavigationKeyNotebook) +-#else +- EVT_NAVIGATION_KEY(cbAuiNotebook::OnNavigationKey) +-#endif + EVT_IDLE(cbAuiNotebook::OnIdle) + EVT_AUINOTEBOOK_DRAG_DONE(wxID_ANY, cbAuiNotebook::OnDragDone) + END_EVENT_TABLE() +@@ -51,9 +47,6 @@ cbAuiNotebook::cbAuiNotebook(wxWindow* pParent, wxWindowID id, const wxPoint& po + #ifdef __WXMSW__ + m_LastSelected(wxNOT_FOUND), + m_LastId(0), +-#endif +-#if !wxCHECK_VERSION(3, 0, 0) +- m_HasToolTip(false), + #endif + m_SetZoomOnIdle(false), + m_MinimizeFreeSpaceOnIdle(false), +@@ -64,7 +57,7 @@ cbAuiNotebook::cbAuiNotebook(wxWindow* pParent, wxWindowID id, const wxPoint& po + m_mgr.SetFlags((m_mgr.GetFlags() | wxAUI_MGR_VENETIAN_BLINDS_HINT) & ~wxAUI_MGR_TRANSPARENT_HINT); + #endif // #ifdef __WXGTK__ + ConfigManager *cfg = Manager::Get()->GetConfigManager(_T("app")); +-#if defined __WXMSW__ && wxCHECK_VERSION(3, 0, 0) ++#if defined __WXMSW__ + wxToolTip::SetMaxWidth(-1); + #endif + s_AllowMousewheel = cfg->ReadBool(_T("/environment/tabs_use_mousewheel"),true); +@@ -152,10 +145,6 @@ void cbAuiNotebook::ResetTabCtrlEvents() + { + for (size_t i = 0; i < m_TabCtrls.GetCount(); ++i) + { +-#if !wxCHECK_VERSION(3, 0, 0) +- m_TabCtrls[i]->Disconnect(wxEVT_MOTION, wxMouseEventHandler(cbAuiNotebook::OnMotion)); +- m_TabCtrls[i]->Connect(wxEVT_MOTION , wxMouseEventHandler(cbAuiNotebook::OnMotion)); +-#endif + m_TabCtrls[i]->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(cbAuiNotebook::OnTabCtrlDblClick)); + m_TabCtrls[i]->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(cbAuiNotebook::OnTabCtrlDblClick)); + m_TabCtrls[i]->Disconnect(wxEVT_SIZE, wxSizeEventHandler(cbAuiNotebook::OnResize)); +@@ -427,57 +416,6 @@ void cbAuiNotebook::OnResize(wxSizeEvent& event) + event.Skip(); + } + +-#if !wxCHECK_VERSION(3, 0, 0) +-void cbAuiNotebook::OnMotion(wxMouseEvent& event) +-{ +- event.Skip(); +- wxAuiTabCtrl* tabCtrl = (wxAuiTabCtrl*)event.GetEventObject(); +- if (!tabCtrl) +- return; +- cbAuiNotebook* nb = (cbAuiNotebook*)tabCtrl->GetParent(); +- if (!nb || !nb->m_HasToolTip) +- return; +- +- wxWindow* win = nullptr; +- if (event.Moving() && tabCtrl->TabHitTest(event.m_x, event.m_y, &win)) +- { +- if (!win) +- { +- tabCtrl->UnsetToolTip(); +- return; +- } +- wxString text(win->GetName()); +- // If the text changes, set it else, keep old, to avoid +- // 'moving tooltip' effect +- wxToolTip* tooltip = tabCtrl->GetToolTip(); +- if (!tooltip || tooltip->GetTip() != text) +- tabCtrl->SetToolTip(text); +- } +- else +- tabCtrl->UnsetToolTip(); +-} +- +-bool cbAuiNotebook::SetPageToolTip(size_t idx, const wxString & text) +-{ +- if (!m_HasToolTip) +- UpdateTabControlsArray(); +- +- m_HasToolTip = true; +- wxWindow* win = GetPage(idx); +- if (win && win->GetName() != text) +- win->SetName(text); +- else +- return false; +- return true; +-} +-wxString cbAuiNotebook::GetPageToolTip(size_t idx) +-{ +- wxWindow* win = GetPage(idx); +- if (win) +- return win->GetName(); +- return wxEmptyString; +-} +-#endif + void cbAuiNotebook::MinimizeFreeSpace() + { + if (GetPageCount() < 2) +@@ -657,22 +595,14 @@ void cbAuiNotebook::AdvanceSelection(bool forward) + } + } + +-#if wxCHECK_VERSION(3, 0, 0) + void cbAuiNotebook::OnNavigationKeyNotebook(wxNavigationKeyEvent& event) +-#else +-void cbAuiNotebook::OnNavigationKey(wxNavigationKeyEvent& event) +-#endif + { + // if we change window, we call our own AdvanceSelection + if ( event.IsWindowChange() ) + AdvanceSelection(event.GetDirection()); + else // otherwise we call the event-handler from the parent-class + { +-#if wxCHECK_VERSION(3, 0, 0) + wxAuiNotebook::OnNavigationKeyNotebook(event); +-#else +- wxAuiNotebook::OnNavigationKey(event); +-#endif + } + } + +@@ -726,11 +656,7 @@ wxString cbAuiNotebook::SavePerspective(const wxString projectTitle) + if (!tabsTmp.empty()) + tabsTmp += wxT(","); + +-#if wxCHECK_VERSION(3, 0, 0) + if ((int)page_idx == m_curPage) +-#else +- if ((int)page_idx == m_curpage) +-#endif + tabsTmp += wxT("*"); + else if ((int)p == tabCtrl->GetActivePage()) + tabsTmp += wxT("+"); +@@ -886,11 +812,7 @@ bool cbAuiNotebook::LoadPerspective(const wxString& layout, bool mergeLayouts) + wxString pane_name = tab_part.BeforeFirst(wxT('=')); + + // create a new tab frame +-#if wxCHECK_VERSION(3, 0, 0) + m_curPage = -1; +-#else +- m_curpage = -1; +-#endif + + // Get list of tab id's and move them to pane + wxString tab_list = tab_part.AfterFirst(wxT('=')); +@@ -1004,11 +926,7 @@ bool cbAuiNotebook::LoadPerspective(const wxString& layout, bool mergeLayouts) + RemoveEmptyTabFrames(); + + // Force refresh of selection +-#if wxCHECK_VERSION(3, 0, 0) + m_curPage = -1; +-#else +- m_curpage = -1; +-#endif + SetSelection(sel_page); + + UpdateTabControlsArray(); +diff --git a/src/sdk/crc32.cpp b/src/sdk/crc32.cpp +index 7b387877d2..62024d3c04 100644 +--- a/src/sdk/crc32.cpp ++++ b/src/sdk/crc32.cpp +@@ -78,11 +78,7 @@ wxUint32 wxCrc32::FromString(const wxString& text) + // Calculate the checksum + crc = 0xFFFFFFFFUL; + while (text[i]) +- #if wxCHECK_VERSION(3, 0, 0) + { crc = (crc>>8) ^ crc_table[ (crc^(text[i++].GetValue())) & 0xFF ]; } +- #else +- { crc = (crc>>8) ^ crc_table[ (crc^(text[i++])) & 0xFF ]; } +- #endif + + crc ^= 0xFFFFFFFFUL ; + } +diff --git a/src/sdk/editorcolourset.cpp b/src/sdk/editorcolourset.cpp +index e39eb412a2..483d6a0e8f 100644 +--- a/src/sdk/editorcolourset.cpp ++++ b/src/sdk/editorcolourset.cpp +@@ -835,11 +835,7 @@ void EditorColourSet::SetKeywords(HighlightLanguage lang, int idx, const wxStrin + wxString tmp(_T(' '), keywords.length()); // faster than using Alloc() + + const wxChar *src = keywords.c_str(); +- #if wxCHECK_VERSION(3, 0, 0) + wxStringCharType *dst = const_cast<wxStringCharType*>(tmp.wx_str()); +- #else +- wxChar *dst = (wxChar *) tmp.c_str(); +- #endif + wxChar c; + size_t len = 0; + +diff --git a/src/sdk/editorlexerloader.cpp b/src/sdk/editorlexerloader.cpp +index ee291b7345..85e4d7db8a 100644 +--- a/src/sdk/editorlexerloader.cpp ++++ b/src/sdk/editorlexerloader.cpp +@@ -229,11 +229,7 @@ void EditorLexerLoader::DoSingleKeywordNode(HighlightLanguage language, TiXmlEle + wxString value(keywords->Attribute("value"), wxConvUTF8); + regex.Replace(&value, _T(" ")); + +- #if wxCHECK_VERSION(3, 0, 0) + m_pTarget->SetKeywords(language, keyidx, value ); +- #else +- m_pTarget->SetKeywords(language, keyidx, wxString ( value, wxConvUTF8 ) ); +- #endif + } + + keywords = keywords->NextSiblingElement(nodename.mb_str()); diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-09.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-09.patch new file mode 100644 index 00000000000..80e943ab5dc --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-09.patch @@ -0,0 +1,556 @@ +From 9a9c6a9d5e3e0f6eff5594ecd61a2222f073be9c Mon Sep 17 00:00:00 2001 +From: wh11204 <wh11204@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Tue, 14 Dec 2021 09:27:57 +0000 +Subject: [PATCH] - Remove code for wxWidgets < 3.0.0 (part II). Includes: + src/sdk/cbeditor.cpp src/sdk/compiler.cpp src/sdk/configmanager.cpp + src/sdk/globals.cpp src/sdk/incremental_select_helper.cpp + src/sdk/newfromtemplatedlg.cpp src/sdk/pluginsconfigurationdlg.cpp + src/sdk/printing_types.cpp src/sdk/scripting/bindings/sc_globals.cpp + src/sdk/toolsmanager.cpp src/sdk/uservarmanager.cpp src/sdk/xtra_res.cpp + src/src/app.cpp + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12579 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + src/sdk/cbeditor.cpp | 8 ++--- + src/sdk/compiler.cpp | 14 ++------- + src/sdk/configmanager.cpp | 37 +---------------------- + src/sdk/globals.cpp | 31 ------------------- + src/sdk/incremental_select_helper.cpp | 4 --- + src/sdk/newfromtemplatedlg.cpp | 4 --- + src/sdk/pluginsconfigurationdlg.cpp | 4 --- + src/sdk/printing_types.cpp | 8 ----- + src/sdk/scripting/bindings/sc_globals.cpp | 8 ----- + src/sdk/toolsmanager.cpp | 4 --- + src/sdk/uservarmanager.cpp | 6 ---- + src/sdk/xtra_res.cpp | 19 ------------ + src/src/app.cpp | 36 +--------------------- + 13 files changed, 9 insertions(+), 174 deletions(-) + +diff --git a/src/sdk/cbeditor.cpp b/src/sdk/cbeditor.cpp +index e0d704bc67..f63f0aca72 100644 +--- a/src/sdk/cbeditor.cpp ++++ b/src/sdk/cbeditor.cpp +@@ -1223,13 +1223,13 @@ void cbEditor::Split(cbEditor::SplitType split) + m_pControl2->SetDocPointer(m_pControl->GetDocPointer()); + + // on wxGTK > 2.9 we need to thaw before reparent and refreeze the editor here or the whole app stays frozen +- #if defined ( __WXGTK__ ) && wxCHECK_VERSION(3, 0, 0) ++ #if defined ( __WXGTK__ ) + Thaw(); + #endif + // parent both controls under the splitter + m_pControl->Reparent(m_pSplitter); + m_pControl2->Reparent(m_pSplitter); +- #if defined ( __WXGTK__ ) && wxCHECK_VERSION(3, 0, 0) ++ #if defined ( __WXGTK__ ) + Freeze(); + #endif + +@@ -1289,12 +1289,12 @@ void cbEditor::Unsplit() + m_pSizer->Detach(m_pSplitter); + + // on wxGTK > 2.9 we need to thaw before reparent and refreeze the editor here or the whole app stays frozen +- #if defined ( __WXGTK__ ) && wxCHECK_VERSION(3, 0, 0) ++ #if defined ( __WXGTK__ ) + Thaw(); + #endif + // parent the left control under this + m_pControl->Reparent(this); +- #if defined ( __WXGTK__ ) && wxCHECK_VERSION(3, 0, 0) ++ #if defined ( __WXGTK__ ) + Freeze(); + #endif + // add it in the sizer +diff --git a/src/sdk/compiler.cpp b/src/sdk/compiler.cpp +index 6eb2ff9751..ab79812e30 100644 +--- a/src/sdk/compiler.cpp ++++ b/src/sdk/compiler.cpp +@@ -1537,11 +1537,7 @@ long Compiler::Execute(const wxString &cmd, wxArrayString &output) + // Loads the wxArrayString with the task output (returned in a wxInputStream) + wxInputStream *inputStream = process.GetInputStream(); + wxTextInputStream text(*inputStream); +-#if wxCHECK_VERSION(3, 0, 0) + while (!text.GetInputStream().Eof()) +-#else +- while (!inputStream->Eof()) +-#endif + { + output.Add(text.ReadLine()); + } +@@ -1556,13 +1552,9 @@ long Compiler::Execute(const wxString &cmd, wxArrayString &output) + { + wxLogNull logNo; // do not warn if execution fails + int flags = wxEXEC_SYNC; +- #if wxCHECK_VERSION(3, 0, 0) +- // Stop event-loop while wxExecute runs, to avoid a deadlock on startup, +- // that occurs from time to time on wx3 +- flags |= wxEXEC_NOEVENTS; +- #else +- flags |= wxEXEC_NODISABLE; +- #endif ++ // Stop event-loop while wxExecute runs, to avoid a deadlock on startup, ++ // that occurs from time to time on wx3 ++ flags |= wxEXEC_NOEVENTS; + return wxExecute(cmd, output, flags); + } + #endif // __WXMSW__ +diff --git a/src/sdk/configmanager.cpp b/src/sdk/configmanager.cpp +index 355a1e1839..c352b6ed24 100644 +--- a/src/sdk/configmanager.cpp ++++ b/src/sdk/configmanager.cpp +@@ -39,11 +39,7 @@ + #endif + + #ifdef __WXMAC__ +-#if wxCHECK_VERSION(3, 0, 0) + #include "wx/osx/core/cfstring.h" +-#else +-#include "wx/mac/corefoundation/cfstring.h" +-#endif + #include "wx/intl.h" + + #include <CoreFoundation/CFBundle.h> +@@ -124,11 +120,7 @@ namespace + CFRelease(resourcesURL); + CFStringRef cfStrPath = CFURLCopyFileSystemPath(absoluteURL,kCFURLPOSIXPathStyle); + CFRelease(absoluteURL); +- #if wxCHECK_VERSION(3, 0, 0) +- wxString str = wxCFStringRef(cfStrPath).AsString(wxLocale::GetSystemEncoding()); +- #else +- wxString str = wxMacCFStringHolder(cfStrPath).AsString(wxLocale::GetSystemEncoding()); +- #endif ++ wxString str = wxCFStringRef(cfStrPath).AsString(wxLocale::GetSystemEncoding()); + if (!str.Contains(wxString(_T("/Resources")))) + return ::DetermineExecutablePath() + _T("/.."); // not a bundle, use relative path + return str; +@@ -239,9 +231,7 @@ static void handleConfigError(TiXmlDocument &doc, const wxString &fileName, cons + wxMessageDialog dlg(Manager::Get()->GetAppWindow(), + message + _("\n\nDiscard old config file?"), _("Config file read error"), + wxSTAY_ON_TOP|wxCENTRE|wxYES|wxNO|wxNO_DEFAULT|wxICON_ERROR); +-#if wxCHECK_VERSION(3, 0, 0) + dlg.SetYesNoLabels(_("&Discard"), _("&Close")); +-#endif + if (dlg.ShowModal() != wxID_YES) + cbThrow(message); + +@@ -337,15 +327,8 @@ void CfgMgrBldr::SwitchToR(const wxString& absFileName) + { + size_t size = is->GetSize(); + wxString str; +- #if wxCHECK_VERSION(3, 0, 0) + wxChar* c = wxStringBuffer(str, size); +- #else +- wxChar* c = str.GetWriteBuf(size); +- #endif + is->Read(c, size); +- #if !wxCHECK_VERSION(3, 0, 0) +- str.UngetWriteBuf(size); +- #endif + + doc = new TiXmlDocument(); + +@@ -493,13 +476,8 @@ wxString CfgMgrBldr::GetConfigFile() const + */ + inline void to_upper(wxString& s) + { +- #if wxCHECK_VERSION(3, 0, 0) + wxStringCharType *p = const_cast<wxStringCharType*>(s.wx_str()); + wxStringCharType q; +- #else +- wxChar *p = (wxChar*) s.c_str(); +- wxChar q; +- #endif + size_t len = s.length()+1; + for (;--len;++p) + { +@@ -511,13 +489,8 @@ inline void to_upper(wxString& s) + + inline void to_lower(wxString& s) + { +- #if wxCHECK_VERSION(3, 0, 0) + wxStringCharType *p = const_cast<wxStringCharType*>(s.wx_str()); + wxStringCharType q; +- #else +- wxChar *p = (wxChar*) s.c_str(); +- wxChar q; +- #endif + size_t len = s.length()+1; + for (;--len;++p) + { +@@ -1239,11 +1212,7 @@ wxArrayString ConfigManager::EnumerateSubPaths(const wxString& path) + { + while (e->IterateChildren(curr) && (curr = e->IterateChildren(curr)->ToElement())) + { +- #if wxCHECK_VERSION(3, 0, 0) + wxUniChar c = cbC2U(curr->Value())[0]; +- #else +- wxChar c = *(cbC2U(curr->Value())); +- #endif + if (c < _T('A') || c > _T('Z')) // first char must be a letter, uppercase letters are key names + ret.Add(cbC2U(curr->Value())); + } +@@ -1325,11 +1294,7 @@ wxArrayString ConfigManager::EnumerateKeys(const wxString& path) + { + while (e->IterateChildren(curr) && (curr = e->IterateChildren(curr)->ToElement())) + { +- #if wxCHECK_VERSION(3, 0, 0) + wxUniChar c = cbC2U(curr->Value())[0]; +- #else +- wxChar c = *(cbC2U(curr->Value())); +- #endif + if (c >= _T('A') && c <= _T('Z')) // opposite of the above + ret.Add(cbC2U(curr->Value())); + } +diff --git a/src/sdk/globals.cpp b/src/sdk/globals.cpp +index f1fa40eb2e..f05975ab01 100644 +--- a/src/sdk/globals.cpp ++++ b/src/sdk/globals.cpp +@@ -1186,11 +1186,7 @@ wxBitmap cbLoadBitmapScaled(const wxString& filename, wxBitmapType bitmapType, d + + double cbGetContentScaleFactor(const wxWindow &window) + { +-#if wxCHECK_VERSION(3, 0, 0) + return window.GetContentScaleFactor(); +-#else +- return 1.0; +-#endif // wxCHECK_VERSION(3, 0, 0) + } + + #ifdef __WXGTK__ +@@ -1200,31 +1196,12 @@ double cbGetContentScaleFactor(const wxWindow &window) + // For other platforms the value returned by GetContentScalingFactor seems adequate. + double cbGetActualContentScaleFactor(cb_unused const wxWindow &window) + { +-#if wxCHECK_VERSION(3, 0, 0) + // It is possible to use the window to find a display, but unfortunately this doesn't work well, + // because we call this function mostly on windows which haven't been shown. This leads to + // warnings in the log about ClientToScreen failures. + // If there are problems on multi-monitor setups we should think about some other solution. :( + const wxSize ppi = wxGetDisplayPPI(); + return ppi.y / 96.0; +-#else // wxCHECK_VERSION(3, 0, 0) +- // This code is the simplest version which works in the most common case. +- // If people complain that multi-monitor setups behave strangely, this should be revised with +- // direct calls to GTK/GDK functions. +- +- // This function might return bad results for multi screen setups. +- const wxSize mm = wxGetDisplaySizeMM(); +- if (mm.x == 0 || mm.y == 0) +- return 1.0; +- const wxSize pixels = wxGetDisplaySize(); +- +- const double ppiX = wxRound((pixels.x * inches2mm) / mm.x); +- const double ppiY = wxRound((pixels.y * inches2mm) / mm.y); +- +- // My guess is that smaller scaling factor would look better. Probably it has effect only in +- // multi monitor setups where there are monitors with different dpi. +- return std::min(ppiX / 96.0, ppiY /96.0); +-#endif // wxCHECK_VERSION(3, 0, 0) + } + #else // __WXGTK__ + double cbGetActualContentScaleFactor(const wxWindow &window) +@@ -1323,11 +1300,7 @@ void SetSettingsIconsStyle(wxListCtrl* lc, SettingsIconsStyle style) + long flags = lc->GetWindowStyleFlag(); + switch (style) + { +-#if wxCHECK_VERSION(3, 0, 0) + case sisNoIcons: flags = (flags & ~wxLC_MASK_TYPE) | wxLC_LIST; break; +-#else +- case sisNoIcons: flags = (flags & ~wxLC_MASK_TYPE) | wxLC_SMALL_ICON; break; +-#endif + default: flags = (flags & ~wxLC_MASK_TYPE) | wxLC_ICON; break; + } + lc->SetWindowStyleFlag(flags); +@@ -1713,11 +1686,7 @@ DLLIMPORT wxArrayInt cbGetMultiChoiceDialog(const wxString& message, const wxStr + return wxArrayInt(); + } + +-#if wxCHECK_VERSION(3, 0, 0) + const char* cbGetTextFromUserPromptStr = wxGetTextFromUserPromptStr; +-#else +-const wxChar* cbGetTextFromUserPromptStr = wxGetTextFromUserPromptStr; +-#endif // wxCHECK_VERSION + + wxString cbGetTextFromUser(const wxString& message, const wxString& caption, const wxString& defaultValue, + wxWindow *parent, wxCoord x, wxCoord y, bool centre) +diff --git a/src/sdk/incremental_select_helper.cpp b/src/sdk/incremental_select_helper.cpp +index ba4d0da971..fdcaf95bd2 100644 +--- a/src/sdk/incremental_select_helper.cpp ++++ b/src/sdk/incremental_select_helper.cpp +@@ -195,10 +195,6 @@ void IncrementalSelectHandler::FilterItems() + FilterItemsFinalize(*m_list, *m_iterator); + } + +-#if !wxCHECK_VERSION(3, 0, 0) +- typedef int wxStandardID; +-#endif +- + static wxStandardID KeyDownAction(wxKeyEvent& event, int &selected, int selectedMax) + { + // now, adjust position from key input +diff --git a/src/sdk/newfromtemplatedlg.cpp b/src/sdk/newfromtemplatedlg.cpp +index 8776dcc30f..ee65504c3a 100644 +--- a/src/sdk/newfromtemplatedlg.cpp ++++ b/src/sdk/newfromtemplatedlg.cpp +@@ -195,11 +195,7 @@ void NewFromTemplateDlg::BuildCategoriesFor(TemplateOutputType otype, wxChoice* + cat->SetSelection(0); + } + +-#if wxCHECK_VERSION(3, 0, 0) + inline int wxCALLBACK SortTemplates(wxIntPtr item1, wxIntPtr item2, cb_unused wxIntPtr sortData) +-#else +-inline int wxCALLBACK SortTemplates(long item1, long item2, cb_unused long sortData) +-#endif + { + ListItemData* data1 = reinterpret_cast<ListItemData*>(item1); + ListItemData* data2 = reinterpret_cast<ListItemData*>(item2); +diff --git a/src/sdk/pluginsconfigurationdlg.cpp b/src/sdk/pluginsconfigurationdlg.cpp +index e3949590f9..fedb6b8458 100644 +--- a/src/sdk/pluginsconfigurationdlg.cpp ++++ b/src/sdk/pluginsconfigurationdlg.cpp +@@ -65,11 +65,7 @@ static wxString GetInitialInfo() + return initialInfo; + } + +-#if wxCHECK_VERSION(3, 0, 0) + inline int wxCALLBACK sortByTitle(wxIntPtr item1, wxIntPtr item2, cb_unused wxIntPtr sortData) +-#else +-inline int wxCALLBACK sortByTitle(long item1, long item2, cb_unused long sortData) +-#endif + { + const PluginElement* elem1 = (const PluginElement*)item1; + const PluginElement* elem2 = (const PluginElement*)item2; +diff --git a/src/sdk/printing_types.cpp b/src/sdk/printing_types.cpp +index 8b62f79831..1cd00a55da 100644 +--- a/src/sdk/printing_types.cpp ++++ b/src/sdk/printing_types.cpp +@@ -28,21 +28,13 @@ void InitPrinting() + { + g_printer = new wxPrinter; + int paperid = Manager::Get()->GetConfigManager(_T("app"))->ReadInt(_T("/printerdialog/paperid"), wxPAPER_A4 ); +- #if wxCHECK_VERSION(3, 0, 0) + wxPrintOrientation paperorientation = static_cast<wxPrintOrientation>( Manager::Get()->GetConfigManager(_T("app"))->ReadInt(_T("/printerdialog/paperorientation"), wxPORTRAIT ) ); +- #else +- int paperorientation = Manager::Get()->GetConfigManager(_T("app"))->ReadInt(_T("/printerdialog/paperorientation"), wxPORTRAIT ); +- #endif + wxPrintData* ppd = &(g_printer->GetPrintDialogData().GetPrintData()); + ppd->SetPaperId((wxPaperSize)paperid); +- #if wxCHECK_VERSION(3, 0, 0) + if (paperorientation == wxPORTRAIT) + ppd->SetOrientation(wxPORTRAIT); + else + ppd->SetOrientation(wxLANDSCAPE); +- #else +- ppd->SetOrientation(paperorientation); +- #endif + } + + // if (!g_pageSetupData) +diff --git a/src/sdk/scripting/bindings/sc_globals.cpp b/src/sdk/scripting/bindings/sc_globals.cpp +index 3b29eb452a..b08dd010ed 100644 +--- a/src/sdk/scripting/bindings/sc_globals.cpp ++++ b/src/sdk/scripting/bindings/sc_globals.cpp +@@ -303,15 +303,7 @@ namespace ScriptBindings + if (id != wxNOT_FOUND) + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, id); +- #if wxCHECK_VERSION(3, 0, 0) + mbar->GetEventHandler()->ProcessEvent(evt); +- #else +- if ( !mbar->ProcessEvent(evt) ) +- { +- wxString msg; msg.Printf(_("Calling the menu '%s' with ID %d failed."), menuPath.wx_str(), id); +- cbMessageBox(msg, _("Script error"), wxICON_WARNING); +- } +- #endif + // done + } + break; +diff --git a/src/sdk/toolsmanager.cpp b/src/sdk/toolsmanager.cpp +index 86ec3e2065..bd128893b4 100644 +--- a/src/sdk/toolsmanager.cpp ++++ b/src/sdk/toolsmanager.cpp +@@ -129,11 +129,7 @@ bool ToolsManager::Execute(const cbTool* tool) + + // log info so user can troubleshoot + dir = wxGetCwd(); // read in the actual working dir +- #if wxCHECK_VERSION(3, 0, 0) + Manager::Get()->GetLogManager()->Log(F(_("Launching tool '%s': %s (in %s)"), tool->GetName().wx_str(), cmdline.wx_str(), dir.wx_str())); +- #else +- Manager::Get()->GetLogManager()->Log(F(_("Launching tool '%s': %s (in %s)"), tool->GetName().c_str(), cmdline.c_str(), dir.c_str())); +- #endif + + bool pipe = true; + int flags = wxEXEC_ASYNC; +diff --git a/src/sdk/uservarmanager.cpp b/src/sdk/uservarmanager.cpp +index fa1118f401..ee21a10eb0 100644 +--- a/src/sdk/uservarmanager.cpp ++++ b/src/sdk/uservarmanager.cpp +@@ -32,9 +32,7 @@ + + #include "annoyingdialog.h" + +-#if wxCHECK_VERSION(3, 0, 0) + #include <wx/unichar.h> +-#endif + + #include <ctype.h> + +@@ -637,11 +635,7 @@ void UsrGlblMgrEditDialog::Sanitise(wxString& s) + } + + for (unsigned int i = 0; i < s.length(); ++i) +-#if wxCHECK_VERSION(3, 0, 0) + s[i] = wxIsalnum(s.GetChar(i)) ? s.GetChar(i) : wxUniChar('_'); +-#else +- s[i] = wxIsalnum(s.GetChar(i)) ? s.GetChar(i) : _T('_'); +-#endif + + if (s.GetChar(0) == _T('_')) + s.Prepend(_T("set")); +diff --git a/src/sdk/xtra_res.cpp b/src/sdk/xtra_res.cpp +index 1efe04276f..aa7f2ed2b9 100644 +--- a/src/sdk/xtra_res.cpp ++++ b/src/sdk/xtra_res.cpp +@@ -100,11 +100,7 @@ wxBitmap wxToolBarAddOnXmlHandler::GetCenteredBitmap(const wxString& param, wxSi + return stockArt; + } + +-#if wxCHECK_VERSION(3, 0, 0) + const wxString name = GetParamValue(paramNode); +-#else +- const wxString name = GetParamValue(param); +-#endif + if (name.empty()) + return wxArtProvider::GetBitmap(wxT("sdk/missing_icon"), wxART_TOOLBAR, size * scaleFactor); + +@@ -186,19 +182,10 @@ wxObject *wxToolBarAddOnXmlHandler::DoCreateResource() + if (GetPosition() != wxDefaultPosition) + { + m_toolbar->AddTool(GetID(), +- #if wxCHECK_VERSION(3, 0, 0) + wxEmptyString, +- #endif + GetCenteredBitmap(_T("bitmap"), bitmapSize, scaleFactor), + GetCenteredBitmap(_T("bitmap2"), bitmapSize, scaleFactor), +- #if !wxCHECK_VERSION(3, 0, 0) +- GetBool(_T("toggle")), +- GetPosition().x, +- GetPosition().y, +- NULL, +- #else + wxITEM_NORMAL, +- #endif + GetText(_T("tooltip")), + GetText(_T("longhelp"))); + } +@@ -332,15 +319,9 @@ bool wxToolBarAddOnXmlHandler::CanHandle(wxXmlNode *node) + // + // Don't ask me why... >:-| + +- #if wxCHECK_VERSION(3, 0, 0) + bool istbar = node->GetAttribute(wxT("class"), wxEmptyString).Matches(_T("wxToolBarAddOn")); + bool istool = node->GetAttribute(wxT("class"), wxEmptyString).Matches(_T("tool")); + bool issep = node->GetAttribute(wxT("class"), wxEmptyString).Matches(_T("separator")); +- #else +- bool istbar = node->GetPropVal(wxT("class"), wxEmptyString).Matches(_T("wxToolBarAddOn")); +- bool istool = node->GetPropVal(wxT("class"), wxEmptyString).Matches(_T("tool")); +- bool issep = node->GetPropVal(wxT("class"), wxEmptyString).Matches(_T("separator")); +- #endif + + return ((!m_isInside && istbar) || + (m_isInside && istool) || +diff --git a/src/src/app.cpp b/src/src/app.cpp +index 136721e62c..b85d4c25ce 100644 +--- a/src/src/app.cpp ++++ b/src/src/app.cpp +@@ -94,12 +94,8 @@ class DDEConnection : public wxConnection + { + public: + DDEConnection(MainFrame* frame) : m_Frame(frame) { ; } +-#if wxCHECK_VERSION(3, 0, 0) + bool OnExecute(const wxString& topic, const void *data, size_t size, + wxIPCFormat format) override; +-#else +- bool OnExecute(const wxString& topic, wxChar *data, int size, wxIPCFormat format) override; +-#endif + bool OnDisconnect() override; + private: + MainFrame* m_Frame; +@@ -110,17 +106,10 @@ wxConnectionBase* DDEServer::OnAcceptConnection(const wxString& topic) + return topic == DDE_TOPIC ? new DDEConnection(m_Frame) : nullptr; + } + +-#if wxCHECK_VERSION(3, 0, 0) + bool DDEConnection::OnExecute(cb_unused const wxString& topic, const void *data, size_t size, + wxIPCFormat format) + { + const wxString strData = wxConnection::GetTextFromData(data, size, format); +-#else +-bool DDEConnection::OnExecute(cb_unused const wxString& topic, wxChar *data, int size, +- wxIPCFormat format) +-{ +- const wxString strData((wxChar*)data); +-#endif + + if (strData.StartsWith(_T("[IfExec_Open(\""))) + return false; // let Shell Open handle the request as we *know* that we have registered the Shell Open command, too +@@ -220,11 +209,7 @@ class DDEClient: public wxClient { + }; + + #if wxUSE_CMDLINE_PARSER +-#if wxCHECK_VERSION(3, 0, 0) + #define CMD_ENTRY(X) X +-#else +-#define CMD_ENTRY(X) _T(X) +-#endif + const wxCmdLineEntryDesc cmdLineDesc[] = + { + { wxCMD_LINE_SWITCH, CMD_ENTRY("h"), CMD_ENTRY("help"), CMD_ENTRY("show this help message"), +@@ -330,21 +315,10 @@ class cbMessageOutputNull : public wxMessageOutput + { + public: + +-#if wxCHECK_VERSION(3, 0, 0) + virtual void Output(const wxString &str) override; +-#else +- #ifdef WX_ATTRIBUTE_PRINTF +- virtual void Printf(const wxChar* format, ...) WX_ATTRIBUTE_PRINTF_2; +- #else +- void Printf(const wxChar* format, ...) override ATTRIBUTE_PRINTF_2; +- #endif +-#endif // wxCHECK_VERSION + }; +-#if wxCHECK_VERSION(3, 0, 0) ++ + void cbMessageOutputNull::Output(cb_unused const wxString &str){} +-#else +-void cbMessageOutputNull::Printf(cb_unused const wxChar* format, ...){} +-#endif + } // namespace + + IMPLEMENT_APP(CodeBlocksApp) // TODO: This gives a "redundant declaration" warning, though I think it's false. Dig through macro and check. +@@ -355,11 +329,7 @@ BEGIN_EVENT_TABLE(CodeBlocksApp, wxApp) + END_EVENT_TABLE() + + #ifdef __WXMAC__ +-#if wxCHECK_VERSION(3, 0, 0) + #include "wx/osx/core/cfstring.h" +-#else +-#include "wx/mac/corefoundation/cfstring.h" +-#endif + #include "wx/intl.h" + + #include <CoreFoundation/CFBundle.h> +@@ -374,11 +344,7 @@ static wxString GetResourcesDir() + CFRelease(resourcesURL); + CFStringRef cfStrPath = CFURLCopyFileSystemPath(absoluteURL,kCFURLPOSIXPathStyle); + CFRelease(absoluteURL); +- #if wxCHECK_VERSION(3, 0, 0) + return wxCFStringRef(cfStrPath).AsString(wxLocale::GetSystemEncoding()); +- #else +- return wxMacCFStringHolder(cfStrPath).AsString(wxLocale::GetSystemEncoding()); +- #endif + } + #endif + diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-10.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-10.patch new file mode 100644 index 00000000000..0ef29e344fd --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-10.patch @@ -0,0 +1,965 @@ +From c28746f4887f10e6f9f10eeafae0fb22ecdbf9c7 Mon Sep 17 00:00:00 2001 +From: wh11204 <wh11204@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Wed, 15 Dec 2021 08:28:41 +0000 +Subject: [PATCH] - Remove code for wxWidgets < 3.0.0 (part III and last). + Includes: src/plugins/compilergcc/compileroptionsdlg.cpp + src/sdk/templatemanager.cpp src/src/associations.cpp src/src/dlgabout.cpp + src/src/main.cpp src/src/notebookstyles.cpp src/src/notebookstyles.h + src/src/projectmanagerui.cpp + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12580 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + .../compilergcc/compileroptionsdlg.cpp | 12 +- + src/sdk/templatemanager.cpp | 12 - + src/src/associations.cpp | 4 - + src/src/dlgabout.cpp | 10 +- + src/src/main.cpp | 13 - + src/src/notebookstyles.cpp | 592 +----------------- + src/src/notebookstyles.h | 39 -- + src/src/projectmanagerui.cpp | 4 - + 8 files changed, 5 insertions(+), 681 deletions(-) + +diff --git a/src/plugins/compilergcc/compileroptionsdlg.cpp b/src/plugins/compilergcc/compileroptionsdlg.cpp +index 476bbc7957..ade5fcf93d 100644 +--- a/src/plugins/compilergcc/compileroptionsdlg.cpp ++++ b/src/plugins/compilergcc/compileroptionsdlg.cpp +@@ -677,13 +677,9 @@ void CompilerOptionsDlg::DoFillOptions() + wxPGProperty *root = m_FlagsPG->GetRoot(); + if (root) + { +- unsigned count = root->GetChildCount(); ++ const unsigned count = root->GetChildCount(); + for (unsigned ii = 0; ii < count; ++ii) +-#if wxCHECK_VERSION(3, 0, 0) + m_FlagsPG->SortChildren(root->Item(ii), wxPG_RECURSE); +-#else +- m_FlagsPG->Sort(root->Item(ii)); +-#endif + } + m_FlagsPG->Thaw(); + } // DoFillOptions +@@ -2118,11 +2114,7 @@ void CompilerOptionsDlg::OnSetDefaultCompilerClick(cb_unused wxCommandEvent& eve + CompilerFactory::SetDefaultCompiler(idx); + wxString msg; + Compiler* compiler = CompilerFactory::GetDefaultCompiler(); +- #if wxCHECK_VERSION(3, 0, 0) +- msg.Printf(_("%s is now selected as the default compiler for new projects"), compiler ? compiler->GetName().wx_str() : _("[invalid]").wx_str()); +- #else +- msg.Printf(_("%s is now selected as the default compiler for new projects"), compiler ? compiler->GetName().c_str() : _("[invalid]")); +- #endif ++ msg.Printf(_("%s is now selected as the default compiler for new projects"), compiler ? compiler->GetName() : _("[invalid]")); + cbMessageBox(msg); + } // OnSetDefaultCompilerClick + +diff --git a/src/sdk/templatemanager.cpp b/src/sdk/templatemanager.cpp +index 5b5b91dff0..0161badf06 100644 +--- a/src/sdk/templatemanager.cpp ++++ b/src/sdk/templatemanager.cpp +@@ -186,11 +186,7 @@ cbProject* TemplateManager::NewProjectFromUserTemplate(NewFromTemplateDlg& dlg, + ++count; + } + else +- #if wxCHECK_VERSION(3, 0, 0) + Manager::Get()->GetLogManager()->DebugLog(F(_T("Failed copying %s to %s"), src.wx_str(), dst.wx_str())); +- #else +- Manager::Get()->GetLogManager()->DebugLog(F(_T("Failed copying %s to %s"), src.c_str(), dst.c_str())); +- #endif + } + if (count != total_count) + cbMessageBox(_("Some files could not be loaded with the template..."), _("Error"), wxICON_ERROR); +@@ -303,21 +299,13 @@ void TemplateManager::SaveUserTemplate(cbProject* prj) + { + wxString src = (*it)->file.GetFullPath(); + wxString dst = templ + (*it)->relativeToCommonTopLevelPath; +- #if wxCHECK_VERSION(3, 0, 0) + Manager::Get()->GetLogManager()->DebugLog(F(_T("Copying %s to %s"), src.wx_str(), dst.wx_str())); +- #else +- Manager::Get()->GetLogManager()->DebugLog(F(_T("Copying %s to %s"), src.c_str(), dst.c_str())); +- #endif + if (!CreateDirRecursively(dst)) + Manager::Get()->GetLogManager()->DebugLog(_T("Failed creating directory for ") + dst); + if (wxCopyFile(src, dst, true)) + ++count; + else +- #if wxCHECK_VERSION(3, 0, 0) + Manager::Get()->GetLogManager()->DebugLog(F(_T("Failed copying %s to %s"), src.wx_str(), dst.wx_str())); +- #else +- Manager::Get()->GetLogManager()->DebugLog(F(_T("Failed copying %s to %s"), src.c_str(), dst.c_str())); +- #endif + } + + // cbProject doesn't have a GetRelativeToCommonTopLevelPath() function, so we simulate it here +diff --git a/src/src/associations.cpp b/src/src/associations.cpp +index f6cebd5c0f..f981c3f27f 100644 +--- a/src/src/associations.cpp ++++ b/src/src/associations.cpp +@@ -201,11 +201,7 @@ void Associations::DoClearAssociation(const wxString& ext) + if (key.Exists()) + { + wxString s; +- #if wxCHECK_VERSION(3, 0, 0) + if (key.QueryValue(wxEmptyString, s) && s.StartsWith(_T("CodeBlocks"))) +- #else +- if (key.QueryValue(NULL, s) && s.StartsWith(_T("CodeBlocks"))) +- #endif + key.DeleteSelf(); + } + +diff --git a/src/src/dlgabout.cpp b/src/src/dlgabout.cpp +index 294350696c..545f7d13ab 100644 +--- a/src/src/dlgabout.cpp ++++ b/src/src/dlgabout.cpp +@@ -20,9 +20,7 @@ + #include <wx/string.h> + #include <wx/textctrl.h> + #include <wx/xrc/xmlres.h> +- #if wxCHECK_VERSION(3, 0, 0) +- #include <wx/versioninfo.h> +- #endif // wxCHECK_VERSION ++ #include <wx/versioninfo.h> + + #include "licenses.h" + #include "configmanager.h" +@@ -146,15 +144,11 @@ dlgAbout::dlgAbout(wxWindow* parent) + wxTextCtrl *txtLicense = XRCCTRL(*this, "txtLicense", wxTextCtrl); + txtLicense->SetValue(LICENSE_GPL); + +-#if wxCHECK_VERSION(3, 0, 0) + const wxVersionInfo scintillaVersion = wxScintilla::GetLibraryVersionInfo(); + const wxString scintillaStr = wxString::Format(wxT("%d.%d.%d"), + scintillaVersion.GetMajor(), + scintillaVersion.GetMinor(), + scintillaVersion.GetMicro()); +-#else +- const wxString scintillaStr = wxSCINTILLA_VERSION; +-#endif // wxCHECK_VERSION + + struct Item + { +@@ -218,9 +212,7 @@ dlgAbout::dlgAbout(wxWindow* parent) + information += wxT(": ") + item.value + wxT("\n"); + } + +-#if wxCHECK_VERSION(3, 0, 0) + information += wxT("\n") + wxGetLibraryVersionInfo().GetDescription(); +-#endif // wxCHECK_VERSION(3, 0, 0) + + wxTextCtrl *txtInformation = XRCCTRL(*this, "txtInformation", wxTextCtrl); + txtInformation->SetValue(information); +diff --git a/src/src/main.cpp b/src/src/main.cpp +index d730a92942..8de2a42061 100644 +--- a/src/src/main.cpp ++++ b/src/src/main.cpp +@@ -2075,11 +2075,7 @@ void MainFrame::DoSelectLayout(const wxString& name) + { + if (!items[i]->IsCheckable()) + continue; +-#if wxCHECK_VERSION(3, 0, 0) + items[i]->Check(items[i]->GetItemLabel().IsSameAs(name)); +-#else +- items[i]->Check(items[i]->GetText().IsSameAs(name)); +-#endif + } + + if (!m_LastLayoutIsTemp) +@@ -2401,12 +2397,7 @@ void MainFrame::DoUpdateEditorStyle(cbAuiNotebook* target, const wxString& prefi + break; + + default: // default style +- #if defined(__WXGTK__) && (USE_GTK_NOTEBOOK) && !wxCHECK_VERSION(3, 0, 0) +- target->SetArtProvider(new NbStyleGTK()); +- #else + target->SetArtProvider(new wxAuiDefaultTabArt()); +- #endif +- break; + } + + target->SetTabCtrlHeight(-1); +@@ -4801,13 +4792,9 @@ void MainFrame::OnEditorUpdateUI(CodeBlocksEvent& event) + + if (Manager::Get()->GetEditorManager() && event.GetEditor() == Manager::Get()->GetEditorManager()->GetActiveEditor()) + { +-#if wxCHECK_VERSION(3, 0, 0) + // Execute the code to update the status bar outside of the paint event for scintilla. + // Executing this function directly in the event handler causes redraw problems on Windows. + CallAfter(&MainFrame::DoUpdateStatusBar); +-#else +- DoUpdateStatusBar(); +-#endif // defined(__wxMSW__) && wxCHECK_VERSION(3, 0, 0) + } + + event.Skip(); +diff --git a/src/src/notebookstyles.cpp b/src/src/notebookstyles.cpp +index 81362d4982..d53edcaed2 100644 +--- a/src/src/notebookstyles.cpp ++++ b/src/src/notebookstyles.cpp +@@ -13,14 +13,6 @@ + #include "prep.h" + #include "notebookstyles.h" + +-#if defined(__WXGTK__) && (USE_GTK_NOTEBOOK) && !wxCHECK_VERSION(3, 0, 0) +- #define GSocket GLibSocket +- #include <gtk/gtk.h> +- #undef GSocket +- #include <wx/artprov.h> +- #include <wx/renderer.h> +-#endif +- + #include <wx/dc.h> + #include <wx/dcclient.h> + +@@ -42,15 +34,9 @@ wxAuiTabArt* NbStyleVC71::Clone() + { + NbStyleVC71* clone = new NbStyleVC71(); + +-#if wxCHECK_VERSION(3, 0, 0) + clone->SetNormalFont(m_normalFont); + clone->SetSelectedFont(m_selectedFont); + clone->SetMeasuringFont(m_measuringFont); +-#else +- clone->SetNormalFont(m_normal_font); +- clone->SetSelectedFont(m_selected_font); +- clone->SetMeasuringFont(m_measuring_font); +-#endif + + return clone; + } +@@ -75,11 +61,7 @@ void NbStyleVC71::DrawTab(wxDC& dc, wxWindow* wnd, + close_button_state, + x_extent); + +-#if wxCHECK_VERSION(3, 0, 0) + wxCoord tab_height = m_tabCtrlHeight - 3; +-#else +- wxCoord tab_height = m_tab_ctrl_height - 3; +-#endif + wxCoord tab_width = tab_size.x; + wxCoord tab_x = in_rect.x; + wxCoord tab_y = in_rect.y + in_rect.height - tab_height; +@@ -166,17 +148,10 @@ void NbStyleVC71::DrawTab(wxDC& dc, wxWindow* wnd, + wxCoord textx; + wxCoord texty; + if (page.active) +-#if wxCHECK_VERSION(3, 0, 0) + dc.SetFont(m_selectedFont); +-#else +- dc.SetFont(m_selected_font); +-#endif + else +-#if wxCHECK_VERSION(3, 0, 0) + dc.SetFont(m_normalFont); +-#else +- dc.SetFont(m_normal_font); +-#endif ++ + dc.GetTextExtent(caption, &textx, &texty); + // draw tab text + dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT)); +@@ -186,21 +161,12 @@ void NbStyleVC71::DrawTab(wxDC& dc, wxWindow* wnd, + // draw 'x' on tab (if enabled) + if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) + { +-#if wxCHECK_VERSION(3, 0, 0) + int close_button_width = m_activeCloseBmp.GetWidth(); + wxBitmap bmp = m_disabledCloseBmp; +-#else +- int close_button_width = m_active_close_bmp.GetWidth(); +- wxBitmap bmp = m_disabled_close_bmp; +-#endif + + if ((close_button_state == wxAUI_BUTTON_STATE_HOVER) || + (close_button_state == wxAUI_BUTTON_STATE_PRESSED)) +-#if wxCHECK_VERSION(3, 0, 0) + bmp = m_activeCloseBmp; +-#else +- bmp = m_active_close_bmp; +-#endif + + wxRect rect(tab_x + tab_width - close_button_width - 3, + drawn_tab_yoff + (drawn_tab_height / 2) - (bmp.GetHeight() / 2), +@@ -227,11 +193,7 @@ int NbStyleVC71::GetBestTabCtrlSize(wxWindow* wnd, + // m_requested_tabctrl_height = -1; + // m_tab_ctrl_height = -1; + wxClientDC dc(wnd); +-#if wxCHECK_VERSION(3, 0, 0) + dc.SetFont(m_measuringFont); +-#else +- dc.SetFont(m_measuring_font); +-#endif + int x_ext = 0; + wxSize s = GetTabSize(dc, wnd, wxT("ABCDEFGHIj"), wxNullBitmap, true, + wxAUI_BUTTON_STATE_HIDDEN, &x_ext); +@@ -246,15 +208,9 @@ wxAuiTabArt* NbStyleFF2::Clone() + { + NbStyleFF2* clone = new NbStyleFF2(); + +-#if wxCHECK_VERSION(3, 0, 0) + clone->SetNormalFont(m_normalFont); + clone->SetSelectedFont(m_selectedFont); + clone->SetMeasuringFont(m_measuringFont); +-#else +- clone->SetNormalFont(m_normal_font); +- clone->SetSelectedFont(m_selected_font); +- clone->SetMeasuringFont(m_measuring_font); +-#endif + + return clone; + } +@@ -272,11 +228,7 @@ void NbStyleFF2::DrawTab(wxDC& dc, wxWindow* wnd, + wxSize tab_size = GetTabSize(dc, wnd, page.caption, page.bitmap, + page.active, close_button_state, x_extent); + +-#if wxCHECK_VERSION(3, 0, 0) + wxCoord tab_height = m_tabCtrlHeight - 2; +-#else +- wxCoord tab_height = m_tab_ctrl_height - 2; +-#endif + wxCoord tab_width = tab_size.x; + wxCoord tab_x = in_rect.x; + wxCoord tab_y = in_rect.y + in_rect.height - tab_height; +@@ -360,17 +312,10 @@ void NbStyleFF2::DrawTab(wxDC& dc, wxWindow* wnd, + wxCoord textx; + wxCoord texty; + if (page.active) +-#if wxCHECK_VERSION(3, 0, 0) + dc.SetFont(m_selectedFont); +-#else +- dc.SetFont(m_selected_font); +-#endif + else +-#if wxCHECK_VERSION(3, 0, 0) + dc.SetFont(m_normalFont); +-#else +- dc.SetFont(m_normal_font); +-#endif ++ + dc.GetTextExtent(caption, &textx, &texty); + // draw tab text + dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT)); +@@ -380,21 +325,12 @@ void NbStyleFF2::DrawTab(wxDC& dc, wxWindow* wnd, + // draw 'x' on tab (if enabled) + if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) + { +-#if wxCHECK_VERSION(3, 0, 0) + int close_button_width = m_activeCloseBmp.GetWidth(); + wxBitmap bmp = m_disabledCloseBmp; +-#else +- int close_button_width = m_active_close_bmp.GetWidth(); +- wxBitmap bmp = m_disabled_close_bmp; +-#endif + + if ((close_button_state == wxAUI_BUTTON_STATE_HOVER) || + (close_button_state == wxAUI_BUTTON_STATE_PRESSED)) +-#if wxCHECK_VERSION(3, 0, 0) + bmp = m_activeCloseBmp; +-#else +- bmp = m_active_close_bmp; +-#endif + + wxRect rect(tab_x + tab_width - close_button_width - 3, + drawn_tab_yoff + (drawn_tab_height / 2) - (bmp.GetHeight() / 2), +@@ -421,533 +357,9 @@ int NbStyleFF2::GetBestTabCtrlSize(wxWindow* wnd, + // m_requested_tabctrl_height = -1; + // m_tab_ctrl_height = -1; + wxClientDC dc(wnd); +-#if wxCHECK_VERSION(3, 0, 0) + dc.SetFont(m_measuringFont); +-#else +- dc.SetFont(m_measuring_font); +-#endif + int x_ext = 0; + wxSize s = GetTabSize(dc, wnd, wxT("ABCDEFGHIj"), wxNullBitmap, true, + wxAUI_BUTTON_STATE_HIDDEN, &x_ext); + return s.y + 6; + } +- +-#if defined(__WXGTK__) && (USE_GTK_NOTEBOOK) && !wxCHECK_VERSION(3, 0, 0) +- +-namespace +-{ +- +-static GtkWidget *g_window = nullptr; +-static GtkWidget *g_container = nullptr; +-static GtkWidget *g_notebook = nullptr; +-static GtkWidget *g_button = nullptr; +-static int s_CloseIconSize = 16; // default size +- +-static void setup_widget_prototype(GtkWidget* widget) +-{ +- if (!g_window) +- { +- g_window = gtk_window_new(GTK_WINDOW_POPUP); +- gtk_widget_realize(g_window); +- } +- if (!g_container) +- { +- g_container = gtk_fixed_new(); +- gtk_container_add(GTK_CONTAINER(g_window), g_container); +- } +- +- gtk_container_add(GTK_CONTAINER(g_container), widget); +- gtk_widget_realize(widget); +-} +- +-static GtkStyle * get_style_button() +-{ +- if (!g_button) +- { +- g_button = gtk_button_new(); +- setup_widget_prototype(g_button); +- } +- return gtk_widget_get_style(g_button); +-} +- +-static GtkStyle * get_style_notebook() +-{ +- if (!g_notebook) +- { +- g_notebook = gtk_notebook_new(); +- setup_widget_prototype(g_notebook); +- } +- return gtk_widget_get_style(g_notebook); +-} +- +-} +- +-NbStyleGTK::NbStyleGTK(): +- m_Xthickness(0), +- m_Ythickness(0), +- m_TabHBorder(0), +- m_TabVBorder(0) +- +-{ +-} +- +-wxAuiTabArt* NbStyleGTK::Clone() +-{ +- NbStyleGTK* clone = new NbStyleGTK(); +- +-#if wxCHECK_VERSION(3, 0, 0) +- clone->SetNormalFont(m_normalFont); +- clone->SetSelectedFont(m_normalFont); +- clone->SetMeasuringFont(m_normalFont); +-#else +- clone->SetNormalFont(m_normal_font); +- clone->SetSelectedFont(m_normal_font); +- clone->SetMeasuringFont(m_normal_font); +-#endif +- +- return clone; +-} +- +-void NbStyleGTK::DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect) +-{ +- GtkStyle* style_notebook = get_style_notebook(); +- GtkNotebook* notebook = GTK_NOTEBOOK (g_notebook); +- +- // if one of the parameters have changed, the height needs to be recalculated, so we force it, +- if(m_Xthickness != style_notebook->xthickness || +- m_Ythickness != style_notebook->ythickness || +- m_TabVBorder != notebook->tab_vborder || +- m_TabHBorder != notebook->tab_hborder) +- { +- m_Xthickness = style_notebook->xthickness; +- m_Ythickness = style_notebook->ythickness; +- m_TabVBorder = notebook->tab_vborder; +- m_TabHBorder = notebook->tab_hborder; +- wxAuiNotebook* nb = nullptr; +- if(wnd) +- nb = (cbAuiNotebook*)wnd->GetParent(); +- if(nb) +- nb->SetTabCtrlHeight(-1); +- } +-#if wxCHECK_VERSION(3, 0, 0) +- wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); +- GdkWindow* pWin = impldc->GetGDKWindow(); +-#else +- GdkWindow* pWin = dc.GetGDKWindow(); +-#endif +- gtk_style_apply_default_background(style_notebook, pWin, 1, GTK_STATE_NORMAL, nullptr, +- rect.x, rect.y, rect.width, rect.height); +-} +- +-void ButtonStateAndShadow(int button_state, GtkStateType &state, GtkShadowType &shadow) +-{ +- +- if (button_state & wxAUI_BUTTON_STATE_DISABLED) +- { +- state = GTK_STATE_INSENSITIVE; +- shadow = GTK_SHADOW_ETCHED_IN; +- } +- else if (button_state & wxAUI_BUTTON_STATE_HOVER) +- { +- state = GTK_STATE_PRELIGHT; +- shadow = GTK_SHADOW_OUT; +- } +- else if (button_state & wxAUI_BUTTON_STATE_PRESSED) +- { +- state = GTK_STATE_ACTIVE; +- shadow = GTK_SHADOW_IN; +- } +- else +- { +- state = GTK_STATE_NORMAL; +- shadow = GTK_SHADOW_OUT; +- } +-} +- +-wxRect DrawCloseButton(wxDC& dc, +- GtkWidget *widget, +- int button_state, +- wxRect const &in_rect, +- int orientation, +- GdkRectangle* clipRect) +-{ +- GtkStyle *style_button = get_style_button(); +- int xthickness = style_button->xthickness; +- int ythickness = style_button->ythickness; +- +- wxBitmap bmp; +- bmp.SetPixbuf(gtk_widget_render_icon(widget, GTK_STOCK_CLOSE, GTK_ICON_SIZE_SMALL_TOOLBAR, "tab")); +- +- if(bmp.GetWidth() != s_CloseIconSize || bmp.GetHeight() != s_CloseIconSize) +- { +- wxImage img = bmp.ConvertToImage(); +- img.Rescale(s_CloseIconSize, s_CloseIconSize); +- bmp = img; +- } +- +- int button_size = s_CloseIconSize + 2 * xthickness; +- +- wxRect out_rect; +- +- if (orientation == wxLEFT) +- out_rect.x = in_rect.x - ythickness; +- else +- out_rect.x = in_rect.x + in_rect.width - button_size - ythickness; +- +- out_rect.y = in_rect.y + (in_rect.height - button_size) / 2; +- out_rect.width = button_size; +- out_rect.height = button_size; +- +-#if wxCHECK_VERSION(3, 0, 0) +- wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); +- GdkWindow* pWin = impldc->GetGDKWindow(); +-#else +- GdkWindow* pWin = dc.GetGDKWindow(); +-#endif +- +- if (button_state == wxAUI_BUTTON_STATE_HOVER) +- { +- gtk_paint_box(style_button, pWin, +- GTK_STATE_PRELIGHT, GTK_SHADOW_OUT, clipRect, widget, "button", +- out_rect.x, out_rect.y, out_rect.width, out_rect.height); +- } +- else if (button_state == wxAUI_BUTTON_STATE_PRESSED) +- { +- gtk_paint_box(style_button, pWin, +- GTK_STATE_ACTIVE, GTK_SHADOW_IN, clipRect, widget, "button", +- out_rect.x, out_rect.y, out_rect.width, out_rect.height); +- } +- +- +- dc.DrawBitmap(bmp, out_rect.x + xthickness, out_rect.y + ythickness, true); +- +- return out_rect; +-} +- +-void NbStyleGTK::DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& page, +- const wxRect& in_rect, int close_button_state, wxRect* out_tab_rect, +- wxRect* out_button_rect, int* x_extent) +-{ +- GtkWidget *widget = wnd->GetHandle(); +- GtkStyle *style_notebook = get_style_notebook(); +- +- wxRect const &window_rect = wnd->GetRect(); +- +- int focus_width = 0; +- +- gtk_widget_style_get(g_notebook, +- "focus-line-width", &focus_width, +- NULL); +- +- int tab_pos; +- if (m_flags &wxAUI_NB_BOTTOM) +- tab_pos = wxAUI_NB_BOTTOM; +- else //if (m_flags & wxAUI_NB_TOP) {} +- tab_pos = wxAUI_NB_TOP; +- +- // TODO: else if (m_flags &wxAUI_NB_LEFT) {} +- // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} +- +- // figure out the size of the tab +- wxSize tab_size = GetTabSize(dc, wnd, page.caption, page.bitmap, +- page.active, close_button_state, x_extent); +- +- wxRect tab_rect = in_rect; +- tab_rect.width = tab_size.x; +- tab_rect.height = tab_size.y; +- tab_rect.y += 2 * m_TabHBorder; +- +- if (page.active) +- tab_rect.height += 2 * m_TabHBorder; +-#if wxCHECK_VERSION(3, 0, 0) +- // if no bitmap is set, we need a tiny correction +- if (! page.bitmap.IsOk()) +- tab_rect.height += 1; +-#endif +- +- int gap_rect_height = 6 * m_TabHBorder; +- int gap_rect_x = 1, gap_start = 0, gap_width = 0; +- int gap_rect_y = tab_rect.y - gap_rect_height; +- int gap_rect_width = window_rect.width; +- +- switch (tab_pos) +- { +- case wxAUI_NB_TOP: +- tab_rect.y -= 2 * m_TabHBorder; +- if (!page.active) +- tab_rect.y += 2 * m_TabHBorder; +- gap_rect_y = tab_rect.y + tab_rect.height - m_TabHBorder / 2; +- // fall through +- case wxAUI_NB_BOTTOM: +- gap_start = tab_rect.x - m_TabVBorder / 2; +- gap_width = tab_rect.width; +- break; +- default: +- break; +- } +- tab_rect.y += m_TabHBorder / 2; +- gap_rect_y += m_TabHBorder / 2; +- +- int padding = focus_width + m_TabHBorder; +- +- int clip_width = tab_rect.width; +- if (tab_rect.x + tab_rect.width > in_rect.x + in_rect.width) +- clip_width = (in_rect.x + in_rect.width) - tab_rect.x; +- +- dc.SetClippingRegion(tab_rect.x, tab_rect.y - m_TabVBorder, clip_width, tab_rect.height + m_TabVBorder); +- +- GdkRectangle area; +- area.x = tab_rect.x - m_TabVBorder; +- area.y = tab_rect.y - 2 * m_TabHBorder; +- area.width = clip_width + m_TabVBorder; +- area.height = tab_rect.height + 2 * m_TabHBorder; +- +-#if wxCHECK_VERSION(3, 0, 0) +- wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); +- GdkWindow* pWin = impldc->GetGDKWindow(); +-#else +- GdkWindow* pWin = dc.GetGDKWindow(); +-#endif +- +- if (tab_pos == wxAUI_NB_BOTTOM) +- { +- if (page.active) +- { +- gtk_paint_box_gap(style_notebook, pWin, GTK_STATE_NORMAL, GTK_SHADOW_OUT, +- NULL, widget, "notebook", +- gap_rect_x, gap_rect_y, +- gap_rect_width, gap_rect_height, +- GTK_POS_BOTTOM, gap_start , gap_width); +- } +- gtk_paint_extension(style_notebook, pWin, +- page.active ? GTK_STATE_NORMAL : GTK_STATE_ACTIVE, GTK_SHADOW_OUT, +- &area, widget, "tab", +- tab_rect.x, tab_rect.y, +- tab_rect.width, tab_rect.height, +- GTK_POS_TOP); +- } +- else +- { +- if (page.active) +- { +- gtk_paint_box_gap(style_notebook, pWin, GTK_STATE_NORMAL, GTK_SHADOW_OUT, +- NULL, widget, "notebook", +- gap_rect_x, gap_rect_y, +- gap_rect_width, gap_rect_height, +- GTK_POS_TOP, gap_start , gap_width); +- } +- gtk_paint_extension(style_notebook, pWin, +- page.active ? GTK_STATE_NORMAL : GTK_STATE_ACTIVE, GTK_SHADOW_OUT, +- &area, widget, "tab", +- tab_rect.x, tab_rect.y, +- tab_rect.width, tab_rect.height, +- GTK_POS_BOTTOM); +- } +- +- wxCoord textX = tab_rect.x + padding + m_Xthickness; +- +- int bitmap_offset = 0; +- if (page.bitmap.IsOk()) +- { +- bitmap_offset = textX; +- +- // draw bitmap +- int bitmapY = tab_rect.y +(tab_rect.height - page.bitmap.GetHeight()) / 2; +- if(!page.active) +- { +- if (tab_pos == wxAUI_NB_TOP) +- bitmapY += m_Ythickness / 2; +- else +- bitmapY -= m_Ythickness / 2; +- } +- dc.DrawBitmap(page.bitmap, +- bitmap_offset, +- bitmapY, +- true); +- +- textX += page.bitmap.GetWidth() + padding; +- } +- +- wxCoord textW, textH, textY; +- +-#if wxCHECK_VERSION(3, 0, 0) +- dc.SetFont(m_normalFont); +-#else +- dc.SetFont(m_normal_font); +-#endif +- dc.GetTextExtent(page.caption, &textW, &textH); +- textY = tab_rect.y + (tab_rect.height - textH) / 2; +- if(!page.active) +- { +- if (tab_pos == wxAUI_NB_TOP) +- textY += m_Ythickness / 2; +- else +- textY -= m_Ythickness / 2; +- } +- +- // draw tab text +- GdkColor text_colour = page.active ? style_notebook->fg[GTK_STATE_NORMAL] : style_notebook->fg[GTK_STATE_ACTIVE]; +- dc.SetTextForeground(wxColor(text_colour)); +- GdkRectangle focus_area; +- +- int padding_focus = padding - focus_width; +- focus_area.x = tab_rect.x + padding_focus; +- focus_area.y = textY - focus_width; +- focus_area.width = tab_rect.width - 2 * padding_focus; +- focus_area.height = textH + 2 * focus_width; +- +- if(page.active && (wnd->FindFocus() == wnd) && focus_area.x <= (area.x + area.width)) +- { +- // clipping seems not to work here, so we we have to recalc the focus-area manually +- if((focus_area.x + focus_area.width) > (area.x + area.width)) +- focus_area.width = area.x + area.width - focus_area.x + focus_width - m_TabVBorder; +- gtk_paint_focus (style_notebook, pWin, +- GTK_STATE_ACTIVE, NULL, widget, "tab", +- focus_area.x, focus_area.y, focus_area.width, focus_area.height); +- } +- +- dc.DrawText(page.caption, textX, textY); +- +- // draw close-button on tab (if enabled) +- if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) +- { +- wxRect rect(tab_rect.x, tab_rect.y, tab_rect.width - m_Xthickness, tab_rect.height); +- if(!page.active) +- { +- if (tab_pos == wxAUI_NB_TOP) +- rect.y += m_Ythickness / 2; +- else +- rect.y -= m_Ythickness / 2; +- } +- *out_button_rect = DrawCloseButton(dc, widget, close_button_state, rect, wxRIGHT, &area); +- } +- +- tab_rect.width = std::min(tab_rect.width, clip_width); +- *out_tab_rect = tab_rect; +- +- dc.DestroyClippingRegion(); +-} +- +-wxRect DrawSimpleArrow(wxDC& dc, +- GtkWidget *widget, +- int button_state, +- wxRect const &in_rect, +- int orientation, +- GtkArrowType arrow_type) +-{ +- int scroll_arrow_hlength, scroll_arrow_vlength; +- gtk_widget_style_get(widget, +- "scroll-arrow-hlength", &scroll_arrow_hlength, +- "scroll-arrow-vlength", &scroll_arrow_vlength, +- NULL); +- +- GtkStateType state; +- GtkShadowType shadow; +- ButtonStateAndShadow(button_state, state, shadow); +- +- wxRect out_rect; +- +- if (orientation == wxLEFT) +- out_rect.x = in_rect.x; +- else +- out_rect.x = in_rect.x + in_rect.width - scroll_arrow_hlength; +- out_rect.y = (in_rect.y + in_rect.height - 3 * get_style_notebook()->ythickness - scroll_arrow_vlength) / 2; +- out_rect.width = scroll_arrow_hlength; +- out_rect.height = scroll_arrow_vlength; +- +-#if wxCHECK_VERSION(3, 0, 0) +- wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); +- GdkWindow* pWin = impldc->GetGDKWindow(); +-#else +- GdkWindow* pWin = dc.GetGDKWindow(); +-#endif +- gtk_paint_arrow (get_style_button(), pWin, state, shadow, nullptr, widget, "notebook", +- arrow_type, TRUE, out_rect.x, out_rect.y, out_rect.width, out_rect.height); +- +- return out_rect; +-} +- +-void NbStyleGTK::DrawButton(wxDC& dc, wxWindow* wnd, +- const wxRect& in_rect, +- int bitmap_id, +- int button_state, +- int orientation, +- wxRect* out_rect) +-{ +- GtkWidget *widget = wnd->GetHandle(); +- wxRect rect = in_rect; +- if (m_flags &wxAUI_NB_BOTTOM) +- rect.y += 2 * get_style_button()->ythickness; +- +- switch (bitmap_id) +- { +- case wxAUI_BUTTON_CLOSE: +- rect.y -= 2 * get_style_button()->ythickness; +- rect = DrawCloseButton(dc, widget, button_state, rect, orientation, NULL); +- break; +- +- case wxAUI_BUTTON_LEFT: +- rect = DrawSimpleArrow(dc, widget, button_state, rect, orientation, GTK_ARROW_LEFT); +- break; +- +- case wxAUI_BUTTON_RIGHT: +- rect = DrawSimpleArrow(dc, widget, button_state, rect, orientation, GTK_ARROW_RIGHT); +- break; +- +- case wxAUI_BUTTON_WINDOWLIST: +- { +- rect.height -= 4 * get_style_button()->ythickness; +- rect.width = rect.height; +- rect.x = in_rect.x + in_rect.width - rect.width; +- +- if (button_state == wxAUI_BUTTON_STATE_HOVER) +- wxRendererNative::Get().DrawComboBoxDropButton(wnd, dc, rect, wxCONTROL_CURRENT); +- else if (button_state == wxAUI_BUTTON_STATE_PRESSED) +- wxRendererNative::Get().DrawComboBoxDropButton(wnd, dc, rect, wxCONTROL_PRESSED); +- else +- wxRendererNative::Get().DrawDropArrow(wnd, dc, rect); +- } +- break; +- +- default: +- break; +- } +- +- *out_rect = rect; +-} +- +- +-int NbStyleGTK::GetBestTabCtrlSize(wxWindow* wnd, +- const wxAuiNotebookPageArray& pages, +- const wxSize& required_bmp_size) +-{ +-#if wxCHECK_VERSION(3, 0, 0) +- SetMeasuringFont(m_normalFont); +- SetSelectedFont(m_normalFont); +-#else +- SetMeasuringFont(m_normal_font); +- SetSelectedFont(m_normal_font); +-#endif +- int tab_height = 3 * get_style_notebook()->ythickness + wxAuiDefaultTabArt::GetBestTabCtrlSize(wnd, pages, required_bmp_size); +- return tab_height; +-} +- +-wxSize NbStyleGTK::GetTabSize(wxDC& dc, +- wxWindow* wnd, +- const wxString& caption, +- const wxBitmap& bitmap, +- bool active, +- int close_button_state, +- int* x_extent) +-{ +- wxSize s = wxAuiDefaultTabArt::GetTabSize(dc, wnd, caption, bitmap, active, close_button_state, x_extent); +- +- int overlap = 0; +- gtk_widget_style_get (wnd->GetHandle(), +- "focus-line-width", &overlap, +- NULL); +- *x_extent -= overlap; +- return s; +-} +- +-#endif // #if defined(__WXGTK__) && (USE_GTK_NOTEBOOK) && !wxCHECK_VERSION(3, 0, 0) +diff --git a/src/src/notebookstyles.h b/src/src/notebookstyles.h +index 1a49428478..36f84139aa 100644 +--- a/src/src/notebookstyles.h ++++ b/src/src/notebookstyles.h +@@ -8,14 +8,6 @@ + + #include "cbauibook.h" + +-#if defined(__WXGTK__) && (USE_GTK_NOTEBOOK) && !wxCHECK_VERSION(3, 0, 0) +- #define GSocket GLibSocket +- #include <gtk/gtk.h> +- #undef GSocket +- #include <wx/artprov.h> +-#endif +- +- + class wxDC; + class wxWindow; + class wxRect; +@@ -53,35 +45,4 @@ class NbStyleFF2 : public wxAuiDefaultTabArt + const wxSize& required_bmp_size) override; + }; + +-#if defined(__WXGTK__) && (USE_GTK_NOTEBOOK) && !wxCHECK_VERSION(3, 0, 0) +-class NbStyleGTK : public wxAuiDefaultTabArt +-{ +-public: +- NbStyleGTK(); +- +- virtual wxAuiTabArt* Clone(); +- virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect); +- virtual void DrawTab(wxDC& dc, +- wxWindow* wnd, +- const wxAuiNotebookPage& page, +- const wxRect& in_rect, +- int close_button_state, +- wxRect* out_tab_rect, +- wxRect* out_button_rect, +- int* x_extent); +- void DrawButton(wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id, +- int button_state, int orientation, wxRect* out_rect); +- int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, +- const wxSize& required_bmp_size); +- virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmap& bitmap, bool active, +- int close_button_state, int* x_extent); +-private: +- int m_Xthickness; +- int m_Ythickness; +- int m_TabHBorder; +- int m_TabVBorder; +- wxBitmap m_ActiveCloseButton; +-}; +-#endif // #if defined(__WXGTK__) && (USE_GTK_NOTEBOOK) && !wxCHECK_VERSION(3, 0, 0) +- + #endif // NOTEBOOKSTYLES_H +diff --git a/src/src/projectmanagerui.cpp b/src/src/projectmanagerui.cpp +index 05718ef605..18b2dcecf2 100644 +--- a/src/src/projectmanagerui.cpp ++++ b/src/src/projectmanagerui.cpp +@@ -1875,11 +1875,7 @@ struct cbStringHash + { + size_t operator()(const wxString& s) const + { +-#if wxCHECK_VERSION(3, 0, 0) + return std::hash<std::wstring>()(s.ToStdWstring()); +-#else +- return std::hash<std::wstring>()(s.wc_str()); +-#endif // wxCHECK_VERSION + } + }; + diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-11.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-11.patch new file mode 100644 index 00000000000..dfcd414de26 --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-11.patch @@ -0,0 +1,66 @@ +From b2e4f1279804e1d11b71bc75eeb37072c3589296 Mon Sep 17 00:00:00 2001 +From: wh11204 <wh11204@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Sat, 18 Dec 2021 08:13:26 +0000 +Subject: [PATCH] * Fix scale factor detection for wxWidgets >= 3.1.4 (ticket + #1132). wxWidgets changed the value returned by + wxWindow::GetContentScaleFactor() in 3.1.0. In 3.1.4 they restored the + pre-3.1.0 behaviour and created a new method GetDPIScaleFactor() returning + what GetContentScaleFactor() was returning until then. + +This change broke HiDPI detection when using wxWidgets >= 3.1.4. BTW, it was already broken in +32-bit C::B because it was not DPI-aware; this has been fixed in [r12591]. + +Update developer list in Thanks section of the About dialog. + + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12592 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + src/sdk/globals.cpp | 4 ++++ + src/src/dlgabout.cpp | 4 ++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/sdk/globals.cpp b/src/sdk/globals.cpp +index f05975ab0..9069305ca 100644 +--- a/src/sdk/globals.cpp ++++ b/src/sdk/globals.cpp +@@ -1186,7 +1186,11 @@ wxBitmap cbLoadBitmapScaled(const wxString& filename, wxBitmapType bitmapType, d + + double cbGetContentScaleFactor(const wxWindow &window) + { ++#if wxCHECK_VERSION(3, 1, 4) ++ return window.GetDPIScaleFactor(); ++#else + return window.GetContentScaleFactor(); ++#endif + } + + #ifdef __WXGTK__ +diff --git a/src/src/dlgabout.cpp b/src/src/dlgabout.cpp +index 545f7d13a..f024d5ed5 100644 +--- a/src/src/dlgabout.cpp ++++ b/src/src/dlgabout.cpp +@@ -101,6 +101,7 @@ dlgAbout::dlgAbout(wxWindow* parent) + "Damien Moore : Developer\n" + "Micah Ng : Developer\n" + "BlueHazzard : Developer\n" ++ "Miguel Gimenez : Developer\n" + "Ricardo Garcia : All-hands person\n" + "Paul A. Jimenez : Help and AStyle plugins\n" + "Thomas Lorblanches : CodeStat and Profiler plugins\n" +@@ -132,7 +133,6 @@ dlgAbout::dlgAbout(wxWindow* parent) + "Alexandr Efremo : Providing OpenSuSe packages\n" + "Huki : Misc. Code-Completion improvements\n" + "stahta01 : Misc. patches for several enhancements\n" +- "Miguel Gimenez : Misc. patches for several enhancements\n" + "\n" + "All contributors that provided patches.\n" + "The wxWidgets project (http://www.wxwidgets.org).\n" +@@ -171,7 +171,7 @@ dlgAbout::dlgAbout(wxWindow* parent) + if (!desktopEnv.empty()) + items.push_back({_("Desktop environment"), desktopEnv }); + +- items.push_back({_("Scaling factor"), wxString::Format("%f", GetContentScaleFactor())}); ++ items.push_back({_("Scaling factor"), wxString::Format("%f", cbGetContentScaleFactor(*this))}); + items.push_back({_("Detected scaling factor"), + wxString::Format("%f", cbGetActualContentScaleFactor(*this))}); + const wxSize displayPPI = wxGetDisplayPPI(); diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-12.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-12.patch new file mode 100644 index 00000000000..3f184a90ce3 --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-12.patch @@ -0,0 +1,129 @@ +From 29315df024251850832583f73e67e515dae10830 Mon Sep 17 00:00:00 2001 +From: wh11204 <wh11204@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Mon, 7 Feb 2022 15:55:51 +0000 +Subject: [PATCH] - Fix compilation of notebookstyles.cpp with + wxWidgets-master. This change allows testing C::B with the upcoming wx3.1.6. + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12707 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + src/src/notebookstyles.cpp | 52 +++++++++++++++++++++++++++++++++----- + 1 file changed, 45 insertions(+), 7 deletions(-) + +diff --git a/src/src/notebookstyles.cpp b/src/src/notebookstyles.cpp +index d53edcaed..51fef6e49 100644 +--- a/src/src/notebookstyles.cpp ++++ b/src/src/notebookstyles.cpp +@@ -124,14 +124,23 @@ void NbStyleVC71::DrawTab(wxDC& dc, wxWindow* wnd, + if (page.bitmap.IsOk()) + { + bitmap_offset = tab_x + 8; +- + // draw bitmap ++#if wxCHECK_VERSION(3, 1, 6) ++ const wxBitmap bmp(page.bitmap.GetBitmapFor(wnd)); ++ dc.DrawBitmap(bmp, ++ bitmap_offset, ++ drawn_tab_yoff + (drawn_tab_height/2) - (bmp.GetHeight()/2), ++ true); ++ ++ text_offset = bitmap_offset + bmp.GetWidth(); ++#else + dc.DrawBitmap(page.bitmap, + bitmap_offset, + drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2), + true); + + text_offset = bitmap_offset + page.bitmap.GetWidth(); ++#endif + text_offset += 3; // bitmap padding + } + else +@@ -161,13 +170,23 @@ void NbStyleVC71::DrawTab(wxDC& dc, wxWindow* wnd, + // draw 'x' on tab (if enabled) + if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) + { +- int close_button_width = m_activeCloseBmp.GetWidth(); +- wxBitmap bmp = m_disabledCloseBmp; ++ wxBitmap bmp; + ++#if wxCHECK_VERSION(3, 1, 6) ++ if ((close_button_state == wxAUI_BUTTON_STATE_HOVER) || ++ (close_button_state == wxAUI_BUTTON_STATE_PRESSED)) ++ bmp = m_activeCloseBmp.GetBitmapFor(wnd); ++ else ++ bmp = m_disabledCloseBmp.GetBitmapFor(wnd); ++#else + if ((close_button_state == wxAUI_BUTTON_STATE_HOVER) || + (close_button_state == wxAUI_BUTTON_STATE_PRESSED)) + bmp = m_activeCloseBmp; ++ else ++ bmp = m_disabledCloseBmp; ++#endif + ++ const int close_button_width = bmp.GetWidth(); + wxRect rect(tab_x + tab_width - close_button_width - 3, + drawn_tab_yoff + (drawn_tab_height / 2) - (bmp.GetHeight() / 2), + close_button_width, tab_height); +@@ -285,17 +304,27 @@ void NbStyleFF2::DrawTab(wxDC& dc, wxWindow* wnd, + int text_offset = tab_x + 8; + + int bitmap_offset = 0; ++ + if (page.bitmap.IsOk()) + { + bitmap_offset = tab_x + 8; +- + // draw bitmap ++#if wxCHECK_VERSION(3, 1, 6) ++ const wxBitmap bmp(page.bitmap.GetBitmapFor(wnd)); ++ dc.DrawBitmap(bmp, ++ bitmap_offset, ++ drawn_tab_yoff + (drawn_tab_height/2) - (bmp.GetHeight()/2), ++ true); ++ ++ text_offset = bitmap_offset + bmp.GetWidth(); ++#else + dc.DrawBitmap(page.bitmap, + bitmap_offset, + drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2), + true); + + text_offset = bitmap_offset + page.bitmap.GetWidth(); ++#endif + text_offset += 3; // bitmap padding + } + else +@@ -303,7 +332,6 @@ void NbStyleFF2::DrawTab(wxDC& dc, wxWindow* wnd, + text_offset = tab_x + 8; + } + +- + // if the caption is empty, measure some temporary text + wxString caption = page.caption; + if (caption.empty()) +@@ -325,13 +353,23 @@ void NbStyleFF2::DrawTab(wxDC& dc, wxWindow* wnd, + // draw 'x' on tab (if enabled) + if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) + { +- int close_button_width = m_activeCloseBmp.GetWidth(); +- wxBitmap bmp = m_disabledCloseBmp; ++ wxBitmap bmp; + ++#if wxCHECK_VERSION(3, 1, 6) ++ if ((close_button_state == wxAUI_BUTTON_STATE_HOVER) || ++ (close_button_state == wxAUI_BUTTON_STATE_PRESSED)) ++ bmp = m_activeCloseBmp.GetBitmapFor(wnd); ++ else ++ bmp = m_disabledCloseBmp.GetBitmapFor(wnd); ++#else + if ((close_button_state == wxAUI_BUTTON_STATE_HOVER) || + (close_button_state == wxAUI_BUTTON_STATE_PRESSED)) + bmp = m_activeCloseBmp; ++ else ++ bmp = m_disabledCloseBmp; ++#endif + ++ const int close_button_width = bmp.GetWidth(); + wxRect rect(tab_x + tab_width - close_button_width - 3, + drawn_tab_yoff + (drawn_tab_height / 2) - (bmp.GetHeight() / 2), + close_button_width, tab_height); diff --git a/community/codeblocks/codeblocks-wxwidgets-3.2-13.patch b/community/codeblocks/codeblocks-wxwidgets-3.2-13.patch new file mode 100644 index 00000000000..849c1d8993c --- /dev/null +++ b/community/codeblocks/codeblocks-wxwidgets-3.2-13.patch @@ -0,0 +1,30 @@ +From 46720043319758cb0e798eb23520063583c40eaa Mon Sep 17 00:00:00 2001 +From: fuscated <fuscated@2a5c6006-c6dd-42ca-98ab-0921f2732cef> +Date: Sun, 15 Aug 2021 11:51:11 +0000 +Subject: [PATCH] * SDK: Fix a regex in the MacroManager to work with the PCRE2 + regex engine used by wx3.1.6 (ticket #1120) + +> This regex is totally bonkers. I don't know what its purpose is, but it + is mighty strange. There is a group at the beginning which tries to match + non-$ or start of the string. At the end there is code to match ' ', '/' + or '\'. The braces could be mismatched - ${var) works perfectly fine. +> The fix is - we want to match '\', so we need to escape it. + +git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12511 2a5c6006-c6dd-42ca-98ab-0921f2732cef +--- + src/sdk/macrosmanager.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sdk/macrosmanager.cpp b/src/sdk/macrosmanager.cpp +index 4027d1974c..086dc35cdf 100644 +--- a/src/sdk/macrosmanager.cpp ++++ b/src/sdk/macrosmanager.cpp +@@ -80,7 +80,7 @@ void MacrosManager::Reset() + m_Plugins = UnixFilename(ConfigManager::GetPluginsFolder()); + m_DataPath = UnixFilename(ConfigManager::GetDataFolder()); + ClearProjectKeys(); +- m_RE_Unix.Compile(_T("([^$]|^)(\\$[({]?(#?[A-Za-z_0-9.]+)[)} /\\]?)"), wxRE_EXTENDED | wxRE_NEWLINE); ++ m_RE_Unix.Compile(_T("([^$]|^)(\\$[({]?(#?[A-Za-z_0-9.]+)[\\)} /\\\\]?)"), wxRE_EXTENDED | wxRE_NEWLINE); + m_RE_DOS.Compile(_T("([^%]|^)(%(#?[A-Za-z_0-9.]+)%)"), wxRE_EXTENDED | wxRE_NEWLINE); + m_RE_IfSp.Compile(_T("(([^=!<>]+)[ ]*(=|==|!=|>|<|>=|<=)[ ]*([^=!<>]+))"), wxRE_EXTENDED | wxRE_NEWLINE); + m_RE_Script.Compile(_T("(\\[\\[(.*)\\]\\])"), wxRE_EXTENDED | wxRE_NEWLINE); 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/conmon/APKBUILD b/community/conmon/APKBUILD index 47a557037a2..b5bf7c7ae1b 100644 --- a/community/conmon/APKBUILD +++ b/community/conmon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=conmon -pkgver=2.1.10 +pkgver=2.1.12 pkgrel=0 pkgdesc="OCI container runtime monitor" url="https://github.com/containers/conmon" @@ -11,13 +11,6 @@ makedepends="bash go-md2man glib-dev libseccomp-dev" subpackages="$pkgname-doc" source="https://github.com/containers/conmon/archive/v$pkgver/conmon-$pkgver.tar.gz" -prepare() { - default_prepare - - # fix location of go-md2man - sed -E "s/(GOMD2MAN =).*/\1 go-md2man/" -i docs/Makefile -} - build() { make } @@ -27,9 +20,9 @@ check() { } package() { - make install PREFIX=/usr DESTDIR="$pkgdir" + make install GOMD2MAN=/usr/bin/go-md2man PREFIX=/usr DESTDIR="$pkgdir" } sha512sums=" -ecf1a961f431b005b54faa68b5c1bcf31d448f994ca66a56f13002216074dba79b53b52a377d4f8dab08141d6c6cf44467352fbff37175135d3da84081b27a18 conmon-2.1.10.tar.gz +06668aa35f5752e3d383f0a2cdf88f7c5056bdef96756aa230279ae25ef1d6b6bfd14888d35907062404670ae85d71d2d7258577abff70b74fa49bff6c2d9d20 conmon-2.1.12.tar.gz " diff --git a/community/consul-template/APKBUILD b/community/consul-template/APKBUILD index 30665cf6a8a..84c9e5b84d3 100644 --- a/community/consul-template/APKBUILD +++ b/community/consul-template/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=consul-template pkgver=0.36.0 -pkgrel=3 +pkgrel=4 pkgdesc="Generic template rendering and notifications with Consul" url="https://www.consul.io/" arch="all" diff --git a/community/containerd/APKBUILD b/community/containerd/APKBUILD index d0825f7a0fc..762fb2367f0 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=83031836b2cf55637d7abf847b17134c51b38e53 -pkgver=1.7.16 +_commit=3a4de459a68952ffb703bbe7f2290861a75b6b67 +pkgver=1.7.17 pkgrel=0 pkgdesc="An open and reliable container runtime" url="https://containerd.io/" @@ -20,7 +20,6 @@ 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 " @@ -119,8 +118,7 @@ stress() { } sha512sums=" -2d6aa4b11d75c1e94de90737cfb16cd34b5c802f5de6f10786856f5c57b69f70ebf6402ac935293cb977da76b142bca4bf5630658c2ee375947db72f14847a35 containerd-1.7.16.tar.gz -d06e051538b5b550fdd739bf91463c6cd0af0225ec351e080ec21d4ff1372b9e8364cab3c974207180f8eef7d85a069a4dad88bf63eed268ffe8becd1dd973b7 update-vendor-ebpf-to-v0.11.0.patch +78ed36ee43def3b83a1e0e8cc7da1e96517dd08c3fb19d2cdaf0e739d5a4188d313cd1f4f2a02701eb79cdcbfea5deba14030b438a0b07b08ec30510f4bb7660 containerd-1.7.17.tar.gz 5fb37b88554422738cc75b944b75836c123d87d418a16c6a25b9d49da023bd0e654d1aa694e60026de42c055ccf7469f5b4778a4876e94720ec2f40d618db580 containerd.confd 8315a8d58b4ba7e19ebed2cd82c7b5eaab45da630f9818a9e6cc8f3c8e88f159432474299798f79e6e465e843c91c0f50df04030083c8913c385ea1d73e81e6a containerd.initd " diff --git a/community/containers-common/APKBUILD b/community/containers-common/APKBUILD index f7d09c8fb67..958308869a0 100644 --- a/community/containers-common/APKBUILD +++ b/community/containers-common/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=containers-common -pkgver=0.57.0 +pkgver=0.58.3 pkgrel=0 pkgdesc="Configuration files for container tools" url="https://github.com/containers/common" @@ -14,11 +14,11 @@ subpackages="$pkgname-doc" # Ideally, they should be the same in skopeo and buildah. # Check them with the list_vendors function. _common_ver=$pkgver -_storage_ver=1.51.0 -_image_ver=5.29.0 -_podman_ver=4.8.0 -_skopeo_ver=1.14.0 -_buildah_ver=1.33.2 +_storage_ver=1.53.0 +_image_ver=5.30.1 +_podman_ver=5.0.3 +_skopeo_ver=1.15.1 +_buildah_ver=1.35.4 _shortnames_ver=2023.02.20 source="https://github.com/containers/common/archive/v$_common_ver/common-$_common_ver.tar.gz https://github.com/containers/storage/archive/v$_storage_ver/storage-$_storage_ver.tar.gz @@ -100,11 +100,11 @@ doc() { } sha512sums=" -b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3 common-0.57.0.tar.gz -89916b49438bce8bb774b4aa799676d4b3a946a0b5207a1b5241b1a3ac0875b06b3cd8e81d7e23332ceae6010b693516fc31d8c7f75a37e7ad3056a83c75b6c1 storage-1.51.0.tar.gz -5e670f85fe0b43769667f1a3e710434ab65c4ec2d8c60b0cad4b0ed41c35f84677528f9dfecb0b946de556ebbdd56f4949760432ec49b1b3c691120a323af869 image-5.29.0.tar.gz -2178a9c8428a0cf2c402e0f299efe2ad9a797143e641a92438112694a4acbdfb69ba8c104c87f4763d001f17cedb709eef24d86460d095a61a64d29a168a2051 podman-4.8.0.tar.gz -59d329036a97cbeca4de20b15d9dd8adacd5201834b26ae5e5c88b05594b2a7101c22da91f22c35c07a98e41afa28f2c7103e660b3847c7f8c9691f27f4c4146 skopeo-1.14.0.tar.gz -574c1a249d93edd5f89e106cd192da94235edcff097d9bce841e3b3b3a9588029deddaceb301505114b994e854016c72090cc0016a00ef027b25f3672a3fab32 buildah-1.33.2.tar.gz +5f75e7175e012c0e5351ffae95c0e96828fd94ec881a6d7f83c3d7dd7231a37a2f38aa241f8eda8cbded3825867cc8872038e84610ea4894f664933561d368ba common-0.58.3.tar.gz +ea4a1d1899208eb8861e36beba206724b1f55cfd6007bc5a90c3a6a5e02835b4a2985814dc9363c31dcdc81a3fb331b29f51f5523628edb8d9c64c465d6dcaa3 storage-1.53.0.tar.gz +4959cacb9590bb89e9e9fbda92a9e45166279090990d9b24640f8ac4b337839975a72bff06969b8faada71dd5228f2d63fa2b4e96b025550f0eb3b06b81ed40e image-5.30.1.tar.gz +c605a52cc5aba43d485796c4986f2d1be704e5c931473bf5ba1cf77f703cdb3d16f41d33da0b25287e8d001077f77caf117d3ea5dbd7c56a744274025d9ab07d podman-5.0.3.tar.gz +686d17da4a84d9029d688cfca08724576564ce2a05aed9380bf55059c244c90cffa3b21c2dbe84b19b746773e98d5f26e5ceaca58f7be26b656125977685c663 skopeo-1.15.1.tar.gz +679f2328f675a39f9965128d51a6e8a3f82d64a6d3c3cdcb862cfcb7691eba272d869b6718147da1590aa573534081329ef05e879875024a11aa9ad52b2f292f buildah-1.35.4.tar.gz 856dbbeb2acda276e9605bd1ecec0f8d65952c597ee2af61dd8909d7d3c04e5ef06c40b69ec4a98f79e623c536850f614c1b0af3a19637e300e7d3a285933193 shortnames-2023.02.20.tar.gz " diff --git a/community/coredns/APKBUILD b/community/coredns/APKBUILD index 402bdc836e3..72d0d5d1d3f 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=6 +pkgrel=7 pkgdesc="fast and flexible DNS server" url="https://github.com/coredns/coredns" license="Apache-2.0" diff --git a/community/corerad/APKBUILD b/community/corerad/APKBUILD index b33fac74e8b..cb2808bf9ed 100644 --- a/community/corerad/APKBUILD +++ b/community/corerad/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=corerad pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Extensible and observable IPv6 Neighbor Discovery Protocol router advertisement daemon" url="https://corerad.net/" license="Apache-2.0" diff --git a/community/corrosion/APKBUILD b/community/corrosion/APKBUILD index 1b9119a8393..16012ea20a6 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.9 +pkgver=0.4.10 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=" -6410a397364526888dd37782a464c7fe1eaece8820da0f617de9e2bd1a5a4c16a71ce45ad9a91f3fd71a6c33da130c83399b68cf5c1430a774bbb320a088ca62 corrosion-0.4.9.tar.gz +72e19bbbe3a574207748c2ba30ae341cf2002309b710cbb5015c9498c1f22779da4121302fe2a650f345bb3341c008e12cdb0680b5072b348d7866bd563dd423 corrosion-0.4.10.tar.gz " diff --git a/community/cosign/APKBUILD b/community/cosign/APKBUILD index 672bbff8050..bc541df11f0 100644 --- a/community/cosign/APKBUILD +++ b/community/cosign/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Ariadne Conill <ariadne@dereferenced.org> pkgname=cosign pkgver=2.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="container signing tool with support for ephemeral keys and Sigstore signing" url="https://github.com/sigstore/cosign" arch="all" diff --git a/community/cppcheck/APKBUILD b/community/cppcheck/APKBUILD index 4a8e43f560d..c9493e7bddd 100644 --- a/community/cppcheck/APKBUILD +++ b/community/cppcheck/APKBUILD @@ -1,8 +1,8 @@ # Contributor: August Klein <amatcoder@gmail.com> # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=cppcheck -pkgver=2.12.1 -pkgrel=1 +pkgver=2.14.0 +pkgrel=0 pkgdesc="Static analysis tool for C/C++ code" url="https://cppcheck.sourceforge.io/" arch="all" @@ -20,6 +20,7 @@ makedepends=" subpackages="$pkgname-doc $pkgname-htmlreport::noarch $pkgname-gui" source="$pkgname-$pkgver.tar.gz::https://github.com/danmar/cppcheck/archive/refs/tags/$pkgver.tar.gz set_datadir.patch + feenableexcept.patch " build() { @@ -33,7 +34,7 @@ build() { -DFILESDIR=/usr/share/cppcheck \ -DHAVE_RULES=ON \ -DUSE_BUNDLED_TINYXML2=OFF \ - -DUSE_MATCHCOMPILER=ON \ + -DUSE_MATCHCOMPILER=On \ -DUSE_QT6=ON \ -DWITH_QCHART=ON @@ -78,6 +79,7 @@ gui() { } sha512sums=" -b9779317d55ed7582344bdf0fedad17aa8a070452c9583836590cd5617f406fa2ec7896529d06b393e4d1f18f863aa687f2cc33ca0bd2ac727e888485acf3264 cppcheck-2.12.1.tar.gz -deead176705825da12796e42ea5f4a9dfb6dfa0c816057862b41d9f8f3121c4272d0bbf98ddea88c2e63e0504ff0cf603cd5b082e6e6cf41403f2ba0377ebc2e set_datadir.patch +77ea3f92b3a83979ba9c6042cf8a937c8d7a6915c2c840755bc2f7bb79c6bc625cb7a515714d23fa57abe4110764e35476bb8e44ec87d2ac034ab33720a8267e cppcheck-2.14.0.tar.gz +2e1d1fe1ba66c091cdd33f2c883370ea216718b2e7b997717623dd36cd73a9b82fa116144d93b7a4f3ab6bfea1c49274c950e751fdda45a61160d3cef913ea88 set_datadir.patch +d483e39b4b5b6482081f656708433b6f45da3e9e7ba4adf9c6ff347273cae7cc6bf854248d460278f39054b36582aa009d9ce3b87d55dc4efe1f45cc865c6cc4 feenableexcept.patch " diff --git a/community/cppcheck/feenableexcept.patch b/community/cppcheck/feenableexcept.patch new file mode 100644 index 00000000000..cdac2e0acff --- /dev/null +++ b/community/cppcheck/feenableexcept.patch @@ -0,0 +1,14 @@ +diff --git a/test/signal/test-signalhandler.cpp b/test/signal/test-signalhandler.cpp +index 023137c2a..92b3fe8af 100644 +--- a/test/signal/test-signalhandler.cpp ++++ b/test/signal/test-signalhandler.cpp +@@ -46,9 +46,6 @@ + + /*static*/ void my_fpe() + { +-#if !defined(__APPLE__) +- feenableexcept(FE_ALL_EXCEPT); // TODO: check result +-#endif + std::feraiseexcept(FE_UNDERFLOW | FE_DIVBYZERO); // TODO: check result + // TODO: to generate this via code + } diff --git a/community/cppcheck/set_datadir.patch b/community/cppcheck/set_datadir.patch index db7e391f35b..37d6ec48369 100644 --- a/community/cppcheck/set_datadir.patch +++ b/community/cppcheck/set_datadir.patch @@ -1,9 +1,7 @@ -diff --git a/gui/main.cpp b/gui/main.cpp -index fc68b7f..a682178 100644 --- a/gui/main.cpp +++ b/gui/main.cpp -@@ -57,6 +57,9 @@ int main(int argc, char *argv[]) - QSettings* settings = new QSettings("Cppcheck", "Cppcheck-GUI", &app); +@@ -61,6 +61,9 @@ int main(int argc, char *argv[]) + auto* settings = new QSettings("Cppcheck", "Cppcheck-GUI", &app); // Set data dir.. + if ((settings->value("DATADIR", QString()).toString()).isEmpty()) @@ -12,13 +10,13 @@ index fc68b7f..a682178 100644 const QStringList args = QApplication::arguments(); auto it = std::find_if(args.cbegin(), args.cend(), [](const QString& arg) { return arg.startsWith("--data-dir="); -@@ -66,6 +69,9 @@ int main(int argc, char *argv[]) +@@ -70,6 +73,9 @@ int main(int argc, char *argv[]) return 0; } + if ((settings->value(SETTINGS_LANGUAGE, QString()).toString()).isEmpty()) + settings->setValue(SETTINGS_LANGUAGE, "en"); + - TranslationHandler* th = new TranslationHandler(&app); + auto* th = new TranslationHandler(&app); th->setLanguage(settings->value(SETTINGS_LANGUAGE, th->suggestLanguage()).toString()); 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/crane/APKBUILD b/community/crane/APKBUILD index 7b0b37fdac9..3af7b9963f7 100644 --- a/community/crane/APKBUILD +++ b/community/crane/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=crane pkgver=0.19.0 -pkgrel=2 +pkgrel=3 pkgdesc="tool for interacting with remote images and registries" url="https://github.com/google/go-containerregistry/tree/main/cmd/crane" arch="all" diff --git a/community/cri-tools/APKBUILD b/community/cri-tools/APKBUILD index b199f1f6020..91ae1dd7746 100644 --- a/community/cri-tools/APKBUILD +++ b/community/cri-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=cri-tools pkgver=1.29.0 -pkgrel=2 +pkgrel=3 pkgdesc="CLI tool for Kubelet Container Runtime Interface (CRI)" url="https://github.com/kubernetes-sigs/cri-tools" arch="all !armhf" @@ -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/croc/APKBUILD b/community/croc/APKBUILD index 49873ca975f..9df265403e4 100644 --- a/community/croc/APKBUILD +++ b/community/croc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=croc pkgver=9.6.15 -pkgrel=0 +pkgrel=1 pkgdesc="Easily and securely send things from one computer to another" url="https://github.com/schollz/croc" license="MIT" diff --git a/community/cs-firewall-bouncer/APKBUILD b/community/cs-firewall-bouncer/APKBUILD index 50c99ee4fb2..b46346f8fb9 100644 --- a/community/cs-firewall-bouncer/APKBUILD +++ b/community/cs-firewall-bouncer/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=cs-firewall-bouncer pkgver=0.0.28 -pkgrel=3 +pkgrel=4 pkgdesc="Crowdsec bouncer for firewalls" url="https://github.com/crowdsecurity/cs-firewall-bouncer" arch="all" diff --git a/community/csview/APKBUILD b/community/csview/APKBUILD index 2067c0bde79..64729e1f617 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.3.0 +pkgver=1.3.2 pkgrel=0 pkgdesc="Pretty csv viewer for cli with cjk/emoji support" url="https://github.com/wfxr/csview" @@ -40,5 +40,5 @@ package() { } sha512sums=" -6ca060089a4cbf20a46a0f9e23d8f38b2366a88e0fd6054b40cd1532615164330829201c776d1e14b35f354e8bc4ca0ba8825e835ce3f62a0faae2714d3a8a18 csview-1.3.0.tar.gz +f824a063818e15fdc8c2198528c9b257b590aa9779e5103801e229e3a96e899d903617dca8c1eca344651fa3f2bd09d36d062d1d01bdc471ffcf534e387fb94f csview-1.3.2.tar.gz " diff --git a/community/csvq/APKBUILD b/community/csvq/APKBUILD index 4f70ca0e0f9..39f6c4f0fa0 100644 --- a/community/csvq/APKBUILD +++ b/community/csvq/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=csvq pkgver=1.18.1 -pkgrel=9 +pkgrel=10 pkgdesc="SQL-like query language for csv format" url="https://github.com/mithrandie/csvq" arch="all" diff --git a/community/ctop/APKBUILD b/community/ctop/APKBUILD index 842883a11e2..4bd317e05d2 100644 --- a/community/ctop/APKBUILD +++ b/community/ctop/APKBUILD @@ -2,11 +2,11 @@ # Maintainer: Shyam Sunder <sgsunder1@gmail.com> pkgname=ctop pkgver=0.7.7 -pkgrel=18 +pkgrel=19 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/community/cue-cli/APKBUILD b/community/cue-cli/APKBUILD index 24ba1158bbb..2000b8ad7f9 100644 --- a/community/cue-cli/APKBUILD +++ b/community/cue-cli/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=cue-cli pkgver=0.8.2 -pkgrel=0 +pkgrel=1 pkgdesc="CLI for CUE configuration and validation language" url="https://cuelang.org/" # 32-bit: value out of int range diff --git a/community/curlie/APKBUILD b/community/curlie/APKBUILD index df287eb45e1..d26400194e2 100644 --- a/community/curlie/APKBUILD +++ b/community/curlie/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=curlie pkgver=1.7.2 -pkgrel=2 +pkgrel=3 pkgdesc="Curlie is a frontend to curl that adds the ease of use of httpie" url="https://curlie.io/" arch="all" 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/testing/darcs/APKBUILD b/community/darcs/APKBUILD index dd067e16355..a6270b7f8b9 100644 --- a/testing/darcs/APKBUILD +++ b/community/darcs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: gay <gay@disroot.org> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=darcs -pkgver=2.18.2 +pkgver=2.18.3 pkgrel=0 pkgdesc="Patch-based revision control system" url="https://darcs.net/" @@ -16,25 +16,45 @@ source="https://hackage.haskell.org/package/darcs-$pkgver/darcs-$pkgver.tar.gz " # Directory where cabal files are stored. -export CABAL_DIR="$srcdir/dist" +export CABAL_DIR="${CABAL_DIR:-"$srcdir/dist"}" # Needed to fix build on aarch64. export PATH="$PATH:/usr/lib/llvm15/bin" cabal_update() { - cd $builddir - cabal v2-update + local repo="hackage.haskell.org" + + # Default config uses HTTP, change it to HTTPS. + [ -f "$CABAL_DIR"/config ] || { + cabal user-config init + cabal user-config update -a \ + "repository $repo {url: https://$repo/}" + } + + [ -d "$builddir" ] || abuild unpack + msg "Freezing $pkgname dependencies" + + # Resolve deps and generate fresh cabal.project.freeze with version constraints. ( - cd "$builddir" + cd "$builddir" || { + error 'Is $builddir set correctly?' + return 1 + } + cabal v2-update cabal v2-freeze --shadow-installed-packages - mv cabal.project.freeze "$startdir/" + + mv -v cabal.project.freeze "$startdir"/ ) + + if ! abuild checksum; then + die "Failed to update checksum, run 'abuild checksum' manually" + fi } prepare() { default_prepare - ln -sf "$srcdir/cabal.project.freeze" \ - "$builddir/cabal.project.freeze" + + ln -svf "$srcdir"/cabal.project.freeze "$builddir"/ } build() { @@ -57,6 +77,6 @@ package() { } sha512sums=" -f776b3b2efd73e9515a99bf154468aa4aef925d20c9de564a78f7a19bf302db31c6e4cdbca2c2c700a0d5cde1b62a426159554f543898712b1f603401c534a9c darcs-2.18.2.tar.gz -b177b661b37a907db1af30e6f796a5c2f600bc8b19411b3a741b071a45ee257a2371e160ea7c1cc31b07a288f2aa9966a14318ca1c0c0eede6aa11fe81798de9 cabal.project.freeze +de70b87493ed9776a16d492ca1fb2f7e1a4a46bf3538ebe937adc8b548b1b4519cb7a737edd13b92253c797a04765832b37c9ef6d552705db6980454429da3d6 darcs-2.18.3.tar.gz +aa94626e596cc0935d14baa874fac5430cf90f3967e5d5c43214151118cdefae8430ac523ef13e084fd1688b25b4bd825fa459a53d88f63b54be43f140a7fb13 cabal.project.freeze " diff --git a/testing/darcs/cabal.project.freeze b/community/darcs/cabal.project.freeze index c6677adac2a..3551ee3d033 100644 --- a/testing/darcs/cabal.project.freeze +++ b/community/darcs/cabal.project.freeze @@ -1,33 +1,26 @@ 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, +constraints: any.Cabal ==3.10.3.0, + any.Cabal-syntax ==3.10.3.0, + any.OneTuple ==0.4.2, + any.QuickCheck ==2.15, QuickCheck -old-random +templatehaskell, any.StateVar ==1.2.2, - any.aeson ==2.2.1.0, + any.aeson ==2.2.2.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.assoc ==1.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.attoparsec-aeson ==2.2.2.0, any.base ==4.19.1.0, - any.base-orphans ==0.9.1, + any.base-orphans ==0.9.2, any.base16-bytestring ==1.0.2.0, any.base64-bytestring ==1.2.1.0, any.basement ==0.0.16, @@ -37,29 +30,28 @@ constraints: any.Cabal ==3.10.2.0, any.bitvec ==1.1.5.0, bitvec +simd, any.blaze-builder ==0.4.2.3, - any.boring ==0.2.1, + any.boring ==0.2.2, 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.cborg ==0.2.10.0, + cborg +optimize-gmp, any.cereal ==0.5.8.3, cereal -bytestring-builder, - any.cmdargs ==0.10.22, - cmdargs +quotation -testprog, - any.colour ==2.3.6, + any.character-ps ==0.1, 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.constraints ==0.14.2, any.containers ==0.6.8, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, any.cookie ==0.5.0, - any.crypton ==0.34, + any.crypton ==1.0.0, 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-connection ==0.4.0, any.crypton-x509 ==1.7.6, any.crypton-x509-store ==1.6.9, any.crypton-x509-system ==1.6.7, @@ -68,18 +60,18 @@ constraints: any.Cabal ==3.10.2.0, 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-fix ==0.3.3, 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.directory ==1.3.8.5, + directory -os-string, 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, @@ -89,10 +81,11 @@ constraints: any.Cabal ==3.10.2.0, any.ghc-bignum ==1.3, any.ghc-boot-th ==9.8.2, any.ghc-prim ==0.11.0, + any.half ==0.3.1, any.hashable ==1.4.4.0, hashable +integer-gmp -random-initial-seed, any.haskeline ==0.8.2.1, - any.hostname ==1.0, + haskeline +examples +terminfo, any.hourglass ==0.2.12, any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, @@ -103,55 +96,47 @@ constraints: any.Cabal ==3.10.2.0, 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.indexed-traversable ==0.1.4, + any.indexed-traversable-instances ==0.1.2, + any.integer-conversion ==0.1.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, + 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.os-string ==2.0.2, + any.os-string ==2.0.3, 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.process ==1.6.20.0, 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, + any.scientific ==0.3.8.0, + scientific -integer-simple, + any.semialign ==1.3.1, semialign +semigroupoids, - any.semigroupoids ==6.0.0.1, + any.semigroupoids ==6.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, + any.serialise ==0.2.6.1, + serialise +newtime15, any.socks ==0.6.1, any.split ==0.2.5, any.splitmix ==0.1.0.5, @@ -161,8 +146,6 @@ constraints: any.Cabal ==3.10.2.0, 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, @@ -170,29 +153,20 @@ constraints: any.Cabal ==3.10.2.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, + any.text-iso8601 ==0.1.1, + any.text-short ==0.1.6, text-short -asserts, - any.th-abstraction ==0.6.0.0, + any.th-abstraction ==0.7.0.0, any.th-compat ==0.1.5, - any.these ==1.2, + any.these ==1.2.1, 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.time-compat ==1.9.7, + any.tls ==2.0.6, + tls -devel, 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, @@ -202,16 +176,15 @@ constraints: any.Cabal ==3.10.2.0, any.unordered-containers ==0.2.20, unordered-containers -debug, any.utf8-string ==1.0.2, - any.uuid-types ==1.0.5.1, + any.uuid-types ==1.0.6, any.vector ==0.13.1.0, vector +boundschecks -internalchecks -unsafechecks -wall, - any.vector-algorithms ==0.9.0.1, + any.vector-algorithms ==0.9.0.2, 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.witherable ==0.5, any.zip-archive ==0.4.3.2, zip-archive -executable, - 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-12T15:34:42Z +index-state: hackage.haskell.org 2024-05-26T13:05:50Z 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/darkman/APKBUILD b/community/darkman/APKBUILD index 918c78315e1..6658582b8ec 100644 --- a/community/darkman/APKBUILD +++ b/community/darkman/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hugo Osvaldo Barrera <hugo@whynothugo.nl> pkgname=darkman -pkgver=1.5.4 -pkgrel=9 +pkgver=2.0.1 +pkgrel=0 pkgdesc="Daemon for dark-mode and light-mode transitions on Unix-like desktop" url="https://darkman.whynothugo.nl/" arch="all" @@ -9,10 +9,13 @@ license="ISC" makedepends="go scdoc" subpackages=" $pkgname-doc + $pkgname-bash-completion + $pkgname-fish-completion + $pkgname-zsh-completion " source="https://gitlab.com/WhyNotHugo/darkman/-/archive/v$pkgver/darkman-v$pkgver.tar.gz" builddir="$srcdir/$pkgname-v$pkgver" -options="!check" +options="!check net" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -26,8 +29,9 @@ build() { package() { make DESTDIR="$pkgdir/" PREFIX=/usr/ install + rm "$pkgdir/usr/lib/systemd/user/darkman.service" } sha512sums=" -1d4bbbbafa56d282f78d344f61e36c12a56caa2f7445ac4e107decf97c0840e4ce3bab1db95a39aa752a3770c3613069e47fc13b8d925db589b608d9a0fdabbb darkman-v1.5.4.tar.gz +3a1c5e0e3ed4354fb319d41b02374171e7f07e832250a10fe06b0ed4cc8537e1ddc86aee23eab8169198017728ad7cb66e5e14748d8de55b425d4d7171c434f0 darkman-v2.0.1.tar.gz " 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/dasel/APKBUILD b/community/dasel/APKBUILD index 2414ce2b9b8..641ba037b82 100644 --- a/community/dasel/APKBUILD +++ b/community/dasel/APKBUILD @@ -1,14 +1,20 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=dasel -pkgver=2.6.0 -pkgrel=2 +pkgver=2.7.0 +pkgrel=0 pkgdesc="Query and modify data structures using selector strings" url="https://daseldocs.tomwright.me/" license="MIT" arch="all" makedepends="go" +subpackages=" + $pkgname-bash-completion + $pkgname-fish-completion + $pkgname-zsh-completion + " source="https://github.com/TomWright/dasel/archive/v$pkgver/dasel-$pkgver.tar.gz" +options="net" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -16,8 +22,12 @@ export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" build() { go build -ldflags " - -X github.com/tomwright/dasel/internal.Version=$pkgver + -X github.com/tomwright/dasel/v2/internal.Version=$pkgver " ./cmd/dasel + + ./dasel completion bash >$pkgname.bash + ./dasel completion fish >$pkgname.fish + ./dasel completion zsh >$pkgname.zsh } check() { @@ -26,8 +36,12 @@ check() { package() { install -Dm755 dasel -t "$pkgdir"/usr/bin/ + + install -Dm644 $pkgname.bash "$pkgdir"/usr/share/bash-completion/completions/$pkgname + install -Dm644 $pkgname.fish "$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish + install -Dm644 $pkgname.zsh "$pkgdir"/usr/share/zsh/site-functions/_$pkgname } sha512sums=" -fae8e5d241ac5e2596170f122d81e7590de5ff39782b08748ca22ecc6b3fde119c5dd1a3e7c66eb02e4d7583eb2cc266580eea85f24fcb88484b310cfd725dd1 dasel-2.6.0.tar.gz +37753bc124511bc2105186ad62090bda25e8574b5c1ec2cc2583f91e9f8ab41de261f870600ea1a501f41c5ad3b13999c64ca995eee50ee120359f819f6f334a dasel-2.7.0.tar.gz " diff --git a/testing/datamash/APKBUILD b/community/datamash/APKBUILD index a9b3465ebbc..28f5913881b 100644 --- a/testing/datamash/APKBUILD +++ b/community/datamash/APKBUILD @@ -8,7 +8,9 @@ url="https://www.gnu.org/software/datamash/" arch="all" license="GPL-3.0-or-later" subpackages="$pkgname-doc $pkgname-bash-completion" -source="https://ftpmirror.gnu.org/datamash/datamash-$pkgver.tar.gz" +source="https://ftpmirror.gnu.org/datamash/datamash-$pkgver.tar.gz + disable-failing-tests.patch + " build() { ./configure \ @@ -38,4 +40,5 @@ package() { sha512sums=" 5ef312a73ebee5df7308b7e368f296714fcc396761499d4a5ba94906f6ecdb0867193c5ce25668bf56b7a5339a8a833a98b3ad564c01544880a6ec210c7b922a datamash-1.8.tar.gz +012c6deb6883d456486a97f21d8756c89bd8b0e54b37184f7082ac297458fd2f30dfac34b342ff2605bc03a4e941378a1c984594d3d0cf420242f348678886c9 disable-failing-tests.patch " diff --git a/community/datamash/disable-failing-tests.patch b/community/datamash/disable-failing-tests.patch new file mode 100644 index 00000000000..430dc898f73 --- /dev/null +++ b/community/datamash/disable-failing-tests.patch @@ -0,0 +1,20 @@ +These tests are failing on build-3-20-x86_64 + +--- a/Makefile.in ++++ b/Makefile.in +@@ -2547,7 +2547,6 @@ + tests/datamash-pair-tests.pl \ + tests/datamash-check-tabular.pl \ + tests/datamash-output-format.pl \ +- tests/datamash-i18n-de.pl \ + tests/datamash-sort-header.pl \ + tests/datamash-sort-header-deprecated.pl \ + tests/datamash-sort-errors.sh \ +@@ -2556,7 +2555,6 @@ + tests/datamash-strbin.sh \ + tests/datamash-valgrind.sh \ + tests/decorate-tests.pl \ +- tests/decorate-errors.pl \ + tests/decorate-sort-tests.pl + + diff --git a/community/datovka/APKBUILD b/community/datovka/APKBUILD index 80ea7de8e4a..10ac74217b4 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.7 +pkgver=4.23.8 pkgrel=0 pkgdesc="A free graphical interface for Czech Databox" url="https://www.datovka.cz/" @@ -62,6 +62,6 @@ package() { } sha512sums=" -c4cf1f473bf9c5b8b1aba9d2caa133bb10efa7c4cf1cfbf91e6f8fa32fc8da80faa6496cc87cf0bfefd0877f1ad0fea7efa17025082b4551d223e68c7e12b722 datovka-4.23.7.tar.xz +89931e557b4e3d5497d42f13ebae94734ab6b82df32f35a7090bae9e8cd4e1246782b2f6b6a390985ed8ee6fde7f1a1bb0eabca2354537acb49e09cd209ce99e datovka-4.23.8.tar.xz ff0d49238fa5e2bf7c6f22f09c23453bf7b39f4252285e86c8bfa140be76b4b82122d4c9548fb6ab6009a5d071b2195a64b2226b5e295ce5f8c11e83c74b4448 disable-test_crypto_pin_pwd.patch " diff --git a/community/delfin/APKBUILD b/community/delfin/APKBUILD index 0c8dc1337c2..23ac247b503 100644 --- a/community/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.4 +pkgver=0.4.5 pkgrel=0 pkgdesc="Stream movies and TV shows from Jellyfin" url="https://delfin.avery.cafe/" @@ -47,6 +47,6 @@ package() { } sha512sums=" -6b48321bca2de86e74c3fcbb0fd072c1cdbc1d3ad9b59d323381b93ae4b3254c6c103e622e9b2452fa72a3e2ee38a0e9db00efef304f8eb201e254b82d90b2b2 delfin-0.4.4.tar.gz +23b0dd2eb8f59ff3e6e4fd3421aac7454c6178b33e1c5a74ed23910d51fbd49c13b4fd1f107e5f7ed5a53d0024766e922cda11c21972f6f16cc9b11ae4097cf4 delfin-0.4.5.tar.gz 2b3f51bf47e847a959545844c37921c612b4b91387f94ad6b1a146be2ce81615274ea6f245eb6b08f21c2d506a7af1f4bfd358feddeacf3623b08e087292fe63 cargo-auditable.patch " diff --git a/community/delve/APKBUILD b/community/delve/APKBUILD index e64a871816c..2d634f41915 100644 --- a/community/delve/APKBUILD +++ b/community/delve/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=delve pkgver=1.22.1 -pkgrel=2 +pkgrel=3 pkgdesc="Debugger for the Go programming language" url="https://github.com/go-delve/delve" arch="x86 x86_64 aarch64" diff --git a/community/dendrite/APKBUILD b/community/dendrite/APKBUILD index b864c6878ba..8c213845d4b 100644 --- a/community/dendrite/APKBUILD +++ b/community/dendrite/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=dendrite pkgver=0.13.7 -pkgrel=0 +pkgrel=1 pkgdesc="Second-generation Matrix homeserver written in Go" url="https://github.com/matrix-org/dendrite" license="Apache-2.0" diff --git a/community/deno/APKBUILD b/community/deno/APKBUILD index 83e8c4ec400..3355b22b93f 100644 --- a/community/deno/APKBUILD +++ b/community/deno/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=deno -pkgver=1.42.1 +pkgver=1.43.5 pkgrel=0 pkgdesc="A modern runtime for JavaScript and TypeScript" url="https://deno.land/" @@ -42,7 +42,7 @@ subpackages=" $pkgname-fish-completion $pkgname-zsh-completion " -_rusty_v8_ver=0.89.0 +_rusty_v8_ver=0.91.1 _stacker_ver=0.1.15 # Note: We use the crate instead of GitHub tarball due to lacks of submodules # in the tarball. @@ -64,16 +64,12 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/denoland/deno/releases/downl ignore-tests-broken-on-ci.patch tests-musl-compat.patch tests-disable-upgrade.patch + tests-fix-npx-output.patch unbundle-ca-certs.patch cargo.lock.patch " 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" ;; -esac - # TODO: # - build variant without dev tools # @@ -195,6 +191,9 @@ prepare() { local rusty_v8_ver="$(_crate_ver 'v8')" [ "$rusty_v8_ver" = "$_rusty_v8_ver" ] || die "Update _rusty_v8_ver to $rusty_v8_ver" + + # FIXME: This test is perhaps broken. + rm -rf tests/specs/cert/cafile_install } build() { @@ -258,8 +257,8 @@ _crate_ver() { } sha512sums=" -4f2dc55ec27f7378462d5f0811be1a3febcf37dd5244c293901c76503e1d11666ea20712557bc0df7e6ccbcf9223d1eb7b771a72608fe65ac94af92c587ca0b7 deno-1.42.1.tar.gz -8144a18cf930b8dc5f493f506c1f36c993b1996bc305d5bf3cc20c56b288f0196208774702aabb13525a743b6665fe7689c483122b0c3d7d530d75c56843a917 deno-rusty_v8-0.89.0.tar.gz +6b942d4a7abade03d1246efcfae61b2264d64a1098f9e2f8f526919cd33bfb233fe40f5b4e1fc29bf8cb34bccfec99db0e2f0c7891e6f6f1e8b1b5f997c4d565 deno-1.43.5.tar.gz +6b31944e9c020e3c53931d3e710a7de842f5c0ce62925044396468000388e3374137790d0524e4e70a82c50848c9ceae8d1d7b6ae3827b5e8556ca29b65c2ea1 deno-rusty_v8-0.91.1.tar.gz 88412e029262a0dffe295a648ba87ec50f782afceb19fbe1eda4239c54fbd56432106fcea5d58c93bfbb5b91317dc6642fc7a8e72136df0ef600c77d99e0970f deno-stacker-0.1.15.tar.gz ecea1432982e55c462f54aae135e1b7d0c964d9faa2f245cf114910e81ba6b3a06379c11ecd56f82cf3528f478cd394ad759cb246b3cdf70f6a40be744e17ecd deno-generate_shim_headers.py 08d09c979191d422d71a6db971bdf4472b322ef829b238519bc35db22f9b4639cca40342c7786777684a4ffa4af2c64febf9d9224b2d7d2d33f63671acfa6d5b stacker-detect-stack-overflow.patch @@ -271,11 +270,12 @@ a911c92e470823f3b6b578d1dc5784222769228e22cca3dc5bf9895e39835d578b28f48e763b5f92 cb00ccb2055a53100c8d3e2d038443a2028461c62c17c7d0a50a5a33f2af480a9bc6cc1c9b465f9f5be063716e2315127006384e62f0114e9994069cb84f7d93 v8-use-alpine-target.patch 1be3c56e3aba4354abaff0a612380ab749dac98599a3dd50640b5d55306a27de64cd827bae7b3bd5fa059049a895bb6e44422aa7007f640482de894e13609d86 v8-use-system-zlib.patch cd05aae0e1aa0771db82d9b96f5fe02f8047f20df1c1f42e7b3e8f93d0c84faa5c37f1c93e04a3d74a92b8242c9b9f4d0095f7e4e510130d3e42a31d3695a056 v8-use-system-icu.patch -1aa3e430cdeb9969970d2cb32df8bfe4845d91d7e1bb5b47e9a67ac6076bae8e0debdcfcf2c587128481df7b9e5b3bb73712b284676fbb35ad3e777c7d2c08bc disable-core-defaults.patch +f850d6418cbf10c9c0ea90a276be562f303133f3fd2f7e83de698866a2bb1fe74022f9b19e5fc8336ede8641779c2c021ad27c6079f998ae33b93d5d04e6647b disable-core-defaults.patch d2f6bd48b3e9fc561ed146d8c997d7f467312655d4126efed361c122f22ebf3971b6d6326d1cfccaffb48435a5f2c32c7b7ff13812d6d5f87bb52522ae6a88c0 use-system-libs.patch f63dfe61ff1854f7242390cdeb09aa69c4b2f4ca131b75cccc726db37e3f95bb1eaad3d7431d9d19f14213ba112680534e0c32c82bee861d12c43e4e91763521 ignore-tests-broken-on-ci.patch 8674c6c53ef206253f88d6e9c68ef12ccca0759c5b364ffb3cc625e80b03b57cceff3a295e2b9eaba975fe9aca5b69bc17dc42b311a5a9ded461528bee19ad0f tests-musl-compat.patch 14eddb7245ae4880bc3bd7f933a4ef69137707bcb3ccbf635fe60e7f8362573c03d2408c9b20c37e781642c9ac9aa9958b5be0a845a4c0f96a54329f80380482 tests-disable-upgrade.patch -f44d7d601937e583cd2a1e536f23d5c684e1b1a7b2f0f840770ed3a28764d4ba4103e2e969b74a8a343f57bc9aae90dca848a9d7dc59acfe7a66299eb530ff95 unbundle-ca-certs.patch -4bcf10a76cb8fbf84f902109f919e1feba086475045a2d66107cd3be2e0ddce60a08b318c103e02edb6826e7c183e956fa651962875f4c5dbbb0dc81d8831010 cargo.lock.patch +b057c2cb374a4d931d0a25d9fd054ab242b0e57e710e66016a7d16de6376fa7be3472fa827a5d2e8088237b6c635099eb7c22f173929d62667a0ac3b2c46013e tests-fix-npx-output.patch +3a32bd68860f8a393b8a337e411fdc14f1f0f35d8c8a851d4f0d3caf7a8c04cd1ea44ccde281f8e604884c088bb602862275e6dc8a45ed1d0da6303fc7962b9a unbundle-ca-certs.patch +a0a538b486601879375430acb5ce2505347dd355384769e09e2ae2b6412891f9a0ba6699f0767c43ef5e21ae720d4b8d78e769cb50a54a365c170cec0d00af4c cargo.lock.patch " diff --git a/community/deno/cargo.lock.patch b/community/deno/cargo.lock.patch index 3910098bda4..3e071914117 100644 --- a/community/deno/cargo.lock.patch +++ b/community/deno/cargo.lock.patch @@ -1,6 +1,6 @@ --- a/Cargo.lock +++ b/Cargo.lock -@@ -425,6 +425,26 @@ +@@ -433,6 +433,26 @@ ] [[package]] @@ -27,7 +27,7 @@ name = "bit-set" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -562,6 +582,15 @@ +@@ -603,6 +623,15 @@ ] [[package]] @@ -43,7 +43,7 @@ name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -588,6 +617,17 @@ +@@ -635,6 +664,17 @@ ] [[package]] @@ -54,22 +54,22 @@ +dependencies = [ + "glob", + "libc", -+ "libloading 0.8.1", ++ "libloading 0.8.3", +] + +[[package]] name = "clap" version = "4.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1271,7 +1311,6 @@ +@@ -1313,7 +1353,6 @@ "bit-vec", "bytes", "cooked-waker", - "deno_core_icudata", "deno_ops", - "deno_unsync 0.3.2", + "deno_unsync", "futures", -@@ -1292,12 +1331,6 @@ +@@ -1333,12 +1372,6 @@ ] [[package]] @@ -80,17 +80,29 @@ - -[[package]] name = "deno_cron" - version = "0.23.0" + version = "0.31.0" dependencies = [ -@@ -1869,7 +1902,6 @@ - "rustls-tokio-stream", +@@ -1914,7 +1947,6 @@ "rustls-webpki", "serde", + "tokio", - "webpki-roots", ] [[package]] -@@ -3699,6 +3731,12 @@ +@@ -3646,9 +3646,9 @@ + + [[package]] + name = "jobserver" +-version = "0.1.29" ++version = "0.1.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f08474e32172238f2827bd160c67871cdb2801430f65c3979184dc362e3ca118" ++checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" + dependencies = [ + "libc", + ] +@@ -3765,6 +3797,12 @@ ] [[package]] @@ -103,7 +115,7 @@ name = "lexical-core" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -3819,7 +3857,7 @@ +@@ -3885,7 +3923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ @@ -112,7 +124,7 @@ "pkg-config", "vcpkg", ] -@@ -4527,6 +4565,12 @@ +@@ -4615,6 +4653,12 @@ ] [[package]] @@ -125,7 +137,7 @@ name = "pem-rfc7468" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -4948,9 +4992,7 @@ +@@ -5025,9 +5069,7 @@ [[package]] name = "psm" @@ -136,7 +148,7 @@ dependencies = [ "cc", ] -@@ -5703,6 +5745,12 @@ +@@ -5785,6 +5827,12 @@ checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" [[package]] @@ -149,7 +161,7 @@ name = "signal-hook" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -5897,8 +5945,6 @@ +@@ -5970,8 +6018,6 @@ [[package]] name = "stacker" version = "0.1.15" @@ -158,12 +170,12 @@ dependencies = [ "cc", "cfg-if", -@@ -7144,8 +7190,6 @@ +@@ -7259,8 +7305,6 @@ [[package]] name = "v8" - version = "0.89.0" + version = "0.91.1" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fe2197fbef82c98f7953d13568a961d4e1c663793b5caf3c74455a13918cdf33" +-checksum = "69026e2e8af55a4d2f20c0c17f690e8b31472bf76ab75b1205d3a0fab60c8f84" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "fslock", diff --git a/community/deno/disable-core-defaults.patch b/community/deno/disable-core-defaults.patch index 94651175342..7f85789d8d5 100644 --- a/community/deno/disable-core-defaults.patch +++ b/community/deno/disable-core-defaults.patch @@ -11,5 +11,5 @@ deno_core looks like this: --- a/Cargo.toml +++ b/Cargo.toml @@ -43 +43 @@ --deno_core = { version = "0.272.0" } -+deno_core = { version = "0.272.0", default-features = false } +-deno_core = { version = "0.280.0" } ++deno_core = { version = "0.280.0", default-features = false } diff --git a/community/deno/feature-flag-for-webgpu.patch b/community/deno/feature-flag-for-webgpu.patch new file mode 100644 index 00000000000..20249ed8cbc --- /dev/null +++ b/community/deno/feature-flag-for-webgpu.patch @@ -0,0 +1,123 @@ +From dc5c374e2f3c5b3a8684fd1c35dba55936829618 Mon Sep 17 00:00:00 2001 +From: Divy Srivastava <dj.srivastava23@gmail.com> +Date: Sun, 3 Mar 2024 13:22:00 +0530 +Subject: [PATCH] feat(cli): cargo feature flag for webgpu + +--- + cli/Cargo.toml | 4 +++- + runtime/Cargo.toml | 7 +++++-- + runtime/lib.rs | 1 + + runtime/snapshot.rs | 1 + + runtime/web_worker.rs | 1 + + runtime/worker.rs | 1 + + 6 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/cli/Cargo.toml b/cli/Cargo.toml +index 5656c77f85ad8..f39613c1f5857 100644 +--- a/cli/Cargo.toml ++++ b/cli/Cargo.toml +@@ -36,7 +36,7 @@ harness = false + path = "./bench/lsp_bench_standalone.rs" + + [features] +-default = ["upgrade", "__vendored_zlib_ng"] ++default = ["upgrade", "__vendored_zlib_ng", "webgpu"] + # A feature that enables the upgrade subcommand and the background check for + # available updates (of deno binary). This is typically disabled for (Linux) + # distribution packages. +@@ -46,6 +46,8 @@ upgrade = [] + __runtime_js_sources = ["deno_runtime/__runtime_js_sources"] + # Vendor zlib as zlib-ng + __vendored_zlib_ng = ["flate2/zlib-ng-compat", "libz-sys/zlib-ng"] ++# Feature flags for large extensions. ++webgpu = ["deno_runtime/webgpu"] + + [build-dependencies] + deno_runtime = { workspace = true, features = ["include_js_files_for_snapshotting", "only_snapshotted_js_sources"] } +diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml +index a7bedafe66a24..fe26635450d6d 100644 +--- a/runtime/Cargo.toml ++++ b/runtime/Cargo.toml +@@ -10,6 +10,7 @@ repository.workspace = true + description = "Provides the deno runtime library" + + [features] ++default = ["webgpu"] + # "fake" feature that allows to generate docs on docs.rs + docsrs = [] + # A feature that allows excluding `./js/99_main.js` from the exported extension. +@@ -27,6 +28,8 @@ __runtime_js_sources = ["include_js_files_for_snapshotting"] + # conditionally exclude the runtime source transpilation logic, and add an + # assertion that a snapshot is provided. + only_snapshotted_js_sources = ["include_js_files_for_snapshotting"] ++# Feature flags for large extensions. ++webgpu = ["deno_webgpu"] + + [lib] + name = "deno_runtime" +@@ -60,7 +63,7 @@ deno_kv.workspace = true + deno_tls.workspace = true + deno_url.workspace = true + deno_web.workspace = true +-deno_webgpu.workspace = true ++deno_webgpu = { workspace = true, optional = true } + deno_webidl.workspace = true + deno_websocket.workspace = true + deno_webstorage.workspace = true +@@ -94,7 +97,7 @@ deno_terminal.workspace = true + deno_tls.workspace = true + deno_url.workspace = true + deno_web.workspace = true +-deno_webgpu.workspace = true ++deno_webgpu = { workspace = true, optional = true } + deno_webidl.workspace = true + deno_websocket.workspace = true + deno_webstorage.workspace = true +diff --git a/runtime/lib.rs b/runtime/lib.rs +index b63fd41340b53..c80ab112b5fef 100644 +--- a/runtime/lib.rs ++++ b/runtime/lib.rs +@@ -19,6 +19,7 @@ pub use deno_node; + pub use deno_tls; + pub use deno_url; + pub use deno_web; ++#[cfg(feature = "webgpu")] + pub use deno_webgpu; + pub use deno_webidl; + pub use deno_websocket; +diff --git a/runtime/snapshot.rs b/runtime/snapshot.rs +index e48af43ff7d1d..f94cfecb98b0a 100644 +--- a/runtime/snapshot.rs ++++ b/runtime/snapshot.rs +@@ -212,6 +212,7 @@ pub fn create_runtime_snapshot( + Default::default(), + Default::default(), + ), ++ #[cfg(feature = "webgpu")] + deno_webgpu::deno_webgpu::init_ops_and_esm(), + deno_canvas::deno_canvas::init_ops_and_esm(), + deno_fetch::deno_fetch::init_ops_and_esm::<Permissions>(Default::default()), +diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs +index 97b855c5671cf..ff133cfedba99 100644 +--- a/runtime/web_worker.rs ++++ b/runtime/web_worker.rs +@@ -409,6 +409,7 @@ impl WebWorker { + options.blob_store.clone(), + Some(main_module.clone()), + ), ++ #[cfg(feature = "webgpu")] + deno_webgpu::deno_webgpu::init_ops_and_esm(), + deno_canvas::deno_canvas::init_ops_and_esm(), + deno_fetch::deno_fetch::init_ops_and_esm::<PermissionsContainer>( +diff --git a/runtime/worker.rs b/runtime/worker.rs +index d19e520c9b1a3..947582bbee73b 100644 +--- a/runtime/worker.rs ++++ b/runtime/worker.rs +@@ -344,6 +344,7 @@ impl MainWorker { + options.blob_store.clone(), + options.bootstrap.location.clone(), + ), ++ #[cfg(feature = "webgpu")] + deno_webgpu::deno_webgpu::init_ops_and_esm(), + deno_canvas::deno_canvas::init_ops_and_esm(), + deno_fetch::deno_fetch::init_ops_and_esm::<PermissionsContainer>( diff --git a/community/deno/tests-fix-npx-output.patch b/community/deno/tests-fix-npx-output.patch new file mode 100644 index 00000000000..dcdc8f10f56 --- /dev/null +++ b/community/deno/tests-fix-npx-output.patch @@ -0,0 +1,11 @@ +npm output changed in https://github.com/npm/cli/pull/7414 which is part of v10.6.0 + +--- a/tests/testdata/task/npx/non_existent.out ++++ b/tests/testdata/task/npx/non_existent.out +@@ -1,4 +1,4 @@ + Task non-existent npx this-command-should-not-exist-for-you +-npm ERR! code E404 +-npm ERR! 404 Not Found - GET http://localhost:4260/this-command-should-not-exist-for-you ++npm error code E404 ++npm error 404 Not Found - GET http://localhost:4260/this-command-should-not-exist-for-you + [WILDCARD] diff --git a/community/deno/unbundle-ca-certs.patch b/community/deno/unbundle-ca-certs.patch index c492b497f1f..2b3abeb1923 100644 --- a/community/deno/unbundle-ca-certs.patch +++ b/community/deno/unbundle-ca-certs.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Don't bundle CA certificates, FFS! --- a/ext/tls/Cargo.toml +++ b/ext/tls/Cargo.toml -@@ -21,4 +21,3 @@ rustls = { workspace = true, features = ["dangerous_configuration"] } - rustls-pemfile.workspace = true +@@ -22,4 +22,3 @@ rustls = { workspace = true, features = ["dangerous_configuration"] } rustls-webpki.workspace = true serde.workspace = true + tokio.workspace = true -webpki-roots.workspace = true --- a/ext/tls/lib.rs +++ b/ext/tls/lib.rs diff --git a/community/dfrs/APKBUILD b/community/dfrs/APKBUILD index 78ad0d49d6a..46045d6fc9c 100644 --- a/community/dfrs/APKBUILD +++ b/community/dfrs/APKBUILD @@ -7,7 +7,8 @@ pkgdesc="Display file system space usage using graphs and colors" url="https://github.com/anthraxx/dfrs" # s390x fails to build # riscv64: rust broken -arch="all !s390x !riscv64" +# loongarch64: fails to build -> nix +arch="all !s390x !riscv64 !loongarch64" license="MIT" makedepends=" cargo diff --git a/community/didder/APKBUILD b/community/didder/APKBUILD index ae27ddd6a11..7d0755a4016 100644 --- a/community/didder/APKBUILD +++ b/community/didder/APKBUILD @@ -3,7 +3,7 @@ pkgname=didder pkgver=1.3.0 _commit=409cfa6 -pkgrel=2 +pkgrel=3 pkgdesc="An extensive, fast, and accurate command-line image dithering tool" url="https://github.com/makeworld-the-better-one/didder" license="GPL-3.0-or-later" diff --git a/community/diffoscope/APKBUILD b/community/diffoscope/APKBUILD index c5e0d977449..4cd2ce5159a 100644 --- a/community/diffoscope/APKBUILD +++ b/community/diffoscope/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=diffoscope -pkgver=265 +pkgver=267 pkgrel=0 pkgdesc="In-depth comparison of files, archives, and directories" url="https://diffoscope.org/" @@ -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=" -1973afdb4821ad75089da407dc3fb82450f07fc6d5cada97c2aae7584c4d84d7799c38e90b8b3acb5a95b6763d23945c6e542365037ae4fa21157e3acb012690 diffoscope-265.tar.gz +efc833f73285d53fb3270c74d856c2b78c1b7c03648a99b4c20f2596d6956ced940a642b7ce14742cec49cdd8c934be894601bcf47815c73f07d88f8cf625d8a diffoscope-267.tar.gz " diff --git a/community/difftastic/APKBUILD b/community/difftastic/APKBUILD index f14596180d6..4845383cf94 100644 --- a/community/difftastic/APKBUILD +++ b/community/difftastic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=difftastic -pkgver=0.57.0 +pkgver=0.58.0 pkgrel=0 pkgdesc="Diff tool that understands syntax" url="https://difftastic.wilfred.me.uk/" @@ -29,5 +29,5 @@ package() { } sha512sums=" -30303a50b6d7daca7dd2d8ed40aa157e16eef52df01c5605ebcdb53789d252ca526d34156c2f6e842ca90e4cabe89ab7f2b0ce05058ca7b59dffa1d9d60fe9a5 difftastic-0.57.0.tar.gz +b6bd3f8919df84aa084e645552a2ce468b2112a245f1757889b353243007ad08ff5cd5d144bf290624db643a9ef5f8607398a7686974e2c450010baf95b883c0 difftastic-0.58.0.tar.gz " diff --git a/community/digikam/APKBUILD b/community/digikam/APKBUILD index 1f9eb06229e..d09ccd54e8d 100644 --- a/community/digikam/APKBUILD +++ b/community/digikam/APKBUILD @@ -9,8 +9,8 @@ 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/direnv/APKBUILD b/community/direnv/APKBUILD index 60b363a3de1..f3ac9555d90 100644 --- a/community/direnv/APKBUILD +++ b/community/direnv/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=direnv pkgver=2.34.0 -pkgrel=2 +pkgrel=3 pkgdesc="Environment variable switcher for the shell" url="https://direnv.net" license="MIT" diff --git a/community/discover/APKBUILD b/community/discover/APKBUILD index 5c0285ef2f5..1cc9e08a917 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.4 +pkgver=6.0.5 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 @@ -64,11 +64,11 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/discover-$pkgver.tar.xz 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() { @@ -127,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=" -cf63b5c1ce1d0b229765ab62bb728b0ac34dee01600a7352f83058dab5216a97c77f5d31e14ae7ba8f9211319512759d4ff603e86d16d0724db6c2d0cb677a74 discover-6.0.4.tar.xz +0be89b2a20c1591021a9fc324679a48f7df0f0883ba1a5385d890b0f08e3add818fdeac4149e0106b0cafbfbce266ee455d9cc516dce2ddf38f5449ae98effb6 discover-6.0.5.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 d7dd40426dc..60653c33c16 100644 --- a/community/distrobox/APKBUILD +++ b/community/distrobox/APKBUILD @@ -5,8 +5,8 @@ pkgver=1.7.2.0 pkgrel=0 pkgdesc="Use any Linux distribution inside your terminal" url="https://distrobox.privatedns.org/" -# s390x blocked by podman -arch="noarch !s390x" +# s390x, loongarch64: blocked by podman +arch="noarch !s390x !loongarch64" license="GPL-3.0-only" depends="podman" subpackages="$pkgname-doc $pkgname-bash-completion" 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/dnscrypt-proxy/APKBUILD b/community/dnscrypt-proxy/APKBUILD index 8e4743fca71..adf41b4db6a 100644 --- a/community/dnscrypt-proxy/APKBUILD +++ b/community/dnscrypt-proxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Ian Bashford <ianbashford@gmail.com> pkgname=dnscrypt-proxy pkgver=2.1.5 -pkgrel=4 +pkgrel=5 pkgdesc="Tool for securing communications between a client and a DNS resolver" url="https://dnscrypt.info" arch="all" diff --git a/community/dnsdist/APKBUILD b/community/dnsdist/APKBUILD index 6e3d0ef2944..0037e450693 100644 --- a/community/dnsdist/APKBUILD +++ b/community/dnsdist/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Peter van Dijk <peter.van.dijk@powerdns.com> pkgname=dnsdist -pkgver=1.9.3 -pkgrel=1 +pkgver=1.9.4 +pkgrel=0 pkgdesc="dnsdist is a highly DNS-, DoS-, and abuse-aware loadbalancer." url="https://dnsdist.org/" # riscv64: for some reason, gcc segfaults @@ -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 1b86f10a1e5..eb907055c3c 100644 --- a/community/docker-cli-buildx/APKBUILD +++ b/community/docker-cli-buildx/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-buildx -pkgver=0.14.0 +pkgver=0.14.1 pkgrel=0 _commit=171fcbeb69d67c90ba7f44f41a9e418f6a6ec1da pkgdesc="A Docker CLI plugin for extended build capabilities" @@ -40,5 +40,5 @@ package() { } sha512sums=" -bc09f29096cfd08c60efd8fca7976a1db896f0ed08d33dfc64dfca2c6487a1dc1722b3fe80b6a175ebebeacf8b460bcc214806d0c7a637f17ed5d09793d8c9d8 buildx-0.14.0.tar.gz +e02e7a10408b44da3c4b6526c6a26d90f78976b53192cfd4b23c130357832688d93d8cef7a9d1ca59195f65d93f3096aa2ff5322ebed4c7ccde8cca4492297d8 buildx-0.14.1.tar.gz " diff --git a/community/docker-cli-compose/APKBUILD b/community/docker-cli-compose/APKBUILD index bbbe3bbcd8a..d3415ce491d 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.27.0 +pkgver=2.27.1 pkgrel=0 pkgdesc="Docker CLI plugin for extended build capabilities" url="https://docs.docker.com/compose/cli-command" @@ -50,5 +50,5 @@ package() { } sha512sums=" -f31627a00002416be6fb4343434d6b1e2b5d275a484ede505406bdbe65c73d61b497e849bb3645900dbb4eb3b7e638976253109b01d67776deed2a95950e3630 docker-cli-compose-2.27.0.tar.gz +b0709303a39e2d7dcc87ab9feb285b167db54f35e485cce75ac344cb6da7e5f4367d633a11bd6c2ca1ae213f9b1839d16c2cacbba816298221dbd74797b0a8a1 docker-cli-compose-2.27.1.tar.gz " diff --git a/community/docker-credential-ecr-login/APKBUILD b/community/docker-credential-ecr-login/APKBUILD index 41729564fb3..f8f4e888aa3 100644 --- a/community/docker-credential-ecr-login/APKBUILD +++ b/community/docker-credential-ecr-login/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Ty Sarna <ty@sarna.org> pkgname=docker-credential-ecr-login pkgver=0.7.1 -pkgrel=17 +pkgrel=18 pkgdesc="Credential helper for Docker to use the AWS Elastic Container Registry" url="https://github.com/awslabs/amazon-ecr-credential-helper" arch="x86_64 aarch64" diff --git a/community/docker-registry/APKBUILD b/community/docker-registry/APKBUILD index 930e49cbd5b..4f9b85ff3e4 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=5 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" @@ -17,6 +17,7 @@ subpackages="$pkgname-openrc" source="$pkgname-$pkgver.tar.gz::https://github.com/distribution/distribution/archive/v$pkgver.tar.gz log-hook-syslog.patch config-example.patch + bugsnag-panicwrap.patch $pkgname.initd $pkgname.confd $pkgname.logrotate @@ -46,11 +47,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 @@ -66,6 +69,7 @@ sha512sums=" 7c2be028f5beb7fd89509250564924e22d2726540a9df4f32c80518f23742680e5f59bec8480a99ff3cade4f10391f94c50e9f31a4f3fac4af9b0b06adc474f6 docker-registry-2.8.3.tar.gz 834257d45bc83eef5fe65955b215c450db0c9849fc9d5ddbaef731589f05e82cc8c0dd8a315623e45c4b4b8d463c8c12b53d99ade9029fd42b6d6afdf7f5ca48 log-hook-syslog.patch 9c3a8afd855bb161166fdc38e931a2ad4aaf9a8e97c67d15ea8a098f6f6f800b4c8ef037dbbd0ac954289dbae7b208116751a3c97aa682fa50887ccc7a68a9d7 config-example.patch +49ed24e520d3f29df1b3367e74b1b5e8e898c8e64a2c3e09c3397131da0adeac87bc1fe4577a20840e2f379b794495b8b170ea5aedfa1e4430ed353d6260af2e bugsnag-panicwrap.patch 7962b2660ee8147b66fc38b7e4c1d7b37ba0b7d64fbddefb970c182bd55e2a841cec885a9459dfa1db7f1a8fcaa0bd9c7eea0b22c9e37854a3081415381c14d4 docker-registry.initd 34d9158cf4b0e04ba9198235629ebe23eb5a7a3dcc70d26cf7f4fd045a7cd8e055476e7e30255f711160aa23af505ca38a8a76302aae7ec24701b3887b874276 docker-registry.confd 979643f6b9a3e12f692dc37f964fddff66f4e08cd74a1094a4be1230e67f83e703207e5420135cebb29aa13ff20a984395168046fd902392ad45d8e3eadcaa0e docker-registry.logrotate diff --git a/community/docker-registry/bugsnag-panicwrap.patch b/community/docker-registry/bugsnag-panicwrap.patch new file mode 100644 index 00000000000..bf89636b1fa --- /dev/null +++ b/community/docker-registry/bugsnag-panicwrap.patch @@ -0,0 +1,20 @@ +diff --git a/vendor/github.com/bugsnag/panicwrap/dup2.go b/vendor/github.com/bugsnag/panicwrap/dup2.go +index de523c8..639bf8e 100644 +--- a/vendor/github.com/bugsnag/panicwrap/dup2.go ++++ b/vendor/github.com/bugsnag/panicwrap/dup2.go +@@ -1,4 +1,4 @@ +-// +build darwin dragonfly freebsd linux,!arm64 netbsd openbsd ++//go:build !(linux && (arm64 || loong64 || riscv64)) + + package panicwrap + +diff --git a/vendor/github.com/bugsnag/panicwrap/dup3.go b/vendor/github.com/bugsnag/panicwrap/dup3.go +index 9721b36..00701cf 100644 +--- a/vendor/github.com/bugsnag/panicwrap/dup3.go ++++ b/vendor/github.com/bugsnag/panicwrap/dup3.go +@@ -1,4 +1,4 @@ +-// +build linux,arm64 ++//go:build linux && (arm64 || loong64 || riscv64) + + package panicwrap + diff --git a/community/docker/APKBUILD b/community/docker/APKBUILD index 706aadc4fa7..53765caaf4b 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.1.1 -_cli_commit=4cf5afaefa0bec8ab94fcf631add24e284d0ecbf # https://github.com/docker/cli/commits/v$pkgver -_moby_commit=ac2de55998d4a977bee136e84cd983ec46855670 # https://github.com/moby/moby/commits/v$pkgver -pkgrel=1 +pkgver=26.1.3 +_cli_commit=b72abbb6f0351eb22e5c7bdbba9112fef6b41429 # https://github.com/docker/cli/commits/v$pkgver +_moby_commit=8e96db1c328d0467b015768e42a62c0f834970bb # https://github.com/moby/moby/commits/v$pkgver +pkgrel=0 pkgdesc="Pack, ship and run any application as a lightweight container" url="https://www.docker.io/" arch="all" @@ -200,8 +200,8 @@ rootless() { } sha512sums=" -2ed44dbab04b3a6c33b721f53fe87c3b52231e3eb9c0d9d98da7dfaebab3c0883917540d806e84f9bf9acea0b8de5484d43f278e42effa55dd47693ac2de82cf cli-26.1.1.tar.gz -78561ef91e32e178dce85398970beabbfd447476c682a6f6c5ff8da13eeb39132ec6a685de27a5b7d6d99e8225ca64841d803fa789f3d045c79d4a74caf40c14 moby-26.1.1.tar.gz +e3b0dcbdd69ce42b9b45ed81bea730c149c8d9db024372cab3e4e127a6a080ce2464e1dd7c9c61eb1fd3611f100b98d6737b6e1744ef8e26f955d529315c0cec cli-26.1.3.tar.gz +bb48cbd3d2bff6b10aec4d89d4aed5bca97ec2decc93d262743b115b51e603eb8e3ac63c5cd86c65e56383c0f9c4a9d0a81104d8838d9c5e0c7221a11c0f20ce moby-26.1.3.tar.gz dd499b92058fc4d7d19e0c9030b1f390f58ac40be423442732cb7d02067ed2e43c464511772a21d4f347ec34f037ddd00cc1243dc41c8ce85151ac6142611d61 docker.initd 43432a05e5776910d45364aee9070932aa89f70eb9e69d3b7ed8e17d9a70eaed4c8c29b3524888214c7ddba592399e781a72255f7eb8fafd80c9f532a9481fac docker.confd 45499bbd9d607cb782b014a2d5697d7279f327ac630accf249a13785d91e15fb0ba1ae2edc10b6b42fcf40b7ce23ef160a40d8cda17b3084d68fe8c54a84b8f4 docker-rootless-extras.conf diff --git a/community/dockviz/APKBUILD b/community/dockviz/APKBUILD index 1ca95e9b22c..032c33d9ae2 100644 --- a/community/dockviz/APKBUILD +++ b/community/dockviz/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: TBK <alpine@jjtc.eu> pkgname=dockviz pkgver=0.6.4 -pkgrel=14 +pkgrel=15 pkgdesc="Visualizing Docker Data" url="https://github.com/justone/dockviz" arch="all" diff --git a/community/doctl/APKBUILD b/community/doctl/APKBUILD index 4de501e5132..12796fc18aa 100644 --- a/community/doctl/APKBUILD +++ b/community/doctl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=doctl pkgver=1.106.0 -pkgrel=0 +pkgrel=1 pkgdesc="Official command line interface for the DigitalOcean API" url="https://github.com/digitalocean/doctl" license="Apache-2.0" diff --git a/community/doggo/APKBUILD b/community/doggo/APKBUILD index 116f223d158..cbc71b43308 100644 --- a/community/doggo/APKBUILD +++ b/community/doggo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Ian Bashford <ianbashford@gmail.com> pkgname=doggo pkgver=0.5.7 -pkgrel=3 +pkgrel=4 pkgdesc="A modern command-line DNS client, additionally supporting DoH, DoT and DNSCrypt protocols" url="https://github.com/mr-karan/doggo" arch="all" diff --git a/community/dolphin-emu/APKBUILD b/community/dolphin-emu/APKBUILD index e0c8471c07b..b50e2cecb64 100644 --- a/community/dolphin-emu/APKBUILD +++ b/community/dolphin-emu/APKBUILD @@ -1,14 +1,16 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=dolphin-emu -pkgver=5.0_git20231117 +pkgver=5.0_git20240429 pkgrel=1 -_commit="dc0814ae4622313d513468bdc377ee9c031de199" -_commit_cubeb="27d2a102b0b75d9e49d43bc1ea516233fb87d778" +_commit="a9544510468740b77cf06ef28daaa65fe247fd32" +_commit_cubeb="54217bca3f3e0cd53c073690a23dd25d83557909" +_commit_enet="2a85cd64459f6ba038d233a634d9440490dbba12" +_commit_tinygltf="c5641f2c22d117da7971504591a8f6a41ece488b" _commit_gtest="58d77fa8070e8cec2dc1ed015d66b454c8d78850" _commit_implot="cc5e1daa5c7f2335a9460ae79c829011dc5cef2d" _commit_mgba="8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51" -_commit_rcheevos="d9e990e6d13527532b7e2bb23164a1f3b7f33bb5" +_commit_rcheevos="a6cdbb4a529d85b74777597fcff037dde7bef66b" _commit_spirv="50b4d5389b6a06f86fb63a2848e1a7da6d9755ca" _commit_vulkan_memory="498e20dfd1343d99b9115201034bb0219801cdec" _commit_zlib="ce01b1e41da298334f8214389cc9369540a7560f" @@ -22,7 +24,6 @@ makedepends=" bluez-dev cmake curl-dev - enet-dev eudev-dev ffmpeg4-dev fmt-dev @@ -45,17 +46,21 @@ makedepends=" pulseaudio-dev qt6-qtbase-dev qt6-qtsvg-dev + sdl2-dev sfml-dev vulkan-headers vulkan-loader-dev xz-dev + xxhash-dev zlib-dev zstd-dev " # The following dependencies are required, but atm not supported for using system wide libraries -# minizip-dev xxhash-dev soundtouch-dev gtest-dev +# minizip-dev soundtouch-dev gtest-dev source="https://github.com/dolphin-emu/dolphin/archive/$_commit/dolphin-emu-$_commit.tar.gz + https://github.com/lsalzman/enet/archive/$_commit_enet/enet-$_commit_enet.tar.gz https://github.com/mozilla/cubeb/archive/$_commit_cubeb/cubeb-$_commit_cubeb.tar.gz + https://github.com/syoyo/tinygltf/archive/$_commit_tinygltf/tinygltf-$_commit_tinygltf.tar.gz https://github.com/google/googletest/archive/$_commit_gtest/googletest-$_commit_gtest.tar.gz https://github.com/epezent/implot/archive/$_commit_implot/implot-$_commit_implot.tar.gz https://github.com/mgba-emu/mgba/archive/$_commit_mgba/mgba-$_commit_mgba.tar.gz @@ -79,6 +84,9 @@ prepare() { rmdir Externals/spirv_cross/SPIRV-Cross mv "$srcdir"/SPIRV-Cross-$_commit_spirv Externals/spirv_cross/SPIRV-Cross + rmdir Externals/tinygltf/tinygltf + mv "$srcdir"/tinygltf-$_commit_tinygltf Externals/tinygltf/tinygltf + rmdir Externals/zlib-ng/zlib-ng mv "$srcdir"/zlib-ng-$_commit_zlib Externals/zlib-ng/zlib-ng @@ -97,6 +105,9 @@ prepare() { rmdir Externals/VulkanMemoryAllocator mv "$srcdir"/VulkanMemoryAllocator-$_commit_vulkan_memory Externals/VulkanMemoryAllocator + rmdir Externals/enet/enet + mv "$srcdir"/enet-$_commit_enet Externals/enet/enet + # Make sure we never use non-system libraries except the ones that are not # supported being used system-wide by removing them from the Externals # folder @@ -107,6 +118,7 @@ prepare() { Vulkan VulkanMemoryAllocator cpp-optparse + enet cubeb expr glslang @@ -120,7 +132,7 @@ prepare() { rcheevos soundtouch spirv_cross - xxhash + tinygltf zlib-ng " @@ -161,7 +173,8 @@ build() { -DENABLE_ANALYTICS=ON \ -DUSE_SANITIZERS=OFF \ -DWITH_SANITIZER=OFF \ - -DUSE_SYSTEM_FMT=ON + -DUSE_SYSTEM_FMT=ON \ + -DUSE_SYSTEM_ENET=OFF cmake --build build } @@ -177,12 +190,14 @@ package() { } sha512sums=" -f494110493840bf339863e8550be331f129b4bdbc63ea22c791da8169af515f3eaaa460be412ce1a372b22164c2df6a7ea41b0f793cf69f4dc963edfe0b052e2 dolphin-emu-dc0814ae4622313d513468bdc377ee9c031de199.tar.gz -0844b56a949a23474b4f8b736bfc61bfe713f2ededd7148644a65883d963606dbde9bed6fc07f1b9181af4e4f8c411e0147352a8556e660907f74b0e617a25d0 cubeb-27d2a102b0b75d9e49d43bc1ea516233fb87d778.tar.gz +e0ba33ce96a1e0eab9b9b9307284a9d9202a7c05fabb1a3bd55b981031ccb2fbad7e6d9c7f5bf8e97746b6033869ead05c079167325a7102fe0ba25df11094aa dolphin-emu-a9544510468740b77cf06ef28daaa65fe247fd32.tar.gz +42f2f0b75bcdb883db39d31c4912e6f2f100f27ca8c7da6198b53c826acf27d1737b9010f9b881510d7a90395109ae078c58b1e50e1f25490e17eef0e779db92 enet-2a85cd64459f6ba038d233a634d9440490dbba12.tar.gz +7ba1cd5b74d49512d2ebf9b07889ee3ad46559afe3293bcbebae0613661f7502f0baaa20b6723738c21b2d71f9d8f72ed1252703533507dec5d2b5ad84784017 cubeb-54217bca3f3e0cd53c073690a23dd25d83557909.tar.gz +486bcf32be137dea5746117074dc51bc978290698de7831e1c4bbaa4acb56ed99fc34c38e69878a955b3e5f10f43eab07b0637164f822beae0fddd099aa0c56d tinygltf-c5641f2c22d117da7971504591a8f6a41ece488b.tar.gz d8153c426e4f9c89a74721cc4a24dfcaf319810f4f10aa25fc972f99da2d96d66bc840cf2f51b756fef6b1ca47e8d2c8633f5862cc24e34d57309ad48802124a googletest-58d77fa8070e8cec2dc1ed015d66b454c8d78850.tar.gz ab9935e759f38d19e6f60ed195c22018929ba46fccf783f4486346d7ffb7040b6097bc4c3d3b3577cc91f0c413684e07449a24bebf3db9c937638092c181de92 implot-cc5e1daa5c7f2335a9460ae79c829011dc5cef2d.tar.gz 782d456b7bf827591c774f146a88821b41b3b936faefddb5aee82bb0dd16ca7ad7228a1c331e1e517eac40a71cc4c94cc44bee12560946328c8433e1c6327225 mgba-8739b22fbc90fdf0b4f6612ef9c0520f0ba44a51.tar.gz -2959002fc41225d7aedd0d69a5ca54b84a4e727814d5dca5b953a0075dd84fd2a2a3751e1840232ec6996868aa41874a00fdffabdf0d141ca53872849c5a8b40 rcheevos-d9e990e6d13527532b7e2bb23164a1f3b7f33bb5.tar.gz +af8f571c3041c35fd00beaa46019b81711a0263983bd34aa65b0d92463b7f0d76c498b2ca906567f7165aefaa872ce0f835e5e1daa83b3bbf37480b8a95d0a0c rcheevos-a6cdbb4a529d85b74777597fcff037dde7bef66b.tar.gz 237bf9c902c23721592bff44b493198bc6b732cbaf4712b1bf56bfe1df76e7290fadec7cccd1694fccd808a1f57b681f696c323ef616f547bb54ddc97c604cea spirv-cross-50b4d5389b6a06f86fb63a2848e1a7da6d9755ca.tar.gz 1a58832ba11b953f097e321e335e5884e7f08e08ef7e7dff43c6faf7a0b7ffaf268b4c50f29fdc5eb08b03d4957f4194b72c4f4c87ae8f060bedf6f965063272 VulkanMemoryAllocator-498e20dfd1343d99b9115201034bb0219801cdec.tar.gz 73f4e56410ae298ef211ebab52b1a0d3d5bfae91c2de3cd294b56cd0a78ab50e1203b396c7df462f360c1aaaa9392ec5625473d1e9eb084cc64bc813e28d12a1 zlib-ng-ce01b1e41da298334f8214389cc9369540a7560f.tar.gz diff --git a/community/dolphin-plugins/APKBUILD b/community/dolphin-plugins/APKBUILD index 511caa20f5c..f43406988a9 100644 --- a/community/dolphin-plugins/APKBUILD +++ b/community/dolphin-plugins/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=dolphin-plugins -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Extra Dolphin plugins" url="https://www.kde.org/applications/system/dolphin/" @@ -44,5 +44,5 @@ package() { } sha512sums=" -585249422ef1637c2caee044a71d11c621127ef578131d2323e879b12bee2f17082c4811273e6bb0013d1386f7010ded187627965bfce0b1b412b25048cd11d8 dolphin-plugins-24.02.2.tar.xz +1d36fae869f5afabd394433f69e83fd603981ebef3d564f04e45cade250c6ccd54edc4e493339201aaea9d415fc87bf031485853619a9298ae86dffa1972e256 dolphin-plugins-24.05.0.tar.xz " diff --git a/community/dolphin/APKBUILD b/community/dolphin/APKBUILD index 3aa3af1d9aa..09f316db036 100644 --- a/community/dolphin/APKBUILD +++ b/community/dolphin/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=dolphin -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -77,5 +77,5 @@ package() { } sha512sums=" -951aa3a29003f3d14cfed4b3b8da000e4c8cb4b71172f32b145d36cde99713f08475d782225743fd7f27a25976b5136f241e6cad5f5c4b0eeffd4345f1b3d7df dolphin-24.02.2.tar.xz +474800ee475f5d4c435754a15aabe4bc10cd45e69be38510388879d85e22874a66000138d46f6c9afb9d0700fafa72ee7c135a39a80553abecf42f85f3f6c044 dolphin-24.05.0.tar.xz " 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/dotnet6-build/APKBUILD b/community/dotnet6-build/APKBUILD index d72c35bd04b..b3863a1f7ee 100644 --- a/community/dotnet6-build/APKBUILD +++ b/community/dotnet6-build/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=dotnet6-build -pkgver=6.0.129 +pkgver=6.0.130 pkgrel=0 # remember to upgrade dotnet6-runtime $_bldver when upgrading dotnet6-build _gittag=v$pkgver @@ -567,10 +567,10 @@ doc() { } sha512sums=" -1e9f9a7098efa397cb0220286a2314683b8b3dd4a3fa971ceddfada50edeea139bf10a53db7455ab584a9ccdbe04cd4e5eedd12b4c9cfa258fbaf201b6b34d38 dotnet-v6.0.129.tar.xz +d58c34902a34bc43a37b11bebadf675b8c2221f3ae601c3be4caaa8cb424b1dca92843e58c43f1864a4a171fd76b77be8f7acb8b3f71183467817015de016f88 dotnet-v6.0.130.tar.xz 69181ea34dafaacf95a267675a2c1dc75c37fcf331e540a9e3ee4f80709572c7523dd4370a786ad5c885356d05ec83b27c9bbcae6adac01b78d9aa2ac69ed719 dotnet-testsuite-4f2372af276898d8acbe92d77af30da86920bbce.tar.gz 7f59b10878aa90a6953ee4d88d08fa932910a24018dace92b173ee87c847d14734f93dc5fc031982a3d0a5cb4ac223b83d0e548531c23c4e3326dc83510989a9 dotnet-bunny-v15.tar.gz -bdc2617791fda07bcc87cf5f8727ac721756810880b14c5472998d6a3e238d85d5a12db7823d1237b17f40945e697a6c9104d1c43816c775cc03920e88572a37 build_14816-non-portable-build.patch +ed5e1dc89664cfae0ec64fcd7d924831b1b7bb5dbf35537832e7450f1780285dcff695f63e49b40385d160b53c24f0b8520b378ba1157ec8d21f0c557028f71a build_14816-non-portable-build.patch 70d402d0bcaa98c8b09652365404238b67ed26eb9c3d510c7d6309fb61937d98c9144f1096e521c11b00e946d29585a9d474498ccc5223de32bd6471ab5a431f build_14816-update-portable-rid-logic.patch a5a359af816595fbf19482e5dccf874c78d2fc4b59f38223118aac603b33e00c9fed22580eee3112519477205c2c8ed16177d100f09f45275e3da3c20b0ed7f7 build_disable-apphost.diff e71f91d14873755bc2f227807d909e5260bd1f166a262eda0bf05d4a3975a7bce7fde457c1eba476a83b317aebdaaba25f1893d3385182428c08bba6243f21c8 installer_14816-update-portable-rid-logic.patch diff --git a/community/dotnet6-build/build_14816-non-portable-build.patch b/community/dotnet6-build/build_14816-non-portable-build.patch index 8e65e16a5cf..e262babe420 100644 --- a/community/dotnet6-build/build_14816-non-portable-build.patch +++ b/community/dotnet6-build/build_14816-non-portable-build.patch @@ -188,21 +188,6 @@ index f3ed143f8..efd8b66fa 100644 + + <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> </Project> -diff --git a/repos/source-build-reference-packages.proj b/repos/source-build-reference-packages.proj -index 69ab564a2..9545b50e4 100644 ---- a/repos/source-build-reference-packages.proj -+++ b/repos/source-build-reference-packages.proj -@@ -2,7 +2,9 @@ - <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> - - <PropertyGroup> -- <BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand> -+ <BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs> -+ <BuildCommandArgs>$(BuildCommandArgs) /p:MicrosoftNetCoreIlasmPackageRuntimeId=$(NETCoreSdkRuntimeIdentifier)</BuildCommandArgs> -+ <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand> - - <NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile> - <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile> -- 2.38.2 diff --git a/community/dotnet6-runtime/APKBUILD b/community/dotnet6-runtime/APKBUILD index 3a6acaf6706..3e74d2ae15d 100644 --- a/community/dotnet6-runtime/APKBUILD +++ b/community/dotnet6-runtime/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=dotnet6-runtime -pkgver=6.0.29 -_bldver=6.0.129-r0 +pkgver=6.0.30 +_bldver=6.0.130-r0 pkgrel=0 _pkgver_macro=${pkgver%.*} diff --git a/community/dotnet8-runtime/APKBUILD b/community/dotnet8-runtime/APKBUILD index 4057c5a30e5..c35c9e4e727 100644 --- a/community/dotnet8-runtime/APKBUILD +++ b/community/dotnet8-runtime/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=dotnet8-runtime -pkgver=8.0.4 +pkgver=8.0.5 pkgrel=0 -_gittag=v8.0.4 +_gittag=v8.0.5 _giturl="https://github.com/dotnet/dotnet" _testtag=4f2372af276898d8acbe92d77af30da86920bbce _bunnytag=v15 @@ -17,7 +17,6 @@ _patches=" runtime_90251-rename-mono-cmake-host-var.patch runtime_enable-system-libunwind.diff runtime_more-clang-16-suppression.patch - runtime_remove-usage-of-off64-t.patch vstest_intent-net8.0.patch " @@ -127,6 +126,9 @@ builddir="$srcdir"/dotnet-${_gittag/v} # - CVE-2024-26190 # 8.0.4-r0: # - CVE-2024-21409 +# 8.0.5-r0: +# - CVE-2024-30045 +# - CVE-2024-30046 _checkdir="$srcdir"/dotnet-bunny-${_bunnytag/v} _testdir="$srcdir"/dotnet-regular-tests-$_testtag @@ -553,8 +555,8 @@ aspnetcore_targeting_pack() { } sha512sums=" -4567be457201dce8c0c66de6ff29e1da114dab2d30444ff2e5899715286dbb076d9bbab9676c2d3cbd99010367fd011a19ad747c7bf861b75f78312885f505a5 dotnet-tarball-v8.0.4.tar.gz -096dc9e15b6da05da87832f9608256ff2f89992774bdc0e1211495ef88101f3976cb27324a356c44c67ca05a8ac4291eac724d42a639d24bf35539238c191678 dotnet-release-v8.0.4.json +a7b26a6e93eee087f2e108770d9e9d256ab0d36326ce9a7f45acb78586b08778c7ab9a25856fd4b213dfe78a98990ef53eab91b0b648ecb10498cbfeef8270f0 dotnet-tarball-v8.0.5.tar.gz +45faf19a6698a2674cc95677ff4d5c3646a643024933e9e504cb3f693b3604014868b211e12ee8520985ec7b6b1962b8940f1c1ea72d4b612d242b22c09bbe96 dotnet-release-v8.0.5.json 69181ea34dafaacf95a267675a2c1dc75c37fcf331e540a9e3ee4f80709572c7523dd4370a786ad5c885356d05ec83b27c9bbcae6adac01b78d9aa2ac69ed719 dotnet-testsuite-4f2372af276898d8acbe92d77af30da86920bbce.tar.gz 7f59b10878aa90a6953ee4d88d08fa932910a24018dace92b173ee87c847d14734f93dc5fc031982a3d0a5cb4ac223b83d0e548531c23c4e3326dc83510989a9 dotnet-bunny-v15.tar.gz c3f31956976b77198e72a3fef3427338b6b2961f8c121416040c1105de0ce8073e46f4c2e9ef22a001aee69cbe39621c2ddac988522693110071dfae42f2e2b7 dotnet.sh.in @@ -566,7 +568,6 @@ ab362bdbbea8d8116b6bf7bf58e330ce6d7d171b42613ac03514f76afa2574b75d6566148d1b7204 d732df247c721c9f677baabdd7f36dbf4b564814ff64164361065bb1c196b767494a1d39f634eadf01a23032c7b3e64102614b7213065c81096bbf3f8022e6a0 runtime_82269-mono-thread-coop-undefine-fortify-source.patch 3354fa721809f1b94c579408ee78004ff3ca2ba79212c1a0ecc424a9955bb5d5a80c115d4c30dd257526f356ea76f0562db6f83d8dd0b6135f8c689886b3348d runtime_90251-rename-mono-cmake-host-var.patch 39e1b848d1ae81e4b81758522de7d3e36b11d2ab626565efb8e4cceae8da29018277709f0af8fcfa75be8da79f8d6432eb6aac49a5e82510c3aca34632df4d8e runtime_enable-system-libunwind.diff -887112eb2b103eadd6887529ebae7f9a75df2c2cb168e84fd40cc09f9bcd20917d428bbba06968b07b0a463890da82b1b2b1d033a3dd016e6494067464ae6f74 runtime_more-clang-16-suppression.patch -0c25319125ef5b0ad490b37a643c0c5257c796d5ed24f9ac404f698710b07de790bcbb0b6336d4a50025b94c3bff99b214951bd8f0a79a8d6f543ebaa300740f runtime_remove-usage-of-off64-t.patch +0a9abc9e7dc01651c9eb8bf0128019ced614d7228d619330f2a45a5fdd08e5d6f242b9869aedadfee3be0353f652220f287b084fb27f02a561516551185d2b2c runtime_more-clang-16-suppression.patch 5c74abbd7ea71ba6164f71b866c9da564db9ccd95f1a9a8b82f5b0b599fab6d59d64ba1157ec13d7ac36d23145f3d9de2189ed6c40f56e46555ab378c161948b vstest_intent-net8.0.patch " diff --git a/community/dotnet8-runtime/runtime_more-clang-16-suppression.patch b/community/dotnet8-runtime/runtime_more-clang-16-suppression.patch index 1e94419844e..888aa98ec26 100644 --- a/community/dotnet8-runtime/runtime_more-clang-16-suppression.patch +++ b/community/dotnet8-runtime/runtime_more-clang-16-suppression.patch @@ -2,12 +2,12 @@ diff --git a/src/runtime/eng/native/configurecompiler.cmake b/src/runtime/eng/na index c9a54547c0a..931da2cae5b 100644 --- a/src/runtime/eng/native/configurecompiler.cmake +++ b/src/runtime/eng/native/configurecompiler.cmake -@@ -488,6 +488,8 @@ if (CLR_CMAKE_HOST_UNIX) +@@ -590,6 +590,8 @@ if (CLR_CMAKE_HOST_UNIX) # other clang 16.0 suppressions add_compile_options(-Wno-single-bit-bitfield-constant-conversion) add_compile_options(-Wno-cast-function-type-strict) + add_compile_options(-Wno-incompatible-function-pointer-types-strict) + add_compile_options(-Wno-ignored-attributes) - else() - add_compile_options(-Wno-uninitialized) - add_compile_options(-Wno-strict-aliasing) + + # clang 18.1 supressions + add_compile_options(-Wno-switch-default) diff --git a/community/dotnet8-runtime/runtime_remove-usage-of-off64-t.patch b/community/dotnet8-runtime/runtime_remove-usage-of-off64-t.patch deleted file mode 100644 index cec58772971..00000000000 --- a/community/dotnet8-runtime/runtime_remove-usage-of-off64-t.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp.orig b/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp -index 20b2494..165b190 100644 ---- a/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp.orig -+++ b/src/runtime/src/coreclr/debug/createdump/crashinfounix.cpp -@@ -469,7 +469,7 @@ CrashInfo::ReadProcessMemory(void* address, void* buffer, size_t size, size_t* r - // performance optimization. - m_canUseProcVmReadSyscall = false; - assert(m_fdMem != -1); -- *read = pread64(m_fdMem, buffer, size, (off64_t)address); -+ *read = pread(m_fdMem, buffer, size, (off_t)address); - } - - if (*read == (size_t)-1) -diff --git a/src/runtime/src/coreclr/debug/createdump/crashinfo.cpp.orig b/src/runtime/src/coreclr/debug/createdump/crashinfo.cpp -index 5addb79..79655d1 100644 ---- a/src/runtime/src/coreclr/debug/createdump/crashinfo.cpp.orig -+++ b/src/runtime/src/coreclr/debug/createdump/crashinfo.cpp -@@ -760,7 +760,7 @@ CrashInfo::PageMappedToPhysicalMemory(uint64_t start) - } - - uint64_t pagemapOffset = (start / PAGE_SIZE) * sizeof(uint64_t); -- uint64_t seekResult = lseek64(m_fdPagemap, (off64_t) pagemapOffset, SEEK_SET); -+ uint64_t seekResult = lseek(m_fdPagemap, (off_t) pagemapOffset, SEEK_SET); - if (seekResult != pagemapOffset) - { - int seekErrno = errno; diff --git a/community/dotnet8-sdk/APKBUILD b/community/dotnet8-sdk/APKBUILD index 9ed1ead40d8..42862bea94b 100644 --- a/community/dotnet8-sdk/APKBUILD +++ b/community/dotnet8-sdk/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=dotnet8-sdk -pkgver=8.0.104 -_bldver=8.0.4-r0 +pkgver=8.0.105 +_bldver=8.0.5-r0 pkgrel=0 # Following for dotnet build version 6.0 and up diff --git a/community/dotool/APKBUILD b/community/dotool/APKBUILD index a57ecfc8187..b5428c39a1b 100644 --- a/community/dotool/APKBUILD +++ b/community/dotool/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: John Gebbie <me@johngebbie.com> pkgname=dotool pkgver=1.5 -pkgrel=0 +pkgrel=1 pkgdesc="Command to simulate input anywhere (X11, Wayland, TTYs)" url="https://sr.ht/~geb/dotool" arch="all" diff --git a/community/dovecot-fts-xapian/APKBUILD b/community/dovecot-fts-xapian/APKBUILD index f645d690542..5438d800362 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.11 +pkgver=1.7.12 pkgrel=0 pkgdesc="Dovecot xapian fts plugin" url="https://github.com/grosjo/fts-xapian" @@ -34,5 +34,5 @@ package() { } sha512sums=" -60590be20c92997f663368c088a062d639b8251550637cdda651294ee384b9300367ad583a5ff1808c0fb954cb49f656a3ece312a9f6d69f41f32fe812e24c71 dovecot-fts-xapian-1.7.11-1.tar.gz +516e621c055c495534e0fdcf1580af503a48323d343f75d8164d80676d8b436872e88faa6b869838da9bb6465586d005bcf9724420623c4e295c0fb6c82b9865 dovecot-fts-xapian-1.7.12-1.tar.gz " diff --git a/community/dragon/APKBUILD b/community/dragon/APKBUILD index ae97e685fd0..52a4c831fac 100644 --- a/community/dragon/APKBUILD +++ b/community/dragon/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=dragon -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A multimedia player where the focus is on simplicity, instead of features" url="https://kde.org/applications/multimedia/org.kde.dragonplayer" @@ -55,5 +55,5 @@ package() { } sha512sums=" -d495c8840fee63e67289040b0d82f5b5a7f47586f2a0054bb784956d8ffe9dbeb8230542713805f6a6aa7cfbe448cb6fcc4de4a88814e8567a522202b958a905 dragon-24.02.2.tar.xz +a2e78a44ddfa29fc088eb1848082c7037893b8d9a748b89ec40b71dcbba181685bab3162a923329d295c78b477995cf86e9b579d1939c1e0f421de41a5622d22 dragon-24.05.0.tar.xz " 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 147a1c3fff7..feb798f300f 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="The KDE crash handler" # armhf blocked by extra-cmake-modules @@ -70,5 +70,5 @@ package() { } sha512sums=" -38d6a41992e508d7779c216eb0a5538a9c860d76cebe189244796e4ab596c6e0fb21025bc5a790cd4eee3601007885abc61c62d26feac79c9b9d5065b20820f2 drkonqi-6.0.4.tar.xz +7ec305d2818211f40a239e0e4fd8b7648df95dd6096d32192d6fd5c42b11aa2d3b99ea32a2e51a84293d406e7572ac4e648c4325bb1bd236c45ec1fde9bd3d6e drkonqi-6.0.5.tar.xz " diff --git a/community/drone/APKBUILD b/community/drone/APKBUILD index 05a977a3589..6e4c2257448 100644 --- a/community/drone/APKBUILD +++ b/community/drone/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: fossdd <fossdd@pwned.life> pkgname=drone -pkgver=2.23.0 -pkgrel=0 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Container-Native, Continuous Delivery Platform" url="https://drone.io/" license="Apache-2.0" @@ -53,7 +53,7 @@ package() { } sha512sums=" -30f9ffbd369258384cdc67fb1632186f9a5875f274243bedeee2a7316c8ea0c5aadd226af41225ff3818abfef07f68be37beef49bab24f01b1efb4b4e4adbc84 gitness-2.23.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/community/dune/APKBUILD b/community/dune/APKBUILD index 62c218f2024..92408a8f8e8 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.2 +pkgver=3.15.3 pkgrel=0 pkgdesc="A composable build system for OCaml (formerly Jbuilder)" url="https://dune.build/" -arch="all !riscv64 !loongarch64" # ocaml +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=" -a15658e439984e0256aedd67b5107d8a347c73752566e8e76f5cf5ef807c3761747f5443bd042d0434a26f73ab18ab283eaf705f797ca31737b45530251210e6 dune-3.15.2.tar.gz +4cdfc7667b4e232077fa24ed9a499bfb015df3e1085c4e5de8d50434bd068adcd8e70fa831f43e3e9534bfe2380b67bb53fdacca5befdd01b899be9cb14350e6 dune-3.15.3.tar.gz " 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/easypki/APKBUILD b/community/easypki/APKBUILD index a4b736c4e19..469209a917b 100644 --- a/community/easypki/APKBUILD +++ b/community/easypki/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> pkgname=easypki pkgver=1.1.0 -pkgrel=29 +pkgrel=30 pkgdesc="Creating a certificate authority the easy way" url="https://github.com/google/easypki" arch="all" 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/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/editorconfig-checker/APKBUILD b/community/editorconfig-checker/APKBUILD index eabc96bf3c9..845696fdb7d 100644 --- a/community/editorconfig-checker/APKBUILD +++ b/community/editorconfig-checker/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Anjandev Momi <anjan@momi.ca> pkgname=editorconfig-checker pkgver=2.7.0 -pkgrel=7 +pkgrel=8 pkgdesc="A tool to verify that your files are in harmony with your .editorconfig" url="https://editorconfig-checker.github.io/" license="MIT" diff --git a/community/efm-langserver/APKBUILD b/community/efm-langserver/APKBUILD index e20b8feddd3..efd8269dd79 100644 --- a/community/efm-langserver/APKBUILD +++ b/community/efm-langserver/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Galen Abell <galen@galenabell.com> pkgname=efm-langserver pkgver=0.0.53 -pkgrel=1 +pkgrel=2 pkgdesc="General purpose language server" url="https://github.com/mattn/efm-langserver" arch="all" diff --git a/community/electrs/APKBUILD b/community/electrs/APKBUILD index 05f3d042f88..92536c2113d 100644 --- a/community/electrs/APKBUILD +++ b/community/electrs/APKBUILD @@ -1,14 +1,15 @@ # Contributor: Nicolas Lorin <androw95220@gmail.com> # Maintainer: Michał Adamski <michal@ert.pl> pkgname=electrs -pkgver=0.10.4 +pkgver=0.10.5 pkgrel=0 pkgdesc="Efficient re-implementation of Electrum Server in Rust" 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 @@ -32,5 +33,5 @@ package() { } sha512sums=" -346366e8f661e54036daaf9d650de065fab9726e8b080a3a6bc9b366875567e6cf9da8ac2f2c84b36943404bc9827a159b0f9abf64c355b6e34735cdb1b60bec electrs-0.10.4.tar.gz +7355ab871f630ea69e03ca7d3c3d333c23a460c40e4e8e0342874de84bd463a9013c226c3e1065ce405f2ede8f27d63e13971ae5b597327488227d86dbc7474f electrs-0.10.5.tar.gz " diff --git a/community/element-web/APKBUILD b/community/element-web/APKBUILD index ae4f50d00d2..697b7685d22 100644 --- a/community/element-web/APKBUILD +++ b/community/element-web/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Galen Abell <galen@galenabell.com> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=element-web -pkgver=1.11.64 +pkgver=1.11.67 pkgrel=0 pkgdesc="A glossy Matrix collaboration client for the web" url="https://element.io/" @@ -67,6 +67,6 @@ package() { } sha512sums=" -bc74ff9330c2972e22fdcd54a9a552c9dacc792874d7d7a30929b1f973f638fa4a88827bf5bc0268761175c21077ab5482475d012512ec480512b1eb15ddbc96 element-web-1.11.64.tar.gz +a93d5c15ea69132c1a15763731823060acd378e5b78976faf6ebf246f352af4043c209e8e0cc21755ca00d59d4e2b29586ad10ed6c4908f80f0aeb03ea5faa4f element-web-1.11.67.tar.gz 92d964d9cd53b751da404bc75b4fbeee099414933a1aa644ff8d020ed2a48a4d856a92b0adffb1ee4606bddae6b498d6dc3db59f2c7292a22ee5d29ee6da18b9 no-source-maps.patch " diff --git a/community/elisa/APKBUILD b/community/elisa/APKBUILD index 0704344056b..aa9350d25b7 100644 --- a/community/elisa/APKBUILD +++ b/community/elisa/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=elisa -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules # s390x blocked by vlc @@ -14,6 +14,7 @@ pkgdesc="A simple music player aiming to provide a nice experience for its users license="LGPL-3.0-or-later" depends=" kirigami + kirigami-addons vlc " makedepends=" @@ -31,6 +32,7 @@ makedepends=" ki18n-dev kio-dev kirigami-dev + kirigami-addons-dev kpackage-dev kxmlgui-dev qqc2-desktop-style-dev @@ -66,5 +68,5 @@ package() { } sha512sums=" -a416aa6360ea903b740262f625248c302cecb2a176aba77773822dca999e1345b5a403fb8b4267b5c57f953359b715b9a954f25d63905440e2e311bf43fb88b7 elisa-24.02.2.tar.xz +f8cf4ccace575899c79dae956f5b61d0e57709e2b9bc8546dca5df0b26df7f2fccf914ea81a3b9cd4f0f33355a44cfe0e50903fe11490a6ac6c563171a1ebeeb elisa-24.05.0.tar.xz " diff --git a/community/elixir/APKBUILD b/community/elixir/APKBUILD index ba4e945612e..ae1ab4a2b58 100644 --- a/community/elixir/APKBUILD +++ b/community/elixir/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Marlus Saraiva <marlus.saraiva@gmail.com> # Maintainer: Michal Jirků <box@wejn.org> pkgname=elixir -pkgver=1.16.2 +pkgver=1.16.3 pkgrel=0 pkgdesc="Elixir is a dynamic, functional language designed for building scalable and maintainable applications" url="https://elixir-lang.org/" @@ -37,5 +37,5 @@ package() { } sha512sums=" -1e90adcd5d0512d4b394276e431f3987fc61a3f6191cd5c1d0f7fdd82baba99747aa553a3583e0813ffb5a48a32ce02a24e27b641f86a61e421722a802a850c1 elixir-1.16.2.tar.gz +1511fb78bdcc50850cbf91007ed11c6a89e947d0a743c1e9ed30e1c93c1b47b5377fced17eeb66ac511d4f151d2e00ef2ecc6fb425d0d4afe2451be41a6ba6ee elixir-1.16.3.tar.gz " 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/community/elvish/APKBUILD b/community/elvish/APKBUILD index 8a978e3ec96..1c949c2b851 100644 --- a/community/elvish/APKBUILD +++ b/community/elvish/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=elvish pkgver=0.20.1 -pkgrel=4 +pkgrel=5 pkgdesc="Friendly and expressive Unix shell" url="https://elv.sh/" arch="all" diff --git a/community/emptty/APKBUILD b/community/emptty/APKBUILD index 2fd8b1c9508..3e3b03291dc 100644 --- a/community/emptty/APKBUILD +++ b/community/emptty/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Michal Tvrznik <emporeor@gmail.com> pkgname=emptty pkgver=0.12.0 -pkgrel=2 +pkgrel=3 pkgdesc="Dead simple CLI Display Manager on TTY" url="https://github.com/tvrzna/emptty" arch="all" diff --git a/community/ergo/APKBUILD b/community/ergo/APKBUILD index c40a52a8a4b..7fdb6d85a3b 100644 --- a/community/ergo/APKBUILD +++ b/community/ergo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kay Thomas <kaythomas@pm.me> pkgname=ergo pkgver=2.13.1 -pkgrel=0 +pkgrel=1 pkgdesc="A modern IRC server (daemon/ircd) written in Go" url="https://ergo.chat" arch="all" diff --git a/community/esbuild/APKBUILD b/community/esbuild/APKBUILD index 292d2ac97f9..132fb58791f 100644 --- a/community/esbuild/APKBUILD +++ b/community/esbuild/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=esbuild -pkgver=0.19.8 -pkgrel=2 +pkgver=0.21.2 +pkgrel=0 pkgdesc="Extremely fast JavaScript bundler and minifier" url="https://esbuild.github.io/" license="MIT" arch="all" makedepends="go nodejs" +subpackages="$pkgname-doc" source="https://github.com/evanw/esbuild/archive/v$pkgver/esbuild-$pkgver.tar.gz" options="net" # fetch dependencies @@ -50,8 +51,10 @@ package() { install -Dm644 -t "$pkgdir"/$destdir npm/esbuild/package.json install -Dm644 -t "$pkgdir"/$destdir/lib npm/esbuild/lib/* ln -s /usr/bin/esbuild "$pkgdir"/$destdir/bin/esbuild + + install -Dm644 LICENSE.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } sha512sums=" -3462475f8705f1390c8d018206201bb6e06c12a069dcb2a15cf83ba8efeb3da4f2882af110faed1465abe2e54a8392d166a8cd771e15a120b7de55bf1a9039ee esbuild-0.19.8.tar.gz +7764fb49dab1c5403796bb61b49c650d5829728de389ac98d1b0e07f557efbc2c18347f30fed9fbdfc239394efa09b349b31dccbd9324ba61116fd095a97b965 esbuild-0.21.2.tar.gz " diff --git a/community/eventviews/APKBUILD b/community/eventviews/APKBUILD index 8e9f819c836..6dfe1f36130 100644 --- a/community/eventviews/APKBUILD +++ b/community/eventviews/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=eventviews -pkgver=24.02.2 +pkgver=24.05.0 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=" @@ -58,5 +59,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -54f231bdea7a0bf86da60f5dc447b2cd55688fe1f34b974c1ccd9fbe7d5a0050c995f030d117f4da700562af839d7196edece9a4ef34f366c690759a02bd0195 eventviews-24.02.2.tar.xz +f15c73a652a9612505e7762833843c3cd431c1f39d7afbe94746b80b74f93f8aee1d399b6dea032a11e7539a2e78e518853ddf2d38c675b0619d706752aa5f02 eventviews-24.05.0.tar.xz " diff --git a/community/evince/APKBUILD b/community/evince/APKBUILD index 5ee5aa1544a..d0b1250f13f 100644 --- a/community/evince/APKBUILD +++ b/community/evince/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=evince -pkgver=46.0 +pkgver=46.3 pkgrel=0 pkgdesc="Simple document viewer for GTK+" url="https://wiki.gnome.org/Apps/Evince" @@ -87,5 +87,5 @@ doc() { } sha512sums=" -f97afa6c91028d6d0af0cc43b5987ed845f646f4a56e25f47a36a837324156cc4e072b45fd844f4efe599b8ab4a9eb9b0693bcb281b4e4e998b74add6a37831f evince-46.0.tar.xz +818d543c3c02cf8736e90d76ef854b22f2bf4b705126e7f7748f5e4f21441d4e4b6a129c3549db58dcd9740a0ec68c8a8827174896745cb828f896ed0f96abcf evince-46.3.tar.xz " diff --git a/community/exoscale/APKBUILD b/community/exoscale/APKBUILD index 74cb916d54d..f3f43de208f 100644 --- a/community/exoscale/APKBUILD +++ b/community/exoscale/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=exoscale -pkgver=1.77.2 +pkgver=1.78.2 pkgrel=0 pkgdesc="Command-line tool for everything at Exoscale" url="https://github.com/exoscale/cli" @@ -28,5 +28,5 @@ package() { } sha512sums=" -7ca505b5f1dc974baab13b5b0ff650aafc5261b2b601f17e35a9f37198ec4d6a9179163f67da360a56d50f1bf2d5d233ef5c1836143a5a306d336a93df95f249 exoscale-1.77.2.tar.gz +1f2b3fedd12a00457e241b0d00eb4235804b60c8c8e6bec1f970617a969761eb9e18c10a6031bffba6c58571ca7049c47d8eb74f3fbaacb095ef72b21bea1c20 exoscale-1.78.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 803921ec762..9ff53a6b407 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.13 +pkgver=0.18.16 pkgrel=0 pkgdesc="ls replacement written in Rust" url="https://github.com/eza-community/eza" @@ -71,6 +71,6 @@ package() { } sha512sums=" -e257e57e7be3419bd4b9abf72e32222ad5a8029801cd8a7128151da3ce2198a57a1f6187e70ec7a1929e012572348bad56f7904f8cce2e1c26ab8880b6041f0c eza-0.18.13.tar.gz +92bf46df3e851275670fc445c3955999b4ea7b19b2fd6d4c6b403f93be7e4cdbb5c8e536da522603a7bed24e4d924d8ec8a37a3e2174260b378b29690a7ccf7c eza-0.18.16.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/community/falkon/APKBUILD b/community/falkon/APKBUILD index f772d0c542b..2bd83551864 100644 --- a/community/falkon/APKBUILD +++ b/community/falkon/APKBUILD @@ -4,13 +4,14 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=falkon -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 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=" @@ -66,5 +67,5 @@ bashcomp() { } sha512sums=" -37493aa624903b4d1fc5fbc8ddc12c7171da8db0f57c8aa9ce9450951538f2eb327102f62ee682da515a6fbb256079dd4e4a814922fdd33d6e74c5a9c4ef7f9b falkon-24.02.2.tar.xz +e8a3b93d07bb99d663acb9633bd5d3815eacf3e928439ebdb3570c9fcd0a04d5ef945f0af1f9d008b6998dd76fab723f0277c42a3e0733bc855099b982bd8fe1 falkon-24.05.0.tar.xz " diff --git a/community/fastfetch/APKBUILD b/community/fastfetch/APKBUILD index e7ddea54b40..655bebdec41 100644 --- a/community/fastfetch/APKBUILD +++ b/community/fastfetch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carter Li <zhangsongcui@live.cn> # Maintainer: Carter Li <zhangsongcui@live.cn> pkgname=fastfetch -pkgver=2.11.5 +pkgver=2.13.2 pkgrel=0 pkgdesc="Like neofetch, but much faster because written mostly in C." url="https://github.com/fastfetch-cli/fastfetch" @@ -70,5 +70,5 @@ package() { } sha512sums=" -d599b863259dcfaae77f1f47827814d6ca311a0cbfb2e5dfe38be144a23327db80eb646ee70e41b6872336afdb6e2754e692f393263d31e9901f588311df1059 fastfetch-2.11.5.tar.gz +b9cfe2e333e234490f0143732419f596a42ee6ab80c316b23440adfa1fd5f05f194d4e5d2a9828c926e85f6a89781702d24ed4d0ac1b58c207dfd40c8095cf15 fastfetch-2.13.2.tar.gz " diff --git a/community/faudio/APKBUILD b/community/faudio/APKBUILD index db9bbbe915c..a401b7c333c 100644 --- a/community/faudio/APKBUILD +++ b/community/faudio/APKBUILD @@ -1,7 +1,7 @@ # Contributor: TBK <alpine@jjtc.eu> # Maintainer: TBK <alpine@jjtc.eu> pkgname=faudio -pkgver=24.04 +pkgver=24.05 pkgrel=0 pkgdesc="Accuracy-focused XAudio reimplementation for open platforms" url="https://fna-xna.github.io/" @@ -32,5 +32,5 @@ package() { } sha512sums=" -6eec9274dffa0a03d072cf3f0a62dd1788474cfcfcb78036807a1196bba88bfd31969d637ce3577387ef411035352235d94c865c696268b0d7bfa0bd27221651 faudio-24.04.tar.gz +7c81d767c301e169213b1f8c8f5fb3e5807076013d2da6b81f42df848029f73d402ff3e2479e181f2dd46a58edb1f42ef63caacb8137f67657e68ca12ab04e6d faudio-24.05.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/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/ffcall/APKBUILD b/community/ffcall/APKBUILD index 8c01ca5b396..f45f05759da 100644 --- a/community/ffcall/APKBUILD +++ b/community/ffcall/APKBUILD @@ -5,7 +5,7 @@ pkgver=2.4 pkgrel=2 pkgdesc="C library for implementing foreign function calls in embedded interpreters" url="https://www.gnu.org/software/libffcall" -arch="all" +arch="all !loongarch64 !riscv64" license="GPL-2.0-or-later" makedepends="$depends_dev" subpackages="$pkgname-doc" diff --git a/community/ffmpeg/APKBUILD b/community/ffmpeg/APKBUILD index ec4418f9d0b..e07ef654559 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=8 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="https://ffmpeg.org/" arch="all" @@ -77,6 +77,8 @@ source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz add-av_stream_get_first_dts-for-chromium.patch v4l-ioctl.patch riscv-compliant-rvv.patch + FFmpeg-devel-v2-1-2-lavc-vaapi_decode-Make-it-possible-to-send-multiple-slice-params-buffers.patch + FFmpeg-devel-v2-2-2-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch " options="!check" # tests/data/hls-lists.append.m3u8 fails @@ -361,4 +363,6 @@ fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f 2804a3317a9c5fbc793af1dc7b9c13113bf8fd232f14a580ad98f25d848edf93015fd08c0aad0316e3a5439aef88ef15be3520dcbfe844791a5f03490a4c7f0b add-av_stream_get_first_dts-for-chromium.patch c73d751e5d2a8214f0beb1b48fac6829903d46ad7db0dddddf47013193efce487825de495a24408d9a8e3c7f78f15fe62a6c14b54efc80e63dde9903cf08e918 v4l-ioctl.patch f3d824511a880bf6971f35271c8f8e7001053a93be212a732b49738e990d3d4ac99a302f28002f588e2cb5a2c01d22db159c1990853f3a201bca56a32ba6924e riscv-compliant-rvv.patch +d536f253f97b3c406c31f1eb7016194180f581968c4c0cb0135d199df20850784e38428e2c87da923179723278624da351343d1e1015363d2554cc15d5fa6401 FFmpeg-devel-v2-1-2-lavc-vaapi_decode-Make-it-possible-to-send-multiple-slice-params-buffers.patch +3750d6c00bf0114161fbf373c7dac8c5ad56022820d0b32f3e077b61f8b334b6732a42141df853ac4d7dcc5b18113cb1538c3b99ccbaab30facd9c835fb4bf4e FFmpeg-devel-v2-2-2-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch " diff --git a/community/ffmpeg/FFmpeg-devel-v2-1-2-lavc-vaapi_decode-Make-it-possible-to-send-multiple-slice-params-buffers.patch b/community/ffmpeg/FFmpeg-devel-v2-1-2-lavc-vaapi_decode-Make-it-possible-to-send-multiple-slice-params-buffers.patch new file mode 100644 index 00000000000..f801f2dd6fe --- /dev/null +++ b/community/ffmpeg/FFmpeg-devel-v2-1-2-lavc-vaapi_decode-Make-it-possible-to-send-multiple-slice-params-buffers.patch @@ -0,0 +1,305 @@ +From patchwork Wed May 8 07:11:11 2024 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: David Rosca <nowrep@gmail.com> +X-Patchwork-Id: 48663 +Delivered-To: ffmpegpatchwork2@gmail.com +Received: by 2002:a05:6a20:9c8f:b0:1af:cdee:28c5 with SMTP id mj15csp25621pzb; + Wed, 8 May 2024 00:13:15 -0700 (PDT) +X-Forwarded-Encrypted: i=2; + AJvYcCWCijb8ZSk/y8BcczxdaxTNBz7xLlmGjenN9PJh0RzaUJGrdvM2Z+GAPh5e5kTeJCYeN8HiQuAyRm6Zzig7PSUIzb8PhAA2sq2Yzw== +X-Google-Smtp-Source: + AGHT+IHdqdMZBAjvbqLRYHa7Md6t9fwRSoJZl7CE/0w7QXsoqw/TDzXZ6Mpbl7AURm+q/U0l6qor +X-Received: by 2002:a50:8713:0:b0:572:689f:6380 with SMTP id + 4fb4d7f45d1cf-5731d9a29d8mr1644806a12.3.1715152394950; + Wed, 08 May 2024 00:13:14 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1715152394; cv=none; + d=google.com; s=arc-20160816; + b=B6jZA/nq8Ym26kz7+ZsenrfiE6wW++e7SnAGUHwNm/gWod3Yl4PNnHvyeR8S5Zmw9O + 3V09Yv3C5LTean+x2RVayPx0AGzKudIRJyy5IM8OhUNm2W7gc1dSif9DZDSaAXZB+TU/ + ZDXUltX0Mb5q2WOCZvHtP97HInDnGH2/v+H17UVTJrGq3BCsV6G2RfHLMkyA1Bw2Kbvb + JDY0R7esCGVoOeTw60KvlRCJZ4nl8rusR1F0ejIiy2T1+peYjxyBVTlcJSRp9qUKq2vx + qi3YZo7KEJ4GvpWU6gaW+OR2j5IYi9hmTa6I2MBAC9MSaoPTY02I/45L5g8oHpwZSYhs + voxw== +ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; + s=arc-20160816; + h=sender:errors-to:content-transfer-encoding:cc:reply-to + :list-subscribe:list-help:list-post:list-archive:list-unsubscribe + :list-id:precedence:subject:mime-version:message-id:date:to:from + :dkim-signature:delivered-to; + bh=QyukGgEk1XAr25k9qbILTx4kdg6yKzLRJ3F+p3y8b8E=; + fh=mbb85L8FZ404unHdLI+iF4ZFmTMGr6nZHIcfO/oKEvw=; + b=0c8ndpLDPBOwZFnv/cS4Jq7WKrDe+E5pfeQvSMzpmBQnyQCuM4A1kVjtLtnmezYmBb + FwKv+qTrH+qYcoDuDOhMc9q3xAU2PES61rIZZ6wCOxObyaI3I08j4Y717BOHqa6horAH + yWxZwZ/AZVa3WjmYDVCGnYi1BVn2y7fDmeAP9Cm2eGBI96bqRZDFgI+ADa7grssNAyUP + jY8IDHQXDbtIPR7YtOhvJQt9dkZrTuyGyz5hpeUbvxNvFj8uYJo2KOLsvbCBF7IVxj5+ + UxfiIJCu4qGBbz9nYGID0GXtK1+fJfRIk15S62z0pDULbeUHylcXJcXb3eMgWp9KtdnG + 8+ug==; + dara=google.com +ARC-Authentication-Results: i=1; mx.google.com; + dkim=neutral (body hash did not verify) header.i=@gmail.com + header.s=20230601 header.b=O+XtIIZD; + spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org + designates 79.124.17.100 as permitted sender) + smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; + dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com +Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> +Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) + by mx.google.com with ESMTP id + w18-20020a056402269200b00571b9f2bd09si7128266edd.34.2024.05.08.00.13.14; + Wed, 08 May 2024 00:13:14 -0700 (PDT) +Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org + designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; +Authentication-Results: mx.google.com; + dkim=neutral (body hash did not verify) header.i=@gmail.com + header.s=20230601 header.b=O+XtIIZD; + spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org + designates 79.124.17.100 as permitted sender) + smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; + dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com +Received: from [127.0.1.1] (localhost [127.0.0.1]) + by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED92D68D4CA; + Wed, 8 May 2024 10:13:10 +0300 (EEST) +X-Original-To: ffmpeg-devel@ffmpeg.org +Delivered-To: ffmpeg-devel@ffmpeg.org +Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com + [209.85.167.44]) + by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F82168D48B + for <ffmpeg-devel@ffmpeg.org>; Wed, 8 May 2024 10:13:04 +0300 (EEST) +Received: by mail-lf1-f44.google.com with SMTP id + 2adb3069b0e04-51fea3031c3so5148511e87.0 + for <ffmpeg-devel@ffmpeg.org>; Wed, 08 May 2024 00:13:04 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=20230601; t=1715152383; x=1715757183; darn=ffmpeg.org; + h=content-transfer-encoding:mime-version:message-id:date:subject:cc + :to:from:from:to:cc:subject:date:message-id:reply-to; + bh=ffXg2XQu2Z246T8u+pR5mw8scM+kCnRnc2DEIwGVp5Y=; + b=O+XtIIZD3mEw83APJDrBeFsRuzwVt3Kyyg3FuAhCXFxtdsjvkBCUAr7QxcnMv6WelI + 9waHWdeZ3Gr3gKWpesLlrvATXFJ0NXsZu78H9ddX0YWj/zrCU3bafwiQw8YqmuSxvQku + tt2FxjepsnsddQ4Rd9xQQbixME7L88FlPIc5cUbSLO6kWAHWg4yrZ83OgHyoX3y+9tRE + cAZq2q+ieBkSd58/Fi/bIad1FrvE2rHNjD2eC0z84uNjH46OiynFFdJZMBvwEoydjAYs + FPch8HkUBtEcMFbY772efPUD1fUua4ZoJYkMJsU9wweRXf6fzWVs144L8UzMXffVJF7V + /CuA== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20230601; t=1715152383; x=1715757183; + h=content-transfer-encoding:mime-version:message-id:date:subject:cc + :to:from:x-gm-message-state:from:to:cc:subject:date:message-id + :reply-to; + bh=ffXg2XQu2Z246T8u+pR5mw8scM+kCnRnc2DEIwGVp5Y=; + b=WORFsv2dMz6yM+ahOJTkfqEjGb37TOSJqIw2Nl55aCSFQOKvma/C8aKz4A1UlIeD6Y + 2QYcGwrGFxynBdkMT9+Sl1fZyhOdcYpYQwFMFtCvLJxUFlDWujzhk4lVjO/XSqJJMV1E + rnMWVOlrkIuwmPnpa6yK8c+10Sq3stzeeOL2+oFcYVWZE6kQhEdEvFyCGAsdhNH0gDlm + LwdTocOaNoI42/FrGVexOMgdRBEpfkrvPJILJR3AFDCwCJD0nFFx5lOh+soX09XC8l7Q + RzaoeGq8qE2OR7TZKOBJiAXKPLFdAUm9Y1DNmS2jW5U3ndmVH/K7C3GbPfOGbICYcle6 + bpHg== +X-Gm-Message-State: AOJu0YxS6mZKvl8CFJt92+Sq4Bu0Q1qCEj4mRz+D6PCG+tLwamYoFb78 + 7SVtiAxsN4Dvyx9PVifcgIXTj1m0AYmwl2tkchF4F+m3SH+lQHxh6Q6bpA== +X-Received: by 2002:ac2:4a71:0:b0:519:e878:9385 with SMTP id + 2adb3069b0e04-5217c5671a9mr1284790e87.18.1715152382619; + Wed, 08 May 2024 00:13:02 -0700 (PDT) +Received: from mitsuki.. (ip-78-45-35-87.bb.vodafone.cz. [78.45.35.87]) + by smtp.gmail.com with ESMTPSA id + t16-20020a170906609000b00a59d7505366sm2872828ejj.62.2024.05.08.00.13.02 + (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); + Wed, 08 May 2024 00:13:02 -0700 (PDT) +From: David Rosca <nowrep@gmail.com> +To: ffmpeg-devel@ffmpeg.org +Date: Wed, 8 May 2024 09:11:11 +0200 +Message-ID: <20240508071247.133615-2-nowrep@gmail.com> +X-Mailer: git-send-email 2.45.0 +MIME-Version: 1.0 +Subject: [FFmpeg-devel] [PATCH v2 1/2] lavc/vaapi_decode: Make it possible + to send multiple slice params buffers +X-BeenThere: ffmpeg-devel@ffmpeg.org +X-Mailman-Version: 2.1.29 +Precedence: list +List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> +List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, + <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> +List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> +List-Post: <mailto:ffmpeg-devel@ffmpeg.org> +List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> +List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, + <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> +Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> +Cc: David Rosca <nowrep@gmail.com> +Errors-To: ffmpeg-devel-bounces@ffmpeg.org +Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> +X-TUID: CXdjf/rnNjyo + +--- +v2: No changes + + libavcodec/vaapi_av1.c | 2 +- + libavcodec/vaapi_decode.c | 3 ++- + libavcodec/vaapi_decode.h | 1 + + libavcodec/vaapi_h264.c | 2 +- + libavcodec/vaapi_hevc.c | 4 ++-- + libavcodec/vaapi_mjpeg.c | 2 +- + libavcodec/vaapi_mpeg2.c | 2 +- + libavcodec/vaapi_mpeg4.c | 2 +- + libavcodec/vaapi_vc1.c | 2 +- + libavcodec/vaapi_vp8.c | 2 +- + libavcodec/vaapi_vp9.c | 2 +- + 11 files changed, 13 insertions(+), 11 deletions(-) + +diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c +index 1f563483b9..4a90db1e09 100644 +--- a/libavcodec/vaapi_av1.c ++++ b/libavcodec/vaapi_av1.c +@@ -409,7 +409,7 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx, + .tg_end = s->tg_end, + }; + +- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param, ++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param, 1, + sizeof(VASliceParameterBufferAV1), + buffer, + size); +diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c +index 21b273cd0f..8e9f647c20 100644 +--- a/libavcodec/vaapi_decode.c ++++ b/libavcodec/vaapi_decode.c +@@ -63,6 +63,7 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx, + int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx, + VAAPIDecodePicture *pic, + const void *params_data, ++ int nb_params, + size_t params_size, + const void *slice_data, + size_t slice_size) +@@ -88,7 +89,7 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx, + + vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context, + VASliceParameterBufferType, +- params_size, 1, (void*)params_data, ++ params_size, nb_params, (void*)params_data, + &pic->slice_buffers[index]); + if (vas != VA_STATUS_SUCCESS) { + av_log(avctx, AV_LOG_ERROR, "Failed to create slice " +diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h +index 6beda14e52..702171e108 100644 +--- a/libavcodec/vaapi_decode.h ++++ b/libavcodec/vaapi_decode.h +@@ -73,6 +73,7 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx, + int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx, + VAAPIDecodePicture *pic, + const void *params_data, ++ int nb_params, + size_t params_size, + const void *slice_data, + size_t slice_size); +diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c +index 55cf5a05ee..b47531ce1c 100644 +--- a/libavcodec/vaapi_h264.c ++++ b/libavcodec/vaapi_h264.c +@@ -375,7 +375,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, + slice_param.chroma_offset_l1); + + err = ff_vaapi_decode_make_slice_buffer(avctx, pic, +- &slice_param, sizeof(slice_param), ++ &slice_param, 1, sizeof(slice_param), + buffer, size); + if (err) { + ff_vaapi_decode_cancel(avctx, pic); +diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c +index 3bdd2dd1b8..3937b7574a 100644 +--- a/libavcodec/vaapi_hevc.c ++++ b/libavcodec/vaapi_hevc.c +@@ -353,7 +353,7 @@ static int vaapi_hevc_end_frame(AVCodecContext *avctx) + if (pic->last_size) { + last_slice_param->LongSliceFlags.fields.LastSliceOfPic = 1; + ret = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic, +- &pic->last_slice_param, slice_param_size, ++ &pic->last_slice_param, 1, slice_param_size, + pic->last_buffer, pic->last_size); + if (ret < 0) + goto fail; +@@ -471,7 +471,7 @@ static int vaapi_hevc_decode_slice(AVCodecContext *avctx, + + if (!sh->first_slice_in_pic_flag) { + err = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic, +- &pic->last_slice_param, slice_param_size, ++ &pic->last_slice_param, 1, slice_param_size, + pic->last_buffer, pic->last_size); + pic->last_buffer = NULL; + pic->last_size = 0; +diff --git a/libavcodec/vaapi_mjpeg.c b/libavcodec/vaapi_mjpeg.c +index 5b8d47bb2a..9557cf5f9b 100644 +--- a/libavcodec/vaapi_mjpeg.c ++++ b/libavcodec/vaapi_mjpeg.c +@@ -131,7 +131,7 @@ static int vaapi_mjpeg_decode_slice(AVCodecContext *avctx, + sp.components[i].ac_table_selector = s->ac_index[i]; + } + +- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, sizeof(sp), buffer, size); ++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, 1, sizeof(sp), buffer, size); + if (err) + goto fail; + +diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c +index eeb4e87321..171a742c7f 100644 +--- a/libavcodec/vaapi_mpeg2.c ++++ b/libavcodec/vaapi_mpeg2.c +@@ -162,7 +162,7 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer + }; + + err = ff_vaapi_decode_make_slice_buffer(avctx, pic, +- &slice_param, sizeof(slice_param), ++ &slice_param, 1, sizeof(slice_param), + buffer, size); + if (err < 0) { + ff_vaapi_decode_cancel(avctx, pic); +diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c +index 363b686e42..612de10cd7 100644 +--- a/libavcodec/vaapi_mpeg4.c ++++ b/libavcodec/vaapi_mpeg4.c +@@ -169,7 +169,7 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer + }; + + err = ff_vaapi_decode_make_slice_buffer(avctx, pic, +- &slice_param, sizeof(slice_param), ++ &slice_param, 1, sizeof(slice_param), + buffer, size); + if (err < 0) { + ff_vaapi_decode_cancel(avctx, pic); +diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c +index 5594118a69..abbe877dd8 100644 +--- a/libavcodec/vaapi_vc1.c ++++ b/libavcodec/vaapi_vc1.c +@@ -490,7 +490,7 @@ static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, + }; + + err = ff_vaapi_decode_make_slice_buffer(avctx, pic, +- &slice_param, sizeof(slice_param), ++ &slice_param, 1, sizeof(slice_param), + buffer, size); + if (err < 0) { + ff_vaapi_decode_cancel(avctx, pic); +diff --git a/libavcodec/vaapi_vp8.c b/libavcodec/vaapi_vp8.c +index 31137a45bd..66fdde1f39 100644 +--- a/libavcodec/vaapi_vp8.c ++++ b/libavcodec/vaapi_vp8.c +@@ -209,7 +209,7 @@ static int vaapi_vp8_decode_slice(AVCodecContext *avctx, + for (i = 0; i < 8; i++) + sp.partition_size[i+1] = s->coeff_partition_size[i]; + +- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, sizeof(sp), data, data_size); ++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, 1, sizeof(sp), data, data_size); + if (err) + goto fail; + +diff --git a/libavcodec/vaapi_vp9.c b/libavcodec/vaapi_vp9.c +index b8e760c807..a28fc75a59 100644 +--- a/libavcodec/vaapi_vp9.c ++++ b/libavcodec/vaapi_vp9.c +@@ -158,7 +158,7 @@ static int vaapi_vp9_decode_slice(AVCodecContext *avctx, + } + + err = ff_vaapi_decode_make_slice_buffer(avctx, pic, +- &slice_param, sizeof(slice_param), ++ &slice_param, 1, sizeof(slice_param), + buffer, size); + if (err) { + ff_vaapi_decode_cancel(avctx, pic); diff --git a/community/ffmpeg/FFmpeg-devel-v2-2-2-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch b/community/ffmpeg/FFmpeg-devel-v2-2-2-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch new file mode 100644 index 00000000000..11beb87910c --- /dev/null +++ b/community/ffmpeg/FFmpeg-devel-v2-2-2-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-multiple-times.patch @@ -0,0 +1,233 @@ +From patchwork Wed May 8 07:11:13 2024 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: David Rosca <nowrep@gmail.com> +X-Patchwork-Id: 48664 +Delivered-To: ffmpegpatchwork2@gmail.com +Received: by 2002:a05:6a20:9c8f:b0:1af:cdee:28c5 with SMTP id mj15csp25694pzb; + Wed, 8 May 2024 00:13:24 -0700 (PDT) +X-Forwarded-Encrypted: i=2; + AJvYcCUU0WAejd+vI8Md/fk24xz5o+Vf/o8BRW6HaRPRrGxjq6S//PLkmyUZRPzd+gHeFBzdlMsfYeq9DopcaKEGU11Y8gnU172C7IbtRw== +X-Google-Smtp-Source: + AGHT+IG3oXW6Btb0nOsLsgP/8AeKUJDwzM/PSxrC5jUdm6vhgOZQDuI+wXt7iXGX4rN6ViSYQ3D/ +X-Received: by 2002:a17:906:6b9a:b0:a59:bae0:b12f with SMTP id + a640c23a62f3a-a59fb9ce9d9mr94975366b.57.1715152404530; + Wed, 08 May 2024 00:13:24 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1715152404; cv=none; + d=google.com; s=arc-20160816; + b=TyPiCxBIX4CkQJzb/tN61GGUtaed+8YXJp0fMtMCWRLhJtQcyPEGQfgMMxf8ud7SjV + XasOofP00bXz6aA/3IDgRNOOR8W9kwSTI6uLYm67idB/vFjKHziHELvkE8reWyYGGUnm + 3Wac/MdE30bLkfj5e5xLKTuAjS+tfDiqPQoY+x0bVErkuGZ5kvsVFBY36zForQQI6gI6 + 7KRKgu69eooP/7GjdfgBJDpRoV5cOimWHTnOrFicoplIhvkiGya3wLg8ewhvYd0FvEPl + mV9jr2J4EkZvwXU6mU0H4kfz3XnZ5lm3VcvN1/7IyVvb2vbUar5H/YpFy/Egakk6kZDq + E2WA== +ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; + s=arc-20160816; + h=sender:errors-to:content-transfer-encoding:cc:reply-to + :list-subscribe:list-help:list-post:list-archive:list-unsubscribe + :list-id:precedence:subject:mime-version:references:in-reply-to + :message-id:date:to:from:dkim-signature:delivered-to; + bh=lG1MGLor19Gww/xCmlAJWXZbhpue6ooFmY8SVpcxzoo=; + fh=mbb85L8FZ404unHdLI+iF4ZFmTMGr6nZHIcfO/oKEvw=; + b=Gf3+xGKpwkxLAdDWLnNlyqQItLga7dBAeke4JLFO0nfgfO9y88/lSZaHMQrNLrFA22 + vJ95hHGS2oaiaJcDbE1P6tmZrp0qjDqKSW02GplFORvI92l80hmqZfUjnZ7Ck72ZMj8e + 3xPxoevI40uz1A0v7kgYvTpMvHezDaOOn3/p6/lEDhWNieas1xoZv8/EUvXGVMyyslOJ + BjLbxoV90InDYTDuDSJyFBl91A/gqOWEATTQJk/mABJhXpbljeejfWyg7jaWnbViIoUD + eIDt7wsyJYmNQkCISpWuISkqBrWXlKxkQvB6MihxwIdtPcYmQ6ra6rKNRI924EX2VAEK + yXVA==; + dara=google.com +ARC-Authentication-Results: i=1; mx.google.com; + dkim=neutral (body hash did not verify) header.i=@gmail.com + header.s=20230601 header.b=OypvhYGi; + spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org + designates 79.124.17.100 as permitted sender) + smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; + dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com +Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> +Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) + by mx.google.com with ESMTP id + b27-20020a170906151b00b00a59befed255si3984295ejd.576.2024.05.08.00.13.24; + Wed, 08 May 2024 00:13:24 -0700 (PDT) +Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org + designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; +Authentication-Results: mx.google.com; + dkim=neutral (body hash did not verify) header.i=@gmail.com + header.s=20230601 header.b=OypvhYGi; + spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org + designates 79.124.17.100 as permitted sender) + smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; + dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com +Received: from [127.0.1.1] (localhost [127.0.0.1]) + by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6258868D5D8; + Wed, 8 May 2024 10:13:16 +0300 (EEST) +X-Original-To: ffmpeg-devel@ffmpeg.org +Delivered-To: ffmpeg-devel@ffmpeg.org +Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com + [209.85.218.42]) + by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8ED3B68D5C6 + for <ffmpeg-devel@ffmpeg.org>; Wed, 8 May 2024 10:13:09 +0300 (EEST) +Received: by mail-ej1-f42.google.com with SMTP id + a640c23a62f3a-a59a934ad50so920836666b.1 + for <ffmpeg-devel@ffmpeg.org>; Wed, 08 May 2024 00:13:09 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=20230601; t=1715152388; x=1715757188; darn=ffmpeg.org; + h=content-transfer-encoding:mime-version:references:in-reply-to + :message-id:date:subject:cc:to:from:from:to:cc:subject:date + :message-id:reply-to; + bh=2gr9y0ycJUz7g/8locnNp/xbvm4Xt9bm5oGOJk63n1Q=; + b=OypvhYGiEgVBtlATeDRoSQ8uoRlMpZj4OZFdaLx8eHWuZ+dnUTUL04V8v+psg5iqL9 + A53WZ9lLffgZpj3KrBtoMKXb4wdW7gf4xM5/PKTx5VPQdK6BRLXEKVLSaRzFBWHFu/9b + bkQfxnsTF+tKwKnuxomZEnZKdtxK9GzoMx5uPJnT27LqxU6DGSWe4OY9or5BO4iRGThe + suvUHkZ7K3MRjncUVtPcm2CF8wIXlbDsD2MROp/GnG7UWUwCZlVIwNiyDlfrygvGSqrb + 5hToNlkEs+yKgcH3mQsYQQOOS7zPWj3OZ+3xHufHNmYxXvwlf/l2NVxED2RpgPFHLTIe + mYEQ== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20230601; t=1715152388; x=1715757188; + h=content-transfer-encoding:mime-version:references:in-reply-to + :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc + :subject:date:message-id:reply-to; + bh=2gr9y0ycJUz7g/8locnNp/xbvm4Xt9bm5oGOJk63n1Q=; + b=Bd1s9ViPxXl4TdTBYOfQAT9wrkmI1uBRar/MUyJEIHHv1GVO6yy0mGvKXzK9dA7JRf + ADq8nqUSLuJm7HVqX03X8vNl8lhQzOHeq0lnTNP8OWU3WLn+8vgINDqrg7u2TBhVJChu + fk0aAuG361EckiGCujtlnjWPmUmjaCyWwVqDoPGJQW31L8jqPklOKIEr2Le6Zc7+eX67 + 1tU4u4MMWZqo4UPVdhYopV1em2EVLvq9eu3PdqK9Bx4Q+DwCYyC3KPxZEJm5xt9EAir0 + b4k642TSP4uTtbQCPt/qDI32CsnA+nvz1p5iCJIS3n6WWrKBha+I+Bl1nvtLwQCRCRSP + Ap5A== +X-Gm-Message-State: AOJu0YyCCVm0AjHkgA3h1/7JMutpn1Aexcggxj5vAwjMMJVANDxR5Prh + oeODe3Hr6qmpyzUfxgYYzOINyE0APs4dadLz45mg5zgYptS+BHmNCBegTQ== +X-Received: by 2002:a17:906:80c2:b0:a55:5e89:a158 with SMTP id + a640c23a62f3a-a59fb9e7628mr98238166b.68.1715152388430; + Wed, 08 May 2024 00:13:08 -0700 (PDT) +Received: from mitsuki.. (ip-78-45-35-87.bb.vodafone.cz. [78.45.35.87]) + by smtp.gmail.com with ESMTPSA id + t16-20020a170906609000b00a59d7505366sm2872828ejj.62.2024.05.08.00.13.07 + (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); + Wed, 08 May 2024 00:13:08 -0700 (PDT) +From: David Rosca <nowrep@gmail.com> +To: ffmpeg-devel@ffmpeg.org +Date: Wed, 8 May 2024 09:11:13 +0200 +Message-ID: <20240508071247.133615-4-nowrep@gmail.com> +X-Mailer: git-send-email 2.45.0 +In-Reply-To: <20240508071247.133615-2-nowrep@gmail.com> +References: <20240508071247.133615-2-nowrep@gmail.com> +MIME-Version: 1.0 +Subject: [FFmpeg-devel] [PATCH v2 2/2] lavc/vaapi_av1: Avoid sending the + same slice buffer multiple times +X-BeenThere: ffmpeg-devel@ffmpeg.org +X-Mailman-Version: 2.1.29 +Precedence: list +List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> +List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, + <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> +List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> +List-Post: <mailto:ffmpeg-devel@ffmpeg.org> +List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> +List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, + <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> +Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> +Cc: David Rosca <nowrep@gmail.com> +Errors-To: ffmpeg-devel-bounces@ffmpeg.org +Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> +X-TUID: q0qvq9b+ZBYX + +When there are multiple tiles in one slice buffer, use multiple slice +params to avoid sending the same slice buffer multiple times and thus +increasing the bitstream size the driver will need to upload to hw. +--- +v2: Avoid allocations every slice. + + libavcodec/vaapi_av1.c | 47 +++++++++++++++++++++++++++++------------- + 1 file changed, 33 insertions(+), 14 deletions(-) + +diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c +index 4a90db1e09..4ee33a3ae3 100644 +--- a/libavcodec/vaapi_av1.c ++++ b/libavcodec/vaapi_av1.c +@@ -19,6 +19,7 @@ + */ + + #include "libavutil/frame.h" ++#include "libavutil/mem.h" + #include "hwaccel_internal.h" + #include "vaapi_decode.h" + #include "internal.h" +@@ -42,6 +43,9 @@ typedef struct VAAPIAV1DecContext { + */ + VAAPIAV1FrameRef ref_tab[AV1_NUM_REF_FRAMES]; + AVFrame *tmp_frame; ++ ++ int nb_slice_params; ++ VASliceParameterBufferAV1 *slice_params; + } VAAPIAV1DecContext; + + static VASurfaceID vaapi_av1_surface_id(AV1Frame *vf) +@@ -97,6 +101,8 @@ static int vaapi_av1_decode_uninit(AVCodecContext *avctx) + for (int i = 0; i < FF_ARRAY_ELEMS(ctx->ref_tab); i++) + av_frame_free(&ctx->ref_tab[i].frame); + ++ av_freep(&ctx->slice_params); ++ + return ff_vaapi_decode_uninit(avctx); + } + +@@ -393,13 +399,24 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx, + { + const AV1DecContext *s = avctx->priv_data; + VAAPIDecodePicture *pic = s->cur_frame.hwaccel_picture_private; +- VASliceParameterBufferAV1 slice_param; +- int err = 0; ++ VAAPIAV1DecContext *ctx = avctx->internal->hwaccel_priv_data; ++ int err, nb_params; ++ ++ nb_params = s->tg_end - s->tg_start + 1; ++ if (ctx->nb_slice_params < nb_params) { ++ ctx->slice_params = av_realloc_array(ctx->slice_params, ++ nb_params, ++ sizeof(*ctx->slice_params)); ++ if (!ctx->slice_params) { ++ ctx->nb_slice_params = 0; ++ err = AVERROR(ENOMEM); ++ goto fail; ++ } ++ ctx->nb_slice_params = nb_params; ++ } + + for (int i = s->tg_start; i <= s->tg_end; i++) { +- memset(&slice_param, 0, sizeof(VASliceParameterBufferAV1)); +- +- slice_param = (VASliceParameterBufferAV1) { ++ ctx->slice_params[i - s->tg_start] = (VASliceParameterBufferAV1) { + .slice_data_size = s->tile_group_info[i].tile_size, + .slice_data_offset = s->tile_group_info[i].tile_offset, + .slice_data_flag = VA_SLICE_DATA_FLAG_ALL, +@@ -408,18 +425,20 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx, + .tg_start = s->tg_start, + .tg_end = s->tg_end, + }; +- +- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param, 1, +- sizeof(VASliceParameterBufferAV1), +- buffer, +- size); +- if (err) { +- ff_vaapi_decode_cancel(avctx, pic); +- return err; +- } + } + ++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, ctx->slice_params, nb_params, ++ sizeof(VASliceParameterBufferAV1), ++ buffer, ++ size); ++ if (err) ++ goto fail; ++ + return 0; ++ ++fail: ++ ff_vaapi_decode_cancel(avctx, pic); ++ return err; + } + + const FFHWAccel ff_av1_vaapi_hwaccel = { diff --git a/community/ffmpegthumbs/APKBUILD b/community/ffmpegthumbs/APKBUILD index 9117ad4e5e7..6908bae47dd 100644 --- a/community/ffmpegthumbs/APKBUILD +++ b/community/ffmpegthumbs/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=ffmpegthumbs -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules # not useful on s390x @@ -43,5 +43,5 @@ package() { } sha512sums=" -4032c489c97231ff9a0d68b2a1ae35ed886962e99d12df7781d4f1f6408a6e2f1fdf5e15cce3b639b2e839467265c6ba6a2133b10cd7ae5225682db710bbb1d7 ffmpegthumbs-24.02.2.tar.xz +e6e666dd4caf0c4293f9bd24868aa63154ca06fadb364be9b5d4b6ec3ece2ef47417474ffbcaf94b511d7388a694734a369849e70f79c142d72b9ca3c64e2450 ffmpegthumbs-24.05.0.tar.xz " diff --git a/community/ffuf/APKBUILD b/community/ffuf/APKBUILD index 392f88c3624..dd379d1483a 100644 --- a/community/ffuf/APKBUILD +++ b/community/ffuf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=ffuf pkgver=2.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="fast web fuzzer written in Go" url="https://github.com/ffuf/ffuf" arch="all" diff --git a/community/file-roller/APKBUILD b/community/file-roller/APKBUILD index 169339dbb98..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=44.1 +pkgver=44.2 pkgrel=0 pkgdesc="File Roller is an archive manager for the GNOME desktop " url="https://wiki.gnome.org/Apps/FileRoller" @@ -48,5 +48,5 @@ nautilus() { } sha512sums=" -de0d0ce93ecba822ec495227cd484cb164a81f8b5349033d80207acc19584985f0c88bfa766a46468349e2b16b020371e2e6b73b4fb7f2f18f40f115f2391b30 file-roller-44.1.tar.xz +741ec593a0df9a797fbd99fac5cc959f83bee0c21b0afb1f663a45a831105ab6f0ad23c3ee08380ba6363dca81ccfa1884c3afbc808e16ce475a33af41ab980d file-roller-44.2.tar.xz " diff --git a/community/filelight/APKBUILD b/community/filelight/APKBUILD index 41808f6e030..63ffc0421b9 100644 --- a/community/filelight/APKBUILD +++ b/community/filelight/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=filelight -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -44,5 +44,5 @@ package() { } sha512sums=" -4f845db966bd329484e5bc9a6f935e5672efa730a01577a0a6163b53b96d261f2590283ccb699497ae1d6605b039c1ec632ef2adebba64f361c0dd05b6e619a6 filelight-24.02.2.tar.xz +0d3ef3b0f77562a73f0c86b17c939fdffd9dea33b772f887ae57fd3bb175d3451a688c785c8d544cb38363205c40047180de5fb8b71e1f57daa23bbf66bb8dd4 filelight-24.05.0.tar.xz " diff --git a/community/filezilla/APKBUILD b/community/filezilla/APKBUILD index 9da54c39007..2e326bf50b7 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=1 +pkgver=3.67.0 +pkgrel=0 pkgdesc="FTP Client" url="https://filezilla-project.org/" arch="all" @@ -67,5 +67,5 @@ package() { } sha512sums=" -b250e65894a3e8c8eb0eac25b3ffa5cd1348df2a38b1e6fa5eb735fff1945dbeb1fbcfe10a8188c260e9fbeaeb78322cb8aa56f6386fd39803421d01bbc8b2dd FileZilla_3.66.5_src.tar.xz +b2d4cd45f2ed7e70fbb11500a42fe0d0e51919831a35bcfb439455d03af8eb744eb25d7f7b6ea9a94c424065e4d071d9706fcf46019da829d1318c099ab8108c FileZilla_3.67.0_src.tar.xz " diff --git a/community/firefox-esr/APKBUILD b/community/firefox-esr/APKBUILD index de2f3c68e73..403df6bb6ab 100644 --- a/community/firefox-esr/APKBUILD +++ b/community/firefox-esr/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=firefox-esr -pkgver=115.10.0 +pkgver=115.11.0 # Date of release, YY-MM-DD for metainfo file (see package()) # https://www.mozilla.org/firefox/organizations/notes/ -_releasedate=2024-03-22 +_releasedate=2024-05-14 pkgrel=0 pkgdesc="Firefox web browser - Extended Support Release" url="https://www.mozilla.org/en-US/firefox/organizations/" @@ -831,7 +831,7 @@ intl() { } sha512sums=" -0626e2c68ce43f24dfc2b9216e2565537ad8781daf4195d53420e1b78d57d0f6360fbe56b0ddbedae3818546c72472c85c1ff2b208c123d32a0543e666f42b65 firefox-115.10.0esr.source.tar.xz +0f3a87c99fb008088afd509d9259f893fdd44ea6bf6a5e69806fefb8d355415e81b9e8832a392acb9d0c1c50e4add7f1362a4aaadc35e1d9c2e55baf7136aed8 firefox-115.11.0esr.source.tar.xz 3e0501ae7a650346c667dfdc0ae0ca286084f22e89ab2ac671cc0d7315673dc5b6dcb9f9882f6f39d26e9a31e57f7a0fd53d6b805e520224e22b8976850e2eb8 audio-lfs64.patch 454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch f7b3b45ba04d05d17439d009bf0c9f27881e126f424e2257552338a0c1e3771ee1289c044babcb0920f62af62873a268c0cf524e1d35711e6dc8b808ca5e9f26 esr-metainfo.patch diff --git a/community/firefox/APKBUILD b/community/firefox/APKBUILD index 9399301cb2d..6058391f376 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.3 -_releasedate=2024-04-29 +pkgver=126.0 +_releasedate=2024-05-14 pkgrel=0 pkgdesc="Firefox web browser" url="https://www.firefox.com/" @@ -752,7 +752,7 @@ intl() { } sha512sums=" -18e705a3093290311ccb5f27f01e43fe243ece94c1769a9ccc4fa53d370e32a1ec6a107cdeb531e9468b9aca1a1fe668161adb7acc1ec65fd383837882c7d484 firefox-125.0.3.tar.xz +56025b051d544ca294911a1d6a66f09945f71012131881b64313dafb579730810a4b091950c90a21d4fd3f393ba23670d8409086e1677d80d0bbbe347c303527 firefox-126.0.tar.xz eb49b791280a8d765e6b056816ad6d7ec20a3b13723ebe648a8ecd2c086a5bc83277a3b4c127a470e7bb7105cfa4ed7611c19ac683545140190cafaa880ad515 disable-moz-stackwalk.patch 19eea840aa9c1c21e7bd1f832ec078989fe6f08fca40baa271be7e74f1cffeb5ab8d3218a93e664b8d90a41506dede524e2a5174cd47580866109bc6711ea969 fix-fortify-system-wrappers.patch cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch diff --git a/testing/flameshot/APKBUILD b/community/flameshot/APKBUILD index ed84e55378d..c45eb877b77 100644 --- a/testing/flameshot/APKBUILD +++ b/community/flameshot/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> -# Maintainer: +# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=flameshot pkgver=12.1.0 pkgrel=3 diff --git a/community/flarectl/APKBUILD b/community/flarectl/APKBUILD index 289c28c4c99..c1f27dc84da 100644 --- a/community/flarectl/APKBUILD +++ b/community/flarectl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=flarectl pkgver=0.92.0 -pkgrel=1 +pkgrel=2 pkgdesc="CLI application for interacting with a Cloudflare account" url="https://github.com/cloudflare/cloudflare-go/tree/master/cmd/flarectl" arch="all" diff --git a/community/flatbuffers/APKBUILD b/community/flatbuffers/APKBUILD index 20470491b72..3cfb292bba4 100644 --- a/community/flatbuffers/APKBUILD +++ b/community/flatbuffers/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=flatbuffers -pkgver=23.5.26 -pkgrel=1 +pkgver=24.3.25 +pkgrel=0 pkgdesc="Memory Efficient Serialization Library" -url="https://google.github.io/flatbuffers/" +url="https://flatbuffers.dev/" # armhf: blocked by bus error in tests # s390x: segfaults in tests # x86: fails trivial tests @@ -21,6 +21,7 @@ makedepends=" subpackages="$pkgname-dev flatc py3-$pkgname-pyc py3-$pkgname:py3" source="flatbuffers-$pkgver.tar.gz::https://github.com/google/flatbuffers/archive/v$pkgver.tar.gz locale-headers.patch + gettemporarypointer-constantness.patch " # Bus error in armv7 as well but it has downstream users @@ -70,6 +71,7 @@ py3() { } sha512sums=" -cd0a5efad8016e1217d01a181d6b02e546f5693c6412361bfeaee820d5dfe5e2a424cee1963270e851c1a4f936ae8a0032a51c5bb16ee19313e0ecc77dc4ba31 flatbuffers-23.5.26.tar.gz +e2a614f4fc526ce07bfe1e1bc79efd3c87acbdb93aee7b42994d4855abd2593f36b5ca1edb53c7dcd470d5fbe14a3e394bd75dcebb4458cc0aeb33d622a3c662 flatbuffers-24.3.25.tar.gz a5460ec027f2884f5801e01d3ef7f831be3ecd92fc9586ab33764467e3de79855f87c4b639806ad6884ec8eac41d6d6f6204644c84ddbcea9fba3798943b1e57 locale-headers.patch +6916dd0bd859a8218298d7caeda75e8874f0df9d2160e28451f4e2854d229757f503b6b3e0d541ac3b479a19ecc4af8a4dd6a90af09387d257e066c126a51f24 gettemporarypointer-constantness.patch " diff --git a/community/flatbuffers/gettemporarypointer-constantness.patch b/community/flatbuffers/gettemporarypointer-constantness.patch new file mode 100644 index 00000000000..bf7a636f322 --- /dev/null +++ b/community/flatbuffers/gettemporarypointer-constantness.patch @@ -0,0 +1,60 @@ +From e6463926479bd6b330cbcf673f7e917803fd5831 Mon Sep 17 00:00:00 2001 +From: Derek Bailey <derekbailey@google.com> +Date: Wed, 17 Apr 2024 16:06:26 +0000 +Subject: [PATCH] `flatbuffer_builder`: Fix GetTemporaryPointer constantness + +--- + include/flatbuffers/flatbuffer_builder.h | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/include/flatbuffers/flatbuffer_builder.h b/include/flatbuffers/flatbuffer_builder.h +index 9a2d62541bd..9ceca8207b6 100644 +--- a/include/flatbuffers/flatbuffer_builder.h ++++ b/include/flatbuffers/flatbuffer_builder.h +@@ -47,7 +47,8 @@ inline voffset_t FieldIndexToOffset(voffset_t field_id) { + 2 * sizeof(voffset_t); // Vtable size and Object Size. + size_t offset = fixed_fields + field_id * sizeof(voffset_t); + FLATBUFFERS_ASSERT(offset < std::numeric_limits<voffset_t>::max()); +- return static_cast<voffset_t>(offset);} ++ return static_cast<voffset_t>(offset); ++} + + template<typename T, typename Alloc = std::allocator<T>> + const T *data(const std::vector<T, Alloc> &v) { +@@ -241,7 +242,7 @@ template<bool Is64Aware = false> class FlatBufferBuilderImpl { + /// called. + uint8_t *ReleaseRaw(size_t &size, size_t &offset) { + Finished(); +- uint8_t* raw = buf_.release_raw(size, offset); ++ uint8_t *raw = buf_.release_raw(size, offset); + Clear(); + return raw; + } +@@ -561,7 +562,7 @@ template<bool Is64Aware = false> class FlatBufferBuilderImpl { + return CreateString<OffsetT>(str.c_str(), str.length()); + } + +-// clang-format off ++ // clang-format off + #ifdef FLATBUFFERS_HAS_STRING_VIEW + /// @brief Store a string in the buffer, which can contain any binary data. + /// @param[in] str A const string_view to copy in to the buffer. +@@ -743,7 +744,7 @@ template<bool Is64Aware = false> class FlatBufferBuilderImpl { + AssertScalarT<T>(); + StartVector<T, OffsetT, LenT>(len); + if (len > 0) { +-// clang-format off ++ // clang-format off + #if FLATBUFFERS_LITTLEENDIAN + PushBytes(reinterpret_cast<const uint8_t *>(v), len * sizeof(T)); + #else +@@ -1470,7 +1471,8 @@ T *GetMutableTemporaryPointer(FlatBufferBuilder &fbb, Offset<T> offset) { + + template<typename T> + const T *GetTemporaryPointer(const FlatBufferBuilder &fbb, Offset<T> offset) { +- return GetMutableTemporaryPointer<T>(fbb, offset); ++ return reinterpret_cast<const T *>(fbb.GetCurrentBufferPointer() + ++ fbb.GetSize() - offset.o); + } + + } // namespace flatbuffers diff --git a/community/flatpak-kcm/APKBUILD b/community/flatpak-kcm/APKBUILD index fdcfb07d5cc..34fa2daa877 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Flatpak Permissions Management KCM" # armhf blocked by qt6-qtdeclarative @@ -55,5 +55,5 @@ package() { } sha512sums=" -d07e9bf459d455079f1fd6aa71f095e5f153a828133fd09e2903b050382501f1a2df71501c0b2639e2182649e2fe552b9aadd240cceddd27f6a4d840cf1b1472 flatpak-kcm-6.0.4.tar.xz +8b446d5a73598299298c1b70e871d6d388504bbe08eca6f1a7924d0ab04c2800e8afdd19185e15211f9c680241350e7f47c7be9d8f61a623d056b91f0e72ec03 flatpak-kcm-6.0.5.tar.xz " diff --git a/community/flatpak/APKBUILD b/community/flatpak/APKBUILD index 6c32bf0eb2e..4052db37325 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.6 -pkgrel=1 +pkgver=1.14.8 +pkgrel=0 pkgdesc="Application deployment framework for desktop apps" url="https://flatpak.org/" arch="all" @@ -133,8 +133,8 @@ gdm() { } sha512sums=" -d858682dbf539afe1b91087b6a0e0ebeea6658a0ef02c96d68259f3d8c58d1e6d02dd8b69db1b3c55f6d5df0f4d7e41c6165f668f09763dd3f9c3beb48f8bcf5 flatpak-1.14.6.tar.xz +a34d539f4ed0682459a22afa282de36da964a3545abd78138d3d86d9464d67cb57479f93bf84d1a9d811b80e72e0ea11f64293cb09a559fd5ec2c957be1729a1 flatpak-1.14.8.tar.xz 57d23d2778556eafc3035e6be575bf95b4032f123b35f2b1657eff5e7496de253173edc657f90531ee58e25673f4f27a5cd1cc76b14a038edb244f104a231771 modules-load.conf 665dc6003360ea65ce391fe2283344d47c1dafc8f860a5ba410641c7ef54d0c68a63c41963843aeb0364b95df567a83cb80007db282bd284a0744aacced8f1d3 fusermount3.patch -4317f1ade5999c5a4e1392b074c32dae07858f79a2769fd7f207182cb514b446fc33b480676d9e8eeaf7f26461e340342a8a17494cfdc63f156c38b58852daf4 tzdir.patch +e3456a7d943e89249eeba2227a25f4cf984a9d8bc3e2b614fe1290d23a3a693dc2d203f65dd240fcb3ead92f11696f7b02aa65d174559e71aff656eff0e04a9c tzdir.patch " diff --git a/community/flatpak/tzdir.patch b/community/flatpak/tzdir.patch index 3690067a0d3..8d8128b1c48 100644 --- a/community/flatpak/tzdir.patch +++ b/community/flatpak/tzdir.patch @@ -28,10 +28,10 @@ diff --git a/profile/flatpak.sh b/profile/flatpak.sh index 9dc6cf9..1feaddd 100644 --- a/profile/flatpak.sh +++ b/profile/flatpak.sh -@@ -23,4 +23,18 @@ if command -v flatpak > /dev/null; then - - export XDG_DATA_DIRS +@@ -25,4 +25,18 @@ if command -v flatpak > /dev/null; then XDG_DATA_DIRS="${new_dirs:+${new_dirs}:}${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" + + unset new_dirs + + # set TZDIR to our setup-timezone directory + # see https://gitlab.alpinelinux.org/alpine/aports/-/issues/14844 diff --git a/community/font-iosevka/APKBUILD b/community/font-iosevka/APKBUILD index a8d3ef3c595..8b2da587080 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=30.0.0 +pkgver=30.1.1 pkgrel=0 pkgdesc="Versatile typeface for code, from code" url="https://typeof.net/Iosevka/" @@ -72,10 +72,10 @@ curly_slab() { } sha512sums=" -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 +60098f67312237c9901af4697afe99e9645bba1747cc0a27fcb4eb5e835b8ba38f20bef9c824d114947c63750fa189cb0f9466fc6827b2799107e6ad3eacaed6 PkgTTC-Iosevka-30.1.1.zip +c4ef17a8b95849f3a77c763bd8610ee7ad82204ab5493ee40ebb0afbffdc7bd8330ec41bb30c3bfb2f64ae9c410d13235609a1890f6688ae75e1a2eed61895e5 PkgTTC-IosevkaAile-30.1.1.zip +fe7421ef29234ec84c5d746d7f7e9a5ae6b08a0ad3b81e7c4250deaae8007434a6905c7b5fc58a511c9ee955ece8b212399417505d0af05f34cb05fb03652cc3 PkgTTC-IosevkaEtoile-30.1.1.zip +40ff2557a5cd30e824b53dfdac562e3ffeec6abea918943cd3e0c8af08fdf79e5a51cc188b24cea5b618c7054420ddb46de0cd4200e79ba33a61fddf0d627aef PkgTTC-IosevkaSlab-30.1.1.zip +874ddd82aaf3227790c4bfcb791554b45fcf9afe1d47692d6f293fad261ee30552ef6cd8a2293ebf6e958cec22e9272b086b5638bc3207520411f0a25816201a PkgTTC-SGr-IosevkaCurly-30.1.1.zip +7c92a57c0f420d207858e5a6b0a06d57722567c3b0d70d2bca1689abbc38462a16aa2b8ecace491af35151ac7429d03abd57fbdcd09e179428e461b9c213e888 PkgTTC-SGr-IosevkaCurlySlab-30.1.1.zip " diff --git a/community/fossil/APKBUILD b/community/fossil/APKBUILD index 4fe57654e1e..ae4d6c4ef0a 100644 --- a/community/fossil/APKBUILD +++ b/community/fossil/APKBUILD @@ -3,13 +3,13 @@ # Maintainer: David Demelier <markand@malikania.fr> pkgname=fossil pkgver=2.24 -pkgrel=0 +pkgrel=1 pkgdesc="Simple, high-reliability, distributed software configuration management" url="https://www.fossil-scm.org" arch="all" license="BSD-2-Clause" makedepends="openssl-dev>3 tcl-dev zlib-dev" -checkdepends="coreutils ed tcl-lib" +checkdepends="coreutils ed tcl-lib sqlite-tcl" subpackages="$pkgname-bash-completion $pkgname-zsh-completion" source="https://www.fossil-scm.org/home/tarball/version-$pkgver/fossil-src-$pkgver.tar.gz fix-tests.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/frameworkintegration5/APKBUILD b/community/frameworkintegration5/APKBUILD index 27dc1f89572..8e18e947677 100644 --- a/community/frameworkintegration5/APKBUILD +++ b/community/frameworkintegration5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=frameworkintegration5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace" # armhf blocked by extra-cmake-modules @@ -52,5 +52,5 @@ package() { } sha512sums=" -83cc9d4e1063cd1496dbe373f30f706dcb2ce2515735d7b82cd45cf35b20a8e6c51625b752c6e9a53033db1b0573f2f3159bd569becc707b3a2e7250ce7fd20a frameworkintegration-5.115.0.tar.xz +425fd38f87b2bba96f68afb8bc8108f9da6011106e33f32b2d91b97b8330d54d0bdc26bec8ecf50c32471d8f8e85af5f6d8b3feee0815225f5dd2075c41c8a83 frameworkintegration-5.116.0.tar.xz " diff --git a/community/francis/APKBUILD b/community/francis/APKBUILD index ecce5d51ef0..e3d05ecf18f 100644 --- a/community/francis/APKBUILD +++ b/community/francis/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-other +# group=kde-applications pkgname=francis -pkgver=1.1.0 +pkgver=24.05.0 pkgrel=0 pkgdesc="Track your time" url="https://invent.kde.org/utilities/francis" @@ -28,7 +28,7 @@ makedepends=" checkdepends="xvfb-run" subpackages="$pkgname-lang" _repo_url="https://invent.kde.org/utilities/francis.git" -source="https://download.kde.org/stable/francis/francis-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/francis-$pkgver.tar.xz" build() { cmake -B build -G Ninja \ @@ -47,5 +47,5 @@ package() { } sha512sums=" -2adf8cd87cd1bcc03df7a0b889c4bdab00c58444adef59988ca3b3f3c151403b1cb2a46509934fc2dd98557edfb6f0f06335fe18b70a4efad1daffb768d516e8 francis-1.1.0.tar.xz +4724d2d22a695fc4401ccd5b9254aeaf7afc2c66bdb31c100d3c4af145f10531beca785626c97e995a66b6fe199d4f506c4f73ace49c69a02e75b46433eaa871 francis-24.05.0.tar.xz " diff --git a/community/frog/APKBUILD b/community/frog/APKBUILD index 8a9e7951d5e..d4685ba9104 100644 --- a/community/frog/APKBUILD +++ b/community/frog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Maarten van Gompel <proycon@anaproy.nl> # Maintainer: Maarten van Gompel <proycon@anaproy.nl> pkgname=frog -pkgver=0.32 +pkgver=0.33 pkgrel=0 pkgdesc="Integration of natural language processing models for Dutch" options="!check" @@ -29,5 +29,5 @@ package() { } sha512sums=" -971398fc6b8925319057ddfba68d543ac6710a0c0d06efb25b9362002f07f78255ab5ea822e428f6cc6034b4895c93ab3aa367ffb3e7fb3e429263d8d4c45dae frog-0.32.tar.gz +78bc675b07fd453c1b573b6de6e8cdfe92fd91b0cf18b09602d8384ecdba802124b3da96f3292303dc6f60748fae0fc1ac3a03c5a88299835c9f3bc83d14b1e4 frog-0.33.tar.gz " diff --git a/community/frp/APKBUILD b/community/frp/APKBUILD index 64e257a91d8..8128446fcd0 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 -pkgrel=0 +pkgver=0.58.0 +pkgrel=1 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 27a0d8d0a6f..5eb7cf07047 100644 --- a/community/fscrypt/APKBUILD +++ b/community/fscrypt/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=fscrypt pkgver=0.3.5 -pkgrel=0 +pkgrel=1 pkgdesc="Manage Linux native filesystem encryption" url="https://github.com/google/fscrypt" # Tests fail on ppc64le with SIGSEGV and memory lock errors diff --git a/testing/fscryptctl/APKBUILD b/community/fscryptctl/APKBUILD index ee6862d0f0f..ee6862d0f0f 100644 --- a/testing/fscryptctl/APKBUILD +++ b/community/fscryptctl/APKBUILD diff --git a/community/fwup/APKBUILD b/community/fwup/APKBUILD index f35e966effc..1e3410151ea 100644 --- a/community/fwup/APKBUILD +++ b/community/fwup/APKBUILD @@ -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 \ diff --git a/community/fwupd/APKBUILD b/community/fwupd/APKBUILD index 133c97ff85a..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.18 +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=" -d5e0f3a8c741240f389628e2ed81f1e6ec21689bdcd39f692222114a2d495925a0f0720b10fbb0087362c0b734f4f0abfd8e105eff4695e41e645395e5587a50 fwupd-1.9.18.tar.xz +e20f16aa2cf528ecc6262a5c343287aef64fb37667f8d3972daa70f96364041daa0b23149acbd20cbeff059f6428c6c2a317973bc1dd40a39e239350b0eb011e fwupd-1.9.19.tar.xz 2c34891ec273aa1a4d105602cd5e99add5a17d6e240fa93a015d5bb2e11e54937b04781de2a854c472be376524b50fc5bb48edf7b875afb54e3ca07dcda117b0 fwupd.initd 0bf773a2c52b0306e99e5192d259f38cce8a25487e95a41b6e0200a1ed629235971795a1f9ba12a633cd902671d888610695658f2cc2c750e2afca70f87ee589 fwupd.confd " diff --git a/community/fx/APKBUILD b/community/fx/APKBUILD index 343b3a8f7c3..d3092f19bef 100644 --- a/community/fx/APKBUILD +++ b/community/fx/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: tetsumaki <yd-alpine@tetsumaki.net> pkgname=fx pkgver=34.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Command-line tool and terminal JSON viewer" url="https://github.com/antonmedv/fx" arch="all" diff --git a/community/fzf/APKBUILD b/community/fzf/APKBUILD index 6ec74438031..f16c78d89dd 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.51.0 -pkgrel=0 +pkgver=0.52.0 +pkgrel=1 pkgdesc="A command-line fuzzy finder" url="https://github.com/junegunn/fzf" arch="all" @@ -126,7 +126,7 @@ nvim() { } sha512sums=" -deb9c434764571eeab466898e1c782ff2fdeedc112f449c6d03e42f1b6fd3f8ee3c83252190f099ab030768920148144fb9c73840c6e36d43dad42b004045e65 fzf-0.51.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/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/gauth/APKBUILD b/community/gauth/APKBUILD index ef10e2eb487..5fd05981199 100644 --- a/community/gauth/APKBUILD +++ b/community/gauth/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=gauth pkgver=1.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="Replacement for Google Authenticator" url="https://github.com/pcarrier/gauth" license="ISC" 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/10-atoll.patch b/community/gdal/10-atoll.patch index 81af7db3a94..ab78e0f4a4c 100644 --- a/community/gdal/10-atoll.patch +++ b/community/gdal/10-atoll.patch @@ -4,7 +4,7 @@ Summary: musl atoll() doesn't return ERANGE in case of overflow --- a/port/cpl_conv.cpp +++ b/port/cpl_conv.cpp -@@ -1011,8 +1011,6 @@ +@@ -1019,8 +1019,6 @@ return atoll(pszString); } @@ -13,7 +13,7 @@ Summary: musl atoll() doesn't return ERANGE in case of overflow // mingw atoll() doesn't return ERANGE in case of overflow static int CPLAtoGIntBigExHasOverflow(const char *pszString, GIntBig nVal) { -@@ -1035,8 +1033,6 @@ +@@ -1043,8 +1041,6 @@ return strcmp(szBuffer, pszString) != 0; } @@ -22,7 +22,7 @@ Summary: musl atoll() doesn't return ERANGE in case of overflow /************************************************************************/ /* CPLAtoGIntBigEx() */ /************************************************************************/ -@@ -1057,9 +1053,7 @@ +@@ -1065,9 +1061,7 @@ errno = 0; GIntBig nVal = strtoll(pszString, nullptr, 10); if (errno == ERANGE diff --git a/community/gdal/20-java-version.patch b/community/gdal/20-java-version.patch deleted file mode 100644 index 3e924c5206c..00000000000 --- a/community/gdal/20-java-version.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/swig/java/build.xml -+++ b/swig/java/build.xml -@@ -21,7 +21,7 @@ - <target name="compile" depends="init" description="Compile the source files."> - <mkdir dir="${build_dir}/build/classes"/> - <javac srcdir="${build_dir}/org" destdir="${build_dir}/build/classes" -- debug="on" source="7" target="7" -+ debug="on" source="8" target="8" - includeantruntime="false" deprecation="true"> - </javac> - <echo>compilation complete</echo> -@@ -38,7 +38,7 @@ - <target name="compile_tests" depends="archive" description="Compile the tests files."> - <mkdir dir="${build_dir}/build/apps"/> - <javac srcdir="${source_apps}" destdir="${build_dir}/build/apps" -- debug="on" source="7" target="7" -+ debug="on" source="8" target="8" - includeantruntime="false" deprecation="true" classpath="${build_dir}/gdal.jar"> - </javac> - <echo>compilation of tests complete</echo> diff --git a/community/gdal/20-plugin_installation_message.patch b/community/gdal/20-plugin_installation_message.patch new file mode 100644 index 00000000000..e94f40a2635 --- /dev/null +++ b/community/gdal/20-plugin_installation_message.patch @@ -0,0 +1,19 @@ +Author: Holger Jaekel <holger.jaekel@gmx.de> +Summary: read PLUGIN_INSTALLATION_MESSAGE from environment +---- + +--- a/cmake/helpers/GdalDriverHelper.cmake ++++ b/cmake/helpers/GdalDriverHelper.cmake +@@ -80,8 +80,9 @@ + else() + set(_var_PLUGIN_INSTALLATION_MESSAGE "OGR_DRIVER_${_KEY}_PLUGIN_INSTALLATION_MESSAGE") + endif() +- if (DEFINED ${_var_PLUGIN_INSTALLATION_MESSAGE}) +- target_compile_definitions(${_DRIVER_TARGET}_core PRIVATE "-DPLUGIN_INSTALLATION_MESSAGE=\"${${_var_PLUGIN_INSTALLATION_MESSAGE}}\"") ++ if (DEFINED ENV{${_var_PLUGIN_INSTALLATION_MESSAGE}}) ++ message(STATUS "**** setting -DPLUGIN_INSTALLATION_MESSAGE=\"$ENV{${_var_PLUGIN_INSTALLATION_MESSAGE}}\"") ++ target_compile_definitions(${_DRIVER_TARGET}_core PRIVATE "-DPLUGIN_INSTALLATION_MESSAGE=\"$ENV{${_var_PLUGIN_INSTALLATION_MESSAGE}}\"") + endif() + gdal_standard_includes(${_DRIVER_TARGET}_core) + add_dependencies(${_DRIVER_TARGET}_core generate_gdal_version_h) +~
\ No newline at end of file diff --git a/community/gdal/APKBUILD b/community/gdal/APKBUILD index c2481c6b1eb..1d6b8dfd051 100644 --- a/community/gdal/APKBUILD +++ b/community/gdal/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Trevor R.H. Clarke <trevor@notcows.com> # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=gdal -pkgver=3.8.5 +pkgver=3.9.0 pkgrel=2 pkgdesc="A translator library for raster and vector geospatial data formats" url="https://gdal.org/" @@ -75,9 +75,9 @@ subpackages=" $pkgname-driver-all:_gdal_driver_all:noarch " -source="https://github.com/OSGeo/gdal/releases/download/v$pkgver/gdal-$pkgver.tar.gz +source="https://download.osgeo.org/gdal/$pkgver/gdal-$pkgver.tar.gz 10-atoll.patch - 20-java-version.patch + 20-plugin_installation_message.patch " # Print value of the specified variable, or the default if empty or not defined. @@ -87,12 +87,15 @@ getvar() { _all_drivers="" _add_driver() { - local name="$1" typ="$2" descr="$3" + local libname="$1" typ="$2" descr="$3" + local name="$(echo "$libname" | tr 'A-Z' 'a-z')" local varprefix="_${name//-/_}" + local subpkgname="$pkgname-driver-$name" - eval "${varprefix}_typ='$typ'; ${varprefix}_descr='$descr'" - subpackages="$subpackages $pkgname-driver-$name:_driver" - _all_drivers="$_all_drivers $pkgname-driver-$name=$pkgver-r$pkgrel" + eval "${varprefix}_libname='$libname'; ${varprefix}_typ='$typ'; ${varprefix}_descr='$descr'" + subpackages="$subpackages $subpkgname:_driver" + _all_drivers="$_all_drivers $subpkgname=$pkgver-r$pkgrel" + eval "export $(echo $typ | tr '[:lower:]' '[:upper:]')_DRIVER_$(echo $libname | tr '[:lower:]' '[:upper:]')_PLUGIN_INSTALLATION_MESSAGE=\"You may install it with 'apk add $subpkgname'\"" } # Optional dependency netcdf-dev is not available on s390x @@ -151,11 +154,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 @@ -169,13 +172,23 @@ armhf|armv7|x86|s390x) ;; ;; esac +# Optional dependency libqb3-dev is not available on s390x and 32-bit platforms +case "$CARCH" in +armhf|armv7|x86|s390x) ;; +*) + makedepends="$makedepends libqb3-dev" + ;; +esac + _add_driver BASISU_KTX2 gdal "Basis Universal" _add_driver EXR gdal "Extended Dynamic Range Image File Format" _add_driver FITS gdal "Flexible Image Transport System" +_add_driver GIF gdal "Graphics Interchange Format" _add_driver HDF5 gdal "Hierarchical Data Format Release 5 (HDF5)" _add_driver HEIF gdal "ISO/IEC 23008-12:2017 High Efficiency Image File Format" _add_driver JP2OpenJPEG gdal "JPEG2000 driver based on OpenJPEG library" +_add_driver JPEG gdal "JFIF File Format" _add_driver KEA gdal "KEA" _add_driver PCIDSK gdal "PCI Geomatics Database File" _add_driver PCRaster gdal "PCRaster raster file format" @@ -211,7 +224,7 @@ fi 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 -G Ninja \ @@ -293,16 +306,17 @@ 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 + -DlibQB3_DIR=/usr/lib/cmake \ + $crossopts cmake --build build } @@ -328,12 +342,17 @@ _java() { } _driver() { - local name="${subpkgname#"$pkgname"-driver-}"; name="${name//-/_}" - local typ=$(getvar _${name}_typ) - local descr=$(getvar _${name}_descr) + local varprefix="${subpkgname#$pkgname-driver-}"; varprefix="_${varprefix//-/_}" + local libname=$(getvar ${varprefix}_libname) + local typ=$(getvar ${varprefix}_typ) + local descr=$(getvar ${varprefix}_descr) pkgdesc="$pkgdesc ($descr driver)" - amove usr/lib/gdalplugins/${typ}_$name.so + # Package name with uppercase letters for backward compatibility (Alpine <3.20). + [ "$subpkgname" != "$pkgname-driver-$libname" ] \ + && provides="$pkgname-driver-$libname=$pkgver-r$pkgrel" + + amove usr/lib/gdalplugins/${typ}_$libname.so } _gdal_driver_all() { @@ -386,7 +405,7 @@ doc() { } sha512sums=" -7e5c77746cf143bb6545bc812588ad726d73dbfe15c3ac3a8b5046af9d697294fa34a818e3161dcee325aa48d807201b3bbf1f222fb874fdaa4b0bd9ea7dadd7 gdal-3.8.5.tar.gz -d2cf59a3c6fe410fb4bc5cd70c6d21323f0ac4f3cc6418ae09ec5b65264c405d1baefe371d74b134058ba9e7df88cbd0a5a1a5aa2998f9884fe8e638c8e33b22 10-atoll.patch -55cd5b466e45182699a8442461f95caa250521e21a77c9367ddfd6cdd04ed485a106b725144ef23e284f6505ce39ec4a266ded7932e41d6c535c5eb47a8724fa 20-java-version.patch +52d9d70f9e5cfa0daa7c6cf0d20581e729ece7ed7ac34337dff2577ca74e13f6b4051c628ebe85b7957e0e9e9ff012b4396334a7ea07e8f819ff5cbf1aa345fb gdal-3.9.0.tar.gz +c1059034f62fa4f5088d3f6abbfae73773047b6ca3a0a197667c936c57266b68417c9e3bb436f507146d5440891de5fe059b62d560576e9c85b1b21afd0e5546 10-atoll.patch +eae398e7d610115bb4df91771036986af3174dbc2b6fa1bead2144dd73c1546ead38a999aa5a55e38b4b4f3d19724cb24486d3fe57d3ca77f12f90b98ebf1988 20-plugin_installation_message.patch " diff --git a/community/gdu/APKBUILD b/community/gdu/APKBUILD index 64a6a3b1ffc..82c6befafcc 100644 --- a/community/gdu/APKBUILD +++ b/community/gdu/APKBUILD @@ -3,7 +3,7 @@ pkgname=gdu pkgver=5.28.0 _majorver=${pkgver%%.*} -pkgrel=1 +pkgrel=2 pkgdesc="Fast disk usage calculator with console interface" url="https://github.com/dundee/gdu" arch="all" diff --git a/community/geany/APKBUILD b/community/geany/APKBUILD index c0a2d105bfb..72086ca8b6b 100644 --- a/community/geany/APKBUILD +++ b/community/geany/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=geany -pkgver=1.38 +pkgver=2.0 pkgrel=0 pkgdesc="fast and lightweight IDE" url="https://www.geany.org" @@ -36,6 +36,7 @@ source="https://download.geany.org/geany-$pkgver.tar.gz https://download.geany.org/contrib/tags/xfce48.c.tags http://advamacs.com/pub/tcl.tcl.tags set_default_terminal.patch + use_sh_for_tests.patch " build() { @@ -43,8 +44,7 @@ build() { --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ - --enable-vte \ - --enable-gtk3 + --enable-vte make } @@ -82,7 +82,7 @@ dev() { } sha512sums=" -e7f73b138617b1af82d9a6413b4b9ab435cab89a45b869d3ec1f2865ac75afb8e2df9d7a053d5df31be90e77407566d7ee512c569f0e682a72c5acce756b8dd1 geany-1.38.tar.gz +55d4730e43c460a30b2497bd3e6ee69abace169f7bfeb8c4a24da960a35406ddbd116001c8abf5025b8d55c8d1e879676525ecc3dafacd32daddc9be6abdf256 geany-2.0.tar.gz 89551143b5557a632b325cceef9c0fa56ea0f9a28d1bd7bed4dba99af5005812702bbf0519f6ce97ce77c362fa454caac8d18c168ffb4af5f91ed6a4df2995e9 dbus-glib-0.76.c.tags 9d06d993ddd3fbc6445a215e327e4d0bfb498bcf0431fff69b66b4fc2163717a313c5a876d0dcd922859f97fb8f5beb20f034dafb99b321be37282f226c76057 drupal.php.tags 1db55822822fe5f9d85ff619c6e2fb9703ed7646eefb8925f8e2f632fb9f6aecaddf1580496e0d9daa9d3d7e466febc80d73ae3955075d1dd92fc238571d5fd1 ethos-1.0.c.tags @@ -107,5 +107,6 @@ fe3f88e86a0f098a2f85df76ddd04978bb8f2bed87ea8cc7c3325ea904f5c625fb2b10757d0f8eda 822ffacbd42c72c459ccd2b44ecfb580c5c65816beaec23638d74d61a8e832c1486b902c3950a892a49b2ce5232533490653ff8bab2194f1b412f16f64c66090 xfce46.c.tags cecd0d4c71fc163fff52c4aec48e69559e9b55f16becfbcb083a453a1e1e6c3ee0835917210511cab134995de3efbf870943313ffdd667ca089501f468fe7564 xfce48.c.tags 71012d3f6d11a7b5171c1debce928fe31776af64a4f7c36fc27946fed220b9918c0894932d54c8a2fb55611ca5a458b7f8d3ae05ee269d83e2e704f0baa6b674 tcl.tcl.tags -ab07a6d1ba4dd9d09dcaa8231476d6cd4e6ce6278bc07ed5f343e864ccf769bb136e3d220c9771081778c2c37ea3651cb67516c5385e12aa88376d6affd294e1 set_default_terminal.patch +2d3a15ad23d18f985ec236530ba3012716d1617e003b3bc6fe100f19757684a6272b2f767248b987e567649d1e30234f2e541eb532e1a6126d23a714b382aea7 set_default_terminal.patch +6344d027dd12441139297b28a4f319cac113cdb83f7346e1fa63e0aec003408b3bf79b83eb37307034fecd5a9013d5f3a328e8d70f9ba590eb6506100865f816 use_sh_for_tests.patch " diff --git a/community/geany/set_default_terminal.patch b/community/geany/set_default_terminal.patch index baf9a3f4c1f..35044b128ac 100644 --- a/community/geany/set_default_terminal.patch +++ b/community/geany/set_default_terminal.patch @@ -1,11 +1,11 @@ ---- geany-1.24.1-origin/src/keyfile.c -+++ geany-1.24.1/src/keyfile.c -@@ -71,7 +71,7 @@ - #ifdef G_OS_WIN32 - #define GEANY_DEFAULT_TOOLS_TERMINAL "cmd.exe /Q /C %c" +--- geany-2.0.origin/src/keyfile.c ++++ geany-2.0/src/keyfile.c +@@ -83,7 +83,7 @@ + #elif defined(__APPLE__) + #define GEANY_DEFAULT_TOOLS_TERMINAL "open -a terminal %c" #else -#define GEANY_DEFAULT_TOOLS_TERMINAL "xterm -e \"/bin/sh %c\"" +#define GEANY_DEFAULT_TOOLS_TERMINAL "Terminal -e \"/bin/sh %c\"" #endif - #define GEANY_DEFAULT_TOOLS_BROWSER "firefox" - #define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr" + #ifdef __APPLE__ + #define GEANY_DEFAULT_TOOLS_BROWSER "open -a safari" diff --git a/community/geany/use_sh_for_tests.patch b/community/geany/use_sh_for_tests.patch new file mode 100644 index 00000000000..370e66638ef --- /dev/null +++ b/community/geany/use_sh_for_tests.patch @@ -0,0 +1,8 @@ +--- geany-2.0.origin/tests/ctags/runner.sh ++++ geany-2.0/tests/ctags/runner.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # error out on undefined variable expansion, useful for debugging + set -u diff --git a/community/gedit-plugins/APKBUILD b/community/gedit-plugins/APKBUILD deleted file mode 100644 index 1930d400d69..00000000000 --- a/community/gedit-plugins/APKBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Contributor: Rasmus Thomsen <oss@cogitri.dev> -# Maintainer: -pkgname=gedit-plugins -pkgver=44.1 -pkgrel=3 -pkgdesc="Plugins for gedit, the GNOME text editor" -url="https://gitlab.gnome.org/GNOME/gedit/blob/master/plugins/list-of-gedit-plugins.md" -arch="all !s390x" -license="GPL-2.0-only" -depends="python3 py3-gobject3 vte3 gucharmap py3-dbus libpeas-python3" -makedepends="glib-dev gtk+3.0-dev gtksourceview4-dev libpeas-dev gedit-dev vala - libgit2-glib-dev itstool vte3-dev gucharmap-dev py3-dbus-dev meson" -checkdepends="appstream-glib" -subpackages="$pkgname-lang $pkgname-doc $pkgname-pyc" -source="https://download.gnome.org/sources/gedit-plugins/${pkgver%.*}/gedit-plugins-$pkgver.tar.xz" - -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 - python3 -m compileall -fq "$pkgdir"/usr/lib/gedit -} - -pyc() { - default_pyc - local IFS=$'\n' - amove $(find usr/lib/gedit/plugins -type d -name __pycache__) -} - -sha512sums=" -d5d767210b362747e4ba51b61b4d1c58bf5b37aa5f942cb9654f71c534d8bce2594ebc9004bed686627403fe1c3a6af84a45f4ce72af1f27fa7b644d11cdc9e2 gedit-plugins-44.1.tar.xz -" diff --git a/community/gemget/APKBUILD b/community/gemget/APKBUILD index b7e49ddbbf2..c18f45eaca3 100644 --- a/community/gemget/APKBUILD +++ b/community/gemget/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: omni <omni@gitlab.alpinelinux.org> pkgname=gemget pkgver=1.9.0 -pkgrel=8 +pkgrel=9 pkgdesc="command line downloader for the Gemini protocol" url="https://github.com/makeworld-the-better-one/gemget" license="MIT" diff --git a/community/geth/APKBUILD b/community/geth/APKBUILD index bd684d4f860..7d30d919b4b 100644 --- a/community/geth/APKBUILD +++ b/community/geth/APKBUILD @@ -1,13 +1,14 @@ # Contributor: André Klitzing <aklitzing@gmail.com> # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=geth -pkgver=1.13.14 +pkgver=1.14.3 pkgrel=2 pkgdesc="Official Go implementation of the Ethereum protocol" url="https://geth.ethereum.org/" -arch="all" +arch="all !loongarch64" license="LGPL-3.0-or-later" makedepends="go linux-headers" +subpackages="$pkgname-tools" checkdepends="fuse" options="!check chmod-clean net" source="$pkgname-$pkgver.tar.gz::https://github.com/ethereum/go-ethereum/archive/v$pkgver.tar.gz" @@ -23,7 +24,7 @@ export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" build() { - make + make all } check() { @@ -31,10 +32,25 @@ check() { } package() { - mkdir -p "$pkgdir"/usr/bin - install -m755 -t "$pkgdir"/usr/bin build/bin/* + install -Dm755 -t "$pkgdir"/usr/bin \ + build/bin/geth \ + build/bin/abigen \ + build/bin/bootnode \ + build/bin/clef \ + build/bin/evm \ + build/bin/rlpdump +} + +tools() { + pkgdesc="$pkgdesc (extra tools: abigen, bootnode, clef, evm, rlpdump)" + + amove usr/bin/abigen + amove usr/bin/bootnode + amove usr/bin/clef + amove usr/bin/evm + amove usr/bin/rlpdump } 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/ghostwriter/APKBUILD b/community/ghostwriter/APKBUILD index ca4321d8b1a..60f5c41ef50 100644 --- a/community/ghostwriter/APKBUILD +++ b/community/ghostwriter/APKBUILD @@ -3,7 +3,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=ghostwriter -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Distraction-free markdown editor" url="https://invent.kde.org/office/ghostwriter/" @@ -47,5 +47,5 @@ package() { } sha512sums=" -ebe605f82710ced4fecf4effd5c257e5d6bc274bbbc6cb36138423ef05b14504dd5d39d698eb23640838df53bc55f9ba3523280731482b1eb1b1ad6d46178381 ghostwriter-24.02.2.tar.xz +587b53f590452ec253feca04caa9b349bbdb718945c935b5775093a6a12ff306191c89e3bf1800336a0d9c162c058d238387ac217b59f06809141f72a96130e6 ghostwriter-24.05.0.tar.xz " diff --git a/community/gi-docgen/APKBUILD b/community/gi-docgen/APKBUILD index 31a4f88bf7f..8e4758ea80a 100644 --- a/community/gi-docgen/APKBUILD +++ b/community/gi-docgen/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=gi-docgen -pkgver=2023.3 -pkgrel=1 +pkgver=2024.1 +pkgrel=0 pkgdesc="A documentation generator for GObject-based libraries" url="https://gitlab.gnome.org/GNOME/gi-docgen" arch="noarch" @@ -34,5 +34,5 @@ package() { } sha512sums=" -9fbfe97167d83e0f166c6eece5e723dcf6d2a345cdf577a0618c971f3023d7a83d3ded471002a3ca24c2fe94611ceb88781002bacf406543f4a7f3b8608e42e5 gi-docgen-2023.3.tar.gz +e3d11418caea657bf0f0d421a8c84adf0c90ee9e6715554c8e81aa882a4c34f4c9c865497a853b7acc6cd62ea8010c2684fcc6cbd7ce1b3e6eeef6149f4c8576 gi-docgen-2024.1.tar.gz " 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 7485408e96f..d7e47625a41 100644 --- a/community/ginkgo/APKBUILD +++ b/community/ginkgo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=ginkgo -pkgver=2.17.2 +pkgver=2.17.3 pkgrel=0 pkgdesc="Modern Testing Framework for Go" url="https://onsi.github.io/ginkgo/" @@ -34,6 +34,6 @@ package() { } sha512sums=" -0aa480d500b35b60f8aa67f13ee897e8b11ba37c1aba59a9b8b8547ac20da718a157a2963037c855dff4d40a5635867397eab7a7010733c7f7ae69beb51a8745 ginkgo-2.17.2.tar.gz +01837c98afa739556f098ca51b21b4db5cff232246fee92476a68c5ed7d24a7c7e11e34b720f9e7a0da0772637d7468845fe11add0f1158c5217b3916e50485f ginkgo-2.17.3.tar.gz 2fe515438583a51dbd92912a761063882788b3d001d37073986d81b9d4076e0381ee1981623cbf603fb70b59efb60bf941d577ecb8d5af97027d1877c7e164cc tests.patch " 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-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-credential-azure/APKBUILD b/community/git-credential-azure/APKBUILD index e237e87b61c..92836c355be 100644 --- a/community/git-credential-azure/APKBUILD +++ b/community/git-credential-azure/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: M Hickford <mirth.hickford@gmail.com> pkgname=git-credential-azure pkgver=0.2.3 -pkgrel=4 +pkgrel=5 pkgdesc="Git credential helper that authenticates to Azure Repos (dev.azure.com)" url="https://github.com/hickford/git-credential-azure" arch="all" diff --git a/community/git-credential-oauth/APKBUILD b/community/git-credential-oauth/APKBUILD index 4c6c56c20e0..7d3873488ac 100644 --- a/community/git-credential-oauth/APKBUILD +++ b/community/git-credential-oauth/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: M Hickford <mirth.hickford@gmail.com> pkgname=git-credential-oauth pkgver=0.11.0 -pkgrel=3 +pkgrel=4 pkgdesc="Git credential helper that securely authenticates to GitHub, GitLab and BitBucket using OAuth" url="https://github.com/hickford/git-credential-oauth" arch="all" diff --git a/community/git-lfs/APKBUILD b/community/git-lfs/APKBUILD index e25314673d3..6dcdd764aa6 100644 --- a/community/git-lfs/APKBUILD +++ b/community/git-lfs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=git-lfs pkgver=3.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="Git extension for versioning large files" url="https://git-lfs.github.io/" arch="all" diff --git a/community/git-lfs2/APKBUILD b/community/git-lfs2/APKBUILD deleted file mode 100644 index a8dbf00ea07..00000000000 --- a/community/git-lfs2/APKBUILD +++ /dev/null @@ -1,82 +0,0 @@ -# Contributor: Jakub Jirutka <jakub@jirutka.cz> -# Maintainer: Jakub Jirutka <jakub@jirutka.cz> -pkgname=git-lfs2 -_projname=git-lfs -pkgver=2.13.3 -pkgrel=21 -pkgdesc="Git extension for versioning large files (version 2.x)" -url="https://git-lfs.github.io/" -arch="all" -license="MIT" -depends="git !git-lfs" -makedepends="go ronn" -checkdepends="bash coreutils curl git-daemon perl-utils" -install="$pkgname.post-install $pkgname.pre-deinstall" -subpackages="$pkgname-doc" -source="https://github.com/git-lfs/git-lfs/archive/v$pkgver/$_projname-$pkgver.tar.gz - makefile-extra_go_flags.patch - patch-env-compare-git-grep-prefix.patch - fix-test-branch-name.patch - quote-ldflags.patch - " -builddir="$srcdir/$_projname-$pkgver" - -[ "$CARCH" = "x86" ] && options="!check" # tests broken on x86 - -# secfixes: -# 0: -# - CVE-2020-27955 # (only affect windows) - -# -tags netcgo - use system's DNS resolver by default. Go's built-in DNS -# resolver is buggy; it resolved localhost to totally wrong IP -# address on ARM builders and so caused test failures. -_goflags="$GOFLAGS -v -tags netcgo" - -export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" -export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" -export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" - -build() { - make \ - EXTRA_GO_FLAGS="$_goflags" \ - GIT_LFS_SHA="v$pkgver" \ - VERSION="v$pkgver" - make man -} - -check() { - make integration EXTRA_GO_FLAGS="$_goflags" -} - -package() { - local docdir="$pkgdir/usr/share/doc/git-lfs" - local mandir="$pkgdir/usr/share/man" - - install -Dm755 bin/git-lfs "$pkgdir"/usr/bin/git-lfs - - mkdir -p "$mandir"/man1 "$mandir"/man5 - install -m 644 man/*.1 "$mandir"/man1/ - install -m 644 man/*.5 "$mandir"/man5/ - - mkdir -p "$docdir" - cp -r docs/*.md docs/api "$docdir"/ - rm -r "$docdir"/api/schemas -} - -doc() { - default_doc - depends="!git-lfs-doc" -} - -cleanup_srcdir() { - go clean -modcache - default_cleanup_srcdir -} - -sha512sums=" -2c9e10e4f2fdb5d6bae8994db5879f50596109f3057e7369a9edca3c13c3f4d77e268e3903a0abca60cf8e342ff54bc4920c01a530f8eb400e3a0cc11a171f74 git-lfs-2.13.3.tar.gz -2d793da75b37324936407948fdb634ff4c510c4dd4d3575c2459b81a0a6eb8f2464f5066ae99e88d5bf69e357fd60354b9d9d53e062cb6ba709f5f3a39858466 makefile-extra_go_flags.patch -335ee5ef04247f8420051c75d04a59d1ebbd0cad9ec1da25ae07b5940d419c15b154f946f3c3e1fa9978201bb730f2401c5f7f606377c114fc224b8be5027d6c patch-env-compare-git-grep-prefix.patch -74d06ddcb431b2bbbb393d01d1331c103f6b80921dd7057c347d74dc22750a1d0c051dc16a44db3cbc7dd4284b416bc561e09669701c6e29b53e0864b54543a6 fix-test-branch-name.patch -6ca2c1d8964f616dc81e1744ebe74736ff5b70f7888eccc315e906e669f78a0d5b5cf8c5018ac14e390f778afc147ee6cbb7175504aa2f6fa4bed3c7ec663317 quote-ldflags.patch -" diff --git a/community/git-lfs2/fix-test-branch-name.patch b/community/git-lfs2/fix-test-branch-name.patch deleted file mode 100644 index 7d5be4c27f0..00000000000 --- a/community/git-lfs2/fix-test-branch-name.patch +++ /dev/null @@ -1,46 +0,0 @@ -for some reasons, tests expect the default branch to be called 'main', -while on alpine it's still 'master'. - -to fix this, we can just rename the branch after cloning a test repo to 'main'. - -diff --git a/Makefile b/Makefile -index 79a0407..232b001 100644 ---- a/Makefile -+++ b/Makefile -@@ -478,6 +478,7 @@ test : fmt $(.DEFAULT_GOAL) - tempdir="$$(mktemp -d)"; \ - export HOME="$$tempdir"; \ - export GIT_CONFIG_NOSYSTEM=1; \ -+ git config --global init.defaultBranch main; \ - $(GO) test -count=1 $(GO_TEST_EXTRA_ARGS) $(addprefix ./,$(PKGS)); \ - RET=$$?; \ - chmod -R u+w "$$tempdir"; \ -diff --git a/t/testhelpers.sh b/t/testhelpers.sh -index 270ca12..7624ea9 100644 ---- a/t/testhelpers.sh -+++ b/t/testhelpers.sh -@@ -361,6 +361,7 @@ clone_repo() { - echo "clone local git repository $reponame to $dir" - out=$(git clone "$GITSERVER/$reponame" "$dir" 2>&1) - cd "$dir" -+ git branch -m main - - git config credential.helper lfstest - echo "$out" > clone.log -@@ -394,6 +395,7 @@ clone_repo_ssl() { - echo "clone local git repository $reponame to $dir" - out=$(git clone "$SSLGITSERVER/$reponame" "$dir" 2>&1) - cd "$dir" -+ git branch -m main - - git config credential.helper lfstest - -@@ -559,6 +561,8 @@ setup() { - write_creds_file ":pass" "$CREDSDIR/--$certpath" - write_creds_file ":pass" "$CREDSDIR/--$keypath" - -+ git config --global init.defaultBranch main -+ - echo "#" - echo "# HOME: $HOME" - echo "# TMP: $TMPDIR" diff --git a/community/git-lfs2/git-lfs2.post-install b/community/git-lfs2/git-lfs2.post-install deleted file mode 100644 index cc9a36578e3..00000000000 --- a/community/git-lfs2/git-lfs2.post-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -git-lfs install --skip-repo --system diff --git a/community/git-lfs2/git-lfs2.pre-deinstall b/community/git-lfs2/git-lfs2.pre-deinstall deleted file mode 100644 index 9f8ad1b3e44..00000000000 --- a/community/git-lfs2/git-lfs2.pre-deinstall +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -git-lfs uninstall --system diff --git a/community/git-lfs2/makefile-extra_go_flags.patch b/community/git-lfs2/makefile-extra_go_flags.patch deleted file mode 100644 index c1437db65b0..00000000000 --- a/community/git-lfs2/makefile-extra_go_flags.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -136,7 +136,7 @@ - # It uses BUILD_MAIN as defined above to specify the entrypoint for building Git - # LFS. - BUILD = GOOS=$(1) GOARCH=$(2) \ -- $(GO) build \ -+ $(GO) build $(EXTRA_GO_FLAGS) \ - -ldflags="$(LD_FLAGS)" \ - -gcflags="$(GC_FLAGS)" \ - -asmflags="$(ASM_FLAGS)" \ - ---- a/t/Makefile -+++ b/t/Makefile -@@ -45,7 +45,7 @@ - $(RM) $(TEST_CMDS) - - ../bin/%$X : cmd/%.go -- go build -o $@ $^ -+ go build $(EXTRA_GO_FLAGS) -o $@ $^ - - ../bin/git-lfs-test-server-api$X : $(TEST_API_SRCS) -- go build -o $@ $^ -+ go build $(EXTRA_GO_FLAGS) -o $@ $^ diff --git a/community/git-lfs2/patch-env-compare-git-grep-prefix.patch b/community/git-lfs2/patch-env-compare-git-grep-prefix.patch deleted file mode 100644 index ebfe0306f66..00000000000 --- a/community/git-lfs2/patch-env-compare-git-grep-prefix.patch +++ /dev/null @@ -1,203 +0,0 @@ -Patch-Source: https://github.com/git-lfs/git-lfs/pull/4678 ---- old/t/t-env.sh -+++ new/t/t-env.sh -@@ -26,7 +26,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - - expected=$(printf '%s - %s -@@ -79,7 +79,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - expected=$(printf '%s - %s - -@@ -138,7 +138,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - expected=$(printf '%s - %s - -@@ -196,7 +196,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - - expected=$(printf '%s - %s -@@ -255,7 +255,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - expected=$(printf '%s - %s - -@@ -316,7 +316,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - expected=$(printf '%s - %s - -@@ -377,7 +377,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - expected=$(printf '%s - %s - -@@ -447,7 +447,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - expected=$(printf '%s - %s - -@@ -504,7 +504,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars="$(GIT_DIR=$gitDir GIT_WORK_TREE=$workTree env | grep "^GIT" | sort)" -+ envVars="$(GIT_DIR=$gitDir GIT_WORK_TREE=$workTree env | grep "^GIT_" | sort)" - expected=$(printf '%s - %s - -@@ -553,7 +553,7 @@ - | grep -v "^GIT_EXEC_PATH=") - contains_same_elements "$expected" "$actual4" - -- envVars="$(GIT_DIR=$gitDir GIT_WORK_TREE=a/b env | grep "^GIT" | sort)" -+ envVars="$(GIT_DIR=$gitDir GIT_WORK_TREE=a/b env | grep "^GIT_" | sort)" - - # `a/b` is an invalid relative path from where we are now and results in an - # error, so resulting output will have many fields blank or invalid -@@ -594,7 +594,7 @@ - contains_same_elements "$expected5" "$actual5" - - cd $TRASHDIR/$reponame/a/b -- envVars="$(GIT_DIR=$gitDir env | grep "^GIT" | sort)" -+ envVars="$(GIT_DIR=$gitDir env | grep "^GIT_" | sort)" - expected7=$(printf '%s - %s - -@@ -627,7 +627,7 @@ - contains_same_elements "$expected7" "$actual7" - - cd $TRASHDIR/$reponame/a -- envVars="$(GIT_WORK_TREE=$workTree env | grep "^GIT" | sort)" -+ envVars="$(GIT_WORK_TREE=$workTree env | grep "^GIT_" | sort)" - expected8=$(printf '%s - %s - -@@ -674,7 +674,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - - expected=$(printf "%s\n%s\n - LocalWorkingDir= -@@ -744,7 +744,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - - localwd=$(canonical_path "$TRASHDIR/$reponame") - localgit=$(canonical_path "$TRASHDIR/$reponame/.git") -@@ -752,7 +752,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - - expectedenabled=$(printf '%s - %s -@@ -819,7 +819,7 @@ - contains_same_elements "$expecteddisabled" "$actual" - - # now enable via env var -- envVarsEnabled=$(printf "%s" "$(GIT_LFS_SKIP_DOWNLOAD_ERRORS=1 env | grep "^GIT")") -+ envVarsEnabled=$(printf "%s" "$(GIT_LFS_SKIP_DOWNLOAD_ERRORS=1 env | grep "^GIT_")") - expectedenabled2=$(printf '%s - %s - -@@ -873,7 +873,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - - localwd=$(canonical_path "$TRASHDIR/$reponame") - localgit=$(canonical_path "$TRASHDIR/$reponame/.git") -@@ -881,7 +881,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - - expectedenabled=$(printf '%s - %s -@@ -940,7 +940,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - expected=$(printf '%s - %s - -@@ -1005,7 +1005,7 @@ - lfsstorage=$(canonical_path "$TRASHDIR/$reponame/.git/lfs") - localmedia=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/objects") - tempdir=$(canonical_path "$TRASHDIR/$reponame/.git/lfs/tmp") -- envVars=$(printf "%s" "$(env | grep "^GIT")") -+ envVars=$(printf "%s" "$(env | grep "^GIT_")") - expected=$(printf '%s - %s - ---- old/t/t-worktree.sh -+++ new/t/t-worktree.sh -@@ -49,7 +49,7 @@ - AccessUpload=none - DownloadTransfers=basic,lfs-standalone-file - UploadTransfers=basic,lfs-standalone-file --$(escape_path "$(env | grep "^GIT")") -+$(escape_path "$(env | grep "^GIT_")") - %s - " "$(git lfs version)" "$(git version)" "$envInitConfig") - actual=$(git lfs env | grep -v "^GIT_EXEC_PATH=") -@@ -85,7 +85,7 @@ - AccessUpload=none - DownloadTransfers=basic,lfs-standalone-file - UploadTransfers=basic,lfs-standalone-file --$(escape_path "$(env | grep "^GIT")") -+$(escape_path "$(env | grep "^GIT_")") - %s - " "$(git lfs version)" "$(git version)" "$envInitConfig") - actual=$(git lfs env | grep -v "^GIT_EXEC_PATH=") diff --git a/community/git-lfs2/quote-ldflags.patch b/community/git-lfs2/quote-ldflags.patch deleted file mode 100644 index 637e5296619..00000000000 --- a/community/git-lfs2/quote-ldflags.patch +++ /dev/null @@ -1,15 +0,0 @@ -otherwise breaks with spaces --- -diff --git a/Makefile b/Makefile -index 051fcbb..a604ac2 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,7 +36,7 @@ endif - # EXTRA_LD_FLAGS are given by the caller, and are passed to the Go linker after - # BUILTIN_LD_FLAGS are processed. By default the system LDFLAGS are passed. - ifdef LDFLAGS --EXTRA_LD_FLAGS ?= -extldflags ${LDFLAGS} -+EXTRA_LD_FLAGS ?= -extldflags '${LDFLAGS}' - endif - # LD_FLAGS is the union of the above two BUILTIN_LD_FLAGS and EXTRA_LD_FLAGS. - LD_FLAGS = $(BUILTIN_LD_FLAGS) $(EXTRA_LD_FLAGS) diff --git a/community/git-sizer/APKBUILD b/community/git-sizer/APKBUILD index 87c37e63aaa..a39fbcf0cb5 100644 --- a/community/git-sizer/APKBUILD +++ b/community/git-sizer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=git-sizer pkgver=1.5.0 -pkgrel=21 +pkgrel=22 pkgdesc="Compute various size metrics for a Git repository" url="https://github.com/github/git-sizer" license="MIT" diff --git a/community/gitea/APKBUILD b/community/gitea/APKBUILD index 39069f4901f..bb1d35c764d 100644 --- a/community/gitea/APKBUILD +++ b/community/gitea/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: 6543 <6543@obermui.de> pkgname=gitea pkgver=1.21.9 -pkgrel=1 +pkgrel=2 pkgdesc="Self-hosted Git service written in Go" url="https://about.gitea.com/" arch="all" diff --git a/community/github-cli/APKBUILD b/community/github-cli/APKBUILD index f2185e1f3b8..c140be48add 100644 --- a/community/github-cli/APKBUILD +++ b/community/github-cli/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Andrei Jiroh Eugenio Halili <ajhalili2006@andreijiroh.xyz> pkgname=github-cli pkgver=2.47.0 -pkgrel=1 +pkgrel=2 pkgdesc="CLI for dealing with GitHub" options="net" # Need to fetch modules url="https://cli.github.com" diff --git a/community/gitlab-release-cli/APKBUILD b/community/gitlab-release-cli/APKBUILD index 357f2c07c9f..4e2e8044e69 100644 --- a/community/gitlab-release-cli/APKBUILD +++ b/community/gitlab-release-cli/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Olliver Schinagl <oliver@schinagl.nl> pkgname=gitlab-release-cli pkgver=0.16.0 -pkgrel=4 +pkgrel=5 pkgdesc="GitLab Release command-line tool" url="https://gitlab.com/gitlab-org/release-cli" license="MIT" diff --git a/community/gitlab-runner/APKBUILD b/community/gitlab-runner/APKBUILD index 1025c95e83a..cac2cfc5f4d 100644 --- a/community/gitlab-runner/APKBUILD +++ b/community/gitlab-runner/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Rasmus Thomsen <oss@cogitir.dev> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=gitlab-runner -pkgver=16.11.0 +pkgver=16.11.1 pkgrel=1 pkgdesc="GitLab runner for CI/CD jobs" url="https://docs.gitlab.com/runner/" @@ -73,8 +73,8 @@ helper() { } sha512sums=" -6fe57318b014d5acf9b7364c07bc700a54782683fffafecf2f4224821fa421d8cd2e104a4c4475d2260ff0b8d5284f36c91d4f8ffe4b28ce52d892e68340d5b6 gitlab-runner-v16.11.0.tar.gz -2b008935cdbb08acdbe81cc8605cb6dbeaa0df1c13d5276783b8bf6d206db5205562fe77ede3a9ff6bf0497159dce69d3c958ad2244979bb7920d80ad24aeee7 gitlab-runner-16.11.0-tags.json +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/glab/APKBUILD b/community/glab/APKBUILD index ecd2b302181..c4fe8475275 100644 --- a/community/glab/APKBUILD +++ b/community/glab/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=glab pkgver=1.40.0 -pkgrel=0 +pkgrel=1 pkgdesc="Open source GitLab CLI tool written in Go" url="https://gitlab.com/gitlab-org/cli" arch="all" diff --git a/community/gleam/APKBUILD b/community/gleam/APKBUILD index 8e6a20c80c1..4632c9e5c22 100644 --- a/community/gleam/APKBUILD +++ b/community/gleam/APKBUILD @@ -1,13 +1,13 @@ # Contributor: rubicon <rubicon@mailo.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=gleam -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=0 pkgdesc="Statically-typed language that compiles to Erlang and JS" url="https://gleam.run/" -# s390x, riscv64, ppc64le: ring +# s390x, riscv64, ppc64le, loongarch64: ring # armhf: error: Undefined temporary symbol .LBB88_2 -arch="all !armhf !s390x !riscv64 !ppc64le" +arch="all !armhf !s390x !riscv64 !ppc64le !loongarch64" license="Apache-2.0" depends="erlang-dev" makedepends="cargo cargo-auditable" @@ -32,5 +32,5 @@ package() { } sha512sums=" -265867096b758ab554f0b4228d95b40a30d5796499b29775465d8dc3cc3ad37cf517cf979f33d906229dd33e424708e40a13ea6cf9932b54c573cd2335788695 gleam-1.1.0.tar.gz +c043c9058854c194bd981eb4a512da14e6ab8a82303b2ed279d38599ea2ecea9db0bd1da64e3d433a6c1c7a6f90b455a4be4626bcabb6db95bb416b8ac7977bd gleam-1.2.0.tar.gz " 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/glirc/APKBUILD b/community/glirc/APKBUILD new file mode 100644 index 00000000000..7990c081dd2 --- /dev/null +++ b/community/glirc/APKBUILD @@ -0,0 +1,83 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=glirc +pkgver=2.40.1 +pkgrel=0 +pkgdesc="Console IRC client written in Haskell" +url="https://github.com/glguy/irc-core" +arch="aarch64 x86_64" # ghc +license="ISC" +makedepends=" + cabal + ghc + ncurses-dev + openssl-dev + " +subpackages="$pkgname-doc" +source="https://hackage.haskell.org/package/glirc-$pkgver/glirc-$pkgver.tar.gz + cabal.project.freeze + " + +# Directory where cabal files are stored. +export CABAL_DIR="${CABAL_DIR:-"$srcdir/cabal"}" + +cabal_update() { + local repo="hackage.haskell.org" + + # Default config uses HTTP, change it to HTTPS. + [ -f "$CABAL_DIR"/config ] || { + cabal user-config init + cabal user-config update -a \ + "repository $repo {url: https://$repo/}" + } + + [ -d "$builddir" ] || abuild unpack + msg "Freezing $pkgname dependencies" + + # Resolve deps and generate fresh cabal.project.freeze with version constraints. + ( + cd "$builddir" || { + error 'Is $builddir set correctly?' + return 1 + } + cabal v2-update + cabal v2-freeze --shadow-installed-packages + + mv -v cabal.project.freeze "$startdir"/ + ) + + if ! abuild checksum; then + die "Failed to update checksum, run 'abuild checksum' manually" + fi +} + +prepare() { + default_prepare + + ln -svf "$srcdir"/cabal.project.freeze "$builddir"/ +} + +build() { + cabal v2-update + cabal v2-build glirc:exes \ + --jobs=${JOBS:-1} \ + --prefix=/usr \ + --docdir=/usr/share/doc/$pkgname \ + --sysconfdir=/etc +} + +check() { + cabal test +} + +package() { + install -Dvm755 "$(cabal list-bin $pkgname)" -t "$pkgdir"/usr/bin/ + install -Dvm644 $pkgname.1 -t "$pkgdir"/usr/share/man/man1/ + install -Dvm644 README.md -t "$pkgdir"/usr/share/doc/$pkgname/ + install -Dvm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/ +} + +sha512sums=" +c2cd359e2a42b703fd82414a906e05f9652357a6b56995d57bec2404ef32c65dacc73d7c97db95d553e6219f0e749d37b9c5e6264a43217fe159407620afd3a5 glirc-2.40.1.tar.gz +09974888ccc6ad381751f45ff06e56f7806cb53968823721fdb80ad283d98bdd11d84d21637ffd797dc68f62b691b9df6cd22d48a834ebeda7bee21ea91cf3cc cabal.project.freeze +" diff --git a/community/glirc/cabal.project.freeze b/community/glirc/cabal.project.freeze new file mode 100644 index 00000000000..fa659d3109d --- /dev/null +++ b/community/glirc/cabal.project.freeze @@ -0,0 +1,131 @@ +active-repositories: hackage.haskell.org:merge +constraints: any.Cabal ==3.10.2.0, + any.Cabal-syntax ==3.10.2.0, + any.HUnit ==1.6.2.0, + any.HsOpenSSL ==0.11.7.6, + HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config, + any.HsOpenSSL-x509-system ==0.1.0.4, + any.OneTuple ==0.4.2, + any.StateVar ==1.2.2, + any.adjunctions ==4.4.2, + any.alex ==3.5.1.0, + any.ansi-terminal ==1.1.1, + ansi-terminal -example, + any.ansi-terminal-types ==1.1, + any.array ==0.5.6.0, + any.assoc ==1.1.1, + assoc -tagged, + any.async ==2.2.5, + async -bench, + any.attoparsec ==0.14.4, + attoparsec -developer, + any.base ==4.19.1.0, + any.base-orphans ==0.9.2, + any.base64-bytestring ==1.2.1.0, + any.bifunctors ==5.6.2, + bifunctors +tagged, + any.binary ==0.8.9.1, + any.blaze-builder ==0.4.2.3, + any.bytestring ==0.12.1.0, + any.call-stack ==0.4.0, + any.cereal ==0.5.8.3, + cereal -bytestring-builder, + any.colour ==2.3.6, + any.comonad ==5.0.8, + comonad +containers +distributive +indexed-traversable, + any.config-schema ==1.3.0.0, + any.config-value ==0.8.3, + any.containers ==0.6.8, + any.contravariant ==1.5.5, + contravariant +semigroups +statevar +tagged, + any.crypto-api ==0.13.3, + crypto-api -all_cpolys, + any.curve25519 ==0.2.8, + any.deepseq ==1.5.0.0, + any.directory ==1.3.8.1, + any.distributive ==0.6.2.1, + distributive +semigroups +tagged, + any.entropy ==0.4.1.10, + entropy -donotgetentropy, + any.exceptions ==0.10.7, + any.filepath ==1.4.200.1, + any.free ==5.2, + any.ghc-bignum ==1.3, + any.ghc-boot-th ==9.8.2, + any.ghc-prim ==0.11.0, + any.githash ==0.1.7.0, + any.happy ==1.20.1.1, + any.hashable ==1.4.4.0, + hashable +integer-gmp -random-initial-seed, + any.hookup ==0.8, + any.hsc2hs ==0.68.10, + hsc2hs -in-ghc-tree, + any.indexed-traversable ==0.1.3, + any.indexed-traversable-instances ==0.1.1.2, + any.integer-logarithms ==1.0.3.1, + integer-logarithms -check-bounds +integer-gmp, + any.invariant ==0.6.3, + any.irc-core ==2.12, + any.kan-extensions ==5.2.6, + any.lens ==5.2.3, + lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, + any.microlens ==0.4.13.1, + any.microlens-mtl ==0.2.0.3, + any.microlens-th ==0.4.3.15, + any.mtl ==2.3.1, + any.network ==3.1.4.0, + network -devel, + any.os-string ==2.0.2.2, + any.parallel ==3.2.2.0, + any.parsec ==3.1.17.0, + any.pretty ==1.1.3.6, + any.primitive ==0.9.0.0, + any.process ==1.6.18.0, + any.profunctors ==5.6.2, + any.psqueues ==0.2.8.0, + any.random ==1.2.1.2, + any.reflection ==2.1.8, + reflection -slow +template-haskell, + any.regex-base ==0.94.0.2, + any.regex-tdfa ==1.3.2.2, + regex-tdfa +doctest -force-o2, + any.rts ==1.0.2, + any.scientific ==0.3.8.0, + scientific -integer-simple, + any.semigroupoids ==6.0.1, + semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, + any.semigroups ==0.20, + semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers, + any.split ==0.2.5, + any.splitmix ==0.1.0.5, + splitmix -optimised-mixer, + any.stm ==2.5.2.1, + any.strict ==0.5, + any.tagged ==0.8.8, + tagged +deepseq +transformers, + any.template-haskell ==2.21.0.0, + any.terminfo ==0.4.1.6, + any.text ==2.1.1, + any.th-abstraction ==0.7.0.0, + any.th-compat ==0.1.5, + any.these ==1.2, + any.time ==1.12.2, + 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.typed-process ==0.2.11.1, + any.unix ==2.8.4.0, + any.unliftio-core ==0.2.1.0, + any.unordered-containers ==0.2.20, + unordered-containers -debug, + any.utf8-string ==1.0.2, + any.vector ==0.13.1.0, + vector +boundschecks -internalchecks -unsafechecks -wall, + any.vector-stream ==0.1.0.1, + any.void ==0.7.3, + void -safe, + any.vty ==6.1, + any.vty-unix ==0.2.0.0 +index-state: hackage.haskell.org 2024-05-16T02:18:16Z 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/gmnitohtml/APKBUILD b/community/gmnitohtml/APKBUILD index 9863f34fecb..122fbad9dad 100644 --- a/community/gmnitohtml/APKBUILD +++ b/community/gmnitohtml/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Willow Barraco <contact@willowbarraco.fr> pkgname=gmnitohtml pkgver=0.1.2 -pkgrel=8 +pkgrel=9 pkgdesc="Gemini text to HTML converter" options="!check" # No testsuite url="https://git.sr.ht/~adnano/gmnitohtml" diff --git a/community/gmobile/APKBUILD b/community/gmobile/APKBUILD index ab26fa39cfc..a07f6a1afa3 100644 --- a/community/gmobile/APKBUILD +++ b/community/gmobile/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: team/phosh <fossdd@pwned.life> pkgname=gmobile -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=1 pkgdesc="Functions useful in mobile related, glib based projects" url="https://gitlab.gnome.org/World/Phosh/gmobile" @@ -13,6 +13,7 @@ makedepends=" gobject-introspection-dev " subpackages="$pkgname-dev" +replaces="phoc" source="https://sources.phosh.mobi/releases/gmobile/gmobile-$pkgver.tar.xz" build() { @@ -29,5 +30,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 e4551c64592..7fd2f9c8cfb 100644 --- a/community/gnome-builder/APKBUILD +++ b/community/gnome-builder/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <newbyte@postmarketos.org> pkgname=gnome-builder -pkgver=46.1 +pkgver=46.2 pkgrel=0 pkgdesc="Develop software for GNOME" url="https://wiki.gnome.org/Apps/Builder" @@ -72,5 +72,5 @@ package() { } sha512sums=" -efc6b7352363c7f49c54e6f55813db7a8a86d0fdbb594377c784ec8f79f2d2ada29c0d80c6c3982f874847315cecd8d52e8afcba7bd51d405b59aed3173ca24c gnome-builder-46.1.tar.xz +2a8e6a876244fd584260fd4adf995ef5b450883577ad6305f375978b46a0fea28e5961050af61c505e558e3fbacbac686fc973bcbc7b7e865ba1e11d5549e7ca gnome-builder-46.2.tar.xz " diff --git a/community/gnome-calculator/APKBUILD b/community/gnome-calculator/APKBUILD index cca04a9f7da..52454ee9fd3 100644 --- a/community/gnome-calculator/APKBUILD +++ b/community/gnome-calculator/APKBUILD @@ -1,7 +1,7 @@ # Contributors: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-calculator -pkgver=46.0 +pkgver=46.1 pkgrel=0 pkgdesc="Calculator for solving mathematical equations" url="https://wiki.gnome.org/Apps/Calculator" @@ -45,5 +45,5 @@ package() { } sha512sums=" -b2af034df6c0e94519aef505e960ef3b31f52038b8224d7688d32de8d4b061ac9ee2a127efdce16679ae8863c2fc625476302571db32e9d9859f9800000466c0 gnome-calculator-46.0.tar.xz +b859a35e614ea5415fbb7a03663f1bf184e7f108882c2093511142d8c067e42f6dd11973cc047552bdd9a74d8ee7e39a00ca42009bea739d2b088b2f90affde1 gnome-calculator-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..18123f864ef 100644 --- a/community/gnome-clocks/APKBUILD +++ b/community/gnome-clocks/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-clocks -pkgver=45.0 -pkgrel=0 +pkgver=46.0 +pkgrel=1 pkgdesc="Clock application designed for GNOME 3" url="https://wiki.gnome.org/Apps/Clocks" arch="all" @@ -26,13 +26,13 @@ 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 " build() { - abuild-meson . output + abuild-meson . output -Dwaked=true meson compile -C output } @@ -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-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-initial-setup/APKBUILD b/community/gnome-initial-setup/APKBUILD index 2e39c8c4235..69a3c848570 100644 --- a/community/gnome-initial-setup/APKBUILD +++ b/community/gnome-initial-setup/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=gnome-initial-setup -pkgver=46.0 +pkgver=46.1 pkgrel=0 pkgdesc="A simple, easy,and safe way to prepare a new system" url="https://gitlab.gnome.org/GNOME/gnome-initial-setup" @@ -53,5 +53,5 @@ package() { } sha512sums=" -c1590c60a485a65c3836e2b4bff2add60bf7944df49abbcd6f248d39b135e5deffccf7db197eebda5f792688ed2ff258b1d120e34b4b769b304e6bbc2303c768 gnome-initial-setup-46.0.tar.xz +f745ec85674d9512ad666b953b67d68e2ae33c0cedb0294f7bfa7abf11c431a042bfb616c7e23120ac48bf0e195fdacded38fae05c8e8d57d7c40b32ef2be4b6 gnome-initial-setup-46.1.tar.xz " 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 10670cbf8ce..16901a6682e 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.10 +pkgver=46.11 pkgrel=0 pkgdesc="simple map client" url="https://wiki.gnome.org/Apps/Maps" @@ -54,5 +54,5 @@ package() { } sha512sums=" -14e20c9d644308d4847616f0390b7460001d472395a18be08745074fcc01752eab39b5588403ba4cd648c2d72a1c45a6e24ff578519527f9021fbd7632cc1fcb gnome-maps-46.10.tar.xz +c34f4535af6db93eca7ed7b7be0778bbfdae53aba1a32ec4882a84d82eeff6d82a365ef4ac18b3f55a829e044d680869827c5b897ddeb12b16a17d08f50f9ba1 gnome-maps-46.11.tar.xz " diff --git a/community/gnome-online-accounts/APKBUILD b/community/gnome-online-accounts/APKBUILD index 8314cc26945..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.1 -pkgrel=0 +pkgrel=1 pkgdesc="Single sign-on framework for GNOME" url="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" arch="all" diff --git a/community/gnome-session/APKBUILD b/community/gnome-session/APKBUILD index 70a9afa73fe..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=3 +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=enable \ -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-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-text-editor/APKBUILD b/community/gnome-text-editor/APKBUILD index d3fe9f937a4..80a6c7f753a 100644 --- a/community/gnome-text-editor/APKBUILD +++ b/community/gnome-text-editor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: jane400 <alpine@j4ne.de> # Maintainer: team/gnome <newbyte@postmarketos.org> pkgname=gnome-text-editor -pkgver=46.1 +pkgver=46.3 pkgrel=0 pkgdesc="A simple text editor for GNOME" url="https://apps.gnome.org/TextEditor" @@ -41,5 +41,5 @@ package() { } sha512sums=" -71c1ca750ea9584c3a6cc5d676e1e18f5b6376e9b6190c00539430f0ba8fed7da7f569c3edc79d63eed8ec907fe12261c8d3a527058d0dabc1e014f64b61bc4c gnome-text-editor-46.1.tar.gz +99e5c58f67317344385d599a4863b363f58f274a7e90d436fa2a92f1c9e7722b578b3e4ed7caf845a468bfc01295821bea461d4dc93e91964a3f80d6e06ca348 gnome-text-editor-46.3.tar.gz " 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/gnss-share/APKBUILD b/community/gnss-share/APKBUILD index 640f164bffe..750f3e7c618 100644 --- a/community/gnss-share/APKBUILD +++ b/community/gnss-share/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=gnss-share -pkgver=0.8.1 +pkgver=0.8.2 pkgrel=1 pkgdesc="GNSS location provider, supporting multiple concurrent clients" url="https://gitlab.com/postmarketOS/gnss-share" @@ -57,6 +57,6 @@ geoclue() { } sha512sums=" -8bb34b822c6eac3bfaa72c3af775aa490b69d09f2e48144234a13a9c6a63351cbe08b148678beccc96c67165f2bc7a2110dcd18a6535cd4ddb93850836752895 gnss-share-0.8.1.tar.gz +796f5e9b7429013e0a67babcf7435aef156064cc60546c8256435b1a3696d8b354e4dd85ec403bdc8ea7dc896083bce68c58ac29a1cb7f9a74f4bc7340c5ce9c gnss-share-0.8.2.tar.gz f1d1c391d7104dd079ee6c7c08b99f6a84749b59eb66f3ceb1994d36198840e81f011b573af455eff1231ddbaf0c786c77785f799355d6d82005317633bca1ed geoclue.conf " 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/go-bindata-assetfs/APKBUILD b/community/go-bindata-assetfs/APKBUILD index aa43e767008..a96d068151c 100644 --- a/community/go-bindata-assetfs/APKBUILD +++ b/community/go-bindata-assetfs/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=go-bindata-assetfs pkgver=1.0.1 -pkgrel=25 +pkgrel=26 pkgdesc="small utility which generates Go code to serve any file with net/http" url="https://github.com/elazarl/go-bindata-assetfs" arch="all" diff --git a/community/go-bindata/APKBUILD b/community/go-bindata/APKBUILD index 647f59339bd..d6e57ccf9e8 100644 --- a/community/go-bindata/APKBUILD +++ b/community/go-bindata/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=go-bindata pkgver=3.1.3 -pkgrel=26 +pkgrel=27 pkgdesc="A small utility which generates Go code from any file" url="https://github.com/go-bindata/go-bindata" arch="all" diff --git a/community/go-md2man/APKBUILD b/community/go-md2man/APKBUILD index 0cc09cd386e..1c622939e98 100644 --- a/community/go-md2man/APKBUILD +++ b/community/go-md2man/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jake Buchholz Göktürk <tomalok@gmail.com> pkgname=go-md2man pkgver=2.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Utility to convert markdown to man pages" options="net" url="https://github.com/cpuguy83/go-md2man" diff --git a/community/go-msgauth/APKBUILD b/community/go-msgauth/APKBUILD index c66b3eda342..c33fc78008c 100644 --- a/community/go-msgauth/APKBUILD +++ b/community/go-msgauth/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=go-msgauth pkgver=0.6.8 -pkgrel=2 +pkgrel=3 pkgdesc="Go utilities for DKIM, DMARC, and Authentication-Results" url="https://github.com/emersion/go-msgauth" arch="all" diff --git a/community/go-sendxmpp/APKBUILD b/community/go-sendxmpp/APKBUILD index 4a31de36454..ab1a100dc02 100644 --- a/community/go-sendxmpp/APKBUILD +++ b/community/go-sendxmpp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Anjandev Momi <anjan@momi.ca> pkgname=go-sendxmpp pkgver=0.10.0 -pkgrel=0 +pkgrel=1 pkgdesc="Tool to send messages to an XMPP contact or MUC" url="https://salsa.debian.org/mdosch/go-sendxmpp" arch="all" diff --git a/community/go-task/APKBUILD b/community/go-task/APKBUILD index 6ae9605aa02..a9fe56fb7f5 100644 --- a/community/go-task/APKBUILD +++ b/community/go-task/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=go-task -pkgver=3.36.0 -pkgrel=0 +pkgver=3.37.2 +pkgrel=1 pkgdesc="Task runner written in Go, installed as go-task" url="https://taskfile.dev/" arch="all" @@ -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/go/APKBUILD b/community/go/APKBUILD index 06274e82539..f82cdd0c7a3 100644 --- a/community/go/APKBUILD +++ b/community/go/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=go # go binaries are statically linked, security updates require rebuilds -pkgver=1.22.2 +pkgver=1.22.3 pkgrel=0 pkgdesc="Go programming language compiler" url="https://go.dev/" @@ -35,6 +35,9 @@ esac # - CVE-2022-41716 # - CVE-2022-41720 # - CVE-2022-41722 +# - CVE-2024-24787 +# 1.22.3-r0: +# - CVE-2024-24788 # 1.22.2-r0: # - CVE-2023-45288 # 1.22.1-r0: @@ -291,7 +294,7 @@ package() { } sha512sums=" -f2491d2b5d4ef2dd86ca7820503a2534cd1860822049dc01a6cb40b556a0812cfc4196fa83173765816060253ac949f4165b0fb4b2bed5d45e30d03bb69e434d go1.22.2.src.tar.gz +e6756866d3cf195f1afd3d852015f32dfb2de3648e30a78e9238a863eae192e9e7ccbcfd19fd97b1d552f35d51d62bf2104d81e35b8854a40400b0d61cf93672 go1.22.3.src.tar.gz 34dbe032c5f08dd8a7aad36fc4d54e746a876fdadc25466888a2f04f5a9d53103190ebd68d3cf978d3a041976185e30ffb25611fb577d031c159810d2d4c7c41 0001-cmd-link-prefer-musl-s-over-glibc-s-ld.so-during-dyn.patch 89ab4fbb2901d3907e9661dce877ee45b4a4ee07b964dca341235420ee08764f49aed5da1596d28c649e349af19ea49c03ab6f2c2ad7588a4cf950a619c10e9b 0002-misc-cgo-test-enable-setgid-tests-on-Alpine-Linux-ag.patch 8061e4ef9d7dd31804bd8d98c95afa5dd82567940b3436f45f874e0419e324b49713d8a814df04617e575ec3c6155199c4661352ea8aef63ead81ca3020f3dc4 0003-go.env-Don-t-switch-Go-toolchain-version-as-directed.patch diff --git a/community/go2rtc/APKBUILD b/community/go2rtc/APKBUILD index e3e377affcf..08f39a65268 100644 --- a/community/go2rtc/APKBUILD +++ b/community/go2rtc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Magnus Sandin <magnus.sandin@gmail.com> # Maintainer: Magnus Sandin <magnus.sandin@gmail.com> pkgname=go2rtc -pkgver=1.9.0 +pkgver=1.9.2 pkgrel=0 pkgdesc="Ultimate camera streaming application" url="https://github.com/AlexxIT/go2rtc" @@ -36,7 +36,7 @@ package() { } sha512sums=" -8880a4fee8ce1c97627987150c09585dc98d0703841bdf8295fa1db18339b29f27fafd180952cbb44d224721b05aac8cc716df747082302c9b938ef0dcd8781b go2rtc-1.9.0.tar.gz +52c75527feb1058689445a7cc62a6c76e3021c40a249ee7650a9fec8e82d928f7236c1793e18db0cd2c3fe9863f5d1abcfbbea5e6adf25ace7b615f8def4bf7b go2rtc-1.9.2.tar.gz b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706 go2rtc.confd bdbc15a16426455ff3bec1e9dbdbcb63f932bd85d634be96e7d46bddd55c63e8636303f39d5a069c62305d76b58d496cca7404f58913a1053553e1a675459733 go2rtc.initd 9fac59cdeb6f48c07fe6169e68e208c648b56cbe9841f0e6896908c55d494a2313f34f2f6902f1f21d33ebb030295d01098601245b5b7f61a4429c1d72678483 go2rtc.logrotate diff --git a/community/gocryptfs/APKBUILD b/community/gocryptfs/APKBUILD index 18b64896290..4e18570f89f 100644 --- a/community/gocryptfs/APKBUILD +++ b/community/gocryptfs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=gocryptfs pkgver=2.4.0 -pkgrel=6 +pkgrel=7 pkgdesc="Encrypted overlay filesystem written in Go" url="https://github.com/rfjakob/gocryptfs" arch="all" @@ -11,7 +11,9 @@ makedepends="go bash openssl-dev>3" depends="fuse" options="!check" # test requires fuse kernel module subpackages="$pkgname-doc" -source="https://github.com/rfjakob/gocryptfs/releases/download/v$pkgver/gocryptfs_v${pkgver}_src-deps.tar.gz" +source="https://github.com/rfjakob/gocryptfs/releases/download/v$pkgver/gocryptfs_v${pkgver}_src-deps.tar.gz + vendor-jacobsa-crypto-support-loongarch64.patch + " builddir="$srcdir/${pkgname}_v${pkgver}_src-deps" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" @@ -29,4 +31,5 @@ package() { sha512sums=" b46d6eee21a0194022a042d6ae2a737f221a0932bb899123438f2cf929ecb50635fcfc90012d6a04928fd4b2856d6e24d19392ce5aa87eea573fb58cf5a5d4e1 gocryptfs_v2.4.0_src-deps.tar.gz +cce3f02ab9b790a7f8403e044cca6ce5d39ba63442b6badad01213d4cc9ac8ca3d146901335d58123cb2b54dba75ee314387e5e9073a1402ab8abcbffd2c7224 vendor-jacobsa-crypto-support-loongarch64.patch " diff --git a/community/gocryptfs/vendor-jacobsa-crypto-support-loongarch64.patch b/community/gocryptfs/vendor-jacobsa-crypto-support-loongarch64.patch new file mode 100644 index 00000000000..9ec250f1b25 --- /dev/null +++ b/community/gocryptfs/vendor-jacobsa-crypto-support-loongarch64.patch @@ -0,0 +1,13 @@ +diff --git a/vendor/github.com/aperturerobotics/jacobsa-crypto/cmac/hash_64bit.go b/vendor/github.com/aperturerobotics/jacobsa-crypto/cmac/hash_64bit.go +index fe31eda..714381b 100644 +--- a/vendor/github.com/aperturerobotics/jacobsa-crypto/cmac/hash_64bit.go ++++ b/vendor/github.com/aperturerobotics/jacobsa-crypto/cmac/hash_64bit.go +@@ -13,7 +13,7 @@ + // See the License for the specific language governing permissions and + // limitations under the License. + +-// +build amd64 arm64 ppc64 ppc64le s390x mips64 mips64le ++// +build amd64 arm64 ppc64 ppc64le s390x mips64 mips64le loong64 + + // This code assumes that it's safe to perform unaligned word-sized loads. This is safe on: + // - arm64 per http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.den0024a/ch05s01s02.html diff --git a/community/gogs/APKBUILD b/community/gogs/APKBUILD index 5c87c65b307..29bddac9455 100644 --- a/community/gogs/APKBUILD +++ b/community/gogs/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=gogs pkgver=0.13.0 -pkgrel=11 +pkgrel=12 pkgdesc="Painless self-hosted Git service" url="https://gogs.io/" arch="all" diff --git a/community/goimapnotify/APKBUILD b/community/goimapnotify/APKBUILD index f09ef0fa694..b4897a63e6b 100644 --- a/community/goimapnotify/APKBUILD +++ b/community/goimapnotify/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Thomas Böhler <witcher@wiredspace.de> # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=goimapnotify -pkgver=2.3.12 +pkgver=2.3.15 pkgrel=1 pkgdesc="execute scripts on IMAP mailbox changes using IDLE, golang version" url="https://gitlab.com/shackra/goimapnotify" @@ -41,9 +41,9 @@ package() { install -Dm755 goimapnotify "$pkgdir"/usr/bin/goimapnotify install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE install -Dm644 README.md "$pkgdir"/usr/share/doc/"$pkgname"/README.md - install -Dm644 CHANGELOG.rst "$pkgdir"/usr/share/doc/"$pkgname"/CHANGELOG.rst + install -Dm644 CHANGELOG.md "$pkgdir"/usr/share/doc/"$pkgname"/CHANGELOG.md } sha512sums=" -c3061af4df07dc2e58b338b25a933b9bd31693e2a8a50fe7f6dcc921f8ee48975d97d9c3f9bea1804f3f6e2a0f282984d72152e7cc3e57a8485300369819461f goimapnotify-2.3.12.tar.gz +e78fcc3f83075fb86e905f558baf8602e4a9872f3b5dc57ea3a81a295a590c14cb64c51273460c0827646d3f9f55465474828db48c00b043ded6e628f00c6357 goimapnotify-2.3.15.tar.gz " diff --git a/community/gojq/APKBUILD b/community/gojq/APKBUILD index 5ce4c3a46df..ea38e5ed184 100644 --- a/community/gojq/APKBUILD +++ b/community/gojq/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=gojq pkgver=0.12.15 -pkgrel=0 +pkgrel=1 pkgdesc="Pure Go implementation of jq" url="https://github.com/itchyny/gojq" license="MIT" diff --git a/community/golangci-lint/APKBUILD b/community/golangci-lint/APKBUILD index 9cc8d995b67..0c6121631f4 100644 --- a/community/golangci-lint/APKBUILD +++ b/community/golangci-lint/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=golangci-lint pkgver=1.57.2 -pkgrel=0 +pkgrel=1 pkgdesc="Fast linters runner for Go" url="https://golangci-lint.run/" arch="all" diff --git a/community/gomaildrop/APKBUILD b/community/gomaildrop/APKBUILD index 67aa111134b..a04f82b34c5 100644 --- a/community/gomaildrop/APKBUILD +++ b/community/gomaildrop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=gomaildrop pkgver=0.1.2 -pkgrel=6 +pkgrel=7 pkgdesc="deliver e-mail to local maildirs based on filters" url="https://gitlab.alpinelinux.org/kdaudt/gomaildrop" arch="all" diff --git a/community/gomplate/APKBUILD b/community/gomplate/APKBUILD index a67d0093ef8..d1bff8afab4 100644 --- a/community/gomplate/APKBUILD +++ b/community/gomplate/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Dave Henderson <dhenderson@gmail.com> pkgname=gomplate pkgver=3.11.7 -pkgrel=3 +pkgrel=4 pkgdesc="A versatile Go template processor" url="https://github.com/hairyhenderson/gomplate" arch="all" diff --git a/community/gomuks/APKBUILD b/community/gomuks/APKBUILD index eae77b5efb9..8acad7a2ddb 100644 --- a/community/gomuks/APKBUILD +++ b/community/gomuks/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Julian Weigt <juw@posteo.de> pkgname=gomuks pkgver=0.3.0 -pkgrel=12 +pkgrel=13 pkgdesc="terminal-based Matrix client written in Go" url="https://github.com/tulir/gomuks" arch="all" diff --git a/community/gonic/APKBUILD b/community/gonic/APKBUILD index de75e2db426..b4966f20df5 100644 --- a/community/gonic/APKBUILD +++ b/community/gonic/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Alex McGrath <amk@amk.ie> pkgname=gonic pkgver=0.16.2 -pkgrel=2 +pkgrel=3 pkgdesc="Subsonic compatible music streaming server" url="https://github.com/sentriz/gonic" arch="all" diff --git a/community/gopass/APKBUILD b/community/gopass/APKBUILD index f23edd255f0..89bca92b253 100644 --- a/community/gopass/APKBUILD +++ b/community/gopass/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Anjandev Momi <anjan@momi.ca> pkgname=gopass pkgver=1.15.13 -pkgrel=0 +pkgrel=1 pkgdesc="The slightly more awesome Standard Unix Password Manager for Teams. Written in Go." url="https://www.gopass.pw" arch="all" diff --git a/community/gopls/APKBUILD b/community/gopls/APKBUILD index e25311d7ce6..39170c8a4cb 100644 --- a/community/gopls/APKBUILD +++ b/community/gopls/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: David Florness <david@florness.com> pkgname=gopls pkgver=0.14.2 -pkgrel=2 +pkgrel=3 pkgdesc="Language server for Go programming language" url="https://github.com/golang/tools/blob/master/gopls" license="BSD-3-Clause" diff --git a/community/gops/APKBUILD b/community/gops/APKBUILD index 856337d65cf..046ab6914d6 100644 --- a/community/gops/APKBUILD +++ b/community/gops/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=gops pkgver=0.3.28 -pkgrel=4 +pkgrel=5 pkgdesc="List and diagnose Go processes currently running on your system" url="https://github.com/google/gops" license="BSD-3-Clause" diff --git a/community/gosec/APKBUILD b/community/gosec/APKBUILD index b95a64df97c..21bab16264a 100644 --- a/community/gosec/APKBUILD +++ b/community/gosec/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=gosec -pkgver=2.19.0 -pkgrel=2 +pkgver=2.20.0 +pkgrel=1 pkgdesc="Go source code static analyzer, focusing on security" url="https://github.com/securego/gosec" arch="all" @@ -30,5 +30,5 @@ package() { } sha512sums=" -96bd3e25761b07fdd4a0ee7d79bf8f8ed35ed7e8b1dcc6033741fd1e0bcdc44807b8e497b6c29551ca7baf94807bbfadbcea36632cdc1c0b7d25b0eed6068016 gosec-2.19.0.tar.gz +47dfd4ff9e280009bc9dc69d4f46aa8fc89c3d30542161b719d22f7bfb6c8d1a3f1c25a987201d0f384b05b555f2e56dd176b5d9c62c70af3b862dfaddfd708d gosec-2.20.0.tar.gz " diff --git a/community/got/APKBUILD b/community/got/APKBUILD index 3b0c0f25468..7bdc30ca251 100644 --- a/community/got/APKBUILD +++ b/community/got/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=got _pkgname=got-portable -pkgver=0.98.2 +pkgver=0.99 pkgrel=0 pkgdesc="A VCS which prioritizes ease of use and simplicity over flexibility" url="https://gameoftrees.org/" @@ -36,5 +36,5 @@ package() { } sha512sums=" -b7b9e7e043a201c19dd4c99997acd561418d683c3c4c34207014f4f616cf9514822dcee56c477192709db3f6fa4b2ce9a48bb4692d560d05a3c04ce3fdf46516 got-portable-0.98.2.tar.gz +59504e9d0fe507f255a51aa0e565f69b190d7e94147c0848066919a932f44ff0724d841ba872c3ad34383e65adc1bffd30927a13add9314975bb613d2aa6b5f1 got-portable-0.99.tar.gz " diff --git a/community/gotop/APKBUILD b/community/gotop/APKBUILD index 59956e0a7f1..ab544735124 100644 --- a/community/gotop/APKBUILD +++ b/community/gotop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Steven Guikal <void@fluix.one> pkgname=gotop pkgver=4.2.0 -pkgrel=13 +pkgrel=14 pkgdesc="Terminal based graphical activity monitor" url="https://github.com/xxxserxxx/gotop" arch="all" diff --git a/community/gotosocial/APKBUILD b/community/gotosocial/APKBUILD index 9d803adec37..3c8b7c78553 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=2 pkgdesc="An ActivityPub social network server" url="https://github.com/superseriousbusiness/gotosocial" arch="all" @@ -15,6 +15,7 @@ subpackages="$pkgname-openrc" source="https://github.com/superseriousbusiness/gotosocial/releases/download/v$pkgver/gotosocial-$pkgver-source-code.tar.gz gotosocial.initd 10-config.patch + update-go-mod.patch " builddir="$srcdir" @@ -29,6 +30,14 @@ export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" +prepare() { + default_prepare + + # Because patches modified go.mod, The vendor needs + # to be update. + go mod vendor +} + build() { yarn --cwd ./web/source install yarn --cwd ./web/source ts-patch install @@ -61,6 +70,7 @@ package() { sha512sums=" de1f17892b3eeb62751ab61a782f74728fc36d80eb9ec27bec7ebdd3317a586850dc78d0be9862d561e9da07b1228ca57223af0f5caaf6ad811e10e0677f3f6a gotosocial-0.15.0-source-code.tar.gz -231908db00d0975ed10518a96760f401f90cdbb8475189446a8a7a95b889784ab4ee1d082010f379cb0b7994401dbed4a574b2fe9a316c2efdf4427202c971ee gotosocial.initd +b84bbd5e00d886d018311898a3e212c9d800c1688a5bd27f159e08a224a3c774513236f67288a7d77f22c4b55b75322972909b545d243f033812ab757ec2fd4b gotosocial.initd e1030586395c7bcca2bf348f764bb51de75e503a29c163e95f155b2192e213db61376f0b15e957813be917ba7f5d28abc8c4e944971ea6db64088424add97874 10-config.patch +4126c417a7ba4ed14375d52cf8a54ef30e2a3dddeb84efb198fc661e466ee630bd7a9b8aa4ffae510e8564d5a9883d6888a1b9c279ceaf549ee9217d751193f4 update-go-mod.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/gotosocial/update-go-mod.patch b/community/gotosocial/update-go-mod.patch new file mode 100644 index 00000000000..218f918c26d --- /dev/null +++ b/community/gotosocial/update-go-mod.patch @@ -0,0 +1,192 @@ +diff --git a/go.mod b/go.mod +index df77d26..73c6bcd 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,10 +1,10 @@ + module github.com/superseriousbusiness/gotosocial + +-go 1.21 ++go 1.21.0 + +-replace modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.29.5-concurrency-workaround ++replace modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.29.9-concurrency-workaround + +-toolchain go1.21.3 ++toolchain go1.22.3 + + require ( + codeberg.org/gruf/go-bytes v1.0.2 +@@ -99,7 +99,7 @@ require ( + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect + github.com/chenzhuoyu/iasm v0.9.1 // indirect +- github.com/cilium/ebpf v0.9.1 // indirect ++ github.com/cilium/ebpf v0.15.0 // indirect + github.com/containerd/cgroups/v3 v3.0.1 // indirect + github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/cornelk/hashmap v1.0.8 // indirect +@@ -184,7 +184,7 @@ require ( + github.com/prometheus/procfs v0.12.0 // indirect + github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b // indirect + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect +- github.com/rogpeppe/go-internal v1.10.0 // indirect ++ github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/rs/xid v1.5.0 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect +@@ -211,10 +211,10 @@ require ( + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/arch v0.7.0 // indirect + golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect +- golang.org/x/mod v0.14.0 // indirect ++ golang.org/x/mod v0.16.0 // indirect + golang.org/x/sync v0.6.0 // indirect +- golang.org/x/sys v0.18.0 // indirect +- golang.org/x/tools v0.17.0 // indirect ++ golang.org/x/sys v0.19.0 // indirect ++ golang.org/x/tools v0.19.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect + google.golang.org/grpc v1.61.1 // indirect +@@ -222,9 +222,9 @@ require ( + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect +- modernc.org/libc v1.41.0 // indirect ++ modernc.org/libc v1.49.3 // indirect + modernc.org/mathutil v1.6.0 // indirect +- modernc.org/memory v1.7.2 // indirect ++ modernc.org/memory v1.8.0 // indirect + modernc.org/strutil v1.2.0 // indirect + modernc.org/token v1.1.0 // indirect + ) +diff --git a/go.sum b/go.sum +index 2fa4c8c..105cf46 100644 +--- a/go.sum ++++ b/go.sum +@@ -126,8 +126,8 @@ github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLI + github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= + github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= + github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +-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.15.0 h1:7NxJhNiBT3NG8pZJ3c+yfrVdHY8ScgKD27sScgjLMMk= ++github.com/cilium/ebpf v0.15.0/go.mod h1:DHp1WyrLeiBh19Cf/tfiSMhqheEiK8fXFZ4No0P1Hso= + 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/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 h1:ox2F0PSMlrAAiAdknSRMDrAr8mfxPCfSZolH+/qQnyQ= +@@ -269,6 +269,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn + github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= + github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4= + github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= ++github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI= ++github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow= + github.com/go-session/session v3.1.2+incompatible/go.mod h1:8B3iivBQjrz/JtC68Np2T1yBBLxTan3mn/3OM0CyRt0= + github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= + github.com/go-swagger/go-swagger v0.30.5 h1:SQ2+xSonWjjoEMOV5tcOnZJVlfyUfCBhGQGArS1b9+U= +@@ -373,8 +375,8 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf + github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= + github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= + github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +-github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= +-github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= ++github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo= ++github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= + github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= + 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= +@@ -483,8 +485,6 @@ github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope + github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= + github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= + github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +-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/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= + github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= + github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58= +@@ -564,8 +564,8 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR + github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= + github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= + github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= ++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/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= + github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= + github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +@@ -720,8 +720,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de + github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= + github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U= + github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= +-gitlab.com/NyaaaWhatsUpDoc/sqlite v1.29.5-concurrency-workaround h1:cyYnGCVJ0zLW2Q0pCepy++ERHegWcKpl5JD1MiTKUuw= +-gitlab.com/NyaaaWhatsUpDoc/sqlite v1.29.5-concurrency-workaround/go.mod h1:S02dvcmm7TnTRvGhv8IGYyLnIt7AS2KPaB1F/71p75U= ++gitlab.com/NyaaaWhatsUpDoc/sqlite v1.29.9-concurrency-workaround h1:gFAlklid3jyXIuZBy5Vy0dhG+F6YBgosRy4syT5CDsg= ++gitlab.com/NyaaaWhatsUpDoc/sqlite v1.29.9-concurrency-workaround/go.mod h1:ItX2a1OVGgNsFh6Dv60JQvGfJfTPHPVpV6DF59akYOA= + go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= + go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= + go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8= +@@ -810,8 +810,8 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB + golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= + golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= ++golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= ++golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= + golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= + golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= + golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +@@ -916,8 +916,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc + golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= ++golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= ++golang.org/x/sys v0.19.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.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +@@ -983,8 +983,8 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc + golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= + golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= + golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +-golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +-golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= ++golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= ++golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= + 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= +@@ -1109,16 +1109,26 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh + honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= + honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= + honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= ++modernc.org/cc/v4 v4.20.0 h1:45Or8mQfbUqJOG9WaxvlFYOAQO0lQ5RvqBcFCXngjxk= ++modernc.org/cc/v4 v4.20.0/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ= ++modernc.org/ccgo/v4 v4.16.0 h1:ofwORa6vx2FMm0916/CkZjpFPSR70VwTjUCe2Eg5BnA= ++modernc.org/ccgo/v4 v4.16.0/go.mod h1:dkNyWIjFrVIZ68DTo36vHK+6/ShBn4ysU61So6PIqCI= + modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE= + modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ= ++modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw= ++modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU= + 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/libc v1.49.3 h1:j2MRCRdwJI2ls/sGbeSk0t2bypOG/uvPZUsGQFDulqg= ++modernc.org/libc v1.49.3/go.mod h1:yMZuGkn7pXbKfoT/M35gFJOAEdSKdxL0q64sF7KqCDo= + 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/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E= ++modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU= ++modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= ++modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= ++modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc= ++modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss= + 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= diff --git a/community/govc/APKBUILD b/community/govc/APKBUILD index 25565e8e19e..a0daf614895 100644 --- a/community/govc/APKBUILD +++ b/community/govc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=govc -pkgver=0.37.1 +pkgver=0.37.2 pkgrel=0 pkgdesc="vSphere CLI built on top of govmomi" url="https://github.com/vmware/govmomi/blob/main/govc/README.md" @@ -27,5 +27,5 @@ package() { } sha512sums=" -b191c043a596ba8a0528c3f1761736d8ed50a4129e37db58dd16ecbfa1f78f175168ed273e920c1d74377244687a6d10feb7a10683b2f516899156febef9e11c govc-0.37.1.tar.gz +e0e6c013cc263d53313e52fcdd376b5838eb74a072e1c399e2497a5b4038d9210e3c4a48e76e332903e5fdc34bcb3a746ca86cff2d00197e7609933e19bd1409 govc-0.37.2.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/gphoto2/APKBUILD b/community/gphoto2/APKBUILD index a2ec9aaac4a..4dfe75c29f2 100644 --- a/community/gphoto2/APKBUILD +++ b/community/gphoto2/APKBUILD @@ -14,6 +14,10 @@ source="https://sourceforge.net/projects/gphoto/files/gphoto/$pkgver/gphoto2-$pk 0001-cast-mtime-to-long-long-to-avoid-32bit-time-issues.patch " +prepare() { + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/gpick/APKBUILD b/community/gpick/APKBUILD index ee9c357812b..fdc9c8cb4ce 100644 --- a/community/gpick/APKBUILD +++ b/community/gpick/APKBUILD @@ -1,8 +1,8 @@ # 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" diff --git a/community/grafana-frontend/APKBUILD b/community/grafana-frontend/APKBUILD index 1cbcb9fd03c..1db111fd69d 100644 --- a/community/grafana-frontend/APKBUILD +++ b/community/grafana-frontend/APKBUILD @@ -12,7 +12,7 @@ # This is also a reason why we use prebuilt frontend archive. pkgname=grafana-frontend -pkgver=10.4.2 +pkgver=11.0.0 pkgrel=0 pkgdesc="Open source, feature rich metrics dashboard and graph editor (frontend files)" url="https://grafana.com" @@ -28,5 +28,5 @@ package() { } sha512sums=" -487413919d6702a62e4f0c6f32957341f38fe1d1c4190c595d415b6c034f3f6235faf3ea53b8a956d788a42fc41b14655220f9cc1e63c5a5e53ada465147d2ea grafana-frontend-10.4.2-bin.tar.gz +87c70e34987966178431eebaa8a5dbf0188dcb9ba82f50f197a0bb25e7cd2fec52d845d1041f0abefd2b283033eab340eb9bd45535bec22ec76b9f0a35fd25ad grafana-frontend-11.0.0-bin.tar.gz " diff --git a/community/grafana/APKBUILD b/community/grafana/APKBUILD index c2e1788dacb..2dd4cfba59b 100644 --- a/community/grafana/APKBUILD +++ b/community/grafana/APKBUILD @@ -4,15 +4,15 @@ # Keep in sync with grafana-frontend. pkgname=grafana -pkgver=10.4.2 +pkgver=11.0.0 pkgrel=0 -_commit=22809dea504 # git rev-parse --short HEAD -_stamp=1712755180 # git --no-pager show -s --format=%ct +_commit=277ef258d4b # git rev-parse --short HEAD +_stamp=1715585693 # git --no-pager show -s --format=%ct pkgdesc="Open source, feature rich metrics dashboard and graph editor" url="https://grafana.com" # x86, armhf, armv7: many test failures, for example https://github.com/grafana/grafana/issues/26389 -# s390x: test failures https://github.com/grafana/grafana/issues/26390 -arch="all !s390x !x86 !armhf !armv7" +# riscv64: tests don't finish in an hour on CI +arch="all !x86 !armhf !armv7 !riscv64" license="AGPL-3.0-only" depends="grafana-frontend~=$pkgver" makedepends="go sqlite-dev wire-go" @@ -86,7 +86,7 @@ package() { } sha512sums=" -dca12ae13c802f79809ddfa8580cd890f33b8295b55c193c615304b190dacb38fd5f03c9160a546afb4e8c91b3781d2ad717e10593a462824bff7cb751fdf9a3 grafana-10.4.2.tar.gz +5ac909b9d90a06afcbf1c24fe911e9604f6d4777f0cd38efce1fb4bc1e52bd7b15578e95c98378b6b0e074da5d6bdf3989adea58627da1a08aff24efe2562a84 grafana-11.0.0.tar.gz 52793ecc49d0c355e11d3ae2a5c047b36c7b0dc687bd1b9f24a20e96a477ffe44ee70295d005bb202cf5b0294d63400066a236b7969cd4eb54d65e9f88d2a40d grafana.initd 055299dd0f3a3a42c7787246f5ffcc2571adcf298a9e0b572313764d532104b8a33becd387b9c7bc4361993e7333a4cb1658d354b0a786b36479f9d8c31adab8 grafana.confd 42472cad4b209fd9d63b0fe9a6a37d832a63309cc8cf08266085461dd6d08da9060b7956d44ef1be5c6a8f2fab5dca0803da00a85578a1bbde25e8c26c92f95d grafana-cli.sh diff --git a/community/granatier/APKBUILD b/community/granatier/APKBUILD index 23db4fc72a7..fbd51958038 100644 --- a/community/granatier/APKBUILD +++ b/community/granatier/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=granatier -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -50,5 +50,5 @@ package() { } sha512sums=" -dd3c56807141daee192919771aa57ef49042eb4a8d8f4b692116f72e03bf0b68aa59ad5d816b1ab3569705db797dd7a3ef3e0992b4c4685763337250b986579d granatier-24.02.2.tar.xz +34532b1299bae738666fd7e4098549bf6cadaf4ca5abcfa136582b8d77b9c3abb9fe6000c95f901e4368e4d0d4a9160858a7e9027fa8d92520d18701983af1d5 granatier-24.05.0.tar.xz " diff --git a/community/grantlee-editor/APKBUILD b/community/grantlee-editor/APKBUILD index 4db92f0deec..2adf003e6b7 100644 --- a/community/grantlee-editor/APKBUILD +++ b/community/grantlee-editor/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=grantlee-editor -pkgver=24.02.2 +pkgver=24.05.0 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=" @@ -57,5 +58,5 @@ package() { } sha512sums=" -28d91691f5116c4a0f52f207a3c5199a6402b2d623024e0b30b2e93bc0d21fc171bd7a5b7faa99471d851760839494efd0abbfcb69ec47acdaaf4a6f2c0a1f29 grantlee-editor-24.02.2.tar.xz +09a5a16c2b4edddb61599e98c6a11f72c56561b14acbe7a4b121c41e8af16a462edd6754cd011cea47102f2d03a436ef4326fc5a56f2ace4072f46015d1c0aec grantlee-editor-24.05.0.tar.xz " diff --git a/community/grantleetheme/APKBUILD b/community/grantleetheme/APKBUILD index 0bf9be94235..c7e4d696a40 100644 --- a/community/grantleetheme/APKBUILD +++ b/community/grantleetheme/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=grantleetheme -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="KDE PIM mail related libraries" # armhf blocked by extra-cmake-modules @@ -47,5 +47,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -acb458acc29ccd40978e9b02224a12da4625b2be393779e90ab25ed02a6a0dd96963da10d3686e6cc8dfb41a87dbae8b30bd38bfd0111b724800918be09d6cd0 grantleetheme-24.02.2.tar.xz +7fb4bb0ec6eb521788ab42f767dcf16eb02e1a9160c57083389fe0783d22d99ac34d4f913726e7c2f36bca7b09a2d34ed39356e03257f1ac72d0ddb48daced6d grantleetheme-24.05.0.tar.xz " diff --git a/community/grass-gis/APKBUILD b/community/grass-gis/APKBUILD index 3a1c345ff2b..8682023a452 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=2 +pkgrel=3 pkgdesc="Geographic Resources Analysis Support System" url="https://grass.osgeo.org" arch="all !s390x" # s390x: tests fail @@ -69,10 +69,6 @@ case "$CARCH" in esac build() { - if [ "$CBUILD" != "$CHOST" ]; then - CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" - fi - # Ancient autoconf used upstream can't handle CPPFLAGS correctly, so set CPP to ignore warnings CPP="gcc -E -w" \ ./configure \ diff --git a/community/greetd-tuigreet/APKBUILD b/community/greetd-tuigreet/APKBUILD index cacf4c346b9..485bee04b5a 100644 --- a/community/greetd-tuigreet/APKBUILD +++ b/community/greetd-tuigreet/APKBUILD @@ -8,7 +8,8 @@ pkgdesc="Graphical console greeter for greetd" url="https://github.com/apognu/tuigreet" # riscv64: blocked by cargo # s390x: no desktop on this arch -arch="all !riscv64 !s390x" +# loongarch64: fail to build nix +arch="all !riscv64 !s390x !loongarch64" license="GPL-3.0" depends="greetd" makedepends="cargo scdoc cargo-auditable" diff --git a/community/greetd/APKBUILD b/community/greetd/APKBUILD index e8baa07efa5..abb5bbc2875 100644 --- a/community/greetd/APKBUILD +++ b/community/greetd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sean McAvoy <seanmcavoy@gmail.com> pkgname=greetd pkgver=0.10.0 -pkgrel=0 +pkgrel=1 pkgdesc="Minimal and flexible login manager daemon" url="https://git.sr.ht/~kennylevinsen/greetd" # riscv64: blocked by cargo @@ -30,6 +30,7 @@ source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~kennylevinsen/greetd/archive $pkgname.confd config.patch change-default-vt.patch + cargo-update.patch " export RUSTFLAGS="$RUSTFLAGS --remap-path-prefix=$builddir=/build/" @@ -46,7 +47,7 @@ build() { } check() { - cargo check --frozen + cargo test --frozen } package() { @@ -76,4 +77,5 @@ b2bfbbd4d9fca94ccc623f4f4fc2c3f9518319c96641ecc2c2f10bb6aa8f2b41633b651ed4396269 4e955bc8ba9df6db48f6e86a84af352b550520f39a3945e1fae4a53064bed96b001cf34437199ae03780f72be4125dc65e3ff65704fc67b4addfb738f03c4811 greetd.confd 98ebd6c77c857d5d1d66aea0c5c22669e9af2f6032bcde89f5b08e4c19d3370c3130307c2796a0b42c4695649594964a96999cab8a9d1d8716cdc97637298ddb config.patch fb3895d41903cd28952e8642c496b302692b4c35f6b89230fd3746b773f74be561c87a815b622a8914a87285bc715359c7ecadadd3e166ee01b8120326f20ff4 change-default-vt.patch +7916b3bd9d622bb45e293563c2f694b8dd20be9c19f333045beb32144a44f11eea7f49a7f808c1d5bd158c542f150f2c1b67b54546c22dc19145ffc4cfdf43c9 cargo-update.patch " diff --git a/community/greetd/cargo-update.patch b/community/greetd/cargo-update.patch new file mode 100644 index 00000000000..84933bb92f8 --- /dev/null +++ b/community/greetd/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index d21f859..30b621d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -154,9 +154,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "memchr" diff --git a/community/grype/APKBUILD b/community/grype/APKBUILD index e8a95f0c0f2..052809c3d68 100644 --- a/community/grype/APKBUILD +++ b/community/grype/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=grype -pkgver=0.74.7 -pkgrel=2 +pkgver=0.77.4 +pkgrel=0 pkgdesc="Vulnerability scanner for container images, filesystems, and SBOMs" url="https://github.com/anchore/grype" license="Apache-2.0" @@ -45,5 +45,5 @@ package() { } sha512sums=" -b69a652d9e38351918ec1e590e7bc8ec52349c79abe23ab3249f1aa05aa63902389d4e493cb3e8cbfcf38efc19167051f5464172b66534101ccf43894c7947ff grype-0.74.7.tar.gz +c1a70050afa715b431f1bd8d2cb4f9c201991ad4a1eec4cf09722f081183870cc195cee8707a8826d9abb5aedefcf8d869a26ad5b9f8efdabeb4cdcc6be22f64 grype-0.77.4.tar.gz " 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 26450e79609..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.3 +pkgver=4.14.4 pkgrel=0 pkgdesc="The GTK Toolkit (v4)" url="https://www.gtk.org/" @@ -121,5 +121,5 @@ lang() { } sha512sums=" -2502fff3e98cb45f2293c94d86c32ff9b7c88d72eb7500a19fc9e589e1eda69af94c4eae78c044dcf5cf345cb99537d264250115d633034d9552cadc67f71e8e gtk-4.14.3.tar.xz +33a983f4ebac9088eaf9d3794a171d1619632bbcb27d9f46d894305dc15f83615a18443598b3c62a553b9596438b58226560ba17c41e539c76c3ee8a2b62c651 gtk-4.14.4.tar.xz " diff --git a/community/gtkmm/APKBUILD b/community/gtkmm/APKBUILD index bbf639494ac..af1831b578f 100644 --- a/community/gtkmm/APKBUILD +++ b/community/gtkmm/APKBUILD @@ -11,6 +11,11 @@ makedepends="$depends_dev intltool gtk+2.0-dev" subpackages="$pkgname-devhelp $pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/gtkmm/${pkgver%.*}/gtkmm-$pkgver.tar.xz" +prepare() { + default_prepare + update_config_sub +} + build() { CXXFLAGS="$CXXFLAGS -std=c++11" \ ./configure \ 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/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/guix/APKBUILD b/community/guix/APKBUILD index ed4a20fd320..669aab82645 100644 --- a/community/guix/APKBUILD +++ b/community/guix/APKBUILD @@ -5,8 +5,8 @@ pkgver=1.4.0 pkgrel=5 pkgdesc="Functional package manager based on Guile Scheme" url="https://guix.gnu.org" -# s390x not supported upstream -arch="all !s390x" +# s390x loongarch64 not supported upstream +arch="all !s390x !loongarch64" license="GPL-3.0-or-later" depends=" guile diff --git a/community/gum/APKBUILD b/community/gum/APKBUILD index bb045464787..92a2ce3c3c5 100644 --- a/community/gum/APKBUILD +++ b/community/gum/APKBUILD @@ -1,8 +1,9 @@ # Contributor: Grigory Kirillov <txgk@bk.ru> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=gum -pkgver=0.14.0 -pkgrel=0 +pkgver=0.13.0 +pkgrel=3 +# 0.14.0 contains many regressions - don't upgrade until they get fixed pkgdesc="Highly configurable utilities for writing interactive shell scripts" url="https://github.com/charmbracelet/gum" arch="all" @@ -48,5 +49,5 @@ package() { } sha512sums=" -600014a5f1215dbbe8045a02feda00335e8007875dedc25cbb0e48ecbc4bc23ffa0e584bb515dd79c83fccc9bffc1fe37973299fda663d9475a9ecd8978eccf0 gum-v0.14.0.tar.gz +e101ddb3fd6d29bfe6e1ce08aa0f4d829e3e8547a41da3ea7e901f0b234ec2f60655be0f34ed77ab23eaf853840dbc77ed08c8f7336b51f1b129165537cfb1af gum-v0.13.0.tar.gz " diff --git a/community/gvmd/APKBUILD b/community/gvmd/APKBUILD index 1a722475228..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.5.2 +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=" -4708fe0033d5244a988560ca9cbe8b0d5be0006690cc5c943eec3cd534329d776a556766a57257a07d40132fa5239455b9f71b4d0e9a5a4ba66d63436c2bc9f4 gvmd-23.5.2.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..0fe6fb57507 100644 --- a/community/gwenview/APKBUILD +++ b/community/gwenview/APKBUILD @@ -4,11 +4,11 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=gwenview -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -79,5 +79,5 @@ package() { } sha512sums=" -0c5d699b6f0d23e4517dc1b41f00d54e06ba7701ab22cf7822abffb937fa9dce39973ad8e6885c605a292665c4d422a2da0c4ad7a148953ef98d08c73dd48d5e gwenview-24.02.2.tar.xz +6a768f304f65cac242cfe94d7bf6b8abbafed0c0aa1c3c987e6dfe9587366133fa187bd8132b490d5488bf0e7c39d417935a51e6007d91fd5fb4cfefec73ee6a gwenview-24.05.0.tar.xz " diff --git a/community/halloy/APKBUILD b/community/halloy/APKBUILD index 02999561912..6ff6d45d633 100644 --- a/community/halloy/APKBUILD +++ b/community/halloy/APKBUILD @@ -5,8 +5,8 @@ pkgver=2024.7 pkgrel=0 pkgdesc="Rust graphical IRC client supporting IRCv3.2 capabilities" url="https://github.com/squidowl/halloy" -# s390x: nix crate -arch="all !s390x" +# s390x, loongarch64: nix crate +arch="all !s390x !loongarch64" license="GPL-3.0-or-later" makedepends=" cargo 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/harsh/APKBUILD b/community/harsh/APKBUILD index c4005579603..98cae3b5822 100644 --- a/community/harsh/APKBUILD +++ b/community/harsh/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Willow Barraco <contact@willowbarraco.fr> pkgname=harsh pkgver=0.8.31 -pkgrel=2 +pkgrel=3 pkgdesc="Habit tracking for geeks" url="https://github.com/wakatara/harsh" arch="all" diff --git a/community/haruna/APKBUILD b/community/haruna/APKBUILD index 6b8b80fc172..8d4ed0f2122 100644 --- a/community/haruna/APKBUILD +++ b/community/haruna/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> -# Maintainer: 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=haruna -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -55,5 +55,5 @@ package() { } sha512sums=" -8ded69235b2243644a396825cf5fbe497b1c6c96fa28a3948771efba12f22d3bb88076099b0b4d330bb7c3b4ad7846b759f50cb49111dbe71c6638741fd3bb2a haruna-1.1.0.tar.xz +d08c29aa06e38ca5e0b52874417c7b4cd5bfbbd1cdfdda3af05f79ceae0d1e6dc30905d01ed9c13df8c9622f6874367bd458c685895b4613f8688c973f9b1340 haruna-1.1.1.tar.xz " diff --git a/community/hcloud/APKBUILD b/community/hcloud/APKBUILD index 5e956966898..4e542c182df 100644 --- a/community/hcloud/APKBUILD +++ b/community/hcloud/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=hcloud pkgver=1.38.3 -pkgrel=4 +pkgrel=5 pkgdesc="Command-line interface for Hetzner Cloud" url="https://github.com/hetznercloud/cli" license="MIT" diff --git a/community/hd-idle/APKBUILD b/community/hd-idle/APKBUILD index a6949911e2f..aa3e5de28ab 100644 --- a/community/hd-idle/APKBUILD +++ b/community/hd-idle/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=hd-idle pkgver=1.21 -pkgrel=3 +pkgrel=4 pkgdesc="spin down idle hard disks" url="https://github.com/adelolmo/hd-idle" arch="all" diff --git a/community/headlines/APKBUILD b/community/headlines/APKBUILD index d7ff3decf22..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=6 +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/community/helm/APKBUILD b/community/helm/APKBUILD index 10795dcf8ea..641182ffd3f 100644 --- a/community/helm/APKBUILD +++ b/community/helm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: techknowlogick <techknowlogick@gitea.io> pkgname=helm pkgver=3.14.3 -pkgrel=1 +pkgrel=2 pkgdesc="The Kubernetes Package Manager" url="https://helm.sh/" arch="all" diff --git a/community/heplify-server/APKBUILD b/community/heplify-server/APKBUILD index e4d61ddfbad..33d893c7b95 100644 --- a/community/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=3 +pkgrel=4 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" ;; diff --git a/community/heplify/APKBUILD b/community/heplify/APKBUILD index 3fe70b3d2e0..7cdad90de4e 100644 --- a/community/heplify/APKBUILD +++ b/community/heplify/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=heplify pkgver=1.66.2 -pkgrel=1 +pkgrel=2 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" diff --git a/community/hexagonrpcd/APKBUILD b/community/hexagonrpcd/APKBUILD index 1af535d0957..e08f1312e4e 100644 --- a/community/hexagonrpcd/APKBUILD +++ b/community/hexagonrpcd/APKBUILD @@ -1,48 +1,57 @@ # Maintainer: Dylan Van Assche <me@dylanvanassche.be> pkgname=hexagonrpcd -pkgver=0.1.0 -pkgrel=0 +pkgver=0.3.2 +pkgrel=1 pkgdesc="Qualcomm HexagonFS daemon" -url="https://gitlab.com/flamingradian/sensh/" -arch="all" +url="https://gitlab.com/sdm670-mainline/hexagonrpc" +# s390x: fails on 1 test. Hexagonrpcd is specific to Qualcomm ARM SoCs, so let's ignore it for now. +arch="all !s390x" license="GPL-3.0-or-later" makedepends="linux-headers meson" install="$pkgname.pre-install" subpackages="$pkgname-openrc" -source="https://gitlab.com/flamingradian/sensh/-/archive/v$pkgver/sensh-v$pkgver.tar.gz - noshared.patch + +source="https://gitlab.com/sdm670-mainline/hexagonrpc/-/archive/v$pkgver/hexagonrpc-v$pkgver.tar.gz 10-fastrpc.rules $pkgname-adsp-rootpd.initd $pkgname-adsp-sensorspd.initd $pkgname-sdsp.initd + $pkgname.confd " -builddir="$srcdir/sensh-v$pkgver/fastrpc" -options="!check" # no tests +builddir="$srcdir/hexagonrpc-v$pkgver" build() { abuild-meson \ -Db_lto=true \ + -Dhexagonrpcd_verbose=false \ . output meson compile -C output } +check() { + meson test -C output +} + package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output # Allow access for FastRPC node for FastRPC user/group - install -Dm 644 "$srcdir"/10-fastrpc.rules -t "$pkgdir"/usr/lib/udev/rules.d/ + install -Dm644 "$srcdir"/10-fastrpc.rules -t "$pkgdir"/usr/lib/udev/rules.d/ install -Dm755 "$srcdir"/$pkgname-adsp-rootpd.initd "$pkgdir"/etc/init.d/$pkgname-adsp-rootpd install -Dm755 "$srcdir"/$pkgname-adsp-sensorspd.initd "$pkgdir"/etc/init.d/$pkgname-adsp-sensorspd install -Dm755 "$srcdir"/$pkgname-sdsp.initd "$pkgdir"/etc/init.d/$pkgname-sdsp + install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname-sdsp + install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname-adsp-rootpd + install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname-adsp-sensorspd } sha512sums=" -130cbaeacc99e69189d60bdcd748c3554317615ae6cbf76cf49d62036c7fa7ed8fdfcba48455a5fd9345c133e6c1a3f9a628c9de53d82963ab6627f762023cf6 sensh-v0.1.0.tar.gz -271be1fd15b864ef5a6e2a44279f1cce3079f2279b4527c0b3ddf0a957941cc8013593dacb6764196de1a12a9dcd3adbb6457be45bddae7c211db88c8837e9e0 noshared.patch +4d6171b2bbbb2df93a1324daafe0b279728531ae7c0b5e218a93de0ae6097f9c651ed416185b61ac276db28eb4d2b652a8636d65f34e34c03a4d7f9b2aee8fd0 hexagonrpc-v0.3.2.tar.gz f931cf5f901a7c17ffb0eb194b5de2c532fd238692898bf264c484b13b93119c9727bd8f8daf6a7d1668cc9108a9a0662231d300c6f1376e3e4edd3ce41d235d 10-fastrpc.rules -a3eafd8eb350920db272fe859abfba0223f5d656dd56bd2af20b9340923fbc1b0249b9fd535fb648a69c9deb85d1bee1a7381986208e37170ba6f029c0d5d277 hexagonrpcd-adsp-rootpd.initd -70107100fb0ffcd43348b3ac96d63c3e8789039e507383cfd756ddcaebb57b3f985145ff554974577f23b4f7fd11b53d5c314297c8a3f3e50b4954d48a5c3e2c hexagonrpcd-adsp-sensorspd.initd -2ee1ff904b22da382ceb059ca8c7c8ac9271d4c6724dd3155b473be94f1850d3ae0ec97226b1aae440c58632e7061205b598d62d80f066cc36c52c3d37dc55a2 hexagonrpcd-sdsp.initd +4ccabf6579ff1bb42d1875a51eddb9884bc65ed60eed723f7747ac6abea7b3a7acf05cfe3bf66a13bec6e22f7bbf48e88b598457286d738fd03e0a69f9263b67 hexagonrpcd-adsp-rootpd.initd +971557a233b9bf7386a8c3641b318b81b38647004eb54687a69a1b5c44506acd7c7cc23d038f3a3ba5c8fcfe191440ce0a06d6e5f42d798da18b7683e2d89a8b hexagonrpcd-adsp-sensorspd.initd +7e9153046370f6a8dd6c6686702866be192364a111216900256a666d726ad97a0cda88f682b18476ea74532081c6e961018529c5213719e1f34f104257a9a4a1 hexagonrpcd-sdsp.initd +e989e45853e2abd17c16ec7cdf9990f4a4ade5a36bb798fb28d5ce8cd264fe693699b196b240cfe3c83949f6931488a59aa446d43b263e168fa3758a5754a71a hexagonrpcd.confd " diff --git a/community/hexagonrpcd/hexagonrpcd-adsp-rootpd.initd b/community/hexagonrpcd/hexagonrpcd-adsp-rootpd.initd index 44e4614b2e9..4c24379d81e 100644 --- a/community/hexagonrpcd/hexagonrpcd-adsp-rootpd.initd +++ b/community/hexagonrpcd/hexagonrpcd-adsp-rootpd.initd @@ -5,5 +5,5 @@ name="Hexagonrpcd ADSP RootPD" description="Daemon to support Qualcomm Hexagon ADSP virtual filesystem for RootPD" command=/usr/bin/hexagonrpcd -command_args="-f /dev/fastrpc-adsp" +command_args="-f /dev/fastrpc-adsp -d adsp -R ${hexagonrpcd_fw_dir}" command_user=fastrpc:fastrpc diff --git a/community/hexagonrpcd/hexagonrpcd-adsp-sensorspd.initd b/community/hexagonrpcd/hexagonrpcd-adsp-sensorspd.initd index 345d04a763f..c313c092727 100644 --- a/community/hexagonrpcd/hexagonrpcd-adsp-sensorspd.initd +++ b/community/hexagonrpcd/hexagonrpcd-adsp-sensorspd.initd @@ -5,5 +5,5 @@ name="Hexagonrpcd ADSP SensorPD" description="Daemon to support Qualcomm Hexagon ADSP virtual filesystem for SensorPD" command=/usr/bin/hexagonrpcd -command_args="-f /dev/fastrpc-adsp -s" +command_args="-f /dev/fastrpc-adsp -d adsp -s -R ${hexagonrpcd_fw_dir}" command_user=fastrpc:fastrpc diff --git a/community/hexagonrpcd/hexagonrpcd-sdsp.initd b/community/hexagonrpcd/hexagonrpcd-sdsp.initd index 21b1cd43cbc..a81bb2f3b82 100644 --- a/community/hexagonrpcd/hexagonrpcd-sdsp.initd +++ b/community/hexagonrpcd/hexagonrpcd-sdsp.initd @@ -5,5 +5,5 @@ name="Hexagonrpcd SDSP" description="Daemon to support Qualcomm Hexagon SDSP virtual filesystem" command=/usr/bin/hexagonrpcd -command_args="-f /dev/fastrpc-sdsp -s" +command_args="-f /dev/fastrpc-sdsp -d sdsp -s -R ${hexagonrpcd_fw_dir}" command_user=fastrpc:fastrpc diff --git a/community/hexagonrpcd/hexagonrpcd.confd b/community/hexagonrpcd/hexagonrpcd.confd new file mode 100644 index 00000000000..f1ff0213b94 --- /dev/null +++ b/community/hexagonrpcd/hexagonrpcd.confd @@ -0,0 +1,4 @@ +# By default, hexagonrpcd searches for firmware in /usr/share/qcom. +# But it can be overrided using the hexagonrpcd_fw_dir option below. +# To learn more, kindly refer to https://gitlab.com/sdm670-mainline/hexagonrpc#hexagonfs. +hexagonrpcd_fw_dir="/usr/share/qcom" diff --git a/community/hexagonrpcd/noshared.patch b/community/hexagonrpcd/noshared.patch deleted file mode 100644 index 9ffb48dc95c..00000000000 --- a/community/hexagonrpcd/noshared.patch +++ /dev/null @@ -1,16 +0,0 @@ -this doesn't install an actual library with headers and an soname, so there is -no point to install it at all --- -diff --git a/libhexagonrpc/meson.build b/libhexagonrpc/meson.build -index 684d380..ca94379 100644 ---- a/libhexagonrpc/meson.build -+++ b/libhexagonrpc/meson.build -@@ -1,7 +1,6 @@ --libhexagonrpc = shared_library('hexagonrpc', -+libhexagonrpc = static_library('hexagonrpc', - 'fastrpc.c', - 'context.c', - include_directories : include, -- install : true - ) - diff --git a/community/hey/APKBUILD b/community/hey/APKBUILD index bee6b601cd4..894b445fc2c 100644 --- a/community/hey/APKBUILD +++ b/community/hey/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=hey pkgver=0.1.4 -pkgrel=23 +pkgrel=24 pkgdesc="HTTP load generator" url="https://github.com/rakyll/hey" arch="all" diff --git a/community/himitsu/APKBUILD b/community/himitsu/APKBUILD index a2563d0c77f..ef413262487 100644 --- a/community/himitsu/APKBUILD +++ b/community/himitsu/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=himitsu -pkgver=0.6 -pkgrel=1 +pkgver=0.7 +pkgrel=0 pkgdesc="A secret storage manager" url="https://himitsustore.org" arch="x86_64 aarch64 riscv64" # Hare @@ -28,5 +28,5 @@ dev() { } sha512sums=" -ebc40fc37a565507dcf219698844846d2e73db300d5432119c71ce6013cf623bc5ba96e36a5e38e3927235bda8d482a548fa7a7dbac89acb0a6673c18239cfbb himitsu-0.6.tar.gz +5b7136d9145729e1d277f78595c5d2f7d7d73cdad3b46b585c90cc8ae945acdad7761abc14c49d686b0c9ff82183c7c7bae286e4818f08ac50b9cf751502744c himitsu-0.7.tar.gz " diff --git a/community/hledger-stockquotes/APKBUILD b/community/hledger-stockquotes/APKBUILD index 31cb120f22b..8e710b7c3b2 100644 --- a/community/hledger-stockquotes/APKBUILD +++ b/community/hledger-stockquotes/APKBUILD @@ -5,11 +5,12 @@ pkgver=0.1.2.2 pkgrel=2 pkgdesc="hledger addon that pulls historical stock prices for commodities" url="https://github.com/prikhi/hledger-stockquotes" +# 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 - cabal.config + cabal.project.freeze " options="!check" # fail to build for some reason @@ -18,16 +19,16 @@ export CABAL_DIR="$srcdir"/cabal cabal_update() { msg "Freezing $pkgname dependencies" - # Resolve deps and generate fresh cabal.config with version constraints. + # Resolve deps and generate fresh cabal.project.freeze with version constraints. ( cd "$builddir" - cabal update - cabal v1-freeze --strong-flags --shadow-installed-packages + cabal v2-update + cabal v2-freeze --strong-flags --shadow-installed-packages # Add version tag at the first line. - sed -i "1i--$pkgver" "cabal.config" + sed -i "1i--$pkgver" "cabal.project.freeze" - mv "cabal.config" "$startdir/" + mv "cabal.project.freeze" "$startdir/" ) if ! abuild checksum; then @@ -38,11 +39,11 @@ cabal_update() { prepare() { default_prepare - if [ "$(head -n 1 "$srcdir/cabal.config")" != "--$pkgver" ]; then + if [ "$(head -n 1 "$srcdir/cabal.project.freeze")" != "--$pkgver" ]; then die "Requirements file is outdated, run 'abuild cabal_update'" fi - ln -sf "$srcdir/cabal.config" "$builddir/cabal.project.freeze" + ln -sf "$srcdir/cabal.project.freeze" "$builddir/" } build() { @@ -63,5 +64,5 @@ package() { sha512sums=" 0b637efc9d99f1b283b53cd45331603a8badd30d91692a854786e91c536ddf2d336973f7c2b8f1d8e439dc730893d91fbd1c2a040bed448a59f1006bfee79653 hledger-stockquotes-0.1.2.2.tar.gz -1f22cf36724aebc303d9f11c068d4778332364c5d55ab835b4ed757619ce9a4648601d0a85261172327a30fb923c3cd3492b52778998f70694cc889847539ddf cabal.config +d5f16d17e8742a497579886d5c84b4b892a3bf9058c39d180c5ffd2f666e99ebc64c1470ecd45c57f97cd87e95bca4a171a6541704bf38c80596931246c2d1ae cabal.project.freeze " diff --git a/community/hledger-stockquotes/cabal.config b/community/hledger-stockquotes/cabal.config deleted file mode 100644 index 4de7fbe4a2d..00000000000 --- a/community/hledger-stockquotes/cabal.config +++ /dev/null @@ -1,185 +0,0 @@ ---0.1.2.2 -constraints: Cabal ==3.8.1.0, - Cabal-syntax ==3.8.1.0, - Decimal ==0.5.2, - Glob ==0.10.2, - OneTuple ==0.4.1.1, - Only ==0.1, - QuickCheck ==2.14.3, - RSA ==2.4.1, - SHA ==1.6.4.4, - StateVar ==1.2.2, - aeson ==2.2.1.0, - aeson-pretty ==0.8.10, - ansi-terminal ==1.0, - ansi-terminal-types ==0.11.5, - appar ==0.1.8, - array ==0.5.4.0, - asn1-encoding ==0.9.6, - asn1-parse ==0.9.5, - asn1-types ==0.3.4, - assoc ==1.1, - async ==2.2.5, - attoparsec ==0.14.4, - attoparsec-aeson ==2.2.0.1, - authenticate-oauth ==1.7, - base ==4.17.2.1, - base-compat ==0.13.1, - base-orphans ==0.9.1, - base64-bytestring ==1.2.1.0, - basement ==0.0.16, - bifunctors ==5.6.1, - binary ==0.8.9.1, - bitvec ==1.1.5.0, - blaze-builder ==0.4.2.3, - blaze-markup ==0.8.3.0, - byteorder ==1.0.4, - bytestring ==0.11.5.3, - cabal-doctest ==1.0.9, - call-stack ==0.4.0, - case-insensitive ==1.2.1.0, - cassava ==0.5.3.0, - cassava-megaparsec ==2.0.4, - cereal ==0.5.8.3, - clock ==0.8.4, - cmdargs ==0.10.22, - colour ==2.3.6, - comonad ==5.0.8, - conduit ==1.3.5, - conduit-extra ==1.3.6, - containers ==0.6.7, - contravariant ==1.5.5, - cookie ==0.4.6, - crypto-api ==0.13.3, - crypto-pubkey-types ==0.4.3, - crypton ==0.34, - crypton-connection ==0.3.1, - crypton-x509 ==1.7.6, - crypton-x509-store ==1.6.9, - crypton-x509-system ==1.6.7, - crypton-x509-validation ==1.6.12, - csv ==0.1.2, - data-default ==0.7.1.1, - data-default-class ==0.1.2.0, - data-default-instances-containers ==0.0.1, - data-default-instances-dlist ==0.0.1, - data-default-instances-old-locale ==0.0.1, - data-fix ==0.3.2, - deepseq ==1.4.8.0, - directory ==1.3.7.1, - distributive ==0.6.2.1, - dlist ==1.0, - doclayout ==0.4.0.1, - emojis ==0.1.3, - entropy ==0.4.1.10, - exceptions ==0.10.5, - extra ==1.7.14, - file-embed ==0.0.15.0, - filepath ==1.4.2.2, - foldable1-classes-compat ==0.1, - generically ==0.1.1, - ghc-bignum ==1.3, - ghc-boot-th ==9.4.8, - ghc-prim ==0.9.1, - hashable ==1.4.3.0, - hashtables ==1.3.1, - hledger-lib ==1.32.1, - hourglass ==0.2.12, - hsc2hs ==0.68.10, - html ==1.0.1.2, - http-api-data ==0.6, - http-client ==0.7.15, - http-client-tls ==0.3.6.3, - http-types ==0.12.4, - indexed-traversable ==0.1.3, - indexed-traversable-instances ==0.1.1.2, - integer-conversion ==0.1.0.1, - integer-gmp ==1.1, - integer-logarithms ==1.0.3.1, - iproute ==1.7.12, - libyaml ==0.1.2, - megaparsec ==9.5.0, - memory ==0.18.0, - microlens ==0.4.13.1, - microlens-th ==0.4.3.14, - mime-types ==0.1.2.0, - modern-uri ==0.3.6.1, - monad-control ==1.0.3.1, - mono-traversable ==1.0.15.3, - mtl ==2.2.2, - mtl-compat ==0.2.2, - network ==3.1.4.0, - network-uri ==2.6.4.2, - old-locale ==1.0.0.7, - old-time ==1.1.0.3, - optparse-applicative ==0.18.1.0, - pager ==0.1.1.0, - parsec ==3.1.16.1, - parser-combinators ==1.3.0, - pem ==0.2.4, - pretty ==1.1.3.6, - pretty-simple ==4.1.2.0, - prettyprinter ==1.7.1, - prettyprinter-ansi-terminal ==1.1.3, - primitive ==0.9.0.0, - process ==1.6.18.0, - profunctors ==5.6.2, - quote-quot ==0.2.1.0, - random ==1.2.1.1, - raw-strings-qq ==1.1, - reflection ==2.1.7, - regex-base ==0.94.0.2, - regex-tdfa ==1.3.2.2, - req ==3.13.1, - resourcet ==1.3.0, - retry ==0.9.3.1, - rts ==1.0.2, - safe ==0.3.19, - safe-exceptions ==0.1.7.4, - scientific ==0.3.7.0, - semialign ==1.3, - semigroupoids ==6.0.0.1, - socks ==0.6.1, - split ==0.2.4, - splitmix ==0.1.0.5, - stm ==2.5.1.0, - streaming-commons ==0.2.2.6, - strict ==0.5, - tabular ==0.2.2.8, - tagged ==0.8.8, - tasty ==1.5, - tasty-hunit ==0.10.1, - template-haskell ==2.19.0.0, - terminal-size ==0.3.4, - terminfo ==0.4.1.5, - text ==2.0.2, - text-ansi ==0.3.0.1, - text-builder-linear ==0.1.2, - text-iso8601 ==0.1, - text-short ==0.1.5, - th-abstraction ==0.6.0.0, - th-compat ==0.1.4, - these ==1.2, - time ==1.12.2, - time-compat ==1.9.6.1, - timeit ==2.0, - tls ==1.9.0, - transformers ==0.5.6.2, - transformers-base ==0.4.6, - transformers-compat ==0.7.2, - typed-process ==0.2.11.1, - uglymemo ==0.1.0.1, - unix ==2.7.3, - unix-time ==0.4.11, - unliftio-core ==0.2.1.0, - unordered-containers ==0.2.19.1, - utf8-string ==1.0.2, - uuid-types ==1.0.5.1, - vector ==0.13.1.0, - vector-algorithms ==0.9.0.1, - vector-stream ==0.1.0.0, - witherable ==0.4.2, - xdg-basedir ==0.2.2, - yaml ==0.11.11.2, - zlib ==0.6.3.0 -nix: disable diff --git a/community/hledger-stockquotes/cabal.project.freeze b/community/hledger-stockquotes/cabal.project.freeze new file mode 100644 index 00000000000..47317c31ff3 --- /dev/null +++ b/community/hledger-stockquotes/cabal.project.freeze @@ -0,0 +1,268 @@ +--0.1.2.2 +active-repositories: hackage.haskell.org:merge +constraints: any.Cabal ==3.10.2.0 || ==3.10.3.0, + any.Cabal-syntax ==3.10.2.0 || ==3.10.3.0, + any.Decimal ==0.5.2, + any.Glob ==0.10.2, + any.OneTuple ==0.4.2, + any.Only ==0.1, + any.QuickCheck ==2.14.3, + QuickCheck -old-random +templatehaskell, + any.RSA ==2.4.1, + any.SHA ==1.6.4.4, + SHA -exe, + any.StateVar ==1.2.2, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, + any.aeson-pretty ==0.8.10, + aeson-pretty -lib-only, + any.ansi-terminal ==1.1.1, + ansi-terminal -example, + any.ansi-terminal-types ==1.1, + 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.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.authenticate-oauth ==1.7, + any.barbies ==2.1.1.0, + any.base ==4.19.1.0, + any.base-compat ==0.14.0, + any.base-orphans ==0.9.2, + 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.blaze-markup ==0.8.3.0, + any.boring ==0.2.1, + boring +tagged, + any.byteorder ==1.0.4, + any.bytestring ==0.12.1.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.1, + any.cassava-megaparsec ==2.1.1, + cassava-megaparsec -dev, + any.cborg ==0.2.10.0, + cborg +optimize-gmp, + any.cereal ==0.5.8.3, + cereal -bytestring-builder, + any.clock ==0.8.4, + clock -llvm, + any.cmdargs ==0.10.22, + cmdargs +quotation -testprog, + any.colour ==2.3.6, + any.comonad ==5.0.8, + comonad +containers +distributive +indexed-traversable, + any.concurrent-output ==1.10.21, + any.conduit ==1.3.5, + any.conduit-extra ==1.3.6, + any.constraints ==0.14.2, + any.containers ==0.6.8, + any.contravariant ==1.5.5, + contravariant +semigroups +statevar +tagged, + any.cookie ==0.4.6, + any.crypto-api ==0.13.3, + crypto-api -all_cpolys, + any.crypto-pubkey-types ==0.4.3, + any.crypton ==1.0.0, + 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.csv ==0.1.2, + any.data-default ==0.7.1.1, + any.data-default-class ==0.1.2.0, + any.data-default-instances-containers ==0.0.1, + any.data-default-instances-dlist ==0.0.1, + any.data-default-instances-old-locale ==0.0.1, + any.data-fix ==0.3.3, + any.deepseq ==1.5.0.0, + any.directory ==1.3.8.1 || ==1.3.8.4, + directory +os-string, + any.distributive ==0.6.2.1, + distributive +semigroups +tagged, + any.dlist ==1.0, + dlist -werror, + any.doclayout ==0.4.0.1, + any.emojis ==0.1.3, + any.entropy ==0.4.1.10, + entropy -donotgetentropy, + any.erf ==2.0.0.0, + any.exceptions ==0.10.7, + any.extra ==1.7.16, + any.file-embed ==0.0.16.0, + any.filepath ==1.4.200.1 || ==1.5.2.0, + filepath -cpphs, + any.generically ==0.1.1, + any.ghc-bignum ==1.3, + any.ghc-boot-th ==9.8.2, + any.ghc-prim ==0.11.0, + any.half ==0.3.1, + any.happy ==1.20.1.1, + any.hashable ==1.4.4.0, + hashable +integer-gmp -random-initial-seed, + any.hashtables ==1.3.1, + hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks, + any.haskell-lexer ==1.1.1, + any.hedgehog ==1.4, + any.hledger-lib ==1.33.1, + any.hourglass ==0.2.12, + any.hsc2hs ==0.68.10, + hsc2hs -in-ghc-tree, + any.html ==1.0.1.2, + any.http-api-data ==0.6, + http-api-data -use-text-show, + any.http-client ==0.7.17, + http-client +network-uri, + any.http-client-tls ==0.3.6.3, + 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.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.libyaml ==0.1.4, + libyaml -no-unicode -system-libyaml, + any.libyaml-clib ==0.2.5, + any.lifted-async ==0.10.2.5, + any.lifted-base ==0.2.3.12, + any.megaparsec ==9.6.1, + megaparsec -dev, + any.memory ==0.18.0, + memory +support_bytestring +support_deepseq, + any.microlens ==0.4.13.1, + any.microlens-th ==0.4.3.15, + any.mime-types ==0.1.2.0, + any.mmorph ==1.2.0, + any.modern-uri ==0.3.6.1, + modern-uri -dev, + any.monad-control ==1.0.3.1, + any.mono-traversable ==1.0.17.0, + any.mtl ==2.3.1, + any.mtl-compat ==0.2.2, + mtl-compat -two-point-one -two-point-two, + 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.2, + any.pager ==0.1.1.0, + any.parsec ==3.1.17.0, + any.parser-combinators ==1.3.0, + parser-combinators -dev, + any.pem ==0.2.4, + any.pretty ==1.1.3.6, + any.pretty-show ==1.10, + any.pretty-simple ==4.1.2.0, + pretty-simple -buildexample +buildexe, + any.prettyprinter ==1.7.1, + prettyprinter -buildreadme +text, + any.prettyprinter-ansi-terminal ==1.1.3, + any.primitive ==0.9.0.0, + any.process ==1.6.18.0 || ==1.6.20.0, + any.profunctors ==5.6.2, + any.quote-quot ==0.2.1.0, + any.random ==1.2.1.2, + any.raw-strings-qq ==1.1, + any.reflection ==2.1.8, + reflection -slow +template-haskell, + any.regex-base ==0.94.0.2, + any.regex-tdfa ==1.3.2.2, + regex-tdfa +doctest -force-o2, + any.req ==3.13.2, + req -dev, + any.resourcet ==1.3.0, + any.retry ==0.9.3.1, + retry -lib-werror, + any.rts ==1.0.2, + any.safe ==0.3.21, + any.safe-exceptions ==0.1.7.4, + any.scientific ==0.3.8.0, + scientific -integer-simple, + any.semialign ==1.3, + semialign +semigroupoids, + any.semigroupoids ==6.0.1, + semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, + any.serialise ==0.2.6.1, + serialise +newtime15, + 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.tabular ==0.2.2.8, + any.tagged ==0.8.8, + tagged +deepseq +transformers, + any.tasty ==1.5, + tasty +unix, + any.tasty-hedgehog ==1.4.0.2, + any.tasty-hunit ==0.10.1, + any.template-haskell ==2.21.0.0, + any.terminal-size ==0.3.4, + any.terminfo ==0.4.1.6, + any.text ==2.1.1, + any.text-ansi ==0.3.0.1, + any.text-builder-linear ==0.1.2, + any.text-iso8601 ==0.1, + any.text-short ==0.1.6, + 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.7, + any.timeit ==2.0, + any.tls ==2.0.5, + tls -devel, + 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.typed-process ==0.2.11.1, + any.uglymemo ==0.1.0.1, + any.unix ==2.8.4.0 || ==2.8.5.1, + unix +os-string, + 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.wl-pprint-annotated ==0.1.0.1, + any.xdg-basedir ==0.2.2, + any.yaml ==0.11.11.2, + yaml +no-examples +no-exe, + any.zlib ==0.7.1.0, + zlib -bundled-c-zlib +non-blocking-ffi +pkg-config +index-state: hackage.haskell.org 2024-05-15T02:20:17Z diff --git a/community/homer-app/APKBUILD b/community/homer-app/APKBUILD index 13bd8692025..e08cbbeba1f 100644 --- a/community/homer-app/APKBUILD +++ b/community/homer-app/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=homer-app pkgver=1.4.59 -pkgrel=8 +pkgrel=9 pkgdesc="HOMER 7.x Front-End and API Server" url="http://sipcapture.io" arch="all" diff --git a/community/hugo/APKBUILD b/community/hugo/APKBUILD index 91560c253a9..a0a0a9868fa 100644 --- a/community/hugo/APKBUILD +++ b/community/hugo/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Thomas Boerger <thomas@webhippie.de> pkgname=hugo pkgver=0.125.4 -pkgrel=0 +pkgrel=1 pkgdesc="Fast and flexible static site generator written in Go" url="https://gohugo.io/" license="Apache-2.0" diff --git a/community/hut/APKBUILD b/community/hut/APKBUILD index 9d5461cbd27..412c53c9a9c 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=1 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/hydroxide/APKBUILD b/community/hydroxide/APKBUILD index ec745bd3cd8..6ab2552e08c 100644 --- a/community/hydroxide/APKBUILD +++ b/community/hydroxide/APKBUILD @@ -1,14 +1,16 @@ # Maintainer: Dekedro <dekedro@protonmail.com> pkgname=hydroxide pkgver=0.2.28 -pkgrel=5 +pkgrel=6 pkgdesc="Third-party, open-source ProtonMail CardDAV, IMAP and SMTP bridge" url="https://github.com/emersion/hydroxide" license="MIT" -arch="all !riscv64" # failure to build github.com/boltdb/bolt +arch="all" makedepends="go" options="net !check" # no tests -source="https://github.com/emersion/hydroxide/releases/download/v$pkgver/hydroxide-$pkgver.tar.gz" +source="https://github.com/emersion/hydroxide/releases/download/v$pkgver/hydroxide-$pkgver.tar.gz + go-mod.patch + " export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -24,4 +26,5 @@ package() { sha512sums=" 55472d5f081eb2827cd37ebb02e66c5831cfde7f375c1800142cb888837bb05ae07da873ddca33b4b83a0ed2adb4587d90d43e05c1478e2696de9b7871e213f0 hydroxide-0.2.28.tar.gz +ef28eb6016be6e16b9c4916eed457c50610868f6ccdba8e32639d05bf64d2067e0904d82ffe67b11eb38b4c1cff5f471ceee1cad19e4ad92d3c1e6b8f583ab71 go-mod.patch " diff --git a/community/hydroxide/go-mod.patch b/community/hydroxide/go-mod.patch new file mode 100644 index 00000000000..14096d497e5 --- /dev/null +++ b/community/hydroxide/go-mod.patch @@ -0,0 +1,39 @@ +diff --git a/go.mod b/go.mod +index c88dde1..632fb49 100644 +--- a/go.mod ++++ b/go.mod +@@ -16,3 +16,5 @@ require ( + golang.org/x/crypto v0.12.0 + golang.org/x/term v0.11.0 + ) ++ ++replace github.com/boltdb/bolt => gitlab.alpinelinux.org/kdaudt/bolt v1.3.5 +diff --git a/go.sum b/go.sum +index 01051cf..fa7575a 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,7 +1,5 @@ + github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 h1:KLq8BE0KwCL+mmXnjLWEAOYO+2l2AE4YMmqG1ZpZHBs= + github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +-github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= +-github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= + github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= + github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= + github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= +@@ -28,6 +26,8 @@ github.com/emersion/go-vcard v0.0.0-20230815062825-8fda7d206ec9/go.mod h1:HMJKR5 + github.com/emersion/go-webdav v0.3.2-0.20220524091811-5d845721d8f7 h1:HqrKOBl8HdSnlo8kz72tCU36aK3WwSmpnnz04+dD0oc= + github.com/emersion/go-webdav v0.3.2-0.20220524091811-5d845721d8f7/go.mod h1:uSM1VveeKtogBVWaYccTksToczooJ0rrVGNsgnDsr4Q= + github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= ++gitlab.alpinelinux.org/kdaudt/bolt v1.3.5 h1:aAv3j2QHPepFkLvjz6tTUpuIe2aNAsn3CRFOKzQ+NHQ= ++gitlab.alpinelinux.org/kdaudt/bolt v1.3.5/go.mod h1:PhUGDccnHuJtnkQQLm4Ml2VFYH9lMva/kkPMH+sVjOA= + golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= + golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +@@ -49,6 +49,7 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.0.0-20210629170331-7dc0b73dc9fb/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/community/i2pd/APKBUILD b/community/i2pd/APKBUILD index cc0d7b6bd48..8f4af8cb05d 100644 --- a/community/i2pd/APKBUILD +++ b/community/i2pd/APKBUILD @@ -1,8 +1,8 @@ -# Maintainer: r4sas <r4sas@i2pmail.org> # Contributor: l-n-s <supervillain@riseup.net> +# Maintainer: r4sas <r4sas@i2pmail.org> pkgname=i2pd -pkgver=2.50.2 -pkgrel=1 +pkgver=2.52.0 +pkgrel=0 pkgdesc="I2P Router written in C++" url="https://i2pd.website" arch="all" @@ -51,7 +51,7 @@ package() { } sha512sums=" -7df7a578711a959feee4326060829cf87c0d1669e473934549cb59d868a7aef7300ecd2d7a6b92a2295aa7e97964cc16d0e44a334db917e22b0b59573a9052de i2pd-2.50.2.tar.gz +54272b23dcb62b8b7523038a9c1fc71b87bb9042f22bd12d6ebc62cfa47da07e2df47d88d706f285e9d88f9cace0564546632c10161f83f5c57b9ea17f5bde5f i2pd-2.52.0.tar.gz fae08de6cbdb5097cb3068d9a87509195d607fe666db870a3264f952fb3fceafc665168bd16bf598597617e48322301bbc900dcbd2c38fefca419d4755cea5f9 i2pd.initd 5b767037b49a9d94ac12dcc014a34c63967ab16a3292dd2622a118326c8d54905213d9638e48903cf0115c69b37490f648d3b2a78a1099063af78178b7024c75 i2pd.confd " diff --git a/community/ibus/APKBUILD b/community/ibus/APKBUILD index 19b024fdb2a..1631f25fa3f 100644 --- a/community/ibus/APKBUILD +++ b/community/ibus/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=ibus -pkgver=1.5.29 -pkgrel=1 +pkgver=1.5.30 +pkgrel=0 pkgdesc="Next Generation Input Bus for Linux" url="https://github.com/ibus/ibus/wiki" arch="all" @@ -27,10 +27,10 @@ subpackages=" $pkgname-gtk4 $pkgname-bash-completion " -source="https://github.com/ibus/ibus/releases/download/$pkgver/ibus-$pkgver-rc2.tar.gz" +# if $pkgver tarball not found, switch to $pkgver-rc$n +# https://github.com/ibus/ibus/issues/2584 +source="https://github.com/ibus/ibus/releases/download/$pkgver/ibus-$pkgver.tar.gz" install="$pkgname.post-install" -#https://github.com/ibus/ibus/issues/2584 -builddir="$srcdir/$pkgname-$pkgver-rc2" prepare() { default_prepare @@ -96,5 +96,5 @@ pyc() { } sha512sums=" -47dd39c9615783b6c157a25e8a2506dc2e1f440d56aa649ee8cb95a390cb4efab9c95e72ac84b5d042c25e350599b4d352ddc66f1385af6660d4a7a296e44ca7 ibus-1.5.29-rc2.tar.gz +cbed37bf62e8d8593c838f8ef7fe0b22bf8f4a661b887fc7be2f2768dda912075abdf3070c22b9699def90e7002aaaf7394f5fc590e12ef6ebb2bb5161cc29a0 ibus-1.5.30.tar.gz " diff --git a/community/icewm/APKBUILD b/community/icewm/APKBUILD index aa68dd1adcc..cd5d5d2eff4 100644 --- a/community/icewm/APKBUILD +++ b/community/icewm/APKBUILD @@ -1,14 +1,13 @@ # Contributor: Paul Bredbury <brebs@sent.com> -# Maintainer: gay <gay@disroot.org> +# Contributor: gay <gay@disroot.org> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=icewm -pkgver=3.4.7 +pkgver=3.5.0 pkgrel=0 pkgdesc="Window manager designed for speed, usability and consistency" url="https://github.com/ice-wm/icewm" arch="all" -options="!check" # No test suite license="LGPL-2.0-only" -subpackages="$pkgname-doc $pkgname-lang" makedepends=" alsa-lib-dev cmake @@ -30,7 +29,9 @@ makedepends=" perl samurai " +subpackages="$pkgname-doc $pkgname-lang" source="https://github.com/ice-wm/icewm/releases/download/$pkgver/icewm-$pkgver.tar.lz" +options="!check" # No test suite build() { cmake -B build -G Ninja \ @@ -50,5 +51,5 @@ package() { } sha512sums=" -6db8186dec7e286515416737ec1796bc9d0c2399ae109f6fb7aebca9938c3ab6c674546b60952b63bf65d0336d3b873f316af175646f873d6c8127c5b1cdceda icewm-3.4.7.tar.lz +946f622ec88c04756919a8dff1cc44154225a020f98e5fdd9a5c58fd81bb82b98f566930821a3965c0c1f99edfa4c75ef7f7c074f05cf0a71545b3ed2fc72659 icewm-3.5.0.tar.lz " 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/img/APKBUILD b/community/img/APKBUILD index 8fdc55054a4..271c11b766e 100644 --- a/community/img/APKBUILD +++ b/community/img/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Lucas Ramage <ramage.lucas@protonmail.com> pkgname=img pkgver=0.5.11 -pkgrel=24 +pkgrel=25 pkgdesc="Standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder" url="https://github.com/genuinetools/img" arch="aarch64 x86_64" diff --git a/community/incidenceeditor/APKBUILD b/community/incidenceeditor/APKBUILD index 8a974e405e6..7d887e7f7d3 100644 --- a/community/incidenceeditor/APKBUILD +++ b/community/incidenceeditor/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=incidenceeditor -pkgver=24.02.2 +pkgver=24.05.0 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=" @@ -61,5 +62,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -ed95e294a56d3d65c69341488ced5ab7bb1ecc8749b19ee91c0537383dd5c5104137dc0196a19a3c0d88c217b87094c8424f57de08df0af1e2e0f40043930cf5 incidenceeditor-24.02.2.tar.xz +3fe4387664f03fbe1e9397f00263885cfd1b4dcd929ffa149e5a41776562f19855a9a3a48412f25c6d6d7cba25b154f094c1f89e84a7ec1877324e2e3dff255e incidenceeditor-24.05.0.tar.xz " diff --git a/community/incus/APKBUILD b/community/incus/APKBUILD index 42fe40f4a83..8b9f3dd02a1 100644 --- a/community/incus/APKBUILD +++ b/community/incus/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=incus pkgver=6.0.0 #LTS releases only -pkgrel=2 +pkgrel=4 pkgdesc="Powerful system container and virtual machine manager" url="https://github.com/lxc/incus" arch="all" @@ -117,7 +117,7 @@ package() { "$pkgdir"/etc/conf.d/incusd install -Dm644 "$builddir"/scripts/bash-completion \ - "$pkgdir"/usr/share/bash-completion/completions/incus-client + "$pkgdir"/usr/share/bash-completion/completions/incus install -Dm755 "$builddir"/scripts/empty-incus.sh \ "$pkgdir"/usr/bin/empty-incus.sh diff --git a/community/iperf/APKBUILD b/community/iperf/APKBUILD index 708fc6dd51f..c909b5f4d1c 100644 --- a/community/iperf/APKBUILD +++ b/community/iperf/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Oleg Titov <oleg.titov@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iperf -pkgver=2.1.9 +pkgver=2.2.0 pkgrel=0 pkgdesc="A tool to measure IP bandwidth using UDP or TCP" url="https://sourceforge.net/projects/iperf2/" @@ -37,7 +37,7 @@ package() { } sha512sums=" -231b281cfaf0e0b67839efef7d86b762a709fe76403a9e39ebe5431e486537b522b58e5a736351c7343134b445499606a02f8430ecb7120cb7d04400d9cb232b iperf-2.1.9.tar.gz +2cd625d334b26dc946d0e485b7082750367c509469e8fb35359dba587b4816322bc2866819d8aab995855b05251d4d3c540338a3b0cb2e78b6b701a89f205980 iperf-2.2.0.tar.gz 7dcd51fa77f7e8bd9a14339f61f93f591d74a86c767dbdc1d6035b6f7f4ce6fec34e8880caf68eab301640250b579b495274f2454c48b9601455ec46abab8949 iperf.initd fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8 iperf.confd " diff --git a/community/irssi-xmpp/APKBUILD b/community/irssi-xmpp/APKBUILD index 01fa837301d..a13c496f592 100644 --- a/community/irssi-xmpp/APKBUILD +++ b/community/irssi-xmpp/APKBUILD @@ -1,17 +1,17 @@ # Contributor: Stefan Wagner <stw@bit-strickerei.de> -# Maintainer: Stefan Wagner <stw@bit-strickerei.de> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=irssi-xmpp pkgver=0.54 -pkgrel=2 +pkgrel=3 pkgdesc="An irssi plugin to connect to the Jabber network" -url="https://cybione.org/~irssi-xmpp/" +url="https://github.com/cdidier/irssi-xmpp" arch="all" license="GPL-2.0-only" depends="irssi" makedepends="irssi-dev loudmouth-dev" subpackages="$pkgname-doc" options="!check" -source="irssi-xmpp-$pkgver.tar.gz::https://github.com/cdidier/irssi-xmpp/archive/v$pkgver/irssi-xmpp-$pkgver.tar.gz +source="https://github.com/cdidier/irssi-xmpp/archive/v$pkgver/irssi-xmpp-$pkgver.tar.gz musl-fixes.patch irssi-1.3-compat.patch g_const_return.patch diff --git a/community/irtt/APKBUILD b/community/irtt/APKBUILD index 18a36c6be98..5494e765b44 100644 --- a/community/irtt/APKBUILD +++ b/community/irtt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Thomas Liske <thomas@fiasko-nw.net> pkgname=irtt pkgver=0.9.1 -pkgrel=23 +pkgrel=24 pkgdesc="Isochronous Round-Trip Tester" url="https://github.com/heistp/irtt" arch="all" diff --git a/community/isa-l/APKBUILD b/community/isa-l/APKBUILD index eaf168b4f1d..ca9322fc704 100644 --- a/community/isa-l/APKBUILD +++ b/community/isa-l/APKBUILD @@ -14,8 +14,7 @@ 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 doxygen @@ -36,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() { @@ -47,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/isoimagewriter/APKBUILD b/community/isoimagewriter/APKBUILD index e96dc27770c..342ec9cb98c 100644 --- a/community/isoimagewriter/APKBUILD +++ b/community/isoimagewriter/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=isoimagewriter -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -46,5 +46,5 @@ package() { } sha512sums=" -7648e2c494dc8e1a5ef71ab767f474df083fa161427d25f3759811e87477ff103512eafa496f105daac41c249317479c16ccae3e49062cce962a4c1101baf834 isoimagewriter-24.02.2.tar.xz +06a99164c22c949f65de94a8634b407855d46385c37972135124eb2024491bce4f1329b751738ff6ca47e902dcca5f15ef66c3ef1ad011c256cf42b31590e62d isoimagewriter-24.05.0.tar.xz " diff --git a/community/itinerary/APKBUILD b/community/itinerary/APKBUILD index 6477f66bd33..451b5d5e120 100644 --- a/community/itinerary/APKBUILD +++ b/community/itinerary/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=itinerary -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by qt6-qtdeclarative # ppc64le blocked by kitinerary @@ -74,5 +74,5 @@ package() { } sha512sums=" -854a3439b096bd76cae4918941162b15c9f39688264a491051df8ff62f30cbe8604d7c0e8b090f80c9cab6970416a89b1854da04d62244f17134af636e579802 itinerary-24.02.2.tar.xz +fbd341d23c3d84cbeac77c859b636b740de19803233eb224606eecb9ccfbd7a053f766788e396c8ea007dfccfcb34d603516130292607c5132d0ae9bc0da52d5 itinerary-24.05.0.tar.xz " diff --git a/community/java-libsignal-client/APKBUILD b/community/java-libsignal-client/APKBUILD index 704b11de5a9..7126b768ba7 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.45.0 +pkgver=0.48.0 pkgrel=0 pkgdesc="libsignal-client contains platform-agnostic APIs useful for Signal client apps" url="https://github.com/signalapp/libsignal" @@ -9,7 +9,8 @@ url="https://github.com/signalapp/libsignal" # s390x: build error in boringssl ("Unknown target CPU") # ppc64le: build error in boringssl ("Unknown target CPU") # riscv64: build error in boringssl ("Unknown target CPU") -arch="all !armhf !armv7 !x86 !ppc64le !s390x !riscv64" +# loongarch64: build error in boringssl ("Unknown target CPU") +arch="all !armhf !armv7 !x86 !ppc64le !s390x !riscv64 !loongarch64" license="AGPL-3.0-or-later" depends="java-jre-headless" makedepends="bash cargo clang-dev cmake openjdk17-jdk protoc rust zip" @@ -42,6 +43,6 @@ package() { } sha512sums=" -70f2cb7d05e019235cd044c401bcf072a934fdfea4a161ef5be988d2e3932ba5233110b4b06525e6f33ea9cad036def442e70adad15eab883903d9246969896e java-libsignal-client-0.45.0.tar.gz +5b3c8f001121ac40d6343fafdb273b146658841e5ba6168b8ee99452cf8e484685625492325c25f6a98b8441d28388012817de8de0dd0d682c1dbdbde227e391 java-libsignal-client-0.48.0.tar.gz acfa6c1595691885b45785b8cb274fef24fea512ba86a06c99da5e278fb03b23866de079a4a5b43d593071d103baeb7e720d33797185a3c4f4a29004a7ce3d78 upgrade-gradle-fix-sigsegv-aarch64.patch " diff --git a/community/jellyfin-mpv-shim/APKBUILD b/community/jellyfin-mpv-shim/APKBUILD index 2a84e865255..cc601d68c6b 100644 --- a/community/jellyfin-mpv-shim/APKBUILD +++ b/community/jellyfin-mpv-shim/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=jellyfin-mpv-shim -pkgver=2.6.0 -pkgrel=2 +pkgver=2.7.0 +pkgrel=0 pkgdesc="MPV Cast Client for Jellyfin " url="https://github.com/jellyfin/jellyfin-mpv-shim" arch="noarch" @@ -13,22 +13,34 @@ depends=" py3-mpv py3-python-mpv-jsonipc py3-requests - python3 python3-tkinter " -makedepends="py3-setuptools" +makedepends=" + py3-gpep517 + py3-setuptools + py3-wheel + " subpackages="$pkgname-pyc" source="https://pypi.python.org/packages/source/j/jellyfin-mpv-shim/jellyfin-mpv-shim-$pkgver.tar.gz" options="!check" # No tests 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=" -b0697245e12d7aede73301f245bee7062c49dfdb4ef50b0896463635751da2b390f56671ff557f587acc1eb6e86e7486a22084af4f8ac43b31f28559fb35e3e6 jellyfin-mpv-shim-2.6.0.tar.gz +a32aba540488d6fa1ed21e2543ee8ccaed011e50cb027c57ec2c1a1a75c3ec5434e97bc60d7f8a9f6c5aa1ccd6038ee0aad7bf29a677230a9d8ec5d0a2b7f98a jellyfin-mpv-shim-2.7.0.tar.gz " diff --git a/community/jellyfin-web/APKBUILD b/community/jellyfin-web/APKBUILD index 0022a194dba..79dcd73a115 100644 --- a/community/jellyfin-web/APKBUILD +++ b/community/jellyfin-web/APKBUILD @@ -1,28 +1,38 @@ # Maintainer: Simon Zeni <simon@bl4ckb0ne.ca> pkgname=jellyfin-web -pkgver=10.8.13 +pkgver=10.9.2 pkgrel=0 pkgdesc="Web Client for Jellyfin" url="https://jellyfin.org/" # armv7: oom arch="x86_64 aarch64" -options="!check net" # no tests +options="net" # net for npm license="GPL-2.0-only" install="$pkgname.post-install" 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 +} + +check() { + npm test +} + 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 +d1efa372ebe92ee2973bd8799c70f3195dd61f273fc125b03c6741c42aab0a528b54f32937dd4da61d14792541712b810cee457fde674d31b039c330b3201573 jellyfin-web-10.9.2.tar.gz " diff --git a/community/jellyfin/APKBUILD b/community/jellyfin/APKBUILD index 5cc74cf489d..fd8067bc627 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 +pkgver=10.9.2 pkgrel=0 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 +d921ac194b4e6f8040e9b7509d7adcc3765d4cfbae71daa10d7d646c863c393abbc87a491b5384533197478fe8b0401111a0f78586c55502abcf124079733345 jellyfin-10.9.2.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/jless/APKBUILD b/community/jless/APKBUILD index 1f3d149d3c8..231dd491524 100644 --- a/community/jless/APKBUILD +++ b/community/jless/APKBUILD @@ -6,7 +6,8 @@ pkgrel=0 pkgdesc="command-line pager for JSON data" url="https://pauljuliusmartinez.github.io/" # riscv64, s390x: ftbfs -arch="all !riscv64 !s390x" +# loongarch64: build failed cause by rustyline +arch="all !riscv64 !s390x !loongarch64" options="net" license="MIT" makedepends="rust cargo python3 libxcb-dev cargo-auditable" diff --git a/community/joker/APKBUILD b/community/joker/APKBUILD index 6237f103214..e690a5b98a0 100644 --- a/community/joker/APKBUILD +++ b/community/joker/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=joker pkgver=1.3.5 -pkgrel=2 +pkgrel=3 pkgdesc="Small Clojure interpreter, linter and formatter written in Go" url="https://joker-lang.org/" # armhf, armv7, x86: tests fail @@ -10,7 +10,9 @@ arch="all !armhf !armv7 !x86" license="EPL-1.0" makedepends="go" checkdepends="bash" -source="https://github.com/candid82/joker/archive/v$pkgver/joker-$pkgver.tar.gz" +source="https://github.com/candid82/joker/archive/v$pkgver/joker-$pkgver.tar.gz + go-mod.patch + " export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" @@ -32,4 +34,5 @@ package() { sha512sums=" f52c90d6dcaa25cc89d9335394d13b57fc27966eecc0dfcda7385d5b5ad7364b9526c0a1e492feee1313157cfe2f0e13d77988e7720edee970ea159de89220ff joker-1.3.5.tar.gz +6084174b5788ba5c08d1178b1651a5e112616fec1e3898dd57995af150727d4e477633abfa738ff34fbdc45ced517f777ec75b40c5a6424ea7d6c2e11c9a566d go-mod.patch " diff --git a/community/joker/go-mod.patch b/community/joker/go-mod.patch new file mode 100644 index 00000000000..01c260ef432 --- /dev/null +++ b/community/joker/go-mod.patch @@ -0,0 +1,48 @@ +diff --git a/go.mod b/go.mod +index f3d3d64..792d709 100644 +--- a/go.mod ++++ b/go.mod +@@ -8,7 +8,7 @@ require ( + github.com/jcburley/go-spew v1.3.0 + github.com/pkg/profile v1.2.1 + github.com/yuin/goldmark v1.4.13 +- go.etcd.io/bbolt v1.3.3 ++ go.etcd.io/bbolt v1.3.7 + gopkg.in/yaml.v2 v2.4.0 + ) + +@@ -32,7 +32,7 @@ require ( + golang.org/x/crypto v0.17.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/net v0.19.0 // indirect +- golang.org/x/sys v0.15.0 // indirect ++ golang.org/x/sys v0.20.0 // indirect + golang.org/x/tools v0.13.0 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + ) +diff --git a/go.sum b/go.sum +index 578bd10..fe1be9a 100644 +--- a/go.sum ++++ b/go.sum +@@ -68,8 +68,8 @@ github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM + github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= + github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= + github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +-go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= +-go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= ++go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= ++go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= + golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= + golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +@@ -107,8 +107,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-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.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= ++golang.org/x/sys v0.20.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.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= diff --git a/community/jool-modules-lts/APKBUILD b/community/jool-modules-lts/APKBUILD index a877c3f18a5..cb29bbb40af 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.30 +_kver=6.6.32 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/community/jool-modules-rpi/APKBUILD b/community/jool-modules-rpi/APKBUILD index d0a7d8fadac..87cc3414c06 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.29 +_kver=6.6.31 _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/jose/APKBUILD b/community/jose/APKBUILD index 3c3a2327221..86a2045b6d5 100644 --- a/community/jose/APKBUILD +++ b/community/jose/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=jose -pkgver=12 +pkgver=13 pkgrel=0 pkgdesc="C-language implementation of Javascript Object Signing and Encryption" url="https://github.com/latchset/jose" @@ -25,5 +25,5 @@ package() { } sha512sums=" -318308b7b82f669efb2b73652a5d2f98902a4ccf04e7db366a73777c59d8ec9866e047aa210e1e220e5e717e86a2a303931d81dab03070901e3e703f478b265b jose-12.tar.xz +c9de298d2f46a3ebb97fe505732effffaa44c18e47986defbc71199d059bfb3484b014e61c9a2916a5718f7a9d8da1d095b36bee9710e5c9878f64cb53cb6b8d jose-13.tar.xz " diff --git a/community/jsonnet/APKBUILD b/community/jsonnet/APKBUILD index 964da0b1fd8..17c0adf0cbf 100644 --- a/community/jsonnet/APKBUILD +++ b/community/jsonnet/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.20.0 pkgrel=0 pkgdesc="The data templating language" url="https://jsonnet.org/" -arch="all !s390x !riscv64" # blocked by rapidyaml +arch="all !s390x !riscv64 !loongarch64" # blocked by rapidyaml license="Apache-2.0" makedepends="cmake gtest-dev nlohmann-json rapidyaml-dev samurai" checkdepends="bash" diff --git a/community/judo/APKBUILD b/community/judo/APKBUILD index c5c7cf1175b..3d3310d759d 100644 --- a/community/judo/APKBUILD +++ b/community/judo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=judo pkgver=0.6 -pkgrel=3 +pkgrel=4 pkgdesc="Simple orchestration & configuration management" url="https://github.com/rollcat/judo" license="MIT" diff --git a/community/jujutsu/APKBUILD b/community/jujutsu/APKBUILD index d335d0e920d..ba9d45feacb 100644 --- a/community/jujutsu/APKBUILD +++ b/community/jujutsu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=jujutsu -pkgver=0.17.0 +pkgver=0.17.1 pkgrel=1 pkgdesc="Git-compatible distributed version control system" url="https://github.com/martinvonz/jj" @@ -16,6 +16,7 @@ makedepends=" openssl-dev zstd-dev " +checkdepends="openssh-keygen" subpackages=" $pkgname-doc $pkgname-bash-completion @@ -39,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() { @@ -73,5 +73,5 @@ package() { } sha512sums=" -1e5023b2a66717b8839a82f57e99f1b97b910663a93baf98e26f3f53cc9bc3876f9dab2ff686254a782912b313748e812d1e0b573ab10eb6d25ecf9232e8066e jujutsu-0.17.0.tar.gz +5a3b90b8a608903483fa0b26c341b8d5b60df3ac6959c0d34fd7d7d5b509f044dfb1eb123d37a84a887b3ab9ff37a3d719be308969cd99837f4d32c6efff6067 jujutsu-0.17.1.tar.gz " diff --git a/community/juk/APKBUILD b/community/juk/APKBUILD index 131f4941deb..9a8751808b4 100644 --- a/community/juk/APKBUILD +++ b/community/juk/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=juk -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -58,5 +58,5 @@ package() { } sha512sums=" -32dd6ad402f6b8d94c6988d0503c375725fe0fe816d9b2dbc89c3a327c5ecd695bca1341d44f694a2139e8900961afe434a1bd67b9192a971209a3d46625515c juk-24.02.2.tar.xz +f9f055a0e89acb0ea373e160dc8335e530a83f4da205504f3ef4b724769da11145a59be81413cff740209729f823a0db1a3d61db6336d5817a3d11b9b095fa0a juk-24.05.0.tar.xz " diff --git a/community/jupyter-notebook/APKBUILD b/community/jupyter-notebook/APKBUILD index 72ebc31fae4..9b2b5cec94a 100644 --- a/community/jupyter-notebook/APKBUILD +++ b/community/jupyter-notebook/APKBUILD @@ -6,9 +6,9 @@ pkgrel=1 pkgdesc="Jupyter interactive notebook" url="https://github.com/jupyter/notebook" # py3-argon2-cffi is not available on s390x -# bower/npm not present on riscv64 +# bower/npm not present on riscv64 and loongarch64 # jupyter-nbclassic not present on ppc64le/armhf -arch="noarch !armhf !s390x !riscv64 !ppc64le" +arch="noarch !armhf !s390x !riscv64 !loongarch64 !ppc64le" license="BSD-3-Clause" depends=" jupyter-nbclassic @@ -53,6 +53,3 @@ package() { python3 setup.py install --prefix="/usr" --root="$pkgdir" } -sha512sums=" -388df9e5e3f329c27353cd368693ae93e4d2efc00f81a96919367518ef742d1e69e34852ef732dc9ef940dab3bbe16406a133a7cc0045f1e2eeb2961af701faf jupyter-notebook-6.5.6.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/k0sctl/APKBUILD b/community/k0sctl/APKBUILD index 4ade7b32268..32de8676382 100644 --- a/community/k0sctl/APKBUILD +++ b/community/k0sctl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=k0sctl pkgver=0.17.5 -pkgrel=1 +pkgrel=2 pkgdesc="Bootstrapping and management tool for k0s clusters" url="https://github.com/k0sproject/k0sctl" arch="all" diff --git a/community/k3b/APKBUILD b/community/k3b/APKBUILD index 8596572f7ca..927cfc87812 100644 --- a/community/k3b/APKBUILD +++ b/community/k3b/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=k3b -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -72,5 +72,5 @@ package() { } sha512sums=" -005c6a782d80e8365b65d2a6c2f5a609cd1b5bf805d010f6bbb85438423b840efb630219171d06ecd67d1c4c48e06fb1a0c794b8e6dcb7b2788fb68a07095ee6 k3b-24.02.2.tar.xz +7da31e1bf83d8ae4e643b2ef8927ba15051e279caa8bdb07d1086dcb2cc9353cc9b189236ba8276b765cc5fa5807b5aa9e941144d2a9be0e1358e42465148206 k3b-24.05.0.tar.xz " diff --git a/community/k3s/APKBUILD b/community/k3s/APKBUILD index f80f437c750..557ac17f8d4 100644 --- a/community/k3s/APKBUILD +++ b/community/k3s/APKBUILD @@ -3,10 +3,10 @@ pkgname=k3s _pkgver=1.29.4+k3s1 pkgver=${_pkgver/+k3s/.} -pkgrel=0 +pkgrel=1 pkgdesc="Lightweight Kubernetes. 5 less than k8s" url="https://k3s.io" -arch="all !riscv64" # https://github.com/marten-seemann/tcp/pull/1 +arch="all !riscv64 !loongarch64" # https://github.com/marten-seemann/tcp/pull/1 license="Apache-2.0" options="!check" # No test suite from upstream depends=" diff --git a/community/k9s/APKBUILD b/community/k9s/APKBUILD index e51d5293bbb..dec9f7a1adb 100644 --- a/community/k9s/APKBUILD +++ b/community/k9s/APKBUILD @@ -3,7 +3,7 @@ pkgname=k9s _pkgname=github.com/derailed/k9s pkgver=0.32.4 -pkgrel=1 +pkgrel=2 pkgdesc="Kubernetes TUI" url="https://k9scli.io" # riscv64 FTBS diff --git a/community/kaccounts-integration/APKBUILD b/community/kaccounts-integration/APKBUILD index e1ea5d25d39..9f509535192 100644 --- a/community/kaccounts-integration/APKBUILD +++ b/community/kaccounts-integration/APKBUILD @@ -4,11 +4,11 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kaccounts-integration -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules -# s390x, ppc64le, riscv64 blocked by signon-ui -> qt6-qtwebengine -arch="all !armhf !s390x !ppc64le !riscv64" +# s390x, ppc64le, riscv64, loongarch64 blocked by qt6-qtwebengine -> signon-ui +arch="all !armhf !s390x !ppc64le !riscv64 !loongarch64" url="https://kde.org/applications/internet/" pkgdesc="Small system to administer web accounts for the sites and services across the KDE desktop" license="GPL-2.0-or-later AND LGPL-2.1-or-later" @@ -49,5 +49,5 @@ package() { } sha512sums=" -214d0bb5a16d539adb6d1007a57b67e09ff2b96208891649945f427efca593d2c2ba1534ca048c6fa1ac97606e9f85c6d2448760a6101114665afa706c94b469 kaccounts-integration-24.02.2.tar.xz +4cfeffc3215e5825f9eedca5d2253b5f7cf7655108515d687dfa9425170aa184984cc0f88e9e10f413b4f0073f87f7fb354020f8d909f10df2e789b0a522f7d0 kaccounts-integration-24.05.0.tar.xz " diff --git a/community/kaccounts-providers/APKBUILD b/community/kaccounts-providers/APKBUILD index e1642b4a43e..c25cda735bf 100644 --- a/community/kaccounts-providers/APKBUILD +++ b/community/kaccounts-providers/APKBUILD @@ -4,11 +4,11 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kaccounts-providers -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules -# s390x, ppc64le and riscv64 blocked by qt6-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64" +# s390x, ppc64le, riscv64 and loongarch64 blocked by qt6-qtwebengine +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://kde.org/applications/internet/" pkgdesc="Small system to administer web accounts for the sites and services across the KDE desktop" license="GPL-2.0-or-later" @@ -43,5 +43,5 @@ package() { } sha512sums=" -a9012add2ed8554777190e918691765c6aabb8db704d4110cc4f983907f22293eadb1ecd6d86678987750c462f7f50969f4da11f20a43e87a7a41a6f16a667a4 kaccounts-providers-24.02.2.tar.xz +d4e85fd695b7d4ba249361774e5ea144df29bf14a2f8b056c2723e8b21ef37cd5f8dd14c02a0719be1726f254fe7e54f80c1a5008bf62f79735f0fc20e44f7cb kaccounts-providers-24.05.0.tar.xz " diff --git a/community/kactivities5/APKBUILD b/community/kactivities5/APKBUILD index b52ed8eab9f..36750cc26b6 100644 --- a/community/kactivities5/APKBUILD +++ b/community/kactivities5/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kactivities5 -pkgver=5.115.0 -pkgrel=2 +pkgver=5.116.0 +pkgrel=0 # armhf blocked by qt5-qtdeclarative arch="all !armhf" pkgdesc="Core components for the KDE's Activities" @@ -56,5 +56,5 @@ libs() { } sha512sums=" -8addffc50b40a4b8a13f26d625b6cf76cfa1758c2aa78b9eb1578f4b9447044e21b643f4140f0dcda0bab7f4b0598a1cce6246c0c0c31ae9a49d33cb31382a3b kactivities-5.115.0.tar.xz +d36755cbf3e28262086da2d737c99eb6829c75c374972b97f8dfa7ba0f5d2c02c4d00e833702d23c04d02a6883d14735950cbdc0d92bb6dfa3fe615a488d5adf kactivities-5.116.0.tar.xz " diff --git a/community/kactivitymanagerd/APKBUILD b/community/kactivitymanagerd/APKBUILD index 2843004038a..e3b20498624 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.4 +pkgver=6.0.5 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=" -10a945a70f4c4ab2b28a9731771c0a79aef9ce99b6c179544c85e1c7935554893284d3718c9653eff3a2c2534149a8f337b92dbc9c43c9336988961b8201a295 kactivitymanagerd-6.0.4.tar.xz +067558a5755439c4db83619278b1faa10a211066a4ae87ba9bc261e46d258ac52915506031585aa6484415dbf9cc2d683bcb2b65acaaeac10bdabc3927d3cfcc kactivitymanagerd-6.0.5.tar.xz " diff --git a/community/kaddressbook/APKBUILD b/community/kaddressbook/APKBUILD index e174e8df93e..dbb3add0c90 100644 --- a/community/kaddressbook/APKBUILD +++ b/community/kaddressbook/APKBUILD @@ -4,11 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kaddressbook -pkgver=24.02.2 +pkgver=24.05.0 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 @@ -55,5 +56,5 @@ package() { } sha512sums=" -487b2367419f15a7df98bc96ff3a321b987963676639af52c9a3e455ae3983a49e7be899f6c16c3ed429ec2c9161158273b5e74474250a8bcd734ca06f153af8 kaddressbook-24.02.2.tar.xz +aa012ca8c815e2f0b2a6f7014c3eb9863876e0314e06007d818a1f2d5ae84e39b801f311c1d289024414108c218d6edbc9c80c0fdf0dac76e4220cb97e10629e kaddressbook-24.05.0.tar.xz " diff --git a/community/kaidan/APKBUILD b/community/kaidan/APKBUILD index 7f62d61f1df..56fe19c5b96 100644 --- a/community/kaidan/APKBUILD +++ b/community/kaidan/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=kaidan pkgver=0.9.1 -pkgrel=5 +pkgrel=6 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" diff --git a/community/kajongg/APKBUILD b/community/kajongg/APKBUILD index c2d505d0940..dcf4a3b8365 100644 --- a/community/kajongg/APKBUILD +++ b/community/kajongg/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kajongg -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="noarch !armhf" @@ -51,5 +51,5 @@ pyc() { } sha512sums=" -77200f4941296bcf0e10634f9017404d17205d20ead864a08e8608ea4093372ba85b31bce3f1e7148ead62a3ae312d6ab83f8c65715799ce6f4f3c20e891bca6 kajongg-24.02.2.tar.xz +2d06ac233f17ee93a9b66d56366ee93515e7bef3b2673932161a009cb9118b57789257238fde38884cee6ca20d50bd1c2f91f7735c58a8f59d485238ee1f2f63 kajongg-24.05.0.tar.xz " 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..75b276a2684 100644 --- a/community/kakoune/APKBUILD +++ b/community/kakoune/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Willow Barraco <contact@willowbarraco.fr> pkgname=kakoune -pkgver=2023.08.05 +pkgver=2024.05.18 pkgrel=0 pkgdesc="Code editor heavily inspired by Vim, but with less keystrokes" url="https://kakoune.org" arch="all" license="Unlicense" -makedepends="asciidoc" +checkdepends="perl" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/mawww/kakoune/archive/v$pkgver.tar.gz alpine-linux.kak @@ -24,13 +24,14 @@ 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 +1e5ccd4882dd3a8682e4e53f562296e737ae9238a343cf543ddbf71cbabc9543d21397a41d91a187593ea0809d1935bf41f83f5ab6ad2e41b213ed03ab32b79a kakoune-2024.05.18.tar.gz c5b11dc28adf785b4e83637fe1d5c9db334616d2d3f6c667823745e273f739c57d0d408b9bec8a65210e3c7ccb80a5b488ebbb3c0c5de8bdec13e1b4b4d02b77 alpine-linux.kak -23d05861de3c23c8193b1b6d7ca0d2b5b33548c0ae9a317186ccca6533b51daffb9064d3ab9e7ac0a0a794e119633089ca34673b6d9dd56041e2f9046b38b87b 0001-fix-CXXFLAGS.patch +83295606d1191ae66339ccd813b5f123ab49b22bafcdd578b109ea367dae52c5de7f6b8e44119579163befb349e3b76b4b9e4b20f951466dc2c270c38e64ceb1 0001-fix-CXXFLAGS.patch aa5df7a115e7b7ecaba85794ea56961fd1c638f4590300474fa72c8900ecb36742d7c8075ebc48151f40ba2dc427c4d8bcca9c844793768a1d0c4e66f22d328c constexpr.patch " diff --git a/community/kalarm/APKBUILD b/community/kalarm/APKBUILD index 8961d3d64d7..28e515ed49e 100644 --- a/community/kalarm/APKBUILD +++ b/community/kalarm/APKBUILD @@ -4,13 +4,14 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kalarm -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 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 @@ -79,5 +80,5 @@ package() { } sha512sums=" -2de2d881e3a2a959b1d4f2e25415fdbdba1adf68578ab2f489cde9a51ef63f7909e686bf869992809ae615dc3caad3cd337fa7bf6d66a1f323996785c4be1f57 kalarm-24.02.2.tar.xz +19bf49642aa7442c79c871fc18e4354b501236ad2525f7f83752163bc9dd2c8399684593b732995c00286e31c0008345245264091ed28f02d4d90603f6b5400e kalarm-24.05.0.tar.xz " diff --git a/community/kalgebra/APKBUILD b/community/kalgebra/APKBUILD index b127ba47737..c56da4e1bd7 100644 --- a/community/kalgebra/APKBUILD +++ b/community/kalgebra/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kalgebra -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -49,5 +49,5 @@ package() { } sha512sums=" -449fa9db2b2aa94de6da004f6daea6c122d6209b2f791920d5db99b4c4999143ae3fb47ed3058e6cb53dfd358cad7a94c48ae790c5f143a4751f301c7c0bf2ce kalgebra-24.02.2.tar.xz +fb00fc5cb0964da764a3dcafada700453613979f1c06cdcf98b15c0701c1f2c65ea288e0ba07c119575459ad0075f3c6d80f0db6dd87207ab76afe825d21c249 kalgebra-24.05.0.tar.xz " diff --git a/community/kalk/APKBUILD b/community/kalk/APKBUILD index 1f052b32a33..43cfbec87ed 100644 --- a/community/kalk/APKBUILD +++ b/community/kalk/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kalk -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A powerful cross-platfrom calculator application" arch="all !armhf" # Blocked by qt6-qtdeclarative @@ -45,5 +45,5 @@ package() { } sha512sums=" -045eb4ab38b700e0ee44f70e5df10341255d51cf0fd99fd8f4c55323e1672e6e6213c84bb26aa5085fbeab1c572adbb88de444b2585aa15f0d7657eac220d038 kalk-24.02.2.tar.xz +c7945e4770c0524f3f0f864b11d05aae5f7253cf76a31e2b0214ab7d8517f911edef704d3f182f78ccf9364039c18262a84553e32d8ddc213b2f7901c9186878 kalk-24.05.0.tar.xz " diff --git a/community/kalzium/APKBUILD b/community/kalzium/APKBUILD index 87bd3962fdb..93ac0c7b817 100644 --- a/community/kalzium/APKBUILD +++ b/community/kalzium/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kalzium -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -52,5 +52,5 @@ package() { } sha512sums=" -7cf5c46a175014c61766a2c0edcac2ca66405053c85a842b40ceca8afbfc5f9130f684b146f54626558d14c70e95f1684d116004816ee5899bd5b4f668947b21 kalzium-24.02.2.tar.xz +f9b935905f98adf9ed924d394c29e785722b1fbe0351c3e6b9d74562af4a986d5cf42f172f84117fad1beb1a22f33cd4ac9b675404bb230ec452e633136beec2 kalzium-24.05.0.tar.xz " diff --git a/community/kamera/APKBUILD b/community/kamera/APKBUILD index ce2299f06ab..e283c254532 100644 --- a/community/kamera/APKBUILD +++ b/community/kamera/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kamera -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -45,5 +45,5 @@ package() { } sha512sums=" -e816bbd52102d118a221230c28c0e8191779757b02fe79a39e8698091bc08ea070c7a0ea7e1a04b4e4a78dd62ce11ce21f523a3ab070ff069a1bc20cc669f853 kamera-24.02.2.tar.xz +2b6260d9b97900a3557ced0bb4a84d323378c4fd1edc1fd897462860537493b61b8240cafa9df5405e9259f8d26a376a2011514df29550d4a17d65e3be3bcb2b kamera-24.05.0.tar.xz " diff --git a/community/kamoso/APKBUILD b/community/kamoso/APKBUILD index 0375b44add2..aec7f795b19 100644 --- a/community/kamoso/APKBUILD +++ b/community/kamoso/APKBUILD @@ -4,11 +4,11 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kamoso -pkgver=24.02.2 +pkgver=24.05.0 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://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 @@ -54,5 +55,5 @@ package() { } sha512sums=" -d492b79b6a47de691f138c5f899cdd15206350eba14626dfd52e50647bcd3c15f41fc31d5dcb2b762013396c6639c6640576edb37a7b11d520773e11ca4475c8 kamoso-24.02.2.tar.xz +032ff659dee161f5c34450a819101d0aa8a9fff3a7751491f958dc86d6127afd7b7f2ccea68c3f36a4c349b3a6a72dbec91e81db44e6df27c0b461cc36dd8d06 kamoso-24.05.0.tar.xz " diff --git a/community/kanagram/APKBUILD b/community/kanagram/APKBUILD index b34075fcbed..ba75b90df83 100644 --- a/community/kanagram/APKBUILD +++ b/community/kanagram/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kanagram -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -49,5 +49,5 @@ package() { } sha512sums=" -9bb611a6276eee9afaa5d5409053f2d8ba7b8d43ffdd0bcbdccf3cf2820557282576f84cf1990a66f93875440a9b32e10816e02f09006c1effe7897a1f8ce413 kanagram-24.02.2.tar.xz +6cd78b59b3ad2d7f460ac5892c768c2943ef32b9d1d658ed130a59dad8287aa376873a80c40ec23960039603cf7c68e373d94d301debc3445d485bd303fb16f1 kanagram-24.05.0.tar.xz " 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/kapman/APKBUILD b/community/kapman/APKBUILD index 07357c91869..deacfa66732 100644 --- a/community/kapman/APKBUILD +++ b/community/kapman/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kapman -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -48,5 +48,5 @@ package() { } sha512sums=" -a78f345a126cf9553fe1793189e04520e6eef749fb29549d7e9c9c40057c8e2e532151b9df11de152f1528ad6558463698f8e004c396626c52bd1806f5c391df kapman-24.02.2.tar.xz +807fa247a453a4c19b6fdfb14929890579478abd0ade12c1562e6a25c11d46db2dc21123916b0904e10d61454bfcb4a06898a02ee92113e9ff07257c8ea95b4b kapman-24.05.0.tar.xz " diff --git a/community/kapptemplate/APKBUILD b/community/kapptemplate/APKBUILD index 86f24e54d5f..23532ce307e 100644 --- a/community/kapptemplate/APKBUILD +++ b/community/kapptemplate/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kapptemplate -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -44,5 +44,5 @@ package() { } sha512sums=" -b206414862528d4f5d0a30488efe35c90a4558b455f619b315861df95556442bab45c5a77d08a7f0a149a5b7e99d449aa4c480b6f2f1be86da6a228214e1abae kapptemplate-24.02.2.tar.xz +d3d599c3e697ce6fd3448b2a91e210fde6fe4c45c7b24c4a7611f614d7c7a5dab93dac296b44156d7855a9b25b03afd35def5d7aec1c1c6aa4c39e09714d3aad kapptemplate-24.05.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/karchive5/APKBUILD b/community/karchive5/APKBUILD index 0382aa8a2bd..6e099afacb3 100644 --- a/community/karchive5/APKBUILD +++ b/community/karchive5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=karchive5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Qt5 addon providing access to numerous types of archives" # armhf blocked by extra-cmake-modules @@ -48,5 +48,5 @@ package() { } sha512sums=" -f17baaaa850368ae517d0750a5100020448a21276c1ed5f304628b34b6e2634a9c151985f28306e0217ac17a4e91afa82562afe5cd5ec4558d16074e161e6e5a karchive-5.115.0.tar.xz +2f14f2998d9e5f73bee71488ab270bf65a989e7a7ff87d68efa685bb14500328d4679c35d8caeb5c65bab255fca4dbb36b449cea08c59a746c721f1d1c318e17 karchive-5.116.0.tar.xz " diff --git a/community/kasts/APKBUILD b/community/kasts/APKBUILD index e285d86e587..e77339f27ad 100644 --- a/community/kasts/APKBUILD +++ b/community/kasts/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kasts -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Kirigami-based podcast player" # armhf blocked by extra-cmake-modules @@ -60,5 +60,5 @@ package() { } sha512sums=" -119d280a89bbd3e31e27013877933b84c9f79c60b4238dc6cda810f8208e389503bfc1b2fdbeeb47cab4571384f8a6c5128eb782300a89cf281851545db37dee kasts-24.02.2.tar.xz +8c55bc0c1a21559c7127814319bc4d4b6b3c1fe500db634ea25b98a1a2ccd879934aa5a52ee9e8eccc3ea44296b7de8125f119c80177f9669dba4f2a3690c265 kasts-24.05.0.tar.xz " diff --git a/community/kate/APKBUILD b/community/kate/APKBUILD index 2614928e583..ed66752da5c 100644 --- a/community/kate/APKBUILD +++ b/community/kate/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kate -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -65,7 +65,7 @@ build() { check() { # kateapp-session_manager_test and kateapp-filetree_model_test are broken # kateapp-sessions_action_test requires OpenGL - xvfb-run ctest --test-dir build/kate --output-on-failure -E "kateapp-(session(_manager|s_action)|filetree_model|bytearraysplitter|diffwidget|location_history|kate_view_mgmt)_test(|s)" -j1 + xvfb-run ctest --test-dir build/kate --output-on-failure -E "kateapp-(session(_manager|s_action)|filetree_model|bytearraysplitter|diffwidget|location_history|kate_view_mgmt|kate_doc_manager)_test(|s)" -j1 } package() { @@ -122,5 +122,5 @@ kwrite_lang() { } sha512sums=" -33d16aed57ac9a712dab525e8a9a8d284628d8fb0d4e22aa861f6cedb7c53b3f1ea9019337e252a249895008878659d48426a8bd9340570cf8b255cec639ded9 kate-24.02.2.tar.xz +e8419677f182b5c59db5a085e8eccf08515a97e96bdc3e435d1dad45571c2e58525a15bc1b542e9e4f522cdd0554e292169c6df41a2a3073f05eecba17ca1a78 kate-24.05.0.tar.xz " diff --git a/community/katomic/APKBUILD b/community/katomic/APKBUILD index 3207f773436..67d49d783a8 100644 --- a/community/katomic/APKBUILD +++ b/community/katomic/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=katomic -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -47,5 +47,5 @@ package() { } sha512sums=" -28ee05fbb6cab1f19d7a6cf981e34f05923e457e192eec708073d64b9eb3a28c1f245c7882e8fb979b8de24f1928448a50c6dac4c1d384b502f7ca0cc8e1ae7e katomic-24.02.2.tar.xz +fb009fc39ca6d381a67d4fcc4495e5fa6a7586a69dfbcb42d7bb5951638c8ceb0bbd936d860e994bd9039741b11c4ada0b1c69d4b9d58aa72f001e850acf9fa1 katomic-24.05.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/kauth5/APKBUILD b/community/kauth5/APKBUILD index 595e0588b32..b408416901c 100644 --- a/community/kauth5/APKBUILD +++ b/community/kauth5/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kauth5 -pkgver=5.115.0 -pkgrel=1 +pkgver=5.116.0 +pkgrel=0 pkgdesc="Abstraction to system policy and authentication features" # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -49,5 +49,5 @@ package() { } sha512sums=" -ace9bcefdba0425dc4e2fc4dfe90bd8faad91b1e5b6ed16ec5b7870f3f22e4384d4b1776c97da501eefb5dc7ed31412593c59a5567cb394e11838d8cfe118fde kauth-5.115.0.tar.xz +1a640bb2bdc4a4d2a6458becb618a618abfb510bf6286145bb3834373cc8fec4980008d977476f699ad97368b316ccdf5308cea3eee80171a9d051003f45d7c6 kauth-5.116.0.tar.xz " diff --git a/community/kbackup/APKBUILD b/community/kbackup/APKBUILD index d5300e22e8a..40800be4a6a 100644 --- a/community/kbackup/APKBUILD +++ b/community/kbackup/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kbackup -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -48,5 +48,5 @@ package() { } sha512sums=" -b0e5fdfab6a9a6c3d8a72caa288532c6b02266d6360ba4ab42c7692ed01e17e1008091bbc6a7f3e7e6d87eb99b931eec6e38f1030aca6d2c9377816d2f4c9823 kbackup-24.02.2.tar.xz +97928a706d64973121d8805b0f4abd5bfd1b52e1b6a1b92fb8caa615c9416dd0b7fbc5cd1f9d9b9e65fee52bea73e34d00ac48a1075ef98d902d616fbf670772 kbackup-24.05.0.tar.xz " diff --git a/community/kblackbox/APKBUILD b/community/kblackbox/APKBUILD index 8338b99fc43..05dd4b80704 100644 --- a/community/kblackbox/APKBUILD +++ b/community/kblackbox/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kblackbox -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -48,5 +48,5 @@ package() { } sha512sums=" -3ee046d2076984991485a8be758efe6df55e97b62349b342751a9728de58538f9ca5cdf54ee2a26e81487a3ca313681ddb0ac815c5a3b7692287e9014ea10897 kblackbox-24.02.2.tar.xz +d15dd431e715041576cf84bff5fe94b71963064006ef39306e1f8fa530ac596370c8930f1284d97c90c638880c459ebde295e8de481a11244a491bf3964b3c4f kblackbox-24.05.0.tar.xz " diff --git a/community/kblocks/APKBUILD b/community/kblocks/APKBUILD index dbb18972991..fb87f86a0dc 100644 --- a/community/kblocks/APKBUILD +++ b/community/kblocks/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kblocks -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="The classic falling blocks game" url="https://kde.org/applications/games/kblocks/" @@ -49,5 +49,5 @@ package() { } sha512sums=" -d4ea2cfc0b97f5afcdddaf726886904952ddf39dc3ff2bfdfda668c18b28d9269a529c03a10145aa5198ec8fa7df5738724f805e894fe9190cac857b5995242d kblocks-24.02.2.tar.xz +909b7a0fec18e2b02c0141e4a76e8297067f4bcb051e9766bd048cc6a0eb24e3f8570e6aef46f265f111a7850c339dd03f865b8978c24b607462aa0932c70fe0 kblocks-24.05.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/kbookmarks5/APKBUILD b/community/kbookmarks5/APKBUILD index 883e1aa707a..ce54fc24be8 100644 --- a/community/kbookmarks5/APKBUILD +++ b/community/kbookmarks5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kbookmarks5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Support for bookmarks and the XBEL format" # armhf blocked by extra-cmake-modules @@ -52,5 +52,5 @@ package() { } sha512sums=" -5a8354bdd425e6891d133d9b77e85c31567356aeedeb996fbb187d64acb8835d560629b8874ce805312fbbd8f0f8737ede35a9c8cecfc6ac0ee218005f0367d2 kbookmarks-5.115.0.tar.xz +72f19ad40595093fa828ead0553f8d0afc149b77479f75b014e1cab059208fa23607a755f2d4afd2079c047bf6832782664beb07d674cb56b41586d51c5d9933 kbookmarks-5.116.0.tar.xz " diff --git a/community/kbounce/APKBUILD b/community/kbounce/APKBUILD index a027780ef14..4ea4a652a05 100644 --- a/community/kbounce/APKBUILD +++ b/community/kbounce/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kbounce -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A single player arcade game with the elements of puzzle" url="https://kde.org/applications/games/kbounce/" @@ -50,5 +50,5 @@ package() { } sha512sums=" -49c16f486a2ab8832cde731f36f1a2ff3052142362084e109a5e17a9703995187814718bfe779eb58f52ceacfe635ed3117cdcc0531d6a0e290c91a73a06b7cc kbounce-24.02.2.tar.xz +bf47e3dff6be345ca3507c9e65ced852661b51a22cf4cd47929ca261655900451043d9f365ab15e7c1c07faeff8ea861b15d681b2445f2d78140da405f545af8 kbounce-24.05.0.tar.xz " diff --git a/community/kbreakout/APKBUILD b/community/kbreakout/APKBUILD index 53f4f436ce9..bb0dac4787e 100644 --- a/community/kbreakout/APKBUILD +++ b/community/kbreakout/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kbreakout -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A Breakout-like game" url="https://kde.org/applications/games/kbreakout/" @@ -48,5 +48,5 @@ package() { } sha512sums=" -7beea15ff0b4ef83e947ff356fd74726d1c35c76e3680b805bc61789d45874b4b8eeb0193bd21bbcf88046b96c65ffc9f8d12742e50bcc34d51b71b48b6625ae kbreakout-24.02.2.tar.xz +ed2716531a56bad025ea08553903974425f6133004e60773da38f1af1d82854907f051be8924501e2ad83d451acce1ac04c76fc692e3e83a1e100c2cf9548bfc kbreakout-24.05.0.tar.xz " diff --git a/community/kbruch/APKBUILD b/community/kbruch/APKBUILD index 13a64caa4a6..7522df0f47b 100644 --- a/community/kbruch/APKBUILD +++ b/community/kbruch/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kbruch -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -43,5 +43,5 @@ package() { } sha512sums=" -e16942c17098924ef1817d2bcdc765a1c725f3ec2b0362d0fa6a661b8b906bd359eab4494ab65863a9a8457fc09893bf53e006a7b3581be5a61f342d4f145b50 kbruch-24.02.2.tar.xz +417490181aa14d456e048f57cb0675e4192aea4b821fa483a9d838c7c0d517dfa93b0958f7751cac93bb1bd997817081e875ebe450238e58c04bb9565dfe812c kbruch-24.05.0.tar.xz " diff --git a/community/kcachegrind/APKBUILD b/community/kcachegrind/APKBUILD index 2bf9706eb3b..0db7506e741 100644 --- a/community/kcachegrind/APKBUILD +++ b/community/kcachegrind/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kcachegrind -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -47,5 +47,5 @@ package() { } sha512sums=" -8b039a6bc9242e7ea0ae8ad782074941a6b46a18551088ea62101e4b5a9782871a02843464c3ea457e749cd16cf96d46d9bf26af0977fa1145ee6f77ac6a9353 kcachegrind-24.02.2.tar.xz +e59969f6b9070669c363e7f7be6a69c5feaf74a8383c63ed7111ee420a70644cbd904e07b67ff1992b0a373d4fff5401cbe69daa68b2e13f3e879819b92438ac kcachegrind-24.05.0.tar.xz " diff --git a/community/kcalc/APKBUILD b/community/kcalc/APKBUILD index 3e0eb419405..acff0408d7b 100644 --- a/community/kcalc/APKBUILD +++ b/community/kcalc/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kcalc -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -47,5 +47,5 @@ package() { } sha512sums=" -bf2b0d8420f0021428174a111abcc17cf0209dae30b635f52a7d166d5917185bdce2100b278b94797c643e876987397e953dc622e99cf2ab158d4e76351f4bc0 kcalc-24.02.2.tar.xz +d2dcab122924fbda2adf9d5e1ebc10de2a8849772aea0b73c60f59f7bf439009411eade9a5e6c4b33ed6613cfcd103bfa24f3beb892b75887ab06ed4ae3de0f9 kcalc-24.05.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..dad8e43814c 100644 --- a/community/kcalendarcore5/APKBUILD +++ b/community/kcalendarcore5/APKBUILD @@ -2,10 +2,10 @@ # 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 +pkgver=5.116.0 +pkgrel=0 pkgdesc="The KDE calendar access library" arch="all !armhf" # armhf blocked by extra-cmake-modules url="https://community.kde.org/Frameworks" @@ -47,5 +47,5 @@ package() { } sha512sums=" -20a47d83a8eedc62e307f8ff49e42d9c74cb4867c15b8ad52a1a20442c839d1a1484abb8c76e17cc0c189578a71f4f40e3cff5e591118904cf3c738b18a03e24 kcalendarcore-5.115.0.tar.xz +04fc6b6c00e2a994b47b15e57a531b51439d67155b90c388b4e37efb6428e0215e90ff52bb5afa55d0ee0e7cb75186eac750770c9036824c20b779ef418bd1c0 kcalendarcore-5.116.0.tar.xz " diff --git a/community/kcalutils/APKBUILD b/community/kcalutils/APKBUILD index 815e00584af..f5d24caa54f 100644 --- a/community/kcalutils/APKBUILD +++ b/community/kcalutils/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kcalutils -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="The KDE calendar utility library" # armhf blocked by extra-cmake-modules @@ -53,5 +53,5 @@ package() { } sha512sums=" -9c6642e79da6749065e76cfb3ec8c316d413bf2897ec19b92350bfb35ccc70ffe94f1afa747f0d8effd11b8767c6cc2ae6a022c142301dbc88fd49f76771382e kcalutils-24.02.2.tar.xz +c6833d7ea27358c9f5bb4baad11183dab8c982a71efa0bd4fcfeb8e0a2b2eb32dec3dc45b20e27276ff13b8ab26f855c0203b394cd00770c778b3806b6c73b0f kcalutils-24.05.0.tar.xz " diff --git a/community/kcharselect/APKBUILD b/community/kcharselect/APKBUILD index 95be5718f10..21da1d72196 100644 --- a/community/kcharselect/APKBUILD +++ b/community/kcharselect/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kcharselect -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -43,5 +43,5 @@ package() { } sha512sums=" -a4bde33768778938bb2f60e4e929657d127b5c95810e5f6b0266a0114866637f79980901a592cb6ae6bb6105aaef7a6f8112cd065a950d76fcbbf3d6c24c109c kcharselect-24.02.2.tar.xz +979e006dba292afa6a8ca80cc9922889efcef0d797db19ccb264db5b01cd520ce10a756dc9d38db9ad991ea3eaa5ae1e2ff4729f8020cd4eda1cf68a48fa20d1 kcharselect-24.05.0.tar.xz " diff --git a/community/kclock/APKBUILD b/community/kclock/APKBUILD index 600b1ea6a20..932a6b091f6 100644 --- a/community/kclock/APKBUILD +++ b/community/kclock/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kclock -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Clock app for Plasma Mobile" url="https://invent.kde.org/utilities/kclock" @@ -50,5 +50,5 @@ package() { } sha512sums=" -038ef993289d58e3c0232453fe6dd8eece9c310fc5488e92446ccb4f8f676ad196f254962050df5b87f0a10d3fd336196682b21312865640e4875e2a32f12b0f kclock-24.02.2.tar.xz +1ad6dba77cbb30506845658c60476b40f375d991254c47466a2c1abc2f35173a460291b072285e3de3b84a49f964913627bfbd2ea998c358c86f2e3468baf9f0 kclock-24.05.0.tar.xz " 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/kcmutils5/APKBUILD b/community/kcmutils5/APKBUILD index b28ae850111..5a3fb9977f8 100644 --- a/community/kcmutils5/APKBUILD +++ b/community/kcmutils5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kcmutils5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Utilities for interacting with KCModules" # armhf blocked by extra-cmake-modules @@ -53,5 +53,5 @@ package() { } sha512sums=" -69e91cf73587365d2861d54e90860adbe8de254473fd86da04a34aabed0623d5ee4500eebc691bcb68d3f271eafab67b32389745992c25d0b9f2b1383ee4511c kcmutils-5.115.0.tar.xz +05ee74e36f859a7c60d60c5da9bf24923742440b094b3969f56f7cef3ca1d7d7cdc6b3d7bb467db3388e3946f627fcbef29ba0c2f84cd85f041382920b4e3ad8 kcmutils-5.116.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/kcodecs5/APKBUILD b/community/kcodecs5/APKBUILD index c6555e3ae22..e768b26e002 100644 --- a/community/kcodecs5/APKBUILD +++ b/community/kcodecs5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kcodecs5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Provide a collection of methods to manipulate strings using various encodings" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -44,5 +44,5 @@ package() { } sha512sums=" -e2fb8a82c38e1038cd6bb230b658c45af8e4fd42dca29ee0f775f7c44154895ba4e983f26a98ab30ab394f246f6c7960642178b2a8b0d50d701b66945e798041 kcodecs-5.115.0.tar.xz +79d2b5b7a7cd815fa9a00ca4a8cd5fbf2a003521796b21fe3014caaa4506d14a7fbada88ff10b1a16118f2863dc876794e21db6a98f34d5b31d5973c5586da4b kcodecs-5.116.0.tar.xz " diff --git a/community/kcolorchooser/APKBUILD b/community/kcolorchooser/APKBUILD index 4b7e9d75d3d..1bfc28c9c70 100644 --- a/community/kcolorchooser/APKBUILD +++ b/community/kcolorchooser/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kcolorchooser -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -39,5 +39,5 @@ package() { } sha512sums=" -c30c9e1e62d51b958d06c91e6dda4c667d9945e874b696a6f7a32562b7deee299b399a1427774c9d6a646c73796cc2c0166834c1f2c5385b3feeaa78f9f1564a kcolorchooser-24.02.2.tar.xz +ab77225bd61429ed36bfe4f8e1ad8cbfaa9e02e1e81f13f6ab2f1d450d95b1cf6fef11ef21861e56c6938986664910dc0d50b43f743f4ae1a1cec3380db83fc8 kcolorchooser-24.05.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/kcompletion5/APKBUILD b/community/kcompletion5/APKBUILD index 51b952964a5..645c363cf5e 100644 --- a/community/kcompletion5/APKBUILD +++ b/community/kcompletion5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kcompletion5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Text completion helpers and widgets" # armhf blocked by extra-cmake-modules @@ -48,5 +48,5 @@ package() { } sha512sums=" -0d54721fcb35740df8cafa3969b9e4a74d16cd624aa19b3e60ac67e633d10c7efa95f6692b9111aeea9f2708a642fea0ca6587d802b7a99845e880414c169bb6 kcompletion-5.115.0.tar.xz +5a758b3e037f87e3b011232d0462599cfd0241f2345312a4ffb82e940aad5da023c07be68401febd556e33c38a6ff48ffff1e8ee769314acafbb3409a0c8b730 kcompletion-5.116.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/kconfig5/APKBUILD b/community/kconfig5/APKBUILD index 79856e2bcfc..bdf352285c9 100644 --- a/community/kconfig5/APKBUILD +++ b/community/kconfig5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kconfig5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Configuration system" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -51,5 +51,5 @@ package() { } sha512sums=" -e06df4c057ba4e03dd88e444c20e3f9481a8bea53fedb049796b9efb59ddd81569368608c98ca3434ad0249b7a7dd6774d5150966117da2c37e988e43395bbbf kconfig-5.115.0.tar.xz +a84f02462f2e7d75488dab6dfb0f438792762f2031cabe8cf7ef143f285e9da8de5e555165d3eb4bc24ae8e3528bc24dde1a6505a55933d98386351493a845d4 kconfig-5.116.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/kconfigwidgets5/APKBUILD b/community/kconfigwidgets5/APKBUILD index 8fa4c6fe0dd..6988a44cb1e 100644 --- a/community/kconfigwidgets5/APKBUILD +++ b/community/kconfigwidgets5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kconfigwidgets5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Widgets for KConfig" # armhf blocked by extra-cmake-modules @@ -54,5 +54,5 @@ package() { } sha512sums=" -2491e0dead8fc5b2ea5bb64587405383f5d8f5eec2dc289cd9d404e797f8d9fda7cbe3d56846c6253f035db54f1f262f29e7dcfb68266f3734303d393e94209e kconfigwidgets-5.115.0.tar.xz +30325d3b88539d96de97adf8d596bebc6f5f8a5ea0ccc0b272f5e5557aa4ad4dc72ece1491ab2d656efb6ba378a236448a2efb35e4d82ee3dd42f2f9d178ad0b kconfigwidgets-5.116.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/kcontacts5/APKBUILD b/community/kcontacts5/APKBUILD index 7764f795b00..9eb92a61cd5 100644 --- a/community/kcontacts5/APKBUILD +++ b/community/kcontacts5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kcontacts5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Address book API for KDE" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -56,5 +56,5 @@ package() { } sha512sums=" -7e53ed4810fb82a34ae3bf46aeb1b4ae1c70b46500928a15748a3b8a4762a3d86b95c7ca70d7387dd92f25c7e10d6c991de4c837c8efaf52ff0b69478391b1df kcontacts-5.115.0.tar.xz +b33a239bc577a0ff4d7b34e7fc12397fed543ba31a0fb1ebcd55dc5ce52e05e026953128f13c76828dd6723fed9a27153cd8420d5dd940404a4f79cd625499bf kcontacts-5.116.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/kcoreaddons5/APKBUILD b/community/kcoreaddons5/APKBUILD index a3613988b4a..c56ee08a3a9 100644 --- a/community/kcoreaddons5/APKBUILD +++ b/community/kcoreaddons5/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kcoreaddons5 -pkgver=5.115.0 -pkgrel=1 +pkgver=5.116.0 +pkgrel=0 pkgdesc="Addons to QtCore" arch="all !armhf" # armhf blocked by extra-cmake-modules url="https://community.kde.org/Frameworks" @@ -60,5 +60,5 @@ icons() { } sha512sums=" -66a209496de8370a3f69549462f101dfca76f87c6bb4e2ad5e616e5fd6b460d17ea3e93386d6450992e6ca3759868d1818bc29987af780b466100a9389504939 kcoreaddons-5.115.0.tar.xz +d77a1fcad6576692c6a6d80728acddb818acbc3a8f70fc59f3fa3c433a94c429e4b230840f7df23ae8027289e57fc0c8ae7c42b83ea734b567a640d5e248867d kcoreaddons-5.116.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/kcrash5/APKBUILD b/community/kcrash5/APKBUILD index 044985dfcfc..f748ff3aeea 100644 --- a/community/kcrash5/APKBUILD +++ b/community/kcrash5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kcrash5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Support for application crash analysis and bug report from apps" arch="all !armhf" @@ -47,5 +47,5 @@ package() { } sha512sums=" -a8c9d9676433f6017681328b93a9218a6e87794712488a905ba6a783c4b370a3d65b9efe6e8c77d809f72cde0fa28a43020b3e0ef909197918c76d94592b3233 kcrash-5.115.0.tar.xz +051ad694f0db1463c1105d3ff37221633a91c282850b6e295dadf07a323ba610046650c7d2e3b45dcd56214709b58989360b727b16dca0ca44dbc9b143f68e07 kcrash-5.116.0.tar.xz " diff --git a/community/kcron/APKBUILD b/community/kcron/APKBUILD index 1075febd0c0..b9d3418f294 100644 --- a/community/kcron/APKBUILD +++ b/community/kcron/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kcron -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -43,5 +43,5 @@ package() { } sha512sums=" -e4da9cf4ad032bfbc9b76a51fa1a5aca1b5c0c42ed38ca0b4e7cb8cb5fcbf9907e803b486b3bc9e9696f20bc5e4bd62289b93bf171a6b5055fcec0ea388bdcfa kcron-24.02.2.tar.xz +84f404bda1a7f1d99d47fadb0e5b123f88fcd0342cdf5caeeaf171e89434ccdd35b88a927c1c2309fee2b4c76a9f8d80085a18d5e272013f1e6c784625a1bf4a kcron-24.05.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/kdbusaddons5/APKBUILD b/community/kdbusaddons5/APKBUILD index c716799c7bb..7f1bcd8a862 100644 --- a/community/kdbusaddons5/APKBUILD +++ b/community/kdbusaddons5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kdbusaddons5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Addons to QtDBus" # armhf blocked by extra-cmake-modules @@ -45,5 +45,5 @@ package() { } sha512sums=" -4d43d39300652a7923a8f2a66dab18e606c2472c18f9629d3481bfc9329ff60b0d53f463de88d6dabfa106cebf68422184a4dc76b35c95f05050271eac29654e kdbusaddons-5.115.0.tar.xz +def33859b260b1910769ae241788c2e3adb85003014989415d3127629667a6e7f149519ae1ebed2e91d4db7d2e9d1792db0fbae46c91a163f07b456387a02993 kdbusaddons-5.116.0.tar.xz " diff --git a/community/kde-applications/APKBUILD b/community/kde-applications/APKBUILD index 5cdf81d6608..2f10183e1e7 100644 --- a/community/kde-applications/APKBUILD +++ b/community/kde-applications/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kde-applications -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 arch="noarch !ppc64le !s390x" # Limited by edu, network, umbrello and pim url="https://kde.org/applications/" diff --git a/community/kde-cli-tools/APKBUILD b/community/kde-cli-tools/APKBUILD index e06d4338b4e..fb72f00692a 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.4 +pkgver=6.0.5 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=" -ad2fc4440eddf9f4fbc732e43373838aa2f137a891acaf9cb49b2383ea27855f7bab667c53d9071111fcf11e6f149c926ebebaa6ddf29c74f2bedecebb42e1c5 kde-cli-tools-6.0.4.tar.xz +506c87d13d8793eab08f499178eb45a08d34d5b4506c5e816a0f42a72b1fd3bbf6c7558fde75e4aea98a40aa5d2fcc656fa8e025b0b3083901dad5f414b6e8ca kde-cli-tools-6.0.5.tar.xz " diff --git a/community/kde-dev-scripts/APKBUILD b/community/kde-dev-scripts/APKBUILD index 0ece9049111..cd0616a8669 100644 --- a/community/kde-dev-scripts/APKBUILD +++ b/community/kde-dev-scripts/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kde-dev-scripts -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf !s390x" @@ -34,5 +34,5 @@ package() { } sha512sums=" -6cc003798da5ab87442625155bfa5176299100e78827b7644dee66e381e43a06e4984d1da7115eac83cf4f4a8d54052c7f136b46b52e3013752661f0748e57d6 kde-dev-scripts-24.02.2.tar.xz +67d54512a4753576c50e9dfdcbd0bd6a861c08bcbcde6091dd500be558553e77d7325d127d645946fe768ada89706ed44334b5c73d23116b3773b99ecfc23f97 kde-dev-scripts-24.05.0.tar.xz " diff --git a/community/kde-dev-utils/APKBUILD b/community/kde-dev-utils/APKBUILD index 4f26317c255..97e7c9feddb 100644 --- a/community/kde-dev-utils/APKBUILD +++ b/community/kde-dev-utils/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kde-dev-utils -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -41,5 +41,5 @@ package() { } sha512sums=" -a482274285bce87071d4f899764de83d63913e91c5b4ca967fc9c0738ab2cd00db4ca3bd1a2661d0350c37285e5342bfb1d89919dd5c619cb09719600d46016f kde-dev-utils-24.02.2.tar.xz +79164a59f451b8b584342c9d8fb00205b2fa8731c8f639e0df3b3e6572f9b1b3b3a525585f6f52f1ce1d853f4064d4817bcc946df97207280221dd5ec3103750 kde-dev-utils-24.05.0.tar.xz " diff --git a/community/kde-gtk-config/APKBUILD b/community/kde-gtk-config/APKBUILD index f274e1e90ca..9b1212fc04f 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="GTK2 and GTK3 Configurator for KDE" # armhf blocked by qt6-qtdeclarative @@ -55,5 +55,5 @@ package() { } sha512sums=" -a6d1bc7b75e0b0d6659be91b22b779af3d50b6ca6590523ea169f92e7d373cdc6940a4a9f49136f3aab009b7da6a2a5d9130798d44bc5a8f045da12be31018b8 kde-gtk-config-6.0.4.tar.xz +61ad8817ee27bdc3b0bd6e279950170969dd32b19c5b4270770a7a929ef1c2d4b908df00ea756acbf707ce0b7e0bf406a91bfac7473576dda0210ac949d783ab kde-gtk-config-6.0.5.tar.xz " diff --git a/community/kde-inotify-survey/APKBUILD b/community/kde-inotify-survey/APKBUILD index 2b518c3058e..500fb3d2063 100644 --- a/community/kde-inotify-survey/APKBUILD +++ b/community/kde-inotify-survey/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kde-inotify-survey -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Tooling for monitoring inotify limits and informing the user when they have been or about to be reached" url="https://invent.kde.org/system/kde-inotify-survey" @@ -45,5 +45,5 @@ package() { } sha512sums=" -1e54060badc5f6a14280f1721efb1b75eac68756b3c11c26c81357eb1a3c5e8bdcad3cc8d1845762781319d53c261607ed2e928c355cf0274b62ee5e62f6dc99 kde-inotify-survey-24.02.2.tar.xz +627b8eeb33014a62cf9291f0d81b851b84e7a525fe13e9c9a2414cba9e40f3a4ac098ea9fce69937d10bcd6ccbfb3539cc816279c1792d9d2b6e876177f5ff23 kde-inotify-survey-24.05.0.tar.xz " diff --git a/community/kdebugsettings/APKBUILD b/community/kdebugsettings/APKBUILD index c54df18a0ea..1f3824e76d7 100644 --- a/community/kdebugsettings/APKBUILD +++ b/community/kdebugsettings/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdebugsettings -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 arch="all !armhf" url="https://kde.org/applications/utilities/" @@ -45,5 +45,5 @@ package() { } sha512sums=" -67fc55904a44bf262bf6eb91e3d6f3adc776db3a52c0f9ae8833aeeeff2bb471436f27da4cdd2bdbc72e11074516147d6b7d33de4d1b0091562a527ce3a2c7de kdebugsettings-24.02.2.tar.xz +2578cd50cf506b63fb2efdfebbe4993802b88d1e1e6f93e9bce95fceb74213471b4e5be713f6b1298d025ad3365961f4f8e916676c920bb690575448a29f7a7d kdebugsettings-24.05.0.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/kdeclarative5/APKBUILD b/community/kdeclarative5/APKBUILD index 89c36663aed..cc02273a40c 100644 --- a/community/kdeclarative5/APKBUILD +++ b/community/kdeclarative5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kdeclarative5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Provides integration of QML and KDE Frameworks" # armhf blocked by qt5-qtdeclarative @@ -57,5 +57,5 @@ package() { } sha512sums=" -e744d970605de5c0f32485ae471f52950c4af72a7e0e3fc3011b2320f7c951ea3e1a1a80f84916ba0fd1d4019c009b66967af70f06e5aa9ea758189c221310ce kdeclarative-5.115.0.tar.xz +6118cfc64c5a600cead31deaab79e7e60fef9c24ce5d4b163b581e1bae617979069e1a00cfc610a1e4b3fb80c9ff77fa5b34dace836d1d5326dfc31a2482d4bc kdeclarative-5.116.0.tar.xz " diff --git a/community/kdeconnect/APKBUILD b/community/kdeconnect/APKBUILD index 5d148b09524..97a4f7da2d4 100644 --- a/community/kdeconnect/APKBUILD +++ b/community/kdeconnect/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdeconnect -pkgver=24.02.2 -pkgrel=0 +pkgver=24.05.0 +pkgrel=1 pkgdesc="Adds communication between KDE and your smartphone" url="https://community.kde.org/KDEConnect" # armhf blocked by extra-cmake-modules @@ -80,6 +80,6 @@ nftables() { } sha512sums=" -b1940213ccf6ace17f84674ee5acca0cd228a3a96562db895e01afeb5d0a7f5d36e8f24ce956e92826026f50f6197ee67db79a182eb2c2fe47971ca623b03097 kdeconnect-kde-24.02.2.tar.xz +2670f07cffc95bac77d8f4d1b411a41a06c0f933b8eef4bec3e1a9cd65b28e4a919bba54315d464014c47e94f1f5ead441233bbe398313218a4efafb31dd2719 kdeconnect-kde-24.05.0.tar.xz 0ccc2cb0ffd3892698b45bcf723cfdd23ad98f0e2b0436cd0a91d9ed13c6992853e2c4092ee8a0edc6216f1f262151e99e344b8f16c52237e9ff8de62fd37cae 60_kdeconnect.nft " diff --git a/community/kdecoration/APKBUILD b/community/kdecoration/APKBUILD index 3591f14927b..a9d522822d9 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Plugin based library to create window decorations" arch="all !armhf" @@ -46,5 +46,5 @@ package() { } sha512sums=" -a27f97b5bdec32702e9aee66b81d11da340dcd12048a1a193f35419e45032bffbffc5e49bd65648314db6b0513e041b29c18941bf117474c72698fd45a60fbfc kdecoration-6.0.4.tar.xz +b15201b938f956672d9d20304a2618c939ad5568c32cd331b4a75ebc622c66c5d58a9606ece2dc1692f200427406d21c9f8767df2081ec923d41845186fb99ff kdecoration-6.0.5.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/kdeedu-data/APKBUILD b/community/kdeedu-data/APKBUILD index 47e4d8d75be..8ae6e7e1f70 100644 --- a/community/kdeedu-data/APKBUILD +++ b/community/kdeedu-data/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdeedu-data -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="noarch !armhf" @@ -34,5 +34,5 @@ package() { } sha512sums=" -bfbaf93b23afeb42dbf3d6fa28f624af0f8d5053283a1fef0786e564222378e1ff264145b338423c2275f0c789f50755f3983c0ff92e3ac3adeaf760c8a297d2 kdeedu-data-24.02.2.tar.xz +f0968e65db5d0c5321429ddd252a871d8e7686417b200fdf86720f960df2bb4ade77cb6ba59795ac35debf9ce4b19bf4d12bd1ff5c45921b10711749d37ff574 kdeedu-data-24.05.0.tar.xz " diff --git a/community/kdegraphics-mobipocket/APKBUILD b/community/kdegraphics-mobipocket/APKBUILD index 9e84c21c3da..aae06fa1c2a 100644 --- a/community/kdegraphics-mobipocket/APKBUILD +++ b/community/kdegraphics-mobipocket/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdegraphics-mobipocket -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A collection of plugins to handle mobipocket files" # armhf blocked by extra-cmake-modules @@ -38,5 +38,5 @@ package() { } sha512sums=" -6ba55478d40e366d629e939d3ea44ce114ce497d13433920774e78d7c6a05109deb110ed5e7284ee7101bc991d45ddb75dde8453e6559a6bcbcca1f2edef8a5a kdegraphics-mobipocket-24.02.2.tar.xz +f6f2e920f103de393fc2ff381271a9d3f32de0a854e97bea8db716457fb4f594f955819c368391d24a377559bc2c89790a4747f10dd16af574d309444a3d52d7 kdegraphics-mobipocket-24.05.0.tar.xz " diff --git a/community/kdegraphics-thumbnailers/APKBUILD b/community/kdegraphics-thumbnailers/APKBUILD index 9f4b87a8ef8..67d2ac238e5 100644 --- a/community/kdegraphics-thumbnailers/APKBUILD +++ b/community/kdegraphics-thumbnailers/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdegraphics-thumbnailers -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -40,5 +40,5 @@ package() { } sha512sums=" -bdacb207bdf74fa12b694253caa9475241fee2e8dd55aeec8d195e59cdf24cb2109b02138a7725fe423b6359bd4ec482fb9441d2e24ca9e0640e7b5455fa4e1f kdegraphics-thumbnailers-24.02.2.tar.xz +aeb247ad25a2f6198d6cca62b764fba34b20d57a540963411f27b334884ce2cfbceb3176dbdb306bcab162954074ad0c69e9524802eadbc233b130d0c879f214 kdegraphics-thumbnailers-24.05.0.tar.xz " diff --git a/community/kdenetwork-filesharing/APKBUILD b/community/kdenetwork-filesharing/APKBUILD index c6a5d4d0700..1538506cdd1 100644 --- a/community/kdenetwork-filesharing/APKBUILD +++ b/community/kdenetwork-filesharing/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdenetwork-filesharing -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -47,5 +47,5 @@ package() { } sha512sums=" -27c4cd378b85a6f1ba7e27bd8df03436557103c2390c5c7a8eef3d3616e1a2e4cfaf343ba33ba7840574af44fc1b53aaecee192c03d5981fc5438daa31bdc9cf kdenetwork-filesharing-24.02.2.tar.xz +71f542cf6bceb39f58795def80a259ec27616dd660d6996767e2b5f7a83091cc874b32211d1ecae0b34b57842d4a150fa37988a8f46e8fa3fd99c3c7ee5e612d kdenetwork-filesharing-24.05.0.tar.xz " diff --git a/community/kdenlive/APKBUILD b/community/kdenlive/APKBUILD index cfbf13d40af..b9206d443a7 100644 --- a/community/kdenlive/APKBUILD +++ b/community/kdenlive/APKBUILD @@ -4,18 +4,19 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdenlive -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # 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 @@ -57,5 +58,5 @@ package() { } sha512sums=" -1528cedd3c33f3bf46de1c7f396eb7213d66dc5c85f5930385268a223c9b30f62ef623022cc39c477f95adfedb742755992deecadf52b010a7ef59f8f60e74c5 kdenlive-24.02.2.tar.xz +ce42c592448955fc73b04c138bd3bcead5bc1827d6a01f2d163c4b9f1001a53607605ef4f86c13230119ee0bad0cfbb7e2851467fd68b2fc6665085e1a58ff1d kdenlive-24.05.0.tar.xz " diff --git a/community/kdepim-addons/APKBUILD b/community/kdepim-addons/APKBUILD index 067da2497b7..84add53d3d1 100644 --- a/community/kdepim-addons/APKBUILD +++ b/community/kdepim-addons/APKBUILD @@ -4,11 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdepim-addons -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -89,5 +90,5 @@ package() { } sha512sums=" -484e844b3e1494b3d86b77e16f7bfb9b83a8ceea3be697431d3c72698ad888b1e14522b92c6b7db39500e1c66ee0952c6df3c8146691432f6e0ec6f0e26f4dbd kdepim-addons-24.02.2.tar.xz +99b5cdca3dccfe946a3b2b367094db812d775b22545d74c485c133da0d5043928a8f317ebb6ad26f35f5a522f11df4b46a82fea61777bc050157cab238514e4f kdepim-addons-24.05.0.tar.xz " diff --git a/community/kdepim-runtime/APKBUILD b/community/kdepim-runtime/APKBUILD index dc1b18a15ba..b6ba19b28c1 100644 --- a/community/kdepim-runtime/APKBUILD +++ b/community/kdepim-runtime/APKBUILD @@ -4,13 +4,14 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdepim-runtime -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 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 @@ -97,5 +98,5 @@ package() { } sha512sums=" -4db66618624e4e3ff3bdcc46535dfb21387d54a7489b8b018e7bff793575ee279f85858556695866437393243f35ccd5c6bfd8019ddccbc05438abda6a7674a8 kdepim-runtime-24.02.2.tar.xz +77870a9a8b54f7756d206aeddafa4baf63e999b62636b85c6c871fefa6d527a1734a14671dd2629cc3140d4aea7a5efdd2a71562a3edea95b92d6fb85d632f26 kdepim-runtime-24.05.0.tar.xz " diff --git a/community/kdeplasma-addons/APKBUILD b/community/kdeplasma-addons/APKBUILD index d6d5ca5d006..3b41251d776 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.4 +pkgver=6.0.5 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=" -f3f9ac1ab0d95ad09e7f79fda0b2eae781750670d26dd552b23984fd9449f8d269df85d437054b41f39651add9515cd685b2bfe1720235cc22b6bc8f4cbdbdcf kdeplasma-addons-6.0.4.tar.xz +317a3cfbeafa1e55a574484476b932d9669e551a9757aa8a690289e88f21579f46f2cffc0e18ceefe23774d685a702bd8709d8b1d33f48a002bef58f3f08229c kdeplasma-addons-6.0.5.tar.xz " diff --git a/community/kdesdk-kio/APKBUILD b/community/kdesdk-kio/APKBUILD index 8f5b403078c..572590e0772 100644 --- a/community/kdesdk-kio/APKBUILD +++ b/community/kdesdk-kio/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdesdk-kio -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -41,5 +41,5 @@ package() { } sha512sums=" -3c005bbe1868b91997beb464a7ca9ef27beb81e8599127be497957d202be2b526ab4366bf85c1e2c30dfdda995c675a233f6613d8521e82d332a94d735e1f94d kdesdk-kio-24.02.2.tar.xz +16ffe00ae7421e37491321447b46f5cb948c967bb523a2f893326a4e7aeea4c18ccff99f3079976d8ae7250c70a5a58344331fa079baaa887097f7e672b64341 kdesdk-kio-24.05.0.tar.xz " diff --git a/community/kdesdk-thumbnailers/APKBUILD b/community/kdesdk-thumbnailers/APKBUILD index 455011a9231..c911465d640 100644 --- a/community/kdesdk-thumbnailers/APKBUILD +++ b/community/kdesdk-thumbnailers/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdesdk-thumbnailers -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -42,5 +42,5 @@ package() { } sha512sums=" -b1cb620d4abca0aabdc8ad626ffcaf53fb554e1f36b83ca252c4a1b21d8a3fba6096e1d91617329544959a52133288e1278f0666c3bc58fc68da744e3f991a66 kdesdk-thumbnailers-24.02.2.tar.xz +67d7c94851d12f033af432643ccb2ddb0e65e15c13b23d4729594b6295eb11f342ca127bad25971825e475ad40656e21ba13f18a19c0efbf3d25c63d85809e20 kdesdk-thumbnailers-24.05.0.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..c6bebf45272 100644 --- a/community/kdesu5/APKBUILD +++ b/community/kdesu5/APKBUILD @@ -2,10 +2,10 @@ # 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 +pkgver=5.116.0 +pkgrel=0 pkgdesc="Integration with su for elevated privileges" # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -54,5 +54,5 @@ package() { } sha512sums=" -097a4ad960fd6f47600a70b6117f8f3517bc627c3bd32616b95acedddb75d49cf44ac07ecd7fad139ac366463741e3358b96e0d2b1af7ab6fc46e009bdbf3e3d kdesu-5.115.0.tar.xz +6426e65af37b4bec97ef2e93a48de25fe2e5d99fa4a4f8da850a6ed91ef428933062ca81455a91f4604fa8552dd0fe46ef835a4408e91a05e4609b09864a25cf kdesu-5.116.0.tar.xz " diff --git a/community/kdevelop/APKBUILD b/community/kdevelop/APKBUILD index 03ea20c010d..ade320111de 100644 --- a/community/kdevelop/APKBUILD +++ b/community/kdevelop/APKBUILD @@ -4,10 +4,10 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdevelop -pkgver=24.02.2 -pkgrel=1 +pkgver=24.05.0 +pkgrel=0 # 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/" @@ -42,7 +42,7 @@ makedepends=" ktexteditor5-dev kwindowsystem5-dev kxmlgui5-dev - libkomparediff25-dev + libkomparediff2-dev llvm$_llvmver-dev llvm$_llvmver-gtest llvm$_llvmver-static @@ -73,5 +73,5 @@ package() { } sha512sums=" -eceb82d76788f1577cff1dbc91f30556a985e7597daeb0cf1de5ac9a59046bf13f326dee77bed406b3c9c24d66cf4c5a6a86dbfe37431d6c9c1d4c0f7d64a3b1 kdevelop-24.02.2.tar.xz +9f5b3a62962352191091503305448956bf352884b4be0b50c4649d8a7fff6332907238883360a56075141b3d74e2c002bbef821a1776940fa0ddea541f97f3cc kdevelop-24.05.0.tar.xz " diff --git a/community/kdf/APKBUILD b/community/kdf/APKBUILD index 638e98d6e94..2000e3fbfbf 100644 --- a/community/kdf/APKBUILD +++ b/community/kdf/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdf -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -48,5 +48,5 @@ package() { } sha512sums=" -101ea4867ceb11587303e7f928e99dc253171c261f787a793fa8ea110a891113f83694e5649ebcd2186fa81fbfea608b1ea544b3a24759ea8222d8934b6bde18 kdf-24.02.2.tar.xz +36a2859cd7f2c3593d1652cbf6c393635ec27072e9ea73e19f9c0a8b62e2a546914dedf68a81e68f9c6a01c880fc80830424d5196c43228e532e47cb6581e3fb kdf-24.05.0.tar.xz " diff --git a/community/kdialog/APKBUILD b/community/kdialog/APKBUILD index 35df5b32d86..807c81a3b13 100644 --- a/community/kdialog/APKBUILD +++ b/community/kdialog/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdialog -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -44,5 +44,5 @@ package() { } sha512sums=" -4e839cd1abb764322575b7299a83adaa7a18a80aa4f57d45bcf536b06c827d62145d1aaf9e4623bc7a29011cc8015bf89297ec387922945f1a7061877438f0b1 kdialog-24.02.2.tar.xz +9f8cf8a475d8f09505a2b5f24d4d1feb82ce09073e5c3bd6134e93951b19c4af25c7e038d0d7ea68108417b0346d95d2d133df7182170da61cb530f1b92b7ed4 kdialog-24.05.0.tar.xz " diff --git a/community/kdiamond/APKBUILD b/community/kdiamond/APKBUILD index b3a945610a3..676e77f99d2 100644 --- a/community/kdiamond/APKBUILD +++ b/community/kdiamond/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kdiamond -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A single player puzzle game" # armhf blocked by extra-cmake-modules @@ -47,5 +47,5 @@ package() { } sha512sums=" -1226750784e2e1d60c263718a217c4e9b793bea0529b57bbd3d1d8f81db4688f5f28b8cd6b5d3787c636b7e59baa59acdde490219d876b5f26fdab2cf449b058 kdiamond-24.02.2.tar.xz +9e827792a834436e1a90b3f98675414dc5f0825a73f69480edaa31afeba14dc9b13d44b8fb6278a003c929fdb81646ad8a37e630e964d583e35865344282d5af kdiamond-24.05.0.tar.xz " diff --git a/community/kdiff3/APKBUILD b/community/kdiff3/APKBUILD index c9177dc2f98..46ec755f884 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.11.0 +pkgver=1.11.1 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -46,5 +46,5 @@ package() { } sha512sums=" -960a134df0898c2fbe0478b1966c864009c6d4249922884c366038284ccf3ab902d329c171daee30b45f4105bc4fdd37d5fe60406d83c7f9d00b0bc564976d42 kdiff3-1.11.0-1.tar.xz +5f481a3cd67e80db939eb795618a635bda2c08875eb826c3a1b6487b631374c48ab9b8a546d9b9504c1bcbc0ed9072f16452d6ef9fe181ce6850f741ced710ce kdiff3-1.11.1-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..541359636c0 100644 --- a/community/kdnssd5/APKBUILD +++ b/community/kdnssd5/APKBUILD @@ -2,10 +2,10 @@ # 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 +pkgver=5.116.0 +pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" pkgdesc="Network service discovery using Zeroconf" @@ -47,5 +47,5 @@ package() { } sha512sums=" -f78ed9a9f4434ec1b071363de35df57d7ad4f114ed91fb9ce361aa0100c42e345ad08c8190c33cefea8d2ed46186b28e2ca9236e319615f6f65855835afdb1d7 kdnssd-5.115.0.tar.xz +542b6ff05ea2d0d43b8563136254f54e690fb561b270517df00158e53a5a2eda23e5371292256cd3f3aae0ee108c8d5cd4f611ac1aa22c259ee80b4815850121 kdnssd-5.116.0.tar.xz " 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/kdoctools5/APKBUILD b/community/kdoctools5/APKBUILD index 5c5ef3e9173..581ee5708f4 100644 --- a/community/kdoctools5/APKBUILD +++ b/community/kdoctools5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kdoctools5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Documentation generation from docbook" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -55,5 +55,5 @@ package() { } sha512sums=" -f7c95c090899fa8d7ea0d730e48a87a4881f271a37bb1d0af6f67aaa52954613e957e04a91b94b985bf993c0b9db3736aa922033d100d2c8beb2f24ae50b2caf kdoctools-5.115.0.tar.xz +06a9d79f5e449ae606f6c5dba20038ad60202c908bb0f7f1dbc8bb3a955db5b6b34e4caa453a7b562d744f30faa62574425d78552b497227d4b5ca8eac3adaab kdoctools-5.116.0.tar.xz " diff --git a/community/keditbookmarks/APKBUILD b/community/keditbookmarks/APKBUILD index f4b94ebc9a2..b3240fc34a8 100644 --- a/community/keditbookmarks/APKBUILD +++ b/community/keditbookmarks/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=keditbookmarks -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -45,5 +45,5 @@ package() { } sha512sums=" -d199fb3c9143aaa3d046a311db76b7fb6f420b2fadad43c48d65a7fd9675024fb347f0be660789264fa18f71f751a76321652b21d2b7bd8d84bbd00f9cf1d704 keditbookmarks-24.02.2.tar.xz +305e18fa4891dbc7c3e459aeb039bdfeb77a98080adb3beb78e337c5c5b470545517eb9db815d45e5300f998c839b8657d0fa38f8c022ca09e5503d2bcea8f43 keditbookmarks-24.05.0.tar.xz " diff --git a/community/keepassxc/APKBUILD b/community/keepassxc/APKBUILD index 41f5ce2255a..7c71f93377b 100644 --- a/community/keepassxc/APKBUILD +++ b/community/keepassxc/APKBUILD @@ -4,8 +4,8 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=keepassxc -pkgver=2.7.7 -pkgrel=2 +pkgver=2.7.8 +pkgrel=0 pkgdesc="Community-driven port of the Windows application Keepass Password Safe" url="https://keepassxc.org/" arch="all" @@ -126,7 +126,7 @@ _firefox_manifest() { } sha512sums=" -fd82e377bf6e57623c65f2bdd463ea59c6465fbe009552e1030ce0fe9d9177fc448b7b36a90a0da9ed2a2ed161c017d13cef618ae785f89110c038e1d9396926 keepassxc-2.7.7-src.tar.xz +c4767ced36d45855b83569d0fcbcfd384ef51d204dd703b006508d55cd7ac94ac36b5476f122fbe1dc6ec301a785e026722e8f0f961d5e339e10997a3871741a keepassxc-2.7.8-src.tar.xz f1d1978db4da56064f6f7eb37f61f82169020afc18de3be4afbe46f6bbb6292cc9551bf07a454a89bc5b09ebe72a153f08bff9f62492e3c1b69b6919da8be94e doc-path.patch 977f1f76c8c7be819b51417481664bf22d3138978f450bf2b762ebad8f4aee7f6384f090f66b5bee8c0a2a182d4f578c1c4c6cd9a2d80ab65716e24c65d43aee org.keepassxc.keepassxc_browser.json " diff --git a/community/kemoticons5/APKBUILD b/community/kemoticons5/APKBUILD index 2943bda10c8..0ea84d5fc19 100644 --- a/community/kemoticons5/APKBUILD +++ b/community/kemoticons5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kemoticons5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Support for emoticons and emoticons themes" arch="all !armhf" @@ -49,5 +49,5 @@ package() { } sha512sums=" -412729a4c236f27d584d508de5104b7a9ac451758427d5595c44ff07c045b91c69f024ea589b3b1f8eca95eb827deab789870ca36acb5cf6a06b3b22169604dc kemoticons-5.115.0.tar.xz +9bf1c7f1c7b0d61a43d12b3af58707d61f3f3ae0f1d817db0e34db6ca25eb8d33a7780d218a44e57b4974e5683e3e26126b45e74a4c8eb764df2cb3d900b27f9 kemoticons-5.116.0.tar.xz " diff --git a/community/keysmith/APKBUILD b/community/keysmith/APKBUILD index 931b04b2cef..9b6228765d9 100644 --- a/community/keysmith/APKBUILD +++ b/community/keysmith/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=keysmith -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="OTP client for Plasma Mobile and Desktop" url="https://invent.kde.org/kde/keysmith" @@ -17,6 +17,7 @@ makedepends=" ki18n-dev kirigami-dev libsodium-dev + qqc2-desktop-style-dev qt6-qt5compat-dev qt6-qtbase-dev qt6-qtsvg-dev @@ -42,5 +43,5 @@ package() { } sha512sums=" -9ee1750d3160a286b617a2f575759022b245a393da8ac5d5bc00363f1fe7a4088d6d444ac67d61dae22a15744178cafe1b3252177ab8ba37c7171150d626319d keysmith-24.02.2.tar.xz +a09b806c509e7e235570ac1e4077080e6c2f4be5e51fba66c3a063afff083676ce8b84766c15f40088ec2eab486c8abad54b645dcf4d3afbe4a91c03cc76af68 keysmith-24.05.0.tar.xz " 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..311fb155809 100644 --- a/community/kfilemetadata5/APKBUILD +++ b/community/kfilemetadata5/APKBUILD @@ -2,10 +2,10 @@ # 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 +pkgver=5.116.0 +pkgrel=0 pkgdesc="A library for extracting file metadata" arch="all !armhf" # armhf blocked by extra-cmake-modules url="https://community.kde.org/Frameworks" @@ -64,5 +64,5 @@ package() { } sha512sums=" -db7fc7e79abf358ee0def12601de140e8f5d62d939f5580b7940a492780eea8d5b4eb2f679ed15ab02134277d15353d24511a6e41260751811af52398ee037e4 kfilemetadata-5.115.0.tar.xz +1c5d264ad2bc123ba0d85882461009efc10c268441e33f82810823d1e2c6fb30209336542b4e2c1eabb96b53cc9184fc3982c27922872a9b92cac38bafe2da0e kfilemetadata-5.116.0.tar.xz " diff --git a/community/kfind/APKBUILD b/community/kfind/APKBUILD index c7a86f29b58..8db4881dc85 100644 --- a/community/kfind/APKBUILD +++ b/community/kfind/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kfind -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -44,5 +44,5 @@ package() { } sha512sums=" -6095e9dc128bd703bd95425457fc361daa0cafb17fc261b76a7ccdc4d65b378f995bb62ca47e776ece1982f2d89bb8ef53a33c9a9511439b51581287183dd992 kfind-24.02.2.tar.xz +d8529c71d636b483e5c6c873e47b3ac67fdd0efc4fa02d2d073614cc0a9aec920fa4dd89c62f53e207b48389b3abed49d83fdd4fc153dce0895a617fa51dce66 kfind-24.05.0.tar.xz " diff --git a/community/kfourinline/APKBUILD b/community/kfourinline/APKBUILD index e53df49d309..18d2a0a701d 100644 --- a/community/kfourinline/APKBUILD +++ b/community/kfourinline/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kfourinline -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A four-in-a-row game" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { } sha512sums=" -45c51c291c308249940819ec3540971578b29ad5407205c37f87f8e6c84c9c77fa4f5a7fee1cc96f3a21078dfeee466def452cf619dfae28f955ad813b21b3fe kfourinline-24.02.2.tar.xz +b6a32c8cc5260210cb8214cd09e1d4da1f2b9a72b6825a38cb093ea06d6cfda8072da04e6d878bc80048cb7fefc6bd7c78cc1032ca83a03b47e8a10690a03b4e kfourinline-24.05.0.tar.xz " diff --git a/community/kgamma/APKBUILD b/community/kgamma/APKBUILD index c23a7222c9b..b3a25848110 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Adjust your monitor's gamma settings" # armhf blocked by extra-cmake-modules @@ -50,5 +50,5 @@ package() { } sha512sums=" -824c603948729a103a5d45422913c05d1227cc8e84f4ffaa9b23c4a7e16a9a11e85b45b63fe1a3f4e532138a74cfbaba239a0664388dcb7eae077c410f619b88 kgamma-6.0.4.tar.xz +6e89153fb7b79b5d134086d1b30669db83351b9b95fcea32826cfba16ff24483c693bd9199f52c22a733975d35942ff9cc76daf29f7a4e2b8458cd8d37ae8f73 kgamma-6.0.5.tar.xz " diff --git a/community/kgeography/APKBUILD b/community/kgeography/APKBUILD index 1d9f82c3362..9acfc6b82ff 100644 --- a/community/kgeography/APKBUILD +++ b/community/kgeography/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kgeography -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -46,5 +46,5 @@ package() { } sha512sums=" -6010f5883ca5866442e8aa13045e60f332d2fc81683fb85f7597f4e0c8fc83805236a494ef9d06b9f04101cfe31086ae950b22e3b263570e1b8ac5e079fc9a43 kgeography-24.02.2.tar.xz +9aed5b2254bf6816d82ec7f15919413776b3813c95631f00b1642f092ca65755884db1cf8f833ed663ede1f33d5075b18767ec992618a0a6e9acd079854d497e kgeography-24.05.0.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/kget/APKBUILD b/community/kget/APKBUILD index b1444cbd81a..3639a887fae 100644 --- a/community/kget/APKBUILD +++ b/community/kget/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kget -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -66,5 +66,5 @@ package() { } sha512sums=" -511bf24007fff1b8387ae7df8ef2499adc7854880735f7bdce700548b092dc3f01981a1ead1c7a04c4e133b0ca42ca3b2aad46189286010d7ff6d7cbc976022c kget-24.02.2.tar.xz +6900d9320a2778cf9ceb137dbd7b03cc398d0f246e9343b14530e5030d0f4bd2b4b47a907a16aae400e0ec1230a7438cd56663c169dc9e9bd08467f82b54d3ca kget-24.05.0.tar.xz " 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/kglobalaccel5/APKBUILD b/community/kglobalaccel5/APKBUILD index d4911e3eb59..b2293e8a01a 100644 --- a/community/kglobalaccel5/APKBUILD +++ b/community/kglobalaccel5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kglobalaccel5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Add support for global workspace shortcuts" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -55,5 +55,5 @@ package() { } sha512sums=" -0cf7649637d6aac4fa2e0d99392663593e2781f2b5de2cdf501b5d9ce20fc93febf24e8a452fe3592a566d72af4d266545c386d04f785dc307e6027ee334b312 kglobalaccel-5.115.0.tar.xz +76420eb2fa026c0770b8f78c9ff0780056e2126aa4b6efdeb023faf306e7068781fb2885e0fff2d6f47475a73ca01fdf137f329701c7f240bc03f485daafbbeb kglobalaccel-5.116.0.tar.xz " diff --git a/community/kglobalacceld/APKBUILD b/community/kglobalacceld/APKBUILD index 91fe2c30986..d8a05a3b6b4 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.4 +pkgver=6.0.5 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=" -54c281bb284d32b2785766c1e0c779b3f354e7534505f73dd3e477463b40ad86f8561546f3c2fa4bcb95bfd3c274e0d52e683ebd1b20fc535d5c06b10da9a963 kglobalacceld-6.0.4.tar.xz +5b073828d453bdeac7ff7e30133dd1d245934438435886a591e8a36a200b207aaf99abc565e589041d39c1ffb31d51638d7212a38cf4cacadc7c8e93b6c92a1d kglobalacceld-6.0.5.tar.xz " diff --git a/community/kgoldrunner/APKBUILD b/community/kgoldrunner/APKBUILD index 9c47fd33fdc..236f0a10983 100644 --- a/community/kgoldrunner/APKBUILD +++ b/community/kgoldrunner/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kgoldrunner -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -46,5 +46,5 @@ package() { } sha512sums=" -41a8458e2eb56c0eca668558d4df59f540ac8f71094c7efbca8c4b437af8daa94c00a945600e2f7eefe50e0492537cd7c5497b163154a8e930a82bcb27ffa6fd kgoldrunner-24.02.2.tar.xz +12f5b56bf129b15ccf8279b4d5ab45983093b8431e06193c3653c1c2f38463c9dfe2462f00016f77f57dced81b58b67638a2ae32440312d01c9f31203bfa96b7 kgoldrunner-24.05.0.tar.xz " diff --git a/community/kgpg/APKBUILD b/community/kgpg/APKBUILD index 5153caf0e28..546de7b1e81 100644 --- a/community/kgpg/APKBUILD +++ b/community/kgpg/APKBUILD @@ -4,11 +4,11 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kgpg -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -62,5 +62,5 @@ package() { } sha512sums=" -487330bdb2999402db566b2c5ea843c527848361d82d0463465b1a8b53fe349910e5276b7605ff95117bf10903f477dcf253f66a841142074d543e66585f1a57 kgpg-24.02.2.tar.xz +182e1e063a086d025c89edd0c99add34d01334e2bc475838242dd2c8f96fbea4a02a1a8515bef3861c2a263a292d83b6300fb645daec7dd7a474bfdf9cd0f060 kgpg-24.05.0.tar.xz " 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/kguiaddons5/APKBUILD b/community/kguiaddons5/APKBUILD index 9ceb174e735..d59e1e9e0ec 100644 --- a/community/kguiaddons5/APKBUILD +++ b/community/kguiaddons5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this apkbuild by some scripts for automation # group=kde-frameworks-old pkgname=kguiaddons5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Addons to QtGui" # armhf blocked by extra-cmake-modules @@ -55,5 +55,5 @@ bin() { } sha512sums=" -4416b0f9d2a9859fe2a8b24cb25405ea4eaa0670168348eaedf5a8e44ade59f582118f8ad7525e5829bac5dc6d4b56dd1e47b58e5df6bbe4226a8039a27ff5aa kguiaddons-5.115.0.tar.xz +6a09bd6b7a3142827e9e44b1526daf945b6b777d091e0c7926fb48604c1ca586c6acc3282b5c8cabec24fba0be3c78e32141ea3307c79d84465718222bd8af04 kguiaddons-5.116.0.tar.xz " diff --git a/community/khangman/APKBUILD b/community/khangman/APKBUILD index 09ba4884506..0766aaf48d1 100644 --- a/community/khangman/APKBUILD +++ b/community/khangman/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=khangman -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -52,5 +52,5 @@ package() { } sha512sums=" -736f3b5facc46a65af6d1216872cd16376f47f4ae66b4b47c4a6415d1b715e6313c50233dbc8ed26925f0ecfa561dc9cc657e317923ad633f171900ca91cd40f khangman-24.02.2.tar.xz +fbc1a276a5682cf938445cb6fa3f2b395b3845c79232cec78b2a1237612d980e4303a1ca2d1fa67c0727c16b05e88236a0a9c92c5bb4abac1ebd7f84dcd380f9 khangman-24.05.0.tar.xz " diff --git a/community/khealthcertificate/APKBUILD b/community/khealthcertificate/APKBUILD index 3d21ffbf2e0..a20efbdf0ea 100644 --- a/community/khealthcertificate/APKBUILD +++ b/community/khealthcertificate/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=khealthcertificate -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Handling of digital vaccination, test and recovery certificates" url="https://invent.kde.org/pim/khealthcertificate" @@ -42,5 +42,5 @@ package() { } sha512sums=" -c43a2dbdd496f2180af4806b5a1079587a7063bcd99916cbef5e9cf8597e608ba5fa1612a326a89d52c3d6bf9c807ffbb1270f010948c0c40cddd5942c9e15f5 khealthcertificate-24.02.2.tar.xz +68387a4adc4ad76fe5ad81a43424ce60a4777c304ef73d19ac8bd54a952e257f4e9ef60a404e631b2b60f933227f16d601c609805e0f8299127d0d5cda346f4d khealthcertificate-24.05.0.tar.xz " diff --git a/community/khelpcenter/APKBUILD b/community/khelpcenter/APKBUILD index 82469ba6669..70a545811f8 100644 --- a/community/khelpcenter/APKBUILD +++ b/community/khelpcenter/APKBUILD @@ -4,13 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=khelpcenter -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Application to show KDE Applications' documentation" # armhf blocked by extra-cmake-modules # x86 blocked by reduced qtwebengine featureset -# armv7, ppc64le, s390x, riscv64 blocked by qt6-qtwebengine -arch="all !armhf !x86 !armv7 !ppc64le !s390x !riscv64" +# armv7, ppc64le, s390x, riscv64, loongarch64 blocked by qt6-qtwebengine +arch="all !armhf !x86 !armv7 !ppc64le !s390x !riscv64 !loongarch64" url="https://userbase.kde.org/KHelpCenter" license="GPL-2.0-or-later AND GFDL-1.2-only" makedepends=" @@ -54,5 +54,5 @@ package() { } sha512sums=" -9422181fa023a94979b6f4bc2186161442841a6053513393f39e5ebd9663fe46616f698bbe8577271077e6b3ddeaa984fd63200a88956119ed4984e68ae6d2c3 khelpcenter-24.02.2.tar.xz +f20c91e28680eb35fd1f98613c7c2ae2db5fd2e6df8ae6c78b98958dd96c81df39ad20135f6ab23dbb9aefa534ab03bbee4021f3c6902fde55daa271ca47a55e khelpcenter-24.05.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..bfc2d4707a9 100644 --- a/community/kholidays5/APKBUILD +++ b/community/kholidays5/APKBUILD @@ -2,10 +2,10 @@ # 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 +pkgver=5.116.0 +pkgrel=0 pkgdesc="Support for icon themes" arch="all !armhf" # armhf blocked by qt5-qtdeclarative url="https://community.kde.org/Frameworks" @@ -45,5 +45,5 @@ package() { } sha512sums=" -db1c7d1575c1037e3de2ca96999d58b95e7c50c7d60483704723bec90fb738136d31895e04fa4256674b983831c812df87d7256582342c39af3213b209ca1378 kholidays-5.115.0.tar.xz +b12c7a4fd427992d94a79d87d077cf0fbcbd790046ded27afa95b7aaeed1fb0826ec544b555516d7e6dc451577674e6f3151dc0ff80890a3e10753dbc5b861fa kholidays-5.116.0.tar.xz " 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/ki18n5/APKBUILD b/community/ki18n5/APKBUILD index cd3c79779db..59e6b892802 100644 --- a/community/ki18n5/APKBUILD +++ b/community/ki18n5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=ki18n5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Advanced internationalization framework" # armhf blocked by qt5-qtdeclarative @@ -49,5 +49,5 @@ package() { } sha512sums=" -63da69b5c9085184dd1aec917b64c32c568db2ca5d312af9fa984b459f7cf836fe4ee4e6386ea33d10982a4c498592115afd3bfa464d1d60d11de493122c838c ki18n-5.115.0.tar.xz +0932336e412c02e23241db11b4c7828f834accea58d6035b4affc3ecdbc7fd0e5a8901d41bf0812ac1cc2ea51ef4a9b3611e234619e77eaec110d8069d0cdbf0 ki18n-5.116.0.tar.xz " diff --git a/community/kicad/APKBUILD b/community/kicad/APKBUILD index 0108194fd45..cfe9cc3592f 100644 --- a/community/kicad/APKBUILD +++ b/community/kicad/APKBUILD @@ -69,7 +69,7 @@ build() { check() { local failing_tests case "$CARCH" in - armv7|armhf|mips|x86) + armv7|armhf|x86) # qa_cli requires too much memory to pass on 32bit arches failing_tests="qa_cli" ;; 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..58fd624c19c 100644 --- a/community/kiconthemes5/APKBUILD +++ b/community/kiconthemes5/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 +# group=kde-frameworks-old pkgname=kiconthemes5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Support for icon themes" # armhf blocked by extra-cmake-module @@ -53,5 +53,5 @@ package() { } sha512sums=" -7cbfe721f45a9edda811fffdb2599452011b679fd5ffdc9088da009de4e712700a6b31cadf0ce24025fe3c264d5169eaae505a9080da123613dd47a8ffb43b6f kiconthemes-5.115.0.tar.xz +2c34793a8ac925c4a6fe548c26f5444e74e84624848158053e282716e59515981f248c17ec24f48794754db0eafe1b3bd63e6202c4a22fa805621084b643637c kiconthemes-5.116.0.tar.xz " diff --git a/community/kidentitymanagement/APKBUILD b/community/kidentitymanagement/APKBUILD index f69babf3c3e..ed5dc3008a2 100644 --- a/community/kidentitymanagement/APKBUILD +++ b/community/kidentitymanagement/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kidentitymanagement -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="KDE PIM libraries" # armhf blocked by extra-cmake-modules @@ -51,5 +51,5 @@ package() { } sha512sums=" -71020877ca62e0555d20eb70df74a9cf87ef24d74cc99db1c96c51552b674cd7c7cc683cd91cc42864696855c9f46b0b578012b0a96b82e26a094c42b136f0a7 kidentitymanagement-24.02.2.tar.xz +2dcd6bd92bbb3f49b575e18df86679d21c68dfe8e11d12a88e3a7507b4685b90c4ade581120b5b7757ff6cb3dc726a3cfc420c6d766d308610a45d87f340dea2 kidentitymanagement-24.05.0.tar.xz " 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..14302695b83 100644 --- a/community/kidletime5/APKBUILD +++ b/community/kidletime5/APKBUILD @@ -2,10 +2,10 @@ # 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 +pkgver=5.116.0 +pkgrel=0 pkgdesc="Monitoring user activity" # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -48,5 +48,5 @@ package() { } sha512sums=" -63b7d62dbdb5b8eb8ff3337616984951ae233b859fe8724604058b3217de454957dcc17152d0ab8a4091c8360020962e3730b4ee7cec4532f86b8d0de79a1143 kidletime-5.115.0.tar.xz +a8172a069266e523cc07f37ce1f4c5f65a421c99eb314e26f68cc32630b8f0da783beee9d2ffe2740113d60ae9b4c280ca9de8bb89bd5db8e56c9b31172ec408 kidletime-5.116.0.tar.xz " diff --git a/community/kig/APKBUILD b/community/kig/APKBUILD index c32fdf56dd7..0877a491c22 100644 --- a/community/kig/APKBUILD +++ b/community/kig/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kig -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Interactive Geometry" url="https://edu.kde.org/kig" @@ -48,5 +48,5 @@ package() { } sha512sums=" -8757a335a85cf1439e7abc3abe55aca9d3dd8962c550ded953d79fe3a752770469e56300679ecf821262f2aef9be7e8e45093f47126f702823b6e654850deb1c kig-24.02.2.tar.xz +a025fadb8631f38ccdff79235733a5e5563458fc09d6798b6d2823b95a6cd8b29bd1c97f62906c88f7ee61e71812cb3ad5be40e7449208b7339b982d73e0c174 kig-24.05.0.tar.xz " diff --git a/community/kigo/APKBUILD b/community/kigo/APKBUILD index ac0fc81736b..7d7aba386f7 100644 --- a/community/kigo/APKBUILD +++ b/community/kigo/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kigo -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="An open-source implementation of the popular Go game" # armhf blocked by extra-cmake-modules @@ -48,5 +48,5 @@ package() { } sha512sums=" -113fa135a8472d05eb210ab771bbbc73f6b03e27ff7b1019d7d54bff1be959eb88c74ce6061ed38e5863cd524f368c476c21c4daa53cf4cfa716463c7029c4fe kigo-24.02.2.tar.xz +e7ec97f21e2c98bad671b20afcb5a1107a39f77bd86c1d57d194e5361c8af74d63179d15a74d0cf6a35d21947d0f8c6c9cfc470bfe07502ff21b30b0cc2cfea2 kigo-24.05.0.tar.xz " diff --git a/community/killbots/APKBUILD b/community/killbots/APKBUILD index bb4f351bf46..85ca9bfd68d 100644 --- a/community/killbots/APKBUILD +++ b/community/killbots/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=killbots -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A simple game of evading killer robots" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { } sha512sums=" -a17378932810f9bea90d3821c1d393c842f697b456bda533135c628728111391ee34bbfd1a40d5b285e366e6bfc003600f80d0f8de616416be4447c7c40c6150 killbots-24.02.2.tar.xz +c506d719739e23a167adff5567c74e0a848e2e10b9b0449c025034a43aa016573629746c848c7621087c14de0f44675c4c18224a63db4a7996815319ac41d5cc killbots-24.05.0.tar.xz " diff --git a/community/kiln/APKBUILD b/community/kiln/APKBUILD index 38a6ddfd16c..e7b66f30921 100644 --- a/community/kiln/APKBUILD +++ b/community/kiln/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Willow Barraco <contact@willowbarraco.fr> pkgname=kiln pkgver=0.4.0 -pkgrel=13 +pkgrel=14 pkgdesc="Simple static site generator for Gemini sites" url="https://git.sr.ht/~adnano/kiln" arch="all" 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/kimagemapeditor/APKBUILD b/community/kimagemapeditor/APKBUILD index 706d4c05abb..ba92bd7e79f 100644 --- a/community/kimagemapeditor/APKBUILD +++ b/community/kimagemapeditor/APKBUILD @@ -4,11 +4,11 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kimagemapeditor -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules -# armv7, ppc64le, s390x, riscv64 and x86 blocked by qt6-qtwebengine -arch="all !armv7 !armhf !ppc64le !s390x !riscv64 !x86" +# armv7, ppc64le, s390x, riscv64, x86 and loongarch64 blocked by qt6-qtwebengine +arch="all !armv7 !armhf !ppc64le !s390x !riscv64 !x86 !loongarch64" url="https://kde.org/applications/development/org.kde.kimagemapeditor" pkgdesc="An editor of image maps embedded inside HTML files, based on the <map> tag" license="GPL-2.0-or-later" @@ -52,5 +52,5 @@ package() { } sha512sums=" -019e4d90b2430442deb6c0c0cfea28c21a98caa087810f022c5c5fb90667d4b1f6b13b385b08154f86ff7c49411ac44aeee1a5eeda4c7692bbe284337656f8c1 kimagemapeditor-24.02.2.tar.xz +a792dc5062e7de725b116853931573755ae58b2c18d60799dae852c7a1708178ccf22cd72f6e11f0a4d2fb64bfb3a26177589a0bfa7230a885b0e9de87ad6823 kimagemapeditor-24.05.0.tar.xz " diff --git a/community/kimap/APKBUILD b/community/kimap/APKBUILD index 075a12f7968..027371468c6 100644 --- a/community/kimap/APKBUILD +++ b/community/kimap/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kimap -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Job-based API for interacting with IMAP servers" # armhf blocked by extra-cmake-modules @@ -45,5 +45,5 @@ package() { } sha512sums=" -261f38d3bb048fbe58f2da22b3501b495e9571bd32d249b93982171c1389309caac7c11aad2ee5198e3deee7c7db95a6ebf33c0a2e7d581d26d583daf6703e8a kimap-24.02.2.tar.xz +ce76e2ef00698ed7f92b1459e3ce56d33ea137c3bd2829bb3a9a3bbb842c8ffb458104c935b9fc9563893866a8200300915e43610847fbdef46de9d84e997624 kimap-24.05.0.tar.xz " diff --git a/community/kinfocenter/APKBUILD b/community/kinfocenter/APKBUILD index fc9f83b8253..6d41538291b 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="A utility that provides information about a computer system" # armhf blocked by extra-cmake-modules @@ -64,5 +64,5 @@ package() { } sha512sums=" -1c3214d844576a4bcfff49e05d316031688fb76355e302097e68140ffbf20feb33d47b0c3a1db067dc63bf0944e5d49b8f3cafd9cbf6e43aaf8fc9ace81b38a4 kinfocenter-6.0.4.tar.xz +ed5b9ffa7a0fe961e2f265941fec7ffbae2e2640ac2b49e39ae3eb8b1e83a6f29dc475fff2f1481b4cd8a8d3493c3be238908d8636c8f25d78680dd6a7c924af kinfocenter-6.0.5.tar.xz " diff --git a/community/kinit5/APKBUILD b/community/kinit5/APKBUILD index 3e8ff176f0a..a1de1a0ba42 100644 --- a/community/kinit5/APKBUILD +++ b/community/kinit5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kinit5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Process launcher to speed up launching KDE applications" # armhf blocked by extra-cmake-modules @@ -48,5 +48,5 @@ package() { } sha512sums=" -bb8026aee90a2be5314ad941c31554f5f9e59ed387fc4cf393486485ad530bdb8a6cb8f020f90472c5241190404730ed0a70025ea24b9536bba5ba5bc123ea7f kinit-5.115.0.tar.xz +741bbf6cf52491f063457a4fad8de91cde1f449b498dc36b76bd86093b13e6c3bd135833bd9a1316dbeec1045ad4755adafc8d7b41533f8b6ab175525b3671e5 kinit-5.116.0.tar.xz " diff --git a/community/kio-admin/APKBUILD b/community/kio-admin/APKBUILD index d4d1b5c86ca..aeacd90145b 100644 --- a/community/kio-admin/APKBUILD +++ b/community/kio-admin/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kio-admin -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Manage files as administrator using the admin:// KIO protocol" url="https://invent.kde.org/system/kio-admin" @@ -42,5 +42,5 @@ package() { } sha512sums=" -8ccfb0820dfbd35f1fa1d3c44228941f72df95ca49fd6e291a8d98c6c290ddd126ab43968bff410b0a3ee0d76e77d34ed1d78368cb5eb889d35d098178c44b63 kio-admin-24.02.2.tar.xz +965fbeea55b68524f26a594704cfd8bf0f569cae3057c19be7353d68f9d5754fe53d591c6919f78fa78cbf5abccb3cc9ff097d3bc893c805f42fc8143cc96871 kio-admin-24.05.0.tar.xz " diff --git a/community/kio-extras/APKBUILD b/community/kio-extras/APKBUILD index dbbe5c2cf9f..00797e5480e 100644 --- a/community/kio-extras/APKBUILD +++ b/community/kio-extras/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kio-extras -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -72,5 +72,5 @@ package() { } sha512sums=" -2c4c807a8debe6ab4ae26208ca60ab3b3dff76d36edf686e77ebd644d6bc3f01ba40b903f9c3f8161421ea31764be339556fd832da29ede1b541432020fff890 kio-extras-24.02.2.tar.xz +c9a69bba458d3b32e8dba970fe7f061e5b12f605f6ce4de5b2db27b8fa7bba6715a424128102110664e4e75c17a79a340ebf309cef4b28e0ca080550109ec836 kio-extras-24.05.0.tar.xz " diff --git a/community/kio-gdrive/APKBUILD b/community/kio-gdrive/APKBUILD index 62b89dfdb42..4311c7696ba 100644 --- a/community/kio-gdrive/APKBUILD +++ b/community/kio-gdrive/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kio-gdrive -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -51,5 +52,5 @@ package() { } sha512sums=" -d91a3aea2f69ab68251b53edccafbbc914edbd865fee837d26b2f3428559d983cd50c536436d91479a957242ff2f35c03f4d8e13661398acf594ce0d5a880269 kio-gdrive-24.02.2.tar.xz +64f28d74d86b5ab73c10233ecf4a97e858cc9291246fe5ed1f10e61f6fe0ae33e527c0262824ba115380d717dfd251ec3266facf8266856cbc09a34f7e3338c3 kio-gdrive-24.05.0.tar.xz " diff --git a/community/kio-zeroconf/APKBUILD b/community/kio-zeroconf/APKBUILD index 8a71616a2d1..0c58d46d721 100644 --- a/community/kio-zeroconf/APKBUILD +++ b/community/kio-zeroconf/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kio-zeroconf -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -42,5 +42,5 @@ package() { } sha512sums=" -8152414cdb7ae3087a03d83471e2c107e9a98cfb9f9f86f451d0e4b00bfbd93450011fa8a7c5e4cc47212169efc9058ae42f24cfcae64960616980a7dca40e01 kio-zeroconf-24.02.2.tar.xz +4278a7b6e893852cba46bc4543f37c347e0e45245335e850f0a1141e3034ca4a84b5884aaf4a40a26fac87f9bfa8badf67047161ab83f0224c7ce4ab129af570 kio-zeroconf-24.05.0.tar.xz " 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/kio5/APKBUILD b/community/kio5/APKBUILD index 787d8ca5aac..ddfa0a1f584 100644 --- a/community/kio5/APKBUILD +++ b/community/kio5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kio5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Resource and network access abstraction" # armhf blocked by extra-cmake-modules @@ -74,5 +74,5 @@ kwallet() { } sha512sums=" -014eab017a1a9ba65cf122a9f241764054b3591c5759d5121ccd82593ebfe301eec0ba1f9e08165ef75b0fdf057094ef81293a6ec020ee2100394a68ab80a8d7 kio-5.115.0.tar.xz +a07661717846860db3a64bcead9c2b80192d8c5b8e66a25f0f83ced6b596c4e8af7eb94e68b17770f45b36b22ccbcecaef4f8590d790cf69fceb140ab9e47376 kio-5.116.0.tar.xz " diff --git a/community/kipi-plugins/APKBUILD b/community/kipi-plugins/APKBUILD index 3b841f35845..e1ac8e73597 100644 --- a/community/kipi-plugins/APKBUILD +++ b/community/kipi-plugins/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kipi-plugins -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A collection of plugins extending the KDE graphics and image applications" # armhf blocked by extra-cmake-modules @@ -43,5 +43,5 @@ package() { } sha512sums=" -893754f9368498dec5507a95a6d1b71da1ee1146894d8ea0b13edf821937ce320f56224fb2b9431a1956b0052341b07902212838e0a8db8880f081a3d9d08856 kipi-plugins-24.02.2.tar.xz +3333cef9a7272694253f8f95e107cbe54ca360044d52d189f61929557d2ca15dd843d6fbc640015ca5cd105f9f53603756368ac34256bd77f776953015d8122e kipi-plugins-24.05.0.tar.xz " diff --git a/community/kirigami-addons/APKBUILD b/community/kirigami-addons/APKBUILD index b623333497b..ba3a4028c25 100644 --- a/community/kirigami-addons/APKBUILD +++ b/community/kirigami-addons/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-other pkgname=kirigami-addons -pkgver=1.1.0 +pkgver=1.2.1 pkgrel=0 pkgdesc="Add-ons for the Kirigami framework" url="https://invent.kde.org/libraries/kirigami-addons" @@ -45,5 +45,5 @@ package() { } sha512sums=" -c5f73203b8befe46e5a0029469ec2ffb5b50e3e9c1d7ff426b4d7a1067f8135d3694fd7cbbe8930cac55f57a63c87dcb64334eb580ab47c1275388e72e6bfc46 kirigami-addons-1.1.0.tar.xz +bdb635f147cb78d0b92bda2c72c72577682cbc3965c232d106113b5de4fb9193e1d18d409d6bc7af2b2aebc613d0c175a27b294e7259bf08e3c41db1ef0601f3 kirigami-addons-1.2.1.tar.xz " diff --git a/community/kirigami-gallery/APKBUILD b/community/kirigami-gallery/APKBUILD index 06a3fe73f6b..ff3aec0e2a1 100644 --- a/community/kirigami-gallery/APKBUILD +++ b/community/kirigami-gallery/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kirigami-gallery -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -42,5 +42,5 @@ package() { } sha512sums=" -2ddad41d137b31206b48a7f47042cb3adeeb9e001a1494b195ce59b4bdd1462adcf85827d225ff84675f2bb298b8f0311bc728def0fbe18fb6202847104e0dc3 kirigami-gallery-24.02.2.tar.xz +e2b9d562a6cb7ded36b361f4d2bd4f16e1c7e0e8ff700273e9cfa4abc38a446dc2ee170aab3a5b5609c7e8dc407dad7abc35575529686eebb522220173284900 kirigami-gallery-24.05.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/kirigami2/APKBUILD b/community/kirigami2/APKBUILD index e99c2327c49..b14e64a0f81 100644 --- a/community/kirigami2/APKBUILD +++ b/community/kirigami2/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kirigami2 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="A QtQuick based components set" arch="all !armhf" # armhf blocked by qt5-qtdeclarative @@ -46,5 +46,5 @@ package() { } sha512sums=" -b99d9829f864ae59b0ae4064e0b0b24a0f33ce2c35c60b4609fd9746bb322cab26d3f9afe6ba0893b486d4c546ead98c5ba42dc33271d2fdf47e34caef35ea90 kirigami2-5.115.0.tar.xz +bb1f7525cb77dc2849bc9782be9b4522b4559b78e8ad88c9cd9953a6d9736cbe63a33a76fadebd9a1fb04f15007e5141aa465991b99117f7c2f26e09c722b66e kirigami2-5.116.0.tar.xz " diff --git a/community/kiriki/APKBUILD b/community/kiriki/APKBUILD index 592fa7f87a9..bbcf27fda10 100644 --- a/community/kiriki/APKBUILD +++ b/community/kiriki/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kiriki -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="An addictive and fun dice game" # armhf blocked by extra-cmake-modules @@ -45,5 +45,5 @@ package() { } sha512sums=" -649c796c501c66d4303764333042e74101205c5ab8ea3708d3973ff595d4ce44a688c1ff748c229b635bb81ccf4bd1c08371a52dda184987637bfd9f54baa664 kiriki-24.02.2.tar.xz +ede644ec3328d075d6e19b7372e7816fafc716ab38a0fae14a5d928c2bf6a4965b839c84e6b4c073d7a072d6a030134e76f2deaf0729180485f9627d980024c7 kiriki-24.05.0.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/kitemmodels5/APKBUILD b/community/kitemmodels5/APKBUILD index 13cc4976814..f9dc0620c3f 100644 --- a/community/kitemmodels5/APKBUILD +++ b/community/kitemmodels5/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kitemmodels5 -pkgver=5.115.0 -pkgrel=1 +pkgver=5.116.0 +pkgrel=0 pkgdesc="Models for Qt Model/View system" arch="all !armhf" # armhf blocked by extra-cmake-modules url="https://community.kde.org/Frameworks" @@ -47,5 +47,5 @@ package() { } sha512sums=" -fdd0c98e27dcacef57a6224c17bdb17f7074514414542653b3211ffe787c1cc84499773ec7b1ab3ee0d6ee1dfa598ef61b7c0f97bffc1555c060c487f884a3bb kitemmodels-5.115.0.tar.xz +ef3ee4ba45fdf8fac395f3d678421fccb7bfdafec2dacaca203dacf90f65548e31d2d0eb5165c4cb2ce5cf71e4bca289c1af9c9e8dead710f9a19d7831db3bfb kitemmodels-5.116.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/kitemviews5/APKBUILD b/community/kitemviews5/APKBUILD index 99a097f5c44..3ef712f1cb2 100644 --- a/community/kitemviews5/APKBUILD +++ b/community/kitemviews5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kitemviews5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Widget addons for Qt Model/View" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -44,5 +44,5 @@ package() { } sha512sums=" -47150f92d74e709b7fc6aa98efd929af1753bd31f605aef16a52f5922235085d0e76676334fda3af3b764d770c3f2482ea8ca4b3eb416ad0cb35770784fb413e kitemviews-5.115.0.tar.xz +631454b73785d131bcdf7631939db7955f3ec158078787657e74953818e5df1ad7757065ad00336b6efc898e4cf35876541201fac0727875a5ac7f3abfc3e9d7 kitemviews-5.116.0.tar.xz " diff --git a/community/kiten/APKBUILD b/community/kiten/APKBUILD index 939c22e19c2..c215c6e5fef 100644 --- a/community/kiten/APKBUILD +++ b/community/kiten/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kiten -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -48,5 +48,5 @@ package() { } sha512sums=" -9369429f28399cc936254208f57e9b17d30662cbfbca7768dea6f11bd3e1210f92cc3444b16363062991df9f330440ba2e115157329cf04942bb8fd35a766e89 kiten-24.02.2.tar.xz +2d4e2e0b7eda03afc2cf45fbf37f46eecca38171243bb0208edee2b20487116258506243815be5e250dd619a4674577c6198fd6996ac7d0e0bac33dae78a834f kiten-24.05.0.tar.xz " diff --git a/community/kitinerary/APKBUILD b/community/kitinerary/APKBUILD index 859e6406309..3d050b30795 100644 --- a/community/kitinerary/APKBUILD +++ b/community/kitinerary/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kitinerary -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by qt6-qtdeclarative # ppc64le FTBFS @@ -70,5 +70,5 @@ package() { } sha512sums=" -29b2db03b24594f4d96fbb1cf6fd60bfef7015b25fc5e33d1275904af6be9abcd622895dd425e6875ca4b609340ca575e7f2a34f3054d147f95242e1fc61ba46 kitinerary-24.02.2.tar.xz +01c1536da65058d114da67167b335bc8430492d690812f80a2da25c76af207a029188c15339d1bee0fbdcc0a495e9894daf442407f4a133f9739a8ce51420862 kitinerary-24.05.0.tar.xz " diff --git a/community/kitty/APKBUILD b/community/kitty/APKBUILD index 2f0b6731300..765bbd9f5c3 100644 --- a/community/kitty/APKBUILD +++ b/community/kitty/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=kitty pkgver=0.31.0 -pkgrel=4 +pkgrel=5 pkgdesc="Modern, hackable, featureful, OpenGL based terminal emulator" url="https://sw.kovidgoyal.net/kitty/" arch="all" 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/kjobwidgets5/APKBUILD b/community/kjobwidgets5/APKBUILD index f1671a73857..7eebd9f110c 100644 --- a/community/kjobwidgets5/APKBUILD +++ b/community/kjobwidgets5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kjobwidgets5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Widgets for tracking KJob instances" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -47,5 +47,5 @@ package() { } sha512sums=" -8364d7dc63fe7777dcf053aa627e8e8182cb56e4d93b4ed2e366f327cae60fbcfa93dac35ca37bc86a2352297a745a93d38c4123bccf73b57d19f987414f8fd0 kjobwidgets-5.115.0.tar.xz +1a138fb048f9cf91aba5b512d0be43ed4add3ac7b31a36ad21a447b3dabcaf65ecfedd92660e634b8f4cd7526eb9ba44c806477d153394262437f3d858af8e2d kjobwidgets-5.116.0.tar.xz " diff --git a/community/kjs/APKBUILD b/community/kjs/APKBUILD index 91fc9c6984f..ed1821d22c1 100644 --- a/community/kjs/APKBUILD +++ b/community/kjs/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kjs -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Support for JS scripting in applications" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -42,5 +42,5 @@ package() { } sha512sums=" -0b95025edf0b3aa3a9f550aeaffe8a43a8a8a265f556aeea80ee9becb50a93aef7c99def609e82db4802771a63474610eabd65b5cbd0965d59a5dd4d30a716fd kjs-5.115.0.tar.xz +418b8f89e05259b912865e1b9777ba0dc8aa10f69b0359f48ecb33495fdb3ec3906d02d825fe307c0b2ffad45e7c28458da0b0b23cf75e492e970e002b090113 kjs-5.116.0.tar.xz " diff --git a/community/kjumpingcube/APKBUILD b/community/kjumpingcube/APKBUILD index 3983f267717..1b03b099715 100644 --- a/community/kjumpingcube/APKBUILD +++ b/community/kjumpingcube/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kjumpingcube -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A simple dice driven tactical game" # armhf blocked by extra-cmake-modules @@ -47,5 +47,5 @@ package() { } sha512sums=" -b9c4dce78188d62a45d17067b2a2a4b44ddada7713cd531ef8ff99bc09513e50b71c8f6e0fcd556c6cc3657ed3a00852b39a66fd44c2a7d1fd27fc8332ab80e2 kjumpingcube-24.02.2.tar.xz +ae55d04f93f64636beb8875935df6ab70301d71b077f7d79df5548ac2f381a41872804bc0f6a263e1a07cb53b7b0f86f395fa4ffde7a1c22d11860c887e4dd1e kjumpingcube-24.05.0.tar.xz " diff --git a/community/kldap/APKBUILD b/community/kldap/APKBUILD index dbcfc3a3cac..d1b8796d6d8 100644 --- a/community/kldap/APKBUILD +++ b/community/kldap/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kldap -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="LDAP access API for KDE" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { } sha512sums=" -a6c9eff8dd95f52db454d9230158958fdfe8ec97398503202d4ec03501cc1ab354f8af2bfcbc987630129217415b6fc46a1fa771e597e3c468862e59466f5d93 kldap-24.02.2.tar.xz +a593dcadbabb33a711ba50e8fd18f3509768c735ef3fffe160f152d619f3d54f3d7a2dc00f4476f67f07ad65b2a7c203f4f9ed754fa553e8fd641e121963ba62 kldap-24.05.0.tar.xz " diff --git a/community/kleopatra/APKBUILD b/community/kleopatra/APKBUILD index 32354b69891..9904c5b9778 100644 --- a/community/kleopatra/APKBUILD +++ b/community/kleopatra/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kleopatra -pkgver=24.02.2 -pkgrel=1 +pkgver=24.05.0 +pkgrel=0 arch="all !armhf !s390x" url="https://www.kde.org/applications/utilities/kleopatra/" pkgdesc="Certificate Manager and Unified Crypto GUI" @@ -66,5 +66,5 @@ package() { } sha512sums=" -c191eeb57ab78763df9c51b263b41d46683810731fa3afca46ff060e88a9e1f57019e6f87e5f0377b52b7a26ad13c2bbed3c2b091be026676c7a115e549b3c31 kleopatra-24.02.2.tar.xz +4b5df32a7fe37adf7e4fc785d5a9574d53ff9b693fc8c49576845162dc710b65a6540f3fdef6054b7ff535fe1670a8e6e3acafa412f3636f9c16d0413030efa4 kleopatra-24.05.0.tar.xz " diff --git a/community/klettres/APKBUILD b/community/klettres/APKBUILD index e67349f4561..72413b48c62 100644 --- a/community/klettres/APKBUILD +++ b/community/klettres/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=klettres -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -46,5 +46,5 @@ package() { } sha512sums=" -1fb6a61d0fd9303f9a912aea8c8543ae7643778cd6c0467296179a574df57ff1c704f3e647eeb98e34fc115fa786310ee159555a4c7e07a4a2a9aed176381470 klettres-24.02.2.tar.xz +78dad64045df29f879d917901e7d508d747360a7b7cfb543baa12b74c53a2f209c2dae959faee061007a2df757b75e8df2ddbe2271628340771d8f56643bb5cc klettres-24.05.0.tar.xz " diff --git a/community/klickety/APKBUILD b/community/klickety/APKBUILD index dd6b17efde9..44a3229b7f6 100644 --- a/community/klickety/APKBUILD +++ b/community/klickety/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=klickety -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="An adaptation of the Clickomania game" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { } sha512sums=" -a0b28691ae32c191bfb162003d220e79be645e7aa4ed068dac8915e4c23f3739ec3146e758cf01054dad63af14c264c3fa6a18063149845593bf172b169d1d8b klickety-24.02.2.tar.xz +c886ad1a21f2ee1e4ee4d1fb5b360a5450b514c7dac89da4b47d35720431989f263bb83b504449ceb60b0af0ae0eb13deb362f9c481b2f754675c93a9616a80c klickety-24.05.0.tar.xz " diff --git a/community/klines/APKBUILD b/community/klines/APKBUILD index 7aae7ba6b3c..2857e735350 100644 --- a/community/klines/APKBUILD +++ b/community/klines/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=klines -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -45,5 +45,5 @@ package() { } sha512sums=" -07fc6fcfd5f93fbed670e4f0c48162f612a60845c19f9320886617a601ca8b695603b77c24cdef9629db6147abd66575f420bb0e5149f1f24bd37ed169541cdc klines-24.02.2.tar.xz +47d7c4dc8dde16d4f556c267b58a41bffff5eb21cce090b02421561a4e3fef3d6ce6bcad581350c4eca7971dc7fd8c706d33ce39b9b46629c2a41f6d8f353947 klines-24.05.0.tar.xz " diff --git a/community/kmag/APKBUILD b/community/kmag/APKBUILD index 1062e598de2..e98e0e7c74f 100644 --- a/community/kmag/APKBUILD +++ b/community/kmag/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kmag -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -41,5 +41,5 @@ package() { } sha512sums=" -5f8ed6eea6ebc06ec1c5aaf30be509f0708970691f967eab9d92ea8871af65a00bedcb8658a105c39737a9fcc17de7e1ab82c9598b5f925d87184885b2154a2f kmag-24.02.2.tar.xz +fc825a10a38225f93e631d28185a8f4f46883c9fafa1781e805bb463e0914f8a03a1c56194dc4411e7d4f496ad3ae67089ec6333c3d06eb8ef847e749eb3a79c kmag-24.05.0.tar.xz " diff --git a/community/kmail-account-wizard/APKBUILD b/community/kmail-account-wizard/APKBUILD index 5b027e5a1cf..1b1a81e775a 100644 --- a/community/kmail-account-wizard/APKBUILD +++ b/community/kmail-account-wizard/APKBUILD @@ -4,11 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kmail-account-wizard -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -65,5 +66,5 @@ package() { } sha512sums=" -86726dcdc04f03bc0d64f3935c595991a4e1d81701de50f73cd67fd2d3c9e32ec48ee1a5fc07b06300261aa7ff548b71689b6712f79b35b996d3e2647a62a591 kmail-account-wizard-24.02.2.tar.xz +04885232d1eba0ead87cfa37c45da692791e26dd07a1638500aca82a562655cb81569a239cb481a37920dec8c9eec7c24160f34aabb2c1428454bb2eae71ce72 kmail-account-wizard-24.05.0.tar.xz " diff --git a/community/kmail/APKBUILD b/community/kmail/APKBUILD index a53835a973a..8a513a28750 100644 --- a/community/kmail/APKBUILD +++ b/community/kmail/APKBUILD @@ -4,11 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kmail -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -106,5 +107,5 @@ package() { } sha512sums=" -4cb591a4b874b5ddccd7aed6ee8dad4b507e4b7f8eae03237a19abfa1d4a9fb293b352ef61917e3377621c5eac0846ae5ff83d9b93a0e33944e6139c4a8d3299 kmail-24.02.2.tar.xz +3d035b84960ded1017a06b32e2ba320aa7a23738c57e48781016d1aeee4033fda4eca706c8b5acddabd39712d1ba7052e72679f16959399bc0910d9407539836 kmail-24.05.0.tar.xz " diff --git a/community/kmailtransport/APKBUILD b/community/kmailtransport/APKBUILD index e8dd3bf8fbb..89de54afd17 100644 --- a/community/kmailtransport/APKBUILD +++ b/community/kmailtransport/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kmailtransport -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Manage mail transport" # armhf blocked by extra-cmake-modules @@ -55,5 +55,5 @@ package() { } sha512sums=" -705a8e5c2dca4e009b027445bef9b822b979d229e43eabb485d8fcb2ee71b6a1681c4a0355170a617cf82409286acfd8b27ba005728a20db5cd95ca9d75a13dc kmailtransport-24.02.2.tar.xz +7d6508da8874dc8fa11d8c3644c9e1d4553a9b849c2ae55d48c3eef2b3f5e29ffb8b2c2d0fb0c85a811cbf6580ecf98aa9434979eff08e2cb68f21ac8ed196f1 kmailtransport-24.05.0.tar.xz " diff --git a/community/kmbox/APKBUILD b/community/kmbox/APKBUILD index 4b37412d453..52cba6a80e1 100644 --- a/community/kmbox/APKBUILD +++ b/community/kmbox/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kmbox -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Library for accessing mail storages in MBox format" # armhf blocked by extra-cmake-modules @@ -38,5 +38,5 @@ package() { } sha512sums=" -a31cb8d740bab2ff240f0a8312cc9e9433b946694cb7e315eb7609d9f0fcdeefe8e160e9a85d88a4e1060ed8644cde14f0328305fca65e505ab766544c778a16 kmbox-24.02.2.tar.xz +a8fb01a211ab5d75fd71f6533e8ab3074725a773aedba1e42c02c2ae4444ad4f3e1a8d8c1ed68ae8ec8360a26fdc70d69625d91133b96564b4611bd96bfb12b2 kmbox-24.05.0.tar.xz " diff --git a/community/kmenuedit/APKBUILD b/community/kmenuedit/APKBUILD index 966e7eee216..4d45f0e8e35 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="KDE menu editor" # armhf blocked by qt6-qtdeclarative @@ -51,5 +51,5 @@ package() { } sha512sums=" -2b3bf5ce0eaa9cfd43dd79732bb24cb59f1ecf2efec81f4d53c189daebdde6796ea35ea237da83d85c03b91312c3a00053b1fbe3cc7b8b396ff3b5924f247c21 kmenuedit-6.0.4.tar.xz +1812f3d4ea485247bc9381dd681042a9d87278b34b6415724a6dc42d42f0ef4ec87c417f77037a5ab4f03cf60d5b484638d5ab49eb78c6f2b72d84fb391305be kmenuedit-6.0.5.tar.xz " diff --git a/community/kmime/APKBUILD b/community/kmime/APKBUILD index fff366ab199..9d73776e6c0 100644 --- a/community/kmime/APKBUILD +++ b/community/kmime/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kmime -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Library for handling mail messages and newsgroup articles" # armhf blocked by extra-cmake-modules @@ -41,5 +41,5 @@ package() { } sha512sums=" -85c217a65890588899ea32a5517a1107fc41e60903f2613a7b3822b7c8370d0c39fd8971bfa3ad2d0c1b7c5fa763d9d9b9aeaa6f42e0c5eb3ba7bd275b43f840 kmime-24.02.2.tar.xz +374e628c80ef94ae16a86e93cf6888fc07a6f3a2b185b09860803b8dbe944771dbae7262fb4b767053b920a432d7e334f3c882a6f708fbfd23268a870b7014d7 kmime-24.05.0.tar.xz " diff --git a/community/kmix/APKBUILD b/community/kmix/APKBUILD index 11d7ccf01dc..d229b2ea118 100644 --- a/community/kmix/APKBUILD +++ b/community/kmix/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kmix -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -54,5 +54,5 @@ package() { } sha512sums=" -9237a06f2bb77133e5b3f0dd2e6b05dc13ac84f1b8f27be5c6e3450d7036940067da0bfbd6e0083f2ae433cd85d8f55a8e9fc3dcef4895443c4c5a6a08722c93 kmix-24.02.2.tar.xz +cbee2bbedb12eafb7aa3d8b7194c80f4e8d735f4d6f0daecdbfa5c613ad2c8cce36df272873566d6aae84d752e18f3155d96ef0d07371869f24fd5957cdf437e kmix-24.05.0.tar.xz " diff --git a/community/kmon/APKBUILD b/community/kmon/APKBUILD index 9a7c658f5e1..65d45988e6b 100644 --- a/community/kmon/APKBUILD +++ b/community/kmon/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=kmon pkgver=1.6.5 -pkgrel=0 +pkgrel=1 pkgdesc="Linux Kernel Manager and Activity Monitor" -arch="all !s390x !riscv64" # limited by cargo +arch="all !s390x" # `nix` crate doesn't support s390x-unknown-linux-musl url="https://kmon.cli.rs/" license="GPL-3.0-or-later" depends="kmod util-linux-misc" # dmesg diff --git a/community/kmousetool/APKBUILD b/community/kmousetool/APKBUILD index 229aed46c30..ddc567c69be 100644 --- a/community/kmousetool/APKBUILD +++ b/community/kmousetool/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kmousetool -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -47,5 +47,5 @@ package() { } sha512sums=" -ec1168aad81c4fa2a42232146131c8823283c4f138d438df60bc1a1e130a48c8c9e23949c1e0781fd1d6b37ee43c57dd90891cbdfaf74af30778047fb412e057 kmousetool-24.02.2.tar.xz +f81d0d56a5f91e288312875fa0e4d3fcac4a8fc48244ac7d9b91614d5deb7e2051d7cf6d562213c17634e4bf45af04b7ca73c4858f12ae1d004afa49ca29ba43 kmousetool-24.05.0.tar.xz " diff --git a/community/kmouth/APKBUILD b/community/kmouth/APKBUILD index d6babf7076f..746d6bb6e87 100644 --- a/community/kmouth/APKBUILD +++ b/community/kmouth/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kmouth -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -49,5 +49,5 @@ package() { } sha512sums=" -efb32603c7907547a54d979c641742afc85ec2127d42be6fcc94e982c8d2589444eb6c45b99d7e56789e1a4f25d0c041197699df27f85c69a3bdeb9b82c7a7c7 kmouth-24.02.2.tar.xz +828806c3469841db25eef5bdfb3f1cd0264545968a944931e41042184396b0cc2fb1ed7f9a2fb6e478a6c06c46fbd6f4b4271f6cf9fa9b30251e13f8e545da35 kmouth-24.05.0.tar.xz " diff --git a/community/kmplot/APKBUILD b/community/kmplot/APKBUILD index 953cab20b5f..62c50863743 100644 --- a/community/kmplot/APKBUILD +++ b/community/kmplot/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kmplot -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -46,5 +46,5 @@ package() { } sha512sums=" -9b91da18f32c9c41bc77bd6ff60ffd87b7f4cb9a279198f3c0348931a73ff0bb06a6e25684222d04fc0210e3a47483a5680c0765770a521cee0a0fc59ff80d97 kmplot-24.02.2.tar.xz +2fdf6a7d2d657e610ae797b68534dadb383ea49948e7e0e0df0e71aa3c57996c86bee81dcd3bf529692ac6c5ffc46479722ad5999aa32fd6a597172b68d3de2d kmplot-24.05.0.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/knavalbattle/APKBUILD b/community/knavalbattle/APKBUILD index aa6835bff22..c84d2f47aca 100644 --- a/community/knavalbattle/APKBUILD +++ b/community/knavalbattle/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=knavalbattle -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -44,5 +44,5 @@ package() { } sha512sums=" -18771bc8984f34beb403e3d90a3e8bf529762ab041e0e212262fe12f2d0853530c6e548a25ec2aa6d3003e627c0df185b2b7d58f41968a120df13ae9e31811d0 knavalbattle-24.02.2.tar.xz +d15e9039ece66dae48159f2f547c7418f16baac3acf7152398437f176fd2cc35113858b2561d465a2eca05b0e383ea856cb52dcee9ac34d2f564839be0835918 knavalbattle-24.05.0.tar.xz " diff --git a/community/knetwalk/APKBUILD b/community/knetwalk/APKBUILD index 0b843ade905..f5149019831 100644 --- a/community/knetwalk/APKBUILD +++ b/community/knetwalk/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=knetwalk -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Connect all the terminals to the server, in as few turns as possible" # armhf blocked by extra-cmake-modules @@ -49,5 +49,5 @@ package() { } sha512sums=" -3c2550a09bcd42d7cbd400a6d1a6dba27e32fb4c11283fdf14e3b1bdac825c9bbd07350d83ee7b7cbaa5c9a433d81598bba7cdba09ed19fadfade6683fe93943 knetwalk-24.02.2.tar.xz +6dcf2bf100cac83912926a47b5b8e7ea7d7c0b0027a97966a40f5573b91cf81c83d8b2c13b059ae830907c6319c44727b552fea27d3af8c12a7e765c5d360885 knetwalk-24.05.0.tar.xz " 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/knewstuff5/APKBUILD b/community/knewstuff5/APKBUILD index 576980824e1..6a26d8e975c 100644 --- a/community/knewstuff5/APKBUILD +++ b/community/knewstuff5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=knewstuff5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Framework for downloading and sharing additional application data" # armhf blocked by qt5-qtdeclarative @@ -70,5 +70,5 @@ package() { } sha512sums=" -32b9d833d20932b7d6b20cc77812db1a3b01db4e581600c145dafc24becf27b7b72efb4c5f20a1b83b598346696198378095bc28efbfaa24f9944a62d5be29e4 knewstuff-5.115.0.tar.xz +c66f8905c622964a81609d384ea64c0614714b4d760ee908e2efcdaab4ef146fc2af099625e81b83c2e43e4f97a0f5960dae345cbf9d8453a15b465536c06152 knewstuff-5.116.0.tar.xz " diff --git a/community/knights/APKBUILD b/community/knights/APKBUILD index cca003ba3d0..adb4b58925e 100644 --- a/community/knights/APKBUILD +++ b/community/knights/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=knights -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Chess board by KDE with XBoard protocol support" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { } sha512sums=" -e99e816447646101f966b73babefe775aff1b57505d3c14e0d79daafb73ec6b7aad92c51a0c04bb94a5096fb87a6236a8a88e3e542ca99fe3a1ff325f2900acb knights-24.02.2.tar.xz +9333a3c3d04d3065945c1fdbbe748a6a19c71e165d0b120c35c8ea0d750cbf7feaf23d32f048226a81ef698dd8ece94b1e496800bbd1cb391877bc3976522eb0 knights-24.05.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..6ec4dea4092 100644 --- a/community/knotes/APKBUILD +++ b/community/knotes/APKBUILD @@ -4,11 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=knotes -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -76,5 +77,5 @@ package() { } sha512sums=" -a154259103f1304aede7c49ac8a1deacd81f1172eb99d78de7e41f05f6b7e9ecdbef70d3b00788c079f1859e3c3f675588328ca133dbbcd40753fc093225b488 knotes-24.02.2.tar.xz +aab33d5007b682e816eb04cda4d7c24129750fe00f15a62c00148c2f781a3eb92a223acf0cfa9a415ec9ec6f6e7102cdc5b7a8708f80eedd2ad0a3cbcef16a01 knotes-24.05.0.tar.xz " 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/knotifications5/APKBUILD b/community/knotifications5/APKBUILD index 2c1032f5a6a..29d8bf01169 100644 --- a/community/knotifications5/APKBUILD +++ b/community/knotifications5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=knotifications5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Abstraction for system notifications" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -52,5 +52,5 @@ package() { } sha512sums=" -5254cf3064fa2ee03332b37651d5fef1aded852c0f8474365bfe20f225d7f59e39c11952793a3a8aefb75206ae09080396e5fc5f2ace528eee5d8df1bda983d3 knotifications-5.115.0.tar.xz +e49b9930c69581b4498a012483b04588c52e5ba04035dbe01e21dbe6c07e8f69a14f40c0ac07a0299bc1ae182ad47b47ecd5ab5da2fb7a0b5a2f1c90282c289c knotifications-5.116.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/knotifyconfig5/APKBUILD b/community/knotifyconfig5/APKBUILD index f4329e0e77e..396f87cbef2 100644 --- a/community/knotifyconfig5/APKBUILD +++ b/community/knotifyconfig5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=knotifyconfig5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Configuration system for KNotify" # armhf blocked by extra-cmake-modules @@ -48,5 +48,5 @@ package() { } sha512sums=" -75ca1341a1ec17f28d5e0651d14ca4b17c42d3bc7593d4976920ce8df96c1e9eddc9fd2eeb7564bf5094551729ac29e73c4d0712fc74a09695790c6d206f8500 knotifyconfig-5.115.0.tar.xz +e251964dc5dbc518e5a993e1d6605435f5d858868631d00178484c57e418deba4e688d3ed5dd6e58b9fcda96991ac0043da5ff762ac6038d1187a4625103d038 knotifyconfig-5.116.0.tar.xz " diff --git a/community/koko/APKBUILD b/community/koko/APKBUILD index 83af69e706e..e83dc308b0e 100644 --- a/community/koko/APKBUILD +++ b/community/koko/APKBUILD @@ -4,14 +4,14 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=koko -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 _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 @@ -87,7 +87,7 @@ package() { } sha512sums=" -86630a687ffa871078e43bc13690336eb27d813afdb051d533e08952068f3c26b36184e703a34bf1399b7f886fcbddd26d9ca5581985c2fd149ab8525be44115 koko-24.02.2.tar.xz +4e59daa71b8930a702189f537115e10dbdb1c3a9b26febc6fcd367b091748c31d89783b5c89b6afdcc5c80f3ee34ae3b8a1f5acfebe3da57a460e239fed663a6 koko-24.05.0.tar.xz 780b1a27bacd1c5ec4b5c4d37b2cedbdd0dfef1d4761b9d10385d6bf5fdaddb90f08afc9e69f8c7d995684682a9ab6575dbec19460125ed456e12045381cbffd cities1000-2023-09-02.zip 6729409e1a229df729d568eabec42ca0ac4abbb6efcb62612bbeaa8682b77c562a7460d86d20329fe5c53858c5d62cc1915cec485760ffe55c4e66274bb99941 admin1CodesASCII-2023-09-02.txt 8de976fe0642b7f3d3133f3928cb050e2f7fd25d65c8bd82ddf06d275f8054b31bfb20f019ce410383bbd466181aaf9469a55e1e36c97c7f550eccb7ec865a3c admin2Codes-2023-09-02.txt diff --git a/community/kolf/APKBUILD b/community/kolf/APKBUILD index 9fe78a70721..f10d479fe06 100644 --- a/community/kolf/APKBUILD +++ b/community/kolf/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kolf -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A miniature golf game with 2d top-down view" # armhf blocked by extra-cmake-modules @@ -48,5 +48,5 @@ package() { } sha512sums=" -138ef38320f3b9c4c66b8db0badbe310ac301b44a65c6f56738694c2206da04f6603459b27145f0bec01039208649d81f7a885ecd20fafdfbfb58ed59967a470 kolf-24.02.2.tar.xz +b0edd89c09a035eb40d5705479ffc62640bc464960fa2a48d7be4ee567a8c842314a6b9c7730a7cc7e1cfa88f3fcd3793525be7ace3a59f92be10f4c868b0585 kolf-24.05.0.tar.xz " diff --git a/community/kollision/APKBUILD b/community/kollision/APKBUILD index 4142d07dc27..377ca6b7bbc 100644 --- a/community/kollision/APKBUILD +++ b/community/kollision/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kollision -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A simple ball dodging game" # armhf blocked by extra-cmake-modules @@ -44,5 +44,5 @@ package() { } sha512sums=" -700fdf5015aeb4f46cbbdb1add5c9aab8a9a7a5036019f428df1d71038213b9ecd2efe61fb9d42c543153c1ec48978c1f0777353929563d7c24017e2c6381e29 kollision-24.02.2.tar.xz +b158e53080048d3053d70a4c61cda9548411cb368a09cfddeb7985cbc3e6609862d84f54a8b75d34327d17809da3a21826a6abdb331940df38452b5bf54be4b4 kollision-24.05.0.tar.xz " diff --git a/community/kolourpaint/APKBUILD b/community/kolourpaint/APKBUILD index a4882a551b8..bd6e379f8c1 100644 --- a/community/kolourpaint/APKBUILD +++ b/community/kolourpaint/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kolourpaint -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -48,5 +48,5 @@ package() { } sha512sums=" -4277ba48582a1ee3c62e95e00f4d8c3e048348eab5e2d75f0579e5e4b179da85793d6cf744b423c3991e9c6501fa4f9d78bfb8fa7389b9e9f334eb61a78000e0 kolourpaint-24.02.2.tar.xz +5d18d712c716ae03b7dceb7295e0950f6b26ff1218f515c5cd9d13d002bc99f96a028257d8c9f86cc5dc6976c340e32aa25fe654351fc5439cfafa74099104dd kolourpaint-24.05.0.tar.xz " diff --git a/community/kompare/APKBUILD b/community/kompare/APKBUILD index fd9f2171ec0..6cf302f84d3 100644 --- a/community/kompare/APKBUILD +++ b/community/kompare/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kompare -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -13,17 +13,17 @@ pkgdesc="Graphical File Differences Tool" license="GPL-2.0-or-later AND GFDL-1.2-only" makedepends=" extra-cmake-modules - kcodecs-dev - kconfig-dev - kcoreaddons-dev - kdoctools-dev - kiconthemes-dev - kjobwidgets-dev - kparts-dev - ktexteditor-dev - kwidgetsaddons-dev + kcodecs5-dev + kconfig5-dev + kcoreaddons5-dev + kdoctools5-dev + kiconthemes5-dev + kjobwidgets5-dev + kparts5-dev + ktexteditor5-dev + kwidgetsaddons5-dev libkomparediff2-dev - qt6-qtbase-dev + qt5-qtbase-dev samurai " subpackages="$pkgname-doc $pkgname-lang" @@ -32,7 +32,6 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/kompare-$pkg build() { cmake -B build -G Ninja \ - -DBUILD_WITH_QT6=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib @@ -48,5 +47,5 @@ package() { } sha512sums=" -992e8f4f89462a65967e872324c157d9a3a611d2336e8ce58e5680c18b1c142abd3d1ebb1d9e82f1ed91b5904b5084de7bcb67c5f5c753e6205c1bf60f15df10 kompare-24.02.2.tar.xz +7d8789f77bb4a56b61d56019dc6241e3e4a84070a8ded2418f4c4f0ba34d87c5c0d834237f209f700c774a7876d3867946f09f1d46b2502581d65413687a019c kompare-24.05.0.tar.xz " diff --git a/community/kongress/APKBUILD b/community/kongress/APKBUILD index a5258be1a72..5a6a3c0c51d 100644 --- a/community/kongress/APKBUILD +++ b/community/kongress/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kongress -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Companion application for conferences" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { } sha512sums=" -da96c5ebc49aefd083f4913b16542d6f80ab46a7756b4a628fb3869310957891d6620c88adec2f7e63179fa80418161b1d02577fdadcd172abc2ea419f8ae5d0 kongress-24.02.2.tar.xz +af842f1b869b5bab5a40eb825f9b2dbae135e3309baf1fbc1fbec6b11c1ac4f61005fc462fba39b78cd6589aa6d9d8116958ef3a88890b61b7cf46618749679f kongress-24.05.0.tar.xz " diff --git a/community/konqueror/APKBUILD b/community/konqueror/APKBUILD index 67f964596cf..a06da856243 100644 --- a/community/konqueror/APKBUILD +++ b/community/konqueror/APKBUILD @@ -4,12 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=konqueror -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="KDE File Manager & Web Browser" # armhf blocked by extra-cmake-modules -# s390x, ppc64le, riscv64 and armv7 blocked by qt6-qtwebengine -arch="all !armhf !s390x !ppc64le !riscv64 !armv7" +# s390x, ppc64le, riscv64, armv7 and loongarch64 blocked by qt6-qtwebengine +arch="all !armhf !s390x !ppc64le !riscv64 !armv7 !loongarch64" url="https://konqueror.org/" license="GPL-2.0-or-later AND GFDL-1.2-only AND LicenseRef-KDE-Accepted-LGPL" makedepends=" @@ -55,5 +55,5 @@ package() { } sha512sums=" -29b7e14e68481f6b155c8d17dda9ae21858213c9fdb5a812c761d40469ca1339f0e237e57f1687a6e000a2ed54060dbe1b2f1ee1bc382dd662975ddda8305717 konqueror-24.02.2.tar.xz +d88392fd49c6fe732ea440316d9907627c2a6ac6e495a90e1387cc4dc8ec8764b97018b127645f4ac87b8732a3b55373985b2822d15907e586e9fb332764d7b3 konqueror-24.05.0.tar.xz " diff --git a/community/konsole/APKBUILD b/community/konsole/APKBUILD index 032ff2c5097..623096b1c22 100644 --- a/community/konsole/APKBUILD +++ b/community/konsole/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=konsole -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -79,5 +79,5 @@ package() { } sha512sums=" -de3154d198fb3e7bfd91e06faeafafcf75478c85af46443c04bd98e5a267bd0eea28e162cd7827858cb9c17880bd7f947983bf81e9ba8aa6647820691cf42042 konsole-24.02.2.tar.xz +2b2b4999384059171c27509955bc0ae632ddb1a89ecdacc5159d9e97c2ab6a0ba193c2ec0ba73da23bff953c1627fed4901576d194417900012c1732efd894cb konsole-24.05.0.tar.xz " diff --git a/community/kontact/APKBUILD b/community/kontact/APKBUILD index 36b4325a113..9564a610b4c 100644 --- a/community/kontact/APKBUILD +++ b/community/kontact/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kontact -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -52,5 +53,5 @@ package() { } sha512sums=" -df5bd9bd159a25fc6ad27fc5397f8969d26180b2ff3224ff8d96f04c1512202060bfc89ad56e9f8c9c0ad03dfb24206718944f2cb433782cae912fd62dbe4c3d kontact-24.02.2.tar.xz +82d0a33ec86a19f81184e5a78526db2f9d06ec0cd859431e420906e2c0c0d1900fb4d9241c6b6dae5a843e9612e991d23b3fb55760c62cd65004808877e301a2 kontact-24.05.0.tar.xz " diff --git a/community/kontactinterface/APKBUILD b/community/kontactinterface/APKBUILD index 7c1e373d96a..a8d41405843 100644 --- a/community/kontactinterface/APKBUILD +++ b/community/kontactinterface/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kontactinterface -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -44,5 +44,5 @@ package() { } sha512sums=" -255f6b06ca87129abbf205b06a349f9228676c4152203e599d4dee2d41081bac105c9f99a77ee9033ebd9c7deb86087f40613d42f2f3c55999fa5c77c56c0080 kontactinterface-24.02.2.tar.xz +4a51520c8820bcbd676933ca73ab9f985373f8e5fbc67854df20ac8f159eeeb6333aa556a4910bc28a3ef13d4c4e3f731c68cf29a0d75fea90f4dbe5fb383c41 kontactinterface-24.05.0.tar.xz " diff --git a/community/kontrast/APKBUILD b/community/kontrast/APKBUILD index f4ce103328e..938b1c18a36 100644 --- a/community/kontrast/APKBUILD +++ b/community/kontrast/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kontrast -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Tool to check contrast for colors that allows verifying that your colors are correctly accessible" # armhf blocked by qt6-qtdeclarative @@ -43,5 +43,5 @@ package() { } sha512sums=" -4a925a6b370820bc9d51352e81758059dd4cc8f4ac38f6cb6db5cf587653b4eb5599baa289fe22019e3a1314b05b979b950a7f34655901499d354a3cfab6d94f kontrast-24.02.2.tar.xz +8cda695659070bd667a9d5f85ed454839c1e45734452443ef6ffeb6656505397e17b49c3a0091052c98f1a27583379bdc96d178828bcd3fab871612d85a391ba kontrast-24.05.0.tar.xz " diff --git a/community/konversation/APKBUILD b/community/konversation/APKBUILD index beb110225c9..cf593036e36 100644 --- a/community/konversation/APKBUILD +++ b/community/konversation/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=konversation -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -60,5 +60,5 @@ package() { } sha512sums=" -c402713dd2918d0b8ab1f617b371763366b903acc120565b9b9087ca71843ef9dc4aa2f10f61e0fbc4406fe27f5e3d12d3fef14b352f49f384c2c39e24099a71 konversation-24.02.2.tar.xz +97da01f374fb3c715b1b6bde52823699474a68f2452ed485a2fd76520ddbb57a2023289ab3c211d6e812c362071696ef66c633214300cf2527bf8334efff206f konversation-24.05.0.tar.xz " diff --git a/community/kopeninghours/APKBUILD b/community/kopeninghours/APKBUILD index 8b60aa88ac6..8637d9013ed 100644 --- a/community/kopeninghours/APKBUILD +++ b/community/kopeninghours/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kopeninghours -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Library for parsing and evaluating OSM opening hours expressions" url="https://invent.kde.org/libraries/kopeninghours" @@ -47,5 +47,5 @@ package() { } sha512sums=" -1540dc045e65c9751c5571b3e2c170f03474282c8e342c41af3101034bdddc8af9e9de17b63b0f3515672b0fcb8a821f5a5acfa074814639f3957aed9e53d857 kopeninghours-24.02.2.tar.xz +73b74a16b3db5f23e757a482f719669d8027d1c9277decf8f858607e5a75e824245bdf17eb7130a6c0825dbeac85adc056fb86e5f8a93fc37b7f75193e646b4b kopeninghours-24.05.0.tar.xz " diff --git a/community/korganizer/APKBUILD b/community/korganizer/APKBUILD index d99569a6e1a..dee02bc02f3 100644 --- a/community/korganizer/APKBUILD +++ b/community/korganizer/APKBUILD @@ -4,11 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=korganizer -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -94,5 +95,5 @@ package() { } sha512sums=" -a798c3dcac8735c5eeedec2a9e9c0c3a180f337e67c3233895d97967c295eb4f66b8555a0ef2ffa8b62a4c36a9d7f87e8c0c7241736eb6752d8c5e7ce29d9e95 korganizer-24.02.2.tar.xz +7fac18fd3cd887344e84b61ced46e370ad878b69461eeae1b9a47486f2a1be31914124532b80eb6c8edc3a58969fb3698a454f917057c87f623f1de784eb7eea korganizer-24.05.0.tar.xz " diff --git a/community/kosmindoormap/APKBUILD b/community/kosmindoormap/APKBUILD index f8ea74fb194..9253c8d1e35 100644 --- a/community/kosmindoormap/APKBUILD +++ b/community/kosmindoormap/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kosmindoormap -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -61,5 +61,5 @@ package() { } sha512sums=" -1edde1b613758f20028f3b92d517e8126712e069651d1e349cddb73676218d60e84e29412e7ae397dd892501a4ef116c0b7a17e976d378904e2c820edd049d5a kosmindoormap-24.02.2.tar.xz +8668493ae241770f57e2e3259fd207600174ae7d23e5c9d0c8d1953c3dcb0921b157004008f3d2aaf6698afd5c5f7f78918ce5d9e4c8d8a5fb3d8305103fb59d kosmindoormap-24.05.0.tar.xz " 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/kpackage5/APKBUILD b/community/kpackage5/APKBUILD index f250db233df..7609e0904a3 100644 --- a/community/kpackage5/APKBUILD +++ b/community/kpackage5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kpackage5 -pkgver=5.115.0 +pkgver=5.116.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 @@ -49,5 +49,5 @@ package() { } sha512sums=" -f393863bde9a3ed6d21a980b3e53e5be37826ae8d520334dc5239f88a6ab2bfc26ea2c1345d362e5e499e1d786e83a705b520436277eaf6f65d9192a5ea9a241 kpackage-5.115.0.tar.xz +15129fecdf53db1a0fa32fb4ebfc82f7b3d7edd9591032267d80b61458e652813f3d18f406a473ca75c202fb7e401815ee290c3c30d3c54920562bdf00a53632 kpackage-5.116.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/kparts5/APKBUILD b/community/kparts5/APKBUILD index 85dcbee6c2d..a4cd5c7839d 100644 --- a/community/kparts5/APKBUILD +++ b/community/kparts5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kparts5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Document centric plugin system" # armhf blocked by extra-cmake-modules @@ -56,5 +56,5 @@ package() { } sha512sums=" -3afdc39d75e8f4f6bd43e40c3d23178f1be2cae3606d797bcd544e43e3f105038b587c6c1b0898fc40728c7742ba11f92592c9ce1531225d02dbabfc27e10aad kparts-5.115.0.tar.xz +a619168f6e2622c64e4304641da47f91deef49843dfec72a08aa775e24b9319f7b550bc423f6b2516ef0a38bb2c39234d1325f25c62b57c8c6daa5fb7580813e kparts-5.116.0.tar.xz " diff --git a/community/kpat/APKBUILD b/community/kpat/APKBUILD index f97085dfb22..c5ac2d8cb39 100644 --- a/community/kpat/APKBUILD +++ b/community/kpat/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kpat -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="KPatience offers a selection of solitaire card games" # armhf blocked by extra-cmake-modules @@ -56,5 +56,5 @@ package() { } sha512sums=" -e3784523968ffff2fa6f4681ee4cea841cc190419759995d20e374ad533a88c00dea68312a87fd55f2721f0fa262b84f3ac16b84edded9570c3c70711ccbf2db kpat-24.02.2.tar.xz +5b278c1d68368ffdad5a53ca811caa8b00c65471da077bd3ca70589e4a1c3b204087466e6c783731ac90cdd2a6d6925be0f5c247f50d621f187483220f8fc77f kpat-24.05.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/kpeople5/APKBUILD b/community/kpeople5/APKBUILD index 6faa4a091d3..e9327073222 100644 --- a/community/kpeople5/APKBUILD +++ b/community/kpeople5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kpeople5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="A library that provides access to all contacts and the people who hold them" arch="all !armhf" # armhf blocked by qt5-qtdeclarative @@ -51,5 +51,5 @@ package() { } sha512sums=" -cc1a8c40e83c0fc2a2185cd515023413c67f21c7adf9ca2870840ac1fddde22ee0ffe6b64819a9b451901ef91748ef7e7df9312a0dc7274b579b8daba286455d kpeople-5.115.0.tar.xz +3cbd62d9696592b654a9568d5789eb0acc370e4fcb174938db23a0ac03949f9fe174d6ff4abe35a7132319c725349be2520d7857a9d0b83048df23bb38f76232 kpeople-5.116.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/kpimtextedit/APKBUILD b/community/kpimtextedit/APKBUILD index 11be35616c4..054521a7b98 100644 --- a/community/kpimtextedit/APKBUILD +++ b/community/kpimtextedit/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kpimtextedit -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Advanced text editor which provide advanced html feature" # armhf blocked by extra-cmake-modules @@ -73,5 +73,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -c48e3ca5fc2b53f8b04cdbd42db32045131fbf4e63b49e005c265ee3deef58d37c34e434842a1de6ce72a59e46deb4863689320b85961c7a3ea8c6dc50bc0db6 kpimtextedit-24.02.2.tar.xz +04f5a648e6463a4d3cb6dac7f8166a5cbceff3939a7dcf8daede3f7af45fef8792d8ad8f74792e071cceb4f27baac465d8ba735bc8280ac54015521718599215 kpimtextedit-24.05.0.tar.xz " diff --git a/community/kpipewire/APKBUILD b/community/kpipewire/APKBUILD index 12395769612..14c52c0571b 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Components relating to pipewire use in Plasma" # armhf blocked by extra-cmake-modules @@ -61,5 +61,5 @@ package() { } sha512sums=" -c4c3accfb99e5bb588cb31ea6163de8f8c75bfd920e8309683b25ad1a92a9eed6bd8dd0ae229e11057eb0c368dd7a3374197a97ed1b5a1620ec6b6e5b7555f33 kpipewire-6.0.4.tar.xz +1f72c721ea9bc9b5c5110868121f988eac9cafaf89556196f8e787ee367226fd555bae8872ec9b07f079b9ff8b0a259cb124a0b87a901728fcdac6a009d305ee kpipewire-6.0.5.tar.xz " diff --git a/community/kpkpass/APKBUILD b/community/kpkpass/APKBUILD index 57468f6204f..fed354e76da 100644 --- a/community/kpkpass/APKBUILD +++ b/community/kpkpass/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kpkpass -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 arch="all !armhf" url="https://kontact.kde.org/" @@ -40,5 +40,5 @@ package() { } sha512sums=" -402029a54938b41bf981049600e6cfb2c443210e2ed50fb6d5293245dda1403a56409d18a765ec794c41af320c520b13bb89302341ece6bbea12378671e98a23 kpkpass-24.02.2.tar.xz +b39710d0c6dc0fd3d8ee413f158a0f41e584e045693171bf162d8e911f32298a3285c1067970c80625d42bbda519960bdc2c24a10c777e84969f0eb491b2ef83 kpkpass-24.05.0.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/kplotting5/APKBUILD b/community/kplotting5/APKBUILD index 0bff82bcb82..43923275ba6 100644 --- a/community/kplotting5/APKBUILD +++ b/community/kplotting5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kplotting5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Lightweight plotting framework" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -43,5 +43,5 @@ package() { } sha512sums=" -cbe3ec13f9282024ddecedd4de03b877fedecdcf71d49a023cd7aded999017f6c373ebc4b4edbb80bbf4f4d6df891b03542241b706a61c97419358e91916cf1c kplotting-5.115.0.tar.xz +1a4d8313c57d32c6af41127ce27086d0d357ade8126ff4dc1d1c5306b198f3d1ab24d67105cef3bad318d753210553fe275350a173b18c1d3c485f213de95fe9 kplotting-5.116.0.tar.xz " diff --git a/community/kpmcore/APKBUILD b/community/kpmcore/APKBUILD index 6d4a65c34cf..984cdfd8178 100644 --- a/community/kpmcore/APKBUILD +++ b/community/kpmcore/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kpmcore -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -52,5 +52,5 @@ package() { } sha512sums=" -24664d79e4fbc630ecdbc08006de2bc6a1d42abd1eeeb842b00c45a17742ae651c0c5a490310d99803b6dfe757f4fcc0a66c211dd2afbbafd4cd8cfb30050bd0 kpmcore-24.02.2.tar.xz +d46b6679902a11b2e92c71c9a970a538d02a9b40f8fc91ec248c2eadce5855d06e54f46a97fb5464d5e60c72e837f7c134666c302b98ac8d83cc84c5e8e76f3c kpmcore-24.05.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..4f8a4e704e3 100644 --- a/community/kpty5/APKBUILD +++ b/community/kpty5/APKBUILD @@ -2,10 +2,10 @@ # 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 +pkgver=5.116.0 +pkgrel=0 pkgdesc="Pty abstraction" arch="all !armhf" # armhf blocked by extra-cmake-modules url="https://community.kde.org/Frameworks" @@ -48,5 +48,5 @@ package() { } sha512sums=" -79d3d593397d357f3ec71f357e5fceb1c0678d9bb60b927df237d52a122f32a2945008faa43a356c1f4f65c4d14d71ebbfd2dd90c287247fd3b3ab68d43d2f6d kpty-5.115.0.tar.xz +5aebb2a66be19dfadc2896b26864b9b0b4074d8c46ead97c7857b035cfe370a7fbf144c7e1b52725ec20339e64a0d08f6c913fe6c3a1ec614b557b4d950a3f21 kpty-5.116.0.tar.xz " diff --git a/community/kpublictransport/APKBUILD b/community/kpublictransport/APKBUILD index f72e5caaf9c..d5dd306b505 100644 --- a/community/kpublictransport/APKBUILD +++ b/community/kpublictransport/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kpublictransport -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -46,5 +46,5 @@ package() { } sha512sums=" -5de51775833138879e943a910d8221423dbc68fa4471795e96a0c1fc709f7fd35fa45632a3dc87173d03fa89dcca27e300313e28ef2656b1e7acb7e36e0ececb kpublictransport-24.02.2.tar.xz +8f746ef0871952cd8652e4de4693532b6a517eb36d409d6dbbe0f143622aaaa3ef50370115c130d86e5209dedd5b861f7f2357f7bf916cec9b03ce61cf15ffc7 kpublictransport-24.05.0.tar.xz " 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/krdc/APKBUILD b/community/krdc/APKBUILD index 0a22b06aafd..940b2411046 100644 --- a/community/krdc/APKBUILD +++ b/community/krdc/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=krdc -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -57,5 +57,5 @@ package() { } sha512sums=" -90c02d5a2174c356d174f9cd7c3b81f0307d211fd933d08c78f81a7df5002fd3e2acbddb22973579640c90295a599ab5f2697f6637bb1365c2d0611238eb19d6 krdc-24.02.2.tar.xz +f3d5f610e8abbfcde3ed638f8b0c00fb72f8e074a8f293a23cc863a6b8f48abf396b1931004ef4d144fcdb4c3c0faf0f509e7ef219f1c06020cf71f0fdc690b4 krdc-24.05.0.tar.xz " diff --git a/community/krecorder/APKBUILD b/community/krecorder/APKBUILD index d2fe3888259..4b6e205b075 100644 --- a/community/krecorder/APKBUILD +++ b/community/krecorder/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=krecorder -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Audio recorder for Plasma Mobile (and other platforms)" url="https://invent.kde.org/utilities/krecorder" @@ -41,5 +41,5 @@ package() { } sha512sums=" -61feb21d2f7e878a9b0fec68e86528c0e2d35f933532e7482fb4518eff90b9d7808c8ad77a87f881cdc20abbcef9be52f2c2f64764eb64d7d9788694efe37493 krecorder-24.02.2.tar.xz +d59f96e8eb267b999c9f5a3c896819545c6792921fdb3e934098f4d0797ca0ab38ef50e009c79b3b01ff56832fac60b63dbef3d2f57e0f37fe143bcf05a9b8a6 krecorder-24.05.0.tar.xz " diff --git a/community/krfb/APKBUILD b/community/krfb/APKBUILD index 7a3117bd150..d9d6e9ae0f4 100644 --- a/community/krfb/APKBUILD +++ b/community/krfb/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=krfb -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 arch="all !armhf" url="https://kde.org/applications/internet/org.kde.krfb" @@ -57,5 +57,5 @@ package() { } sha512sums=" -30b0debfd1407ccc8588a86f43e556c64347048cdea7c7cb3b08414b33d05c8f4f32835796e762c2d0c9b6d3d33b9aaf47df3a23eb9aa0b422ef76419677932a krfb-24.02.2.tar.xz +c92355e8c7b7f698d75097c2d5cbe192443986611a6aa45c67c2c9d02e41c67be4b80dc65c2d0eea5ad8604803401de21d6e4dcb6d6bc4e01caa46ca34fe5b3a krfb-24.05.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 9d2913a41d0..d5cfa4d2b45 100644 --- a/community/krita/APKBUILD +++ b/community/krita/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=krita pkgver=5.2.2 -pkgrel=2 +pkgrel=3 # armhf blocked by build failures # s390x: nobody is using an art tool there # riscv64: fails to build from source @@ -61,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" @@ -102,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/kross/APKBUILD b/community/kross/APKBUILD index b91e4518421..95a65fdab59 100644 --- a/community/kross/APKBUILD +++ b/community/kross/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kross -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Framework for scripting KDE applications" # armhf blocked by extra-cmake-modules @@ -49,5 +49,5 @@ package() { } sha512sums=" -19c1cbd94cec88df149ddec45ba2c436dae5debce5a126c19f3292a3f1a7724ef04bede63a907e387606d163ae3c2ec7a880df851f5d9db976902303045322bb kross-5.115.0.tar.xz +cc6b3e4da7c5ccdbcbe7917405f84930ab89a9d82999ccc7016affa5dbdd540e3da7f5a45bfdc753c5160fefc506cdda9717e424dc33cba7f97ea8323e53564b kross-5.116.0.tar.xz " diff --git a/community/kruler/APKBUILD b/community/kruler/APKBUILD index a4a29dbed3c..2b6c59a6a6d 100644 --- a/community/kruler/APKBUILD +++ b/community/kruler/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kruler -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -43,5 +43,5 @@ package() { } sha512sums=" -e8b15f37e845135527acf9a86c351e9f78d254c46a5c0a3eb0b46232db51263b475574535c5a40c58df8c823a9552e6d69cf6d12c3b6f61e2bd22c9405da18f2 kruler-24.02.2.tar.xz +3dd7bf34ee56ef3ba149ca6ddee30ef90aae7c3b7b9f2fdb4e0c3c5be90e337561afaf65acf4fddb121af24171ec7c94a142ec7de46904318bfac8985e7dacde kruler-24.05.0.tar.xz " 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..581f4d3715b 100644 --- a/community/krunner5/APKBUILD +++ b/community/krunner5/APKBUILD @@ -2,10 +2,10 @@ # 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 +pkgver=5.116.0 +pkgrel=0 pkgdesc="Framework for providing different actions given a string query" # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -57,5 +57,5 @@ package() { } sha512sums=" -b0eeed6d7145585a55c29a60618a2be73fc3c9cb3e2167ccf064528994270f628a6d8bc5ef3147e332bff398005ee70d8c3870b076dc90a71d6368c0f9a7c676 krunner-5.115.0.tar.xz +53fdc8e841219578a75b7d6ca67aaebd44e2208adfc99a4937c8377369f66a0f907390f49eca6d98385e3fdddc27ec1844620d7390900999d5eb966a565666c9 krunner-5.116.0.tar.xz " diff --git a/community/krusader/APKBUILD b/community/krusader/APKBUILD index 767557ab19d..74297011cb8 100644 --- a/community/krusader/APKBUILD +++ b/community/krusader/APKBUILD @@ -5,12 +5,13 @@ # group=kde-other pkgname=krusader pkgver=2.8.1 -pkgrel=0 +pkgrel=1 # armhf blocked by extra-cmake-modules arch="all !armhf" url="https://apps.kde.org/krusader" pkgdesc="Advanced twin panel (commander style) file manager" license="GPL-2.0-or-later and GFDL-1.1-or-later" +depends="kdesu5" makedepends=" extra-cmake-modules karchive5-dev diff --git a/community/ksanecore/APKBUILD b/community/ksanecore/APKBUILD index a0fe236f915..8847ce62f78 100644 --- a/community/ksanecore/APKBUILD +++ b/community/ksanecore/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=ksanecore -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -43,5 +43,5 @@ package() { } sha512sums=" -51f428ba59dca3ad96df6e2080fa431de2823cf01141d2b584c6084d3711b8b358a91ecb8d3a6097bb490cb28978c0f58ea2eac37e360678572c32604be4d25d ksanecore-24.02.2.tar.xz +7e9d9732b76ce3d33cd4c213ee08a307b8719ed9db40f4d6ab01bfe25b66b39843f32fedae9843df3ce18b652a52592983f99c86fdcad8a163dbe973ecfb2675 ksanecore-24.05.0.tar.xz " diff --git a/community/kscreen/APKBUILD b/community/kscreen/APKBUILD index f2be77f1307..c3693c7ce10 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="KDE's screen management software" # armhf blocked by qt6-qtdeclarative @@ -64,5 +64,5 @@ package() { } sha512sums=" -541b3bda55590cc599c36f9c37cbd4439bb93e3156c57d66aa5350d0b7f35dcc52ae40e9dd93e0b07baf01bb223b2332346bae9a615d81be3668583f783e6343 kscreen-6.0.4.tar.xz +6180e7b91bd7474b8cbc269c5c6c1087275abedfba55e806a9383a96a3d481ab01bf6e9bc79cbad6aeb4b7bed9b1184ab45b6b9220759c8e1078d81d81e825a9 kscreen-6.0.5.tar.xz " diff --git a/community/kscreenlocker/APKBUILD b/community/kscreenlocker/APKBUILD index 66dbdbbcc40..2023a903e0a 100644 --- a/community/kscreenlocker/APKBUILD +++ b/community/kscreenlocker/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-plasma pkgname=kscreenlocker -pkgver=6.0.4 -pkgrel=0 +pkgver=6.0.5 +pkgrel=1 pkgdesc="Library and components for secure lock screen architecture" # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -79,8 +79,8 @@ package() { } sha512sums=" -a5f01c8d1c976584546dacdb9d0f18ee8b59bf3e00caf01a6de294d1998eaf0806e551650d0528a3b3d4f65954fc7edadd808ba75b5b7d7060646058ab8d34cf kscreenlocker-6.0.4.tar.xz +58da244c278dd755c43348b12c5c6bb4007d2894bba09e7e8098510a4ab8c9f5bea5d06fa47fe7995d859fdb0846058380f29e71f57ba240e8f0a4d2f78faad2 kscreenlocker-6.0.5.tar.xz cdbc45fb74a3c43fb2302fe09bf2f9f644ca93693e0110cf748c403762236aaeea8284a8d21fc495014c69b6d5fe4789aaff7687ce9f03dda270490fa5042e2b kde.pam -fe2f244b73b5cccf4b7125b9e3cac0a35566840e4ba2f69937fd8053aa56af71ee43dcbfa9c0f79de9ebe31f656e98a5d38955f77560be5c3535b08215ad8789 kde-fingerprint.pam +ffe092db00d5d633ac772a27bf921b968f2b46d19c2f7dec983acd4647bcbd7ca2f850177a56460d7290a296c0092101d8ba89a51c6831bad79aaedb322cce11 kde-fingerprint.pam 2ae866d25224ba345ea9d5ddb2fce668de5c51d1cfbb4d7a048c50107ccd6cffc3231a46855599c0ba3d62ff002a26e45b69d9029f88f4ab42661465a5e526c5 kde-smartcard.pam " diff --git a/community/kscreenlocker/kde-fingerprint.pam b/community/kscreenlocker/kde-fingerprint.pam index 628568ec3f1..383ac408f7c 100644 --- a/community/kscreenlocker/kde-fingerprint.pam +++ b/community/kscreenlocker/kde-fingerprint.pam @@ -1,15 +1,14 @@ -auth substack fingerprint-auth -auth include postlogin +#%PAM-1.0 -account required pam_nologin.so -account include fingerprint-auth +auth required pam_shells.so +auth requisite pam_nologin.so +auth requisite pam_faillock.so preauth +-auth required pam_fprintd.so +auth optional pam_permit.so +auth required pam_env.so -password include fingerprint-auth +account include system-local-login -session required pam_selinux.so close -session required pam_loginuid.so -session required pam_selinux.so open -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session include fingerprint-auth -session include postlogin +password required pam_deny.so + +session include system-local-login 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/kservice5/APKBUILD b/community/kservice5/APKBUILD index 6582c8009fd..6d3fc94e8cf 100644 --- a/community/kservice5/APKBUILD +++ b/community/kservice5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kservice5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Advanced plugin and service introspection" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -65,5 +65,5 @@ package() { } sha512sums=" -c7a88ee7e36b4f8d8c19259c72402ac573ab3d3e7e536d039d6501c255aa501bc756143f6aee07bfe792c908b802d35c76eae032d95a20e5272770dba64d55d1 kservice-5.115.0.tar.xz +daadc5d0bfa2dbfc6ae0c6535f407851d1adc67529d2262d92c2e8dff8a45aa701790d8aa2e6d97d9c433409ffee4767214523f992937e244b02fb27d62ffea8 kservice-5.116.0.tar.xz " diff --git a/community/ksirk/APKBUILD b/community/ksirk/APKBUILD index e11d9a1c7e2..04dd5e8e5da 100644 --- a/community/ksirk/APKBUILD +++ b/community/ksirk/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=ksirk -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A computerised version of the well known strategic board game Risk" # armhf blocked by extra-cmake-modules @@ -51,5 +51,5 @@ package() { } sha512sums=" -be54f4d54391c7828d872bc41e30c5ea83f5cb51011904e8c7783fd7869972358ae58ebf308cc9b6b71cfc6ed3a47b1f8321d67f632d1a04a45ea65520f6be63 ksirk-24.02.2.tar.xz +adb4bc2e524f345810f5f2ae4cae2497ae10ca19a8b83789443dad78d2f4bf952772e471d697fc8b654aa40a0b44c1109fd39e19becc4a80158695da1ec2f575 ksirk-24.05.0.tar.xz " diff --git a/community/ksmtp/APKBUILD b/community/ksmtp/APKBUILD index 5a2e2213355..a1b3c164eb0 100644 --- a/community/ksmtp/APKBUILD +++ b/community/ksmtp/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=ksmtp -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Job-based library to send email through an SMTP server" # armhf blocked by extra-cmake-modules @@ -48,5 +48,5 @@ package() { } sha512sums=" -6d81edae32ed912badb6886da44013437f8d307898e6ab9feaa2c0426ce1e3bc69c089f30bc341cac231f191bf484ab1184511fb0c95c79b706af0800b0b5258 ksmtp-24.02.2.tar.xz +2f7437f037364035cc7021603163bb7ff8d4a0fe60d1a5812fdc64a8eee10295e3e102d7babef68a217d0b5900085c920efb8ee9fdb1a3ecc455c8a191dd4bd4 ksmtp-24.05.0.tar.xz " diff --git a/community/ksshaskpass/APKBUILD b/community/ksshaskpass/APKBUILD index ff24dd44e65..21112eb464f 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="ssh-add helper that uses kwallet and kpassworddialog" # armhf blocked by qt6-qtdeclarative @@ -47,5 +47,5 @@ package() { } sha512sums=" -a0dc562f0fa7cb8cc17e84745b29f82e96828e8a093e5b2a89a13924685649ecd62b41d937a3a39c9a9309db90ee427c5b4bea94a2b79e564d065d13e4ebe6b4 ksshaskpass-6.0.4.tar.xz +78501f93534a95fc03005ce1e84a0ebb67ffacd6c16af84b18ed0fd1a98ec72783423c66fb79ae788ecd2ce1e1b68a401fc62b2c202f042ce5603e7ce712b641 ksshaskpass-6.0.5.tar.xz " diff --git a/community/kstart/APKBUILD b/community/kstart/APKBUILD index cf14935f227..054c6298ae9 100644 --- a/community/kstart/APKBUILD +++ b/community/kstart/APKBUILD @@ -11,6 +11,11 @@ makedepends="krb5-dev perl" subpackages="$pkgname-doc" source="https://archives.eyrie.org/software/kerberos/kstart-$pkgver.tar.gz" +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ 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/ksystemlog/APKBUILD b/community/ksystemlog/APKBUILD index 06d4c7bded4..aa04f7eb42a 100644 --- a/community/ksystemlog/APKBUILD +++ b/community/ksystemlog/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=ksystemlog -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -52,5 +52,5 @@ package() { } sha512sums=" -f6aaf1ac7149ed141718132fa0c5971b230d07aceadc0eb20fb2ae4d2327ed0ec92431aabf1c85a6e42090cc420f268d6858fe642adf0d069cb43530263eb1e3 ksystemlog-24.02.2.tar.xz +acb2f5cae806ed2a682795824e4bf9ad51a9818c19f4ca9408ce0e26e3eae0fec3a95d61ee0dd184d01b7ceaf23f7baf132a18f17c1f4465a9d3986babf29d75 ksystemlog-24.05.0.tar.xz " diff --git a/community/ksystemstats/APKBUILD b/community/ksystemstats/APKBUILD index c6842754006..d2d6e74c307 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="A plugin based system monitoring daemon" # armhf blocked by extra-cmake-modules @@ -54,5 +54,5 @@ package() { } sha512sums=" -b8487f6e7dc989b5c7546d36734b6fbf1dd9a8aa8949ad0f8261eabcb78349cdb1372f6aa284a9dfd0aeaba4c183146fd3caca15e72dae32a143f417bf6ff470 ksystemstats-6.0.4.tar.xz +764a0700cae0061a96f6a35915c2cda2f044aa54d41088d17a51d256f601c1aa7abce721bd1828f0a9e9aa99f2313e7e534cc6b4dfc5e2607fae4956b2b0d3c8 ksystemstats-6.0.5.tar.xz " diff --git a/community/kteatime/APKBUILD b/community/kteatime/APKBUILD index 04067a91d4c..9f2f31d6cd9 100644 --- a/community/kteatime/APKBUILD +++ b/community/kteatime/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kteatime -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 arch="all !armhf" url="https://kde.org/applications/utilities/org.kde.kteatime" @@ -44,5 +44,5 @@ package() { } sha512sums=" -35b47e2c0081c093c0c15bef2a1d3b591d110e452a961776b76cff10fa53ec3a8b0826a5c6d168e5869e9e867864c3a50884031e90e586ff04a9e7731e4d0b2b kteatime-24.02.2.tar.xz +ba6df78b758587efbb0a9c937f232e769e0fe7fba85e9f8874e85e9c33144a7ff5ff611f23b6b14203cdfed4408bc19e4384d4af2b685ea78db2ea4b3ccb4934 kteatime-24.05.0.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/ktexteditor5/APKBUILD b/community/ktexteditor5/APKBUILD index 2419ee388b2..230fe6d5787 100644 --- a/community/ktexteditor5/APKBUILD +++ b/community/ktexteditor5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=ktexteditor5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Advanced embeddable text editor" # armhf blocked by extra-cmake-modules @@ -56,5 +56,5 @@ package() { } sha512sums=" -ce30c8e43d453e02c8f2f36087d145bf29e6f7740340868ce6740670856bb3c5dc10e310934facfcdbeef447a54d11faa96f1ff08b0173283c25f604760607a8 ktexteditor-5.115.0.tar.xz +9d17558e4f7adc5de1dec0af9ba32b2eb086def576dd32d3458b91d9f0424aa86505a57ab092a71f5274197bfd18927b7ccddf221551cd42d2a96f22394495e0 ktexteditor-5.116.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/ktextwidgets5/APKBUILD b/community/ktextwidgets5/APKBUILD index 06dd5bff4b5..31229da3a1f 100644 --- a/community/ktextwidgets5/APKBUILD +++ b/community/ktextwidgets5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=ktextwidgets5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Advanced text editing widgets" # armhf blocked by extra-cmake-modules @@ -54,5 +54,5 @@ package() { } sha512sums=" -ed6091a72b1e2e242652a9dc47a17651a02be642faa96155fe4d602e6b1ed6ea3cb48a5922eece146bb38a570e20fafd550ba4dab161b5eec60f57e980027977 ktextwidgets-5.115.0.tar.xz +0534a06529e681da51aac627869de8587e3002a5ad3b460725924454ef66a69cb4b72a8b455aa4bf06b50cf0623f54ba6ba267485e2317659dc5ada295092b4c ktextwidgets-5.116.0.tar.xz " diff --git a/community/ktimer/APKBUILD b/community/ktimer/APKBUILD index 706f299ec55..c974325be98 100644 --- a/community/ktimer/APKBUILD +++ b/community/ktimer/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=ktimer -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A little tool to execute programs after some time" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { } sha512sums=" -0f68b6b12f3db428f1349f7d9ede8d1f77d5b1ff8fe3a575c211b235a05d33c5ddde2f4e9e520b13eac5778a8125e65b32d2188dfcb600f5f0341b67d669fc35 ktimer-24.02.2.tar.xz +d696a140a0d13f121af9d9d03ab84386ba0fc91d9efe65a37e0a0ba17dd434384b813f3928ef208f341d3beb9f948f2aa257f1b8db3c4d02f367a00eef23b1ec ktimer-24.05.0.tar.xz " diff --git a/community/ktnef/APKBUILD b/community/ktnef/APKBUILD index 34116ae14f4..fa4b2ea98e9 100644 --- a/community/ktnef/APKBUILD +++ b/community/ktnef/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=ktnef -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="API for handling TNEF data" # armhf blocked by extra-cmake-modules @@ -42,5 +42,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -197df8b4ba2e0cc4c165b91931f0e01b639a898a956815208181a0d175dea59f984b420c06884a122e22ac829ad0fcca8650756489a81ff0b46cc7ebd5ad9f29 ktnef-24.02.2.tar.xz +bfe0b07efc544a99241715bd5cb547b01d522b3f4cbf27549c5afafab1e42f04d0351f9d7a3f7b552563a463d26e5aafe829a81cadfdf206488319c4daa6ae98 ktnef-24.05.0.tar.xz " diff --git a/community/ktorrent/APKBUILD b/community/ktorrent/APKBUILD index 45430bf4198..c42580b5588 100644 --- a/community/ktorrent/APKBUILD +++ b/community/ktorrent/APKBUILD @@ -4,11 +4,11 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=ktorrent -pkgver=24.02.2 -pkgrel=1 +pkgver=24.05.0 +pkgrel=0 # 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" @@ -75,5 +75,5 @@ package() { } sha512sums=" -d623cad02bf524795c514a859360e29a6608299a7327d43ba2e07f0520bd487c24c94f1aa17d5193454fb8b18059b79c27fa88e867f249e204b83f2c08f6e9a0 ktorrent-24.02.2.tar.xz +8b9782cdb21ae08f63724026a155797ed2a1a68682560bd23da2044232628d63e48e6c59f072e69cd1519951434daa75ee9d741bff54752f17861b26beefbe6e ktorrent-24.05.0.tar.xz " diff --git a/community/ktouch/APKBUILD b/community/ktouch/APKBUILD index 1cd75109ff4..8757bf56260 100644 --- a/community/ktouch/APKBUILD +++ b/community/ktouch/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=ktouch -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by qt5-qtdeclarative arch="all !armhf" @@ -57,5 +57,5 @@ package() { } sha512sums=" -3adedfde86dabfc6cd9acaeeb3bd4255f8ab0ec5d32d02f6175ff475ef79d2bed65783b795466f097550a66b3de7361aaab3f3ea3ac2a4be8e317de542b0ba76 ktouch-24.02.2.tar.xz +63dabd289eaf66ce962f101a97599d3bb2aef0cee0b95be614b2ede72e8c9ecbb3bbe04096f2a3cb1e8aa4013b0c9791b394409403af32460bdd0b23fd840661 ktouch-24.05.0.tar.xz " diff --git a/community/ktrip/APKBUILD b/community/ktrip/APKBUILD index fc5b9226efa..2924e0bbd7e 100644 --- a/community/ktrip/APKBUILD +++ b/community/ktrip/APKBUILD @@ -3,7 +3,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=ktrip -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A public transport assistant" # armhf blocked by extra-cmake-modules @@ -51,5 +51,5 @@ package() { } sha512sums=" -ecc12607c7bf0c055535a9193cc67f69f14c8b56f8d5f485268b97b2385c1428e1289fb1eb624069cfa97ece5db63352dd36b249c33b592aa7fb06136c6879d3 ktrip-24.02.2.tar.xz +c5d3ecf92723899d9ccee60176268ce95b636bb5462b52baada2cebfe759f03b053052af9756863aff160a00379c385ffe916d9d874fb1f64fe7f277549d8606 ktrip-24.05.0.tar.xz " diff --git a/community/kturtle/APKBUILD b/community/kturtle/APKBUILD index 87a3b89a047..9ebe8e48da6 100644 --- a/community/kturtle/APKBUILD +++ b/community/kturtle/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kturtle -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -45,5 +45,5 @@ package() { } sha512sums=" -d3dae8ef23cd299361bc54b71f31208cd1d7d2067f2acaf624422c9e14b009711d63dd10c9a975575b7d0d848fb45a7850aebed136b7861899aa22798f26d191 kturtle-24.02.2.tar.xz +976f36c2d298cab29de88e1e8258eadf3e6675e9a17e3dcb522ae1928165fd1b030fb5fd7d1f27ddc48de2cb2a286e7ea2e486a507aa912e908b90cda9d484b4 kturtle-24.05.0.tar.xz " diff --git a/community/kubectx/APKBUILD b/community/kubectx/APKBUILD index 9808d1a7076..b93a05efdb3 100644 --- a/community/kubectx/APKBUILD +++ b/community/kubectx/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=kubectx pkgver=0.9.5 -pkgrel=5 +pkgrel=6 pkgdesc="Faster way to switch between clusters and namespaces in kubectl" url="https://kubectx.dev/" license="Apache-2.0" diff --git a/community/kubernetes/APKBUILD b/community/kubernetes/APKBUILD index 1b0bf0d9eb1..7ac94ffa6bc 100644 --- a/community/kubernetes/APKBUILD +++ b/community/kubernetes/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Dave <dj.2dixx@gmail.com> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=kubernetes -pkgver=1.29.3 +pkgver=1.30.0 pkgrel=1 pkgdesc="Container Cluster Manager" url="https://kubernetes.io/" @@ -213,7 +213,7 @@ _do_zshcomp() { } sha512sums=" -853b7d38c850780a5e39fcb817012b35eea91b62d055f6611aba8f14cd7f6c176a047dc7e79ecc11d3bd7815f3ececb26b8e5d419124c03c4aecf6f0670ca603 kubernetes-1.29.3.tar.gz +f0b0dba3281f16c6528a58ce4ae4262164b621e402df52f8c9069b8f8a03a8856ae2851533298761344518ecdccd35478f346f3a18564641c3d5b104b29046fb kubernetes-1.30.0.tar.gz 5427c2e653504cfd5b0bcaf195d4734ee40947ddfebc9f155cd96dddccfc27692c29d94af4ac99f1018925b52995c593b584c5d7a82df2f185ebce1a9e463c40 make-e2e_node-run-over-distro-bins.patch 94d07edfe7ca52b12e85dd9e29f4c9edcd144abc8d120fb71e2a0507f064afd4bac5dde30da7673a35bdd842b79a4770a03a1f3946bfae361c01dd4dc4903c64 make-test-cmd-run-over-hyperkube-based-kubectl.patch e690daff2adb1013c92124f32e71f8ed9a18c611ae6ae5fcb5ce9674768dbf9d911a05d7e4028488cda886e63b82e8ac0606d14389a05844c1b5538a33dd09d1 kube-apiserver.initd diff --git a/community/kubo/APKBUILD b/community/kubo/APKBUILD index 700de782dba..d2a468c78a3 100644 --- a/community/kubo/APKBUILD +++ b/community/kubo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=kubo pkgver=0.28.0 -pkgrel=0 +pkgrel=1 _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/" 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/kup/APKBUILD b/community/kup/APKBUILD index ab356887e98..098b879e7bd 100644 --- a/community/kup/APKBUILD +++ b/community/kup/APKBUILD @@ -1,8 +1,11 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> -# Maintainer: 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=kup -pkgver=0.9.1 -pkgrel=7 +pkgver=0.10.0 +pkgrel=0 pkgdesc="KDE bup backup software for helping people to keep up-to-date backups" # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -11,22 +14,23 @@ license="GPL-2.0-only" depends="rsync" makedepends=" extra-cmake-modules - kconfig5-dev - kcoreaddons5-dev - kdbusaddons5-dev - ki18n5-dev - kidletime5-dev - kinit5-dev - kio5-dev - kjobwidgets5-dev - knotifications5-dev - kwidgetsaddons5-dev + kconfig-dev + kcoreaddons-dev + kdbusaddons-dev + ki18n-dev + kidletime-dev + kio-dev + kjobwidgets-dev + knotifications-dev + kwidgetsaddons-dev libgit2-dev - plasma-framework5-dev - qt5-qtbase-dev + libplasma-dev + plasma5support-dev + qt6-qtbase-dev samurai - solid5-dev + solid-dev " +_repo_url="https://invent.kde.org/system/kup.git" source="https://download.kde.org/stable/kup/kup-$pkgver.tar.xz 0001-fix-build.patch " @@ -35,6 +39,7 @@ subpackages="$pkgname-lang" build() { cmake -B build -G Ninja \ + -DBUILD_WITH_QT6=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib @@ -46,6 +51,6 @@ package() { } sha512sums=" -8906c33ce489fb049ce6223180693e1f5fa97762ff0a45eb68dbd8bad0b816b7ef500f13f1299a4ae75785a48825fc442b39fc0af1a5ef64b5f854d9fac9cc33 kup-0.9.1.tar.xz +3ee5241b4e918488cd4e6d2d54474bafa23749c9bf7132639ca3683ec0723eabb0626df7233f898f97bc0403fca36c7431386b37e1e3d4389d4ef614f5c916c9 kup-0.10.0.tar.xz 945b4651d3a5b06d7b0e1296f57043251dbf2bebe2d4c02dac8b16024221c565e34158ffa0d459370ade4a247eb211dd20c5ec5ec3b21a922fa0136377bfdda2 0001-fix-build.patch " 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/kustomize/APKBUILD b/community/kustomize/APKBUILD index e828b6dc107..fdd89d802a3 100644 --- a/community/kustomize/APKBUILD +++ b/community/kustomize/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=kustomize pkgver=5.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="Template-free customization of Kubernetes YAML manifests" url="https://kustomize.io/" license="Apache-2.0" diff --git a/community/kvantum/APKBUILD b/community/kvantum/APKBUILD index f967c1bb4a6..9589e4edcef 100644 --- a/community/kvantum/APKBUILD +++ b/community/kvantum/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: knuxify <knuxify@gmail.com> pkgname=kvantum -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=0 pkgdesc="SVG-based theme engine for Qt" options="!check" # No testsuite @@ -92,5 +92,5 @@ themes() { } sha512sums=" -dc6bc3cb44d3a050a7e43196f7c0ab69d5f33c5fa645cdf191631164384aed8d8130093a4da4367b061c33d0d844dc57f91352d96a9368dd9abd6694a404d7f6 kvantum-1.1.0.tar.gz +c56b23999035c09f1a890e64c0ea965e2183f326db7fc52b24856425786122cbc4d1bd7ed5f4627576fc31bd627ddc64fed34f51ffe1fb31513b45548286f186 kvantum-1.1.1.tar.gz " diff --git a/community/kwallet-pam/APKBUILD b/community/kwallet-pam/APKBUILD index 384288f28b5..838161959e5 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="KWallet PAM integration" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { } sha512sums=" -af186165fe2e2ada5e1dd8359b41980af36e18b5266048fd3dbeeb4e2815ec158a1d1079d0c25ea427dc4c43414bf985c8eea828eafe54d9c58bc4b3c59255c6 kwallet-pam-6.0.4.tar.xz +c20f626e8572f34e1c8065b464984a9616ad8270bdb003587272d25c05ad9d746b68d624994117ac6df6cb7c7f3381624a171e30033ddceda99abf818460b060 kwallet-pam-6.0.5.tar.xz " diff --git a/community/kwallet/APKBUILD b/community/kwallet/APKBUILD index c9b307861d7..aa968ada59f 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.1 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 +9a40246df384d090ad2c72d01cf10b585897adcb148aa836876839a8268d160602eec5cf20cd77ef7bb8532ad7bef396573ae73a664b209916825f07e1eef867 kwallet-6.2.1.tar.xz " diff --git a/community/kwallet5/APKBUILD b/community/kwallet5/APKBUILD index c60822a6e43..2a3cce350e9 100644 --- a/community/kwallet5/APKBUILD +++ b/community/kwallet5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kwallet5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Secure and unified container for user passwords" # armhf blocked by extra-cmake-modules @@ -69,5 +69,5 @@ bin() { } sha512sums=" -8870af27ab6dfe5a7f9c60a8199b917e3f0ad81e48524c5ea383c39d6e3ca6a2fbe7bbce9b645a190c33a58bc7e63347e1737b6f55783fefa2a46bf7bab598fe kwallet-5.115.0.tar.xz +fc96b2e87e565dadb960159c5412cc0862454331824510405f434dfda2146ecf4e2ca133345c0c46608143da10265f154a0225f4d8d82ae6f11a184b222d663d kwallet-5.116.0.tar.xz " diff --git a/community/kwalletmanager/APKBUILD b/community/kwalletmanager/APKBUILD index e5cd4275dba..48dfe70567f 100644 --- a/community/kwalletmanager/APKBUILD +++ b/community/kwalletmanager/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kwalletmanager -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -58,5 +58,5 @@ package() { } sha512sums=" -967db908d66737686cd73d926e655e9ecb4474b798266bc8a25dda8c201f63068cd28cdb487e7e4de4f76f89b5c2732e11b9285a1d2205fa78c3d27c7dc9bd08 kwalletmanager-24.02.2.tar.xz +c9230b116713d025f8eaeec63d32f845982a0a158deac6ada309c56ca6f000afaf3f29cf6c833970275a22464de139093da4e43568d1cc3479a44ba32acca831 kwalletmanager-24.05.0.tar.xz " diff --git a/community/kwave/APKBUILD b/community/kwave/APKBUILD index d68956d68e1..6f577afc003 100644 --- a/community/kwave/APKBUILD +++ b/community/kwave/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kwave -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -65,5 +65,5 @@ package() { } sha512sums=" -e5c13588cbc8eee53b3825ddfcd7d1fa506e29613dba025ab7b13f7d328db2618eb2996a90715b0177a3c9a625bf97fd06a3b81ffc383352f1fc12691872991d kwave-24.02.2.tar.xz +6f112c0bcec6e5fc4e74fc684dabb6ab33822644e4a7e737e6936ad67fd663f0cf2c9ba64d6145167c3ba537d5c80fc0ee33eb7384637ace2149c7ecbb02c01b kwave-24.05.0.tar.xz " diff --git a/community/kwayland-integration/APKBUILD b/community/kwayland-integration/APKBUILD index 3a8f29b35d8..70e84903474 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="KWayland integration" url="https://kde.org/plasma-desktop/" @@ -43,5 +43,5 @@ package() { } sha512sums=" -2fac1bf44212a0c70f89625bdf7169551e26d252299e740a3c0ee4c87a3172ed69549856c7cc0f2cb27b09c5b72fe4de14a186e2d513436708d839e95503157a kwayland-integration-6.0.4.tar.xz +394043d5efaa8b3f417145918f2fe297478ebcf3cc4fd44f1993ffb9e713df7ece7a69dffd2fb51925e301ba751dd08ea12d2fabe9e8d2af0b3cd40c5bceba7f kwayland-integration-6.0.5.tar.xz " diff --git a/community/kwayland/APKBUILD b/community/kwayland/APKBUILD index 4bc0ec12fbc..d9d4b93a385 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.4 +pkgver=6.0.5 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=" -12db8acbd24716ee3321d2e8b47315dfa645dc447224eba7db80095d9f5eb41d61f7d3d8422f38a6d066313d0cc6994085b4bc9bb974e427b574a1aafd20a653 kwayland-6.0.4.tar.xz +85007a154b223bf87d5b66f00671d8a011125145797e19d60631e0f3d7c95d301bd0004180b9cfaa2fa6790c4057f68b614462870703076e1dcccc09bbc3a84b kwayland-6.0.5.tar.xz " diff --git a/community/kwayland5/APKBUILD b/community/kwayland5/APKBUILD index bc8d487e2ce..414610476d5 100644 --- a/community/kwayland5/APKBUILD +++ b/community/kwayland5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kwayland5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Qt-style Client and Server library wrapper for the Wayland libraries" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -49,5 +49,5 @@ package() { } sha512sums=" -d4279353a7179001f19bd6962595c321161ec5f5fa24518af4326b21dab56caeed5a86cc82c5335cd8288c0b348feccfb59ec8e3ee0ec0f418972c29d48832ec kwayland-5.115.0.tar.xz +48b24c88872a21d237274868fea601120fb9700f888ab0a7531651dc6501db8559af3a70b6131d89d31010e1f32013222d42e9d1244ae91bf9972588494957a9 kwayland-5.116.0.tar.xz " diff --git a/community/kweather/APKBUILD b/community/kweather/APKBUILD index a0a4f4bdc3c..a28ca70c8c1 100644 --- a/community/kweather/APKBUILD +++ b/community/kweather/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kweather -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Weather application for Plasma Mobile" url="https://invent.kde.org/plasma-mobile/kweather" @@ -53,5 +53,5 @@ package() { } sha512sums=" -d0207acf1b16009ffeb2f12391337988e9a09e12ee37e4ff23b86eec5caeace3fa1a710b99a428da87c31c96c056ea1eb1454e47fb95fe9e9cfc9cbd79b61bb9 kweather-24.02.2.tar.xz +4f86c2abf128843bbe6e9d0bd9a0e2dd9953c3da37998fc3e5dbd4f506721b20fdb4ba8f590985a423f65ed6adad49d8949fa9f7aa4983865d15a0d5ba79a6ea kweather-24.05.0.tar.xz " diff --git a/community/kwidgetsaddons/APKBUILD b/community/kwidgetsaddons/APKBUILD index 4dccdea25e6..2b6cca0e5b4 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.2 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 +73d0dabbf058ac07322fadda79ec1e2f167dc0aa1d869540b6981ff359e41656996b5b9f31f0c2daf1b88da2cf9801b6203a378f8e0efea93f8ef07187198275 kwidgetsaddons-6.2.2.tar.xz " diff --git a/community/kwidgetsaddons5/APKBUILD b/community/kwidgetsaddons5/APKBUILD index f0903e7f9f8..ea91bf1f09d 100644 --- a/community/kwidgetsaddons5/APKBUILD +++ b/community/kwidgetsaddons5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kwidgetsaddons5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Addons to QtWidgets" # armhf blocked by extra-cmake-modules @@ -48,5 +48,5 @@ package() { } sha512sums=" -fba4e669f6747f5823d45e80e5afa9f5057366bd964156cc2505a4ffcbd4a834144bb2a3fa717f3e7b9805991649d6108bd0cfbea2ea4e77d924bbe8b8dfee9c kwidgetsaddons-5.115.0.tar.xz +34d74d9a4c1ce57e1f9306b442fe44975c9d1e7bd9d5d2461750e017331c2746a07d173b769636eb4143e05b4138fd823ab233618742f2599051036b8c5955bc kwidgetsaddons-5.116.0.tar.xz " diff --git a/community/kwin/APKBUILD b/community/kwin/APKBUILD index 6a894c70953..d3920de63db 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.4.1 +pkgver=6.0.5 pkgrel=0 pkgdesc="An easy to use, but flexible, composited Window Manager" # armhf blocked by qt6-qtdeclarative @@ -87,7 +87,7 @@ case "$pkgver" in 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 +source="https://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz 0001-kwin-Fix-building-of-tests.patch " # Broken, fails to setup due to missing or invalid XDG_RUNTIME_DIR? @@ -121,6 +121,6 @@ package() { } sha512sums=" -a38605dea13a225220544b77f835bff5bb191861ad34dd5ea6de06069921bc6db1f2683cb361d421ab3f7a82c58d2ff914512074a17e8e554bac3e5303f19ab5 kwin-6.0.4.1.tar.xz +ae4004f846f663339e44f88cad9ffc3decde2f6efb1fd50212a86a8b78138f91b0ba7d510b9508e4ccd274a9a6116fb171d8baded62573e3ddf3aedff718f757 kwin-6.0.5.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/kwindowsystem5/APKBUILD b/community/kwindowsystem5/APKBUILD index 578bdb9e72b..8807e89a606 100644 --- a/community/kwindowsystem5/APKBUILD +++ b/community/kwindowsystem5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=kwindowsystem5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Access to the windowing system" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -65,5 +65,5 @@ package() { } sha512sums=" -37380c8a523220cece2b9867e9801b79b848c55b0808fa472834050bbbd23ecd18db48d3ef3a17fcf8cf9ee6dbf8a5988a5c562c29c876065a3fda96913f78c7 kwindowsystem-5.115.0.tar.xz +1b8d45ee0a09161b45f62e6ba4f200f3c2ad937c20eedc03bf65c3a788a5311727ec2a1634db9e1b1208b8ecbe4158273d11c97924a86059a06d3a24d1201157 kwindowsystem-5.116.0.tar.xz " diff --git a/community/kwordquiz/APKBUILD b/community/kwordquiz/APKBUILD index f1796dee284..778674d4271 100644 --- a/community/kwordquiz/APKBUILD +++ b/community/kwordquiz/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=kwordquiz -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -55,5 +55,5 @@ package() { } sha512sums=" -25ca5e332830da3a2922685821bf2e1d545838ca26b0b32e3da1c0974357946902b1439c9161434437fd7eb00e656e73f13aa4ad4396afc1f581f7c9c2887f7a kwordquiz-24.02.2.tar.xz +25b997aa1d4bbf160e0519ac8c34af41e43bcd88688aee3311e1dcc8204b7bd9f4175be859aed672e7170541f55ad9c815b92ed903cdd6a6a6bb6f48c5ca95be kwordquiz-24.05.0.tar.xz " diff --git a/community/kwrited/APKBUILD b/community/kwrited/APKBUILD index eae4cea58ec..07c9b29e1eb 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.4 +pkgver=6.0.5 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=" -6a6b178b3bfa9c3bcbb59caac35e78119d78d522494eb3f4af20d1a50288797b292689c7de7ece1c895f526b800e989b54d9a7ea815aa77d22a642f82419a633 kwrited-6.0.4.tar.xz +06410c11e7ba0d0490febeb0e1281becd124ed40b93895f147f8500be6764d0a79fced020ae99c0af71a53ba56c97e97719fdc99ce51da9c3c5a82d6a92369ce kwrited-6.0.5.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..6c7078de19d 100644 --- a/community/kxmlgui5/APKBUILD +++ b/community/kxmlgui5/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 +# group=kde-frameworks-old pkgname=kxmlgui5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="User configurable main windows" # armhf blocked by extra-cmake-modules @@ -60,5 +60,5 @@ package() { } sha512sums=" -4e06d72f509701d969eb77e608bd5a703a80fcd18d4d42a70d26b01b6889ca41b573b8be0a06b98b799e2dc62ff5d0111577e76f363c6f4c3d24828339274236 kxmlgui-5.115.0.tar.xz +e3a205f8eb0dc28869530e73e02ab090c55a5e1a54e3747b2271e34d211e2fb81fc61d07a44fc9ff3b41d37720e2861e4bff04d06419e5813ee526c02681bbef kxmlgui-5.116.0.tar.xz " diff --git a/community/lab/APKBUILD b/community/lab/APKBUILD index 666edd6b698..88f641b2172 100644 --- a/community/lab/APKBUILD +++ b/community/lab/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> pkgname=lab pkgver=0.25.1 -pkgrel=18 +pkgrel=19 pkgdesc="Git Wrapper for GitLab" url="https://zaquestion.github.io/lab/" arch="all" @@ -15,7 +15,9 @@ subpackages=" $pkgname-zsh-completion $pkgname-fish-completion " -source="lab-$pkgver.tar.gz::https://github.com/zaquestion/lab/archive/v$pkgver.tar.gz" +source="lab-$pkgver.tar.gz::https://github.com/zaquestion/lab/archive/v$pkgver.tar.gz + update-go-mod.patch + " options="net !check chmod-clean" # Tests require configured GitLab account with SSH keys export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" @@ -42,4 +44,5 @@ package() { sha512sums=" 891605f0572c9deff27b5583782b59361fd99a2559f9ac84a77f9a9d323ba54b97ac79bfed4ea63e8a421e38a63b3ea713a67c42ecd45ca895d29b2f826e8859 lab-0.25.1.tar.gz +0fe48eab9285fd36f04cda639f2c81e0242778ba0d9e47563510140968d93e412e208af99ea54b0dcb3df9d72d15443a3bdd266acadeb84925910d10048b4339 update-go-mod.patch " diff --git a/community/lab/update-go-mod.patch b/community/lab/update-go-mod.patch new file mode 100644 index 00000000000..1b59f8b8edf --- /dev/null +++ b/community/lab/update-go-mod.patch @@ -0,0 +1,64 @@ +diff --git a/go.mod b/go.mod +index a62b9e7..019fe3a 100644 +--- a/go.mod ++++ b/go.mod +@@ -65,11 +65,11 @@ require ( + github.com/whilp/git-urls v1.0.0 + github.com/yuin/goldmark v1.4.1 // indirect + github.com/yuin/goldmark-emoji v1.0.1 // indirect +- golang.org/x/net v0.0.0-20210917221730-978cfadd31cf // indirect ++ golang.org/x/net v0.1.0 // indirect + golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect +- golang.org/x/sys v0.0.0-20210923061019-b8560ed6a9b7 // indirect +- golang.org/x/term v0.0.0-20210916214954-140adaaadfaf // indirect +- golang.org/x/text v0.3.7 // indirect ++ golang.org/x/sys v0.1.0 // indirect ++ golang.org/x/term v0.1.0 // indirect ++ golang.org/x/text v0.4.0 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.27.1 // indirect +diff --git a/go.sum b/go.sum +index dbf5b1e..7eaac1c 100644 +--- a/go.sum ++++ b/go.sum +@@ -504,8 +504,8 @@ golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96b + golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= + golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= + golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +-golang.org/x/net v0.0.0-20210917221730-978cfadd31cf h1:R150MpwJIv1MpS0N/pc+NhTM8ajzvlmxlY5OYsrevXQ= +-golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= ++golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= ++golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= + golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= + golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= + golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +@@ -594,13 +594,13 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc + golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.0.0-20210923061019-b8560ed6a9b7 h1:c20P3CcPbopVp2f7099WLOqSNKURf30Z0uq66HpijZY= +-golang.org/x/sys v0.0.0-20210923061019-b8560ed6a9b7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= ++golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= + golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= + golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +-golang.org/x/term v0.0.0-20210916214954-140adaaadfaf h1:Ihq/mm/suC88gF8WFcVwk+OV6Tq+wyA1O0E5UEvDglI= +-golang.org/x/term v0.0.0-20210916214954-140adaaadfaf/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= ++golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= ++golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= + 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= +@@ -609,8 +609,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= + golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= + golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= + golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= ++golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= ++golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= + golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= + golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= + golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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/layer-shell-qt/APKBUILD b/community/layer-shell-qt/APKBUILD index f8c4cbbb1ea..2aa9a249e0e 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.4 +pkgver=6.0.5 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=" -0eaa28103023c63d9df2c1d9ebd221c2ac1a0198f45923cfd521a3107eaf9498b9d6c0b3a98e15fa2aec229de92b1aa2760c6a35a813511d2b7befe22a73f51f layer-shell-qt-6.0.4.tar.xz +8da7612be743e9445b492c3e9b19f62e8112a419d9686138aa9dc009b3ec02ac180c156f5bbe74bc71fc13453a00f7bbaf7caa0818985898463eb0d2d218d397 layer-shell-qt-6.0.5.tar.xz " diff --git a/community/lazydocker/APKBUILD b/community/lazydocker/APKBUILD index 7f8148fb917..d3184b36092 100644 --- a/community/lazydocker/APKBUILD +++ b/community/lazydocker/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Thomas Deutsch <thomas@tuxpeople.org> # Maintainer: Thomas Deutsch <thomas@tuxpeople.org> pkgname=lazydocker -pkgver=0.23.1 -pkgrel=2 +pkgver=0.23.3 +pkgrel=0 pkgdesc="Simple terminal UI for both docker and docker-compose" url="https://github.com/jesseduffield/lazydocker" arch="all" @@ -28,5 +28,5 @@ package() { } sha512sums=" -10620d2c1fd6d6aaad00648aef4c5812e5e7a1fbc325bd2ec1e4d8a3e032f86d11479f25947b48cadce400659f87da5bf580cafb3ef4b5b33ac352008747094e lazydocker-0.23.1.tar.gz +355a95dfdc1de37f4067e44aa70c8b8bdcfad25cc758940b24cff0148ae2b8cd68c0a9b97f1f43f9a9129bc0a25b8823c76e3510843e5298d6523bf56fbb9690 lazydocker-0.23.3.tar.gz " diff --git a/community/lazygit/APKBUILD b/community/lazygit/APKBUILD index 352b74d7995..f3287fbe50e 100644 --- a/community/lazygit/APKBUILD +++ b/community/lazygit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Deutsch <thomas@tuxpeople.org> pkgname=lazygit pkgver=0.41.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simple terminal UI for git commands" url="https://github.com/jesseduffield/lazygit" arch="all" 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/lego/APKBUILD b/community/lego/APKBUILD index 9eb618d1904..b6a7a8b8071 100644 --- a/community/lego/APKBUILD +++ b/community/lego/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> pkgname=lego pkgver=4.16.1 -pkgrel=1 +pkgrel=2 pkgdesc="Let's Encrypt client and ACME library written in Go" url="https://github.com/go-acme/lego" license="MIT" diff --git a/community/lf/APKBUILD b/community/lf/APKBUILD index 6d0cb6caafe..6298084e8d6 100644 --- a/community/lf/APKBUILD +++ b/community/lf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Miles Alan <m@milesalan.com> pkgname=lf pkgver=32 -pkgrel=0 +pkgrel=1 pkgdesc="Terminal filemanager written in Go with vim-style keybindings" options="chmod-clean net" url="https://github.com/gokcehan/lf" diff --git a/community/lib3mf/APKBUILD b/community/lib3mf/APKBUILD index efe17093c68..442e7b2ccb8 100644 --- a/community/lib3mf/APKBUILD +++ b/community/lib3mf/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 pkgdesc="A C++ implementation of the 3D Manufacturing Format file standard" url="https://github.com/3MFConsortium/lib3mf" # "Generating hourglass API bindings and implementation stub" fail on ARM, s390x, and ppc64le -arch="all !armv7 !armhf !aarch64 !s390x !ppc64le" +arch="all !armv7 !armhf !aarch64 !s390x !ppc64le !loongarch64" license="BSD-2-Clause" subpackages="$pkgname-dev" makedepends=" diff --git a/community/libass/APKBUILD b/community/libass/APKBUILD index 160d7e3ca0e..7dcac831d12 100644 --- a/community/libass/APKBUILD +++ b/community/libass/APKBUILD @@ -4,8 +4,8 @@ # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libass -pkgver=0.17.1 -pkgrel=2 +pkgver=0.17.2 +pkgrel=0 pkgdesc="Portable library for SSA/ASS subtitle rendering" url="https://github.com/libass/libass" arch="all" @@ -50,5 +50,5 @@ package() { } sha512sums=" -437b4b60db2626e48f438b5138ab4dbf2c2ab4c8f0b587a6e554510c6719544ef2235c601ff1e482d020410f9bab95ad1a9b176d19a3bd54880499a576b41f23 libass-0.17.1.tar.xz +adb868d1adc6bc661bb2ba701fc775f2db698e3eb933d6c98e7969c1c039fdbae01ef35ceda002c9bac3614bc60eba73d09c03f1764edafa32d036891cc10341 libass-0.17.2.tar.xz " diff --git a/community/libcamera/APKBUILD b/community/libcamera/APKBUILD index 443b423c565..f13e4d9adab 100644 --- a/community/libcamera/APKBUILD +++ b/community/libcamera/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Luca Weiss <luca@z3ntu.xyz> # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=libcamera -pkgver=0.2.0 +pkgver=0.3.0 pkgrel=0 pkgdesc="Linux camera framework" url="https://libcamera.org/" @@ -40,10 +40,11 @@ subpackages=" $pkgname-v4l2 $pkgname-tools " -source="$pkgname-$pkgver.tar.gz::https://github.com/libcamera-org/libcamera/archive/refs/tags/v$pkgver.tar.gz +source="https://gitlab.freedesktop.org/camera/libcamera/-/archive/v$pkgver/libcamera-v$pkgver.tar.gz 0001-qcam-Decrease-minimum-width-of-selector-dialog.patch qcam.desktop " +builddir="$srcdir/$pkgname-v$pkgver" # gstreamer tests fail # manual strip because ipa .sign files depend on the file contents- have to re-sign after strip options="!strip !check" @@ -55,7 +56,7 @@ arm*|aarch64) esac case "$CARCH" in -ppc64le|s390x|riscv64) +ppc64le|s390x|riscv64|loongarch64) # doesn't install any ipa ;; *) @@ -136,7 +137,7 @@ tools() { } sha512sums=" -f01afcbf615d6c1a7f6c3f2b89043094a737376a3f3cb3f4e4f72f8366acf0bbf099b1f1b1b306c489a43f92eaf723779f0e49bb047c233367a0d69555b74def libcamera-0.2.0.tar.gz +d232593b6cc7f2b772e8cd0b6751fee00ddbde256328c4cf7162726d4766149afca36411075e2b55a8a009d52758f01874ff08b947b508dbe5e3059fa4a92c86 libcamera-v0.3.0.tar.gz 69d6e29d764f752feed453b9c0f61c81cdb506eb14893d0d99d0d6834f369f1e816c2381dfab5ad1a744a3d11211af02d75dc041ecc87c7e4f73e2bd34c666c2 0001-qcam-Decrease-minimum-width-of-selector-dialog.patch 22167a4eceb6d1b40b0b7c45fdf116c71684f5340de7f767535cb8e160ad9d2ae0f00cb3d461f73a344520a48a4641cf46226841d78bee06bfbfd2a91337f754 qcam.desktop " 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/libchewing/APKBUILD b/community/libchewing/APKBUILD index 090a516bb86..ad524fb2040 100644 --- a/community/libchewing/APKBUILD +++ b/community/libchewing/APKBUILD @@ -1,21 +1,42 @@ # Contributor: Luca Weiss <luca@z3ntu.xyz> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=libchewing -pkgver=0.6.0 -pkgrel=1 +pkgver=0.8.3 +pkgrel=0 pkgdesc="Intelligent Chinese phonetic input method" url="https://chewing.im/" arch="all" license="LGPL-2.1-only" -makedepends="cmake samurai sqlite-dev" -subpackages="$pkgname-dev" -source="https://github.com/chewing/libchewing/releases/download/v$pkgver/libchewing-$pkgver.tar.xz" +makedepends=" + cargo + cmake + corrosion + ncurses-dev + samurai + sqlite-dev + zstd + " +subpackages=" + $pkgname-dev + $pkgname-tools + $pkgname-tools-doc:_tools_doc:noarch + " +source="https://github.com/chewing/libchewing/releases/download/v$pkgver/libchewing-$pkgver.tar.zst" + +prepare() { + default_prepare + + cargo fetch --target="$CTARGET" --locked +} build() { + export CFLAGS="$CFLAGS -DHAVE_NCURSES_H" + cmake -B build -G Ninja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=ON \ + -DBUILD_TESTING="$(want_check && echo ON || echo OFF)" \ -DCMAKE_BUILD_TYPE=None cmake --build build } @@ -29,6 +50,20 @@ package() { DESTDIR="$pkgdir" cmake --install build } +tools() { + pkgdesc="$pkgdesc (command line tools)" + + amove usr/bin +} + +_tools_doc() { + pkgdesc="$pkgdesc (man pages for tools)" + install_if="docs $pkgname-tools=$pkgver-r$pkgrel" + + # man pages are already gzipped by cmake + amove usr/share/man/man1 +} + sha512sums=" -9df8587061d0f283d2580d03df73472fa0b545db22f52b73606f5b51f5c23051552d5984b49ad509e5464cb6d2743d6862207dcefffc406bcda44d9e3ae9c057 libchewing-0.6.0.tar.xz +8b50cc6ac7c1ed6a74b707b8e55e8dd6c14e40b1516cfb0cb84b0e6a35bd802ce46722285c98c0818b91ac26735178cf2277b14f130965282e50d24082272db8 libchewing-0.8.3.tar.zst " 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/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/libfilezilla/APKBUILD b/community/libfilezilla/APKBUILD index 4d7239f975c..a6fe8d191f6 100644 --- a/community/libfilezilla/APKBUILD +++ b/community/libfilezilla/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable pkgname=libfilezilla -pkgver=0.46.0 +pkgver=0.47.0 pkgrel=0 pkgdesc="C++ library for filezilla" url="https://filezilla-project.org/" @@ -38,5 +38,5 @@ package() { } sha512sums=" -721186993b9af7087033d9acd03ecd70a6a567cd46ded0d26e141ffccba5aed31d5095f3a1d56397280a6f75ad53460c9acbbb3650881e57dccd6f67ccbbf9ba libfilezilla-0.46.0.tar.xz +28af8aeacc5b6b188613c2afebb23477aa0c6908cd2bfe7dc39ba4b69fa67f2d18a64cdefe52968f429b18545fe03c031363b3aa9ed07b2ecb9faa56b1275282 libfilezilla-0.47.0.tar.xz " diff --git a/community/libfolia/APKBUILD b/community/libfolia/APKBUILD index 431dacfde8d..e2ca743e02b 100644 --- a/community/libfolia/APKBUILD +++ b/community/libfolia/APKBUILD @@ -1,15 +1,15 @@ # Contributors: Maarten van Gompel <proycon@anaproy.nl> # Maintainer: Maarten van Gompel <proycon@anaproy.nl> pkgname=libfolia -pkgver=2.17 -pkgrel=1 +pkgver=2.18 +pkgrel=0 pkgdesc="C++ library for FoLiA (Format for Linguistic Annotation)" options="!check" arch="all" url="https://github.com/LanguageMachines/libfolia" license="GPL-3.0-only" makedepends="libtool libxml2-dev ticcutils-dev icu-dev" -subpackages="$pkgname-dev" +subpackages="$pkgname-dev $pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/LanguageMachines/libfolia/releases/download/v$pkgver/libfolia-$pkgver.tar.gz" build() { @@ -27,5 +27,5 @@ package() { } sha512sums=" -11b8f40ad03191dd1e90d2b7997c2a36fc33d4a6690f817fee8b91c863b42b09e9897a5bfba87f5865f0c6d16f7a3e72bd3af50c6ff74dbf6b8b9429e69993df libfolia-2.17.tar.gz +b6d3e1c6ef106782cdace65fde4b87ea8694609094ba50ace9ff914e4365d7bd953bcfb8bd873d20c047a91c970840cdc118a542760fdbb7177f98588a825869 libfolia-2.18.tar.gz " diff --git a/testing/libfossil/APKBUILD b/community/libfossil/APKBUILD index 642210a3dc3..d24bdfc813a 100644 --- a/testing/libfossil/APKBUILD +++ b/community/libfossil/APKBUILD @@ -8,6 +8,7 @@ pkgdesc="Unofficial Fossil SCM library" url="https://fossil.wanderinghorse.net/r/libfossil" arch="all !ppc64le !riscv64 !s390x" # ftbfs license="BSD-2-Clause" +depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="bash tcl zlib-dev" subpackages="$pkgname-apps $pkgname-dev" source="https://fossil.wanderinghorse.net/r/libfossil/tarball/$_fslhash/libfossil-$_fslhash.tar.gz" @@ -37,6 +38,7 @@ package() { apps() { pkgdesc="$pkgdesc (command-line apps)" + depends="$pkgname=$pkgver-r$pkgrel" amove usr/bin } diff --git a/community/libftdi1/APKBUILD b/community/libftdi1/APKBUILD index 278a929b3b7..976cb56152a 100644 --- a/community/libftdi1/APKBUILD +++ b/community/libftdi1/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Stefan Wagner <stw@bit-strickerei.de> -# Maintainer: Stefan Wagner <stw@bit-strickerei.de> +# Maintainer: Marian Buschsieweke <marian.buschsieweke@posteo.net> pkgname=libftdi1 pkgver=1.5 -pkgrel=2 +pkgrel=3 pkgdesc="A library to talk to FTDI chips" url="https://www.intra2net.com/en/developer/libftdi/download.php" arch="all" diff --git a/community/libgravatar/APKBUILD b/community/libgravatar/APKBUILD index f7ba94292b5..e0110347c28 100644 --- a/community/libgravatar/APKBUILD +++ b/community/libgravatar/APKBUILD @@ -4,12 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libgravatar -pkgver=24.02.2 +pkgver=24.05.0 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=" @@ -47,5 +47,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -2de04c41d1b3e2a00e2ee2722eb87644dc19560c272ba8b483bb02c38382691ea49a36c2f7ed848d0ed2a077d13df292227119144fd1fcaae19fa091bfa67746 libgravatar-24.02.2.tar.xz +85b2352ab38bbdc9a028700cbfc1af15ada95bd6866151a5f2dd3c22d68335e92acbbd9c59c23fdb8f26cb676b942f579c447441d195d8602ab15a36c7319ae9 libgravatar-24.05.0.tar.xz " diff --git a/community/libimagequant/APKBUILD b/community/libimagequant/APKBUILD index 25e316e9d11..205796b0d44 100644 --- a/community/libimagequant/APKBUILD +++ b/community/libimagequant/APKBUILD @@ -54,5 +54,5 @@ package() { sha512sums=" 31bd79024abc1fd884461f8f422d6eac1f5786ce347ac3c517e9cb66f289ad1ace0e3a25c55c7b7384badb2545174871464d60f1238ed2deb1f521d5f3ede96b libimagequant-4.2.2.tar.gz -f93efe8408e706cb710457899e2b163f6714b3079a092756cebf2a48f1bc15a4458f9c36021bb682726909efa4d41f3f69c400b6ff548844e12171b7eb911325 Cargo.lock +476c698dd00d2c288b0984d240a06c962d3e45c9477842b7bad6d2cf04eddf1859338887af0a98de7ca0bb011a398ab7079572eef330e6759d1c471a4bb2577f Cargo.lock " diff --git a/community/libimagequant/Cargo.lock b/community/libimagequant/Cargo.lock index 8db9ee48978..2c6fc27a672 100644 --- a/community/libimagequant/Cargo.lock +++ b/community/libimagequant/Cargo.lock @@ -165,9 +165,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "lodepng" diff --git a/community/libindi/APKBUILD b/community/libindi/APKBUILD index 3dea02406d0..60faf2ace49 100644 --- a/community/libindi/APKBUILD +++ b/community/libindi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=libindi pkgver=2.0.7 -pkgrel=0 +pkgrel=1 pkgdesc="implementation of the INDI protocol for astronomical instrumentation control" url="https://indilib.org" arch="all !armv7 !armhf !riscv64" # libnova diff --git a/community/libjwt/APKBUILD b/community/libjwt/APKBUILD index a0e61d095c5..b06461dbff5 100644 --- a/community/libjwt/APKBUILD +++ b/community/libjwt/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=libjwt -pkgver=1.17.0 +pkgver=1.17.1 pkgrel=0 pkgdesc="JWT C Library" url="https://github.com/benmcollins/libjwt" @@ -41,5 +41,5 @@ package() { } sha512sums=" -4d3fd4e12e13549b3cd924394ba6b786525a22e85cf09129e1cfa62170900a36bfa4e58da5805eaa1b8ee20f57b6a9c6f52f51f342e923ad9bbbf7770b7761e1 libjwt-1.17.0.tar.gz +2eb9178c0603bb0e836f5f47d036ac2a668ae638f16c326ca34a103ac14d9c44a7d728b1431162998609cb5207aee7d8a5be95fb58872c883d4c77c33aa5b96a libjwt-1.17.1.tar.gz " 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/libkcddb/APKBUILD b/community/libkcddb/APKBUILD index 7a9a31a96d9..664aa37cef3 100644 --- a/community/libkcddb/APKBUILD +++ b/community/libkcddb/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libkcddb -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -56,5 +56,5 @@ package() { } sha512sums=" -63846960a2817fb4f296818f3d16139bca4f2fc9f38d16417cd395497f6d0b6444acb867108077bf5713fa007c92e9f28d267d23794b490896ec23d6f32f4a79 libkcddb-24.02.2.tar.xz +8b9bc80feb7a849b0bec2a611f294839e91f5c1fe6830e62199f00617819a9d4aad72df542d1091f38c608792f1cbcf2ced2597dc39fc6d08167ddb6a876ba3d libkcddb-24.05.0.tar.xz " diff --git a/community/libkcompactdisc/APKBUILD b/community/libkcompactdisc/APKBUILD index 7983284775c..92bed8d7ea1 100644 --- a/community/libkcompactdisc/APKBUILD +++ b/community/libkcompactdisc/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libkcompactdisc -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -42,5 +42,5 @@ package() { } sha512sums=" -46e82a9e565f6694445d271689066cd582bec977078c47e23784b262b6cb66c603e948b2ab3778c3c7ff6886fecdb7d09dc608e299e281b39c8515c040cc06e6 libkcompactdisc-24.02.2.tar.xz +c23947d0980f8172835ee19816f869bbdf52d397df8d4b7da1215f3c0ce326b998de2bab2952c4f46594a4d50430e5cb99e1f9e8b56dcd19ad38df6b0ace6b8a libkcompactdisc-24.05.0.tar.xz " diff --git a/community/libkdcraw/APKBUILD b/community/libkdcraw/APKBUILD index 5befec9ade5..48c43b2daea 100644 --- a/community/libkdcraw/APKBUILD +++ b/community/libkdcraw/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libkdcraw -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -40,5 +40,5 @@ package() { } sha512sums=" -6d91c4d20b3055c1bf870b75135990744bd87cd2f150ad562d6b0c06f2231b9be8f6d471bdfdc3932a834bcc9c3e1023a6573d66098c512f5bb96237411cee64 libkdcraw-24.02.2.tar.xz +be3784c1433d6663830d9486b826edbea7d40c6450e828574a3c79563a50ca46883e15c5df1d9173b39a2debc93f16d2c36c92f07c849a21c234f148e6ddea53 libkdcraw-24.05.0.tar.xz " diff --git a/community/libkdegames/APKBUILD b/community/libkdegames/APKBUILD index c4c871cebef..1fc46329649 100644 --- a/community/libkdegames/APKBUILD +++ b/community/libkdegames/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libkdegames -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -71,5 +71,5 @@ carddecks() { } sha512sums=" -2c034b87ba1584da6835df5d0a296b922a2703258caff67aeacee8041a15f0e42849833e4c73bd21198e822c835223b70da491cc4fd119a6eace851809da6a63 libkdegames-24.02.2.tar.xz +bcc6a88ae8e4435f536c47c6e2b2fb6da379507d23a0593d7e83ebf1b068267fc0c970de1ea686ef90ee5d719eb1088eec7bc9c48b134216ffb4456d4ee7c0bf libkdegames-24.05.0.tar.xz " diff --git a/community/libkdepim/APKBUILD b/community/libkdepim/APKBUILD index 11c561b2902..3e4be9e3696 100644 --- a/community/libkdepim/APKBUILD +++ b/community/libkdepim/APKBUILD @@ -4,12 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libkdepim -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Lib for common KDEPim apps" # armhf blocked by extra-cmake-modules -# ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -> akonadi -arch="all !armhf !ppc64le !s390x !riscv64" +# ppc64le, s390x, riscv64 and loongarch64 blocked by qt6-qtwebengine -> akonadi +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://community.kde.org/KDE_PIM" license="GPL-2.0-or-later AND LGPL-2.0-or-later" depends_dev=" @@ -59,5 +59,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -c442cc0ec8c844600c8e7e8360a3e2cab2dbba98cc4c81349640a57c91cdebc91a484790d4c236409555f3b88198f59c37fbb7cdf47af9c4dc5efb21dd62b849 libkdepim-24.02.2.tar.xz +146127fe782981a9c52eb3cf5023d48d2b8f04358a77b501995366d97d1681d793b711fe65a108328335fa3aa340eaf935351e304bd8b01571691024f7165b68 libkdepim-24.05.0.tar.xz " diff --git a/community/libkeduvocdocument/APKBUILD b/community/libkeduvocdocument/APKBUILD index 73c404f5c53..32f7d6de3da 100644 --- a/community/libkeduvocdocument/APKBUILD +++ b/community/libkeduvocdocument/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libkeduvocdocument -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 arch="all !armhf" url="https://edu.kde.org" @@ -40,5 +40,5 @@ package() { } sha512sums=" -b0851f80c9e1c1bd857a40811416c1823a7b6f68794ff4775ff9194082e7e569d79ccd30b38595672c80a9dcc9d29c9bc9358febe7d49e434d5e049323a6e4a3 libkeduvocdocument-24.02.2.tar.xz +2298fd8349c7d370af8cfb9ae2b053a2ec3ca2e7f4e68f5c8b691c08419fc2de025617cf86c7f0dc210afd03fefc88d9a146242163bb9be21ab707b41205f40a libkeduvocdocument-24.05.0.tar.xz " diff --git a/community/libkexiv2-kf5/APKBUILD b/community/libkexiv2-kf5/APKBUILD index 43daf896f4e..0ee000c50a2 100644 --- a/community/libkexiv2-kf5/APKBUILD +++ b/community/libkexiv2-kf5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications-old pkgname=libkexiv2-kf5 -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Library to manipulate picture metadata (built against KF5)" url="https://www.kde.org/applications/graphics" @@ -38,5 +38,5 @@ package() { } sha512sums=" -2d2ca4060bde9919f040dea4f059d24b4162d89d60292787e09408d8188c6747513418ec83ec642bf08d847c2a6bbcc02028ecc7fd3780ab60feed31da5bca03 libkexiv2-24.02.2.tar.xz +2688d11da38949bf8175380f1e557496249bf3d15a99824aec5c81f791c4bcc7d63458897cb256e04c5175d7090a8cc241b11b354d6fb0f7f71887f05d4fd74d libkexiv2-24.05.0.tar.xz " diff --git a/community/libkexiv2/APKBUILD b/community/libkexiv2/APKBUILD index 9debc0e6ed0..0c8cc24c51b 100644 --- a/community/libkexiv2/APKBUILD +++ b/community/libkexiv2/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libkexiv2 -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Library to manipulate picture metadata" url="https://www.kde.org/applications/graphics" @@ -39,5 +39,5 @@ package() { } sha512sums=" -2d2ca4060bde9919f040dea4f059d24b4162d89d60292787e09408d8188c6747513418ec83ec642bf08d847c2a6bbcc02028ecc7fd3780ab60feed31da5bca03 libkexiv2-24.02.2.tar.xz +2688d11da38949bf8175380f1e557496249bf3d15a99824aec5c81f791c4bcc7d63458897cb256e04c5175d7090a8cc241b11b354d6fb0f7f71887f05d4fd74d libkexiv2-24.05.0.tar.xz " diff --git a/community/libkgapi/APKBUILD b/community/libkgapi/APKBUILD index 3c2f6c39e80..42016328c51 100644 --- a/community/libkgapi/APKBUILD +++ b/community/libkgapi/APKBUILD @@ -4,12 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libkgapi -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="LibKGAPI is a KDE-based library for accessing various Google services via their public API" # armhf blocked by extra-cmake-modules -# ppc64le, s390x, riscv64 and armv7 blocked by qt6-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64 !armv7" +# ppc64le, s390x, riscv64, armv7 and loongarch64 blocked by qt6-qtwebengine +arch="all !armhf !ppc64le !s390x !riscv64 !armv7 !loongarch64" url="https://community.kde.org/KDE_PIM" license="LGPL-2.1-only OR LGPL-3.0-only" depends_dev=" @@ -75,5 +75,5 @@ package() { } sha512sums=" -6c50b109414b7f31bd4c051bda94440416114320fcd2f3f4cfd9bf2255ce31ed328fd986d1c21cd481e9f4e7dd63b13c5a1bced80c7f7b45972a8ab8f46ad783 libkgapi-24.02.2.tar.xz +36f29469d2575f9ac6a61e341c08bffc9686ba9f742c99985f0c6033522998d67c4b8a1d486e76f2b8b8b30a198de919fb5beca6a9a2ae390e583956b56124b2 libkgapi-24.05.0.tar.xz " diff --git a/community/libkipi/APKBUILD b/community/libkipi/APKBUILD index 7b0386869be..1c94ea9fa9d 100644 --- a/community/libkipi/APKBUILD +++ b/community/libkipi/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libkipi -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" # armhf blocked by extra-cmake-modules @@ -42,5 +42,5 @@ package() { } sha512sums=" -314c011f81970535486401273f4ef09a84ddf7746ab093d3a57d274ae783baa14c5495d6c6ea7d3548af53d5a5daa4eb31d55df3a7a232fc062ab391f1b9e1ea libkipi-24.02.2.tar.xz +a99d1cc9b4b6cde27c2aa54c8c045b1497f647f21cbf06d22106a87a1e6454887d758828c4890bc4a0e83a735fb194f6bc6c3bf618b1771bd1b59683cafa7d6d libkipi-24.05.0.tar.xz " 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/testing/libkkc/APKBUILD b/community/libkkc/APKBUILD index 09904b002e8..09904b002e8 100644 --- a/testing/libkkc/APKBUILD +++ b/community/libkkc/APKBUILD diff --git a/testing/libkkc/libkkc-py3.patch b/community/libkkc/libkkc-py3.patch index 91d3f6956e8..91d3f6956e8 100644 --- a/testing/libkkc/libkkc-py3.patch +++ b/community/libkkc/libkkc-py3.patch diff --git a/community/libkleo/APKBUILD b/community/libkleo/APKBUILD index 16471518d39..db7518b4141 100644 --- a/community/libkleo/APKBUILD +++ b/community/libkleo/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libkleo -pkgver=24.02.2 -pkgrel=1 +pkgver=24.05.0 +pkgrel=0 pkgdesc="KDE PIM cryptographic library" # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -51,5 +51,5 @@ package() { } sha512sums=" -8acc81aa6f102e64e7ae4142f854e36a43a59971733afe49ba86380fb70a7910b8a8feb8649bff77fa5ed5fe0110cdb83f98dccd1448af5d83ea90a3ceda0d85 libkleo-24.02.2.tar.xz +8ec74d26928f9a9586d1225c2e7360ef884d36dc29cb3ebcf28054d0373615d798a9a524243e2e8281e57e07ebab349cee85111cd5e38a21c70d711fe9d9ce3f libkleo-24.05.0.tar.xz " diff --git a/community/libkmahjongg/APKBUILD b/community/libkmahjongg/APKBUILD index ec1b79258f0..b549542a5cd 100644 --- a/community/libkmahjongg/APKBUILD +++ b/community/libkmahjongg/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libkmahjongg -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -44,5 +44,5 @@ package() { } sha512sums=" -5e261d2146f17806fc3b51d6d4decff77a654d1d9c2f79d473976ced56c5881b3a85ba9c4d136ad4505a5986c939f08b5c882903069164bf998e80e9af2108ce libkmahjongg-24.02.2.tar.xz +b9fc226b6d2952b7bdf1c971ac897b95526275e382c90599cf1d250edd587e21be3dd82ce7c7cbec8e6d285c20f39799f3fefe14cfef2f3c2979dc211fb57829 libkmahjongg-24.05.0.tar.xz " diff --git a/community/libkml/APKBUILD b/community/libkml/APKBUILD index d9679d764e8..3d942e22a0d 100644 --- a/community/libkml/APKBUILD +++ b/community/libkml/APKBUILD @@ -37,9 +37,9 @@ source="https://github.com/libkml/libkml/archive/$pkgver/libkml-$pkgver.tar.gz 40-dont-bytecompile.patch " -# missing openjdk on mips64 and riscv64 +# missing openjdk on riscv64 case $CARCH in - mips*|riscv64) + riscv64) _have_java=OFF ;; *) diff --git a/community/libkomparediff2/APKBUILD b/community/libkomparediff2/APKBUILD index b51617d81c4..37bc253cbc7 100644 --- a/community/libkomparediff2/APKBUILD +++ b/community/libkomparediff2/APKBUILD @@ -4,22 +4,22 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libkomparediff2 -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" -url="https://kde.org/applications/development" pkgdesc="Library to compare files and strings" +url="https://kde.org/applications/development" license="GPL-2.0-or-later AND LGPL-2.0-or-later" makedepends=" extra-cmake-modules - kcodecs-dev - kconfig-dev - kcoreaddons-dev - ki18n-dev - kio-dev - kxmlgui-dev - qt6-qtbase-dev + kcodecs5-dev + kconfig5-dev + kcoreaddons5-dev + ki18n5-dev + kio5-dev + kxmlgui5-dev + qt5-qtbase-dev samurai " subpackages="$pkgname-dev $pkgname-lang" @@ -28,7 +28,6 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/libkomparedi build() { cmake -B build -G Ninja \ - -DBUILD_WITH_QT6=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib @@ -44,5 +43,5 @@ package() { } sha512sums=" -f5e616687a792b43aaf70269bfd3696dc07a1d3e76c52b58adb1601e2e51ae3b3e4c6bc7b510e5cfdadb060729abfe1357e66c7a99294f48badaeca454c8b7aa libkomparediff2-24.02.2.tar.xz +905f4a53557ffdb3ab67a6472c81b64d497d0fb4ca261114b536236caee2ea00ac266246b7473ee796f7f3e98a611ceda5eae328ceecea0796d3b31a32b46455 libkomparediff2-24.05.0.tar.xz " diff --git a/community/libkomparediff25/APKBUILD b/community/libkomparediff25/APKBUILD deleted file mode 100644 index f1169c08512..00000000000 --- a/community/libkomparediff25/APKBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# 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-applications -pkgname=libkomparediff25 -pkgver=24.02.2 -pkgrel=0 -# armhf blocked by extra-cmake-modules -arch="all !armhf" -url="https://kde.org/applications/development" -pkgdesc="Library to compare files and strings" -license="GPL-2.0-or-later AND LGPL-2.0-or-later" -makedepends=" - extra-cmake-modules - kcodecs5-dev - kconfig5-dev - kcoreaddons5-dev - ki18n5-dev - kio5-dev - kxmlgui5-dev - qt5-qtbase-dev - samurai - " -subpackages="$pkgname-dev $pkgname-lang" -_repo_url="https://invent.kde.org/sdk/libkomparediff2.git" -source="https://download.kde.org/stable/release-service/$pkgver/src/libkomparediff2-$pkgver.tar.xz" -builddir="$srcdir/libkomparediff2-$pkgver" - -build() { - cmake -B build -G Ninja \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib - cmake --build build -} - -check() { - ctest --test-dir build --output-on-failure -} - -package() { - DESTDIR="$pkgdir" cmake --install build -} - -sha512sums=" -f5e616687a792b43aaf70269bfd3696dc07a1d3e76c52b58adb1601e2e51ae3b3e4c6bc7b510e5cfdadb060729abfe1357e66c7a99294f48badaeca454c8b7aa libkomparediff2-24.02.2.tar.xz -" diff --git a/community/libksane/APKBUILD b/community/libksane/APKBUILD index e5fd04b1c50..b41578dbbc8 100644 --- a/community/libksane/APKBUILD +++ b/community/libksane/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libksane -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -45,5 +45,5 @@ package() { } sha512sums=" -e5ad9152760384be4f1aa2b7cf54161caceb3fa68e9745606398cadd6e2e44c9b4b0d7d4cbf51c44667697221d6c7ab8ee3dcb9e210bd341d33bd7cee006909a libksane-24.02.2.tar.xz +5238c18582c68f055fc2563db439bd16926f8f6ee139a65d33bfbf436160656f5c746396a8197e95ac21b2bacfeb6ce6946bb484cc843266fc7a0b6d37d89999 libksane-24.05.0.tar.xz " diff --git a/community/libkscreen/APKBUILD b/community/libkscreen/APKBUILD index 7f5eea77be1..c8ff90cceca 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="KDE screen management software" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -58,5 +58,5 @@ package() { } sha512sums=" -c448307cd2fdf01b594232675e45feb3bd8722e3c17fca012af0152a82f0fe6a5a5a30c1b4b5cf94aa821a029d5e6f88c76d9606418306a30b3d2660e494e584 libkscreen-6.0.4.tar.xz +39f90cde99f299f152589747e9e454288c4a555eac174965a71aef5b9e7efcb913b453b39d534aa54ed5e694a8ab0fbef7d73b9668a2323042b8f727eff2a66a libkscreen-6.0.5.tar.xz " diff --git a/community/libksieve/APKBUILD b/community/libksieve/APKBUILD index 4eeea057112..e9fa2af1c1d 100644 --- a/community/libksieve/APKBUILD +++ b/community/libksieve/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libksieve -pkgver=24.02.2 +pkgver=24.05.0 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=" @@ -61,5 +62,5 @@ package() { } sha512sums=" -e85a47e8f6673ff41d35a26000e9fa36efac478cd7fb0bae8b03d22692f742d50840606e5913e5717df19b9879a39906baf1ad56650f21b954e32b973371d9b7 libksieve-24.02.2.tar.xz +9e40fd585764bdc1a61bdc3d5381e86615695421cee80ffc1ea709b063e039235004068866ee0f5f6483ad83cb784290a4a6f7b60775043cfc306e62186c47e6 libksieve-24.05.0.tar.xz " diff --git a/community/libksysguard/APKBUILD b/community/libksysguard/APKBUILD index 45349eabddc..e81f49be036 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="KDE system monitor library" # armhf blocked by extra-cmake-modules @@ -67,5 +67,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -eda6a98679fe607c0593c6cf19da451e3f051f82a18982fe5f70ff79aa25c0c47f1af661fe385b71730d8f46fa4ae91f717865f3123cd8e4ba4efa6c664e2b7c libksysguard-6.0.4.tar.xz +1024dcc439931742cde927c937df625e82629baf0d2e3e7aaaca81a7641e9c753424f64b1e94eb18007878d2f1c8d68e6c5ce76b73e283c885ce5181d1122751 libksysguard-6.0.5.tar.xz " diff --git a/community/libktorrent/APKBUILD b/community/libktorrent/APKBUILD index d518e435ec8..c71cc315e58 100644 --- a/community/libktorrent/APKBUILD +++ b/community/libktorrent/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=libktorrent -pkgver=24.02.2 -pkgrel=1 +pkgver=24.05.0 +pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" url="https://kde.org/applications/internet/org.kde.ktorrent" @@ -52,5 +52,5 @@ package() { } sha512sums=" -bda6c2a25cedc89b95a0aab4443a4609b02d4ba60088634a4d5cf07a613dba8e498755c60210859429949576ec0383d94521f3859abfe55698a55940b5b9b996 libktorrent-24.02.2.tar.xz +e803a7ba5e3089cec140a802d5f9f28bb5ccc4cb24c5eb2682b5ec9ad639a21fca005d87d9342e120ce57101db20133d72f219a3a7262fc72386db513ac89b21 libktorrent-24.05.0.tar.xz " diff --git a/community/libmikmod/APKBUILD b/community/libmikmod/APKBUILD index 0d3c1fa12bf..1d6763f8c7c 100644 --- a/community/libmikmod/APKBUILD +++ b/community/libmikmod/APKBUILD @@ -11,6 +11,12 @@ makedepends="alsa-lib-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/mikmod/libmikmod-$pkgver.tar.gz" +prepare() { + default_prepare + update_config_guess + update_config_sub +} + build() { # build fails with bash export CONFIG_SHELL="/bin/sh" diff --git a/community/libnpupnp/APKBUILD b/community/libnpupnp/APKBUILD index 4d17b263d5b..5afea07bf64 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.3 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 +763bf891a45efd1e022259839ac258b961a81a0e1e45d0b14c8a84a1ee3cdd02897ab98b9c4264871e2ec9cbc6cd315311d0a058f3fa0040b0f1198d1bd4b986 libnpupnp-6.1.3.tar.gz " diff --git a/community/libopenmpt/APKBUILD b/community/libopenmpt/APKBUILD index ae59f7307a4..73a5e93cf28 100644 --- a/community/libopenmpt/APKBUILD +++ b/community/libopenmpt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: knuxify <knuxify@gmail.com> # Maintainer: knuxify <knuxify@gmail.com> pkgname=libopenmpt -pkgver=0.7.6 +pkgver=0.7.7 pkgrel=0 pkgdesc="Cross-platform library to render tracker music to a PCM audio stream" url="https://lib.openmpt.org/libopenmpt/" @@ -53,5 +53,5 @@ _openmpt123_doc() { } sha512sums=" -9665d3e301bab06f363bc4376fc488ca5befcf05f580deeb01a035167f02f8d47cda0d940239d5f29a91f97da6f31a2f6f20836b4f8ef6a248c7e39e49a7aa66 libopenmpt-0.7.6+release.autotools.tar.gz +88d68bd32e696c01c070abd7156645c2969d389d6fb660f4f45d9e5e16ff9c25c3084d30cef208578080ee8a2da5c6045e5b1d93db7e2c456d42b91daaa02199 libopenmpt-0.7.7+release.autotools.tar.gz " diff --git a/community/libopenraw/APKBUILD b/community/libopenraw/APKBUILD index 6c87f675ee2..2d54b5b9719 100644 --- a/community/libopenraw/APKBUILD +++ b/community/libopenraw/APKBUILD @@ -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/libplasma/APKBUILD b/community/libplasma/APKBUILD index 7be7170d702..4d0ab32912d 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.4 +pkgver=6.0.5 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=" -afc4555b57fda20299a3a46560271590af69370eb11831d1246196c0f115215664181694efdf80cb5c0496385a9354bb3d6c4a68814d0235dee4afaaa468bd31 libplasma-6.0.4.tar.xz +40ef4d9100edf16bfba138570e85849715df8047e22cd5c6e7fc3334996ae5a8bb1f95b681b16d2e4ffc5aad93fb16bd444d1316f82205e4a36847648b0509ae libplasma-6.0.5.tar.xz " diff --git a/community/libqb3/10-soversion.patch b/community/libqb3/10-soversion.patch new file mode 100644 index 00000000000..01b9fa09628 --- /dev/null +++ b/community/libqb3/10-soversion.patch @@ -0,0 +1,15 @@ +Author: Holger Jaekel <holger.jaekel@gmx.de> +Summary: set soversion of library +---- + +--- a/QB3lib/CMakeLists.txt ++++ b/QB3lib/CMakeLists.txt +@@ -32,6 +32,8 @@ + PUBLIC_HEADER "QB3.h;${CMAKE_CURRENT_BINARY_DIR}/libqb3_export.h" + DEBUG_POSTFIX "d" + PREFIX "" ++ VERSION ${PROJECT_VERSION} ++ SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} + ) + + include(GenerateExportHeader) diff --git a/community/libqb3/20-cmake_destination.patch b/community/libqb3/20-cmake_destination.patch new file mode 100644 index 00000000000..32e66cdf07c --- /dev/null +++ b/community/libqb3/20-cmake_destination.patch @@ -0,0 +1,31 @@ +Author: Holger Jaekel <holger.jaekel@gmx.de> +Summary: set destination of cmake files +---- + +--- a/QB3lib/CMakeLists.txt ++++ b/QB3lib/CMakeLists.txt +@@ -53,7 +53,7 @@ + install(EXPORT "${PROJECT_NAME}Targets" + FILE "${PROJECT_NAME}Targets.cmake" + NAMESPACE ${namespace}:: +- DESTINATION cmake ++ DESTINATION lib/cmake + ) + + # generate the version file for the config file +@@ -65,13 +65,13 @@ + # create config file + configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" +- INSTALL_DESTINATION cmake ++ INSTALL_DESTINATION lib/cmake + ) + # install config files + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" +- DESTINATION cmake ++ DESTINATION lib/cmake + ) + # generate the export targets for the build tree + export(EXPORT "${PROJECT_NAME}Targets" diff --git a/community/libqb3/APKBUILD b/community/libqb3/APKBUILD new file mode 100644 index 00000000000..803742288ed --- /dev/null +++ b/community/libqb3/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: Holger Jaekel <holger.jaekel@gmx.de> +# Maintainer: Holger Jaekel <holger.jaekel@gmx.de> +pkgname=libqb3 +pkgver=1.1.0 +pkgrel=0 +pkgdesc="Fast and efficient raster compression" +url="https://github.com/lucianpls/QB3" +arch="all !armhf !armv7 !x86 !s390x" # requires little endian, 64bit +license="Apache-2.0" +options="!check" # no tests +makedepends="clang cmake samurai" +subpackages="$pkgname-dev" +source="libqb3-$pkgver.tar.gz::https://github.com/lucianpls/QB3/archive/refs/tags/V$pkgver.tar.gz + 10-soversion.patch + 20-cmake_destination.patch" +builddir="$srcdir/QB3-$pkgver" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + local crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + CC=clang \ + CXX=clang++ \ + cmake -B build -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=None \ + -DBUILD_CQB3=OFF \ + $crossopts + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} + +sha512sums=" +75d428b38402383dc2744f9e529b52d04922c49e95eb1240542c80ded3969d175d47e7fd9000410091c1808cdb9311520cfdaba72834778849857627b0f6a9ef libqb3-1.1.0.tar.gz +e6322afb53ffefa4ea2e2bf5ba77d6d4685090a0b49ac3134bb9fda11b933645b13b75f64ba4ca76b4358a83a9cb639b2d0e8f98aab46f14d1bf3a0dde1a0fb8 10-soversion.patch +c263135219f8a156b011feacefe7fa29c4f4cbf7e1dc12faf2a2257fb177885ad92d786af8b8d0b0d423461d74a28f92063a4151ff219855207e67f32dfa6c5e 20-cmake_destination.patch +" diff --git a/community/libqmi/0001-qmi-common-turn-qmi_helpers_str_hex-into-qmi_common_.patch b/community/libqmi/0001-qmi-common-turn-qmi_helpers_str_hex-into-qmi_common_.patch new file mode 100644 index 00000000000..8e097cbe07c --- /dev/null +++ b/community/libqmi/0001-qmi-common-turn-qmi_helpers_str_hex-into-qmi_common_.patch @@ -0,0 +1,347 @@ +From ff9d55551a5ec381ccfc04a773b82d98b5b95028 Mon Sep 17 00:00:00 2001 +From: Fabio Porcedda <fabio.porcedda@gmail.com> +Date: Tue, 12 Dec 2023 10:09:47 +0100 +Subject: [PATCH 1/5] qmi-common: turn qmi_helpers_str_hex into + qmi_common_str_hex + +Rename qmi_helpers_str_hex() to qmi_common_str_hex() and move it to +the new library libqmi-common that will be shared between libqmi-glib +and qmicli. +--- + build-aux/qmi-codegen/Message.py | 2 +- + build-aux/qmi-codegen/utils.py | 1 + + src/common/meson.build | 15 +++++++++ + src/common/qmi-common.c | 45 +++++++++++++++++++++++++++ + src/common/qmi-common.h | 16 ++++++++++ + src/libqmi-glib/generated/meson.build | 5 ++- + src/libqmi-glib/meson.build | 1 + + src/libqmi-glib/qmi-compat.c | 5 +-- + src/libqmi-glib/qmi-device.c | 5 +-- + src/libqmi-glib/qmi-endpoint.c | 4 +-- + src/libqmi-glib/qmi-helpers.c | 36 --------------------- + src/libqmi-glib/qmi-helpers.h | 4 --- + src/libqmi-glib/qmi-message.c | 3 +- + src/meson.build | 1 + + 14 files changed, 94 insertions(+), 49 deletions(-) + create mode 100644 src/common/meson.build + create mode 100644 src/common/qmi-common.c + create mode 100644 src/common/qmi-common.h + +diff --git a/build-aux/qmi-codegen/Message.py b/build-aux/qmi-codegen/Message.py +index b522fd4d..eb56358f 100644 +--- a/build-aux/qmi-codegen/Message.py ++++ b/build-aux/qmi-codegen/Message.py +@@ -381,7 +381,7 @@ class Message: + ' g_autofree gchar *value_hex = NULL;\n' + '\n' + ' if (qmi_utils_get_show_personal_info () || !value_has_personal_info)\n' +- ' value_hex = qmi_helpers_str_hex (value, length, \':\');\n' ++ ' value_hex = qmi_common_str_hex (value, length, \':\');\n' + ' else\n' + ' value_hex = g_strdup ("###...");\n' + '\n' +diff --git a/build-aux/qmi-codegen/utils.py b/build-aux/qmi-codegen/utils.py +index b4313a58..00d98c33 100644 +--- a/build-aux/qmi-codegen/utils.py ++++ b/build-aux/qmi-codegen/utils.py +@@ -114,6 +114,7 @@ def add_source_start(f, output_name): + "#include <string.h>\n" + "\n" + "#include \"${name}.h\"\n" ++ "#include \"qmi-common.h\"\n" + "#include \"qmi-enum-types.h\"\n" + "#include \"qmi-flag-types.h\"\n" + "#include \"qmi-enum-types-private.h\"\n" +diff --git a/src/common/meson.build b/src/common/meson.build +new file mode 100644 +index 00000000..06fcdc31 +--- /dev/null ++++ b/src/common/meson.build +@@ -0,0 +1,15 @@ ++# SPDX-License-Identifier: LGPL-2.1-or-later ++# Copyright (C) 2023 Fabio Porcedda <fabio.porcedda@gmail.com> ++ ++libqmi_common = static_library( ++ 'qmi-common', ++ sources: 'qmi-common.c', ++ include_directories: top_inc, ++ dependencies: glib_dep, ++) ++ ++libqmi_common_dep = declare_dependency( ++ include_directories: '.', ++ dependencies: glib_dep, ++ link_with: libqmi_common, ++) +diff --git a/src/common/qmi-common.c b/src/common/qmi-common.c +new file mode 100644 +index 00000000..a65e346b +--- /dev/null ++++ b/src/common/qmi-common.c +@@ -0,0 +1,45 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* SPDX-License-Identifier: LGPL-2.1-or-later */ ++/* ++ * Copyright (C) 2023 Fabio Porcedda <fabio.porcedda@gmail.com> ++ */ ++ ++#include "qmi-common.h" ++ ++#include <stdio.h> ++ ++/*****************************************************************************/ ++ ++gchar * ++qmi_common_str_hex (gconstpointer mem, ++ gsize size, ++ gchar delimiter) ++{ ++ const guint8 *data = mem; ++ gsize i; ++ gsize j; ++ gsize new_str_length; ++ gchar *new_str; ++ ++ /* Get new string length. If input string has N bytes, we need: ++ * - 1 byte for last NUL char ++ * - 2N bytes for hexadecimal char representation of each byte... ++ * - N-1 bytes for the separator ':' ++ * So... a total of (1+2N+N-1) = 3N bytes are needed... */ ++ new_str_length = 3 * size; ++ ++ /* Allocate memory for new array and initialize contents to NUL */ ++ new_str = g_malloc0 (new_str_length); ++ ++ /* Print hexadecimal representation of each byte... */ ++ for (i = 0, j = 0; i < size; i++, j += 3) { ++ /* Print character in output string... */ ++ snprintf (&new_str[j], 3, "%02X", data[i]); ++ /* And if needed, add separator */ ++ if (i != (size - 1) ) ++ new_str[j + 2] = delimiter; ++ } ++ ++ /* Set output string */ ++ return new_str; ++} +diff --git a/src/common/qmi-common.h b/src/common/qmi-common.h +new file mode 100644 +index 00000000..d59e5e7b +--- /dev/null ++++ b/src/common/qmi-common.h +@@ -0,0 +1,16 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ ++/* SPDX-License-Identifier: GPL-2.0-or-later */ ++/* ++ * Copyright (C) 2023 Fabio Porcedda <fabio.porcedda@gmail.com> ++ */ ++ ++#ifndef _COMMON_QMI_COMMON_H_ ++#define _COMMON_QMI_COMMON_H_ ++ ++#include <glib.h> ++ ++gchar *qmi_common_str_hex (gconstpointer mem, ++ gsize size, ++ gchar delimiter); ++ ++#endif /* _COMMON_QMI_COMMON_H_ */ +diff --git a/src/libqmi-glib/generated/meson.build b/src/libqmi-glib/generated/meson.build +index 19eeeb69..9c07c881 100644 +--- a/src/libqmi-glib/generated/meson.build ++++ b/src/libqmi-glib/generated/meson.build +@@ -305,7 +305,10 @@ c_flags = [ + '-Wno-unused-function', + ] + +-deps = [glib_deps] ++deps = [ ++ glib_deps, ++ libqmi_common_dep, ++] + + if enable_qrtr + deps += qrtr_glib_dep +diff --git a/src/libqmi-glib/meson.build b/src/libqmi-glib/meson.build +index f3113747..854234ff 100644 +--- a/src/libqmi-glib/meson.build ++++ b/src/libqmi-glib/meson.build +@@ -99,6 +99,7 @@ sources = files( + deps = [ + generated_dep, + gio_unix_dep, ++ libqmi_common_dep, + ] + + if enable_mbim_qmux +diff --git a/src/libqmi-glib/qmi-compat.c b/src/libqmi-glib/qmi-compat.c +index 636a9631..d65d2e75 100644 +--- a/src/libqmi-glib/qmi-compat.c ++++ b/src/libqmi-glib/qmi-compat.c +@@ -21,6 +21,7 @@ + + #include <string.h> + ++#include "qmi-common.h" + #include "qmi-compat.h" + #include "qmi-helpers.h" + #include "qmi-enum-types.h" +@@ -40,8 +41,8 @@ print_read_bytes_trace (const gchar *type, + gchar *str1; + gchar *str2; + +- str1 = qmi_helpers_str_hex (buffer, n_bytes, ':'); +- str2 = qmi_helpers_str_hex (out, n_bytes, ':'); ++ str1 = qmi_common_str_hex (buffer, n_bytes, ':'); ++ str2 = qmi_common_str_hex (out, n_bytes, ':'); + + g_debug ("Read %s (%s) --> (%s)", type, str1, str2); + g_warn_if_fail (g_str_equal (str1, str2)); +diff --git a/src/libqmi-glib/qmi-device.c b/src/libqmi-glib/qmi-device.c +index 55ec075a..b901a62a 100644 +--- a/src/libqmi-glib/qmi-device.c ++++ b/src/libqmi-glib/qmi-device.c +@@ -31,6 +31,7 @@ + #include <termios.h> + #include <unistd.h> + ++#include "qmi-common.h" + #include "qmi-device.h" + #include "qmi-message.h" + #include "qmi-file.h" +@@ -1744,13 +1745,13 @@ trace_message (QmiDevice *self, + } + + if (qmi_utils_get_show_personal_info () || (((GByteArray *)message)->len < MAX_PRINTED_BYTES)) { +- printable = qmi_helpers_str_hex (((GByteArray *)message)->data, ++ printable = qmi_common_str_hex (((GByteArray *)message)->data, + ((GByteArray *)message)->len, + ':'); + } else { + g_autofree gchar *tmp = NULL; + +- tmp = qmi_helpers_str_hex (((GByteArray *)message)->data, MAX_PRINTED_BYTES, ':'); ++ tmp = qmi_common_str_hex (((GByteArray *)message)->data, MAX_PRINTED_BYTES, ':'); + printable = g_strdup_printf ("%s...", tmp); + } + +diff --git a/src/libqmi-glib/qmi-endpoint.c b/src/libqmi-glib/qmi-endpoint.c +index 362311cc..f5c5aae1 100644 +--- a/src/libqmi-glib/qmi-endpoint.c ++++ b/src/libqmi-glib/qmi-endpoint.c +@@ -24,7 +24,7 @@ + + #include "qmi-endpoint.h" + +-#include "qmi-helpers.h" ++#include "qmi-common.h" + #include "qmi-error-types.h" + #include "qmi-errors.h" + +@@ -93,7 +93,7 @@ qmi_endpoint_parse_buffer (QmiEndpoint *self, + gchar *printable; + guint len = MIN (self->priv->buffer->len, 2048); + +- printable = qmi_helpers_str_hex (self->priv->buffer->data, len, ':'); ++ printable = qmi_common_str_hex (self->priv->buffer->data, len, ':'); + g_debug ("<<<<<< RAW INVALID MESSAGE:\n" + "<<<<<< length = %u\n" + "<<<<<< data = %s\n", +diff --git a/src/libqmi-glib/qmi-helpers.c b/src/libqmi-glib/qmi-helpers.c +index 2cd433fb..d5626105 100644 +--- a/src/libqmi-glib/qmi-helpers.c ++++ b/src/libqmi-glib/qmi-helpers.c +@@ -37,42 +37,6 @@ + + /*****************************************************************************/ + +-gchar * +-qmi_helpers_str_hex (gconstpointer mem, +- gsize size, +- gchar delimiter) +-{ +- const guint8 *data = mem; +- gsize i; +- gsize j; +- gsize new_str_length; +- gchar *new_str; +- +- /* Get new string length. If input string has N bytes, we need: +- * - 1 byte for last NUL char +- * - 2N bytes for hexadecimal char representation of each byte... +- * - N-1 bytes for the separator ':' +- * So... a total of (1+2N+N-1) = 3N bytes are needed... */ +- new_str_length = 3 * size; +- +- /* Allocate memory for new array and initialize contents to NUL */ +- new_str = g_malloc0 (new_str_length); +- +- /* Print hexadecimal representation of each byte... */ +- for (i = 0, j = 0; i < size; i++, j += 3) { +- /* Print character in output string... */ +- snprintf (&new_str[j], 3, "%02X", data[i]); +- /* And if needed, add separator */ +- if (i != (size - 1) ) +- new_str[j + 2] = delimiter; +- } +- +- /* Set output string */ +- return new_str; +-} +- +-/*****************************************************************************/ +- + gboolean + qmi_helpers_check_user_allowed (uid_t uid, + GError **error) +diff --git a/src/libqmi-glib/qmi-helpers.h b/src/libqmi-glib/qmi-helpers.h +index 48b9f6df..5be5c09a 100644 +--- a/src/libqmi-glib/qmi-helpers.h ++++ b/src/libqmi-glib/qmi-helpers.h +@@ -34,10 +34,6 @@ + + G_BEGIN_DECLS + +-G_GNUC_INTERNAL +-gchar *qmi_helpers_str_hex (gconstpointer mem, +- gsize size, +- gchar delimiter); + G_GNUC_INTERNAL + gboolean qmi_helpers_check_user_allowed (uid_t uid, + GError **error); +diff --git a/src/libqmi-glib/qmi-message.c b/src/libqmi-glib/qmi-message.c +index 3e31b4b4..ab928a15 100644 +--- a/src/libqmi-glib/qmi-message.c ++++ b/src/libqmi-glib/qmi-message.c +@@ -34,6 +34,7 @@ + #include <string.h> + #include <endian.h> + ++#include "qmi-common.h" + #include "qmi-message.h" + #include "qmi-helpers.h" + #include "qmi-enums-private.h" +@@ -1623,7 +1624,7 @@ qmi_message_get_tlv_printable (QmiMessage *self, + g_return_val_if_fail (line_prefix != NULL, NULL); + g_return_val_if_fail (raw != NULL, NULL); + +- value_hex = qmi_helpers_str_hex (raw, raw_length, ':'); ++ value_hex = qmi_common_str_hex (raw, raw_length, ':'); + printable = g_strdup_printf ("%sTLV:\n" + "%s type = 0x%02x\n" + "%s length = %" G_GSIZE_FORMAT "\n" +diff --git a/src/meson.build b/src/meson.build +index 10550ab7..33f642f6 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -1,6 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0-or-later + # Copyright (C) 2019 - 2021 Iñigo Martinez <inigomartinez@gmail.com> + ++subdir('common') + subdir('libqmi-glib') + subdir('qmicli') + subdir('qmi-proxy') +-- +2.45.1 + diff --git a/community/libqmi/0002-uim-Add-Open-Logical-Channel-command.patch b/community/libqmi/0002-uim-Add-Open-Logical-Channel-command.patch new file mode 100644 index 00000000000..fa0351594b6 --- /dev/null +++ b/community/libqmi/0002-uim-Add-Open-Logical-Channel-command.patch @@ -0,0 +1,224 @@ +From 2ac09dbc9e433290a26c6ace653d28d0aff223d0 Mon Sep 17 00:00:00 2001 +From: Luca Weiss <luca.weiss@fairphone.com> +Date: Fri, 23 Feb 2024 08:46:55 +0100 +Subject: [PATCH 2/5] uim: Add Open Logical Channel command + +Allows the client to open a logical channel to the SIM card which can +then be used to e.g. send APDU requests to the SIM card. + +QMI format is based on ChromiumOS hermes definition: +https://chromium.googlesource.com/chromiumos/platform2/+/eab2f7edb247fc11b3f0ec4b886aa7a5b12f24f6/hermes/uim_cmd.qmi#17 +--- + data/qmi-service-uim.json | 43 ++++++++ + .../libqmi-glib/libqmi-glib-docs.xml | 1 + + src/qmicli/qmicli-uim.c | 100 ++++++++++++++++++ + 3 files changed, 144 insertions(+) + +diff --git a/data/qmi-service-uim.json b/data/qmi-service-uim.json +index 35edd8e1..2a0d21e6 100644 +--- a/data/qmi-service-uim.json ++++ b/data/qmi-service-uim.json +@@ -920,6 +920,49 @@ + "format" : "guint8" } ] } } ] }, + "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, + ++ // ********************************************************************************* ++ { "name" : "Open Logical Channel", ++ "type" : "Message", ++ "service" : "UIM", ++ "id" : "0x0042", ++ "since" : "1.36", ++ "input" : [ { "name" : "Slot", ++ "id" : "0x01", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "guint8" }, ++ { "name" : "AID", ++ "id" : "0x10", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "array", ++ "size-prefix-format" : "guint8", ++ "array-element" : { "format" : "guint8" } } ], ++ "output" : [ { "common-ref" : "Operation Result" }, ++ { "name" : "Channel ID", ++ "id" : "0x10", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "guint8", ++ "prerequisites" : [ { "common-ref" : "Success" } ] }, ++ { "name" : "Card result", ++ "id" : "0x11", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "sequence", ++ "contents" : [ { "name" : "SW1", ++ "format" : "guint8" }, ++ { "name" : "SW2", ++ "format" : "guint8" } ] }, ++ { "name" : "Select Response", ++ "id" : "0x12", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "array", ++ "size-prefix-format" : "guint8", ++ "array-element" : { "format" : "guint8" }, ++ "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, ++ + // ********************************************************************************* + { "name" : "Refresh Register All", + "type" : "Message", +diff --git a/docs/reference/libqmi-glib/libqmi-glib-docs.xml b/docs/reference/libqmi-glib/libqmi-glib-docs.xml +index 1374c365..f6cd58b2 100644 +--- a/docs/reference/libqmi-glib/libqmi-glib-docs.xml ++++ b/docs/reference/libqmi-glib/libqmi-glib-docs.xml +@@ -371,6 +371,7 @@ + <xi:include href="xml/qmi-message-uim-refresh-register-all.xml"/> + <xi:include href="xml/qmi-message-uim-refresh-complete.xml"/> + <xi:include href="xml/qmi-message-uim-remote-unlock.xml"/> ++ <xi:include href="xml/qmi-message-uim-open-logical-channel.xml"/> + </section> + </chapter> + +diff --git a/src/qmicli/qmicli-uim.c b/src/qmicli/qmicli-uim.c +index c3d0abad..402d74fe 100644 +--- a/src/qmicli/qmicli-uim.c ++++ b/src/qmicli/qmicli-uim.c +@@ -65,6 +65,7 @@ static gchar *change_provisioning_session_str; + static gchar *switch_slot_str; + static gchar *depersonalization_str; + static gchar *remote_unlock_str; ++static gchar *open_logical_channel_str; + static gchar **monitor_refresh_file_array; + static gboolean get_card_status_flag; + static gboolean get_supported_messages_flag; +@@ -204,6 +205,12 @@ static GOptionEntry entries[] = { + "Updates the SimLock configuration data", + "[XX:XX:...]" + }, ++#endif ++#if defined HAVE_QMI_MESSAGE_UIM_OPEN_LOGICAL_CHANNEL ++ { "uim-open-logical-channel", 0, 0, G_OPTION_ARG_STRING, &open_logical_channel_str, ++ "Open logical channel", ++ "[(slot number),(aid)]" ++ }, + #endif + { "uim-noop", 0, 0, G_OPTION_ARG_NONE, &noop_flag, + "Just allocate or release a UIM client. Use with `--client-no-release-cid' and/or `--client-cid'", +@@ -250,6 +257,7 @@ qmicli_uim_options_enabled (void) + !!monitor_refresh_file_array + + !!depersonalization_str + + !!remote_unlock_str + ++ !!open_logical_channel_str + + get_card_status_flag + + get_supported_messages_flag + + get_slot_status_flag + +@@ -2658,6 +2666,76 @@ remote_unlock_ready (QmiClientUim *client, + + #endif /* HAVE_QMI_MESSAGE_UIM_REMOTE_UNLOCK */ + ++#if defined HAVE_QMI_MESSAGE_UIM_OPEN_LOGICAL_CHANNEL ++ ++static QmiMessageUimOpenLogicalChannelInput * ++open_logical_channel_input_create (const gchar *str) ++{ ++ QmiMessageUimOpenLogicalChannelInput *input; ++ g_auto(GStrv) split = NULL; ++ guint slot; ++ g_autoptr(GArray) aid_data = NULL; ++ ++ /* Prepare inputs. ++ * Format of the string is: ++ * "[(slot number),(aid)]" ++ */ ++ split = g_strsplit (str, ",", -1); ++ ++ if (!split[0] || !qmicli_read_uint_from_string (split[0], &slot) || (slot > G_MAXUINT8)) { ++ g_printerr ("error: invalid slot number\n"); ++ return NULL; ++ } ++ ++ /* AID is optional */ ++ if (split[1]) { ++ if (!qmicli_read_raw_data_from_string (split[1], &aid_data)) { ++ g_printerr ("error: invalid AID data\n"); ++ return NULL; ++ } ++ } ++ ++ input = qmi_message_uim_open_logical_channel_input_new (); ++ qmi_message_uim_open_logical_channel_input_set_slot (input, slot, NULL); ++ if (aid_data) ++ qmi_message_uim_open_logical_channel_input_set_aid (input, aid_data, NULL); ++ ++ return input; ++} ++ ++static void ++open_logical_channel_ready (QmiClientUim *client, ++ GAsyncResult *res) ++{ ++ g_autoptr(QmiMessageUimOpenLogicalChannelOutput) output = NULL; ++ g_autoptr(GError) error = NULL; ++ guint8 channel_id; ++ ++ output = qmi_client_uim_open_logical_channel_finish (client, res, &error); ++ if (!output) { ++ g_printerr ("error: operation failed: %s\n", error->message); ++ operation_shutdown (FALSE); ++ return; ++ } ++ ++ if (!qmi_message_uim_open_logical_channel_output_get_result (output, &error)) { ++ g_printerr ("error: open logical channel operation failed: %s\n", error->message); ++ operation_shutdown (FALSE); ++ return; ++ } ++ ++ if (!qmi_message_uim_open_logical_channel_output_get_channel_id (output, &channel_id, &error)) { ++ g_printerr ("error: get channel id operation failed: %s\n", error->message); ++ operation_shutdown (FALSE); ++ return; ++ } ++ ++ g_print ("Open Logical Channel operation successfully completed: %d\n", channel_id); ++ operation_shutdown (TRUE); ++} ++ ++#endif /* HAVE_QMI_MESSAGE_UIM_OPEN_LOGICAL_CHANNEL */ ++ + void + qmicli_uim_run (QmiDevice *device, + QmiClientUim *client, +@@ -3057,6 +3135,28 @@ qmicli_uim_run (QmiDevice *device, + } + #endif + ++#if defined HAVE_QMI_MESSAGE_UIM_OPEN_LOGICAL_CHANNEL ++ /* Request to open logical channel? */ ++ if (open_logical_channel_str) { ++ g_autoptr(QmiMessageUimOpenLogicalChannelInput) input = NULL; ++ ++ g_debug ("Asynchronously opening logical channel..."); ++ input = open_logical_channel_input_create (open_logical_channel_str); ++ if (!input) { ++ operation_shutdown (FALSE); ++ return; ++ } ++ ++ qmi_client_uim_open_logical_channel (ctx->client, ++ input, ++ 10, ++ ctx->cancellable, ++ (GAsyncReadyCallback)open_logical_channel_ready, ++ NULL); ++ return; ++ } ++#endif ++ + /* Just client allocate/release? */ + if (noop_flag) { + g_idle_add (noop_cb, NULL); +-- +2.45.1 + diff --git a/community/libqmi/0003-uim-Add-Send-APDU-command.patch b/community/libqmi/0003-uim-Add-Send-APDU-command.patch new file mode 100644 index 00000000000..6825e07da7d --- /dev/null +++ b/community/libqmi/0003-uim-Add-Send-APDU-command.patch @@ -0,0 +1,234 @@ +From 262c098794914079125490d088c7eb2ceb515e41 Mon Sep 17 00:00:00 2001 +From: Luca Weiss <luca.weiss@fairphone.com> +Date: Fri, 23 Feb 2024 10:12:35 +0100 +Subject: [PATCH 3/5] uim: Add Send APDU command + +Allow an APDU to be sent to the SIM card, using the logical channel +opened with Open Logical Channel. + +QMI format is based on ChromiumOS hermes definition: +https://chromium.googlesource.com/chromiumos/platform2/+/eab2f7edb247fc11b3f0ec4b886aa7a5b12f24f6/hermes/uim_cmd.qmi#38 +--- + data/qmi-service-uim.json | 37 ++++++ + .../libqmi-glib/libqmi-glib-docs.xml | 1 + + src/qmicli/qmicli-uim.c | 109 ++++++++++++++++++ + 3 files changed, 147 insertions(+) + +diff --git a/data/qmi-service-uim.json b/data/qmi-service-uim.json +index 2a0d21e6..9a562ead 100644 +--- a/data/qmi-service-uim.json ++++ b/data/qmi-service-uim.json +@@ -920,6 +920,43 @@ + "format" : "guint8" } ] } } ] }, + "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, + ++ // ********************************************************************************* ++ { "name" : "Send APDU", ++ "type" : "Message", ++ "service" : "UIM", ++ "id" : "0x003B", ++ "since" : "1.36", ++ "input" : [ { "name" : "Slot", ++ "id" : "0x01", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "guint8" }, ++ { "name" : "APDU", ++ "id" : "0x02", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "array", ++ "size-prefix-format" : "guint16", ++ "array-element" : { "format" : "guint8" } }, ++ { "name" : "Channel ID", ++ "id" : "0x10", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "guint8" }, ++ { "name" : "Procedure bytes", ++ "id" : "0x11", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "guint8" } ], ++ "output" : [ { "common-ref" : "Operation Result" }, ++ { "name" : "APDU Response", ++ "id" : "0x10", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "array", ++ "size-prefix-format" : "guint16", ++ "array-element" : { "format" : "guint8" } } ] }, ++ + // ********************************************************************************* + { "name" : "Open Logical Channel", + "type" : "Message", +diff --git a/docs/reference/libqmi-glib/libqmi-glib-docs.xml b/docs/reference/libqmi-glib/libqmi-glib-docs.xml +index f6cd58b2..72c76fa5 100644 +--- a/docs/reference/libqmi-glib/libqmi-glib-docs.xml ++++ b/docs/reference/libqmi-glib/libqmi-glib-docs.xml +@@ -372,6 +372,7 @@ + <xi:include href="xml/qmi-message-uim-refresh-complete.xml"/> + <xi:include href="xml/qmi-message-uim-remote-unlock.xml"/> + <xi:include href="xml/qmi-message-uim-open-logical-channel.xml"/> ++ <xi:include href="xml/qmi-message-uim-send-apdu.xml"/> + </section> + </chapter> + +diff --git a/src/qmicli/qmicli-uim.c b/src/qmicli/qmicli-uim.c +index 402d74fe..cd91ec99 100644 +--- a/src/qmicli/qmicli-uim.c ++++ b/src/qmicli/qmicli-uim.c +@@ -30,6 +30,7 @@ + #include <gio/gio.h> + + #include <libqmi-glib.h> ++#include <qmi-common.h> + + #include "qmicli.h" + #include "qmicli-helpers.h" +@@ -66,6 +67,7 @@ static gchar *switch_slot_str; + static gchar *depersonalization_str; + static gchar *remote_unlock_str; + static gchar *open_logical_channel_str; ++static gchar *send_apdu_str; + static gchar **monitor_refresh_file_array; + static gboolean get_card_status_flag; + static gboolean get_supported_messages_flag; +@@ -211,6 +213,12 @@ static GOptionEntry entries[] = { + "Open logical channel", + "[(slot number),(aid)]" + }, ++#endif ++#if defined HAVE_QMI_MESSAGE_UIM_SEND_APDU ++ { "uim-send-apdu", 0, 0, G_OPTION_ARG_STRING, &send_apdu_str, ++ "Send APDU", ++ "[(slot number),(channel ID),(apdu)]" ++ }, + #endif + { "uim-noop", 0, 0, G_OPTION_ARG_NONE, &noop_flag, + "Just allocate or release a UIM client. Use with `--client-no-release-cid' and/or `--client-cid'", +@@ -258,6 +266,7 @@ qmicli_uim_options_enabled (void) + !!depersonalization_str + + !!remote_unlock_str + + !!open_logical_channel_str + ++ !!send_apdu_str + + get_card_status_flag + + get_supported_messages_flag + + get_slot_status_flag + +@@ -2736,6 +2745,84 @@ open_logical_channel_ready (QmiClientUim *client, + + #endif /* HAVE_QMI_MESSAGE_UIM_OPEN_LOGICAL_CHANNEL */ + ++#if defined HAVE_QMI_MESSAGE_UIM_SEND_APDU ++ ++static QmiMessageUimSendApduInput * ++send_apdu_input_create (const gchar *str) ++{ ++ QmiMessageUimSendApduInput *input; ++ g_auto(GStrv) split = NULL; ++ guint slot; ++ guint channel_id; ++ g_autoptr(GArray) apdu_data = NULL; ++ ++ /* Prepare inputs. ++ * Format of the string is: ++ * "[(slot number),(channel ID),(apdu)]" ++ */ ++ split = g_strsplit (str, ",", -1); ++ ++ if (!split[0] || !qmicli_read_uint_from_string (split[0], &slot) || (slot > G_MAXUINT8)) { ++ g_printerr ("error: invalid slot number\n"); ++ return NULL; ++ } ++ ++ if (!split[1] || !qmicli_read_uint_from_string (split[1], &channel_id) || (channel_id > G_MAXUINT8)) { ++ g_printerr ("error: invalid channel ID\n"); ++ return NULL; ++ } ++ ++ if (!split[2] || !qmicli_read_raw_data_from_string (split[2], &apdu_data)) { ++ g_printerr ("error: invalid APDU data\n"); ++ return NULL; ++ } ++ ++ input = qmi_message_uim_send_apdu_input_new (); ++ qmi_message_uim_send_apdu_input_set_slot (input, slot, NULL); ++ qmi_message_uim_send_apdu_input_set_channel_id (input, channel_id, NULL); ++ qmi_message_uim_send_apdu_input_set_apdu (input, apdu_data, NULL); ++ ++ return input; ++} ++ ++static void ++send_apdu_ready (QmiClientUim *client, ++ GAsyncResult *res) ++{ ++ g_autoptr(QmiMessageUimSendApduOutput) output = NULL; ++ g_autoptr(GError) error = NULL; ++ GArray *apdu_res = NULL; ++ gchar *apdu_res_hex; ++ ++ output = qmi_client_uim_send_apdu_finish (client, res, &error); ++ if (!output) { ++ g_printerr ("error: operation failed: %s\n", error->message); ++ operation_shutdown (FALSE); ++ return; ++ } ++ ++ if (!qmi_message_uim_send_apdu_output_get_result (output, &error)) { ++ g_printerr ("error: send apdu operation failed: %s\n", error->message); ++ operation_shutdown (FALSE); ++ return; ++ } ++ ++ if (!qmi_message_uim_send_apdu_output_get_apdu_response (output, &apdu_res, &error)) { ++ g_printerr ("error: get apdu response operation failed: %s\n", error->message); ++ operation_shutdown (FALSE); ++ return; ++ } ++ ++ g_print ("Send APDU operation successfully completed:"); ++ apdu_res_hex = qmi_common_str_hex (apdu_res->data, apdu_res->len, ':'); ++ g_print (" %s\n", apdu_res_hex); ++ g_free (apdu_res_hex); ++ ++ operation_shutdown (TRUE); ++} ++ ++#endif /* HAVE_QMI_MESSAGE_UIM_SEND_APDU */ ++ + void + qmicli_uim_run (QmiDevice *device, + QmiClientUim *client, +@@ -3157,6 +3244,28 @@ qmicli_uim_run (QmiDevice *device, + } + #endif + ++#if defined HAVE_QMI_MESSAGE_UIM_SEND_APDU ++ /* Request to send APDU? */ ++ if (send_apdu_str) { ++ g_autoptr(QmiMessageUimSendApduInput) input = NULL; ++ ++ g_debug ("Asynchronously sending APDU..."); ++ input = send_apdu_input_create (send_apdu_str); ++ if (!input) { ++ operation_shutdown (FALSE); ++ return; ++ } ++ ++ qmi_client_uim_send_apdu (ctx->client, ++ input, ++ 10, ++ ctx->cancellable, ++ (GAsyncReadyCallback)send_apdu_ready, ++ NULL); ++ return; ++ } ++#endif ++ + /* Just client allocate/release? */ + if (noop_flag) { + g_idle_add (noop_cb, NULL); +-- +2.45.1 + diff --git a/community/libqmi/0004-uim-Add-Logical-Channel-command.patch b/community/libqmi/0004-uim-Add-Logical-Channel-command.patch new file mode 100644 index 00000000000..cecbc9ac327 --- /dev/null +++ b/community/libqmi/0004-uim-Add-Logical-Channel-command.patch @@ -0,0 +1,296 @@ +From a8bd657cafc5d9265b1e3ee63a143d5c43e925cb Mon Sep 17 00:00:00 2001 +From: Luca Weiss <luca.weiss@fairphone.com> +Date: Fri, 1 Mar 2024 09:54:21 +0100 +Subject: [PATCH 4/5] uim: Add Logical Channel command + +While the "Logical Channel" command can do more things, it can be used +for closing a logical channel that has been opened previously. + +QMI format is based on gobi-api definition: +https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/main/gobi-api/GobiAPI_2013-07-31-1347/GobiConnectionMgmt/GobiConnectionMgmtAPIStructs.h#L24531-24584 +--- + data/qmi-service-uim.json | 59 ++++++++++++ + .../libqmi-glib/libqmi-glib-common.sections | 4 + + .../libqmi-glib/libqmi-glib-docs.xml | 1 + + src/libqmi-glib/qmi-enums-uim.h | 20 +++++ + src/qmicli/qmicli-uim.c | 89 +++++++++++++++++++ + 5 files changed, 173 insertions(+) + +diff --git a/data/qmi-service-uim.json b/data/qmi-service-uim.json +index 9a562ead..181f0418 100644 +--- a/data/qmi-service-uim.json ++++ b/data/qmi-service-uim.json +@@ -957,6 +957,65 @@ + "size-prefix-format" : "guint16", + "array-element" : { "format" : "guint8" } } ] }, + ++ // ********************************************************************************* ++ { "name" : "Logical Channel", ++ "type" : "Message", ++ "service" : "UIM", ++ "id" : "0x003F", ++ "since" : "1.36", ++ "input" : [ { "name" : "Slot", ++ "id" : "0x01", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "guint8" }, ++ { "name" : "AID", ++ "id" : "0x10", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "array", ++ "size-prefix-format" : "guint8", ++ "array-element" : { "format" : "guint8" } }, ++ { "name" : "Channel ID", ++ "id" : "0x11", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "guint8" }, ++ { "name" : "File Control Information", ++ "id" : "0x12", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "guint8", ++ "public-format" : "QmiUimFileControlInformation" }, ++ { "name" : "Terminate Application", ++ "id" : "0x13", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "guint8" } ], ++ "output" : [ { "common-ref" : "Operation Result" }, ++ { "name" : "Channel ID", ++ "id" : "0x10", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "guint8", ++ "prerequisites" : [ { "common-ref" : "Success" } ] }, ++ { "name" : "Card result", ++ "id" : "0x11", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "sequence", ++ "contents" : [ { "name" : "SW1", ++ "format" : "guint8" }, ++ { "name" : "SW2", ++ "format" : "guint8" } ] }, ++ { "name" : "Select Response", ++ "id" : "0x12", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "array", ++ "size-prefix-format" : "guint8", ++ "array-element" : { "format" : "guint8" }, ++ "prerequisites" : [ { "common-ref" : "Success" } ] } ] }, ++ + // ********************************************************************************* + { "name" : "Open Logical Channel", + "type" : "Message", +diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections +index 89473ed8..3709dff5 100644 +--- a/docs/reference/libqmi-glib/libqmi-glib-common.sections ++++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections +@@ -961,6 +961,7 @@ QmiUimRefreshMode + QmiUimRefreshStage + QmiUimConfiguration + QmiUimDepersonalizationOperation ++QmiUimFileControlInformation + <SUBSECTION Methods> + qmi_uim_event_registration_flag_build_string_from_mask + qmi_uim_session_type_get_string +@@ -983,6 +984,7 @@ qmi_uim_refresh_mode_get_string + qmi_uim_refresh_stage_get_string + qmi_uim_configuration_build_string_from_mask + qmi_uim_depersonalization_operation_get_string ++qmi_uim_file_control_information_get_string + <SUBSECTION Standard> + QMI_TYPE_UIM_EVENT_REGISTRATION_FLAG + QMI_TYPE_UIM_SESSION_TYPE +@@ -1005,6 +1007,7 @@ QMI_TYPE_UIM_REFRESH_MODE + QMI_TYPE_UIM_REFRESH_STAGE + QMI_TYPE_UIM_CONFIGURATION + QMI_TYPE_UIM_DEPERSONALIZATION_OPERATION ++QMI_TYPE_UIM_FILE_CONTROL_INFORMATION + qmi_uim_event_registration_flag_get_type + qmi_uim_session_type_get_type + qmi_uim_file_type_get_type +@@ -1026,6 +1029,7 @@ qmi_uim_refresh_mode_get_type + qmi_uim_refresh_stage_get_type + qmi_uim_configuration_get_type + qmi_uim_depersonalization_operation_get_type ++qmi_uim_file_control_information_get_type + </SECTION> + + <SECTION> +diff --git a/docs/reference/libqmi-glib/libqmi-glib-docs.xml b/docs/reference/libqmi-glib/libqmi-glib-docs.xml +index 72c76fa5..c59f1fad 100644 +--- a/docs/reference/libqmi-glib/libqmi-glib-docs.xml ++++ b/docs/reference/libqmi-glib/libqmi-glib-docs.xml +@@ -373,6 +373,7 @@ + <xi:include href="xml/qmi-message-uim-remote-unlock.xml"/> + <xi:include href="xml/qmi-message-uim-open-logical-channel.xml"/> + <xi:include href="xml/qmi-message-uim-send-apdu.xml"/> ++ <xi:include href="xml/qmi-message-uim-logical-channel.xml"/> + </section> + </chapter> + +diff --git a/src/libqmi-glib/qmi-enums-uim.h b/src/libqmi-glib/qmi-enums-uim.h +index 76ede04a..64814441 100644 +--- a/src/libqmi-glib/qmi-enums-uim.h ++++ b/src/libqmi-glib/qmi-enums-uim.h +@@ -558,4 +558,24 @@ typedef enum { /*< since=1.30 >*/ + QMI_UIM_DEPERSONALIZATION_OPERATION_UNBLOCK = 1, + } QmiUimDepersonalizationOperation; + ++/** ++ * QmiUimFileControlInformation: ++ * @QMI_UIM_FILE_CONTROL_INFORMATION_NO_DATA: No data. ++ * @QMI_UIM_FILE_CONTROL_INFORMATION_FCP: File control parameters ++ * @QMI_UIM_FILE_CONTROL_INFORMATION_FCI: File control information ++ * @QMI_UIM_FILE_CONTROL_INFORMATION_FCI_WITH_INTERFACES: FCI with interfaces ++ * @QMI_UIM_FILE_CONTROL_INFORMATION_FMD: File management data ++ * ++ * File Control Information. ++ * ++ * Since: 1.36 ++ */ ++typedef enum { /*< since=1.36 >*/ ++ QMI_UIM_FILE_CONTROL_INFORMATION_NO_DATA = 0, ++ QMI_UIM_FILE_CONTROL_INFORMATION_FCP = 1, ++ QMI_UIM_FILE_CONTROL_INFORMATION_FCI = 2, ++ QMI_UIM_FILE_CONTROL_INFORMATION_FCI_WITH_INTERFACES = 3, ++ QMI_UIM_FILE_CONTROL_INFORMATION_FMD = 4, ++} QmiUimFileControlInformation; ++ + #endif /* _LIBQMI_GLIB_QMI_ENUMS_UIM_H_ */ +diff --git a/src/qmicli/qmicli-uim.c b/src/qmicli/qmicli-uim.c +index cd91ec99..83b0c8fa 100644 +--- a/src/qmicli/qmicli-uim.c ++++ b/src/qmicli/qmicli-uim.c +@@ -67,6 +67,7 @@ static gchar *switch_slot_str; + static gchar *depersonalization_str; + static gchar *remote_unlock_str; + static gchar *open_logical_channel_str; ++static gchar *close_logical_channel_str; + static gchar *send_apdu_str; + static gchar **monitor_refresh_file_array; + static gboolean get_card_status_flag; +@@ -214,6 +215,12 @@ static GOptionEntry entries[] = { + "[(slot number),(aid)]" + }, + #endif ++#if defined HAVE_QMI_MESSAGE_UIM_LOGICAL_CHANNEL ++ { "uim-close-logical-channel", 0, 0, G_OPTION_ARG_STRING, &close_logical_channel_str, ++ "Close logical channel", ++ "[(slot number),(channel ID)]" ++ }, ++#endif + #if defined HAVE_QMI_MESSAGE_UIM_SEND_APDU + { "uim-send-apdu", 0, 0, G_OPTION_ARG_STRING, &send_apdu_str, + "Send APDU", +@@ -266,6 +273,7 @@ qmicli_uim_options_enabled (void) + !!depersonalization_str + + !!remote_unlock_str + + !!open_logical_channel_str + ++ !!close_logical_channel_str + + !!send_apdu_str + + get_card_status_flag + + get_supported_messages_flag + +@@ -2745,6 +2753,65 @@ open_logical_channel_ready (QmiClientUim *client, + + #endif /* HAVE_QMI_MESSAGE_UIM_OPEN_LOGICAL_CHANNEL */ + ++#if defined HAVE_QMI_MESSAGE_UIM_LOGICAL_CHANNEL ++ ++static QmiMessageUimLogicalChannelInput * ++close_logical_channel_input_create (const gchar *str) ++{ ++ QmiMessageUimLogicalChannelInput *input; ++ g_auto(GStrv) split = NULL; ++ guint slot; ++ guint channel_id; ++ ++ /* Prepare inputs. ++ * Format of the string is: ++ * "[(slot number),(channel ID)]" ++ */ ++ split = g_strsplit (str, ",", -1); ++ ++ if (!split[0] || !qmicli_read_uint_from_string (split[0], &slot) || (slot > G_MAXUINT8)) { ++ g_printerr ("error: invalid slot number\n"); ++ return NULL; ++ } ++ ++ if (!split[1] || !qmicli_read_uint_from_string (split[1], &channel_id) || (channel_id > G_MAXUINT8)) { ++ g_printerr ("error: invalid channel ID\n"); ++ return NULL; ++ } ++ ++ input = qmi_message_uim_logical_channel_input_new (); ++ qmi_message_uim_logical_channel_input_set_slot (input, slot, NULL); ++ qmi_message_uim_logical_channel_input_set_channel_id (input, channel_id, NULL); ++ ++ return input; ++} ++ ++static void ++close_logical_channel_ready (QmiClientUim *client, ++ GAsyncResult *res) ++{ ++ g_autoptr(QmiMessageUimLogicalChannelOutput) output = NULL; ++ g_autoptr(GError) error = NULL; ++ ++ output = qmi_client_uim_logical_channel_finish (client, res, &error); ++ if (!output) { ++ g_printerr ("error: operation failed: %s\n", error->message); ++ operation_shutdown (FALSE); ++ return; ++ } ++ ++ if (!qmi_message_uim_logical_channel_output_get_result (output, &error)) { ++ g_printerr ("error: close logical channel operation failed: %s\n", error->message); ++ operation_shutdown (FALSE); ++ return; ++ } ++ ++ g_print ("Close Logical Channel operation successfully completed\n"); ++ operation_shutdown (TRUE); ++} ++ ++#endif /* HAVE_QMI_MESSAGE_UIM_LOGICAL_CHANNEL */ ++ + #if defined HAVE_QMI_MESSAGE_UIM_SEND_APDU + + static QmiMessageUimSendApduInput * +@@ -3244,6 +3311,28 @@ qmicli_uim_run (QmiDevice *device, + } + #endif + ++#if defined HAVE_QMI_MESSAGE_UIM_LOGICAL_CHANNEL ++ /* Request to close logical channel? */ ++ if (close_logical_channel_str) { ++ g_autoptr(QmiMessageUimLogicalChannelInput) input = NULL; ++ ++ g_debug ("Asynchronously closing logical channel..."); ++ input = close_logical_channel_input_create (close_logical_channel_str); ++ if (!input) { ++ operation_shutdown (FALSE); ++ return; ++ } ++ ++ qmi_client_uim_logical_channel (ctx->client, ++ input, ++ 10, ++ ctx->cancellable, ++ (GAsyncReadyCallback)close_logical_channel_ready, ++ NULL); ++ return; ++ } ++#endif ++ + #if defined HAVE_QMI_MESSAGE_UIM_SEND_APDU + /* Request to send APDU? */ + if (send_apdu_str) { +-- +2.45.1 + diff --git a/community/libqmi/0005-uim-Add-File-Control-Information-to-Open-Logical-Cha.patch b/community/libqmi/0005-uim-Add-File-Control-Information-to-Open-Logical-Cha.patch new file mode 100644 index 00000000000..bd2a2fc042a --- /dev/null +++ b/community/libqmi/0005-uim-Add-File-Control-Information-to-Open-Logical-Cha.patch @@ -0,0 +1,34 @@ +From 1fcfda5f1dc5675afe54846ca0d01e32b39fbac2 Mon Sep 17 00:00:00 2001 +From: Luca Weiss <luca.weiss@fairphone.com> +Date: Fri, 1 Mar 2024 10:33:23 +0100 +Subject: [PATCH 5/5] uim: Add "File Control Information" to Open Logical + Channel request + +According to gobi-api sources this TLV exists: +https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/main/gobi-api/GobiAPI_2013-07-31-1347/GobiConnectionMgmt/GobiConnectionMgmtAPIStructs.h#L24641-24645 +--- + data/qmi-service-uim.json | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/data/qmi-service-uim.json b/data/qmi-service-uim.json +index 181f0418..cd7ca237 100644 +--- a/data/qmi-service-uim.json ++++ b/data/qmi-service-uim.json +@@ -1033,7 +1033,13 @@ + "since" : "1.36", + "format" : "array", + "size-prefix-format" : "guint8", +- "array-element" : { "format" : "guint8" } } ], ++ "array-element" : { "format" : "guint8" } }, ++ { "name" : "File Control Information", ++ "id" : "0x11", ++ "type" : "TLV", ++ "since" : "1.36", ++ "format" : "guint8", ++ "public-format" : "QmiUimFileControlInformation" } ], + "output" : [ { "common-ref" : "Operation Result" }, + { "name" : "Channel ID", + "id" : "0x10", +-- +2.45.1 + diff --git a/community/libqmi/APKBUILD b/community/libqmi/APKBUILD index 21d52a77d2e..4087983b707 100644 --- a/community/libqmi/APKBUILD +++ b/community/libqmi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=libqmi pkgver=1.34.0 -pkgrel=0 +pkgrel=1 pkgdesc="QMI modem protocol helper library" url="https://www.freedesktop.org/wiki/Software/libqmi" arch="all" @@ -25,7 +25,13 @@ subpackages=" $pkgname-bash-completion qmi-utils " -source="https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$pkgver/libqmi-$pkgver.tar.gz" +source="https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$pkgver/libqmi-$pkgver.tar.gz + 0001-qmi-common-turn-qmi_helpers_str_hex-into-qmi_common_.patch + 0002-uim-Add-Open-Logical-Channel-command.patch + 0003-uim-Add-Send-APDU-command.patch + 0004-uim-Add-Logical-Channel-command.patch + 0005-uim-Add-File-Control-Information-to-Open-Logical-Cha.patch + " build() { abuild-meson \ @@ -54,4 +60,9 @@ utils() { sha512sums=" 4be50814c846e986d2f792af1d488e76f9e3d5457741c1e49187232150b4e14fd26538d0850f2c014be0144b61781827787ca466cd94f1032019ec69e3ab3f3b libqmi-1.34.0.tar.gz +9fd2e5a4b3b5b148c01e9b713385623b1c9c20b491b8d99760cb42fcf0a1d7d1f3bcb35044119bb57c8577bc19dd3d7a20098dc2447b397612aee01bc52d9974 0001-qmi-common-turn-qmi_helpers_str_hex-into-qmi_common_.patch +503c0f8ac3869b5fc0486708d10ec9095148d900914187a00e3c0a90d47657672e6dffddbf1cf59a66601272e9b598f710ea14c2eacf7dc49b05838506878d58 0002-uim-Add-Open-Logical-Channel-command.patch +c66418eaba0ce6d6a878685a2e80a86cd8cf5c47ecb2842fbf15439f5335e6b19e69e9838579eee156e53938e05570327b82e2e22349eb30e3a92c10e82b7ec9 0003-uim-Add-Send-APDU-command.patch +0bc0568f5bde4bd12f7a73875a9c178af3d2fb2151dd119084501e33156e21062964e7bdbd6137d0b66011048150fb12c8194ffa2d50b1e114e9361836456478 0004-uim-Add-Logical-Channel-command.patch +548b795681ed8bafad2e34a3c7f8857fa8c09e6814afd94569b9254d3865fffb21c28d9056552866defee7af43ea735c9f767895a61cf158da99bc416c0f0079 0005-uim-Add-File-Control-Information-to-Open-Logical-Cha.patch " 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/libreoffice/APKBUILD b/community/libreoffice/APKBUILD index 34c5201c45a..0b1ca2541a5 100644 --- a/community/libreoffice/APKBUILD +++ b/community/libreoffice/APKBUILD @@ -5,18 +5,16 @@ pkgname=libreoffice # "fresh" version. before, we used to package still, but community/ is only # 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=4 +pkgver=7.6.7.2 +pkgrel=0 pkgdesc="LibreOffice - Meta package for the full office suite" url="https://www.libreoffice.org/" -# missing openjdk17 on riscv64 # armhf disabled due to requiring armv6k as minimum arm architecture # ppc64le: hangs forever in build on builders -arch="all !ppc64le !s390x !riscv64 !armhf" +arch="all !ppc64le !s390x !armhf" license="MPL-2.0" makedepends=" abseil-cpp-dev - apache-ant autoconf automake bison @@ -104,12 +102,12 @@ makedepends=" " # openjdk isn't available on 32-bit case $CARCH in -x86|arm*|ppc64le) +x86|arm*|riscv64) _have_java=false ;; *) _have_java=true - makedepends="$makedepends openjdk17-jdk openjdk17-jre-headless" + makedepends="$makedepends apache-ant openjdk21-jdk openjdk21-jre-headless" ;; esac # GNU sed is needed for in i18npool/CustomTarget_localedata.mk @@ -178,11 +176,12 @@ source="https://download.documentfoundation.org/libreoffice/src/$_v/libreoffice- musl-stacksize.patch musl-libintl.patch icu74.patch - libxml-2.12.patch " options="!check" # todo, huge testsuite, not much value, .. # secfixes: +# 7.6.7.2-r0: +# - CVE-2024-3044 # 7.3.6.2-r0: # - CVE-2022-3140 # 7.2.7.2-r0: @@ -384,7 +383,7 @@ build() { export CXXFLAGS="${CXXFLAGS//-Os/-O2}" if [ "$_have_java" = true ]; then - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk + export JAVA_HOME=/usr/lib/jvm/java-21-openjdk local java=" --with-jdk-home=$JAVA_HOME --with-ant-home=/usr/share/java/apache-ant @@ -626,9 +625,9 @@ sdk() { } sha512sums=" -dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6 libreoffice-7.6.4.1.tar.xz -aa5ee67fdb7f3746c35f462554430cd83b6dfd24fb5afb42bbca22eb501b5f0631ab25d64805bb9aef21231ded59ffa7850186689ff2057801a1f85e0ba036ea libreoffice-dictionaries-7.6.4.1.tar.xz -4e7108754f50e117566e16b86e98f1d5e808e2bd07a472be27da1ececdd79b039f731d528e844015ef95dba8dc03e0e771cdd3bd9b5d7df7a9dd4c20683ee4a7 libreoffice-translations-7.6.4.1.tar.xz +443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747 libreoffice-7.6.7.2.tar.xz +b7ec4b06e0b595e1aff68607a43a40e8faf8757d76b67d915d5f15c4f6d6ed1282637931aa6058468ca8ddfb19f3fec95facedb4fe2a3959429e9fd28eab7909 libreoffice-dictionaries-7.6.7.2.tar.xz +f22903f315d6f3cc1b5be9e19cf668e2bd207a5737328d9e577eb3d37122393ef9440597de633f422c93174ba3b13bebc33f84d79461aad48b7d4e9d67d1c422 libreoffice-translations-7.6.7.2.tar.xz a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -657,5 +656,4 @@ a322cda7f9bb8e191033b41d1076208c5edfbf8a0ef1d0c2a210b5be61d75a8918c3530db246fb7c 3364062dac89722d6ec738a254e2296f4f6e0426e689e16be59fa1bcc504aea4a183859f82277f1409c25965b08655d1e643cef4dff03d96aba1fa4bfc2feb06 musl-stacksize.patch d99d074e89e2713a3b6a56fa60d9d989ca6eefc8884ccbf88cb16c7b09da6dde4ba4ebc6a4d8408b61a08088df7cb1bcda60738f91e5569179fc45d7e9b901a3 musl-libintl.patch 9f96ca0fde7014fcdef8a974f6e3fc4e3360186fedbaa3c65e29196384fca066cc819536695c614a904f3add80b8ee004f6588ab4fd32e52f69b655fe72fa885 icu74.patch -d2125816be231c6b13055374394efd69e7f079687f7e4cdc22553bc4b1cf771670e3d46579bc07c3fd246a3caa608024e884edacd807038835463bb0060153e9 libxml-2.12.patch " diff --git a/community/libreoffice/libxml-2.12.patch b/community/libreoffice/libxml-2.12.patch deleted file mode 100644 index d4c6083dd74..00000000000 --- a/community/libreoffice/libxml-2.12.patch +++ /dev/null @@ -1,300 +0,0 @@ -From c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb Mon Sep 17 00:00:00 2001 -From: Miklos Vajna <vmiklos@collabora.com> -Date: Mon, 27 Nov 2023 08:02:59 +0100 -Subject: [PATCH] tdf#158302 fix build against system-libxml-2.12 - -Seen in a fedora:40 container, using --with-system-libcmis, ---with-system-liblangtag and --with-system-xmlsec. - -Change-Id: I9d748d3dc0b70dbfdfcb6b99c9ce8440bda6f326 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159980 -Tested-by: Jenkins -Reviewed-by: Miklos Vajna <vmiklos@collabora.com> ---- - drawinglayer/source/tools/primitive2dxmldump.cxx | 1 + - filter/source/xsltfilter/LibXSLTTransformer.cxx | 2 +- - helpcompiler/source/HelpLinker.cxx | 4 ++++ - include/xmloff/xmltoken.hxx | 2 +- - sax/source/fastparser/fastparser.cxx | 2 +- - sc/source/core/tool/interpr7.cxx | 1 + - sc/source/filter/xml/XMLExportDataPilot.cxx | 2 +- - sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 2 +- - sc/source/filter/xml/xmlfilti.cxx | 6 +++--- - unoxml/source/dom/attr.cxx | 1 + - unoxml/source/dom/document.cxx | 1 + - unoxml/source/dom/documentbuilder.cxx | 1 + - unoxml/source/dom/entity.cxx | 1 + - unoxml/source/xpath/xpathapi.cxx | 7 ++++++- - xmloff/source/core/xmltoken.cxx | 2 +- - xmloff/source/style/PageMasterStyleMap.cxx | 2 +- - xmlsecurity/inc/xmlsec-wrapper.h | 1 + - xmlsecurity/inc/xmlsec/saxhelper.hxx | 1 + - 18 files changed, 28 insertions(+), 11 deletions(-) - -diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx -index 76aefec902ead..f3b9ef1bc9193 100644 ---- a/drawinglayer/source/tools/primitive2dxmldump.cxx -+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx -@@ -15,6 +15,7 @@ - - #include <math.h> - #include <memory> -+#include <libxml/parser.h> - #include <sal/log.hxx> - - #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> -diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx -index 1a7c34805f1b5..5e9a7c4bcd35e 100644 ---- a/filter/source/xsltfilter/LibXSLTTransformer.cxx -+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx -@@ -333,7 +333,7 @@ namespace XSLT - } - else - { -- xmlErrorPtr lastErr = xmlGetLastError(); -+ const xmlError* lastErr = xmlGetLastError(); - OUString msg; - if (lastErr) - msg = OStringToOUString(lastErr->message, RTL_TEXTENCODING_UTF8); -diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx -index 3d52834dbe6bf..898a8b26392a9 100644 ---- a/helpcompiler/source/HelpLinker.cxx -+++ b/helpcompiler/source/HelpLinker.cxx -@@ -815,7 +815,11 @@ static const HelpProcessingException* GpXMLParsingException = nullptr; - - extern "C" { - -+#if LIBXML_VERSION >= 21200 -+static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const xmlError* error) -+#else - static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error) -+#endif - { - std::string aErrorMsg = error->message; - std::string aXMLParsingFile; -diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx -index 4e64418417740..ba42fae4d035a 100644 ---- a/include/xmloff/xmltoken.hxx -+++ b/include/xmloff/xmltoken.hxx -@@ -744,7 +744,7 @@ namespace xmloff::token { - XML_EMBEDDED_VISIBLE_AREA, - XML_EMBOSSED, - XML_EMISSIVE_COLOR, -- XML_EMPTY, -+ XML_TOKEN_EMPTY, - XML_EMPTY_LINE_REFRESH, - XML_ENABLE_NUMBERING, - XML_ENABLED, -diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx -index ec8065016a12d..e0338e053cf05 100644 ---- a/sax/source/fastparser/fastparser.cxx -+++ b/sax/source/fastparser/fastparser.cxx -@@ -578,7 +578,7 @@ Event& Entity::getEvent( CallbackType aType ) - OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, std::u16string_view sSystemId, sal_Int32 nLine ) - { - const char* pMessage; -- xmlErrorPtr error = xmlCtxtGetLastError( ctxt ); -+ const xmlError* error = xmlCtxtGetLastError( ctxt ); - if( error && error->message ) - pMessage = error->message; - else -diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx -index 352c7cf70e45d..ecb4ea346396b 100644 ---- a/sc/source/core/tool/interpr7.cxx -+++ b/sc/source/core/tool/interpr7.cxx -@@ -31,6 +31,7 @@ - #include <cstring> - #include <memory> - #include <string_view> -+#include <libxml/parser.h> - - using namespace com::sun::star; - -diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx -index da65bec0dab75..bd5f16d828ff7 100644 ---- a/sc/source/filter/xml/XMLExportDataPilot.cxx -+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx -@@ -123,7 +123,7 @@ void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, boo - - if (aQueryEntry.IsQueryByEmpty()) - { -- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_EMPTY)); -+ rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_TOKEN_EMPTY)); - } - else if (aQueryEntry.IsQueryByNonEmpty()) - { -diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx -index 6905e02d651bc..e4307065bd92f 100644 ---- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx -+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx -@@ -376,7 +376,7 @@ class WriteDatabaseRange - case SC_EQUAL: - { - if (rEntry.IsQueryByEmpty()) -- return GetXMLToken(XML_EMPTY); -+ return GetXMLToken(XML_TOKEN_EMPTY); - else if (rEntry.IsQueryByNonEmpty()) - return GetXMLToken(XML_NOEMPTY); - -diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx -index 7585ce0c50fa1..61f7cfe4a3495 100644 ---- a/sc/source/filter/xml/xmlfilti.cxx -+++ b/sc/source/filter/xml/xmlfilti.cxx -@@ -370,7 +370,7 @@ void ScXMLConditionContext::GetOperator( - rEntry.eOp = SC_BOTPERC; - else if (IsXMLToken(aOpStr, XML_BOTTOM_VALUES)) - rEntry.eOp = SC_BOTVAL; -- else if (IsXMLToken(aOpStr, XML_EMPTY)) -+ else if (IsXMLToken(aOpStr, XML_TOKEN_EMPTY)) - rEntry.SetQueryByEmpty(); - else if (aOpStr == u">") - rEntry.eOp = SC_GREATER; -@@ -422,7 +422,7 @@ void SAL_CALL ScXMLConditionContext::endFastElement( sal_Int32 /*nElement*/ ) - if (maQueryItems.empty()) - { - ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); -- if (IsXMLToken(sOperator, XML_EMPTY)) -+ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY)) - return; - if (IsXMLToken(sDataType, XML_NUMBER)) - { -@@ -753,7 +753,7 @@ void SAL_CALL ScXMLDPConditionContext::endFastElement( sal_Int32 /*nElement*/ ) - else - aFilterField.eConnect = SC_AND; - pFilterContext->SetIsCaseSensitive(bIsCaseSensitive); -- if (IsXMLToken(sOperator, XML_EMPTY)) -+ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY)) - aFilterField.SetQueryByEmpty(); - else if (IsXMLToken(sOperator, XML_NOEMPTY)) - aFilterField.SetQueryByNonEmpty(); -diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx -index dd974d910edb1..d8d873cdf0555 100644 ---- a/unoxml/source/dom/attr.cxx -+++ b/unoxml/source/dom/attr.cxx -@@ -22,6 +22,7 @@ - #include <string.h> - - #include <memory> -+#include <libxml/entities.h> - - #include <osl/diagnose.h> - #include <sal/log.hxx> -diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx -index cb48bd1635f82..0825fc2cd7edd 100644 ---- a/unoxml/source/dom/document.cxx -+++ b/unoxml/source/dom/document.cxx -@@ -41,6 +41,7 @@ - #include <eventdispatcher.hxx> - - #include <string.h> -+#include <libxml/xmlIO.h> - - #include <osl/diagnose.h> - -diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx -index c3cd7663d2fc6..3898d58e4be4a 100644 ---- a/unoxml/source/dom/documentbuilder.cxx -+++ b/unoxml/source/dom/documentbuilder.cxx -@@ -22,6 +22,7 @@ - #include <string.h> - - #include <libxml/xmlerror.h> -+#include <libxml/parser.h> - - #include <memory> - -diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx -index ccc8a08724997..98909dfe8f123 100644 ---- a/unoxml/source/dom/entity.cxx -+++ b/unoxml/source/dom/entity.cxx -@@ -22,6 +22,7 @@ - #include <osl/diagnose.h> - - #include <string.h> -+#include <libxml/entities.h> - - using namespace css::uno; - using namespace css::xml::dom; -diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx -index a60083983882e..c2b7537831766 100644 ---- a/unoxml/source/xpath/xpathapi.cxx -+++ b/unoxml/source/xpath/xpathapi.cxx -@@ -26,6 +26,7 @@ - #include <libxml/xmlerror.h> - #include <libxml/xpath.h> - #include <libxml/xpathInternals.h> -+#include <libxml/xmlIO.h> - - #include <com/sun/star/xml/xpath/XPathException.hpp> - -@@ -217,7 +218,7 @@ namespace XPath - return selectSingleNode(contextNode, expr); - } - -- static OUString make_error_message(xmlErrorPtr pError) -+ static OUString make_error_message(const xmlError* pError) - { - OUStringBuffer buf; - if (pError) { -@@ -259,7 +260,11 @@ namespace XPath - SAL_WARN("unoxml", "libxml2 error: " << str); - } - -+#if LIBXML_VERSION >= 21200 -+ static void structured_error_func(void *, const xmlError* error) -+#else - static void structured_error_func(void *, xmlErrorPtr error) -+#endif - { - SAL_WARN("unoxml", "libxml2 error: " << make_error_message(error)); - } -diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx -index 6879f37db2950..e11dc0d161119 100644 ---- a/xmloff/source/core/xmltoken.cxx -+++ b/xmloff/source/core/xmltoken.cxx -@@ -756,7 +756,7 @@ namespace xmloff::token { - TOKEN( "embedded-visible-area", XML_EMBEDDED_VISIBLE_AREA ), - TOKEN( "embossed", XML_EMBOSSED ), - TOKEN( "emissive-color", XML_EMISSIVE_COLOR ), -- TOKEN( "empty", XML_EMPTY ), -+ TOKEN( "empty", XML_TOKEN_EMPTY ), - TOKEN( "empty-line-refresh", XML_EMPTY_LINE_REFRESH ), - TOKEN( "enable-numbering", XML_ENABLE_NUMBERING ), - TOKEN( "enabled", XML_ENABLED ), -diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx -index 7b2cab4751aa8..6f631289672b7 100644 ---- a/xmloff/source/style/PageMasterStyleMap.cxx -+++ b/xmloff/source/style/PageMasterStyleMap.cxx -@@ -157,7 +157,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = - PLMAP( PROP_FootnoteLineRelativeWidth, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_PERCENT8|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_WIDTH ), - PLMAP( PROP_FootnoteLineTextDistance, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_MEASURE|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_DISTANCE ), - PLMAP( PROP_FootnoteLineWeight, XML_NAMESPACE_STYLE, XML_FOOTNOTE_SEP, XML_TYPE_MEASURE16|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_WEIGHT ), -- PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ), -+ PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_TOKEN_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ), - PLMAP_EXT(PROP_GutterMargin, XML_NAMESPACE_LO_EXT, XML_MARGIN_GUTTER, XML_TYPE_MEASURE, CTF_PM_MARGINGUTTER), - - ////////////////////////////////////////////////////////////////////////// -diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h -index 7c6d267e8b739..3ad705400c52c 100644 ---- a/xmlsecurity/inc/xmlsec-wrapper.h -+++ b/xmlsecurity/inc/xmlsec-wrapper.h -@@ -23,6 +23,7 @@ - - #include <sal/types.h> - -+#include <libxml/parser.h> - #include <xmlsec/base64.h> - #include <xmlsec/bn.h> - #include <xmlsec/errors.h> -diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx -index a49ccef1894c6..a5863ffd0e2a0 100644 ---- a/xmlsecurity/inc/xmlsec/saxhelper.hxx -+++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx -@@ -23,6 +23,7 @@ - - #include <string_view> - -+#include <libxml/parser.h> - #include <libxml/tree.h> - - #include <rtl/ustring.hxx> diff --git a/community/librsvg/APKBUILD b/community/librsvg/APKBUILD index a9d6e805a05..24a473e6efc 100644 --- a/community/librsvg/APKBUILD +++ b/community/librsvg/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=librsvg -pkgver=2.58.0 +pkgver=2.58.1 pkgrel=0 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" url="https://wiki.gnome.org/Projects/LibRsvg" @@ -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" @@ -90,5 +92,6 @@ _convert_doc() { } sha512sums=" -56bf2b1b9b524142b4b79fe6f289cb33f334ab8a714f9898dacecc9461fbea8248477c29929446503e7a8d8cd16152ee3b7b7807279e436b6d079cfa6a4b1151 librsvg-2.58.0.tar.xz +f38bf70cc282071634b791d54af52d0cf32882ba99e504fdc6a5bf79d721163d946f7d22ddbd3c4ebed7bbf39b69eb9f925300389d377a5d220f453e367855dd librsvg-2.58.1.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/libsecp256k1/APKBUILD b/community/libsecp256k1/APKBUILD index 95aec14061f..8efec3a9ae2 100644 --- a/community/libsecp256k1/APKBUILD +++ b/community/libsecp256k1/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Michał Adamski <michal@ert.pl> pkgname=libsecp256k1 -pkgver=0.3.2 -pkgrel=0 +pkgver=0.5.0 +pkgrel=1 pkgdesc="Optimized C library for EC operations on curve secp256k1" url="https://github.com/bitcoin-core/secp256k1" arch="all" @@ -25,6 +25,8 @@ build() { --disable-static \ --enable-module-ecdh \ --enable-module-recovery \ + --enable-module-schnorrsig \ + --enable-module-extrakeys \ --disable-benchmark \ --disable-exhaustive-tests \ --disable-examples @@ -40,5 +42,5 @@ package() { } sha512sums=" -18104b72dd5d1f5e776d72c31c36247e450736437b453b59cf6ec86f84fedeafcf231e266c1ddad727befd9864c65a779000d01e6cef4b9a6485850afebc8a81 secp256k1-v0.3.2.tar.gz +b8511b0d8b581d371ee48f2c8a5a72930e7a0686a860200e56e83e2f58a63f2d781af75829d922e98f6648d361e20efde29abcf52c086b77647457c6c3586e78 secp256k1-v0.5.0.tar.gz " diff --git a/community/libslirp/APKBUILD b/community/libslirp/APKBUILD index 0d60d62c659..5bd86f2d9b2 100644 --- a/community/libslirp/APKBUILD +++ b/community/libslirp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=libslirp -pkgver=4.7.0 +pkgver=4.8.0 pkgrel=0 pkgdesc="A general purpose TCP-IP emulator" url="https://gitlab.freedesktop.org/slirp/libslirp" @@ -37,5 +37,5 @@ package() { } sha512sums=" -387f4a6dad240ce633df2640bb49c6cb0041c8b3afc8d0ef38186d385f00dd9e4ef4443e93e1b71dbf05e22892b6f2771a87a202e815d8ec899ab5c147a1f09f libslirp-v4.7.0.tar.gz +eef9d77f1588c4e3dcf91cd53e54db235d624998fc64df75d389657411635f28bfcbe0c81cd3b0ede7792eea1eb7ef716b8a87a199a6be1e9a29da27ca4a1df4 libslirp-v4.8.0.tar.gz " diff --git a/community/libssc/APKBUILD b/community/libssc/APKBUILD index 0a2b6c3dec4..c6ebb6f1aeb 100644 --- a/community/libssc/APKBUILD +++ b/community/libssc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Dylan Van Assche <me@dylanvanassche.be> # Contributor: Dylan Van Assche <me@dylanvanassche.be> pkgname=libssc -pkgver=0.1.4 +pkgver=0.1.5 pkgrel=0 pkgdesc="Library to expose Qualcomm Sensor Core sensors" url="https://codeberg.org/DylanVanAssche/libssc" @@ -33,5 +33,5 @@ package() { } sha512sums=" -ac5a602c366ef1c188b5600fce82cb913f702a33cdc5430ceb25c75ddf40461293da59d6e24cd120646905530b881501f2e42da1b0ed76ffbe3941bf5dce225a libssc-0.1.4.tar.gz +be710c12b946918a28e1ba0f6bdcb1e6d6af7f1917ff052e4329d967219f0e03425fa699a8ad7237c0b242aa33e0ed827f9d5cb1cb2471cd484bc232a5af46be libssc-0.1.5.tar.gz " diff --git a/testing/libubox/APKBUILD b/community/libubox/APKBUILD index da21285b060..fded01b333d 100644 --- a/testing/libubox/APKBUILD +++ b/community/libubox/APKBUILD @@ -1,19 +1,18 @@ -# Maintainer: Ariadne Conill <ariadne@dereferenced.org> +# Contributor: Ariadne Conill <ariadne@dereferenced.org> +# Maintainer: omni <omni+alpine@hack.org> pkgname=libubox -pkgver=20230523 +pkgver=2024.03.29 pkgrel=0 +_owrtgit=eb9bcb64 pkgdesc="OpenWrt utility and data structures library" url="https://git.openwrt.org/project/ustream-ssl.git" arch="all" license="ISC" -depends="" depends_dev="libubox json-c-dev" makedepends="cmake $depends_dev" subpackages="libblobmsg jshn $pkgname-static $pkgname-dev" -_owrtgit=75a3b870 -_owrtver="${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}-${_owrtgit}" -source="https://sources.openwrt.org/libubox-${_owrtver}.tar.xz" -builddir="$srcdir/libubox-${_owrtver}" +source="https://sources.openwrt.org/libubox-$pkgver~$_owrtgit.tar.xz" +builddir="$srcdir/libubox-$pkgver~$_owrtgit" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -50,5 +49,5 @@ package() { } sha512sums=" -67cac344dc58bccd54937a8a32d8492be8b8d007b2419c3b90e6290d5ac995934c9de6f29f3a0e48382b9ef2af83ec2e4a2a97c346b4de2d42999b70eecfaf88 libubox-2023-05-23-75a3b870.tar.xz +53284071ca086f1561c0c932b3c534180ef736b3e65d68101ad4bb7d5a3f3fb6232c09b9ea95239999fbddee6a1f50a6dc6b5725636abb4360f60019797a1fcb libubox-2024.03.29~eb9bcb64.tar.xz " diff --git a/community/libupnpp/APKBUILD b/community/libupnpp/APKBUILD index 1052cb665b8..2fdb23620e9 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.5 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 +619de7f1448dd7473af8bc980e6806c60a6223b26ebcccb1e0a857af48868fe81d8f28cdc713d84c720072f07630751149d1ab5b2a1c5a0890822308ce7bd18e libupnpp-0.26.5.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/libvpx/APKBUILD b/community/libvpx/APKBUILD index b0f5d7e6216..0e74cfaea19 100644 --- a/community/libvpx/APKBUILD +++ b/community/libvpx/APKBUILD @@ -26,6 +26,9 @@ options="!check" # - CVE-2019-9325 # - CVE-2019-9232 +# GCC13 unrecognized '-mlsx' '-mlasx' on loongarch64 +[ "$CARCH" = "loongarch64" ] && _target="--target=generic-gnu" + build() { # build fix for arm export CROSS=" " @@ -47,7 +50,8 @@ build() { --enable-vp9 \ --enable-vp9-highbitdepth \ --enable-vp9-postproc \ - --enable-vp9-temporal-denoising + --enable-vp9-temporal-denoising \ + $_target make } 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 4a7c2ac193f..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 diff --git a/community/limine/APKBUILD b/community/limine/APKBUILD index 06d548e037a..66727b95838 100644 --- a/community/limine/APKBUILD +++ b/community/limine/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: streaksu <streaksu@member.fsf.org> pkgname=limine -pkgver=7.5.0 +pkgver=7.5.3 pkgrel=0 pkgdesc="Advanced, portable, multiprotocol bootloader" url="https://limine-bootloader.org" @@ -136,7 +136,7 @@ updater() { } sha512sums=" -927cba6eecc8b01ee0af7f3dc24392fc50bce28b06e36c50d44ab995f3a5f7ab17f804116e00fac3c7a92749340802a2643f20a54ebf8fb9ec44f13fa03dbe5a limine-7.5.0.tar.gz +c424434cf557560d695cd7c73f982f2dbdce4376d4fe4552af3e6efd56155e8ff23ab652351084f59e8ce9ed40394e24ea10a4eaa2b159c599face2c8877c592 limine-7.5.3.tar.gz e4a92c519e5a17bae16ec31dcdc7faeefbbaf12531744839e4ce5335a347a15c3955ac2c36ddf848abc33651b2e9536d298356dac8f2c6a54f9a8dff34a69a0d limine-efi-updater.sh 394c5067b850eb7b8b236c172471c6b9d152a4ef823d2f6b71396199fbe798638ef4031e60402fdfdfc9425aed0b7e119d15625fc0007622d35fbfadf9457cf8 limine-efi.conf " diff --git a/testing/links-graphics/APKBUILD b/community/links-graphics/APKBUILD index fd1ca8757dd..1f4532bda8f 100644 --- a/testing/links-graphics/APKBUILD +++ b/community/links-graphics/APKBUILD @@ -6,7 +6,7 @@ pkgrel=1 pkgdesc="Web browser running in both graphics and text mode" url="http://links.twibright.com/" arch="all" -license="GPL-2.0-or-later" +license="GPL-2.0-or-later WITH OpenSSL-Exception" makedepends=" bzip2-dev jpeg-dev diff --git a/community/linux-edge/APKBUILD b/community/linux-edge/APKBUILD index 97ebc4ccde0..9aaaf9a638d 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.9 +pkgver=6.9.1 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -265,10 +265,10 @@ _doc() { } sha512sums=" -5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068 linux-6.8.tar.xz -89c036fac161c5df8c594d62ccc7c841ae2ea19b9e0c66cdb2a4404101e39bef765c0ccc774bd81a281ab160cdff83f3a64beac7b616eb337cdef908de10ad65 patch-6.8.9.xz -5ec0058f94b2587cb6b435718f9a07c929c353c37d059ca99d65a1e6a2feafbeb2a7a5419336bf78c0eed0a7b27226c19bdc33acbacf973a4932f67ddd58aa0d config-edge.aarch64 -822887510ec25d56feba0e41ad94309fcb3c8f7679cb03437c209dce855b0a02cd0214dd2cedc07f5cab40689d78e940332f26877e6d5445b60974fac6bb1302 config-edge.armv7 -262d8fb19036f2cb0bd98d8206c4030455f03552e7edbf8853b5c22520045c24f75b1ce41908cdec4a483a7a03ceea6ebbc2fe4169bffb77911696e6df25a56b config-edge.x86_64 -ab95f9c88cc69dbe1e08cd0b1a94250ca09a4c154e199f7de53f47e5ce081bea5cfa7ac9d823933d1941f34345928a6a3dc46faeb0dbd2ca37e55e9712d3b8d2 config-edge.riscv64 +fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579 linux-6.9.tar.xz +e75b7aa6517f4141cbfbd35641231fec7a3e5fae5742496e806b8f73ab38fd951749da25d919f783c01eca5f0e05cc3c6458d87b462131f9a5bfce5e5fd9a45a patch-6.9.1.xz +fe50191cd59d8d005abe7198ea68266ce8ecb3dfa1af7af89666af4ab22a64634d3656938031ec864229ac43a2038b633189aea4e52e7394a731444191502b10 config-edge.aarch64 +f90e92a6011ed89b934c5291cb6863e9f35d087722a9bb4c43b83a8802729cfbeca697e4b4a9bc3d27624970e971607a56e5b3dbb526f741dbc5b3f9552559c6 config-edge.armv7 +24dfef4770206a0ce9847c3b4633e8bfec6441f3c3892982cebb69da1bbe7ebb3f747faeaece54ca71af2979d8ef16ddb9a49ff84c4720847713f284e4955414 config-edge.x86_64 +8ba69835ba72e68bdf0620bb42ea67fa289d5c245c2b12354f9331137b548354cec6001dad751d4a85d23ec0b39b319018230633c4f6107cffc47ecdcf03f0af config-edge.riscv64 " diff --git a/community/linux-edge/config-edge.aarch64 b/community/linux-edge/config-edge.aarch64 index a0d2d23f15e..c167d44c882 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.9 Kernel Configuration +# Linux/arm64 6.9.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" CONFIG_CC_IS_GCC=y @@ -264,7 +264,6 @@ CONFIG_SYSTEM_DATA_VERIFICATION=y # # Kexec and crash features # -CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y CONFIG_KEXEC=y # CONFIG_KEXEC_FILE is not set @@ -276,7 +275,6 @@ CONFIG_ARM64=y CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_64BIT=y CONFIG_MMU=y -CONFIG_ARM64_PAGE_SHIFT=12 CONFIG_ARM64_CONT_PTE_SHIFT=4 CONFIG_ARM64_CONT_PMD_SHIFT=4 CONFIG_ARCH_MMAP_RND_BITS_MIN=18 @@ -411,6 +409,7 @@ CONFIG_ARM64_4K_PAGES=y # CONFIG_ARM64_64K_PAGES is not set # CONFIG_ARM64_VA_BITS_39 is not set CONFIG_ARM64_VA_BITS_48=y +# CONFIG_ARM64_VA_BITS_52 is not set CONFIG_ARM64_VA_BITS=48 CONFIG_ARM64_PA_BITS_48=y CONFIG_ARM64_PA_BITS=48 @@ -439,7 +438,6 @@ CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y CONFIG_ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG=y CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y -CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y CONFIG_TRANS_TABLE=y CONFIG_XEN_DOM0=y CONFIG_XEN=y @@ -540,6 +538,9 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_HIBERNATION_SNAPSHOT_DEV=y +CONFIG_HIBERNATION_COMP_LZO=y +# CONFIG_HIBERNATION_COMP_LZ4 is not set +CONFIG_HIBERNATION_DEF_COMP="lzo" CONFIG_PM_STD_PARTITION="" CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -604,7 +605,6 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y # CONFIG_CPUFREQ_DT=m CONFIG_CPUFREQ_DT_PLATDEV=y -# CONFIG_ACPI_CPPC_CPUFREQ is not set CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m CONFIG_ARM_ARMADA_37XX_CPUFREQ=m # CONFIG_ARM_ARMADA_8K_CPUFREQ is not set @@ -617,6 +617,7 @@ CONFIG_ARM_TEGRA20_CPUFREQ=m CONFIG_ARM_TEGRA124_CPUFREQ=y CONFIG_ARM_TEGRA186_CPUFREQ=m CONFIG_ARM_TEGRA194_CPUFREQ=m +# CONFIG_ACPI_CPPC_CPUFREQ is not set # end of CPU Frequency scaling # end of CPU Power Management @@ -649,7 +650,6 @@ CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_PCI_SLOT=y CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HED=m -# CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_BGRT is not set CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y CONFIG_ACPI_NUMA=y @@ -667,7 +667,6 @@ CONFIG_ACPI_PPTT=y # CONFIG_ACPI_FFH is not set CONFIG_PMIC_OPREGION=y CONFIG_ACPI_PRMT=y -CONFIG_HAVE_KVM=y CONFIG_KVM_COMMON=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_IRQ_ROUTING=y @@ -676,6 +675,7 @@ CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y CONFIG_NEED_KVM_DIRTY_RING_WITH_BITMAP=y CONFIG_KVM_MMIO=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_READONLY_MEM=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y @@ -720,6 +720,7 @@ CONFIG_ARCH_WANTS_NO_INSTR=y CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_RUST=y CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_PERF_REGS=y @@ -768,8 +769,11 @@ CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_ARCH_MMAP_RND_BITS=18 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 +CONFIG_HAVE_PAGE_SIZE_4KB=y +CONFIG_PAGE_SIZE_4KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SHIFT=12 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y @@ -839,6 +843,7 @@ CONFIG_MODULE_COMPRESS_GZIP=y # CONFIG_MODULE_DECOMPRESS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set CONFIG_MODPROBE_PATH="/sbin/modprobe" +# CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y CONFIG_BLOCK_LEGACY_AUTOLOAD=y @@ -944,7 +949,6 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set -# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set # CONFIG_ZSWAP_SHRINKER_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y @@ -1065,7 +1069,6 @@ CONFIG_SKB_EXTENSIONS=y CONFIG_PACKET=m CONFIG_PACKET_DIAG=m CONFIG_UNIX=y -CONFIG_UNIX_SCM=y CONFIG_AF_UNIX_OOB=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m @@ -1439,6 +1442,7 @@ CONFIG_IP_VS_PE_SIP=m # IP: Netfilter Configuration # CONFIG_NF_DEFRAG_IPV4=m +CONFIG_IP_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y @@ -1471,6 +1475,7 @@ CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_SECURITY is not set CONFIG_IP_NF_ARPTABLES=m +CONFIG_NFT_COMPAT_ARP=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m # end of IP: Netfilter Configuration @@ -1478,6 +1483,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # +CONFIG_IP6_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y @@ -1515,6 +1521,7 @@ CONFIG_NF_TABLES_BRIDGE=m # CONFIG_NFT_BRIDGE_META is not set CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_CONNTRACK_BRIDGE=m +CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1706,7 +1713,6 @@ CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m # CONFIG_NET_ACT_SAMPLE is not set -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m @@ -1984,6 +1990,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_ARM_AMBA=y CONFIG_TEGRA_AHB=y CONFIG_HAVE_PCI=y +CONFIG_GENERIC_PCI_IOMAP=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS_GENERIC=y @@ -2104,7 +2111,6 @@ CONFIG_CXL_PORT=m CONFIG_CXL_SUSPEND=y CONFIG_CXL_REGION=y # CONFIG_CXL_REGION_INVALIDATION_TEST is not set -CONFIG_CXL_PMU=m # CONFIG_PCCARD is not set # CONFIG_RAPIDIO is not set @@ -2341,7 +2347,6 @@ CONFIG_MTD_PHYSMAP=m # CONFIG_MTD_PHYSMAP_OF is not set # CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set CONFIG_MTD_PCI=m -CONFIG_MTD_INTEL_VR_NOR=m CONFIG_MTD_PLATRAM=m # end of Mapping drivers for chip access @@ -2408,6 +2413,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set # CONFIG_MTD_UBI_BLOCK is not set +# CONFIG_MTD_UBI_NVMEM is not set # CONFIG_MTD_HYPERBUS is not set CONFIG_DTC=y CONFIG_OF=y @@ -2855,6 +2861,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_LOG_WRITES=m CONFIG_DM_INTEGRITY=m CONFIG_DM_AUDIT=y +# CONFIG_DM_VDO is not set CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m @@ -3125,6 +3132,7 @@ CONFIG_SKY2=m # CONFIG_OCTEONTX2_AF is not set # CONFIG_OCTEONTX2_PF is not set # CONFIG_OCTEON_EP is not set +# CONFIG_OCTEON_EP_VF is not set # CONFIG_PRESTERA is not set # CONFIG_NET_VENDOR_MEDIATEK is not set CONFIG_NET_VENDOR_MELLANOX=y @@ -3335,7 +3343,11 @@ CONFIG_NATIONAL_PHY=m # CONFIG_NXP_C45_TJA11XX_PHY is not set # CONFIG_NXP_TJA11XX_PHY is not set # CONFIG_NCN26000_PHY is not set +CONFIG_QCOM_NET_PHYLIB=m CONFIG_AT803X_PHY=m +# CONFIG_QCA83XX_PHY is not set +# CONFIG_QCA808X_PHY is not set +# CONFIG_QCA807X_PHY is not set CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m CONFIG_RENESAS_PHY=m @@ -3375,6 +3387,7 @@ CONFIG_CAN_CC770=m CONFIG_CAN_CC770_PLATFORM=m # CONFIG_CAN_CTUCANFD_PCI is not set # CONFIG_CAN_CTUCANFD_PLATFORM is not set +# CONFIG_CAN_ESD_402_PCI is not set CONFIG_CAN_IFI_CANFD=m CONFIG_CAN_M_CAN=m # CONFIG_CAN_M_CAN_PCI is not set @@ -3955,6 +3968,8 @@ CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m # CONFIG_TOUCHSCREEN_EXC3000 is not set CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GOODIX=m +# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set +# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set @@ -4120,7 +4135,6 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -4509,6 +4523,7 @@ CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_KVM=m # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set # CONFIG_PTP_1588_CLOCK_IDTCM is not set +# CONFIG_PTP_1588_CLOCK_FC3W is not set # CONFIG_PTP_1588_CLOCK_MOCK is not set # CONFIG_PTP_1588_CLOCK_OCP is not set # end of PTP clock support @@ -4521,6 +4536,7 @@ CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y # CONFIG_PINCTRL_AMD is not set CONFIG_PINCTRL_AXP209=m +# CONFIG_PINCTRL_AW9523 is not set # CONFIG_PINCTRL_CY8C95X0 is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set @@ -4723,6 +4739,7 @@ CONFIG_GPIO_PCF857X=m # # MFD GPIO expanders # +CONFIG_GPIO_CROS_EC=m CONFIG_GPIO_JANZ_TTL=m # end of MFD GPIO expanders @@ -4774,6 +4791,7 @@ CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_DS2482=m # CONFIG_W1_MASTER_GPIO is not set # CONFIG_W1_MASTER_SGI is not set +# CONFIG_W1_MASTER_UART is not set # end of 1-wire Bus Masters # @@ -4906,10 +4924,12 @@ CONFIG_SENSORS_AHT10=m # CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set # CONFIG_SENSORS_AS370 is not set CONFIG_SENSORS_ASC7621=m +# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set # CONFIG_SENSORS_AXI_FAN_CONTROL is not set CONFIG_SENSORS_ARM_SCMI=m CONFIG_SENSORS_ARM_SCPI=m CONFIG_SENSORS_ATXP1=m +# CONFIG_SENSORS_CHIPCAP2 is not set # CONFIG_SENSORS_CORSAIR_CPRO is not set # CONFIG_SENSORS_CORSAIR_PSU is not set CONFIG_SENSORS_DRIVETEMP=m @@ -4948,6 +4968,7 @@ CONFIG_SENSORS_LTC4222=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4260=m CONFIG_SENSORS_LTC4261=m +# CONFIG_SENSORS_LTC4282 is not set CONFIG_SENSORS_MAX1111=m # CONFIG_SENSORS_MAX127 is not set CONFIG_SENSORS_MAX16065=m @@ -4997,6 +5018,7 @@ CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NPCM7XX=m # CONFIG_SENSORS_NZXT_KRAKEN2 is not set +# CONFIG_SENSORS_NZXT_KRAKEN3 is not set # CONFIG_SENSORS_NZXT_SMART2 is not set # CONFIG_SENSORS_OCC_P8_I2C is not set CONFIG_SENSORS_PCF8591=m @@ -5038,6 +5060,7 @@ CONFIG_SENSORS_MAX8688=m # CONFIG_SENSORS_MP5023 is not set # CONFIG_SENSORS_MP5990 is not set # CONFIG_SENSORS_MPQ7932 is not set +# CONFIG_SENSORS_MPQ8785 is not set # CONFIG_SENSORS_PIM4328 is not set # CONFIG_SENSORS_PLI1209BC is not set # CONFIG_SENSORS_PM6764TR is not set @@ -5053,6 +5076,7 @@ CONFIG_SENSORS_UCD9200=m # CONFIG_SENSORS_XDPE152 is not set # CONFIG_SENSORS_XDPE122 is not set CONFIG_SENSORS_ZL6100=m +# CONFIG_SENSORS_PT5161L is not set CONFIG_SENSORS_PWM_FAN=m # CONFIG_SENSORS_SBTSI is not set # CONFIG_SENSORS_SBRMI is not set @@ -5118,7 +5142,6 @@ CONFIG_THERMAL_STATISTICS=y # CONFIG_THERMAL_DEBUGFS is not set CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_OF=y -CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -5194,6 +5217,7 @@ CONFIG_WATCHDOG_SYSFS=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_CROS_EC_WATCHDOG=m # CONFIG_GPIO_WATCHDOG is not set CONFIG_WDAT_WDT=m # CONFIG_XILINX_WATCHDOG is not set @@ -6249,23 +6273,26 @@ CONFIG_DVB_SP2=m # Graphics support # CONFIG_APERTURE_HELPERS=y -CONFIG_VIDEO_CMDLINE=y -CONFIG_VIDEO_NOMODESET=y +CONFIG_SCREEN_INFO=y +CONFIG_VIDEO=y CONFIG_AUXDISPLAY=y # CONFIG_HD44780 is not set -# CONFIG_IMG_ASCII_LCD is not set -# CONFIG_HT16K33 is not set # CONFIG_LCD2S is not set # CONFIG_PARPORT_PANEL is not set # CONFIG_CHARLCD_BL_OFF is not set # CONFIG_CHARLCD_BL_ON is not set CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_IMG_ASCII_LCD is not set +# CONFIG_HT16K33 is not set +# CONFIG_MAX6959 is not set +# CONFIG_SEG_LED_GPIO is not set # CONFIG_PANEL is not set CONFIG_TEGRA_HOST1X_CONTEXT_BUS=y CONFIG_TEGRA_HOST1X=m CONFIG_TEGRA_HOST1X_FIREWALL=y CONFIG_DRM=m CONFIG_DRM_MIPI_DSI=y +# CONFIG_DRM_DEBUG_MM is not set CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 @@ -6394,15 +6421,15 @@ CONFIG_DRM_PANEL_ARM_VERSATILE=m # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set # CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set +# CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set -# CONFIG_DRM_PANEL_DSI_CM is not set -# CONFIG_DRM_PANEL_LVDS is not set -CONFIG_DRM_PANEL_SIMPLE=m -CONFIG_DRM_PANEL_EDP=m # CONFIG_DRM_PANEL_EBBG_FT8719 is not set # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m +# CONFIG_DRM_PANEL_DSI_CM is not set +# CONFIG_DRM_PANEL_LVDS is not set +# CONFIG_DRM_PANEL_HIMAX_HX83112A is not set # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set CONFIG_DRM_PANEL_ILITEK_IL9322=m # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set @@ -6412,17 +6439,17 @@ CONFIG_DRM_PANEL_ILITEK_IL9322=m # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set -# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_JDI_LPM102A188A is not set +# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_JDI_R63452 is not set # CONFIG_DRM_PANEL_KHADAS_TS050 is not set # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set -# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set +# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set # CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set @@ -6431,8 +6458,8 @@ CONFIG_DRM_PANEL_ILITEK_IL9322=m # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set +# CONFIG_DRM_PANEL_NOVATEK_NT36672E is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set -# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m @@ -6443,15 +6470,16 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m CONFIG_DRM_PANEL_RAYDIUM_RM68200=m # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set +# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set # CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set CONFIG_DRM_PANEL_SEIKO_43WVF1G=m @@ -6462,19 +6490,21 @@ CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set -# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set # CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set +CONFIG_DRM_PANEL_EDP=m +CONFIG_DRM_PANEL_SIMPLE=m +# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set +# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set # CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set -# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels @@ -6688,6 +6718,7 @@ CONFIG_LCD_HX8357=m # CONFIG_LCD_OTM3225A is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_KTD253 is not set +# CONFIG_BACKLIGHT_KTD2801 is not set # CONFIG_BACKLIGHT_KTZ8866 is not set CONFIG_BACKLIGHT_PWM=m # CONFIG_BACKLIGHT_QCOM_WLED is not set @@ -6866,6 +6897,7 @@ CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 # CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_SCODEC_COMPONENT=m # CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set # CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set # CONFIG_SND_HDA_SCODEC_CS35L56_I2C is not set @@ -7205,6 +7237,7 @@ CONFIG_SND_SOC_TSCS42XX=m # CONFIG_SND_SOC_UDA1334 is not set # CONFIG_SND_SOC_WCD9335 is not set # CONFIG_SND_SOC_WCD938X_SDW is not set +# CONFIG_SND_SOC_WCD939X_SDW is not set # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set # CONFIG_SND_SOC_WM8524 is not set @@ -7436,6 +7469,7 @@ CONFIG_USB_OTG=y # CONFIG_USB_OTG_FSM is not set CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_MON=m # @@ -7782,6 +7816,7 @@ CONFIG_TYPEC_TPS6598X=m # CONFIG_TYPEC_MUX_FSA4480 is not set # CONFIG_TYPEC_MUX_GPIO_SBU is not set CONFIG_TYPEC_MUX_PI3USB30532=m +# CONFIG_TYPEC_MUX_IT5205 is not set # CONFIG_TYPEC_MUX_NB7VPQ904M is not set # CONFIG_TYPEC_MUX_PTN36502 is not set # CONFIG_TYPEC_MUX_WCD939X_USBSS is not set @@ -7842,6 +7877,7 @@ CONFIG_MMC_DW_PLTFM=y # CONFIG_MMC_DW_BLUEFIELD is not set CONFIG_MMC_DW_EXYNOS=m CONFIG_MMC_DW_HI3798CV200=m +# CONFIG_MMC_DW_HI3798MV200 is not set CONFIG_MMC_DW_K3=m CONFIG_MMC_DW_PCI=y CONFIG_MMC_DW_ROCKCHIP=y @@ -7963,6 +7999,7 @@ CONFIG_LEDS_LM3601X=m # # CONFIG_LEDS_GROUP_MULTICOLOR is not set # CONFIG_LEDS_KTD202X is not set +# CONFIG_LEDS_NCP5623 is not set # CONFIG_LEDS_PWM_MULTICOLOR is not set CONFIG_LEDS_QCOM_LPG=m @@ -8278,6 +8315,7 @@ CONFIG_VFIO_PCI_MMAP=y CONFIG_VFIO_PCI_INTX=y CONFIG_VFIO_PCI=m # CONFIG_MLX5_VFIO_PCI is not set +# CONFIG_NVGRACE_GPU_VFIO_PCI is not set # end of VFIO support for PCI devices # @@ -8420,7 +8458,6 @@ CONFIG_VIDEO_ROCKCHIP_VDEC=m # CONFIG_VIDEO_SUNXI is not set # CONFIG_VIDEO_TEGRA is not set # CONFIG_STAGING_MEDIA_DEPRECATED is not set -# CONFIG_STAGING_BOARD is not set # CONFIG_LTE_GDM724X is not set # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set @@ -8633,7 +8670,11 @@ CONFIG_ARMADA_CP110_SYSCON=y CONFIG_QCOM_GDSC=y CONFIG_QCOM_RPMCC=y CONFIG_COMMON_CLK_QCOM=m +# CONFIG_CLK_X1E80100_CAMCC is not set +# CONFIG_CLK_X1E80100_DISPCC is not set # CONFIG_CLK_X1E80100_GCC is not set +# CONFIG_CLK_X1E80100_GPUCC is not set +# CONFIG_CLK_X1E80100_TCSRCC is not set # CONFIG_QCOM_A53PLL is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CLK_APCS_MSM8916 is not set @@ -8681,7 +8722,6 @@ CONFIG_MSM_MMCC_8998=m # CONFIG_SC_LPASSCC_8280XP is not set # CONFIG_SC_LPASS_CORECC_7180 is not set # CONFIG_SC_LPASS_CORECC_7280 is not set -# CONFIG_SC_MSS_7180 is not set # CONFIG_SC_VIDEOCC_7180 is not set # CONFIG_SC_VIDEOCC_7280 is not set # CONFIG_SDM_CAMCC_845 is not set @@ -8961,6 +9001,7 @@ CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_WCNSS_CTRL=m # CONFIG_QCOM_APR is not set # CONFIG_QCOM_ICC_BWMON is not set +# CONFIG_QCOM_PBS is not set # end of Qualcomm SoC drivers CONFIG_ROCKCHIP_GRF=y @@ -8976,6 +9017,7 @@ CONFIG_ARCH_TEGRA_210_SOC=y # CONFIG_ARCH_TEGRA_186_SOC is not set CONFIG_ARCH_TEGRA_194_SOC=y # CONFIG_ARCH_TEGRA_234_SOC is not set +# CONFIG_ARCH_TEGRA_241_SOC is not set CONFIG_SOC_TEGRA_FUSE=y CONFIG_SOC_TEGRA_FLOWCTRL=y CONFIG_SOC_TEGRA_PMC=y @@ -9168,6 +9210,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m # CONFIG_AD7923 is not set # CONFIG_AD7949 is not set # CONFIG_AD799X is not set +# CONFIG_AD9467 is not set # CONFIG_ADI_AXI_ADC is not set CONFIG_AXP20X_ADC=m # CONFIG_AXP288_ADC is not set @@ -9199,6 +9242,7 @@ CONFIG_AXP20X_ADC=m # CONFIG_MEDIATEK_MT6577_AUXADC is not set CONFIG_MESON_SARADC=m # CONFIG_NAU7802 is not set +# CONFIG_PAC1934 is not set CONFIG_QCOM_VADC_COMMON=m # CONFIG_QCOM_SPMI_RRADC is not set # CONFIG_QCOM_SPMI_IADC is not set @@ -9218,6 +9262,7 @@ CONFIG_ROCKCHIP_SARADC=m # CONFIG_TI_ADS1015 is not set # CONFIG_TI_ADS7924 is not set # CONFIG_TI_ADS1100 is not set +# CONFIG_TI_ADS1298 is not set # CONFIG_TI_ADS7950 is not set # CONFIG_TI_ADS8344 is not set # CONFIG_TI_ADS8688 is not set @@ -9373,6 +9418,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m # CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set # CONFIG_ADF4377 is not set +# CONFIG_ADMFM2000 is not set # CONFIG_ADMV1013 is not set # CONFIG_ADMV1014 is not set # CONFIG_ADMV4420 is not set @@ -9514,6 +9560,7 @@ CONFIG_HID_SENSOR_PROX=m # # Magnetometer sensors # +# CONFIG_AF8133J is not set # CONFIG_AK8974 is not set # CONFIG_AK8975 is not set # CONFIG_AK09911 is not set @@ -9723,6 +9770,7 @@ CONFIG_MST_IRQ=y CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y CONFIG_RESET_BERLIN=y +# CONFIG_RESET_GPIO is not set CONFIG_RESET_MESON=y CONFIG_RESET_MESON_AUDIO_ARB=m CONFIG_RESET_QCOM_AOSS=y @@ -9787,6 +9835,7 @@ CONFIG_PHY_MVEBU_A3700_UTMI=y # CONFIG_PHY_MTK_UFS is not set # CONFIG_PHY_MTK_XSPHY is not set CONFIG_PHY_MTK_HDMI=m +# CONFIG_PHY_MTK_MIPI_CSI_0_5 is not set # CONFIG_PHY_MTK_MIPI_DSI is not set # CONFIG_PHY_MTK_DP is not set # CONFIG_PHY_LAN966X_SERDES is not set @@ -9825,6 +9874,7 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=m # CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set # CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY is not set CONFIG_PHY_ROCKCHIP_PCIE=m +# CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX is not set # CONFIG_PHY_ROCKCHIP_SNPS_PCIE3 is not set CONFIG_PHY_ROCKCHIP_TYPEC=m CONFIG_PHY_ROCKCHIP_USB=m @@ -9867,6 +9917,7 @@ CONFIG_PHY_TEGRA_XUSB=m # CONFIG_DWC_PCIE_PMU is not set # CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set # CONFIG_MESON_DDR_PMU is not set +CONFIG_CXL_PMU=m # end of Performance monitor support # CONFIG_RAS is not set @@ -9987,6 +10038,8 @@ CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y CONFIG_XFS_DRAIN_INTENTS=y +CONFIG_XFS_LIVE_HOOKS=y +CONFIG_XFS_MEMORY_BUFS=y CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_ONLINE_SCRUB_STATS=y # CONFIG_XFS_ONLINE_REPAIR is not set @@ -10055,6 +10108,7 @@ CONFIG_AUTOFS_FS=m CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m +CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set # CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set @@ -10097,13 +10151,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="utf8" # CONFIG_FAT_DEFAULT_UTF8 is not set CONFIG_EXFAT_FS=m CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y CONFIG_NTFS3_FS=m # CONFIG_NTFS3_64BIT_CLUSTER is not set # CONFIG_NTFS3_LZX_XPRESS is not set # CONFIG_NTFS3_FS_POSIX_ACL is not set +CONFIG_NTFS_FS=m # end of DOS/FAT/EXFAT/NT Filesystems # @@ -10739,7 +10791,6 @@ CONFIG_GENERIC_NET_UTILS=y CONFIG_CORDIC=m # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y -CONFIG_GENERIC_PCI_IOMAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_ARCH_USE_SYM_ANNOTATIONS=y @@ -10958,7 +11009,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set # CONFIG_DEBUG_FS_ALLOW_NONE is not set CONFIG_HAVE_ARCH_KGDB=y -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +CONFIG_ARCH_HAS_UBSAN=y # CONFIG_UBSAN is not set CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments diff --git a/community/linux-edge/config-edge.armv7 b/community/linux-edge/config-edge.armv7 index 725f44efc95..afab09a6d16 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.9 Kernel Configuration +# Linux/arm 6.9.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" CONFIG_CC_IS_GCC=y @@ -258,7 +258,6 @@ CONFIG_SYSTEM_DATA_VERIFICATION=y # # Kexec and crash features # -CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set @@ -442,13 +441,7 @@ CONFIG_MACH_OMAP_GENERIC=y # end of TI OMAP/AM/DM/DRA Family CONFIG_ARCH_QCOM=y -# CONFIG_ARCH_IPQ40XX is not set -CONFIG_ARCH_MSM8X60=y -# CONFIG_ARCH_MSM8909 is not set -# CONFIG_ARCH_MSM8916 is not set -CONFIG_ARCH_MSM8960=y -CONFIG_ARCH_MSM8974=y -# CONFIG_ARCH_MDM9615 is not set +# CONFIG_ARCH_QCOM_RESERVE_SMEM is not set # CONFIG_ARCH_REALTEK is not set CONFIG_ARCH_ROCKCHIP=y # CONFIG_ARCH_S5PV210 is not set @@ -726,6 +719,9 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_HIBERNATION_SNAPSHOT_DEV=y +CONFIG_HIBERNATION_COMP_LZO=y +# CONFIG_HIBERNATION_COMP_LZ4 is not set +CONFIG_HIBERNATION_DEF_COMP="lzo" CONFIG_PM_STD_PARTITION="" CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -810,8 +806,11 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_EXIT_THREAD=y CONFIG_ARCH_MMAP_RND_BITS=8 +CONFIG_HAVE_PAGE_SIZE_4KB=y +CONFIG_PAGE_SIZE_4KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SHIFT=12 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y @@ -870,6 +869,7 @@ CONFIG_MODULE_COMPRESS_GZIP=y # CONFIG_MODULE_DECOMPRESS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set CONFIG_MODPROBE_PATH="/sbin/modprobe" +# CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_BLOCK=y CONFIG_BLOCK_LEGACY_AUTOLOAD=y CONFIG_BLK_CGROUP_RWSTAT=y @@ -948,7 +948,6 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set -# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set # CONFIG_ZSWAP_SHRINKER_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y @@ -1010,6 +1009,7 @@ CONFIG_CMA=y CONFIG_CMA_AREAS=7 CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_IDLE_PAGE_TRACKING is not set +CONFIG_ARCH_HAS_CPU_CACHE_ALIASING=y CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y CONFIG_ZONE_DMA=y CONFIG_VM_EVENT_COUNTERS=y @@ -1049,7 +1049,6 @@ CONFIG_SKB_EXTENSIONS=y CONFIG_PACKET=m CONFIG_PACKET_DIAG=m CONFIG_UNIX=y -CONFIG_UNIX_SCM=y CONFIG_AF_UNIX_OOB=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m @@ -1424,6 +1423,7 @@ CONFIG_IP_VS_PE_SIP=m # IP: Netfilter Configuration # CONFIG_NF_DEFRAG_IPV4=m +CONFIG_IP_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y @@ -1456,6 +1456,7 @@ CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_SECURITY=m CONFIG_IP_NF_ARPTABLES=m +CONFIG_NFT_COMPAT_ARP=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m # end of IP: Netfilter Configuration @@ -1463,6 +1464,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # +CONFIG_IP6_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y @@ -1500,6 +1502,7 @@ CONFIG_NF_TABLES_BRIDGE=m # CONFIG_NFT_BRIDGE_META is not set CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_CONNTRACK_BRIDGE=m +CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1690,7 +1693,6 @@ CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m # CONFIG_NET_ACT_SAMPLE is not set -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m @@ -1947,6 +1949,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_ARM_AMBA=y CONFIG_TEGRA_AHB=y CONFIG_HAVE_PCI=y +CONFIG_GENERIC_PCI_IOMAP=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS_GENERIC=y @@ -2238,7 +2241,6 @@ CONFIG_MTD_PHYSMAP=m # CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set # CONFIG_MTD_IMPA7 is not set # CONFIG_MTD_PCI is not set -# CONFIG_MTD_INTEL_VR_NOR is not set CONFIG_MTD_PLATRAM=m # end of Mapping drivers for chip access @@ -2307,6 +2309,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set # CONFIG_MTD_UBI_BLOCK is not set +# CONFIG_MTD_UBI_NVMEM is not set # CONFIG_MTD_HYPERBUS is not set CONFIG_DTC=y CONFIG_OF=y @@ -3068,6 +3071,9 @@ CONFIG_NATIONAL_PHY=m # CONFIG_NXP_TJA11XX_PHY is not set # CONFIG_NCN26000_PHY is not set # CONFIG_AT803X_PHY is not set +# CONFIG_QCA83XX_PHY is not set +# CONFIG_QCA808X_PHY is not set +# CONFIG_QCA807X_PHY is not set CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m CONFIG_RENESAS_PHY=m @@ -3108,6 +3114,7 @@ CONFIG_CAN_CC770=m CONFIG_CAN_CC770_PLATFORM=m # CONFIG_CAN_CTUCANFD_PCI is not set # CONFIG_CAN_CTUCANFD_PLATFORM is not set +# CONFIG_CAN_ESD_402_PCI is not set # CONFIG_CAN_IFI_CANFD is not set CONFIG_CAN_M_CAN=m # CONFIG_CAN_M_CAN_PCI is not set @@ -3593,6 +3600,8 @@ CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m # CONFIG_TOUCHSCREEN_EXC3000 is not set CONFIG_TOUCHSCREEN_FUJITSU=m # CONFIG_TOUCHSCREEN_GOODIX is not set +# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set +# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set @@ -3760,7 +3769,6 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -4116,6 +4124,7 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=m CONFIG_PTP_1588_CLOCK_KVM=m # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set # CONFIG_PTP_1588_CLOCK_IDTCM is not set +# CONFIG_PTP_1588_CLOCK_FC3W is not set # CONFIG_PTP_1588_CLOCK_MOCK is not set # CONFIG_PTP_1588_CLOCK_OCP is not set # end of PTP clock support @@ -4127,6 +4136,7 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y CONFIG_PINCTRL_AXP209=m +# CONFIG_PINCTRL_AW9523 is not set # CONFIG_PINCTRL_CY8C95X0 is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set @@ -4275,6 +4285,7 @@ CONFIG_GPIO_PCF857X=m # # MFD GPIO expanders # +CONFIG_GPIO_CROS_EC=m # CONFIG_GPIO_DLN2 is not set # CONFIG_HTC_EGPIO is not set CONFIG_GPIO_TPS65218=m @@ -4462,8 +4473,10 @@ CONFIG_SENSORS_AHT10=m # CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set # CONFIG_SENSORS_AS370 is not set CONFIG_SENSORS_ASC7621=m +# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set # CONFIG_SENSORS_AXI_FAN_CONTROL is not set CONFIG_SENSORS_ATXP1=m +# CONFIG_SENSORS_CHIPCAP2 is not set # CONFIG_SENSORS_CORSAIR_CPRO is not set # CONFIG_SENSORS_CORSAIR_PSU is not set CONFIG_SENSORS_DRIVETEMP=m @@ -4503,6 +4516,7 @@ CONFIG_SENSORS_LTC4222=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4260=m CONFIG_SENSORS_LTC4261=m +# CONFIG_SENSORS_LTC4282 is not set CONFIG_SENSORS_MAX1111=m # CONFIG_SENSORS_MAX127 is not set CONFIG_SENSORS_MAX16065=m @@ -4551,6 +4565,7 @@ CONFIG_SENSORS_NCT6683=m # CONFIG_SENSORS_NCT7904 is not set CONFIG_SENSORS_NPCM7XX=m # CONFIG_SENSORS_NZXT_KRAKEN2 is not set +# CONFIG_SENSORS_NZXT_KRAKEN3 is not set # CONFIG_SENSORS_NZXT_SMART2 is not set # CONFIG_SENSORS_OCC_P8_I2C is not set CONFIG_SENSORS_PCF8591=m @@ -4592,6 +4607,7 @@ CONFIG_SENSORS_MAX8688=m # CONFIG_SENSORS_MP5023 is not set # CONFIG_SENSORS_MP5990 is not set # CONFIG_SENSORS_MPQ7932 is not set +# CONFIG_SENSORS_MPQ8785 is not set # CONFIG_SENSORS_PIM4328 is not set # CONFIG_SENSORS_PLI1209BC is not set # CONFIG_SENSORS_PM6764TR is not set @@ -4607,6 +4623,7 @@ CONFIG_SENSORS_UCD9200=m # CONFIG_SENSORS_XDPE152 is not set # CONFIG_SENSORS_XDPE122 is not set CONFIG_SENSORS_ZL6100=m +# CONFIG_SENSORS_PT5161L is not set CONFIG_SENSORS_PWM_FAN=m # CONFIG_SENSORS_SBTSI is not set # CONFIG_SENSORS_SBRMI is not set @@ -4666,7 +4683,6 @@ CONFIG_THERMAL_STATISTICS=y # CONFIG_THERMAL_DEBUGFS is not set CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_OF=y -# CONFIG_THERMAL_WRITABLE_TRIPS is not set CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -4739,6 +4755,7 @@ CONFIG_WATCHDOG_SYSFS=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +CONFIG_CROS_EC_WATCHDOG=m CONFIG_GPIO_WATCHDOG=m # CONFIG_MENZ069_WATCHDOG is not set CONFIG_XILINX_WATCHDOG=m @@ -5597,17 +5614,18 @@ CONFIG_DVB_SP2=m # Graphics support # CONFIG_APERTURE_HELPERS=y -CONFIG_VIDEO_CMDLINE=y -CONFIG_VIDEO_NOMODESET=y +CONFIG_VIDEO=y CONFIG_AUXDISPLAY=y # CONFIG_HD44780 is not set -# CONFIG_IMG_ASCII_LCD is not set -# CONFIG_HT16K33 is not set # CONFIG_LCD2S is not set -# CONFIG_ARM_CHARLCD is not set # CONFIG_CHARLCD_BL_OFF is not set # CONFIG_CHARLCD_BL_ON is not set CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_IMG_ASCII_LCD is not set +# CONFIG_HT16K33 is not set +# CONFIG_MAX6959 is not set +# CONFIG_SEG_LED_GPIO is not set +# CONFIG_ARM_CHARLCD is not set # CONFIG_TEGRA_HOST1X is not set CONFIG_IMX_IPUV3_CORE=m CONFIG_DRM=y @@ -5651,6 +5669,7 @@ CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_RADEON is not set # CONFIG_DRM_AMDGPU is not set # CONFIG_DRM_NOUVEAU is not set +# CONFIG_DRM_XE is not set # CONFIG_DRM_VGEM is not set # CONFIG_DRM_VKMS is not set CONFIG_DRM_EXYNOS=m @@ -5729,15 +5748,15 @@ CONFIG_DRM_PANEL_ARM_VERSATILE=m # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set # CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set +# CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set -# CONFIG_DRM_PANEL_DSI_CM is not set -# CONFIG_DRM_PANEL_LVDS is not set -CONFIG_DRM_PANEL_SIMPLE=y -CONFIG_DRM_PANEL_EDP=y # CONFIG_DRM_PANEL_EBBG_FT8719 is not set # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set +# CONFIG_DRM_PANEL_DSI_CM is not set +# CONFIG_DRM_PANEL_LVDS is not set +# CONFIG_DRM_PANEL_HIMAX_HX83112A is not set # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set CONFIG_DRM_PANEL_ILITEK_IL9322=m # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set @@ -5747,17 +5766,17 @@ CONFIG_DRM_PANEL_ILITEK_IL9322=m # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set -# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_JDI_LPM102A188A is not set +# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_JDI_R63452 is not set # CONFIG_DRM_PANEL_KHADAS_TS050 is not set # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set -CONFIG_DRM_PANEL_SAMSUNG_LD9040=y # CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set +# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set # CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set @@ -5766,8 +5785,8 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=y # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set +# CONFIG_DRM_PANEL_NOVATEK_NT36672E is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set -# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m @@ -5778,15 +5797,16 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m CONFIG_DRM_PANEL_RAYDIUM_RM68200=m # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set +CONFIG_DRM_PANEL_SAMSUNG_LD9040=y # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m # CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set CONFIG_DRM_PANEL_SEIKO_43WVF1G=m @@ -5797,19 +5817,21 @@ CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set -# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set # CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set +CONFIG_DRM_PANEL_EDP=y +CONFIG_DRM_PANEL_SIMPLE=y +# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set +# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set # CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set -# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels @@ -5862,6 +5884,8 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7511_CEC=y # CONFIG_DRM_CDNS_DSI is not set # CONFIG_DRM_CDNS_MHDP8546 is not set +# CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE is not set +# CONFIG_DRM_IMX8MP_HDMI_PVI is not set # CONFIG_DRM_IMX8QM_LDB is not set # CONFIG_DRM_IMX8QXP_LDB is not set # CONFIG_DRM_IMX8QXP_PIXEL_COMBINER is not set @@ -5997,6 +6021,7 @@ CONFIG_LCD_HX8357=m # CONFIG_LCD_OTM3225A is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_KTD253 is not set +# CONFIG_BACKLIGHT_KTD2801 is not set # CONFIG_BACKLIGHT_KTZ8866 is not set CONFIG_BACKLIGHT_PWM=m # CONFIG_BACKLIGHT_QCOM_WLED is not set @@ -6704,6 +6729,7 @@ CONFIG_USB_OTG=y CONFIG_USB_OTG_FSM=m CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_MON=m # @@ -6960,6 +6986,7 @@ CONFIG_TYPEC_TPS6598X=m # CONFIG_TYPEC_MUX_FSA4480 is not set # CONFIG_TYPEC_MUX_GPIO_SBU is not set CONFIG_TYPEC_MUX_PI3USB30532=m +# CONFIG_TYPEC_MUX_IT5205 is not set # CONFIG_TYPEC_MUX_NB7VPQ904M is not set # CONFIG_TYPEC_MUX_PTN36502 is not set # CONFIG_TYPEC_MUX_WCD939X_USBSS is not set @@ -7024,6 +7051,7 @@ CONFIG_MMC_DW_PLTFM=y # CONFIG_MMC_DW_BLUEFIELD is not set CONFIG_MMC_DW_EXYNOS=y # CONFIG_MMC_DW_HI3798CV200 is not set +# CONFIG_MMC_DW_HI3798MV200 is not set CONFIG_MMC_DW_K3=y # CONFIG_MMC_DW_PCI is not set CONFIG_MMC_DW_ROCKCHIP=y @@ -7138,6 +7166,7 @@ CONFIG_LEDS_LM3601X=m # # CONFIG_LEDS_GROUP_MULTICOLOR is not set # CONFIG_LEDS_KTD202X is not set +# CONFIG_LEDS_NCP5623 is not set # CONFIG_LEDS_PWM_MULTICOLOR is not set # CONFIG_LEDS_QCOM_LPG is not set @@ -7481,7 +7510,6 @@ CONFIG_R8712U=m # CONFIG_FB_SM750 is not set # CONFIG_MFD_NVEC is not set # CONFIG_STAGING_MEDIA is not set -# CONFIG_STAGING_BOARD is not set # CONFIG_LTE_GDM724X is not set CONFIG_FB_TFT=m # CONFIG_FB_TFT_AGM1264K_FL is not set @@ -7799,6 +7827,7 @@ CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_WCNSS_CTRL=m # CONFIG_QCOM_APR is not set # CONFIG_QCOM_ICC_BWMON is not set +# CONFIG_QCOM_PBS is not set # end of Qualcomm SoC drivers CONFIG_ROCKCHIP_GRF=y @@ -8001,6 +8030,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 # CONFIG_AD7923 is not set # CONFIG_AD7949 is not set # CONFIG_AD799X is not set +# CONFIG_AD9467 is not set # CONFIG_ADI_AXI_ADC is not set # CONFIG_AXP20X_ADC is not set CONFIG_AXP288_ADC=m @@ -8035,6 +8065,7 @@ CONFIG_MCP3422=m # CONFIG_MEN_Z188_ADC is not set CONFIG_MESON_SARADC=m # CONFIG_NAU7802 is not set +# CONFIG_PAC1934 is not set CONFIG_QCOM_VADC_COMMON=m # CONFIG_QCOM_PM8XXX_XOADC is not set # CONFIG_QCOM_SPMI_RRADC is not set @@ -8056,6 +8087,7 @@ CONFIG_SUN4I_GPADC=m # CONFIG_TI_ADS1015 is not set # CONFIG_TI_ADS7924 is not set # CONFIG_TI_ADS1100 is not set +# CONFIG_TI_ADS1298 is not set # CONFIG_TI_ADS7950 is not set # CONFIG_TI_ADS8344 is not set # CONFIG_TI_ADS8688 is not set @@ -8206,6 +8238,7 @@ CONFIG_TI_AM335X_ADC=m # CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set # CONFIG_ADF4377 is not set +# CONFIG_ADMFM2000 is not set # CONFIG_ADMV1013 is not set # CONFIG_ADMV4420 is not set # CONFIG_ADRF6780 is not set @@ -8344,6 +8377,7 @@ CONFIG_TI_AM335X_ADC=m # # Magnetometer sensors # +# CONFIG_AF8133J is not set # CONFIG_AK8974 is not set CONFIG_AK8975=m # CONFIG_AK09911 is not set @@ -8546,6 +8580,7 @@ CONFIG_EXYNOS_IRQ_COMBINER=y # CONFIG_IPACK_BUS is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_GPIO is not set CONFIG_RESET_IMX7=y CONFIG_RESET_MESON=y CONFIG_RESET_MESON_AUDIO_ARB=m @@ -8627,6 +8662,7 @@ CONFIG_PHY_QCOM_IPQ806X_SATA=m # CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set # CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY is not set # CONFIG_PHY_ROCKCHIP_PCIE is not set +# CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX is not set # CONFIG_PHY_ROCKCHIP_SNPS_PCIE3 is not set # CONFIG_PHY_ROCKCHIP_TYPEC is not set # CONFIG_PHY_ROCKCHIP_USB is not set @@ -8763,6 +8799,8 @@ CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y CONFIG_XFS_DRAIN_INTENTS=y +CONFIG_XFS_LIVE_HOOKS=y +CONFIG_XFS_MEMORY_BUFS=y CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_ONLINE_SCRUB_STATS=y # CONFIG_XFS_ONLINE_REPAIR is not set @@ -8830,6 +8868,7 @@ CONFIG_AUTOFS_FS=m CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m +CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set # CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set @@ -8871,12 +8910,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="utf8" CONFIG_FAT_DEFAULT_UTF8=y CONFIG_EXFAT_FS=m CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y CONFIG_NTFS3_FS=m # CONFIG_NTFS3_LZX_XPRESS is not set # CONFIG_NTFS3_FS_POSIX_ACL is not set +CONFIG_NTFS_FS=m # end of DOS/FAT/EXFAT/NT Filesystems # @@ -9490,7 +9527,6 @@ CONFIG_GENERIC_NET_UTILS=y CONFIG_CORDIC=m # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y -CONFIG_GENERIC_PCI_IOMAP=y CONFIG_STMP_DEVICE=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y @@ -9675,7 +9711,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set # CONFIG_DEBUG_FS_ALLOW_NONE is not set CONFIG_HAVE_ARCH_KGDB=y -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +CONFIG_ARCH_HAS_UBSAN=y # CONFIG_UBSAN is not set CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments @@ -9693,7 +9729,6 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_PAGE_POISONING is not set # CONFIG_DEBUG_RODATA_TEST is not set -# CONFIG_DEBUG_WX is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_PER_VMA_LOCK_STATS is not set # CONFIG_SHRINKER_DEBUG is not set @@ -9768,6 +9803,7 @@ CONFIG_IO_STRICT_DEVMEM=y # # arm Debugging # +# CONFIG_ARM_DEBUG_WX is not set # CONFIG_UNWINDER_FRAME_POINTER is not set CONFIG_UNWINDER_ARM=y CONFIG_ARM_UNWIND=y diff --git a/community/linux-edge/config-edge.riscv64 b/community/linux-edge/config-edge.riscv64 index 96f2721306e..b912aa53eb1 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.9 Kernel Configuration +# Linux/riscv 6.9.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" CONFIG_CC_IS_GCC=y @@ -239,6 +239,8 @@ CONFIG_CACHESTAT_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_HAVE_PERF_EVENTS=y # @@ -253,7 +255,6 @@ CONFIG_SYSTEM_DATA_VERIFICATION=y # # Kexec and crash features # -CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y CONFIG_KEXEC=y # CONFIG_KEXEC_FILE is not set @@ -314,7 +315,7 @@ CONFIG_ERRATA_SIFIVE=y CONFIG_ERRATA_SIFIVE_CIP_453=y CONFIG_ERRATA_SIFIVE_CIP_1200=y CONFIG_ERRATA_THEAD=y -CONFIG_ERRATA_THEAD_PBMT=y +CONFIG_ERRATA_THEAD_MAE=y CONFIG_ERRATA_THEAD_CMO=y CONFIG_ERRATA_THEAD_PMU=y # end of CPU errata selection @@ -344,6 +345,7 @@ CONFIG_RISCV_ISA_V_DEFAULT_ENABLE=y CONFIG_RISCV_ISA_V_UCOPY_THRESHOLD=768 # CONFIG_RISCV_ISA_V_PREEMPTIVE is not set CONFIG_TOOLCHAIN_HAS_ZBB=y +CONFIG_TOOLCHAIN_HAS_VECTOR_CRYPTO=y CONFIG_RISCV_ISA_ZBB=y CONFIG_RISCV_ISA_ZICBOM=y CONFIG_RISCV_ISA_ZICBOZ=y @@ -353,6 +355,8 @@ CONFIG_FPU=y CONFIG_IRQ_STACKS=y CONFIG_THREAD_SIZE_ORDER=2 CONFIG_RISCV_MISALIGNED=y +CONFIG_RISCV_PROBE_UNALIGNED_ACCESS=y +# CONFIG_RISCV_EMULATED_UNALIGNED_ACCESS is not set # end of Platform type # @@ -371,7 +375,6 @@ CONFIG_ARCH_SELECTS_KEXEC=y CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY=y CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y -CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y CONFIG_COMPAT=y # CONFIG_PARAVIRT is not set # CONFIG_RELOCATABLE is not set @@ -397,6 +400,12 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y # CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_HIBERNATION_SNAPSHOT_DEV=y +CONFIG_HIBERNATION_COMP_LZO=y +CONFIG_HIBERNATION_DEF_COMP="lzo" +CONFIG_PM_STD_PARTITION="" CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y # CONFIG_PM_AUTOSLEEP is not set @@ -411,6 +420,8 @@ CONFIG_PM_GENERIC_DOMAINS_SLEEP=y CONFIG_PM_GENERIC_DOMAINS_OF=y CONFIG_CPU_PM=y # CONFIG_ENERGY_MODEL is not set +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_HIBERNATION_HEADER=y CONFIG_ARCH_SUSPEND_POSSIBLE=y # end of Power management options @@ -457,6 +468,7 @@ CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_KVM_MMIO=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_READONLY_MEM=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL=y CONFIG_KVM_XFER_TO_GUEST_WORK=y @@ -500,6 +512,8 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y +CONFIG_MMU_GATHER_TABLE_FREE=y +CONFIG_MMU_GATHER_RCU_TABLE_FREE=y CONFIG_MMU_LAZY_TLB_REFCOUNT=y CONFIG_HAVE_ARCH_SECCOMP=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y @@ -530,13 +544,19 @@ CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_ARCH_MMAP_RND_BITS=18 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 +CONFIG_HAVE_PAGE_SIZE_4KB=y +CONFIG_PAGE_SIZE_4KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SHIFT=12 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_VMAP_STACK=y +CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y +CONFIG_RANDOMIZE_KSTACK_OFFSET=y +# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y @@ -594,6 +614,7 @@ CONFIG_MODULE_COMPRESS_GZIP=y # CONFIG_MODULE_DECOMPRESS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set CONFIG_MODPROBE_PATH="/sbin/modprobe" +# CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y CONFIG_BLOCK_LEGACY_AUTOLOAD=y @@ -649,6 +670,8 @@ CONFIG_QUEUED_RWLOCKS=y CONFIG_ARCH_HAS_MMIOWB=y CONFIG_MMIOWB=y CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y +CONFIG_ARCH_HAS_PREPARE_SYNC_CORE_CMD=y +CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y CONFIG_FREEZER=y @@ -673,7 +696,6 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set -# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set # CONFIG_ZSWAP_SHRINKER_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y @@ -712,6 +734,7 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y +CONFIG_HAVE_FAST_GUP=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_MEMORY_BALLOON=y @@ -769,7 +792,6 @@ CONFIG_SKB_EXTENSIONS=y CONFIG_PACKET=m CONFIG_PACKET_DIAG=m CONFIG_UNIX=y -CONFIG_UNIX_SCM=y CONFIG_AF_UNIX_OOB=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m @@ -1139,6 +1161,7 @@ CONFIG_IP_VS_PE_SIP=m # IP: Netfilter Configuration # CONFIG_NF_DEFRAG_IPV4=m +CONFIG_IP_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y @@ -1171,6 +1194,7 @@ CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_SECURITY is not set CONFIG_IP_NF_ARPTABLES=m +CONFIG_NFT_COMPAT_ARP=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m # end of IP: Netfilter Configuration @@ -1178,6 +1202,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # +CONFIG_IP6_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y @@ -1215,6 +1240,7 @@ CONFIG_NF_TABLES_BRIDGE=m # CONFIG_NFT_BRIDGE_META is not set CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_CONNTRACK_BRIDGE=m +CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1381,7 +1407,6 @@ CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m # CONFIG_NET_ACT_SAMPLE is not set -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m @@ -1508,6 +1533,7 @@ CONFIG_ETHTOOL_NETLINK=y # CONFIG_ARM_AMBA=y CONFIG_HAVE_PCI=y +CONFIG_GENERIC_PCI_IOMAP=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS_GENERIC=y @@ -1739,7 +1765,6 @@ CONFIG_MTD_PHYSMAP=m # CONFIG_MTD_PHYSMAP_OF is not set # CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set CONFIG_MTD_PCI=m -CONFIG_MTD_INTEL_VR_NOR=m CONFIG_MTD_PLATRAM=m # end of Mapping drivers for chip access @@ -1809,6 +1834,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set # CONFIG_MTD_UBI_BLOCK is not set +# CONFIG_MTD_UBI_NVMEM is not set # CONFIG_MTD_HYPERBUS is not set CONFIG_DTC=y CONFIG_OF=y @@ -2304,6 +2330,9 @@ CONFIG_MICROSEMI_PHY=m # CONFIG_NXP_C45_TJA11XX_PHY is not set # CONFIG_NXP_TJA11XX_PHY is not set # CONFIG_NCN26000_PHY is not set +# CONFIG_QCA83XX_PHY is not set +# CONFIG_QCA808X_PHY is not set +# CONFIG_QCA807X_PHY is not set # CONFIG_QSEMI_PHY is not set CONFIG_REALTEK_PHY=m # CONFIG_RENESAS_PHY is not set @@ -2633,7 +2662,6 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -2864,6 +2892,7 @@ CONFIG_PINMUX=y CONFIG_GENERIC_PINMUX_FUNCTIONS=y CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y +# CONFIG_PINCTRL_AW9523 is not set # CONFIG_PINCTRL_CY8C95X0 is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set @@ -3036,8 +3065,10 @@ CONFIG_HWMON=m # CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set # CONFIG_SENSORS_AS370 is not set # CONFIG_SENSORS_ASC7621 is not set +# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set # CONFIG_SENSORS_AXI_FAN_CONTROL is not set # CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_CHIPCAP2 is not set # CONFIG_SENSORS_CORSAIR_CPRO is not set # CONFIG_SENSORS_CORSAIR_PSU is not set # CONFIG_SENSORS_DRIVETEMP is not set @@ -3073,6 +3104,7 @@ CONFIG_HWMON=m # CONFIG_SENSORS_LTC4245 is not set # CONFIG_SENSORS_LTC4260 is not set # CONFIG_SENSORS_LTC4261 is not set +# CONFIG_SENSORS_LTC4282 is not set # CONFIG_SENSORS_MAX1111 is not set # CONFIG_SENSORS_MAX127 is not set # CONFIG_SENSORS_MAX16065 is not set @@ -3121,10 +3153,12 @@ CONFIG_HWMON=m # CONFIG_SENSORS_NCT7904 is not set # CONFIG_SENSORS_NPCM7XX is not set # CONFIG_SENSORS_NZXT_KRAKEN2 is not set +# CONFIG_SENSORS_NZXT_KRAKEN3 is not set # CONFIG_SENSORS_NZXT_SMART2 is not set # CONFIG_SENSORS_OCC_P8_I2C is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_PMBUS is not set +# CONFIG_SENSORS_PT5161L is not set # CONFIG_SENSORS_SBTSI is not set # CONFIG_SENSORS_SBRMI is not set # CONFIG_SENSORS_SHT15 is not set @@ -3357,10 +3391,10 @@ CONFIG_MFD_SYSCON=y # Graphics support # CONFIG_APERTURE_HELPERS=y -CONFIG_VIDEO_CMDLINE=y -CONFIG_VIDEO_NOMODESET=y +CONFIG_VIDEO=y # CONFIG_AUXDISPLAY is not set CONFIG_DRM=m +# CONFIG_DRM_DEBUG_MM is not set CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 @@ -3441,12 +3475,9 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_ARM_VERSATILE is not set # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set # CONFIG_DRM_PANEL_LVDS is not set -# CONFIG_DRM_PANEL_SIMPLE is not set -CONFIG_DRM_PANEL_EDP=m # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set -# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set @@ -3454,16 +3485,19 @@ CONFIG_DRM_PANEL_EDP=m # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set +# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set +CONFIG_DRM_PANEL_EDP=m +# CONFIG_DRM_PANEL_SIMPLE is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set @@ -3603,6 +3637,7 @@ CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_KTD253 is not set +# CONFIG_BACKLIGHT_KTD2801 is not set # CONFIG_BACKLIGHT_KTZ8866 is not set # CONFIG_BACKLIGHT_QCOM_WLED is not set # CONFIG_BACKLIGHT_ADP8860 is not set @@ -4153,6 +4188,7 @@ CONFIG_USB_DEFAULT_PERSIST=y # CONFIG_USB_OTG_PRODUCTLIST is not set # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 # CONFIG_USB_MON is not set # @@ -4303,6 +4339,7 @@ CONFIG_MMC_DW_PLTFM=y # CONFIG_MMC_DW_BLUEFIELD is not set # CONFIG_MMC_DW_EXYNOS is not set # CONFIG_MMC_DW_HI3798CV200 is not set +# CONFIG_MMC_DW_HI3798MV200 is not set # CONFIG_MMC_DW_K3 is not set # CONFIG_MMC_DW_PCI is not set CONFIG_MMC_DW_STARFIVE=y @@ -4339,8 +4376,6 @@ CONFIG_LEDS_CLASS=m # CONFIG_LEDS_GPIO is not set # CONFIG_LEDS_LP3944 is not set # CONFIG_LEDS_LP3952 is not set -# CONFIG_LEDS_LP50XX is not set -# CONFIG_LEDS_LP55XX_COMMON is not set # CONFIG_LEDS_LP8860 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set @@ -4594,7 +4629,6 @@ CONFIG_R8712U=m # CONFIG_VT6656 is not set # CONFIG_FB_SM750 is not set # CONFIG_STAGING_MEDIA is not set -# CONFIG_STAGING_BOARD is not set # CONFIG_LTE_GDM724X is not set # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set @@ -4774,10 +4808,12 @@ CONFIG_IRQCHIP=y # CONFIG_XILINX_INTC is not set CONFIG_RISCV_INTC=y CONFIG_SIFIVE_PLIC=y +CONFIG_STARFIVE_JH8100_INTC=y # end of IRQ chip support # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_GPIO is not set CONFIG_RESET_SIMPLE=y # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESET_TI_TPS380X is not set @@ -4822,6 +4858,7 @@ CONFIG_PHY_STARFIVE_JH7110_USB=y CONFIG_RISCV_PMU=y CONFIG_RISCV_PMU_LEGACY=y CONFIG_RISCV_PMU_SBI=y +CONFIG_STARFIVE_STARLINK_PMU=y # CONFIG_DWC_PCIE_PMU is not set # end of Performance monitor support @@ -4900,6 +4937,8 @@ CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y CONFIG_XFS_DRAIN_INTENTS=y +CONFIG_XFS_LIVE_HOOKS=y +CONFIG_XFS_MEMORY_BUFS=y CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_ONLINE_SCRUB_STATS=y # CONFIG_XFS_ONLINE_REPAIR is not set @@ -4966,6 +5005,7 @@ CONFIG_AUTOFS_FS=m CONFIG_FUSE_FS=m # CONFIG_CUSE is not set CONFIG_VIRTIO_FS=m +CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -5008,13 +5048,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="utf8" # CONFIG_FAT_DEFAULT_UTF8 is not set CONFIG_EXFAT_FS=m CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y CONFIG_NTFS3_FS=m # CONFIG_NTFS3_64BIT_CLUSTER is not set # CONFIG_NTFS3_LZX_XPRESS is not set # CONFIG_NTFS3_FS_POSIX_ACL is not set +CONFIG_NTFS_FS=m # end of DOS/FAT/EXFAT/NT Filesystems # @@ -5336,6 +5374,7 @@ CONFIG_CRYPTO_BLOWFISH_COMMON=m # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_SEED is not set CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SM4=m # CONFIG_CRYPTO_SM4_GENERIC is not set # CONFIG_CRYPTO_TEA is not set CONFIG_CRYPTO_TWOFISH=m @@ -5447,6 +5486,19 @@ CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y # end of Userspace interface CONFIG_CRYPTO_HASH_INFO=y + +# +# Accelerated Cryptographic Algorithms for CPU (riscv) +# +CONFIG_CRYPTO_AES_RISCV64=m +CONFIG_CRYPTO_CHACHA_RISCV64=m +CONFIG_CRYPTO_GHASH_RISCV64=m +CONFIG_CRYPTO_SHA256_RISCV64=m +CONFIG_CRYPTO_SHA512_RISCV64=m +CONFIG_CRYPTO_SM3_RISCV64=m +CONFIG_CRYPTO_SM4_RISCV64=m +# end of Accelerated Cryptographic Algorithms for CPU (riscv) + CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set @@ -5500,7 +5552,6 @@ CONFIG_GENERIC_NET_UTILS=y # CONFIG_CORDIC is not set # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y -CONFIG_GENERIC_PCI_IOMAP=y # # Crypto library routines @@ -5678,7 +5729,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_ALLOW_NONE is not set CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_KGDB_QXFER_PKT=y -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +CONFIG_ARCH_HAS_UBSAN=y # CONFIG_UBSAN is not set CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments diff --git a/community/linux-edge/config-edge.x86_64 b/community/linux-edge/config-edge.x86_64 index 4a630c8b43d..9de6a7cd8d5 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.9 Kernel Configuration +# Linux/x86_64 6.9.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" CONFIG_CC_IS_GCC=y @@ -88,6 +88,7 @@ CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST_IDLE=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y @@ -288,7 +289,6 @@ CONFIG_SYSTEM_DATA_VERIFICATION=y # # Kexec and crash features # -CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y CONFIG_KEXEC=y # CONFIG_KEXEC_FILE is not set @@ -331,8 +331,8 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y CONFIG_SMP=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y -# CONFIG_GOLDFISH is not set # CONFIG_X86_CPU_RESCTRL is not set +# CONFIG_X86_FRED is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_NUMACHIP is not set # CONFIG_X86_VSMP is not set @@ -484,7 +484,6 @@ CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y -CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y @@ -504,19 +503,29 @@ CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_HAVE_LIVEPATCH=y # end of Processor type and features +CONFIG_CC_HAS_NAMED_AS=y +CONFIG_USE_X86_SEG_SUPPORT=y CONFIG_CC_HAS_SLS=y CONFIG_CC_HAS_RETURN_THUNK=y CONFIG_CC_HAS_ENTRY_PADDING=y CONFIG_FUNCTION_PADDING_CFI=11 CONFIG_FUNCTION_PADDING_BYTES=16 +CONFIG_CALL_PADDING=y +CONFIG_HAVE_CALL_THUNKS=y +CONFIG_CALL_THUNKS=y +CONFIG_PREFIX_SYMBOLS=y CONFIG_CPU_MITIGATIONS=y -CONFIG_PAGE_TABLE_ISOLATION=y -CONFIG_RETPOLINE=y -# CONFIG_RETHUNK is not set -CONFIG_CPU_IBPB_ENTRY=y -CONFIG_CPU_IBRS_ENTRY=y -CONFIG_SLS=y -# CONFIG_GDS_FORCE_MITIGATION is not set +CONFIG_MITIGATION_PAGE_TABLE_ISOLATION=y +CONFIG_MITIGATION_RETPOLINE=y +CONFIG_MITIGATION_RETHUNK=y +CONFIG_MITIGATION_UNRET_ENTRY=y +CONFIG_MITIGATION_CALL_DEPTH_TRACKING=y +# CONFIG_CALL_THUNKS_DEBUG is not set +CONFIG_MITIGATION_IBPB_ENTRY=y +CONFIG_MITIGATION_IBRS_ENTRY=y +CONFIG_MITIGATION_SRSO=y +# CONFIG_MITIGATION_SLS is not set +# CONFIG_MITIGATION_GDS_FORCE is not set CONFIG_MITIGATION_RFDS=y CONFIG_MITIGATION_SPECTRE_BHI=y CONFIG_ARCH_HAS_ADD_PAGES=y @@ -530,6 +539,9 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_HIBERNATION_SNAPSHOT_DEV=y +CONFIG_HIBERNATION_COMP_LZO=y +# CONFIG_HIBERNATION_COMP_LZ4 is not set +CONFIG_HIBERNATION_DEF_COMP="lzo" CONFIG_PM_STD_PARTITION="" CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -583,7 +595,6 @@ CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_IOAPIC=y CONFIG_ACPI_SBS=m CONFIG_ACPI_HED=m -# CONFIG_ACPI_CUSTOM_METHOD is not set CONFIG_ACPI_BGRT=y # CONFIG_ACPI_NFIT is not set CONFIG_ACPI_NUMA=y @@ -686,7 +697,6 @@ CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y # end of Binary Emulations -CONFIG_HAVE_KVM=y CONFIG_KVM_COMMON=y CONFIG_HAVE_KVM_PFNCACHE=y CONFIG_HAVE_KVM_IRQCHIP=y @@ -697,6 +707,7 @@ CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y CONFIG_KVM_MMIO=y CONFIG_KVM_ASYNC_PF=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_READONLY_MEM=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y @@ -826,8 +837,11 @@ CONFIG_ARCH_MMAP_RND_BITS=28 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y +CONFIG_HAVE_PAGE_SIZE_4KB=y +CONFIG_PAGE_SIZE_4KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SHIFT=12 CONFIG_HAVE_OBJTOOL=y CONFIG_HAVE_JUMP_LABEL_HACK=y CONFIG_HAVE_NOINSTR_HACK=y @@ -852,6 +866,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_MEM_ENCRYPT=y +CONFIG_ARCH_HAS_CC_PLATFORM=y CONFIG_HAVE_STATIC_CALL=y CONFIG_HAVE_STATIC_CALL_INLINE=y CONFIG_HAVE_PREEMPT_DYNAMIC=y @@ -908,6 +923,7 @@ CONFIG_MODULE_COMPRESS_GZIP=y # CONFIG_MODULE_DECOMPRESS is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set CONFIG_MODPROBE_PATH="/sbin/modprobe" +# CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y CONFIG_BLOCK_LEGACY_AUTOLOAD=y @@ -1010,7 +1026,6 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y CONFIG_ZSWAP_DEFAULT_ON=y -# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set # CONFIG_ZSWAP_SHRINKER_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y @@ -1140,7 +1155,6 @@ CONFIG_SKB_EXTENSIONS=y CONFIG_PACKET=m CONFIG_PACKET_DIAG=m CONFIG_UNIX=y -CONFIG_UNIX_SCM=y CONFIG_AF_UNIX_OOB=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m @@ -1519,6 +1533,7 @@ CONFIG_IP_VS_PE_SIP=m # IP: Netfilter Configuration # CONFIG_NF_DEFRAG_IPV4=m +CONFIG_IP_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y @@ -1551,6 +1566,7 @@ CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_SECURITY is not set CONFIG_IP_NF_ARPTABLES=m +CONFIG_NFT_COMPAT_ARP=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m # end of IP: Netfilter Configuration @@ -1558,6 +1574,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # +CONFIG_IP6_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y @@ -1595,6 +1612,7 @@ CONFIG_NF_TABLES_BRIDGE=m # CONFIG_NFT_BRIDGE_META is not set CONFIG_NFT_BRIDGE_REJECT=m # CONFIG_NF_CONNTRACK_BRIDGE is not set +CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1782,7 +1800,6 @@ CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m # CONFIG_NET_ACT_SAMPLE is not set -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m @@ -2067,6 +2084,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_HAVE_EISA=y # CONFIG_EISA is not set CONFIG_HAVE_PCI=y +CONFIG_GENERIC_PCI_IOMAP=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y @@ -2349,7 +2367,6 @@ CONFIG_MTD_SCB2_FLASH=m CONFIG_MTD_NETtel=m CONFIG_MTD_L440GX=m CONFIG_MTD_PCI=m -CONFIG_MTD_INTEL_VR_NOR=m CONFIG_MTD_PLATRAM=m # end of Mapping drivers for chip access @@ -2415,6 +2432,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set # CONFIG_MTD_UBI_BLOCK is not set +# CONFIG_MTD_UBI_NVMEM is not set # CONFIG_MTD_HYPERBUS is not set # CONFIG_OF is not set CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y @@ -2852,6 +2870,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_LOG_WRITES=m CONFIG_DM_INTEGRITY=m CONFIG_DM_AUDIT=y +# CONFIG_DM_VDO is not set CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m @@ -3104,6 +3123,7 @@ CONFIG_ICE_HWMON=y # CONFIG_ICE_HWTS is not set # CONFIG_FM10K is not set CONFIG_IGC=m +CONFIG_IGC_LEDS=y # CONFIG_IDPF is not set CONFIG_JME=m # CONFIG_NET_VENDOR_ADI is not set @@ -3116,6 +3136,7 @@ CONFIG_SKGE_GENESIS=y CONFIG_SKY2=m # CONFIG_SKY2_DEBUG is not set # CONFIG_OCTEON_EP is not set +# CONFIG_OCTEON_EP_VF is not set # CONFIG_PRESTERA is not set CONFIG_NET_VENDOR_MELLANOX=y CONFIG_MLX4_EN=m @@ -3310,7 +3331,10 @@ CONFIG_NATIONAL_PHY=m # CONFIG_NXP_C45_TJA11XX_PHY is not set # CONFIG_NXP_TJA11XX_PHY is not set # CONFIG_NCN26000_PHY is not set +CONFIG_QCOM_NET_PHYLIB=m CONFIG_AT803X_PHY=m +# CONFIG_QCA83XX_PHY is not set +# CONFIG_QCA808X_PHY is not set CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m CONFIG_RENESAS_PHY=m @@ -3346,6 +3370,7 @@ CONFIG_CAN_CC770=m # CONFIG_CAN_CC770_ISA is not set CONFIG_CAN_CC770_PLATFORM=m # CONFIG_CAN_CTUCANFD_PCI is not set +# CONFIG_CAN_ESD_402_PCI is not set CONFIG_CAN_IFI_CANFD=m CONFIG_CAN_M_CAN=m # CONFIG_CAN_M_CAN_PCI is not set @@ -3970,6 +3995,8 @@ CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m # CONFIG_TOUCHSCREEN_EXC3000 is not set CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GOODIX=m +# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set +# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set @@ -4132,7 +4159,6 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -4447,6 +4473,7 @@ CONFIG_DP83640_PHY=m CONFIG_PTP_1588_CLOCK_KVM=m # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set # CONFIG_PTP_1588_CLOCK_IDTCM is not set +# CONFIG_PTP_1588_CLOCK_FC3W is not set # CONFIG_PTP_1588_CLOCK_MOCK is not set # CONFIG_PTP_1588_CLOCK_VMW is not set # CONFIG_PTP_1588_CLOCK_OCP is not set @@ -4542,6 +4569,7 @@ CONFIG_GPIO_PCF857X=m # # MFD GPIO expanders # +# CONFIG_GPIO_CROS_EC is not set CONFIG_GPIO_CRYSTAL_COVE=m # CONFIG_GPIO_ELKHARTLAKE is not set CONFIG_GPIO_JANZ_TTL=m @@ -4663,6 +4691,7 @@ CONFIG_SENSORS_ADT7475=m # CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set # CONFIG_SENSORS_AS370 is not set CONFIG_SENSORS_ASC7621=m +# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set CONFIG_SENSORS_AXI_FAN_CONTROL=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_K10TEMP=m @@ -4670,6 +4699,7 @@ CONFIG_SENSORS_FAM15H_POWER=m CONFIG_SENSORS_APPLESMC=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_ATXP1=m +# CONFIG_SENSORS_CHIPCAP2 is not set # CONFIG_SENSORS_CORSAIR_CPRO is not set # CONFIG_SENSORS_CORSAIR_PSU is not set CONFIG_SENSORS_DRIVETEMP=m @@ -4712,6 +4742,7 @@ CONFIG_SENSORS_LTC4222=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4260=m CONFIG_SENSORS_LTC4261=m +# CONFIG_SENSORS_LTC4282 is not set CONFIG_SENSORS_MAX1111=m # CONFIG_SENSORS_MAX127 is not set CONFIG_SENSORS_MAX16065=m @@ -4762,6 +4793,7 @@ CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NPCM7XX=m # CONFIG_SENSORS_NZXT_KRAKEN2 is not set +# CONFIG_SENSORS_NZXT_KRAKEN3 is not set # CONFIG_SENSORS_NZXT_SMART2 is not set # CONFIG_SENSORS_OCC_P8_I2C is not set # CONFIG_SENSORS_OXP is not set @@ -4804,6 +4836,7 @@ CONFIG_SENSORS_MAX8688=m # CONFIG_SENSORS_MP5023 is not set # CONFIG_SENSORS_MP5990 is not set # CONFIG_SENSORS_MPQ7932 is not set +# CONFIG_SENSORS_MPQ8785 is not set # CONFIG_SENSORS_PIM4328 is not set # CONFIG_SENSORS_PLI1209BC is not set # CONFIG_SENSORS_PM6764TR is not set @@ -4819,6 +4852,7 @@ CONFIG_SENSORS_UCD9200=m # CONFIG_SENSORS_XDPE152 is not set # CONFIG_SENSORS_XDPE122 is not set CONFIG_SENSORS_ZL6100=m +# CONFIG_SENSORS_PT5161L is not set # CONFIG_SENSORS_SBTSI is not set # CONFIG_SENSORS_SBRMI is not set CONFIG_SENSORS_SHT15=m @@ -4839,6 +4873,7 @@ CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m # CONFIG_SENSORS_STTS751 is not set +# CONFIG_SENSORS_SURFACE_FAN is not set CONFIG_SENSORS_ADC128D818=m CONFIG_SENSORS_ADS7828=m CONFIG_SENSORS_ADS7871=m @@ -4886,7 +4921,6 @@ CONFIG_THERMAL_NETLINK=y # CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_DEBUGFS is not set CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 -CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -4940,6 +4974,7 @@ CONFIG_WATCHDOG_SYSFS=y # Watchdog Device Drivers # CONFIG_SOFT_WATCHDOG=m +# CONFIG_CROS_EC_WATCHDOG is not set CONFIG_WDAT_WDT=m # CONFIG_XILINX_WATCHDOG is not set # CONFIG_ZIIRAVE_WATCHDOG is not set @@ -5842,10 +5877,15 @@ CONFIG_DVB_SP2=m # Graphics support # CONFIG_APERTURE_HELPERS=y -CONFIG_VIDEO_CMDLINE=y -CONFIG_VIDEO_NOMODESET=y +CONFIG_SCREEN_INFO=y +CONFIG_VIDEO=y CONFIG_AUXDISPLAY=y # CONFIG_HD44780 is not set +# CONFIG_LCD2S is not set +# CONFIG_PARPORT_PANEL is not set +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set +CONFIG_CHARLCD_BL_FLASH=y CONFIG_KS0108=m CONFIG_KS0108_PORT=0x378 CONFIG_KS0108_DELAY=2 @@ -5853,11 +5893,8 @@ CONFIG_CFAG12864B=m CONFIG_CFAG12864B_RATE=20 # CONFIG_IMG_ASCII_LCD is not set # CONFIG_HT16K33 is not set -# CONFIG_LCD2S is not set -# CONFIG_PARPORT_PANEL is not set -# CONFIG_CHARLCD_BL_OFF is not set -# CONFIG_CHARLCD_BL_ON is not set -CONFIG_CHARLCD_BL_FLASH=y +# CONFIG_MAX6959 is not set +# CONFIG_SEG_LED_GPIO is not set # CONFIG_PANEL is not set CONFIG_AGP=m CONFIG_AGP_AMD64=m @@ -5868,12 +5905,14 @@ CONFIG_INTEL_GTT=m CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=m CONFIG_DRM_MIPI_DSI=y +# CONFIG_DRM_DEBUG_MM is not set CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set CONFIG_DRM_DISPLAY_HELPER=m CONFIG_DRM_DISPLAY_DP_HELPER=y +CONFIG_DRM_DISPLAY_DP_TUNNEL=y CONFIG_DRM_DISPLAY_HDCP_HELPER=y CONFIG_DRM_DISPLAY_HDMI_HELPER=y CONFIG_DRM_DP_AUX_CHARDEV=y @@ -5939,6 +5978,7 @@ CONFIG_DRM_I915_COMPRESS_ERROR=y CONFIG_DRM_I915_USERPTR=y CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_PXP=y +CONFIG_DRM_I915_DP_TUNNEL=y CONFIG_DRM_I915_REQUEST_TIMEOUT=20000 CONFIG_DRM_I915_FENCE_TIMEOUT=10000 CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250 @@ -5967,6 +6007,7 @@ CONFIG_DRM_PANEL=y # Display Panels # # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set @@ -6134,6 +6175,7 @@ CONFIG_LCD_HX8357=m # CONFIG_LCD_OTM3225A is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_KTD253 is not set +# CONFIG_BACKLIGHT_KTD2801 is not set # CONFIG_BACKLIGHT_KTZ8866 is not set CONFIG_BACKLIGHT_PWM=m CONFIG_BACKLIGHT_APPLE=m @@ -6320,6 +6362,7 @@ CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 # CONFIG_SND_HDA_PATCH_LOADER is not set +CONFIG_SND_HDA_SCODEC_COMPONENT=m # CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set # CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set # CONFIG_SND_HDA_SCODEC_CS35L56_I2C is not set @@ -6403,6 +6446,7 @@ CONFIG_SND_SOC_AMD_ACP6x=m # CONFIG_SND_SOC_AMD_YC_MACH is not set CONFIG_SND_AMD_ACP_CONFIG=m # CONFIG_SND_SOC_AMD_ACP_COMMON is not set +CONFIG_SND_AMD_SOUNDWIRE_ACPI=m # CONFIG_SND_SOC_AMD_RPL_ACP6x is not set # CONFIG_SND_SOC_AMD_PS is not set # CONFIG_SND_ATMEL_SOC is not set @@ -6511,6 +6555,7 @@ CONFIG_SND_SOC_SOF_AMD_RENOIR=m CONFIG_SND_SOC_SOF_AMD_VANGOGH=m CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m CONFIG_SND_SOC_SOF_ACP_PROBES=m +CONFIG_SND_SOC_SOF_AMD_SOUNDWIRE_LINK_BASELINE=m CONFIG_SND_SOC_SOF_AMD_ACP63=m CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m @@ -6746,6 +6791,7 @@ CONFIG_SND_SOC_TSCS42XX=m # CONFIG_SND_SOC_TSCS454 is not set # CONFIG_SND_SOC_UDA1334 is not set # CONFIG_SND_SOC_WCD938X_SDW is not set +# CONFIG_SND_SOC_WCD939X_SDW is not set # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set # CONFIG_SND_SOC_WM8524 is not set @@ -6999,6 +7045,7 @@ CONFIG_USB_OTG=y # CONFIG_USB_OTG_FSM is not set CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_MON=m # @@ -7308,6 +7355,7 @@ CONFIG_TYPEC_TPS6598X=m # CONFIG_TYPEC_MUX_FSA4480 is not set # CONFIG_TYPEC_MUX_GPIO_SBU is not set CONFIG_TYPEC_MUX_PI3USB30532=m +# CONFIG_TYPEC_MUX_IT5205 is not set # CONFIG_TYPEC_MUX_NB7VPQ904M is not set # CONFIG_TYPEC_MUX_PTN36502 is not set # CONFIG_TYPEC_MUX_WCD939X_USBSS is not set @@ -7745,7 +7793,7 @@ CONFIG_VFIO_PCI_IGD=y # end of VFIO support for PCI devices CONFIG_VFIO_MDEV=m -CONFIG_IRQ_BYPASS_MANAGER=m +CONFIG_IRQ_BYPASS_MANAGER=y CONFIG_VIRT_DRIVERS=y CONFIG_VMGENID=m CONFIG_VBOXGUEST=m @@ -7886,6 +7934,7 @@ CONFIG_R8712U=m # CONFIG_PI433 is not set # CONFIG_FIELDBUS_DEV is not set # CONFIG_VME_BUS is not set +# CONFIG_GOLDFISH is not set CONFIG_CHROME_PLATFORMS=y CONFIG_CHROMEOS_ACPI=m CONFIG_CHROMEOS_LAPTOP=m @@ -8338,6 +8387,8 @@ CONFIG_KXCJK1013=m # CONFIG_AD7923 is not set # CONFIG_AD7949 is not set # CONFIG_AD799X is not set +# CONFIG_AD9467 is not set +# CONFIG_ADI_AXI_ADC is not set # CONFIG_CC10001_ADC is not set # CONFIG_ENVELOPE_DETECTOR is not set # CONFIG_HI8435 is not set @@ -8362,6 +8413,7 @@ CONFIG_INA2XX_ADC=m # CONFIG_MCP3564 is not set # CONFIG_MCP3911 is not set # CONFIG_NAU7802 is not set +# CONFIG_PAC1934 is not set # CONFIG_RICHTEK_RTQ6056 is not set # CONFIG_SD_ADC_MODULATOR is not set # CONFIG_TI_ADC081C is not set @@ -8374,6 +8426,7 @@ CONFIG_INA2XX_ADC=m # CONFIG_TI_ADS1015 is not set # CONFIG_TI_ADS7924 is not set # CONFIG_TI_ADS1100 is not set +# CONFIG_TI_ADS1298 is not set # CONFIG_TI_ADS7950 is not set # CONFIG_TI_ADS8344 is not set # CONFIG_TI_ADS8688 is not set @@ -8530,6 +8583,7 @@ CONFIG_IIO_SSP_SENSORHUB=m # CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set # CONFIG_ADF4377 is not set +# CONFIG_ADMFM2000 is not set # CONFIG_ADMV1013 is not set # CONFIG_ADMV1014 is not set # CONFIG_ADMV4420 is not set @@ -8847,6 +8901,7 @@ CONFIG_PWM_PCA9685=m # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_GPIO is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESET_TI_TPS380X is not set @@ -8885,6 +8940,7 @@ CONFIG_IDLE_INJECT=y # end of Performance monitor support CONFIG_RAS=y +# CONFIG_AMD_ATL is not set CONFIG_USB4=m # CONFIG_USB4_DEBUGFS_WRITE is not set # CONFIG_USB4_DMA_TEST is not set @@ -8967,6 +9023,8 @@ CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y CONFIG_XFS_DRAIN_INTENTS=y +CONFIG_XFS_LIVE_HOOKS=y +CONFIG_XFS_MEMORY_BUFS=y CONFIG_XFS_ONLINE_SCRUB=y CONFIG_XFS_ONLINE_SCRUB_STATS=y # CONFIG_XFS_ONLINE_REPAIR is not set @@ -9036,6 +9094,7 @@ CONFIG_AUTOFS_FS=m CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m +CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set # CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set @@ -9078,13 +9137,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="utf8" CONFIG_FAT_DEFAULT_UTF8=y CONFIG_EXFAT_FS=m CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y CONFIG_NTFS3_FS=m # CONFIG_NTFS3_64BIT_CLUSTER is not set # CONFIG_NTFS3_LZX_XPRESS is not set # CONFIG_NTFS3_FS_POSIX_ACL is not set +CONFIG_NTFS_FS=m # end of DOS/FAT/EXFAT/NT Filesystems # @@ -9652,6 +9709,7 @@ CONFIG_CRYPTO_DEV_QAT_4XXX=m CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C62XVF=m +# CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION is not set CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_VIRTIO=m # CONFIG_CRYPTO_DEV_SAFEXCEL is not set @@ -9694,7 +9752,6 @@ CONFIG_GENERIC_NET_UTILS=y CONFIG_CORDIC=m # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y -CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_IOMAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y @@ -9899,7 +9956,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set # CONFIG_DEBUG_FS_ALLOW_NONE is not set CONFIG_HAVE_ARCH_KGDB=y -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +CONFIG_ARCH_HAS_UBSAN=y # CONFIG_UBSAN is not set CONFIG_HAVE_ARCH_KCSAN=y CONFIG_HAVE_KCSAN_COMPILER=y diff --git a/community/linux-tools/APKBUILD b/community/linux-tools/APKBUILD index 09a0f07848f..b6c47eb6799 100644 --- a/community/linux-tools/APKBUILD +++ b/community/linux-tools/APKBUILD @@ -3,12 +3,12 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=linux-tools -pkgver=6.6.18 +pkgver=6.6.31 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=1 +pkgrel=0 pkgdesc="Linux kernel tools meta package" url="https://www.kernel.org/" arch="all" @@ -70,6 +70,8 @@ source="https://kernel.org/pub/linux/kernel/v6.x/linux-$_kernver.tar.xz cpupower-libs.patch dt_lnk.patch perf-doc.patch + perf-basename.patch + bpftool-basename.patch cpupower.initd cpupower.confd usbip.initd @@ -287,9 +289,11 @@ sha512sums=" a46e3a84b00a39a356618831d0ddfb7f0d10f0a3799d1307ba2cc832e73c01f8d637a4e801a6dd25025f6f13155c6ad8b836422ff72d365e51063ac0bf907f52 cpupower-libs.patch 0657b461659e79c1926379aab30e7b7ab2d59eaf3e686f1dce468b79eb1320c188c14a0507361660abd2553bccffa9e149fa5b6e4d770d10c99bf5dafd2e05ee dt_lnk.patch 2092b96d64e6c379ae52700b3c1bf459581afea69622a296821381e74ecafa4a08cea24eab002ad2152878a4508918de7807ac98ba72faf2d4dea18cc275933f perf-doc.patch +518a843bc4f11275e746a3fbcdbf126111f4f86f7f757033fa1b0e19ec1f8965bbfbcd9f170f9d33ab562b3e09743c080adc7fb8657f263ddcf120cf76b4da44 perf-basename.patch +ea04b71c828df423e55ce22058015fe3cf13f58a1adbddefa61a8df26b343d22596d16737c592ead87a82df68672d44cbe4d4bfa4561185347db5c80ee9db340 bpftool-basename.patch 97ecfeaaaa8efca7af585316b843bf7be885e88095bbdfbf52bc9a96b14dc862435482781e205ea022ab208978aaa4aabb317354fab890ed514a5088ae5045c8 cpupower.initd 63cd12a4d8782198c71662e9205e346e064b65bae5e3e175b5bc43bdf7ec6ddf675b60349750afe3c37c8a925f9ae9a93530671821342581bd282a69e0773b8c cpupower.confd fcbd64d844c9bc187d08cef5995e91a46c0df78deb24e96ac9210c0e2c730eca0301970d9b8ffbf003df274682d05072431a26b59d8c491f396618268a12ec92 usbip.initd eb8de617e27c4d5fdfee9c442e8f74b0afb4d0fe7b59eca3a19629eb70fea7e09b3c125bc968aa8810d845ce661c829bd0f3fdb2288664f2cccf423bc0ae6ae8 usbip.confd -2fe42e370b61789aed4b257b95c9c008fbca3f7980d5ce58be4fa7993b4a0748890a64c7d89c9211f48c7e48f6e40bac11621ebf29904617e1105a6f37068d2f patch-6.6.18.xz +48b774ddc1c157b9e0b994bfead7e482593a81fc71edd706b344d17114333835f09f9f159191e24da61852a8eb115f8882965251d403a479c4da59785ebcf29f patch-6.6.31.xz " diff --git a/community/linux-tools/bpftool-basename.patch b/community/linux-tools/bpftool-basename.patch new file mode 100644 index 00000000000..ef1451f789f --- /dev/null +++ b/community/linux-tools/bpftool-basename.patch @@ -0,0 +1,14 @@ +This should be fixed and the patch dropped in Linux 6.9, see: +https://lore.kernel.org/bpf/Zbe3NuOgaupvUcpF@kernel.org/ +-- +--- a/tools/bpf/bpftool/gen.c ++++ b/tools/bpf/bpftool/gen.c +@@ -23,6 +23,8 @@ + #include "json_writer.h" + #include "main.h" + ++#define basename(path) (strrchr((path),'/') ? strrchr((path),'/')+1 : (path)) ++ + #define MAX_OBJ_NAME_LEN 64 + + static void sanitize_identifier(char *name) diff --git a/community/linux-tools/perf-basename.patch b/community/linux-tools/perf-basename.patch new file mode 100644 index 00000000000..f688e2f430a --- /dev/null +++ b/community/linux-tools/perf-basename.patch @@ -0,0 +1,10 @@ +--- a/tools/perf/util/probe-event.c ++++ b/tools/perf/util/probe-event.c +@@ -17,6 +17,7 @@ + #include <string.h> + #include <stdarg.h> + #include <limits.h> ++#include <libgen.h> /* for basename */ + #include <elf.h> + + #include "build-id.h" diff --git a/community/lld17/APKBUILD b/community/lld17/APKBUILD new file mode 100644 index 00000000000..2873ce35b2c --- /dev/null +++ b/community/lld17/APKBUILD @@ -0,0 +1,76 @@ +# 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 lld17-libs +pkgname=lld17 +pkgver=17.0.6 +pkgrel=0 +_llvmver=${pkgver%%.*} +pkgdesc="The LLVM Linker" +url="https://llvm.org/" +arch="all" +license="Apache-2.0" +depends_dev="$pkgname=$pkgver-r$pkgrel" +makedepends=" + clang + cmake + compiler-rt + libedit-dev + libxml2-dev + llvm$_llvmver-dev + llvm$_llvmver-gtest + 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 + " +builddir="$srcdir/lld-${pkgver//_/}.src" +options="!check" # temp package for zig only + +prepare() { + default_prepare + mv "$srcdir"/cmake-${pkgver//_/}.src "$srcdir"/cmake +} + +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 OFF)" \ + -DLLVM_EXTERNAL_LIT=/usr/bin/lit \ + -DLLD_BUILT_STANDALONE=ON \ + -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-z,stack-size=2097152" + 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=" +55955fc24b3fb87012486618cf227a1640ad9a6d607c898d890337aa8c28f3e6a9ed48a52bd0ed57f365f0dc5081a6b3a037cb65da9a9f2cbc53a1527cb8db60 lld-17.0.6.src.tar.xz +b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a cmake-17.0.6.src.tar.xz +" diff --git a/community/lnav/APKBUILD b/community/lnav/APKBUILD index 1acbd9c1c70..3c544e3ec5d 100644 --- a/community/lnav/APKBUILD +++ b/community/lnav/APKBUILD @@ -25,7 +25,10 @@ checkdepends=" xz " subpackages="$pkgname-doc" -source="https://github.com/tstack/lnav/releases/download/v$pkgver/lnav-$pkgver.tar.gz" +source="https://github.com/tstack/lnav/releases/download/v$pkgver/lnav-$pkgver.tar.gz + rapidyaml.patch + prqlc-c.patch + " options="!check" # failed on some tests build() { @@ -46,4 +49,6 @@ package() { sha512sums=" 20cc31ed8c69e4ba0971d581b9e8629d415b1025713200eec0b70070991dbd288af449775a6cb5cb239d3a20aee3f4adbcc7420c5d017ae3bf62587925af49f7 lnav-0.12.2.tar.gz +f31767c6425c48cedd9dded6112d37e61ecf316b37678286a09dc64808b0d369978823613076d216a34922d06267695d19fe7797e87eee2315bbb44b3b51ec2c rapidyaml.patch +6a60e142cbfd1c06d6ca14f16c38d144c134c928d946ac35ee858d8631a7bbf286158a60b62ef2e6967d937484bf8095642c67e1e050ad1d07c43952de9c367b prqlc-c.patch " diff --git a/community/lnav/prqlc-c.patch b/community/lnav/prqlc-c.patch new file mode 100644 index 00000000000..32a1155826c --- /dev/null +++ b/community/lnav/prqlc-c.patch @@ -0,0 +1,16 @@ +diff --git a/src/third-party/prqlc-c/Cargo.lock b/src/third-party/prqlc-c/Cargo.lock +index 486bd5c..b21d909 100644 +--- a/src/third-party/prqlc-c/Cargo.lock ++++ b/src/third-party/prqlc-c/Cargo.lock +@@ -703,9 +703,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "link-cplusplus" diff --git a/community/lnav/rapidyaml.patch b/community/lnav/rapidyaml.patch new file mode 100644 index 00000000000..ec399b8dbcb --- /dev/null +++ b/community/lnav/rapidyaml.patch @@ -0,0 +1,15 @@ +diff --git a/src/third-party/rapidyaml/ryml_all.hpp b/src/third-party/rapidyaml/ryml_all.hpp +index 03734a1..6084389 100644 +--- a/src/third-party/rapidyaml/ryml_all.hpp ++++ b/src/third-party/rapidyaml/ryml_all.hpp +@@ -498,6 +498,10 @@ C4_FOR_EACH(PRN_STRUCT_OFFSETS, a, b, c); + #endif + #define C4_BYTE_ORDER _C4EL + ++#elif defined(__loongarch64) ++ #define C4_CPU_LOONGARCH64 ++ #define C4_WORDSIZE 8 ++ + #elif defined(__EMSCRIPTEN__) + # define C4_BYTE_ORDER _C4EL + # define C4_WORDSIZE 4 diff --git a/community/lokalize/APKBUILD b/community/lokalize/APKBUILD index b80e29eb421..9495e16663a 100644 --- a/community/lokalize/APKBUILD +++ b/community/lokalize/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=lokalize -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Computer-Aided Translation System" url="https://apps.kde.org/lokalize/" @@ -49,5 +49,5 @@ package() { } sha512sums=" -6cb0dff01139146968d56269494a64f35635a51c9ab4845e69502bf3d5a686feedd00755f4a015cbc035fcaba00e8d6d3cfbdb448963127357a35ef91e629ff4 lokalize-24.02.2.tar.xz +f62f8fe3e7bdd9c4003880f1fdce90868e39e475f672f9a5c0301c1f747c48c06fd56730a76d3568cd4ea59da812fbe98fb7ef25c18abaa10ba79f7dda6de7c6 lokalize-24.05.0.tar.xz " diff --git a/community/loki/APKBUILD b/community/loki/APKBUILD index a695046e2be..383a7fd4e1b 100644 --- a/community/loki/APKBUILD +++ b/community/loki/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Pirogov <vbnet.ru@gmail.com> pkgname=loki pkgver=2.9.4 -pkgrel=4 +pkgrel=5 pkgdesc="Like Prometheus, but for logs" pkgusers="loki" pkggroups="grafana" diff --git a/community/loudmouth/APKBUILD b/community/loudmouth/APKBUILD index 5c0efffa6fc..a9ff8e3ca9a 100644 --- a/community/loudmouth/APKBUILD +++ b/community/loudmouth/APKBUILD @@ -16,6 +16,7 @@ source="https://mcabber.com/files/loudmouth/loudmouth-$pkgver.tar.bz2 prepare() { default_prepare + update_config_sub autoconf } 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/testing/lpac/APKBUILD b/community/lpac/APKBUILD index 5d940d9bf12..5d940d9bf12 100644 --- a/testing/lpac/APKBUILD +++ b/community/lpac/APKBUILD diff --git a/community/lsp-plugins/APKBUILD b/community/lsp-plugins/APKBUILD index c406cda4a2d..ea36852dd54 100644 --- a/community/lsp-plugins/APKBUILD +++ b/community/lsp-plugins/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Magnus Sandin <magnus.sandin@gmail.com> # Maintainer: Magnus Sandin <magnus.sandin@gmail.com> pkgname=lsp-plugins -pkgver=1.2.15 +pkgver=1.2.16 pkgrel=0 pkgdesc="Collection of free plugins compatible with LADSPA, LV2 and LinuxVST" url="https://lsp-plug.in" @@ -101,5 +101,5 @@ vst2() { } sha512sums=" -e383e9c96aa47b5cb1f883edd150f5b232a0fb8e53f69b618ad769df955d2e0a54c56606a1e406ce8bb019b5442c9c90330df734c3d9df5456185168867211a7 lsp-plugins-src-1.2.15.tar.gz +50ad81d528fa9702caf9b66950ad4d38f11095b349e0242a614e92dd06b7ff31fc55a8d32f8341a7dcbe8d0833dbdea65158c42f0948636ba5700549aee81bed lsp-plugins-src-1.2.16.tar.gz " 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 faa2e8228d6..ddb932f6b0a 100644 --- a/community/lua-http/APKBUILD +++ b/community/lua-http/APKBUILD @@ -24,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" 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-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/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 41f6ba06203..be7a49e7a89 100644 --- a/community/lua-resty-hmac/APKBUILD +++ b/community/lua-resty-hmac/APKBUILD @@ -6,8 +6,8 @@ _pkgver=$pkgver-1 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" 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-lock/APKBUILD b/community/lua-resty-lock/APKBUILD index 498f03c339c..6af1335ef2b 100644 --- a/community/lua-resty-lock/APKBUILD +++ b/community/lua-resty-lock/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.09 pkgrel=2 pkgdesc="Simple nonblocking lock API for ngx_lua based on shared memory dictionaries" url="https://github.com/openresty/lua-resty-lock" -arch="noarch !ppc64le !riscv64" +arch="noarch !ppc64le !riscv64 !loongarch64" license="BSD-1-Clause" depends="lua lua-resty-core" source="$pkgname-$pkgver.tar.gz::https://github.com/openresty/lua-resty-lock/archive/refs/tags/v$pkgver.tar.gz diff --git a/community/lua-resty-mail/APKBUILD b/community/lua-resty-mail/APKBUILD index 35b811584d6..e119e86aa8a 100644 --- a/community/lua-resty-mail/APKBUILD +++ b/community/lua-resty-mail/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.0.2 pkgrel=1 pkgdesc="High-level, easy to use, non-blocking email and SMTP library for OpenResty" url="https://github.com/GUI/lua-resty-mail" -arch="noarch !ppc64le !riscv64" # lua-resty-core +arch="noarch !ppc64le !riscv64 !loongarch64" # lua-resty-core license="MIT" depends="lua-resty-core" checkdepends="lua5.1 luacheck" 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/lxd/APKBUILD b/community/lxd/APKBUILD index d42626a8a95..0f22e656e9f 100644 --- a/community/lxd/APKBUILD +++ b/community/lxd/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Leonardo Arena <larena@alpinelinux.org> pkgname=lxd pkgver=5.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A container hypervisor and a new user experience for LXC - 'LTS' release channel" url="https://ubuntu.com/lxd" 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/lzbench/APKBUILD b/community/lzbench/APKBUILD index c2ac50d0b68..f9463ec1f22 100644 --- a/community/lzbench/APKBUILD +++ b/community/lzbench/APKBUILD @@ -9,7 +9,9 @@ arch="all !x86 !s390x !riscv64" license="GPL zlib MIT Unlicense BSD Apache-2.0 CDDL CC0 custom" options="!check" # No test suite from upstream subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/inikep/lzbench/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/inikep/lzbench/archive/v$pkgver.tar.gz + loongarch64.patch + " builddir="$srcdir/$pkgname-$pkgver/" build() { @@ -22,4 +24,7 @@ package() { install -Dm 644 -t "$pkgdir"/usr/share/doc/$pkgname/ README.md } -sha512sums="5a1f4c25a7d8b95619027c527e668d466cbdb8759faf4fcd59d3de311895fc72788b8e06b7ac5bb2d26bb94fbe633f5639336fa6eac6ba72769e4ad969401862 lzbench-1.8.1.tar.gz" +sha512sums=" +5a1f4c25a7d8b95619027c527e668d466cbdb8759faf4fcd59d3de311895fc72788b8e06b7ac5bb2d26bb94fbe633f5639336fa6eac6ba72769e4ad969401862 lzbench-1.8.1.tar.gz +23941f7d0474cea13b331206448bfac73d57bce8755a98c1e4e53f435e4ce75d175ab2fe14cba4725155d2f8d094994810a8415b8fc859c64cbd291bc70fd74d loongarch64.patch +" diff --git a/community/lzbench/loongarch64.patch b/community/lzbench/loongarch64.patch new file mode 100644 index 00000000000..776dfc9ade5 --- /dev/null +++ b/community/lzbench/loongarch64.patch @@ -0,0 +1,13 @@ +diff --git a/tornado/Common.h b/tornado/Common.h +index 0373316..4f7bd7c 100644 +--- a/tornado/Common.h ++++ b/tornado/Common.h +@@ -15,7 +15,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + +-#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__) || defined(_ARCH_PPC64) || defined(__arm64__) || defined(__aarch64__) ++#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__) || defined(_ARCH_PPC64) || defined(__arm64__) || defined(__aarch64__) || defined(__loongarch64) + #define FREEARC_64BIT + #endif + diff --git a/community/m1n1/APKBUILD b/community/m1n1/APKBUILD index 84796c9cbe8..daea7824eb0 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.12 +pkgver=1.4.14 _artwork_commitid=8f94d09964c00678ed01b24de9b75350735ec486 pkgrel=0 pkgdesc="bootloader and experimentation playground for Apple Silicon" @@ -31,6 +31,6 @@ package() { } sha512sums=" -2537c06523e133c169cd8a21cce0f644d004c8d9aa25ea08a8c5f0781851f68f832b4ac44011f5541ad6ab61271ece7c9d7337fa252f068673850090622659f3 m1n1-1.4.12.tar.gz -60b5215fcf3d6b64e21553ddb87d0fad0588ce16ee8ba76e676233a6c91ca97373a0258b7a352f4f7028d1887d7c5a996de6aac1989d6e595e9b18477a25d2fb artwork-1.4.12.tar.gz +5fee4af23dab761b5ee72ef1ddef654e8c1addc8faecef5963b87d69da89739574a5fc541c9a779c257be08f8b15f2e4ba59cbaaaf765a6b82a0696469455e2e m1n1-1.4.14.tar.gz +60b5215fcf3d6b64e21553ddb87d0fad0588ce16ee8ba76e676233a6c91ca97373a0258b7a352f4f7028d1887d7c5a996de6aac1989d6e595e9b18477a25d2fb artwork-1.4.14.tar.gz " diff --git a/community/macchanger/APKBUILD b/community/macchanger/APKBUILD index 3e286ce9f24..9e33296f714 100644 --- a/community/macchanger/APKBUILD +++ b/community/macchanger/APKBUILD @@ -1,17 +1,29 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Contributor: Stefan Wagner <stw@bit-strickerei.de> -# Maintainer: Stefan Wagner <stw@bit-strickerei.de> +# Maintainer: omni <omni+alpine@hack.org> pkgname=macchanger pkgver=1.7.0 -pkgrel=2 +pkgrel=3 pkgdesc="An utility for viewing/manipulating the MAC address of network interfaces" url="https://github.com/alobbs/macchanger" arch="all" license="GPL-3.0-or-later" makedepends="linux-headers" subpackages="$pkgname-doc" -source="https://github.com/alobbs/macchanger/releases/download/$pkgver/$pkgname-$pkgver.tar.gz - fix-caddr_t.patch" +source="https://github.com/alobbs/macchanger/releases/download/$pkgver/macchanger-$pkgver.tar.gz + https://ftp.debian.org/debian/pool/main/m/macchanger/macchanger_1.7.0-5.4.debian.tar.xz + fix-caddr_t.patch + " + +prepare() { + default_prepare + + patch -p1 < "$srcdir"/debian/patches/02-fix_usage_message.patch + patch -p1 < "$srcdir"/debian/patches/06-update_OUI_list.patch + patch -p1 < "$srcdir"/debian/patches/08-fix_random_MAC_choice.patch + patch -p1 < "$srcdir"/debian/patches/check-random-device-read-errors.patch + patch -p1 < "$srcdir"/debian/patches/verify-changed-MAC.patch +} build() { ./configure \ @@ -29,7 +41,13 @@ check() { package() { make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir"/debian/changelog \ + "$pkgdir"/usr/share/doc/"$pkgname"/debian.changelog } -sha512sums="69f2008ace6ff8223ecf25805c08ddf42add9ed16c65f3bb57f74b8b0d080d584381ce79592d2ef581a9ba73f12624dae8db63dbb12e4875dfd29d828a4a5da3 macchanger-1.7.0.tar.gz -00d59ce7562f0f011bd00f68d6e9aa4dd09d1dfb1aff4cb7291602e02d7015fb1f5038037c638e79f8aaf3c4787ef549c83d60303512b7d983b7f2ab386ccd21 fix-caddr_t.patch" +sha512sums=" +69f2008ace6ff8223ecf25805c08ddf42add9ed16c65f3bb57f74b8b0d080d584381ce79592d2ef581a9ba73f12624dae8db63dbb12e4875dfd29d828a4a5da3 macchanger-1.7.0.tar.gz +b50b52532fc987f443088f2a4d0f2327dac972e69bc4c0bc0a94de4583df76c7d32c40a143d24b7fa6e066fc36b89c4b160c02b26860c484aab5054a4032f0cc macchanger_1.7.0-5.4.debian.tar.xz +00d59ce7562f0f011bd00f68d6e9aa4dd09d1dfb1aff4cb7291602e02d7015fb1f5038037c638e79f8aaf3c4787ef549c83d60303512b7d983b7f2ab386ccd21 fix-caddr_t.patch +" diff --git a/community/madonctl/APKBUILD b/community/madonctl/APKBUILD index aa3be86986c..bbea4c234b0 100644 --- a/community/madonctl/APKBUILD +++ b/community/madonctl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: mio <miyopan@e.email> pkgname=madonctl pkgver=2.3.2 -pkgrel=10 +pkgrel=11 pkgdesc="CLI client for the Mastodon social network API" url="https://github.com/McKael/madonctl" license="MIT" diff --git a/community/mailcommon/APKBUILD b/community/mailcommon/APKBUILD index 02c11e76b39..bd48376bea4 100644 --- a/community/mailcommon/APKBUILD +++ b/community/mailcommon/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=mailcommon -pkgver=24.02.2 +pkgver=24.05.0 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. @@ -86,5 +87,5 @@ package() { } sha512sums=" -d88e49e8efe5891a629cb37d425b60e2607174643c0ffe6dca67e971ff50ae32d47ed706fc57a41052be5edbeaa819a3bce69cf9907d0ac98e62df53625feeec mailcommon-24.02.2.tar.xz +60edf944e611bfb567c8df8f1d6dad122fe112e26e1a9f0ab155121fa395b1a98a63d095513e97ea5c377dfc5f17d413a731c5b4ed58d301ded497f443471651 mailcommon-24.05.0.tar.xz " diff --git a/community/mailimporter/APKBUILD b/community/mailimporter/APKBUILD index 4e2437c414a..f40c1541d39 100644 --- a/community/mailimporter/APKBUILD +++ b/community/mailimporter/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=mailimporter -pkgver=24.02.2 +pkgver=24.05.0 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=" @@ -54,5 +55,5 @@ package() { } sha512sums=" -398445294e3f147c3e363f095ceff2696ece919f3737b058485722ab9e9443270ae5b984b04c7e58fe36fd16f5e1d29d5de17526f323b6e42ab86085a4cf8de6 mailimporter-24.02.2.tar.xz +bd8514968dd18f7bf70815d8d307b4a764b76d004aa45acfd2ffd95796174b5ba038268d1450dac6ea8270117b60d26b88d8be828725842c7130ea3f37f0e721 mailimporter-24.05.0.tar.xz " diff --git a/community/mako/APKBUILD b/community/mako/APKBUILD index 64c7bd21b92..6b8fa32dada 100644 --- a/community/mako/APKBUILD +++ b/community/mako/APKBUILD @@ -1,8 +1,7 @@ -# Contributor: # Maintainer: Michał Polański <michal@polanski.me> pkgname=mako -pkgver=1.8.0 -pkgrel=2 +pkgver=1.9.0 +pkgrel=0 pkgdesc="A lightweight notification daemon for Wayland" url="https://wayland.emersion.fr/mako/" arch="all" @@ -45,5 +44,5 @@ package() { } sha512sums=" -d187c00296f3c3d4fb2c5964a95e1ac6ab74deb7dc27633d8e8301d60d90e4dc92b0ee66953670c42a3c08160536a4126ee747214c4ea05a30a80fd5e2004ad0 mako-1.8.0.tar.gz +da9c89dc698e44100960c9911c9da59e6f3dd5e95c8c0fbc489c9597dd614bb46074170b9621eba6ff692eff140f7be11ecc9da1a285b8e5c0975b7b53daabee mako-1.9.0.tar.gz " diff --git a/community/mangohud/0001-fix-ld_libdir_mangohud.patch b/community/mangohud/0001-fix-ld_libdir_mangohud.patch deleted file mode 100644 index af1fd233226..00000000000 --- a/community/mangohud/0001-fix-ld_libdir_mangohud.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix ld_libdir_mangohud used by the mangohud shell script to locate the -libMangoHud.so lib. ---- a/src/meson.build -+++ b/src/meson.build -@@ -3,10 +3,10 @@ - # Needs prefix for configure_file() - if get_option('append_libdir_mangohud') - libdir_mangohud = join_paths(get_option('prefix'), get_option('libdir'), 'mangohud') -- ld_libdir_mangohud = get_option('prefix') + '/\$LIB/mangohud/' -+ ld_libdir_mangohud = join_paths(get_option('prefix'), get_option('libdir'), 'mangohud') + '/' - else - libdir_mangohud = join_paths(get_option('prefix'), get_option('libdir')) -- ld_libdir_mangohud = get_option('prefix') + '/\$LIB/' -+ ld_libdir_mangohud = join_paths(get_option('prefix'), get_option('libdir')) + '/' - endif - - conf_data = configuration_data() diff --git a/community/mangohud/0002-fix-stat64.patch b/community/mangohud/0002-fix-stat64.patch deleted file mode 100644 index b898160c7d6..00000000000 --- a/community/mangohud/0002-fix-stat64.patch +++ /dev/null @@ -1,13 +0,0 @@ -stat() is always 64 bit on musl and stat64() has been long deprecated and -eventually removed as alias for `stat()`. ---- a/subprojects/spdlog-1.8.5/include/spdlog/details/os-inl.h -+++ b/subprojects/spdlog-1.8.5/include/spdlog/details/os-inl.h -@@ -231,7 +231,7 @@ - int fd = ::fileno(f); - #endif - // 64 bits(but not in osx or cygwin, where fstat64 is deprecated) --#if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) -+#if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) - struct stat64 st; - if (::fstat64(fd, &st) == 0) - { diff --git a/community/mangohud/APKBUILD b/community/mangohud/APKBUILD index d73b9bc07f6..a0c324c0ac6 100644 --- a/community/mangohud/APKBUILD +++ b/community/mangohud/APKBUILD @@ -1,14 +1,16 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=mangohud -pkgver=0.7.0 +pkgver=0.7.1 +_pkgver=$pkgver-1 pkgrel=0 pkgdesc="Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more" url="https://github.com/flightlessmango/MangoHud" -# Fails to build on 32 bit arches -arch="all !armhf !armv7 !x86" +# s390x: See https://github.com/flightlessmango/MangoHud/issues/1330 +arch="all !s390x" license="MIT" subpackages="$pkgname-doc" makedepends=" + appstream dbus-dev glew-dev glfw-dev @@ -26,15 +28,13 @@ makedepends=" vulkan-loader-dev wayland-dev " +checkdepends=" + cmocka-dev + " source=" - $pkgname-$pkgver.tar.xz::https://github.com/flightlessmango/MangoHud/releases/download/v$pkgver/MangoHud-v$pkgver-Source.tar.xz - - 0001-fix-ld_libdir_mangohud.patch - 0002-fix-stat64.patch - fc925300601098dc45241087626369843d6a2c66.patch + $pkgname-$pkgver.tar.xz::https://github.com/flightlessmango/MangoHud/releases/download/v$pkgver/MangoHud-v$_pkgver-Source.tar.xz " builddir="$srcdir/MangoHud-v$pkgver" -options="!check" # tests not working with --wrap-mode=nodownload build() { abuild-meson \ @@ -46,7 +46,7 @@ build() { -Dmangoapp=true \ -Dmangoapp_layer=true \ -Dmangohudctl=true \ - -Dtests=disabled \ + -Dtests=enabled \ -Dwith_dbus=enabled \ -Dwith_wayland=enabled \ -Dwith_xnvctrl=disabled \ @@ -63,8 +63,5 @@ package() { } sha512sums=" -d875052ab6017923b12acfc76d6955b8a59c90ea5afa91809579ed59d123945c3c35e4613e7581e502edcb77c8037c5f0ac00e77e2527f9b394c92bb7823a9e4 mangohud-0.7.0.tar.xz -eced3fd10cc50231363eaf02340bb48f7c27faead82af11cdc0e5536c50db03b32de5268311192cd6f68ccc4dc7921451240a019e155e28fe517e63e7dd1737b 0001-fix-ld_libdir_mangohud.patch -38653a58076ff809bf3d37407903206f84a9dff61d99ffda9fce2a889e9977f3063fb3c35b7db3d7bc5d3e226808f83a31748ea0b517c5cc56d613ebd2b2d210 0002-fix-stat64.patch -3209fb641de48566572253d1706152f6e2b3e468284d8ef32471698eaff8c763eea83741957162d726e76aba6c85f24042d8f77d31db33b066831f4443aba015 fc925300601098dc45241087626369843d6a2c66.patch +79ac17a199035c410b98b5c4315641efde39636659c2b78b4cd6dc71024a7230044522a6c20bf82f2ca2f6c771e879274655561e8f8071914c30e2a61d99af80 mangohud-0.7.1.tar.xz " diff --git a/community/mangohud/fc925300601098dc45241087626369843d6a2c66.patch b/community/mangohud/fc925300601098dc45241087626369843d6a2c66.patch deleted file mode 100644 index ff18578a2cd..00000000000 --- a/community/mangohud/fc925300601098dc45241087626369843d6a2c66.patch +++ /dev/null @@ -1,105 +0,0 @@ -From fc925300601098dc45241087626369843d6a2c66 Mon Sep 17 00:00:00 2001 -From: John Zimmermann <me@johnnynator.dev> -Date: Thu, 28 Sep 2023 16:42:21 +0200 -Subject: [PATCH] elfhacks: d_un.d_ptr is relative on non glibc systems - -elf(5) documents it this way, GLIBC diverts from this documentation - -partial fix for #601 ---- - src/elfhacks.cpp | 22 ++++++++++++++-------- - src/real_dlsym.cpp | 1 + - 2 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/src/elfhacks.cpp b/src/elfhacks.cpp -index 7cfc310ee9..810a19d967 100644 ---- a/src/elfhacks.cpp -+++ b/src/elfhacks.cpp -@@ -29,6 +29,12 @@ - * \{ - */ - -+#ifdef __GLIBC__ -+# define ABS_ADDR(obj, ptr) (ptr) -+#else -+# define ABS_ADDR(obj, ptr) ((obj->addr) + (ptr)) -+#endif -+ - struct eh_iterate_callback_args { - eh_iterate_obj_callback_func callback; - void *arg; -@@ -196,22 +202,22 @@ int eh_init_obj(eh_obj_t *obj) - if (obj->strtab) - return ENOTSUP; - -- obj->strtab = (const char *) obj->dynamic[p].d_un.d_ptr; -+ obj->strtab = (const char *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr); - } else if (obj->dynamic[p].d_tag == DT_HASH) { - if (obj->hash) - return ENOTSUP; - -- obj->hash = (ElfW(Word) *) obj->dynamic[p].d_un.d_ptr; -+ obj->hash = (ElfW(Word) *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr); - } else if (obj->dynamic[p].d_tag == DT_GNU_HASH) { - if (obj->gnu_hash) - return ENOTSUP; - -- obj->gnu_hash = (Elf32_Word *) obj->dynamic[p].d_un.d_ptr; -+ obj->gnu_hash = (Elf32_Word *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr); - } else if (obj->dynamic[p].d_tag == DT_SYMTAB) { - if (obj->symtab) - return ENOTSUP; - -- obj->symtab = (ElfW(Sym) *) obj->dynamic[p].d_un.d_ptr; -+ obj->symtab = (ElfW(Sym) *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr); - } - p++; - } -@@ -449,7 +455,7 @@ int eh_find_next_dyn(eh_obj_t *obj, ElfW_Sword tag, int i, ElfW(Dyn) **next) - - int eh_set_rela_plt(eh_obj_t *obj, int p, const char *sym, void *val) - { -- ElfW(Rela) *rela = (ElfW(Rela) *) obj->dynamic[p].d_un.d_ptr; -+ ElfW(Rela) *rela = (ElfW(Rela) *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr); - ElfW(Dyn) *relasize; - unsigned int i; - -@@ -470,7 +476,7 @@ int eh_set_rela_plt(eh_obj_t *obj, int p, const char *sym, void *val) - - int eh_set_rel_plt(eh_obj_t *obj, int p, const char *sym, void *val) - { -- ElfW(Rel) *rel = (ElfW(Rel) *) obj->dynamic[p].d_un.d_ptr; -+ ElfW(Rel) *rel = (ElfW(Rel) *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr); - ElfW(Dyn) *relsize; - unsigned int i; - -@@ -520,7 +526,7 @@ int eh_set_rel(eh_obj_t *obj, const char *sym, void *val) - - int eh_iterate_rela_plt(eh_obj_t *obj, int p, eh_iterate_rel_callback_func callback, void *arg) - { -- ElfW(Rela) *rela = (ElfW(Rela) *) obj->dynamic[p].d_un.d_ptr; -+ ElfW(Rela) *rela = (ElfW(Rela) *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr); - ElfW(Dyn) *relasize; - eh_rel_t rel; - eh_sym_t sym; -@@ -550,7 +556,7 @@ int eh_iterate_rela_plt(eh_obj_t *obj, int p, eh_iterate_rel_callback_func callb - - int eh_iterate_rel_plt(eh_obj_t *obj, int p, eh_iterate_rel_callback_func callback, void *arg) - { -- ElfW(Rel) *relp = (ElfW(Rel) *) obj->dynamic[p].d_un.d_ptr; -+ ElfW(Rel) *relp = (ElfW(Rel) *) ABS_ADDR(obj, obj->dynamic[p].d_un.d_ptr); - ElfW(Dyn) *relsize; - eh_rel_t rel; - eh_sym_t sym; -diff --git a/src/real_dlsym.cpp b/src/real_dlsym.cpp -index 173dc1be9d..3e5a77c4ed 100644 ---- a/src/real_dlsym.cpp -+++ b/src/real_dlsym.cpp -@@ -26,6 +26,7 @@ static void get_real_functions() - #endif - "*libc.so*", - "*libc.*.so*", -+ "*ld-musl-*.so*", - }; - - for (size_t i = 0; i < sizeof(libs) / sizeof(*libs); i++) diff --git a/community/marble/APKBUILD b/community/marble/APKBUILD index 344aa028c83..eaa75065e5d 100644 --- a/community/marble/APKBUILD +++ b/community/marble/APKBUILD @@ -4,12 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=marble -pkgver=24.02.2 +pkgver=24.05.0 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=" @@ -61,5 +61,5 @@ package() { } sha512sums=" -3efee57d8270e4643e38c10565a73a32840d2284b9e773d115dcb826f7c95d62884a251b5eaaf5abbe5a494668d6cdde2c8bdafedce0e666035dfbe46399d5b0 marble-24.02.2.tar.xz +023d65a0bcdedf9ea77b7b7d78e8eee7e3702f37a0647c4b11a9cd29f92f4f48805735288f97e34b4846f680541ab54ac0f9a097f15559ecf9594400ea1c33a0 marble-24.05.0.tar.xz " diff --git a/testing/marknote/APKBUILD b/community/marknote/APKBUILD index 797fa3e02bb..1ed1e593b92 100644 --- a/testing/marknote/APKBUILD +++ b/community/marknote/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-other pkgname=marknote -pkgver=1.1.1 +pkgver=1.2.1 pkgrel=0 pkgdesc="A simple markdown note management app" # armhf blocked by extra-cmake-modules @@ -51,5 +51,5 @@ package() { } sha512sums=" -b5664ae77d64e53f2eb773a3bca88709995ee2fc743490a2cc45bc15affb30a866cf970f5c766c4c8a4f0da8c93cce97c5ef2c21776d2977acd3c3344bda3a6b marknote-1.1.1.tar.xz +9cf559abbc859b3b8781591bc0883a60245ea170f050508e3a3cfb00f15e42f936f06f62a052eeb8e70d5721d184a38addfbd8ac3c3211c1388ae4935d9db36a marknote-1.2.1.tar.xz " diff --git a/community/massif-visualizer/APKBUILD b/community/massif-visualizer/APKBUILD index 996aed9bd5f..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 - kdiagram5-dev - ki18n5-dev - kio5-dev - kparts5-dev - qt5-qtbase-dev - qt5-qtsvg-dev - qt5-qtxmlpatterns-dev + karchive-dev + kconfig-dev + kcoreaddons-dev + kdiagram-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 } @@ -48,5 +45,5 @@ package() { } sha512sums=" -058412e34c0899a34fb4080a602cb0c70a9ac707f27b72a79fb412ea35a6e8c66ce06df15b3153fdc1a70a27232f98b508c7441b657eb73466962b33f9b2f561 massif-visualizer-0.7.0.tar.xz +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/matterbridge/APKBUILD b/community/matterbridge/APKBUILD index 879abf00039..452815f6548 100644 --- a/community/matterbridge/APKBUILD +++ b/community/matterbridge/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com> pkgname=matterbridge pkgver=1.26.0 -pkgrel=10 +pkgrel=11 _commit=6dafebc7 # git rev-parse --short HEAD pkgdesc="Bridges between a growing number of chat protocols" url="https://github.com/42wim/matterbridge" diff --git a/community/mautrix-whatsapp/APKBUILD b/community/mautrix-whatsapp/APKBUILD index 8d1bbe1963e..342beb695a4 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=2 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/mediaelch/APKBUILD b/community/mediaelch/APKBUILD index faaf80e30ae..f08252276bf 100644 --- a/community/mediaelch/APKBUILD +++ b/community/mediaelch/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Galen Abell <galen@galenabell.com> pkgname=mediaelch pkgver=2.10.6 -pkgrel=0 +pkgrel=1 pkgdesc="Media Manager for Kodi" url="https://github.com/Komet/MediaElch" arch="all" license="LGPL-3.0-only" -depends="qt6-qtbase-sqlite" +depends="qt6-qtbase-sqlite qt6-qtsvg" makedepends=" cmake qt6-qt5compat-dev diff --git a/community/meek/APKBUILD b/community/meek/APKBUILD index e5731b48c57..c30675e8769 100644 --- a/community/meek/APKBUILD +++ b/community/meek/APKBUILD @@ -2,10 +2,11 @@ # Maintainer: kpcyrd <git@rxv.cc> pkgname=meek pkgver=0.38.0 -pkgrel=5 +pkgrel=6 pkgdesc="Pluggable transport proxy written in Go" url="https://trac.torproject.org/projects/tor/wiki/doc/meek" -arch="all !riscv64" # fails to build on riscv64 +# riscv64, loongarch64: fails to build -> rerefraction-networking/utls +arch="all !riscv64 !loongarch64" license="CC0-1.0" depends="ca-certificates" makedepends="go libcap-utils" diff --git a/community/megapixels/APKBUILD b/community/megapixels/APKBUILD index c6f4c87ce96..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.1 +pkgver=1.8.2 pkgrel=0 pkgdesc="GTK+4 camera app for mobile devices" url="https://gitlab.com/megapixels-org/Megapixels" @@ -45,6 +45,6 @@ tools() { } sha512sums=" -2a90198f7681233fe2a633b63ceab4cb64670c5e17eef747d7e2627aa0a1746c4a22c178e8e4eb3b21f1bfbc2dc0e1ded39a29203467e8b221b319534b511351 Megapixels-1.8.1.tar.bz2 +cbcb76a70f153faaf5ad5cca10947243a0d9b7370ecd1e16b7690b4ee9dd59cfd96eda2cb67a52e2b719748b8e49be94dbe227ddbf6035426ca3d5f2a8212c11 Megapixels-1.8.2.tar.bz2 bfaa5b1729642f2eeb5b9e6b0c3b8b6152ecd8c3510301588719efb303d27d64b27aebe0773bf7b71f6481ee4508204cbb68b5cc4b2856fb3bda60bd306f9751 0001-Don-t-pass-length-parameter-for-TIFFSetField-TIFFTAG.patch " diff --git a/testing/meowdict/APKBUILD b/community/meowdict/APKBUILD index 97211639a93..ec2c15ff7ff 100644 --- a/testing/meowdict/APKBUILD +++ b/community/meowdict/APKBUILD @@ -15,7 +15,7 @@ makedepends=" openssl-dev " source="https://github.com/eatradish/meowdict/archive/v$pkgver/meowdict-$pkgver.tar.gz - getrandom-0.2.14.patch + getrandom-0.2.15.patch nix-0.28.0.patch update-test_wordshk_api_result.patch " @@ -42,7 +42,7 @@ package() { sha512sums=" 2af8e39e6fa6c3dc54a38993f59bef4b893255b9dc05c47af6bd3fd2f61654f8768b748c33f9f623a255e73e0d06f9301d15390cfeee09466015daaaab457698 meowdict-0.10.5.tar.gz -d1eadfb6b000be2a020b5430793a81bd880ec0be4de2604aa96fa74757e16c9dff22c0c46b87ef417f33d03c22ec3d1a784f20c71ec0d31a58fafafe9194408e getrandom-0.2.14.patch +54a7cb097241320abd5568de61215f68fbbe063dc433fbda4988370ffcf20e942a89d35bfec83f897d331359493a19d99d49dc28cc7762538cd8d85170716261 getrandom-0.2.15.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/community/meowdict/getrandom-0.2.15.patch index 318cf13433c..279d7c3bc7c 100644 --- a/testing/meowdict/getrandom-0.2.14.patch +++ b/community/meowdict/getrandom-0.2.15.patch @@ -5,10 +5,10 @@ [[package]] name = "getrandom" -version = "0.2.8" -+version = "0.2.14" ++version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -+checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" ++checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -17,10 +17,10 @@ [[package]] name = "libc" -version = "0.2.140" -+version = "0.2.153" ++version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" -+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "linux-raw-sys" diff --git a/testing/meowdict/nix-0.28.0.patch b/community/meowdict/nix-0.28.0.patch index 5e0ca58c3e1..5e0ca58c3e1 100644 --- a/testing/meowdict/nix-0.28.0.patch +++ b/community/meowdict/nix-0.28.0.patch diff --git a/testing/meowdict/update-test_wordshk_api_result.patch b/community/meowdict/update-test_wordshk_api_result.patch index 0fb08da68c1..0fb08da68c1 100644 --- a/testing/meowdict/update-test_wordshk_api_result.patch +++ b/community/meowdict/update-test_wordshk_api_result.patch diff --git a/community/mercury/APKBUILD b/community/mercury/APKBUILD index 787bc67d203..eff949aba50 100644 --- a/community/mercury/APKBUILD +++ b/community/mercury/APKBUILD @@ -5,7 +5,7 @@ pkgver=22.01.8 pkgrel=1 pkgdesc="Compiler for the Mercury language" url="https://www.mercurylang.org" -arch="all" +arch="all !loongarch64" # loongarch64: upstream does not support license="GPL-2.0-only" makedepends="autoconf automake bison flex" depends="$pkgname-libs" diff --git a/community/merkuro/APKBUILD b/community/merkuro/APKBUILD index cae27e716e5..be5e8fb2112 100644 --- a/community/merkuro/APKBUILD +++ b/community/merkuro/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=merkuro -pkgver=24.02.2 +pkgver=24.05.0 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=" @@ -65,5 +66,5 @@ package() { } sha512sums=" -4958ddd9e15637852da04004f661b120315e95c0430dd910e8018c74dda475785b0cf91afc8cfe24199dd134f9de1ce2a048d3531161ea444f1af1f5ed43b88e merkuro-24.02.2.tar.xz +42bb6b1e8e0e08975d8ad44331f970e6c8bfddf3581afb936c6ce6eb1fc39aed429f0cd4c78be637c22d2838fd08f3694c3c9fe36d4204d677b7f934793666f5 merkuro-24.05.0.tar.xz " diff --git a/community/messagelib/APKBUILD b/community/messagelib/APKBUILD index 480d2ddefda..de8d9ab0adc 100644 --- a/community/messagelib/APKBUILD +++ b/community/messagelib/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=messagelib -pkgver=24.02.2 +pkgver=24.05.0 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=" @@ -115,5 +116,5 @@ package() { } sha512sums=" -60aecc3b53fe5e61e120c361f65dce1490a2a3da2930a8a14583c76c741636156634f1e5b6b35a1a33f84fdf1fbd847a05131c16f82c92d1da5874c20ec3114b messagelib-24.02.2.tar.xz +589e21357f3d13a6c897c696b966b327f6d9342d131f8db619d965f13362723b651371e37c0d6b173d0fe27673dd08b0b3b38f0283e5416eba4f269e7c47f782 messagelib-24.05.0.tar.xz " diff --git a/community/micro/APKBUILD b/community/micro/APKBUILD index 0f97303c8e9..de54b8be6fb 100644 --- a/community/micro/APKBUILD +++ b/community/micro/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=micro pkgver=2.0.13 -pkgrel=3 +pkgrel=4 # This will need to be updated along with version as it cannot currently be # obtained from the tarball, and is necessary if the user is to make error # reports upsteam. diff --git a/community/miller/APKBUILD b/community/miller/APKBUILD index 2c3ca61d4ed..e8d42ccefd1 100644 --- a/community/miller/APKBUILD +++ b/community/miller/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=miller pkgver=6.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="Name-indexed data processing tool" url="https://miller.readthedocs.io/" arch="all" diff --git a/community/millipixels/APKBUILD b/community/millipixels/APKBUILD index 272f6a74042..a5d1a185f2b 100644 --- a/community/millipixels/APKBUILD +++ b/community/millipixels/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=millipixels pkgver=0.22.0 -pkgrel=5 +pkgrel=6 pkgdesc="Camera application for the Librem 5" url="https://source.puri.sm/Librem5/millipixels" arch="all" diff --git a/community/milou/APKBUILD b/community/milou/APKBUILD index 4d371f033e0..e0cad621d9f 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="A dedicated search application built on top of Baloo" # armhf blocked by qt6-qtdeclarative @@ -50,5 +50,5 @@ package() { } sha512sums=" -8a95186eb0933236f03e846d8cc2ab886882e44a13de98de4aefdd915955f5f3f7d4fb0c358449869324dd7deca772c78172c90a2203828e30e9c39fb70d8c71 milou-6.0.4.tar.xz +c310c0bbfd50df8a6723a42bb3e25b40a616f81e8cffc7e69316f7d8a9ed1370a37bc4b119ab55aa6e33ba1bb67c74fb04360cf497fae4ff9481709cfd12075e milou-6.0.5.tar.xz " diff --git a/community/mimalloc2/APKBUILD b/community/mimalloc2/APKBUILD index ff5d83c2801..28117ea7e08 100644 --- a/community/mimalloc2/APKBUILD +++ b/community/mimalloc2/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=mimalloc2 _projname=mimalloc -pkgver=2.1.2 +pkgver=2.1.6 _pkgver=${pkgver%_*} pkgrel=0 _pkgdesc="A compact general purpose allocator with excellent performance" @@ -19,6 +19,7 @@ subpackages=" $pkgname-debug " source="https://github.com/microsoft/mimalloc/archive/v$_pkgver/$_projname-$_pkgver.tar.gz + fix-align-issue-on-32bit-musl.patch cmake-add-insecure-suffix.patch " builddir="$srcdir/$_projname-$_pkgver" @@ -102,6 +103,7 @@ debug() { } sha512sums=" -927b046e67783b325a6e41e3a9a6d3d78306fa1c82255defd1f3a7a60a27fd809a601f65b1b27fa38f2064e124f29856d7c0e5ccc33c54c2e4b6ebb9816d74b1 mimalloc-2.1.2.tar.gz +cbecca799be7a38b291c44ac765aa6ce36c6aeb0f064da942c568da38073350a122e7d1553e7929ee4f72f61ab3b767fa565f252cfd819463d2e1c73c25c5163 mimalloc-2.1.6.tar.gz +6c17d01de467018d328f65c220676ff51e313f22143cb3fda4d980db203d5b2168c84482d91fa3db6981efdcb0b716ac2fbae60c2032b15a5152999d4ffc7a19 fix-align-issue-on-32bit-musl.patch 99a7777e310f4a585e482ad9dc44fce62e88b65f4f8f51545c9e6b1fd8a17583614cc853e65dade9dd083936de90c3a6f23aa52eb84697020f2a44868e6d4c93 cmake-add-insecure-suffix.patch " diff --git a/community/mimalloc2/fix-align-issue-on-32bit-musl.patch b/community/mimalloc2/fix-align-issue-on-32bit-musl.patch new file mode 100644 index 00000000000..139170eeefd --- /dev/null +++ b/community/mimalloc2/fix-align-issue-on-32bit-musl.patch @@ -0,0 +1,47 @@ +Patch-Source: https://github.com/microsoft/mimalloc/commit/e3fea8f4e1a04f4b260a78e6b5a8f0eead990445 +Patch-Source: https://github.com/microsoft/mimalloc/commit/8fd1184272fdf5c93f4776a36086911b55fb315e +See-Also: https://github.com/microsoft/mimalloc/issues/895 +-- +From 8fd1184272fdf5c93f4776a36086911b55fb315e Mon Sep 17 00:00:00 2001 +From: Daan <daanl@outlook.com> +Date: Fri, 17 May 2024 09:06:27 -0700 +Subject: [PATCH] fix alignment issue on Alpine 32-bit musl compilation (issue + #895) + +--- + src/arena.c | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +diff --git a/src/arena.c b/src/arena.c +index acfde132..aa4bfa42 100644 +--- a/src/arena.c ++++ b/src/arena.c +@@ -141,8 +141,8 @@ static bool mi_arena_memid_indices(mi_memid_t memid, size_t* arena_index, mi_bit + + #define MI_ARENA_STATIC_MAX (MI_INTPTR_SIZE*MI_KiB) // 8 KiB on 64-bit + +-static uint8_t mi_arena_static[MI_ARENA_STATIC_MAX]; +-static _Atomic(size_t) mi_arena_static_top; ++static mi_decl_cache_align uint8_t mi_arena_static[MI_ARENA_STATIC_MAX]; // must be cache aligned, see issue #895 ++static mi_decl_cache_align _Atomic(size_t) mi_arena_static_top; + + static void* mi_arena_static_zalloc(size_t size, size_t alignment, mi_memid_t* memid) { + *memid = _mi_memid_none(); +@@ -151,7 +151,7 @@ static void* mi_arena_static_zalloc(size_t size, size_t alignment, mi_memid_t* m + if ((toplow + size) > MI_ARENA_STATIC_MAX) return NULL; + + // try to claim space +- if (alignment == 0) { alignment = 1; } ++ if (alignment < MI_MAX_ALIGN_SIZE) { alignment = MI_MAX_ALIGN_SIZE; } + const size_t oversize = size + alignment - 1; + if (toplow + oversize > MI_ARENA_STATIC_MAX) return NULL; + const size_t oldtop = mi_atomic_add_acq_rel(&mi_arena_static_top, oversize); +@@ -167,7 +167,7 @@ static void* mi_arena_static_zalloc(size_t size, size_t alignment, mi_memid_t* m + memid->initially_zero = true; + const size_t start = _mi_align_up(oldtop, alignment); + uint8_t* const p = &mi_arena_static[start]; +- _mi_memzero(p, size); ++ _mi_memzero_aligned(p, size); + return p; + } + diff --git a/community/mimetreeparser/APKBUILD b/community/mimetreeparser/APKBUILD index c4df8653717..9e79f241a47 100644 --- a/community/mimetreeparser/APKBUILD +++ b/community/mimetreeparser/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=mimetreeparser -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Parser for MIME trees" # armhf blocked by extra-cmake-modules @@ -55,5 +55,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -d2384284baf339b994947b88b382bf2b23fb21f3c7c557a74783e0d190b7a0ba9d1ecde1f1afa6f69fdf84a3818e6ec1b2d74200759b1957db81b9dff454df6d mimetreeparser-24.02.2.tar.xz +20ffa4d2e7b4c5bc6b927f078726fd29b4a2b5b282438f8995e2c34b11512ecc2b648dbd00a56b0d1ed1169fe4a10eb7b01e59a28c2d361724801c555d2e1b95 mimetreeparser-24.05.0.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/APKBUILD b/community/miniflux/APKBUILD index f9fbd438dcd..9e8b59fbc9b 100644 --- a/community/miniflux/APKBUILD +++ b/community/miniflux/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas J Faughnan Jr <thomas@faughnan.net> pkgname=miniflux pkgver=2.1.3 -pkgrel=0 +pkgrel=1 pkgdesc="Minimalist and opionated feed reader" url="https://miniflux.app/" arch="all" diff --git a/community/minify/APKBUILD b/community/minify/APKBUILD index 7aa10e2d890..3d11c207f79 100644 --- a/community/minify/APKBUILD +++ b/community/minify/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Wesley van Tilburg <justwesley@protonmail.com> pkgname=minify -pkgver=2.20.20 +pkgver=2.20.24 pkgrel=0 pkgdesc="Minifier CLI for HTML, CSS, JS, JSON, SVG and XML" url="https://github.com/tdewolff/minify" @@ -30,5 +30,5 @@ package() { } sha512sums=" -608aec858bd468b6606e0112bbda4c6c3007ee0a96bc7d718de036258c233f46f65b4edea274114eb11c28d4b89283658a975509f57220986b9b1fa91949d72a minify-2.20.20.tar.gz +dd17aec5223bb3996cd5fb2419ade3fcd3af27e2ea31507cfe050edfc34bf89ceb693162fe83e6caf9e0db939322cefe8edb04898e5a40253286276241f7d7e6 minify-2.20.24.tar.gz " diff --git a/community/minio-client/APKBUILD b/community/minio-client/APKBUILD index af68a7dd9bc..5c022d8eaf3 100644 --- a/community/minio-client/APKBUILD +++ b/community/minio-client/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Hoang Nguyen <folliekazetani@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=minio-client -pkgver=0.20240429.095605 +pkgver=0.20240524.090849 # 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=0 @@ -47,5 +47,5 @@ package() { } sha512sums=" -093125f4f6be1b6cf74c3d29d0dce06b91ecca2ed15a6fd6dabc8db5deb67f43bb3a6702874a72834ae72b1b7874fb9f12e3465acddf905451ab0bb61c70be5f minio-client-0.20240429.095605.tar.gz +97b6fbc1683d0807ff53d5cef1026daf455b8c8d44a6b9442f4ef79cd4cb4f37250229843cabaaa0848c0c27fd666b6735223256c9187a5598edfc813cb7ef86 minio-client-0.20240524.090849.tar.gz " diff --git a/community/minio/APKBUILD b/community/minio/APKBUILD index e3d75661a52..9520345fa63 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.20240501.011110 +pkgver=0.20240527.191746 # 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=" -c32eee47ee241a40da1acbfbd7003a6a233338d3e7795012d56618f206918c79bbb6d20a44e7f262fbad97559de0bdedd9dcc8ea73cefdc04eabc4d976a70c2f minio-0.20240501.011110.tar.gz +6412700a878095084515ba61be7fc2250d0459be1d061c8891776479d8179be3a7a5df7ad49ca0e6fda3d83ee804e4ef0c1fbee711adfcbfa71ee2b98468c898 minio-0.20240527.191746.tar.gz 084373e2f0fd35e0c2c86abbcac3e7611a9931608b3aaf9a76677bc5d2f70944917ae8ad6ec401f989eccf8a5e82891764bb5882624bb48857f85c0ba53ffb83 minio.initd 4710b19471af3d84405b543776d88bf48c9276dd676417f9b6e915e866d934b8e64546aaa5cbfc2a3c23243ec5e4959a1a5b62ba850759b1029f99baa27cbefe minio.confd 9c6c0f1041989d999b9ff567e8ece29a91e32c98cce9ee6471a7044cce2d8b7b02459753dd593ed6d7eb8bf308abc219c3eb87177e855addd04b286cb60e657f minio.logrotate 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/minuet/APKBUILD b/community/minuet/APKBUILD index 777fdc9a0c3..000287b9810 100644 --- a/community/minuet/APKBUILD +++ b/community/minuet/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=minuet -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 _commit="353639d99eb54d251516a13db5032b71bd67b47c" arch="all !armhf" # armhf blocked by qt6-qtdeclarative @@ -46,5 +46,5 @@ package() { } sha512sums=" -548ff005ce377a1aa89d4dba1435a2678dcae63d6f27cf3751f5cb57de1f80e28e825fcd7b7c0b957881364fe586d265ed57b656a7407cdd32411fabbce3aeee minuet-24.02.2.tar.xz +94f45b1d36f758a9197229876d69f6ea2418b702cf42caf50e63ac527443dbc6d93853a1cbf446cac38a67424d66006e73d9316a29c38720d34e32ff61913b2c minuet-24.05.0.tar.xz " diff --git a/community/mise/APKBUILD b/community/mise/APKBUILD index f862fe75674..11b3795eaf1 100644 --- a/community/mise/APKBUILD +++ b/community/mise/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Jeff Dickey <alpine@mise.jdx.dev> pkgname=mise -pkgver=2024.5.3 +pkgver=2024.5.23 pkgrel=0 pkgdesc="Polyglot runtime and dev tool version manager" url="https://mise.jdx.dev" @@ -33,5 +33,5 @@ package() { } sha512sums=" -516a8782be088d78dcfac89f47ca5361d765f0f7c4b647f0642eff26bc18ac50170b7440ed0244730c989a4ce1caf1ad59c72a1133c0178df7be3894a19223e4 mise-2024.5.3.tar.gz +8513944277512f1b7501868a736f998e06fb174d8a61a7c08df0edd7e5c12c0bae82ae2f0ef5b39d988ecfb572fa2bf19d40bd73a2367543437a7f8158e5773f mise-2024.5.23.tar.gz " diff --git a/community/mlmym/APKBUILD b/community/mlmym/APKBUILD index 31e11a18cda..d655609db92 100644 --- a/community/mlmym/APKBUILD +++ b/community/mlmym/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=mlmym -pkgver=0.0.43 +pkgver=0.0.45 pkgrel=0 pkgdesc="Lemmy frontend offering a familiar desktop experience" url="https://mlmym.org/" @@ -39,7 +39,7 @@ package() { } sha512sums=" -ffe08533dcc44acd278f5a35ff7f862e07eff7caa2e0d768ec8680c763c8a61ef922948c2b44f28a9206747262e8039174ab4ab06b780668ad4699465649688c mlmym-0.0.43.tar.gz +55a9094e7c90c61d6d3d4ea662b985eeaf699c896f0f2a3e99f8aa8f2d3e25be036cc2a3572f26204bd7c20c7eb8bdd94ef3b9332e9d340f7840aedc9788b204 mlmym-0.0.45.tar.gz 0550e887d54352ad57ed3e3229fc5177b7c85903f93bfb98fb9c719727e7586b61eff4dbc604fca18a11b20362c14b83aafd9513d1bea567ff338df911a01eca mlmym.confd b1e12a9544507db312084ab652ed7572f03c3be3a92b32003b62ad8dbe04f67aae73e18c0aa3e6a6614bacb99a2a1a5254b1ecb196b69a1165db752526351bd8 mlmym.initd f0e5069f0f082a4b6e5af98aada1c90395c3d63571d36e332f4a96294146b48f52b0dc31963a757bea90215d1c449160e29a23c536172a65a5ccbd5a42402e35 dont-get-version-from-git.patch diff --git a/community/mnc/APKBUILD b/community/mnc/APKBUILD index 3780440e6b6..5830f62e411 100644 --- a/community/mnc/APKBUILD +++ b/community/mnc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Anjandev Momi <anjan@momi.ca> pkgname=mnc pkgver=0.4 -pkgrel=20 +pkgrel=21 arch="all" url="https://git.sr.ht/~anjan/mnc" pkgdesc="get the time in seconds to next cron job" 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/modemmanager-qt5/APKBUILD b/community/modemmanager-qt5/APKBUILD index e557d780014..7b03ce22dce 100644 --- a/community/modemmanager-qt5/APKBUILD +++ b/community/modemmanager-qt5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=modemmanager-qt5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Qt wrapper for ModemManager DBus API" # armhf blocked by extra-cmake-modules @@ -48,5 +48,5 @@ package() { } sha512sums=" -0726dbda809e94fea966f54d5adfa8d03e51e5fed5a4b5471516c39e23dd0fd652d5ce9822aa3ddd8e9197b842067040e87e5d369c8cfeccdc8d5965df935f64 modemmanager-qt-5.115.0.tar.xz +dbcac87691d9c0dc12badfdcff229dc1160663c52f8f3d9cd52c964810d49f0bab4612e26f7381a60e1fb25e0b89443cfddfce6416d32c837658641cdb78dbbe modemmanager-qt-5.116.0.tar.xz " diff --git a/community/mold/APKBUILD b/community/mold/APKBUILD index f63f873b940..18049f45f68 100644 --- a/community/mold/APKBUILD +++ b/community/mold/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: Simon Zeni <simon@bl4ckb0ne.ca> pkgname=mold -pkgver=2.30.0 +pkgver=2.31.0 pkgrel=0 pkgdesc="fast modern linker" url="https://github.com/rui314/mold" -arch="all" +arch="all !riscv64" license="MIT" _llvmver=17 makedepends=" @@ -28,8 +28,7 @@ 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 - $pkgname-ppc64le-test-skip.patch + armhf-fix-a-test.patch xxhash.patch " @@ -71,8 +70,7 @@ package() { } sha512sums=" -7cfba4f0fb332799ad267d3eafb8e2f0057af4484467b3e3fbaf8044220163a2c7e26cd1786510f250844c8b57e30c15167c8dd9688af1773abc580c5605abf3 mold-2.30.0.tar.gz -956997757fad80e01cb70dfb927477dbceac2c46874156fddbf32519ef2ee1f73e3ee9179a74f4c5bb02031ee4685f4dd92993a8f35637d0d99098036ebccd06 mold-test-fix.patch -07039b0126cc5471fd91363c83a979d7e906b001928215e23afe4ff659914c21979038353d15320ad53cbfdb2e71d185cd584774c86051c3bcf0b91f36db7f5d mold-ppc64le-test-skip.patch +343c62d8c67b74988f762c46999d2d866b2e9a0c69d2b910b12384ea5abc620b30468cd1b1bacfe41474d1c97c8ce2e49d55ca70479691238fb73d83d9adc683 mold-2.31.0.tar.gz +9d68d03af654a3612796a6bc2e65ef852913c2830e3ba9d64915ecf4b80dc3aea3a7103a1a42aafdd66c75f410b68ed5ac38f468d8ee74e253f4bae92f9b2937 armhf-fix-a-test.patch 9a54c572df99c79e501806ad08cf5e0f5ef7a91f02c973c6e9a86980b1e1fadb0f028746f160bcf89933453a1854e481136ee2fbfb2dbde7f0f53b16e215bd71 xxhash.patch " diff --git a/community/mold/armhf-fix-a-test.patch b/community/mold/armhf-fix-a-test.patch new file mode 100644 index 00000000000..0cfd530f83f --- /dev/null +++ b/community/mold/armhf-fix-a-test.patch @@ -0,0 +1,23 @@ +From 74129bfc86a51237a0908f3d72980617f2f260e7 Mon Sep 17 00:00:00 2001 +From: Rui Ueyama <ruiu@cs.stanford.edu> +Date: Mon, 6 May 2024 13:54:10 +0900 +Subject: [PATCH] Fix a test + +Fixes https://github.com/rui314/mold/issues/1249 +--- + test/elf/arm_abs-error.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/elf/arm_abs-error.sh b/test/elf/arm_abs-error.sh +index 8c5504ab8..fbc57d55f 100755 +--- a/test/elf/arm_abs-error.sh ++++ b/test/elf/arm_abs-error.sh +@@ -6,7 +6,7 @@ cat <<EOF | $CC -fPIC -c -o $t/a.o -xassembler - -mthumb + foo = 3; + EOF + +-cat <<EOF | $CC -fno-PIC -c -o $t/b.o -xc - -mthumb ++cat <<EOF | $CC -fno-PIC -c -o $t/b.o -xc - -mthumb 2> /dev/null || skip + #include <stdio.h> + extern char foo; + int main() { printf("foo=%p\n", &foo); } diff --git a/community/mold/mold-ppc64le-test-skip.patch b/community/mold/mold-ppc64le-test-skip.patch deleted file mode 100644 index 05a689fa234..00000000000 --- a/community/mold/mold-ppc64le-test-skip.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 46723d00c7c..00000000000 --- a/community/mold/mold-test-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 2155591a364..f4e2e63eb3b 100644 --- a/community/monero/APKBUILD +++ b/community/monero/APKBUILD @@ -31,6 +31,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/monero-project/monero/archiv gcc13.patch system-miniupnpc.patch version-string.patch + loongarch64.patch " prepare() { @@ -63,4 +64,5 @@ c149f1e6a6968115f95213d512116457b36665ff1159c5137dda45fa27712ce6f088b908663fb429 9d1ae2b057d49abb1fcd04744069bc3898f8822db2ecf259bc6f0f8b20c4871ba9947356c548e43d2fc20aa4aa03aaf02e0052d53056028d334638c0a360842a gcc13.patch 53c5d59a8c6a39969ca2507dd0e9cb9339c85f54ae175be4bb773d0a99ca8ba39b4aab3ffe843637395760e1b4162d6002a97242fda3bbfbad1ecccce1ecf209 system-miniupnpc.patch 411d041754bf801a4dcff6eb52d0d7fa29ad07ce673f956764b2d4b8c8252233b5f09f8833f8461be0f9b0c922748db71fecad04ae755c61ebe50113e2648485 version-string.patch +f71bace84a4569cf6c7e094303bb98ba7472d8e8f35b5ece4d5d1e60b3c6a75fb212cbf88a3bc5a5b0ef28a645c7b1c32520f940fa935e42421885cfb0268f74 loongarch64.patch " diff --git a/community/monero/loongarch64.patch b/community/monero/loongarch64.patch new file mode 100644 index 00000000000..20c6de66fa5 --- /dev/null +++ b/community/monero/loongarch64.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8fb03ba..3fbd9cf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -335,6 +335,11 @@ set(RISCV 1) + set(RISCV32 1) + endif() + ++if(ARCH_ID STREQUAL "loongarch64") ++set(LOONGARCH 1) ++set(LOONGARCH64 1) ++endif() ++ + if(WIN32 OR ARM OR PPC64LE OR PPC64 OR PPC) + set(OPT_FLAGS_RELEASE "-O2") + else() +@@ -748,7 +753,7 @@ else() + message(STATUS "AES support explicitly disabled") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNO_AES") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNO_AES") +- elseif(NOT ARM AND NOT PPC64LE AND NOT PPC64 AND NOT PPC AND NOT S390X AND NOT RISCV) ++ elseif(NOT ARM AND NOT PPC64LE AND NOT PPC64 AND NOT PPC AND NOT S390X AND NOT RISCV AND NOT LOONGARCH64) + message(STATUS "AES support enabled") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes") +@@ -762,6 +767,8 @@ else() + message(STATUS "AES support not available on ARMv6") + elseif(ARM7) + message(STATUS "AES support not available on ARMv7") ++ elseif(LOONGARCH64) ++ message(STATUS "AES support not available on LoongArch64") + elseif(ARM8) + CHECK_CXX_ACCEPTS_FLAG("-march=${ARCH}+crypto" ARCH_PLUS_CRYPTO) + if(ARCH_PLUS_CRYPTO) diff --git a/community/mongo-c-driver/APKBUILD b/community/mongo-c-driver/APKBUILD index 327bedf48ce..2561fa6f08a 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.27.0 +pkgver=1.27.1 pkgrel=0 pkgdesc="Client library written in C for MongoDB" url="https://github.com/mongodb/mongo-c-driver" @@ -131,5 +131,5 @@ _dev() { } sha512sums=" -547caacbff9ff43788c658743825ee16ae13e75f9322b0fcd8e107985f9d043a3cb133893ea870c2e5e2c92bc13a9cb69d9a102603f8fa3deb3f2fe26a6f8432 mongo-c-driver-1.27.0.tar.gz +642264ec4358eb2de76b5dc0d7534c8751df980fc7fe21a010a44e4a7799a351ec6a8ed46fba54a6029b5d5e8c82df055a1a0eb01f23c1247a91bab8d6a5b306 mongo-c-driver-1.27.1.tar.gz " diff --git a/community/mongodb-tools/APKBUILD b/community/mongodb-tools/APKBUILD index 30972732a13..4b3e2e852ce 100644 --- a/community/mongodb-tools/APKBUILD +++ b/community/mongodb-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Mikael Jenkler <mikael@jenkler.com> pkgname=mongodb-tools pkgver=100.9.4 -pkgrel=2 +pkgrel=3 pkgdesc="The MongoDB tools provide import, export, and diagnostic capabilities." url="https://github.com/mongodb/mongo-tools" arch="all !s390x !riscv64" # rv64 hangs diff --git a/community/mpd-mpris/APKBUILD b/community/mpd-mpris/APKBUILD index ab25d735df2..a9cf601d427 100644 --- a/community/mpd-mpris/APKBUILD +++ b/community/mpd-mpris/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Zach DeCook <zachdecook@librem.one> pkgname=mpd-mpris pkgver=0.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="Implementation of the MPRIS protocol for MPD." url="https://github.com/natsukagami/mpd-mpris" arch="all" diff --git a/community/mpv/APKBUILD b/community/mpv/APKBUILD index 7f26ac93cbb..65dc55f5b6a 100644 --- a/community/mpv/APKBUILD +++ b/community/mpv/APKBUILD @@ -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" ;; *) diff --git a/community/mqttui/APKBUILD b/community/mqttui/APKBUILD index 7ee2a6fbd6f..181f79807f6 100644 --- a/community/mqttui/APKBUILD +++ b/community/mqttui/APKBUILD @@ -1,7 +1,7 @@ # Contributor: guddaff <alpine@guddaff.de> # Maintainer: guddaff <alpine@guddaff.de> pkgname=mqttui -pkgver=0.20.0 +pkgver=0.21.0 pkgrel=0 pkgdesc="Subscribe to a MQTT Topic or publish something quickly from the terminal" url="https://github.com/EdJoPaTo/mqttui" @@ -14,8 +14,7 @@ subpackages=" $pkgname-fish-completion $pkgname-zsh-completion " -source="https://github.com/EdJoPaTo/mqttui/archive/v$pkgver/mqttui-$pkgver.tar.gz - " +source="https://github.com/EdJoPaTo/mqttui/archive/v$pkgver/mqttui-$pkgver.tar.gz" prepare() { default_prepare @@ -40,5 +39,5 @@ package() { } sha512sums=" -65a71910d23a997317175baf7fee78adb7b5885b2fceda52c9b01c36f21eeee5901b8a396937e8cb4a03a9c8c54d1deed1d3f7f52d506461ae8b6760d6f8e305 mqttui-0.20.0.tar.gz +92cb0f40dcbf1a0e5fa58ee2a476d2374937b459ee76f6cc69b4e117d57171747fbde1ee2cfeaf612e071255e65fb9c2b464b13463e1a11314f8f347b5e91d2a mqttui-0.21.0.tar.gz " 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/munin/APKBUILD b/community/munin/APKBUILD index d78f1e8c034..fcb081748d0 100644 --- a/community/munin/APKBUILD +++ b/community/munin/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Stefan Wagner <stw@bit-strickerei.de> # Maintainer: Stefan Wagner <stw@bit-strickerei.de> pkgname=munin -pkgver=2.0.75 +pkgver=2.0.76 pkgrel=0 pkgdesc="A distributed monitoring/graphing tool" url="https://munin-monitoring.org/" @@ -59,7 +59,7 @@ node() { } sha512sums=" -cceb47c27bfb3080980fd6342e805b5b9fecbef7033d6f2a83fe6c78d20f943961c9f1775ef5e464e49c25c9d246606594f2844827b38d34c04016f15dd68613 munin-2.0.75.tar.gz +e43d8f123cb6bf9a1b99dde4fe93440e256b3950ec1f79923998f83b14530bba24dab87ece1d3e7e5bf3afd645eafa6c1055d1119748e76230cfb29136712086 munin-2.0.76.tar.gz d39760b9c0546638feaf164ad132a0f384f1b70872de2251a328a27a64797501f926141a7273cd5e41a8c11ec4d7a4adda1863b02439d9caa8b216fac60d3062 munin-config.patch 0c2c257ab1b218fa87439de6b5b73782492143bf625cdf18481fff97d648446554c5e1decb6dd44c8803b0ccf1eb6949398da261876093963a8230eda1afe0a8 fix-build.patch 194b742b2ff8312c4c42a8a77d1d9a80bc53ced2343248c36f4229b0b0d366e898487fb5e415f1f5ccea7210a7a86e25de5e45193dbb5d26d2d6a195f0597642 munin.crond 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/mustach/APKBUILD b/community/mustach/APKBUILD index 3f9f5cffeb0..66f7e0edcf2 100644 --- a/community/mustach/APKBUILD +++ b/community/mustach/APKBUILD @@ -21,9 +21,9 @@ 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 build() { diff --git a/community/mycorrhiza/APKBUILD b/community/mycorrhiza/APKBUILD index 304d2d846d7..34ce07ff942 100644 --- a/community/mycorrhiza/APKBUILD +++ b/community/mycorrhiza/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Umar Getagazov <umar@handlerug.me> pkgname=mycorrhiza pkgver=1.14.0 -pkgrel=9 +pkgrel=10 pkgdesc="Lightweight wiki engine based on Git" url="https://mycorrhiza.wiki/" arch="all" 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/mynewt-newt/APKBUILD b/community/mynewt-newt/APKBUILD index 6004c39e82a..eda406847bb 100644 --- a/community/mynewt-newt/APKBUILD +++ b/community/mynewt-newt/APKBUILD @@ -3,7 +3,7 @@ pkgname=mynewt-newt pkgver=1.11.0 _ver=${pkgver//./_}_tag -pkgrel=2 +pkgrel=3 pkgdesc="Apache Newt is a smart build and package management tool for Apache Mynewt Operating System" url="https://mynewt.apache.org" arch="all" diff --git a/community/nats-server/APKBUILD b/community/nats-server/APKBUILD index 09c75b40415..74ea8093eb7 100644 --- a/community/nats-server/APKBUILD +++ b/community/nats-server/APKBUILD @@ -1,13 +1,14 @@ # Contributor: Henrik Riomar <henrik.riomar@gmail.com> # Maintainer: Henrik Riomar <henrik.riomar@gmail.com> pkgname=nats-server -pkgver=2.10.14 +pkgver=2.10.16 pkgrel=0 pkgdesc="High-Performance server for NATS.io" url="https://github.com/nats-io/nats-server" arch="all !x86 !armv7 !armhf !s390x !ppc64le !riscv64" # limited by failing check() license="Apache-2.0" makedepends="go" +options="net" # Go modules source="https://github.com/nats-io/nats-server/archive/v$pkgver/nats-server-$pkgver.tar.gz" # secfixes: @@ -41,5 +42,5 @@ package() { } sha512sums=" -f18a701403bccb46d18f0823d4a4dd99f1bc979e2c407ef4bd2950f61c96a8ceba1da62ced5617a0b423da4de4d6bda1056e62354a3df4cc23da9d41cb70901f nats-server-2.10.14.tar.gz +ce2401f10b13807913976a475604656928afa17d52cb61294f39a65c9377f29fe7cb93dba6914d18c11705b47fb31b889afa19d116631150fec35069dea5864f nats-server-2.10.16.tar.gz " diff --git a/community/navidrome/APKBUILD b/community/navidrome/APKBUILD index 40a77f70c82..504d33c7dd0 100644 --- a/community/navidrome/APKBUILD +++ b/community/navidrome/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Tom Lebreux <me@tomlebreux.com> pkgname=navidrome pkgver=0.51.1 -pkgrel=2 +pkgrel=3 pkgdesc="Modern Music Server and Streamer compatible with Subsonic/Airsonic" url="https://navidrome.org/" arch="all" diff --git a/community/nebula/APKBUILD b/community/nebula/APKBUILD index 4fc827606fe..7058e2c346c 100644 --- a/community/nebula/APKBUILD +++ b/community/nebula/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: TBK <alpine@jjtc.eu> pkgname=nebula pkgver=1.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Scalable overlay networking tool with a focus on performance, simplicity and security" url="https://github.com/slackhq/nebula" license="MIT" diff --git a/community/neo4j/APKBUILD b/community/neo4j/APKBUILD index 4500e5cfef1..63d077213bc 100644 --- a/community/neo4j/APKBUILD +++ b/community/neo4j/APKBUILD @@ -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" diff --git a/community/neochat/APKBUILD b/community/neochat/APKBUILD index b51fbcc6a58..13690e90d78 100644 --- a/community/neochat/APKBUILD +++ b/community/neochat/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=neochat -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="A client for Matrix, the decentralized communication protocol" url="https://invent.kde.org/network/neochat/" @@ -12,7 +12,8 @@ url="https://invent.kde.org/network/neochat/" # riscv64 blocked due to build failure on builders, compiler segfault # Wait for real riscv64 hardware before enabling again # s390x and ppc64le blocked by qt6-qtwebview -arch="all !armhf !riscv64 !s390x !ppc64le" +# loongarch64: blocked by purpose +arch="all !armhf !riscv64 !s390x !ppc64le !loongarch64" license="GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND BSD-2-Clause" depends=" kirigami @@ -40,6 +41,7 @@ makedepends=" kquickimageeditor-dev kstatusnotifieritem-dev libquotient-dev + purpose-dev qcoro-dev qqc2-desktop-style-dev qt6-qtbase-dev @@ -50,6 +52,7 @@ makedepends=" qtkeychain-dev samurai sonnet-dev + syntax-highlighting-dev " subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang" _repo_url="https://invent.kde.org/network/neochat.git" @@ -69,5 +72,5 @@ package() { } sha512sums=" -726ae34b6e714f34d4f88070ef3e173cfb2893530e65efdaf294b835ab9c1e1f8c600c6accf6124bd7f509079acacf2e9b36f3b43956ba37b531677f25a4f18c neochat-24.02.2.tar.xz +c61a40aebb8c4b27094ad282b2b32b065241e2c30bbd7ba03f32330d4002d6ff4dcc4cce68ff4bcb7d87af013daed0a2ce52b105edaf651631543607a443a73b neochat-24.05.0.tar.xz " diff --git a/community/neofetch/APKBUILD b/community/neofetch/APKBUILD index 7ec3d036f0b..97886c543e9 100644 --- a/community/neofetch/APKBUILD +++ b/community/neofetch/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Dawid Dziurla <dawidd0811@gmail.com> -# Maintainer: Dawid Dziurla <dawidd0811@gmail.com> +# Maintainer: pkgname=neofetch pkgver=7.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A CLI system information tool written in Bash that supports displaying images" url="https://github.com/dylanaraps/neofetch" arch="noarch" diff --git a/community/neovim/APKBUILD b/community/neovim/APKBUILD index c6d8922e4d8..6a0b5a0ada0 100644 --- a/community/neovim/APKBUILD +++ b/community/neovim/APKBUILD @@ -3,12 +3,13 @@ # # TODO: Try to trim the base package to include only common syntax files etc. pkgname=neovim -pkgver=0.9.5 -pkgrel=0 +pkgver=0.10.0 +pkgrel=1 pkgdesc="Vim-fork focused on extensibility and agility" url="https://neovim.io/" arch="all" license="Apache-2.0 AND Vim" +depends="lua5.1-lpeg" makedepends=" cmake gettext-dev @@ -17,7 +18,6 @@ makedepends=" libuv-dev libvterm-dev lua-luv-dev - lua5.1-lpeg lua5.1-mpack msgpack-c-dev samurai @@ -27,11 +27,13 @@ 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" +options="!check" # unit and functional tests fail source="https://github.com/neovim/neovim/archive/v$pkgver/neovim-$pkgver.tar.gz + make-tree-sitter-optional.patch nodoc.txt " # secfixes: @@ -63,6 +65,13 @@ build() { cmake --build build } +check() { + msg "Running unit tests" + cmake --build build --target test/unittest + msg "Running functional tests" + cmake --build build --target test/functionaltest +} + package() { DESTDIR="$pkgdir" cmake --install build @@ -91,6 +100,7 @@ doc() { } sha512sums=" -6e20d0a1d506dc292dd68dabe4b5635f86c019ca832f9927e907377e6d21fe7765b3010f5bba644bb2d7a76c178d55b290af24856a7e3c4083a1aa60bc496775 neovim-0.9.5.tar.gz +878cb58729a18179b38303bd9cf79e38997c87946665ac4e7b76d87e15f5d001028fd1454ce30b20773b20a4fe929dfa399fc2ec7f6db0774a4e864c9e8586c1 neovim-0.10.0.tar.gz +660c83a863b8467a7f19febe4cae6f3ea08f985d5fda0c7466e00936c7b8113bf53077d4bd9a983744f131a68346da2f098425695f4c7c7fdd3244b26ee76927 make-tree-sitter-optional.patch 72ab288f53acddc088c567aafe8c5afa6835325fab7879e782d1d62f87a662f3a6bac123c450debbae1b32336cc60b2830b429838ee3dfcc7524773b5069f4f0 nodoc.txt " diff --git a/community/neovim/make-tree-sitter-optional.patch b/community/neovim/make-tree-sitter-optional.patch new file mode 100644 index 00000000000..9dd43aae52b --- /dev/null +++ b/community/neovim/make-tree-sitter-optional.patch @@ -0,0 +1,43 @@ +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Thu, 23 May 2024 20:07:15 +0200 +Subject: Fallback to classic syntax highlighting if tree-sitter parser + is not available + +See https://gitlab.alpinelinux.org/alpine/aports/-/issues/16132, +https://github.com/neovim/neovim/pull/26824 + +--- a/runtime/ftplugin/help.lua ++++ b/runtime/ftplugin/help.lua +@@ -1,5 +1,8 @@ + -- use treesitter over syntax (for highlighted code blocks) +-vim.treesitter.start() ++local ok, _ = pcall(vim.treesitter.start) ++if not ok then ++ print('Note: tree-sitter-vimdoc package is not installed, some features will not work') ++end + + -- add custom highlights for list in `:h highlight-groups` + local bufname = vim.fs.normalize(vim.api.nvim_buf_get_name(0)) +--- a/runtime/ftplugin/lua.lua ++++ b/runtime/ftplugin/lua.lua +@@ -1,2 +1,5 @@ + -- use treesitter over syntax +-vim.treesitter.start() ++local ok, _ = pcall(vim.treesitter.start) ++if not ok then ++ print('Note: tree-sitter-lua package is not installed, some features will not work') ++end +--- a/runtime/ftplugin/query.lua ++++ b/runtime/ftplugin/query.lua +@@ -9,7 +9,10 @@ + -- Do not set vim.b.did_ftplugin = 1 to allow loading of ftplugin/lisp.vim + + -- use treesitter over syntax +-vim.treesitter.start() ++local ok, _ = pcall(vim.treesitter.start) ++if not ok then ++ print('Note: tree-sitter-query package is not installed, some features will not work') ++end + + -- set omnifunc + vim.bo.omnifunc = 'v:lua.vim.treesitter.query.omnifunc' 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 5acb0c1692b..5c84b256a3f 100644 --- a/community/nerdctl/APKBUILD +++ b/community/nerdctl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=nerdctl pkgver=1.7.6 -pkgrel=0 +pkgrel=1 pkgdesc="Docker-compatible CLI for containerd" url="https://github.com/containerd/nerdctl/" arch="all" diff --git a/community/netdata/APKBUILD b/community/netdata/APKBUILD index e8ded470cc6..5176b7973ed 100644 --- a/community/netdata/APKBUILD +++ b/community/netdata/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=netdata -pkgver=1.45.3 -pkgrel=0 +pkgver=1.45.4 +pkgrel=1 pkgdesc="Real-time performance monitoring" url="https://www.netdata.cloud/" license="GPL-3.0-or-later" @@ -164,7 +164,7 @@ go() { } sha512sums=" -c425e748b8968e01aa7e20fb2c71ec3102c16c0917e11a49abb2a1f3a11d46ae1fdc72b4229c39ced28009debd3e86356ea0958c7113f12bb7c2c726a34e78ab netdata-1.45.3.tar.gz +440ba2ea11480a265507db17d09fabb8864d2a6c87bda98a13457994c95bf393fee099ff430dcd18053e4ef31c9e8d9b01d1eed0c6a433214296953b6c186399 netdata-1.45.4.tar.gz 9687ede999002e73563c118fb604cbf8957670f8fac8f7c51d637c1518c00c1919e3b66bf055f152cda766695fc625a751db19a91174f487c0cc2752d47afb52 aclk-schemas-83c661c0dcddb9526814ebbd0668fbc3e281f03f.tar.gz 814e3ee5811b43349a218c2b6595e53c1daf5db2c9346b2ec0ff6475cc83b1803adad3f3210f51e219d6523fcf839543087b94eb18501ee144128fb169bd9c0b dlib-021cbbb1c2ddec39d8dd4cb6abfbbafdf1cf4482.tar.gz f494a2bf75fe7a6c97bf64ae8d2a4eabe6bcc5c1a4a038cb27c23b478a65a543f9c2dcc8223b0e05ebe2ee811baa06876d13d5abb344c1bc51bdf5e3e8d3a75b h2o-094a6f90f76eeb280a430200cba47bde39b0b8e8.tar.gz diff --git a/community/networkmanager-l2tp/APKBUILD b/community/networkmanager-l2tp/APKBUILD index ad3946059b1..806d8a570fc 100644 --- a/community/networkmanager-l2tp/APKBUILD +++ b/community/networkmanager-l2tp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Will Sinatra <wpsinatra@gmail.com> # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=networkmanager-l2tp -pkgver=1.20.14 +pkgver=1.20.16 pkgrel=0 pkgdesc="L2TP support for NetworkManager" url="https://github.com/nm-l2tp/NetworkManager-l2tp" @@ -45,5 +45,5 @@ package() { } sha512sums=" -cddb33bb41b8a865c2c716365598f18daee734c4e10eee3dc5cdf4a4a2184eeb4d61a6ff9b23aab814bde6e67def714a319e6ca50323af24d5f1f265163aa5f5 NetworkManager-l2tp-1.20.14.tar.xz +d1a8364bae0116d556e1b554846df4efa415c0b84fa667181daae50ea706f7f62fa016290c35985667e9bda7ac237198575083dc816c05f16d6ac997da02aa7d NetworkManager-l2tp-1.20.16.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..5089d83654f 100644 --- a/community/networkmanager-qt5/APKBUILD +++ b/community/networkmanager-qt5/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 +# group=kde-frameworks-old pkgname=networkmanager-qt5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Qt wrapper for NetworkManager API" arch="all" @@ -44,5 +44,5 @@ package() { } sha512sums=" -a21522f447dabd98cae2535c41f6a08748f96c2b76ac63264615f2610b74527522edc4539598c30d1166bac8b4f1cc40729afcca36057968a781b6ce07f25e8f networkmanager-qt-5.115.0.tar.xz +01f5687d8476a784c6a6673350c4907ee2f5061207f861895bd54c510bbe940b866488ea07aa63a72d3318b08a855c1096d7f52a1ddbf7cbf7820c248a5efac1 networkmanager-qt-5.116.0.tar.xz " 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/newsraft/APKBUILD b/community/newsraft/APKBUILD index b219bd7a56f..85dc9c08a8b 100644 --- a/community/newsraft/APKBUILD +++ b/community/newsraft/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Grigory Kirillov <txgk@bk.ru> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=newsraft -pkgver=0.24 +pkgver=0.25 pkgrel=0 pkgdesc="Feed reader with ncurses user interface" url="https://codeberg.org/newsraft/newsraft" @@ -32,5 +32,5 @@ package() { } sha512sums=" -3e3d15010115dceb035263d4e0bac669b6d25bc977f01c232e0bcadd6ef4413f20827fb2689fe63ed744b4374c88dc6a758e9ac112f57b45dcedd6c39a3557af newsraft-0.24.tar.gz +354f3d5fb0e6d86782538da03408383b74443889aed19ae3599b1f286c76f6814ec406297dcdb505bbca6cf835440161a89066df0f21d52871c57dca288dfa23 newsraft-0.25.tar.gz " diff --git a/community/nextcloud-client/APKBUILD b/community/nextcloud-client/APKBUILD index 31fa438e0dc..438e04e46da 100644 --- a/community/nextcloud-client/APKBUILD +++ b/community/nextcloud-client/APKBUILD @@ -5,9 +5,9 @@ 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=" diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD index 3c25bf278f7..0732585af6c 100644 --- a/community/nextcloud/APKBUILD +++ b/community/nextcloud/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=nextcloud -pkgver=28.0.5 +pkgver=29.0.1 pkgrel=0 -_replaced_ver=27 +_replaced_ver=28 pkgdesc="A safe home for all your data" url="https://nextcloud.com/" arch="noarch" license="AGPL-3.0-only" -_php=php82 +_php=php83 _php_mods="-bcmath -ctype -curl -dom -gd -fileinfo -gmp -iconv -intl -mbstring -opcache -openssl -pcntl -posix -session -simplexml -xml -xmlreader -xmlwriter -zip" @@ -59,7 +59,7 @@ builddir="$srcdir"/$pkgname # List of bundled apps to separate into subpackages. Keep it in sync! # Note: Don't add "bruteforcesettings", "contactsinteraction", -# "cloud_federation_api", "files", "dav", +# "cloud_federation_api", "dav", "files", # "federatedfilesharing", "lookup_server_connector", "provisioning_api", # "oauth2", "settings", "twofactor_backupcodes", "twofactor_totp", # "theming", "viewer", "workflowengine", "related_resources" @@ -254,16 +254,16 @@ _package_app() { } sha512sums=" -a6f25e6ddced8087366537793c28869a6bbda0d165aa4d99858745fdfab7679a717e82cab17f72b73105bbeca917d58ff5a9e19ec820b688b5f85397de76457f nextcloud-28.0.5.tar.bz2 +22fa14231e7e6c81a4ddb1565618bdd63a491f4a53a0f47971f77f6083fbf19ad4767e62d11badce9b19ed3bd06109092f0cc580a39f552ce625c8cb458debeb nextcloud-29.0.1.tar.bz2 aea0adb2c3a48ec6af2958c6ccfe13adff86316a56084e763b7e6df9e21aa3435b13305b7c15cc2b795e83c9388b05006862f6465c29e3dc2c1fbd8eb8befcb9 nextcloud-dont-chmod.patch -aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch -ccee7b4d2520653dc4584e364f082c7d2c2ebce12642db47ad31bba3aa13fabeb0954876640f6a2854fdf8395b0a305b64b7ef668887a9326a8be0611ebfe008 disable-integrity-check-as-default.patch +12f4a39aef0f81a0115c81bf2b345cc194537a7e8300748b800b0e35bc07928091296074b23c2019c17aced69854a11d1ed7225f67eefd27cf00c3969a75c5b0 dont-update-htaccess.patch +cb04252d01407c7030e87dd54616c621ea0f85ef0212674b1161288182538cae0fb31c67e7cc07c66f9607075774c64e386009cc66365b1f1b155f6ad4f83ac0 disable-integrity-check-as-default.patch c0a9b7c31c8beaca711f8e97d98441007b3dca7fb3d316d2eacd28a73b5233def6f846c02d98202f75efb9cb248b8787a80e20b07c32d1c7534a0e54bb20feab use-external-docs-if-local-not-avail.patch 5f73cd9399fa484ef15bd47e803c93381deffbc7699eceadbb5c27e43b20156806d74e5021a64d28f0165ef87b519e962780651711a37bceb9f0b04455dfdce1 nextcloud-config.php 7388458a9e8b7afd3d3269718306410ffa59c3c23da4bef367a4d7f6d2570136fae9dd421b19c1441e7ffb15a5405e18bb5da67b1a15f9f45e8b98d3fda532ba nextcloud.logrotate dcc57735d7d4af4a7ebbdd1186d301e51d2ae4675022aea6bf1111222dfa188a3a490ebd6e7c8a7ac30046cb7d93f81cec72a51acbc60d0c10b7fb64630c637a nextcloud.confd -ffbdd91841dc3b62a3d5e1b936408310c1c7d2cdf6a4893894e7748825e538b9201608c2eb0401b0ca4adb05ed9ea0bb06c614ecf57689434faa51a5002ec8be nextcloud.cron +06a62deae219d09df7acbf38ccb1dcac691dd882459ef70243b5583d7ed21d1ea81dbf0751b4e7199c0de9878755a3882e139d9ccc280bf2e90cbe33fb565487 nextcloud.cron b9ad5434c384c96608f00d65c45f782e279c6756da8fb706f62ecaf7b7aa420077cb6989da5e85becc47418884ec0672e7db874174454ca679fdca84a50f537f nextcloud-mysql.cnf 78ef204ee7c12b228c0b7b04333514e561c1c8e19153f5507224fa4fdd112aaaa6331747014f3b72181298f52ecd4223bcff4bd963b49b49153265254b07e79b fpm-pool.conf -bd23b7581a3d0a27da8e33e1f756a4150ad145ea014cb10bb04df078180d862a6c9b0a404395c081b9adb5e44ddec086d4c6256eae553381e3e3918db07624f3 occ +be54ad9308c8250ff3aef3514b10b228487fc2fbdefa1d28dbbb18a4770f7d9fda90e80c722de8e3c25ce752d124ff79314f16f783b1e5ad67df4e1fe6e880f9 occ " diff --git a/community/nextcloud/disable-integrity-check-as-default.patch b/community/nextcloud/disable-integrity-check-as-default.patch index 70add50f626..f6a3a11d7db 100644 --- a/community/nextcloud/disable-integrity-check-as-default.patch +++ b/community/nextcloud/disable-integrity-check-as-default.patch @@ -1,15 +1,23 @@ We patch some files and Nextcloud's integrity check doesn't like it... APK ensures integrity of all installed files, so this Nextcloud's integrity check doesn't add any value. +--- + lib/private/IntegrityCheck/Checker.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php +index e8fd087e..cfbaeb7d 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php -@@ -116,7 +116,7 @@ +@@ -91,7 +91,7 @@ class Checker { + * applicable for very specific scenarios and we should not advertise it + * too prominent. So please do not add it to config.sample.php. */ - $isIntegrityCheckDisabled = false; - if ($this->config !== null) { -- $isIntegrityCheckDisabled = $this->config->getSystemValueBool('integrity.check.disabled', false); -+ $isIntegrityCheckDisabled = $this->config->getSystemValueBool('integrity.check.disabled', true); - } - if ($isIntegrityCheckDisabled) { - return false; +- return !($this->config?->getSystemValueBool('integrity.check.disabled', false) ?? false); ++ return !($this->config?->getSystemValueBool('integrity.check.disabled', true) ?? true); + } + + /** +-- +2.44.0 + diff --git a/community/nextcloud/dont-update-htaccess.patch b/community/nextcloud/dont-update-htaccess.patch index aecaebc7154..87ec6a14521 100644 --- a/community/nextcloud/dont-update-htaccess.patch +++ b/community/nextcloud/dont-update-htaccess.patch @@ -1,21 +1,28 @@ Don't mess with .htaccess files. Patch ported from https://src.fedoraproject.org/cgit/rpms/nextcloud.git/tree/nextcloud-9.1.0-dont_update_htacess.patch +--- + core/register_command.php | 1 - + lib/private/Updater.php | 8 -------- + 2 files changed, 9 deletions(-) +diff --git a/core/register_command.php b/core/register_command.php +index 4a84e551..a5158dc4 100644 --- a/core/register_command.php +++ b/core/register_command.php -@@ -135,7 +135,6 @@ - $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader())); - $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector())); - $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig())); -- $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess()); - $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory())); +@@ -136,7 +136,6 @@ if ($config->getSystemValueBool('installed', false)) { + $application->add(Server::get(Command\Maintenance\Mimetype\UpdateDB::class)); + $application->add(Server::get(Command\Maintenance\Mimetype\UpdateJS::class)); + $application->add(Server::get(Command\Maintenance\Mode::class)); +- $application->add(Server::get(Command\Maintenance\UpdateHtaccess::class)); + $application->add(Server::get(Command\Maintenance\UpdateTheme::class)); - $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(\OC\Installer::class))); - + $application->add(Server::get(Command\Upgrade::class)); +diff --git a/lib/private/Updater.php b/lib/private/Updater.php +index 09866273..59144308 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php -@@ -233,14 +233,6 @@ +@@ -230,14 +230,6 @@ class Updater extends BasicEmitter { throw new \Exception('Updates between multiple major versions and downgrades are unsupported.'); } @@ -30,3 +37,6 @@ Patch ported from https://src.fedoraproject.org/cgit/rpms/nextcloud.git/tree/nex // create empty file in data dir, so we can later find // out that this is indeed an ownCloud data directory // (in case it didn't exist before) +-- +2.44.0 + diff --git a/community/nextcloud/nextcloud-initscript.post-install b/community/nextcloud/nextcloud-initscript.post-install index 805d7a4aa83..48f1351a650 100644 --- a/community/nextcloud/nextcloud-initscript.post-install +++ b/community/nextcloud/nextcloud-initscript.post-install @@ -21,7 +21,7 @@ cat <<EOF * * Point your web server to /run/nextcloud/fastcgi.sock and start Nextcloud with * /etc/init.d/nextcloud start. You can modify php-fpm settings in -* /etc/php82/fpm.d/nextcloud.conf. +* /etc/php83/fpm.d/nextcloud.conf. * EOF diff --git a/community/nextcloud/nextcloud.cron b/community/nextcloud/nextcloud.cron index efa7c6883b5..398cb11bb87 100644 --- a/community/nextcloud/nextcloud.cron +++ b/community/nextcloud/nextcloud.cron @@ -2,5 +2,5 @@ # Run only when nextcloud service is started. if rc-service nextcloud -q status >/dev/null 2>&1; then - su nextcloud -s /bin/sh -c 'php82 -f /usr/share/webapps/nextcloud/cron.php' + su nextcloud -s /bin/sh -c 'php83 -f /usr/share/webapps/nextcloud/cron.php' fi diff --git a/community/nextcloud/occ b/community/nextcloud/occ index b619cfe3fa0..57b8ef39e4c 100644 --- a/community/nextcloud/occ +++ b/community/nextcloud/occ @@ -4,7 +4,7 @@ NEXTCLOUD_DIR='/usr/share/webapps/nextcloud' : ${NEXTCLOUD_USER:="nextcloud"} if [ "$(id -un)" != "$NEXTCLOUD_USER" ]; then - exec su -s /bin/sh "$NEXTCLOUD_USER" -c '$0 "$@"' -- php82 $NEXTCLOUD_DIR/occ "$@" + exec su -s /bin/sh "$NEXTCLOUD_USER" -c '$0 "$@"' -- php83 $NEXTCLOUD_DIR/occ "$@" else - exec php82 $NEXTCLOUD_DIR/occ "$@" + exec php83 $NEXTCLOUD_DIR/occ "$@" fi diff --git a/community/nextcloud28/APKBUILD b/community/nextcloud28/APKBUILD new file mode 100644 index 00000000000..5bd1bc211a5 --- /dev/null +++ b/community/nextcloud28/APKBUILD @@ -0,0 +1,270 @@ +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> +pkgname=nextcloud28 +_pkgname=nextcloud +pkgver=28.0.5 +pkgrel=0 +_replaced_ver=27 +pkgdesc="Transitional package to allow upgrade to version 29" +url="https://nextcloud.com/" +arch="noarch" +license="AGPL-3.0-only" +_php=php82 +_php_mods="-bcmath -ctype -curl -dom -gd -fileinfo -gmp -iconv -intl + -mbstring -opcache -openssl -pcntl -posix -session + -simplexml -xml -xmlreader -xmlwriter -zip" +depends="ca-certificates $_php ${_php_mods//-/$_php-}" +makedepends="xmlstarlet" +provides="$pkgname-accessibility=$pkgver-r$pkgrel + $pkgname-bruteforcesettings=$pkgver-r$pkgrel + $pkgname-contactsinteraction=$pkgver-r$pkgrel + $pkgname-cloud_federation_api=$pkgver-r$pkgrel + $pkgname-dav=$pkgver-r$pkgrel + $pkgname-files=$pkgver-r$pkgrel + $pkgname-files_videoplayer=$pkgver-r$pkgrel + $pkgname-federatedfilesharing=$pkgver-r$pkgrel + $pkgname-lookup_server_connector=$pkgver-r$pkgrel + $pkgname-oauth2=$pkgver-r$pkgrel + $pkgname-provisioning_api=$pkgver-r$pkgrel + $pkgname-related_resources=$pkgver-r$pkgrel + $pkgname-settings=$pkgver-r$pkgrel + $pkgname-theming=$pkgver-r$pkgrel + $pkgname-twofactor_totp=$pkgver-r$pkgrel + $pkgname-twofactor_backupcodes=$pkgver-r$pkgrel + $pkgname-viewer=$pkgver-r$pkgrel + $pkgname-workflowengine=$pkgver-r$pkgrel + " +replaces="nextcloud$_replaced_ver" +install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade + $pkgname-initscript.post-install" +subpackages="$pkgname-doc $pkgname-initscript $pkgname-mysql $pkgname-pgsql $pkgname-sqlite + $pkgname-default-apps:_default_apps" +source="https://download.nextcloud.com/server/releases/nextcloud-$pkgver.tar.bz2 + nextcloud-dont-chmod.patch + dont-update-htaccess.patch + disable-integrity-check-as-default.patch + use-external-docs-if-local-not-avail.patch + + $pkgname-config.php + $pkgname.logrotate + $pkgname.confd + $pkgname.cron + $pkgname-mysql.cnf + fpm-pool.conf + occ + " +options="!check" +pkgusers="nextcloud" +pkggroups="www-data" +builddir="$srcdir"/$_pkgname + +# List of bundled apps to separate into subpackages. Keep it in sync! +# Note: Don't add "bruteforcesettings", "contactsinteraction", +# "cloud_federation_api", "files", "dav", +# "federatedfilesharing", "lookup_server_connector", "provisioning_api", +# "oauth2", "settings", "twofactor_backupcodes", "twofactor_totp", +# "theming", "viewer", "workflowengine", "related_resources" +# here, these should be always installed. +_apps="activity + admin_audit + circles + comments + dashboard + encryption + federation + files_external + files_pdfviewer + files_reminders + files_sharing + files_trashbin + files_versions + firstrunwizard + logreader + nextcloud_announcements + notifications + password_policy + photos + privacy + recommendations + serverinfo + support + sharebymail + survey_client + suspicious_login + systemtags + text + user_ldap + user_status + weather_status + " +for _i in $_apps; do + subpackages="$subpackages $pkgname-$_i:_package_app" +done + +# Directory for apps shipped with Nextcloud. +_appsdir="usr/share/webapps/$_pkgname/apps" + +package() { + local basedir="var/lib/$_pkgname" + local datadir="$basedir/data" + local wwwdir="usr/share/webapps/$_pkgname" + local confdir="etc/$_pkgname" + + mkdir -p "$pkgdir" + cd "$pkgdir" + + mkdir -p ./${wwwdir%/*} + cp -a "$builddir" ./$wwwdir + + chmod +x ./$wwwdir/occ + chmod 664 ./$wwwdir/.htaccess \ + ./$wwwdir/.user.ini + + # Let's not ship upstream's 'updatenotification' app and updater, which + # has zero chance of working and a big chance of blowing things up. + rm -r ./$wwwdir/apps/updatenotification \ + ./$wwwdir/lib/private/Updater/VersionCheck.php + + # Replace bundled CA bundle with ours. + ln -sf /etc/ssl/certs/ca-certificates.crt ./$wwwdir/resources/config/ca-bundle.crt + + install -d -m 770 -o nextcloud -g www-data \ + ./$confdir ./$datadir ./$basedir/apps + install -d -m 775 -o nextcloud -g www-data \ + ./var/log/$_pkgname + + # Create symlink from web root to site-apps, so web server can find + # assets w/o explicit configuration for this layout. + ln -s /$basedir/apps ./$wwwdir/apps-appstore + + mv ./$wwwdir/config/* ./$confdir/ + rm -r ./$wwwdir/config + ln -s /$confdir ./$wwwdir/config + + mkdir -p ./usr/share/doc/$_pkgname + mv ./$wwwdir/core/doc ./usr/share/doc/$_pkgname/core + + install -m 660 -o nextcloud -g www-data \ + "$srcdir"/$pkgname-config.php ./$confdir/config.php + + install -m 644 -D "$srcdir"/$pkgname.logrotate ./etc/logrotate.d/$_pkgname + + install -m 755 -D "$srcdir"/occ ./usr/bin/occ + + # Clean some unnecessary files. + find . -name .gitignore -delete \ + -o -name .bower.json -delete \ + -o -name 'README*' -delete \ + -o -name 'CHANGELOG*' -delete \ + -o -name 'CONTRIBUTING*' -delete + find . -name .github -type d -prune -exec rm -r {} \; +} + +doc() { + replaces="nextcloud$_replaced_ver-doc" + default_doc + + local target="$subpkgdir"/usr/share/webapps/$_pkgname/core/doc + mkdir -p "${target%/*}" + ln -s ../../../doc/$_pkgname/core "$target" + install -m644 README.alpine "$subpkgdir"/usr/share/webapps/$_pkgname/README.alpine +} + +initscript() { + pkgdesc="Init script that runs Nextcloud with php-fpm" + depends="$pkgname $_php-fpm" + replaces="nextcloud$_replaced_ver-initscript" + + local confdir="$subpkgdir/etc/$_php/php-fpm.d" + local fpm_name="php-fpm${_php#php}" + + install -m 644 -D "$srcdir"/fpm-pool.conf "$confdir"/$_pkgname.conf + install -m 644 -D "$srcdir"/$pkgname.confd "$subpkgdir"/etc/conf.d/$_pkgname + install -m 755 -D "$srcdir"/$pkgname.cron "$subpkgdir"/etc/periodic/15min/$_pkgname + + mkdir -p "$subpkgdir"/etc/init.d + ln -s $fpm_name "$subpkgdir"/etc/init.d/$_pkgname +} + +pgsql() { + pkgdesc="Nextcloud PostgreSQL support" + depends="$pkgname $_php-pgsql $_php-pdo_pgsql" + replaces="nextcloud$_replaced_ver-pgsql" + mkdir -p "$subpkgdir" +} + +sqlite() { + pkgdesc="Nextcloud SQLite support" + depends="$pkgname $_php-sqlite3 $_php-pdo_sqlite" + replaces="nextcloud$_replaced_ver-sqlite" + mkdir -p "$subpkgdir" +} + +mysql() { + pkgdesc="Nextcloud MySQL support" + depends="$pkgname $_php-pdo_mysql" + replaces="nextcloud$_replaced_ver-mysql" + + mkdir -p "$subpkgdir" + install -m 644 -D "$srcdir"/$pkgname-mysql.cnf "$subpkgdir"/etc/my.cnf.d/$pkgname.cnf +} + +_default_apps() { + pkgdesc="Nextcloud default apps" + depends="$pkgname" + replaces="nextcloud$_replaced_ver-default-apps" + + local path; for path in "$pkgdir"/"$_appsdir"/*; do + if grep -q '<default_enable\s*/>' "$path"/appinfo/info.xml; then + depends="$depends $pkgname-${path##*/}" + fi + done + + mkdir -p "$subpkgdir" +} + +_package_app() { + local appname="${subpkgname#"$pkgname"-}" + local appinfo="$pkgdir/$_appsdir/$appname/appinfo/info.xml" + + local name=$(xmlstarlet sel -t -v 'info/name/text()' "$appinfo") + pkgdesc="Nextcloud ${name:-$appname} app" + replaces="nextcloud$_replaced_ver-$appname" + + local php_deps=$(xmlstarlet sel -t -v 'info/dependencies/lib/text()' "$appinfo" \ + | xargs -r -n1 printf "$_php-%s\n") + local app_deps="" + + case "$appname" in + dashboard) app_deps="-accessibility" + ;; + files_sharing) app_deps="-federatedfilesharing" + ;; + photos) + app_deps="-viewer" + provides="$pkgname-gallery=$pkgver-r$pkgrel" + replaces="$replaces nextcloud$_replaced_ver-gallery" + ;; + serverinfo) app_deps="-files_sharing" + esac + + depends="$pkgname $php_deps ${app_deps//-/$pkgname-}" + + mkdir -p "$subpkgdir"/$_appsdir + mv "$pkgdir"/$_appsdir/$appname "$subpkgdir"/$_appsdir/ +} + +sha512sums=" +a6f25e6ddced8087366537793c28869a6bbda0d165aa4d99858745fdfab7679a717e82cab17f72b73105bbeca917d58ff5a9e19ec820b688b5f85397de76457f nextcloud-28.0.5.tar.bz2 +aea0adb2c3a48ec6af2958c6ccfe13adff86316a56084e763b7e6df9e21aa3435b13305b7c15cc2b795e83c9388b05006862f6465c29e3dc2c1fbd8eb8befcb9 nextcloud-dont-chmod.patch +aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch +ccee7b4d2520653dc4584e364f082c7d2c2ebce12642db47ad31bba3aa13fabeb0954876640f6a2854fdf8395b0a305b64b7ef668887a9326a8be0611ebfe008 disable-integrity-check-as-default.patch +c0a9b7c31c8beaca711f8e97d98441007b3dca7fb3d316d2eacd28a73b5233def6f846c02d98202f75efb9cb248b8787a80e20b07c32d1c7534a0e54bb20feab use-external-docs-if-local-not-avail.patch +5f73cd9399fa484ef15bd47e803c93381deffbc7699eceadbb5c27e43b20156806d74e5021a64d28f0165ef87b519e962780651711a37bceb9f0b04455dfdce1 nextcloud28-config.php +7388458a9e8b7afd3d3269718306410ffa59c3c23da4bef367a4d7f6d2570136fae9dd421b19c1441e7ffb15a5405e18bb5da67b1a15f9f45e8b98d3fda532ba nextcloud28.logrotate +dcc57735d7d4af4a7ebbdd1186d301e51d2ae4675022aea6bf1111222dfa188a3a490ebd6e7c8a7ac30046cb7d93f81cec72a51acbc60d0c10b7fb64630c637a nextcloud28.confd +ffbdd91841dc3b62a3d5e1b936408310c1c7d2cdf6a4893894e7748825e538b9201608c2eb0401b0ca4adb05ed9ea0bb06c614ecf57689434faa51a5002ec8be nextcloud28.cron +b9ad5434c384c96608f00d65c45f782e279c6756da8fb706f62ecaf7b7aa420077cb6989da5e85becc47418884ec0672e7db874174454ca679fdca84a50f537f nextcloud28-mysql.cnf +78ef204ee7c12b228c0b7b04333514e561c1c8e19153f5507224fa4fdd112aaaa6331747014f3b72181298f52ecd4223bcff4bd963b49b49153265254b07e79b fpm-pool.conf +bd23b7581a3d0a27da8e33e1f756a4150ad145ea014cb10bb04df078180d862a6c9b0a404395c081b9adb5e44ddec086d4c6256eae553381e3e3918db07624f3 occ +" diff --git a/community/nextcloud28/README.alpine b/community/nextcloud28/README.alpine new file mode 100644 index 00000000000..229ab605529 --- /dev/null +++ b/community/nextcloud28/README.alpine @@ -0,0 +1,5 @@ +## nextcloud-serverinfo package + +If you are using the provided nextcloud php-fpm configuration, +nextcloud-serverinfo package requires to enable 'shell_exec' function +in php configuration file 'nextcloud.conf'. diff --git a/community/nextcloud28/disable-integrity-check-as-default.patch b/community/nextcloud28/disable-integrity-check-as-default.patch new file mode 100644 index 00000000000..70add50f626 --- /dev/null +++ b/community/nextcloud28/disable-integrity-check-as-default.patch @@ -0,0 +1,15 @@ +We patch some files and Nextcloud's integrity check doesn't like it... +APK ensures integrity of all installed files, so this Nextcloud's integrity +check doesn't add any value. + +--- a/lib/private/IntegrityCheck/Checker.php ++++ b/lib/private/IntegrityCheck/Checker.php +@@ -116,7 +116,7 @@ + */ + $isIntegrityCheckDisabled = false; + if ($this->config !== null) { +- $isIntegrityCheckDisabled = $this->config->getSystemValueBool('integrity.check.disabled', false); ++ $isIntegrityCheckDisabled = $this->config->getSystemValueBool('integrity.check.disabled', true); + } + if ($isIntegrityCheckDisabled) { + return false; diff --git a/community/nextcloud28/dont-update-htaccess.patch b/community/nextcloud28/dont-update-htaccess.patch new file mode 100644 index 00000000000..aecaebc7154 --- /dev/null +++ b/community/nextcloud28/dont-update-htaccess.patch @@ -0,0 +1,32 @@ +Don't mess with .htaccess files. + +Patch ported from https://src.fedoraproject.org/cgit/rpms/nextcloud.git/tree/nextcloud-9.1.0-dont_update_htacess.patch + +--- a/core/register_command.php ++++ b/core/register_command.php +@@ -135,7 +135,6 @@ + $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader())); + $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector())); + $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig())); +- $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess()); + $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory())); + + $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(\OC\Installer::class))); + +--- a/lib/private/Updater.php ++++ b/lib/private/Updater.php +@@ -233,14 +233,6 @@ + throw new \Exception('Updates between multiple major versions and downgrades are unsupported.'); + } + +- // Update .htaccess files +- try { +- Setup::updateHtaccess(); +- Setup::protectDataDirectory(); +- } catch (\Exception $e) { +- throw new \Exception($e->getMessage()); +- } +- + // create empty file in data dir, so we can later find + // out that this is indeed an ownCloud data directory + // (in case it didn't exist before) diff --git a/community/nextcloud28/fpm-pool.conf b/community/nextcloud28/fpm-pool.conf new file mode 100644 index 00000000000..cae9acce210 --- /dev/null +++ b/community/nextcloud28/fpm-pool.conf @@ -0,0 +1,200 @@ +[global] +; Error log file +; Default Value: log/php-fpm.log +error_log = /var/log/nextcloud/php-fpm.log + +; Log level +; Possible Values: alert, error, warning, notice, debug +; Default Value: notice +log_level = warning + +; If this number of child processes exit with SIGSEGV or SIGBUS within the time +; interval set by emergency_restart_interval then FPM will restart. A value +; of '0' means 'Off'. +; Default Value: 0 +emergency_restart_threshold = 10 + +; Interval of time used by emergency_restart_interval to determine when +; a graceful restart will be initiated. This can be useful to work around +; accidental corruptions in an accelerator's shared memory. +; Available Units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +emergency_restart_interval = 1m + +; Time limit for child processes to wait for a reaction on signals from master. +; Available units: s(econds), m(inutes), h(ours), or d(ays) +; Default Unit: seconds +; Default Value: 0 +process_control_timeout = 10s + + +[nextcloud] +user = nextcloud +group = www-data + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket (the path is *not* +; relative to chroot!) +; Note: This value is mandatory. +listen = /run/nextcloud/fastcgi.sock + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0666 +listen.mode = 0660 + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static ... a fixed number of child processes. +; dynamic ... the number of child processes are set dynamically. +; ondemand ... no children are created at startup; children will be forked +; when new requests will connect. +; Note: This value is mandatory. +pm = ondemand + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. +; This value sets the limit on the number of simultaneous requests that will be +; served. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' +; Note: This value is mandatory. +pm.max_children = 10 + +; The number of seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +pm.process_idle_timeout = 120s + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +pm.status_path = + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +ping.path = /ping + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +; Note: the path is *not* relative to chroot. +;slowlog = /var/log/nextcloud/php-fpm.slow.log + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +;catch_workers_output = yes + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. +; +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. +; +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr/lib/php7.x) + +; Allow HTTP file uploads. +php_admin_flag[file_uploads] = true + +; Maximal size of a file that can be uploaded via web interface. +php_admin_value[memory_limit] = 512M +php_admin_value[post_max_size] = 513M +php_admin_value[upload_max_filesize] = 513M + +; Where to store temporary files. +php_admin_value[session.save_path] = /var/tmp/nextcloud +php_admin_value[sys_temp_dir] = /var/tmp/nextcloud +php_admin_value[upload_tmp_dir] = /var/tmp/nextcloud + +; Log errors to specified file. +php_admin_flag[log_errors] = on +php_admin_value[error_log] = /var/log/nextcloud/php.error.log + +; OPcache error_log file name. Empty string assumes "stderr" +php_admin_value[opcache.error_log] = /var/log/nextcloud/php.error.log + +; Output buffering is a mechanism for controlling how much output data +; (excluding headers and cookies) PHP should keep internally before pushing that +; data to the client. If your application's output exceeds this setting, PHP +; will send that data in chunks of roughly the size you specify. +; This must be disabled for ownCloud. +php_admin_flag[output_buffering] = false + +; Overload(replace) single byte functions by mbstring functions. +; This must be disabled for ownCloud. +php_admin_flag[mbstring.func_overload] = false + +; Never populate the $HTTP_RAW_POST_DATA variable. +; http://php.net/always-populate-raw-post-data +php_admin_value[always_populate_raw_post_data] = -1 + +; Disable certain functions for security reasons. +; http://php.net/disable-functions +php_admin_value[disable_functions] = exec,passthru,shell_exec,system,proc_open,curl_multi_exec,show_source + +; Set recommended settings for OpCache. +; https://docs.nextcloud.com/server/13/admin_manual/configuration_server/server_tuning.html#enable-php-opcache +php_admin_flag[opcache.enable] = true +php_admin_flag[opcache.enable_cli] = true +php_admin_flag[opcache.save_comments] = true +php_admin_value[opcache.interned_strings_buffer] = 8 +php_admin_value[opcache.max_accelerated_files] = 10000 +php_admin_value[opcache.memory_consumption] = 128 +php_admin_value[opcache.revalidate_freq] = 1 diff --git a/community/nextcloud28/nextcloud-dont-chmod.patch b/community/nextcloud28/nextcloud-dont-chmod.patch new file mode 100644 index 00000000000..214550871db --- /dev/null +++ b/community/nextcloud28/nextcloud-dont-chmod.patch @@ -0,0 +1,58 @@ +commit d8f09abd65e5fd620b8b0d720daee293c355660c +Author: Leonardo Arena <rnalrd@alpinelinux.org> +Date: Mon Aug 31 06:59:15 2020 +0000 + + Don't chmod. The package takes care of setting the right permissions for directories and files + +diff --git a/lib/private/Config.php b/lib/private/Config.php +index cbdbc5b2..1118981b 100644 +--- a/lib/private/Config.php ++++ b/lib/private/Config.php +@@ -242,9 +242,6 @@ class Config { + touch($this->configFilePath); + $filePointer = fopen($this->configFilePath, 'r+'); + +- // Prevent others not to read the config +- chmod($this->configFilePath, 0640); +- + // File does not exist, this can happen when doing a fresh install + if (!is_resource($filePointer)) { + throw new HintException( +diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php +index 9e9abb11..7db25286 100644 +--- a/lib/private/Log/File.php ++++ b/lib/private/Log/File.php +@@ -82,9 +82,6 @@ class File extends LogDetails implements IWriter, IFileBased { + public function write(string $app, $message, int $level) { + $entry = $this->logDetailsAsJSON($app, $message, $level); + $handle = @fopen($this->logFile, 'a'); +- if ($this->logFileMode > 0 && is_file($this->logFile) && (fileperms($this->logFile) & 0777) != $this->logFileMode) { +- @chmod($this->logFile, $this->logFileMode); +- } + if ($handle) { + fwrite($handle, $entry."\n"); + fclose($handle); +diff --git a/lib/private/TempManager.php b/lib/private/TempManager.php +index 49d4ee94..b0943843 100644 +--- a/lib/private/TempManager.php ++++ b/lib/private/TempManager.php +@@ -96,7 +96,6 @@ class TempManager implements ITempManager { + if ($postFix !== '') { + $fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix); + touch($fileNameWithPostfix); +- chmod($fileNameWithPostfix, 0600); + $this->current[] = $fileNameWithPostfix; + return $fileNameWithPostfix; + } +diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php +index 71f6edba..216abdf8 100644 +--- a/lib/private/legacy/OC_Util.php ++++ b/lib/private/legacy/OC_Util.php +@@ -1004,7 +1004,6 @@ class OC_Util { + . ' cannot be listed by other users.'); + $perms = substr(decoct(@fileperms($dataDirectory)), -3); + if (substr($perms, -1) !== '0') { +- chmod($dataDirectory, 0770); + clearstatcache(); + $perms = substr(decoct(@fileperms($dataDirectory)), -3); + if ($perms[2] !== '0') { diff --git a/community/nextcloud28/nextcloud28-config.php b/community/nextcloud28/nextcloud28-config.php new file mode 100644 index 00000000000..035fb790ecf --- /dev/null +++ b/community/nextcloud28/nextcloud28-config.php @@ -0,0 +1,37 @@ +<?php +$CONFIG = array ( + 'datadirectory' => '/var/lib/nextcloud/data', + 'logfile' => '/var/log/nextcloud/nextcloud.log', + 'apps_paths' => array ( + // Read-only location for apps shipped with Nextcloud and installed by apk. + 0 => array ( + 'path' => '/usr/share/webapps/nextcloud/apps', + 'url' => '/apps', + 'writable' => false, + ), + // Writable location for apps installed from AppStore. + 1 => array ( + 'path' => '/var/lib/nextcloud/apps', + 'url' => '/apps-appstore', + 'writable' => true, + ), + ), + 'updatechecker' => false, + 'check_for_working_htaccess' => false, + + // Uncomment to enable Zend OPcache. + //'memcache.local' => '\OC\Memcache\APCu', + + // Uncomment this and add user nextcloud to the redis group to enable Redis + // cache for file locking. This is highly recommended, see + // https://github.com/nextcloud/server/issues/9305. + //'memcache.locking' => '\OC\Memcache\Redis', + //'redis' => array( + // 'host' => '/run/redis/redis.sock', + // 'port' => 0, + // 'dbindex' => 0, + // 'timeout' => 1.5, + //), + + 'installed' => false, +); diff --git a/community/nextcloud28/nextcloud28-initscript.post-install b/community/nextcloud28/nextcloud28-initscript.post-install new file mode 100644 index 00000000000..805d7a4aa83 --- /dev/null +++ b/community/nextcloud28/nextcloud28-initscript.post-install @@ -0,0 +1,28 @@ +#!/bin/sh + +# It's not needed to be writable for www-data group when running with php-fpm. +for dir in /etc/nextcloud \ + /etc/nextcloud/config.php \ + /var/lib/nextcloud/data \ + /var/lib/nextcloud/apps +do + chmod g-w $dir +done +chgrp root /etc/nextcloud/config.php + +# This must be writable (only) by nextcloud user. +chmod 750 /var/log/nextcloud + +mkdir /var/tmp/nextcloud # If /var/tmp doesn't exist there's a big problem +chown nextcloud /var/tmp/nextcloud +chmod 700 /var/tmp/nextcloud + +cat <<EOF +* +* Point your web server to /run/nextcloud/fastcgi.sock and start Nextcloud with +* /etc/init.d/nextcloud start. You can modify php-fpm settings in +* /etc/php82/fpm.d/nextcloud.conf. +* +EOF + +exit 0 diff --git a/community/nextcloud28/nextcloud28-mysql.cnf b/community/nextcloud28/nextcloud28-mysql.cnf new file mode 100644 index 00000000000..ff90630b689 --- /dev/null +++ b/community/nextcloud28/nextcloud28-mysql.cnf @@ -0,0 +1,3 @@ +[server] +# See https://github.com/nextcloud/server/issues/25436 +innodb_read_only_compressed=off diff --git a/community/nextcloud28/nextcloud28.confd b/community/nextcloud28/nextcloud28.confd new file mode 100644 index 00000000000..b24f26d7f15 --- /dev/null +++ b/community/nextcloud28/nextcloud28.confd @@ -0,0 +1,8 @@ +# Config file for /etc/init.d/nextcloud + +name="Nextcloud" +user="nextcloud" +group="www-data" + +# Uncomment if you use Nextcloud with Redis for caching. +#rc_need="redis" diff --git a/community/nextcloud28/nextcloud28.cron b/community/nextcloud28/nextcloud28.cron new file mode 100644 index 00000000000..efa7c6883b5 --- /dev/null +++ b/community/nextcloud28/nextcloud28.cron @@ -0,0 +1,6 @@ +#!/bin/sh + +# Run only when nextcloud service is started. +if rc-service nextcloud -q status >/dev/null 2>&1; then + su nextcloud -s /bin/sh -c 'php82 -f /usr/share/webapps/nextcloud/cron.php' +fi diff --git a/community/nextcloud28/nextcloud28.logrotate b/community/nextcloud28/nextcloud28.logrotate new file mode 100644 index 00000000000..19e17fdf4d1 --- /dev/null +++ b/community/nextcloud28/nextcloud28.logrotate @@ -0,0 +1,6 @@ +/var/log/nextcloud/*.log { + daily + compress + copytruncate + su nextcloud www-data +} diff --git a/community/nextcloud28/nextcloud28.post-upgrade b/community/nextcloud28/nextcloud28.post-upgrade new file mode 100644 index 00000000000..898b0ea547b --- /dev/null +++ b/community/nextcloud28/nextcloud28.post-upgrade @@ -0,0 +1,57 @@ +#!/bin/sh + +ver_new="$1" +ver_old="$2" + +if [ $(apk version -t "$ver_old" '12.0.0-r2') = '<' ]; then + cat >&2 <<-EOF + * + * All Nextcloud's bundled apps (except "files" and "dav") have been moved to + * separate subpackages (e.g. nextcloud-activity). If you want to install + * all apps that are enabled by default at once, run: + * + * apk add nextcloud-default-apps + * + EOF + + if [ "$(ls -A /var/lib/nextcloud/apps)" ]; then + cat >&2 <<-EOF + * + * Nextcloud's bundled apps have been moved from /var/lib/nextcloud/apps + * to /usr/share/webapps/nextcloud/apps. Only apps installed from App Store + * should be stored in /var/lib/nextcloud/apps. + * + * It seems that you have installed some apps from App Store, so you have to + * add /var/lib/nextcloud/apps to your apps_paths. Copy "apps_paths" key + * from /etc/nextcloud/config.php.apk-new to your config.php. + * + EOF + fi +fi + +if [ $(apk version -t "$ver_old" '15.0.2-r0') = '<' ]; then + cat >&2 <<-EOF + * + * App "user_external" is no longer available via release channel. + * You need to uninstall the package and install it via appstore: + * + * apk del nextcloud-user_external + * + EOF + +fi + +if [ $(apk version -t "$ver_old" '20.0.0-r0') = '<' ]; then + cat >&2 <<-EOF + * + * If you are updating from Alpine 3.12->3.13 + * please use the transitional package nextcloud19 + * to upgrade from Nextcloud 18->20 + * + EOF + +fi + +if [ "${ver_new%-r*}" != "${ver_old%-r*}" ]; then + echo ' * Run "occ upgrade" to finish upgrading your NextCloud instance!' >&2 +fi diff --git a/community/nextcloud28/nextcloud28.pre-install b/community/nextcloud28/nextcloud28.pre-install new file mode 100644 index 00000000000..e9cf53919cb --- /dev/null +++ b/community/nextcloud28/nextcloud28.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S -g 82 www-data 2>/dev/null +adduser -S -D -H -h /var/lib/nextcloud -s /sbin/nologin -G www-data -g Nextcloud nextcloud 2>/dev/null + +exit 0 diff --git a/community/nextcloud28/nextcloud28.pre-upgrade b/community/nextcloud28/nextcloud28.pre-upgrade new file mode 100644 index 00000000000..f444e78f492 --- /dev/null +++ b/community/nextcloud28/nextcloud28.pre-upgrade @@ -0,0 +1,10 @@ +#!/bin/sh + +ver_old="$2" +apps_link='/usr/share/webapps/nextcloud/apps' + +# Remove apps symlink before replacing files to avoid losing installed apps. +# This is a workaround for some issue in apk. +if [ $(apk version -t "$ver_old" '12.0.0-r2') = '<' ] && [ -L "$apps_link" ]; then + rm "$apps_link" +fi diff --git a/community/nextcloud28/occ b/community/nextcloud28/occ new file mode 100644 index 00000000000..b619cfe3fa0 --- /dev/null +++ b/community/nextcloud28/occ @@ -0,0 +1,10 @@ +#!/bin/sh + +NEXTCLOUD_DIR='/usr/share/webapps/nextcloud' +: ${NEXTCLOUD_USER:="nextcloud"} + +if [ "$(id -un)" != "$NEXTCLOUD_USER" ]; then + exec su -s /bin/sh "$NEXTCLOUD_USER" -c '$0 "$@"' -- php82 $NEXTCLOUD_DIR/occ "$@" +else + exec php82 $NEXTCLOUD_DIR/occ "$@" +fi diff --git a/community/nextcloud28/use-external-docs-if-local-not-avail.patch b/community/nextcloud28/use-external-docs-if-local-not-avail.patch new file mode 100644 index 00000000000..42af94bafca --- /dev/null +++ b/community/nextcloud28/use-external-docs-if-local-not-avail.patch @@ -0,0 +1,36 @@ +From f17c14956c51206ad82acc5d9b66fd752f0e3c03 Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Tue, 19 Dec 2023 07:53:40 +0000 +Subject: [PATCH] use external docs if local not available + +--- + apps/settings/templates/help.php | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/apps/settings/templates/help.php b/apps/settings/templates/help.php +index 649178c1..29b5ac4c 100644 +--- a/apps/settings/templates/help.php ++++ b/apps/settings/templates/help.php +@@ -48,8 +48,19 @@ + </div> + + <div id="app-content" class="help-includes"> ++ <?php if ($_['localDocs']) { ?> + <iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe" tabindex="0"> + </iframe> ++ <?php } else { ?> ++ <div class="section"> ++ <h2>Local documentation is not installed</h2> ++ <p>Please use ++ <a href="<?php print_unescaped($_['url']); ?>" target="_blank" rel="noreferrer"> ++ <?php p($l->t('online documentation')); ?> ↗ ++ </a> ++ </p> ++ </div> ++ <?php } ?> + </div> + <?php else: ?> + <div id="app-content"> +-- +2.42.0 + diff --git a/community/nfpm/APKBUILD b/community/nfpm/APKBUILD index 8592092175d..800fe0cbfe1 100644 --- a/community/nfpm/APKBUILD +++ b/community/nfpm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=nfpm -pkgver=2.36.1 +pkgver=2.37.1 pkgrel=1 pkgdesc="a simple apk, Deb and RPM packager without external dependencies" url="https://nfpm.goreleaser.com/" @@ -32,5 +32,5 @@ package() { } sha512sums=" -233f6c7cc27906728755b06a755e09c5a89fff0ffcf0eb32517d32b5f8799722a18c5d398e5cc35523c1a4ad406c84d2d9c1dad2846d25fa27e58ce0842d5494 nfpm-2.36.1.tar.gz +e8003e1cd4370de1b6ec0e8ef2b936d76dd60c3ed91b62366b072beb6f5d8cb54e67d115d26dbdb091a9336192301935b0c1ad364ec72619f1180c5b19bd4f09 nfpm-2.37.1.tar.gz " diff --git a/community/nghttp3/APKBUILD b/community/nghttp3/APKBUILD index 2a1fd1f86e5..e30d1450468 100644 --- a/community/nghttp3/APKBUILD +++ b/community/nghttp3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=nghttp3 -pkgver=1.2.0 +pkgver=1.3.0 pkgrel=0 pkgdesc="HTTP/3 library written in C" url="https://github.com/ngtcp2/nghttp3" @@ -37,5 +37,5 @@ package() { } sha512sums=" -a497b097a12503b474a58ec501af7fc8f3d32142ce4b26f35b6b28397ec066fc1f11889ae26a5d9767ec6790de691882e09c9c83bb227089ef0caa0daf612548 nghttp3-1.2.0.tar.gz +1edcd3246e2edd661b626b98ca3716edf27516c82cdf5f4dd5d27f3390f7dd693191531d4d2cb843cd036dc033316d60213bbb79dc4c35f3b7b08ab3d4371161 nghttp3-1.3.0.tar.gz " diff --git a/community/nim/APKBUILD b/community/nim/APKBUILD index 15c6ad24c35..a60ef8eed2e 100644 --- a/community/nim/APKBUILD +++ b/community/nim/APKBUILD @@ -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"}" 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/testing/nmail/APKBUILD b/community/nmail/APKBUILD index 710e09def4d..710e09def4d 100644 --- a/testing/nmail/APKBUILD +++ b/community/nmail/APKBUILD diff --git a/community/nodeinfo/APKBUILD b/community/nodeinfo/APKBUILD index a77a6b2a58e..e2285851931 100644 --- a/community/nodeinfo/APKBUILD +++ b/community/nodeinfo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: 6543 <6543@obermui.de> pkgname=nodeinfo pkgver=0.3.2 -pkgrel=0 +pkgrel=1 pkgdesc="A command line tool to query nodeinfo based on a given domain" url="https://codeberg.org/thefederationinfo/nodeinfo-go" license="MIT" 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/npm/APKBUILD b/community/npm/APKBUILD index 5dcabb81bf1..028f2b8fec6 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.6.0 +pkgver=10.8.0 pkgrel=0 pkgdesc="The package manager for JavaScript" url="https://www.npmjs.com/" @@ -103,7 +103,7 @@ doc() { } sha512sums=" -282ef44aed999cef6fe22dadf8cd2c41cb1111193ef977186caf5fcb86cb5b35025769c42e148ded4024a1ee363f81d04e0d8bc90c5c7e7b60612f3d38468eb0 npm-10.6.0.tgz +c21f77b91733829ec70e73cc88b5dc0a4bf685a81d252d3327d293ff7d5dd05a173f4dbeaa037600ec29696f397f14569229e5dab10b7cfc3e0a30575b8f3f8d npm-10.8.0.tgz bf1362f6ad18738f54f30976e13da066293e21d0d3d81a5c2802f1064e49fa9bc7693b7e73e58f6c8f7fa545edcbb2dbac4b9c69165a9efc69f32fbc1e676597 dont-check-for-last-version.patch 6d0ce425061ffff1c5d7a42c9908f3382cd77abf81a9c30a62ff6fff1f0d02ff633b2bb090814aa619f7d2a51237b3da7f85d97d0f584e037639b60ccfaf0e96 npmrc " diff --git a/community/ntfy/APKBUILD b/community/ntfy/APKBUILD index 5b86a72fc03..e3c4b06e3fb 100644 --- a/community/ntfy/APKBUILD +++ b/community/ntfy/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Alex McGrath <amk@amk.ie> # Maintainer: Alex McGrath <amk@amk.ie> pkgname=ntfy -pkgver=2.10.0 -pkgrel=1 +pkgver=2.11.0 +pkgrel=2 pkgdesc="A simple HTTP-based pub-sub notification service" url="https://ntfy.sh/" # riscv64: fails to build @@ -22,6 +22,12 @@ export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" +prepare() { + default_prepare + + sed -i 's/^# listen-http: ":80"/listen-http: ":8080"/g' server/server.yml +} + build() { make web mkdir -p dist/ntfy_linux_server server/docs @@ -45,11 +51,14 @@ package() { "$pkgdir"/etc/conf.d/$pkgname install -Dm755 "$builddir"/dist/"$pkgname"_linux_server/"$pkgname" \ "$pkgdir"/usr/bin/"$pkgname" - + install -Dm644 "$builddir"/client/client.yml \ + "$pkgdir"/etc/ntfy/client.yml + install -Dm644 "$builddir"/server/server.yml \ + "$pkgdir"/etc/ntfy/server.yml } sha512sums=" -13c0dd8d5208ca42b8e9a2ef31c66bcec8841a33eaccfc4102e9d81ac0b6f5c95881d072ff0ad8da4be53f7182cbda5c6257f25096cc48e9cd438779b598759e ntfy-2.10.0.tar.gz +9c665125197742be86230ef6bf7131f69041c584ce4650d1b9b4b546abd04911eee4a3f4d905783de352bc185bfbf36d20f2e77efac6147cf6bc62953ad785e2 ntfy-2.11.0.tar.gz 5de3242dded5b9f47ee23063ba43e02f5ffc7cd17cee6953c0bb24609d7030a2a2dd7c386f07416e6dbe68698232c7096ff9407f7d3ebedc00a7207f6796f7d9 ntfy.initd 0e016b9f62ba3b0c555757abeb8152e7fb77825ff6451bda820173750fa3ddd449fbc1330ddd7d77db98cff39dc6ab897bc046004469688bf7289be8049890a9 ntfy.confd " diff --git a/community/numen/APKBUILD b/community/numen/APKBUILD index dd66cf537c9..c63331ff1cc 100644 --- a/community/numen/APKBUILD +++ b/community/numen/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: John Gebbie <me@johngebbie.com> pkgname=numen pkgver=0.7 -pkgrel=6 +pkgrel=7 pkgdesc="Voice control for handsfree computing" url="https://sr.ht/~geb/numen" # limited by vosk-api 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 14300bcd92e..3a0c7b895b4 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.75 +pkgver=5.76 pkgrel=0 pkgdesc="OBEXD with enhanced capabilities such as PBAP" url="https://www.bluez.org/" @@ -45,11 +45,6 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz builddir="$srcdir/bluez-$pkgver" -case "$CARCH" in - # crypto tests assume little-endian - mips*) options="!check";; -esac - provides="obexd=$pkgver-r$pkgrel" replaces="obex-capabilities<=0.2.1-r4" @@ -95,7 +90,7 @@ package() { } sha512sums=" -f5fdad3824ed094d944d33f3d116c045e69d593a2b4dae5e57feeb5625a13e024e2433a3178921d2f8e1bd8261794ecdfc25ff3e52672e6e8d42e85b33a735a4 bluez-5.75.tar.xz +30dc3faef74a2225fd6027178376dca4166082d1ed5188021e13d13582db5846aef60b753f173d525bfd0c040f26c3e7dab0283ecafbd34c4a06855d13abb389 bluez-5.76.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 diff --git a/community/objfw/APKBUILD b/community/objfw/APKBUILD index d3bfa4001de..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.2 +pkgver=1.1.3 pkgrel=0 pkgdesc="Portable, lightweight framework for the Objective-C language" url="https://objfw.nil.im/" @@ -106,5 +106,5 @@ _ofhttp() { } sha512sums=" -f93d3c2853aec50517a4de401f19772d9bfba83573b94a81ca31a8a717333dd9938966d0f5950ec9d2b85e149310665b2a835cdbbb34ac00d28c00056d99c139 objfw-1.1.2.tar.gz +c5372451f02ad7a8c1090a9ab9a8df8d106dbc789f2e9857b0543317d5be2f3f321c70ce55ac7179333134e31b24be4e2810a6a4024274ae72def882b63f5132 objfw-1.1.3.tar.gz " 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/testing/ocaml5/APKBUILD b/community/ocaml5/APKBUILD index 822775727c0..9d1baab3a01 100644 --- a/testing/ocaml5/APKBUILD +++ b/community/ocaml5/APKBUILD @@ -3,8 +3,7 @@ # 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/" @@ -22,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 \ @@ -58,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() { @@ -110,5 +116,5 @@ runtime() { } sha512sums=" -e534881eec10b79141b6598ba6d3f59e32ed46a2c64b90c226bbec199c73cdb70e6e5bfa555c34c385d3d83c15e5115f0ea9a182fdda6547db7bbb416f8ed98f ocaml-5.1.1.tar.xz +6c2376777f0ec567fc414d534cba65e5f2120f7c766de25f36bbf80260e882f5d1c94c2ce8e12f2b2982097089c6e8f928f26dbc0b559a0463e7dcdd8baf20fe ocaml-5.2.0.tar.xz " diff --git a/community/ocean-sound-theme/APKBUILD b/community/ocean-sound-theme/APKBUILD index 43ad4ca17ed..0ede4343d35 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.4 +pkgver=6.0.5 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=" -c3683b71ca672aa20c4a20b23689ef2f868fae15758fac9116cb6ae40afa56cd5db540c8a1e5b7745446ae6d8c76a45e522e21882d0a5bcfd6aaa9804a1814f3 ocean-sound-theme-6.0.4.tar.xz +89f8777d552ea63def82694b8d89065d26cc28ef371da06bae445e150f9bf5684ff2d37307848afb8131e3dfed1ed4f2be9d54d14a7bcd32b9571050460ab30f ocean-sound-theme-6.0.5.tar.xz " diff --git a/community/oci-cli/APKBUILD b/community/oci-cli/APKBUILD index b072e7d7543..52bb0283b94 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.40.1 +pkgver=3.40.3 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=" -133cfe8c3697a6a100b3f73427246228721bc68558f1033ac4d2796ceb5ecc627e211f749b209be4fc01550d48bf70c9be2b8eb3bc0b5602202fbd7b1857feea oci-cli-3.40.1.tar.gz +960e5c2ba628fa8856ade513c0fd4ce09aebcd485f4be673d2d012c86e5d8731f3635e659cb04b2d1110dcf0daf021d6ae83f3e6d60e81f8a70b20d7120ea551 oci-cli-3.40.3.tar.gz " diff --git a/community/okular/APKBUILD b/community/okular/APKBUILD index 9fb300c7261..eb956db36bf 100644 --- a/community/okular/APKBUILD +++ b/community/okular/APKBUILD @@ -4,11 +4,11 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=okular -pkgver=24.02.2 +pkgver=24.05.0 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" @@ -114,5 +114,5 @@ mobile() { } sha512sums=" -86cc798a867a711114cc80ad90fb3871a9db38578975699a341614d5c8600a6baec83c04eb6a8bb8c306c89f222e41b7c227c54a7028dfada8fb01e0179358c6 okular-24.02.2.tar.xz +8c9200fb8c848613e3f115a3509403f8bd7a21d175a7c37d0838facb628553077d6651a7a4797e8432db4e94592e42bb44a65dcc0aa0773a4d5704dedc730ddd okular-24.05.0.tar.xz " diff --git a/community/onefetch/APKBUILD b/community/onefetch/APKBUILD index 2ca420e56c4..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" @@ -74,5 +74,5 @@ package() { } sha512sums=" -f6639058dca7b1222b5e0f3695847b3d82642e2f4857cd7f656e4cbb80eb1688ffc0894a45f71eae8f919f9bb79d8717d68596cb639060266821b1bd89fed41a onefetch-2.20.0.tar.gz +bdcdc922c5d5912a6e2b5cb87d43fb7d69a7f489199857578c29c60247aefe97b4ff20e2f1a28ed2e53d1d613d921b525c009c96c59bc354b89a420d92ff38b0 onefetch-2.21.0.tar.gz " diff --git a/community/opam/APKBUILD b/community/opam/APKBUILD index cee55b1b748..2c11e633a72 100644 --- a/community/opam/APKBUILD +++ b/community/opam/APKBUILD @@ -4,22 +4,26 @@ # Contributor: omni <omni+alpine@hack.org> # Maintainer: Kate <kit.ty.kate@disroot.org> pkgname=opam -pkgver=2.1.5 -pkgrel=2 +pkgver=2.1.6 +pkgrel=0 pkgdesc="OCaml Package Manager" url="https://opam.ocaml.org" -arch="all !riscv64 !loongarch64" # 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 makedepends="dune tar ocaml-compiler-libs" checkdepends="rsync bash diffutils" -source="https://github.com/ocaml/opam/releases/download/$pkgver/opam-full-$pkgver.tar.gz - makefile.patch - " +source="https://github.com/ocaml/opam/releases/download/$pkgver/opam-full-$pkgver.tar.gz" subpackages="$pkgname-doc" builddir="$srcdir/opam-full-$pkgver" +case "$CARCH" in + riscv64) + makedepends="${makedepends//ocaml/ocaml5}" + ;; +esac + build() { ./configure \ --build=$CBUILD \ @@ -44,6 +48,5 @@ package() { } sha512sums=" -e4e33fcee0a9f922f8b43c6b095554a946559a2c50341326d21cca0f24fc7105c0de01db204b408240b12b267c9929435e2c511adf140618c91873f10444ae90 opam-full-2.1.5.tar.gz -0e9b1ccac3dc6b9f215a01ac9c30ca95a254240752af7ab9c6368b525e108b4b55cc460ca7ba8fcccca33103247a90f12779649d2823643f1e856cb3a8de50f0 makefile.patch +2bb24db05dc39d6e8294c10b5a6bb2dd8f675a4d56e1dc9a2e9bc576f54d14a1709005219c25586df9382897ab7ba5ea0636765410f01c06958ec59be9f14b4c opam-full-2.1.6.tar.gz " diff --git a/community/opam/makefile.patch b/community/opam/makefile.patch deleted file mode 100644 index 3192febd8c6..00000000000 --- a/community/opam/makefile.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -20,11 +20,6 @@ - endif - else - DUNE_EXE= -- # NB make does not export the PATH update in Makefile.config to $(shell ...) -- ifeq ($(shell PATH='$(PATH)' $(DUNE) build --root . --help=plain 2>/dev/null \ -- | grep -F -- '$(DUNE_PROMOTE_ARG) '),) -- DUNE_PROMOTE_ARG = -- endif - endif - - OPAMINSTALLER = ./opam-installer$(EXE) 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/openimageio/APKBUILD b/community/openimageio/APKBUILD index 923c3148c8b..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=2 +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/openjdk-mandrel/APKBUILD b/community/openjdk-mandrel/APKBUILD index d5aa97908dd..8675da994da 100644 --- a/community/openjdk-mandrel/APKBUILD +++ b/community/openjdk-mandrel/APKBUILD @@ -24,6 +24,7 @@ makedepends=" ninja-is-really-ninja openjdk$_jdkver-static-libs python3 + py3-setuptools " provides="openjdk$_jdkver-mandrel" _mx_ver=6.27.3 @@ -31,6 +32,7 @@ source="mandrel-packaging-$pkgver-Final.tar.gz::https://github.com/graalvm/mandr https://github.com/graalvm/mandrel/archive/mandrel-$pkgver-Final.tar.gz https://github.com/graalvm/mx/archive/$_mx_ver/graalvm-mx-$_mx_ver.tar.gz fix-file-system-loop-exception.patch + jdk-17.0.10-compatibility_patch Example.java " builddir="$srcdir/mandrel-packaging-$pkgver" @@ -51,6 +53,10 @@ unpack() { prepare() { default_prepare + cd "$srcdir"/mandrel-$pkgver + msg "jdk-17.0.10-compatibility_patch" + patch -p1 -i "$srcdir"/jdk-17.0.10-compatibility_patch + cd "$srcdir" # Build scripts require the sources to be git repositories. local dir; for dir in mandrel-$pkgver mandrel-packaging-$pkgver; do @@ -113,5 +119,6 @@ sha512sums=" 35fb7a96cd08cc7f94222831a95ea2f66158e128294ff44b9d686c2a8344a1fdfa42f627ef4d3913f71f768dbe9761e5d03923c61d15832198d81b3db91f84dc mandrel-23.0.0.0-Final.tar.gz 5e89961a80855ae46973fb6d995320b3134d9bf71442949147bef23a9a15453cb978f753f64ccfc87023059654bad1330ab25483bd6c022f520b7f6e50ddc1fc graalvm-mx-6.27.3.tar.gz 8d98ef2316a12e58e2a7d920533fcaab30dc81ceadba66206af1af9a8f7f21af5cac41a6a80d2a4aef8c1eb3b293a518f242ec0530e5c955418bfb7da1d4f72b fix-file-system-loop-exception.patch +fc4c316b1e1a98aa313f8709f9430f3179f7efd7a0edcccd6b3dcb20cb3b4e84dd1cbfce4bdbd3d8221a7943bfa6df1e891d8198e922c9691f471b188114df11 jdk-17.0.10-compatibility_patch 601ac59e59d32cbaf91f7541bd8173b38c68cbec96a7fb74227017afc8e5dc6ce4b8be03e92dd34cf52370e5d52beb780808af57b17c79c53ae8ec64cd34a92d Example.java " diff --git a/community/openjdk-mandrel/jdk-17.0.10-compatibility_patch b/community/openjdk-mandrel/jdk-17.0.10-compatibility_patch new file mode 100644 index 00000000000..84cb1d4c398 --- /dev/null +++ b/community/openjdk-mandrel/jdk-17.0.10-compatibility_patch @@ -0,0 +1,266 @@ +Patch-Source: https://github.com/graalvm/mandrel/commit/cedccd02520a6d9888e9cb5b2f6b505fca79dd7a +-- +From cedccd02520a6d9888e9cb5b2f6b505fca79dd7a Mon Sep 17 00:00:00 2001 +From: Foivos Zakkak <fzakkak@redhat.com> +Date: Thu, 9 Nov 2023 11:10:10 +0200 +Subject: [PATCH] Fix `javax.crypto.JceSecurity` substitutions in JDK >= + 17.0.10 + +Closes https://github.com/graalvm/mandrel/issues/607 +--- + ...eSecurityHasInnerClassIdentityWrapper.java | 41 +++++++++++++++++++ + ...urityHasInnerClassWeakIdentityWrapper.java | 41 +++++++++++++++++++ + .../svm/core/jdk/SecuritySubstitutions.java | 36 ++++++++++++++-- + .../svm/hosted/SecurityServicesFeature.java | 32 ++++++++++++++- + 4 files changed, 145 insertions(+), 5 deletions(-) + create mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JceSecurityHasInnerClassIdentityWrapper.java + create mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JceSecurityHasInnerClassWeakIdentityWrapper.java + +diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JceSecurityHasInnerClassIdentityWrapper.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JceSecurityHasInnerClassIdentityWrapper.java +new file mode 100644 +index 000000000000..393d47004794 +--- /dev/null ++++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JceSecurityHasInnerClassIdentityWrapper.java +@@ -0,0 +1,41 @@ ++/* ++ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle in the LICENSE file that accompanied this code. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++package com.oracle.svm.core.jdk; ++ ++import java.util.function.BooleanSupplier; ++ ++public class JceSecurityHasInnerClassIdentityWrapper implements BooleanSupplier { ++ ++ @Override ++ public boolean getAsBoolean() { ++ try { ++ Class.forName("javax.crypto.JceSecurity$IdentityWrapper"); ++ return true; ++ } catch (ClassNotFoundException e) { ++ return false; ++ } ++ } ++ ++} +diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JceSecurityHasInnerClassWeakIdentityWrapper.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JceSecurityHasInnerClassWeakIdentityWrapper.java +new file mode 100644 +index 000000000000..40f5e8732eb7 +--- /dev/null ++++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JceSecurityHasInnerClassWeakIdentityWrapper.java +@@ -0,0 +1,41 @@ ++/* ++ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. Oracle designates this ++ * particular file as subject to the "Classpath" exception as provided ++ * by Oracle in the LICENSE file that accompanied this code. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++package com.oracle.svm.core.jdk; ++ ++import java.util.function.BooleanSupplier; ++ ++public class JceSecurityHasInnerClassWeakIdentityWrapper implements BooleanSupplier { ++ ++ @Override ++ public boolean getAsBoolean() { ++ try { ++ Class.forName("javax.crypto.JceSecurity$WeakIdentityWrapper"); ++ return true; ++ } catch (ClassNotFoundException e) { ++ return false; ++ } ++ } ++ ++} +diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java +index f4fead83b3e7..d769996b731f 100644 +--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java ++++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -26,6 +26,7 @@ + + import static com.oracle.svm.core.snippets.KnownIntrinsics.readCallerStackPointer; + ++import java.lang.ref.ReferenceQueue; + import java.lang.reflect.Constructor; + import java.lang.reflect.InvocationTargetException; + import java.net.URL; +@@ -43,6 +44,7 @@ + import java.security.SecureRandom; + import java.util.List; + import java.util.Map; ++import java.util.function.BooleanSupplier; + import java.util.function.Predicate; + + import org.graalvm.compiler.serviceprovider.JavaVersionUtil; +@@ -317,10 +319,26 @@ static boolean isTrustedCryptoProvider(Provider provider) { + } + } + ++final class QueueFieldPresent implements BooleanSupplier { ++ @Override ++ public boolean getAsBoolean() { ++ try { ++ Class<?> jceSecurity = Class.forName("javax.crypto.JceSecurity"); ++ jceSecurity.getDeclaredField("queue"); ++ return true; ++ } catch (ClassNotFoundException | NoSuchFieldException e) { ++ return false; ++ } ++ } ++} ++ + @TargetClass(className = "javax.crypto.JceSecurity") + @SuppressWarnings({"unused"}) + final class Target_javax_crypto_JceSecurity { + ++ @Alias @TargetElement(onlyWith = QueueFieldPresent.class)// ++ public static ReferenceQueue<Object> queue; ++ + /* + * Lazily recompute the RANDOM field at runtime. We cannot push the entire static initialization + * of JceSecurity to run time because we want the JceSecurity.verificationResults initialized at +@@ -393,8 +411,7 @@ public Object transform(Object receiver, Object originalValue) { + } + } + +-@TargetClass(className = "javax.crypto.JceSecurity", innerClass = "IdentityWrapper", onlyWith = JDK17OrLater.class) +-@SuppressWarnings({"unused"}) ++@TargetClass(className = "javax.crypto.JceSecurity", innerClass = "IdentityWrapper", onlyWith = JceSecurityHasInnerClassIdentityWrapper.class) + final class Target_javax_crypto_JceSecurity_IdentityWrapper { + @Alias // + Provider obj; +@@ -405,6 +422,14 @@ final class Target_javax_crypto_JceSecurity_IdentityWrapper { + } + } + ++@TargetClass(className = "javax.crypto.JceSecurity", innerClass = "WeakIdentityWrapper", onlyWith = JceSecurityHasInnerClassWeakIdentityWrapper.class) ++final class Target_javax_crypto_JceSecurity_WeakIdentityWrapper { ++ @Alias // ++ Target_javax_crypto_JceSecurity_WeakIdentityWrapper(Provider obj, ReferenceQueue<Object> queue) { ++ // Do nothing this is just an alias ++ } ++} ++ + class JceSecurityAccessor { + private static volatile SecureRandom RANDOM; + +@@ -436,7 +461,12 @@ static Object providerKey(Provider p) { + if (JavaVersionUtil.JAVA_SPEC <= 11) { + return p; + } ++ + /* Starting with JDK 17 the verification results map key is an identity wrapper object. */ ++ if (new JceSecurityHasInnerClassWeakIdentityWrapper().getAsBoolean()) { ++ return new Target_javax_crypto_JceSecurity_WeakIdentityWrapper(p, Target_javax_crypto_JceSecurity.queue); ++ } ++ + return new Target_javax_crypto_JceSecurity_IdentityWrapper(p); + } + +diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java +index d5c4e9ea3dba..56e4790d7fbb 100644 +--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java ++++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2018, 2018, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -31,6 +31,7 @@ + import java.io.FileWriter; + import java.io.IOException; + import java.io.PrintWriter; ++import java.lang.ref.Reference; + import java.lang.reflect.Executable; + import java.lang.reflect.Field; + import java.lang.reflect.InvocationTargetException; +@@ -87,6 +88,7 @@ + import javax.xml.crypto.dsig.XMLSignatureFactory; + import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory; + ++import com.oracle.svm.core.jdk.JceSecurityHasInnerClassWeakIdentityWrapper; + import org.graalvm.compiler.options.Option; + import org.graalvm.compiler.serviceprovider.JavaVersionUtil; + import org.graalvm.nativeimage.ImageSingletons; +@@ -885,7 +887,33 @@ private Function<Object, Object> constructVerificationCacheCleaner(Class<?> jceS + }; + } + /* +- * For JDK 17 and later, the verification cache is an IdentityWrapper -> Verification result ++ * For JDK 17.0.10 and later, the verification cache is a WeakIdentityWrapper -> ++ * Verification result ConcurrentHashMap. The WeakIdentityWrapper contains the actual ++ * provider in the 'obj' field. ++ */ ++ if (new JceSecurityHasInnerClassWeakIdentityWrapper().getAsBoolean()) { ++ Method getReferent = ReflectionUtil.lookupMethod(Reference.class, "get"); ++ Predicate<Object> listRemovalPredicate = wrapper -> { ++ try { ++ return shouldRemoveProvider((Provider) getReferent.invoke(wrapper)); ++ } catch (IllegalAccessException | InvocationTargetException e) { ++ throw VMError.shouldNotReachHere(e); ++ } ++ }; ++ ++ return obj -> { ++ Map<Object, Object> original = (Map<Object, Object>) obj; ++ Map<Object, Object> verificationResults = new ConcurrentHashMap<>(original); ++ ++ verificationResults.keySet().removeIf(listRemovalPredicate); ++ ++ return verificationResults; ++ }; ++ ++ } ++ ++ /* ++ * For JDK 17 up to 17.0.10, the verification cache is an IdentityWrapper -> Verification result + * ConcurrentHashMap. The IdentityWrapper contains the actual provider in the 'obj' field. + */ + Class<?> identityWrapper = loader.findClassOrFail("javax.crypto.JceSecurity$IdentityWrapper"); diff --git a/community/openlibm/APKBUILD b/community/openlibm/APKBUILD index 9d014ca7a9a..6da78f04700 100644 --- a/community/openlibm/APKBUILD +++ b/community/openlibm/APKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="High quality system independent, portable, open source libm implementation" url="https://openlibm.org/" # riscv64 is not supported upstream -arch="all !s390x !riscv64" +arch="all !s390x !riscv64 !loongarch64" license="MIT AND BSD-2-Clause AND ISC AND LGPL-2.1-or-later" subpackages="$pkgname-dev" source="openlibm-$pkgver.tar.gz::https://github.com/JuliaLang/openlibm/archive/v$pkgver.tar.gz 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/openring/APKBUILD b/community/openring/APKBUILD index 62890b9f323..abefb46f902 100644 --- a/community/openring/APKBUILD +++ b/community/openring/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Anjandev Momi <anjan@momi.ca> pkgname=openring pkgver=1.0.1 -pkgrel=18 +pkgrel=19 pkgdesc="a webring for static site generators" url="https://sr.ht/~sircmpwn/openring/" arch="all" diff --git a/community/opensc/APKBUILD b/community/opensc/APKBUILD index 3e87d6a61a8..0d9a096a027 100644 --- a/community/opensc/APKBUILD +++ b/community/opensc/APKBUILD @@ -18,6 +18,9 @@ source="$_realname-$pkgver.tar.gz::https://github.com/OpenSC/OpenSC/archive/$pkg builddir="$srcdir/$_realname-$pkgver" # secfixes: +# 0.25.1-r0: +# - CVE-2023-5992 +# - CVE-2024-1454 # 0.24.0-r0: # - CVE-2023-40660 # - CVE-2023-40661 diff --git a/community/openscenegraph/APKBUILD b/community/openscenegraph/APKBUILD index b75177f625b..a2cabb47ae8 100644 --- a/community/openscenegraph/APKBUILD +++ b/community/openscenegraph/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=openscenegraph pkgver=3.6.5 -pkgrel=14 +pkgrel=15 pkgdesc="High performance 3D graphics toolkit" url="http://www.openscenegraph.org/" arch="all" diff --git a/community/opensmtpd-filter-rspamd/APKBUILD b/community/opensmtpd-filter-rspamd/APKBUILD index db7c5cb13a9..46acaafd382 100644 --- a/community/opensmtpd-filter-rspamd/APKBUILD +++ b/community/opensmtpd-filter-rspamd/APKBUILD @@ -3,7 +3,7 @@ pkgname=opensmtpd-filter-rspamd _pkgname=filter-rspamd pkgver=0.1.8 -pkgrel=6 +pkgrel=7 pkgdesc="OpenSMTPD filter integration for Rspamd" url="https://github.com/poolpOrg/filter-rspamd" license="ISC" diff --git a/community/opensmtpd-filter-senderscore/APKBUILD b/community/opensmtpd-filter-senderscore/APKBUILD index e83eb5e5680..d71251d0e5e 100644 --- a/community/opensmtpd-filter-senderscore/APKBUILD +++ b/community/opensmtpd-filter-senderscore/APKBUILD @@ -3,7 +3,7 @@ pkgname=opensmtpd-filter-senderscore _pkgname=filter-senderscore pkgver=0.1.2 -pkgrel=10 +pkgrel=11 pkgdesc="OpenSMTPD senderscore filter" url="https://github.com/poolpOrg/filter-senderscore" license="ISC" diff --git a/community/openspecfun/APKBUILD b/community/openspecfun/APKBUILD index 8de217e3939..e09def8a042 100644 --- a/community/openspecfun/APKBUILD +++ b/community/openspecfun/APKBUILD @@ -5,8 +5,8 @@ pkgver=0.5.6 pkgrel=0 pkgdesc="A collection of special mathematical functions." url="https://github.com/JuliaMath/openspecfun" -# s390x and riscv64 blocked by openlibm -arch="all !s390x !riscv64" +# s390x, riscv64 and loongarch64 blocked by openlibm +arch="all !s390x !riscv64 !loongarch64" license="MIT Public-Domain" makedepends="openlibm-dev gfortran" options="!check" # no tests diff --git a/community/opentofu/APKBUILD b/community/opentofu/APKBUILD index c8cbbe97ff1..078c7705a8b 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.7.0 -pkgrel=0 +pkgver=1.7.1 +pkgrel=1 pkgdesc="OpenTofu lets you declaratively manage your cloud infrastructure" url="https://opentofu.org" arch="all" @@ -29,5 +29,5 @@ package() { } sha512sums=" -5454310ab21f7b8dde49f56827970487bafaad2b4073f8fb3ba4e7b5c9a94a7f048db9b961a23387397d12a79d6385e91126b27d1bb654e25827a51f959f15ac opentofu-1.7.0.tar.gz +11573449cf73e44352124463bb2dfe890688fc0bb1a232fb57a16872612c562e0fe08ed926635fc21063118d83a120febd156073c23d8dc3294e00035c660ad6 opentofu-1.7.1.tar.gz " diff --git a/community/openvas-scanner/APKBUILD b/community/openvas-scanner/APKBUILD index c7992745db0..283275d05d3 100644 --- a/community/openvas-scanner/APKBUILD +++ b/community/openvas-scanner/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=openvas-scanner -pkgver=23.0.1 +pkgver=23.2.0 pkgrel=0 pkgdesc="Open Vulnerability Assessment Scanner" url="https://openvas.org/" @@ -84,7 +84,7 @@ config() { } sha512sums=" -e2107ca762abcbb20d4506d2cc4479d5fbf5efd744a598ec63ea3c66ae6a6f1743deeb4b7aa9863b78c186c8a4d4b5f2212d241cef51b91c6c5bcd0879c45dc7 openvas-scanner-23.0.1.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/openvi/APKBUILD b/community/openvi/APKBUILD index b93e64528ca..b6bfab9252f 100644 --- a/community/openvi/APKBUILD +++ b/community/openvi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jason Swank <jswank@scalene.net> # Maintainer: Jason Swank <jswank@scalene.net> pkgname=openvi -pkgver=7.5.28 +pkgver=7.5.29 pkgrel=0 pkgdesc="OpenVi is a fork of the vi / ex editor included with OpenBSD" url="https://github.com/johnsonjh/OpenVi" @@ -22,5 +22,5 @@ package() { } sha512sums=" -15ea561c81987c3c32f9afa5af04735b479ec3a9771c7323d1fb1ab12dcaf0ffff0767ad9f8a1fff7154e81f07588012e7d24f67641d3dbb360e1c419789d186 openvi-7.5.28.tar.gz +6c11cf0651cc3ba21669e4f7f660411299cac4de53659ab58bae9c0fdb2453282dc0f8a0e346279021509a83df86cc1db09b079b2b3e9880eaf722b3d3cf9a8a openvi-7.5.29.tar.gz " diff --git a/community/opus-tools/APKBUILD b/community/opus-tools/APKBUILD index d1f4b7f4b74..d64711ab543 100644 --- a/community/opus-tools/APKBUILD +++ b/community/opus-tools/APKBUILD @@ -18,6 +18,11 @@ makedepends=" subpackages="$pkgname-doc" source="https://archive.mozilla.org/pub/opus/opus-tools-$pkgver.tar.gz" +prepare() { + default_prepare + update_config_sub +} + build() { CFLAGS="$CFLAGS -flto=auto" \ ./configure \ diff --git a/community/opustags/APKBUILD b/community/opustags/APKBUILD index d21cfacf52d..af708d02956 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.10.0 +pkgver=1.10.1 pkgrel=0 pkgdesc="Ogg Opus tags editor" url="https://github.com/fmang/opustags" @@ -32,5 +32,5 @@ package() { } sha512sums=" -55b682755746ed8ec9b41d8a3afe5d39242b3b7e7eddcf43cd9bdcb8c19d2a7a5272b437eb38a9b4a9dbdcb3c8dfedf49f954ced8bc6b4fe6d85696b79211deb opustags-1.10.0.tar.gz +df48d9f9344bf9f5300cc998f753b162ff1312809b77c958ce530ab96095c9b200d4df30e27e6aead84918591846d5f0ab3d1b802e6f10856f2754be8cb3b050 opustags-1.10.1.tar.gz " diff --git a/community/orca/APKBUILD b/community/orca/APKBUILD index 4e3643ef91f..777c5fa9269 100644 --- a/community/orca/APKBUILD +++ b/community/orca/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/gnome <ablocorrea@hotmail.com> pkgname=orca -pkgver=46.0 -pkgrel=1 +pkgver=46.1 +pkgrel=0 pkgdesc="Orca is an extensible screen reader" url="https://wiki.gnome.org/Projects/Orca" arch="noarch !armhf" # missing gst-plugins-good @@ -42,5 +42,5 @@ package() { } sha512sums=" -21ea896cfa49c6eed76c0280adfc06201b9e4e000ba3799fd38e13966d99de700733a739f0ed6b589c6b44c65f8ea371dfe04efe2fcc9da1b2b0913e08197b9c orca-46.0.tar.xz +16c504ea64a633f5c45ab394418f01c0a038523af2c794677c13ed3c78e2e0e827bfe558b00c5d4eb4a34bca774e8ea8aaf9a9b60607b4209e3041c56653462e orca-46.1.tar.xz " diff --git a/community/osl/APKBUILD b/community/osl/APKBUILD index 02e5391f0c5..bf94680d6a7 100644 --- a/community/osl/APKBUILD +++ b/community/osl/APKBUILD @@ -7,7 +7,8 @@ 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/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/ostree/APKBUILD b/community/ostree/APKBUILD index e463d002b35..5fdafab781f 100644 --- a/community/ostree/APKBUILD +++ b/community/ostree/APKBUILD @@ -37,6 +37,11 @@ builddir="$srcdir/lib$pkgname-$pkgver" # todo: fails to make stuff in var/tmp in root options="!check" +prepare() { + default_prepare + update_config_sub +} + build() { CFLAGS="$CFLAGS -flto=auto" \ CXXFLAGS="$CXXFLAGS -flto=auto" \ diff --git a/community/osv-scanner/APKBUILD b/community/osv-scanner/APKBUILD index b6924617029..9a5adec7f63 100644 --- a/community/osv-scanner/APKBUILD +++ b/community/osv-scanner/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: kpcyrd <git@rxv.cc> pkgname=osv-scanner pkgver=1.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="Vulnerability scanner written in Go which uses the data provided by https://osv.dev" url="https://github.com/google/osv-scanner" arch="all" diff --git a/community/oxipng/APKBUILD b/community/oxipng/APKBUILD index b3d99a3fc45..79739bc3f67 100644 --- a/community/oxipng/APKBUILD +++ b/community/oxipng/APKBUILD @@ -9,7 +9,8 @@ url="https://github.com/shssoichiro/oxipng" arch="all !armhf" license="MIT" makedepends="cargo cargo-auditable" -source="https://github.com/shssoichiro/oxipng/archive/v$pkgver/oxipng-$pkgver.tar.gz" +source="https://github.com/shssoichiro/oxipng/archive/v$pkgver/oxipng-$pkgver.tar.gz + cargo-update.patch" options="net" # required for cargo fetch prepare() { @@ -35,4 +36,5 @@ package() { sha512sums=" 3d941f991b5ae82364e088a845919b5d88a335e56853044a835007d903844e4800f166c8d649413c97252ec7f70a28f93f633ecec81e6df2194cd87bc0c13297 oxipng-9.1.1.tar.gz +fc5c5f822acdf1a559e64c330dc690dde4e307fe0abff9299952077a9ea3afaed9b78ca429625e6fed8bc628c0e4e72f89462cc115280ad9323b594a8c5c97c0 cargo-update.patch " diff --git a/community/oxipng/cargo-update.patch b/community/oxipng/cargo-update.patch new file mode 100644 index 00000000000..b0f2158e0ec --- /dev/null +++ b/community/oxipng/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c2825c0..de214a5 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -314,9 +314,9 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libdeflate-sys" diff --git a/community/oxygen-sounds/APKBUILD b/community/oxygen-sounds/APKBUILD index 3f44365af8e..7eca6233b30 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="The Oxygen Sound Theme" # armhf blocked by extra-cmake-modules @@ -41,5 +41,5 @@ package() { } sha512sums=" -3181e648f062e166b40e85a6611336eccc7a83c2b81ead0eb7010285c3b5219d9066267035d605cc39e89e0641f91e100dd2cd304e835a23a98c94b19fe06b9c oxygen-sounds-6.0.4.tar.xz +aaa1de2a573e314e4d1247ce7f370166c8f7a24f4c6df7cf8fccb68f7f6ca8ecf798484c189ab16b5bb244bc352b6ecf16bc9c484e7d55e7284be894e56e8613 oxygen-sounds-6.0.5.tar.xz " diff --git a/community/oxygen/APKBUILD b/community/oxygen/APKBUILD index a6b2bc24a2c..803bf5922b4 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.4 +pkgver=6.0.5 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=" -9cfc66e10c155aac24afaa02633768a5ed9b61aae79bcb40010d138e19b83b15d56fd330e21c7ff424da526ee7f5a5f0d2671491205da5de4f9c562fe33d06f9 oxygen-6.0.4.tar.xz +002c834e5cab013acf870d730538fb8b9217f2de6d3e5d97279e023f61bf2ca1c4f2c2976dcd7aca51305b9bcffa3dc7c00c51a69f86d882ec331d75448a0eda oxygen-6.0.5.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/parley/APKBUILD b/community/parley/APKBUILD index 4acf612c154..332bd77f90c 100644 --- a/community/parley/APKBUILD +++ b/community/parley/APKBUILD @@ -4,11 +4,11 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=parley -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules -# armv7, ppc64le, s390x and riscv64 blocked by qt6-qtwebengine -arch="all !armhf !armv7 !ppc64le !s390x !riscv64" +# armv7, ppc64le, s390x, riscv64 and loongarch64 blocked by qt6-qtwebengine +arch="all !armhf !armv7 !ppc64le !s390x !riscv64 !loongarch64" url="https://kde.org/applications/education/org.kde.parley" pkgdesc="Vocabulary Trainer" license="GPL-2.0-or-later AND GFDL-1.2-only" @@ -56,5 +56,5 @@ package() { } sha512sums=" -afdb8829fffed2c54863c120299464b70acfc77706125246c12c90a90ebf58dd3002390b6560012d6a92d72f3d74c29717adbc8f33fd858cfcbd93b0b13b122e parley-24.02.2.tar.xz +cc9ba7c749bc8732e97a8967afec46f7cc90e8447cb7dacdbe2caed0d3b610d9b459e3d66945a423e50965afb73c1b2d75a2e66bfa0a993c6831528c3d7e86ef parley-24.05.0.tar.xz " diff --git a/community/partitionmanager/APKBUILD b/community/partitionmanager/APKBUILD index aa950a2f16c..3fac48248c0 100644 --- a/community/partitionmanager/APKBUILD +++ b/community/partitionmanager/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=partitionmanager -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -50,5 +50,5 @@ package() { } sha512sums=" -53694c88828fe83a5e29dd1af6e20d48f4670a4925457ff15f640b5e1d457b1c2fcf266dd358163e2e1b72bd69b570d72dcde9adb8ef9e610666f6bb74eb7094 partitionmanager-24.02.2.tar.xz +202a7730cebae436fcb3c412ae3bdd606181b453f33cb7a79b16d66eae284bc2c26362afea254676e7a0dba26fbb3f524356874e520ff8a3a03c1d5b6e532eab partitionmanager-24.05.0.tar.xz " diff --git a/community/passt/APKBUILD b/community/passt/APKBUILD index 51befecac5a..2a8f36a9bfa 100644 --- a/community/passt/APKBUILD +++ b/community/passt/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Hoang Nguyen <folliekazetani@protonmail.com> # Maintainer: omni <omni+alpine@hack.org> pkgname=passt -pkgver=2024.04.26 -_commit=d03c4e2 +pkgver=2024.05.23 +_commit=765eb0b _tag=${pkgver//./_}.$_commit -pkgrel=1 -pkgdesc="Plug a simple socket transport" +pkgrel=0 +pkgdesc="Plug A Simple Socket Transport" url="https://passt.top/" arch="all" license="BSD-3-Clause AND GPL-2.0-or-later" @@ -26,5 +26,5 @@ package() { } sha512sums=" -7e39aeb46d57b5409e101506972606505eae8b57e55b47e7cc544879c65d6b70416983c2eaf00bcd1a972b8c9bbd8ac816bdbfb07091f048e2e6ca39f35fe918 passt-2024_04_26.d03c4e2.tar.gz +092989b8910f789473580741dfc794cb3ec6dc4febd1c6f5d80cf5f40bf5b7ea40f653d8a744305a7fc93bb332c7b95da224121166463b6b41f41e095f425aa4 passt-2024_05_23.765eb0b.tar.gz " 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 edebb2c9d9e..f45606d0357 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=3 +pkgrel=4 pkgdesc="PDAL is a C++ BSD library for translating and manipulating point cloud data." url="https://pdal.io/" arch="all" @@ -30,7 +30,7 @@ makedepends=" zstd-dev xerces-c-dev " -checkdepends="gdal-tools gdal-driver-PNG" +checkdepends="gdal-tools gdal-driver-PNG gdal-driver-JPEG" subpackages=" $pkgname-dev libpdal-plugins @@ -84,6 +84,7 @@ check() { io_ept_reader io_las_reader io_las_writer + io_ogr_writer io_optech io_stac_reader io_tiledb_bit_fields @@ -97,6 +98,7 @@ check() { utils filters_icp file_utils + filters_assign " ;; esac for test in $tests; do diff --git a/community/pdns-recursor/APKBUILD b/community/pdns-recursor/APKBUILD index baa5ada5410..c9cb9f8c492 100644 --- a/community/pdns-recursor/APKBUILD +++ b/community/pdns-recursor/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Peter van Dijk <peter.van.dijk@powerdns.com> pkgname=pdns-recursor -pkgver=5.0.4 +pkgver=5.0.5 pkgrel=0 pkgdesc="PowerDNS Recursive Server" url="https://www.powerdns.com/" @@ -24,6 +24,7 @@ subpackages="$pkgname-common::noarch $pkgname-doc $pkgname-openrc" pkgusers="recursor" pkggroups="recursor" source="https://downloads.powerdns.com/releases/pdns-recursor-${pkgver//_/-}.tar.bz2 + cargo-update.patch $pkgname.initd recursor.conf " @@ -160,7 +161,8 @@ luajit() { } sha512sums=" -a78422917df91a8f8c49bc5c2bdf599f92f6c3359f049653c6623a05da8117445c04400321cc4e2128cfaedb7b345cbec003339c35e4f2c76bb43d16d07b00d4 pdns-recursor-5.0.4.tar.bz2 +52bed3516a8dfbe4be5e5ddd81920955c1c4c66d1996afc9f61d361e06ec11cc5aba7afe4c49f8f69b1554b6564cb619ee5572c066d6d6f2733a0f07bc6945c0 pdns-recursor-5.0.5.tar.bz2 +f28df5fa24d800e40965785a930cb8f9eac6b35cdcd71a202b4a59e36df46631f8998a917fdcf4516c5b8a8e0102b351d123d7d8d12db6111649c71263bac273 cargo-update.patch 71f7be51d3a9a78f22f3946e95534d4f5b37b3bcbd1891ad3a17095be545fdb0eaf239d58c9f40ccc642542150c0b35ed025bf69acabfa779c0ab10c67a5e796 pdns-recursor.initd abda278d29b21e9635fb154c8685e5d346f47889498f075a8dd2e486f8ea4dcc2ccd20f4245783e4d55534fed88c49825b22fd3d1c55d8645522ce45cc53d661 recursor.conf " diff --git a/community/pdns-recursor/cargo-update.patch b/community/pdns-recursor/cargo-update.patch new file mode 100644 index 00000000000..ee4c2856200 --- /dev/null +++ b/community/pdns-recursor/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/settings/rust/Cargo.lock b/settings/rust/Cargo.lock +index b1bc840..68aacb7 100644 +--- a/settings/rust/Cargo.lock ++++ b/settings/rust/Cargo.lock +@@ -101,9 +101,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + + [[package]] + name = "libc" +-version = "0.2.150" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "link-cplusplus" diff --git a/community/pdns/APKBUILD b/community/pdns/APKBUILD index d002684697e..711a3da9796 100644 --- a/community/pdns/APKBUILD +++ b/community/pdns/APKBUILD @@ -6,8 +6,8 @@ # Contributor: Fabian Zoske <fabian@zoske.it> # Maintainer: Peter van Dijk <peter.van.dijk@powerdns.com> pkgname=pdns -pkgver=4.9.0 -pkgrel=3 +pkgver=4.9.1 +pkgrel=0 pkgdesc="PowerDNS Authoritative Server" url="https://www.powerdns.com/" # s390x blocked by failing testsuite @@ -184,7 +184,7 @@ backend_pgsql() { } sha512sums=" -73dcad9a6cc80e5ca2bdd28f1c49b1acab463ec51cb181324536a566ab26ac3a236099bd4eb03fbe98748f798ad0e11270fb8e6d52a33ea106c8dd2d97013388 pdns-4.9.0.tar.bz2 +8be784615a4b35dd04af7584d1faf3e2b25665b31f83d8f64057ca164a2c4f0604c92c768b88a7b778aa13148fb2d0cedc328551b8c467b7b21011cfc3b33b1a pdns-4.9.1.tar.bz2 3a55547e1b6407e7d2faa6e02982ed903c2364381af1b7eeb626ae3a8b0e32558dd79bf31c982b134414e5636d4868c1f3660ac523f25d2440ed6f7b436843bf pdns.initd -6776e711dc60f0f7850c07e78de777d2c1500427bcf6ee4f9304507aed65e64db41f60ac4b113ffb7a362a8e3d8b92d620309bb15a87692f085f68adadbe5fb0 pdns.conf +b46bda3731fe91715d4c2e5e735a331505859d30e5c47e24a50484e091b9b564ddac59c762babf2c8369b483038bfb78c350d7b877a38ed188f3189b026d989d pdns.conf " diff --git a/community/pdns/pdns.conf b/community/pdns/pdns.conf index 8e86ee8d729..319a4a32619 100644 --- a/community/pdns/pdns.conf +++ b/community/pdns/pdns.conf @@ -211,7 +211,7 @@ # disable-axfr-rectify=no ################################# -# disable-syslog Disable logging to syslog, useful when running inside a supervisor that logs stdout +# disable-syslog Disable logging to syslog, useful when running inside a supervisor that logs stderr # # disable-syslog=no @@ -236,6 +236,11 @@ # dnsupdate=no ################################# +# dnsupdate-require-tsig Require TSIG secured DNS updates. Default is no. +# +# dnsupdate-require-tsig=no + +################################# # domain-metadata-cache-ttl Seconds to cache zone metadata from the database # # domain-metadata-cache-ttl= @@ -381,6 +386,11 @@ # lua-records-exec-limit=1000 ################################# +# lua-records-insert-whitespace Insert whitespace when combining LUA chunks +# +# lua-records-insert-whitespace=no + +################################# # max-cache-entries Maximum number of entries in the query cache # # max-cache-entries=1000000 @@ -586,7 +596,7 @@ # signing-threads=3 ################################# -# socket-dir Where the controlsocket will live, /var/run/pdns when unset and not chrooted +# socket-dir Where the controlsocket will live, /var/run/pdns when unset and not chrooted. Set to the RUNTIME_DIRECTORY environment variable when that variable has a value (e.g. under systemd). # # socket-dir= diff --git a/community/pebble/APKBUILD b/community/pebble/APKBUILD index 49e79316c95..1eba427c6d9 100644 --- a/community/pebble/APKBUILD +++ b/community/pebble/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=pebble -pkgver=2.5.1 -pkgrel=1 +pkgver=2.5.2 +pkgrel=0 pkgdesc="small RFC 8555 ACME test server not for a production certificate authority" url="https://github.com/letsencrypt/pebble" # riscv64 blocked by syscall dependency @@ -36,5 +36,5 @@ package() { } sha512sums=" -626dccd22be56c0424f5040798bac09586095ce5b2d31c7f5b90a4f6e4dd5e8454046fcbf87303029e4f9f440cb5a0079bc3b36b0f0aa7dfcd15a9103e603a84 pebble-2.5.1.tar.gz +aa58facc13643d00d9f35770d1f56e1573a6e2c9e1444f8377652bd4c637970c5045f50619409b73b940852b1f83a532fefdd5e3195ce616219f72b7a3c1de1d pebble-2.5.2.tar.gz " diff --git a/community/perl-b-keywords/APKBUILD b/community/perl-b-keywords/APKBUILD index 33a3c3e0d01..61b78c0349d 100644 --- a/community/perl-b-keywords/APKBUILD +++ b/community/perl-b-keywords/APKBUILD @@ -1,22 +1,24 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=perl-b-keywords -pkgver=1.26 -pkgrel=1 +pkgver=1.27 +pkgrel=0 pkgdesc="Lists of reserved barewords and symbol names" url="https://metacpan.org/pod/B::Keywords" arch="noarch" license="GPL-2.0-only OR Artistic-1.0-Perl" depends="perl" -makedepends="perl-dev" -checkdepends="perl-test-pod" +checkdepends="perl-dev perl-test-pod" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/B-Keywords-$pkgver.tar.gz" builddir="$srcdir/B-Keywords-$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,9 +29,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -b2abf8df82975db907ce4061c00faf7ad03b2324e98ded6a008b58b80b90a3d7bc1d63b68a404b3bfbabed97c1640e355c3d17e15819f9093d12f257754a7393 B-Keywords-1.26.tar.gz +f846cbc6f045a8cc7cb9f7d74a50e927ba66b7060dc0f77c096f15fdb0d8959599dc8c2024eacea9ba298eac42bbfb887f6ca8b749531d8c08962de673d21854 B-Keywords-1.27.tar.gz " diff --git a/community/perl-business-isbn-data/APKBUILD b/community/perl-business-isbn-data/APKBUILD index 9b81568b0ac..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=20240426.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=" -7543e0ab8d3fb54f1143af7ab2fd6aba14dee7389ea3d172a62ef6eeda11567d8476db0ed084d7e325d6ca36b0d0d59da1cd754ab5d7971d00c5d1c5cfd269be Business-ISBN-Data-20240426.001.tar.gz +64158b148729ef6201984aee178fd102abbe65df5b11f638ec2a52f0bf927db929670124e4bfc2175062b0fecfe9c9056e8a90e41408d91a27c9ef07c0b18705 Business-ISBN-Data-20240509.001.tar.gz " diff --git a/community/perl-crypt-openssl-aes/APKBUILD b/community/perl-crypt-openssl-aes/APKBUILD index f6aa6877ddb..87ce0f8b118 100644 --- a/community/perl-crypt-openssl-aes/APKBUILD +++ b/community/perl-crypt-openssl-aes/APKBUILD @@ -1,17 +1,20 @@ -# Automatically generated by apkbuild-cpan, template 1 -# Maintainer: Sergey Safarov <s.safarov@gmail.com> +# Automatically generated by apkbuild-cpan, template 4 +# Contributor: Sergey Safarov <s.safarov@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-crypt-openssl-aes -_pkgreal=Crypt-OpenSSL-AES pkgver=0.19 -pkgrel=0 -pkgdesc="Perl module Crypt-OpenSSL-AES" -url="https://metacpan.org/release/Crypt-OpenSSL-AES" +pkgrel=1 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Crypt-OpenSSL-AES +pkgdesc="Perl wrapper around OpenSSL's AES library" +url="https://metacpan.org/release/Crypt-OpenSSL-AES/" arch="all" license="GPL-1.0-or-later OR Artistic-1.0-Perl" +depends="perl" makedepends=" + openssl-dev perl-crypt-openssl-guess perl-dev - openssl-dev>3 " checkdepends=" perl-crypt-cbc @@ -19,22 +22,24 @@ checkdepends=" " subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/T/TI/TIMLEGGE/Crypt-OpenSSL-AES-$pkgver.tar.gz" - builddir="$srcdir/$_pkgreal-$pkgver" 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 } 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=" diff --git a/community/perl-devel-caller/APKBUILD b/community/perl-devel-caller/APKBUILD index d187918b509..fa322be2153 100644 --- a/community/perl-devel-caller/APKBUILD +++ b/community/perl-devel-caller/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: rubicon <rubicon@mailo.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-devel-caller -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Devel-Caller pkgver=2.07 pkgrel=2 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Devel-Caller pkgdesc="Enhanced versions of caller()" url="https://metacpan.org/release/Devel-Caller/" arch="all" @@ -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,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/community/perl-devel-lexalias/APKBUILD b/community/perl-devel-lexalias/APKBUILD index b15a00b14c2..e1943ec3e3f 100644 --- a/community/perl-devel-lexalias/APKBUILD +++ b/community/perl-devel-lexalias/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: rubicon <rubicon@mailo.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-devel-lexalias -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Devel-LexAlias pkgver=0.05 pkgrel=3 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Devel-LexAlias pkgdesc="Alias lexical variables of subroutines" url="https://metacpan.org/release/Devel-LexAlias/" arch="all" @@ -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,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/community/perl-ev/APKBUILD b/community/perl-ev/APKBUILD index 39afd7a4b04..d5763944688 100644 --- a/community/perl-ev/APKBUILD +++ b/community/perl-ev/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: rubicon <rubicon@mailo.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-ev -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=EV pkgver=4.34 pkgrel=1 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=EV pkgdesc="Perl interface to libev" url="https://metacpan.org/release/EV/" arch="all" @@ -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,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/community/perl-file-fcntllock/APKBUILD b/community/perl-file-fcntllock/APKBUILD index 92277813d69..2c940559b9d 100644 --- a/community/perl-file-fcntllock/APKBUILD +++ b/community/perl-file-fcntllock/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-file-fcntllock -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=File-FcntlLock pkgver=0.22 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=File-FcntlLock pkgdesc="File locking with fcntl(2)" url="https://metacpan.org/release/File-FcntlLock/" arch="all" @@ -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,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } doc() { diff --git a/community/perl-future-asyncawait/APKBUILD b/community/perl-future-asyncawait/APKBUILD index 633679a63af..e0ad55de5a1 100644 --- a/community/perl-future-asyncawait/APKBUILD +++ b/community/perl-future-asyncawait/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: rubicon <rubicon@mailo.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-future-asyncawait -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Future-AsyncAwait pkgver=0.66 pkgrel=1 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Future-AsyncAwait pkgdesc="Deferred subroutine syntax for Futures" url="https://metacpan.org/release/Future-AsyncAwait/" 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,7 +31,6 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" 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 375839cd362..d2b0c73fa09 100644 --- a/community/perl-mail-sendmail/APKBUILD +++ b/community/perl-mail-sendmail/APKBUILD @@ -1,9 +1,10 @@ -# 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 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/" @@ -18,19 +19,18 @@ source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Mail-Sendmail-$pkgver.ta " 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=$! @@ -44,7 +44,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/community/perl-match-simple-xs/APKBUILD b/community/perl-match-simple-xs/APKBUILD index a07ed0cb867..0a483230ce2 100644 --- a/community/perl-match-simple-xs/APKBUILD +++ b/community/perl-match-simple-xs/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-match-simple-xs -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=match-simple-XS pkgver=0.002 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=match-simple-XS pkgdesc="XS backend for match::simple" url="https://metacpan.org/release/match-simple-XS/" 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,7 +33,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/community/perl-math-basecnv/APKBUILD b/community/perl-math-basecnv/APKBUILD index 67d6562a713..c7610880f53 100644 --- a/community/perl-math-basecnv/APKBUILD +++ b/community/perl-math-basecnv/APKBUILD @@ -1,30 +1,38 @@ +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Sergey Safarov <s.safarov@gmail.com> +# Contributor: Sergey Safarov <s.safarov@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-math-basecnv pkgver=1.14 -pkgrel=4 -pkgdesc="Math::BaseCnv perl module" +pkgrel=5 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Math-BaseCnv +pkgdesc="CoNVert between number Bases" url="https://metacpan.org/release/Math-BaseCnv/" arch="noarch" -license="GPL-3.0-only" +license="GPL-3.0-or-later" depends="perl" +makedepends="perl-module-build" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/P/PI/PIP/Math-BaseCnv-$pkgver.tgz" - -builddir="$srcdir"/Math-BaseCnv-$pkgver +builddir="$srcdir/$_pkgreal-$pkgver" build() { - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') + 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="0100dcf8786fe0983bbddffb2a44876d75cf023b78a04687b4d410c3667e44606f8315fb30ee5ca4efd26d8784be8af07cd810813e72d9b0c9ae16725e09a5e6 Math-BaseCnv-1.14.tgz" +sha512sums=" +0100dcf8786fe0983bbddffb2a44876d75cf023b78a04687b4d410c3667e44606f8315fb30ee5ca4efd26d8784be8af07cd810813e72d9b0c9ae16725e09a5e6 Math-BaseCnv-1.14.tgz +" 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-meta/APKBUILD b/community/perl-meta/APKBUILD index f68504b2025..bc086f9eda9 100644 --- a/community/perl-meta/APKBUILD +++ b/community/perl-meta/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-meta -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=meta pkgver=0.004 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=meta pkgdesc="Perl meta-programming API" url="https://metacpan.org/release/meta/" 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,7 +31,6 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/community/perl-metacpan-client/APKBUILD b/community/perl-metacpan-client/APKBUILD index d14ae337fa4..d5f9555a392 100644 --- a/community/perl-metacpan-client/APKBUILD +++ b/community/perl-metacpan-client/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Timothy Legge <timlegge@gmail.com> # Maintainer: Timothy Legge <timlegge@gmail.com> pkgname=perl-metacpan-client -pkgver=2.031001 +pkgver=2.032000 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=MetaCPAN-Client @@ -38,5 +38,5 @@ package() { } sha512sums=" -2d5997459a652968370e8dc7faa04c5027c84b93595fb13321147492b2a39f816b4e9f12498183ce94766c58a62bfdff73972224e5965d43285eaeddc3c97580 MetaCPAN-Client-2.031001.tar.gz +8bd9f9c21be7e0196b11f7f0c2a9287e9d536035d731026bf255f9577003115e6d1a732fe78e1bc455fc9d5c11a84ad07865b55cf92f576c4c3588fd41600ddc MetaCPAN-Client-2.032000.tar.gz " 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-pdf-api2/APKBUILD b/community/perl-pdf-api2/APKBUILD index 3dd7f84707c..288ba553cab 100644 --- a/community/perl-pdf-api2/APKBUILD +++ b/community/perl-pdf-api2/APKBUILD @@ -1,10 +1,10 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=perl-pdf-api2 +pkgver=2.047 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=PDF-API2 -pkgver=2.045 -pkgrel=0 pkgdesc="Facilitates the creation and modification of PDF files" url="https://metacpan.org/release/PDF-API2/" 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,9 +31,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -86d71cec6ce9e7798948513b6408de404ec30e0022e8852a94e9ad602d4bc2f12285ec19f560c940c0e5303816748bdeaad604b9b53181252e9ea2ead1365be0 PDF-API2-2.045.tar.gz +8e3fed9adbd96c15a052ccf78ec516bcf5735b0da95f7259cbbfa8c5486af56daa36bd9fe759821fa2d908cb63e46d993f38a1b2402ecc6c2f93a32d6ead8a9a PDF-API2-2.047.tar.gz " diff --git a/community/perl-protocol-http2/APKBUILD b/community/perl-protocol-http2/APKBUILD index 38acbcaab2e..6461f095c6e 100644 --- a/community/perl-protocol-http2/APKBUILD +++ b/community/perl-protocol-http2/APKBUILD @@ -1,10 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 2 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Axel Ulrich <ulrich.axel@gmail.com> # Maintainer: Axel Ulrich <ulrich.axel@gmail.com> pkgname=perl-protocol-http2 +pkgver=1.11 +pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Protocol-HTTP2 -pkgver=1.10 -pkgrel=2 pkgdesc="HTTP/2 protocol implementation (RFC 7540)" url="https://metacpan.org/release/Protocol-HTTP2/" arch="noarch" @@ -15,15 +16,12 @@ checkdepends="perl-anyevent perl-net-ssleay perl-test-tcp perl-test-leaktrace" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/C/CR/CRUX/Protocol-HTTP2-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -options="!check" # todo - -prepare() { - default_prepare - perl Build.PL --installdirs=vendor -} build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') + perl Build.PL \ + --installdirs=vendor \ + --create_packlist=0 ./Build } @@ -33,9 +31,8 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -56ef060be4b0f512d181b437ad6cb0421ba3fc3fff027f3da2da60e3db1d8025986ce10849c04327d3a044b25e8a153b3dd33058b30f0e6810efd92eeda22d6d Protocol-HTTP2-1.10.tar.gz +6568b156e9986dbddab8acbd672ee7de06ffcdf7725eb5efd75a7468bcee7846249081437656c3fae8badefded0df27ea3bd7700e23ca862cd22d68af019273a Protocol-HTTP2-1.11.tar.gz " diff --git a/community/perl-ref-util/APKBUILD b/community/perl-ref-util/APKBUILD index ebfe45e4baf..9bfe4791b35 100644 --- a/community/perl-ref-util/APKBUILD +++ b/community/perl-ref-util/APKBUILD @@ -1,10 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 -# Maintainer: Sergey Safarov <s.safarov@gmail.com> +# Automatically generated by apkbuild-cpan, template 4 +# Contributor: Sergey Safarov <s.safarov@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-ref-util +pkgver=0.204 +pkgrel=4 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Ref-Util -pkgver=0.204 -pkgrel=3 pkgdesc="Utility functions for checking references" url="https://metacpan.org/release/Ref-Util/" arch="noarch" @@ -16,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 } @@ -27,7 +31,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="12834e13de5578232e40ba308e97786c60fcec4da9dc0b2922506d42645e8b3c3234663cf3b9c1dc374772107de953ed49ba8b52a2bac79183e3860338c0b288 Ref-Util-0.204.tar.gz" +sha512sums=" +12834e13de5578232e40ba308e97786c60fcec4da9dc0b2922506d42645e8b3c3234663cf3b9c1dc374772107de953ed49ba8b52a2bac79183e3860338c0b288 Ref-Util-0.204.tar.gz +" diff --git a/community/perl-sub-override/APKBUILD b/community/perl-sub-override/APKBUILD index 82a29e03654..13a26b36737 100644 --- a/community/perl-sub-override/APKBUILD +++ b/community/perl-sub-override/APKBUILD @@ -1,23 +1,27 @@ -# 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-sub-override +pkgver=0.11 +pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Sub-Override -pkgver=0.10 -pkgrel=0 pkgdesc="easily override subroutines" url="https://metacpan.org/release/Sub-Override/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" -depends="perl perl-test-fatal" +depends="perl perl-sub-prototype" +checkdepends="perl-test-fatal" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/O/OV/OVID/Sub-Override-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/M/MV/MVSJES/Sub-Override-$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 } @@ -28,9 +32,8 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" -27782c301c7abd30291be8af79a251d2be27b7616f950c28cb83ceeeb6a91eb69fe29413992c229afb6d75974851e69986eaa232aa81484ad49fcad55b2bdead Sub-Override-0.10.tar.gz +b9a3c06dea8f2e050d6749839828d965fab98c01eebb2278c7158a237a5368d09f18843a0a9664617c3f3896128d5c23633d4bea6a075f1832a5f0711ff66536 Sub-Override-0.11.tar.gz " diff --git a/community/perl-sub-prototype/APKBUILD b/community/perl-sub-prototype/APKBUILD new file mode 100644 index 00000000000..839b582774f --- /dev/null +++ b/community/perl-sub-prototype/APKBUILD @@ -0,0 +1,39 @@ +# Automatically generated by apkbuild-cpan, template 4 +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=perl-sub-prototype +pkgver=0.03 +pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Sub-Prototype +pkgdesc="Set a subroutine's prototype" +url="https://metacpan.org/release/Sub-Prototype/" +arch="all" +license="GPL-1.0-or-later OR Artistic-1.0-Perl" +depends="perl perl-sub-exporter" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Sub-Prototype-$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 \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 + make +} + +check() { + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') + make test +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums=" +fa2d4e7f5d5db310899eb0d6d0c9d451fbf37af5a17b35709a772be913f5dc1adaa744bb1c87e6e7b23723d279c1ed8c4b3da8629e843ce56fcadd94e22d7b2b Sub-Prototype-0.03.tar.gz +" diff --git a/community/perl-syntax-keyword-defer/APKBUILD b/community/perl-syntax-keyword-defer/APKBUILD index b8ce4215ad2..49eecdb2ce1 100644 --- a/community/perl-syntax-keyword-defer/APKBUILD +++ b/community/perl-syntax-keyword-defer/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: rubicon <rubicon@mailo.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-syntax-keyword-defer -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Syntax-Keyword-Defer pkgver=0.10 pkgrel=1 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Syntax-Keyword-Defer pkgdesc="Execute code when leaving a block" url="https://metacpan.org/release/Syntax-Keyword-Defer/" 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,7 +31,6 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/community/perl-syntax-keyword-dynamically/APKBUILD b/community/perl-syntax-keyword-dynamically/APKBUILD index b2cfff06be9..9a96e36027a 100644 --- a/community/perl-syntax-keyword-dynamically/APKBUILD +++ b/community/perl-syntax-keyword-dynamically/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-syntax-keyword-dynamically -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Syntax-Keyword-Dynamically pkgver=0.13 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Syntax-Keyword-Dynamically pkgdesc="Dynamically change the value of a variable" url="https://metacpan.org/release/Syntax-Keyword-Dynamically/" 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,7 +31,6 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" 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-tcl/APKBUILD b/community/perl-tcl/APKBUILD index 4c6990d30c5..873ae4db05d 100644 --- a/community/perl-tcl/APKBUILD +++ b/community/perl-tcl/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-tcl -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Tcl pkgver=1.32 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Tcl pkgdesc="Tcl extension module for Perl" url="https://metacpan.org/release/Tcl/" arch="all" @@ -18,8 +18,11 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') - PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor \ - --tclconfig=/usr/lib/tclConfig.sh + PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \ + --tclconfig=/usr/lib/tclConfig.sh \ + INSTALLDIRS=vendor \ + NO_PACKLIST=1 \ + NO_PERLLOCAL=1 make } @@ -30,7 +33,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } doc() { diff --git a/community/perl-tickit-async/APKBUILD b/community/perl-tickit-async/APKBUILD index 9af5479395f..af8387b562c 100644 --- a/community/perl-tickit-async/APKBUILD +++ b/community/perl-tickit-async/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-tickit-async -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Tickit-Async pkgver=0.25 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Tickit-Async pkgdesc="Use Tickit with IO::Async" url="https://metacpan.org/release/Tickit-Async/" 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 } @@ -30,7 +32,6 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/community/perl-tickit/APKBUILD b/community/perl-tickit/APKBUILD index 91d4c9f2287..4859b6f7c16 100644 --- a/community/perl-tickit/APKBUILD +++ b/community/perl-tickit/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-tickit -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Tickit pkgver=0.74 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Tickit pkgdesc="Terminal Interface Construction KIT" url="https://metacpan.org/release/Tickit/" 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 } @@ -32,7 +34,6 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" 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-uri-encode-xs/APKBUILD b/community/perl-uri-encode-xs/APKBUILD index 91ddf3d5312..8c6fe4697e2 100644 --- a/community/perl-uri-encode-xs/APKBUILD +++ b/community/perl-uri-encode-xs/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Nick Andrew <nick@nick-andrew.net> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-uri-encode-xs -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=URI-Encode-XS pkgver=0.11 pkgrel=9 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=URI-Encode-XS pkgdesc="Perl URI encoder/decoder using C" url="https://metacpan.org/release/URI-Encode-XS/" arch="all" @@ -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,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" 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_probackup/APKBUILD b/community/pg_probackup/APKBUILD index 10cc3c03c97..0a17e670e9f 100644 --- a/community/pg_probackup/APKBUILD +++ b/community/pg_probackup/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=pg_probackup -pkgver=2.5.13 -_pgsqlver=15.5 +pkgver=2.5.15 +_pgsqlver=16.3 _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 @@ -50,6 +50,6 @@ package() { } sha512sums=" -0b4ee0d86e93fbd7cc5b1d271b8b7edbfe30d4cd00a730837ab19ac1e69281710d53aa177e94857e18afbaaa44eac61313ef8da56f07720402b7698adb9d16ef pg_probackup-2.5.13.tar.gz -9ed9d160b3cef99954ccd47a970c107b7e3b0196a7d848f740bf3c52a1c626f6f457814c97f37b9f0467bb07734e19806a15bd9cf3c39445e1d89e75b37064cc postgresql-15.5.tar.bz2 +10c241397895824db63a9f374e375a1de99822cdd0b2573986e9b99ceda513b255bba8234a99a9cb26506f9177d501b0d4565a939848e92082da72431b69e79e pg_probackup-2.5.15.tar.gz +dc1c8d4fbc8e53e9be91dcf1b644b3969bd634f11bf5a1c4fe16619fd386f3349a5509788d43e6a57d099ad75233026d4dd4e0bb180ffc747fd3c1a575c51a5f postgresql-16.3.tar.bz2 " 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/phoc/APKBUILD b/community/phoc/APKBUILD index a61839ecfae..009a79d4699 100644 --- a/community/phoc/APKBUILD +++ b/community/phoc/APKBUILD @@ -4,8 +4,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/phosh <newbie13xd@gmail.com> pkgname=phoc -pkgver=0.38.0 -pkgrel=1 +pkgver=0.39.0 +pkgrel=0 pkgdesc="wlroots based Phone compositor for the Phosh shell" arch="all !s390x" # blocked by gnome-desktop url="https://gitlab.gnome.org/World/Phosh/phoc" @@ -30,6 +30,7 @@ _wlrootsmakedepends=" " makedepends=" glib-dev + gmobile-dev gnome-desktop-dev json-glib-dev libdrm-dev @@ -82,5 +83,5 @@ package() { } sha512sums=" -739fb382336885b78ca3f50f8c5f6ddf3bc308a2158663c49c84ce506d2edf0c8d0dcd412e634eccf848d420bb5923d42ebc02044f7acf322b3ab621ffa4cd23 phoc-0.38.0.tar.xz +47e133754efaadb633ed963d4b30c531e3845b7211ce1f146c2c8a87c3ba3d19e8b46962e56b6b32d401adab97217134b2eb3c2b28715c1a5495e28540660cf8 phoc-0.39.0.tar.xz " diff --git a/community/phosh-mobile-settings/APKBUILD b/community/phosh-mobile-settings/APKBUILD index 9195705413b..f250256fbe6 100644 --- a/community/phosh-mobile-settings/APKBUILD +++ b/community/phosh-mobile-settings/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Newbyte <newbie13xd@gmail.com> # Maintainer: team/phosh <newbie13xd@gmail.com> pkgname=phosh-mobile-settings -pkgver=0.38.0 -pkgrel=2 +pkgver=0.39.0 +pkgrel=0 pkgdesc="Settings app for mobile specific things" url="https://gitlab.gnome.org/guidog/phosh-mobile-settings" # blocked by phosh @@ -20,8 +20,7 @@ makedepends=" phosh-dev " subpackages="$pkgname-lang" -source="https://sources.phosh.mobi/releases/phosh-mobile-settings/phosh-mobile-settings-$pkgver.tar.xz - ignore-phoc-tests.patch" +source="https://sources.phosh.mobi/releases/phosh-mobile-settings/phosh-mobile-settings-$pkgver.tar.xz" build() { abuild-meson \ @@ -39,6 +38,5 @@ package() { } sha512sums=" -7406ca631d0bb2d51bf405ffb1820496bbd3349927b677b208d623d7a792dbfbd5f6bfd6edc31bb3009490e4ea6c860660df5d983861d929b7b9300d69c8f9e8 phosh-mobile-settings-0.38.0.tar.xz -41c5b8aa691556debc41aefa6d9987072f2069627aed60058d3b93b616134fec8e8cf4db80a5a8800a2443140f802f1cb283aeae3f6b9580324a8679f64a3748 ignore-phoc-tests.patch +29482e85f006b43399451466a33c910d5934a86101f49c64f9d5a6f41cb8aa47e6b5b2ad29683fc51ca70ec629fdfea11d0cc90c934d1006bb51fc1d63d1baca phosh-mobile-settings-0.39.0.tar.xz " diff --git a/community/phosh-mobile-settings/ignore-phoc-tests.patch b/community/phosh-mobile-settings/ignore-phoc-tests.patch deleted file mode 100644 index eb75b57ec86..00000000000 --- a/community/phosh-mobile-settings/ignore-phoc-tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -Some tests require a running Wayland compositor, -to mitigiate this issue make phoc dependency optional ---- -diff --git a/tests/meson.build b/tests/meson.build -index 837e8d9..7a9a8d5 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -8,7 +8,7 @@ test_env_common.set('MALLOC_CHECK_', '2') - test_env_common.set('NO_AT_BRIDGE', '1') - test_env_common.set('GTK_A11Y', 'none') - --phoc = find_program('phoc') -+phoc = find_program('phoc', required: false) - - if phoc.found() diff --git a/community/phosh/APKBUILD b/community/phosh/APKBUILD index 3e01874190b..e5f45b654d2 100644 --- a/community/phosh/APKBUILD +++ b/community/phosh/APKBUILD @@ -4,8 +4,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/phosh <newbyte@postmarketos.org> pkgname=phosh -pkgver=0.38.0 -pkgrel=2 +pkgver=0.39.0 +pkgrel=0 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 @@ -40,6 +40,7 @@ makedepends=" gcr-dev gettext-dev glib-dev + gmobile-dev gnome-desktop-dev gtk+3.0-dev libadwaita-dev @@ -59,6 +60,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 +69,6 @@ build() { abuild-meson \ -Db_lto=true \ -Dphoc_tests=disabled \ - -Dsystemd=true \ -Dman=true \ . output meson compile -C output @@ -93,6 +94,7 @@ portalsconf() { } sha512sums=" -dfde54b64ea6edba2b66dfe2f5ff0f4b3edbb192b1a37fbc8c98d9365bdedc5d19ddb1464673e516cb8e436a6c0ea00c84087cc6431b6c1862019f90e02b73ce phosh-0.38.0.tar.xz +ea7499a18b2abde731fcc9e739e137a1fb1edc2bff18c7b437df06ac55a285b81c1ecab8feb55892c35ecc4ef990acc80b25768a2160d3a459501429f5f30416 phosh-0.39.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/photon/APKBUILD b/community/photon/APKBUILD index 23b6fefd908..23542d1ef64 100644 --- a/community/photon/APKBUILD +++ b/community/photon/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Coco Liliace <coco@liliace.dev> pkgname=photon pkgver=1.0.1 -pkgrel=6 +pkgrel=7 pkgdesc="RSS reader as light as a photon with terminal + sixel" url="https://sr.ht/~ghost08/photon/" arch="all" diff --git a/community/php82-pecl-couchbase/APKBUILD b/community/php82-pecl-couchbase/APKBUILD index 2c52c8f1116..38090c4e278 100644 --- a/community/php82-pecl-couchbase/APKBUILD +++ b/community/php82-pecl-couchbase/APKBUILD @@ -6,7 +6,7 @@ pkgver=4.2.1 pkgrel=0 pkgdesc="PHP 8.2 extension for Couchbase - PECL" url="https://pecl.php.net/package/couchbase" -arch="all !riscv64 !ppc64le !s390x" # ftbfs +arch="all !riscv64 !ppc64le !s390x !loongarch64" # ftbfs license="Apache-2.0" _phpv=82 _php=php$_phpv 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-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/APKBUILD b/community/php82/APKBUILD index 27a2d83115d..a734c4c98fb 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} @@ -106,13 +106,13 @@ source="php-$pkgver.tar.xz::https://php.net/distributions/$_pkgreal-$pkgver.tar. disabled-tests.x86.list disabled-tests.ppc64le.list disabled-tests.s390x.list + disabled-tests.loongarch64.list install-pear.patch includedir.patch sharedir.patch $pkgname-fpm-version-suffix.patch fix-tests-devserver.patch phpinfo-avif.patch - fix-lfs64-2.patch fix-icu74.patch loongarch64-support-for-fibers.patch " @@ -633,21 +633,21 @@ _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 -bb4b75b629c27a38a139456c91a01cad42acc33d8711fafcfc50b11628f2931016f6582c2051436e177245779a1e623ebe44cb2542caf568ed0e9c5f65a58bd4 disabled-tests.list +9e407b4fff13dad933974374ff237d9cb3c778e0780a43a7c12ce04153d47e37fb823d62cf84362c427ce586d200e721555235945faf91f2343028d2caa4216c disabled-tests.list 4818e0247d8efa2f58a38c563e7bcb9a5d3cd1e668d489d341dfc293230c4608a5587200f9bdfe73fdd854443a30a5a862ff4975aefda7b77ed09871d1148ee1 disabled-tests.x86.list 30cba10c11f800d23e013c7f92cadb7e2a9ac5e89e5466445c77761369e7f3b8daba7ae64e23967329139b01f37f187acd2f1f1e3dfb0bca2e900a7d7e1afd07 disabled-tests.ppc64le.list 54930246f22034e6a73020aa95915d14b2a2fcfe121df57eb17fdc663aceeb94c5c4b1800347149a8fb4eaa0edda4224a11133bdb7e0cd34a2065a2de121db0d disabled-tests.s390x.list +be3184e07ed3e12b0982b2ed68f12852dbff706031def4be76b89ecad51c23cf2bd4bbf7138b6d83252af4343de0b693724fac9b188941beb5e7cd89af9b07ee disabled-tests.loongarch64.list ec206639d076ddac6c2d1db697a5428ed3be979157db39417af7fbe6ab837e8dc00315ae0e55aea4f92f45ca5827c88cc4933099fad9c962f029ca81bef779d7 install-pear.patch f93c6544fe7cc630b72c2315b312e327b39d7a46e9bcd0d00d37d92863dd44c06f96f74539f0ef93768f73d81f38356c753901621a62e69966c3fe8aaa58ba9e includedir.patch 8fb98b369b522eb2d5b0735773343e5ca31bcdf422cba0dc0c014d57e63de0f8c746c8b4cedcfa874aa053488ec8642a84771aad16eeee50b1bfd84343f37c05 sharedir.patch 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 50eb7771bf4..6289a6afa5f 100644 --- a/community/php82/disabled-tests.list +++ b/community/php82/disabled-tests.list @@ -177,3 +177,4 @@ 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/disabled-tests.loongarch64.list b/community/php82/disabled-tests.loongarch64.list new file mode 100644 index 00000000000..8a3a51581cc --- /dev/null +++ b/community/php82/disabled-tests.loongarch64.list @@ -0,0 +1,3 @@ +ext/standard/tests/array/range_variation.phpt +ext/gd/tests/avif_decode_encode.phpt +ext/gd/tests/imagecreatefromstring_avif.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/php83-pecl-couchbase/APKBUILD b/community/php83-pecl-couchbase/APKBUILD index 3982323acb1..f3ebbea2820 100644 --- a/community/php83-pecl-couchbase/APKBUILD +++ b/community/php83-pecl-couchbase/APKBUILD @@ -6,7 +6,7 @@ pkgver=4.2.1 pkgrel=0 pkgdesc="PHP 8.3 extension for Couchbase - PECL" url="https://pecl.php.net/package/couchbase" -arch="all !riscv64 !ppc64le !s390x" # ftbfs +arch="all !riscv64 !ppc64le !s390x !loongarch64" # ftbfs license="Apache-2.0" _phpv=83 _php=php$_phpv 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-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/APKBUILD b/community/php83/APKBUILD index 00fe6ea56dc..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,6 @@ 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" @@ -620,7 +619,7 @@ _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 @@ -634,6 +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/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/picat/APKBUILD b/community/picat/APKBUILD index 88f5bab6d9a..a988b0c8a03 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.5 +pkgver=3.6.8 _pkgver="${pkgver//./}" pkgrel=0 pkgdesc="Logic-based multi-paradigm programming language" @@ -39,6 +39,6 @@ package() { } sha512sums=" -41b2a6445ac4a1953fc22b71b521ca513e0ce73ca2fe6234589d313dfa689b8c7446ddcc82cc8f17b0a68643b1b3976d6791787bc8c99e3d151c5e91c7838ba8 picat-3.6.5.tar.gz +e444b83111a8ef963a8f98ae106b5c9dcdf63f043ab16bccaab3340a397d8b34b5321b60ec81afe6a000a2dfe590b663f3018286e7f1fb9c160f5c4bda177d9a picat-3.6.8.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/pijul/APKBUILD b/community/pijul/APKBUILD index 8773a09ced6..13d62540928 100644 --- a/community/pijul/APKBUILD +++ b/community/pijul/APKBUILD @@ -1,14 +1,14 @@ # Contributor: TBK <alpine@jjtc.eu> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=pijul -pkgver=1.0.0_beta8 -_pkgver=1.0.0-beta.8 -pkgrel=1 +pkgver=1.0.0_beta9 +_pkgver="1.0.0-beta.${pkgver##*_beta}" +pkgrel=0 pkgdesc="Patch-based distributed version control system" url="https://pijul.org/" -# s390x: fails to build due to nix crate +# s390x, loongarch64: fails to build due to nix crate # riscv64: rlimit::Resource::NOFILE not found -arch="all !s390x !riscv64" +arch="all !s390x !riscv64 !loongarch64" license="GPL-2.0-or-later" makedepends=" cargo @@ -22,9 +22,7 @@ subpackages=" $pkgname-fish-completion $pkgname-zsh-completion " -source="$pkgname-$pkgver.tar.gz::https://crates.io/api/v1/crates/pijul/$_pkgver/download - thrussh-0.35.1.patch - " +source="$pkgname-$pkgver.tar.gz::https://crates.io/api/v1/crates/pijul/$_pkgver/download" builddir="$srcdir/$pkgname-$_pkgver" options="net" @@ -64,6 +62,5 @@ package() { } sha512sums=" -eca5190ca0b7bf6a79823319793c32e372231d76508d5ff3278a767641305377893a98a9959a4a7c3e6ffca7c4ee1d1bd3828837e5e08ed44d69ec9263963432 pijul-1.0.0_beta8.tar.gz -9f4347682d1663c160fc86f1f206b19c3ebc6814419905aa7b9cca7e2d9e87840c2b242d8699bb83361b402a0e96cf5fb9ea6c19bcd12ddd14b244ce75f0f9d8 thrussh-0.35.1.patch +5e4facce9b1620b1ea31d6735ccb5fb0f862f7039cf88b63b4bafb8f5efd7de2a8610cd0cf5b3fcf555a25f6df3fd9d8ea9b34dc439d235b3b87345651402123 pijul-1.0.0_beta9.tar.gz " diff --git a/community/pijul/thrussh-0.35.1.patch b/community/pijul/thrussh-0.35.1.patch deleted file mode 100644 index 782fe88495c..00000000000 --- a/community/pijul/thrussh-0.35.1.patch +++ /dev/null @@ -1,170 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -30,7 +30,7 @@ - checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" - dependencies = [ - "cfg-if", -- "cipher", -+ "cipher 0.3.0", - "cpufeatures", - "ctr", - "opaque-debug", -@@ -326,15 +326,13 @@ - - [[package]] - name = "bcrypt-pbkdf" --version = "0.6.2" -+version = "0.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7c38c03b9506bd92bf1ef50665a81eda156f615438f7654bffba58907e6149d7" -+checksum = "6aeac2e1fe888769f34f05ac343bbef98b14d1ffb292ab69d4608b3abc86f2a2" - dependencies = [ - "blowfish", -- "crypto-mac", -- "pbkdf2 0.8.0", -- "sha2 0.9.9", -- "zeroize", -+ "pbkdf2 0.12.2", -+ "sha2 0.10.8", - ] - - [[package]] -@@ -402,7 +400,7 @@ - checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" - dependencies = [ - "block-padding", -- "cipher", -+ "cipher 0.3.0", - ] - - [[package]] -@@ -429,13 +427,12 @@ - - [[package]] - name = "blowfish" --version = "0.8.0" -+version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fe3ff3fc1de48c1ac2e3341c4df38b0d1bfb8fdf04632a187c8b75aaa319a7ab" -+checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" - dependencies = [ - "byteorder", -- "cipher", -- "opaque-debug", -+ "cipher 0.4.4", - ] - - [[package]] -@@ -519,6 +516,16 @@ - ] - - [[package]] -+name = "cipher" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -+dependencies = [ -+ "crypto-common", -+ "inout", -+] -+ -+[[package]] - name = "clap" - version = "3.2.25" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -703,7 +710,7 @@ - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" - dependencies = [ -- "cipher", -+ "cipher 0.3.0", - ] - - [[package]] -@@ -1511,6 +1518,15 @@ - ] - - [[package]] -+name = "inout" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -+dependencies = [ -+ "generic-array", -+] -+ -+[[package]] - name = "instant" - version = "0.1.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -2166,6 +2182,15 @@ - ] - - [[package]] -+name = "pbkdf2" -+version = "0.12.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -+dependencies = [ -+ "digest 0.10.7", -+] -+ -+[[package]] - name = "percent-encoding" - version = "2.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -2981,9 +3006,9 @@ - - [[package]] - name = "thrussh" --version = "0.33.5" -+version = "0.35.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8e6540238a9adf83df6e66541c182a52acf892ab335595ca965c229ade8536f8" -+checksum = "addf63d9ce535faca8a869a234de46c6018e9fa4b7e65597ca64e457bb8d128e" - dependencies = [ - "bitflags 1.3.2", - "byteorder", -@@ -3004,9 +3029,9 @@ - - [[package]] - name = "thrussh-config" --version = "0.5.0" -+version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "67c044d978aff4dfc0036a29ce10bfa190ab84381bb4551fd50fa0e0db2ef5f9" -+checksum = "fa974aab89a724928e2fb4e526f6e9a5fa4fb9d544e824fc38bd177c48ca6622" - dependencies = [ - "dirs-next", - "futures", -@@ -3018,9 +3043,9 @@ - - [[package]] - name = "thrussh-keys" --version = "0.21.0" -+version = "0.22.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a72cc51a2932b18d92f7289332d8564cec4a5014063722a9d3fdca52c5d8f5ab" -+checksum = "c43d59b13e4c08db0e379bced99bda596ac5ed33651d919bf3916d34ad4259bb" - dependencies = [ - "aes", - "bcrypt-pbkdf", ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -215,13 +215,13 @@ - version = "1.0.31" - - [dependencies.thrussh] --version = "0.33.2" -+version = "0.35.1" - - [dependencies.thrussh-config] --version = "0.5" -+version = "0.6" - - [dependencies.thrussh-keys] --version = "0.21" -+version = "0.22.1" - - [dependencies.tokio] - version = "1.25" diff --git a/community/pike/APKBUILD b/community/pike/APKBUILD index bfe29f690a0..78b4c5ece50 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.1908 +pkgver=8.0.1914 pkgrel=0 pkgdesc="Pike programming language" url="https://pike.lysator.liu.se/" @@ -174,5 +174,5 @@ full() { } sha512sums=" -4fc0c3c91b45337c16b46f0132c5ccc738a1242cdb3d9f04b6d87979b8d58262c7c00940e900ec9485ee285a5d06827bfcaf2ebedf2f5a9b78d8dc1abbacf758 pike-8.0.1908.tar.gz +0db8bbdbeb86b073442b10ee6401d071e340fce49a4896b42c93c6b6e4a0ed43037b9b199754ca4a41389f82f4ffbdd01e7134a127df9a9fcc36e1cfe7a4d9bf pike-8.0.1914.tar.gz " diff --git a/community/piknik/APKBUILD b/community/piknik/APKBUILD index 8637497c704..5b636f1c713 100644 --- a/community/piknik/APKBUILD +++ b/community/piknik/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=piknik pkgver=0.10.1 -pkgrel=22 +pkgrel=23 pkgdesc="Copy/paste anything over the network" url="https://github.com/jedisct1/piknik" arch="all" diff --git a/community/pimcommon/APKBUILD b/community/pimcommon/APKBUILD index 9f421ed37f8..b0dbf949666 100644 --- a/community/pimcommon/APKBUILD +++ b/community/pimcommon/APKBUILD @@ -4,12 +4,13 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=pimcommon -pkgver=24.02.2 +pkgver=24.05.0 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=" @@ -69,5 +70,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -d2dd70b1e0e5b8352ddbfcb00d9c21eb778db2593537d0cb027fc81ca2dfef8af1f09b45fd59bf843dbc1ffb9245e4fc28a986395083fb32b53a3c56c7f48aa7 pimcommon-24.02.2.tar.xz +9432a6eb840c389b945e0f779d291aff77cd050255a582712736b29583a0259fafba1ea7b4912e6853d99d32ab87d36e46bf244a660f402a2f7a79ff25cd3af7 pimcommon-24.05.0.tar.xz " 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/pinta/APKBUILD b/community/pinta/APKBUILD index 002e0361d4c..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.2 -pkgrel=0 +pkgrel=1 pkgdesc="Simple GTK# paint program" url="https://www.pinta-project.com/" arch="x86_64 aarch64 armv7" diff --git a/community/pipe-viewer/APKBUILD b/community/pipe-viewer/APKBUILD index 92ef5147087..c22cf186826 100644 --- a/community/pipe-viewer/APKBUILD +++ b/community/pipe-viewer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dmitry Zakharchenko <dmitz@disroot.org> # Maintainer: Antoni Aloy <aaloytorrens@gmail.com> pkgname=pipe-viewer -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=0 pkgdesc="Lightweight YouTube client that does not require an YouTube API key" url="https://github.com/trizen/pipe-viewer" @@ -45,5 +45,5 @@ gtk() { } sha512sums=" -9b8990942eb2efa5ff67b87228b7c38b795bcf27fa824af369019bc41bcdb9613601ae6d1434322e455c39c8268a065956b76cf719eff043d38df0cfb55af53e pipe-viewer-0.5.0.tar.gz +e8b86fde9be4dc18d76f437daf07018dd21f94a36e08fbd973dc15afdc20db32fd47d22ac1b60453f31cb62cfb09106b5d08f9bb3922c9beecce795ec583fa72 pipe-viewer-0.5.1.tar.gz " diff --git a/community/pipewire/APKBUILD b/community/pipewire/APKBUILD index b80fca3d918..aec70547f7a 100644 --- a/community/pipewire/APKBUILD +++ b/community/pipewire/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/alpine-desktop <bribbers@disroot.org> pkgname=pipewire -pkgver=1.0.5 -pkgrel=0 +pkgver=1.0.6 +pkgrel=2 _so_ver=0.3 pkgdesc="Multimedia processing graphs" url="https://pipewire.org/" @@ -167,6 +167,7 @@ jack() { gst_plugin() { pkgdesc="Multimedia graph framework - PipeWire plugin" depends="pipewire-session-manager gst-plugins-base" + install_if="$pkgname=$pkgver-r$pkgrel gstreamer" amove usr/lib/gstreamer-1.0 } @@ -242,7 +243,7 @@ libs() { } sha512sums=" -ed561154b2b5182c94142e03b1147a90a98e788cb5f455a5202ee8c79c1f41e19c2235b3e06ca7af68f2c76320f7c2f8c71db147c9f15f82bef50fccb8ef985f pipewire-1.0.5.tar.gz +70bec82280a99ddc014d70d825bbbbd69112b5a855f6cb19196eb2f4c52cff7f8f1a6b005a484a3a913a88ead9897745850627177f937c703f8f7272edc00ae6 pipewire-1.0.6.tar.gz d5d8bc64e42715aa94296e3e26e740142bff7f638c7eb4fecc0301e46d55636d889bdc0c0399c1eb523271b20f7c48cc03f6ce3c072e0e8576c821ed1ea0e3dd pipewire.desktop e46939b8f903fe6b7421cd42d0746e669402d76afe3326401c186fefeb725e3c126a00ba9f315067d2535991134a24afd855752d757e9e52c20191b5d388f99b pipewire-launcher.sh " diff --git a/community/plantuml/APKBUILD b/community/plantuml/APKBUILD index 26fb3e8d698..87d092e1f3f 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.4 +pkgver=1.2024.5 pkgrel=0 pkgdesc="Draw UML diagrams, using a simple and human readable text description" url="https://plantuml.com/" @@ -51,6 +51,6 @@ package() { } sha512sums=" -cb51e44691eb0a206de3f23e0bf1ba08f8a9d111d838c8b5f2ef2e7b7bae61294deb935bd0c0f2798fdc51d7a0a3e54d40d201075964e109a7f0781010933e91 plantuml-1.2024.4.tar.gz +20b9502a3d6ac9ceccb667943f8ea70990102f778175001852b1fcd2b9b7fa570f5b7a7fb237b6831c0411667c3e986f2b0ea09ce2602b5c1ca98694b37c20a5 plantuml-1.2024.5.tar.gz 4b2be5783dffd9aeb4e49c4c192f24e182cc55e39dae45a34f7cf42a0174c22aa0ada60230d6714e473f316ec230d0abec09cfdbeae27e3de0f26861a9814f8e plantuml.run " diff --git a/community/plasma-activities-stats/APKBUILD b/community/plasma-activities-stats/APKBUILD index f85db631400..72d274ce526 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.4 +pkgver=6.0.5 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=" -676deda84eab9cde73b4498694913deafb60be041106e945c61431552e3e61e9b71e3dd07fc40282e67d2a2cbfa4318704fbc702f7bc123ea24137bcbf351a0c plasma-activities-stats-6.0.4.tar.xz +a69a952c6285368335f40ecec2033cbaa827b0bdbf3534b8a5482478de093d2c38d4eaae498f8370f4e1de91e374a7feea4bba78da2a001d457fa7a57a5029fe plasma-activities-stats-6.0.5.tar.xz " diff --git a/community/plasma-activities/APKBUILD b/community/plasma-activities/APKBUILD index e269040dd46..0325172ebea 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.4 +pkgver=6.0.5 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -47,5 +47,5 @@ package() { } sha512sums=" -e9f6cc4fdd0b64860218091a8112cedd8d0c22e767bcb4939100ea2f64e5aefc05150e822204090be333d2d9bba70b7bcc56d217b00fde000647f7ffb53078ad plasma-activities-6.0.4.tar.xz +50791e43e4ac2cbc6a6ba77acb5b5c6fdf4d5d51c4b94504493b585d658f1ff8b2a193f1eaec5272b90be84c5728c48f24abd993b6baec41ff60db8dbfadd604 plasma-activities-6.0.5.tar.xz " diff --git a/community/plasma-browser-integration/APKBUILD b/community/plasma-browser-integration/APKBUILD index ca10847b0b4..9c1a07ac058 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.4 +pkgver=6.0.5 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=" -2df6308b73f7195ce948c57cc86651d2e3fae6d8b414d1afd75feba04a117a7c3887a958bd019eb819a417811ed4f1f73cc62f12010c19db5c87c1b6f4f104b6 plasma-browser-integration-6.0.4.tar.xz +ae87b3b8b1153c559848e870efba33e70628c6183b9842b6bc90f2c93375c6d851b1e001617265d023babd77f355b8d27ce9fa52623922b87748cc0418025011 plasma-browser-integration-6.0.5.tar.xz " diff --git a/community/plasma-desktop-meta/APKBUILD b/community/plasma-desktop-meta/APKBUILD index a4e6855bf50..56e53b14d5a 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.4 +pkgver=6.0.5 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 15be5dd5282..d0ab8ef5719 100644 --- a/community/plasma-desktop/APKBUILD +++ b/community/plasma-desktop/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-desktop -pkgver=6.0.4 -pkgrel=0 +pkgver=6.0.5 +pkgrel=1 pkgdesc="KDE Plasma Desktop" # armhf blocked by qt6-qtdeclarative -# 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 !loongarch64" url='https://kde.org/plasma-desktop/' license="GPL-2.0-only AND LGPL-2.1-only" depends=" @@ -60,6 +60,7 @@ makedepends=" qt6-qtdeclarative-dev qt6-qtsvg-dev samurai + sdl2-dev signon-plugin-oauth2-dev xf86-input-evdev-dev xf86-input-libinput-dev @@ -72,6 +73,12 @@ checkdepends=" xvfb-run " +case "$CARCH" in + x86|x86_64|armv7|aarch64) + makedepends="$makedepends kaccounts-integration-dev" + ;; +esac + case "$pkgver" in *.90*) _rel=unstable;; *) _rel=stable;; @@ -106,5 +113,5 @@ knetattach() { } sha512sums=" -6e682e2ff91bda05331f581a36afbf1ea571c8855a27280d871e0ae1cd570373f5bb781d078c010d8cf74da0f062deabd9186b161a08a3178304ea6c50816860 plasma-desktop-6.0.4.tar.xz +59ab3e024a5a947603556d596f52bbcedbe94a997f67955583534ad4fce9c95c03e98e977f6df47be13d6014c55266c3f0fee88fdde682fe5d1036c170577499 plasma-desktop-6.0.5.tar.xz " diff --git a/community/plasma-disks/APKBUILD b/community/plasma-disks/APKBUILD index 3a6195496cd..ecae517343e 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.4 +pkgver=6.0.5 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=" -50205d7f14ce7dc2cb05755205087efc25b356946b68526807c884b8f599501fb2fb0c312782bfaa0b936d93fe77d77b78a5d802547d39096ea93ebf4d9e57df plasma-disks-6.0.4.tar.xz +6f8a705719a3febf3fcc3a36a9765937965a9f7feb002b455b63aabc981ae84a1ee1afed5e4e19540d6c50c25c3d5b0c6b194c1689bd36e531654f7a59bbed41 plasma-disks-6.0.5.tar.xz " diff --git a/community/plasma-firewall/APKBUILD b/community/plasma-firewall/APKBUILD index 7c1a54df649..43ca65cad89 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Control Panel for your system firewall" # armhf blocked by qt6-qtdeclarative @@ -50,5 +50,5 @@ package() { } sha512sums=" -70b914f1dbe011e10a250f4a3ca84a0e324798ba5d74cd3f89adddb61e92a53b7fca95cee63f6065c84dc36a81f45cb091ed51156b23564f62fba89625340a7c plasma-firewall-6.0.4.tar.xz +fdcdfc8ae2a137a5ab1758bb92a36b5bc2518d887df02e5fd2c83e31790e596ac3c2d946288cf14049f4b9bf4a28b7c08ecaa916a297bd8c9a1bb82792e15edc plasma-firewall-6.0.5.tar.xz " diff --git a/community/plasma-framework5/APKBUILD b/community/plasma-framework5/APKBUILD index 447618fb145..9d33db80408 100644 --- a/community/plasma-framework5/APKBUILD +++ b/community/plasma-framework5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=plasma-framework5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Plasma library and runtime components based upon KF5 and Qt5" # armhf blocked by qt5-qtdeclarative @@ -74,5 +74,5 @@ package() { } sha512sums=" -46ff7c6e93c7be3bb6998010b8b613f7c90cb9b3313290d6ebf0b94ed896e676c245aa090f0beb74c4c68576909f7dc7b6f580e386c18a923be90f74bdc1fbb6 plasma-framework-5.115.0.tar.xz +d15a1379d14a13c17932c1278b209b0a2f6a07f1abc15cb436f73765f8df12564297541c29bf453991e4dc7d469c5b83ecc53e9e97480d10d8d897597acfe804 plasma-framework-5.116.0.tar.xz " diff --git a/community/plasma-integration/APKBUILD b/community/plasma-integration/APKBUILD index 33bb4c00345..e6d37a41d1f 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.4 +pkgver=6.0.5 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=" -80bd8d44ceb920109d971027f71eafbdc682972d7b0eb737504c840befd47ccd6dc1536e67e173d1df11b38bb91bd493351159de853fdd2b5035800846004833 plasma-integration-6.0.4.tar.xz +54c1dd96610cfa479cf4edf2b937ef1543a42ec3edec29c515ed3db49093b7ea2e5ec425d70142e47e9bcf95c28747fb1e28cd0e5dba28ba4a7515a146c0ff0c plasma-integration-6.0.5.tar.xz " diff --git a/community/plasma-mobile/APKBUILD b/community/plasma-mobile/APKBUILD index d719e72ce71..1a1f6a63d09 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Modules providing phone functionality for Plasma" # armhf blocked by extra-cmake-modules @@ -97,6 +97,6 @@ package() { } sha512sums=" -179ee8d029311a9e8328dbbce22d33bd3b929082d553931443b5dc6f0ae2dbbc54320a9dea1c23b956b3da4504b74322200402062912cc620b23c4d8cc4f418e plasma-mobile-6.0.4.tar.xz +9b68769031a8d3e5ec26b9f629ca60c8773331b7f88c0c5a7c188d93a90da7b45e489692b6f8f38fecee8f16958f39b7331c77a65ee1fab0394b64e8574b9748 plasma-mobile-6.0.5.tar.xz 4badc25cbb7dc84d6af54cff5f3c09dcc37da86b7e930bdcab6d75f8dd90ef0dd9c8a3837ab696b1f4de9cad82d5e64ddd44904640a92e910a8f45524542be95 99-flashlight.rules " diff --git a/community/plasma-nano/APKBUILD b/community/plasma-nano/APKBUILD index 963d2cc2ab7..f195c1ef499 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="A minimal Plasma shell package intended for embedded devices" # armhf blocked by extra-cmake-modules @@ -47,5 +47,5 @@ package() { } sha512sums=" -c1a15c1ac5d2001f5edc8d4806ae76102003291ea948ba3a2582c5396922ff905c0218f58c91c0eaed504dcd5f9f6fd9809197dc41331039d85c62547eef4e9e plasma-nano-6.0.4.tar.xz +1b0366ee47681e6e4c3c5a3b36afecbaa3ad430f793eb7f6bfa50f44c2cd3d95700f5fa877549fa8bf06200e5afa10a906d918687176162a5170051b932c485b plasma-nano-6.0.5.tar.xz " diff --git a/community/plasma-nm/APKBUILD b/community/plasma-nm/APKBUILD index e6469983b9a..d3e16167ec3 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Plasma applet written in QML for managing network connections" # armhf blocked by qt6-qtdeclarative @@ -78,5 +78,5 @@ mobile() { } sha512sums=" -df2fdb51f3e78ca123ac9c206c2a99ef3e52e7b05a8d8b2d638da675dacefcfb6b13b71ca9f951ab9e4dabea301eb1a1ab7019dbedd1dde4fec0f64bc6558c35 plasma-nm-6.0.4.tar.xz +ea5f96d1d12aa66b082fd78ec0c6896b5e345ecd39328ece917ca732c9eaa1944dc4fbc22cb4ab9a1fd2d50559ad3d113dd0f5ece6bfa20f66d97905f2108c1d plasma-nm-6.0.5.tar.xz " diff --git a/community/plasma-pa/APKBUILD b/community/plasma-pa/APKBUILD index f2ae8e16d13..36381e6e859 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Plasma applet for audio volume management using PulseAudio" # armhf blocked by qt6-qtdeclarative @@ -63,5 +63,5 @@ package() { } sha512sums=" -a911574ad84ca67caa32b0f038abe687ad1073bbda691ecf5f4b79274ca9f7914284ca96f4ebf4088ed2d69c6eb5190cea0fe7bcbdf2406ce97ea09e7b845300 plasma-pa-6.0.4.tar.xz +4c7c881cac64c54114efd202ad7011ebd16ccc14dddf8c2a17b7427950eacdfa5b3fd27a6f3932ed9798760d04f39fe14fa1bc04c86587198ed34707073628ed plasma-pa-6.0.5.tar.xz " diff --git a/community/plasma-sdk/APKBUILD b/community/plasma-sdk/APKBUILD index e436330b62b..a40f839d16c 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Applications useful for Plasma Development" # armhf blocked by qt6-qtdeclarative @@ -66,5 +66,5 @@ package() { } sha512sums=" -ca150c1985950831fff091306281cf2aa7a6a60b75329af3187955532452a42bcb8baef3c2f7f736c32ef2a83e9a12fb49173571f3395154a4a34e7ed8b64442 plasma-sdk-6.0.4.tar.xz +4c28df3ffdeafc40e14626eb2c29ef102ac6d8a47ff0d8b3da78a764876326907de521aa5cbd441b491457b78aa57a17c9520534758cfe6a3a71edb2f6ec1235 plasma-sdk-6.0.5.tar.xz " diff --git a/community/plasma-systemmonitor/APKBUILD b/community/plasma-systemmonitor/APKBUILD index d5fdbfbe320..0b0f1a0ab32 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="An application for monitoring system resources" # armhf blocked by extra-cmake-modules @@ -59,5 +59,5 @@ package() { } sha512sums=" -1e8269412c6bc8ce32f48fbc9bb7a847884926fcdd8231ab468b1bdc1824733d05d48b69f7fcce1fea92694d4b0bb0caf1f6819eb287dc2b2c0f6fc0bbadc004 plasma-systemmonitor-6.0.4.tar.xz +8e1e06e56bc5d8aa5d21a576f6e3b23bc7f47ff5014260350e0a28368f6af358dcc06989c258230b76e7f144668f1e9c613e728f8d3da7488494a30e81c280a2 plasma-systemmonitor-6.0.5.tar.xz " diff --git a/community/plasma-thunderbolt/APKBUILD b/community/plasma-thunderbolt/APKBUILD index 139c437368e..17fc0c0a71a 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.4 +pkgver=6.0.5 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -54,5 +54,5 @@ package() { } sha512sums=" -119f6af9088dc108ccee9e0ba83d2a357f25a561f774f7ac88282fc8716594fa38d7d2b125cb19fbff9055498b4187f7c7ea7dcf146e8d2103109652df63a936 plasma-thunderbolt-6.0.4.tar.xz +e22f61f99f8259c2c48dfd7c1bbbb75f2c9be7fa78b1187154235ace44e48277670bd89cddfe2f970564e880db4056062ed7155c78b07ae3377fc24a4516ad1f plasma-thunderbolt-6.0.5.tar.xz " diff --git a/community/plasma-vault/APKBUILD b/community/plasma-vault/APKBUILD index 4516a8730f4..edafd18bd84 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Plasma applet and services for creating encrypted vaults" # armhf blocked by extra-cmake-modules @@ -52,5 +52,5 @@ package() { } sha512sums=" -1f3dadf69a4f1803eb8bc3e6f5b3c147c38761df67d3d121e1226191d8e0ea7b1ccc0a736b5276648d3c98d5a456e59c2df3ac9a80470e8c43e8e659a543c42b plasma-vault-6.0.4.tar.xz +2ac2544f1a6e47f069e8cd58517f41bf195335dc4f8389e2bfeab3e268b1e3e86ea1ef130ea58c7341b21e71e06ce46ef48b200cbd907cf6376ab003b5cf7d27 plasma-vault-6.0.5.tar.xz " diff --git a/community/plasma-wayland-protocols/APKBUILD b/community/plasma-wayland-protocols/APKBUILD index c6756518e4f..165225d7b18 100644 --- a/community/plasma-wayland-protocols/APKBUILD +++ b/community/plasma-wayland-protocols/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-other pkgname=plasma-wayland-protocols -pkgver=1.12.0 -pkgrel=1 +pkgver=1.13.0 +pkgrel=0 pkgdesc="Plasma Specific Protocols for Wayland" # armhf blocked by extra-cmake-modules arch="noarch !armhf" @@ -33,5 +33,5 @@ package() { } sha512sums=" -4894493e117669d7ab54b385e2a40d69ddce7cb860b68d9a28f9032d63cad6004858f984ad8ece34567e0e806ccb3f973852596b905d2618b60115ccf9c82886 plasma-wayland-protocols-1.12.0.tar.xz +7e335df79a9b614701330d1dd4aa37803a35a5fa409f4d9456f487383c9c3c02414f74551363b22694e7fea9c4c2427ead3213d984c3673c90348e7f890826af plasma-wayland-protocols-1.13.0.tar.xz " diff --git a/community/plasma-welcome/APKBUILD b/community/plasma-welcome/APKBUILD index 7ff6bc8eec3..7463b0a0ba8 100644 --- a/community/plasma-welcome/APKBUILD +++ b/community/plasma-welcome/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-welcome -pkgver=6.0.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="A friendly onboarding wizard for Plasma" # armhf blocked by qt6-qtdeclarative -# 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://kde.org/plasma-desktop/" license="GPL-2.0-or-later" depends="kirigami" @@ -62,5 +62,5 @@ package() { } sha512sums=" -865c4c84dfeede20f6e1d740833bda009af3be5202321e14a74c3dda9a5086e685361a4d75bb5a3ded85e827d0bd0fae59ec4f5d11799fce34c1061aeec90651 plasma-welcome-6.0.4.tar.xz +e9a234a0ac876938faeddb14d01dc4c5f9915678b7d6280c74083859ce16b8e8c09fad436977483cf0dbcfa574cbd204a599bfca5f69a766c9931fee56345111 plasma-welcome-6.0.5.tar.xz " diff --git a/community/plasma-workspace-wallpapers/APKBUILD b/community/plasma-workspace-wallpapers/APKBUILD index ae8038ab7ca..bb3587a1864 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Wallpapers for the Plasma Workspace" # armhf blocked by extra-cmake-modules @@ -39,5 +39,5 @@ package() { } sha512sums=" -8a6233319e9a6d480f025a4d92b2289820e62417df69b22ccaa911790eefbf14e98de844d27aa498d3a099f309fc1d70e9fb3bd11721d781f58cefc82238bfab plasma-workspace-wallpapers-6.0.4.tar.xz +877c8285e50bad720246716a023ca4f8e654d4a3744c0c0a57268c4c77095cd54e0685b197352ee841413f3f5d036ac395dcbbbbd6c7f6c620ee3386ede0d67c plasma-workspace-wallpapers-6.0.5.tar.xz " diff --git a/community/plasma-workspace/APKBUILD b/community/plasma-workspace/APKBUILD index effdf79c171..312b45be82d 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="KDE Plasma Workspace" # armhf blocked by extra-cmake-modules @@ -179,6 +179,6 @@ sddm_breeze() { } sha512sums=" -d55cd7232b2d4da4172e813cdaa432e9582f3d16a7f38055303617a0c66f67511c6e20cc19bfb8bff68e06515c445783040dd212fbb686b2993f469ec6757466 plasma-workspace-6.0.4.tar.xz +e6ad1ee600ae95cbbb4e565178f6b03f81f7139188d48ccb846337034227c8520cc2aaad70cfe6161204b16fe791f6578587493b242feb5f14f70602930140ed plasma-workspace-6.0.5.tar.xz affbeec6d236bf09ae95b7bf478015ead9b5eabcffa8291107e34463bc3f7563c01d4e444e035b7eb575700e64c4da9f5079950b254b8c24b305845f031eb17f sddm.conf " diff --git a/community/plasma5support/APKBUILD b/community/plasma5support/APKBUILD index c1ee02640f0..bd10f699bd7 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.4 +pkgver=6.0.5 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=" -db501ad90331871a46450a3e051830970d4da2e0a90f7ee4b8d97efca7f1b2e9995418bc124b1378fa3af94dcfcdb9c46f376eb44d27c54036b2e22469867763 plasma5support-6.0.4.tar.xz +5279517c2d1e61f1914338dc5d933a7590ce09029e34f4bb4f7e87f3c4e72515f32fae3d8e3bd3641aa6619a1ec4782e46f4e4fddaf0b2b0fec875f066ecd9e8 plasma5support-6.0.5.tar.xz " diff --git a/community/plasmatube/APKBUILD b/community/plasmatube/APKBUILD index 580ad5028ef..f1f65297ccf 100644 --- a/community/plasmatube/APKBUILD +++ b/community/plasmatube/APKBUILD @@ -3,7 +3,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=plasmatube -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Kirigami YouTube video player based on Invidious" # armhf blocked by extra-cmake-modules @@ -54,5 +54,5 @@ package() { } sha512sums=" -12d74ab9206bd00fe35bd15f20e275fbc7fe2123cab5be8b09c5f16f4194d3f04f6314c6d811a5754c3034d6416900b247d33c02976ba52fbd5713260546fa4b plasmatube-24.02.2.tar.xz +df7d76989ac20eb2e0d4086aa4da48cee06c228b5761ac33fbe806527e0450b1414695fd3673428d23e9b428ee2ec693429e6ad1f07ce436f1fb3e9af76f4335 plasmatube-24.05.0.tar.xz " diff --git a/community/plymouth-kcm/APKBUILD b/community/plymouth-kcm/APKBUILD index bcc26786d55..6443094de5e 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.4 +pkgver=6.0.5 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -52,5 +52,5 @@ package() { } sha512sums=" -b9e4865a79d99b72203a3e6088eb65ac6eb4291de771746439c5984c7b13aa9cdb7b3a858867e122f35151e9cb18358de100fbde8590262f4e2966c06098ae48 plymouth-kcm-6.0.4.tar.xz +abc3ffa1bdf6d9d86dda293d8dafdb7b8f29e01539fd9f1f6b5db7814741e4b3df8cfcf53896db0d0d9dc2340716533ae72fd9390a280a9d76501dab49e446e4 plymouth-kcm-6.0.5.tar.xz " diff --git a/community/pmbootstrap/APKBUILD b/community/pmbootstrap/APKBUILD index 9e9e7f514c1..75b0fdddc93 100644 --- a/community/pmbootstrap/APKBUILD +++ b/community/pmbootstrap/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org> pkgname=pmbootstrap -pkgver=2.2.1 -pkgrel=1 +pkgver=2.3.1 +pkgrel=0 pkgdesc="Sophisticated chroot/build/flash tool to develop and install postmarketOS" -url="https://sr.ht/~postmarketos/pmbootstrap/" +url="https://gitlab.com/postmarketOS/pmbootstrap" arch="noarch" license="GPL-3.0-or-later" depends=" @@ -34,6 +34,6 @@ package() { } sha512sums=" -25c517f8624663c87008e78fa352a2661de15c9468b24c9a75e3b6fab07acdda178268c8554d44affecd1f72c2a737c89fc6dadf823d0d67b6def5a051b0d501 pmbootstrap-2.2.1.tar.bz2 +d2c184ca3bb2f3a671a3a17a73f2f3e38ed1971ba11ab9bdec0151c06988c99b97e2558acfe176956a5348f661f863449174e60313422e10a1ebcd9ae72e581a pmbootstrap-2.3.1.tar.bz2 f8026ab32234b885e69252459047f70160c54319113bc449000aa7c05bd016f00a46cee05c8f5251682f967ab44a12c06fbbb3c02d0a57ccb836cff810ce1a40 modules-load.conf " diff --git a/community/podman-compose/APKBUILD b/community/podman-compose/APKBUILD index 796c9ee539f..8acec15129b 100644 --- a/community/podman-compose/APKBUILD +++ b/community/podman-compose/APKBUILD @@ -2,16 +2,16 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=podman-compose pkgver=1.1.0 -pkgrel=0 +pkgrel=1 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" +# s390x, loongarch64: podman (netavark & aardvark-dns -> nix crate) +arch="noarch !s390x !loongarch64" 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" +subpackages="$pkgname-bash-completion $pkgname-doc $pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/containers/podman-compose/archive/v$pkgver.tar.gz" build() { @@ -20,6 +20,13 @@ build() { package() { python3 -m installer -d "$pkgdir" .dist/*.whl + + install -Dm644 completion/bash/"$pkgname" \ + "$pkgdir"/usr/share/bash-completion/completions/"$pkgname" + + install -Dm644 docs/* -t "$pkgdir"/usr/share/doc/"$pkgname" + install -Dm644 docs/* -t "$pkgdir"/usr/share/doc/"$pkgname" + mv examples "$pkgdir"/usr/share/doc/"$pkgname"/ } sha512sums=" diff --git a/community/podman-tui/APKBUILD b/community/podman-tui/APKBUILD index 846b4eda432..711275c7378 100644 --- a/community/podman-tui/APKBUILD +++ b/community/podman-tui/APKBUILD @@ -1,13 +1,13 @@ # Contributor: omni <omni+alpine@hack.org> # Maintainer: omni <omni+alpine@hack.org> pkgname=podman-tui -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="Terminal user interface for Podman v4" url="https://github.com/containers/podman-tui" license="Apache-2.0" -# podman (netavark & aardvark-dns -> nix crate) -arch="all !s390x" +# s390x, loongarch64: podman (netavark & aardvark-dns -> nix crate) +arch="all !s390x !loongarch64" makedepends="go gpgme-dev linux-headers btrfs-progs-dev lvm2-dev" depends="podman" options="!check" @@ -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 844046da846..5a02ea1c62a 100644 --- a/community/podman/APKBUILD +++ b/community/podman/APKBUILD @@ -1,19 +1,19 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=podman -pkgver=4.9.4 +pkgver=5.0.3 pkgrel=0 pkgdesc="Simple management tool for pods, containers and images" url="https://podman.io/" license="Apache-2.0" -# s390x: blocked by aardvark-dns and netavark -arch="all !s390x" +# s390x, loongarch64: blocked by aardvark-dns and netavark +arch="all !s390x !loongarch64" options="!check" # tests require root privileges depends=" conmon oci-runtime iptables - slirp4netns + passt shadow-subids containers-common netavark @@ -32,7 +32,7 @@ makedepends=" mandoc sqlite-dev " -install="$pkgname.post-install" +install="$pkgname.post-install $pkgname.post-upgrade" subpackages=" $pkgname-doc $pkgname-openrc @@ -44,13 +44,15 @@ subpackages=" $pkgname-docker-doc:docker_doc:noarch " source="https://github.com/containers/podman/archive/v$pkgver/podman-$pkgver.tar.gz - no-quadlet.patch + no-systemd.patch podman.initd podman.confd " # secfixes: +# 5.0.3-r0: +# - CVE-2024-3727 # 4.9.4-r0: # - CVE-2024-1753 # 4.9.2-r0: @@ -99,9 +101,6 @@ package() { install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname - - # remove systemd files - rm -r "$pkgdir"/usr/lib/tmpfiles.d } remote() { @@ -120,10 +119,7 @@ docker() { make PREFIX=/usr DESTDIR="$subpkgdir" install.docker # Remove man pages - rm -rf "$subpkgdir"/usr/share - - # Remove systemd files - rm -rf "$subpkgdir"/usr/lib + rm -rf "${subpkgdir:?}"/usr/share } docker_doc() { @@ -142,8 +138,8 @@ docker_doc() { } sha512sums=" -7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b podman-4.9.4.tar.gz -4eb688c35634c0986231c9723667e1fac034573b0bc778bf078c3e797120653e7013965e59c63075eb9db9685aae8ddd79a899288b674f460a06aa4410ba4499 no-quadlet.patch +c605a52cc5aba43d485796c4986f2d1be704e5c931473bf5ba1cf77f703cdb3d16f41d33da0b25287e8d001077f77caf117d3ea5dbd7c56a744274025d9ab07d podman-5.0.3.tar.gz +33d93c1a9ddd7df8f7d800129f22ce558c3545f85b76d909ca9026255babee7b737821eb95245a238b87e38bc20fef3c69ee4b0ee39c48550917376a84c6723e no-systemd.patch f8941dc3f8c6b08b288e3347ef2d782140f6e46809da0353f3695338a2de75a971b312e57d09b0a0ea51557568d888b367e3b234be550aea8386321878f4a22f podman.initd ec6e6d3f72d0ab6c90a30b2cca5152c0d0f1e402ae671289263d7bf3b5141de9d67c3593f20b6075cedd214b7fb1506e69ff7b4f9691b43b391389343ab9b9b1 podman.confd " diff --git a/community/podman/no-quadlet.patch b/community/podman/no-quadlet.patch deleted file mode 100644 index 3a54cc007f1..00000000000 --- a/community/podman/no-quadlet.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/Makefile b/Makefile -index 8e701c3..e20799b 100644 ---- a/Makefile -+++ b/Makefile -@@ -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 --binaries: podman podman-remote podmansh rootlessport quadlet ## Build podman, podman-remote and rootlessport binaries quadlet -+binaries: podman podman-remote podmansh rootlessport ## Build podman, podman-remote and rootlessport binaries quadlet - endif - - # Extract text following double-# for targets, as their description for -@@ -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 -- install ${SELINUXOPT} -m 755 bin/quadlet $(DESTDIR)$(LIBEXECPODMAN)/quadlet - install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(SYSTEMDGENERATORSDIR) -- ln -sfr $(DESTDIR)$(LIBEXECPODMAN)/quadlet $(DESTDIR)$(SYSTEMDGENERATORSDIR)/podman-system-generator - install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(USERSYSTEMDGENERATORSDIR) -- ln -sfr $(DESTDIR)$(LIBEXECPODMAN)/quadlet $(DESTDIR)$(USERSYSTEMDGENERATORSDIR)/podman-user-generator - install ${SELINUXOPT} -m 755 -d ${DESTDIR}${TMPFILESDIR} - install ${SELINUXOPT} -m 644 contrib/tmpfile/podman.conf ${DESTDIR}${TMPFILESDIR}/podman.conf - endif diff --git a/community/podman/no-systemd.patch b/community/podman/no-systemd.patch new file mode 100644 index 00000000000..9b1d303532f --- /dev/null +++ b/community/podman/no-systemd.patch @@ -0,0 +1,54 @@ +--- a/Makefile ++++ b/Makefile +@@ -119,7 +119,6 @@ LDFLAGS_PODMAN ?= \ + $(if $(BUILD_INFO),-X $(LIBPOD)/define.buildInfo=$(BUILD_INFO),) \ + -X $(LIBPOD)/config._installPrefix=$(PREFIX) \ + -X $(LIBPOD)/config._etcDir=$(ETCDIR) \ +- -X $(PROJECT)/v5/pkg/systemd/quadlet._binDir=$(BINDIR) \ + -X github.com/containers/common/pkg/config.additionalHelperBinariesDir=$(HELPER_BINARIES_DIR)\ + $(EXTRA_LDFLAGS) + LDFLAGS_PODMAN_STATIC ?= \ +@@ -235,7 +234,7 @@ binaries: podman podman-remote ## Build + else ifneq (, $(findstring $(GOOS),darwin windows)) + binaries: podman-remote ## Build podman-remote (client) only binaries + else +-binaries: podman podman-remote podmansh rootlessport quadlet ## Build podman, podman-remote and rootlessport binaries quadlet ++binaries: podman podman-remote podmansh rootlessport ## Build podman, podman-remote and rootlessport binaries + endif + + # Extract text following double-# for targets, as their description for +@@ -548,7 +547,6 @@ man-page-check: bin/podman + hack/man-page-checker + hack/xref-helpmsgs-manpages + hack/man-page-table-check +- hack/xref-quadlet-docs + + .PHONY: swagger-check + swagger-check: +@@ -841,13 +839,6 @@ 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 +- install ${SELINUXOPT} -m 755 bin/quadlet $(DESTDIR)$(LIBEXECPODMAN)/quadlet +- install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(SYSTEMDGENERATORSDIR) +- ln -sfr $(DESTDIR)$(LIBEXECPODMAN)/quadlet $(DESTDIR)$(SYSTEMDGENERATORSDIR)/podman-system-generator +- install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(USERSYSTEMDGENERATORSDIR) +- ln -sfr $(DESTDIR)$(LIBEXECPODMAN)/quadlet $(DESTDIR)$(USERSYSTEMDGENERATORSDIR)/podman-user-generator +- install ${SELINUXOPT} -m 755 -d $(DESTDIR)${TMPFILESDIR} +- install ${SELINUXOPT} -m 644 contrib/tmpfile/podman.conf $(DESTDIR)${TMPFILESDIR}/podman.conf + endif + + .PHONY: install.modules-load +@@ -884,12 +875,9 @@ install.docker: + env BINDIR=${BINDIR} ETCDIR=${ETCDIR} envsubst < docker/docker.in > ${INTERPOLATED_DOCKER_SCRIPT} + install ${SELINUXOPT} -m 755 ${INTERPOLATED_DOCKER_SCRIPT} $(DESTDIR)$(BINDIR)/docker + rm ${INTERPOLATED_DOCKER_SCRIPT} +- install ${SELINUXOPT} -m 755 -d $(DESTDIR)${SYSTEMDDIR} $(DESTDIR)${USERSYSTEMDDIR} $(DESTDIR)${TMPFILESDIR} $(DESTDIR)${USERTMPFILESDIR} + install ${SELINUXOPT} -d -m 755 $(DESTDIR)${ETCDIR}/profile.d + install ${SELINUXOPT} -m 644 docker/podman-docker.sh $(DESTDIR)${ETCDIR}/profile.d/podman-docker.sh + install ${SELINUXOPT} -m 644 docker/podman-docker.csh $(DESTDIR)${ETCDIR}/profile.d/podman-docker.csh +- install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-docker.conf -t $(DESTDIR)${TMPFILESDIR} +- install ${SELINUXOPT} -m 644 contrib/systemd/system/podman-docker.conf -t $(DESTDIR)${USERTMPFILESDIR} + + .PHONY: install.docker-docs + install.docker-docs: diff --git a/community/podman/podman.post-upgrade b/community/podman/podman.post-upgrade new file mode 100644 index 00000000000..f3f5d9c9f73 --- /dev/null +++ b/community/podman/podman.post-upgrade @@ -0,0 +1,13 @@ +#!/bin/sh + +ver_old=$1 + +if [ "$(apk version -t "$ver_old" '5.0.3-r0')" = '<' ]; then + cat >&2 <<-EOF + * + * The default tool for rootless networking has been swapped from slirp4netns to + * pasta (passt) for improved performance. As a result, networks named pasta are + * no longer supported. + * + EOF +fi diff --git a/community/poedit/APKBUILD b/community/poedit/APKBUILD index 4200defb7b9..c4f9fc2269e 100644 --- a/community/poedit/APKBUILD +++ b/community/poedit/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=poedit -pkgver=3.4.2 -pkgrel=1 +pkgver=3.4.3 +pkgrel=0 pkgdesc="cross-platform translations editor" url="https://www.poedit.net" # s390x: cpprestsdk; nobody would use this there @@ -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/poetry/APKBUILD b/community/poetry/APKBUILD index 46b240c295e..b88c5ca811f 100644 --- a/community/poetry/APKBUILD +++ b/community/poetry/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=poetry -pkgver=1.7.1 -pkgrel=1 +pkgver=1.8.3 +pkgrel=0 pkgdesc="Python3 dependency management and packaging system" url="https://python-poetry.org/" license="MIT" @@ -62,5 +62,5 @@ package() { } sha512sums=" -65f616979114e6f89d259d55e9ba5af95021c19595e7c9dd97764013add42507c3a9fbdca6f2fc0b40794e4f55fcd5b926f19b367be3b12e593058fe2103b80c poetry-1.7.1.tar.gz +dd5986ff4c91887ef77d54107ba97016872a7d64e31eb7cbc5eb96dccf9292caee9781141f0ee1bd1ae09fb8a63f08d1240705b2eb120ff18696bb66c41065de poetry-1.8.3.tar.gz " diff --git a/community/polari/APKBUILD b/community/polari/APKBUILD index 3b694978bf1..8dd047bafbf 100644 --- a/community/polari/APKBUILD +++ b/community/polari/APKBUILD @@ -2,12 +2,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=polari pkgver=46.0 -pkgrel=0 +pkgrel=1 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="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 diff --git a/community/polkit-kde-agent-1/APKBUILD b/community/polkit-kde-agent-1/APKBUILD index 31701632078..5963d454123 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Daemon providing a polkit authentication UI for KDE" # armhf blocked by extra-cmake-modules @@ -52,5 +52,5 @@ package() { } sha512sums=" -7f5a3c0f3283caf6b669a237980d5cec8774d0fcbc5512b37981c146b5da19aec97374e6288ceffe5f257021bc0765562f84c57bf2de9c0940413a3b06182c91 polkit-kde-agent-1-6.0.4.tar.xz +09039518784b13da7f1873172e6814a51b968be45a341b87eb17c25cb7f04810c12f3a4c62b3ac312710b45b8827675abbd05bb7a5e370824c383a7a5ff49d54 polkit-kde-agent-1-6.0.5.tar.xz " diff --git a/community/postgis/APKBUILD b/community/postgis/APKBUILD index 22fd3721b43..d03a1d3daac 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=1 +pkgrel=2 pkgdesc="spatial database extender for PostgreSQL object-relational database" url="https://postgis.net/" arch="all" diff --git a/community/postgresql-bdr/APKBUILD b/community/postgresql-bdr/APKBUILD index cebf833f608..5cd84f5dc8b 100644 --- a/community/postgresql-bdr/APKBUILD +++ b/community/postgresql-bdr/APKBUILD @@ -44,10 +44,10 @@ prepare() { } build() { - # native spinlocks not supported on riscv64 currently + # native spinlocks not supported on riscv64 and loongarch64currently local _configure="" case $CARCH in - riscv64) _configure=--disable-spinlocks ;; + riscv64|loongarch64) _configure=--disable-spinlocks ;; esac ./configure \ 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/postgresql14/APKBUILD b/community/postgresql14/APKBUILD index c24f95c4036..88a62251d2c 100644 --- a/community/postgresql14/APKBUILD +++ b/community/postgresql14/APKBUILD @@ -2,8 +2,8 @@ # Contributor: G.J.R. Timmer <gjr.timmer@gmail.com> # Contributor: Jakub Jirutka <jakub@jirutka.cz> _pkgname=postgresql -pkgver=14.11 -pkgrel=2 +pkgver=14.12 +pkgrel=0 _majorver=${pkgver%%.*} # Should this aport provide libpq* and libecpg*? true/false # Exactly one postgresql aport must be the default one! @@ -535,7 +535,7 @@ _setdiff() { } sha512sums=" -67289cd638ed7b13e845263d5a34394347f33735d9e2fafd6aa3562989a3a9455ea547d1b5079138648f33b093e77841654188fc74a49c0d6d458a42cfb57ffe postgresql-14.11.tar.bz2 +cb6729d0fba8aa705c92beecdc5cd1131e64337db6de038da6f5b75c7d9e65381f93f6ebfac601d5622399b9485e8ec558be53e6a7dcc59350a9b053f8836bf9 postgresql-14.12.tar.bz2 73080f61ae274a214966d2d010de49c8c90eb3180e4f56d86a9e23063eaddbe7f8d2c40ed414591c16bc9cfe88577866af2a965c2b6effb54965d19ef96a3fa9 initdb.patch 27e00b58fe5c3899c66fc0dde51846c14701bcfedd132b106d676783ba603e8cbdc6e620f29b52dc892bdaa9302052788cf5e575a1659f61c017a12e0d2ee4d0 perl-rpath.patch 92d28f91b57a01afc81a00d386e87b9e2aa812f341a1578f262af372ee905530205592eda595111827582acceacd1bf244d1df130330003f05e74e4ddb5a7c4f per-version-dirs.patch 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/powerdevil/APKBUILD b/community/powerdevil/APKBUILD index c09fd2cda15..7b58cbe0d70 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Manages the power consumption settings of a Plasma Shell" # armhf blocked by extra-cmake-modules @@ -81,5 +81,5 @@ package() { } sha512sums=" -9290ea667b254f4a9c7ce7322a1f34eed755d15067caa1dd29573bfd9b4cff1d47589f585176e63e9f8e0435129287581ca52e5548c4083c5c2f6e508c0f7a49 powerdevil-6.0.4.tar.xz +36be20bfc0c074b451e0f9eca6317f2894dc71a943353e8ce52c3f68e0181e054e4a035a85888b9281aa684b50912e87ec3db8d6260fdd371dd6d4c7e86e3709 powerdevil-6.0.5.tar.xz " diff --git a/community/poxml/APKBUILD b/community/poxml/APKBUILD index bc9679095f6..a4b587e002e 100644 --- a/community/poxml/APKBUILD +++ b/community/poxml/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=poxml -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 arch="all !armhf !riscv64" url="https://www.kde.org/applications/development/" @@ -38,5 +38,5 @@ package() { } sha512sums=" -94552451f0f85fb1928c61cb3a6e41e64736ed463b0201e0ffe750f7a38e5849532f669368de59b00dbe57f18a56dde48fcb1adf231862a66ecc3092e180f37c poxml-24.02.2.tar.xz +4a101ce7262ceceffcee917003753b419582d5a3883f9b69f9171f651f4309c948576e780eca1b65f6452fd3d28ea19132fef465dd82f554674634b66072580e poxml-24.05.0.tar.xz " 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/print-manager/APKBUILD b/community/print-manager/APKBUILD index 42efc8f62c8..2893ddc2d98 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.4 +pkgver=6.0.5 pkgrel=0 # armhf blocked by qt6-qtdeclarative arch="all !armhf" @@ -52,5 +52,5 @@ package() { } sha512sums=" -fd1d5e1c1cb26838e0b5b98ade3f703425caa6a86b6184af508df4adeaa2521980546a20362e0f2f55d6e968b1f7c24c663a3e0754403977d457860f86885855 print-manager-6.0.4.tar.xz +87c8e553a8a288bde40a16cfe191c27d625ef4323e42e0b3f418ca34eddd4a2b9abe77951daa67a4b5a9eb73cdcf7d3abe66f1987d9606d72976b189c5aed6c6 print-manager-6.0.5.tar.xz " 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..9f4c22c03f1 100644 --- a/community/prison5/APKBUILD +++ b/community/prison5/APKBUILD @@ -2,10 +2,10 @@ # 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 +pkgver=5.116.0 +pkgrel=0 pkgdesc="A barcode API to produce QRCode barcodes and DataMatrix barcodes" arch="all !armhf" # armhf blocked by qt5-qtdeclarative url="https://community.kde.org/Frameworks" @@ -53,5 +53,5 @@ package() { } sha512sums=" -48145ee4c1fd7eb177e58b3cd676eb7e50452897b335093eb1d65ac1f6cada83ab5e43d16d26387c1f4c5b992367a91a03d07ac26ae96b253f8f03660f7b226b prison-5.115.0.tar.xz +fa7ad2393a25b8b7d7cea60891ab27e114ea069a78479a90a6e7df219963991e89f477c061fea0d6c680cfe72502e4b40fdf05b55858072825543ca52635bfd0 prison-5.116.0.tar.xz " diff --git a/community/proftpd/APKBUILD b/community/proftpd/APKBUILD index d5013b2fb97..b0844384505 100644 --- a/community/proftpd/APKBUILD +++ b/community/proftpd/APKBUILD @@ -5,7 +5,7 @@ pkgname=proftpd pkgver=1.3.8b _pkgver=${pkgver/_/} -pkgrel=1 +pkgrel=2 pkgdesc="Highly configurable FTP server software" url="https://github.com/proftpd/proftpd" pkgusers=$pkgname @@ -25,6 +25,7 @@ makedepends=" pcre2-dev sqlite-dev unixodbc-dev + gettext-dev " install="$pkgname.pre-install" @@ -32,11 +33,13 @@ _modules="mod_unique_id:mod_site_misc:mod_load:mod_ban:mod_quotatab:mod_sql:mod_ _modules="$_modules:mod_quotatab_sql:mod_ldap:mod_quotatab_ldap:mod_ratio:mod_tls:mod_rewrite:mod_radius:mod_wrap2:mod_wrap2_file" _modules="$_modules:mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrls_admin:mod_copy:mod_deflate:mod_ifversion" _modules="$_modules:mod_geoip:mod_exec:mod_sftp:mod_sftp_sql:mod_shaper:mod_sql_passwd:mod_ifsession:mod_auth_otp:mod_tls_redis" -_modules="$_modules:mod_wrap2_redis:mod_redis:mod_memcache:mod_tls_memcache:mod_readme:mod_snmp:mod_tls_shmcache" +_modules="$_modules:mod_wrap2_redis:mod_redis:mod_memcache:mod_tls_memcache:mod_readme:mod_snmp:mod_tls_shmcache:mod_lang" subpackages="$pkgname-doc $pkgname-utils - $pkgname-openrc" + $pkgname-openrc + $pkgname-lang + " for _module in ${_modules//:/ }; do subpackages="$subpackages $pkgname-$_module:_module" @@ -57,6 +60,7 @@ builddir="$srcdir/$pkgname-$_pkgver/" prepare() { default_prepare + update_config_sub } check() { @@ -84,6 +88,7 @@ build() { --disable-wtmp \ --disable-auth-pam \ --enable-openssl \ + --enable-nls \ --with-shared=$_modules make } @@ -99,7 +104,7 @@ package() { install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -Dm644 "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname - rm -fr "$pkgdir"/run "$pkgdir"/usr/share/locale \ + rm -fr "$pkgdir"/run \ "$pkgdir"/usr/sbin/in.$pkgname \ "$pkgdir"/usr/lib/pkgconfig \ "$pkgdir"/usr/include @@ -138,6 +143,10 @@ _module() { pkgdesc="ProFTPd module: $name" depends="$pkgname" + + if [ "$module_name" = "lang" ]; then + depends="$depends $pkgname-lang" + fi mkdir -p "$subpkgdir"/usr/lib/$pkgname mv "$pkgdir"/usr/lib/$pkgname/$name.so "$subpkgdir"/usr/lib/$pkgname if [ -f "$srcdir"/$name.conf ]; then diff --git a/community/prometheus-blackbox-exporter/APKBUILD b/community/prometheus-blackbox-exporter/APKBUILD index f62d689df9a..f30e7f6412b 100644 --- a/community/prometheus-blackbox-exporter/APKBUILD +++ b/community/prometheus-blackbox-exporter/APKBUILD @@ -2,7 +2,7 @@ pkgname=prometheus-blackbox-exporter _pkgname=blackbox_exporter pkgver=0.25.0 -pkgrel=0 +pkgrel=1 pkgdesc="Prometheus Blackbox Exporter" url="https://github.com/prometheus/blackbox_exporter" license="Apache-2.0" diff --git a/community/prometheus-json-exporter/APKBUILD b/community/prometheus-json-exporter/APKBUILD index 90d106a33ec..7f103b42220 100644 --- a/community/prometheus-json-exporter/APKBUILD +++ b/community/prometheus-json-exporter/APKBUILD @@ -3,7 +3,7 @@ pkgname=prometheus-json-exporter _pkgname=json_exporter pkgver=0.6.0 -pkgrel=8 +pkgrel=9 pkgdesc="Prometheus exporter which scrapes remote JSON by JSONPath" url="https://github.com/prometheus-community/json_exporter" license="Apache-2.0" diff --git a/community/prometheus-libvirt-exporter/APKBUILD b/community/prometheus-libvirt-exporter/APKBUILD index 3da1027177d..a897cd8cdff 100644 --- a/community/prometheus-libvirt-exporter/APKBUILD +++ b/community/prometheus-libvirt-exporter/APKBUILD @@ -3,7 +3,7 @@ pkgname=prometheus-libvirt-exporter _pkgname=libvirt-exporter pkgver=2.3.3 -pkgrel=6 +pkgrel=7 pkgdesc="Prometheus libvirt exporter" url="https://github.com/Tinkoff/libvirt-exporter" arch="all !s390x !riscv64" # libvirt diff --git a/community/prometheus-nextcloud-exporter/APKBUILD b/community/prometheus-nextcloud-exporter/APKBUILD index 8c0e26a491e..64357c8f144 100644 --- a/community/prometheus-nextcloud-exporter/APKBUILD +++ b/community/prometheus-nextcloud-exporter/APKBUILD @@ -3,7 +3,7 @@ pkgname=prometheus-nextcloud-exporter _pkgname=nextcloud-exporter pkgver=0.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="Prometheus nextcloud exporter" url="https://github.com/xperimental/nextcloud-exporter" arch="all" diff --git a/community/prometheus-node-exporter/APKBUILD b/community/prometheus-node-exporter/APKBUILD index d23ed1e4533..e87cd964645 100644 --- a/community/prometheus-node-exporter/APKBUILD +++ b/community/prometheus-node-exporter/APKBUILD @@ -3,7 +3,7 @@ pkgname=prometheus-node-exporter _pkgname=node_exporter pkgver=1.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="Prometheus exporter for machine metrics" url="https://github.com/prometheus/node_exporter" license="Apache-2.0" diff --git a/community/prometheus-openrc-exporter/APKBUILD b/community/prometheus-openrc-exporter/APKBUILD index 66e3075e402..3d9af8e424e 100644 --- a/community/prometheus-openrc-exporter/APKBUILD +++ b/community/prometheus-openrc-exporter/APKBUILD @@ -3,7 +3,7 @@ pkgname=prometheus-openrc-exporter _pkgname=openrc-exporter pkgver=0.0.2 -pkgrel=16 +pkgrel=17 pkgdesc="Prometheus exporter which exposes metrics on services managed by OpenRC" url="https://git.sr.ht/~tomleb/openrc-exporter" arch="all" diff --git a/community/prometheus-postgres-exporter/APKBUILD b/community/prometheus-postgres-exporter/APKBUILD index 480bed44d8d..0640dfb96ad 100644 --- a/community/prometheus-postgres-exporter/APKBUILD +++ b/community/prometheus-postgres-exporter/APKBUILD @@ -3,7 +3,7 @@ pkgname=prometheus-postgres-exporter _pkgname=postgres_exporter pkgver=0.15.0 -pkgrel=1 +pkgrel=2 pkgdesc="Prometheus exporter for PostgreSQL database" url="https://github.com/prometheus-community/postgres_exporter" license="Apache-2.0" diff --git a/community/prometheus-snmp-exporter/APKBUILD b/community/prometheus-snmp-exporter/APKBUILD index 70345b30b94..55f5b4cfb81 100644 --- a/community/prometheus-snmp-exporter/APKBUILD +++ b/community/prometheus-snmp-exporter/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: nixfloyd <nixfloyd@gmail.com> pkgname=prometheus-snmp-exporter _pkgname=snmp_exporter -pkgver=0.25.0 -pkgrel=2 +pkgver=0.26.0 +pkgrel=1 pkgdesc="SNMP Exporter for Prometheus" url="https://github.com/prometheus/snmp_exporter" # riscv64: prometheus/procfs needs updating @@ -51,7 +51,7 @@ package() { } sha512sums=" -29beb903ecd2520232eb8a3c398be4728622256ceb863b5c2587f520a52547fc29b2646de4fb44686bfdade7e7fec4199d29294b6806437ec22b801addc2e1ea prometheus-snmp-exporter-0.25.0.tar.gz +e2920483ce2c63e4e35c67bcb5714831088a27954cd7350b2b285517ebd6238f1d2447a4440daff698bb19c452d52e8ebe7165fee423417d55de138facd6abd1 prometheus-snmp-exporter-0.26.0.tar.gz a11085f14e192ff277107dbbb12857a3043dbce1acadbbdf94a88d2b921745f9556cad3c0a81a0113349d322e02b1705831967af3ecc0f95259e759ade9ff5ad snmp-exporter.initd 489cb298e215bd9647aa5293d456106eb26a73f5fbd9d42fab68de26d273ebb612dba01ba113ce58521b543a2f82a10ad86dc35056ef8d0438b39e77be61f67e snmp-exporter.confd " diff --git a/community/prometheus/APKBUILD b/community/prometheus/APKBUILD index 83fd7c58e0c..b875963f4af 100644 --- a/community/prometheus/APKBUILD +++ b/community/prometheus/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Pedro Lucas Porcellis <porcellis@eletrotupi.com> pkgname=prometheus -pkgver=2.51.1 -pkgrel=1 +pkgver=2.52.0 +pkgrel=2 pkgdesc="The Prometheus monitoring system and time series database" url="https://github.com/prometheus/prometheus" arch="all !riscv64" # npm @@ -85,7 +85,7 @@ package() { } sha512sums=" -cf64ce4e226c80a7b788f6a673e8c645581168446776d8ea296cae52ff4b15ac9dc98cdcae00f37f4d8ed290da5c87cea15e41818ee78af07b086fd9ad1b2895 prometheus-2.51.1.tar.gz +6ad5825ee6dfe6ba82ad8f091cb1fd8bfaf323558f0171c8e16fccb070fa99865cc9e9137a60405a5ec7c90706469cefefbe25c47e47bc37c30de671981955e3 prometheus-2.52.0.tar.gz f4c222ba836f65d874fb30c62c7a55c27c4cedd6c473e39808a84bb7b4353c79c6ff3cefd3c4cf2ce966ce3a1234db3343cba397c83328ccc4e25072f683fcf5 prometheus.initd 2e47a19e313cbf64f7a57a15de4bea959f5b1c307ef0c2b7f6b254f4abc5504b6ae31b02a1e11487fd82bc975f1cd8e1f3733393823b007f375acbdaf17af8ea prometheus.confd " diff --git a/community/promu/APKBUILD b/community/promu/APKBUILD index 5f97401101c..c751861d750 100644 --- a/community/promu/APKBUILD +++ b/community/promu/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=promu -pkgver=0.16.0 -pkgrel=0 +pkgver=0.17.0 +pkgrel=1 pkgdesc="Prometheus Utility Tool" url="https://github.com/prometheus/promu" arch="all" @@ -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/prosody-filer/APKBUILD b/community/prosody-filer/APKBUILD index 83ed5426b08..847ad328a80 100644 --- a/community/prosody-filer/APKBUILD +++ b/community/prosody-filer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Galen Abell <galen@galenabell.com> pkgname=prosody-filer pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Golang mod_http_upload_external server for Prosody and Ejabberd" url="https://github.com/ThomasLeister/prosody-filer" arch="all" diff --git a/community/pulseaudio-qt/APKBUILD b/community/pulseaudio-qt/APKBUILD index 6215d2da466..2c6139dd171 100644 --- a/community/pulseaudio-qt/APKBUILD +++ b/community/pulseaudio-qt/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-other pkgname=pulseaudio-qt -pkgver=1.4.0 -pkgrel=1 +pkgver=1.5.0 +pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" url="https://invent.kde.org/libraries/pulseaudio-qt" @@ -46,5 +46,5 @@ package() { } sha512sums=" -4bd7d0d50c4720fea59dd7216116de370ea34790c18f80ad01d61c24df5e2b8ee3aa4ddbfa6c19efb0580db6f2089588ecf8cc234ee887fe3d05105b2e63aec3 pulseaudio-qt-1.4.0.tar.xz +c0ce24c10b607b2866eb08bae14bac340de028bbf6ebfdd57ae8f9bd3bbb182cc681a124f20a4f309fd56c97598a33db07c6289d2c9801cc8f395cd424e588b8 pulseaudio-qt-1.5.0.tar.xz " diff --git a/community/pulumi-language-dotnet/APKBUILD b/community/pulumi-language-dotnet/APKBUILD index 17c1ed77c10..05b2191da2f 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.63.1 -pkgrel=0 +pkgrel=1 pkgdesc="Infrastructure as Code SDK (.NET language provider)" url="https://pulumi.com/" # blocked by pulumi diff --git a/community/pulumi-language-java/APKBUILD b/community/pulumi-language-java/APKBUILD index b1213520938..4eb677a538e 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.10.0 -pkgrel=0 +pkgrel=1 pkgdesc="Infrastructure as Code SDK (Java language provider)" url="https://pulumi.com/" # blocked by pulumi diff --git a/community/pulumi-language-yaml/APKBUILD b/community/pulumi-language-yaml/APKBUILD index 5361072db11..4cc61c570f6 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.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="Infrastructure as Code SDK (YAML language provider)" url="https://pulumi.com/" # blocked by pulumi diff --git a/community/pulumi/APKBUILD b/community/pulumi/APKBUILD index e56e81cbad2..16f5249fbe1 100644 --- a/community/pulumi/APKBUILD +++ b/community/pulumi/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=pulumi pkgver=3.115.0 -pkgrel=0 +pkgrel=1 pkgdesc="Infrastructure as Code SDK" url="https://pulumi.com/" # Tests show that pulumi's plugin system doesn't work on any other platforms diff --git a/community/pup/APKBUILD b/community/pup/APKBUILD index 0096dfe7e03..5dfe3d5c346 100644 --- a/community/pup/APKBUILD +++ b/community/pup/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Erwan Rouchet <lucidiot@brainshit.fr> pkgname=pup pkgver=0.4.0 -pkgrel=23 +pkgrel=24 pkgdesc="HTML parser for the command line" url="https://github.com/ericchiang/pup" arch="all" 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..6c90d66ab28 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 +pkgver=5.116.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 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=" @@ -53,5 +53,5 @@ package() { } sha512sums=" -b17cd780ed7947582fbc71430de67ebeaf33432113bbb77fba3736bd608d05fb132d40f7783cba4fdfd7ab3eec60f00676d48be0ce9c601c37f8eccc04d4db31 purpose-5.115.0.tar.xz +3447135ad33c725e0512c6b20a9be81082737146fa0c5a32b0c7d50a21cb5697b2b4796d1cbffc8661dd845ee3ef51bc57af0c94cce0ed14cc1542df822139d5 purpose-5.116.0.tar.xz " diff --git a/community/pushgateway/APKBUILD b/community/pushgateway/APKBUILD index f7dc185a350..58b577be442 100644 --- a/community/pushgateway/APKBUILD +++ b/community/pushgateway/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=pushgateway pkgver=1.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="Prometheus push acceptor for ephemeral and batch jobs" url="https://github.com/prometheus/pushgateway" license="Apache-2.0" 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/py3-aiohttp-retry/APKBUILD b/community/py3-aiohttp-retry/APKBUILD new file mode 100644 index 00000000000..81f868ea867 --- /dev/null +++ b/community/py3-aiohttp-retry/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-aiohttp-retry +_pkgreal=aiohttp_retry +pkgver=2.8.3 +pkgrel=0 +pkgdesc="Simple retry client for aiohttp." +url="https://github.com/inyutin/aiohttp_retry" +arch="noarch" +license="MIT" +depends=" + py3-aiohttp + py3-yarl +" +makedepends=" + py3-gpep517 + py3-setuptools + py3-wheel + " +checkdepends=" + py3-pytest + py3-pytest-aiohttp + py3-pytest-cov + " +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/inyutin/aiohttp_retry/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 .dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +71869c3997e9b5089c298fa6f992b0ed08ca3da0f93c4f37566d8c6b9809bb1873a629cc47f1ffaeccac112d96036851794ee564b11c0f4f1eec00f49413358d py3-aiohttp-retry-2.8.3.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-aiounittest/APKBUILD b/community/py3-aiounittest/APKBUILD new file mode 100644 index 00000000000..b14ade54f76 --- /dev/null +++ b/community/py3-aiounittest/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> +# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> +pkgname=py3-aiounittest +_pkgreal=aiounittest +pkgver=1.4.2 +pkgrel=0 +pkgdesc="Test python asyncio-based code with ease" +url="https://github.com/kwarunek/aiounittest" +arch="noarch" +license="MIT" +depends="py3-wrapt" +makedepends=" + py3-gpep517 + py3-setuptools + py3-wheel + " +checkdepends=" + py3-coverage + py3-pytest + py3-nose + " +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/kwarunek/aiounittest/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 .dist/*.whl + .testenv/bin/python3 -m pytest -v +} + +package() { + python3 -m installer -d "$pkgdir" \ + .dist/*.whl +} + +sha512sums=" +358b7c412f90eb7afc7ed7058e8e2d4426a6c57379d341d997658859ba6054a9a1337d0b05e63a825e28023f02550bd72d65bdb3feab4503c763c98f8c0d19c6 py3-aiounittest-1.4.2.tar.gz +" diff --git a/community/py3-annotated-types/APKBUILD b/community/py3-annotated-types/APKBUILD index 81c7240f6f3..cff6eab0847 100644 --- a/community/py3-annotated-types/APKBUILD +++ b/community/py3-annotated-types/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-annotated-types -pkgver=0.6.0 -pkgrel=1 +pkgver=0.7.0 +pkgrel=0 pkgdesc="Reusable constraint types to use with typing.Annotated" url="https://github.com/annotated-types/annotated-types" arch="noarch" @@ -30,5 +30,5 @@ package() { } sha512sums=" -c4125cdfdc6a16561ac885c97b4300ebe8fe36c0b3ebdf59429002734bf77afb88ffe6c7aa03fdb9a0e5c793c55d3cf825695f1a2d279abf6f366a945447959d py3-annotated-types-0.6.0.tar.gz +1cd43119f9127bcf68929a53158a91cef94d16b7bae3647b830899089b05bb66070ca4ac052e2a0b2fadbe567bca01d7773006568382034b3fbe20678d5fdc9c py3-annotated-types-0.7.0.tar.gz " diff --git a/community/py3-ast-monitor/APKBUILD b/community/py3-ast-monitor/APKBUILD index de4abd0a5d2..b8de91fd0cb 100644 --- a/community/py3-ast-monitor/APKBUILD +++ b/community/py3-ast-monitor/APKBUILD @@ -6,7 +6,7 @@ pkgrel=1 pkgdesc="A wearable Raspberry Pi computer for cyclists" url="https://github.com/firefly-cpp/AST-Monitor" # below blocked by py3-pyqt6-webengine -> qt6-qtwebengine -arch="noarch !armv7 !armhf !ppc64le !riscv64 !s390x" +arch="noarch !armv7 !armhf !ppc64le !riscv64 !s390x !loongarch64" license="MIT" depends=" python3 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-ceph/APKBUILD b/community/py3-bcrypt-ceph/APKBUILD index 96cc56499d2..0f8cd51ac19 100644 --- a/community/py3-bcrypt-ceph/APKBUILD +++ b/community/py3-bcrypt-ceph/APKBUILD @@ -22,7 +22,8 @@ checkdepends="py3-pytest" options="net" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/pyca/$_pkgname/archive/$pkgver.tar.gz - name.patch" + name.patch + cargo-update.patch" builddir="$srcdir/$_pkgname-$pkgver" prepare() { @@ -50,4 +51,5 @@ package() { sha512sums=" eb7b1d67a2d60e82e2d2e4dcb12d7808be910f9b7aefab714a22dedbffc3722182875fdcf3c8c650c0bb7c1122e9e8bead92f18bc660043b017a14957467e2a9 py3-bcrypt-ceph-4.0.1.tar.gz 946e67452fbb4634022ee02c8163639af28a185e8f9ce0fe675c7a47450751fa19ff75bf509d576b96671785e85e1a685f6dacdaa1aae1aab0dadca9d43bed61 name.patch +06c5b6c8c7152a40efcad4911b92c1738535fa953938141d70ca4467e87865cd7c2580c785e48b4ffb47b7e6e99c3dd216be6d003de37ccbef02791e0d8f9f0d cargo-update.patch " diff --git a/community/py3-bcrypt-ceph/cargo-update.patch b/community/py3-bcrypt-ceph/cargo-update.patch new file mode 100644 index 00000000000..af8c8ac22bb --- /dev/null +++ b/community/py3-bcrypt-ceph/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/src/_bcrypt/Cargo.lock b/src/_bcrypt/Cargo.lock +index 404be82..925f54d 100644 +--- a/src/_bcrypt/Cargo.lock ++++ b/src/_bcrypt/Cargo.lock +@@ -188,9 +188,9 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.134" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "lock_api" 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-bioframe/APKBUILD b/community/py3-bioframe/APKBUILD index 31afcfb37ee..30090b8cfc2 100644 --- a/community/py3-bioframe/APKBUILD +++ b/community/py3-bioframe/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-bioframe -pkgver=0.6.4 -pkgrel=1 +pkgver=0.7.0 +pkgrel=0 pkgdesc="Pandas utilities for tab-delimited and other genomic data files" url="https://github.com/open2c/bioframe" arch="noarch !armhf !armv7 !x86 !riscv64" #assertion errors @@ -24,7 +24,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 -n auto + .testenv/bin/python3 -m pytest -n auto --ignore="tests/test_fileops.py" } package() { @@ -35,5 +35,5 @@ package() { } sha512sums=" -f9698c55872cb770676189f4f464f19468cec9a727234ab9ce5ee79c4bfe405ce5897b43112339b4047bd15db3654074e2e120290470183959513943a01fc519 bioframe-0.6.4.tar.gz +4d8a8a7ab63ccb5df50c1a24d53730b80aaed18852694957646cbd405dd5e521c7244c4e70afae02adf193489ed32199cf8eff0338a6afd1a8ae0e1d6e751a9a bioframe-0.7.0.tar.gz " diff --git a/community/py3-boto3/APKBUILD b/community/py3-boto3/APKBUILD index f1faedc895d..b2f2af65a61 100644 --- a/community/py3-boto3/APKBUILD +++ b/community/py3-boto3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-boto3 -pkgver=1.34.95 +pkgver=1.34.108 pkgrel=0 pkgdesc="AWS SDK for Python (Boto3)" url="https://aws.amazon.com/sdk-for-python/" @@ -37,5 +37,5 @@ package() { } sha512sums=" -f6d57435da348c9ef5a3997188e97bb975c709bdd0b998c228276027ea5acb926e43f5ed28c1dd4a02e9f0cfb7dbac827dc04ec111d1431928e3f5fb854f19a7 boto3-1.34.95.tar.gz +82fd04bc7d18e5799a70b8ecaece9fe555a0bea87a99e8e07297cb530645c2891f7108f7cfc0f7d0703a2c5d2cda1544dad94eeed3c38d0230639864ff5ec7d7 boto3-1.34.108.tar.gz " diff --git a/community/py3-botocore/APKBUILD b/community/py3-botocore/APKBUILD index ab6062907ad..d3f86258e31 100644 --- a/community/py3-botocore/APKBUILD +++ b/community/py3-botocore/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-botocore # Verify required version from py3-boto3 on this package before upgrading -pkgver=1.34.39 -pkgrel=1 +pkgver=1.34.108 +pkgrel=0 pkgdesc="The low-level, core functionality of Boto3" url="https://github.com/boto/botocore" arch="noarch" @@ -39,5 +39,5 @@ package() { } sha512sums=" -5b3703f13167ea0a6b1483c6c7a1b446e417b84254cb8e86a682bdacd6d544f63846096d43e3e5b24512acdecd1e48ba341d204c1e0e38776ae72e13d14fae5c botocore-1.34.39.tar.gz +e78969bed3131be3144e2b3ab3a5dcd187103a1efa8f0d4472ed281f869a8570335fbe28c490954dbdd0b8e8881d74d6335ae99af5f3d5344b49183f336f990e botocore-1.34.108.tar.gz " diff --git a/community/py3-cairocffi/APKBUILD b/community/py3-cairocffi/APKBUILD index 97284715722..cca8384f744 100644 --- a/community/py3-cairocffi/APKBUILD +++ b/community/py3-cairocffi/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-cairocffi _pkgname=cairocffi -pkgver=1.6.1 -pkgrel=2 +pkgver=1.7.0 +pkgrel=0 pkgdesc="Python CFFI-based binding to Cairo and GDK-PixBuf" url="https://github.com/Kozea/cairocffi" arch="noarch" @@ -40,5 +40,5 @@ package() { } sha512sums=" -5489263b7e7e2aca7291860a90a6339d35e819cc03a9add47cd21b4ec0cb0274445c3e852ee3be127c42d8b5d9fcb98b02ff7eb66e3d9d243bd33527ce6ddf5c cairocffi-1.6.1.tar.gz +bfc0f388a6ea1885523d99ad0ccfd59fec89848ef053c240ea9e3e8aab3f3aed5dc343b74de5cc72fb8512d460e55c70ef99a4ae4705fb1dd92d654a4197d7a9 cairocffi-1.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 efcd981381a..52fb1e969dc 100644 --- a/community/py3-chaospy/APKBUILD +++ b/community/py3-chaospy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-chaospy _pkgorig=chaospy -pkgver=4.3.14 +pkgver=4.3.15 pkgrel=0 pkgdesc="Numerical tool for performing uncertainty quantification" url="https://github.com/jonathf/chaospy" @@ -44,6 +44,6 @@ package() { } sha512sums=" -d25f183a80907db8ffb8adc7b209ff0af4e9c588cb38724574efc95ae92e9b38bb00893abd89f73c74cbe5ff3dba78cd4a29e60e267fbb258e9ba3578f8f47df py3-chaospy-4.3.14.tar.gz +64527e2f14e64bbb227c904031b35c9cc6c395e2e5f3812af6ee00beeacbed985a6e30fdf56aa60bc533be528afa085c53c89d0e210cc2bc8be05864d74da591 py3-chaospy-4.3.15.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 de97390bf97..f7cc6647477 100644 --- a/community/py3-cliff/APKBUILD +++ b/community/py3-cliff/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=py3-cliff -pkgver=4.6.0 +pkgver=4.7.0 pkgrel=0 pkgdesc="Command Line Interface Formulation Framework" url="https://docs.openstack.org/cliff/latest/" @@ -19,9 +19,13 @@ makedepends=" py3-wheel " checkdepends=" + py3-autopage + py3-cmd2 + py3-docutils py3-pytest py3-prettytable py3-stevedore + py3-testtools " subpackages="$pkgname-pyc" source="https://pypi.python.org/packages/source/c/cliff/cliff-$pkgver.tar.gz" @@ -46,5 +50,5 @@ package() { } sha512sums=" -59e887eddbdf695927e9ece46749f3f62557fd20bb24d7ff109f174a4ae4886cb3b44994903522c1d31c83b9f7f101f16604f6ffc4167ed6405e49a09f236dd0 cliff-4.6.0.tar.gz +f1e6a28fbedb911efae02a3827f019411b99afdc316fcb07b115ca2157dcd23bbcce72d2d63b9850bb5b1cb21a4787575528a26d178943f7aba2a125ed9b55e5 cliff-4.7.0.tar.gz " diff --git a/community/py3-cryptography/APKBUILD b/community/py3-cryptography/APKBUILD index d5fffe7cd8f..086926cf142 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" @@ -33,6 +33,7 @@ subpackages="$pkgname-pyc" source="https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-$pkgver.tar.gz https://files.pythonhosted.org/packages/source/c/cryptography_vectors/cryptography_vectors-$pkgver.tar.gz skip-aead-tests-on-32-bit.patch + Cargo-update.patch " builddir="$srcdir/cryptography-$pkgver" options="net" @@ -75,7 +76,8 @@ 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 +c94a839f0e69137ded2043d3776ba5744a42144ef73b52bde537d90a567f754e4be5ee081b3f67f246c299356b87a6948b8e0e123c6b8fdefb6bb575893fdea1 Cargo-update.patch " diff --git a/community/py3-cryptography/Cargo-update.patch b/community/py3-cryptography/Cargo-update.patch new file mode 100644 index 00000000000..0a3afa526d3 --- /dev/null +++ b/community/py3-cryptography/Cargo-update.patch @@ -0,0 +1,17 @@ +#update libc to v0.2.154 to support loongarch64 +diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock +index c60002f..d6fc9d8 100644 +--- a/src/rust/Cargo.lock ++++ b/src/rust/Cargo.lock +@@ -158,9 +158,9 @@ checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + + [[package]] + name = "libc" +-version = "0.2.152" ++version = "0.2.154" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" ++checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" + + [[package]] + name = "lock_api" diff --git a/community/py3-django-allauth/APKBUILD b/community/py3-django-allauth/APKBUILD index f2158176063..9e75e89f415 100644 --- a/community/py3-django-allauth/APKBUILD +++ b/community/py3-django-allauth/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-django-allauth _pyname="django-allauth" -pkgver=0.62.1 +pkgver=0.63.1 pkgrel=0 arch="noarch" pkgdesc="Integrated set of Django applications addressing SSO" @@ -49,5 +49,5 @@ package() { } sha512sums=" -43aeb4e81382bf8f8a616730db365f08c5c73e607606cb38107693d5920504136e3cc66c8515d15343f74ffb7d374d1f6172deba7bc7b3407fa29343a20d95c7 py3-django-allauth-0.62.1.tar.gz +87a5b8e74a5f2bae86c7aa76b160f12eabf692ae021f8edaa4592d189806ea9efa759e55141e24c7b93f344bf10747d18b2c38c1f79028f96ff2182dbf3d0d02 py3-django-allauth-0.63.1.tar.gz " 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-oauth-toolkit/APKBUILD b/community/py3-django-oauth-toolkit/APKBUILD index 857c544018f..4efa556a1bd 100644 --- a/community/py3-django-oauth-toolkit/APKBUILD +++ b/community/py3-django-oauth-toolkit/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=py3-django-oauth-toolkit -pkgver=2.3.0 -pkgrel=1 +pkgver=2.4.0 +pkgrel=0 pkgdesc="OAuth2 Provider for Django" url="https://django-oauth-toolkit.readthedocs.io/" arch="noarch" @@ -50,5 +50,5 @@ package() { } sha512sums=" -6e4701210300e3e04f85a38e3461daebed7f5d305e8d11fc60a31a715f43d9fc2eed50cf5ff381e6ce11dca479a7dadfbdfacab37e06d88a674b872a50c1a9d1 py3-django-oauth-toolkit-2.3.0.tar.gz +ada4c7a7e5154f51f700f1b524461eb3d2899d27792b8cf72de18e5e1eb10c61e42a32596d2c18496ee641124af03e761d0f0453912e0c1d66b6c388976f10f1 py3-django-oauth-toolkit-2.4.0.tar.gz " diff --git a/community/py3-django-redis/APKBUILD b/community/py3-django-redis/APKBUILD index 10e7d3eefc1..5350ad66675 100644 --- a/community/py3-django-redis/APKBUILD +++ b/community/py3-django-redis/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-django-redis _pyname=django-redis pkgver=5.4.0 -pkgrel=1 +pkgrel=2 arch="noarch" pkgdesc="Full featured redis cache backend for Django." url="https://pypi.python.org/project/django-redis" @@ -19,8 +19,12 @@ makedepends=" " checkdepends=" py3-pytest + py3-pytest-django + py3-pytest-cov + py3-pytest-mock + py3-msgpack + valkey " -options="!check" # Missing depends for test source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/d/django-redis/django-redis-$pkgver.tar.gz" builddir="$srcdir"/$_pyname-$pkgver subpackages="$pkgname-pyc" @@ -32,7 +36,15 @@ build() { } check() { - PYTHONPATH="$PYTHONPATH/.dist" pytest -v + valkey-server & + python3 -m venv --clear --without-pip --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + PYTHONPATH=tests \ + .testenv/bin/python3 -m pytest -v || local FAIL=true + pkill valkey-server + if [ "$FAIL" = "true" ]; then + return 1 + fi } package() { diff --git a/community/py3-docopt-ng/APKBUILD b/community/py3-docopt-ng/APKBUILD index aabe0711c43..7c008f10316 100644 --- a/community/py3-docopt-ng/APKBUILD +++ b/community/py3-docopt-ng/APKBUILD @@ -1,7 +1,7 @@ -# Maintainer: +# Maintainer: Daniel Mizyrycki <mzdaniel@glidelink.net> pkgname=py3-docopt-ng pkgver=0.9.0 -pkgrel=2 +pkgrel=3 pkgdesc="Humane command line arguments parser" url="https://github.com/jazzband/docopt-ng" arch="noarch" @@ -13,9 +13,10 @@ makedepends=" " checkdepends="py3-pytest" subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://github.com/jazzband/docopt-ng/archive/refs/tags/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/jazzband/docopt-ng/archive/refs/tags/$pkgver.tar.gz + fix-PytestRemovedIn9Warning.patch + " builddir="$srcdir/docopt-ng-$pkgver" -options="!check" # todo build() { gpep517 build-wheel \ @@ -36,4 +37,5 @@ package() { sha512sums=" 51d52d9fc459702006d2362c23effb3122453efe49c4a10aa5bb6adc7661c77e5eb6445afb937512c9840687880b2579212188e6bb7f8c16562725cf7c809a6d py3-docopt-ng-0.9.0.tar.gz +1f2474220c395c5843936a32c616a69d1bd0017d169ed7aa9f3a9279621524690fb2f97fe7d4ce178807135a8642bb1c23758b71866584c46e67836a544bcc48 fix-PytestRemovedIn9Warning.patch " diff --git a/community/py3-docopt-ng/fix-PytestRemovedIn9Warning.patch b/community/py3-docopt-ng/fix-PytestRemovedIn9Warning.patch new file mode 100644 index 00000000000..9beba291dd7 --- /dev/null +++ b/community/py3-docopt-ng/fix-PytestRemovedIn9Warning.patch @@ -0,0 +1,11 @@ +--- docopt-ng-0.9.0-orig/tests/conftest.py 2023-05-30 13:38:46.000000000 -0700 ++++ docopt-ng-0.9.0/tests/conftest.py 2024-05-22 16:12:53.952007724 -0700 +@@ -10,7 +10,7 @@ import pytest + import docopt + + +-def pytest_collect_file(file_path: Path, path, parent): ++def pytest_collect_file(file_path: Path, parent): + if file_path.suffix == ".docopt" and file_path.stem.startswith("test"): + return DocoptTestFile.from_parent(path=file_path, parent=parent) + diff --git a/community/py3-emoji/APKBUILD b/community/py3-emoji/APKBUILD index 3d97e592721..f0bedce934a 100644 --- a/community/py3-emoji/APKBUILD +++ b/community/py3-emoji/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-emoji _pkgorig=emoji -pkgver=2.11.1 +pkgver=2.12.1 pkgrel=0 pkgdesc="Emoji terminal output for Python" url="https://github.com/carpedm20/emoji" arch="noarch" license="BSD-3-Clause" -depends="python3" +depends="python3 py3-typing-extensions" makedepends="py3-gpep517 py3-setuptools py3-wheel" checkdepends="py3-pytest-xdist" subpackages="$pkgname-pyc" @@ -33,5 +33,5 @@ package() { } sha512sums=" -c200e3b143569ba6890b5c83721d9c8fbd76288e05e8d8dad02b853adc79fab5886a6a9606fd361430c9cd42689c24f05583bbe1c4aeff520fff4591aa443af5 py3-emoji-2.11.1.tar.gz +98c1ecf986c7623122c9d101c82f7667d30b58b6e45c834f2644bae1659c67755dd9a4f025111b74508267861ad155131d4aefb8f951566f6950e64e7d3a3d24 py3-emoji-2.12.1.tar.gz " diff --git a/community/py3-evdev/APKBUILD b/community/py3-evdev/APKBUILD index 46c1012d919..035f44d57fc 100644 --- a/community/py3-evdev/APKBUILD +++ b/community/py3-evdev/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=py3-evdev -pkgver=1.7.0 -pkgrel=1 +pkgver=1.7.1 +pkgrel=0 pkgdesc="Python bindings to the kernel's generic input event interface (evdev) and to uinput" url="https://github.com/gvalkov/python-evdev" arch="all" @@ -32,5 +32,5 @@ package() { } sha512sums=" -79cb8e92f5698b120ba0c4b2603a18907097d130e0128cbad68eb95b50935b6aeadd1e844d4c76909c965719cb5b067e37d0921748be3c7c2493acb58c153521 py3-evdev-1.7.0.tar.gz +802ba7c252a8817c60480db90b28e89b8356580d7b7f6a35725c70fcacbcabb3d3216330f6639ece940d901434cf1617d7682d344b7428fd5c5b6ab940700ff8 py3-evdev-1.7.1.tar.gz " diff --git a/community/py3-faker/APKBUILD b/community/py3-faker/APKBUILD index 0c88941f530..29b7d206097 100644 --- a/community/py3-faker/APKBUILD +++ b/community/py3-faker/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=py3-faker _pyname=Faker -pkgver=25.0.1 +pkgver=25.2.0 pkgrel=0 pkgdesc="Python package that generates fake data for you" url="https://faker.readthedocs.io/en/master" @@ -49,5 +49,5 @@ package() { } sha512sums=" -0f0cfc86f76584320fc6ab0afae40da8c022b65fca07eff639ba9a89744814afc7f9e37c987a73d0ec025fa971c0468f3b8b026b16dc4a5813bacb9562a33384 Faker-25.0.1.tar.gz +bec0a516944f36a4714bcb9b8d46dbd4ab3fb3feb6d4818fd28e9d22d0cfd1621845f669940d41365ec423398ef58714e18de5ae537ce7524cf27018ab088c8f Faker-25.2.0.tar.gz " diff --git a/community/py3-fakeredis/APKBUILD b/community/py3-fakeredis/APKBUILD index 8c945f86dd9..22b42077dab 100644 --- a/community/py3-fakeredis/APKBUILD +++ b/community/py3-fakeredis/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=py3-fakeredis _pkgname=${pkgname#py3-} -pkgver=2.22.0 +pkgver=2.23.2 pkgrel=0 pkgdesc="Fake implementation of redis API for testing purposes" url="https://pypi.org/project/fakeredis/" @@ -41,6 +41,6 @@ package() { } sha512sums=" -a533f26c2a4289b1b4d398ee426f44c93f01a4aac0dc841854bf94674d7e0738fde38ea896280d4e83bf16041dba505db13e3fa3837a912dc872b1d36c05cc6e py3-fakeredis-2.22.0.tar.gz +0994f7c7e955a8cc7b1046f62d37841ea592022f21c34cf1f7d3bb335ba88bda5abf08fa002b4b7c9f0b09a6837a38b1b49cec44a3185e16ab4d4711ad4f95d4 py3-fakeredis-2.23.2.tar.gz 69ffb5c3eb8e991cdfe8900c72df3de421b696ecab55fadd51ba30d3283cf71e64ad80ceef298e0aa93ea1504a4f98ef2df37488d9498050aef01975e67e019c fix-test-exception-msg.patch " diff --git a/community/py3-fiona/APKBUILD b/community/py3-fiona/APKBUILD index 3d9f1d7f4fc..f9834f9f637 100644 --- a/community/py3-fiona/APKBUILD +++ b/community/py3-fiona/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-fiona pkgver=1.9.6 -pkgrel=1 +pkgrel=2 pkgdesc="Fiona reads and writes geographical data files" url="https://github.com/Toblerity/Fiona" arch="all" diff --git a/community/py3-flexmock/APKBUILD b/community/py3-flexmock/APKBUILD index cc7250ace58..2e8f226ae20 100644 --- a/community/py3-flexmock/APKBUILD +++ b/community/py3-flexmock/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=py3-flexmock -pkgver=0.12.0 -pkgrel=1 +pkgver=0.12.1 +pkgrel=0 pkgdesc="Testing library for creating mocks, stubs and fakes" url="https://github.com/flexmock/flexmock" license="BSD-2-Clause" @@ -31,5 +31,5 @@ package() { } sha512sums=" -a157c5ccb88a1e00bac9124145f882e59633f406971df0940579a12b9e161a787790a0ce27664997faa6ddc7c8926122359bd5b31fae0d31c729e5ed140e745e py3-flexmock-0.12.0.tar.gz +e168790ee2ce19ce87d9da438a45903663a3ff6679bc3afd90aee3e9e2960a50a8210fbac7752ff6c77982e441a1869ec47b3d310971f5f05da57014e372ab90 py3-flexmock-0.12.1.tar.gz " diff --git a/community/py3-gitlab/APKBUILD b/community/py3-gitlab/APKBUILD index 28fac140ffc..687b1479d52 100644 --- a/community/py3-gitlab/APKBUILD +++ b/community/py3-gitlab/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=py3-gitlab _pyname=${pkgname/py3/python} -pkgver=4.4.0 -pkgrel=1 +pkgver=4.5.0 +pkgrel=0 pkgdesc="Python wrapper for Gitlab's API" url="https://github.com/python-gitlab/python-gitlab" arch="noarch" @@ -45,5 +45,5 @@ package() { } sha512sums=" -cb572d169d948dcd74b1d85fb4e8fc2b2593ad167dd708f38bcaf5cccacc8a8b32231b2231d9cb69909e63ba0ce2c6f1cf522f21df56659343314ea2c0d39645 py3-gitlab-4.4.0.tar.gz +3ad6f5de418bea379d049974e58c50d3b8363c113e8e6d0bdfb95c2be9c99801c900f4fa38f783f6381251906db3e24c3d138b22160c2992294e251d10500f72 py3-gitlab-4.5.0.tar.gz " diff --git a/community/py3-hypothesis/APKBUILD b/community/py3-hypothesis/APKBUILD index 06767ebdeb2..6f228cbcb40 100644 --- a/community/py3-hypothesis/APKBUILD +++ b/community/py3-hypothesis/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Michał Polański <michal@polanski.me> pkgname=py3-hypothesis -pkgver=6.100.1 +pkgver=6.102.4 pkgrel=0 pkgdesc="Advanced property-based (QuickCheck-like) testing for Python" options="!check" @@ -40,5 +40,5 @@ package() { } sha512sums=" -4b46c5dfb330c65c8fc4afce90ed28309fc377e39d65b1ba0bf086efb5fe53b2be021bcb5e6a90fa6bdad463de6254761faab14fe2ad7814e84dfff08ff1a9d9 py3-hypothesis-6.100.1.tar.gz +5e758ec308ae8bbd11a0c715a537541de63ef74bba664f666031d4948cc186a7a450aea77eacbc970c97215f79eda89a85bb77b5cb878b27a5ac99fd053be1b6 py3-hypothesis-6.102.4.tar.gz " diff --git a/community/py3-inotify/APKBUILD b/community/py3-inotify/APKBUILD index c2c66bf640c..525f8d71961 100644 --- a/community/py3-inotify/APKBUILD +++ b/community/py3-inotify/APKBUILD @@ -11,7 +11,7 @@ license="MIT" makedepends="py3-setuptools python3-dev" subpackages="$pkgname-pyc" source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz - riscv64-and-aarch64.patch + riscv64-aarch64-and-loongarch64.patch force-c-ext.patch " builddir="$srcdir"/$_pkgname-$pkgver @@ -29,6 +29,6 @@ package() { sha512sums=" b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5 pyinotify-0.9.6.tar.gz -83c2f30461b43736088b47cc528ca058cc8975367c48c89bead53a48f9d65b34f267085178d815960c88958f47c138a6f133479b8961f1f1ff51b15bc61d1378 riscv64-and-aarch64.patch +34db9ae6d0d2fd3cabb7be2eefc772d05cdb048041af5ac128f10a75943803250d3dfb69d3126e07692f2ba9bfc5a8130ff4115f8d8c5d8c736c34a7e9b709ec riscv64-aarch64-and-loongarch64.patch 28fe821c7fd4edf5f359c2d6026bfe95477ed167ea6948b3785d3c1708513c0e038dd4d9f3988a26c02c43bfaac9acb0357ee7edd6d5b0b7ae6c40000e31c485 force-c-ext.patch " diff --git a/community/py3-inotify/riscv64-and-aarch64.patch b/community/py3-inotify/riscv64-aarch64-and-loongarch64.patch index 1a60fcf7982..964ddf1a2fa 100644 --- a/community/py3-inotify/riscv64-and-aarch64.patch +++ b/community/py3-inotify/riscv64-aarch64-and-loongarch64.patch @@ -1,4 +1,4 @@ -Both riscv64 and aarch64 use the system call numbers defined in +riscv64 aarch64 and loongarch64 use the system call numbers defined in include/uapi/asm-generic/unistd.h in the Linux source tree. diff -upr pyinotify-0.9.6.orig/common/inotify_syscalls.c pyinotify-0.9.6/common/inotify_syscalls.c @@ -8,7 +8,7 @@ diff -upr pyinotify-0.9.6.orig/common/inotify_syscalls.c pyinotify-0.9.6/common/ # define __NR_inotify_init 316 # define __NR_inotify_add_watch 317 # define __NR_inotify_rm_watch 318 -+# elif defined (__aarch64__) || defined(__riscv) ++# elif defined (__aarch64__) || defined(__riscv) || defined(__loongarch64) +# define __NR_inotify_init 26 +# define __NR_inotify_add_watch 27 +# define __NR_inotify_rm_watch 28 diff --git a/community/py3-jwcrypto/APKBUILD b/community/py3-jwcrypto/APKBUILD index 65115b4ff3a..ab6582fcfcc 100644 --- a/community/py3-jwcrypto/APKBUILD +++ b/community/py3-jwcrypto/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: prspkt <prspkt@protonmail.com> pkgname=py3-jwcrypto _pkgname=jwcrypto -pkgver=1.5.1 -pkgrel=1 +pkgver=1.5.6 +pkgrel=0 pkgdesc="Python module implementing JOSE Web standards" url="https://github.com/latchset/jwcrypto" arch="noarch" license="LGPL-3.0-only" -depends="python3 py3-deprecated py3-cryptography" +depends="python3 py3-typing-extensions py3-cryptography" makedepends="py3-gpep517 py3-setuptools py3-wheel" checkdepends="py3-pytest" subpackages="$pkgname-doc $pkgname-pyc" @@ -37,5 +37,5 @@ package() { } sha512sums=" -888ec851f2a213f4490c7f97306250b69804c8532b6bbfea7eee36d64ae4e5d61d0bff8eed619dd2244bc78d710b593b9c943c4b8b344f475d3298c23dbcaf5e jwcrypto-1.5.1.tar.gz +321de20492ee509de261d1fb2b20e3a94239db76fec45deca50b3e0ce7163bf0051bb4433a6eb24bffd2bd657d41c50b403fa7477a6b95b8d043e3fda5cdaac2 jwcrypto-1.5.6.tar.gz " diff --git a/community/py3-mizani/APKBUILD b/community/py3-mizani/APKBUILD index cb605fe4b63..cefa9a49fca 100644 --- a/community/py3-mizani/APKBUILD +++ b/community/py3-mizani/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-mizani -pkgver=0.11.2 +pkgver=0.11.4 pkgrel=0 pkgdesc="A scales package for python" url="https://github.com/has2k1/mizani" @@ -41,5 +41,5 @@ package() { } sha512sums=" -820be6be1024cf114f4c4eaef2cd1187ab33eec2318cd4b88276a2c50e097b35714b304bf04f424a15aa2f5a961d95b628f2926755954e3ea290baa759e5f74d mizani-0.11.2.tar.gz +d50d9c2108a7f1ed742d63b1af933e871c699db331ef1e0a4b6d0856c4c207c0c16b3c68d6ddef2871f9351e9d9d66c1ed150d8fe8bd86acb36350136c8687e3 mizani-0.11.4.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 93ce6653ed8..f4cf82ff7d6 100644 --- a/community/py3-msoffcrypto-tool/APKBUILD +++ b/community/py3-msoffcrypto-tool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-msoffcrypto-tool -pkgver=5.4.0 +pkgver=5.4.1 pkgrel=0 pkgdesc="tool and library for decrypting MS Office files with passwords or other keys" url="https://github.com/nolze/msoffcrypto-tool" @@ -35,5 +35,5 @@ package() { } sha512sums=" -bebb727754512b0f1f011538d65f113d0b63c59b758fc5d427202c74587f9efc091cf5747098f6b50df40761a143ba8732a9a5e253827bcffb5f5577af986a0c py3-msoffcrypto-tool-5.4.0.tar.gz +1244952ba2c6f8ab832d258dd34d93c4c34e13af9c8ee8fd000695db5378ea042df48d5c5d9f4d50a0ddf84a4f631b9506e655b7dc6a0464a8ae3154755f58f7 py3-msoffcrypto-tool-5.4.1.tar.gz " diff --git a/community/py3-mypy/APKBUILD b/community/py3-mypy/APKBUILD index c0de93a5cbb..87b56e8a95e 100644 --- a/community/py3-mypy/APKBUILD +++ b/community/py3-mypy/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Justin Berthault <justin.berthault@zaclys.net> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-mypy -pkgver=1.9.0 -pkgrel=1 +pkgver=1.10.0 +pkgrel=0 pkgdesc="Optional static typing for Python (PEP484)" url="https://mypy-lang.org/" arch="noarch" @@ -14,7 +14,7 @@ depends=" makedepends="python3-dev py3-gpep517 py3-setuptools py3-wheel" checkdepends="py3-pytest py3-pytest-xdist py3-lxml py3-typed-ast py3-virtualenv" subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://github.com/python/mypy/archive/refs/tags/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/python/mypy/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir/mypy-$pkgver" options="!check" # they take forever @@ -36,5 +36,5 @@ package() { } sha512sums=" -aaa975b97e72f00a384a38fee190e39c6469b062a7083c76bb94bb7058ed38f713f65b96bb36a871a430633cab424a0f11e995868f867e2f7a13c4754ed96c89 py3-mypy-1.9.0.tar.gz +c936c299d9d4b6911505ef7b7df6f8d7344bd199a2d654e66467291f6e6ba4432dfa7aed5a504e6ec9518d9d53ac85f771e7b31dc6a72e06e79c443547bc2b66 py3-mypy-1.10.0.tar.gz " diff --git a/community/py3-niapy/APKBUILD b/community/py3-niapy/APKBUILD index c194965db3d..30b726f641e 100644 --- a/community/py3-niapy/APKBUILD +++ b/community/py3-niapy/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-niapy _pkgorig=NiaPy -pkgver=2.1.0 -pkgrel=1 +pkgver=2.3.1 +pkgrel=0 pkgdesc="Python micro framework for building nature-inspired algorithms" url="https://niapy.org" arch="noarch" @@ -12,7 +12,7 @@ depends="python3 py3-numpy py3-pandas py3-openpyxl py3-matplotlib" checkdepends="py3-pytest-xdist" makedepends="py3-gpep517 py3-poetry-core" subpackages="$pkgname-doc $pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://github.com/NiaOrg/NiaPy/archive/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/NiaOrg/NiaPy/archive/v$pkgver/niapy-$pkgver.tar.gz" builddir="$srcdir/$_pkgorig-$pkgver" build() { @@ -38,5 +38,5 @@ package() { } sha512sums=" -d877a0b70ce7bf6208593d08f3f7bd4819a663e3fd3dcae57473ceef1505cf1a881ee82a7e92ebc153d8044df959800110c9915641668c90ebd9bee30fef591e py3-niapy-2.1.0.tar.gz +184fea05c8790cc77f04ec974a78ad8b1c7677d6fab59695efd90b4c793967f97f8c48b7d79d863bad9df7224e3120d0ee714940847f5414d01715aafe7e562b py3-niapy-2.3.1.tar.gz " diff --git a/community/py3-nose2/APKBUILD b/community/py3-nose2/APKBUILD index 54fab0685fd..1180baa2540 100644 --- a/community/py3-nose2/APKBUILD +++ b/community/py3-nose2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=py3-nose2 -pkgver=0.14.1 -pkgrel=1 +pkgver=0.14.2 +pkgrel=0 pkgdesc="Successor to nose, based on unittest" url="https://docs.nose2.io/en/latest/" arch="noarch" @@ -35,5 +35,5 @@ package() { } sha512sums=" -7cd4e4a67dfd87ce85927aa65137ca7df926e8a4b83162131cb081cbec357e951693826d43f92beb92af0e1d690c8f0a3f8cf6b0b58f174ae2516383892b5207 nose2-0.14.1.tar.gz +2f6317bc45177194f62b0e664bd6dcba50c8c8f593500edd8b4562a6bc784ceb52d931cc296869673d15142aceaeb1267a4edfdb5e14e3007eac035e6e18a3db nose2-0.14.2.tar.gz " diff --git a/community/py3-numpoly/APKBUILD b/community/py3-numpoly/APKBUILD index 93aeeaee7fe..3dd322d5b1b 100644 --- a/community/py3-numpoly/APKBUILD +++ b/community/py3-numpoly/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-numpoly _pkgorig=numpoly -pkgver=1.2.11 -pkgrel=2 +pkgver=1.2.12 +pkgrel=0 pkgdesc="Numpy compatible polynomial representation" url="https://github.com/jonathf/numpoly" arch="noarch !armhf !armv7 !x86 !ppc64le" # failed tests on 32 bit @@ -32,5 +32,5 @@ package() { } sha512sums=" -63359e18368d2476cbe4ed991db4925e6c45704bb4cd61211118f45cd6dc6f87dcb3f5332abb658f4653f034fd0210a83eaf55a1fbe57f9fda5e6508af4428b4 numpoly-1.2.11.tar.gz +2c1b6d545e73cadd63d4b04204b65ebe391f1fe80b3ecc812a3a8107c934519827280229adc1fe6b9a615d0450999d490ed60bdd9315ae3b299db8dcea6a868c numpoly-1.2.12.tar.gz " diff --git a/community/py3-oci/APKBUILD b/community/py3-oci/APKBUILD index 2dafd31cdb9..3ec37fc5346 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.126.1 +pkgver=2.126.3 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=" -375b1a43a5c9a480c842f3545c00695fb2359e3d10fa9cef261bd1ea6d603299740ec265663c17b385bf076b46125e54a2238c069dae7000a96d4fd2224a07bc py3-oci.2.126.1.tar.gz +f4c9c0e9f4ba8267ca02702878faf9a437624006a47c3e52bbcb7e159ea47b9d8c1928321abd81d80c1919ac0a4007fa163704dc715c419b6aa7a533f418faf8 py3-oci.2.126.3.tar.gz e88495f19a3b9bd4b4b086007e2c93d6200aa316e93c1ec58b31794afb58967994f061a5ad1346edbbecd9119cea7a60c1e2ac6cba99f78b4e349b8f594ce01f vcr.patch " diff --git a/community/py3-opfunu/APKBUILD b/community/py3-opfunu/APKBUILD index b2adfbc7acd..5160a5855d2 100644 --- a/community/py3-opfunu/APKBUILD +++ b/community/py3-opfunu/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-opfunu _pkgorig=opfunu -pkgver=1.0.2 -pkgrel=1 +pkgver=1.0.3 +pkgrel=0 pkgdesc="A collection of Benchmark functions for numerical optimization problems" url="https://github.com/thieu1995/opfunu" arch="noarch" @@ -33,5 +33,5 @@ package() { } sha512sums=" -5dceb2ba9ed56131b2a50f88bc03c229934bedbb1367227a8458a8fe2a3a255c839662da1dc021f67f237f4e4a369f7af42cd59415f1704d79291679d7069224 py3-opfunu-1.0.2.tar.gz +deca160a397f4ef1714cd80db0d44835934d989d4c8bb2a893a14d8026897eaf1ed68d374affa938c662ca32601e3689263b3644cc395f918744e26a0e6310c7 py3-opfunu-1.0.3.tar.gz " diff --git a/community/py3-pandas/APKBUILD b/community/py3-pandas/APKBUILD index 76ccad8d306..09ac9cd122e 100644 --- a/community/py3-pandas/APKBUILD +++ b/community/py3-pandas/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-pandas _pkgname=pandas pkgver=2.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="Powerful data structures for data analysis, time series, and statistics" url="https://pandas.pydata.org/" arch="all" @@ -12,6 +12,7 @@ depends=" py3-dateutil py3-numpy py3-tz + py3-tzdata " makedepends=" cython diff --git a/community/py3-peewee/APKBUILD b/community/py3-peewee/APKBUILD index 6674b9eda3f..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.3 +pkgver=3.17.5 pkgrel=0 pkgdesc="Small, expressive ORM" url="https://github.com/coleifer/peewee" @@ -39,5 +39,5 @@ package() { } sha512sums=" -d7d0c716c1b6600275c151894ea8738c3393e554627ae4d8cf0d52548be99cfaf31e5553f51762cedc7f9e66a779ddef60d305a3797e3db71ac1a2178bb45468 py3-peewee-3.17.3.tar.gz +b9878450a0759740f28cb6425ba0f14aa92e037bc4c888c13ae24bc38993787e64bff6342edcdf5364b5aac97c405e1c8e53e1140016e6bdbeba6d57d7f339ec py3-peewee-3.17.5.tar.gz " diff --git a/community/py3-pgspecial/APKBUILD b/community/py3-pgspecial/APKBUILD index 57bd0b9e6a6..dd83d414b47 100644 --- a/community/py3-pgspecial/APKBUILD +++ b/community/py3-pgspecial/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Thomas Boerger <thomas@webhippie.de> # Maintainer: omni <omni+alpine@hack.org> pkgname=py3-pgspecial -_pkgname=pgspecial -pkgver=2.1.1 -pkgrel=1 +pkgver=2.1.2 +pkgrel=0 pkgdesc="Meta-commands handler for Postgres Database" url="https://pypi.org/project/pgspecial" arch="noarch" @@ -12,8 +11,8 @@ depends="py3-click py3-psycopg-c py3-sqlparse" makedepends="py3-gpep517 py3-setuptools py3-wheel" checkdepends="py3-pytest py3-configobj" subpackages="$pkgname-pyc" -source="$_pkgname-$pkgver.tar.gz::https://github.com/dbcli/pgspecial/archive/refs/tags/v$pkgver.tar.gz" -builddir="$srcdir/$_pkgname-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/dbcli/pgspecial/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/pgspecial-$pkgver" replaces="py-pgspecial" # Backwards compatibility provides="py-pgspecial=$pkgver-r$pkgrel" # Backwards compatibility @@ -33,5 +32,5 @@ package() { } sha512sums=" -21d93af2aac0b9390e336b63ccec652ff18d8d99b0248370d1cb6cf5d8a688c952e9cc198f0dd9f31135c4735d53f5982ede11ea2d02b42b247260a81e747993 pgspecial-2.1.1.tar.gz +d5457edfe09dfb0a75c3dd65ea6e77199f5738a7f03f7c8c316956749a8f010a8a3d2dfdc09bd345f3cc1a7c3b7d4656ceb7a3fa61f9f3f62835c0eab320875c py3-pgspecial-2.1.2.tar.gz " diff --git a/community/py3-phonenumbers/APKBUILD b/community/py3-phonenumbers/APKBUILD index 768b82daa12..a2f30e2f051 100644 --- a/community/py3-phonenumbers/APKBUILD +++ b/community/py3-phonenumbers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org> # Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org> pkgname=py3-phonenumbers -pkgver=8.13.35 +pkgver=8.13.37 pkgrel=0 pkgdesc="International phone number library for Python" url="https://github.com/daviddrysdale/python-phonenumbers" @@ -38,5 +38,5 @@ package() { } sha512sums=" -56c94f535f104532269f71fe8bcd796ce96f500d3d7002329074c1333ae35b8bbe5ef67ab284914c38153514e93c9d60c249ea88c4a791f483aead527a4a0185 phonenumbers-8.13.35.tar.gz +fc7868e143841cacf203134e3db651c156030feb701c34f5fdbbd3282543a1a8b236168ca5243d8b6e20e8e37c7fcf03b34ee4fd7a3679bce28871147ff7625c phonenumbers-8.13.37.tar.gz " diff --git a/community/py3-pikepdf/APKBUILD b/community/py3-pikepdf/APKBUILD index d55d09b87d1..f65934a26fe 100644 --- a/community/py3-pikepdf/APKBUILD +++ b/community/py3-pikepdf/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> pkgname=py3-pikepdf _pyname=pikepdf -pkgver=8.14.0 -pkgrel=2 +pkgver=8.15.1 +pkgrel=0 pkgdesc="Python library for reading and writing PDF" url="https://github.com/pikepdf/pikepdf" arch="all" @@ -55,5 +55,5 @@ package() { } sha512sums=" -51fa58148c0d9095ed3fd130f6c04a5103796ee1e51e4708ba80100a3d4b71a21c4bd86dbcaf83be7f7a829a8c6957a436ae7778cce146b9da70455ed90a3d68 py3-pikepdf-8.14.0.tar.gz +ac553d773627c2d61331817e4cacd0b3ae6409bb3798931e875b94b2ed151d126e463c00cb7cd25f4bce6caaa88b0015c6dbcef1831b195ecb368d94ef48298c py3-pikepdf-8.15.1.tar.gz " diff --git a/community/py3-platformdirs/APKBUILD b/community/py3-platformdirs/APKBUILD index 6c7dbc2e898..9297b837a86 100644 --- a/community/py3-platformdirs/APKBUILD +++ b/community/py3-platformdirs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-platformdirs -pkgver=4.2.1 +pkgver=4.2.2 pkgrel=0 pkgdesc="Module for determining appropriate platform-specific dirs" url="https://github.com/platformdirs/platformdirs" @@ -30,5 +30,5 @@ package() { } sha512sums=" -c6c671022a74ba35610469f08e9a275daa19f0362a98208096fab147a77abfc96c12a0312fdf65668b3e457e0c06d938f141efec1217ef1a7598a77f65786130 platformdirs-4.2.1.tar.gz +e67aff332a6c84669d77a68e7d5546bfd14e08dcf61681b03447bf6381c0d981c63be0f87fd63bc99f0a51c92bf960902ded83ba8872801c14755ab163d45a0f platformdirs-4.2.2.tar.gz " diff --git a/community/py3-plotnine/APKBUILD b/community/py3-plotnine/APKBUILD index 0f1e2718385..692d6888787 100644 --- a/community/py3-plotnine/APKBUILD +++ b/community/py3-plotnine/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> # Maintainer: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu> pkgname=py3-plotnine -pkgver=0.13.5 +pkgver=0.13.6 pkgrel=0 pkgdesc="A grammar of graphics for Python" url="https://github.com/has2k1/plotnine" @@ -57,5 +57,5 @@ package() { } sha512sums=" -237abcb2e67f4352d38139746ff9d5e276fb2bb3baccaea8f9d5d43fd41eaba2659d1417582ab69064c0e47196495b62fe3f18fdefb5b918875961095e6b4aaf plotnine-0.13.5.tar.gz +b4aca7b3bdc929f13279e68d38b81c1fe35b7fec67cf789d92761fb475c3c68bf178d13ebd583610d592011647fca7b95a3c8f88f12ce55d44ca421f44acd82d plotnine-0.13.6.tar.gz " diff --git a/community/py3-poetry-core/APKBUILD b/community/py3-poetry-core/APKBUILD index fd8df7bbc55..1d2a0cf13f2 100644 --- a/community/py3-poetry-core/APKBUILD +++ b/community/py3-poetry-core/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=py3-poetry-core _pkgname=poetry-core -pkgver=1.8.1 -pkgrel=1 +pkgver=1.9.0 +pkgrel=0 pkgdesc="PEP 517 build backend implementation for Poetry" url="https://github.com/python-poetry/poetry-core" license="MIT" @@ -25,9 +25,7 @@ checkdepends=" python3-dev " subpackages="$pkgname-pyc" -source="$_pkgname-$pkgver.tar.gz::https://github.com/python-poetry/poetry-core/archive/$pkgver.tar.gz - fix-musl.patch - " +source="$_pkgname-$pkgver.tar.gz::https://github.com/python-poetry/poetry-core/archive/$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { @@ -59,6 +57,5 @@ package() { } sha512sums=" -25b4787f45da88142d8cbdad22a518335a82f24ccdba34112ab0f9be8eb130251211969d9da9422bc89fa3c5990adb4e2cde2e3b6f7a4f57f81c6d2b21cf722f poetry-core-1.8.1.tar.gz -b3ac0ac12e9d7f179946c45ae548c8f73a497bf26cf4db3f94e87cc401f7cb9ee12e40788f34b357bdad9f0c4b18b3ac990a90eb0f1c60ace75de521532c92b4 fix-musl.patch +a2d63480f0df36fabe61c234377a4fa9ea0a1ddce449006162d6e49e849c92ad9c77d0a93aba7c51561bac16a77d5db00a95594bd5e2de328e1664f3f41f689b poetry-core-1.9.0.tar.gz " diff --git a/community/py3-poetry-core/fix-musl.patch b/community/py3-poetry-core/fix-musl.patch deleted file mode 100644 index 44f26653fca..00000000000 --- a/community/py3-poetry-core/fix-musl.patch +++ /dev/null @@ -1,21 +0,0 @@ -extended/extended.c:13:9: error: initialization of 'int' from 'void *' makes integer from point -er without a cast [-Werror=int-conversion] - 13 | NULL, - | ^~~~ -extended/extended.c:13:9: note: (near initialization for 'module_methods[0].ml_flags') -cc1: some warnings being treated as errors -error: command '/usr/bin/gcc' failed with exit code 1 - -diff --git a/tests/masonry/builders/fixtures/extended/extended/extended.c b/tests/masonry/builders/fixtures/extended/extended/extended.c -index 25a028e..8980ea3 100644 ---- a/tests/masonry/builders/fixtures/extended/extended/extended.c -+++ b/tests/masonry/builders/fixtures/extended/extended/extended.c -@@ -10,7 +10,7 @@ static PyMethodDef module_methods[] = { - { - "hello", - (PyCFunction) hello, -- NULL, -+ 0, - PyDoc_STR("Say hello.") - }, - {NULL} diff --git a/community/py3-poetry-plugin-export/APKBUILD b/community/py3-poetry-plugin-export/APKBUILD index 07802cdf2c8..09cf94d556b 100644 --- a/community/py3-poetry-plugin-export/APKBUILD +++ b/community/py3-poetry-plugin-export/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=py3-poetry-plugin-export -pkgver=1.6.0 -pkgrel=1 +pkgver=1.8.0 +pkgrel=0 pkgdesc="Poetry plugin to export the dependencies to various formats" url="https://github.com/python-poetry/poetry-plugin-export" license="MIT" @@ -37,6 +37,6 @@ package() { } sha512sums=" -9ea155a2f80b63c0ed7261615041048f0afdacbb21a6c0618cf4174cc76b2c10ac3102eb7325fda760d6cfac0e95b9194b2f16c33395c88dffcea9ddfaf0ac65 py3-poetry-plugin-export-1.6.0.tar.gz +ddaa4ed20601357648fe0187c50d033da5dfc37d66c96b67c83962a88825ec5b49c79b30e60f67c860d381e6ad0cbac084209af806561f50cdc779dcebacaf2b py3-poetry-plugin-export-1.8.0.tar.gz 1bad78c40d1647b32bd2d111179f7f44195c0e606a24f26b87c4ebf3cc05730659a3ebe9ffcf09f9e698ac0421c8f90de58038940f41963bea93be610edc7e41 pytest.patch " 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-pydyf/APKBUILD b/community/py3-pydyf/APKBUILD index acf36e5468d..cc5a5da7296 100644 --- a/community/py3-pydyf/APKBUILD +++ b/community/py3-pydyf/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-pydyf _pyname=pydyf -pkgver=0.9.0 -pkgrel=1 +pkgver=0.10.0 +pkgrel=0 pkgdesc="A low-level PDF generator" url="https://pypi.org/project/pydyf/" arch="noarch" @@ -37,5 +37,5 @@ package() { } sha512sums=" -e834026cae3782f7ac43b47bc30d21f3d1c39bcd4017823aaf01f5da4a67f924650f6e0285107d07bc63743ff4d718b3165a84c5805223305907ba3de45207a5 pydyf-0.9.0.tar.gz +7c35a818569dda0edb0dda5e31c595a65e2637594a7a6815ef3b41e34c10a4f2a1b3412af59f48fee2e72e8bf23c01e651b46130e1927645cbafc7d99c104574 pydyf-0.10.0.tar.gz " 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-pymysql/APKBUILD b/community/py3-pymysql/APKBUILD index 5c875685b92..3b0406c06cc 100644 --- a/community/py3-pymysql/APKBUILD +++ b/community/py3-pymysql/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Thomas Boerger <thomas@webhippie.de> # Maintainer: omni <omni+alpine@hack.org> pkgname=py3-pymysql -_pyname=PyMySQL -pkgver=1.1.0 -pkgrel=1 +pkgver=1.1.1 +pkgrel=0 pkgdesc="Pure Python MySQL Client" url="https://pypi.org/project/PyMySQL" arch="noarch" @@ -11,8 +10,8 @@ license="MIT" options="!check" #require mysql for tests makedepends="py3-gpep517 py3-setuptools py3-wheel" subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pyname:0:1}/$_pyname/$_pyname-$pkgver.tar.gz" -builddir="$srcdir/$_pyname-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/PyMySQL/PyMySQL/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/PyMySQL-$pkgver" replaces="py-pymysql" # Backwards compatibility provides="py-pymysql=$pkgver-r$pkgrel" # Backwards compatibility @@ -29,5 +28,5 @@ package() { } sha512sums=" -51dddc92e766183ab5d93717121d853415561dc81abc7ec8299a73610cae5bc22b6070006d6ea24405ab31bc1ea68be61466a3477c0f84d47435f78ffc60d31e py3-pymysql-1.1.0.tar.gz +ef46ab189760b2d68bb7582b20a537bc68c2719241a4939bff9a6311ab64cb2df852d437ab4b8dd41a0fb5ff620a78c67aa96ccd037d44899dc2886d16218e2c py3-pymysql-1.1.1.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-hooks/APKBUILD b/community/py3-pyproject-hooks/APKBUILD index 63806227b14..b624ff72537 100644 --- a/community/py3-pyproject-hooks/APKBUILD +++ b/community/py3-pyproject-hooks/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-pyproject-hooks -pkgver=1.0.0 -pkgrel=2 +pkgver=1.1.0 +pkgrel=0 pkgdesc="Low-level library for calling build-backends in 'pyproject.toml'-based project" url="https://pyproject-hooks.readthedocs.io/" arch="noarch" @@ -32,5 +32,5 @@ package() { } sha512sums=" -fca9b69859d7e3949b158c2879ba7ebc7305f1edaacdd84b71a92565010176d1194be03a21fd6b9aa65d175cfd8243ba3a50aab617fb56ceac6b263da6613e17 py3-pyproject-hooks-1.0.0.tar.gz +256028d13adbe35126a63431a2a49e0c48adddce5ffc3ff2eebad368eee7ce52591ecfd8a8526876de20bc59dfc87156533d6a97b55538a739873e60f9509eff py3-pyproject-hooks-1.1.0.tar.gz " diff --git a/community/py3-pyqt6-webengine/APKBUILD b/community/py3-pyqt6-webengine/APKBUILD index 67a2edc52e0..4060b1f8607 100644 --- a/community/py3-pyqt6-webengine/APKBUILD +++ b/community/py3-pyqt6-webengine/APKBUILD @@ -5,7 +5,7 @@ pkgrel=1 pkgdesc="Python bindings for the Qt6 WebEngine framework" url="https://pypi.org/project/PyQt6-WebEngine/" # others blocked by qt6-qtwebengine -arch="all !riscv64 !s390x !ppc64le !armv7 !armhf" +arch="all !riscv64 !s390x !ppc64le !armv7 !armhf !loongarch64" license="GPL-3.0-only" depends="py3-qt6" makedepends=" diff --git a/community/py3-pytelegrambotapi/APKBUILD b/community/py3-pytelegrambotapi/APKBUILD index ffc15deb3e2..d1e6abd9ac1 100644 --- a/community/py3-pytelegrambotapi/APKBUILD +++ b/community/py3-pytelegrambotapi/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-pytelegrambotapi -pkgver=4.17.0 +pkgver=4.18.0 # sometimes upstream forgets to tag pypi releases _gittag=$pkgver -pkgrel=1 +pkgrel=0 arch="noarch" pkgdesc="A simple, but extensible Python implementation for the Telegram Bot API." url="https://pypi.org/project/pyTelegramBotAPI/" @@ -42,5 +42,5 @@ package() { } sha512sums=" -6c6a4cf7c45def12613996d7b8ea37130fbdea0acadfbd3edade46ce18dbd66637bf4951534c2a8f50bcf1a1692d83df9c4cf3d3d7bd5e1d49dafee8d6c910bd py3-pytelegrambotapi-4.17.0.tar.gz +c7c69c73b142d01b3938fc481d01385d2ab21d7014b969cd9cbd38527033145240941ab5112ba51fba1b0d1438a3af8df1ef18b25049c736252dab1e832d8848 py3-pytelegrambotapi-4.18.0.tar.gz " diff --git a/community/py3-python-gssapi/APKBUILD b/community/py3-python-gssapi/APKBUILD index 033d22b7691..6854c51d96f 100644 --- a/community/py3-python-gssapi/APKBUILD +++ b/community/py3-python-gssapi/APKBUILD @@ -2,16 +2,16 @@ # Maintainer: Dmitry Romanenko <dmitry@romanenko.in> pkgname=py3-python-gssapi pkgver=1.8.3 -pkgrel=0 +pkgrel=1 pkgdesc="A Python interface to RFC 2743/2744 (plus common extensions)" url="https://github.com/pythongssapi/python-gssapi" arch="all" license="ISC" -depends="python3 krb5-dev py3-decorator" -checkdepends="py3-nose py3-k5test py3-parameterized py3-pytest" -makedepends="cython python3-dev py3-gpep517 py3-setuptools py3-setuptools_scm py3-wheel" +depends="krb5 python3 py3-decorator" +checkdepends="py3-k5test py3-parameterized py3-pytest" +makedepends="cython python3-dev krb5-dev py3-gpep517 py3-setuptools py3-wheel" subpackages="$pkgname-pyc" -source="https://github.com/pythongssapi/python-gssapi/releases/download/v$pkgver/python-gssapi-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/pythongssapi/python-gssapi/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir"/python-gssapi-$pkgver options="!check" # fail to find self for some reason @@ -33,5 +33,5 @@ package() { } sha512sums=" -f08a318beac4b2807f33f5c30ccdafeafed0971537456a477138fe783f7fd9f05ab59cff74030c3041504302b0922307e5c391cd5d0e8b4f370f0036a5ef45b8 python-gssapi-1.8.3.tar.gz +63e6981977cb3f90c734a0f2089fc0628a86709f120814629b85576abe326f2602cfe4c351d7b3fc08cf3999e2b2f0091f829b1f1f9f1a784496bf39a781ddde py3-python-gssapi-1.8.3.tar.gz " diff --git a/community/py3-pytz_deprecation_shim/APKBUILD b/community/py3-pytz_deprecation_shim/APKBUILD deleted file mode 100644 index e447dc43c71..00000000000 --- a/community/py3-pytz_deprecation_shim/APKBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> -# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> -pkgname=py3-pytz_deprecation_shim -_pyname=pytz_deprecation_shim -pkgver=0.1.0 -_pyver=$pkgver.post0 -pkgrel=1 -arch='noarch' -pkgdesc="Shims to help you safely remove pytz" -url="https://pypi.org/project/$_pyname/" -license="MIT" -makedepends=" - py3-setuptools - py3-wheel - py3-installer - py3-gpep517 - " -source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/${_pyname:0:1}/$_pyname/$_pyname-$_pyver.tar.gz" -builddir="$srcdir"/$_pyname-$_pyver -options="!check" # No testsuite -subpackages="$pkgname-pyc" - -build() { - gpep517 build-wheel \ - --wheel-dir dist \ - --output-fd 3 3>&1 >&2 -} - -package() { - python3 -m installer --destdir="$pkgdir" dist/*.whl -} - -sha512sums=" -201eea777f4da9def1b060911da5eaa89652f6716d5608278fdc94a2f67af5ea23a8b667cb181e03d5edd7f0a07f4954047621668f4c2e7bb325dd07f454d0b6 py3-pytz_deprecation_shim-0.1.0.tar.gz -" 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-rapidfuzz/APKBUILD b/community/py3-rapidfuzz/APKBUILD index 13fcf7968d6..e82007b168b 100644 --- a/community/py3-rapidfuzz/APKBUILD +++ b/community/py3-rapidfuzz/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-rapidfuzz -pkgver=3.9.0 +pkgver=3.9.1 pkgrel=0 pkgdesc="Rapid fuzzy string matching in Python using various string metrics" url="https://github.com/maxbachmann/RapidFuzz" @@ -54,5 +54,5 @@ package() { } sha512sums=" -bfd0d399dc75c6654d5e66522a057298d3914f8b74955e873034b314926127971f1bf4ddca0c2c92e81ba5bae79caf249303b169805d48ef3d6c64fb706c9547 rapidfuzz-3.9.0.tar.gz +f8efcc271a823c957b2a00f78ab7bf37133a87027fcb75d9e24cf1629b776d3f970ebe4f596e6685013408637e2e2b3713680c7716e9adb505241b61decee18b rapidfuzz-3.9.1.tar.gz " diff --git a/community/py3-rasterio/APKBUILD b/community/py3-rasterio/APKBUILD index 385b4e58b1f..bd6412ba2d9 100644 --- a/community/py3-rasterio/APKBUILD +++ b/community/py3-rasterio/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=py3-rasterio pkgver=1.3.9 -pkgrel=3 +pkgrel=4 pkgdesc="Fast and direct raster I/O for use with Numpy and SciPy" url="https://pypi.org/project/rasterio" arch="all" diff --git a/community/py3-referencing/APKBUILD b/community/py3-referencing/APKBUILD index 51f685abc71..c559dd228cd 100644 --- a/community/py3-referencing/APKBUILD +++ b/community/py3-referencing/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-referencing -pkgver=0.35.0 +pkgver=0.35.1 pkgrel=0 pkgdesc="Cross-specification JSON referencing" url="https://github.com/python-jsonschema/referencing" @@ -33,5 +33,5 @@ package() { } sha512sums=" -c637a3767a7d03445adb14bcb4c1e9c9a069779d31c5043f300e34398c9c728dfe09cdf9601516a96280d6c095740114e3bd4a6b5103f8a1938b1be6b9cb9cb3 referencing-0.35.0.tar.gz +b737afb45bfb1adb91f457b78ab4a31a6f33839ef61095663fd66d91c09fc379d900f778bacaa36722770ce80eccd6a227a074cb44836e69205bed06165d033d referencing-0.35.1.tar.gz " diff --git a/community/py3-requests-file/APKBUILD b/community/py3-requests-file/APKBUILD index 182d0bc7c00..1464d7990dc 100644 --- a/community/py3-requests-file/APKBUILD +++ b/community/py3-requests-file/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Galen Abell <galen@galenabell.com> pkgname=py3-requests-file _pyname=requests-file -pkgver=2.0.0 -pkgrel=1 +pkgver=2.1.0 +pkgrel=0 pkgdesc="Transport adapter for fetching file:// URLs with the requests python library" url="https://github.com/dashea/requests-file" arch="noarch" @@ -18,20 +18,21 @@ builddir="$srcdir/$_pyname-$pkgver" build() { export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver gpep517 build-wheel \ - --wheel-dir dist \ + --wheel-dir .dist \ --output-fd 3 3>&1 >&2 } check() { - python3 -m venv --clear --system-site-packages testenv - testenv/bin/python3 -m installer dist/*.whl - testenv/bin/python3 -m pytest + python3 -m venv --clear --system-site-packages .testenv + .testenv/bin/python3 -m installer .dist/*.whl + .testenv/bin/python3 -m pytest } package() { python3 -m installer -d "$pkgdir" \ - dist/*.whl + .dist/*.whl } + sha512sums=" -0e4d0d9ceda33dd2bcbf1d94d1237c0c2b98958aef5837bf8b925adc73b1cb243f6b148a93431d524539af24bfd6327bd0d26d4eca3b844e66f3069973d28563 requests-file-2.0.0.tar.gz +64047226585655f02f7877a9d7a97b36d4ed5b2f7b1df435895ebb665205a4d25ab42a7a9a532e880455d5befe0068665b2fd0e94e8acb8297724f36821711d1 requests-file-2.1.0.tar.gz " diff --git a/community/py3-requests-gssapi/APKBUILD b/community/py3-requests-gssapi/APKBUILD index 2ac69ea6888..28408a714e4 100644 --- a/community/py3-requests-gssapi/APKBUILD +++ b/community/py3-requests-gssapi/APKBUILD @@ -1,9 +1,8 @@ # Contributor: Noel Kuntze <noel.kuntze@thermi.consulting> # Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting> pkgname=py3-requests-gssapi -_pkgname=requests-gssapi pkgver=1.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="GSSAPI (HTTP negotiate) authentication handler for Python Requests" url="https://github.com/pythongssapi/requests-gssapi" arch="noarch" @@ -20,8 +19,8 @@ makedepends=" " checkdepends="py3-pytest" subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/r/$_pkgname/$_pkgname-$pkgver.tar.gz" -builddir="$srcdir/$_pkgname-$pkgver" +source="$pkgname-$pkgver-2.tar.gz::https://github.com/pythongssapi/requests-gssapi/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/requests-gssapi-$pkgver" build() { gpep517 build-wheel \ @@ -41,5 +40,5 @@ package() { } sha512sums=" -a9d7acf213b3ecbbc45f6342964268247fc42d6bf341e9121a4e1d72cf43ef586df51df1a0efdbffb975aa5200e6e650b11e013c5df90a0d15b3cc6508da690c py3-requests-gssapi-1.3.0.tar.gz +d4ce6e132d19f0bb1fa388d3e6700acd201f6b63b5352e93d833f470f8a7812aff416a4360dd44dc8eaebd019fed7e5d3c39c8641b820874ff0cbbee77ae5ba5 py3-requests-gssapi-1.3.0-2.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-schedule/APKBUILD b/community/py3-schedule/APKBUILD index cd2a393d3e6..bc9115a696c 100644 --- a/community/py3-schedule/APKBUILD +++ b/community/py3-schedule/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=py3-schedule -pkgver=1.2.1 -pkgrel=1 +pkgver=1.2.2 +pkgrel=0 pkgdesc="Job scheduling for humans" url="https://github.com/dbader/schedule" arch="noarch" @@ -11,7 +11,7 @@ depends="python3" makedepends="py3-setuptools" checkdepends="py3-pytest py3-pytest-mock" subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/s/schedule/schedule-$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/dbader/schedule/archive/refs/tags/$pkgver.tar.gz" builddir="$srcdir/schedule-$pkgver" build() { @@ -27,5 +27,5 @@ package() { } sha512sums=" -f2802bb7c49afd649f3e4650366bcd03c64db0301e929c981e1888323b6debac1280d668dad0e2fd7149534cfccefc46eaaafc0a009828ba11606c6a2cfbcc81 schedule-1.2.1.tar.gz +851b2affa4b04e4b080f87dafcc2cbb2807cdcb14232471ab1703950a27198d5fe9740d4adb52de38d271fc3b007d155a5e43225a10cdf010f7cff37c95e2e95 py3-schedule-1.2.2.tar.gz " diff --git a/community/py3-setuptools-gettext/APKBUILD b/community/py3-setuptools-gettext/APKBUILD index b86b13575f0..7e18cd240dc 100644 --- a/community/py3-setuptools-gettext/APKBUILD +++ b/community/py3-setuptools-gettext/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-setuptools-gettext -pkgver=0.1.11 -pkgrel=1 +pkgver=0.1.14 +pkgrel=0 pkgdesc="setuptools plugin for building mo files" url="https://github.com/breezy-team/setuptools-gettext" arch="noarch" @@ -31,5 +31,5 @@ package() { } sha512sums=" -83b76cbda5e9794ef7893013dacff1529ac8950da97e7b1fe32bc048e2d3b31887bab2bcd788d952785fd63f2082f0d7167445057a647e1a2b08c890796ab0a6 py3-setuptools-gettext-0.1.11.tar.gz +642bf26d7e508232d88827037661a98d0576841433a8fdf1f0f25bac2c98d31d967852d138a11ad93dbd5703154737054e214d1846b452e84e5c75be80ea969f py3-setuptools-gettext-0.1.14.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/community/py3-slack_sdk/APKBUILD b/community/py3-slack_sdk/APKBUILD index 0d96fec9eaa..f235af99ce2 100644 --- a/community/py3-slack_sdk/APKBUILD +++ b/community/py3-slack_sdk/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> _pyname="slack_sdk" pkgname=py3-$_pyname -pkgver=3.27.1 -pkgrel=1 +pkgver=3.27.2 +pkgrel=0 arch="noarch" pkgdesc="The Slack API Platform SDK for Python" url="https://pypi.python.org/project/slack_sdk" @@ -45,5 +45,5 @@ package() { } sha512sums=" -e430aebef8a4f9fb1152a1d3db5095c2cb998c37a50d7d030bf5c11f93f662ad08ae8219b33215fba76abc01f8efba20ef49cef9e778d7bff2fb7dc462ddac11 py3-slack_sdk-3.27.1.tar.gz +50c97e0ae36fa9c9a57a14d615f183c44a4683cae757b883e5516f4933f3d2ba6e99c5174d204ac52dd483897cd61e940d0e4f7cc4a9157cec57d09c592244c0 py3-slack_sdk-3.27.2.tar.gz " diff --git a/community/py3-sqlglot/APKBUILD b/community/py3-sqlglot/APKBUILD index d4fa3475ba1..0d1544bf594 100644 --- a/community/py3-sqlglot/APKBUILD +++ b/community/py3-sqlglot/APKBUILD @@ -1,9 +1,8 @@ # Contributor: omni <omni+alpine@hack.org> # Maintainer: omni <omni+alpine@hack.org> pkgname=py3-sqlglot -_pkgname=sqlglot -pkgver=23.8.0 -pkgrel=1 +pkgver=24.0.1 +pkgrel=0 pkgdesc="Python SQL Parser and Transpiler" url="https://github.com/tobymao/sqlglot" arch="noarch" @@ -14,8 +13,8 @@ options="!check" # tests are included in the github release tarball but seem to require # additional aports to be added, see requirements.txt subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/s/sqlglot/$_pkgname-$pkgver.tar.gz" -builddir="$srcdir/$_pkgname-$pkgver" +source="https://files.pythonhosted.org/packages/source/s/sqlglot/sqlglot-$pkgver.tar.gz" +builddir="$srcdir/sqlglot-$pkgver" build() { gpep517 build-wheel \ @@ -29,5 +28,5 @@ package() { } sha512sums=" -dd69eb0fe28cbfb6b928c1e2cfe020469da759e75fa73912160e743ae3285cef816b898f3668dd4da87f9f37649310ff67d0f02ee0787c32eff09a15b4ed7138 sqlglot-23.8.0.tar.gz +d1fcf7839fa8fdcb8cba311c6aad6b588619d75275b80483d2adc6fa8162e288abc7f3f410570c81bd50c3ac6d9429e85d93e1b4e5a01700c5249c8e85339817 sqlglot-24.0.1.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-swagger-spec-validator/APKBUILD b/community/py3-swagger-spec-validator/APKBUILD index 4e13fc778cd..be030d30ab3 100644 --- a/community/py3-swagger-spec-validator/APKBUILD +++ b/community/py3-swagger-spec-validator/APKBUILD @@ -3,7 +3,7 @@ pkgname=py3-swagger-spec-validator _pyname=swagger-spec-validator pkgver=3.0.3 -pkgrel=2 +pkgrel=3 arch="noarch" pkgdesc="Validation of Swagger specifications" url="https://pypi.python.org/project/swagger-spec-validator" @@ -11,15 +11,18 @@ license="Apache-2.0" depends=" py3-jsonschema py3-yaml + py3-typing-extensions " makedepends=" py3-setuptools py3-gpep517 py3-wheel " -options="!check" # No testsuite -source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/s/swagger-spec-validator/swagger-spec-validator-$pkgver.tar.gz" -builddir="$srcdir"/$_pyname-$pkgver +checkdepends=" + py3-pytest +" +source="$pkgname-$pkgver-gh.tar.gz::https://github.com/Yelp/swagger_spec_validator/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir"/swagger_spec_validator-$pkgver subpackages="$pkgname-pyc" build() { @@ -28,11 +31,18 @@ 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 + # test_raise_SwaggerValidationError_on_urlopen_error: urlopen error [Errno -5] Name has no usable address>', URLError(gaierror(-5, 'Name has no usable address' + .testenv/bin/python3 -m pytest -v -k 'not test_raise_SwaggerValidationError_on_urlopen_error' +} + package() { python3 -m installer -d "$pkgdir" \ .dist/*.whl } sha512sums=" -21d849f3b7631c1bced3831728852d953063f28d918e5b409ac302781769a495536869bf3e042692d70e5a589a9db5306986aebb4cd0e363e6f80e1330a753f2 py3-swagger-spec-validator-3.0.3.tar.gz +977a6320ce629d102c7c608249d220996aba852d1c0c464be447b6b5a7aa7bb2a61023bc967a41c561a12c4620306c6a077605c4b34b828540d0ee8926d59a94 py3-swagger-spec-validator-3.0.3-gh.tar.gz " diff --git a/community/py3-tomlkit/APKBUILD b/community/py3-tomlkit/APKBUILD index 155df48a319..8033a411d5d 100644 --- a/community/py3-tomlkit/APKBUILD +++ b/community/py3-tomlkit/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=py3-tomlkit _realname=tomlkit -pkgver=0.12.3 -pkgrel=1 +pkgver=0.12.5 +pkgrel=0 pkgdesc="Style-preserving TOML library for Python" url="https://github.com/sdispater/tomlkit" arch="noarch" @@ -30,5 +30,5 @@ package() { } sha512sums=" -f89b1fdcbefcd511bbc5e22a1cc57d8c4593fc1353e901de31c69ac99ed3c685f042d71205c747bd5d20df246dd19b5402393df81231f12d18414d85c0a0000c tomlkit-0.12.3.tar.gz +85fba0018059c72f483251e53c039ede4ed630dd31afc58a1555705281a42c090aee2d8c25234b8700ff5f3a766313d7c9c716d7224f608f22f836c9e701c251 tomlkit-0.12.5.tar.gz " diff --git a/community/py3-twilio/APKBUILD b/community/py3-twilio/APKBUILD index a64a3ae8c30..3cb7efa31fe 100644 --- a/community/py3-twilio/APKBUILD +++ b/community/py3-twilio/APKBUILD @@ -1,32 +1,40 @@ # Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> pkgname=py3-twilio -pkgver=9.0.4 -pkgrel=1 +pkgver=9.0.5 +pkgrel=0 arch="noarch" pkgdesc="Twilio API client and TwiML generator" url="https://pypi.python.org/project/twilio" license="MIT" depends=" - py3-flake8 - py3-mock - py3-nose - py3-jwt py3-requests - py3-twine - py3-tz + py3-jwt + py3-aiohttp + py3-aiohttp-retry " makedepends=" py3-gpep517 py3-setuptools py3-wheel " -options="!check" # No testsuite +# missing py3-pyngrok, py3-autoflake, py3-recommonmark +checkdepends=" + black + py3-sphinx + py3-mock + py3-pytest + py3-pytest-cov + py3-aiounittest + py3-flake8 + py3-cryptography + py3-django + py3-multidict + " subpackages="$pkgname-pyc" -_pyname=twilio -source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/t/twilio/twilio-$pkgver.tar.gz" +_pyname=twilio-python +source="$pkgname-$pkgver.tar.gz::https://github.com/twilio/twilio-python/archive/refs/tags/$pkgver.tar.gz" builddir="$srcdir"/$_pyname-$pkgver -options="!check" # No testsuite build() { gpep517 build-wheel \ @@ -34,11 +42,18 @@ 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 + # tests/cluster require Twilio API access + .testenv/bin/python3 -m pytest -v --ignore=tests/cluster +} + package() { python3 -m installer -d "$pkgdir" \ .dist/*.whl } sha512sums=" -bc0c4de1e493fee85505f0ee5854d02c94024685be5340538cb1544ad6529213037902457403d69dcf40134aee04ccf5d4fc9a88dedb943040838000bc5d6e35 py3-twilio-9.0.4.tar.gz +9ae006d6e604dcc20a9b59cccc1ae59c7818b29ff4ebbbbd7bdc4f2d41135e7cd05a4902ccad035073b3df1d67d8b2b7e9838d753310385b20e61ed269e8cd38 py3-twilio-9.0.5.tar.gz " diff --git a/community/py3-validate-pyproject/APKBUILD b/community/py3-validate-pyproject/APKBUILD index af35ec545d9..ff1b98dff4e 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.18 +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 +0c688bc9e098eb708eb1f045023046804c2fca5b7fd0ed54d92352f1ca66a51a036a9c25a435c1979a6cae585612ced5d278d172d98a67289f42803ac3a25745 py3-validate-pyproject-0.18.tar.gz 831c908ac5c8d62bafe8aafff2ae27998d568e0479f90ed721493c0c4731d1914bb457055ca3dfdf97c7a780939e2027fcd8359339258c8e82a226d5a22da967 no-useless-check.patch " diff --git a/community/py3-validators/APKBUILD b/community/py3-validators/APKBUILD index d02cc9aedac..df392eece8e 100644 --- a/community/py3-validators/APKBUILD +++ b/community/py3-validators/APKBUILD @@ -2,7 +2,7 @@ # Contributor: fossdd <fossdd@pwned.life> # Maintainer: fossdd <fossdd@pwned.life> pkgname=py3-validators -pkgver=0.28.1 +pkgver=0.28.3 pkgrel=0 pkgdesc="Python3 Data Validation for Humans" url="https://github.com/python-validators/validators" @@ -32,5 +32,5 @@ package() { } sha512sums=" -6a3b9ffffbdc5f68d7ffd6123251d3bf3b26f5600b3398966abf022ec3c7cafedffe04fc18570ed110f7bbfa6048424a91283bc06384571413270a354784b43d py3-validators-0.28.1.tar.gz +e15679eebe2b13ed09000bd1155c4dc8ad4e44e3eba4c298134c7adbd3b99e1f4e8ce50282a37cd49626c404894f1e04dad2a8154fa8e465e7ea1074834624c4 py3-validators-0.28.3.tar.gz " diff --git a/community/py3-virtnbdbackup/APKBUILD b/community/py3-virtnbdbackup/APKBUILD index 1f72b0de3ac..e2a98d65a71 100644 --- a/community/py3-virtnbdbackup/APKBUILD +++ b/community/py3-virtnbdbackup/APKBUILD @@ -1,7 +1,7 @@ # Contributor: André Klitzing <aklitzing@gmail.com> # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=py3-virtnbdbackup -pkgver=2.9 +pkgver=2.10 pkgrel=0 pkgdesc="Backup utility for Libvirt / qemu / kvm" url="https://github.com/abbbi/virtnbdbackup" @@ -30,5 +30,5 @@ package() { } sha512sums=" -3be993a5197222b3af351934d8d6de4bb506727ed8793ca2a06369d85c55e3eeefe4f546bfe114c48b9c901f642155856e3c1d3fccd0cb2e47bdf3e8459820c5 virtnbdbackup-2.9.tar.gz +4ac2b6fab640ae3da0b406716c73875abc46c101d929ecbe0650f5a20ca334072c831bd0209e80df38d0daa875803a9a0fd36c4d9ecb8a96284dee2b691883fc virtnbdbackup-2.10.tar.gz " diff --git a/community/py3-virtualenv/APKBUILD b/community/py3-virtualenv/APKBUILD index 3c3f541c3be..909c10a0c9b 100644 --- a/community/py3-virtualenv/APKBUILD +++ b/community/py3-virtualenv/APKBUILD @@ -2,8 +2,8 @@ # Contributor: TBK <alpine@jjtc.eu> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-virtualenv -pkgver=20.25.1 -pkgrel=2 +pkgver=20.26.2 +pkgrel=0 pkgdesc="Virtual Python3 Environment builder" url="https://virtualenv.pypa.io/en/latest/" arch="noarch" @@ -27,6 +27,7 @@ checkdepends=" subpackages="$pkgname-pyc" source="https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-$pkgver.tar.gz" builddir="$srcdir/virtualenv-$pkgver" +options="net" # fetches stuff during tests replaces="py-virtualenv" # Backwards compatibility provides="py-virtualenv=$pkgver-r$pkgrel" # Backwards compatibility @@ -50,5 +51,5 @@ package() { } sha512sums=" -c0791de2aed7893658316199696906b1aed650460f3b53e0dbd13e695d16bc14d8974cd72fc8dcc010ff7ba10036121929ce9a608f97d7d2cd9f972144a3a1f0 virtualenv-20.25.1.tar.gz +49b78bb2b339a41637faa887728f195b042133506092e0793adf049b5b1523fab89222809449323a1eb771fa40d2f55df6dd97c16d765d7a78dc9299185fb864 virtualenv-20.26.2.tar.gz " diff --git a/community/py3-waitress/APKBUILD b/community/py3-waitress/APKBUILD index 525d52a9cc4..73b4f37ae49 100644 --- a/community/py3-waitress/APKBUILD +++ b/community/py3-waitress/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: fossdd <fossdd@pwned.life> pkgname=py3-waitress pkgver=3.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="A Python3 WSGI server" url="https://github.com/Pylons/waitress" arch="noarch" @@ -27,6 +27,7 @@ source="https://files.pythonhosted.org/packages/source/w/waitress/waitress-$pkgv waitress.initd waitress.confd" builddir="$srcdir/waitress-$pkgver" +options="!check" # https://github.com/pytest-dev/pytest/issues/12278 # secfixes: # 2.1.2-r0: @@ -63,6 +64,6 @@ package() { sha512sums=" 8b391eb194fce32fd78c1a20cd1afe8caf20e7e0c622e4be2b1ec7d3831cb5a607cda0637d08dcd3a55f2e8c84817abdad4636bf2ca260b12a774dcfa68b9176 waitress-3.0.0.tar.gz -5e85fdaaf564f1a581488cc8d26362775d8623f414c2a1bddcc7e3ac5bdbbb0ef48eda3f1b00d203dee3cc14b271a3324bfade7a16b9b6106dbb2da85a970d37 waitress.initd +376206127f007f45abf7ff2740bc9da3fdbc048d9d099f9b1cad419db4c41889069e58a329ee790879f4cee9f4821f7d9a11945eeeb2bae52d05f56d997e23d6 waitress.initd 3f3fce6347784461c39f4281c371eabeff165dcfc273f1f92a6f50db35a36dd79faef70abf638dbe3f1894f050828cb3be755172cb7b8283bcbf9b0d5b2723da waitress.confd " diff --git a/community/py3-waitress/waitress.initd b/community/py3-waitress/waitress.initd index 0a1865d7885..10515e807ca 100644 --- a/community/py3-waitress/waitress.initd +++ b/community/py3-waitress/waitress.initd @@ -19,7 +19,7 @@ start_stop_daemon_args=" ${basedir:+--chdir $basedir} ${start_stop_daemon_args:-}" -depends() { +depend() { need net after postgresql } 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-werkzeug/APKBUILD b/community/py3-werkzeug/APKBUILD index 00b713005a8..eac1fea1b0f 100644 --- a/community/py3-werkzeug/APKBUILD +++ b/community/py3-werkzeug/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: prspkt <prspkt@protonmail.com> pkgname=py3-werkzeug _pkgname=werkzeug -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=0 pkgdesc="The WSGI swiss-army knife" url="https://werkzeug.palletsprojects.com/" @@ -51,5 +51,5 @@ package() { } sha512sums=" -5f9a91684653da17ef419459db11a6a4bd83b6c1f2f6b0e9f0a296bc5c7c63d2b465044a131f579557f1fb240a560793b734f3d0248ecbb7b6af62b1713484c3 werkzeug-3.0.2.tar.gz +fc771c161b37a376a86930c29c8b8052f81fb869cedea8c3c83af1e8b1aba271358c918e3067f3b0ac6d4a1689c8c355bff410d521c73a1909fd0ffc90fee6c6 werkzeug-3.0.3.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 6b1946df15d..b0866ae6d89 100644 --- a/community/py3-xmldiff/APKBUILD +++ b/community/py3-xmldiff/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sascha Brawer <sascha@brawer.ch> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=py3-xmldiff -pkgver=2.6.3 -pkgrel=2 +pkgver=2.7.0 +pkgrel=0 pkgdesc="Creates diffs of XML files" url="https://github.com/Shoobx/xmldiff" arch="noarch" @@ -32,5 +32,5 @@ package() { } sha512sums=" -ba25b8cc9866c66bc829a82d1f20108c17a09e2f46735763317f7fd6f60c3920ba6d3114454ead1461de4a59c177065291bb71bebb7ee9c4a03f3584452a9e33 xmldiff-2.6.3.tar.gz +e285c0e30b4a6f057dd4888599a6bd354b1f1465598eafa7a9ac91d3eb2e8b04e25e466d410dde84d1b6986b647d3759bad322036f3c5c9cd498e8fc291ab888 xmldiff-2.7.0.tar.gz " diff --git a/community/py3-ytmusicapi/APKBUILD b/community/py3-ytmusicapi/APKBUILD index b27fa713f8b..d18faef304f 100644 --- a/community/py3-ytmusicapi/APKBUILD +++ b/community/py3-ytmusicapi/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=py3-ytmusicapi -pkgver=1.7.0 +pkgver=1.7.2 pkgrel=0 pkgdesc="Unofficial API for YouTube Music" url="https://github.com/sigma67/ytmusicapi" @@ -26,5 +26,5 @@ package() { } sha512sums=" -4e5f021e7dc9879e6cf881595afc8c17637e0d722a019b855563358f38bb74fe5ff154ea639c6d56836967c520bfece504733bf960b77cfe79b0586390339551 ytmusicapi-1.7.0.tar.gz +012b904accdb2fd84871909a139b1b665d0266ed2c157d4988ec0a02eb22ca47803ab980af2828442ca83a08c76c4fb88bec4dedcaf3a15b58e9ff1d2b9ee44c ytmusicapi-1.7.2.tar.gz " diff --git a/community/py3-zeroconf/APKBUILD b/community/py3-zeroconf/APKBUILD index 83963080cca..cfc6c7f9dc6 100644 --- a/community/py3-zeroconf/APKBUILD +++ b/community/py3-zeroconf/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> pkgname=py3-zeroconf -pkgver=0.74.0 -pkgrel=1 +pkgver=0.132.2 +pkgrel=0 pkgdesc="Python implementation of multicast DNS service discovery" url="https://github.com/jstasiak/python-zeroconf" arch="all" @@ -41,5 +41,5 @@ package() { } sha512sums=" -c95348f406f93d38a6ae527250007d3556a6b1aa417331bc902249725bfb749d4e3639fe9eeed38697953d985a9ff9cef8b3177f8f2b3a8474d1a2a491827db7 python-zeroconf-0.74.0.tar.gz +773c9dc99e722a35f3a4883c667077907b03eb6bcda519d216c74e2424cf73960420143daff77e9e5e749f76ede64bc3c1161721ac3c95b3754274cfe25ffd69 python-zeroconf-0.132.2.tar.gz " diff --git a/community/pyside6/APKBUILD b/community/pyside6/APKBUILD index 4b774ab1161..f0099caed4e 100644 --- a/community/pyside6/APKBUILD +++ b/community/pyside6/APKBUILD @@ -2,12 +2,13 @@ # 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/" # riscv64: segfault while building -arch="all !riscv64" +# loongarch64: blocked by qt6-qtwebview +arch="all !riscv64 !loongarch64" license="LGPL-3.0-only AND GPL-2.0-only" makedepends=" bash @@ -56,11 +57,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/qmlkonsole/APKBUILD b/community/qmlkonsole/APKBUILD index a63643bb5f4..460fedf3c71 100644 --- a/community/qmlkonsole/APKBUILD +++ b/community/qmlkonsole/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=qmlkonsole -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Terminal app for Plasma Mobile" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { } sha512sums=" -3d2773f7309fa180587fc5856be14697dc506b2198ac597434580e407c686ec1bff8f1c1d1d4bfad0925fe1c62b9464ab6b1038301a09d68370ada4c22e689aa qmlkonsole-24.02.2.tar.xz +a41a3b48d08d355bf0bd0a641ff15336f6bb1925f8e7fe564cedeaddcecf61a6191aac9407a7cfaa1e8e801a45cb402e8cc35ff318d14d12c16afdd13b09db76 qmlkonsole-24.05.0.tar.xz " diff --git a/community/qqc2-breeze-style/APKBUILD b/community/qqc2-breeze-style/APKBUILD index efd27e5d20c..0454c4b7232 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Breeze inspired QQC2 style" # armhf blocked by extra-cmake-modules @@ -50,5 +50,5 @@ package() { } sha512sums=" -51f9a855ab574115e2f6121a25a5271236743c52cf504a17a83e394f923352d24e12ab1713689edede3e128014e4061db04e3e3d4b1c76906490362391d275ab qqc2-breeze-style-6.0.4.tar.xz +8248fb3c64494c851971279b7b039aa0564632c4289d07a28796ee0bf3e4566ef23f844206e14f4d2fa46ccff28df08e4bbb4fc6fa9bd32e8734208f935297c0 qqc2-breeze-style-6.0.5.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/qrupdate/APKBUILD b/community/qrupdate/APKBUILD index 06e678cd266..ee26ff7e4db 100644 --- a/community/qrupdate/APKBUILD +++ b/community/qrupdate/APKBUILD @@ -5,7 +5,8 @@ pkgver=1.1.5 pkgrel=1 pkgdesc="Fork of the qrupdate library for future maintenance" url="https://gitlab.mpi-magdeburg.mpg.de/koehlerm/qrupdate-ng" -arch="all" +# riscv64: test_tch1up and test_tchdex tests fails +arch="all !riscv64" license="GPL-3.0-only" makedepends="cmake lapack-dev gfortran openblas-dev" subpackages="$pkgname-dev" diff --git a/community/qt5-qtwebengine/APKBUILD b/community/qt5-qtwebengine/APKBUILD index 7ec2c7dcfbf..7abbaf19600 100644 --- a/community/qt5-qtwebengine/APKBUILD +++ b/community/qt5-qtwebengine/APKBUILD @@ -8,8 +8,8 @@ pkgrel=8 _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=" 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..54619cdc606 100644 --- a/community/qt6-qtwebengine/APKBUILD +++ b/community/qt6-qtwebengine/APKBUILD @@ -5,16 +5,16 @@ # group=qt6 pkgname=qt6-qtwebengine pkgver=6.6.3 -pkgrel=2 +pkgrel=4 # latest commit of 112-based branch of qtwebengine-chromium -_chromium_commit="20eddf6037712f677235f6048d43bf5e384bed53" +_chromium_commit="be3ba7a0ebb340b9498e82c3506cf46ec5ddbee6" pkgdesc="Provides support for web applications using the Chromium browser project" url="https://qt.io/" -# riscv64 unknown current CPU +# riscv64 and loongarch64 unknown current CPU # s390x blocked by qt6-qtdeclarative # ppc64le not supported by chromium # armhf missing some includes (cstddef/array/algorithm) -arch="all !riscv64 !s390x !ppc64le !armhf" +arch="all !riscv64 !s390x !ppc64le !armhf !loongarch64" license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" depends_dev=" alsa-lib-dev @@ -57,6 +57,16 @@ subpackages="$pkgname-dev" builddir="$srcdir/qtwebengine-${pkgver/_/-}" # secfixes: +# 6.6.3-r4: +# - CVE-2024-3840 +# - CVE-2024-4558 +# - CVE-2024-4671 +# 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 +203,7 @@ package() { sha512sums=" 6e631f7b4e5eb19f0a2c1cb7f0b0bed341c4e3be6181ae65e1616c6229afa6d8b9bac7caf220a422aa64947a49a3f0994e6d098276e2ea5f708c21b544197cb0 qt6-qtwebengine-6.6.3.tar.gz -8a465c9e8ca08fe6303c65eb6037b2ec7cd0b7c7b3ebb5616663bed463958961f24ae8f9e8c2602a3710bc5a0379e99c0306d525d0a9b6a0769fcccec6698cb2 qtwebengine-chromium-20eddf6037712f677235f6048d43bf5e384bed53.tar.gz +7163a050d61800271dec1296df444a77d0f0078c2c49023a0e8228fd598b55a1b7379d7a5786b095a3de274374d5cea3f1104db5d542e2850314cb396fa4611d qtwebengine-chromium-be3ba7a0ebb340b9498e82c3506cf46ec5ddbee6.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/qt6-qtwebview/APKBUILD b/community/qt6-qtwebview/APKBUILD index 0ed187ad002..9a7917fa7e7 100644 --- a/community/qt6-qtwebview/APKBUILD +++ b/community/qt6-qtwebview/APKBUILD @@ -9,8 +9,8 @@ pkgrel=0 pkgdesc="Provides a way to display web content in a QML application" url="https://qt.io/" # s390x blocked by qt6-qtdeclarative -# ppc64le, riscv64 and armhf blocked by qt6-qtwebengine -arch="all !s390x !ppc64le !riscv64 !armhf" +# ppc64le, riscv64, armhf and loongarch64 blocked by qt6-qtwebengine +arch="all !s390x !ppc64le !riscv64 !armhf !loongarch64" license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" depends_dev=" qt6-qtbase-dev 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/community/qxmpp/APKBUILD b/community/qxmpp/APKBUILD index 15c29286cef..11de59f2bb3 100644 --- a/community/qxmpp/APKBUILD +++ b/community/qxmpp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=qxmpp -pkgver=1.6.0 +pkgver=1.7.0 pkgrel=0 pkgdesc="Cross-platform C++ XMPP client and server library" arch="all" @@ -40,5 +40,5 @@ package() { } sha512sums=" -3c3594661b84454bb56507915438e8da122ee74f845fb10d9dafa9076ee78e62f39900eb2a0766ab8204d2b79b5dc172106ce20354d5df9fe20f29d28bacbb27 qxmpp-v1.6.0.tar.gz +4e97f485d4b4c2201ff1feaafdc4a430086970220716f8ac624712fd4a86a6c6c1cb25e7a62df469e99ecea83be8e39d28752cf3494d93687ac3b1052d4395be qxmpp-v1.7.0.tar.gz " diff --git a/testing/rabbitmq-server/APKBUILD b/community/rabbitmq-server/APKBUILD index 45ef6c8b0ac..45ef6c8b0ac 100644 --- a/testing/rabbitmq-server/APKBUILD +++ b/community/rabbitmq-server/APKBUILD 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/racket/APKBUILD b/community/racket/APKBUILD index 91c1b3afa4e..e4f021d7d68 100644 --- a/community/racket/APKBUILD +++ b/community/racket/APKBUILD @@ -5,7 +5,7 @@ # TODO: Install even packages from the full tarball? # TODO: Figure out how to run tests. pkgname=racket -pkgver=8.12 +pkgver=8.13 pkgrel=0 pkgdesc="general purpose programming language in the Lisp-Scheme family" url="https://racket-lang.org/" @@ -36,7 +36,7 @@ _flags= case "$CARCH" in # Racket CS (Chez Scheme backend) is not supported on these platforms, # so build only BC (custom backend). - ppc64le | s390x) + ppc64le | riscv64 | s390x) pkgdesc="Racket BC - $pkgdesc" license="($license) AND LGPL-3.0-or-later" _flags="--enable-bconly --enable-bcdefault --enable-shared" @@ -87,5 +87,5 @@ package() { } sha512sums=" -8cddd7fc2743d049f03b393573618e6cc77cb4bedc4066add91458e60dc812a0ecfc91c6eef64242bb6093c7aed4ee2e748f5d961b9254462f55c1202f8de823 racket-minimal-8.12-src.tgz +f924ffd9277077aeaca72bd440e0d15f75e70cdc70540f584de2d04bcbbc39e1a26c1ecfb7f90b07ff41b9f334a8dd98d23fbe3cb44bcfe53c948d75c08cdbec racket-minimal-8.13-src.tgz " 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/rapidyaml/APKBUILD b/community/rapidyaml/APKBUILD index 46fd6490393..711a11c2c46 100644 --- a/community/rapidyaml/APKBUILD +++ b/community/rapidyaml/APKBUILD @@ -8,7 +8,7 @@ _fast_float=052975dd5f8166d0f9e4a215fa75a349d5985b91 _debugbreak=5dcbe41d2bd4712c8014aa7e843723ad7b40fd74 pkgdesc="Library to parse and emit YAML, and do it fast" url="https://github.com/biojppm/rapidyaml/" -arch="all !s390x !riscv64" # unknown cpu arch +arch="all !s390x !riscv64 !loongarch64" # unknown cpu arch license="MIT" options="!check" # needs another 3 vendored deps it git clones.. makedepends=" diff --git a/community/raspberrypi-utils/APKBUILD b/community/raspberrypi-utils/APKBUILD index ea37fde3849..f30bc6d0bee 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.20240424 +pkgver=0.20240515 pkgrel=0 -_commit="451b9881b72cb994c102724b5a7d9b93f97dc315" +_commit="9f493ccf3750e612565ace494c8c754ae71ddd1d" 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=" -2ef1d36bd8cf4fb641e7ef07712aaefe301f5217cf649068375dbdcc74be586e44f90270e3b51ee8368a3470874d8655c48427ec4b0ad4c7c562cca10e2a4484 raspberrypi-utils-451b9881b72cb994c102724b5a7d9b93f97dc315.tar.gz +3ae5d3fc872aa07f6b4afc56ca0e0eb3936f3fe7bf9593efb0effd3fb13eb0dd2b8cc075dced36e9bfa49274dd1ef05ed818eca9487a24b4420fba602ea81b22 raspberrypi-utils-9f493ccf3750e612565ace494c8c754ae71ddd1d.tar.gz " diff --git a/community/rclone/APKBUILD b/community/rclone/APKBUILD index 7c568c5c45d..c0d87856576 100644 --- a/community/rclone/APKBUILD +++ b/community/rclone/APKBUILD @@ -2,11 +2,12 @@ # Maintainer: Mike Crute <mike@crute.us> pkgname=rclone pkgver=1.66.0 -pkgrel=1 +pkgrel=2 pkgdesc="Rsync for cloud storage" url="https://rclone.org/" # s390x: https://github.com/cronokirby/saferith/pull/51 -arch="all !s390x" +# loongarch64: upstream does not support -> cronokirby/saferith +arch="all !s390x !loongarch64" license="MIT" makedepends="go" checkdepends="fuse" diff --git a/community/reader/APKBUILD b/community/reader/APKBUILD index d9c6dfbbb41..d8520c9716b 100644 --- a/community/reader/APKBUILD +++ b/community/reader/APKBUILD @@ -2,10 +2,11 @@ # Maintainer: Adam Thiede <me@adamthiede.com> pkgname=reader pkgver=0.4.4 -pkgrel=3 +pkgrel=4 pkgdesc="reader parses a web page for its actual content and displays it in nicely highlighted text on the command line." url="https://github.com/mrusme/reader" -arch="all" +# loongarch64: fail to build utls +arch="all !loongarch64" license="GPL-3.0-only" makedepends="go" source="$pkgname-$pkgver.tar.gz::https://github.com/mrusme/reader/archive/v$pkgver.tar.gz" diff --git a/community/redict/APKBUILD b/community/redict/APKBUILD index 873337d5ec8..2009e547e8e 100644 --- a/community/redict/APKBUILD +++ b/community/redict/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: fossdd <fossdd@pwned.life> pkgname=redict pkgver=7.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="A distributed key/value database" url="https://redict.io/" arch="all" @@ -16,6 +16,7 @@ checkdepends="tcl procps" install=" $pkgname-compat.pre-install $pkgname.post-install + $pkgname.post-upgrade $pkgname.pre-install " subpackages=" diff --git a/community/redict/redict.post-install b/community/redict/redict.post-install index 3189533841b..1fe8b18cbdb 100644 --- a/community/redict/redict.post-install +++ b/community/redict/redict.post-install @@ -8,15 +8,4 @@ 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/community/redict/redict.post-upgrade b/community/redict/redict.post-upgrade new file mode 100644 index 00000000000..344e2ed2be2 --- /dev/null +++ b/community/redict/redict.post-upgrade @@ -0,0 +1,14 @@ +#!/bin/sh + +ver_old=$2 + +if [ "$(apk version -t "$ver_old" '7.3.0-r3')" = '<' ]; 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/community/redis/APKBUILD b/community/redis/APKBUILD index b6b9fb91d1b..b975ccaf49e 100644 --- a/community/redis/APKBUILD +++ b/community/redis/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: TBK <alpine@jjtc.eu> pkgname=redis # CAUTION: Do not upgrade to 7.3+ (non-free license). -pkgver=7.2.4 -pkgrel=1 +pkgver=7.2.5 +pkgrel=0 pkgdesc="Advanced key-value store" url="https://redis.io/" arch="all" @@ -103,7 +103,7 @@ package() { } sha512sums=" -78590fb6680f229905c240ed8ce7a9a7153e5f8563577dbbb26aebf9bfbdcd7495d687f452bd95e0a86c76d772e1c497b506cf8d29bc97b62c9267f7d1e76f72 redis-7.2.4.tar.gz +e064a0f380e3a00ab8eb2f10ed7317fd6aa27d64cf00792fab80465036f92d17b166050e71b8a779fdf024528ac736cb54722316811f99951c4e386f4ab2245d redis-7.2.5.tar.gz 7725486329f2aba8fe03a768f6d8ab78cc96ab6f2ca403af56c252ef7978f7628b580587b372969ca5dd6257780ef58571ce6dc5aca468c3b2a299033b41047f redis.conf.patch a5dc411c2bd7edf61400e29accb375275dd888fda72a8f7e3889be475010c695a22f536be818ef9441e47285c00b451966db924362a7f56806586078c9e3ff8c sentinel.conf.patch f6dcdad1edd6b5fb6aa28ba774bfc8aba035f316695da261fb2ad291b76f00f177479f9d74434d06c26bd15f131edc9a2f55c9880758cf0987800d2031069738 redis.initd diff --git a/community/rekor/APKBUILD b/community/rekor/APKBUILD index 36e6d9b857d..97e5d19141f 100644 --- a/community/rekor/APKBUILD +++ b/community/rekor/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: kpcyrd <git@rxv.cc> pkgname=rekor pkgver=1.3.5 -pkgrel=2 +pkgrel=3 pkgdesc="Signature transparency log" url="https://github.com/sigstore/rekor" arch="all" diff --git a/community/renderdoc/APKBUILD b/community/renderdoc/APKBUILD index dcdc6d691c7..6a1614e6193 100644 --- a/community/renderdoc/APKBUILD +++ b/community/renderdoc/APKBUILD @@ -6,7 +6,7 @@ pkgrel=1 pkgdesc="Stand-alone graphics debugging tool for Vulkan and OpenGL" url="https://renderdoc.org/" # limited by vendored plthook version -arch="all !s390x !ppc64le !riscv64" +arch="all !s390x !ppc64le !riscv64 !loongarch64" license="MIT" makedepends=" autoconf diff --git a/community/rest-server/APKBUILD b/community/rest-server/APKBUILD index 617bf650e01..845554b2dae 100644 --- a/community/rest-server/APKBUILD +++ b/community/rest-server/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=rest-server pkgver=0.12.1 -pkgrel=6 +pkgrel=7 pkgdesc="A high performance HTTP server that implements restic's REST backend API" url="https://github.com/restic/rest-server" arch="all" diff --git a/community/restic/APKBUILD b/community/restic/APKBUILD index 32e325b6896..2ada7d44cc0 100644 --- a/community/restic/APKBUILD +++ b/community/restic/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=restic pkgver=0.16.4 -pkgrel=2 +pkgrel=3 pkgdesc="Fast, secure, efficient backup program" url="https://restic.net/" arch="all" 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/rocs/APKBUILD b/community/rocs/APKBUILD index 2398fec4b2c..9ea5cc86196 100644 --- a/community/rocs/APKBUILD +++ b/community/rocs/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=rocs -pkgver=24.02.2 -pkgrel=1 +pkgver=24.05.0 +pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" url="https://kde.org/applications/education/org.kde.rocs" @@ -66,5 +66,5 @@ package() { } sha512sums=" -88918f302a0f93799dcddc01b74edb416b740f326f728fc363ea7162dfc7b7fbb69dae1a4aab045438948b671f2f9be3cd3dd72672745bb6dc3b8831774a20e2 rocs-24.02.2.tar.xz +05ce5b78481dbc1aa712f6d5f3bbe850af2474582914d212fd06592af777842c319049824490e8e5e734e1970240b359552bc46e0f197cd8e5f81396186993f0 rocs-24.05.0.tar.xz " diff --git a/community/rootlesskit/APKBUILD b/community/rootlesskit/APKBUILD index fb45e2eb946..0eb6722e916 100644 --- a/community/rootlesskit/APKBUILD +++ b/community/rootlesskit/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=rootlesskit pkgver=2.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Linux-native fake root for implementing rootless containers" url="https://github.com/rootless-containers/rootlesskit" arch="all" diff --git a/community/rqlite/APKBUILD b/community/rqlite/APKBUILD index 8fc64f10d91..ad3298ff161 100644 --- a/community/rqlite/APKBUILD +++ b/community/rqlite/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=rqlite -pkgver=8.24.2 -pkgrel=0 +pkgver=8.24.7 +pkgrel=1 pkgdesc="Lightweight, distributed relational database built on SQLite" url="https://github.com/rqlite/rqlite" arch="all" @@ -56,5 +56,5 @@ client() { } sha512sums=" -f18490832c2a05eea2c6af81d470dc34f37dd72d02ea34e4e98890306ecb3fdf3b316573b9d6364058b00b8ce9e8ee888e03e91179d2dfbd4966129f9a1ebfbb rqlite-8.24.2.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/rtpengine-lts/APKBUILD b/community/rtpengine-lts/APKBUILD index fe6964ffb12..2fb662394f7 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.30 +_kver=6.6.32 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/community/ruby-rb-inotify/APKBUILD b/community/ruby-rb-inotify/APKBUILD index 5a67dfd0434..ffaa696d594 100644 --- a/community/ruby-rb-inotify/APKBUILD +++ b/community/ruby-rb-inotify/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=ruby-rb-inotify _gemname=rb-inotify -pkgver=0.10.1 -pkgrel=4 +pkgver=0.11.1 +pkgrel=0 pkgdesc="A Ruby wrapper for Linux inotify, using FFI" url="https://github.com/guard/rb-inotify" arch="noarch" @@ -49,6 +49,6 @@ package() { } sha512sums=" -fb8484b3c019ff471dbea57ad305c32a9d03377f8bbcb4d1631ef498b3207bc83da08889f7d43fe3a9ba54df2d9164e3a83d001797f8113ddc2e3a7f2ad9a83b ruby-rb-inotify-0.10.1.tar.gz +46966609686878d99c5a6623f5a3f55ef203ae32e48d0efbef295f97cc728c6938759360d445e052b82206322c7bf6f995db3007c7f3c0b2818549b8088be9bf ruby-rb-inotify-0.11.1.tar.gz 2d9896ee5a81bc74d8921c4773771cf966dd5b164f6949857671afd2152a791377a18dd3c71cad7aefcd1d1d2f2b70fd366873f80269c672e750618e8e90e727 gemspec.patch " diff --git a/community/ruby-rmagick/APKBUILD b/community/ruby-rmagick/APKBUILD index a86b521ad6d..e0ae49f14a1 100644 --- a/community/ruby-rmagick/APKBUILD +++ b/community/ruby-rmagick/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=ruby-rmagick _gemname=rmagick -pkgver=5.5.0 +pkgver=6.0.1 _pkgver=${pkgver//./-} pkgrel=0 pkgdesc="Ruby bindings for ImageMagick" @@ -60,8 +60,8 @@ package() { } sha512sums=" -f813104c347867b14281b044135fd626805d35d2afa3167c25d5e31179b31e985c5cc75deb630f8a64d20b877d8c42ce13e31e137f573467d3c5f3f2453d514f RMagick_5-5-0.tar.gz -77f661ec08793f94e93a523102ba3b30ea4d4c65632694b6e1babcc00b4cad69a9d78c8401f2c57c3e92bfcbfc00dd97694c51017d17c846c9727f406ff200bd gemspec.patch +a6fdecd4ad6d17045438a9a14fc6c0a8b9d18224d6d3d0af2ade6fcba1bd0c889710f03d8b2f9738214023d87c504f7a7017f49b467a778fa3d97a14aa2bfeb3 RMagick_6-0-1.tar.gz +b701536776e201458494509d1fa4dccb4485aa94da67ce9fe4e922c2bd4ba0ac26bea20c636e17312892fed24427bc4b950cd1328b27e37a6365aec3ecbcdb0b gemspec.patch 6550535ebaf3924b9f707da395eeaec630e5db50e1964ab9f84d2f941d97c7c49eb7dff05439efa355abb97e72556385b26b8af1d86e05b7c12fd8f2f781834a spec-drop-pry.patch 5eeea508d44f2c9679fe4fe3d5b9a51470f8022537f5822f85c95dbd4d78149c2cada763f0bdf3e86523770b0b758117a6d216b240c92f54253905c19d38d064 dont-test-webp.patch 3e10aae2b9c452409c34b38f005b922aa91119a44b260d192f1a03bcbd7e90a7ea6e01ec65bc331bdd19457490296a36af75008fcdbbee086f2ea169b48fa1af skip-broken-test.patch diff --git a/community/ruby-rmagick/gemspec.patch b/community/ruby-rmagick/gemspec.patch index 100cee1c864..6c9502e22ac 100644 --- a/community/ruby-rmagick/gemspec.patch +++ b/community/ruby-rmagick/gemspec.patch @@ -2,9 +2,9 @@ About pkg-config dependency see https://github.com/rmagick/rmagick/commit/65c18a --- a/rmagick.gemspec +++ b/rmagick.gemspec -@@ -13,17 +13,13 @@ - s.homepage = 'https://github.com/rmagick/rmagick' - s.license = 'MIT' +@@ -16,11 +16,7 @@ + s.metadata['documentation_uri'] = 'https://rmagick.github.io/' + s.metadata['changelog_uri'] = 'https://github.com/rmagick/rmagick/blob/main/CHANGELOG.md' - tracked_files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR) - file_exclusion_regex = /\A(doc|benchmarks|examples|spec|Steepfile)/ @@ -15,10 +15,10 @@ About pkg-config dependency see https://github.com/rmagick/rmagick/commit/65c18a s.require_paths << 'ext' s.extensions = %w[ext/RMagick/extconf.rb] - s.required_ruby_version = ">= #{Magick::MIN_RUBY_VERSION}" +@@ -28,5 +24,5 @@ s.requirements << "ImageMagick #{Magick::MIN_IM_VERSION} or later" + s.add_runtime_dependency 'observer', '~> 0.1' - s.add_runtime_dependency 'pkg-config', '~> 1.4' + s.add_development_dependency 'pkg-config', '~> 1.4' - s.add_runtime_dependency 'observer', '~> 0.1' end diff --git a/community/ruff/APKBUILD b/community/ruff/APKBUILD index 9d689d250b6..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.4.2 +pkgver=0.4.4 pkgrel=0 pkgdesc="Extremely fast Python linter" url="https://github.com/astral-sh/ruff" @@ -65,5 +65,5 @@ package() { } sha512sums=" -15db74fa0449d9cc3071f6f5f3e67bf57fca5eb6c02b64f4ae99c3ea37b884b9f19e506473e8d882952b4111510c051cb2b2e8527ee74b439a68e7d8552ad76b ruff-0.4.2.tar.gz +d5b14266d30920e4772cc690e263478abfdfd08865ca7cae64b9184566e172fc5c70d3f9463967cc431bb12bff9c97333835d3773fa70462953aa9fafd47aa0d ruff-0.4.4.tar.gz " diff --git a/community/runc/APKBUILD b/community/runc/APKBUILD index b8e747b65fc..bf54ee87bdf 100644 --- a/community/runc/APKBUILD +++ b/community/runc/APKBUILD @@ -6,7 +6,7 @@ pkgdesc="CLI tool for spawning and running containers according to the OCI speci url="https://www.opencontainers.org" _commit=51d5e94601ceffbbd85688df1c928ecccbfa4685 pkgver=1.1.12 -pkgrel=2 +pkgrel=3 arch="all" license="Apache-2.0" makedepends="bash go go-md2man libseccomp-dev libtool" 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 8f7077bdca0..f700e6cba81 100644 --- a/community/rust-analyzer/APKBUILD +++ b/community/rust-analyzer/APKBUILD @@ -1,14 +1,14 @@ # Contributor: S.M Mukarram Nainar <theone@sm2n.ca> # Maintainer: team/rust <alpine@ptrcnull.me> pkgname=rust-analyzer -pkgver=2024.04.29 +pkgver=2024.05.27 _pkgver=${pkgver//./-} pkgrel=0 pkgdesc="Rust compiler front-end for IDEs" url="https://github.com/rust-lang/rust-analyzer" # armhf, armv7, x86: some tests fail, not supported by upstream # riscv64, s390x: blocked by cargo/rust -arch="aarch64 ppc64le x86_64" +arch="aarch64 ppc64le x86_64 loongarch64" license="MIT OR Apache-2.0" depends="rust-src" makedepends="cargo mimalloc2-dev cargo-auditable" @@ -58,5 +58,5 @@ package() { } sha512sums=" -be737ab8afdf70fa68f52c413c1bf222a8422dd2c96251517b156f5dac425603888a7db6c08def342ee69c10ef5cec13cb62912947ec164e0382e0d0fc0aea85 rust-analyzer-2024.04.29.tar.gz +57732b19923c7b6c2f2854befafb994c07b19978c13df3668b52d24789c3fc5169b10c41a02bf2fd0c6ad2ca812a1347ed506b68877db781234e2f6c764135c4 rust-analyzer-2024.05.27.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 69c11c6b32e..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.13 +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=" -d069279d0962f94bef7e9e09d961ea9ce4333011a3d4ab928f0543d20684d13910dd16c58f036d0d42b0b5dcc18b2159c203d5867df770f79dc32229aa4a0dd3 s2n-tls-1.4.13.tar.gz +ff835314db87b5f97cf674964eba3f893d934b7f536ab5ee47558cb7c8888bd58c2c6e677d589ea9f1db11541a528ef8c6425f410f78c5497d981dc04b26344d s2n-tls-1.4.14.tar.gz " diff --git a/community/saga-gis/APKBUILD b/community/saga-gis/APKBUILD index 1fb7a4aefe0..05c62666790 100644 --- a/community/saga-gis/APKBUILD +++ b/community/saga-gis/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Holger Jaekel <holger.jaekel@gmx.de> pkgname=saga-gis pkgver=9.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="System for Automated Geoscientific Analyses" url="https://saga-gis.sourceforge.io/en/index.html" arch="all" diff --git a/community/salt/APKBUILD b/community/salt/APKBUILD index 2f66083104f..168ddb0509e 100644 --- a/community/salt/APKBUILD +++ b/community/salt/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=salt -pkgver=3007.0 -pkgrel=3 +pkgver=3007.1 +pkgrel=0 pkgdesc="parallel remote execution system" url="https://github.com/saltstack/salt" arch="noarch" @@ -185,7 +185,7 @@ _conf_copy() { } sha512sums=" -0e49d76dafdb981ee380ea89ceba2cddeae8cd95df1d188a6f8ba64a175c606aaf2f8101bacb040792255afdb46ae668cbc9464d0dbb055986e85cee4d5c130b salt-3007.0.tar.gz +732820bae98ce2eb74175a2c37c986076572e0e60d04a270861fd3b0b6871cd2cc703683a8c0d97ffc43b2f7fffb76ae709a1aea839d10abc9f5d0837eaade4b salt-3007.1.tar.gz 975ba2f5e681fbd62045da61cc3dc065b148683a07b5df7eca9f131e47314eb6bfa8660ca1c06a3bd93683c7097d0ff9f8e514273dd24d82fb2de6a255e6b275 salt-api.confd 435d399bfecf431d0c713031e2ae57ce25b5c6edc98b62f33bd7a4ff1c587e3cdeb988445ae0c3e9ffc1911555c3694654d98815f9562b8a14bf0688ec1ebea6 salt-api.initd cfbbeb8023a383e7c42d84e3346edfd068c9ec7650c4ddc3caa38534da325a67497e1f06ca02cc1f0941b7348a3af6d1dca7cd6f2bcb3612ca10e1ec98997e5a salt-master.confd 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/sbctl/APKBUILD b/community/sbctl/APKBUILD index b4344aa0541..6a777728588 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=1 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/scc/APKBUILD b/community/scc/APKBUILD index 8966065e4d6..5f667291986 100644 --- a/community/scc/APKBUILD +++ b/community/scc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Andrej Kolchin <KAAtheWise@protonmail.com> # Maintainer: Andrej Kolchin <KAAtheWise@protonmail.com> pkgname=scc -pkgver=3.3.3 +pkgver=3.3.4 pkgrel=0 pkgdesc="Very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go" url="https://github.com/boyter/scc" @@ -27,5 +27,5 @@ package() { } sha512sums=" -369a638d719129cf949c592442e75fb791803c1b3a285b01ba6f0edac6794ba4d5b5978e931bbb05503ddf00bfd33a813cde3bbb12164d793e916fbf781e5986 scc-3.3.3.tar.gz +fb81462b44ef41d1e376685558bb6cb3a8fd45b1ffa26a39e378d7b98ba916c2133d225c35e6ba441520eb3a3bc7aabeff23eb0259132dc34eb15c7ad32e85e3 scc-3.3.4.tar.gz " diff --git a/community/sccache/APKBUILD b/community/sccache/APKBUILD index 2ff0cb26617..8cde8264be3 100644 --- a/community/sccache/APKBUILD +++ b/community/sccache/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=sccache -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=0 pkgdesc="shared compilation cache for C/C++ and Rust" url="https://github.com/mozilla/sccache/" @@ -11,6 +11,7 @@ makedepends="cargo openssl-dev>3 cargo-auditable" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/mozilla/sccache/archive/v$pkgver.tar.gz test_musl_ldd_parse.patch + cargo-update-libc.patch " case "$CARCH" in @@ -61,6 +62,7 @@ dist() { } sha512sums=" -1b0a85ff12e9e17c39b4145adbab8706108691ad924a4dad94ee2cf6a48c4ee6a5fba47c5edd810c6767c04bea9c40e1ca0971fc8fab4af724228979446361bc sccache-0.8.0.tar.gz +f42c4d3521c91bf3ecd7605e4e0703120af7341de03e431095d91be9402ffaf25c7d783e114877b261b282fb254e1cbba97f59ee96ac6821ada01cc3a9b10d73 sccache-0.8.1.tar.gz e185fc6371bcfd59b5c5243d6d4461327061b26d608680187ec49b3698a459e4dca03a0641553a690b8009bd08413d157cf03697bfad7b7d47e8a31c80f37bac test_musl_ldd_parse.patch +2966d4b0b726f9035de30c1d0adb3d7dca3389e0432c75e87863d529452c76415a6ed1e347b70a03c49e2d0a0c4797404ab675b0c43d2ec4ac20ed90e8edf8d1 cargo-update-libc.patch " diff --git a/community/sccache/cargo-update-libc.patch b/community/sccache/cargo-update-libc.patch new file mode 100644 index 00000000000..69fa1efb148 --- /dev/null +++ b/community/sccache/cargo-update-libc.patch @@ -0,0 +1,16 @@ +fix loongarch64 build + +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1312,9 +1312,9 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libm" diff --git a/community/scrcpy/APKBUILD b/community/scrcpy/APKBUILD index da8c13c657a..cc059f1c51c 100644 --- a/community/scrcpy/APKBUILD +++ b/community/scrcpy/APKBUILD @@ -1,8 +1,8 @@ # Contributor: prspkt <prspkt@protonmail.com> # Maintainer: prspkt <prspkt@protonmail.com> pkgname=scrcpy -pkgver=2.3.1 -pkgrel=1 +pkgver=2.4 +pkgrel=0 pkgdesc="Display and control your Android device" url="https://github.com/Genymobile/scrcpy" arch="all !s390x !ppc64le" # limited by android-tools @@ -31,6 +31,6 @@ package() { } sha512sums=" -4ef9398f23740edf8d09bb18ecc9f6e120b7d3991b8d359836f5e3f4a568484307a1f020da2edeb3193a4f4d6820b5948d6b80600e7ceeed869a2ed8136bfefd scrcpy-2.3.1.tar.gz -9360ad9321554bc9ab38833720e20fada1e0e3a9d1302fced2bbc035b87ea2bbc6802fa8d52fe73ae8d9272ac0f1759c6042badd0043392b90cb68c5c89fc57c scrcpy-server-v2.3.1 +05467a476a9a7eb3034eb5c16875a00dceedf25a9a3acde26738c6dfbc314e9c2a515feb3f6050c7b47436cc2a44ae2d05664b1783b1b1d7c63660044404b3d6 scrcpy-2.4.tar.gz +6618e3bd23f139f5ed10d00dd8f8bb259bd9eaa5bca4625d3da2b38c2d1aa2cd10b6e412b6e79b1b0aecc291bde9dd2f2fddf416544b18046648a6c2b92e3368 scrcpy-server-v2.4 " diff --git a/community/sd/APKBUILD b/community/sd/APKBUILD index f33117592d5..38629bb2f16 100644 --- a/community/sd/APKBUILD +++ b/community/sd/APKBUILD @@ -9,7 +9,8 @@ arch="all" license="MIT" options="net" makedepends="cargo cargo-auditable" -source="$pkgname-$pkgver.tar.gz::https://github.com/chmln/sd/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/chmln/sd/archive/v$pkgver.tar.gz + cargo-update-libc.patch" subpackages="$pkgname-doc $pkgname-bash-completion $pkgname-zsh-completion @@ -44,4 +45,5 @@ package() { sha512sums=" 33ffbbaeb4d3829a231e3e0b9d8b3f07443a708aef46d976139329466b06038b3e83ecaf57c69df89ad5dc9528f7a54f678fc7081e015db9c00dd381323ed7a5 sd-1.0.0.tar.gz +bcc8eeacd57909c7e596e2d20ca2528d4be31782a3c0e4af30c8a53b8cbecb72fc11516f8e8961632115f239b96a2ded8c50a4ee7a97b8012bae5d53938edf58 cargo-update-libc.patch " diff --git a/community/sd/cargo-update-libc.patch b/community/sd/cargo-update-libc.patch new file mode 100644 index 00000000000..46f080a10a6 --- /dev/null +++ b/community/sd/cargo-update-libc.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 5f67cce..11069a2 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -371,9 +371,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.149" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libm" diff --git a/community/sddm-kcm/APKBUILD b/community/sddm-kcm/APKBUILD index 133537cdba5..93f744f78e3 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Config module for SDDM" # armhf blocked by extra-cmake-modules @@ -57,5 +57,5 @@ package() { DESTDIR="$pkgdir" cmake --install build } sha512sums=" -41f4d76f214be149d570ec152f0d155566d96831807d498012b2672c203d998bcaa5e2b74e2d45e8bf41d0451fa01fcc6854e8b8717af7b700ae9fc2222c111b sddm-kcm-6.0.4.tar.xz +5cae2c11c5a9de14fd77378de3796ced0deffb830b9109f51fbf3903648845ea40736c20e0386f9c2630570aaa74956a5548acfc5bd8cf246a2fe818072e5e03 sddm-kcm-6.0.5.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/community/senpai/APKBUILD b/community/senpai/APKBUILD index 4f846e186f3..48af96d111f 100644 --- a/community/senpai/APKBUILD +++ b/community/senpai/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Simon Zeni <simon@bl4ckb0ne.ca> pkgname=senpai pkgver=0.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="Your everyday IRC student" url="https://sr.ht/~delthas/senpai" arch="all" 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/sequoia-sq/APKBUILD b/community/sequoia-sq/APKBUILD index 95989d0d59d..a198e59238f 100644 --- a/community/sequoia-sq/APKBUILD +++ b/community/sequoia-sq/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Simon Rupf <simon@rupf.net> pkgname=sequoia-sq -pkgver=0.35.0 +pkgver=0.36.0 pkgrel=0 pkgdesc="Command-line frontends for Sequoia" url="https://gitlab.com/sequoia-pgp/sequoia-sq" @@ -58,5 +58,5 @@ package() { } sha512sums=" -18439273ef3811c57d71a88ce7e10d25fd3ecfc26820f9a8827298bd170583574dba49e178ba7318e2e22ad645331d441db62e78e2e5879758722f00f22dfb75 sequoia-sq-v0.35.0.tar.bz2 +4faea8d7c6f8086d892d694957dbfddaa674d8672acd2c8afd6f187995aa2b908972399f79d2261aa9c7b818ef1e799570da31909a3fdece50eb06efbcfc9c8c sequoia-sq-v0.36.0.tar.bz2 " diff --git a/community/shadowsocks-rust/APKBUILD b/community/shadowsocks-rust/APKBUILD index 60fddf1ef65..900b30c69e3 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.3 +pkgver=1.19.0 pkgrel=0 pkgdesc="Rust port of shadowsocks" url="https://github.com/shadowsocks/shadowsocks-rust" @@ -53,7 +53,7 @@ build() { utility " case "$CARCH" in - ppc64le|s390x|riscv64) + ppc64le|s390x|riscv64|loongarch64) ;; *) # ioctl-sys @@ -119,5 +119,5 @@ ssurl() { } sha512sums=" -725853073949703f16dfad8e4266ae477fa0209f61b11cb49d1cc0f3b3848602051a6852cd20f7734cda069080b9187f1ba7973b702336343c146250263c16d6 shadowsocks-rust-1.18.3.tar.gz +99b0fd4346d1a8ec0c7b75b950404340986c383daefa9dec3ebdff5cbadb3512023ce42ec861e933ab0bc97b36be494d2fba96fcba6e6cd038cd8f2950d2fe45 shadowsocks-rust-1.19.0.tar.gz " diff --git a/community/shairport-sync/APKBUILD b/community/shairport-sync/APKBUILD index 37e4d963255..0ffa1f43d32 100644 --- a/community/shairport-sync/APKBUILD +++ b/community/shairport-sync/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=shairport-sync pkgver=4.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="AirTunes emulator. Shairport Sync adds multi-room capability with Audio Synchronisation" url="https://github.com/mikebrady/shairport-sync" arch="all" @@ -51,7 +51,9 @@ build() { --with-soxr \ --with-stdout \ --with-pipe \ - --with-metadata + --with-metadata \ + --with-mpris-interface \ + --with-dbus-interface make } diff --git a/community/shfmt/APKBUILD b/community/shfmt/APKBUILD index 684c938040e..64d7e68c251 100644 --- a/community/shfmt/APKBUILD +++ b/community/shfmt/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Olliver Schinagl <oliver@schinagl.nl> pkgname=shfmt pkgver=3.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="A shell parser, formatter, and interpreter (sh/bash/mksh)" url="https://mvdan.cc/sh" arch="all" diff --git a/community/shotman/APKBUILD b/community/shotman/APKBUILD index d1c1e7e36c6..c91e1f6b9a4 100644 --- a/community/shotman/APKBUILD +++ b/community/shotman/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Hugo Osvaldo Barrera <hugo@whynothugo.nl> pkgname=shotman -pkgver=0.4.5 +pkgver=0.4.6 pkgrel=0 pkgdesc="Uncompromising screenshot GUI for Wayland" url="https://git.sr.ht/~whynothugo/shotman" @@ -39,5 +39,5 @@ package() { } sha512sums=" -8f63d8acaade3f2d4bb36911cbf5776cddb23f3ceacfee4adc7344fe648b0fe80cbee019f25c112004b46473419526170c54c587b9c57368d46b08e0aefea6dd shotman-0.4.5.tar.gz +6546ccce72f707fdc03033e767abd1494601070323f24364993b7a080243ac1c64b1fa84d65c3a6f3898c54b782aefec60c8079badc435f3574504071005fd3c shotman-0.4.6.tar.gz " 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/signon-ui/APKBUILD b/community/signon-ui/APKBUILD index 42823d3b2e9..4cdd6b0c679 100644 --- a/community/signon-ui/APKBUILD +++ b/community/signon-ui/APKBUILD @@ -4,8 +4,8 @@ pkgname=signon-ui pkgver=0.18_git20231016 pkgrel=0 _commit="eef943f0edf3beee8ecb85d4a9dae3656002fc24" -# armhf, ppc64le, s390x, riscv64 blocked by qt6-qtwebengine -arch="all !armhf !ppc64le !s390x !riscv64" +# armhf, ppc64le, s390x, riscv64, loongarch64 blocked by qt6-qtwebengine +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" url="https://gitlab.com/accounts-sso/signon-ui" pkgdesc="Signond Qt UI" license="GPL-3.0-only" diff --git a/community/singularity/APKBUILD b/community/singularity/APKBUILD index 4a5dca3eb56..0b1254fc796 100644 --- a/community/singularity/APKBUILD +++ b/community/singularity/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=singularity pkgver=4.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="Application containers focused on reproducibility for scientific computing and HPC world." url="https://www.sylabs.io/singularity/" # ppc64le: produces a non-PIE suid binary 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/community/skanlite/APKBUILD b/community/skanlite/APKBUILD index 50d28f00e1e..97d3a6f56f0 100644 --- a/community/skanlite/APKBUILD +++ b/community/skanlite/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=skanlite -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -45,5 +45,5 @@ package() { } sha512sums=" -53e395d8f7199840393b6c5e427fa8989eebd9a6c9474e88c0e2c1428e7c858acf19ee32d6865f154ecba259f8a0b03da5e38f75122f36ea47efcbc92fd8bceb skanlite-24.02.2.tar.xz +d2973034ee8078f6a1ddbb9eb07ea56f5b63b1c42726d1fc223957a82c9bcdd8ca3889f180d45ab5e6cc39aebab584ef88f6f5662bf61f9fc54f3b4bf6cdb514 skanlite-24.05.0.tar.xz " diff --git a/community/skopeo/APKBUILD b/community/skopeo/APKBUILD index 381262b85f4..13d9958b9ec 100644 --- a/community/skopeo/APKBUILD +++ b/community/skopeo/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> pkgname=skopeo -pkgver=1.14.2 -pkgrel=2 +pkgver=1.15.1 +pkgrel=0 # set this to the gitrev of the version -_gitrev=b673eb60b754ddd8ba9eeea1dc2e8d8ad03037ac +_gitrev=e2ea426918973e5e007a5e1e2457a41ab336fc41 pkgdesc="Work with remote images registries - retrieving information, images, signing content" url="https://github.com/containers/skopeo" license="Apache-2.0" @@ -32,6 +32,8 @@ subpackages=" source="https://github.com/containers/skopeo/archive/v$pkgver/skopeo-$pkgver.tar.gz" # secfixes: +# 1.15.1-r0: +# - CVE-2024-3727 # 1.5.2-r0: # - CVE-2021-41190 @@ -56,5 +58,5 @@ package() { } sha512sums=" -ffb3c00cdde05f7a916bd3980c9cec1bb82b3f3bf90058bfff1837d3a9902087ac011828e6164baec18210d4aeee1a5258b75405411fd15ea2470a2522a6da73 skopeo-1.14.2.tar.gz +686d17da4a84d9029d688cfca08724576564ce2a05aed9380bf55059c244c90cffa3b21c2dbe84b19b746773e98d5f26e5ceaca58f7be26b656125977685c663 skopeo-1.15.1.tar.gz " diff --git a/community/slides/APKBUILD b/community/slides/APKBUILD index ffdaf2a98a7..d725b89e425 100644 --- a/community/slides/APKBUILD +++ b/community/slides/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=slides pkgver=0.9.0 -pkgrel=14 +pkgrel=15 pkgdesc="Terminal based presentation tool" url="http://maaslalani.com/slides" arch="all" diff --git a/community/sliding-sync/APKBUILD b/community/sliding-sync/APKBUILD index 0ab2f644769..98977f144a0 100644 --- a/community/sliding-sync/APKBUILD +++ b/community/sliding-sync/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Guy Godfroy <guy.godfroy@gugod.fr> pkgname=sliding-sync pkgver=0.99.15 -pkgrel=1 +pkgrel=2 pkgdesc="Matrix protocol sliding sync specification" url="https://github.com/matrix-org/sliding-sync" license="Apache-2.0" 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/community/snac/APKBUILD b/community/snac/APKBUILD index 174f6b2ba79..485b08e2d55 100644 --- a/community/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.53 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 +dc25c53004ade54795d246e034bb0c737be52bc517fa4992fcb681a49b479fe308341a9023bcc1eba0d4c62cdd3253274bc0218bdf0e79b371e61fbcc2e17249 snac-2.53.tar.gz 8451eb37e5135b926a1a36b7f69d63cb76aa617ca3f9b9167f2284223582dcf66723ee67c51c6abc2d1605c41678d26f67ec6cb1bf920c61379dbf63f7852e1a snac.initd " diff --git a/community/snapshot/APKBUILD b/community/snapshot/APKBUILD index 7c07062d9e9..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.2 +pkgver=46.3 pkgrel=0 pkgdesc="Take pictures and videos" url="https://gitlab.gnome.org/GNOME/snapshot" @@ -41,5 +41,5 @@ package() { } sha512sums=" -eb34a9d16e7e0856e04d402b9efd23f9e3f6598846d7a13d16f9ca741e73eadba498b61ff628d5d64f0bad2a5927267d261e52541c68dff59501434f20051f15 snapshot-46.2.tar.xz +d2fc212727d90ec403f743b8fe92fbdd47d3e8bb80b79b21035be8f9f97c682011c72a7f07d2dd44c963464312c18043ebd5de1ecffb52f1dfe2b2a799690e5f snapshot-46.3.tar.xz " diff --git a/community/sof-firmware/APKBUILD b/community/sof-firmware/APKBUILD index e81ff9f8e9e..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=2024.03 -pkgrel=0 +pkgrel=1 pkgdesc="Sound Open Firmware" url="https://github.com/thesofproject/sof-bin" arch="noarch" @@ -18,7 +18,7 @@ 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/ } diff --git a/community/solid/APKBUILD b/community/solid/APKBUILD index 4d9ec9bcd4d..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.1 +pkgver=6.2.0 pkgrel=0 pkgdesc="Hardware integration and detection" # armhf blocked by qt6-qtdeclarative @@ -46,5 +46,5 @@ package() { } sha512sums=" -d30e6426e418791f0cab72fb5ab54ed2d8ff98212959fee5a4e661db2165a0b920f3a1c36ebc518b4659b36640429e31925200946a45999d874424f4756158d5 solid-6.1.1.tar.xz +809517d751b5b70b3e7c2221e5fb180a35fcd538e3efa2ee1ca7621e01957efd0a0bebe610a2cc7a766702e95f63a50c46570f0cc636680908bcb86bb506547d solid-6.2.0.tar.xz " diff --git a/community/solid5/APKBUILD b/community/solid5/APKBUILD index bd87635d296..1ce59d4084f 100644 --- a/community/solid5/APKBUILD +++ b/community/solid5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=solid5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Hardware integration and detection" # armhf blocked by qt5-qtdeclarative @@ -55,5 +55,5 @@ _libs() { } sha512sums=" -727fe483124edcfbc56aad2f3988c1499b1d100173279a0da3477a12857e0381b845a9efa1d1827ad24a96557d3a2d0ce67b09e53571c37637dbb4aac4dff4d1 solid-5.115.0.tar.xz +1d6cb0c096bfede35a4b2963cd87e2ef0cb1a6be640d18c737434451e288645f7bbb0657c8ac780f3a60104c153b3b20ed7bd9c90b077d9aa7daea5740947b36 solid-5.116.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/sonnet5/APKBUILD b/community/sonnet5/APKBUILD index 4f07de174d9..3b9c67c4f8e 100644 --- a/community/sonnet5/APKBUILD +++ b/community/sonnet5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=sonnet5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Spelling framework for Qt5" # armhf blocked by extra-cmake-modules @@ -50,5 +50,5 @@ package() { } sha512sums=" -ee95bd4be8fb97eb284f9f7f6dedbf4b8eb9d105cc95f0a489c2acbc52b447e138ce70a4dc8aca4ebb8f90f328ab7c87dda4ce66b9026cf303479f1455b55c7c sonnet-5.115.0.tar.xz +d40f721679f77d0eef706eddaa4369c63bb28a45852f0ad8f09518762ef249983dcdc1b4fac2b08fa37b2f4d53a6c301ec1abe2aab2af075ee52d442c248e88b sonnet-5.116.0.tar.xz " diff --git a/community/sops/APKBUILD b/community/sops/APKBUILD index 70e7b4fcc17..b9a20c85fd2 100644 --- a/community/sops/APKBUILD +++ b/community/sops/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=sops pkgver=3.8.1 -pkgrel=3 +pkgrel=4 pkgdesc="Simple and flexible tool for managing secrets" url="https://github.com/getsops/sops" license="MPL-2.0" diff --git a/community/spacebar/APKBUILD b/community/spacebar/APKBUILD index 3920e29d8c6..09484a1c9f2 100644 --- a/community/spacebar/APKBUILD +++ b/community/spacebar/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-mobile pkgname=spacebar -pkgver=24.02.0 +pkgver=24.05.0 pkgrel=0 pkgdesc="Collection of stuff for running IM on Plasma Mobile" url="https://invent.kde.org/plasma-mobile/spacebar" @@ -49,5 +49,5 @@ package() { } sha512sums=" -ec814f32e416b20f33816e91512d309c0bb1c82f2baa559749b04220e7e11151973b034126ea49b8ca3c1a4946d5c443a044722e5d08b0525ea9eeff947e1ab7 spacebar-24.02.0.tar.xz +8809bd7c5fe6b86040ce0c9ecdb2bb6eb97c99170c19ec71081ddaf58bc8ddf1971c5edccc15bbd6148ca38b82bb9341d146ce4762fe38217ab3a82da7079da8 spacebar-24.05.0.tar.xz " diff --git a/community/spectacle/APKBUILD b/community/spectacle/APKBUILD index 1900f392413..66934723278 100644 --- a/community/spectacle/APKBUILD +++ b/community/spectacle/APKBUILD @@ -4,12 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=spectacle -pkgver=24.02.2 +pkgver=24.05.0 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=" @@ -29,6 +29,7 @@ makedepends=" kwindowsystem-dev layer-shell-qt-dev libxcb-dev + opencv-dev pipewire-dev purpose-dev qt6-qtbase-dev @@ -36,6 +37,7 @@ makedepends=" xcb-util-cursor-dev xcb-util-image-dev xcb-util-renderutil-dev + zxing-cpp-dev " subpackages="$pkgname-doc $pkgname-lang" _repo_url="https://invent.kde.org/graphics/spectacle.git" @@ -64,6 +66,6 @@ package() { rm -r "$pkgdir"/usr/lib/systemd } sha512sums=" -52269013adadce38d7faa6ddd8d4be8935bbfca70c3d906b24d78d19b55595b7d0cfffaa008c42030c08ccf82ea46742a4d81c9d0cf01fcc31073a2bede93d88 spectacle-24.02.2.tar.xz +e76d44f1e52e65785556f5cc6b6cb7b3aaa072af7f43f6c11d21791f98b9fddc099dfac2c3682f6b5987395beac5fe14a0ee9d022273688b6f7b5eb4f7d1b092 spectacle-24.05.0.tar.xz 7c563d811f30d26f83e01a465e803b95167c5b2b842315257216ab282e07c69e7582a14d7f429cd19678199179ad8f3f2854265092f5a4c9ce9b65c87ed3849d spectacle.desktop " diff --git a/community/sprec/APKBUILD b/community/sprec/APKBUILD index 991d4f04fa6..6a82415c8a5 100644 --- a/community/sprec/APKBUILD +++ b/community/sprec/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: John Gebbie <me@johngebbie.com> pkgname=sprec pkgver=0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Speech recognition command" url="https://sr.ht/~geb/sprec" # limited by vosk-api diff --git a/community/spvm/APKBUILD b/community/spvm/APKBUILD index 4afea0d118e..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.990005 +pkgver=0.990006 pkgrel=0 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=SPVM @@ -39,5 +39,5 @@ package() { } sha512sums=" -8ce2647e73212da89090a9e492ab955607fe4f19f3d66d4b718cae42a3feea192c075f7ccff54c64d8c3a8a3488b3a7bd43830a2acd414f33e785690563e7449 SPVM-0.990005.tar.gz +daf9858a05dffa39f1f39b7a169a694d49236acde02556f16db2afeba3ae73ec6c098e84ec2ef8bf63a74b8d848c84012e96ea39864dc8b6f6cd41c5673e8276 SPVM-0.990006.tar.gz " diff --git a/community/sqlcipher/APKBUILD b/community/sqlcipher/APKBUILD index df00646659d..dab58411185 100644 --- a/community/sqlcipher/APKBUILD +++ b/community/sqlcipher/APKBUILD @@ -17,6 +17,11 @@ subpackages=" " source="$pkgname-$pkgver.tar.gz::https://github.com/sqlcipher/sqlcipher/archive/v$pkgver.tar.gz" +prepare() { + default_prepare + update_config_sub +} + build() { export CFLAGS="$CFLAGS \ -DSQLITE_HAS_CODEC \ diff --git a/testing/squashfs-tools-ng/APKBUILD b/community/squashfs-tools-ng/APKBUILD index 3843d6953db..3843d6953db 100644 --- a/testing/squashfs-tools-ng/APKBUILD +++ b/community/squashfs-tools-ng/APKBUILD diff --git a/community/squeekboard/APKBUILD b/community/squeekboard/APKBUILD index cea9d87f9a6..1b517a86146 100644 --- a/community/squeekboard/APKBUILD +++ b/community/squeekboard/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: team/phosh <newbyte@postmarketos.org> pkgname=squeekboard -pkgver=1.38.0 -pkgrel=2 +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/sshign/APKBUILD b/community/sshign/APKBUILD index 35c790aca46..0429e8355fb 100644 --- a/community/sshign/APKBUILD +++ b/community/sshign/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Pedro Lucas Porcellis <porcellis@eletrotupi.com> pkgname=sshign pkgver=0.2.1 -pkgrel=23 +pkgrel=24 pkgdesc="Small program to sign & verify files with your SSH key" url="https://git.sr.ht/~minus/sshign" arch="all" 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/stack/APKBUILD b/community/stack/APKBUILD new file mode 100644 index 00000000000..eb231b5e92a --- /dev/null +++ b/community/stack/APKBUILD @@ -0,0 +1,108 @@ +# Contributor: gay <gay@disroot.org> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=stack +pkgver=2.15.7 +pkgrel=0 +pkgdesc="The Haskell Tool Stack" +url="https://haskellstack.org/" +arch="aarch64 x86_64" # limited by ghc +license="BSD-3-Clause" +makedepends=" + cabal + ghc + gmp-dev + sqlite-dev + uusi + zlib-dev + " +checkdepends="ncurses-dev" +subpackages=" + $pkgname-bash-completion + $pkgname-fish-completion + $pkgname-zsh-completion + " +source="https://hackage.haskell.org/package/stack-$pkgver/stack-$pkgver.tar.gz + cabal.project.freeze + " + +export CABAL_DIR="${CABAL_DIR:-"$srcdir/cabal"}" + +cabal_relax() { + # Following what Homebrew does + cat > "$builddir"/cabal.project <<-'END' + packages: . + constraints: tar < 0.6 + END + + uusi -u directory -u filepath "$builddir"/$pkgname.cabal +} + +cabal_update() { + local repo="hackage.haskell.org" + + # Default config uses HTTP, change it to HTTPS. + [ -f "$CABAL_DIR"/config ] || { + cabal user-config init + cabal user-config update -a \ + "repository $repo {url: https://$repo/}" + } + + [ -d "$builddir" ] || abuild unpack + msg "Freezing $pkgname dependencies" + + # Resolve deps and generate fresh cabal.project.freeze with version constraints. + ( + cd "$builddir" || { + error 'Is $builddir set correctly?' + return 1 + } + cabal_relax + + cabal v2-update + cabal v2-freeze --shadow-installed-packages + + mv -v cabal.project.freeze "$startdir"/ + ) + + if ! abuild checksum; then + die "Failed to update checksum, run 'abuild checksum' manually" + fi +} + +prepare() { + cabal_relax + default_prepare + + ln -svf "$srcdir"/cabal.project.freeze "$builddir"/ +} + +build() { + cabal v2-update + cabal v2-build stack:exes \ + --jobs=${JOBS:-1} \ + --prefix=/usr \ + --docdir=/usr/share/doc/$pkgname \ + --sysconfdir=/etc \ + --enable-relocatable +} + +check() { + cabal test +} + +package() { + cd dist-newstyle/build/*-linux/ghc-*/$pkgname-$pkgver/build/$pkgname + install -Dvm755 $pkgname -t "$pkgdir"/usr/bin/ + + ./stack --bash-completion-script stack | install -Dm644 /dev/stdin \ + "$pkgdir"/usr/share/bash-completion/completions/$pkgname + ./stack --fish-completion-script stack | install -Dm644 /dev/stdin \ + "$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish + ./stack --zsh-completion-script stack | install -Dm644 /dev/stdin \ + "$pkgdir"/usr/share/zsh/site-functions/_$pkgname +} + +sha512sums=" +0a0e2fca52b17e3fbc5091da9fc7dd639a50c37519ae8ea27954536381d63bda4e1f20ca047e061dc898cac35a0551c996ced6f8d87184fe8e5be03e03d3cb82 stack-2.15.7.tar.gz +bbc0b3a3aa65412e053a0a580c139872c74e3446fdcb46bbcfe0f37b773d54ee0527d8ff6dad46b19c881c0aed459ff298cbd2d81888064362cef226c09dcf14 cabal.project.freeze +" diff --git a/community/stack/cabal.project.freeze b/community/stack/cabal.project.freeze new file mode 100644 index 00000000000..b68d3c3851c --- /dev/null +++ b/community/stack/cabal.project.freeze @@ -0,0 +1,289 @@ +active-repositories: hackage.haskell.org:merge +constraints: any.Cabal ==3.10.2.0 || ==3.10.3.0, + any.Cabal-syntax ==3.10.2.0 || ==3.10.3.0, + any.Glob ==0.10.2, + any.HUnit ==1.6.2.0, + any.OneTuple ==0.4.2, + any.QuickCheck ==2.15, + QuickCheck -old-random +templatehaskell, + any.StateVar ==1.2.2, + any.aeson ==2.2.2.0, + aeson +ordered-keymap, + any.aeson-warning-parser ==0.1.1, + any.annotated-wl-pprint ==0.7.0, + any.ansi-terminal ==1.1.1, + ansi-terminal -example, + any.ansi-terminal-types ==1.1, + 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.1, + assoc -tagged, + any.async ==2.2.5, + async -bench, + any.attoparsec ==0.14.4, + attoparsec -developer, + any.attoparsec-aeson ==2.2.2.0, + any.auto-update ==0.2.0, + any.base ==4.19.1.0, + any.base-orphans ==0.9.2, + 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.blaze-html ==0.9.2.0, + any.blaze-markup ==0.8.3.0, + any.byteorder ==1.0.4, + any.bytestring ==0.12.1.0, + any.call-stack ==0.4.0, + any.casa-client ==0.0.2, + any.casa-types ==0.0.2, + any.case-insensitive ==1.2.1.0, + any.cborg ==0.2.10.0, + cborg +optimize-gmp, + any.cereal ==0.5.8.3, + cereal -bytestring-builder, + any.character-ps ==0.1, + any.clock ==0.8.4, + clock -llvm, + any.cmdargs ==0.10.22, + cmdargs +quotation -testprog, + any.colour ==2.3.6, + any.comonad ==5.0.8, + comonad +containers +distributive +indexed-traversable, + any.companion ==0.1.0, + any.conduit ==1.3.5, + any.conduit-combinators ==1.3.0, + any.conduit-extra ==1.3.6, + any.containers ==0.6.8, + any.contravariant ==1.5.5, + contravariant +semigroups +statevar +tagged, + any.cookie ==0.4.6, + any.cryptohash-sha256 ==0.11.102.1, + cryptohash-sha256 -exe +use-cbits, + any.crypton ==1.0.0, + crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, + any.crypton-conduit ==0.2.3, + any.crypton-connection ==0.4.0, + 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.data-default-class ==0.1.2.0, + any.data-fix ==0.3.3, + 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 || ==1.3.8.4, + directory +os-string, + any.distributive ==0.6.2.1, + distributive +semigroups +tagged, + any.dlist ==1.0, + dlist -werror, + any.easy-file ==0.2.5, + any.echo ==0.1.4, + echo -example, + any.ed25519 ==0.0.5.0, + ed25519 +no-donna +test-doctests +test-hlint +test-properties, + any.exceptions ==0.10.7, + any.extra ==1.7.16, + any.fast-logger ==3.2.3, + any.file-embed ==0.0.16.0, + any.filelock ==0.1.1.7, + any.filepath ==1.4.200.1 || ==1.5.2.0, + filepath -cpphs, + any.fsnotify ==0.4.1.0, + any.generic-deriving ==1.14.5, + generic-deriving +base-4-9, + any.generically ==0.1.1, + any.ghc-bignum ==1.3, + any.ghc-boot ==9.8.2, + any.ghc-boot-th ==9.8.2, + any.ghc-prim ==0.11.0, + any.githash ==0.1.7.0, + any.hackage-security ==0.6.2.6, + hackage-security +cabal-syntax +lukko, + any.half ==0.3.1, + any.hashable ==1.4.4.0, + hashable +integer-gmp -random-initial-seed, + any.haskell-lexer ==1.1.1, + any.hi-file-parser ==0.1.6.0, + any.hinotify ==0.4.1, + any.hourglass ==0.2.12, + any.hpack ==0.36.0, + any.hpc ==0.7.0.0, + any.hsc2hs ==0.68.10, + hsc2hs -in-ghc-tree, + any.hspec ==2.11.8, + any.hspec-core ==2.11.8, + any.hspec-discover ==2.11.8, + any.hspec-expectations ==0.8.4, + any.http-api-data ==0.6, + http-api-data -use-text-show, + 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-download ==0.2.1.0, + any.http-types ==0.12.4, + any.indexed-traversable ==0.1.4, + any.indexed-traversable-instances ==0.1.2, + any.infer-license ==0.2.0, + any.integer-conversion ==0.1.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.libyaml ==0.1.4, + libyaml -no-unicode -system-libyaml, + any.libyaml-clib ==0.2.5, + any.lift-type ==0.1.1.1, + any.lifted-base ==0.2.3.12, + any.lukko ==0.1.1.3, + lukko +ofd-locking, + any.megaparsec ==9.6.1, + megaparsec -dev, + any.memory ==0.18.0, + memory +support_bytestring +support_deepseq, + any.microlens ==0.4.13.1, + any.microlens-mtl ==0.2.0.3, + any.microlens-th ==0.4.3.15, + any.mime-types ==0.1.2.0, + any.monad-control ==1.0.3.1, + any.monad-logger ==0.3.40, + monad-logger +template_haskell, + any.monad-loops ==0.4.3, + monad-loops +base4, + any.mono-traversable ==1.0.17.0, + any.mtl ==2.3.1, + any.mtl-compat ==0.2.2, + mtl-compat -two-point-one -two-point-two, + any.mustache ==2.4.2, + any.neat-interpolation ==0.5.1.4, + 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.open-browser ==0.2.1.0, + any.optparse-applicative ==0.18.1.0, + optparse-applicative +process, + any.optparse-simple ==0.1.1.4, + optparse-simple -build-example, + any.os-string ==2.0.2.2, + any.pantry ==0.9.3.2, + pantry -test-pretty-exceptions, + any.parsec ==3.1.17.0, + any.parser-combinators ==1.3.0, + parser-combinators -dev, + any.path ==0.9.5, + path -dev, + any.path-io ==1.8.1, + path-io -dev, + any.path-pieces ==0.2.1, + any.pem ==0.2.4, + any.persistent ==2.14.6.1, + any.persistent-sqlite ==2.13.3.0, + persistent-sqlite -build-sanity-exe +full-text-search +have-usleep +json1 -systemlib +uri-filenames -use-pkgconfig -use-stat3 +use-stat4, + any.persistent-template ==2.12.0.0, + any.pretty ==1.1.3.6, + any.prettyprinter ==1.7.1, + prettyprinter -buildreadme +text, + any.prettyprinter-ansi-terminal ==1.1.3, + any.primitive ==0.9.0.0, + any.process ==1.6.18.0 || ==1.6.20.0, + any.project-template ==0.2.1.0, + any.quickcheck-io ==0.2.0, + any.random ==1.2.1.2, + any.raw-strings-qq ==1.1, + any.resource-pool ==0.4.0.0, + any.resourcet ==1.3.0, + any.retry ==0.9.3.1, + retry -lib-werror, + any.rio ==0.1.22.0, + any.rio-orphans ==0.1.2.0, + any.rio-prettyprint ==0.1.8.0, + any.rts ==1.0.2, + any.safe-exceptions ==0.1.7.4, + any.scientific ==0.3.8.0, + scientific -integer-simple, + any.semialign ==1.3.1, + semialign +semigroupoids, + any.semigroupoids ==6.0.1, + semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, + any.serialise ==0.2.6.1, + serialise +newtime15, + any.silently ==1.2.5.3, + any.socks ==0.6.1, + any.split ==0.2.5, + any.splitmix ==0.1.0.5, + splitmix -optimised-mixer, + stack -developer-mode -disable-git-info -disable-stack-upload -hide-dependency-versions -integration-tests -static -supported-build, + any.static-bytes ==0.1.0, + any.stm ==2.5.2.1, + any.stm-chans ==3.0.0.9, + any.streaming-commons ==0.2.2.6, + streaming-commons -use-bytestring-builder, + any.strict ==0.5, + any.tagged ==0.8.8, + tagged +deepseq +transformers, + any.tar ==0.5.1.1, + tar -old-bytestring -old-time, + any.tar-conduit ==0.4.1, + any.template-haskell ==2.21.0.0, + any.temporary ==1.3, + any.text ==2.1.1, + any.text-iso8601 ==0.1.1, + any.text-metrics ==0.3.2, + text-metrics -dev, + any.text-short ==0.1.6, + text-short -asserts, + any.tf-random ==0.5, + any.th-abstraction ==0.7.0.0, + any.th-compat ==0.1.5, + any.th-lift ==0.8.4, + any.th-lift-instances ==0.1.20, + any.these ==1.2.1, + any.time ==1.12.2, + any.time-compat ==1.9.7, + any.tls ==2.0.5, + tls -devel, + 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.typed-process ==0.2.11.1, + any.unix ==2.8.4.0 || ==2.8.5.1, + unix +os-string, + any.unix-compat ==0.7.1, + unix-compat -old-time, + any.unix-time ==0.4.12, + any.unliftio ==0.2.25.0, + any.unliftio-core ==0.2.1.0, + any.unordered-containers ==0.2.20, + unordered-containers -debug, + any.uuid-types ==1.0.6, + any.vault ==0.3.1.5, + vault +useghc, + 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.5, + any.yaml ==0.11.11.2, + yaml +no-examples +no-exe, + any.zip-archive ==0.4.3.2, + zip-archive -executable, + any.zlib ==0.7.1.0, + zlib -bundled-c-zlib +non-blocking-ffi +pkg-config +index-state: hackage.haskell.org 2024-05-17T09:16:07Z diff --git a/community/stargazer-gmi/APKBUILD b/community/stargazer-gmi/APKBUILD index 7210b612133..6dd3982442c 100644 --- a/community/stargazer-gmi/APKBUILD +++ b/community/stargazer-gmi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sashanoraa <sasha@noraa.gay> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=stargazer-gmi -pkgver=1.1.0 +pkgver=1.2.1 pkgrel=0 pkgdesc="Fast and easy to use Gemini server" url="https://sr.ht/~zethra/stargazer/" @@ -16,9 +16,7 @@ subpackages=" $pkgname-fish-completion $pkgname-zsh-completion " -source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~zethra/stargazer/archive/$pkgver.tar.gz - ring-0.17.patch - " +source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~zethra/stargazer/archive/$pkgver.tar.gz" builddir="$srcdir/stargazer-$pkgver" options="!check" # connection refused to localhost @@ -48,6 +46,5 @@ package() { } sha512sums=" -93b257b794c6f56c382f410d1c11f7d248f04fce60a0e448437b6be663455f50c713d0c518b46948473c3c3eec34f3865186121151fd72493324a2f09f93fdd8 stargazer-gmi-1.1.0.tar.gz -02a92c7f31cc1486850c8431fcbf31dc26e4024e36ca6c422e6c0fca54a696bbf3d7122ccbdc56150cb5eff0e8dfe3c1a1729afc357200bb373e8131bec42eaf ring-0.17.patch +1eb5ed691756ecd2126421642a3fb71bdf9d7a1e8e94f8f1c5c5b23e361499aaa6a4383995ae6810dc4cba65360f4e98b9f6ed620723e67c71a44c5929a2010d stargazer-gmi-1.2.1.tar.gz " diff --git a/community/stargazer-gmi/ring-0.17.patch b/community/stargazer-gmi/ring-0.17.patch deleted file mode 100644 index 5fbf4283907..00000000000 --- a/community/stargazer-gmi/ring-0.17.patch +++ /dev/null @@ -1,218 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -243,12 +243,6 @@ - ] - - [[package]] --name = "bumpalo" --version = "3.12.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" -- --[[package]] - name = "cc" - version = "1.0.79" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -597,15 +591,6 @@ - checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - - [[package]] --name = "js-sys" --version = "0.3.61" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" --dependencies = [ -- "wasm-bindgen", --] -- --[[package]] - name = "lazy_static" - version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -813,11 +798,10 @@ - [[package]] - name = "rcgen" - version = "0.11.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" -+source = "git+https://github.com/rustls/rcgen?rev=948c3b54eae1db242c7966cfa7338001c3928c2f#948c3b54eae1db242c7966cfa7338001c3928c2f" - dependencies = [ - "pem", -- "ring 0.16.20", -+ "ring", - "time", - "yasna", - ] -@@ -873,21 +857,6 @@ - - [[package]] - name = "ring" --version = "0.16.20" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" --dependencies = [ -- "cc", -- "libc", -- "once_cell", -- "spin 0.5.2", -- "untrusted 0.7.1", -- "web-sys", -- "winapi", --] -- --[[package]] --name = "ring" - version = "0.17.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" -@@ -895,8 +864,8 @@ - "cc", - "getrandom", - "libc", -- "spin 0.9.8", -- "untrusted 0.9.0", -+ "spin", -+ "untrusted", - "windows-sys", - ] - -@@ -940,7 +909,7 @@ - checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" - dependencies = [ - "log", -- "ring 0.17.3", -+ "ring", - "rustls-webpki", - "sct", - ] -@@ -960,18 +929,18 @@ - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" - dependencies = [ -- "ring 0.17.3", -- "untrusted 0.9.0", -+ "ring", -+ "untrusted", - ] - - [[package]] - name = "sct" --version = "0.7.0" -+version = "0.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" - dependencies = [ -- "ring 0.16.20", -- "untrusted 0.7.1", -+ "ring", -+ "untrusted", - ] - - [[package]] -@@ -1043,12 +1012,6 @@ - - [[package]] - name = "spin" --version = "0.5.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -- --[[package]] --name = "spin" - version = "0.9.8" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -@@ -1211,12 +1174,6 @@ - - [[package]] - name = "untrusted" --version = "0.7.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -- --[[package]] --name = "untrusted" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -@@ -1258,70 +1215,6 @@ - version = "0.11.0+wasi-snapshot-preview1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -- --[[package]] --name = "wasm-bindgen" --version = "0.2.84" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" --dependencies = [ -- "cfg-if", -- "wasm-bindgen-macro", --] -- --[[package]] --name = "wasm-bindgen-backend" --version = "0.2.84" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" --dependencies = [ -- "bumpalo", -- "log", -- "once_cell", -- "proc-macro2", -- "quote", -- "syn 1.0.109", -- "wasm-bindgen-shared", --] -- --[[package]] --name = "wasm-bindgen-macro" --version = "0.2.84" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" --dependencies = [ -- "quote", -- "wasm-bindgen-macro-support", --] -- --[[package]] --name = "wasm-bindgen-macro-support" --version = "0.2.84" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" --dependencies = [ -- "proc-macro2", -- "quote", -- "syn 1.0.109", -- "wasm-bindgen-backend", -- "wasm-bindgen-shared", --] -- --[[package]] --name = "wasm-bindgen-shared" --version = "0.2.84" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" -- --[[package]] --name = "web-sys" --version = "0.3.61" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" --dependencies = [ -- "js-sys", -- "wasm-bindgen", --] - - [[package]] - name = "winapi" ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -84,3 +84,6 @@ - [profile.release] - lto = "fat" - codegen-units = 1 -+ -+[patch.crates-io] -+rcgen = { git = "https://github.com/rustls/rcgen", rev = "948c3b54eae1db242c7966cfa7338001c3928c2f" } diff --git a/community/staticcheck/APKBUILD b/community/staticcheck/APKBUILD index 67052b15674..031c3c6b5ae 100644 --- a/community/staticcheck/APKBUILD +++ b/community/staticcheck/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=staticcheck pkgver=2023.1.7 -pkgrel=2 +pkgrel=3 pkgdesc="advanced Go linter" url="https://github.com/dominikh/go-tools" arch="all" diff --git a/community/step-certificates/APKBUILD b/community/step-certificates/APKBUILD index 93d78ba70ef..3f4de3b83d2 100644 --- a/community/step-certificates/APKBUILD +++ b/community/step-certificates/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: pkgname=step-certificates pkgver=0.25.2 -pkgrel=4 +pkgrel=5 pkgdesc="Online certificate authority and related tools" url="https://smallstep.com/certificates/" arch="all !riscv64" # step-cli diff --git a/community/step-cli/APKBUILD b/community/step-cli/APKBUILD index 953bca78fc1..5961c95b3af 100644 --- a/community/step-cli/APKBUILD +++ b/community/step-cli/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: pkgname=step-cli pkgver=0.25.2 -pkgrel=4 +pkgrel=5 pkgdesc="Zero trust swiss army knife that integrates with step-ca for automated certificate management" url="https://github.com/smallstep/cli" arch="all !riscv64" # ftbfs diff --git a/community/step-kms-plugin/APKBUILD b/community/step-kms-plugin/APKBUILD index b64d754a40b..04d754ee37e 100644 --- a/community/step-kms-plugin/APKBUILD +++ b/community/step-kms-plugin/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=step-kms-plugin pkgver=0.10.0 -pkgrel=3 +pkgrel=4 pkgdesc="Step plugin to manage keys and certs on KMSs and HSMs" url="https://github.com/smallstep/step-kms-plugin" arch="all" diff --git a/community/step/APKBUILD b/community/step/APKBUILD index 18cfe939962..52b0725baad 100644 --- a/community/step/APKBUILD +++ b/community/step/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=step -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules # s390x blocked by @@ -50,5 +50,5 @@ package() { } sha512sums=" -35d6df48c97dc13f3247673706a37ad64c3bbc25dfc65a8e3364363563f6df31f60e66ab97ee6c3f78017ff93e66e77781cd421bf43a8f26823e6631781212b1 step-24.02.2.tar.xz +2377404b7f108b574486db3f9c56c3074b5447cda6bd4dc8addcab382b7849be50091f82ec00b5b7710143ff278a6bb62afa1a06d02aa8cfa49d9ac5c0b25a55 step-24.05.0.tar.xz " 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/supercronic/APKBUILD b/community/supercronic/APKBUILD index 300f0bbbcbd..0c93c80ecea 100644 --- a/community/supercronic/APKBUILD +++ b/community/supercronic/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=supercronic pkgver=0.2.29 -pkgrel=2 +pkgrel=3 pkgdesc="Cron for containers" url="https://github.com/aptible/supercronic" arch="all" diff --git a/community/superd/APKBUILD b/community/superd/APKBUILD index 8deba36c7bd..5839b88ef48 100644 --- a/community/superd/APKBUILD +++ b/community/superd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=superd pkgver=0.7.1 -pkgrel=12 +pkgrel=13 pkgdesc="lightweight user service supervising daemon" url="https://sr.ht/~craftyguy/superd" arch="all" diff --git a/community/suricata/APKBUILD b/community/suricata/APKBUILD index 7b2ed24bd92..f19106f2e6e 100644 --- a/community/suricata/APKBUILD +++ b/community/suricata/APKBUILD @@ -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" 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/svt-av1/APKBUILD b/community/svt-av1/APKBUILD index 8fc83049f54..e20865bd220 100644 --- a/community/svt-av1/APKBUILD +++ b/community/svt-av1/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Oleg Titov <oleg.titov@gmail.com> # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=svt-av1 -pkgver=2.0.0 -pkgrel=1 +pkgver=2.1.0 +pkgrel=0 pkgdesc="Scalable Vector Technology for AV1 encoder (SVT-AV1 Encoder)" url="https://gitlab.com/AOMediaCodec/SVT-AV1" # 32-bit is not supported upstream @@ -46,5 +46,5 @@ enclib() { } sha512sums=" -00422ae747b8a18e13db087ac00cdb949d9a2aa6a5d6416807f2fe34b056aa831bc33058bdc0b5858bfd8690319ec7c532ba7897775acb17ffafbc388fe5986a SVT-AV1-v2.0.0.tar.bz2 +e0eeb48950455dba5c8f2ba26d38e66b94a77a1042cbf256431e6d0c5c4b312f11f74ee554063daec22b2f2e2a9342a0d36a70974aa3389783f8d54e0d8801fc SVT-AV1-v2.1.0.tar.bz2 " diff --git a/community/sway-contrib/APKBUILD b/community/sway-contrib/APKBUILD new file mode 100644 index 00000000000..5726d929c6c --- /dev/null +++ b/community/sway-contrib/APKBUILD @@ -0,0 +1,62 @@ +# Contributor: fossdd <fossdd@pwned.life> +# Maintainer: fossdd <fossdd@pwned.life> +pkgname=sway-contrib +pkgver=1.9 +pkgrel=0 +pkgdesc="A collection of user-contributed scripts for Sway" +url="https://github.com/OctopusET/sway-contrib" +arch="noarch" +license="MIT" +depends=" + python3 + py3-i3ipc + " +_grimshot_depends=" + cmd:grim + cmd:jq + cmd:notify-send + cmd:slurp + cmd:swaymsg + cmd:wl-copy + " +makedepends="$_grimshot_depends" +subpackages=" + $pkgname-doc + grimshot + grimshot-doc:_grimshot_doc + " +source="$pkgname-$pkgver.tar.gz::https://github.com/OctopusET/sway-contrib/archive/$pkgver.tar.gz" +options="!check" # no tests available + +package() { + install -Dm755 -t "$pkgdir"/usr/share/$pkgname/ \ + autoname-workspaces.py \ + firefox-focus-monitor.py \ + inactive-windows-transparency.py \ + layout-per-window.py \ + switch-top-level.py + + install -Dm755 grimshot -t "$pkgdir"/usr/bin/ + + install -Dm644 README.md -t "$pkgdir"/usr/share/doc/$pkgname/ + install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/ +} + +grimshot() { + pkgdesc="Script for taking screenshots with grim and slurp on Sway" + depends="$_grimshot_depends" + + amove usr/bin/grimshot +} + +_grimshot_doc() { + install -Dm644 "$builddir"/grimshot.1 -t "$pkgdir"/usr/share/man/man1/ + + default_doc + pkgdesc="Documentation for grimshot" + install_if="docs ${subpkgname%-doc}=$pkgver-r$pkgrel" +} + +sha512sums=" +333536be50622c3db55484d273ae7082d4d8780f44b99f36897288138423471e8fc1c622f5336ef84e6ecad6791746b8049e49ad37c8d53520f37e71900932fd sway-contrib-1.9.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/swc/APKBUILD b/community/swc/APKBUILD index e3481961141..4b689577e74 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.5.0 +pkgver=1.5.7 pkgrel=0 pkgdesc="A super-fast TypeScript / JavaScript compiler written in Rust" url="https://swc.rs" @@ -33,5 +33,5 @@ package() { } sha512sums=" -6aafd15243a9355df8aed29345c0283dfa1c783e6105288d668390ffafb560c234cf6660c69deb295a4591241cd8172127351545e4f10c9978b980573592323c swc-1.5.0.tar.gz +55e74071d4f25eeba162d3271c0d87a9f332ac33b4e12abbe0a1fc7cfc5eac552b69941d3efdf854791faa3455ef2565bbc81acb62abc088611818bfc28caaab swc-1.5.7.tar.gz " diff --git a/community/sweeper/APKBUILD b/community/sweeper/APKBUILD index 23d1dee1f21..484e9651e36 100644 --- a/community/sweeper/APKBUILD +++ b/community/sweeper/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=sweeper -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -48,5 +48,5 @@ package() { } sha512sums=" -b17f703e81764f1a1999863b25e14bb12479b2ee39f59a480631e04ecfdbdfdc9d2e7b2e53786e56ec14390b128949aeb25a557badcf5c3fb37cc09305b6750c sweeper-24.02.2.tar.xz +06f601ef1ff618bd591744aa8671e4e676f5431e386fd41fa505d6d3727efcde6710fe471c3da1e225cbb554601ee21255ffb633bdf4a82080fab7954cb62944 sweeper-24.05.0.tar.xz " diff --git a/community/syft/APKBUILD b/community/syft/APKBUILD index 2a6fac76aa5..50fb6d269c9 100644 --- a/community/syft/APKBUILD +++ b/community/syft/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=syft -pkgver=1.0.1 -pkgrel=1 +pkgver=1.4.1 +pkgrel=0 pkgdesc="Generate a Software Bill of Materials (SBOM) from container images and filesystems" url="https://github.com/anchore/syft" license="Apache-2.0" @@ -44,5 +44,5 @@ package() { } sha512sums=" -7053a387df0b56be591067efa60e854dfe2e3f8de6fd1f674814daeae7d1f3f3042bd61c219ad234f8d8a22f3db4be554df51b84ad1691c9234aa8509e0ca75c syft-1.0.1.tar.gz +df2416051fb2f25d99d45f4de41029bf7956c9df70e97e194d4cc090d54c1f831ebc6dfa1699b7c69f14fce4e2a121c91b0894304243e3f4ce84ee5133d2dbb7 syft-1.4.1.tar.gz " diff --git a/community/synapse/APKBUILD b/community/synapse/APKBUILD index 26be6a4597f..53701460cb3 100644 --- a/community/synapse/APKBUILD +++ b/community/synapse/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: 6543 <6543@obermui.de> pkgname=synapse -pkgver=1.105.1 +pkgver=1.106.0 pkgrel=0 pkgdesc="Matrix reference homeserver" url="https://github.com/element-hq/synapse" @@ -155,7 +155,7 @@ package() { } sha512sums=" -be597b90c63306bc39f39a1e26f2daa76dcd986b155bcb2a4d191fece3f743004ee5d94723aba0f7d5744f6bf827c4fa26b972c03c0b7216f35838b5f2fffe4d synapse-1.105.1.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..d682efb8cca 100644 --- a/community/syncthing/APKBUILD +++ b/community/syncthing/APKBUILD @@ -4,8 +4,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Sertonix <sertonix@posteo.net> pkgname=syncthing -pkgver=1.27.6 -pkgrel=0 +pkgver=1.27.7 +pkgrel=1 pkgdesc="Open Source Continuous File Synchronization" url="https://syncthing.net/" arch="all" @@ -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/syndication5/APKBUILD b/community/syndication5/APKBUILD index 5d4fc3bc802..dd2705ffd57 100644 --- a/community/syndication5/APKBUILD +++ b/community/syndication5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=syndication5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="An RSS/Atom parser library" arch="all !armhf" # armhf blocked by extra-cmake-modules @@ -46,5 +46,5 @@ package() { } sha512sums=" -477d50ac097f63ecdfce009a2c52cae58d08213f06c1ae806956c0b6d6d6a4253d9cc77c4ed5e44f39a7d10ff539e24243cbe45f43db3a1720bd83479ff783cd syndication-5.115.0.tar.xz +82ca9937286cc9ab525bb078b2c884c368be7d243462a636d50a005e8667666f5cfdc11b324be75269857bf9f143a7b3704fc6411600bbfb60acd30dd772181d syndication-5.116.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/syntax-highlighting5/APKBUILD b/community/syntax-highlighting5/APKBUILD index 0be0d60317e..2af38ea54ee 100644 --- a/community/syntax-highlighting5/APKBUILD +++ b/community/syntax-highlighting5/APKBUILD @@ -4,8 +4,8 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=syntax-highlighting5 -pkgver=5.115.0 -pkgrel=1 +pkgver=5.116.0 +pkgrel=0 pkgdesc="Syntax highlighting engine for structured text and code" arch="all !armhf" # armhf blocked by extra-cmake-modules url="https://community.kde.org/Frameworks" @@ -22,10 +22,8 @@ makedepends="$depends_dev samurai " _repo_url="https://invent.kde.org/frameworks/syntax-highlighting.git" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/syntax-highlighting-$pkgver.tar.xz - fix-pcre.patch - " -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/syntax-highlighting-$pkgver.tar.xz" +subpackages="$pkgname-dev $pkgname-lang" builddir="$srcdir/syntax-highlighting-$pkgver" replaces="syntax-highlighting<=5.110.0-r0" @@ -35,7 +33,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_QCH=ON + -DBUILD_QCH=OFF # Currently fails to build cmake --build build } @@ -48,6 +46,5 @@ package() { } sha512sums=" -6a25a6c3be6258e956663065864ec177d05d91c817e79922ba599e45d4738813746a7c751c5043135d2c7255d341a60a6152e1d02ad90136e00a97ecb2ecd479 syntax-highlighting-5.115.0.tar.xz -29befce7098f5fad53673bf01693d67d590fc6f55dae8c28773d1fc2e688004688bbac6be2117ed2bef84cfd0d0a6887246056591647d3d613f3da701be1d313 fix-pcre.patch +e8d0f424ad0349ef1a97fa6cb6a785ef9f2d20ca116b92ad4455bb87a61f868197cbb40e014a4eb0778aee12f40cf892af12717ebbd3545adf76afc05657d5a5 syntax-highlighting-5.116.0.tar.xz " diff --git a/community/sysbench/APKBUILD b/community/sysbench/APKBUILD index 41a2a8a2b44..5d4d73ca09f 100644 --- a/community/sysbench/APKBUILD +++ b/community/sysbench/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Dennis Krupenik <dennis@krupenik.com> pkgname=sysbench pkgver=1.0.20 -pkgrel=1 +pkgrel=2 pkgdesc="Scriptable database and system performance benchmark" url="https://github.com/akopytov/sysbench" arch="x86 x86_64 aarch64" # Fails to compile on other arches license="GPL-2.0" depends_dev="libaio-dev mariadb-dev" -makedepends="$depends_dev autoconf automake bash libtool python3" +makedepends="$depends_dev autoconf automake bash libtool luajit-dev python3" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/akopytov/sysbench/archive/$pkgver/sysbench-$pkgver.tar.gz python3-test.patch" @@ -25,7 +25,9 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --without-gcc-arch \ + --with-system-luajit make } diff --git a/community/systemsettings/APKBUILD b/community/systemsettings/APKBUILD index 218ac959b9d..f4f1b7af51a 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.4 +pkgver=6.0.5 pkgrel=0 pkgdesc="Plasma system manager for hardware, software, and workspaces" # armhf blocked by qt6-qtdeclarative @@ -64,5 +64,5 @@ package() { } sha512sums=" -8c631bab21d70baec86352cb8238883fc8df2b3c6a0955f76d392f50d81166b9d25085771da7d8dd929d88cf86f68ef62b5b1cb285df29f8e7c8e177d9aba7c8 systemsettings-6.0.4.tar.xz +3912fc9f00c67c163bd71639dd8186df5eae83f5d560adddcb4bd95532d078a3b18488c66378c0686f0d4be2c01acdc70c3b6726030ef3dbf113262561897204 systemsettings-6.0.5.tar.xz " diff --git a/community/tailscale/APKBUILD b/community/tailscale/APKBUILD index 29a9bcfa404..2b634c9b314 100644 --- a/community/tailscale/APKBUILD +++ b/community/tailscale/APKBUILD @@ -3,12 +3,14 @@ # Contributor: Xe <xe@tailscale.com> # Maintainer: Robert Günzler <r@gnzler.io> pkgname=tailscale -pkgver=1.62.0 -pkgrel=2 +pkgver=1.66.4 +pkgrel=0 pkgdesc="The easiest, most secure way to use WireGuard and 2FA" url="https://tailscale.com/" license="BSD-3-Clause" -arch="all !s390x" # upstream still doesn't have hardware to debug this +# s390x: upstream still doesn't have hardware to debug this +# riscv64: tests fails +arch="all !s390x !riscv64" options="chmod-clean" depends="iptables" # https://github.com/tailscale/tailscale/issues/391 makedepends="go linux-headers" @@ -27,6 +29,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,7 +79,7 @@ package() { } sha512sums=" -187cadb3eb0db54b8b4a6ae78d77745750167ead7fd6e68bc95171ea6058386e91696a3e36fdd8101f8a52fe0a2d9344484b4bca0a48929f19b2d314bb182e1c tailscale-1.62.0.tar.gz +6c114508964f86984cdbcd2f3e81c4939f4c5a0ed20363b4463642fc8ca235d5b220e46e5b55c655e435f20be24295391b0070db3a78d45210ac9c27f5e7bbab tailscale-1.66.4.tar.gz 24706f10a6f5f7091c0f73a13e0c2d72e969e92e6f7aa21abe504f8e2c16af4d1d80fd28c33acbe4866dd8174abd9dc201d97eb5271f6355f7589a56f470f52c tailscale.confd 5cb35e0144d3bc2c20b1fde1ee402aab642b666c259bb324bf1c742a79fd8b3892cf2e7419e684764a50b6a29dc562ee674915bbf16a76eda543fd9c8988428c tailscale.initd 4f44f59553142bff5ca0914543114e4a6e3e413a96353543551445be6fa3ddc1037492baf0e091c95fe22a63e639b58bc5040285b8b5d246dbb57b70337d5178 tailscale.logrotate diff --git a/testing/tangram/APKBUILD b/community/tangram/APKBUILD index 24a1963cc73..220f7c3c230 100644 --- a/testing/tangram/APKBUILD +++ b/community/tangram/APKBUILD @@ -1,8 +1,8 @@ # Contributor: knuxify <knuxify@gmail.com> # Maintainer: knuxify <knuxify@gmail.com> pkgname=tangram -pkgver=3.0 -pkgrel=1 +pkgver=3.1 +pkgrel=0 _troll_commit="63392a57392fb8ed944e859269a3751f649f64ec" pkgdesc="Browser for your pinned tabs" url="https://apps.gnome.org/app/re.sonny.Tangram" @@ -57,7 +57,7 @@ package() { } sha512sums=" -74fb84ecd18e80605f98582a0e42d8f7acf8c1e208895592ef6299f187a741ef8642237283bdcf164bf29ee6a1c73f528dfdde274f2f45278cbad118c38b6d42 Tangram-3.0.tar.gz +66fe9f0db624f5cca8933dc06c875b716d654fd9bb1f78fea2ba70f70f3b2de5af56fe3eb50594faeee653f2aeba6d89f31a828df68b31988ba5243fceafe5d6 Tangram-3.1.tar.gz 53f093712dd11cf2cc3e0448561b57873d225653bff937efa6a2e264ad3520b601cd623aa0178508e4a81e4f85c187dfc977f7f75bbd15873fce64b48efdcda8 troll-63392a57392fb8ed944e859269a3751f649f64ec.tar.gz 0312705a1a832da0ff26c89fd83769a6f1720917dd954cc1d43482daf386841a8a0cae3a4e8b45cbf6c2b7ac3dbf5eb888ed690a568ab48b1763cc727ad69ebe busybox.patch " 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/tcl-readline/APKBUILD b/community/tcl-readline/APKBUILD index 90843b44c10..da661ba4465 100644 --- a/community/tcl-readline/APKBUILD +++ b/community/tcl-readline/APKBUILD @@ -18,6 +18,7 @@ builddir="$srcdir/tclreadline-$pkgver" prepare() { default_prepare + update_config_sub cp -av tclreadline.n.in tclreadline.3tcl.in } diff --git a/community/tcpreplay/APKBUILD b/community/tcpreplay/APKBUILD index d7f12a042ff..fd2f569b614 100644 --- a/community/tcpreplay/APKBUILD +++ b/community/tcpreplay/APKBUILD @@ -31,6 +31,11 @@ esac # - CVE-2020-24265 # - CVE-2020-24266 +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/community/tea/APKBUILD b/community/tea/APKBUILD index 1fd8be739b5..38dd181266c 100644 --- a/community/tea/APKBUILD +++ b/community/tea/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: 6543 <6543@obermui.de> pkgname=tea pkgver=0.9.2 -pkgrel=8 +pkgrel=9 pkgdesc="A command line tool to interact with Gitea servers" url="https://gitea.com/gitea/tea" license="MIT" diff --git a/community/telegraf/APKBUILD b/community/telegraf/APKBUILD index a40e9e4e2a5..aced73a7490 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.2 +pkgver=1.30.3 pkgrel=0 -_commit=10c15ce41 # git rev-parse --short HEAD +_commit=fd4af8866 # 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=" -9f66b371ef7e562f99a30358590be21e6c041be610491a74b9588e9ad9c2e8bdbd014b7fd0292f711f0fe72221078791e18316597ebac9e00b762111a19dfaa1 telegraf-1.30.2.tar.gz +1fe6ac2a59e47f2cde6dc12bf393f4968289b2dc5c85690b99a747971be678f6edaec120810868c5319cd8a7a2ff01eea3818eb2e154956b8b656ea2b48eff6e telegraf-1.30.3.tar.gz abe483deb8e12fe140de2c36d17bbfbc97ed7a5de8c3d76162357f7ba6575b8236b7197b92a26ed6d54f95c1ccbfc12ca62d6cc0371bf49d10a1ea5622a51ed1 telegraf.initd d1a9aa57f8b5179f2d8396518b9db757fe1c40337b515c1f750cf577683ff15f3174bc757afa70d880a1fef809c873e6aa0da1b903a5a97934c14965712d47a4 telegraf.confd " diff --git a/community/telegram-desktop/APKBUILD b/community/telegram-desktop/APKBUILD index e61bb06dc11..fed358df73e 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=6 +pkgver=5.0.4 +pkgrel=0 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 +611bad9f174a35c27ffc55efe3544318f992af25a89364c3b64fa1afb4765ebf7aae7d4a83539d9e0038fe4ca8e637bdb5d453f058e64dffc2c45edf2f348dbb tdesktop-5.0.4-full.tar.gz 396b5577bdeb852be3659fcbf09a1ebdc33432baea49296869e2f968d61343679187ed4b923c51c8f417b8d4679aedd7ac863abed255b5b6b1b589029fdc34f6 small-sizes.patch " diff --git a/community/telly-skout/APKBUILD b/community/telly-skout/APKBUILD index 115da7e3b90..d5b9402f39c 100644 --- a/community/telly-skout/APKBUILD +++ b/community/telly-skout/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=telly-skout -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 pkgdesc="Convergent TV guide based on Kirigami" url="https://invent.kde.org/plasma-mobile/telly-skout" @@ -19,6 +19,7 @@ makedepends=" kcrash-dev ki18n-dev kirigami-addons-dev + qqc2-desktop-style-dev qt6-qtbase-dev qt6-qtdeclarative-dev qt6-qtsvg-dev @@ -43,5 +44,5 @@ package() { } sha512sums=" -1ebdc01f47aa3f98361247d31aab7af76f167b4776bea198d2cffd962f9f6aded040080a95ee55614101226af620ef5eb77c3307de09b86dea12c87d5c467433 telly-skout-24.02.2.tar.xz +5fe9881d0a7e23958ef0e42592c6fe74e9b88b1648427af8b8431580d9e695d1b42b0038eae3fc73a70d3bd6af4e427c69da891cb8cb05d15dad881748d6238b telly-skout-24.05.0.tar.xz " diff --git a/community/termshark/APKBUILD b/community/termshark/APKBUILD index 8d983009906..9c5c572c0d6 100644 --- a/community/termshark/APKBUILD +++ b/community/termshark/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=termshark pkgver=2.4.0 -pkgrel=16 +pkgrel=17 pkgdesc="terminal UI for tshark, inspired by Wireshark" url="https://termshark.io" license="MIT" diff --git a/community/texlive/APKBUILD b/community/texlive/APKBUILD index 3644473a6e2..496114c69b2 100644 --- a/community/texlive/APKBUILD +++ b/community/texlive/APKBUILD @@ -7,8 +7,8 @@ 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 diff --git a/community/tflint/APKBUILD b/community/tflint/APKBUILD index 272e5f3df1e..fa86ef6b476 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.51.0 -pkgrel=0 +pkgver=0.51.1 +pkgrel=1 pkgdesc="A linter for Terraform code" license="MIT" arch="all" @@ -25,5 +25,5 @@ package() { } sha512sums=" -efd902facfeb8c1226f7b065c690177b5f303b491c5a4334fd113c42e588096c9758be3a51a7c91b5ef3358e3d4c73d74a4309aff4044cee255d7e45d7b021c0 tflint-0.51.0.tar.gz +e26f30fc5923327db5c17ab91cf30109ea1d2e34331a0e3403fa26984e38c062545be79b077f2359425cacda0a3e9cb7769f654eac3758d81a8721c2a38948d5 tflint-0.51.1.tar.gz " diff --git a/community/thin-provisioning-tools/APKBUILD b/community/thin-provisioning-tools/APKBUILD index 8f056e423e0..9c893e650f1 100644 --- a/community/thin-provisioning-tools/APKBUILD +++ b/community/thin-provisioning-tools/APKBUILD @@ -10,7 +10,8 @@ arch="all" license="GPL-3.0-only" makedepends="cargo gawk cargo-auditable" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/jthornber/thin-provisioning-tools/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/jthornber/thin-provisioning-tools/archive/v$pkgver.tar.gz + cargo-update.patch" # tests do a ton of disk i/o for a while.. # they pass on x86_64, but a bit too destructive to constantly run options="net !check" @@ -35,4 +36,5 @@ package() { sha512sums=" 2e960e5a0d11016c1131ed48678a44c54164b43811f8efaa7172d9df7f433b185fa4b2f8d3d430affff19ced672f74a1f17614efd00287f2c310a6a3745ff8e5 thin-provisioning-tools-1.0.12.tar.gz +61208020a20ee774b42e0363079df30b24b8119bcb41a95c408ccbf5c268e896cb46e47174ee2eaba97703b2bc8f701331d29f35c36f99d304fdcbd72aaf313e cargo-update.patch " diff --git a/community/thin-provisioning-tools/cargo-update.patch b/community/thin-provisioning-tools/cargo-update.patch new file mode 100644 index 00000000000..42d6d94e81b --- /dev/null +++ b/community/thin-provisioning-tools/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 8f9a97c..d559f92 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -294,9 +294,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "linux-raw-sys" 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/threadweaver5/APKBUILD b/community/threadweaver5/APKBUILD index 4ceb1f242d4..77ac5499e7f 100644 --- a/community/threadweaver5/APKBUILD +++ b/community/threadweaver5/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-frameworks-old pkgname=threadweaver5 -pkgver=5.115.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="High-level multithreading framework" arch="all !armhf" # armhf blocked by qt5-qtdeclarative @@ -45,5 +45,5 @@ package() { } sha512sums=" -4c7fa0fe4d04269bfabebab0cab1636e237005046b6c88e27f7dcb0bf8dc6b96d62254748e97177ae9b9a7ec69756130429280e09c64db8cb7f851d997b55240 threadweaver-5.115.0.tar.xz +ef365148a91a54d3252ba831c5a49fe7e369850e5d86c87173c5b621eeb1132af6eb76e33e858499c7a2135073497d05519ca9cdb906881419272387aedc16d3 threadweaver-5.116.0.tar.xz " diff --git a/community/thunar-vcs-plugin/APKBUILD b/community/thunar-vcs-plugin/APKBUILD index 8c5daf35d7f..eb6d40ec4f0 100644 --- a/community/thunar-vcs-plugin/APKBUILD +++ b/community/thunar-vcs-plugin/APKBUILD @@ -14,6 +14,7 @@ source="https://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/${pkgver%. prepare() { default_prepare + update_config_sub # quick and dirty fix for apr linking sed -i -e 's/APR_LDFLAGS/APR_LIBS/' thunar-vcs-plugin/Makefile.in diff --git a/community/thunderbird/APKBUILD b/community/thunderbird/APKBUILD index 4530c744f7b..87d312c6b9c 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.10.2 +pkgver=115.11.0 pkgrel=0 pkgdesc="Thunderbird email client" url="https://www.thunderbird.net/" @@ -576,7 +576,7 @@ package() { ln -sfv /usr/bin/thunderbird "$pkgdir"/$_mozappdir/thunderbird-bin } sha512sums=" -e893cba882fe3fba516758b8822fa16a6c5b1f633cd2877a91357255f956be32b55ee671ab8ebc4372f116848d4fb67a2220a673c8d5f3c95952ba266d99cd67 thunderbird-115.10.2.source.tar.xz +002f783cff7f2b50d9a29f20061fe55a1f64487b38a18dcb49217c3d7b99c2852af842decbd0347939aaf4c4c73ae66a8b04527ccd1b6db7f87aab402cb84ca1 thunderbird-115.11.0.source.tar.xz 3e0501ae7a650346c667dfdc0ae0ca286084f22e89ab2ac671cc0d7315673dc5b6dcb9f9882f6f39d26e9a31e57f7a0fd53d6b805e520224e22b8976850e2eb8 audio-lfs64.patch 454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch 2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch diff --git a/community/tio/APKBUILD b/community/tio/APKBUILD index ad128e118b4..f89c51bc8ee 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=3.1 +pkgver=3.3 pkgrel=0 pkgdesc="Simple TTY Terminal I/O Application" url="https://github.com/tio/tio" @@ -28,5 +28,5 @@ package() { } sha512sums=" -687e1ad9006e1ec9a6b70f3eae15d38ba926fb947abc9e592b1f413bf48d012ba470d778b65006e89dbf9ecd8002ceee5070621cab1399b9c79e4ac8be4660ee tio-3.1.tar.xz +f4eeb274cd74fdd22f22cf5024966268f656fd7bb9a413eb26fdb886f0b783540ffc1e5ddd740952e09c0a630d3cae2f72054c5edd705a6e272a2634b4a42498 tio-3.3.tar.xz " diff --git a/community/tlsrouter/APKBUILD b/community/tlsrouter/APKBUILD index 78eb6e8b270..ba719a7716d 100644 --- a/community/tlsrouter/APKBUILD +++ b/community/tlsrouter/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Marvin Preuss <marvin@xsteadfastx.org> pkgname=tlsrouter pkgver=0_git20220202 -pkgrel=19 +pkgrel=20 _short_commit=2e577fe pkgdesc="tls proxy that routes connections to backends based on tls sni" pkgusers="tlsrouter" diff --git a/community/tlstunnel/APKBUILD b/community/tlstunnel/APKBUILD index b09e6aa1ebd..74808ed3eb5 100644 --- a/community/tlstunnel/APKBUILD +++ b/community/tlstunnel/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=tlstunnel pkgver=0.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="TLS reverse proxy" url="https://sr.ht/~emersion/tlstunnel/" license="MIT" diff --git a/community/tokodon/APKBUILD b/community/tokodon/APKBUILD index 5b90fee9bf5..4821d07ae27 100644 --- a/community/tokodon/APKBUILD +++ b/community/tokodon/APKBUILD @@ -4,13 +4,14 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=tokodon -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 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 @@ -57,5 +58,5 @@ package() { } sha512sums=" -a0af63e1571a80f31823598645cd184797889ecf98cae5ba0663056c2f019d02562430f3026e8aef2553964b33aae459499e26e9b9f6d65b89202ef19baa4bb7 tokodon-24.02.2.tar.xz +9488cd630b70e312f3f4e5db6acb9dcb1b3b989f4cd5403c4d63d5cc4cd3b93dbc95ad8643dfddd993f62b0f37423274b1868d4c9d20fe08e47702a9c46548f0 tokodon-24.05.0.tar.xz " diff --git a/community/tpm2-tss/APKBUILD b/community/tpm2-tss/APKBUILD index 1bcdb21fede..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" @@ -45,6 +45,10 @@ source=" # fhs: /var/run/tpm2-tss/eventlog created in package() options="!fhs" +# secfixes: +# 4.1.1-r0: +# - CVE-2024-29040 + case "$CARCH" in s390x) # https://github.com/tpm2-software/tpm2-tss/issues/2531 @@ -52,11 +56,6 @@ s390x) ;; esac -prepare() { - default_prepare - update_config_sub -} - build() { ./configure \ --build=$CBUILD \ @@ -195,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/traefik/APKBUILD b/community/traefik/APKBUILD index dfec869a55c..610efde4fe5 100644 --- a/community/traefik/APKBUILD +++ b/community/traefik/APKBUILD @@ -1,20 +1,20 @@ # Contributor: Joe Holden <jwh@zorins.us> # Contributor: Michał Polański <michal@polanski.me> +# Contributor: Fabricio Silva <hi@fabricio.dev> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=traefik -pkgver=2.11.2 -pkgrel=0 +pkgver=3.0.0 +pkgrel=1 pkgdesc="The Cloud Native Edge Router" url="https://traefik.io/" arch="all" -arch="$arch !x86 !armhf !armv7 !s390x !ppc64le !riscv64" # failing tests license="MIT" -makedepends="go go-bindata" +makedepends="go yarn" checkdepends="tzdata" install="$pkgname.pre-install" pkgusers="$pkgname" pkggroups="$pkgname" -subpackages="$pkgname-openrc" +subpackages="$pkgname-doc $pkgname-openrc" options="net setcap chmod-clean" source="$pkgname-$pkgver.tar.gz::https://github.com/traefik/traefik/releases/download/v$pkgver/traefik-v$pkgver.src.tar.gz traefik.initd @@ -37,35 +37,61 @@ export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" +prepare() { + default_prepare + + # dashboard frontend + yarn --cwd webui install --frozen-lockfile +} + build() { + local builddate="$(date -u "+%Y-%m-%dT%TZ" ${SOURCE_DATE_EPOCH:+-d @$SOURCE_DATE_EPOCH})" + + # dashboard frontend + yarn --cwd webui build + go generate -v - go build \ - -ldflags "-X github.com/traefik/traefik/v2/pkg/version.Version=$pkgver" \ - -v -o bin/$pkgname \ - ./cmd/$pkgname + go build -v -ldflags "-s -w -extldflags \"$LDFLAGS\" \ + -X github.com/traefik/traefik/v3/pkg/version.Codename=cheddar \ + -X github.com/traefik/traefik/v3/pkg/version.Version=$pkgver \ + -X github.com/traefik/traefik/v3/pkg/version.BuildDate=$builddate" \ + -o bin/ ./cmd/$pkgname } check() { + # update fixtures due float values being different on some platforms + go test ./pkg/provider/traefik/... -update_expected=true + + # skipping: + # logs: failing due "Lshortfile", Im unable to fix + # healthcheck: failing due "30000000000 overflows int" on 32bits platforms + # influxdb2 (part of metrics): failing on riscv64 "context canceled" + local _filter="logs" + case "$CARCH" in + armhf | armv7 | x86 | s390x) _filter="$_filter|healthcheck" ;; + riscv64) _filter="$_filter|metrics" ;; + esac + # shellcheck disable=2046 - CI=1 \ - go test $(go list ./pkg/... | grep -Ev '(pkg/server)') + go test -timeout 30m -cover "-coverprofile=cover.out" \ + $(go list ./pkg/... ./cmd/... | grep -Ev "pkg/($_filter)") } package() { install -Dm755 bin/$pkgname "$pkgdir"/usr/sbin/$pkgname - - install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname - install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname + install -Dm644 LICENSE.md -t "$pkgdir"/usr/share/licenses/$pkgname/ install -dm775 -o $pkgname -g $pkgname "$pkgdir"/var/log/$pkgname - install -dm750 -o $pkgname -g $pkgname "$pkgdir"/etc/$pkgname install -m644 -o $pkgname -g $pkgname "$srcdir"/traefik.yaml \ - "$pkgdir"/etc/$pkgname/$pkgname.yaml + -t "$pkgdir"/etc/$pkgname/ + + install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname } sha512sums=" -0bfe1542da3f7ae0b6c08300ba2f42f7a936d28406b96a18a585694018acaf301629c29f5fc219250aa85a652ada75222a9ca27dbf97060b2a224cefee84119c traefik-2.11.2.tar.gz +5ff2fe681926ec1b68024e6f324e41c27048a3523d8f0fbfa67322b0917dce8c79a845d185b440c826c9fd4365b18f36137fef62e715bf6dc11ddaa0efe21c78 traefik-3.0.0.tar.gz d5a64e46ebafebd1352fda2fae5c3b6ccb58d3191583b06efbba9eaf0b444d4a7b6743a347a13ad79ca207ddeda7ab8d7387ffd7d4f9160ec80b5f2521bf8808 traefik.initd bbc0bb6825f8847ef0ee18b7194afc4e1443041727022e435e48249744b1230b3422ff9d20a6b42d2e3615e57c10254611fe1e999b847e7b4a4d5954bd677cf2 traefik.confd -ae87af859fa64aa35a5f8493dd29630d4ed8c6c8e6e70083bb03b2eded5cd1ab46979901fca5d495d2dd918bf1bbf0a553a43da38b9507a2437874bfcf09bc1a traefik.yaml +1a0124b4b312dade4b8aacb6c73ac2898ff5d0e235b8cd1749d8a85a9ef9b383ad5ba6b334335dd3722b1653c6e40fa95690a0e50312f3a133e95704dd1fee36 traefik.yaml " diff --git a/community/traefik/traefik.yaml b/community/traefik/traefik.yaml index 5801e012443..a9c7d4ff9c1 100644 --- a/community/traefik/traefik.yaml +++ b/community/traefik/traefik.yaml @@ -4,10 +4,9 @@ global: log: filePath: /var/log/traefik/traefik.log - compress: 3 + accessLog: filePath: /var/log/traefik/access.log - compress: 3 entryPoints: http: @@ -16,13 +15,11 @@ entryPoints: address: ':443' traefik: address: 'localhost:8080' + api: insecure: true dashboard: true -pilot: - dashboard: false - ping: {} #certificatesResolvers: 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 36e58bd9a4d..7f6500d93b5 100644 --- a/community/tree-sitter-cli/APKBUILD +++ b/community/tree-sitter-cli/APKBUILD @@ -10,7 +10,8 @@ makedepends=" cargo cargo-auditable " -source="$pkgname-$pkgver.tar.gz::https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v$pkgver.tar.gz + cargo-update.patch" builddir="$srcdir/tree-sitter-$pkgver" options="!check" # fail in this release @@ -36,4 +37,5 @@ package() { sha512sums=" cff3902e8f6e0211b6d4fafecf9f0d73a2bf73efed68df0d6e8798aac3e685cbcc882fb698ebc10115e72bcf46b59aabd0b14dd402a08d3b42cfceffea5aab2c tree-sitter-cli-0.22.5.tar.gz +2bda2cc5f2b2ac3cd244a63a1dfcb686baebb8e12c2347a775f686eb4f5546ec45004c51ac9fc7c766bbe3a656d67b521d6ad4a41f292203a79bf33a66c95d44 cargo-update.patch " diff --git a/community/tree-sitter-cli/cargo-update.patch b/community/tree-sitter-cli/cargo-update.patch new file mode 100644 index 00000000000..47afe4f36be --- /dev/null +++ b/community/tree-sitter-cli/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 2a930d9..13e4b4e 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -715,9 +715,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libgit2-sys" diff --git a/community/trurl/APKBUILD b/community/trurl/APKBUILD index 8ecc4a585c8..a36914ffbf6 100644 --- a/community/trurl/APKBUILD +++ b/community/trurl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=trurl -pkgver=0.12 +pkgver=0.13 pkgrel=0 pkgdesc="command line tool for URL parsing and manipulation" url="https://curl.se/trurl/" @@ -30,5 +30,5 @@ package() { } sha512sums=" -3e8acef76bb704df1315deb0d02c5e1f4995147ab6f7f17ecd3b02d93c212a34bd6b77839cb292db01568c101c62b5cdeb30d544c22bd87144320701ae45cef4 trurl-0.12.tar.gz +3ee6558039236163b87b9822e5fbc54f5b95ab7dfef5738c4db9629388acca6f33a0f1e26bac8ddf674a80baf1b0a0b2e6ba35001a97d509598f0d3d361fe312 trurl-0.13.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/tut/APKBUILD b/community/tut/APKBUILD index 6d1f11614fc..8839938da4b 100644 --- a/community/tut/APKBUILD +++ b/community/tut/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Alexey Yerin <yyp@disroot.org> pkgname=tut pkgver=2.0.1 -pkgrel=10 +pkgrel=11 pkgdesc="TUI for Mastodon" url="https://github.com/RasmusLindroth/tut" arch="all" diff --git a/community/tvheadend/APKBUILD b/community/tvheadend/APKBUILD index 5d2ac9fd421..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=7 +pkgrel=8 pkgdesc="TV Streaming server for linux" url="https://tvheadend.org/" arch="all" diff --git a/community/typst/APKBUILD b/community/typst/APKBUILD index fd8f17033d3..5b03e3a0b73 100644 --- a/community/typst/APKBUILD +++ b/community/typst/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=typst -pkgver=0.11.0 +pkgver=0.11.1 pkgrel=0 pkgdesc="New markup-based typesetting system that is powerful and easy to learn" url="https://github.com/typst/typst" @@ -22,6 +22,7 @@ subpackages=" " source=" $pkgname-$pkgver.tar.gz::https://github.com/typst/typst/archive/refs/tags/v$pkgver.tar.gz + cargo-update.patch " options="net" @@ -29,9 +30,6 @@ prepare() { default_prepare cargo fetch --target="$CTARGET" --locked - - # https://github.com/typst/typst/issues/3682 - rm ./tests/typ/layout/grid-positioning.typ } build() { @@ -60,5 +58,6 @@ package() { } sha512sums=" -ca4767b2b05d064012a0bf152323c8b2cce994e32c60d1a80c1563ec4d2e2adc211988a1c6b9892efe7269e26fde3aa28468142af7ddd36a2b97e00ac21f545e typst-0.11.0.tar.gz +ddae20f2cf77517447d9f79aec45d27fd60422defa381d50bd148b08450749d4f8ebb143d0c136c30ac47c1d2db0e07fcf8146eef73f59b4cc3290972871765c typst-0.11.1.tar.gz +eab21d0d0e058ca3c3446c5bd04a5b1ade597d37148de3d84af42f628204ed0dfa591dad1fcf2ce61303a3ee1efc2344df0edd23b00defb26900d1f197945cbc cargo-update.patch " diff --git a/community/typst/cargo-update.patch b/community/typst/cargo-update.patch new file mode 100644 index 00000000000..b04d5d96a0d --- /dev/null +++ b/community/typst/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 0a9e82c..5006a6b 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1218,9 +1218,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libdeflate-sys" diff --git a/community/tz/APKBUILD b/community/tz/APKBUILD index 245eb48d2da..8872b767dcc 100644 --- a/community/tz/APKBUILD +++ b/community/tz/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=tz pkgver=0.7.0 -pkgrel=3 +pkgrel=4 pkgdesc="interactive TUI program that displays time across a few time zones of your choosing" url="https://github.com/oz/tz" arch="all" diff --git a/community/ublock-origin/APKBUILD b/community/ublock-origin/APKBUILD index 57757407090..62a03502ad8 100644 --- a/community/ublock-origin/APKBUILD +++ b/community/ublock-origin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Hugo Osvaldo Barrera <hugo@whynothugo.nl> # Maintainer: Hugo Osvaldo Barrera <hugo@whynothugo.nl> pkgname=ublock-origin -pkgver=1.57.2 +pkgver=1.58.0 pkgrel=0 pkgdesc="Efficient blocker add-on for Firefox" url="https://github.com/gorhill/uBlock" @@ -11,8 +11,8 @@ makedepends="git python3 zip bash strip-nondeterminism" # Upstream's build script pulls latest master for uAssets. # Pin the versions we use so we don't need network at built-time and the package # sources are deterministic. -_uassets_master=2d9a31529c6247843afd0f51febd479d5c5fbc60 -_uassets_ghpages=e7eda5280c4978263903303916b6dba453749026 +_uassets_master=1a523a6572a02d55986f738b2925c00fe2657099 +_uassets_ghpages=f16065b33a15f8548c5c4fde1fd07581269c567e source="ublock-origin-$pkgver.tar.gz::https://github.com/gorhill/uBlock/archive/refs/tags/$pkgver.tar.gz uAssets-$_uassets_master.tar.gz::https://github.com/uBlockOrigin/uAssets/archive/$_uassets_master.tar.gz uAssets-$_uassets_ghpages.tar.gz::https://github.com/uBlockOrigin/uAssets/archive/$_uassets_ghpages.tar.gz @@ -38,7 +38,7 @@ package() { } sha512sums=" -417de98dec542d4a21fa114ab29dfb3d4251b5e6302997bbefa08cce4440aba7fcda5866f9d30c6f18e466087fe38e98df695a9aee3320c279e7f53a6b2d93fb ublock-origin-1.57.2.tar.gz -0934ada631ca4a88f35313b74e4f54a29c16ed22560bc020b9e1debe50d04bd38bd37c566efd9cc9e9a7d9a1797b31ae6d56fd3fbafc1223f29eeefeeb73cc7b uAssets-2d9a31529c6247843afd0f51febd479d5c5fbc60.tar.gz -4bf8492795a70836ef017b8305dff4d335700bc54849ac09c8279b7294f4a56f51e7450fb32f818c31bd9b7a182240eb3b95283590b3994aa364c15550470f8f uAssets-e7eda5280c4978263903303916b6dba453749026.tar.gz +99d1687a31e1866cebcb687ec2237a946c189f62f5fe16ea0179d19f22a276b1d6a2f691bf0f03f0e5ca43eaadd7a6fc09f7c2e3fba0536f22e48221dec627c6 ublock-origin-1.58.0.tar.gz +a7fb2aa3d123fdf56c89cf50ffa4e9a0fc6f16a91f950d9b5a45504d6fd464872ad977937302f5727e11beea166a59b24cf5e2f8ba59d56f4d166742503cd3c9 uAssets-1a523a6572a02d55986f738b2925c00fe2657099.tar.gz +b7991674572b127d5ae70ea60f131620e2f83daa4eb143481dc8ddff41605abe8961d77f9faaaf8040db0267b4c5dc1a8ab3027e866d7d3bfab1bc094aff7e21 uAssets-f16065b33a15f8548c5c4fde1fd07581269c567e.tar.gz " diff --git a/community/ucto/APKBUILD b/community/ucto/APKBUILD index 9bd5ecb2516..22ef7b22bd4 100644 --- a/community/ucto/APKBUILD +++ b/community/ucto/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Maarten van Gompel <proycon@anaproy.nl> # Maintainer: Maarten van Gompel <proycon@anaproy.nl> pkgname=ucto -pkgver=0.32.1 +pkgver=0.33 pkgrel=0 pkgdesc="advanced rule-based (regular-expression) and unicode-aware tokenizer for various languages" arch="all" @@ -29,5 +29,5 @@ package() { } sha512sums=" -9d382b8af8e1321856f5e30a092baa5f969075822b799b234ede43a450712c6d61ba67f4fe87d13fc10e963c2b56352cdc2ec57fc21e82e0198e16a1ce613766 ucto-0.32.1.tar.gz +0cd9aa4e423cfa71818f817e21ca59c5b533bf462b026c96d1c90ec5dc034a690898929e6d8a86c424b19491d2f20ed703d16fd565cec6df935265345d75c8f7 ucto-0.33.tar.gz " diff --git a/community/uctodata/APKBUILD b/community/uctodata/APKBUILD index 7e2ea7b52ae..f019bac3d36 100644 --- a/community/uctodata/APKBUILD +++ b/community/uctodata/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Maarten van Gompel <proycon@anaproy.nl> # Maintainer: Maarten van Gompel <proycon@anaproy.nl> pkgname=uctodata -pkgver=0.10.1 +pkgver=0.11 pkgrel=0 pkgdesc="Data for the tokeniser ucto" options="!check" @@ -25,5 +25,5 @@ package() { } sha512sums=" -3e58ee407d991334a6bb3c6da69822bad6531bdf0d704efd38008b66ab5cea82cbdf04a88318878a7477173d292597dd99eee6fcdda24eb7ad56f0c7d79d6daa uctodata-0.10.1.tar.gz +7763612310860596fc5dddb90d653e86c27aeab57a41daf468fc7d8a1a22b71207ddeb74fb66d480875504bf9c059fc4ace10d62ba0aafeab22b3d1061d6c7b2 uctodata-0.11.tar.gz " diff --git a/testing/udpcast/APKBUILD b/community/udpcast/APKBUILD index a90e10f7d20..a90e10f7d20 100644 --- a/testing/udpcast/APKBUILD +++ b/community/udpcast/APKBUILD diff --git a/testing/udpcast/console.patch b/community/udpcast/console.patch index 71cd0c081a3..71cd0c081a3 100644 --- a/testing/udpcast/console.patch +++ b/community/udpcast/console.patch diff --git a/testing/udpcast/fix-includes.patch b/community/udpcast/fix-includes.patch index 810824e2294..810824e2294 100644 --- a/testing/udpcast/fix-includes.patch +++ b/community/udpcast/fix-includes.patch diff --git a/community/ugm/APKBUILD b/community/ugm/APKBUILD index 60799e60a0f..d06129098b6 100644 --- a/community/ugm/APKBUILD +++ b/community/ugm/APKBUILD @@ -1,8 +1,8 @@ # Contributor: omni <omni+alpine@hack.org> # Maintainer: omni <omni+alpine@hack.org> pkgname=ugm -pkgver=1.4.0 -pkgrel=2 +pkgver=1.5.0 +pkgrel=0 pkgdesc="A terminal based UNIX user and group browser" url="https://github.com/ariasmn/ugm" license="MIT" @@ -28,5 +28,5 @@ package() { } sha512sums=" -8adb1f2ba331c378e9002940e49b3c48f6cf5b01fe99076c394c20f388c8eef787de3367e1e6266e78211e91eb2af9bf76ce1bf3394669f4c4a2c5190ba035dc ugm-1.4.0.tar.gz +ddec87a0ad135d8f243fa693b64e69061b82dc4c02dfee0452119b3d06827ee86b94fdf95af71546d9066be4cabf7642a274b9b5bc4e825526b86d177aa3abd5 ugm-1.5.0.tar.gz " diff --git a/community/umbrello/APKBUILD b/community/umbrello/APKBUILD index ab29b69450c..03a17b9ac2d 100644 --- a/community/umbrello/APKBUILD +++ b/community/umbrello/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=umbrello -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -57,5 +57,5 @@ package() { } sha512sums=" -773d7682baf622d615a9e24f39431ba004b6b67a915d23b5873bf218499ec213bb62dcd8fd2a1ce94856a2157619f7f0de1f2e58544054b8a40382ae15af6367 umbrello-24.02.2.tar.xz +118e2c2b7777f8746637308540ec02c1eded70cce8edcafee2f152aabdae43d3310ff7c8054a6573cbb7c8f44cdc9727d70cb0754a0bd11d656434fa901a9196 umbrello-24.05.0.tar.xz " diff --git a/community/umoci/APKBUILD b/community/umoci/APKBUILD index f78f668598a..44f5054efea 100644 --- a/community/umoci/APKBUILD +++ b/community/umoci/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> pkgname=umoci pkgver=0.4.7 -pkgrel=22 +pkgrel=23 pkgdesc="umoci modifies Open Container images" url="https://umo.ci/" arch="all" diff --git a/community/umockdev/APKBUILD b/community/umockdev/APKBUILD index 4fecbcebfc0..8fff9ad3941 100644 --- a/community/umockdev/APKBUILD +++ b/community/umockdev/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=umockdev -pkgver=0.18.1 +pkgver=0.18.3 pkgrel=0 pkgdesc="Mock hardware devices for creating unit tests and bug reporting" arch="all" @@ -31,5 +31,5 @@ package() { } sha512sums=" -4897c12fca8d1927a2840efbbd8281a95102b328cc682ffed10cd4e29b80f26b80df55fbd3736297ee4633561b007beda369bd3ddf07eb71bdd1d7c0222243c8 umockdev-0.18.1.tar.xz +565fedc4367b7896ac4fd9cee19d704d1f3f8b382c31069ceef81d0a0e8f3a38b775f28bd7a3652a7bb9c5cb62dd1f616ea81d7fc2ee7fda933bad44b32627d2 umockdev-0.18.3.tar.xz " diff --git a/community/uncrustify/APKBUILD b/community/uncrustify/APKBUILD index 4b47fbe9b34..d2df9d7835d 100644 --- a/community/uncrustify/APKBUILD +++ b/community/uncrustify/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: André Klitzing <aklitzing@gmail.com> pkgname=uncrustify -pkgver=0.78.1 +pkgver=0.79.0 pkgrel=0 pkgdesc="Source code beautifier" url="https://github.com/uncrustify/uncrustify" @@ -29,5 +29,5 @@ package() { } sha512sums=" -51ebbc8b08212adea76565cdb578ceb9435769066d70ac14b55fbf0d66bcb34bfcc1cedd9c14c7bafe7b75be8795b3b59a076e40bbad9d242cb06ee9c0ac8638 uncrustify-0.78.1.tar.gz +7972061058cbf232a0fa44fc165b73b0b4f1b75baca4e460b4d64a704779804d7cfd14fbcbd9bc1828273284feb83196a8e4ccc7c923e875ce3fa7b843151e5f uncrustify-0.79.0.tar.gz " diff --git a/community/unfurl/APKBUILD b/community/unfurl/APKBUILD index 3d53cc7a159..1893e710ad9 100644 --- a/community/unfurl/APKBUILD +++ b/community/unfurl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=unfurl pkgver=0.4.3 -pkgrel=15 +pkgrel=16 pkgdesc="Pull out bits of URLs provided on stdin" url="https://github.com/tomnomnom/unfurl" arch="all" diff --git a/community/uni/APKBUILD b/community/uni/APKBUILD index e041261a539..b6226f8bf29 100644 --- a/community/uni/APKBUILD +++ b/community/uni/APKBUILD @@ -1,8 +1,8 @@ # Contributor: omni <omni@gitlab.alpinelinux.org> # Maintainer: omni <omni@gitlab.alpinelinux.org> pkgname=uni -pkgver=2.6.0 -pkgrel=2 +pkgver=2.7.0 +pkgrel=0 pkgdesc="Query the Unicode database from the commandline" url="https://github.com/arp242/uni" license="MIT" @@ -25,10 +25,13 @@ check() { } package() { - install -Dm755 uni -t "$pkgdir"/usr/bin - install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname + install -Dm755 uni -t "$pkgdir"/usr/bin/ + + install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/"$pkgname"/ + install -Dm644 CHANGELOG.md README.md -t "$pkgdir"/usr/share/doc/"$pkgname"/ + install -Dm755 dmenu-uni -t "$pkgdir"/usr/share/doc/"$pkgname"/examples/ } sha512sums=" -d946a4784c4a5290b26eea358a5f3ca3e2b078a9c1b54a0ddf47fce104f147013c11f20be6346a9846dbf6f15009377093dabfef86a020665e42eb48f65634a5 uni-2.6.0.tar.gz +ac223f57c8f6e38592d1cf0e7b24da46591f3728dc45164391fdcc21382c6e0bc51b3fb0ace2b454a5be906da04525aad6fe0131c94ccafcfe53d8715d7e1439 uni-2.7.0.tar.gz " diff --git a/community/unison/APKBUILD b/community/unison/APKBUILD index a4c5e1b4447..2d17d937ae6 100644 --- a/community/unison/APKBUILD +++ b/community/unison/APKBUILD @@ -8,15 +8,21 @@ pkgrel=0 _majorver=${pkgver%.*} # x.y pkgdesc="Efficient file-synchronization tool" url="https://www.cis.upenn.edu/~bcpierce/unison/" -arch="all !riscv64 !loongarch64" # ocaml +arch="all !loongarch64" # ocaml 4+5 license="GPL-3.0-or-later" makedepends="ocaml linux-headers" checkdepends="coreutils" subpackages="$pkgname-doc" 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 + make NATIVE="$(command -v ocamlopt >/dev/null && echo true || echo false)" cp -v src/unison unison-text cp -v src/unison-fsmonitor unison-fsmonitor 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..45ef9c9de6e 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.11 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 +86badc49d3a6adef1d5283c38776cc8ab8dce6ce516ce6a87af76d00f4a681747eb5d4415640dfa191929ef5b77865a57bc72c7e10bc37e59c66d44119e7749c upmpdcli-1.8.11.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/uusi/APKBUILD b/community/uusi/APKBUILD new file mode 100644 index 00000000000..69b90239d1b --- /dev/null +++ b/community/uusi/APKBUILD @@ -0,0 +1,40 @@ +# Based on Arch's uusi package +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=uusi +pkgver=0.4.3 +pkgrel=0 +pkgdesc="Tweak cabal package descriptions" +url="https://github.com/berberman/uusi" +arch="aarch64 x86_64" # ghc +license="MIT" +makedepends="ghc" +subpackages="$pkgname-doc" +source="https://github.com/berberman/uusi/archive/$pkgver/uusi-$pkgver.tar.gz" +options="!check" # needs HUnit package + +build() { + runhaskell Setup configure -O \ + --enable-shared \ + --enable-executable-dynamic \ + --disable-library-vanilla \ + --prefix=/usr \ + --docdir=/usr/share/licenses/$pkgname \ + --datasubdir=$pkgname \ + --disable-tests \ + --dynlibdir=/usr/lib \ + --libsubdir=\$compiler/site-local/\$pkgid \ + --ghc-option=-fllvm \ + --ghc-option=-optl-Wl\,-z\,relro\,-z\,now \ + --ghc-option='-pie' + + runhaskell Setup build +} + +package() { + runhaskell Setup copy --destdir="$pkgdir" +} + +sha512sums=" +12ea510341face022ce51a39f10a85c620446daa29170618c0421746dccd9c726837a8309a01bf9b326186a03a508baed5213cf01d5dcb1bf9b35f40adbadaf2 uusi-0.4.3.tar.gz +" diff --git a/community/v2ray/APKBUILD b/community/v2ray/APKBUILD index 6918a9c15dc..ee351e34929 100644 --- a/community/v2ray/APKBUILD +++ b/community/v2ray/APKBUILD @@ -1,7 +1,7 @@ # Contributor: nibon7 <nibon7@163.com> # Maintainer: nibon7 <nibon7@163.com> pkgname=v2ray -pkgver=5.14.1 +pkgver=5.16.1 pkgrel=0 pkgdesc="A platform for building proxies to bypass network restrictions" url="https://v2fly.org" @@ -9,8 +9,8 @@ arch="all" license="MIT" makedepends="go" subpackages="$pkgname-openrc" -_geosite_ver=20240331083526 -_geoip_ver=202403280038 +_geosite_ver=20240508170917 +_geoip_ver=202405230041 source="$pkgname-core-$pkgver.tar.gz::https://github.com/v2fly/v2ray-core/archive/v$pkgver.tar.gz geosite-$_geosite_ver.dat::https://github.com/v2fly/domain-list-community/releases/download/$_geosite_ver/dlc.dat geoip-$_geoip_ver.dat::https://github.com/v2fly/geoip/releases/download/$_geoip_ver/geoip.dat @@ -67,10 +67,10 @@ package() { } sha512sums=" -0090d2aa50b3a02d673a1c656078b62ceb8ddba1b984f94b66aa2cf5341c8c97f032f1c85ee3583a06d1c55864aa7fd237632e2c53be4c73a96c3ac260f92ade v2ray-core-5.14.1.tar.gz -c315f56ea7308dea2675b80a9ea398c8c76b62b27f312c6610de5497e6863647b1189efd3eb56c774ddf24ffb32957cc41c24ed538e13f7cc2634eafd923c921 geosite-20240331083526.dat -cd0594fa4c5791f98052721e4ba8898a5d76d67e7bd0d2f1f23b8800ff26fde8235a990d50d2a5e6be60c8b2d054cfc0a3b00ff13a2e2742dcee6862f9618493 geoip-202403280038.dat -6e20b674b084960e3f0220d8e1e21dac3342db516080899eb161c469827412cf8eee8af85700a0060c481c5381631ce6efb2f101490ea29e014ee60dca9205f9 geoip-only-cn-private-202403280038.dat +ce935b156ee62dba712ff31fee8422d3ba32c596a9a55c0ae3d31917c9b4ed2a47260bf5ed241e8e32d4f85ed5d2b6bd8229e0928f6bfe636e25565ae58d3f61 v2ray-core-5.16.1.tar.gz +84e414342b65859ab0f631c9218b01fb360c7b5eb30644ad3e99278a8928f3faa1071e1bf9fc1c1ab3d41df6974776f7c2f428657cbff38875528c1bbab78b62 geosite-20240508170917.dat +7c942cc94373bcd2bf7345668556b767137d24d5f07ab8dde263cb267d59f62c63918d06aaccb266ffa0172ecae4f7a29e31fc9d705475b26018f8fb3e3cdac4 geoip-202405230041.dat +4d3593d2efb013d762f09d0c8569d39c01d900a39a282962951de7f73bc4e817610a2ed41862f2a1b3948d021cca9a27b525b03f83256a6c0428759684bb7f12 geoip-only-cn-private-202405230041.dat 714e9f93efb74a2b30a74df95fa2bdaa854188d5fce3ed4514f2d19e790baf31dc78c18726700013113501dd31981a2e0582150b64d7235121242c01e2e5b8d9 v2ray.initd 4b00bfe001780b9ac7eff1b9776a98ae5e7050362ebfb0ed2550f8f1244e9474d186dcde5bccba01dbdd908e9a932f75238becae6585efe674ebc5ffb8cbf0a6 v2ray.confd " diff --git a/community/valhalla/APKBUILD b/community/valhalla/APKBUILD index a5a35224fb8..4ac3dfcbff5 100644 --- a/community/valhalla/APKBUILD +++ b/community/valhalla/APKBUILD @@ -6,8 +6,8 @@ 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/vaultwarden/APKBUILD b/community/vaultwarden/APKBUILD index 1dc1e5c86f3..9c867b77046 100644 --- a/community/vaultwarden/APKBUILD +++ b/community/vaultwarden/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Chris Kruger <alpine@krugerheavyindustries.com> # Contributor: Fabricio Silva <hi@fabricio.dev> -# Maintainer: Chris Kruger <alpine@krugerheavyindustries.com> +# Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=vaultwarden pkgver=1.30.5 -pkgrel=0 +pkgrel=2 pkgdesc="bitwarden alternative backend" _bw_web_ver=2024.1.2b provides="bitwarden_rs=$pkgver-r$pkgrel" @@ -26,6 +26,7 @@ pkgusers="vaultwarden" pkggroups="vaultwarden" source="$pkgname-$pkgver.tar.gz::https://github.com/dani-garcia/vaultwarden/archive/$pkgver.tar.gz $pkgname-webvault-$_bw_web_ver.tar.gz::https://github.com/dani-garcia/bw_web_builds/releases/download/v$_bw_web_ver/bw_web_v$_bw_web_ver.tar.gz + cargo-update.patch $pkgname.initd $pkgname.confd" @@ -80,6 +81,7 @@ vault() { sha512sums=" acf7c344840f9b19e3aa366dae794ca6daca9dfad10d2bfdfa08d195d00f553643b46f2f7fe9344d0949306f9dc892722af7aeb7a047986edc98b51ec0c143bb vaultwarden-1.30.5.tar.gz 0157c751f5869de261c93624a1fa168a96e86ad1a169727bee428bb9d804b8bfac3d7b8e4b993e2e5d2414ee99a016702eb750d81c3cc71c9e4c659a5ff7b37f vaultwarden-webvault-2024.1.2b.tar.gz +0c401edb4f826f957a8ab238fc5e3e29d6a89cab0b7347f9fe11ca9834120fbc86eec3f4e2fd0ca0e8772b69e82eb63bacbb2a54aeac07893921230b13e706f6 cargo-update.patch a407bf26f78b74f0d907c4cde1fca8ff00c3ba22093397ace903c8648c03bd943a064b1756337cf82e8aeb5e4617640fefd46565420e8812c6e0fc7392f6be5b vaultwarden.initd e59370b2971904a86b373257e728dfe1ddc384ae9c175fff7cdcfb2fd91f0e52b6d68428269afb41b785f04a532f6534c5e3ec5bfd0cabe77be950c458dc1b52 vaultwarden.confd " diff --git a/community/vaultwarden/cargo-update.patch b/community/vaultwarden/cargo-update.patch new file mode 100644 index 00000000000..80dffcb6d24 --- /dev/null +++ b/community/vaultwarden/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 518d8f8..62b51ff 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1675,9 +1675,9 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libm" diff --git a/community/vhs/APKBUILD b/community/vhs/APKBUILD index d9edb552ea5..95a8fd8e5fb 100644 --- a/community/vhs/APKBUILD +++ b/community/vhs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=vhs pkgver=0.7.2 -pkgrel=0 +pkgrel=1 pkgdesc="Tool for automatic recording of terminal sessions" url="https://github.com/charmbracelet/vhs" arch="all" diff --git a/community/victoria-metrics/APKBUILD b/community/victoria-metrics/APKBUILD index 9b6934b0d11..acfa54f5a44 100644 --- a/community/victoria-metrics/APKBUILD +++ b/community/victoria-metrics/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com> pkgname=victoria-metrics pkgver=1.101.0 -pkgrel=0 +pkgrel=1 provides="victoriametrics=$pkgver-r$pkgrel" pkgdesc="Fast, cost-effective and scalable time series database" url="https://github.com/VictoriaMetrics/VictoriaMetrics" diff --git a/community/viddy/APKBUILD b/community/viddy/APKBUILD index dd5f6a0b8e7..01cff63e08f 100644 --- a/community/viddy/APKBUILD +++ b/community/viddy/APKBUILD @@ -2,13 +2,15 @@ # Maintainer: Marvin Preuss <marvin@xsteadfastx.org> pkgname=viddy pkgver=0.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="Modern watch command. Time machine and pager etc." url="https://github.com/sachaos/viddy" arch="all" license="MIT" makedepends="go" -source="$pkgname-$pkgver.tar.gz::https://github.com/sachaos/viddy/archive/refs/tags/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/sachaos/viddy/archive/refs/tags/v$pkgver.tar.gz + update-go-mod.patch + " export GOFLAGS="$GOFLAGS -modcacherw" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" @@ -29,4 +31,5 @@ package() { sha512sums=" 5e0fdbc1b1fe441a4190bf13d3331eeebbba0a6be6b965bd3f22fe7ed2cfa303fe54d886992bc38d1c267d3013bb3a603fe32825659b472c985d8f72dbf39cf6 viddy-0.4.0.tar.gz +7527b8cb38e09af74e2da792c185eaddf5b318a9173c4827bc0d5ef358b2a2f7e88c8cae388e7c883aec308e8dc24a7eeea0bc46f5a06d7e5107d3b70c7f79fa update-go-mod.patch " diff --git a/community/viddy/update-go-mod.patch b/community/viddy/update-go-mod.patch new file mode 100644 index 00000000000..f2ff7874664 --- /dev/null +++ b/community/viddy/update-go-mod.patch @@ -0,0 +1,28 @@ +diff --git a/go.mod b/go.mod +index ac93456..01d0ca8 100644 +--- a/go.mod ++++ b/go.mod +@@ -4,7 +4,7 @@ go 1.18 + + require ( + github.com/adrg/xdg v0.3.3 +- github.com/creack/pty v1.1.15 ++ github.com/creack/pty v1.1.21 + github.com/fatih/color v1.12.0 + github.com/gdamore/tcell/v2 v2.5.1 + github.com/mattn/go-runewidth v0.0.13 +diff --git a/go.sum b/go.sum +index 7b019c9..1462db6 100644 +--- a/go.sum ++++ b/go.sum +@@ -60,8 +60,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht + github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= + github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= + github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +-github.com/creack/pty v1.1.15 h1:cKRCLMj3Ddm54bKSpemfQ8AtYFBhAI2MPmdys22fBdc= +-github.com/creack/pty v1.1.15/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= ++github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0= ++github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= + github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= + github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/community/vim-go/APKBUILD b/community/vim-go/APKBUILD index 005cf465813..4c83394c69c 100644 --- a/community/vim-go/APKBUILD +++ b/community/vim-go/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vim-go pkgver=1.28 -pkgrel=6 +pkgrel=7 pkgdesc="Go development plugin for Vim" url="https://github.com/fatih/vim-go" license="BSD-3-Clause" diff --git a/community/vips/APKBUILD b/community/vips/APKBUILD index a4882670478..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" 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 416d5caccb7..178884b289d 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.30 +_kver=6.6.32 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/community/virtualbox-guest-additions/APKBUILD b/community/virtualbox-guest-additions/APKBUILD index 05535cf45c1..17834a32f20 100644 --- a/community/virtualbox-guest-additions/APKBUILD +++ b/community/virtualbox-guest-additions/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Ben Allen <bensallen@me.com> # Maintainer: Peter Shkenev <santurysim@gmail.com> pkgname=virtualbox-guest-additions -pkgver=7.0.14 -pkgrel=1 +pkgver=7.0.18 +pkgrel=0 pkgdesc="VirtualBox Addtions userland components" arch='x86 x86_64' url='https://virtualbox.org/' @@ -80,7 +80,7 @@ udev() { } sha512sums=" -6a82933bbf51ff255d17cb61ae6ddfb791a2200e3dff705f181cd06c6031b48cf15faa5e8202a65daef0fb20b7fd9e33d40dbd0f9cc3f49af49fff04a1cb0a73 VirtualBox-7.0.14.tar.bz2 +e78a18fa808152cbdc1d407751acf3f57a8202bf238ad3432c4f0b0f97ab203e915a6cd11619e64f4aca5b907eb72be67bab146869af0e73414144addf0d76b4 VirtualBox-7.0.18.tar.bz2 fe5003d340ef40490eec6746dbc79f1df89cccf55358ce8eef3cef7fcb8fac36c1223850109f1f3b8d3f8ea6f4183367579256ca0604cd98c893b98afa154a32 futimens.patch 7a97497605afe486d31b21b6fecd8e0763415983ea0259093ca9c4589046a9b7e87567bc16c3f5ff80407586aec709091f2f2b4493a8a6cee79311c67412a161 musl-no-glibc.patch d5ea53cc11fd4a9f1a17f5c68ca3939004e178b11e105c61c8a49df456311633a9fe020d2773d37ee50e90c0a16f2c0c5f0944b2294ccaaafa099b86fe10fee0 musl-fix-stat-nsec.patch 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 2ed881127a8..906a7525603 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.30 +_kver=6.6.32 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/community/vouch-proxy/APKBUILD b/community/vouch-proxy/APKBUILD index b18b4f2fc8a..2edabf9ab74 100644 --- a/community/vouch-proxy/APKBUILD +++ b/community/vouch-proxy/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=vouch-proxy pkgver=0.40.0 -pkgrel=1 +pkgrel=2 pkgdesc="An SSO solution for Nginx using the auth_request module" url="https://github.com/vouch/vouch-proxy" arch="all" 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/wacomtablet/APKBUILD b/community/wacomtablet/APKBUILD index 3b2c3b75ac5..e8fdd075bf8 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.4 +pkgver=6.0.5 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=" -7e12a8b27b1c52f19b4847558ccdce86709eca06982798d9ada7a27cf954fa4f9c5b2c3e2f6d8593045c218a5256c3a87078823fd8d0901e2382172de21a4095 wacomtablet-6.0.4.tar.xz +cc9c53e9a18f9b74af14b466aede365b190e6573a2da8387148c57008f72df583e5f4dfa8b9221614df781cbd672d67d05977f524fe7625fa07485d0ca990735 wacomtablet-6.0.5.tar.xz " diff --git a/community/waf/APKBUILD b/community/waf/APKBUILD index 6f57eb8cc80..8e2603c97f7 100644 --- a/community/waf/APKBUILD +++ b/community/waf/APKBUILD @@ -1,20 +1,20 @@ # Contributor: Adam Saponara <as@php.net> -# Maintainer: +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=waf -pkgver=2.0.27 +pkgver=2.1.1 pkgrel=0 pkgdesc="The meta build system" url="https://waf.io/" arch="noarch" license="BSD-3-Clause" -options="!check" # no tests available depends="python3" source="https://waf.io/waf-$pkgver" +options="!check" # no tests available package() { - install -Dm755 "$srcdir"/waf-$pkgver "$pkgdir"/usr/bin/waf + install -Dvm755 "$srcdir"/waf-$pkgver "$pkgdir"/usr/bin/waf } sha512sums=" -22c21dfcbf5ed25c25040ab04f62326f271b2b18ff96ca7598dadf68230d21d70cef1c9d7ef56721edbd9c737a56576fd4a9ffac1b00cb93d5c013b8f3a9d97e waf-2.0.27 +80519b2d4f650c148ce8ac2704bc4214358c1c5d835dd39a9ef925b9c51874fdb09facc5b3d75f9918879832f5888a90b668d04586c4be71fce0a0ad5a1bad6f waf-2.1.1 " diff --git a/community/wait4x/APKBUILD b/community/wait4x/APKBUILD index 3b8d0210e66..f47805e702a 100644 --- a/community/wait4x/APKBUILD +++ b/community/wait4x/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Mohammad Abdolirad <m.abdolirad@gmail.com> pkgname=wait4x pkgver=2.14.0 -pkgrel=2 +pkgrel=3 pkgdesc="Wait4X allows you to wait for a port or a service to enter the requested state" url="https://wait4x.dev" arch="all" diff --git a/community/watchexec/APKBUILD b/community/watchexec/APKBUILD index 29fd3c22aba..735b7290178 100644 --- a/community/watchexec/APKBUILD +++ b/community/watchexec/APKBUILD @@ -19,6 +19,7 @@ subpackages=" " source="$pkgname-$pkgver.tar.gz::https://github.com/watchexec/watchexec/archive/refs/tags/v$pkgver.tar.gz system-dbus.patch + cargo-update.patch " options="net" @@ -51,4 +52,5 @@ package() { sha512sums=" 7d84398c53140b45466bb95e8e32dc352535de5da9f0037d1b242b70142b8185775cb38687f9ca29c749c075ed3c22b6e77fd0b1f84973103b40347aa7669c13 watchexec-2.1.1.tar.gz 9827cde53207fc20ab7a6e971e952e9c3c9cab7b2d1714ca3816a4468e9dd3bba4281a4fbaa3d46cc8e53db52d21226072c615750e72f590cf76e69863e14266 system-dbus.patch +fbf675aced1e1686319168c867748293695efba002229c6e0a7874353865790fa6f4c1da03e68b8afee2f1dad1fabb83e078ad141acb08d7af84edf2dafc817f cargo-update.patch " diff --git a/community/watchexec/cargo-update.patch b/community/watchexec/cargo-update.patch new file mode 100644 index 00000000000..6da85731bdd --- /dev/null +++ b/community/watchexec/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 1f22788..5e690eb 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1899,9 +1899,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libdbus-sys" diff --git a/community/waydroid/APKBUILD b/community/waydroid/APKBUILD index b046d6b7cfd..d7efd54cd63 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=6 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 @@ -27,6 +27,7 @@ subpackages=" $pkgname-nftables " source="https://github.com/waydroid/waydroid/archive/$pkgver/waydroid-$pkgver.tar.gz + python3.12-syntax-warning-fix.patch waydroid-container.initd waydroid-container.confd 51_waydroid.nft @@ -63,7 +64,8 @@ pyc() { sha512sums=" 0d3eba799895c853545b7087e3c07160d593d4a3166822039973669bc0ee93a8a6b9c394a7d982e57cfbbfbd8df1ba7991dd33b1b1517d79fcbe191d8a86890a waydroid-1.4.2.tar.gz -a173f927586c4d036113bee7170775a497cd833ea683957ed4b29746500769f407ba47f6c8b2c6280d411d0663e84be660cb5883c844d1b7a70f2c8d700a71a6 waydroid-container.initd +0e1d83000e60ab5c1962044823dec45a254087cbab74142c0b02a6520bd6f44e8f621c08dfb9022a4210776500b602cf4d8188e6b333704a06c8415820612100 python3.12-syntax-warning-fix.patch +f319dde4f4bb365069dff2c1ddaa0a85d711c9e9d49011b15aec0d10da2ba0da39c464505d28cd7e8b4f803e932fdde04ca69602805d084529bac0ee6b22ba59 waydroid-container.initd b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706 waydroid-container.confd 27cec579cfda197ff70d6328043755fc3d1719347bf4987edb86a07341bc4f02b99b65a6ef1fcde58b48a925176e6d770ed7cef304edff6a860bf4d408a62e06 51_waydroid.nft 56dc332d66c3eb3af08887eb2f4b8235419ff87a4e4632108cdde39cf274bc88b9e95c650a7d407d05a72f1ce2edf5d465a06b7e526113d9c9ae3817a6ed1f78 waydroid-session.desktop diff --git a/community/waydroid/python3.12-syntax-warning-fix.patch b/community/waydroid/python3.12-syntax-warning-fix.patch new file mode 100644 index 00000000000..808b78d9fb3 --- /dev/null +++ b/community/waydroid/python3.12-syntax-warning-fix.patch @@ -0,0 +1,23 @@ +From 66c8343c4d2ea118601ba5d8ce52fa622cbcd665 Mon Sep 17 00:00:00 2001 +From: Aarron Lee <aclee91@gmail.com> +Date: Sun, 19 Nov 2023 16:11:44 -0500 +Subject: [PATCH] update regex for deprecation warning + +--- + tools/helpers/net.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/helpers/net.py b/tools/helpers/net.py +index c20a95bc..b267357a 100644 +--- a/tools/helpers/net.py ++++ b/tools/helpers/net.py +@@ -31,6 +31,6 @@ def get_device_ip_address(): + + try: + with open(lease_file) as f: +- return re.search("(\d{1,3}\.){3}\d{1,3}\s", f.read()).group().strip() ++ return re.search(r"(\d{1,3}\.){3}\d{1,3}\s", f.read()).group().strip() + except: +- pass +\ No newline at end of file ++ pass 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/community/wcslib/APKBUILD b/community/wcslib/APKBUILD index dfa5c61a82c..b3630775239 100644 --- a/community/wcslib/APKBUILD +++ b/community/wcslib/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net> pkgname=wcslib -pkgver=8.2.2 +pkgver=8.3 pkgrel=0 pkgdesc="implementation of the FITS WCS standard" url="https://www.atnf.csiro.au/people/mcalabre/WCS/wcslib/" @@ -33,5 +33,5 @@ package() { } sha512sums=" -cf540fdac03d2868902c9d4c2f1cd5919e878e79de635b01006b61f4d95f727659033d0d05172a7bcd00287ecc395609a643cf95a6498fbc3ff2d3fb26c136b4 wcslib-8.2.2.tar.bz2 +248518489431cbcba7a5df9e34a747e2a007128639d8ab655ceee35250e609d952fe466b67cdca5defe16d3e926730d00bfc5c362c369f74851cd88973b506ba wcslib-8.3.tar.bz2 " diff --git a/community/webhook/APKBUILD b/community/webhook/APKBUILD index 9160271213d..90f9f9cd4c6 100644 --- a/community/webhook/APKBUILD +++ b/community/webhook/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Andy Hawkins <andy@gently.org.uk> pkgname=webhook pkgver=2.8.1 -pkgrel=6 +pkgrel=7 pkgdesc="Lightweight configurable webhooks server" url="https://github.com/adnanh/webhook" license="MIT" 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/websocketd/APKBUILD b/community/websocketd/APKBUILD index 14457e75fc9..60c5f7a7f64 100644 --- a/community/websocketd/APKBUILD +++ b/community/websocketd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=websocketd pkgver=0.4.1 -pkgrel=22 +pkgrel=23 pkgdesc="Like inetd, but for WebSockets. Turn any application that uses STDIO/STDOUT into a WebSocket server." url="https://github.com/joewalnes/websocketd" license="BSD-2-Clause" diff --git a/community/weechat/APKBUILD b/community/weechat/APKBUILD index 222b88dc05a..d7a133c9766 100644 --- a/community/weechat/APKBUILD +++ b/community/weechat/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Julien Voisin <julien.voisin@dustri.org> pkgname=weechat -pkgver=4.2.2 -pkgrel=1 +pkgver=4.3.0 +pkgrel=0 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://weechat.org" arch="all" @@ -10,6 +10,7 @@ options="!check" # test suite runs "sudo make install" license="GPL-3.0-or-later" depends_dev=" aspell-dev + cjson-dev curl-dev gettext-dev gnutls-dev @@ -92,5 +93,5 @@ perl() { } sha512sums=" -cee642ea0fd43763933bb401d40999dff0b1a5260d536d7437cb2188e31f90c8196c6836072be51fa9df7abca5f5aee91a5f99e82852c9268091347d56350032 weechat-4.2.2.tar.xz +d52d04dd3e8a5e0b5f6b626c2ee9e1b400c8605e7102a53b22206ad4caf89f226fd1cfc827072c3ab298967f4d1ba94a97c504cee8e9ecdec8234eabacc63e12 weechat-4.3.0.tar.xz " diff --git a/community/wego/APKBUILD b/community/wego/APKBUILD index 5205b86ded7..1745cc17f73 100644 --- a/community/wego/APKBUILD +++ b/community/wego/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=wego pkgver=2.2 -pkgrel=2 +pkgrel=3 pkgdesc="A weather app for the terminal" url="https://github.com/schachmat/wego" license="ISC" diff --git a/community/whois/APKBUILD b/community/whois/APKBUILD index a5b0edb036a..0b0202b2b50 100644 --- a/community/whois/APKBUILD +++ b/community/whois/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Stuart Cardall <developer@it-offshore.co.uk> # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=whois -pkgver=5.5.22 +pkgver=5.5.23 pkgrel=0 pkgdesc="Intelligent WHOIS client by Marco d'Itri" url="https://github.com/rfc1036/whois" @@ -40,7 +40,7 @@ _mkpasswd() { } sha512sums=" -b4e1088807e05729f76e48a0e7d0f4eb4560d934c99feffd73835c012a6a0d41a1b8c053ed5fbd1b7795f7771d1f23415aac4eeaea7ba990e2b3c6af8480efd1 whois-5.5.22.tar.gz +6e2caf1ce28edcd561287ea7a072a069851caee42fd47850b8555e03dd353ad79a338ceae2f9b8fa98c0e06a16dbeef5a7a6d422a76d8a141c92d8e9e82aebc3 whois-5.5.23.tar.gz 7b066a41db4bb1b3753f9f390de05df6bbde27a0436c53ea2de47d87dbaf1182ce3dfc41459b49b3dc079b37ab1a21ea19118a283bd6b062a48ab3f6e2bfbbed undefined-libintl.patch 71aaa2cb719fb76514263758b4e731bb6d9213b3174b1e5f1b17a531ececfb9d14acd5e8a2dfc2d776bb15b5cec2b67d9a1bae1c0009a91e8a2149d5b4f5012b enable-sha256-sha512-mkpasswd.patch " diff --git a/community/wine/APKBUILD b/community/wine/APKBUILD index c6af8a76b95..ea44233a7f1 100644 --- a/community/wine/APKBUILD +++ b/community/wine/APKBUILD @@ -6,7 +6,7 @@ # Contributor: Craig Andrews <candrews@integralblue.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wine -pkgver=9.0 +pkgver=9.9 pkgrel=0 pkgdesc="Compatibility layer for running Windows programs" url="https://www.winehq.org" @@ -56,7 +56,7 @@ makedepends=" " subpackages="$pkgname-dev $pkgname-doc" checkdepends="xvfb-run" -source="https://dl.winehq.org/wine/source/9.0/wine-$pkgver.tar.xz +source="https://dl.winehq.org/wine/source/9.x/wine-$pkgver.tar.xz rpath.patch " options="textrels !check" # As of 2.0.3 most of the tests fails @@ -158,6 +158,6 @@ doc() { rm -fr "$subpkgdir"/usr/share/man/*.UTF-8 } sha512sums=" -838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4 wine-9.0.tar.xz +df016411933b5447bef9b48f67c58e12d6d33ef0c24045ab03c92821dcccbf84335d1a2d765e6d6cf3a743598317010b8ae6f69de3661733e4fa43febec873dd wine-9.9.tar.xz 9881abfd0e7e4589cd5724291f9ec06ccb9d88b842c69abb5ea7865b6c27c778a060e60a9776c3620a030555cf61b8cceded55db9f04d5e45d9c627306763bff rpath.patch " diff --git a/community/wire-go/APKBUILD b/community/wire-go/APKBUILD index 43d9ca1769b..3b19840a514 100644 --- a/community/wire-go/APKBUILD +++ b/community/wire-go/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=wire-go pkgver=0.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="Compile-time Dependency Injection for Go" url="https://github.com/google/wire" arch="all" diff --git a/community/wireshark/APKBUILD b/community/wireshark/APKBUILD index 0d17afe8ae2..c3b6445ac35 100644 --- a/community/wireshark/APKBUILD +++ b/community/wireshark/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wireshark # check if these are stable first. -pkgver=4.2.4 +pkgver=4.2.5 pkgrel=0 pkgdesc="Network protocol analyzer" url="https://www.wireshark.org/" @@ -50,9 +50,14 @@ makedepends=" checkdepends="py3-pytest py3-pytest-xdist" subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark" options="setcap" -source="https://www.wireshark.org/download/src/all-versions/wireshark-$pkgver.tar.xz" +source="https://www.wireshark.org/download/src/all-versions/wireshark-$pkgver.tar.xz + find-lua.patch" # secfixes: +# 4.2.5-r0: +# - CVE-2024-4853 +# - CVE-2024-4854 +# - CVE-2024-4855 # 4.2.4-r0: # - CVE-2024-2955 # 4.0.12-r0: @@ -350,5 +355,6 @@ tshark() { } sha512sums=" -963ac6938c08c6526240c270977057eeff7814686e11d1f3c6641a4838eb66f8d4349e48aa7373d25a8ca8911ad12eb8162f1c55af043f571d74979ddf4fd9a6 wireshark-4.2.4.tar.xz +92a8fb08af5a1da30ca469fa45bd982638069907d289fa716068ac71141b7d9726ca0b01adc2910da4c928db23760da75a1c6a7c2eb795ac66ba003a90abb87b wireshark-4.2.5.tar.xz +1794bf87fdcf3106613740205e77d83990950f96e0966ea22e3f01b207ec15d4aeead7ec6f3635b99505aac6ae38ff150c187e28478467048e8121e0bc276e65 find-lua.patch " diff --git a/community/wireshark/find-lua.patch b/community/wireshark/find-lua.patch new file mode 100644 index 00000000000..fe21b14c9c6 --- /dev/null +++ b/community/wireshark/find-lua.patch @@ -0,0 +1,34 @@ +From 7587228433ad150c1a48696c3ff5c768739279e6 Mon Sep 17 00:00:00 2001 +From: John Thacker <johnthacker@gmail.com> +Date: Thu, 16 May 2024 14:11:19 +0000 +Subject: [PATCH] CMake: Look for the lua library with versioned suffixes + +Alpine Linux puts not just the include files but also the +library in a versioned subdirectory, so look for it there too. + +Fix #19841 + + +(cherry picked from commit 59b376dce046eb4f739a70f49c20ac9da9cab794) + +Co-authored-by: John Thacker <johnthacker@gmail.com> +--- + cmake/modules/FindLua.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/FindLua.cmake b/cmake/modules/FindLua.cmake +index 23e50a6a947..6a594a7d546 100644 +--- a/cmake/modules/FindLua.cmake ++++ b/cmake/modules/FindLua.cmake +@@ -184,7 +184,7 @@ find_library(LUA_LIBRARY + HINTS + ${LUA_HINTS} + ENV LUA_DIR +- PATH_SUFFIXES lib ++ PATH_SUFFIXES lib ${_lua_library_names} + ) + unset(_lua_library_names) + +-- +GitLab + diff --git a/community/wmname/APKBUILD b/community/wmname/APKBUILD index 6345907f4ab..b5ef497211d 100644 --- a/community/wmname/APKBUILD +++ b/community/wmname/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Stefan Wagner <stw@bit-strickerei.de> -# Maintainer: Stefan Wagner <stw@bit-strickerei.de> +# Maintainer: Marian Buschsieweke <marian.buschsieweke@posteo.net> pkgname=wmname pkgver=0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Sets the window manager name property of the root window" url="https://tools.suckless.org/x/wmname" arch="all" diff --git a/community/wormhole-william/APKBUILD b/community/wormhole-william/APKBUILD index 6a85a2f9b9d..27a1710a6f2 100644 --- a/community/wormhole-william/APKBUILD +++ b/community/wormhole-william/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Edd Salkield <edd@salkield.uk> pkgname=wormhole-william pkgver=1.0.7 -pkgrel=4 +pkgrel=5 pkgdesc="Go implementation of Magic Wormhole" arch="all" url="https://github.com/psanford/wormhole-william" diff --git a/community/writefreely/APKBUILD b/community/writefreely/APKBUILD index 1207f4bf2d7..4b0b71855a7 100644 --- a/community/writefreely/APKBUILD +++ b/community/writefreely/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=writefreely pkgver=0.15.0 -pkgrel=0 +pkgrel=1 pkgdesc="Federated blogging from write.as" url="https://writefreely.org" arch="all !riscv64" # riscv64 fails to build diff --git a/community/wuzz/APKBUILD b/community/wuzz/APKBUILD index a8f3dada450..07335cbdd5e 100644 --- a/community/wuzz/APKBUILD +++ b/community/wuzz/APKBUILD @@ -2,14 +2,16 @@ # Maintainer: Adam Jensen <adam@acj.sh> pkgname=wuzz pkgver=0.5.0 -pkgrel=22 +pkgrel=24 pkgdesc="Interactive CLI tool for HTTP inspection" options="net" url="https://github.com/asciimoo/wuzz" arch="all" license="AGPL-3.0-only" makedepends="go" -source="$pkgname-$pkgver.tar.gz::https://github.com/asciimoo/wuzz/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/asciimoo/wuzz/archive/v$pkgver.tar.gz + update-go-mod.patch + " builddir="$srcdir/$pkgname-v$pkgver" export GOPATH="$srcdir" @@ -40,4 +42,5 @@ package() { sha512sums=" dbed0076d15e87e4b13d817fc02cf853a4c1fa96b6c3647507a86e47a26619f40120b72c8df8a4b6afd2472e552998d5fad292efa0d62ce9d63149e4379d7715 wuzz-0.5.0.tar.gz +056fe63a4f5ec3e8fd919daea7a330f81d7a2900f34ed34f2a05355021b9ac0f942f32d3087bce08a5f6249a59529904a415ccfaf080b06939594b0dd8b68228 update-go-mod.patch " diff --git a/community/wuzz/update-go-mod.patch b/community/wuzz/update-go-mod.patch new file mode 100644 index 00000000000..fa8a57781ed --- /dev/null +++ b/community/wuzz/update-go-mod.patch @@ -0,0 +1,16 @@ +diff --git a/go.mod b/go.mod +index 03516ce..08a3cb5 100644 +--- a/go.mod ++++ b/go.mod +@@ -13,9 +13,10 @@ require ( + github.com/mitchellh/go-homedir v1.1.0 + github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1 + github.com/nwidger/jsoncolor v0.3.0 ++ github.com/stretchr/testify v1.9.0 // indirect + github.com/tidwall/gjson v1.6.0 + github.com/tidwall/pretty v1.0.1 // indirect + github.com/x86kernel/htmlcolor v0.0.0-20190529101448-c589f58466d0 + golang.org/x/net v0.0.0-20200602114024-627f9648deb9 +- golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 // indirect ++ golang.org/x/sys v0.6.0 // indirect + ) diff --git a/community/wxwidgets/APKBUILD b/community/wxwidgets/APKBUILD index 288f47add49..dbeb220d900 100644 --- a/community/wxwidgets/APKBUILD +++ b/community/wxwidgets/APKBUILD @@ -3,7 +3,7 @@ # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=wxwidgets -pkgver=3.2.4 +pkgver=3.2.5 pkgrel=0 pkgdesc="wxWidgets GUI library" url="https://www.wxwidgets.org/" @@ -148,7 +148,7 @@ _qt5() { } sha512sums=" -8592e8b7ddf4afe83c9dd4894faa43bbf8a5d57d1ac408b3b6b3b77a809063493ef3e2eefa3155214e1c91c5fad2dc6c0760dd79ada3e73f73ec4d06021b6fff wxWidgets-3.2.4.tar.bz2 +b5bd8e4b53b7c44f79b76a39de0071d14e1f0325e66b7a9f2c7f1934a4146be3c78332f610119f7ba46ca4cd1055272a3d8937ad46665ce5abd867a803f22c86 wxWidgets-3.2.5.tar.bz2 c8049633dd39a7f2dfc5f0973d033420cec9338b719078b9239d6b8653b9998cff8fcad57ec746d8864bb69b580de170918bdf2af6b20caba4cb3b9963efa36b wxwidgets-missing-qt-symbols.patch 37355180cb4ed670a0ed8abd095cd32eff6cb576d4cbb6e42e3bb7adcb3e03a2170d2bb0f523de63efa6666061bc3a8356885133d8f26c76933b3cfd4e5e451d invalid-header-syntax.patch 33797f211a142a3d1caeaa9e971cd047b33da28ba73cf772772d2d00bef590f629c5a90a8283d310026bb391669c3733265385ad3e5faa98633e25406c761eef largefile.patch 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 b8dd8185e90..d4ac0bb8f76 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.1 +pkgver=46.2 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=" -deac695606731a910c4a4b0874c7d2d3a7a218b91c583ab07a6d9f7bbf5356f86e5adc2c1170965e81a3a472d238fcdb4953681d55aa3128beb3f6f36d66f332 xdg-desktop-portal-gnome-46.1.tar.xz +8257a30fd2303e32c6eebd2fd97e876f2776aeb7442de96040d7fdb5961b674272d03c24ebd89bfb55a88bd668ae75bde3f3405a26cda48b93c23033d0d7bde5 xdg-desktop-portal-gnome-46.2.tar.xz " diff --git a/community/xdg-desktop-portal-kde/APKBUILD b/community/xdg-desktop-portal-kde/APKBUILD index 5770189bf29..348cd9c8b70 100644 --- a/community/xdg-desktop-portal-kde/APKBUILD +++ b/community/xdg-desktop-portal-kde/APKBUILD @@ -4,8 +4,8 @@ # 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.4 -pkgrel=0 +pkgver=6.0.5 +pkgrel=1 pkgdesc="A backend implementation for xdg-desktop-portal that is using Qt/KDE" # armhf blocked by extra-cmake-modules arch="all !armhf" @@ -30,6 +30,11 @@ makedepends=" samurai xdg-desktop-portal-dev " +checkdepends=" + dbus-x11 + py3-gobject3 + xvfb-run + " subpackages="$pkgname-lang" case "$pkgver" in @@ -48,6 +53,11 @@ build() { cmake --build build } +check() { + # colorschemetest requires the package itself installed + xvfb-run ctest --test-dir build --output-on-failure -E "colorschemetest" +} + package() { DESTDIR="$pkgdir" cmake --install build @@ -55,5 +65,5 @@ package() { } sha512sums=" -7682ffc69315c4319404c13f1c29016c5ae6f4f60233fa41f035cf4532b8f56f976969536aec52ca0cc676a2399ee04e04a06972dbf598d36e0c89e0b5f92669 xdg-desktop-portal-kde-6.0.4.tar.xz +f83af71b1441926d7688c97da9253bc49896b56927edb39bf1839a07461f7d3a507f69f79bce2bfe63b9eb5f7553e43e74ae78203ef9f3db56f806b191c21745 xdg-desktop-portal-kde-6.0.5.tar.xz " diff --git a/community/xdm/APKBUILD b/community/xdm/APKBUILD index 33fdc8ecd38..00bed0ca04a 100644 --- a/community/xdm/APKBUILD +++ b/community/xdm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=xdm pkgver=1.1.16 -pkgrel=0 +pkgrel=1 pkgdesc="X Display Manager" options="!check" # No testsuite url="https://xorg.freedesktop.org/wiki/" @@ -63,7 +63,7 @@ package() { sha512sums=" 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/xdotool/APKBUILD b/community/xdotool/APKBUILD index 6214b8e8e0b..f6350cb3bd6 100644 --- a/community/xdotool/APKBUILD +++ b/community/xdotool/APKBUILD @@ -1,22 +1,41 @@ # Contributor: Stuart Cardall <developer@it-offshore.co.uk> # Contributor: Stefan Wagner <stw@bit-strickerei.de> -# Maintainer: Stefan Wagner <stw@bit-strickerei.de> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=xdotool pkgver=3.20211022.1 -pkgrel=0 -pkgdesc="Simulate keyboard/mouse input" +pkgrel=1 +pkgdesc="Simulate X11 keyboard/mouse input events" url="https://github.com/jordansissel/xdotool" arch="all" license="BSD-3-Clause" -depends_dev="libxtst-dev libxinerama-dev libxkbcommon-dev" -makedepends="$depends_dev libx11-dev perl" -source="$pkgname-$pkgver.tar.gz::https://github.com/jordansissel/xdotool/archive/v$pkgver.tar.gz" +depends_dev=" + libxinerama-dev + libxkbcommon-dev + libxtst-dev + " +makedepends=" + $depends_dev + libx11-dev + perl + " +checkdepends=" + bash + openbox + ruby + xvfb + " +options="!check" # tests hang on the CI subpackages="$pkgname-dev $pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/jordansissel/xdotool/archive/v$pkgver.tar.gz" build() { make WITHOUT_RPATH_FIX=1 } +check() { + make -j1 test +} + package() { make DESTDIR="$pkgdir" PREFIX=/usr INSTALLMAN=/usr/share/man install } diff --git a/community/xe-guest-utilities/APKBUILD b/community/xe-guest-utilities/APKBUILD index 5bb58a5abea..42dd14277d4 100644 --- a/community/xe-guest-utilities/APKBUILD +++ b/community/xe-guest-utilities/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Ian Bashford <ianbashford@gmail.com> pkgname=xe-guest-utilities pkgver=8.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="XenServer guest tools" url="https://github.com/xenserver/xe-guest-utilities" arch="x86 x86_64 aarch64" diff --git a/community/xfce4-terminal/APKBUILD b/community/xfce4-terminal/APKBUILD index acb663e1c8d..046db49f069 100644 --- a/community/xfce4-terminal/APKBUILD +++ b/community/xfce4-terminal/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-terminal -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=0 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" url="https://docs.xfce.org/apps/xfce4-terminal/start" @@ -35,5 +35,5 @@ package() { } sha512sums=" -ffd0975dc839e256ee18c8a5cb01025bfc2703af7d379d565ea861482269698c718c4cca408440cdc76ef7c6ccacaa6816da7f6734b1aef004cfb223f657243a xfce4-terminal-1.1.2.tar.bz2 +12d489099851b281d3ac83a4d9b2f459ed8442899823edba36055a0aa731d1821686f400d5d370833077b0ccf930cb3dfdf5800af58dd2339377dd7e902210b9 xfce4-terminal-1.1.3.tar.bz2 " diff --git a/community/xfce4-weather-plugin/APKBUILD b/community/xfce4-weather-plugin/APKBUILD index ad15c4639f5..b72c16b6111 100644 --- a/community/xfce4-weather-plugin/APKBUILD +++ b/community/xfce4-weather-plugin/APKBUILD @@ -1,8 +1,8 @@ # Contributor: knuxify <knuxify@gmail.com> -# Maintainer: knuxify <knuxify@gmail.com> +# Maintainer: pkgname=xfce4-weather-plugin pkgver=0.11.2 -pkgrel=0 +pkgrel=1 pkgdesc="Weather plugin for the Xfce desktop environment" url="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin" arch="all" diff --git a/community/xmake/APKBUILD b/community/xmake/APKBUILD index 8ec6727d0df..87c296b2aa5 100644 --- a/community/xmake/APKBUILD +++ b/community/xmake/APKBUILD @@ -1,7 +1,7 @@ # Contributor: qaqland <qaq@qaq.land> # Maintainer: qaqland <qaq@qaq.land> pkgname=xmake -pkgver=2.9.1 +pkgver=2.9.2 pkgrel=0 pkgdesc="A cross-platform build utility based on Lua" url="https://xmake.io/" @@ -81,7 +81,7 @@ package() { } sha512sums=" -9e5bbab9c3025c522af5d4cd8e1349a641147fd53618ba6ab223491cc08bf3bf99b3e1d5d4910de55007dd575f79451d31806aa9d83d69c72b55b48c05e4c3a6 xmake-2.9.1.tar.gz +b3fde837b818d1fc410dbee26dafc576b56f3d5da649762e7dbbd625cb7d3272804db3aea9f659db53c4d40552d1d574b6c017081cda258022f79d2c7ac91e15 xmake-2.9.2.tar.gz a2799a33230c849102f27e15c44b3972691132f551d7a571ed5c8d99a628d2f1923f093bcc41cc2b11c9fd431dfa4b2cb71438530ed3fe2c2daa656530a2fccc 01-pkgconfig-libsv.patch 735560bb8a148818b3c1efeac612c2873c473fd6727e749de78053442fda09919e51292f1aae71e49e5b22ab432da0a981d2d7505bd6e25ae02e4b40b6084279 02-system-include.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/community/xq/APKBUILD b/community/xq/APKBUILD index 66e06dc6bc9..0d9e2f3964c 100644 --- a/community/xq/APKBUILD +++ b/community/xq/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakob Meier <comcloudway@ccw.icu> pkgname=xq pkgver=1.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="Command-line XML and HTML beautifier and content extractor" url="https://github.com/sibprogrammer/xq" arch="all" diff --git a/community/xterm/APKBUILD b/community/xterm/APKBUILD index d83cdc68020..ee864ebebe3 100644 --- a/community/xterm/APKBUILD +++ b/community/xterm/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Simon Rupf <simon@rupf.net> pkgname=xterm -pkgver=390 -pkgrel=0 +pkgver=392 +pkgrel=1 pkgdesc="X Terminal Emulator" options="!check" # Requires vttest url="https://invisible-island.net/xterm" @@ -11,9 +11,7 @@ license="MIT" depends="ncurses-terminfo-base" makedepends="libxaw-dev libxft-dev ncurses-dev" subpackages="$pkgname-doc" -source="https://invisible-island.net/archives/xterm/xterm-$pkgver.tgz - posix-ptys.patch - " +source="https://invisible-island.net/archives/xterm/xterm-$pkgver.tgz" # secfixes: # 371-r0: @@ -66,6 +64,5 @@ package() { } sha512sums=" -865ae292a56635ec2811a950763da22cbbb4de463bee75b4595b7387a09227f612c5620986e431631c3d73fe783d862fd9a6694c54c33898327339467b7085b7 xterm-390.tgz -03722dc3ebe8067a1edf4673ce2e5132832e52818f4e122bfbd3846a4ebf0ca25bea999d98455b87ec572931becbbb0432e22c75b0fb5371a81c8acf0c4e9f98 posix-ptys.patch +41d19b3b8429ed193e37a926a62fe92083bf1b6675de6deac6b0ba408a0022f3592452378ac3b38d69c74312c61fbeff0e3255061bef7b810faa99ba1e09ed08 xterm-392.tgz " diff --git a/community/xterm/posix-ptys.patch b/community/xterm/posix-ptys.patch deleted file mode 100644 index 596699fde2f..00000000000 --- a/community/xterm/posix-ptys.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -upr xterm-323.orig/main.c xterm-323/main.c ---- xterm-323.orig/main.c 2016-03-09 15:30:51.191053881 +0100 -+++ xterm-323/main.c 2016-03-09 15:31:17.961635229 +0100 -@@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED) - close(opened_tty); - opened_tty = -1; - } --#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT_PTY_ISATTY) -+#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) - if ((*pty = posix_openpt(O_RDWR)) >= 0) { - char *name = ptsname(*pty); - if (name != 0) { -@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw) - /* - * now in child process - */ --#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) -+#if defined(_POSIX_VERSION) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) - int pgrp = setsid(); /* variable may not be used... */ - #else - int pgrp = getpid(); diff --git a/community/yakuake/APKBUILD b/community/yakuake/APKBUILD index 65fb0b36c0c..2943dbe9407 100644 --- a/community/yakuake/APKBUILD +++ b/community/yakuake/APKBUILD @@ -4,7 +4,7 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=yakuake -pkgver=24.02.2 +pkgver=24.05.0 pkgrel=0 arch="all !armhf" url="https://kde.org/applications/system/org.kde.yakuake" @@ -55,5 +55,5 @@ package() { } sha512sums=" -3687f344e94a0b0f7b1651cae2d314049013673d23ec28b74b7a1603d95fb230fd9fdf0ebb29d99e206ff041256e083d41ad731b0f055c3c261e8ced2187a9e8 yakuake-24.02.2.tar.xz +a4e62aabf30bdba5d65e99396a6f70debd5e88619b0c3f80775001e625f54d2a0147097b1bcb372e9e3d54836bc29de63cb29f24536eff93f981266e38ab24d5 yakuake-24.05.0.tar.xz " diff --git a/community/yara/APKBUILD b/community/yara/APKBUILD index 28fc30d6576..efe7f28d1ad 100644 --- a/community/yara/APKBUILD +++ b/community/yara/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Daniel Isaksen <d@duniel.no> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=yara -pkgver=4.5.0 +pkgver=4.5.1 pkgrel=0 pkgdesc="The pattern matching swiss knife for malware researchers" url="https://virustotal.github.io/yara/" @@ -19,7 +19,6 @@ makedepends=" subpackages="$pkgname-dev $pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/VirusTotal/yara/archive/v$pkgver.tar.gz frozen-tests.patch - lfs64.patch " # secfixes: @@ -54,7 +53,6 @@ package() { } sha512sums=" -c9fe8a89879d1a742236101f1754e6b25e70356cdf5c020b2583e3ac509600c3b462756c412b01f2ebcb17df351c83afcf04d1cfaa87e6753eb25bab0f797aa3 yara-4.5.0.tar.gz +8bf1df7089f9bc5a448dbae0999e04f4ecdec06b4478e2cb5f42a2a3201b99fce68379e3f8f7c67a9db201205366250d7befe5c38451cced807ed692d436422c yara-4.5.1.tar.gz 7409cc9b10e45d49ef5def47ece19db34e18c7dada007cb8d27879b07374e57913ce4489df9d4bd6bd86706505fb29ee847362dcd3863eeaa6397277012f418f frozen-tests.patch -6aafb018b6744118d4a448bf7dca679fa0ff7fc63943a6441501c4d8d753769c839f6bbe5c13b4db7283175cd229c0adfa9cdeec64ab27bb4ef3932824edbf08 lfs64.patch " diff --git a/community/yara/lfs64.patch b/community/yara/lfs64.patch deleted file mode 100644 index 0bba5af7f10..00000000000 --- a/community/yara/lfs64.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/libyara/proc/linux.c -+++ b/libyara/proc/linux.c -@@ -249,7 +249,7 @@ - // target process VM. - if (fd == -1) - { -- if (pread64( -+ if (pread( - proc_info->mem_fd, - (void*) context->buffer, - block->size, -@@ -265,7 +265,7 @@ - { - goto _exit; - } -- if (pread64( -+ if (pread( - proc_info->pagemap_fd, - pagemap, - sizeof(uint64_t) * block->size / page_size, -@@ -284,7 +284,7 @@ - // swap-backed and if it differs from our mapping. - uint8_t buffer[page_size]; - -- if (pread64( -+ if (pread( - proc_info->mem_fd, - buffer, - page_size, diff --git a/community/yggdrasil/APKBUILD b/community/yggdrasil/APKBUILD index d27e5eb19a1..aa1806ff5ee 100644 --- a/community/yggdrasil/APKBUILD +++ b/community/yggdrasil/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Steven Guikal <void@fluix.one> pkgname=yggdrasil pkgver=0.5.5 -pkgrel=3 +pkgrel=4 pkgdesc="An experiment in scalable routing as an encrypted IPv6 overlay network" url="https://yggdrasil-network.github.io/" arch="all" diff --git a/community/yq-go/APKBUILD b/community/yq-go/APKBUILD index d7c1e685833..36db96f3d0a 100644 --- a/community/yq-go/APKBUILD +++ b/community/yq-go/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Tuan Hoang <tmhoang@linux.ibm.com> pkgname=yq-go _projname=yq -pkgver=4.43.1 -pkgrel=1 +pkgver=4.44.1 +pkgrel=0 pkgdesc="Portable command-line YAML processor written in Go" url="https://github.com/mikefarah/yq" arch="all" @@ -12,6 +12,9 @@ license="MIT" makedepends="go" checkdepends="bash tzdata" replaces="yq~=4.0" # backward compatibility (Alpine <3.20) +# For backward compatibility (Alpine <3.20). This should be moved to yq-python +# someday later (see #16052). +provides="yq=$pkgver-r$pkgrel" subpackages=" $pkgname-bash-completion $pkgname-zsh-completion @@ -56,5 +59,5 @@ package() { } sha512sums=" -a3bb594421811db613118af5ba002e08ccb4b76a63ddf428bbdd4926cf8614217d67f47bfa4ad2c87361a96ade1841fde656fcf9ed700a8994333d61b9a80a8d yq-go-4.43.1.tar.gz +afcec4e6f99f38a342a91aff34823823e32df0498c8e617314945a00d2161d28bfcc603dcaac2eb95d510bc57fe63ca2aebf1966b7420536be42f8102564314f yq-go-4.44.1.tar.gz " diff --git a/community/yq/APKBUILD b/community/yq-python/APKBUILD index 6cd28bad00a..878a1c42957 100644 --- a/community/yq/APKBUILD +++ b/community/yq-python/APKBUILD @@ -3,7 +3,7 @@ # # 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 +pkgname=yq-python pkgver=3.2.3 pkgrel=0 pkgdesc="jq wrapper for YAML/XML/TOML documents" @@ -25,7 +25,6 @@ makedepends=" " 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" diff --git a/community/yq/yq.post-upgrade b/community/yq/yq.post-upgrade deleted file mode 100644 index b1969dad445..00000000000 --- a/community/yq/yq.post-upgrade +++ /dev/null @@ -1,19 +0,0 @@ -#!/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/yt-dlp/APKBUILD b/community/yt-dlp/APKBUILD index d36c169715b..61d34745d5e 100644 --- a/community/yt-dlp/APKBUILD +++ b/community/yt-dlp/APKBUILD @@ -5,8 +5,8 @@ # Contributor: Sodface <sod@sodface.com> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=yt-dlp -pkgver=2024.04.09 -pkgrel=1 +pkgver=2024.05.27 +pkgrel=0 pkgdesc="Command-line program to download videos from YouTube" url="https://github.com/yt-dlp/yt-dlp" arch="noarch" @@ -86,5 +86,5 @@ core() { } sha512sums=" -5eada1c6a3d656c4f70552824a59ed677ecc102e1a2c3475a12fccff78ea267d7391e778060d708bf0aca1bdf92f4bf413785e0cd65b43259535577e92755556 yt-dlp-2024.04.09.tar.gz +ca2ddd04abb9ca3861584f6cbf827e21cbf9771394f059f2d8a0fc8874036dc9ae2bd0ad8a7bb350d1a042c1988aaeb3fef476f76ecc61710351c6a428aa95bc yt-dlp-2024.05.27.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-touch-detector/APKBUILD b/community/yubikey-touch-detector/APKBUILD index 28065765c7b..ad49a7392ce 100644 --- a/community/yubikey-touch-detector/APKBUILD +++ b/community/yubikey-touch-detector/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=yubikey-touch-detector pkgver=1.11.0 -pkgrel=2 +pkgrel=3 pkgdesc="Tool to detect when your YubiKey is waiting for a touch" url="https://github.com/maximbaz/yubikey-touch-detector" arch="all" diff --git a/community/zabbix-agent2-plugin-alpine/APKBUILD b/community/zabbix-agent2-plugin-alpine/APKBUILD index 74d2e8260c4..2e6173954f1 100644 --- a/community/zabbix-agent2-plugin-alpine/APKBUILD +++ b/community/zabbix-agent2-plugin-alpine/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=zabbix-agent2-plugin-alpine pkgver=0.3.1 -pkgrel=6 +pkgrel=7 pkgdesc="Alpine related plugins for Zabbix Agent 2" url="https://gitlab.alpinelinux.org/alpine/infra/zabbix-agent2-plugins" arch="all" diff --git a/community/zabbix-agent2-plugin-postgresql/APKBUILD b/community/zabbix-agent2-plugin-postgresql/APKBUILD index fa642d12442..71279de3557 100755 --- a/community/zabbix-agent2-plugin-postgresql/APKBUILD +++ b/community/zabbix-agent2-plugin-postgresql/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=zabbix-agent2-plugin-postgresql pkgver=6.4.11 -pkgrel=2 +pkgrel=3 pkgdesc="Zabbix Agent 2 PostgreSQL loadable plugin" url="https://git.zabbix.com/projects/AP/repos/postgresql/browse" arch="all" diff --git a/community/zabbix/APKBUILD b/community/zabbix/APKBUILD index 65f314472c2..8b41ff384ff 100644 --- a/community/zabbix/APKBUILD +++ b/community/zabbix/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=zabbix -pkgver=6.4.14 +pkgver=6.4.15 pkgrel=0 pkgdesc="Enterprise-class open source distributed monitoring" url="https://www.zabbix.com/" @@ -291,7 +291,7 @@ agent2_openrc() { } sha512sums=" -cbfa6313170dd0a0395535227f57f515d4638d9110f128fdd60ccf16519e75ff79a8a4af98fdb5c78cff1f95cf09c1ef3cb270b733d0004c8e75da330af59568 zabbix-6.4.14.tar.gz +2461f0b9e4cf66860df1e26da6bc185ba41ce925ccfef2dc31e9ec7caa50bf38a3535a916b0a043844c13d5e6a4135797503a45adbd4c1919d196052e6f90774 zabbix-6.4.15.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 2518e989343..51a8149a694 100644 --- a/community/zanshin/APKBUILD +++ b/community/zanshin/APKBUILD @@ -4,11 +4,12 @@ # The group tag is just to easily find this APKBUILD by some scripts for automation # group=kde-applications pkgname=zanshin -pkgver=24.02.2 -pkgrel=1 +pkgver=24.05.0 +pkgrel=0 # 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" @@ -65,5 +66,5 @@ package() { } sha512sums=" -1d5026288c6f280580f2a8bbfaf8cf69ad5ec218927f393d951bda8a13690c1ca3cfcd11edc2c18260e6602e5710476464f71f83ad5b0475674204a95d588a62 zanshin-24.02.2.tar.xz +d133b8514c9f4badf19f580cfd8321c34fd9408438682d9332c53e5da0e960b30d96beb08b1c208f7e2f336ea89d3d23339020edfd6d8c9ab4a1731d66c2d7f8 zanshin-24.05.0.tar.xz " 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 976d2059cbc..7ce60bfbe72 100644 --- a/community/zathura-pdf-mupdf/APKBUILD +++ b/community/zathura-pdf-mupdf/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=zathura-pdf-mupdf -pkgver=0.4.1 -pkgrel=14 +pkgver=0.4.2 +pkgrel=0 pkgdesc="mupdf plugin to zathura" -url="https://git.pwmt.org/pwmt/zathura-pdf-mupdf" +url="https://pwmt.org/projects/zathura-pdf-mupdf/" arch="all" license="Zlib" options="!check" # no test suite @@ -29,6 +29,6 @@ package() { } sha512sums=" -26bb28fa15fbbd8dc39b72a01812f424ec02e02af1dcb79b1ae10865c209cc00b8d2f813aa0685e1bef76f6c8ce5f8a461cf51c3a37691face9f84416e0ab31a zathura-pdf-mupdf-0.4.1.tar.xz +a3a675f090ebd4596f7fe56c0ee5e4a287d1fcf93e28bb528d53b1be66374060e8260c4a2153f465feacdc22a32256fe3df183131e70bece8c3ef01af6f6f616 zathura-pdf-mupdf-0.4.2.tar.xz dbe18e2f56db80184edcd174221342770b6baa46ec14ed2f75e9033d961ac993fdbd9ba7faeb139787d5e463de5e612a2f6d0d1dc47075f3d52b51996fa5e561 fix-meson.build.patch " 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/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/community/zeromq-gsl/APKBUILD b/community/zeromq-gsl/APKBUILD index eee6f7ed122..5db7b27663a 100644 --- a/community/zeromq-gsl/APKBUILD +++ b/community/zeromq-gsl/APKBUILD @@ -4,8 +4,8 @@ pkgver=4.1.5 pkgrel=1 pkgdesc="A universal code generator" url="https://zeromq.org/" -# riscv64 blocked by not defined qbyte -arch="all !riscv64" +# riscv64 and loongarch64 blocked by not defined qbyte +arch="all !riscv64 !loongarch64" license="GPL-3.0-or-later" makedepends="pcre-dev" subpackages="$pkgname-doc" diff --git a/community/zigbee2mqtt/APKBUILD b/community/zigbee2mqtt/APKBUILD index 041b13af175..1e291609425 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.1 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 +a496b068f21553c8d654bd8e6a0be2bc07c59e2add1fa18157b5d1eb4c31b724cd7a925bc16cb9ab070dbefca7ff304086f66b73de85cbb009a51baba5bbef77 zigbee2mqtt-1.37.1.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/zsh-syntax-highlighting/APKBUILD b/community/zsh-syntax-highlighting/APKBUILD index 0196922b1ba..c7be5141ae5 100644 --- a/community/zsh-syntax-highlighting/APKBUILD +++ b/community/zsh-syntax-highlighting/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Dawid Dziurla <dawidd0811@gmail.com> -# Maintainer: Dawid Dziurla <dawidd0811@gmail.com> +# Maintainer: pkgname=zsh-syntax-highlighting pkgver=0.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="Fish shell like syntax highlighting for Zsh" url="https://github.com/zsh-users/zsh-syntax-highlighting" arch="noarch" 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/alpine-base/APKBUILD b/main/alpine-base/APKBUILD index 4f075d6c91a..aa03be3bddc 100644 --- a/main/alpine-base/APKBUILD +++ b/main/alpine-base/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-base -pkgver=3.20.0_alpha20240329 +pkgver=3.20.0 pkgrel=0 pkgdesc="Meta package for minimal alpine base" url="https://alpinelinux.org" diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index cf36c5d62e3..23842a16b71 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,16 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=3.17.2 +pkgver=3.18.0 pkgrel=0 pkgdesc="Alpine configuration management scripts" url="https://git.alpinelinux.org/alpine-conf/about" arch="all" license="MIT" depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3" -checkdepends="kyua" -source="https://gitlab.alpinelinux.org/alpine/alpine-conf/-/archive/$pkgver/alpine-conf-$pkgver.tar.gz - setup-disk-add-loongarch64-support.patch - " +checkdepends="kyua sfdisk" +source="https://gitlab.alpinelinux.org/alpine/alpine-conf/-/archive/$pkgver/alpine-conf-$pkgver.tar.gz" build() { make VERSION=$pkgver-r$pkgrel @@ -28,6 +26,5 @@ check() { } sha512sums=" -4459ba5004a9c4272e606af9f4c21119d3c8ab8f55543c79a7b3469f0574232cf286cbb5887f338f1371d013236522f630bdf3f096c62fb886ce226d4065f386 alpine-conf-3.17.2.tar.gz -c8b2ff058e65e774de5254ee5f0b62360bf83e746790190c73f55cedcaf568f431902768d147310b4d6b1f1d80b87849cf09790384a38b650f6f889a36c8a6c1 setup-disk-add-loongarch64-support.patch +0312f94b69dc185f4ae4112ca6ec0cd5f19bb02b40578910b3f5757d95cba878cdbdbfaddc7e9887ec24aca5bb8cf703c06a7f781fd9a1538b68e2c7e8ed4967 alpine-conf-3.18.0.tar.gz " diff --git a/main/alpine-conf/setup-disk-add-loongarch64-support.patch b/main/alpine-conf/setup-disk-add-loongarch64-support.patch deleted file mode 100644 index a9f8120aeae..00000000000 --- a/main/alpine-conf/setup-disk-add-loongarch64-support.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1512b22ae7cbd99f5f77a027fbd2b6acb3ec1615 Mon Sep 17 00:00:00 2001 -From: Jingyun Hua <huajingyun@loongson.cn> -Date: Mon, 18 Mar 2024 10:48:17 +0800 -Subject: [PATCH] setup-disk: add loongarch64 support - ---- - setup-disk.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setup-disk.in b/setup-disk.in -index 56f5152..7f01bfb 100755 ---- a/setup-disk.in -+++ b/setup-disk.in -@@ -322,6 +322,7 @@ setup_grub() { - arm*) target=arm-efi ; fwa=arm ;; - aarch64) target=arm64-efi ; fwa=aa64 ;; - riscv64) target=riscv64-efi ; fwa=riscv64 ;; -+ loongarch64) target=loongarch64-efi ; fwa=loongarch64 ;; - esac - - # currently disabling nvram so grub doesnt call efibootmgr --- -2.27.0 - diff --git a/main/apparmor/APKBUILD b/main/apparmor/APKBUILD index 981d56e5f4a..5116df3532b 100644 --- a/main/apparmor/APKBUILD +++ b/main/apparmor/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Allan Garret <allan.garret@gmail.com> pkgname=apparmor pkgver=3.1.7 -pkgrel=1 +pkgrel=2 pkgdesc="Linux application security framework - mandatory access control for programs" url="https://gitlab.com/apparmor/apparmor/wikis/home" arch="all" @@ -51,6 +51,7 @@ source=" 0001-Fix-linking-against-gettext-on-musl-libc.patch 0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch + libapparmor-basename.patch fix-dnsmasq-profile.patch " options="!check" # checkdepends in community @@ -202,5 +203,6 @@ sha512sums=" 1a57cc577ba3aedfbe10ef6148c1e8f5d0bbf65c99e60eec80c52409c9dab59ae002024500c6e4fd0e01e8c7aeb0c85e3e6b41cacee08c17fdd869d31bca614e apparmor.initd e94f44427ed3c6f64462170939ffc92ce9ac1a58c61c7c7c3483fe16fe8e1c419daade9d56cdd342132e4d823dcac1963a86ad889f10bf71fd52b7f54c4694ed 0001-Fix-linking-against-gettext-on-musl-libc.patch 38ebb30a0185f8eabd9103925959da365f64ef485f66ffb10180ac596fc172f9c98df39baec0b035138e9ab32056148e69a066faba9faebf9e92bf7a09c150c0 0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch +49a8e3e9ff57cea30ae82e5d50611f47e51d98974e2cfc0f9e32c9f3fcb8669893f5dd915f77e93475bf1c5a1010fa795f58bf9651585b64fcb3a48ab45c572e libapparmor-basename.patch cbe6eb9dd46e3ace122d5bc386596d5106a301b82a9ac1681f31a967013d3db67a8d674d54605444f30c3a136677ff3b26fad80f78d0f02dbe18a9f10f64672a fix-dnsmasq-profile.patch " diff --git a/main/apparmor/libapparmor-basename.patch b/main/apparmor/libapparmor-basename.patch new file mode 100644 index 00000000000..7977d2c2f85 --- /dev/null +++ b/main/apparmor/libapparmor-basename.patch @@ -0,0 +1,20 @@ +--- a/libraries/libapparmor/testsuite/test_multi.c ++++ b/libraries/libapparmor/testsuite/test_multi.c +@@ -1,5 +1,3 @@ +-#define _GNU_SOURCE /* for glibc's basename version */ +- + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +@@ -7,6 +5,11 @@ + + #include <aalogparse.h> + ++static const char *basename(const char *path) ++{ ++ return strrchr(path, '/') ? strrchr(path, '/')+1 : path; ++} ++ + int print_results(aa_log_record *record); + + int main(int argc, char **argv) diff --git a/main/asciidoctor/APKBUILD b/main/asciidoctor/APKBUILD index 63827d49046..1927e7b6c52 100644 --- a/main/asciidoctor/APKBUILD +++ b/main/asciidoctor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Seung Soo Mun <hamletmun@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=asciidoctor -pkgver=2.0.22 +pkgver=2.0.23 pkgrel=0 pkgdesc="Converter for AsciiDoc to HTML5, DocBook 5 (or 4.5) and other formats" url="https://rubygems.org/gems/asciidoctor" @@ -34,5 +34,5 @@ package() { } sha512sums=" -1c9cd3bdbb7f4467b73e99b29ab655d521213d51c0151f6aee21cfd1d943c6456c1ef23bfdbf180057b70590341d92fcda2be0bf5e1c741e7068ff0901bd282c asciidoctor-2.0.22.gem +61aeb0c78438b61cdd7caf31840c82fc68d94ed296e381927c1e3a0b36be5bc29a025a7d9a076c19293f1c8b69056120f0493456106eeeb4a083afb59a414328 asciidoctor-2.0.23.gem " diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index 2a80ead90d0..e4acc870c50 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk -pkgver=20.5.2 +pkgver=20.8.1 pkgrel=0 pkgdesc="Modular Open Source PBX System" pkgusers="asterisk" @@ -85,6 +85,8 @@ source="$_download/asterisk-$pkgver.tar.gz " # secfixes: +# 20.8.1-r0: +# - CVE-2024-35190 # 20.5.1-r0: # - CVE-2023-37457 # - CVE-2023-49294 @@ -255,7 +257,7 @@ sound_en() { } sha512sums=" -ff2d6ddd5b6031b6e4fcb15c82149c3272031b617bf5bca87af1d085464fcd9af6bd373e9431077ce58a558b50c6b2c9cd4d94e739ecc312371cd605e4746a84 asterisk-20.5.2.tar.gz +19f2619ea0e0ee141c1dda8260c141db0f2ccf1cb5e3b703adbfea9954307efa6ab9e5a78d5647a6d3aa9b9016cec7a8d59066535214a66458167306598af4bd asterisk-20.8.1.tar.gz aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b asterisk-addon-mp3-r201.patch.gz 69d82b878728f99b7bf7e862025cbc01aa5b6b9332a5372059ea89a788c66fd351f1103989b3573a7a4ba9ff533f3ee2ff5d88de938440e05d6246e41a882306 asterisk-13.7-90e8780faccc79e68c07775c6ab2fe1ffaccfa08.tar.gz 771237ba6d42ab62d914f2702234b23fd0bc8c22f2aa33b0e745c9170163c8046f6d48ecb299faab3d6fb397f1aa046421083c3cc88510c9779861c522f357dd 10-musl-mutex-init.patch diff --git a/main/axel/APKBUILD b/main/axel/APKBUILD index 6383b8a0ac3..741b918417d 100644 --- a/main/axel/APKBUILD +++ b/main/axel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=axel -pkgver=2.17.13 +pkgver=2.17.14 pkgrel=0 pkgdesc="A multiple-connection concurrent downloader" url="https://github.com/axel-download-accelerator/axel" @@ -33,5 +33,5 @@ package() { } sha512sums=" -e36129de893c3c56fe89f7ff3accba9803b4e6d3b5094ed4266c10b33639b973c2fdc41beaf0a80d4fb5e62339580383497a15b4b7caad7d70c8fc581c0c4fc2 axel-2.17.13.tar.xz +73ea499f581d9411197269fc96d7eeed83dcdb7470aba2ef93db0a1032689bfb66e03a194e9ae5191477ca86cc772d204c6672233009cf210b9ebb3ae29bc9c0 axel-2.17.14.tar.xz " diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD index 0453b03dbfa..1d884b3767a 100644 --- a/main/bind/APKBUILD +++ b/main/bind/APKBUILD @@ -5,12 +5,12 @@ # Contributor: ungleich <alpinelinux@ungleich.ch> # Maintainer: Mike Crute <mike@crute.us> pkgname=bind -pkgver=9.18.25 +pkgver=9.18.27 _ver=${pkgver%_p*} _p=${pkgver#*_p} _major=${pkgver%%.*} [ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p" -pkgrel=1 +pkgrel=0 pkgdesc="The ISC DNS server" url="https://www.isc.org/" arch="all" @@ -290,7 +290,7 @@ _gpgfingerprints=" " sha512sums=" -af2b751b72121a6e98d762110bff183984ab5312d0e080b4ff091f3176437d8be570a8d849034ae4df5eee4e8795f32196d94859262e44f2ce55d8b3d895ba6e bind-9.18.25.tar.xz +d0c89821fef38e531d65b465adeb5946589775e6a4d5e2068e969f1106c961d3b202af19247b9e20f9fbde645be10d610478edf89ed0d83b39d38fb4353c693a bind-9.18.27.tar.xz 3d1d3e954aaee5e125f6b6f3cb660b51fc91d803df4cad43c47dbe97f19789cef20b5ca2834624668f0d761a5b81ac72db8959745d6eb293ca1154a1b390a007 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd d2f61d02d7829af51faf14fbe2bafe8bc90087e6b6697c6275a269ebbddcaa14a234fff5c41da793e945e8ff1de3de0858a40334e0d24289eab98df4bb721ac5 named.conf.authoritative diff --git a/main/bluez-headers/APKBUILD b/main/bluez-headers/APKBUILD index 4878a0de312..cf9c57b0fcd 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.75 +pkgver=5.76 pkgrel=0 pkgdesc="Bluez development headers" url="https://www.bluez.org/" @@ -31,5 +31,5 @@ package() { } sha512sums=" -f5fdad3824ed094d944d33f3d116c045e69d593a2b4dae5e57feeb5625a13e024e2433a3178921d2f8e1bd8261794ecdfc25ff3e52672e6e8d42e85b33a735a4 bluez-5.75.tar.xz +30dc3faef74a2225fd6027178376dca4166082d1ed5188021e13d13582db5846aef60b753f173d525bfd0c040f26c3e7dab0283ecafbd34c4a06855d13abb389 bluez-5.76.tar.xz " diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD index 4a53cadaffa..2c26c7770f2 100644 --- a/main/bluez/APKBUILD +++ b/main/bluez/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bluez # Make sure to also update the obexd-enhanced package if updating bluez -pkgver=5.75 +pkgver=5.76 pkgrel=0 pkgdesc="Tools for the Bluetooth protocol stack" url="https://www.bluez.org/" @@ -54,6 +54,7 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz fix-endianness.patch test-mesh-crypto.patch disable-test-vcp.patch + basename.patch " # secfixes: @@ -181,7 +182,7 @@ openrc() { } sha512sums=" -f5fdad3824ed094d944d33f3d116c045e69d593a2b4dae5e57feeb5625a13e024e2433a3178921d2f8e1bd8261794ecdfc25ff3e52672e6e8d42e85b33a735a4 bluez-5.75.tar.xz +30dc3faef74a2225fd6027178376dca4166082d1ed5188021e13d13582db5846aef60b753f173d525bfd0c040f26c3e7dab0283ecafbd34c4a06855d13abb389 bluez-5.76.tar.xz 5442f4f489718e51c50611c143803f2cc99e540b55a72af20ea2921b256774a6c7c5e273f2bedb745753d8c67d3fb7c938750fb48feac7460b32bd1cca029a28 bluetooth.initd 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd @@ -196,4 +197,5 @@ ac635f9bca0e983835940572eb1b96ad70cf60fb84d5b0fde38c76ea6d1b13ef7d9adf81468b9fed 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/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD index 0d81214b812..a7105965e42 100644 --- a/main/btrfs-progs/APKBUILD +++ b/main/btrfs-progs/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=btrfs-progs pkgver=6.8.1 -pkgrel=0 +pkgrel=1 pkgdesc="BTRFS filesystem utilities" url="https://btrfs.wiki.kernel.org" arch="all" @@ -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) @@ -104,4 +105,5 @@ sha512sums=" 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/0001-awk-fix-use-after-free-CVE-2023-42363.patch b/main/busybox/0001-awk-fix-use-after-free-CVE-2023-42363.patch new file mode 100644 index 00000000000..d7b1c627629 --- /dev/null +++ b/main/busybox/0001-awk-fix-use-after-free-CVE-2023-42363.patch @@ -0,0 +1,43 @@ +From 814bfcba6284038a4bada5c1733d72cc4f7c2f72 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 20 May 2024 17:04:23 +0200 +Subject: [PATCH] awk: fix use after free (CVE-2023-42363) + +Fixes https://bugs.busybox.net/show_bug.cgi?id=15865 +--- + editors/awk.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/editors/awk.c b/editors/awk.c +index 0981c6735..122376935 100644 +--- a/editors/awk.c ++++ b/editors/awk.c +@@ -2981,10 +2981,6 @@ static var *evaluate(node *op, var *res) + /* yes, remember where Fields[] is */ + old_Fields_ptr = Fields; + } +- if (opinfo & OF_STR1) { +- L.s = getvar_s(L.v); +- debug_printf_eval("L.s:'%s'\n", L.s); +- } + if (opinfo & OF_NUM1) { + L_d = getvar_i(L.v); + debug_printf_eval("L_d:%f\n", L_d); +@@ -3014,6 +3010,14 @@ static var *evaluate(node *op, var *res) + } + } + ++ /* Must get L.s after R.v is evaluated in case it realloc's L.v. ++ * eg: x = (v = "abc", gsub("b", "X", v)); ++ */ ++ if ((opinfo & OF_RES1) && (opinfo & OF_STR1)) { ++ L.s = getvar_s(L.v); ++ debug_printf_eval("L.s:'%s'\n", L.s); ++ } ++ + debug_printf_eval("switch(0x%x)\n", XC(opinfo & OPCLSMASK)); + switch (XC(opinfo & OPCLSMASK)) { + +-- +2.45.1 + diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 4eb46173b33..1b6b008f18f 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=26 +pkgrel=28 pkgdesc="Size optimized toolbox of many common UNIX utilities" url="https://busybox.net/" arch="all" @@ -87,6 +87,7 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2 0038-tsort-avoid-use-after-free.patch 0001-wget-add-header-Accept.patch + 0001-awk-fix-use-after-free-CVE-2023-42363.patch acpid.logrotate busyboxconfig @@ -102,6 +103,8 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2 " # secfixes: +# 1.36.1-r27: +# - CVE-2023-42363 # 1.36.1-r25: # - CVE-2023-42366 # 1.36.1-r2: @@ -441,6 +444,7 @@ decfd9df491944775ab0a51db1b922b45b6437d4e02429bf4d15642674df541fcc76b247497050f2 bff815bf9c8cd0856dde87eb90e2fe56f105dccb426e4f5da9425e30d449d7ee7ccc3b3324aee5136b276678e7be12afbcc368c7ca92d2c1bdcf22ed92ea1f4f 0037-awk.c-fix-CVE-2023-42366-bug-15874.patch 525df8ef0f78c79b74a62619729e4746c265aa0598036f74b3d7bbf2bf54dbdcf789ebfe7b1e0f8b21751f7e7c06a0a6125c0f166a551763199acb634164af82 0038-tsort-avoid-use-after-free.patch bff27cf4a311bc7f5af857f431ba5cca9861e3875815e81384c90419fa817d5d00812acaf0045342ab8f5355003135e9c0340547c1045e0144f6b9d01465838e 0001-wget-add-header-Accept.patch +771b52eb5218ce21ecc1ea5f4d1384bfd02078b37f2a361faeb68c03c7f69854bfe29624060b43eb653a2692303b5fe8ea7c0d2f07df0a022996cffe54697115 0001-awk-fix-use-after-free-CVE-2023-42363.patch aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1 acpid.logrotate 076f13b9d85ebf23aff8c0a2f313d3ca05f4d1c0d3ed06b0bc274d41deda3bd4808a8381f7c0411e8188b67315cc7ac8dced1b4473cda3c247773dbce2b71f55 busyboxconfig cfd96023125ca27c6eddb13af490a36e5e7d2fcfd0847363e48f1fa5ce237e93e6a9fe4577feeb35291d79d6240ae5e6a518b9258966e0fac27e30a43172b792 busyboxconfig-extras 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/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/cjson/APKBUILD b/main/cjson/APKBUILD index 06ea4c62d15..d7617bd50ae 100644 --- a/main/cjson/APKBUILD +++ b/main/cjson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=cjson -pkgver=1.7.17 +pkgver=1.7.18 pkgrel=0 pkgdesc="Lighweight JSON parser in C" url="https://github.com/DaveGamble/cJSON" @@ -40,5 +40,5 @@ package() { } sha512sums=" -4feebafa5225297fa3e6a7bf23f8d31b5c3e172f437078c5a07528522ad58ca2e9c72dd9e8611241d2b8321e9aa0a1a9af7743689d1c2001d1d9cb624aae6fa8 cjson-1.7.17.tar.gz +2accb507c6b97222eb5f0232c015b356cf6d248d1247049928731aa8e897378245e62395c232b1ec57d28d1e53ac72c849be85e59c33616a382d40473649f66b cjson-1.7.18.tar.gz " diff --git a/main/clang18/10-add-musl-triples.patch b/main/clang18/10-add-musl-triples.patch new file mode 100644 index 00000000000..d1e32ff8cec --- /dev/null +++ b/main/clang18/10-add-musl-triples.patch @@ -0,0 +1,39 @@ +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -2073,7 +2073,7 @@ + static const char *const AArch64LibDirs[] = {"/lib64", "/lib"}; + static const char *const AArch64Triples[] = { + "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux", +- "aarch64-suse-linux"}; ++ "aarch64-suse-linux", "aarch64-linux-musl"}; + static const char *const AArch64beLibDirs[] = {"/lib"}; + static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu", + "aarch64_be-linux-gnu"}; +@@ -2085,7 +2085,9 @@ + "armv7l-linux-musleabihf", + "armv7hl-redhat-linux-gnueabi", + "armv6hl-suse-linux-gnueabi", +- "armv7hl-suse-linux-gnueabi"}; ++ "armv7hl-suse-linux-gnueabi", ++ "arm-linux-musleabihf", ++ "armv7l-linux-musleabihf"}; + static const char *const ARMebLibDirs[] = {"/lib"}; + static const char *const ARMebTriples[] = {"armeb-linux-gnueabi"}; + static const char *const ARMebHFTriples[] = { +@@ -2101,7 +2103,7 @@ + "x86_64-redhat-linux", "x86_64-suse-linux", + "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", + "x86_64-slackware-linux", "x86_64-unknown-linux", +- "x86_64-amazon-linux"}; ++ "x86_64-amazon-linux", "x86_64-linux-musl"}; + static const char *const X32Triples[] = {"x86_64-linux-gnux32", + "x86_64-pc-linux-gnux32"}; + static const char *const X32LibDirs[] = {"/libx32", "/lib"}; +@@ -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-linux-musl", + }; + + static const char *const LoongArch64LibDirs[] = {"/lib64", "/lib"}; diff --git a/main/clang18/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang18/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch new file mode 100644 index 00000000000..42c8893a5d2 --- /dev/null +++ b/main/clang18/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch @@ -0,0 +1,90 @@ +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 @@ + + #include "Gnu.h" + #include "clang/Driver/ToolChain.h" ++#include "clang/Basic/LangOptions.h" + + namespace clang { + namespace driver { +@@ -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(); ++ if (VendorName.compare("alpine") == 0) ++ return LangOptions::SSPStrong; ++ ++ return LangOptions::SSPOff; ++ } + + 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 +@@ -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: 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 @@ + // SSP-PS4-BUF: "-stack-protector" "2" + // SSP-PS4-BUF: "-stack-protector-buffer-size" "16" + ++// Test default stack protector values for Alpine ++ ++// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE ++// ALPINE: "-stack-protector" "2" ++ ++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_SPS ++// ALPINE_SPS: "-stack-protector" "2" ++ ++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_ALL ++// ALPINE_ALL: "-stack-protector" "3" ++// ALPINE_ALL-NOT: "-stack-protector-buffer-size" ++ ++// RUN: %clang -target x86_64-alpine-linux-musl -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_NOSSP ++// ALPINE_NOSSP-NOT: "-stack-protector" ++// ALPINE_NOSSP-NOT: "-stack-protector-buffer-size" ++ + // Test default stack protector values for Darwin platforms + + // RUN: %clang -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS diff --git a/main/clang18/APKBUILD b/main/clang18/APKBUILD new file mode 100644 index 00000000000..0e12dedb12c --- /dev/null +++ b/main/clang18/APKBUILD @@ -0,0 +1,500 @@ +# 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.6 +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 + ;; + loongarch64) + 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=" +db9c41ae9cb9dc327ed819667b01ee75df4badbc7c11c1eadaa8d926c917c8e942d9282bed812f090ffa5cb3305b1d0145872530e267d16e2d4ea8c3fbe1b00f clang-18.1.6.src.tar.xz +5f44491fe486d0c294d2b94801fadcb5ae72aa0a2b72df41ab9195b9199ce6f57df43b34e7e90ed0539fdbf0568e772b41cf097804a623b6c7384effa95783cd clang-tools-extra-18.1.6.src.tar.xz +1334647f4be280b41858aa272bebc65e935cab772001032f77040396ba7472fbd5eb6a1a0c042ab7156540075705b7f05c8de2f02e2ce9d7ec1ec27be6bef86f cmake-18.1.6.src.tar.xz +6b52d63a7c1a604d062ddb69838939fd2e51a31de7225bf4f2c11a6cf3574f96188ebee3020ecbeb77cd4592680571abad8f0a9584a23685bf662b7f085c0372 llvm-18.1.6.src.tar.xz +4131a08951683972ab4897687b1dbc5cb0873c8d31fdc8fbaab92a2de52249e797b983329ef0d53fc681b531972d8d5550757af52314f0a3087d8009eb2f5c66 third-party-18.1.6.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/cmake/APKBUILD b/main/cmake/APKBUILD index b169e2869f2..ebf59928f9c 100644 --- a/main/cmake/APKBUILD +++ b/main/cmake/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cmake -pkgver=3.29.2 -pkgrel=1 +pkgver=3.29.3 +pkgrel=0 pkgdesc="Cross-platform, open-source make system" url="https://www.cmake.org/" arch="all" @@ -91,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 143f9224e41..04f91e44f3c 100644 --- a/main/conky/APKBUILD +++ b/main/conky/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=conky -pkgver=1.20.2 +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=" -b516db38af5c20b101520356cd4f50d147869e7ed2bc84287e8a464e32bb306655edbac074da278d4732ee87f02c52d99cb4c117556e0d08f5be911a2a789618 conky-1.20.2.tar.gz +584b74cacb3d398bdaf345558c8431d85c3bd1371cf58f678c53d6d01a76804589678ceb4bbf6073094dc2f99705e14d9e4f8e61701fcf7608504ddea7d1f2ba conky-1.21.0.tar.gz " diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD index 7ffa6fc362c..c19da78ace6 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=4 +pkgver=2.4.8 +pkgrel=0 pkgdesc="The CUPS Printing System" url="https://github.com/OpenPrinting/cups/" arch="all" @@ -155,7 +155,7 @@ doc() { } sha512sums=" -27ca505a2868aa7bc248bac892aafe2a837633e73b6059d3ab4812264e3b0e786ef075751e8cc4300ce6bc43ef095e3d77dd3fce88ce8e72ca69b65093427bca cups-2.4.7.tar.gz +9def5d66ff000fa36cc00749c9e3533348f55fa34724bab9fe8d982db990003c499b4acf2c8ae81d30a0c0ffded39b51f36eb391ab06a1da79bbe7d28a270cc8 cups-2.4.8.tar.gz cf64211da59e79285f99d437c02fdd7db462855fb2920ec9563ba47bd8a9e5cbd10555094940ceedeb41ac805c4f0ddb9147481470112a11a76220d0298aef79 cups.logrotate 2c2683f755a220166b3a1653fdd1a6daa9718c8f0bbdff2e2d5e61d1133306260d63a83d3ff41619b5cf84c4913fae5822b79553e2822858f38fa3613f4c7082 cupsd.initd 148eb01f0861e1cd0861a174a5c5262c49b079b27b972b4e90656b9b9357ec710e861604c30e897818f550e9c1cdcefcd8c8bc955ba4a333902a74cdd8dfb5a6 cups-no-export-ssllibs.patch diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD index b434ea1ec7e..d9ab7e3b5a6 100644 --- a/main/curl/APKBUILD +++ b/main/curl/APKBUILD @@ -8,7 +8,7 @@ # this aport from arch=all WILL be reverted. pkgname=curl -pkgver=8.7.1 +pkgver=8.8.0 pkgrel=0 pkgdesc="URL retrival utility and library" url="https://curl.se/" @@ -237,5 +237,5 @@ libcurl() { } sha512sums=" -5bbde9d5648e9226f5490fa951690aaf159149345f3a315df2ba58b2468f3e59ca32e8a49734338afc861803a4f81caac6d642a4699b72c6310ebfb1f618aad2 curl-8.7.1.tar.xz +9d2c0d3a0d8f6c31ba4fabe48f801910f886fde43dc198dc4213708d6967ed5e040a1bb7348aa1cb126577ee508a3ec36fe65256d027d861d6ffb70f6383967a curl-8.8.0.tar.xz " diff --git a/main/czmq/APKBUILD b/main/czmq/APKBUILD index 7ee9be01846..b7ed1e70abd 100644 --- a/main/czmq/APKBUILD +++ b/main/czmq/APKBUILD @@ -11,11 +11,6 @@ makedepends="util-linux-dev zeromq-dev cmake samurai" subpackages="$pkgname-static $pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/zeromq/czmq/archive/v$pkgver.tar.gz" -case "$CARCH" in -# crypto tests assume MIPS is little-endian - mips*) options="!check";; -esac - build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" diff --git a/main/dav1d/APKBUILD b/main/dav1d/APKBUILD index 96b90c86903..38a61475f3b 100644 --- a/main/dav1d/APKBUILD +++ b/main/dav1d/APKBUILD @@ -1,16 +1,18 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Bart Ribbers <bribbers@disroot.org> pkgname=dav1d -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=0 pkgdesc="small and fast AV1 Decoder" url="https://code.videolan.org/videolan/dav1d" arch="all" license="BSD-2-Clause" -makedepends="nasm meson" +makedepends=" + meson + nasm + " subpackages="$pkgname-dev lib$pkgname:libs" -source="https://code.videolan.org/videolan/dav1d/-/archive/$pkgver/dav1d-$pkgver.tar.bz2 - fix-rv64.patch" +source="https://code.videolan.org/videolan/dav1d/-/archive/$pkgver/dav1d-$pkgver.tar.bz2" build() { case "$CARCH" in @@ -40,6 +42,5 @@ package() { } sha512sums=" -b2dcdeeb3d6c37788b4c697b497b9282738b758927ffbdbe72b05b1b26a61aa967dfba0ce05828b5bd5bcac93eb3394b0eafbb57e325d037867cf720d64ba099 dav1d-1.4.1.tar.bz2 -1677b906a37d05d7ec692ce484b85ce2fca62f1ca4062d2dbed863748d2e453bc45fbb31a0327e6c920ccfe4b22e7204b0b12e8ee82a9e2c5c670e2c4433f22d fix-rv64.patch +b2b4a3c6961e8f2b7b9a366fecf6b2014d35ec840533d267d6bee869394828843ec11cc4ce63155ebfcc27ce2ca96c79adb9b8cc4cf24a7ef899c34ed33e762d dav1d-1.4.2.tar.bz2 " diff --git a/main/dav1d/fix-rv64.patch b/main/dav1d/fix-rv64.patch deleted file mode 100644 index 034e8ceb4ae..00000000000 --- a/main/dav1d/fix-rv64.patch +++ /dev/null @@ -1,91 +0,0 @@ -Patch-Source: https://code.videolan.org/videolan/dav1d/-/merge_requests/1629 -From 6c51565174f08baf7441e22ea9f84a25c716c5da Mon Sep 17 00:00:00 2001 -From: "Nathan E. Egge" <unlord@xiph.org> -Date: Sat, 16 Mar 2024 10:12:09 -0400 -Subject: [PATCH] riscv: Check for standards compliant RVV 1.0+ - ---- - src/meson.build | 1 + - src/riscv/cpu.S | 38 ++++++++++++++++++++++++++++++++++++++ - src/riscv/cpu.c | 4 +++- - 3 files changed, 42 insertions(+), 1 deletion(-) - create mode 100644 src/riscv/cpu.S - -diff --git a/src/meson.build b/src/meson.build -index dc4be5fd..f3d7bcaf 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -256,6 +256,7 @@ if is_asm_enabled - elif host_machine.cpu_family().startswith('riscv') - libdav1d_sources += files( - 'riscv/cpu.c', -+ 'riscv/cpu.S', - ) - if host_machine.cpu_family() == 'riscv64' - libdav1d_sources += files( -diff --git a/src/riscv/cpu.S b/src/riscv/cpu.S -new file mode 100644 -index 00000000..ca103a9a ---- /dev/null -+++ b/src/riscv/cpu.S -@@ -0,0 +1,38 @@ -+/****************************************************************************** -+ * Copyright © 2018, VideoLAN and dav1d authors -+ * Copyright © 2024, Nathan Egge -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright notice, this -+ * list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ *****************************************************************************/ -+ -+#include "src/riscv/asm.S" -+ -+function has_compliant_rvv, export=1, ext=v -+ vsetvli zero, zero, e8, m1, ta, ma -+ csrr a1, vtype -+ li a0, 0 -+ blt a1, x0, no_rvv10 -+ li a0, 1 -+no_rvv10: -+ ret -+endfunc -diff --git a/src/riscv/cpu.c b/src/riscv/cpu.c -index 16377109..30e13543 100644 ---- a/src/riscv/cpu.c -+++ b/src/riscv/cpu.c -@@ -38,11 +38,13 @@ - - #endif - -+int dav1d_has_compliant_rvv(void); -+ - COLD unsigned dav1d_get_cpu_flags_riscv(void) { - unsigned flags = 0; - #if defined(HAVE_GETAUXVAL) - unsigned long hw_cap = getauxval(AT_HWCAP); -- flags |= (hw_cap & HWCAP_RVV) ? DAV1D_RISCV_CPU_FLAG_V : 0; -+ flags |= (hw_cap & HWCAP_RVV) && dav1d_has_compliant_rvv() ? DAV1D_RISCV_CPU_FLAG_V : 0; - #endif - - return flags; --- -GitLab - diff --git a/main/doas/APKBUILD b/main/doas/APKBUILD index a1b232f486c..96ea3731f2f 100644 --- a/main/doas/APKBUILD +++ b/main/doas/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=doas pkgver=6.8.2 -pkgrel=6 +pkgrel=7 pkgdesc="OpenBSD's temporary privilege escalation tool" url="https://github.com/Duncaen/OpenDoas" arch="all" @@ -13,6 +13,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/Duncaen/OpenDoas/archive/v$p configuration-directory.patch manpage-example-path.patch change-PATH.patch + rowhammer.patch doas.conf " builddir="$srcdir/OpenDoas-$pkgver" @@ -50,5 +51,6 @@ sha512sums=" efad2866d9d3e26266bdb37555453a436aa88ff4b8877b2ba01f7446ea095d998313aa566cafba30d426c79968d3d4a610dfbaa2e33735ab60f1283c9d9fa4ef configuration-directory.patch 60efd196595bda2c4f036cd0080a8825a85fedcc7524c917304b342373863213b3c557b4336f1dab760f167fd8cc2a59b2e744d8a47ff8a8acebbe74b1328f4f manpage-example-path.patch 31a87aced097ea1189c2162172788cd27b82af318db3476e1c143d3c87d99e2aa6350f63b81361d0a54482ba8dd0cfd10928ff6074a4c66248a1ec815a274f68 change-PATH.patch +c18e0e164606466c2e59b94c463f31c8d4ba7f050938114525a70855935655d0c690662de63358ca6854d3411a486d5a85aa247895b640c3b124c957ff325fe9 rowhammer.patch b52a9cfe5cea9068db0f2ff09d2c2520a09603bd5cc5586031fcb2496a11b87c0b5ffc5bac2bfa9a9daafd04d9d3c8b3c93cf413a7b835c36a7a12bd60844598 doas.conf " diff --git a/main/doas/rowhammer.patch b/main/doas/rowhammer.patch new file mode 100644 index 00000000000..761ffb421cb --- /dev/null +++ b/main/doas/rowhammer.patch @@ -0,0 +1,73 @@ +This patch has been taken from OpenBSD upstream, it changes permit bits to make +them more rowhammer-resistent. A similar patch has also been committed to sudo. + +The patch has not made its way into OpenDoas yet, but at the time of writting +OpenDoas upstream is rather stale (last commit was done 2 years ago). + +See: + +* https://github.com/openbsd/src/commit/38599afa1d1d1f14a897b01350e8ce94486e1788 +* https://github.com/sudo-project/sudo/commit/7873f8334c8d31031f8cfa83bd97ac6029309e4f + +diff --git a/doas.c b/doas.c +index ac3a42a..93f0836 100644 +--- a/doas.c ++++ b/doas.c +@@ -148,8 +148,10 @@ permit(uid_t uid, gid_t *groups, int ngroups, const struct rule **lastr, + *lastr = rules[i]; + } + if (!*lastr) ++ return -1; ++ if ((*lastr)->action == PERMIT) + return 0; +- return (*lastr)->action == PERMIT; ++ return -1; + } + + static void +@@ -184,6 +186,7 @@ checkconfig(const char *confpath, int argc, char **argv, + uid_t uid, gid_t *groups, int ngroups, uid_t target) + { + const struct rule *rule; ++ int rv; + + if (setresuid(uid, uid, uid) != 0) + err(1, "setresuid"); +@@ -191,9 +194,9 @@ checkconfig(const char *confpath, int argc, char **argv, + parseconfig(confpath, 0); + if (!argc) + exit(0); +- +- if (permit(uid, groups, ngroups, &rule, target, argv[0], +- (const char **)argv + 1)) { ++ rv = permit(uid, groups, ngroups, &rule, target, argv[0], ++ (const char **)argv + 1); ++ if (rv == 0) { + printf("permit%s\n", (rule->options & NOPASS) ? " nopass" : ""); + exit(0); + } else { +@@ -342,8 +345,9 @@ main(int argc, char **argv) + } + + cmd = argv[0]; +- if (!permit(uid, groups, ngroups, &rule, target, cmd, +- (const char **)argv + 1)) { ++ rv = permit(uid, groups, ngroups, &rule, target, cmd, ++ (const char **)argv + 1); ++ if (rv != 0) { + syslog(LOG_AUTHPRIV | LOG_NOTICE, + "command not permitted for %s: %s", mypw->pw_name, cmdline); + errc(1, EPERM, NULL); +diff --git a/doas.h b/doas.h +index a8aa41b..591816f 100644 +--- a/doas.h ++++ b/doas.h +@@ -36,7 +36,7 @@ struct passwd; + char **prepenv(const struct rule *, const struct passwd *, + const struct passwd *); + +-#define PERMIT 1 ++#define PERMIT -1 + #define DENY 2 + + #define NOPASS 0x1 diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD index 9635cf20e11..2ab970abdb3 100644 --- a/main/doxygen/APKBUILD +++ b/main/doxygen/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=doxygen -pkgver=1.10.0 +pkgver=1.11.0 pkgrel=0 pkgdesc="Documentation system for C++, C, Java, IDL and PHP" url="https://www.doxygen.nl/" @@ -8,6 +8,7 @@ arch="all" license="GPL-2.0-or-later" checkdepends="libxml2-utils" makedepends="flex bison coreutils perl python3 cmake samurai" +subpackages="$pkgname-doc" source="https://doxygen.nl/files/doxygen-$pkgver.src.tar.gz remove-usage-of-fstat64.patch " @@ -33,6 +34,6 @@ package() { } sha512sums=" -885de36fa0b4364cdd1eddd5e02517e08da7a52274c6fda2c22cbe85f0840e2ddf7358f613c018dc39b4a6dfce2ddd627e9318e73b903f954bbad1a39d03a416 doxygen-1.10.0.src.tar.gz +54f4a15e459d1d9cc3b4f021b5264191146bd8e0e780b57c4c31f4f9dcbfc7fe7a9db58e8cda4c6df1b4b354dd432dac0b3089fd547afe7cbe313771b2c6aaa4 doxygen-1.11.0.src.tar.gz 590d3ca57a0c7cc492118f386c0f90ebbc94aa7557a7095f2ac6de67fe405480d7237fa452ea6c5881fff2f4d7482080cba3bea7513ac0e10cdc458ad345fee9 remove-usage-of-fstat64.patch " diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD index ed66660f9ca..d0128e54eae 100644 --- a/main/dropbear/APKBUILD +++ b/main/dropbear/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dropbear -pkgver=2024.84 -pkgrel=2 +pkgver=2024.85 +pkgrel=0 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 " @@ -97,10 +98,11 @@ _ssh() { } sha512sums=" -254daea819c5aeaa65bb43449386fb964f4aa13e3b3037fe11064120205c6e265925e7ef2d84f7ebe66c6a00cf0a22e6010314c065ed49a3815f47137b7aca44 dropbear-2024.84.tar.bz2 +09619e9874172658b7fc284823e0a619b6a4346a5db41487d1628768b46c1f8eac962bfd8ef73e2a59e466fc4022395f7a194b4309195c954b0d7e0d13254f67 dropbear-2024.85.tar.bz2 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/ed/APKBUILD b/main/ed/APKBUILD index 429a9475110..1f2d6fd7b05 100644 --- a/main/ed/APKBUILD +++ b/main/ed/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Breno Leitao <breno.leitao@gmail.com> # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=ed -pkgver=1.20 +pkgver=1.20.2 pkgrel=0 pkgdesc="Line-oriented text editor used to create, display, modify and otherwise manipulate text files" url="https://www.gnu.org/software/ed/" @@ -30,5 +30,5 @@ package() { } sha512sums=" -90c0f24b1d0b7abd18d34345bc37de0e67a0bb96375a4531a742a89b53d4858c30781911c22d81aa0387d0cf4d2153e0b4286fd3483b05e4c35d5e02c0991c53 ed-1.20.tar.lz +5efad386399035329892d8349500544f76e1b18406e164aae35af872c15a0935d412dd4a6996bd15b960d0e899857cc7d8657805f441b1b9f2ae3d73c73dcf4f ed-1.20.2.tar.lz " diff --git a/main/efi-mkkeys/APKBUILD b/main/efi-mkkeys/APKBUILD index a031c0a0329..b4e5462c104 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 !loongarch64" # limited by efitools +arch="noarch !armhf !s390x !ppc64le !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 e50988490f6..69eb62c5972 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 !loongarch64" +arch="all !armhf !s390x !ppc64le !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/freeradius/APKBUILD b/main/freeradius/APKBUILD index 6cdb837f4ad..cdc29719d5d 100644 --- a/main/freeradius/APKBUILD +++ b/main/freeradius/APKBUILD @@ -5,11 +5,12 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=freeradius pkgver=3.0.26 -pkgrel=7 +pkgrel=8 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server" url="https://freeradius.org/" arch="all" license="GPL-2.0-or-later" +depends="$pkgname-lib=$pkgver-r$pkgrel" makedepends=" autoconf automake @@ -80,6 +81,7 @@ source="https://github.com/FreeRADIUS/freeradius-server/releases/download/releas remove-eap-from-default-mods.patch readme-setup-script.patch dont-install-test-tools.patch + fix-rlm_python3.patch " builddir="$srcdir/$pkgname-server-$pkgver" options="!check" @@ -137,8 +139,11 @@ build() { --with-rlm_redis \ --with-rlm_rediswho \ --with-modules="rlm_python3" \ + --without-rlm_cache_memcached \ --without-rlm_eap_tnc \ --without-rlm_eap_ikev2 \ + --without-rlm_python \ + --without-rlm_sql_freetds \ --without-rlm_sql_iodbc \ --without-rlm_sql_oracle \ --without-rlm_yubikey \ @@ -408,4 +413,5 @@ caf85ffb96e08ad8314fe72aac052948b2461f94bb21e20ea34925534ee1ef682284457318d50df8 5fba0394073cd32a0cd80dea0c27e4474cd44c7d52fdf4e1dafb98025ffa3439bbab6112e091ca5e548713d071c026b280b1f205e8e51e57e4fda4bb6336b020 remove-eap-from-default-mods.patch 55e179d5e6b31d289c2da7f907e494a6a6f5900483fdff8d3bb25ee15a583b8705942eca1f0d5390e91376966e66e457dce9b2cf1a1f61c8eac6d8fb825404dd readme-setup-script.patch 908c4408ab6538ddd96577e47d5e509b19e227e144655eaa0fd7569ddadbe5b2298e6599b8370847b3bcb5e788067b163b0cb66e1b3afa4d83dc3f724e058674 dont-install-test-tools.patch +622ae94252e6c8d720ae0a5ee436f3c747438276c67e8c85ab7e214dbca8ee6ebf8e3b2365ad30c70fce27f4921300d850d5bb9e313a9c43fb505c94df7e8bbb fix-rlm_python3.patch " diff --git a/main/freeradius/fix-rlm_python3.patch b/main/freeradius/fix-rlm_python3.patch new file mode 100644 index 00000000000..b0d420a4a22 --- /dev/null +++ b/main/freeradius/fix-rlm_python3.patch @@ -0,0 +1,17 @@ +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Sat, 18 May 2024 16:08:24 +0200 +Subject: [PATCH] Fix rlm_python3 for Python 3.10+ + +https://gitlab.alpinelinux.org/alpine/aports/-/issues/16095 + +--- a/src/modules/rlm_python3/configure ++++ b/src/modules/rlm_python3/configure +@@ -2951,7 +2951,7 @@ + if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 + else +- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` ++ am_cv_python_version=`$PYTHON -c "import sys ; print('.'.join(map(str, sys.version_info[:2])))"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 + $as_echo "$am_cv_python_version" >&6; } diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD index 7f320a2c29a..45e0b7fcd31 100644 --- a/main/freeswitch/APKBUILD +++ b/main/freeswitch/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Cameron Banta <cbanta@gmail.com> # Contributor: Francesco Colista <fcolista@alpinelinux.org> pkgname=freeswitch -pkgver=1.10.10 -pkgrel=1 +pkgver=1.10.11 +pkgrel=0 pkgdesc="A communications platform written in C from the ground up" url="https://www.freeswitch.org/" arch="all" @@ -81,6 +81,8 @@ source="https://files.freeswitch.org/freeswitch-releases/freeswitch-$pkgver.-rel builddir="$srcdir/$pkgname-$pkgver.-release" # secfixes: +# 1.10.11-r0: +# - CVE-2023-51443 # 1.10.7-r0: # - CVE-2021-37624 # - CVE-2021-41105 @@ -235,7 +237,7 @@ conf() { } sha512sums=" -b43079bc818a86bf667d9b328cf904e49c8455827c199c832ee686ff8634273ea186c35d907bed19d0474cbc2e1232d81624ae878a9aaa3b8897fd76e9916e55 freeswitch-1.10.10.-release.tar.xz +44487c195506707f68d257309dca2fa5dce86693ba73b7bf654661c9a4c78c17667f413b9ce8124c188ea220101055c8248f854b2053ec98c84b6d3d11432cca freeswitch-1.10.11.-release.tar.xz 4ceb48f64d2bc26a02cc0846276506241bfd30c156422b0a1d608fd172c099feb5c121a763652e9a45046dcdd0ba0eb71eab240e0c6ce2ad63ff781719e135a4 getlib.patch 98a53f289c3647cafd05b6f847da0504a838a6e06545c133c10fb058c2d941e6bccf2820f44649fc25f94a4a5b7c1280eaee91098e8110f96ed3342c1cb4346c libvpx-fix-arm-float-abi.patch 16e9208fca7f0a1985dd01ec38ddabb6a79da83ad6ab004bb66de528ac45f02fadaddc50a9f228e1aa38fae213fa5af0ca858b7af629b67a7d654339f813a68c disable-Werror.patch diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD index 3f0c19b4bcd..ebf75f718e1 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.15 pkgrel=0 pkgdesc="Tabular Datastream Library" url="https://www.freetds.org/" @@ -42,5 +42,5 @@ package() { } sha512sums=" -cb537490a06c12aa25ce02e1c3b474ad8d6a2be0737719c1b9f83d51245d275abcbd6f4a32dec158cac964ea924458609e253bf9c1497572e386a7436506df8c freetds-1.4.12.tar.bz2 +c56b9e44a82df2579f6da04c08007da2d41e26679e81c7fa84049ab5c977603af7311ae7d8d15bd9f3ad6ffdb18858945f9cbe0f90b86e010d0fcbd087fcb889 freetds-1.4.15.tar.bz2 " diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD index 273e37c2372..7688c6a4aa2 100644 --- a/main/gd/APKBUILD +++ b/main/gd/APKBUILD @@ -27,7 +27,7 @@ builddir="$srcdir/$_pkgreal-$pkgver" case "$CARCH" in # https://github.com/libgd/libgd/issues/359 - aarch64|mips*|ppc64le|riscv64|s390x|x86|loongarch64) options="!check";; + aarch64|ppc64le|riscv64|s390x|x86|loongarch64) options="!check";; esac # secfixes: diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 6b63268002c..4638e1570e6 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -2,6 +2,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> # # secfixes: +# 2.45.1-r0: +# - CVE-2024-32002 +# - CVE-2024-32004 +# - CVE-2024-32020 +# - CVE-2024-32021 +# - CVE-2024-32465 # 2.40.1-r0: # - CVE-2023-25652 # - CVE-2023-25815 @@ -47,7 +53,7 @@ # - CVE-2021-46101 pkgname=git -pkgver=2.45.0 +pkgver=2.45.1 pkgrel=0 pkgdesc="Distributed version control system" url="https://www.git-scm.com/" @@ -380,7 +386,7 @@ _init_template() { } sha512sums=" -36d438bf9a57dee8fe0536c90cb25d53c552e9f80e7575447d1d2af30cadab08522356f4ecd0f69b7877d5a7f84ab3b9766d8386beae57fe8d411d05d70db214 git-2.45.0.tar.xz +28461855e03f3dd5af73a1c6d26cc3e2b7b71f5eb90852f1daf582d24503b4dd5c4e4dac359e9eba1c2ba542aeb0940e0482506f19d02a354654b181c56c5317 git-2.45.1.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/gmp/APKBUILD b/main/gmp/APKBUILD index 62bc2270797..0dbc4b8ac8d 100644 --- a/main/gmp/APKBUILD +++ b/main/gmp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gmp pkgver=6.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="free library for arbitrary precision arithmetic" url="https://gmplib.org/" arch="all" diff --git a/main/gnu-efi/APKBUILD b/main/gnu-efi/APKBUILD index 7f6f6ac2cde..609b6939916 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 !loongarch64" +arch="all !armhf !s390x !ppc64le !loongarch64" license="BSD-2-Clause" subpackages="$pkgname-dev" depends_dev="$pkgname" diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD index dc4c551e158..e32a9885322 100644 --- a/main/gnutls/APKBUILD +++ b/main/gnutls/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnutls -pkgver=3.8.3 +pkgver=3.8.5 pkgrel=0 pkgdesc="TLS protocol implementation" url="https://www.gnutls.org/" @@ -31,6 +31,9 @@ source="https://www.gnupg.org/ftp/gcrypt/gnutls/v$_v/gnutls-$pkgver.tar.xz # Upstream Tracker: https://gnutls.org/security-new.html # secfixes: +# 3.8.5-r0: +# - CVE-2024-28834 GNUTLS-SA-2023-12-04 +# - CVE-2024-28835 GNUTLS-SA-2024-01-23 # 3.8.3-r0: # - CVE-2023-5981 # - CVE-2024-0553 @@ -104,6 +107,6 @@ xx() { } sha512sums=" -74eddba01ce4c2ffdca781c85db3bb52c85f1db3c09813ee2b8ceea0608f92ca3912fd9266f55deb36a8ba4d01802895ca5d5d219e7d9caec45e1a8534e45a84 gnutls-3.8.3.tar.xz +4bac1aa7ec1dce9b3445cc515cc287a5af032d34c207399aa9722e3dc53ed652f8a57cfbc9c5e40ccc4a2631245d89ab676e3ba2be9563f60ba855aaacb8e23c gnutls-3.8.5.tar.xz 0913e95e58c509c5bb3463cce262741486ada05e283f770a0ef9bf88956e1b87224070036d32069a6d0b6cb880253627890aee98edb5f1b07acf26a97bc19cee skip-ktls.patch " diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD index 9820b1a0f35..11b2d6cd1dc 100644 --- a/main/grub/APKBUILD +++ b/main/grub/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=grub pkgver=2.12 -pkgrel=3 +pkgrel=5 pkgdesc="Bootloader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all !s390x" @@ -24,16 +24,16 @@ subpackages=" # currently grub only builds on x86*, aarch64 and ppc* systems case "$CARCH" in - x86) flavors="efi bios";; - x86_64) flavors="efi bios xenhost xenhost_pvh";; - aarch64|arm*) flavors="efi";; - mips*) flavors="qemu_mips";; - riscv*) flavors="efi";; - ppc*) flavors="ieee1275"; makedepends="$makedepends powerpc-utils" ;; - s390x) flavors="emu" ;; - loongarch64) flavors="efi" ;; + x86) _flavors="efi bios";; + x86_64) _flavors="efi bios xenhost xenhost_pvh";; + aarch64|arm*) _flavors="efi";; + mips*) _flavors="qemu_mips";; + riscv*) _flavors="efi";; + ppc*) _flavors="ieee1275"; makedepends="$makedepends powerpc-utils" ;; + s390x) _flavors="emu" ;; + loongarch64) _flavors="efi" ;; esac -for f in $flavors; do +for f in $_flavors; do [ "$f" = "xenhost_pvh" ] && continue # xenhost_pvh shipped in the xenhost subpackage subpackages="$subpackages $pkgname-$f" done @@ -103,7 +103,7 @@ _build_flavor() { build() { local f - for f in $flavors; do + for f in $_flavors; do case "$f" in bios) CFLAGS="${CFLAGS/-fno-plt/}" \ _build_flavor $f --with-platform=pc;; @@ -178,7 +178,7 @@ _install_flavor() { package() { # install BIOS & EFI version into the same directory # and overwrite similar files. - for f in $flavors; do + for f in $_flavors; do _install_flavor $f done @@ -190,7 +190,7 @@ package() { cat >"$pkgdir"/etc/default/grub <<-EOF GRUB_DISTRIBUTOR="Alpine" GRUB_TIMEOUT=2 - GRUB_DISABLE_SUBMENU=y + GRUB_DISABLE_SUBMENU=true GRUB_DISABLE_RECOVERY=true EOF @@ -202,16 +202,14 @@ package() { bios() { pkgdesc="$pkgdesc (BIOS version)" - depends="$pkgname" - mkdir -p $subpkgdir/usr/lib/grub - mv $pkgdir/usr/lib/grub/*-pc $subpkgdir/usr/lib/grub/ + depends="$pkgname=$pkgver-r$pkgrel" + amove 'usr/lib/grub/*-pc' } efi() { pkgdesc="$pkgdesc (EFI version)" - depends="$pkgname" - mkdir -p $subpkgdir/usr/lib/grub - mv $pkgdir/usr/lib/grub/*-efi $subpkgdir/usr/lib/grub/ + depends="$pkgname=$pkgver-r$pkgrel" + amove 'usr/lib/grub/*-efi' 'etc/grub.d/*_bli' 'etc/grub.d/*_uefi-firmware' } xenhost() { @@ -225,37 +223,32 @@ xenhost() { qemu_mips() { pkgdesc="$pkgdesc (QEMU MIPS version)" - depends="$pkgname" - mkdir -p $subpkgdir/usr/lib/grub - mv $pkgdir/usr/lib/grub/*-qemu_mips $subpkgdir/usr/lib/grub/ + depends="$pkgname=$pkgver-r$pkgrel" + amove 'usr/lib/grub/*-qemu_mips' } ieee1275() { pkgdesc="$pkgdesc (IEEE1275 version)" - depends="$pkgname powerpc-utils" - mkdir -p $subpkgdir/usr/lib/grub - mv $pkgdir/usr/lib/grub/*-ieee1275 $subpkgdir/usr/lib/grub/ + depends="$pkgname=$pkgver-r$pkgrel powerpc-utils" + amove 'usr/lib/grub/*-ieee1275' } emu() { pkgdesc="$pkgdesc (EMU version)" - depends="$pkgname" - mkdir -p $subpkgdir/usr/lib/grub - mv $pkgdir/usr/lib/grub/*-emu $subpkgdir/usr/lib/grub/ + depends="$pkgname=$pkgver-r$pkgrel" + amove 'usr/lib/grub/*-emu' } mkfont() { pkgdesc="$pkgdesc (mkfont utility)" - depends="$pkgname" - mkdir -p $subpkgdir/usr/bin - mv $pkgdir/usr/bin/grub-mkfont $subpkgdir/usr/bin/ + depends="$pkgname=$pkgver-r$pkgrel" + amove usr/bin/grub-mkfont } mount() { pkgdesc="$pkgdesc (mount utility)" depends="" - mkdir -p $subpkgdir/usr/bin - mv $pkgdir/usr/bin/grub-mount $subpkgdir/usr/bin/ + amove usr/bin/grub-mount } sha512sums=" diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD index 66d673136a3..51f9bfcf62e 100644 --- a/main/gtk+3.0/APKBUILD +++ b/main/gtk+3.0/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gtk+3.0 -pkgver=3.24.41 +pkgver=3.24.42 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -131,5 +131,5 @@ icon_cache() { } sha512sums=" -aaf061d846fac592e71089feace302bdef1bb64bb2ad6ff30d51d90000da9084cad2fa5bf88cb75adcd789c911d94231ae60a2ca7cf97a2f5720687369a3da98 gtk+-3.24.41.tar.xz +53e86e35d33f82384f1d40bd91feee67be68bc9003abd095842991441b1f2ee11a5b431168963270d3ffc0c653d26673ca97cdd55a8f577ef21dbd5d6004b643 gtk+-3.24.42.tar.xz " diff --git a/main/gummiboot/APKBUILD b/main/gummiboot/APKBUILD index f6a50f56e74..4be0bbfe450 100644 --- a/main/gummiboot/APKBUILD +++ b/main/gummiboot/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gummiboot pkgver=48.1 -pkgrel=7 +pkgrel=8 pkgdesc="Simple EFI Boot Manager" url="https://cgit.freedesktop.org/gummiboot/" arch="x86 x86_64 aarch64" @@ -14,6 +14,8 @@ source="https://dev.alpinelinux.org/archive/gummiboot/gummiboot-$pkgver.tar.gz gummiboot-aarch64-support.patch sysmacros.patch remove-conflicts.patch + fix-non-secureboot-mode.patch + fix-waitforkey.patch " options="!check" @@ -51,4 +53,6 @@ a536db10ee384fa2cd38d22bd43f87215501c38471612a1d30986748d645d970e67b3f3d38fc9d6b 6acc971c59b917616d75f5935859d109efff14c55b8fb26075ee89b6e4141f1c91708c1fc77f0acb2239d9030f4b350eaf1dac59ebb37e7a9ae5682eb52687cf gummiboot-aarch64-support.patch b16d5f68429acfd7ff7942ef6091455035645cb592b9f4b1424daff3245c584bf61c30a7d5eb236530c46226d67ba48f6496f6ae00de6c94a7c5e37f5bdc4831 sysmacros.patch 2f48957253afdb05d1ec401a80383bc582543822fda2c2a30b8a9137481b6911194ac34c7da323414dd00234cd51b8f7803788360e747d325e192b71f9171f72 remove-conflicts.patch +cf411c3ecf5f6d975533a85c3fa0f0cf5ee1bb4e899680179d7a3103ccf618c68b0746faac0a83497f1e150f691a26399fc73e5e644b03954e4bcc02c07702b1 fix-non-secureboot-mode.patch +d07c3e0ea4eaed0396e13d5327ac282681d1667333d29fa420ffd81f81c341ef85c1d8ce621873d63310a7d3f9d691c8f70a3e52b0227aeaaadd7943e4ff3b9c fix-waitforkey.patch " diff --git a/main/gummiboot/fix-non-secureboot-mode.patch b/main/gummiboot/fix-non-secureboot-mode.patch new file mode 100644 index 00000000000..62c7df65652 --- /dev/null +++ b/main/gummiboot/fix-non-secureboot-mode.patch @@ -0,0 +1,14 @@ +Patch-Source: https://github.com/void-linux/void-packages/blob/master/srcpkgs/gummiboot/patches/stub.patch +-- +--- a/src/efi/stub.c 2015-03-12 00:50:35.000000000 +0100 ++++ b/src/efi/stub.c 2020-07-06 12:32:55.985327487 +0200 +@@ -83,7 +83,7 @@ + cmdline_len = szs[0]; + + /* if we are not in secure boot mode, accept a custom command line and replace the built-in one */ +- if (!secure && loaded_image->LoadOptionsSize > 0) { ++ if ((!secure || cmdline_len == 0) && loaded_image->LoadOptionsSize > 0 && *(CHAR16 *)loaded_image->LoadOptions > 0x1F) { + CHAR16 *options; + CHAR8 *line; + UINTN i; + diff --git a/main/gummiboot/fix-waitforkey.patch b/main/gummiboot/fix-waitforkey.patch new file mode 100644 index 00000000000..14f28a502da --- /dev/null +++ b/main/gummiboot/fix-waitforkey.patch @@ -0,0 +1,24 @@ +Patch-Source: https://github.com/void-linux/void-packages/blob/master/srcpkgs/gummiboot/patches/fix-waitforkey.patch +-- +This patch fixes an issue where pressing any key within the gummiboot +menu causes it to hang (though no issue occurs if no key is pressed). The +culprit appears to be the WaitForKeyEx function, which lacks support in certain +UEFI implementations. This fix is backported from the same issue found in +systemd-boot (gummiboot's mainstream counterpart): see +<https://github.com/systemd/systemd/issues/3632> and +<https://github.com/systemd/systemd/pull/3735>. + +--- a/src/efi/console.c 2015-03-11 16:50:35.000000000 -0700 ++++ b/src/efi/console.c 2020-12-09 15:41:19.837704801 -0800 +@@ -96,10 +96,7 @@ + + /* wait until key is pressed */ + if (wait) { +- if (TextInputEx) +- uefi_call_wrapper(BS->WaitForEvent, 3, 1, &TextInputEx->WaitForKeyEx, &index); +- else +- uefi_call_wrapper(BS->WaitForEvent, 3, 1, &ST->ConIn->WaitForKey, &index); ++ uefi_call_wrapper(BS->WaitForEvent, 3, 1, &ST->ConIn->WaitForKey, &index); + } + + if (TextInputEx) { diff --git a/main/harfbuzz/APKBUILD b/main/harfbuzz/APKBUILD index d373fc9c021..76abeab3e3b 100644 --- a/main/harfbuzz/APKBUILD +++ b/main/harfbuzz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpinelinux@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=harfbuzz -pkgver=8.4.0 +pkgver=8.5.0 pkgrel=0 pkgdesc="Text shaping library" url="https://harfbuzz.github.io/" @@ -95,5 +95,5 @@ dev() { } sha512sums=" -9d79ea86f7642f2f1a8726e12a48363eb395162c9b50524e7651b63ad3bb458a69fc82427dbcbfe2550231138f7e454b2c12097a51890f63c645fa3dc668f542 harfbuzz-8.4.0.tar.xz +d5762f77b0913792d34596e6f3adb98ab693e2ef928396f997ca2e647ca7cad13fdd204fa15b49e2f7c33320ff210d7f078215d5765c9365571458b919a4f10c harfbuzz-8.5.0.tar.xz " diff --git a/main/hwdata/APKBUILD b/main/hwdata/APKBUILD index 4e56c2eb9ea..f808113488e 100644 --- a/main/hwdata/APKBUILD +++ b/main/hwdata/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Simon Zeni <simon@bl4ckb0ne.ca> pkgname=hwdata -pkgver=0.381 +pkgver=0.382 pkgrel=0 pkgdesc="Hardware identification and configuration data" url="https://github.com/vcrhonek/hwdata" @@ -30,7 +30,7 @@ package() { $pkgname-pnp=$pkgver-r$pkgrel $pkgname-net=$pkgver-r$pkgrel " - make -j1 DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } dev() { @@ -70,5 +70,5 @@ pnp() { } sha512sums=" -683fa1df2f04b768b95ac77ab785c5fee8ed1ce352d8367fca2346330aa0a563bb66765df4413ce012a1ab224cb2af9b90d44e4d57d38affd7c7d88383dd97bc hwdata-0.381.tar.gz +0ab3ef561c1f71188a513bcec97e5790483b612844bbb2b40b99cb04a81f10285d2bcf03714ef1c66b8984580193739b7c26593c8c69e880f1d23c8e6ea80da3 hwdata-0.382.tar.gz " diff --git a/main/iniparser/APKBUILD b/main/iniparser/APKBUILD index 374216e2afe..387bfcd96e1 100644 --- a/main/iniparser/APKBUILD +++ b/main/iniparser/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iniparser -pkgver=4.2 +pkgver=4.2.1 pkgrel=0 pkgdesc="C library for parsing INI-style files" url="https://github.com/ndevilla/iniparser" @@ -33,6 +33,6 @@ package() { } sha512sums=" -532479daad99a5966d559ff62164da40240df4401c7b6ae9a0adc4d3224c6434521d9be76aac06e671f4da48fe37b030fe0233fed5d1e86af2a8959055fcad79 iniparser-4.2.tar.gz +5cc95e5f1541de9530d71704fba1a74fc5f764f9a92c991309c7f4659dd68a4f25bde3351356d5c8f2c664d2b91cfdafa81ebaef93a82205e099b0d1c745077d iniparser-4.2.1.tar.gz db7bdab6f8faafd47c8b50104e1a461fbd9324b75482b1455a8fc059c07278e7e60f088a3f712b0ade05a9bb989168d17684455b9863018f22a61e0190a888c6 rpath.patch " diff --git a/main/intel-ucode/APKBUILD b/main/intel-ucode/APKBUILD index c2528ff91ee..7d5df9e29c9 100644 --- a/main/intel-ucode/APKBUILD +++ b/main/intel-ucode/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de> pkgname=intel-ucode -pkgver=20240312 +pkgver=20240514 pkgrel=0 pkgdesc="Microcode update files for Intel CPUs" arch="x86 x86_64" @@ -13,7 +13,11 @@ builddir="$srcdir/Intel-Linux-Processor-Microcode-Data-Files-microcode-$pkgver" # (Taken from https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/blob/main/releasenote.md) # secfixes: -# 20240312-40: +# 20240514-r0: +# - CVE-2023-45733 +# - CVE-2023-46103 +# - CVE-2023-45745 +# 20240312-r0: # - CVE-2023-39368 # - CVE-2023-38575 # - CVE-2023-28746 @@ -79,5 +83,5 @@ package() { } sha512sums=" -f5f3dfb1706675060b00057b5f017c2cb4ac0df74727139185fd167ca67fc6c611e205b1caeded23b006e4d8d314f87537007e7bafba2c87373f6d960988c911 microcode-20240312.tar.gz +1c0f1707bf7db70d04e94a0728c0f61a1f9c25fead8c2c3716cafd20c976973cf636e411d12f81b34bf0076d7c7601c11b1bcd92a2e1be35d98003bb61ace569 microcode-20240514.tar.gz " diff --git a/main/iperf3/APKBUILD b/main/iperf3/APKBUILD index 15b7c4a879f..15c717450ea 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.1 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 +54789c5a63081aa803575ce1df3cb251a3b0bb16313f049f2479ae3a5af39944ace1222d4a086bed0ab34821da73371b2499f8b8283791a953d861da4cfc56f0 iperf3-3.17.1.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/itstool/10-python_3.12.patch b/main/itstool/10-python_3.12.patch new file mode 100644 index 00000000000..2ac4a076235 --- /dev/null +++ b/main/itstool/10-python_3.12.patch @@ -0,0 +1,75 @@ +Patch-Source: https://github.com/itstool/itstool/pull/51/commits/32c7d07664dc37765100285d1202d488cd6a27e8 +-- +From 32c7d07664dc37765100285d1202d488cd6a27e8 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <nils@tiptoe.de> +Date: Mon, 9 Oct 2023 14:26:43 +0200 +Subject: [PATCH] Fix insufficiently quoted regular expressions + +These went under the radar until Python 3.12 started warning about them. + +Signed-off-by: Nils Philippsen <nils@tiptoe.de> +--- + itstool.in | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/itstool.in b/itstool.in +index c21ad4b..4452616 100755 +--- a/itstool.in ++++ b/itstool.in +@@ -220,7 +220,7 @@ class Message (object): + if not isinstance(text, ustr_type): + text = ustr(text, 'utf-8') + self._message[-1] += text.replace('&', '&').replace('<', '<').replace('>', '>') +- if re.sub('\s+', ' ', text).strip() != '': ++ if re.sub(r'\s+', ' ', text).strip() != '': + self._empty = False + + def add_entity_ref (self, name): +@@ -318,7 +318,7 @@ class Message (object): + message += '<_:%s-%i/>' % (msg.name, placeholder) + placeholder += 1 + if not self._preserve: +- message = re.sub('\s+', ' ', message).strip() ++ message = re.sub(r'\s+', ' ', message).strip() + return message + + def get_preserve_space (self): +@@ -456,9 +456,9 @@ class LocNote (object): + if self._preserve_space: + return self.locnote + else: +- return re.sub('\s+', ' ', self.locnote).strip() ++ return re.sub(r'\s+', ' ', self.locnote).strip() + elif self.locnoteref is not None: +- return '(itstool) link: ' + re.sub('\s+', ' ', self.locnoteref).strip() ++ return '(itstool) link: ' + re.sub(r'\s+', ' ', self.locnoteref).strip() + return '' + + +@@ -889,7 +889,7 @@ class Document (object): + trans = translations.ugettext('_\x04translator-credits') + if trans is None or trans == 'translator-credits': + return +- regex = re.compile('(.*) \<(.*)\>, (.*)') ++ regex = re.compile(r'(.*) \<(.*)\>, (.*)') + for credit in trans.split('\n'): + match = regex.match(credit) + if not match: +@@ -924,7 +924,7 @@ class Document (object): + prevnode = None + if node.prev is not None and node.prev.type == 'text': + prevtext = node.prev.content +- if re.sub('\s+', '', prevtext) == '': ++ if re.sub(r'\s+', '', prevtext) == '': + prevnode = node.prev + for lang in sorted(list(translations.keys()), reverse=True): + locale = self.get_its_locale_filter(node) +@@ -1468,7 +1468,7 @@ def match_locale(extrange, locale): + localei += 1 + return True + +-_locale_pattern = re.compile('([a-zA-Z0-9-]+)(_[A-Za-z0-9]+)?(@[A-Za-z0-9]+)?(\.[A-Za-z0-9]+)?') ++_locale_pattern = re.compile(r'([a-zA-Z0-9-]+)(_[A-Za-z0-9]+)?(@[A-Za-z0-9]+)?(\.[A-Za-z0-9]+)?') + def convert_locale (locale): + # Automatically convert POSIX-style locales to BCP47 + match = _locale_pattern.match(locale) diff --git a/main/itstool/APKBUILD b/main/itstool/APKBUILD index f029a61c176..87946b2e3ab 100644 --- a/main/itstool/APKBUILD +++ b/main/itstool/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=itstool pkgver=2.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="ITS-based XML translation tool" url="https://itstool.org/" arch="noarch" @@ -12,6 +12,7 @@ checkdepends="diffutils gettext" subpackages="$pkgname-doc" source="https://github.com/itstool/itstool/archive/$pkgver/itstool-$pkgver.tar.gz fix-segfault.patch + 10-python_3.12.patch " options="net" # Tests require network access @@ -43,4 +44,5 @@ package() { sha512sums=" 03f16486336add31d24e74554fcb22f5ec00e0db63f890fb94d4a4561048b7aecaadd86d9ab7489a1b5f7adf180ce1b27131db928488e4e6ffe9444eee38a2e9 itstool-2.0.7.tar.gz a47ab86ee0ea7b8fa8329649cda28db91e106ffdc695836e55f274b406759e3945835dbaf32230a30f2afaf482aff0ef205a12d722a19a6ab874c8f33413df9a fix-segfault.patch +f0dfc13b370083a3e9bc8feaa9e5ff732b41273d936841d6ced2d8acbeb4775d33f7dc6f47a1a94936091c1366a4b686d94bd8d4f12845f332a35514b1ed4c8c 10-python_3.12.patch " diff --git a/main/iw/APKBUILD b/main/iw/APKBUILD index 688a4d8ca9d..b91d93ceafa 100644 --- a/main/iw/APKBUILD +++ b/main/iw/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iw -pkgver=6.7 +pkgver=6.9 pkgrel=0 pkgdesc="nl80211 based CLI configuration utility for wireless devices" url="https://wireless.kernel.org/en/users/Documentation/iw" @@ -20,5 +20,5 @@ package() { } sha512sums=" -7370d3b55ce43691ba84913be334c04dcdf9aa44e9556e4214d8016ddf9733b2c555ebdfbdfc814d2eba7da68501503d267ad6353b14f87b81f064f629afbef5 iw-6.7.tar.xz +cbafa54cffa6098a727edd8fb90382ab9f08d2db999811e543bcdaf8de41386c87a34504cf8965340839445929879a608faf51314b7335783beab403cf3f9cbc iw-6.9.tar.xz " diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD index c619bb68eec..5b7f0b83a04 100644 --- a/main/kbd/APKBUILD +++ b/main/kbd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=kbd pkgver=2.6.4 -pkgrel=0 +pkgrel=1 pkgdesc="Tools for configuring the console (keyboard, virtual terminals, etc.)" url="https://kbd-project.org/" arch="all" @@ -21,6 +21,8 @@ makedepends=" subpackages="$pkgname-bkeymaps::noarch $pkgname-legacy::noarch $pkgname-misc::noarch $pkgname-doc $pkgname-openrc $pkgname-vlock" source="https://www.kernel.org/pub/linux/utils/kbd/kbd-$pkgver.tar.gz + fix-double-kbdfile-open.patch + loadkeys.initd loadkeys.confd " @@ -174,6 +176,7 @@ misc() { sha512sums=" 2bde7a271392f0ac81966af46c4b3568c9e777550fd0b0d1627db158f0b24b8a67f3c0cca84de9b33d43ac8cbb730c1610212c3da071add3559abe6c4397272f kbd-2.6.4.tar.gz +bbf48394551b0219a8115a52b9abfa13c2c555841b0f4b7271f9c999160e0c5bd7f79fbd6a2bdae82bf8a2c47980a00dc3b7a551bfa69f34764d8335167574ee fix-double-kbdfile-open.patch 64b5ab4c362350521da8f507d22c0b77784da99bbe1b32f0c001cd826f63c607e3f9cd6af01f06a61af8bd709760bbf2bb3cfe2010c33925f2987a1af6ef4998 loadkeys.initd 12028796552a5ffed1d5cb19d37fc6a73fb4f2e2bf34d837a81171c7ebee98d6c3f557715bf79706d79ce053b9b2450cd8cf1c4ea045428fb7d8a5915ae3ed78 loadkeys.confd " diff --git a/main/kbd/fix-double-kbdfile-open.patch b/main/kbd/fix-double-kbdfile-open.patch new file mode 100644 index 00000000000..90fc3101bf0 --- /dev/null +++ b/main/kbd/fix-double-kbdfile-open.patch @@ -0,0 +1,17 @@ +Subject: libkeymap: fix double kbdfile open + +976867c3a84 (Rewrite libkbdfile library) changed kbdfile_find to error +when the file descriptor was already opened. Make sure kbdfile_find +isn't called again when kbdfile is found in include_dirpath1. + +--- a/src/libkeymap/analyze.l ++++ b/src/libkeymap/analyze.l +@@ -177,7 +177,7 @@ find_standard_incl_file(struct lk_ctx *ctx, char *s, struct kbdfile *fp) + i--; + pathname = kbdfile_get_pathname(ctx->stack[i]); + +- if (kbdfile_find(s, include_dirpath1, include_suffixes, fp)) { ++ if (rc = kbdfile_find(s, include_dirpath1, include_suffixes, fp)) { + if ((rc = find_incl_file_near_fn(ctx, s, pathname, fp)) == -1) + return rc; + } diff --git a/main/libbpf/APKBUILD b/main/libbpf/APKBUILD index 7a30fc30eeb..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.1 +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=" -3073806d9fc2aafb6620f41bf7d73f17ebe92cff577821a309d0fb2192a88b8bb5a984d11590fe1050035dc4dc154d50372f78c2e87a1000ddb795e30120ddf5 libbpf-1.4.1.tar.gz +b0faf45e77fc0197239b87d74010bad6b7ef7d48c1b3de2a3960164d9029851e2ad204b92d0cccb2fde2d0dfe44d9fa7f24b35a4917179dbab1bee192d3780db libbpf-1.4.2.tar.gz a374386f8b361b60c70d566aebb11b87a23bc43d8cfa02cce9997961139f89caf691d826020c4b08159e815c14d87cc907f2cc6e784329d0288d18d2b609fefd 10-consolidate-lib-dirs.patch " diff --git a/main/libcap/APKBUILD b/main/libcap/APKBUILD index 14a4143e2db..445bfeef2ad 100644 --- a/main/libcap/APKBUILD +++ b/main/libcap/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libcap -pkgver=2.69 -pkgrel=1 +pkgver=2.70 +pkgrel=0 pkgdesc="POSIX 1003.1e capabilities" arch="all" license="BSD-3-Clause OR GPL-2.0-only" @@ -64,5 +64,5 @@ libcap2() { } sha512sums=" -647c307dc451517da9d089495ab959b4a6fbbe41c79f4e1e9bb663569dad630ead0c2e413dfb393319e3ea14dc9848c81b392107fe3382ce1813d278c3394a7f libcap-2.69.tar.xz +4e0bf0efeccb654c409afe9727b2b53c1d4da8190d7a0a9848fc52550ff3e13502add3eacde04a68a5b7bec09e91df487f64c5746ba987f873236a9e53b3d4e8 libcap-2.70.tar.xz " diff --git a/main/libedit/APKBUILD b/main/libedit/APKBUILD index 1c48d7d0231..97cdf8e73ff 100644 --- a/main/libedit/APKBUILD +++ b/main/libedit/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libedit -pkgver=20230828.3.1 +pkgver=20240517.3.1 _ver=${pkgver/./-} -pkgrel=4 +pkgrel=0 pkgdesc="BSD line editing library" url="https://www.thrysoee.dk/editline" arch="all" @@ -46,5 +46,5 @@ package() { } sha512sums=" -c7232376ef1bc128ed79f950a5f1f207f874011218682d7e6186f76443927df5483b46c4daa8cf02e327079259aee1a56e2b791aa682491eb802d90ff8940cca libedit-20230828-3.1.tar.gz +bc17371eeb8842b93cd5ed7ce3a04aa1cadf26aa697d92e3440f9f729a4d0631eef60ea2c96844ff773e1b3b80ae518fd3ae684126373dfc69b65d67a0f25e90 libedit-20240517-3.1.tar.gz " 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/libnvme/APKBUILD b/main/libnvme/APKBUILD index 34f0db57d1d..36a36dd2ae0 100644 --- a/main/libnvme/APKBUILD +++ b/main/libnvme/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libnvme -pkgver=1.8 -pkgrel=1 +pkgver=1.9 +pkgrel=0 pkgdesc="C Library for NVM Express on Linux" url="https://github.com/linux-nvme/libnvme/" arch="all" @@ -25,7 +25,6 @@ checkdepends="diffutils" subpackages="${pkgname}mi:mi $pkgname-dev py3-nvme:_py3" source="https://github.com/linux-nvme/libnvme/archive/v$pkgver/libnvme-v$pkgver.tar.gz doc-test.patch - sysfs-test-getc-eof.patch " build() { @@ -54,7 +53,6 @@ mi() { } sha512sums=" -ba0cec72fd6c9bb29b29c4342be7b25aec1f31157a094ad387a1105cbd1961ab600e1448a2462d8be2af91d5251b2970d6d06d4871ce96604c5be204d6096bcb libnvme-v1.8.tar.gz +39a3346805143f93a17d00cfcb6fb75f82154658db6079134c09dfa989995ac5de79b1ce1ac091b4e997523d3216829ce9eac44110c9f59f9fd21636529c8b25 libnvme-v1.9.tar.gz 6ca036287d964db018a2ddfb5480b0b46e6f2edd9f0a7c39dbf5977ce58d8da4d619705e16a3f269bfa7c619d6da5aeff20d9b558c697f6d68e5d89a73ef586e doc-test.patch -5c417a296fb9fcf4ef3f617017d1bc2bfc450eb7cea808c5560728a25f3bf584a8b8973c299acff8e303100cbc93d2ac01746873bd931112b1a9305e74194b9f sysfs-test-getc-eof.patch " diff --git a/main/libnvme/sysfs-test-getc-eof.patch b/main/libnvme/sysfs-test-getc-eof.patch deleted file mode 100644 index bf8fae206ce..00000000000 --- a/main/libnvme/sysfs-test-getc-eof.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/test/sysfs/sysfs.c -+++ b/test/sysfs/sysfs.c -@@ -44,7 +44,7 @@ - static bool compare_content(const char *filename1, const char *filename2) - { - FILE *f1, *f2; -- char c1, c2; -+ int c1, c2; - bool pass = false; - - f1 = fopen(filename1, "r"); diff --git a/main/libseccomp/APKBUILD b/main/libseccomp/APKBUILD index 43b39a4549a..5a17b9e8bbe 100644 --- a/main/libseccomp/APKBUILD +++ b/main/libseccomp/APKBUILD @@ -16,10 +16,6 @@ source="https://github.com/seccomp/libseccomp/releases/download/v$pkgver/libsecc remove-redefinition-prctl.patch " -case "$CARCH" in - mips*) options="$options !check";; -esac - # secfixes: # 2.4.0-r0: # - CVE-2019-9893 diff --git a/main/libsndfile/APKBUILD b/main/libsndfile/APKBUILD index a3d4cd3a621..a6137756d23 100644 --- a/main/libsndfile/APKBUILD +++ b/main/libsndfile/APKBUILD @@ -29,7 +29,6 @@ source="https://github.com/libsndfile/libsndfile/releases/download/$pkgver/libsn case $CARCH in arm*) options="!check" ;; # sporadic testsuite failures s390x*) options="!check" ;; # broken opus support -mips*) options="!check" ;; # takes way too long esac # secfixes: diff --git a/main/libsodium/APKBUILD b/main/libsodium/APKBUILD index b566bec53bd..fa90aaa6fc9 100644 --- a/main/libsodium/APKBUILD +++ b/main/libsodium/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Stuart Cardall <developer@it-offshore.co.uk> # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=libsodium -pkgver=1.0.19 +pkgver=1.0.20 pkgrel=0 pkgdesc="P(ortable|ackageable) NaCl-based crypto library" url="https://github.com/jedisct1/libsodium" @@ -10,7 +10,6 @@ arch="all" license="ISC" subpackages="$pkgname-static $pkgname-dev" source="https://github.com/jedisct1/libsodium/releases/download/$pkgver-RELEASE/libsodium-$pkgver.tar.gz" -builddir="$srcdir/$pkgname-stable" build() { ./configure \ @@ -29,5 +28,5 @@ package() { } sha512sums=" -8e9b6d796f6330e00921ce37f1b43545966094250938626ae227deef5fd1279f2fc18b5cd55e23484732a27df4d919cf0d2f07b9c2f1aa0c0ef689e668b0d439 libsodium-1.0.19.tar.gz +7ea165f3c1b1609790e30a16348b9dfdc5731302da00c07c65e125c8ab115c75419a5631876973600f8a4b560ca2c8267001770b68f2eb3eebc9ba095d312702 libsodium-1.0.20.tar.gz " diff --git a/main/libxml2/APKBUILD b/main/libxml2/APKBUILD index 6ff9ac0e451..ebb096ad153 100644 --- a/main/libxml2/APKBUILD +++ b/main/libxml2/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> pkgname=libxml2 -pkgver=2.12.6 -pkgrel=2 +pkgver=2.12.7 +pkgrel=0 pkgdesc="XML parsing library, version 2" url="https://gitlab.gnome.org/GNOME/libxml2" arch="all" @@ -21,6 +21,8 @@ fi source="https://download.gnome.org/sources/libxml2/${pkgver%.*}/libxml2-$pkgver.tar.xz" # secfixes: +# 2.12.7-r0: +# - CVE-2024-34459 # 2.12.5-r0: # - CVE-2024-25062 # 2.10.4-r0: @@ -104,5 +106,5 @@ utils() { } sha512sums=" -19d6901c0f189813e8bd20ffdfbb29d8545ca30154d1f3cc82624d64e4db3cfbe8eef7e8ccc1e195289f1bf94bb50fefcf11a95badb0ddeb845b4e4ea5a819ac libxml2-2.12.6.tar.xz +88b5f3e0a7c6704926e662a46ba0606d901efbcd70a36bd39fe034e29ee42d66d7296358761e04272c9696192a1380bda55852b2a0b14a05a7a083a08e125f5f libxml2-2.12.7.tar.xz " diff --git a/main/linux-firmware/APKBUILD b/main/linux-firmware/APKBUILD index 73cc04423ef..e383ab8fadd 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=20240410 +pkgver=20240513 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=" -559cedb0e7f549ef4fd130a790f3c92e41fb5889120bb8c9ec1e4068a2dc658d851c5d217036b019dbbd6e984c73527c952c27ad18020138111bbbb6718c2a3b linux-firmware-20240410.tar.gz +6c857897f466fafe5750a22f72d10958505f682eeba1e525bf102aaa067fa27f543e692e1ba52591ed9024688743a2936505e3ce66e1dd947b6de80111d8ee25 linux-firmware-20240513.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 5c3f5d57b73..72ad39dd8bc 100644 --- a/main/linux-lts/APKBUILD +++ b/main/linux-lts/APKBUILD @@ -2,7 +2,7 @@ _flavor=lts pkgname=linux-$_flavor -pkgver=6.6.30 +pkgver=6.6.32 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -90,7 +90,6 @@ _kernelarch() { case "$arch" in aarch64*) arch="arm64" ;; arm*) arch="arm" ;; - mips*) arch="mips" ;; ppc*) arch="powerpc" ;; s390*) arch="s390" ;; riscv*) arch="riscv" ;; @@ -359,17 +358,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 -ae8f01abee26ab4b184f7686fccec6a2559facd1c3fabc1be47c5a4310ca48747b81a055973f98ac2e0129ca48169ae078b6b777490b6257fb9cf87cded96923 lts.aarch64.config +498cf253cd031ad7ca6855c3c77e46524c998e885b08231a7346bf46e908e9fc4ab208cdac39769cd4c259426e29cdb7d6a4bcd09c775f9932927ccdbe4a95f9 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 +c87984d5c00365382d72a40fb488fa8264fedd435a88777ef3827316679b65b00aeaa521c3c6e8aa3047e4a1956e7587eeeded0369af109c7feb0b3fc68b0624 lts.x86.config +b53c94e8a141421609c478cbd1c2031316b5d78443470c113121912d194466aaa65a3bacc61844e04331dc51090d179baf9cdcdbcba3f78d9034b0170dbfba3b lts.x86_64.config +971915e02cdbd5500ff01b5b70f6d2a6712496bd4b5d307f2c4c90b5c8a2cb4e32d176ea52c6b2da0e1a8707462de420da4d25c5be044595f6d4050dcffd95c8 lts.ppc64le.config +60327486c2668ee24041f86a22d3856dcac3c9e358f4e16a16f6d302d79095ca5a08c4011141050eafe06ba2d1c3eccd142b79ffa469338e213ae2156e29aa44 lts.s390x.config +4697069b98b81243a18d97ed668a00c08504b55255e4d4392a0f1e63403b6d72036d440b4e54c63c8932ca243164729486e1cea229bd8baf5201fb969f838450 lts.loongarch64.config +b30d0392b396165310ff1fdefd2fbd5103c44914b73e2ec330e1a24db6d872b8382ee3eff6b8a3cda20674d4ddb9801462c4ebcef8059ed943ee1ac9b7500edc virt.aarch64.config 7e4cd192b30aed8e9d1f01c99a1350f09e7498ad31e332c0ff2d0b0291d70a787b80aee2105e6d3208f05066faee02a12cbd2fb82fc8e43dc9eec2baa84d35ff virt.armv7.config -2c660dd87ad7cf7e730b3748e9cb0e33c50cdaf7a37779b2b2787160c633686761ee02f28a4c35ee4a4db8cac8d0516af7e06a2a85ebb891724d8f401fff592a virt.ppc64le.config +c68a89b73356e21f8d5c1ad6b66701a94a27ad1e7d03ca545792695d7f6420b957a9e4525d43c570a81947f45fb12222515309c1c8a245d84be5dd39f3eec924 virt.ppc64le.config ba056237fe5b1d18b0dbc242f609896e437d37dd9a6131f5257e2d9a706cac497f01fecf11e81b7a4319aa60cbf388f8a5c036c24cd65a6075aa1dd1f3aa1ffe virt.x86.config -91b7c53c346c806affc30502ecf7088804afa706f8c123a469718bf7c74b250e10696b46413e173187c2a40cdcdd7a3d435f4af35ee45e7257794e70289861cd virt.x86_64.config -f96b8db3029f0ae7207c9f4b60f96eb8d5f808b607bd3ecea940f63ea7de9d0be6e60524ddcedf5996ef89c7e202781b941fb88c76784d63a27a91eed3070cee patch-6.6.30.xz +7030cc24ae43427bac6f73f1c2a1cd79dfc05aed0d912ef41247c188b8442d4b6a9fd0f654be8de409ffd9cac9710f06c1433d85bb908c2fde084040e48b426d virt.x86_64.config +9ca83bb2a4c3412a9cbaa387d58de277002851d00141f7f12379a4949d2ac11e0e857987acdecf30afbc151de6eeabbb74852b44cd9184a79b4cf9d08f3d2d73 patch-6.6.32.xz " diff --git a/main/linux-lts/lts.aarch64.config b/main/linux-lts/lts.aarch64.config index 5881c7d57ce..16c8f60282d 100644 --- a/main/linux-lts/lts.aarch64.config +++ b/main/linux-lts/lts.aarch64.config @@ -1574,6 +1574,7 @@ CONFIG_GPIO_JANZ_TTL=m CONFIG_GPIO_BT8XX=m CONFIG_GPIO_RDC321X=m CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_VIRTIO=m CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO_RESTART=y CONFIG_POWER_RESET_RESTART=y @@ -2519,6 +2520,7 @@ CONFIG_VFIO_AMBA=m CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_VDPA=m +CONFIG_VIRTIO_PMEM=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=m diff --git a/main/linux-lts/lts.loongarch64.config b/main/linux-lts/lts.loongarch64.config index a6c2dbda769..50e6e2c77e2 100644 --- a/main/linux-lts/lts.loongarch64.config +++ b/main/linux-lts/lts.loongarch64.config @@ -601,6 +601,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_LOONGSON2=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_LOONGSON_64BIT=y +CONFIG_GPIO_VIRTIO=m CONFIG_POWER_RESET=y CONFIG_POWER_RESET_RESTART=y CONFIG_POWER_RESET_SYSCON=y diff --git a/main/linux-lts/lts.ppc64le.config b/main/linux-lts/lts.ppc64le.config index bbd8144ac2c..f2f55b197d2 100644 --- a/main/linux-lts/lts.ppc64le.config +++ b/main/linux-lts/lts.ppc64le.config @@ -677,7 +677,10 @@ CONFIG_VFIO=m CONFIG_VFIO_PCI=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_VDPA=m +CONFIG_VIRTIO_PMEM=m CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=m CONFIG_VDPA=m CONFIG_VDPA_USER=m CONFIG_IFCVF=m diff --git a/main/linux-lts/lts.s390x.config b/main/linux-lts/lts.s390x.config index 68e818b827f..85acfc4bd96 100644 --- a/main/linux-lts/lts.s390x.config +++ b/main/linux-lts/lts.s390x.config @@ -734,6 +734,7 @@ CONFIG_SCLP_OFB=y CONFIG_PTP_1588_CLOCK=m CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_VIRTIO=m # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y @@ -765,8 +766,10 @@ CONFIG_UIO_NETX=m CONFIG_UIO_MF624=m CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PMEM=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=m CONFIG_VHOST_NET=m CONFIG_VHOST_SCSI=m CONFIG_RPMSG_VIRTIO=m diff --git a/main/linux-lts/lts.x86.config b/main/linux-lts/lts.x86.config index 292a2147383..0d6fcf6f10b 100644 --- a/main/linux-lts/lts.x86.config +++ b/main/linux-lts/lts.x86.config @@ -1573,6 +1573,7 @@ CONFIG_GPIO_AMD8111=m CONFIG_GPIO_ML_IOH=m CONFIG_GPIO_RDC321X=m CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_VIRTIO=m CONFIG_GENERIC_ADC_BATTERY=m CONFIG_AXP288_CHARGER=m CONFIG_AXP288_FUEL_GAUGE=m diff --git a/main/linux-lts/lts.x86_64.config b/main/linux-lts/lts.x86_64.config index efc1e3c1049..96b6f147b0b 100644 --- a/main/linux-lts/lts.x86_64.config +++ b/main/linux-lts/lts.x86_64.config @@ -1667,6 +1667,7 @@ CONFIG_GPIO_BT8XX=m CONFIG_GPIO_ML_IOH=m CONFIG_GPIO_RDC321X=m CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_VIRTIO=m CONFIG_GENERIC_ADC_BATTERY=m CONFIG_AXP288_CHARGER=m CONFIG_AXP288_FUEL_GAUGE=m @@ -2769,6 +2770,7 @@ CONFIG_NITRO_ENCLAVES=m CONFIG_EFI_SECRET=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_VDPA=m +CONFIG_VIRTIO_PMEM=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_MEM=m CONFIG_VIRTIO_INPUT=m diff --git a/main/linux-lts/virt.aarch64.config b/main/linux-lts/virt.aarch64.config index a8c24477b07..c6f129170bc 100644 --- a/main/linux-lts/virt.aarch64.config +++ b/main/linux-lts/virt.aarch64.config @@ -744,6 +744,7 @@ CONFIG_I2C_VIRTIO=m CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m CONFIG_GPIO_PL061=m +CONFIG_GPIO_VIRTIO=m CONFIG_POWER_RESET_VEXPRESS=y CONFIG_HWMON=m CONFIG_SENSORS_ACPI_POWER=m @@ -801,6 +802,7 @@ CONFIG_DW_DMAC_PCI=m CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VDPA=m +CONFIG_VIRTIO_PMEM=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_MEM=m CONFIG_VIRTIO_INPUT=m diff --git a/main/linux-lts/virt.ppc64le.config b/main/linux-lts/virt.ppc64le.config index c7e3ca12997..34f6a7be0df 100644 --- a/main/linux-lts/virt.ppc64le.config +++ b/main/linux-lts/virt.ppc64le.config @@ -707,6 +707,7 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_DP83640_PHY=m CONFIG_PINCTRL=y CONFIG_GPIOLIB=y +CONFIG_GPIO_VIRTIO=m CONFIG_POWER_RESET=y CONFIG_POWER_SUPPLY=y CONFIG_HWMON=m @@ -759,6 +760,7 @@ CONFIG_DW_DMAC_PCI=m CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VDPA=m +CONFIG_VIRTIO_PMEM=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=m diff --git a/main/linux-lts/virt.x86_64.config b/main/linux-lts/virt.x86_64.config index a3bc935a0e9..5c3b7af5cf1 100644 --- a/main/linux-lts/virt.x86_64.config +++ b/main/linux-lts/virt.x86_64.config @@ -809,6 +809,7 @@ CONFIG_NITRO_ENCLAVES=m CONFIG_EFI_SECRET=m CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VDPA=m +CONFIG_VIRTIO_PMEM=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_MEM=m CONFIG_VIRTIO_INPUT=m diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD index cb917d27d4e..d6f36a05fc9 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.29 +pkgver=6.6.31 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -299,7 +299,7 @@ _dev() { sha512sums=" 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 linux-6.6.tar.xz -fc0a0e25386dadc0663b6b5c9b2a9e0edb72f833acf591830818ed5b5e0e5859a301d35f3815dcf5b22f1e5b186fc21b4b3d95717483786239f7efedbace9c9e patch-6.6.29.xz -ed7b5c10a48e41d9cf00636907c9633c7a588990dae83629b252cf90b9a04132515366f0404acad9ec998104853717a1eae7e5358ad1ae46759b109e6a8c6a79 rpi-6.6.29-alpine.patch +48b774ddc1c157b9e0b994bfead7e482593a81fc71edd706b344d17114333835f09f9f159191e24da61852a8eb115f8882965251d403a479c4da59785ebcf29f patch-6.6.31.xz +4d6cf276329245e5fefa131922e2cacb6db4fb94bc2d5541740c90a6d764be071d167f5281f6bb5e81c0063b45f6162c21804d8005cf678de6401e29bba385e2 rpi-6.6.31-alpine.patch f014a9b3574df17a3f6e0d8a2c48aef4239f33a062d64704fd56ecd596d090bb0413c8cb2abd6ec3ceeee09fa66243b6a3f7b405657edbd9c7a6407d6ec79fef common-changes.config " diff --git a/main/lld/APKBUILD b/main/lld/APKBUILD index a7bd193d9a3..d506fdd7fa4 100644 --- a/main/lld/APKBUILD +++ b/main/lld/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lld -pkgver=17.0.6 +pkgver=18.1.6 pkgrel=0 _llvmver=${pkgver%%.*} pkgdesc="The LLVM Linker" @@ -40,8 +40,19 @@ prepare() { } build() { - CFLAGS="$CFLAGS -O2 -DNDEBUG -g1" \ - CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -g1" \ + local lit=/usr/lib/llvm$_llvmver/bin/lit + local cflags="$CFLAGS" + local cxxflags="$CXXFLAGS" + case "$CARCH" in + aarch64|arm*|riscv64|loongarch64) + # not supported by clang here + cflags="${cflags/-fstack-clash-protection}" + cxxflags="${cxxflags/-fstack-clash-protection}" + ;; + esac + + 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 \ @@ -49,7 +60,7 @@ build() { -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DBUILD_SHARED_LIBS=ON \ -DLLVM_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \ - -DLLVM_EXTERNAL_LIT=/usr/bin/lit \ + -DLLVM_EXTERNAL_LIT=$lit \ -DLLD_BUILT_STANDALONE=ON \ -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-z,stack-size=2097152" cmake --build build @@ -69,6 +80,6 @@ package() { } sha512sums=" -55955fc24b3fb87012486618cf227a1640ad9a6d607c898d890337aa8c28f3e6a9ed48a52bd0ed57f365f0dc5081a6b3a037cb65da9a9f2cbc53a1527cb8db60 lld-17.0.6.src.tar.xz -b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a cmake-17.0.6.src.tar.xz +a53da0c796390950f656c71b0c194c741e0112d1661ceb959caec82fbee31e06aaf666e0135a7dd6441c935c5237dd50961450a15c5d9810cab526dd9082610b lld-18.1.6.src.tar.xz +1334647f4be280b41858aa272bebc65e935cab772001032f77040396ba7472fbd5eb6a1a0c042ab7156540075705b7f05c8de2f02e2ce9d7ec1ec27be6bef86f cmake-18.1.6.src.tar.xz " 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/llvm18/APKBUILD b/main/llvm18/APKBUILD index 7b8ba3274db..2f1acd196c0 100644 --- a/main/llvm18/APKBUILD +++ b/main/llvm18/APKBUILD @@ -7,7 +7,7 @@ # Contributor: omni <omni+alpine@hack.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> _pkgname=llvm -pkgver=18.1.5 +pkgver=18.1.6 _majorver=${pkgver%%.*} _prevmajorver=$((_majorver - 1)) pkgname=$_pkgname$_majorver @@ -232,8 +232,8 @@ static() { libs() { pkgdesc="LLVM $_majorver runtime library" depends="" - local soname="libLLVM-$_majorver.so" - local soname2="libLLVM-$pkgver.so" + local soname="libLLVM.so.${pkgver%.*}" + local soname2="libLLVM-$_majorver.so" mkdir -p "$subpkgdir" cd "$subpkgdir" @@ -324,7 +324,7 @@ _common_subpkg() { } sha512sums=" -9e2f1e251b3754a24a0b39676d78c98692887c05c85cf0bee50fd44d9635290019930d4dabd1ff4ba3c9c1067e7e0e09aa1bbcd3d76687f919a1d44ba85eee20 llvm-project-18.1.5.src.tar.xz +89ec276aa41bb2d76cfc3a72d8e728a9ce9176e02c085338b704790524fe329904cf311381805814faa8a6c79637620c01627bf122a51f89e0f3adb47e5df34c llvm-project-18.1.6.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 diff --git a/main/lttng-ust/APKBUILD b/main/lttng-ust/APKBUILD index a94d61a7464..a13c684041a 100644 --- a/main/lttng-ust/APKBUILD +++ b/main/lttng-ust/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Michael Jeanson <mjeanson@efficios.com> -# Maintainer: Michael Jeanson <mjeanson@efficios.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=lttng-ust -pkgver=2.13.6 -pkgrel=1 +pkgver=2.13.8 +pkgrel=0 pkgdesc="LTTng 2.0 Userspace Tracer" -url="https://lttng.org" +url="https://lttng.org/" arch="all" license="LGPL-2.1-only AND GPL-2.0-only AND MIT" depends_dev="userspace-rcu-dev>0.10" makedepends="$depends_dev util-linux-dev linux-headers python3 py3-setuptools" -checkdepends="bash" +checkdepends="bash gawk" subpackages="$pkgname-doc $pkgname-dev $pkgname-tools::noarch py3-lttng:pyagent" source="https://lttng.org/files/lttng-ust/lttng-ust-$pkgver.tar.bz2" @@ -30,8 +30,6 @@ check() { package() { make DESTDIR="$pkgdir" install - - sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/env python3|' "$pkgdir"/usr/bin/lttng-gen-tp } tools() { @@ -49,5 +47,5 @@ pyagent() { } sha512sums=" -15458f8dd0ad6fa96a9cf7569ffabadfddcaa70b822b69b39d4d7dfba3701c9489706b06f12f9d7e376147299fb3cfc6fe1213d46d510bdb7b3dc834271da55f lttng-ust-2.13.6.tar.bz2 +f61f7e1633051a4d515ba28d4945b96a84eab8a8143ef698bbb6857cbaad1acbe238041e43f04d9818bac43f59023be3f3c2154ecf75f180d8233c9d7f65c555 lttng-ust-2.13.8.tar.bz2 " 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-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/lvm2/APKBUILD b/main/lvm2/APKBUILD index e7bab1538d9..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 @@ -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/APKBUILD b/main/lxc/APKBUILD index 51ed3d44399..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=2 +pkgrel=4 pkgdesc="Userspace interface for the Linux kernel containment features" url="https://linuxcontainers.org/lxc/" arch="all" @@ -37,6 +37,7 @@ subpackages=" $pkgname-user-nic:_user_nic " source="https://linuxcontainers.org/downloads/lxc/lxc-$_pkgver.tar.gz + lxc-top-cgroupv2.patch lxc.initd lxc.confd " @@ -111,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 } @@ -175,6 +176,7 @@ _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 f1e7afd46ed..b79b569c542 100644 --- a/main/man-pages/APKBUILD +++ b/main/man-pages/APKBUILD @@ -1,16 +1,14 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=man-pages -pkgver=6.7 +pkgver=6.8 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 - " +source="https://cdn.kernel.org/pub/linux/docs/man-pages/man-pages-$pkgver.tar.xz" # just manpages options="!check" @@ -48,6 +46,5 @@ package() { } sha512sums=" -6706bf1fcb1f60b2281c0ee1cf00edad3d883d75a14b861f9e6bba03cc56fac81cb3176ffce546ca043dc3f19e89fb6e9cec724e7bb1bb5ede19ea701cee15a2 man-pages-6.7.tar.xz -a2c889288d5ebad8277fbdceea9b91d9eb1e522c8b1c2a0d35d0aaf83db89e03d5b45a156d6d5671f721ec68b86bea4fc5b830267295b2fef17c59cdefe6f156 gnumakefile-shell.patch +df0fa665d22a45250b7771c266b8376ac6b1f403e1a4ab9d1775be6969ad30ff5fb442c25f26cb5a19b1ac46c27f1dfdbc70027161f610e06dd4a2301e60a4ef man-pages-6.8.tar.xz " diff --git a/main/man-pages/gnumakefile-shell.patch b/main/man-pages/gnumakefile-shell.patch deleted file mode 100644 index e0c2ed74aa9..00000000000 --- a/main/man-pages/gnumakefile-shell.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/GNUmakefile 2024-05-03 13:21:43.669859309 +0000 -+++ b/GNUmakefile 2024-05-03 13:26:15.463773574 +0000 -@@ -3,8 +3,8 @@ - - - BASH := bash --SHELL := /usr/bin/env --.SHELLFLAGS := -S '$(BASH) -Eeuo pipefail -c' -+SHELL := /bin/sh -+.SHELLFLAGS := -Eeuo pipefail -c - - - MAKEFLAGS += --no-builtin-rules diff --git a/main/mariadb-connector-c/APKBUILD b/main/mariadb-connector-c/APKBUILD index 29348ae750a..f9d97dc6849 100644 --- a/main/mariadb-connector-c/APKBUILD +++ b/main/mariadb-connector-c/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb-connector-c -pkgver=3.3.9 +pkgver=3.3.10 pkgrel=0 pkgdesc="The MariaDB Native Client library (C driver)" url="https://mariadb.org/" @@ -12,7 +12,6 @@ options="!check" # no testsuite replaces="mariadb-client-libs" subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/mariadb-corporation/mariadb-connector-c/archive/refs/tags/v$pkgver.tar.gz - incorrect-sys-poll.patch unused-parameter.patch " @@ -59,7 +58,6 @@ dev() { } sha512sums=" -2365628248d83fdb31ad8aedc2209aaa855262d799183dbc6445d3419f3b769d782232d590add33e7aa2b9d226417a9cdf65707bb95768a60b5215d839d6c55b mariadb-connector-c-3.3.9.tar.gz -ca55213d91a1495cc85a972528820af058ea194073f050389fbac829e077fc179fa7c0422b18953ebe7751379af7e670a5fffef9bd642cd2051d35e0410ab4f3 incorrect-sys-poll.patch +aff5120cb8840daffba6f72c7a074f2bc6cf820334cbe1bd5a531ddde4a325726ace56dcbc264735804e71e3f4bc7e773820e024661846bf74399342bbc5b05c mariadb-connector-c-3.3.10.tar.gz 1e71e01ffb2a95833ae08fe6bb72c75f762b57ea5919d27be518e40c4cb1dee16ac2609fe4a663a1ca7781523046285ab1c757b5c82bce42ef4b5ecd75d5ed90 unused-parameter.patch " diff --git a/main/mariadb-connector-c/incorrect-sys-poll.patch b/main/mariadb-connector-c/incorrect-sys-poll.patch deleted file mode 100644 index 8a1a53acee5..00000000000 --- a/main/mariadb-connector-c/incorrect-sys-poll.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/plugins/pvio/pvio_socket.c -+++ b/plugins/pvio/pvio_socket.c -@@ -39,7 +39,7 @@ - #include <sys/un.h> - #endif - #ifdef HAVE_POLL --#include <sys/poll.h> -+#include <poll.h> - #endif - #ifdef HAVE_SYS_IOCTL_H - #include <sys/ioctl.h> diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 8380a6c1065..8be8fbdd472 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -7,7 +7,7 @@ # Contributor: Jake Buchholz <tomalok@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb -pkgver=10.11.7 +pkgver=10.11.8 pkgrel=0 pkgdesc="A fast SQL database server" url="https://www.mariadb.org/" @@ -71,7 +71,7 @@ subpackages=" options="suid" case "$CARCH" in - x86|s390x|mips64) _enable_rocksdb=NO ;; + x86|s390x) _enable_rocksdb=NO ;; *) _enable_rocksdb=YES subpackages="$subpackages $pkgname-plugin-rocksdb:_plugin_rocksdb" @@ -93,10 +93,11 @@ source="https://rsync.osuosl.org/pub/mariadb/mariadb-$pkgver/source/mariadb-$pkg ppc-remove-glibc-dep.patch disable-failing-test.patch have_stacktrace.patch - revert-c432c9ef.patch " # secfixes: +# 10.11.8-r0: +# - CVE-2024-21096 # 10.11.6-r0: # - CVE-2023-22084 # 10.6.9-r0: @@ -344,7 +345,6 @@ package() { "$pkgdir"/usr/include/mysql/mysql.h \ "$pkgdir"/usr/include/mysql/mysql/client_plugin.h \ "$pkgdir"/usr/include/mysql/mysql/plugin_auth.h \ - "$pkgdir"/usr/include/mysql/mysql/plugin_auth_common.h \ "$pkgdir"/usr/include/mysql/mysql_version.h \ "$pkgdir"/usr/include/mysql/mysqld_error.h \ "$pkgdir"/usr/lib/$pkgname/plugin/dialog.so \ @@ -553,12 +553,11 @@ _plugin_rocksdb() { } sha512sums=" -a6ebc9ba88b52e5d339b176b6fa48c03fcbe5bb590740a02c1bbd083a3d62e619937e645de2504a9f9adeed2f67127fab0307dece524b7c5217ad5df0f3ccc71 mariadb-10.11.7.tar.gz +61bdbe4a51adb438335c22bfcf75f59864fa0412c7ed6e938ef73fd602c2ef27131dbeef83cd314f2bea54135c6e8f8646608ff96a7ce6ce2c74f34ef6a8675f mariadb-10.11.8.tar.gz c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c mariadb.initd ec9068ee1da8276f04ac3654640cb6149e0f0a21ee77b133d7e5b82fa2ab2fd7971bce6ea3c5a5e094d8c6e2571f4ce43d7014b2767bb27e0a335005ced81968 gcc13.patch 466d21376f6abae024aee26af701aa93275734c47a9c93084cec17e2e089667d059fbf76ea9c748c97de4a4b37c6663370f1d1f2183e17e69bd98213a57667ce lfs64.patch 20331e52e3dc419b4833e3c16bbb9828b9591f8aa3b6fce93c592161f3cae403c4a5d073369b2383d7d2325a2c9394d178866ac3e069fd8b6c50be00155ba942 ppc-remove-glibc-dep.patch 598490b4bb45c9f7be46086d25c2b6c601d417c45f11aa519c2290065e7d6e98a7519f9860b823e67a8fd3e6ce3b4728af73ec3a2c66eec32b42fd4ad7cc07f7 disable-failing-test.patch 4965275371e6d5e08e32a16fcfff2e68dfdcf6f4c30e5beffe18dcf56b503cbf373feeda814694e048964b16165ad65156c32fe27e974bed47201e8cf60736c6 have_stacktrace.patch -3757166dae8cd2c517d7e09d286f0012c12815e58edbf615d3fb935d52ec4ab56fa4bd62fcb126a434a229a6757a34ec17900dd469d629ea22ed680733a2686d revert-c432c9ef.patch " diff --git a/main/mariadb/revert-c432c9ef.patch b/main/mariadb/revert-c432c9ef.patch deleted file mode 100644 index d13fa9dbbc4..00000000000 --- a/main/mariadb/revert-c432c9ef.patch +++ /dev/null @@ -1,23 +0,0 @@ -Date: Wed, 21 Feb 2024 20:34:12 -0800 -Subject: [PATCH] Revert compile_time_assert() changes from "MDEV-32862 MYSQL struct in C/C and server differs" - -This partially reverts commit c432c9ef19bf6ff40ab9551bcae202d7e1319878 which -most likely caused the regression that broke builds on many 32-bit platforms. - ---- a/tests/mysql_client_fw.c -+++ b/tests/mysql_client_fw.c -@@ -1430,14 +1430,6 @@ int main(int argc, char **argv) - tests_to_run[i]= NULL; - } - --#ifdef _WIN32 -- /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */ -- compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728); --#else -- /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */ -- compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656); --#endif -- - if (mysql_server_init(embedded_server_arg_count, - embedded_server_args, - (char**) embedded_server_groups)) diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD index 78f24686e3d..3d8f6dd8a91 100644 --- a/main/mdadm/APKBUILD +++ b/main/mdadm/APKBUILD @@ -2,20 +2,23 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mdadm -pkgver=4.2 -pkgrel=4 +pkgver=4.3 +pkgrel=0 pkgdesc="a tool for managing Linux Software RAID arrays" url="https://raid.wiki.kernel.org/index.php/A_guide_to_mdadm" arch="all" license="GPL-2.0-only" depends="lsblk" -makedepends="groff linux-headers" +makedepends="eudev-dev groff linux-headers" checkdepends="bash eudev e2fsprogs" subpackages="$pkgname-doc $pkgname-udev::noarch $pkgname-misc::noarch $pkgname-openrc" source="https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.gz $pkgname.initd $pkgname.confd $pkgname-raid.initd + basename.patch + Create.c-fix-build.patch + util.c-include-limits.h.patch lfs64.patch no-werror.patch mdadm-include-sysmacros.patch @@ -66,12 +69,15 @@ misc() { } sha512sums=" -112a897c6943d7343f44ffe32a8d7ef11e1f1624f51385c0f1d27458d661202bb378678a3ddc78ed2e24533be234441ea15cf33769345d5709b72b72ad9ec540 mdadm-4.2.tar.gz +a77af2b371ed27b7bd89b7991302282f0fc77999eb93d7959446fc4b1c28388582d08ff0abfc470a9f9a8c8036acb0158edc44d9a8d406f807ca28111bf74459 mdadm-4.3.tar.gz ca5f4e3ff5b284102b44e818d11622e1889066e3d18edce2d62c1a44ee8f4cfdc0979121c0462a916c638423c5ebc706c46aa996a7c4f68e030589adc62803f4 mdadm.initd 7d45bf489ef93a4f217ffcf72311eb661b8de7fbf63a5344697252c0d3a684b0123ff60efa5f218da4eb4cda7c88d91c2ef3625d5e44a588e3e1210cb60b0ab9 mdadm.confd 10d2456ca82c353c9b8540ca996de48575a60b83ede5b0bb7e960b4dd28aac2aa73eaeff4bdb99d03ce9630f986c2023b38fe332c5be74e0234985af6273a934 mdadm-raid.initd -df8b5d78000c416652da07e46d94c5c3b8afa48619a360b0a33290420f718bf88069ff4cf62537cc510208fae95b5632a9f340fe97d1aa31661b031bd4dc5d71 lfs64.patch -d3e67b8d4f41996007a4b6dd28666e844925e071cd59530b9611590d536dd206375e372f56bca25cbdf45def41ffe199bd4bf64688436cdd5ac71a6ff699d95d no-werror.patch -e711c15fada5fc98984f43f90a8ab3b6a2a20e9b91c56b5672fdb0ea127b61934b2f0c6ca986bd91c96c56b66f46326cb616101a62e4bfebe3a2b0d33ed2465c mdadm-include-sysmacros.patch -d7aeac1ce8e1b17bfdc6178551aaee364b731003e03b1d0c713ee879ac3f82164dff70999ad56c0e91c4bf90c5bca7708bdbb5d2a57e032fd0291828a917b054 fix-monitor-tv_sec.patch +cb980a8f0249aa56e01afb34f4e456a1486dd32aca418f723277ffb1e30d311e27f54991d6c82cc02b2f4e6d98c34f2fbaf96b416414dd32bdc2478a75c9f71a basename.patch +40c1935a0f0491bac6b33205883c1920b4ce5830f100462ae448f8f34d143d0de716007d6b14a207879192c73c10141e7ecf414a866b51cf52652950d781e0cc Create.c-fix-build.patch +6513bef2ccf2bfa9caa536f1475161f6a207f202be48dde4d4516b5817f03e1da77cdbf646666d39729a34296ed14413348518f96727926e8b7398f17c8d9e2a util.c-include-limits.h.patch +0516df3117618e46b9699d427f3c3601701906bbdb1b2f8fb913e443c21f0fba021e66fb352f9d97678e1394e05c9f4fd041fc3f1f14953d219bbcd804eb6d55 lfs64.patch +e01f1eeb35c0890505004f1e35c8f73de5d1b406c64bc24d0d8577ab3fdbd60b1b912f9321e266a298251cbd92f0fe35a8663d174eedd4c77609e1613c57368c no-werror.patch +40994227cb4cab3cd890e674ad78cb1fd1d5dcb4a577c86dc1948d465fe5e95092809788bf97c917cee038f5be1cd376c453e69dc28ecb6accb3a1aa3d79c01d mdadm-include-sysmacros.patch +5d337f39d8f9b95447d4b6e0b9b1442a9893ea7f47b25687df0c7ad67a47f151900bfbcbd4ebf43ee2833f8643696df163b931c389b0a6498be7e2377913b965 fix-monitor-tv_sec.patch " diff --git a/main/mdadm/Create.c-fix-build.patch b/main/mdadm/Create.c-fix-build.patch new file mode 100644 index 00000000000..8ec0c127266 --- /dev/null +++ b/main/mdadm/Create.c-fix-build.patch @@ -0,0 +1,41 @@ +From 52bead95d2957437c691891fcdc49bd6afccdd49 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Fri, 12 Apr 2024 18:45:13 +0200 +Subject: [PATCH] Create.c: fix uclibc build + +Define FALLOC_FL_ZERO_RANGE if needed as FALLOC_FL_ZERO_RANGE is only +defined for aarch64 on uclibc-ng resulting in the following or1k build +failure since commit 577fd10486d8d1472a6b559066f344ac30a3a391: + +Create.c: In function 'write_zeroes_fork': +Create.c:155:35: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) + 155 | if (fallocate(fd, FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE, + | ^~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/0e04bcdb591ca5642053e1f7e31384f06581e989 + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> +--- + Create.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Create.c b/Create.c +index 4397ff49..d94253b1 100644 +--- a/Create.c ++++ b/Create.c +@@ -32,6 +32,10 @@ + #include <sys/signalfd.h> + #include <sys/wait.h> + ++#ifndef FALLOC_FL_ZERO_RANGE ++#define FALLOC_FL_ZERO_RANGE 16 ++#endif ++ + static int round_size_and_verify(unsigned long long *size, int chunk) + { + if (*size == 0) +-- +2.45.0 + diff --git a/main/mdadm/basename.patch b/main/mdadm/basename.patch new file mode 100644 index 00000000000..8e79c43771c --- /dev/null +++ b/main/mdadm/basename.patch @@ -0,0 +1,17 @@ +--- a/mdadm.h ++++ b/mdadm.h +@@ -248,6 +248,14 @@ static inline void __put_unaligned32(__u + } + + /* ++ * Ensure GNU basename behavior for musl libc ++ */ ++#ifndef __GLIBC__ ++#define basename(path) \ ++ (strrchr((path),'/') ? strrchr((path),'/')+1 : (path)) ++#endif ++ ++/* + * Check at compile time that something is of a particular type. + * Always evaluates to 1 so you may use it easily in comparisons. + */ diff --git a/main/mdadm/fix-monitor-tv_sec.patch b/main/mdadm/fix-monitor-tv_sec.patch index f40d940026a..01dbddc509b 100644 --- a/main/mdadm/fix-monitor-tv_sec.patch +++ b/main/mdadm/fix-monitor-tv_sec.patch @@ -2,7 +2,7 @@ diff --git monitor.c monitor.c index 81537ed..08027ac 100644 --- a/monitor.c +++ b/monitor.c -@@ -447,9 +447,9 @@ static int read_and_act(struct active_array *a, fd_set *fds) +@@ -449,9 +449,9 @@ static int read_and_act(struct active_array *a, fd_set *fds) } gettimeofday(&tv, NULL); diff --git a/main/mdadm/lfs64.patch b/main/mdadm/lfs64.patch index 414f76d3e68..20ed30598b8 100644 --- a/main/mdadm/lfs64.patch +++ b/main/mdadm/lfs64.patch @@ -4,7 +4,7 @@ diff --git a/Grow.c b/Grow.c index 9c6fc95..bb21333 100644 --- a/Grow.c +++ b/Grow.c -@@ -4260,10 +4260,10 @@ static int grow_backup(struct mdinfo *sra, +@@ -4268,10 +4268,10 @@ static int grow_backup(struct mdinfo *sr bsb.magic[15] = '2'; for (i = 0; i < dests; i++) if (part) @@ -17,7 +17,7 @@ index 9c6fc95..bb21333 100644 rv = save_stripes(sources, offsets, disks, chunk, level, layout, dests, destfd, offset * 512 * odata, -@@ -4282,14 +4282,14 @@ static int grow_backup(struct mdinfo *sra, +@@ -4290,14 +4290,14 @@ static int grow_backup(struct mdinfo *sr ((char*)&bsb.sb_csum2)-((char*)&bsb)); rv = -1; @@ -34,7 +34,7 @@ index 9c6fc95..bb21333 100644 destoffsets[i]+stripes*chunk*odata) break; if (write(destfd[i], &bsb, 512) != 512) -@@ -4339,7 +4339,7 @@ static int forget_backup(int dests, int *destfd, +@@ -4347,7 +4347,7 @@ static int forget_backup(int dests, int if (memcmp(bsb.magic, "md_backup_data-2", 16) == 0) bsb.sb_csum2 = bsb_csum((char*)&bsb, ((char*)&bsb.sb_csum2)-((char*)&bsb)); @@ -43,7 +43,7 @@ index 9c6fc95..bb21333 100644 destoffsets[i]-4096) rv = -1; if (rv == 0 && write(destfd[i], &bsb, 512) != 512) -@@ -4367,7 +4367,7 @@ static void validate(int afd, int bfd, unsigned long long offset) +@@ -4375,7 +4375,7 @@ static void validate(int afd, int bfd, u */ if (afd < 0) return; @@ -52,7 +52,7 @@ index 9c6fc95..bb21333 100644 if (read(bfd, &bsb2, 512) != 512) fail("cannot read bsb"); if (bsb2.sb_csum != bsb_csum((char*)&bsb2, -@@ -4398,12 +4398,12 @@ static void validate(int afd, int bfd, unsigned long long offset) +@@ -4406,12 +4406,12 @@ static void validate(int afd, int bfd, u } } @@ -67,7 +67,7 @@ index 9c6fc95..bb21333 100644 if ((unsigned long long)read(afd, abuf, len) != len) fail("read first from array failed"); if (memcmp(bbuf, abuf, len) != 0) { -@@ -4431,10 +4431,10 @@ static void validate(int afd, int bfd, unsigned long long offset) +@@ -4439,10 +4439,10 @@ static void validate(int afd, int bfd, u bbuf = xmalloc(abuflen); } @@ -80,7 +80,7 @@ index 9c6fc95..bb21333 100644 if ((unsigned long long)read(afd, abuf, len) != len) fail("read second from array failed"); if (memcmp(bbuf, abuf, len) != 0) -@@ -4711,7 +4711,7 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, +@@ -4719,7 +4719,7 @@ int Grow_restart(struct supertype *st, s st->ss->getinfo_super(st, &dinfo, NULL); st->ss->free_super(st); @@ -89,7 +89,7 @@ index 9c6fc95..bb21333 100644 (dinfo.data_offset + dinfo.component_size - 8) <<9, 0) < 0) { pr_err("Cannot seek on device %d\n", i); -@@ -4811,7 +4811,7 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, +@@ -4819,7 +4819,7 @@ int Grow_restart(struct supertype *st, s goto nonew; /* No new data here */ } } @@ -98,7 +98,7 @@ index 9c6fc95..bb21333 100644 second_fail: if (verbose) pr_err("Failed to verify secondary backup-metadata block on %s\n", -@@ -4819,7 +4819,7 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, +@@ -4827,7 +4827,7 @@ int Grow_restart(struct supertype *st, s continue; /* Cannot seek */ } /* There should be a duplicate backup superblock 4k before here */ @@ -107,11 +107,9 @@ index 9c6fc95..bb21333 100644 read(fd, &bsb2, sizeof(bsb2)) != sizeof(bsb2)) goto second_fail; /* Cannot find leading superblock */ if (bsb.magic[15] == '1') -diff --git a/raid6check.c b/raid6check.c -index a8e6005..392cf29 100644 --- a/raid6check.c +++ b/raid6check.c -@@ -206,7 +206,7 @@ int autorepair(int *disk, unsigned long long start, int chunk_size, +@@ -211,7 +211,7 @@ int autorepair(int *disk, unsigned long for(j = 0; j < (chunk_size >> CHECK_PAGE_BITS); j++) { if(page_to_write[j] == 1) { int slot = block_index_for_slot[disk[j]]; @@ -120,7 +118,7 @@ index a8e6005..392cf29 100644 write_res += write(source[slot], blocks[disk[j]] + j * CHECK_PAGE_SIZE, CHECK_PAGE_SIZE); -@@ -279,9 +279,9 @@ int manual_repair(int chunk_size, int syndrome_disks, +@@ -284,9 +284,9 @@ int manual_repair(int chunk_size, int sy } int write_res1, write_res2; @@ -132,7 +130,7 @@ index a8e6005..392cf29 100644 offsets[fd1] + start * chunk_size, SEEK_SET); if (seek_res < 0) { fprintf(stderr, "lseek failed for failed_disk1\n"); -@@ -289,7 +289,7 @@ int manual_repair(int chunk_size, int syndrome_disks, +@@ -294,7 +294,7 @@ int manual_repair(int chunk_size, int sy } write_res1 = write(source[fd1], blocks[failed_slot1], chunk_size); @@ -141,7 +139,7 @@ index a8e6005..392cf29 100644 offsets[fd2] + start * chunk_size, SEEK_SET); if (seek_res < 0) { fprintf(stderr, "lseek failed for failed_disk2\n"); -@@ -374,7 +374,7 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets, +@@ -379,7 +379,7 @@ int check_stripes(struct mdinfo *info, i goto exitCheck; } for (i = 0 ; i < raid_disks ; i++) { @@ -150,8 +148,6 @@ index a8e6005..392cf29 100644 SEEK_SET); if (seek_res < 0) { fprintf(stderr, "lseek to source %d failed\n", i); -diff --git a/restripe.c b/restripe.c -index a7a7229..eec3619 100644 --- a/restripe.c +++ b/restripe.c @@ -581,7 +581,7 @@ int save_stripes(int *source, unsigned long long *offsets, @@ -196,7 +192,7 @@ diff --git a/super-ddf.c b/super-ddf.c index 3f304cd..7b10568 100644 --- a/super-ddf.c +++ b/super-ddf.c -@@ -816,7 +816,7 @@ static int load_ddf_header(int fd, unsigned long long lba, +@@ -809,7 +809,7 @@ static int load_ddf_header(int fd, unsig if (lba >= size-1) return 0; @@ -205,7 +201,7 @@ index 3f304cd..7b10568 100644 return 0; if (read(fd, hdr, 512) != 512) -@@ -870,7 +870,7 @@ static void *load_section(int fd, struct ddf_super *super, void *buf, +@@ -863,7 +863,7 @@ static void *load_section(int fd, struct else offset += be64_to_cpu(super->active->secondary_lba); @@ -214,7 +210,7 @@ index 3f304cd..7b10568 100644 if (dofree) free(buf); return NULL; -@@ -889,7 +889,7 @@ static int load_ddf_headers(int fd, struct ddf_super *super, char *devname) +@@ -882,7 +882,7 @@ static int load_ddf_headers(int fd, stru get_dev_size(fd, NULL, &dsize); @@ -223,7 +219,7 @@ index 3f304cd..7b10568 100644 if (devname) pr_err("Cannot seek to anchor block on %s: %s\n", devname, strerror(errno)); -@@ -1691,7 +1691,7 @@ static int copy_metadata_ddf(struct supertype *st, int from, int to) +@@ -1689,7 +1689,7 @@ static int copy_metadata_ddf(struct supe if (!get_dev_size(from, NULL, &dsize)) goto err; @@ -232,7 +228,7 @@ index 3f304cd..7b10568 100644 goto err; if (read(from, buf, 512) != 512) goto err; -@@ -1710,8 +1710,8 @@ static int copy_metadata_ddf(struct supertype *st, int from, int to) +@@ -1708,8 +1708,8 @@ static int copy_metadata_ddf(struct supe bytes = dsize - offset; @@ -243,7 +239,7 @@ index 3f304cd..7b10568 100644 goto err; while (written < bytes) { int n = bytes - written; -@@ -3037,7 +3037,7 @@ static int __write_ddf_structure(struct dl *d, struct ddf_super *ddf, __u8 type) +@@ -2967,7 +2967,7 @@ static int __write_ddf_structure(struct header->openflag = 1; header->crc = calc_crc(header, 512); @@ -252,7 +248,7 @@ index 3f304cd..7b10568 100644 if (write(fd, header, 512) < 0) goto out; -@@ -3101,7 +3101,7 @@ out: +@@ -3031,7 +3031,7 @@ out: header->openflag = 0; header->crc = calc_crc(header, 512); @@ -261,7 +257,7 @@ index 3f304cd..7b10568 100644 if (write(fd, header, 512) < 0) ret = 0; -@@ -3154,7 +3154,7 @@ static int _write_super_to_disk(struct ddf_super *ddf, struct dl *d) +@@ -3084,7 +3084,7 @@ static int _write_super_to_disk(struct d if (!__write_ddf_structure(d, ddf, DDF_HEADER_SECONDARY)) return 0; @@ -270,7 +266,7 @@ index 3f304cd..7b10568 100644 if (write(fd, &ddf->anchor, 512) < 0) return 0; -@@ -3909,7 +3909,7 @@ static int store_super_ddf(struct supertype *st, int fd) +@@ -3836,7 +3836,7 @@ static int store_super_ddf(struct supert return 1; memset(buf, 0, 512); @@ -279,11 +275,9 @@ index 3f304cd..7b10568 100644 rc = write(fd, buf, 512); free(buf); if (rc < 0) -diff --git a/super-intel.c b/super-intel.c -index d5fad10..236e2ee 100644 --- a/super-intel.c +++ b/super-intel.c -@@ -3092,7 +3092,7 @@ static int read_imsm_migr_rec(int fd, struct intel_super *super) +@@ -3195,7 +3195,7 @@ static int read_imsm_migr_rec(int fd, st unsigned long long dsize; get_dev_size(fd, NULL, &dsize); @@ -292,7 +286,7 @@ index d5fad10..236e2ee 100644 SEEK_SET) < 0) { pr_err("Cannot seek to anchor block: %s\n", strerror(errno)); -@@ -3283,7 +3283,7 @@ static int write_imsm_migr_rec(struct supertype *st) +@@ -3386,7 +3386,7 @@ static int write_imsm_migr_rec(struct su continue; get_dev_size(sd->fd, NULL, &dsize); @@ -301,7 +295,7 @@ index d5fad10..236e2ee 100644 sector_size), SEEK_SET) < 0) { pr_err("Cannot seek to anchor block: %s\n", -@@ -4404,7 +4404,7 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname) +@@ -4511,7 +4511,7 @@ static int load_imsm_mpb(int fd, struct return 1; } @@ -310,7 +304,7 @@ index d5fad10..236e2ee 100644 if (devname) pr_err("Cannot seek to anchor block on %s: %s\n", devname, strerror(errno)); -@@ -4472,7 +4472,7 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname) +@@ -4580,7 +4580,7 @@ static int load_imsm_mpb(int fd, struct } /* read the extended mpb */ @@ -319,7 +313,7 @@ index d5fad10..236e2ee 100644 if (devname) pr_err("Cannot seek to extended mpb on %s: %s\n", devname, strerror(errno)); -@@ -5994,7 +5994,7 @@ static int add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk, +@@ -6111,7 +6111,7 @@ static int add_to_super_imsm(struct supe /* clear migr_rec when adding disk to container */ memset(super->migr_rec_buf, 0, MIGR_REC_BUF_SECTORS*MAX_SECTOR_SIZE); @@ -328,7 +322,7 @@ index d5fad10..236e2ee 100644 SEEK_SET) >= 0) { if ((unsigned int)write(fd, super->migr_rec_buf, MIGR_REC_BUF_SECTORS*member_sector_size) != -@@ -6219,7 +6219,7 @@ static int write_super_imsm(struct supertype *st, int doclose) +@@ -6336,7 +6336,7 @@ static int write_super_imsm(struct super unsigned long long dsize; get_dev_size(d->fd, NULL, &dsize); @@ -337,7 +331,7 @@ index d5fad10..236e2ee 100644 SEEK_SET) >= 0) { if ((unsigned int)write(d->fd, super->migr_rec_buf, -@@ -6302,7 +6302,7 @@ static int write_ppl_header(unsigned long long ppl_sector, int fd, void *buf) +@@ -6419,7 +6419,7 @@ static int write_ppl_header(unsigned lon ppl_hdr->checksum = __cpu_to_le32(~crc32c_le(~0, buf, PPL_HEADER_SIZE)); @@ -346,7 +340,7 @@ index d5fad10..236e2ee 100644 ret = -errno; perror("Failed to seek to PPL header location"); return ret; -@@ -6396,7 +6396,7 @@ static int validate_ppl_imsm(struct supertype *st, struct mdinfo *info, +@@ -6513,7 +6513,7 @@ static int validate_ppl_imsm(struct supe dprintf("Checking potential PPL at offset: %llu\n", ppl_offset); @@ -355,7 +349,7 @@ index d5fad10..236e2ee 100644 SEEK_SET) < 0) { perror("Failed to seek to PPL header location"); ret = -1; -@@ -8858,7 +8858,7 @@ static int store_imsm_mpb(int fd, struct imsm_super *mpb) +@@ -9022,7 +9022,7 @@ static int store_imsm_mpb(int fd, struct sectors = mpb_sectors(mpb, sector_size) - 1; /* write the extended mpb to the sectors preceeding the anchor */ @@ -364,7 +358,7 @@ index d5fad10..236e2ee 100644 SEEK_SET) < 0) return 1; -@@ -8868,7 +8868,7 @@ static int store_imsm_mpb(int fd, struct imsm_super *mpb) +@@ -9032,7 +9032,7 @@ static int store_imsm_mpb(int fd, struct } /* first block is stored on second to last sector of the disk */ @@ -373,7 +367,7 @@ index d5fad10..236e2ee 100644 return 1; if ((unsigned int)write(fd, buf, sector_size) != sector_size) -@@ -11058,7 +11058,7 @@ int recover_backup_imsm(struct supertype *st, struct mdinfo *info) +@@ -11213,7 +11213,7 @@ int recover_backup_imsm(struct supertype skipped_disks++; continue; } @@ -382,7 +376,7 @@ index d5fad10..236e2ee 100644 pr_err("Cannot seek to block: %s\n", strerror(errno)); skipped_disks++; -@@ -11070,7 +11070,7 @@ int recover_backup_imsm(struct supertype *st, struct mdinfo *info) +@@ -11225,7 +11225,7 @@ int recover_backup_imsm(struct supertype skipped_disks++; continue; } @@ -391,7 +385,7 @@ index d5fad10..236e2ee 100644 pr_err("Cannot seek to block: %s\n", strerror(errno)); skipped_disks++; -@@ -12320,7 +12320,7 @@ static int imsm_manage_reshape( +@@ -12473,7 +12473,7 @@ static int imsm_manage_reshape( unsigned long long dsize; get_dev_size(d->fd, NULL, &dsize); @@ -400,7 +394,7 @@ index d5fad10..236e2ee 100644 SEEK_SET) >= 0) { if ((unsigned int)write(d->fd, super->migr_rec_buf, MIGR_REC_BUF_SECTORS*sector_size) != -@@ -12476,7 +12476,7 @@ static int validate_internal_bitmap_for_drive(struct supertype *st, +@@ -12629,7 +12629,7 @@ static int validate_internal_bitmap_for_ } } @@ -409,7 +403,7 @@ index d5fad10..236e2ee 100644 goto abort; if (read(fd, read_buf, IMSM_BITMAP_HEADER_SIZE) != IMSM_BITMAP_HEADER_SIZE) -@@ -12605,7 +12605,7 @@ static int locate_bitmap_imsm(struct supertype *st, int fd, int node_num) +@@ -12747,7 +12747,7 @@ static int locate_bitmap_imsm(struct sup offset = get_bitmap_header_sector(super, super->current_vol); dprintf("bitmap header offset is %llu\n", offset); @@ -418,7 +412,7 @@ index d5fad10..236e2ee 100644 return 0; } -@@ -12659,7 +12659,7 @@ static int write_init_bitmap_imsm(struct supertype *st, int fd, +@@ -12801,7 +12801,7 @@ static int write_init_bitmap_imsm(struct return -1; memset(buf, 0xFF, MAX_SECTOR_SIZE); offset = get_bitmap_sector(super, vol_idx); @@ -427,11 +421,9 @@ index d5fad10..236e2ee 100644 while (written < IMSM_BITMAP_AREA_SIZE) { to_write = IMSM_BITMAP_AREA_SIZE - written; if (to_write > MAX_SECTOR_SIZE) -diff --git a/super0.c b/super0.c -index b79b97a..74bb418 100644 --- a/super0.c +++ b/super0.c -@@ -327,12 +327,12 @@ static int copy_metadata0(struct supertype *st, int from, int to) +@@ -327,12 +327,12 @@ static int copy_metadata0(struct superty offset *= 512; @@ -446,7 +438,7 @@ index b79b97a..74bb418 100644 goto err; super = buf; if (super->md_magic != MD_SB_MAGIC || -@@ -862,7 +862,7 @@ static int store_super0(struct supertype *st, int fd) +@@ -885,7 +885,7 @@ static int store_super0(struct supertype offset = dsize/512 - 8*2; offset &= ~(4*2-1); offset *= 512; @@ -455,7 +447,7 @@ index b79b97a..74bb418 100644 ret = 3; else if (write(fd, st->other, 1024) != 1024) ret = 4; -@@ -877,7 +877,7 @@ static int store_super0(struct supertype *st, int fd) +@@ -900,7 +900,7 @@ static int store_super0(struct supertype offset *= 512; @@ -464,7 +456,7 @@ index b79b97a..74bb418 100644 return 3; if (write(fd, super, sizeof(*super)) != sizeof(*super)) -@@ -1004,7 +1004,7 @@ static int load_super0(struct supertype *st, int fd, char *devname) +@@ -1027,7 +1027,7 @@ static int load_super0(struct supertype offset *= 512; @@ -473,7 +465,7 @@ index b79b97a..74bb418 100644 if (devname) pr_err("Cannot seek to superblock on %s: %s\n", devname, strerror(errno)); -@@ -1189,7 +1189,7 @@ static int locate_bitmap0(struct supertype *st, int fd, int node_num) +@@ -1212,7 +1212,7 @@ static int locate_bitmap0(struct superty offset += MD_SB_BYTES; @@ -482,7 +474,7 @@ index b79b97a..74bb418 100644 return 0; } -@@ -1214,7 +1214,7 @@ static int write_bitmap0(struct supertype *st, int fd, enum bitmap_update update +@@ -1237,7 +1237,7 @@ static int write_bitmap0(struct supertyp offset *= 512; @@ -491,11 +483,9 @@ index b79b97a..74bb418 100644 return 3; if (posix_memalign(&buf, 4096, 4096)) -diff --git a/super1.c b/super1.c -index a12a5bc..4e098b0 100644 --- a/super1.c +++ b/super1.c -@@ -761,7 +761,7 @@ static int copy_metadata1(struct supertype *st, int from, int to) +@@ -745,7 +745,7 @@ static int copy_metadata1(struct superty goto err; } @@ -504,7 +494,7 @@ index a12a5bc..4e098b0 100644 goto err; if (read(from, buf, bufsize) != bufsize) goto err; -@@ -775,7 +775,7 @@ static int copy_metadata1(struct supertype *st, int from, int to) +@@ -759,7 +759,7 @@ static int copy_metadata1(struct superty calc_sb_1_csum(sb) != super.sb_csum) goto err; @@ -513,7 +503,7 @@ index a12a5bc..4e098b0 100644 goto err; if (write(to, buf, bufsize) != bufsize) goto err; -@@ -791,9 +791,9 @@ static int copy_metadata1(struct supertype *st, int from, int to) +@@ -775,9 +775,9 @@ static int copy_metadata1(struct superty bitmap_offset += (int32_t)__le32_to_cpu(super.bitmap_offset); @@ -525,7 +515,7 @@ index a12a5bc..4e098b0 100644 goto err; for (written = 0; written < bytes ; ) { -@@ -832,9 +832,9 @@ static int copy_metadata1(struct supertype *st, int from, int to) +@@ -816,9 +816,9 @@ static int copy_metadata1(struct superty bb_offset += (int32_t)__le32_to_cpu(super.bblog_offset); @@ -537,7 +527,7 @@ index a12a5bc..4e098b0 100644 goto err; for (written = 0; written < bytes ; ) { -@@ -940,7 +940,7 @@ static int examine_badblocks_super1(struct supertype *st, int fd, char *devname) +@@ -920,7 +920,7 @@ static int examine_badblocks_super1(stru offset = __le64_to_cpu(sb->super_offset) + (int)__le32_to_cpu(sb->bblog_offset); offset <<= 9; @@ -546,7 +536,7 @@ index a12a5bc..4e098b0 100644 pr_err("Cannot seek to bad-blocks list\n"); return 1; } -@@ -1797,7 +1797,7 @@ static int store_super1(struct supertype *st, int fd) +@@ -1810,7 +1810,7 @@ static int store_super1(struct supertype abort(); } @@ -555,7 +545,7 @@ index a12a5bc..4e098b0 100644 return 3; sbsize = ROUND_UP(sizeof(*sb) + 2 * __le32_to_cpu(sb->max_dev), 512); -@@ -1866,7 +1866,7 @@ static int write_init_ppl1(struct supertype *st, struct mdinfo *info, int fd) +@@ -1879,7 +1879,7 @@ static int write_init_ppl1(struct supert sizeof(sb->set_uuid))); ppl_hdr->checksum = __cpu_to_le32(~crc32c_le(~0, buf, PPL_HEADER_SIZE)); @@ -564,7 +554,7 @@ index a12a5bc..4e098b0 100644 ret = errno; perror("Failed to seek to PPL header location"); } -@@ -1911,7 +1911,7 @@ static int write_empty_r5l_meta_block(struct supertype *st, int fd) +@@ -1924,7 +1924,7 @@ static int write_empty_r5l_meta_block(st crc = crc32c_le(crc, (void *)mb, META_BLOCK_SIZE); mb->checksum = crc; @@ -573,7 +563,7 @@ index a12a5bc..4e098b0 100644 pr_err("cannot seek to offset of the meta block\n"); goto fail_to_write; } -@@ -2268,7 +2268,7 @@ static int load_super1(struct supertype *st, int fd, char *devname) +@@ -2290,7 +2290,7 @@ static int load_super1(struct supertype return -EINVAL; } @@ -582,7 +572,7 @@ index a12a5bc..4e098b0 100644 if (devname) pr_err("Cannot seek to superblock on %s: %s\n", devname, strerror(errno)); -@@ -2639,7 +2639,7 @@ static int locate_bitmap1(struct supertype *st, int fd, int node_num) +@@ -2675,7 +2675,7 @@ static int locate_bitmap1(struct superty } if (mustfree) free(sb); @@ -591,8 +581,6 @@ index a12a5bc..4e098b0 100644 return ret; } -diff --git a/swap_super.c b/swap_super.c -index b6db574..9c39aff 100644 --- a/swap_super.c +++ b/swap_super.c @@ -16,7 +16,7 @@ @@ -630,7 +618,7 @@ diff --git a/util.c b/util.c index 3d05d07..6109fd4 100644 --- a/util.c +++ b/util.c -@@ -2344,7 +2344,7 @@ int zero_disk_range(int fd, unsigned long long sector, size_t count) +@@ -2387,7 +2387,7 @@ int zero_disk_range(int fd, unsigned lon return -1; } diff --git a/main/mdadm/mdadm-include-sysmacros.patch b/main/mdadm/mdadm-include-sysmacros.patch index 09d755e9398..0919c4b257b 100644 --- a/main/mdadm/mdadm-include-sysmacros.patch +++ b/main/mdadm/mdadm-include-sysmacros.patch @@ -1,10 +1,10 @@ --- a/mdadm.h +++ b/mdadm.h -@@ -34,6 +34,7 @@ - #endif +@@ -35,6 +35,7 @@ extern __off64_t lseek64 __P ((int __fd, + #include <assert.h> #include <sys/types.h> +#include <sys/sysmacros.h> #include <sys/stat.h> + #include <stdarg.h> #include <stdint.h> - #include <stdlib.h> diff --git a/main/mdadm/no-werror.patch b/main/mdadm/no-werror.patch index f1a6b10a4ca..08bbd93dec7 100644 --- a/main/mdadm/no-werror.patch +++ b/main/mdadm/no-werror.patch @@ -1,13 +1,11 @@ -diff --git a/Makefile b/Makefile -index 5fd7f16..5095a42 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ ifeq ($(origin CC),default) CC := $(CROSS_COMPILE)gcc endif CXFLAGS ?= -ggdb --CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -+CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter +-CWFLAGS ?= -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds ++CWFLAGS ?= -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds ifdef WARN_UNUSED - CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 + CWFLAGS += -Wp -O3 endif diff --git a/main/mdadm/util.c-include-limits.h.patch b/main/mdadm/util.c-include-limits.h.patch new file mode 100644 index 00000000000..ddb4aacccff --- /dev/null +++ b/main/mdadm/util.c-include-limits.h.patch @@ -0,0 +1,29 @@ +From 8bda86099089b44129ef6206764f9de47a45f0db Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Tue, 12 Mar 2024 11:01:50 +0100 +Subject: [PATCH] util.c: add limits.h include for NAME_MAX definition + +Add limits.h include for NAME_MAX definition. + +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> +--- + util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util.c b/util.c +index 05ad3343..49a9c6e2 100644 +--- a/util.c ++++ b/util.c +@@ -36,7 +36,7 @@ + #include <ctype.h> + #include <dirent.h> + #include <dlfcn.h> +- ++#include <limits.h> + + /* + * following taken from linux/blkpg.h because they aren't +-- +2.45.0 + diff --git a/main/mdev-conf/APKBUILD b/main/mdev-conf/APKBUILD index ef45021a0ee..a912f2e0819 100644 --- a/main/mdev-conf/APKBUILD +++ b/main/mdev-conf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mdev-conf -pkgver=4.6 +pkgver=4.7 pkgrel=0 pkgdesc="Configuration files for mdev and mdevd" url="https://gitlab.alpinelinux.org/alpine/mdev-conf" @@ -24,5 +24,5 @@ package() { } sha512sums=" -51334962944701e95d3e6da10aa9f9806c89fd10caaed906336f54e8dfa75275c86ed27c6dacac082978a43b3251cfca28e2fd6ec417e628f58c02d84c977d0e mdev-conf-4.6.tar.gz +340a2f788cb860591e2768769a81bda85522e38c3c855ac36c328b7d2e802d940da6ca0aae72e03171ef16ace701fecdee284e65ef74fa903a305234c89dc483 mdev-conf-4.7.tar.gz " diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index 9f6c15156ed..579599012f4 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa -pkgver=24.0.6 -pkgrel=0 +pkgver=24.1.0 +pkgrel=2 pkgdesc="Mesa DRI OpenGL library" url="https://www.mesa3d.org" arch="all" @@ -52,8 +52,10 @@ makedepends=" libxxf86vm-dev llvm$_llvmver-dev meson + py3-cparser py3-mako py3-packaging + py3-ply python3 vulkan-loader-dev wayland-dev @@ -64,8 +66,8 @@ makedepends=" " source=" https://mesa.freedesktop.org/archive/mesa-${pkgver/_/-}.tar.xz - enable-mali-t600.patch no-unlink-megadrivers.patch + musl-fix-stack-overflow.patch " replaces="mesa-dricore" options="!check" # we skip tests intentionally @@ -122,7 +124,7 @@ x86) esac case "$CARCH" in -aarch64|x86_64) +aarch64|x86|x86_64) _rusticl=true makedepends=" $makedepends @@ -370,7 +372,7 @@ _vulkan_layers() { } sha512sums=" -60fcc77132c3cb0c98e650d97d3324bfd18abe7f8f8a3aa5209f71b2fddd94510f939bbf5272b2241749307184d5badde9da4842be57ce13f5760875885ea6fc mesa-24.0.6.tar.xz -450e9c61a62487e2cc83e03a05521d40a48294118b1af9d56220fb546c50fedd61f1f005b85c5e956e23eb2397f696fe1bbf9626253c99233278ca406b75543b enable-mali-t600.patch +4b7ed1940fc812ef4efb55978d3ffe3d0e2ae53d5b57a3baca10a52db2ba5852c5ee7e75c3739bd8d384c80bf1cba970a384250050f01f03bba98f255e12cec5 mesa-24.1.0.tar.xz e3d39d61b14188cd5a22e19e8c065650995f85943e6c42ec5775db5b76a9ebe8913253a8b9ac32056ac13a2c357cd951f867ecb39976c52f7d014dcc1a2d87dc no-unlink-megadrivers.patch +2a8b0d3288359d698707b2e504305c39de2ce510ec79a32b6493d6f446085dc0079ae9f6fea1aa1809481d45cb96a21414c23d638c89d1ad40f1c9b11a623dea musl-fix-stack-overflow.patch " diff --git a/main/mesa/enable-mali-t600.patch b/main/mesa/enable-mali-t600.patch deleted file mode 100644 index 4cbbf87476d..00000000000 --- a/main/mesa/enable-mali-t600.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e3111262ee009bfa2a0aad202aaf535715e38ec7 Mon Sep 17 00:00:00 2001 -From: Anton Bambura <jenneron@postmarketos.org> -Date: Thu, 8 Feb 2024 10:01:58 +0000 -Subject: [PATCH] panfrost: Enable Mali-T600 - -Upstream MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27519 - -Signed-off-by: Anton Bambura <jenneron@postmarketos.org> ---- - src/panfrost/lib/pan_props.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/panfrost/lib/pan_props.c b/src/panfrost/lib/pan_props.c -index 55871169638fd..f2da5f6e82a78 100644 ---- a/src/panfrost/lib/pan_props.c -+++ b/src/panfrost/lib/pan_props.c -@@ -46,6 +46,7 @@ - /* Table of supported Mali GPUs */ - /* clang-format off */ - const struct panfrost_model panfrost_model_list[] = { -+ MODEL(0x600, "T600", "T60x", NO_ANISO, 8192, {}), - MODEL(0x620, "T620", "T62x", NO_ANISO, 8192, {}), - MODEL(0x720, "T720", "T72x", NO_ANISO, 8192, { .no_hierarchical_tiling = true }), - MODEL(0x750, "T760", "T76x", NO_ANISO, 8192, {}), --- -GitLab - diff --git a/main/mesa/musl-fix-stack-overflow.patch b/main/mesa/musl-fix-stack-overflow.patch new file mode 100644 index 00000000000..2c079b86e62 --- /dev/null +++ b/main/mesa/musl-fix-stack-overflow.patch @@ -0,0 +1,147 @@ +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10988 + +From 4692869492255f199163bda26876174ea54a2861 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 24 May 2024 11:56:46 +0200 +Subject: [PATCH] nir/opt_varyings: reduce stack usage + +Avoid put a huge struct on stack to fix a stack overflow on musl libc. + +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10988 +Fixes: commit c66967b5cb7a (nir: add nir_opt_varyings, new pass optimizing and compacting varyings) +--- + src/compiler/nir/nir_opt_varyings.c | 52 ++++++++++++++++------------- + 1 file changed, 29 insertions(+), 23 deletions(-) + +diff --git a/src/compiler/nir/nir_opt_varyings.c b/src/compiler/nir/nir_opt_varyings.c +index c32cda66c93c4..0aded7fbc7201 100644 +--- a/src/compiler/nir/nir_opt_varyings.c ++++ b/src/compiler/nir/nir_opt_varyings.c +@@ -485,6 +485,7 @@ + #include "nir.h" + #include "nir_builder.h" + #include "util/u_math.h" ++#include "util/u_memory.h" + + /* nir_opt_varyings works at scalar 16-bit granularity across all varyings. + * +@@ -4205,11 +4206,12 @@ free_linkage(struct linkage_info *linkage) + static void + print_shader_linkage(nir_shader *producer, nir_shader *consumer) + { +- struct linkage_info linkage; ++ struct linkage_info *linkage = MALLOC_STRUCT(linkage_info); + +- init_linkage(producer, consumer, false, 0, 0, &linkage); +- print_linkage(&linkage); +- free_linkage(&linkage); ++ init_linkage(producer, consumer, false, 0, 0, linkage); ++ print_linkage(linkage); ++ free_linkage(linkage); ++ FREE(linkage); + } + + /** +@@ -4226,6 +4228,11 @@ nir_opt_varyings(nir_shader *producer, nir_shader *consumer, bool spirv, + if (producer->info.stage == MESA_SHADER_TASK) + return 0; + ++ nir_opt_varyings_progress progress = 0; ++ struct linkage_info *linkage = MALLOC_STRUCT(linkage_info); ++ if (linkage == NULL) ++ return 0; ++ + /* Producers before a fragment shader must have up-to-date vertex + * divergence information. + */ +@@ -4235,19 +4242,17 @@ nir_opt_varyings(nir_shader *producer, nir_shader *consumer, bool spirv, + nir_vertex_divergence_analysis(producer); + } + +- nir_opt_varyings_progress progress = 0; +- struct linkage_info linkage; + init_linkage(producer, consumer, spirv, max_uniform_components, +- max_ubos_per_stage, &linkage); ++ max_ubos_per_stage, linkage); + + /* Part 1: Run optimizations that only remove varyings. (they can move + * instructions between shaders) + */ +- remove_dead_varyings(&linkage, &progress); +- propagate_uniform_expressions(&linkage, &progress); ++ remove_dead_varyings(linkage, &progress); ++ propagate_uniform_expressions(linkage, &progress); + + /* Part 2: Deduplicate outputs. */ +- deduplicate_outputs(&linkage, &progress); ++ deduplicate_outputs(linkage, &progress); + + /* Run CSE on the consumer after output deduplication because duplicated + * loads can prevent finding the post-dominator for inter-shader code +@@ -4256,17 +4261,17 @@ nir_opt_varyings(nir_shader *producer, nir_shader *consumer, bool spirv, + NIR_PASS(_, consumer, nir_opt_cse); + + /* Re-gather linkage info after CSE. */ +- free_linkage(&linkage); ++ free_linkage(linkage); + init_linkage(producer, consumer, spirv, max_uniform_components, +- max_ubos_per_stage, &linkage); ++ max_ubos_per_stage, linkage); + /* This must be done again to clean up bitmasks in linkage. */ +- remove_dead_varyings(&linkage, &progress); ++ remove_dead_varyings(linkage, &progress); + + /* This must be done after deduplication and before inter-shader code + * motion. + */ +- tidy_up_convergent_varyings(&linkage); +- find_open_coded_tes_input_interpolation(&linkage); ++ tidy_up_convergent_varyings(linkage); ++ find_open_coded_tes_input_interpolation(linkage); + + /* Part 3: Run optimizations that completely change varyings. */ + #if PRINT +@@ -4278,31 +4283,32 @@ nir_opt_varyings(nir_shader *producer, nir_shader *consumer, bool spirv, + puts(""); + #endif + +- while (backward_inter_shader_code_motion(&linkage, &progress)) { ++ while (backward_inter_shader_code_motion(linkage, &progress)) { + #if PRINT + i++; + printf("Finished: %i\n", i); +- nir_print_shader(linkage.producer_builder.shader, stdout); +- nir_print_shader(linkage.consumer_builder.shader, stdout); +- print_linkage(&linkage); ++ nir_print_shader(linkage->producer_builder.shader, stdout); ++ nir_print_shader(linkage->consumer_builder.shader, stdout); ++ print_linkage(linkage); + puts(""); + #endif + } + + /* Part 4: Do compaction. */ +- compact_varyings(&linkage, &progress); ++ compact_varyings(linkage, &progress); + +- nir_metadata_preserve(linkage.producer_builder.impl, ++ nir_metadata_preserve(linkage->producer_builder.impl, + progress & nir_progress_producer ? + (nir_metadata_block_index | + nir_metadata_dominance) : + nir_metadata_all); +- nir_metadata_preserve(linkage.consumer_builder.impl, ++ nir_metadata_preserve(linkage->consumer_builder.impl, + progress & nir_progress_consumer ? + (nir_metadata_block_index | + nir_metadata_dominance) : + nir_metadata_all); +- free_linkage(&linkage); ++ free_linkage(linkage); ++ FREE(linkage); + + if (progress & nir_progress_producer) + nir_validate_shader(producer, "nir_opt_varyings"); +-- +GitLab + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 94031574b57..7945a855dfb 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs -pkgver=3.9.1 +pkgver=3.10.0 # shellcheck disable=SC2034 # used for git versions, keep around for next time _ver=${pkgver%_git*} pkgrel=0 @@ -41,5 +41,5 @@ package() { } sha512sums=" -217ae1353dad9bf5e5c7ebb25f281c80493c2bad16fe99aa079a30a9196918ac39fd02c54d59de19f338e07f93f9297945d621d32a6d802f0f01d93df89398d1 mkinitfs-3.9.1.tar.gz +a2711c7264b145cb826a10ebef9f6923c18693d9bfa3e4a0e2f5af908dbd0e3f17b6b0824928ee0d3a6282f0d9c43d8130b2884cf17e2796cdf737b1f5be37de mkinitfs-3.10.0.tar.gz " diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD index 5f40cc7da30..ad155292022 100644 --- a/main/musl/APKBUILD +++ b/main/musl/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=musl pkgver=1.2.5 -pkgrel=0 +pkgrel=1 pkgdesc="the musl c library (libc) implementation" url="https://musl.libc.org/" arch="all" @@ -21,6 +21,7 @@ nolibc) ;; esac source="https://musl.libc.org/releases/musl-$pkgver.tar.gz handle-aux-at_base.patch + ldso-fix-non-functional-fix-to-early-dynamic-PAGE_SI.patch ldconfig __stack_chk_fail_local.c @@ -161,6 +162,7 @@ dev() { sha512sums=" 7bb7f7833923cd69c7a1a9b8a5f1784bfd5289663eb6061dcd43d583e45987df8a68a1be05d75cc1c88a3f5b610653d1a70f4a9cff4d8f7fd41ae73ee058c17c musl-1.2.5.tar.gz a76f79b801497ad994746cf82bb6eaf86f9e1ae646e6819fbae8532a7f4eee53a96ac1d4e789ec8f66aea2a68027b0597f7a579b3369e01258da8accfce41370 handle-aux-at_base.patch +1b85079c706b017106ecbf4afbc65b4a2171297a673035645e4c3ddb7e2aae0549b04932df83778323b7329ae8d32160a89e0c1b2534c278708c61b1f40a1ed8 ldso-fix-non-functional-fix-to-early-dynamic-PAGE_SI.patch 8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f ldconfig 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b __stack_chk_fail_local.c 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d getconf.c diff --git a/main/musl/ldso-fix-non-functional-fix-to-early-dynamic-PAGE_SI.patch b/main/musl/ldso-fix-non-functional-fix-to-early-dynamic-PAGE_SI.patch new file mode 100644 index 00000000000..05bbd99d7f4 --- /dev/null +++ b/main/musl/ldso-fix-non-functional-fix-to-early-dynamic-PAGE_SI.patch @@ -0,0 +1,48 @@ +From 6f666231bf51703fadbef10460d462fb573548a1 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Tue, 7 May 2024 08:18:49 -0400 +Subject: [PATCH] ldso: fix non-functional fix to early dynamic PAGE_SIZE + access + +commit f47a8cdd250d9163fcfb39bf4e9d813957c0b187 introduced an +alternate mechanism for access to runtime page size for compatibility +with early stages of dynamic linking, but because pthread_impl.h +indirectly includes libc.h, the condition #ifndef PAGE_SIZE was never +satisfied. + +rather than depend on order of inclusion, use the (baseline POSIX) +macro PAGESIZE, not the (XSI) macro PAGE_SIZE, to determine whether +page size is dynamic. our internal libc.h only provides a dynamic +definition for PAGE_SIZE, not for PAGESIZE. +--- + ldso/dynlink.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/ldso/dynlink.c b/ldso/dynlink.c +index 324aa859..42687da2 100644 +--- a/ldso/dynlink.c ++++ b/ldso/dynlink.c +@@ -21,15 +21,17 @@ + #include <sys/membarrier.h> + #include "pthread_impl.h" + #include "fork_impl.h" ++#include "libc.h" + #include "dynlink.h" + + static size_t ldso_page_size; +-#ifndef PAGE_SIZE ++/* libc.h may have defined a macro for dynamic PAGE_SIZE already, but ++ * PAGESIZE is only defined if it's constant for the arch. */ ++#ifndef PAGESIZE ++#undef PAGE_SIZE + #define PAGE_SIZE ldso_page_size + #endif + +-#include "libc.h" +- + #define malloc __libc_malloc + #define calloc __libc_calloc + #define realloc __libc_realloc +-- +2.27.0 + diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD index 2c9d2c93de4..93533f8253c 100644 --- a/main/nagios/APKBUILD +++ b/main/nagios/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> pkgname=nagios -pkgver=4.5.1 +pkgver=4.5.2 pkgrel=0 pkgdesc="Popular monitoring tool" url="https://www.nagios.org/" @@ -73,7 +73,7 @@ apache() { } sha512sums=" -71b57d4e0bd2971e8e62b7013c406888d0afd40bc23b032ee9bfdb6e2b3cb083746c5259ef997df241249d2ddaafd6ba5a6470527feddf02e03da32cc0c724b9 nagios-4.5.1.tar.gz +a44a54e564a21e974f242491c3cd34a6d7f1f9363e1750d6e2cd5d3b48da181c4dd02e23efb966c1da70f0ef3cdb15308dc9e93bd43c8feef9eb49ca3b87ef96 nagios-4.5.2.tar.gz 8575902dcb7252f195847f9997b424c1ef9bee7dfacdd124c922fc119f583923c34847ce77c505783662d91f7290b1a85dc5e382ac50d177406bfb3876d4e40a nagios.confd a004ed1cf8e7d9faeb849cd714095dbe5157c707618d2cce92c98c78604b896bb806b55aa69b2db8ca3e954bd629f9e3db5d2676015f87d6be5da32fa9ec5664 nagios.initd 6f1448db1964e378dbc7460a6d321638f4d0f7a08bc078824edca12fb6653fb0200b3be365fa519e7b2ff566802701878975bb97e65d65dc54d3da34dae21588 lighttpd-nagios.conf diff --git a/main/nghttp2/APKBUILD b/main/nghttp2/APKBUILD index 59cc0f01147..906dcb044b3 100644 --- a/main/nghttp2/APKBUILD +++ b/main/nghttp2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=nghttp2 -pkgver=1.61.0 +pkgver=1.62.0 pkgrel=0 pkgdesc="HTTP/2 C client, server and proxy" url="https://nghttp2.org" @@ -73,5 +73,5 @@ package() { } sha512sums=" -01e930d7caf464699505f92b76e2bc8192d168612dc564d2546812c42afea2fb81d552d70e8a5fed35e2bf5deadbec8eda095af94a2484bca41542988afce52a nghttp2-1.61.0.tar.xz +1674e269dcf1067312056e5ea0e7108a48a177888fbaae5a194bddcc9640babc996d86e74e3160cd0dc4a360f0440441116259f3b44a3ca5fea081cdff7e7c88 nghttp2-1.62.0.tar.xz " diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD index 5bb5917ea12..79c8e15741d 100644 --- a/main/nginx/APKBUILD +++ b/main/nginx/APKBUILD @@ -37,7 +37,7 @@ 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.26.0 -pkgrel=0 +pkgrel=2 # Revision of nginx-tests to use for check(). _tests_hgrev=22f45bf99a9e _njs_ver=0.8.4 @@ -94,6 +94,7 @@ source="https://nginx.org/download/nginx-$pkgver.tar.gz traffic-accounting-nginx-module~fix-memory-leak.patch nginx_cookie_flag_module~fix-mem-allocations.patch njs~mktemp-busybox-compat.patch + njs~improve-checking-for-duplicate-js_set.patch naxsi~assert.patch naxsi~ff-header.patch naxsi~compat.patch @@ -106,6 +107,7 @@ source="https://nginx.org/download/nginx-$pkgver.tar.gz nginx-upload-module~fixes.patch nginx-upload-module~fix-nginx-compat.patch zstd-nginx-module~fix-infinite-loop.patch + ngx_slowfs_cache~nginx-1.8.x-compat.patch nginx.conf default.conf stream.conf @@ -118,7 +120,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 @@ -232,6 +234,9 @@ _http_set_misc_depends="$pkgname-mod-devel-kit" _add_module "http-shibboleth" "v2.0.2" "https://github.com/nginx-shib/nginx-http-shibboleth" +_add_module "http-slowfs-cache" "1.11" "https://github.com/dvershinin/ngx_slowfs_cache" +_http_slowfs_cache_so="ngx_http_slowfs_module.so" + _add_module "http-untar" "v1.1" "https://github.com/ajax16384/ngx_http_untar_module" _add_module "http-upload" "2.3.0" "https://github.com/fdintino/nginx-upload-module" @@ -365,13 +370,6 @@ check() { msg "Running nginx tests..." cd "$srcdir"/nginx-tests-* - case "$CARCH" in - mips*) - # Sporadic failure on builder. - rm ssl.t - ;; - esac - : ${JOBS:-1} TEST_NGINX_BINARY="$builddir/objs/nginx" prove -j $((JOBS > 20 ? 20 : JOBS)) . @@ -508,6 +506,7 @@ c89fab6d3d4226e37f2a8d2122d825046fc9a787e464fc75351a19fbda5b47016ddb907e0a61241a 5a7e72fc6ade460b725e6b91d5eafeb2792ad9832fbdb84ed868bd9a25d43116e42877df587b5f3885a1e38769f072ed4e8605393aca672d61bc71dd106d392b traffic-accounting-nginx-module~fix-memory-leak.patch ac0f912ae90e0083cc761a622290223edeed0bd32213bbe766d637ac2dfd9835d163e5d16ef28740cbad05d6d92cc418d62df3413c70b4f2c63db02f8ca1c7cc nginx_cookie_flag_module~fix-mem-allocations.patch 4db527d663dbe9e8b503c3cbaa4eae34b45990a5359b3bb98ce970c705faefcac98de49439f2557756a2be8e2e06acc67f98942de01674c498832d80c3cb90c3 njs~mktemp-busybox-compat.patch +79f9e609d79783d098e2f93eb7d6b051b694e12a7dfc5edaa200f38966e66e5c990c6d2496d7854dbfc341e2a1203af1e91b50cfa506e768b64145fd54c75c61 njs~improve-checking-for-duplicate-js_set.patch eee45b82a594c4dfa5eecf94cf14cd247bd1dd7d627aa0a26666828b3e2da1a358da251a23f0b5feeb5f95f6ba205af6ead54c1e6bcb67f6d11149c0580de3af naxsi~assert.patch 7c35f51d73b6c20b6b9b030e76a4898752eae38e0f8e4001286a93633f0b1b11c39fd883116d86a323338027766d15d99c824a9cd9ffe934bea80b7af2a3070c naxsi~ff-header.patch 3e000d58e1259a656bb49af23623e6542ec994e3fe699e0005afde9ded5d505e7a174b206390b55ef639e53fd47516a86d88de675df86d550808da1d2732e683 naxsi~compat.patch @@ -520,6 +519,7 @@ abda15727e34178db2f8013a1c47e480ba323a3b3b88a44bbada0169b8ce66743911ec7b551272fc ef57603bd65ffbbb216fd748dab0126d3df7aafdfa70dce0ea9ef91373df95269546ec2fcaa03f842a8db3a16879274184a23b18db17b4f9be3916aedacb7765 nginx-upload-module~fixes.patch bae6c3153810bf6f460248668f2c48e332aba37081e25e45a1691344508530ef1be9acee4d52f506cb09510c4fce8d93ca3178ba45af771c54e37126f4f11b1b nginx-upload-module~fix-nginx-compat.patch 97ed3a3ad636a8853a993db3a33c67da303063e7ac43c20eeac6afb9f71adafa5dedf5f5f8c6705a256294c0566e3ac9f5fa41930048ad80b10a7d2a7d3c9b53 zstd-nginx-module~fix-infinite-loop.patch +f3bddaea6a52917d57a3cac84a90ca3951e09b976b69dba2ee7559d64f52b781ab13185d9fac18af1abdbfffd80561167a391d7e2fc73e04104444e5cc9f82b0 ngx_slowfs_cache~nginx-1.8.x-compat.patch c209a220b6afc9354a1c4c39817199327425485b3da44778d632cdfd1d95b8412c58ba9b27a5c96599e7a34cc039f5b7d914ad82153c610b27dfbe21fdcdca77 nginx.conf 0907f69dc2d3dc1bad3a04fb6673f741f1a8be964e22b306ef9ae2f8e736e1f5733a8884bfe54f3553fff5132a0e5336716250f54272c3fec2177d6ba16986f3 default.conf 426f0c317322af7cab152f2070398c7aa5c059276ba504617a212f1e060bbb1dd9edc54e62d4cf5f14e3678235351c808ebeabe8b122757c74b3f505e8427106 stream.conf @@ -548,6 +548,7 @@ d7aac69b5eceeb1b0db4741201159ade1e0e7f6f7c3e8c4afa2f8959c6c00c3b5285d5185747c2fb d6ca250db8de93edbd7875afca35e73cecdaf82132d1a7ee933cf94c6b8afa8e629e9e647a9321f2bc1fbb92137ec0d32dcd89b82ac5fae31e342537fb7e0431 redis2-nginx-module-0.15.tar.gz 1ff4c947538a5bd5f9d6adcd87b37f2702f5cc90e3342bc08359cbe8f290b705a3a2daa3dedfb1df3ce4bc19478c8fcac07081c4a53a804fc2862d50078278dc set-misc-nginx-module-0.33.tar.gz 0f0c5167e999ffad0caa816d4b7d0a121f0598d578391834fe3293a3e023453d91b36ffc32a431ff3af3f9f376d2d78703998560094d20643b4049c2fec84bda nginx-http-shibboleth-2.0.2.tar.gz +3ace47ec7b93af1cbe513ee1c98c51ca7c14bb1824e1d70c0718b6279125fb34451cd41983ef384ea1549685779cba31c4f514f1c48c1fe90e80174b33269e97 ngx_slowfs_cache-1.11.tar.gz c3a7dd29c4a4e47d396b19622a290a04d4cceb97c1b8a508bc984eb8c81d17da4bf5789514bb996987f8343bc801ee4457a86a274bde98b49a809afdfc04cbde ngx_http_untar_module-1.1.tar.gz a0da355888398f86a6b5d065e58c05f9e057589ee785be9f515d77d7a020ae5a7b0656f5af30fb3b026f457326db2e26f4fed29026221ec5fc8156ef8586da25 nginx-upload-module-2.3.0.tar.gz c31c46344d49704389722325a041b9cd170fa290acefe92cfc572c07f711cd3039de78f28df48ca7dcb79b2e4bbe442580aaaf4d92883fd3a14bf41d66dd9d8c nginx-upload-progress-module-0.9.2.tar.gz diff --git a/main/nginx/ngx_slowfs_cache~nginx-1.8.x-compat.patch b/main/nginx/ngx_slowfs_cache~nginx-1.8.x-compat.patch new file mode 100644 index 00000000000..94c51f86bfc --- /dev/null +++ b/main/nginx/ngx_slowfs_cache~nginx-1.8.x-compat.patch @@ -0,0 +1,65 @@ +--- a/ngx_http_slowfs_module.c 2013-03-07 17:01:55.000000000 +0400 ++++ b/ngx_http_slowfs_module.c 2023-03-13 13:34:38.294577255 +0300 +@@ -62,6 +62,12 @@ + ngx_int_t ngx_http_slowfs_cache_status(ngx_http_request_t *, + ngx_http_variable_value_t *, uintptr_t); + ++static void * ngx_http_slowfs_create_main_conf(ngx_conf_t *cf); ++ ++typedef struct { ++ ngx_array_t caches; /* ngx_http_file_cache_t * */ ++} ngx_http_slowfs_main_conf_t; ++ + typedef struct { + ngx_flag_t enabled; + ngx_shm_zone_t *cache; +@@ -108,8 +114,8 @@ + { ngx_string("slowfs_cache_path"), + NGX_HTTP_MAIN_CONF|NGX_CONF_2MORE, + ngx_http_file_cache_set_slot, +- 0, +- 0, ++ NGX_HTTP_MAIN_CONF_OFFSET, ++ offsetof(ngx_http_slowfs_main_conf_t, caches), + &ngx_http_slowfs_module }, + + { ngx_string("slowfs_cache_min_uses"), +@@ -156,7 +162,7 @@ + ngx_http_slowfs_add_variables, /* preconfiguration */ + ngx_http_slowfs_init, /* postconfiguration */ + +- NULL, /* create main configuration */ ++ ngx_http_slowfs_create_main_conf, /* create main configuration */ + NULL, /* init main configuration */ + + NULL, /* create server configuration */ +@@ -1170,6 +1176,29 @@ + return NGX_OK; + } + ++static void * ++ngx_http_slowfs_create_main_conf(ngx_conf_t *cf) ++{ ++ ngx_http_slowfs_main_conf_t *conf; ++ ++ conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_slowfs_main_conf_t)); ++ if (conf == NULL) { ++ return NULL; ++ } ++ ++#if (NGX_HTTP_CACHE) ++ if (ngx_array_init(&conf->caches, cf->pool, 4, ++ sizeof(ngx_http_file_cache_t *)) ++ != NGX_OK) ++ { ++ return NULL; ++ } ++#endif ++ ++ return conf; ++} ++ ++ + #else /* !NGX_HTTP_CACHE */ + + diff --git a/main/nginx/njs~improve-checking-for-duplicate-js_set.patch b/main/nginx/njs~improve-checking-for-duplicate-js_set.patch new file mode 100644 index 00000000000..4d5b714bd9a --- /dev/null +++ b/main/nginx/njs~improve-checking-for-duplicate-js_set.patch @@ -0,0 +1,249 @@ +Patch-Source: https://github.com/nginx/njs/commit/5ab8d47c6d59ce21feae1541d4b7acb1289570dc +See-Also: https://github.com/nginx/njs/issues/705 +-- +From 5ab8d47c6d59ce21feae1541d4b7acb1289570dc Mon Sep 17 00:00:00 2001 +From: Dmitry Volyntsev <xeioex@nginx.com> +Date: Mon, 22 Apr 2024 17:51:45 -0700 +Subject: [PATCH] Modules: improved checking for duplicate js_set variables. + +Since 6fb1aca4eeaf (0.8.4) the identical js_set variables introduced as +a part of an include file that is shared amongst multiple vhosts are +rejected during configuration parsing. + +The patch ignores duplicate js_set variables when they refer to the same +JS function. + +This fixes #705 issue on Github. +--- + nginx/ngx_http_js_module.c | 15 ++++++-- + nginx/ngx_stream_js_module.c | 15 ++++++-- + nginx/t/js_dup_set.t | 74 ++++++++++++++++++++++++++++++++++++ + nginx/t/stream_js_dup_set.t | 72 +++++++++++++++++++++++++++++++++++ + 4 files changed, 168 insertions(+), 8 deletions(-) + create mode 100644 nginx/t/js_dup_set.t + create mode 100644 nginx/t/stream_js_dup_set.t + +diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c +index ef494d482..d280ca0f6 100644 +--- a/nginx/ngx_http_js_module.c ++++ b/nginx/ngx_http_js_module.c +@@ -4732,7 +4732,7 @@ ngx_http_js_periodic(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) + static char * + ngx_http_js_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) + { +- ngx_str_t *value, *fname; ++ ngx_str_t *value, *fname, *prev; + ngx_http_variable_t *v; + + value = cf->args->elts; +@@ -4759,9 +4759,16 @@ ngx_http_js_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) + *fname = value[2]; + + if (v->get_handler == ngx_http_js_variable_set) { +- ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, +- "variable \"%V\" is already declared", &value[1]); +- return NGX_CONF_ERROR; ++ prev = (ngx_str_t *) v->data; ++ ++ if (fname->len != prev->len ++ || ngx_strncmp(fname->data, prev->data, fname->len) != 0) ++ { ++ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ++ "variable \"%V\" is redeclared with " ++ "different function name", &value[1]); ++ return NGX_CONF_ERROR; ++ } + } + + v->get_handler = ngx_http_js_variable_set; +diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c +index 088b5229a..b8b29a560 100644 +--- a/nginx/ngx_stream_js_module.c ++++ b/nginx/ngx_stream_js_module.c +@@ -2191,7 +2191,7 @@ ngx_stream_js_periodic(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) + static char * + ngx_stream_js_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) + { +- ngx_str_t *value, *fname; ++ ngx_str_t *value, *fname, *prev; + ngx_stream_variable_t *v; + + value = cf->args->elts; +@@ -2218,9 +2218,16 @@ ngx_stream_js_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) + *fname = value[2]; + + if (v->get_handler == ngx_stream_js_variable_set) { +- ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, +- "variable \"%V\" is already declared", &value[1]); +- return NGX_CONF_ERROR; ++ prev = (ngx_str_t *) v->data; ++ ++ if (fname->len != prev->len ++ || ngx_strncmp(fname->data, prev->data, fname->len) != 0) ++ { ++ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ++ "variable \"%V\" is redeclared with " ++ "different function name", &value[1]); ++ return NGX_CONF_ERROR; ++ } + } + + v->get_handler = ngx_stream_js_variable_set; +diff --git a/nginx/t/js_dup_set.t b/nginx/t/js_dup_set.t +new file mode 100644 +index 000000000..317eaffac +--- /dev/null ++++ b/nginx/t/js_dup_set.t +@@ -0,0 +1,74 @@ ++#!/usr/bin/perl ++ ++# (C) Dmitry Volyntsev ++# (C) Nginx, Inc. ++ ++# Tests for http njs module, duplicate identical js_set directives. ++ ++############################################################################### ++ ++use warnings; ++use strict; ++ ++use Test::More; ++ ++BEGIN { use FindBin; chdir($FindBin::Bin); } ++ ++use lib 'lib'; ++use Test::Nginx; ++ ++############################################################################### ++ ++select STDERR; $| = 1; ++select STDOUT; $| = 1; ++ ++my $t = Test::Nginx->new()->has(qw/http/) ++ ->write_file_expand('nginx.conf', <<'EOF'); ++ ++%%TEST_GLOBALS%% ++ ++daemon off; ++ ++events { ++} ++ ++http { ++ %%TEST_GLOBALS_HTTP%% ++ ++ js_import test.js; ++ ++ server { ++ listen 127.0.0.1:8080; ++ server_name localhost; ++ ++ location /set1 { ++ js_set $test test.foo; ++ return 200 set1:$test; ++ } ++ ++ location /set2 { ++ js_set $test test.foo; ++ return 200 set2:$test; ++ } ++ } ++} ++ ++EOF ++ ++$t->write_file('test.js', <<EOF); ++ function foo(r) { ++ return 42; ++ } ++ ++ export default {foo}; ++ ++EOF ++ ++$t->try_run('no njs')->plan(2); ++ ++############################################################################### ++ ++like(http_get('/set1'), qr/set1:42/, '/set1 location'); ++like(http_get('/set2'), qr/set2:42/, '/set2 location'); ++ ++############################################################################### +diff --git a/nginx/t/stream_js_dup_set.t b/nginx/t/stream_js_dup_set.t +new file mode 100644 +index 000000000..09669240b +--- /dev/null ++++ b/nginx/t/stream_js_dup_set.t +@@ -0,0 +1,72 @@ ++#!/usr/bin/perl ++ ++# (C) Dmitry Volyntsev ++# (C) Nginx, Inc. ++ ++# Tests for stream njs module, duplicate identical js_set directives. ++ ++############################################################################### ++ ++use warnings; ++use strict; ++ ++use Test::More; ++ ++BEGIN { use FindBin; chdir($FindBin::Bin); } ++ ++use lib 'lib'; ++use Test::Nginx; ++use Test::Nginx::Stream qw/ stream /; ++ ++############################################################################### ++ ++select STDERR; $| = 1; ++select STDOUT; $| = 1; ++ ++my $t = Test::Nginx->new()->has(qw/stream stream_return/) ++ ->write_file_expand('nginx.conf', <<'EOF'); ++ ++%%TEST_GLOBALS%% ++ ++daemon off; ++ ++events { ++} ++ ++stream { ++ %%TEST_GLOBALS_STREAM%% ++ ++ js_import test.js; ++ ++ server { ++ listen 127.0.0.1:8081; ++ js_set $test test.foo; ++ return 8081:$test; ++ } ++ ++ server { ++ listen 127.0.0.1:8082; ++ js_set $test test.foo1; ++ return 8082:$test; ++ } ++} ++ ++EOF ++ ++$t->write_file('test.js', <<EOF); ++ function foo(r) { ++ return 42; ++ } ++ ++ export default {foo}; ++ ++EOF ++ ++$t->try_run('no njs available')->plan(2); ++ ++############################################################################### ++ ++is(stream('127.0.0.1:' . port(8081))->read(), '8081:42', '8081 server'); ++is(stream('127.0.0.1:' . port(8082))->read(), '8082:42', '8082 server'); ++ ++############################################################################### diff --git a/main/ngtcp2/APKBUILD b/main/ngtcp2/APKBUILD index dfc48725110..51783f006d1 100644 --- a/main/ngtcp2/APKBUILD +++ b/main/ngtcp2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=ngtcp2 -pkgver=1.4.0 +pkgver=1.5.0 pkgrel=0 pkgdesc="Implementation of IETF QUIC protocol" url="https://nghttp2.org/ngtcp2/" @@ -65,5 +65,5 @@ gnutls() { } sha512sums=" -6491f158cd3bd659d593810935ceedefea8ee4a77e0a1952c0300f83188d0af1ef8313b24f9dbd3e7a795b6ad9099d2681b70ff1bafd92eed429ee028b2f2dea ngtcp2-1.4.0.tar.xz +6c05beccac5d53c575ceaa594ac6b1d91ae9f0be01394b3520e84b51a44d3c6a71612c2c6f613d3d1b9d2992a83a68696fedbfdc3842f02d4009c95b463ad97f ngtcp2-1.5.0.tar.xz " diff --git a/main/nodejs/APKBUILD b/main/nodejs/APKBUILD index d163530c6e6..9f474ca272b 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.2 +pkgver=20.13.1 pkgrel=0 pkgdesc="JavaScript runtime built on V8 engine - LTS version" url="https://nodejs.org/" @@ -270,7 +270,7 @@ dev() { } sha512sums=" -25d35c0be251e557ba8b3115b75f38aa20000e2abcabcfd40143528c64d4db8a1eba338847f90be539e4918e62fb52840ff0ae9a8f5224f03335fc28d575cb36 node-v20.12.2.tar.gz +1c423d35b4e05e8e9e5b4b964195485818340e31ec5b9ff6cfd9c9a019d512da16eea4647607d73203e147af3017cd38faace480c672f85b8e8dba1bfacd96c9 node-v20.13.1.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/nvme-cli/APKBUILD b/main/nvme-cli/APKBUILD index 82201da4077..61d1c546ead 100644 --- a/main/nvme-cli/APKBUILD +++ b/main/nvme-cli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Florian Heigl <florian.heigl@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=nvme-cli -pkgver=2.8 +pkgver=2.9.1 pkgrel=0 pkgdesc="NVM-Express user space tooling for Linux" arch="all" @@ -24,7 +24,8 @@ subpackages=" $pkgname-bash-completion $pkgname-zsh-completion " -source="$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/nvme-cli/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/nvme-cli/archive/v$pkgver.tar.gz + stdint.patch" options="!check" # needs pci nvme stuff build() { @@ -46,5 +47,6 @@ package() { } sha512sums=" -1be0bed4e1bf8a25229f301c2b00b78d2de4eaf8ff2b815fa75e44dd35ddd7787604152bdf00696130df3281206a734c5f408c3f2127440e05c2e4b1cdbb79d4 nvme-cli-2.8.tar.gz +c9c86e7567c2d4c59aff1eb9d18f4775923db3c81a89c628b819121c32150d4bc2d65d0dacac764c64594369890b380d0fd06bc7c1f83f4a7f3e71a51a6fee24 nvme-cli-2.9.1.tar.gz +3f9ae251a81d454149b79bd7079949d06743a01416472da742abf9c713f5108024d466bc3339cb67e2bc20435a9ec5e18dc01a6786c85493053f31f9f5408046 stdint.patch " diff --git a/main/nvme-cli/stdint.patch b/main/nvme-cli/stdint.patch new file mode 100644 index 00000000000..77364f89409 --- /dev/null +++ b/main/nvme-cli/stdint.patch @@ -0,0 +1,15 @@ +--- a/plugins/ssstc/ssstc-nvme.c ++++ b/plugins/ssstc/ssstc-nvme.c +@@ -64,9 +64,9 @@ + unsigned int nsid, const char *devname) + { + struct json_object *root, *entry_stats, *dev_stats, *multi; +- __uint16_t wear_level_min = 0; +- __uint16_t wear_level_max = 0; +- __uint16_t wear_level_avg = 0; ++ uint16_t wear_level_min = 0; ++ uint16_t wear_level_max = 0; ++ uint16_t wear_level_avg = 0; + uint64_t raw_val = 0; + + root = json_create_object(); diff --git a/main/oidentd/APKBUILD b/main/oidentd/APKBUILD index 7ebe0eccee9..e49b5b51b21 100644 --- a/main/oidentd/APKBUILD +++ b/main/oidentd/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=oidentd -pkgver=2.5.0 -pkgrel=2 +pkgver=3.1.0 +pkgrel=0 pkgdesc="Configurable IDENT server that supports NAT/IP masq" url="https://oidentd.janikrabe.com" arch="all" license="GPL-2.0-only" makedepends="bison flex linux-headers libnetfilter_conntrack-dev" install="$pkgname.pre-install" -subpackages="$pkgname-doc $pkgname-openrc" +subpackages="$pkgname-dbg $pkgname-doc $pkgname-openrc" source="https://files.janikrabe.com/pub/oidentd/releases/$pkgver/oidentd-$pkgver.tar.xz $pkgname.initd $pkgname.confd @@ -41,7 +41,7 @@ package() { } sha512sums=" -31ff2cad2afaa9f07a0aa35ad904047de78f168f9e6d6a3fcf7397eb89e6b930c30741eb1de44e3c2c24f48ca7d860cafd2771f464b336d400ab6d98384e9320 oidentd-2.5.0.tar.xz +03ce6c64a4351cecdc9177e5a035860d433689de4c86d344eab5af9810b03caedface983c4c4fb2e7ae31b7d868bfcbdd15a094a3f79f43c400258c4902a5972 oidentd-3.1.0.tar.xz 8f4efbd888ab729be6e04197a6f05080a2c5cc3d0c2b6944529f087a9be3a5e4946138aed9c8d74bdce64664e9ba5f2533859e950c6083ce778dac5147cb6a60 oidentd.initd 387acc88fb9331ea57614785abc679dea69401c2d6d266c1481da208d8f9c9d5fb15619aab3871fff51aa5871bd1bd5f55baa7ba9748e8ced97d7d1fbabb1b40 oidentd.confd " diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index ce0902cd985..f5e6643a0bb 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -4,7 +4,7 @@ pkgname=openssl pkgver=3.3.0 _abiver=${pkgver%.*.*} -pkgrel=1 +pkgrel=2 pkgdesc="Toolkit for Transport Layer Security (TLS)" url="https://www.openssl.org/" arch="all" @@ -17,10 +17,13 @@ subpackages="$pkgname-dbg $pkgname-libs-static $pkgname-dev $pkgname-doc $pkgname-misc::noarch libcrypto$_abiver:_libcrypto libssl$_abiver:_libssl" source="https://www.openssl.org/source/openssl-$pkgver.tar.gz man-section.patch + CVE-2024-4603.patch " builddir="$srcdir/openssl-$pkgver" # secfixes: +# 3.3.0-r2: +# - CVE-2024-4603 # 3.2.1-r2: # - CVE-2024-2511 # 3.1.4-r5: @@ -229,4 +232,5 @@ _libssl() { sha512sums=" 1f9daeee6542e1b831c65f1f87befaef98ccedc3abc958c9d17f064ef771924c30849e3ff880f94eed4aaa9d81ea105e3bc8815e6d2e4d6b60b5e890f14fc5da openssl-3.3.0.tar.gz 8c44e990fe8a820f649631b9f81cf28225b7516065169a7f68e2dd7c067b30df9b2c6cb88fa826afbc9fcdaf156360aabf7c498d2d9ed452968815b12b004809 man-section.patch +7562080dd7e759805d8e64b50e17b337e5733c3908761467a900e3d5dca228ae7a21d0faff0fa48e173a269725e2cd48a98c654f472ebff61ad42c056639f8cc CVE-2024-4603.patch " diff --git a/main/openssl/CVE-2024-4603.patch b/main/openssl/CVE-2024-4603.patch new file mode 100644 index 00000000000..039dc0cafed --- /dev/null +++ b/main/openssl/CVE-2024-4603.patch @@ -0,0 +1,166 @@ +From 53ea06486d296b890d565fb971b2764fcd826e7e Mon Sep 17 00:00:00 2001 +From: Tomas Mraz <tomas@openssl.org> +Date: Wed, 8 May 2024 15:23:45 +0200 +Subject: [PATCH] Check DSA parameters for excessive sizes before validating + +This avoids overly long computation of various validation +checks. + +Fixes CVE-2024-4603 + +Reviewed-by: Paul Dale <ppzgs1@gmail.com> +Reviewed-by: Matt Caswell <matt@openssl.org> +Reviewed-by: Neil Horman <nhorman@openssl.org> +Reviewed-by: Shane Lontis <shane.lontis@oracle.com> +(Merged from https://github.com/openssl/openssl/pull/24346) + +(cherry picked from commit 85ccbab216da245cf9a6503dd327072f21950d9b) + +diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c +index 7b6d7df88fdb8..e1375dfad9c0f 100644 +--- a/crypto/dsa/dsa_check.c ++++ b/crypto/dsa/dsa_check.c +@@ -19,8 +19,34 @@ + #include "dsa_local.h" + #include "crypto/dsa.h" + ++static int dsa_precheck_params(const DSA *dsa, int *ret) ++{ ++ if (dsa->params.p == NULL || dsa->params.q == NULL) { ++ ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS); ++ *ret = FFC_CHECK_INVALID_PQ; ++ return 0; ++ } ++ ++ if (BN_num_bits(dsa->params.p) > OPENSSL_DSA_MAX_MODULUS_BITS) { ++ ERR_raise(ERR_LIB_DSA, DSA_R_MODULUS_TOO_LARGE); ++ *ret = FFC_CHECK_INVALID_PQ; ++ return 0; ++ } ++ ++ if (BN_num_bits(dsa->params.q) >= BN_num_bits(dsa->params.p)) { ++ ERR_raise(ERR_LIB_DSA, DSA_R_BAD_Q_VALUE); ++ *ret = FFC_CHECK_INVALID_PQ; ++ return 0; ++ } ++ ++ return 1; ++} ++ + int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret) + { ++ if (!dsa_precheck_params(dsa, ret)) ++ return 0; ++ + if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK) + return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params, + FFC_PARAM_TYPE_DSA, ret); +@@ -39,6 +65,9 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret) + */ + int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret) + { ++ if (!dsa_precheck_params(dsa, ret)) ++ return 0; ++ + return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret) + && *ret == 0; + } +@@ -50,6 +79,9 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret) + */ + int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret) + { ++ if (!dsa_precheck_params(dsa, ret)) ++ return 0; ++ + return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret) + && *ret == 0; + } +@@ -58,8 +90,10 @@ int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret) + { + *ret = 0; + +- return (dsa->params.q != NULL +- && ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret)); ++ if (!dsa_precheck_params(dsa, ret)) ++ return 0; ++ ++ return ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret); + } + + /* +@@ -72,8 +106,10 @@ int ossl_dsa_check_pairwise(const DSA *dsa) + BN_CTX *ctx = NULL; + BIGNUM *pub_key = NULL; + +- if (dsa->params.p == NULL +- || dsa->params.g == NULL ++ if (!dsa_precheck_params(dsa, &ret)) ++ return 0; ++ ++ if (dsa->params.g == NULL + || dsa->priv_key == NULL + || dsa->pub_key == NULL) + return 0; +diff --git a/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem +new file mode 100644 +index 0000000000000..e85e2953b7a24 +--- /dev/null ++++ b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem +@@ -0,0 +1,57 @@ ++-----BEGIN DSA PARAMETERS----- ++MIIKLAKCBQEAym47LzPFZdbz16WvjczLKuzLtsP8yRk/exxL4bBthJhP1qOwctja ++p1586SF7gDxCMn7yWVEYdfRbFefGoq0gj1XOE917XqlbnkmZhMgxut2KbNJo/xil ++XNFUjGvKs3F413U9rAodC8f07cWHP1iTcWL+vPe6u2yilKWYYfnLWHQH+Z6aPrrF ++x/R08LI6DZ6nEsIo+hxaQnEtx+iqNTJC6Q1RIjWDqxQkFVTkJ0Y7miRDXmRdneWk ++oLrMZRpaXr5l5tSjEghh1pBgJcdyOv0lh4dlDy/alAiqE2Qlb667yHl6A9dDPlpW ++dAntpffy4LwOxfbuEhISvKjjQoBwIvYE4TBPqL0Q6bC6HgQ4+tqd9b44pQjdIQjb ++Xcjc6azheITSnPEex3OdKtKoQeRq01qCeLBpMXu1c+CTf4ApKArZvT3vZSg0hM1O ++pR71bRZrEEegDj0LH2HCgI5W6H3blOS9A0kUTddCoQXr2lsVdiPtRbPKH1gcd9FQ ++P8cGrvbakpTiC0dCczOMDaCteM1QNILlkM7ZoV6VghsKvDnFPxFsiIr5GgjasXP5 ++hhbn3g7sDoq1LiTEo+IKQY28pBWx7etSOSRuXW/spnvCkivZla7lSEGljoy9QlQ2 ++UZmsEQI9G3YyzgpxHvKZBK1CiZVTywdYKTZ4TYCxvqzhYhjv2bqbpjI12HRFLojB ++koyEmMSp53lldCzp158PrIanqSp2rksMR8SmmCL3FwfAp2OjqFMEglG9DT8x0WaN ++TLSkjGC6t2csMte7WyU1ekNoFDKfMjDSAz0+xIx21DEmZtYqFOg1DNPK1xYLS0pl ++RSMRRkJVN2mk/G7/1oxlB8Wb9wgi3GKUqqCYT11SnBjzq0NdoJ3E4GMedp5Lx3AZ ++4mFuRPUd4iV86tE0XDSHSFE7Y3ZkrOjD7Q/26/L53L/UH5z4HW6CHP5os7QERJjg ++c1S3x87wXWo9QXbB9b2xmf+c+aWwAAr1cviw38tru58jF3/IGyduj9H8claKQqBG ++cIOUF4aNe1hK2K3ArAOApUxr4KE+tCvrltRfiTmVFip0g9Jt1CPY3Zu7Bd4Z2ZkE ++DtSztpwa49HrWF5E9xpquvBL2U8jQ68E7Xd8Wp4orI/TIChriamBmdkgRz3H2LvN ++Ozb6+hsnEGrz3sp2RVAToSqA9ysa6nHZdfufPNtMEbQdO/k1ehmGRb0ljBRsO6b2 ++rsG2eYuC8tg8eCrIkua0TGRI7g6a4K32AJdzaX6NsISaaIW+OYJuoDSscvD3oOg8 ++PPEhU+zM7xJskTA+jxvPlikKx8V7MNHOCQECldJlUBwzJvqp40JvwfnDsF+8VYwd ++UaiieR3pzMzyTjpReXRmZbnRPusRcsVzxb2OhB79wmuy4UPjjQBX+7eD0rs8xxvW ++5a5q1Cjq4AvbwmmcA/wDrHDOjcbD/zodad2O1QtBWa/R4xyWea4zKsflgACE1zY9 ++wW2br7+YQFekcrXkkkEzgxd6zxv8KVEDpXRZjmAM1cI5LvkoN64To4GedN8Qe/G7 ++R9SZh9gnS17PTP64hK+aYqhFafMdu87q/+qLfxaSux727qE5hiW01u4nnWhACf9s ++xuOozowKqxZxkolMIyZv6Lddwy1Zv5qjCyd0DvM/1skpXWkb9kfabYC+OhjsjVhs ++0Ktfs6a5B3eixiw5x94hhIcTEcS4hmvhGUL72FiTca6ZeSERTKmNBy8CIQC9/ZUN ++uU/V5JTcnYyUGHzm7+XcZBjyGBagBj9rCmW3SQKCBQAJ/k9rb39f1cO+/3XDEMjy ++9bIEXSuS48g5RAc1UGd5nrrBQwuDxGWFyz0yvAY7LgyidZuJS21+MAp9EY7AOMmx ++TDttifNaBJYt4GZ8of166PcqTKkHQwq5uBpxeSDv/ZE8YbYfaCtLTcUC8KlO+l36 ++gjJHSkdkflSsGy1yObSNDQDfVAAwQs//TjDMnuEtvlNXZllsTvFFBceXVETn10K2 ++ZMmdSIJNfLnjReUKEN6PfeGqv7F4xoyGwUybEfRE4u5RmXrqCODaIjY3SNMrOq8B ++R3Ata/cCozsM1jIdIW2z+OybDJH+BYsYm2nkSZQjZS6javTYClLrntEKG/hAQwL8 ++F16YLOQXpHhgiAaWnTZzANtLppB2+5qCVy5ElzKongOwT8JTjTFXOaRnqe/ngm9W ++SSbrxfDaoWUOyK9XD8Cydzpv3n4Y8nWNGayi7/yAFCU36Ri040ufgv/TZLuKacnl +++3ga3ZUpRlSigzx0kb1+KjTSWeQ8vE/psdWjvBukVEbzdUauMLyRLo/6znSVvvPX ++UGhviThE5uhrsUg+wEPFINriSHfF7JDKVhDcJnLBdaXvfN52pkF/naLBF5Rt3Gvq ++fjCxjx0Sy9Lag1hDN4dor7dzuO7wmwOS01DJW1PtNLuuH0Bbqh1kYSaQkmyXBZWX ++qo8K3nkoDM0niOtJJubOhTNrGmSaZpNXkK3Mcy9rBbdvEs5O0Jmqaax/eOdU0Yot ++B3lX+3ddOseT2ZEFjzObqTtkWuFBeBxuYNcRTsu3qMdIBsEb8URQdsTtjoIja2fK ++hreVgjK36GW70KXEl8V/vq5qjQulmqkBEjmilcDuiREKqQuyeagUOnhQaBplqVco ++4xznh5DMBMRbpGb5lHxKv4cPNi+uNAJ5i98zWUM1JRt6aXnRCuWcll1z8fRZ+5kD ++vK9FaZU3VRMK/eknEG49cGr8OuJ6ZRSaC+tKwV1y+amkSZpKPWnk2bUnQI3ApJv3 ++k1e1EToeECpMUkLMDgNbpKBoz4nqMEvAAlYgw9xKNbLlQlahqTVEAmaJHh4yDMDy ++i7IZ9Wrn47IGoR7s3cvhDHUpRPeW4nsmgzj+tf5EAxemI61STZJTTWo0iaPGJxct ++9nhOOhw1I38Mvm4vkAbFH7YJ0B6QrjjYL2MbOTp5JiIh4vdOeWwNo9/y4ffyaN5+ ++ADpxuuIAmcbdr6GPOhkOFFixRJa0B2eP1i032HESlLs8RB9oYtdTXdXQotnIgJGd ++Y8tSKOa1zjzeLHn3AVpRZTUW++/BxmApV3GKIeG8fsUjg/df0QRrBcdC/1uccdaG ++KKlAOwlywVn5jUlwHkTmDiTM9w5AqVVGHZ2b+4ZgQW8jnPKN0SrKf6U555D+zp7E ++x4uXoE8ojN9y8m8UKf0cTLnujH2XgZorjPfuMOt5VZEhQFMS2QaljSeni5CJJ8gk ++XtztNqfBlAtWR4V5iAHeQOfIB2YaOy8GESda89tyKraKeaez41VblpTVHTeq9IIF ++YB4cQA2PfuNaGVRGLMAgT3Dvl+mxxxeJyxnGAiUcETU/jJJt9QombiuszBlYGQ5d ++ELOSm/eQSRARV9zNSt5jaQlMSjMBqenIEM09BzYqa7jDwqoztFxNdO8bcuQPuKwa ++4z3bBZ1yYm63WFdNbQqqGEwc0OYmqg1raJ0zltgHyjFyw8IGu4g/wETs+nVQcH7D ++vKuje86bePD6kD/LH3wmkA== ++-----END DSA PARAMETERS----- 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/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/pcre/APKBUILD b/main/pcre/APKBUILD index eb90e3abcf0..bf9af2b6aa0 100644 --- a/main/pcre/APKBUILD +++ b/main/pcre/APKBUILD @@ -38,8 +38,6 @@ prepare() { build() { local _enable_jit="--enable-jit" case "$CARCH" in - mips64*) export CPPFLAGS="$CPPFLAGS -DSLJIT_IS_FPU_AVAILABLE=0";; - mips*) export CPPFLAGS="$CPPFLAGS -DSLJIT_IS_FPU_AVAILABLE=0 -DSLJIT_MIPS_R1=1";; s390x) _enable_jit="";; riscv*) _enable_jit="";; loongarch64) _enable_jit="";; 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/pcsc-lite/APKBUILD b/main/pcsc-lite/APKBUILD index 726a5a8b25b..ec2ac1d7c00 100644 --- a/main/pcsc-lite/APKBUILD +++ b/main/pcsc-lite/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=pcsc-lite -pkgver=2.0.1 +pkgver=2.2.0 pkgrel=0 pkgdesc="Middleware to access a smart card using SCard API (PC/SC)" url="https://pcsclite.apdu.fr/" @@ -16,6 +16,7 @@ makedepends=" $depends_dev flex libcap-ng-utils + meson perl-dev " install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -27,39 +28,30 @@ subpackages=" $pkgname-libs $pkgname-openrc " -source="https://pcsclite.apdu.fr/files/pcsc-lite-$pkgver.tar.bz2 +source="https://pcsclite.apdu.fr/files/pcsc-lite-$pkgver.tar.xz + include-prefix-in-sbindir.patch pcscd.initd " build() { - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --disable-libusb \ - --enable-libudev \ - --disable-maintainer-mode \ - --disable-silent-rules \ - --without-systemdsystemunitdir \ - --enable-ipcdir=/run/pcscd \ - --enable-usbdropdir=/usr/lib/pcsc/drivers \ - --disable-libsystemd \ - --disable-polkit \ - --disable-strict \ - --enable-static - make + abuild-meson . build \ + -D default_library=both \ + -D usb=false \ + -D libudev=true \ + -D polkit=false \ + -D libsystemd=false + + meson compile -C build } check() { - make check + meson test --no-rebuild --print-errorlogs -C build } package() { license="$license AND GPL-3.0-or-later" - make DESTDIR="$pkgdir" install + meson install --no-rebuild --destdir "$pkgdir" -C build install -D -m755 "$srcdir"/pcscd.initd "$pkgdir"/etc/init.d/pcscd @@ -88,6 +80,7 @@ dev() { } sha512sums=" -af007f00f43e8d897710580f6f27814c9e7d3ca489ff01edf2e3b979e46267915aa04d9c15f225a420fa681de936e42a1d4779d962717cf9a9f4a3d1ca31502b pcsc-lite-2.0.1.tar.bz2 +07771a45f92b472bc0085c992da4c8a031d4ccadca592a515c50e5ce240bca90111f4e33b759fc24ba42c05426b8c9fe320d8d55bbd6392b037f6f4ca9480b02 pcsc-lite-2.2.0.tar.xz +b13bba9bc4aab3801bb4a9fb366dd1bd117bc75c89eb22871b9feb4bd79bfcc79a6bb33c7a11d6fea8b421ce5c540f3ed62fba10550fafb32d811924467c0b66 include-prefix-in-sbindir.patch 5a8b3cb5b4ed9884c1032ec3c4c51167b8771185e8ea4122e40de4a92135cc3687a1df43bc877cf5ebcfe9392a17035873d8c052d58243eb681a3e93a44c5773 pcscd.initd " diff --git a/main/pcsc-lite/include-prefix-in-sbindir.patch b/main/pcsc-lite/include-prefix-in-sbindir.patch new file mode 100644 index 00000000000..f21718e8204 --- /dev/null +++ b/main/pcsc-lite/include-prefix-in-sbindir.patch @@ -0,0 +1,44 @@ +Patch-Source: https://github.com/LudovicRousseau/PCSC/commit/960e367edc01518b90684ffff99010ee07ae1bd4 +--- +From 960e367edc01518b90684ffff99010ee07ae1bd4 Mon Sep 17 00:00:00 2001 +From: Ludovic Rousseau <ludovic.rousseau@free.fr> +Date: Sat, 4 May 2024 15:39:39 +0200 +Subject: [PATCH] meson: include prefix in sbindir + +If sbindir is set to "bin" and prefix is set to "/usr" then sbindir is +"/usr/bin" instead of "/bin". + +Thanks to Frederik Schwan for the bug report +" [Build] Meson ignoring prefix for binary location #179 " +https://github.com/LudovicRousseau/PCSC/issues/179 +--- + meson.build | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 843d643e..0686a151 100644 +--- a/meson.build ++++ b/meson.build +@@ -20,11 +20,12 @@ conf_data = configuration_data({ + 'NO_LOG' : get_option('embedded'), + }) + # for generated files from .in templates ++sbindir = join_paths(get_option('prefix') , get_option('sbindir')) + confgen_data = configuration_data({ + 'VERSION' : meson.project_version(), + 'ipcdir' : get_option('ipcdir'), + 'sysconfdir' : get_option('sysconfdir'), +- 'sbindir_exp' : '/' / get_option('sbindir'), ++ 'sbindir_exp' : sbindir, + 'PCSCLITE_CONFIG_DIR' : get_option('serialconfdir'), + 'usbdropdir' : get_option('usbdropdir'), + }) +@@ -143,7 +144,7 @@ executable('pcscd', + dependencies : pcscd_dep, + c_args: '-DPCSCD', + export_dynamic : true, +- install_dir : '/' / get_option('sbindir'), ++ install_dir : sbindir, + install : true) + + # libpcsclite_real library 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-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-gd/APKBUILD b/main/perl-gd/APKBUILD index 0229fe5d0aa..356f5f404bd 100644 --- a/main/perl-gd/APKBUILD +++ b/main/perl-gd/APKBUILD @@ -1,18 +1,26 @@ # 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=0 +pkgrel=1 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=GD 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" 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-http-message/APKBUILD b/main/perl-http-message/APKBUILD index 030c08b126f..1998f8d5e44 100644 --- a/main/perl-http-message/APKBUILD +++ b/main/perl-http-message/APKBUILD @@ -1,40 +1,39 @@ +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=perl-http-message -_pkgreal=HTTP-Message -_author=OALDERS -_au=${_author%%"${_author#??}"} -_a=${_author%%"${_author#?}"} -pkgver=6.45 +pkgver=6.46 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=HTTP-Message pkgdesc="HTTP style message" -url="https://metacpan.org/release/HTTP-Message" +url="https://metacpan.org/release/HTTP-Message/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl perl-clone>=0.46 perl-http-date perl-uri perl-io-html perl-encode-locale perl-lwp-mediatypes" checkdepends="perl-try-tiny perl-test-needs" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/HTTP-Message-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Message-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" -prepare() { - default_prepare - 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=" -b72ab9068c5f9ddb41f89b2a84887393f2c1bd14b462a1a60c03b4560800cfbf37c76f4bdd7c08f1ce9bf616242c2e39e0ff93859ed61268c48c978322a6d03d HTTP-Message-6.45.tar.gz +86940c54f710cd44497c8ead305fff3922cedd95491eccfbdd6deb96ca57a579c441693d684d92536aa369ad13e87da160ce5b6ec6f2fdd54df03a002a8fd4da HTTP-Message-6.46.tar.gz " diff --git a/main/perl-ipc-sharelite/APKBUILD b/main/perl-ipc-sharelite/APKBUILD index 9ae0544d222..1baa5969b1a 100644 --- a/main/perl-ipc-sharelite/APKBUILD +++ b/main/perl-ipc-sharelite/APKBUILD @@ -1,30 +1,37 @@ +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-ipc-sharelite pkgver=0.17 pkgrel=12 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=IPC-ShareLite pkgdesc="Lightweight interface to shared memory" -url="https://metacpan.org/pod/IPC::ShareLite" +url="https://metacpan.org/release/IPC-ShareLite/" arch="all" 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/A/AN/ANDYA/IPC-ShareLite-$pkgver.tar.gz" - -builddir="$srcdir"/IPC-ShareLite-$pkgver +builddir="$srcdir/$_pkgreal-$pkgver" build() { - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + 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=" 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-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-syntax-keyword-try/APKBUILD b/main/perl-syntax-keyword-try/APKBUILD index 151b9148c01..db941afc961 100644 --- a/main/perl-syntax-keyword-try/APKBUILD +++ b/main/perl-syntax-keyword-try/APKBUILD @@ -1,11 +1,11 @@ -# Automatically generated by apkbuild-cpan, template 3 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: rubicon <rubicon@mailo.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-syntax-keyword-try -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Syntax-Keyword-Try pkgver=0.29 pkgrel=2 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Syntax-Keyword-Try pkgdesc="C<try/catch/finally> syntax for perl" url="https://metacpan.org/release/Syntax-Keyword-Try/" 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,7 +31,6 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" 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/pgpool/APKBUILD b/main/pgpool/APKBUILD index ea7bbc0ebe0..efd73590f13 100644 --- a/main/pgpool/APKBUILD +++ b/main/pgpool/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Cameron <cbanta@gmail.com> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=pgpool -pkgver=4.5.1 +pkgver=4.5.2 _pkgver="${pkgver//./_}" -pkgrel=0 +pkgrel=1 pkgdesc="A connection pooling/replication server for PostgreSQL" url="https://www.pgpool.net/" arch="all" @@ -17,6 +17,7 @@ makedepends=" libtool linux-headers openssl-dev + postgresql-dev " pkgusers="postgres" pkggroups="postgres" @@ -51,6 +52,7 @@ build() { --with-openssl \ --disable-rpath make -j1 + make PG_CONFIG=/usr/bin/pg_config -C "$builddir"/src/sql } check() { @@ -60,6 +62,8 @@ check() { package() { make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}/" PG_CONFIG=/usr/bin/pg_config -C "$builddir"/src/sql install + touch "$pkgdir"/etc/$pkgname/pool_passwd install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname @@ -84,7 +88,7 @@ doc() { } sha512sums=" -fee71e1c5513fa82f5263028e2a26e5dee88c792fc925edf1390642d7ae90e93615ffc1c1a6755302aac5b15ad09540d172899545022c423c92c04b6e147b72a pgpool2-4_5_1.tar.gz +6db9487f2b1474f357f6afb6e4d0c65a8ad4c606362caa7d9aecd7ce36f5d61a8363f3d5e721b4e55eb32ebe5722285ae28439f671407e5532e9612b9e5211c1 pgpool2-4_5_2.tar.gz 9e54835f2a907f4b7a521d7d52cf04f69e1edfe591d9618cb2a1514953e5ba9e0d5ef543f0d6ee281fef21e64b7a6ff4a26a7f54fadbfc2d3bc7009d10dbccbf pgpool.initd 7e605cea31ae32127ec1aca9e47a6652e87243214bde202d49a405652784e68b4dbff7d364345259d327bc37041c60c146e6f674a4aa72c6214bdba3740e700e pgpool.confd c9aa2ea9484ed29cb57cdff4004fa9dd4780d73c69db3378effb2e0ecd3ae178771c6a847a28e1a9cc6492ada4321584afb92c9b592119fb11898b42191f22b1 pgpool.logrotated diff --git a/main/postgresql15/APKBUILD b/main/postgresql15/APKBUILD index 48c180a4fb5..a17386aa94b 100644 --- a/main/postgresql15/APKBUILD +++ b/main/postgresql15/APKBUILD @@ -2,8 +2,8 @@ # Contributor: G.J.R. Timmer <gjr.timmer@gmail.com> # Contributor: Jakub Jirutka <jakub@jirutka.cz> _pkgname=postgresql -pkgver=15.6 -pkgrel=2 +pkgver=15.7 +pkgrel=0 _majorver=${pkgver%%[_.]*} # Should this aport provide libpq* and libecpg*? true/false # Exactly one postgresql aport must be the default one! @@ -72,7 +72,6 @@ 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 @@ -550,8 +549,7 @@ _setdiff() { } sha512sums=" -d9f158d844ec21bc5a7eccad9193dfe026d3df46a011980412ad7d150b3894c01754be0053bed530976047d7eff657204ac321138ba8da6eac8fb7b93b9520ad postgresql-15.6.tar.bz2 -e3b05a2df199440cd558cd729aac9ee53cda6dd675f0ecdecda27d6158cc1b2f3f3fdb2b69657adba93886f4331183ec9f63c71868f34020a5ff82575e0a4202 fix-tests-on-musl.patch +8a03e2d7a267f0d11c27d90a2fb605725accb41cfebba2b56c735d4af45bb5f977d4ba051a02ac8d31f93253372df3d3b5efdd159e258d6fcc506b73e3ad6e27 postgresql-15.7.tar.bz2 73080f61ae274a214966d2d010de49c8c90eb3180e4f56d86a9e23063eaddbe7f8d2c40ed414591c16bc9cfe88577866af2a965c2b6effb54965d19ef96a3fa9 initdb.patch 27e00b58fe5c3899c66fc0dde51846c14701bcfedd132b106d676783ba603e8cbdc6e620f29b52dc892bdaa9302052788cf5e575a1659f61c017a12e0d2ee4d0 perl-rpath.patch 6d992f53bf8b3e914933f89bc3f01591de2b707cf809aeee4210f9d59e2dc11e3fce697f50a7660f54925a2f0a6154eaeab0f59a969f76572dac5ff6f08faa71 per-version-dirs.patch diff --git a/main/postgresql15/fix-tests-on-musl.patch b/main/postgresql15/fix-tests-on-musl.patch deleted file mode 100644 index 405ac8fb1a4..00000000000 --- a/main/postgresql15/fix-tests-on-musl.patch +++ /dev/null @@ -1,96 +0,0 @@ -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/APKBUILD b/main/postgresql16/APKBUILD index df55bc89c39..f765d9e31ba 100644 --- a/main/postgresql16/APKBUILD +++ b/main/postgresql16/APKBUILD @@ -2,8 +2,8 @@ # Contributor: G.J.R. Timmer <gjr.timmer@gmail.com> # Contributor: Jakub Jirutka <jakub@jirutka.cz> _pkgname=postgresql -pkgver=16.2 -pkgrel=4 +pkgver=16.3 +pkgrel=0 _majorver=${pkgver%%[_.]*} # Should this aport provide libpq* and libecpg*? true/false # Exactly one postgresql aport must be the default one! @@ -72,7 +72,6 @@ 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 @@ -491,8 +490,7 @@ _setdiff() { } sha512sums=" -3194941cc3f1ec86b6cf4f08c6422d268d99890441f8fc9ab87b6a7fd16c990fa230b544308644cbef54e6960c4984e3703752e40930bdc0537b7bfda3ab7ccf postgresql-16.2.tar.bz2 -e3b05a2df199440cd558cd729aac9ee53cda6dd675f0ecdecda27d6158cc1b2f3f3fdb2b69657adba93886f4331183ec9f63c71868f34020a5ff82575e0a4202 fix-tests-on-musl.patch +dc1c8d4fbc8e53e9be91dcf1b644b3969bd634f11bf5a1c4fe16619fd386f3349a5509788d43e6a57d099ad75233026d4dd4e0bb180ffc747fd3c1a575c51a5f postgresql-16.3.tar.bz2 73080f61ae274a214966d2d010de49c8c90eb3180e4f56d86a9e23063eaddbe7f8d2c40ed414591c16bc9cfe88577866af2a965c2b6effb54965d19ef96a3fa9 initdb.patch 27e00b58fe5c3899c66fc0dde51846c14701bcfedd132b106d676783ba603e8cbdc6e620f29b52dc892bdaa9302052788cf5e575a1659f61c017a12e0d2ee4d0 perl-rpath.patch 6d992f53bf8b3e914933f89bc3f01591de2b707cf809aeee4210f9d59e2dc11e3fce697f50a7660f54925a2f0a6154eaeab0f59a969f76572dac5ff6f08faa71 per-version-dirs.patch diff --git a/main/postgresql16/fix-tests-on-musl.patch b/main/postgresql16/fix-tests-on-musl.patch deleted file mode 100644 index 405ac8fb1a4..00000000000 --- a/main/postgresql16/fix-tests-on-musl.patch +++ /dev/null @@ -1,96 +0,0 @@ -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/powertop/APKBUILD b/main/powertop/APKBUILD index 0572da47217..b6a43c63a87 100644 --- a/main/powertop/APKBUILD +++ b/main/powertop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Steven Guikal <void@fluix.one> pkgname=powertop pkgver=2.15 -pkgrel=4 +pkgrel=5 pkgdesc="Power consumption monitor" url="https://github.com/fenrus75/powertop" arch="all" @@ -24,8 +24,7 @@ subpackages=" $pkgname-doc $pkgname-bash-completion " -source="$pkgname-$pkgver.tar.gz::https://github.com/fenrus75/powertop/releases/download/v$pkgver/powertop.tar.gz" -builddir="$srcdir/$pkgname" +source="$pkgname-$pkgver-2.tar.gz::https://github.com/fenrus75/powertop/archive/refs/tags/v$pkgver.tar.gz" options="!check" # no tests prepare() { @@ -48,5 +47,5 @@ package() { } sha512sums=" -8aa71c15a3931f1b62fd22920c8f16d552a3b81335d87ad210121419fd74263ac6956eec7fb0d607247fee71658923a0e049717de946031604085e5d8c108a85 powertop-2.15.tar.gz +de4ca3ea25697d2cd5f05c41c82c326ad3e2d21cbf38ddb9b3af40c0d862a70781ca45d9ef7b735ad6def0cb580e4fa153eb4a6e6598e204fc931b30d85ecf41 powertop-2.15-2.tar.gz " diff --git a/main/pspg/APKBUILD b/main/pspg/APKBUILD index 8a54e432d03..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.5 +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=" -f33be2e0ddd8f56054c82f4f3a8ea531faef2f9ca21a706f894f5419e8122d291a9174495d68dc8637728cc57fe764e63c34b843e8ed8a3b3ff7546a6c904e7e pspg-5.8.5.tar.gz +1483adbecaac01fc5ef73fde2792a804bc6f8db00ef5ac434692985cf61f181c16be3ae3ddcfc50648cfe09ace8f237f3dbeee86c09e3ad1ccb2ec9141378b8d pspg-5.8.6.tar.gz " diff --git a/main/py3-gpep517/APKBUILD b/main/py3-gpep517/APKBUILD index 0ed1ad62edd..329a3bc9d79 100644 --- a/main/py3-gpep517/APKBUILD +++ b/main/py3-gpep517/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Peter Shkenev <santurysim@gmail.com> pkgname=py3-gpep517 _pkgname=gpep517 -pkgver=15 -pkgrel=2 +pkgver=16 +pkgrel=0 pkgdesc="Minimal backend script to aid installing Python packages through PEP 517-compliant build systems" url="https://github.com/mgorny/gpep517/" arch="noarch" @@ -23,6 +23,7 @@ check() { package() { local sitedir="$(python3 -c 'import site;print(site.getsitepackages()[0])')" mkdir -p "$pkgdir/$sitedir" + find gpep517 -name "*.orig" -delete cp -a gpep517 "$pkgdir/$sitedir" python3 -m compileall "$pkgdir/$sitedir" @@ -30,7 +31,7 @@ package() { } sha512sums=" -7c3b878220e907ef801301eadc0e3031dd3c31770cc50bb7119ab32f9244c8a33792b4896ddeffc5d4b7be9f1d881fba5179de155f11845f510e455be59fb92e gpep517-v15.tar.gz +fcd7cb0f98003a8ecb9976cffe3d4140b16e537dbfcfa8e8416569cd7e38e8e9ab359b35c1e22b830dc2711b3c07f8e3113c0f6b73d415ce63ad5f7d76f180c6 gpep517-v16.tar.gz 3e90bf2d94006672c66f5082812115903054b6e05a5d37aa9a0fd33f7b2c8368f13e5fbd3ea815c386d6155dcbf8babd69faa9ca27b95f35b35a4ef47974efd7 gpep517 d3174ce9ac13d124578fc5ace0bd7a2c8582a8075d5355bf781bfa7218155cd00a7a707e76f26bcb933c6f49786a59bb63147b3e2f9645d36c97647865250894 default-bytecode-levels.patch " diff --git a/main/py3-jinja2/APKBUILD b/main/py3-jinja2/APKBUILD index 363936c31de..d6ab94d1795 100644 --- a/main/py3-jinja2/APKBUILD +++ b/main/py3-jinja2/APKBUILD @@ -1,21 +1,25 @@ # Contributor: Matt Smith <mcs@darkregion.net> # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=py3-jinja2 -_pkgname=Jinja2 -pkgver=3.1.3 -pkgrel=1 +_pkgname=jinja2 +pkgver=3.1.4 +pkgrel=0 pkgdesc="A small but fast and easy to use stand-alone python template engine" url="https://palletsprojects.com/p/jinja/" arch="noarch" license="BSD-3-Clause" depends="py3-markupsafe" checkdepends="py3-pytest" -makedepends="python3-dev py3-gpep517 py3-setuptools py3-wheel" +makedepends="python3-dev py3-gpep517 py3-flit-core py3-wheel" subpackages="$pkgname-pyc $pkgname-doc" source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" # secfixes: +# 3.1.4-r0: +# - CVE-2024-34064 GHSA-h75v-3vvj-5mfj +# 3.1.3-r0: +# - CVE-2024-22195 GHSA-h5c8-rqwp-cp95 # 1.11.3-r0: # - CVE-2020-28493 @@ -39,11 +43,11 @@ package() { # by py-sphinx, however, this package (py-jinja2) is a dependency of # Sphinx itself! mkdir -p "$docdir" - cp -R docs examples "$docdir"/ + cp -R docs "$docdir"/ - install -m 644 -D LICENSE.rst "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.rst + install -m 644 -D LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt } sha512sums=" -5c36d0cd094b40626511f30c561176c095c49ef4066c2752a9edc3e6feb2430dafa866c17deebddcd0168aa1f0fd3944916d592c5c999639b8152e7c1009c700 Jinja2-3.1.3.tar.gz +d07d68a2687af68c705d3b7f5a2c67aca7b9d125316b15085888b9d0d6e769981af76f6f524728b89b5501bd671d518fcb2638f9ae112e57ca2bf2a53482cd89 jinja2-3.1.4.tar.gz " 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/community/py3-ply/APKBUILD b/main/py3-ply/APKBUILD index 3bff301787d..3bff301787d 100644 --- a/community/py3-ply/APKBUILD +++ b/main/py3-ply/APKBUILD diff --git a/community/py3-ply/assertTrue.patch b/main/py3-ply/assertTrue.patch index 3803814cd66..3803814cd66 100644 --- a/community/py3-ply/assertTrue.patch +++ b/main/py3-ply/assertTrue.patch diff --git a/community/py3-ply/no-py3-six.patch b/main/py3-ply/no-py3-six.patch index 5a4c6658828..5a4c6658828 100644 --- a/community/py3-ply/no-py3-six.patch +++ b/main/py3-ply/no-py3-six.patch 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 05fb1083220..a705ba1c3ee 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.2.0 +pkgver=8.2.1 pkgrel=0 pkgdesc="Python3 testing library" url="https://docs.pytest.org/en/latest/" @@ -55,5 +55,5 @@ package() { } sha512sums=" -1a74a2269010804101fc4b8efc370c5d8d484eb145eb4e181feeb1a17046457b97071d2de925c3e8bbd4c6090cd00ca532d69286cb9e10ea023e59a99cd51088 pytest-8.2.0.tar.gz +c837b2031c2b198345ce090cc5fcbebd2640a521131a60b882250b70825dc85e5072403a80e9a73f62e429156b57dce405d8400255457c55b14d4a2f700c5331 pytest-8.2.1.tar.gz " diff --git a/main/py3-requests/APKBUILD b/main/py3-requests/APKBUILD index 893fb80d308..2754a59eca8 100644 --- a/main/py3-requests/APKBUILD +++ b/main/py3-requests/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Peter Bui <pnutzh4x0r@gmail.com> # Maintainer: Steven Guikal <void@fluix.one> pkgname=py3-requests -pkgver=2.31.0 -pkgrel=2 +pkgver=2.32.2 +pkgrel=0 pkgdesc="HTTP request library for Python3" url="https://requests.readthedocs.io/" arch="noarch" @@ -36,5 +36,5 @@ package() { } sha512sums=" -ce50d64973752f4cf7f7c7c91401669854b55c66d7465bea3689772fae8a6b646cf6720d84a2984bbe6fd78fc8b9ce0aa377f291fb6d7c20c7c2a4be8193acdd requests-2.31.0.tar.gz +6f85e41f30d8bdf8d3343092d7fc163342c22c21cf0490eabd65cb66b59a464fbd6a4cd28f1f3ab1eac636adff2a8d55ded54c40351df93deafeb2aba62bcbde requests-2.32.2.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-trove-classifiers/APKBUILD b/main/py3-trove-classifiers/APKBUILD index 2e841aec7b2..6decc39b0ad 100644 --- a/main/py3-trove-classifiers/APKBUILD +++ b/main/py3-trove-classifiers/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michał Polański <michal@polanski.me> # Maintainer: Michał Polański <michal@polanski.me> pkgname=py3-trove-classifiers -pkgver=2024.3.3 -pkgrel=2 +pkgver=2024.5.17 +pkgrel=0 pkgdesc="Canonical source for classifiers on PyPI" url="https://github.com/pypa/trove-classifiers" license="Apache-2.0" @@ -36,5 +36,5 @@ package() { } sha512sums=" -f4298eeb69881aa17f6559bf3749ae7a23c3c48e31bcefc19748290be59296e0bacc2bb5ba12410ab1c45ee13f2c5858295cd4ceb5755185efccd74f96b5a4a8 py3-trove-classifiers-2024.3.3.tar.gz +55f5716e2266a0b3f59a5b07579418ed6811cb5dda77aa8399bc528f717ca660f0cf41d1bea84eed31ad4f2fba5f53d726cf021bdbbc86c2af8237a627b33712 py3-trove-classifiers-2024.5.17.tar.gz " diff --git a/main/py3-xmlschema/APKBUILD b/main/py3-xmlschema/APKBUILD index 659be6895f7..d5ef21edc2f 100644 --- a/main/py3-xmlschema/APKBUILD +++ b/main/py3-xmlschema/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Aiden Grossman <agrossman154@yahoo.com> # Maintainer: Aiden Grossman <agrossman154@yahoo.com> pkgname=py3-xmlschema -pkgver=3.3.0 +pkgver=3.3.1 pkgrel=0 pkgdesc="XML schema validator and conversion library" url="https://github.com/sissaschool/xmlschema" @@ -33,5 +33,5 @@ package() { } sha512sums=" -49749877112c1baf46bdf409d3d97da91438ac8049183a7612164273877accaf4b3c031a680caac29400ec1390c91797f608ac0abf51019a24320055f5da60d5 py3-xmlschema-3.3.0.tar.gz +42f852b6898fe855db7f0cf58ce5571a6e516d655f7970bbeeed929654774c02959416360dd0383670035a7ce727891d5e145a9da072c39a69361d2a11454252 py3-xmlschema-3.3.1.tar.gz " diff --git a/main/radvd/APKBUILD b/main/radvd/APKBUILD index d8b40d390d1..acc8802d74b 100644 --- a/main/radvd/APKBUILD +++ b/main/radvd/APKBUILD @@ -16,11 +16,6 @@ source="http://www.litech.org/radvd/dist/radvd-$pkgver.tar.xz fix-alpine-plz.patch " -# test failure on builders due to kernel issue -case "$CARCH" in -mips*) options="!check";; -esac - prepare() { default_prepare update_config_sub diff --git a/main/raspberrypi-bootloader/APKBUILD b/main/raspberrypi-bootloader/APKBUILD index aeeda529193..22e89024519 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=6bb99655a963e73937b981bbdf530da1a98e2b51 -pkgver=1.20240503 +_commit=30a6adaded0241842a58fecb70ca4ed99bac0e35 +pkgver=1.20240520 pkgrel=0 pkgdesc="Bootloader files for the Raspberry Pi" url="https://github.com/raspberrypi/rpi-firmware" @@ -65,6 +65,6 @@ cutdown() { } sha512sums=" -796f75cecfa5e7f0548e68a3a5ae10a604ffa68cda169493481b548170ddd4acf1e79340366463a6d13f5fcf8902e973b32caeff9a25d98df02dedad5c200c9c raspberrypi-bootloader-1.20240503.tar.gz +0a7198b419971e223d77d8e91cfe3db004978a1024e354fe90ad70ed10faadb94ae7906b1cd70503a65a1412d0a2f4bbfc4ea2a685bbea2215b317e2065bb9f3 raspberrypi-bootloader-1.20240520.tar.gz 35af8c7bdd3ab6f2bbc0290d8cb2adbe333639e9e3d9d03f3d0b981e6814a0ab56fb508e0e34e44ae3a325909cab3a76819fb6844d7eafe394996f7a0db83c0e update-raspberrypi-bootloader " diff --git a/main/rng-tools/01-fix-ignorefail.patch b/main/rng-tools/01-fix-ignorefail.patch deleted file mode 100644 index 9e5c7cb4f19..00000000000 --- a/main/rng-tools/01-fix-ignorefail.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Dermot Bradley <dermot_bradley@yahoo.com> -Date: Mon, 10 Apr 2023 14:25 +0100 - -When -i used, the fips_run_rng_test() should not be called in -update_kernel_random(). - -Upstream PR #189, already merged in master. - ---- - -diff -aur a/rngd.c b/rngd.c ---- a/rngd.c -+++ b/rngd.c -@@ -728,10 +728,11 @@ - unsigned char *buf, fips_ctx_t *fipsctx_in) - { - unsigned char *p; -- int fips; -+ int fips = 0; - int rc; - -- fips = fips_run_rng_test(fipsctx_in, buf); -+ if (!arguments->ignorefail) -+ fips = fips_run_rng_test(fipsctx_in, buf); - if (fips && !arguments->ignorefail) - return 1; - diff --git a/main/rng-tools/02-fix-random_step-boundary.patch b/main/rng-tools/02-fix-random_step-boundary.patch deleted file mode 100644 index 66ec854aad9..00000000000 --- a/main/rng-tools/02-fix-random_step-boundary.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Dermot Bradley <dermot_bradley@yahoo.com> -Date: Mon, 10 Apr 2023 14:25 +0100 - -As buffer size in do_loop() is FIPS_RNG_BUFFER_SIZE, so the random_step -should not bigger. If random_step > FIPS_RNG_BUFFER_SIZE, -update_kernel_random() will not write any date. - -Upstream PR #190, already merged in master. - ---- - -diff -aur a/rngd.c b/rngd.c ---- a/rngd.c -+++ b/rngd.c -@@ -623,6 +623,8 @@ - case 's': - if (sscanf(arg, "%i", &arguments->random_step) == 0) - argp_usage(state); -+ if (arguments->random_step > FIPS_RNG_BUFFER_SIZE || arguments->random_step < 0) -+ arguments->random_step = FIPS_RNG_BUFFER_SIZE; - break; - case 'W': { - int n; diff --git a/main/rng-tools/03-correct-linux-poolsize.patch b/main/rng-tools/03-correct-linux-poolsize.patch deleted file mode 100644 index f5134164c26..00000000000 --- a/main/rng-tools/03-correct-linux-poolsize.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Dermot Bradley <dermot_bradley@yahoo.com> -Date: Mon, 24 Apr 2023 15:37 +0100 - -Change the size of the Linux poolsize from 4096 to 256 to reflect -that of modern/recent Linux kernels. - -Upstream PR #196 submitted. - ---- - -diff -aur a/rngd.8.in b/rngd.8.in ---- a/rngd.8.in -+++ b/rngd.8.in -@@ -108,7 +108,7 @@ - Setting this too high will cause \fIrngd\fR to dominate the contents of the - entropy pool. Low values will hurt system performance during entropy - starves. Do not set \fIfill-watermark\fR above the size of the --entropy pool (usually 4096 bits). A value of 0 to this option will cause no -+entropy pool (usually 256 bits). A value of 0 to this option will cause no - watermark to be set. - .TP - \fB\-R\fI n\fR, \fB\-\-force-reseed=\fInnn\fR -diff -aur a/rngd.c b/rngd.c ---- a/rngd.c -+++ b/rngd.c -@@ -120,7 +120,7 @@ - "Number of bytes written to random-device at a time (default: 64)" }, - - { "fill-watermark", 'W', "n", 0, -- "Do not stop feeding entropy to random-device until at least n bits of entropy are available in the pool (default: 3/4 of poolsize), 0 <= n <= 4096" }, -+ "Do not stop feeding entropy to random-device until at least n bits of entropy are available in the pool (default: 3/4 of poolsize), 0 <= n <= 256" }, - - { "quiet", 'q', 0, 0, "Suppress all messages" }, - -@@ -628,7 +628,7 @@ - break; - case 'W': { - int n; -- if ((sscanf(arg, "%i", &n) == 0) || (n < 0) || (n > 4096)) -+ if ((sscanf(arg, "%i", &n) == 0) || (n < 0) || (n > 256)) - argp_usage(state); - else - arguments->fill_watermark = n; -diff -aur a/rngd_linux.c b/rngd_linux.c ---- a/rngd_linux.c -+++ b/rngd_linux.c -@@ -60,7 +60,7 @@ - * randomdev is the path to the random device - */ - --#define DEFAULT_WATERMARK_GUESS 4096 -+#define DEFAULT_WATERMARK_GUESS 256 - - void init_kernel_rng(const char* randomdev) - { diff --git a/main/rng-tools/APKBUILD b/main/rng-tools/APKBUILD index beafdf30ab6..a171beb9b31 100644 --- a/main/rng-tools/APKBUILD +++ b/main/rng-tools/APKBUILD @@ -9,8 +9,8 @@ pkgname=rng-tools # *both* packages may not be released at the same time and potentially # upgrading rng-tools alone could break the rngd jitter functionality). # -pkgver=6.16 -pkgrel=5 +pkgver=6.17 +pkgrel=0 pkgdesc="Random number generator daemon" url="https://github.com/nhorman/rng-tools" arch="all" @@ -37,9 +37,6 @@ subpackages=" rng-tools-extra-openrc:extra_openrc " source="rng-tools-$pkgver.tar.gz::https://github.com/nhorman/rng-tools/archive/v$pkgver.tar.gz - 01-fix-ignorefail.patch - 02-fix-random_step-boundary.patch - 03-correct-linux-poolsize.patch README.Alpine rngd.confd rngd.confd-arm @@ -143,10 +140,7 @@ extra_openrc() { } sha512sums=" -f4155dca8a54f47227f49ccf5f8453ddd50bd91a37b3b1659b5ad02278ed119028cee42918dd48552c79e19f2e2477277a41afa8e422395b2778b17fab09484d rng-tools-6.16.tar.gz -6cef58eb21f814d2f74484114f1c8d5a57fcdf2eb1c0c34377716df5ff3b15a37f582099b67f9b75be1dd56a34c8c85573b1057a002efdd585af68d41f1e403d 01-fix-ignorefail.patch -5999206a5d35e58973c5a5d3d4f73e1060b9d02b4653fd6bd3d140fa127a7bbdb2fe1108fc556ee6cf9628d6699a561e414a56e14fff125f0fb401c236ef5fd3 02-fix-random_step-boundary.patch -11941117d3125529464b277b7d0e719a783c49ebb80d7132a89f134fe2b4e7c7c5f36f101ef2eca1d4ad65affcb889bc9542de0a98613bf8214e322af0aa8367 03-correct-linux-poolsize.patch +fe874e578c0d5916c271ed5a96b87ed8bb5ce4238cc158471d390ca32864959206b0657dd5910ebb0730a3987f3bf9656690759f5a910d1c4a5891a27678e60d rng-tools-6.17.tar.gz ed483460a47f92d3debf8ba4cc14781b87b8b5dc0fc98f6ac84a3f5996355a69f4d077226e7aa5a0b07e8e1cbcabef86bc626ec5635f5e0c121cdf9f1728d72e README.Alpine 489b9ea52b31c7e3aef495a76184df23becea679422a3e2232c8f2217f3d6b9bddd3fdd8d17e04cd9ab4a014e234daddd98078938a6afb0197cae71c5969baf1 rngd.confd c315e6306bb93233bcd75d216b778eea3487a75244335e13b9586c267dd4423c2a5f93119f3dd2da6aed847b8a0fe97d2cc62fc6a40141c1ea1cd9caf0f3ff8f rngd.confd-arm 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-rbs/APKBUILD b/main/ruby-rbs/APKBUILD index 2701211898e..203626c06b7 100644 --- a/main/ruby-rbs/APKBUILD +++ b/main/ruby-rbs/APKBUILD @@ -4,7 +4,7 @@ pkgname=ruby-rbs _gemname=rbs # Keep version in sync with "Bundled gems" (https://stdgems.org) for the # packaged Ruby version. -pkgver=3.3.2 +pkgver=3.4.4 pkgrel=0 pkgdesc="Type Signature for Ruby" url="https://github.com/ruby/rbs" @@ -59,6 +59,6 @@ doc() { } sha512sums=" -ef0ac2bf65cebd12596c2e7cecd5eeb41abf169f18cdd8cfe056195150ebcb2544b2c65cbfdd63f6e9f2af3e95d5a312aa7db230b2bb03d44f995cf0522ae754 rbs-3.3.2.tar.gz +c6be887af1c89e7b9d8f01e248a24f571c189fc81f55d1625957434a3d1e74c5d23f9ba2089750cb742a82560165d9bab309cff8cdb6c9e455076051301c7dd4 rbs-3.4.4.tar.gz 39f59efc8ed4af86314e630c19cbefdf5df740c3baf8e51e184a58f8a42df7fb5c47d8f3563e97fff1f41d38d3d4d80ba665378ac82b24983a9aa49d4f7e11e4 gemspec.patch " diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index d17f253c4ee..02ae0566c7f 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=2 +pkgver=4.19.6 +pkgrel=0 pkgdesc="Tools to access a server's filespace and printers via SMB" url="https://www.samba.org/" arch="all" @@ -650,7 +650,7 @@ libs() { } sha512sums=" -5b0934f2e44a28ffc4aa07e5495b339cf3a7548c49e29d1bae87de6c3a6f57c2a9130592dce782895079f559ed3bc8b5e4514c9c0fd8d5638aef68f0d0a3391f samba-4.19.5.tar.gz +23172f4393deb9c520182ffb1acb3cf3e53391d4276fffe98527f2f514f969c0952e6e59bcd90f11385dc51367a7bb9cd0534fa9fc3814f16bfb88f41609d0f5 samba-4.19.6.tar.gz f997d0bca9de64a567bccc245bec41e4aa00bacb379d8e348678dcafcf7e723e8716608c5d2d266ad816439b8b93bb8ee28371308a01c9d9c50229f1fc8deb67 netgroup.patch 58de5e79fdfd06e828d478e112d581d333a8bee88d2602b92204d780f0d707b27dd84f8e2e6b00fca40da81c8fe99aa5bcec70d8b393d3a0a83199c72a4aa48b getpwent_r.patch b7906d66fe55a980a54161ee3f311b51bcbce76b8d4c8cc1ba6d0c5bdf98232cb192b9d2c1aa7b3e2742f5b9848c6cf429347940eefe66c3e0eda1d5aac1bf93 musl_uintptr.patch 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/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/spamassassin/APKBUILD b/main/spamassassin/APKBUILD index 9c9dd346103..19afa431ab7 100644 --- a/main/spamassassin/APKBUILD +++ b/main/spamassassin/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=spamassassin _pkgreal=Mail-SpamAssassin -pkgver=3.4.6 -pkgrel=7 +pkgver=4.0.1 +pkgrel=0 pkgdesc="The Powerful #1 Open-Source Spam Filter" url="https://metacpan.org/pod/Mail::SpamAssassin" arch="all" @@ -47,7 +47,10 @@ builddir="$srcdir/$_pkgreal-$pkgver" build() { rm t/dnsbl_subtests.t export CFLAGS="$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 } @@ -57,7 +60,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete install -Dm755 "$srcdir"/spamd.crond "$pkgdir"/etc/periodic/daily/$pkgname-update install -Dm755 "$srcdir"/spamd.initd "$pkgdir"/etc/init.d/spamd install -Dm644 "$srcdir"/spamd.confd "$pkgdir"/etc/conf.d/spamd @@ -84,18 +86,18 @@ cpan() { depends="$_perl_depends" mkdir -p "$subpkgdir"/usr "$subpkgdir"/etc "$subpkgdir"/var/lib/$pkgname mv "$pkgdir"/etc/mail "$subpkgdir"/etc - mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr + mv "$pkgdir"/usr/share "$subpkgdir"/usr mv "$subpkgdir"/usr/share/$pkgname/user_prefs.template \ "$subpkgdir"/etc/mail/$pkgname/user_prefs sed -i '/^#\*/d' "$subpkgdir"/etc/mail/$pkgname/user_prefs } sha512sums=" -7910852f04463a7363a2fc3b70a35adadf5714552e57c5b8ca57beaa534ee18d9f06526cdbcf8bcd5781e5ca778f98d2f84ef2efd1872fa550cfe1689440364a Mail-SpamAssassin-3.4.6.tar.gz +7ac2d789d8744dfe37f647013871e293de50cfcd792029956eb6cea8e51343aad135398bd91867c3c21a68e5fb6330bd6b38a04b794a24449a59287b46d4ac70 Mail-SpamAssassin-4.0.1.tar.gz 0a22933290a3abd147689bf3a9de4b6b277628c22966f353c5da932cd98560babf1d0bb9d92c456ea24decfb5af0bbc960192d29a90d9cab437e7986c75c8278 spamd.initd 274d3aa0d9aab05e83c8d5ad3e93a457649360021a67c8cb19088365bed681ebe26889cfa86f8c46a6044c7ee969231f2a71e3227adf8ad9e38d0286b9caf48d spamd.confd 2ad52adfb6eb2ab28d59311853572ef4c5858e5b3cee1b8ff8c16f1d605e537e823746376bf468b6f041d953f24d5592940686024bc91153d5ec886d65fd16b3 spamd.crond 66a6daa7e9898864497e7d8e17efc6094aabc5a9a94afbc7da08acf4cf2430fad2cb0128b8db4be637f5dcabe3fa9f03490f9d7cbba3c1cc02b7824f63cd0965 Mail-SpamAssassin.patch -6eda2d1073bcf999a976de3e4e2c928a044d46962ce1a4f169078bfc017fb7d0f39d2fc78b17734c2d936649b34638abed3cf9ebeb51614531134289eb23afa6 fix-test.patch -a2d0625b2224641abd338879044f7dcb4c47d09cbc6318c978b88e70e40d0129a7d68e97458ea2d23afcc465f99805a6359153d09e9fc9da881de31ad7a27c4a taint.patch +e6d57356fdbeba0825c8b7d6700786661a4d691a2f9865881d7183424118fe82ccc5e7b6de10538c30519529c82af855e9d5a93f99b120b2e33ec88a98b69d11 fix-test.patch +e98072df43e8f620c8203683c3a003b770ebd11bc49a554c6675578d3ee52223a5287d9433caa2edd6f22008d49eaa043f520f19f71b35afc89ff251966a10dd taint.patch " diff --git a/main/spamassassin/fix-test.patch b/main/spamassassin/fix-test.patch index ee026c54db8..c33dc44a056 100644 --- a/main/spamassassin/fix-test.patch +++ b/main/spamassassin/fix-test.patch @@ -1,70 +1,26 @@ -From 0ae43e7fe4b1e23bc170e16a64c73a8b517c013a Mon Sep 17 00:00:00 2001 -From: Henrik Krohns <hege@apache.org> -Date: Mon, 27 Jan 2020 12:21:46 +0000 -Subject: [PATCH] Fix strip2.t +Patch-Source: https://github.com/apache/spamassassin/commit/1f43d5555ebc14dd904cd8f89643e566b2eb1d47 +Upstream issue: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=8238 +-- +From 1f43d5555ebc14dd904cd8f89643e566b2eb1d47 Mon Sep 17 00:00:00 2001 +From: Sidney Markowitz <sidney@apache.org> +Date: Sun, 14 Apr 2024 17:00:33 +0000 +Subject: [PATCH] bug 8238 delete SDBM_File files during cleanuo in test -git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1873205 13f79535-47bb-0310-9956-ffa450edef68 +git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1916985 13f79535-47bb-0310-9956-ffa450edef68 --- - t/strip2.t | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) + t/sa_txrep.t | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/t/strip2.t b/t/strip2.t -index fb268e2107..4ababeda30 100755 ---- a/t/strip2.t -+++ b/t/strip2.t -@@ -4,7 +4,7 @@ use lib '.'; use lib 't'; - use SATest; sa_t_init("strip2"); - - use Test::More; --plan skip_all => 'Long running tests disabled' if conf_bool('run_long_tests'); -+plan skip_all => 'Long running tests disabled' unless conf_bool('run_long_tests'); - plan tests => 98; - - # --------------------------------------------------------------------------- -@@ -48,7 +48,7 @@ foreach $input (@files) { - $test_number = test_number(); - my $d_output = "log/d.$testname/$test_number"; - unlink $d_output; -- ok sarun ("-d < $d_input"); -+ ok sarun ("-L -d < $d_input"); - ok (-f $d_output); - ok(!compare_text($input,$d_output)) - or diffwarn( $input, $d_output ); -@@ -72,7 +72,7 @@ foreach $input (@files) { - $test_number = test_number(); - my $d_output = "log/d.$testname/$test_number"; - unlink $d_output; -- ok sarun ("-d < $d_input"); -+ ok sarun ("-L -d < $d_input"); - ok (-f $d_output); - ok(!compare_text($input,$d_output)) - or diffwarn( $input, $d_output ); -@@ -101,7 +101,7 @@ ok (-f $d_input); - $test_number = test_number(); - my $d_output = "log/d.$testname/$test_number"; - unlink $d_output; -- ok sarun ("-d < $d_input"); -+ ok sarun ("-L -d < $d_input"); - ok (-f $d_output); - ok(!compare_text($input,$d_output)) - or diffwarn( $input, $d_output ); -@@ -111,7 +111,7 @@ ok (-f $d_input); - $test_number = test_number(); - my $d_output = "log/d.$testname/$test_number"; - unlink $d_output; --ok sarun ("-d < $input"); -+ok sarun ("-L -d < $input"); - ok (-f $d_output); - ok(!compare_text($input,$d_output)) - or diffwarn( $input, $d_output ); -@@ -119,8 +119,8 @@ ok(!compare_text($input,$d_output)) - - sub diffwarn { - my ($f1, $f2) = @_; -- print "# Diff is as follows:\n"; -- untaint_system "diff -u $f1 $f2"; -+ print STDERR "# Diff is as follows:\n"; -+ untaint_system "diff -u $f1 $f2 | cat -v >&2"; - print "\n\n"; - } +diff --git a/t/sa_txrep.t b/t/sa_txrep.t +index c1a6c4b73b..179e29f5e9 100755 +--- a/t/sa_txrep.t ++++ b/t/sa_txrep.t +@@ -88,7 +88,7 @@ tstprefs(" + txrep_weight_email 10 + $rules + "); +-unlink("./$userstate/txreptest"); ++unlink("./$userstate/txreptest", "./$userstate/txreptest.pag", "./$userstate/txreptest.dir"); + %txrep_pattern0 = ( + q{ 0.0 TXREP } => 'Score normalizing', diff --git a/main/spamassassin/taint.patch b/main/spamassassin/taint.patch index c5a2c1cc5a5..a49dad9516e 100644 --- a/main/spamassassin/taint.patch +++ b/main/spamassassin/taint.patch @@ -1,22 +1,22 @@ --- a/t/SATest.pm +++ b/t/SATest.pm -@@ -58,7 +58,7 @@ - }; +@@ -65,7 +65,7 @@ # Clean PATH so taint doesn't complain -- $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin'; -+ $ENV{'PATH'} = '/bin:/usr/bin'; - # Remove tainted envs, at least ENV used in FreeBSD - delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; - } + if (!$RUNNING_ON_WINDOWS) { +- $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin'; ++ $ENV{'PATH'} = '/bin:/usr/bin'; + # Remove tainted envs, at least ENV used in FreeBSD + delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; + } else { --- a/t/config_tree_recurse.t +++ b/t/config_tree_recurse.t @@ -1,4 +1,4 @@ -#!/usr/bin/perl -T +#!/usr/bin/perl - # - # Test that config_tree_recurse works ok in taint mode; bug 6019 + use lib '.'; use lib 't'; + use SATest; sa_t_init("config_tree_recurse.t"); --- a/t/spamd_utf8.t +++ b/t/spamd_utf8.t @@ -1,4 +1,4 @@ diff --git a/main/sqlite-tcl/APKBUILD b/main/sqlite-tcl/APKBUILD deleted file mode 100644 index 7136ae14295..00000000000 --- a/main/sqlite-tcl/APKBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> -# Contributor: Łukasz Jendrysik <scadu@yandex.com> -pkgname=sqlite-tcl -pkgver=3.45.3 -pkgrel=0 -pkgdesc="Sqlite Tcl Extension Architecture (TEA)" -url="https://www.sqlite.org/" -arch="all" -license="blessing" -makedepends="readline-dev tcl-dev sqlite-dev libtool autoconf automake" -subpackages="$pkgname-doc" -options="!check" # no testsuite from upstream - -# compute _ver -_a=${pkgver%%.*} -_b=${pkgver#"$_a".} -_b=${_b%%.*} -_c=${pkgver#"$_a"."$_b".} -_c=${_c%%.*} -case $pkgver in - *.*.*.*)_d=${pkgver##*.};; - *.*.*) _d=0;; -esac -[ $_b -lt 10 ] && _b=0$_b -[ $_c -lt 10 ] && _c=0$_c -[ $_d -lt 10 ] && _d=0$_d -_ver=${_a}${_b}${_c}$_d - -# these variables depend on _ver being set -source="https://www.sqlite.org/2024/sqlite-autoconf-$_ver.tar.gz - include-stdint.patch - " -builddir="$srcdir/sqlite-autoconf-$_ver/tea" - -prepare() { - default_prepare - - if [ -f "$startdir"/../sqlite/APKBUILD ]; then - ( - _tclver=$pkgver - . "$startdir"/../sqlite/APKBUILD - if [ "$_tclver" != "$pkgver" ]; then - die "sqlite version mismatch ($_tclver != $pkgver)" - fi - ) - fi -} - -build() { - ./configure \ - --build="$CBUILD" \ - --host="$CHOST" \ - --prefix=/usr \ - --with-system-sqlite \ - --enable-threads - make -} - -check() { - make check -} - -package() { - make DESTDIR="$pkgdir" install - install -Dm644 license.terms \ - "$pkgdir"/usr/share/licenses/$pkgname/license.terms -} - -sha512sums=" -ab4bb99186ccf81d288bc5150dacd5f8a32561303fbc0c607c24b5bb5ad44e0974655cea57d05122c62e957329f5260d170d2a71cbcf818501af29903c99a391 sqlite-autoconf-3450300.tar.gz -65d9153a2460832f0a49c07a6306af039cf6c0993df63da62f6d093ac77344605186aa16b29d7c34ffa2f2e6d3d94872af5bad5ca2e2d739a3870b68610fd21a include-stdint.patch -" diff --git a/main/sqlite-tools/APKBUILD b/main/sqlite-tools/APKBUILD new file mode 100644 index 00000000000..3fa4e0d0afc --- /dev/null +++ b/main/sqlite-tools/APKBUILD @@ -0,0 +1,184 @@ +# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> +# Contributor: Łukasz Jendrysik <scadu@yandex.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=sqlite-tools +pkgver=3.46.0 +pkgrel=0 +pkgdesc="Helper tools for SQLite" +url="https://www.sqlite.org/" +arch="all" +license="blessing" +makedepends=" + autoconf + readline-dev + sqlite-dev + tcl-dev + " +checkdepends="bash" +subpackages=" + sqlite-analyzer + sqlite-tcl + sqlite-tcl-doc:_tcl_doc:noarch + " + +# compute _ver +_a=${pkgver%%.*} +_b=${pkgver#"$_a".} +_b=${_b%%.*} +_c=${pkgver#"$_a"."$_b".} +_c=${_c%%.*} +case $pkgver in + *.*.*.*)_d=${pkgver##*.};; + *.*.*) _d=0;; +esac +[ $_b -lt 10 ] && _b=0$_b +[ $_c -lt 10 ] && _c=0$_c +[ $_d -lt 10 ] && _d=0$_d +_ver=${_a}${_b}${_c}$_d + +# these variables depend on _ver being set +source="https://www.sqlite.org/2024/sqlite-src-$_ver.zip + date4-test-musl.patch + stdout-invalid-argument.patch + tclsqlite-include-stdint.patch + " +builddir="$srcdir/sqlite-src-$_ver" + +_tools="showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer" + +prepare() { + default_prepare + update_config_sub + + if [ -f "$startdir"/../sqlite/APKBUILD ]; then + _amalgamation=$( + _toolsver=$pkgver + # shellcheck disable=SC1091 + . "$startdir"/../sqlite/APKBUILD + if [ "$_toolsver" != "$pkgver" ]; then + die "sqlite version mismatch ($_toolsver != $pkgver)" + fi + echo "$_amalgamation" + ) + fi + + # based on what tool/mkautoconfamal.sh does to build the TEA tarball + if grep -Fq "AC_INIT([sqlite],[$pkgver])" autoconf/tea/configure.ac; then + msg "TEA version number ok" + else + die "TEA version number mismatch. Should be $pkgver" + fi + + mkdir -vp autoconf/tea/generic + cat > autoconf/tea/generic/tclsqlite3.c <<-'HEADER' + #ifdef USE_SYSTEM_SQLITE + # include <sqlite3.h> + #else + #include "sqlite3.c" + #endif + HEADER + cat src/tclsqlite.c >> autoconf/tea/generic/tclsqlite3.c + + cd autoconf/tea + autoupdate + autoconf +} + +build() { + export CFLAGS="$CFLAGS $_amalgamation" + + # configure options copied from main/sqlite + ./configure \ + --build="$CBUILD" \ + --host="$CHOST" \ + --prefix=/usr \ + --enable-threadsafe \ + --enable-readline \ + --enable-static \ + --enable-dynamic-extensions \ + --enable-fts3 \ + --enable-fts4 \ + --enable-fts5 + + msg "Building sqlite3_analyzer" + make sqlite3_analyzer \ + CFLAGS="$CFLAGS -DUSE_EXTERNAL_SQLITE" \ + LTLINK_EXTRAS="-lsqlite3" + + local tool; for tool in ${_tools//sqlite3_analyzer}; do + msg "Building $tool" + ${CC:-gcc} $CFLAGS $LDFLAGS \ + -o $tool tool/$tool.c -lsqlite3 + done + + # test at the same optimization level as main/sqlite + if want_check; then + msg "Building testfixture" + make CFLAGS="$CFLAGS -O2" testfixture + fi + + if subpackage_types_has tcl; then + msg "Building libtclsqlite3.so" + cd autoconf/tea + ./configure \ + --build="$CBUILD" \ + --host="$CHOST" \ + --prefix=/usr \ + --with-system-sqlite \ + --enable-threads + make + fi +} + +check() { + # parallelize tests on slow archs with "testrunner" + # others run "tcltest" which has more detailed output + + case "$CARCH" in + arm*|riscv64) + make testrunner + ;; + *) + make tcltest + ;; + esac +} + +package() { + install -Dvm755 $_tools -t "$pkgdir"/usr/bin/ + + if subpackage_types_has tcl; then + cd autoconf/tea + make DESTDIR="$pkgdir" install + + install -Dvm644 license.terms \ + -t "$pkgdir"/usr/share/licenses/sqlite-tcl/ + fi +} + +analyzer() { + pkgdesc="Analyze space utilization of SQLite database files" + + amove usr/bin/sqlite3_analyzer +} + +tcl() { + pkgdesc="Sqlite Tcl Extension Architecture (TEA)" + + amove usr/include usr/lib +} + +_tcl_doc() { + pkgdesc="Sqlite Tcl Extension Architecture (TEA) (documentation)" + install_if="docs sqlite-tcl=$pkgver-r$pkgrel" + + gzip -9v "$pkgdir"/usr/share/man/mann/sqlite3.n + amove usr/share/licenses/sqlite-tcl usr/share/man/mann/sqlite3.n.gz +} + +sha512sums=" +441c51943e77655652409965b831df5af8662b4c585134be7fcd9bb5755a495170f37bd6510a80c18c42de72dda23536b583e84e58f042d342dd9e4139ae3327 sqlite-src-3460000.zip +6eb41417c4279702e420846f234f04176d2d2b9a81b3e14ed6e080e9698954cc36f1011fce2a87750b83beeb7633e259aa51a98bac475b2598772c686fd220ec date4-test-musl.patch +cd976a64a3721dec1fb465bf337f30bb14e35ee94f4fec3d2667630853f30f9f489ef60c96a8789de4ceb05463396c529ee03a0b8aa3745ea161aac008425059 stdout-invalid-argument.patch +16cf491de20c2eb2188ce9f99363e597cb6580a32ab340963429368f5746c04f130874c6abdd021c5db95e2e8f780670371b2ce7158ec484226352b169933d59 tclsqlite-include-stdint.patch +" diff --git a/main/sqlite-tools/date4-test-musl.patch b/main/sqlite-tools/date4-test-musl.patch new file mode 100644 index 00000000000..d04e96e1b5c --- /dev/null +++ b/main/sqlite-tools/date4-test-musl.patch @@ -0,0 +1,14 @@ +Do not test format specifiers not supported by musl +https://www.openwall.com/lists/musl/2024/02/28/5 + +--- a/test/date4.test ++++ b/test/date4.test +@@ -24,7 +24,7 @@ + } + + if {$tcl_platform(os)=="Linux"} { +- set FMT {%d,%e,%F,%H,%k,%I,%l,%j,%m,%M,%u,%w,%W,%Y,%%,%P,%p,%U,%V,%G,%g} ++ set FMT {%d,%e,%F,%H,%I,%j,%m,%M,%u,%w,%W,%Y,%%,%p,%U,%V,%G,%g} + } else { + set FMT {%d,%e,%F,%H,%I,%j,%p,%R,%u,%w,%W,%%} + } diff --git a/main/sqlite-tools/stdout-invalid-argument.patch b/main/sqlite-tools/stdout-invalid-argument.patch new file mode 100644 index 00000000000..52473652684 --- /dev/null +++ b/main/sqlite-tools/stdout-invalid-argument.patch @@ -0,0 +1,13 @@ +--- a/test/tester.tcl ++++ b/test/tester.tcl +@@ -1585,6 +1585,10 @@ + set col "" + catch { set col $color($opcode) } + ++ # For VCheck, P4 is a pointer to a Table object, printing ++ # it as a string results in an unprintable character ++ if {$opcode == "VCheck"} { set p4 [binary encode hex $p4] } ++ + output2 [format {%-4d %s%s%-12.12s%s %-6d %-6d %-6d % -17s %s %s} \ + $addr $I $col $opcode $D $p1 $p2 $p3 $p4 $p5 $comment + ] diff --git a/main/sqlite-tcl/include-stdint.patch b/main/sqlite-tools/tclsqlite-include-stdint.patch index e545a874b7f..78611829ea9 100644 --- a/main/sqlite-tcl/include-stdint.patch +++ b/main/sqlite-tools/tclsqlite-include-stdint.patch @@ -1,6 +1,6 @@ ---- a/generic/tclsqlite3.c -+++ b/generic/tclsqlite3.c -@@ -73,6 +73,7 @@ +--- a/src/tclsqlite.c ++++ b/src/tclsqlite.c +@@ -68,6 +68,7 @@ # endif # endif /* SQLITE_PTRSIZE */ # if defined(HAVE_STDINT_H) diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD index ef0cdb26b69..99c2c23c3c3 100644 --- a/main/sqlite/APKBUILD +++ b/main/sqlite/APKBUILD @@ -1,8 +1,9 @@ -# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> +# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Contributor: Łukasz Jendrysik <scadu@yandex.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=sqlite -# NOTE: pkgver needs to correspond with sqlite-tcl -pkgver=3.45.3 +# NOTE: pkgver needs to correspond with sqlite-tools +pkgver=3.46.0 pkgrel=0 pkgdesc="C library that implements an SQL database engine" url="https://www.sqlite.org/" @@ -62,12 +63,13 @@ _amalgamation="-DSQLITE_ENABLE_FTS3_PARENTHESIS \ -DSQLITE_MAX_VARIABLE_NUMBER=250000" prepare() { - if [ -f "$startdir"/../sqlite-tcl/APKBUILD ]; then + if [ -f "$startdir"/../sqlite-tools/APKBUILD ]; then ( _sqlitever=$pkgver - . "$startdir"/../sqlite-tcl/APKBUILD + # shellcheck disable=SC1093 + . "$startdir"/../sqlite-tools/APKBUILD if [ "$_sqlitever" != "$pkgver" ]; then - warning "sqlite-tcl version mismatch ($_sqlitever != $pkgver)" + warning "sqlite-tools version mismatch ($_sqlitever != $pkgver)" fi ) fi @@ -110,6 +112,6 @@ package() { } sha512sums=" -ab4bb99186ccf81d288bc5150dacd5f8a32561303fbc0c607c24b5bb5ad44e0974655cea57d05122c62e957329f5260d170d2a71cbcf818501af29903c99a391 sqlite-autoconf-3450300.tar.gz -8a347c292363e55a8c0fa0321e3f399bfe9c9aedcb6c838123f0eb3e2a4e078d096b7c152a4981e18ee9fa50c4ef913a33ed840aeed33aee0a46e95cd17f0814 sqlite-3450300-LICENSE.md +631ffe4b39dffbafdcb8ac09a6a84cd7959505ecc588d8ad9278d0ff0c3ea467f87c11167e1b1a3f56d62178e679780e2be313ae3badae8ea056709d71bd4817 sqlite-autoconf-3460000.tar.gz +8a347c292363e55a8c0fa0321e3f399bfe9c9aedcb6c838123f0eb3e2a4e078d096b7c152a4981e18ee9fa50c4ef913a33ed840aeed33aee0a46e95cd17f0814 sqlite-3460000-LICENSE.md " 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/strace/APKBUILD b/main/strace/APKBUILD index c5143adb948..aa36cd6daa2 100644 --- a/main/strace/APKBUILD +++ b/main/strace/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=strace -pkgver=6.8 +pkgver=6.9 pkgrel=0 pkgdesc="Diagnostic, debugging and instructional userspace tracer" url="https://strace.io" @@ -38,7 +38,7 @@ package() { } sha512sums=" -c477724a77112a74a5236a38b7dbaa9b6199622a1d21cc6253cac80dc4ddea78aeaf8cddf4a51ee4119e00e1adaf95f64f64e20d9775ec3edd77cd82c8f7b30e strace-6.8.tar.xz +aa80b9b6ec41082f1710f2327f7a22003cdce6d95ab0e5083ada9c5b7b40b8f7cbc7dc6c017878dc0e42c52e405e98ed1488c51d17bc3538989ff4be2c2411e1 strace-6.9.tar.xz 273b92ebf0069f19bef7ec26c7860e2af7ef01e782255c70ded1ae5e967f8f6bf031ecba96612c6083bf58f46278ba4ab3ec0fb35b08c8c8d668191f97adee52 disable-fortify.patch 44b1872cf996caa4970fa6c2875a3a2cffe4a38455e328d968bd7855ef9a05cf41190794dc137bc8667576635f5271057cf0e6cde9a6c7aee66afd1dba9bdba0 nlattr-fix.patch " diff --git a/main/tcl/APKBUILD b/main/tcl/APKBUILD index 4603def9078..fadb7dc6a0a 100644 --- a/main/tcl/APKBUILD +++ b/main/tcl/APKBUILD @@ -1,21 +1,22 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> +# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=tcl pkgver=8.6.14 +pkgrel=1 _major=${pkgver%.*} -pkgrel=0 pkgdesc="The Tcl scripting language" url="https://www.tcl-lang.org/" arch="all" license="TCL" depends="tzdata" -depends_dev="tcl" +depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="zlib-dev sqlite-dev" subpackages="$pkgname-doc $pkgname-dev" source="https://downloads.sourceforge.net/sourceforge/tcl/tcl$pkgver-src.tar.gz tcl-stat64.patch " -builddir="$srcdir"/tcl$pkgver/unix +builddir="$srcdir/tcl$pkgver/unix" prepare() { cd "$srcdir"/tcl$pkgver @@ -32,6 +33,7 @@ build() { case "$CARCH" in x86_64) _64bit="--enable-64bit";; esac + ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -45,14 +47,15 @@ build() { } package() { - export LD_LIBRARY_PATH="$_builddir" make INSTALL_ROOT="$pkgdir" install install-private-headers ln -sf tclsh$_major "$pkgdir"/usr/bin/tclsh - install -Dm644 ../license.terms $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -Dm644 ../license.terms \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE # remove buildroot traces - find "$pkgdir" -name '*Config.sh' | xargs sed -i -e "s#${srcdir}#/usr/src#" + find "$pkgdir" -name '*Config.sh' -print0 | + xargs -0 sed -i -e "s#${srcdir}#/usr/src#" } check() { @@ -64,10 +67,9 @@ check() { dev() { default_dev - cd $pkgdir - for i in $(find . -name '*.c' -o -name '*Config.sh'); do - mkdir -p "$subpkgdir"/${i%/*} - mv $i "$subpkgdir"/${i%/*}/ + + local file; find "$pkgdir" -name '*Config.sh' | while read -r file; do + amove "${file#"$pkgdir"}" done } 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/u-boot/APKBUILD b/main/u-boot/APKBUILD index f49183a662c..84e0dfb7a9e 100644 --- a/main/u-boot/APKBUILD +++ b/main/u-boot/APKBUILD @@ -119,7 +119,7 @@ build() { package() { case "$CARCH" in - mips64|x86*) return;; + x86*) return;; esac cd "$builddir"/build mkdir -p "$pkgdir"/usr/share/$pkgname "$pkgdir"/usr/sbin 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 28b133102fd..7d5a69c8a4e 100644 --- a/main/util-linux/APKBUILD +++ b/main/util-linux/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=util-linux -pkgver=2.40 -pkgrel=2 +pkgver=2.40.1 +pkgrel=1 pkgdesc="Random collection of Linux utilities" url="https://git.kernel.org/cgit/utils/util-linux/util-linux.git" arch="all" @@ -34,6 +34,7 @@ subpackages=" agetty:_mv_bin blkid:_mv_bin cfdisk:_mv_bin + dmesg:_mv_bin findmnt:_mv_bin flock:_mv_bin fstrim:_mv_bin @@ -83,7 +84,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 @@ -115,6 +115,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) @@ -349,9 +351,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 fedace57f3b..3d1bdde2044 100644 --- a/main/uwsgi/APKBUILD +++ b/main/uwsgi/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=uwsgi pkgver=2.0.25.1 -pkgrel=0 +pkgrel=1 pkgdesc="uWSGI application container server" url="https://projects.unbit.it/uwsgi/" arch="all" @@ -189,6 +189,8 @@ _plugin() { provides="uwsgi-python=$pkgver-r$pkgrel" replaces="uwsgi-python" ln -s python3_plugin.so "$subpkgdir"/usr/lib/uwsgi/python_plugin.so + local python_libpath=$(python3 -c "import sysconfig; print(sysconfig.get_path('purelib'))") + install -Dm644 uwsgidecorators.py -t "$subpkgdir/$python_libpath/" ;; # Mitigate breakages caused by injudicious rename in v3.11. gevent3) @@ -196,13 +198,15 @@ _plugin() { provides="uwsgi-gevent=$pkgver-r$pkgrel" replaces="uwsgi-gevent" ln -s gevent3_plugin.so "$subpkgdir"/usr/lib/uwsgi/gevent_plugin.so + local python_libpath=$(python3 -c "import sysconfig; print(sysconfig.get_path('purelib'))") + install -Dm644 uwsgidecorators.py -t "$subpkgdir/$python_libpath/" ;; esac } sha512sums=" 3b2a78917b129f5a2f38f3538e30b132e4cd6e270df55365ccc0dc6b94641a262af1484c62b252d0a24121eb68417cb061210e89e2b7885992ab4ffa07092119 uwsgi-2.0.25.1.tar.gz -1fef8a30e8e20b0322cf464a2adf744a4b46a35f4c9e104acacab4c99b913c5a0b537783bdfedf8900a4e7397e08079b675be2414beb571fd0b330985ac676cc uwsgi.initd +8389c5bc34f3b6eb038baeb91269af0e6ba885399bcc094f86caad74befddcb04c2e36ba7399c2722ac0de74b5fafc1f284f83dbfec82d367f3451a3a01f9118 uwsgi.initd 370202e143d0e041a2e36905346080d3ca592c9a74705a8c4e142a1307d22b921c10e673d683ca284ea27d184474ed86edd7723a6e590d35a562ad7cf6afa529 uwsgi.ini 2798c9d2e49e29292ffe6a5a29b866301c78d5f322fc5d07dfa9569efdaa5220237a5f6744652fbdd957be29311ddaff190541333f042cbf0e907dfa98ce3e2a readme.emperor f3cff00926929a5bb40afafb65fd5228582af35fbf524562282020c4c4ae9c659231b2381f4b3cceb18e8f3f6c888c21bdd8ed4ddcd81e92fbc6a0891800ce38 alpine.buildconf diff --git a/main/uwsgi/uwsgi.initd b/main/uwsgi/uwsgi.initd index 9e76358fd41..0cca46d787f 100644 --- a/main/uwsgi/uwsgi.initd +++ b/main/uwsgi/uwsgi.initd @@ -44,7 +44,9 @@ start_pre() { --user $user $(optif --group "$group") $(optif --stdout "$logfile") - $(optif --stderr "$logfile")" + $(optif --stderr "$logfile") + $(optif --stdout-logger "$output_logger") + $(optif --stderr-logger "$error_logger")" if [ -z "$uwsgi_conf" ]; then case "$RC_SVCNAME" in diff --git a/main/valkey/APKBUILD b/main/valkey/APKBUILD index c63bbbff440..b82aedc68db 100644 --- a/main/valkey/APKBUILD +++ b/main/valkey/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=valkey pkgver=7.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="Open source high-performance key/value datastore (fork of Redis)" url="https://valkey.io/" arch="all" @@ -15,6 +15,7 @@ makedepends="linux-headers openssl-dev" checkdepends="tcl procps" install=" $pkgname.pre-install + $pkgname.post-install $pkgname-compat.pre-install " subpackages=" @@ -97,7 +98,7 @@ compat() { sha512sums=" 0b684a5ffe045ce51bb2f4f76429928784b8b46ee4817a95b658ffd69313a90b3d0fb12e0ddbb0b4cb57a7e0c79072f603eb4524a9bcce96ecc9ae8f1a5f02c3 valkey-7.2.5.tar.gz -20278cb287d9bc15839a120af4379d18bbc3bef61f07834931c807be87a2227027ad4f1bbd1fba3fdcc99b37e67262f2c925e99905b4bc1b15697a5be282265b valkey.conf.patch +a5b567a9ac300fed9f3eb484922b49d3677915c7282ffecd3b71505c685cf1964791f4915308ac31f03851f707646313e72bb35b229cfe81fea4a9b1d8f4009b valkey.conf.patch d0311d2bfade7efbfa2bdcc6c74e8e8a151c09c627e30f5cea1826155dcb4f7ca4c1d35aba26bccec933575fadcbe5785e16b4801058fec73c7de5537ffeb09a sentinel.conf.patch 605c1f39cf5f206e03d19af54412a66732ad3c65d5cb36e5d6cfb9d28779807d2da9c29d01f07e0ba2956446cb6935b66c92844a74b255b6070870b30d7d45d8 valkey.initd 639a007f7e98cf7614d2afb6e109042883030e0bdf4eaf1dc3df3ecab8043d6be30647e1e46295f783efc7baf42dc420b2e5dcf388913efdc5bdf2cd1e418f9f valkey.confd diff --git a/main/valkey/valkey.conf.patch b/main/valkey/valkey.conf.patch index f8cdcdc82e8..911a1ca3990 100644 --- a/main/valkey/valkey.conf.patch +++ b/main/valkey/valkey.conf.patch @@ -3,7 +3,9 @@ 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. +convenient to have it enabled by default. It must be in a subdirectory that +is automatically created by the init script because valkey user has no +permission to create files in /run. --- a/valkey.conf +++ b/valkey.conf @@ -13,7 +15,7 @@ convenient to have it enabled by default. # -# unixsocket /run/valkey.sock -# unixsocketperm 700 -+unixsocket /run/valkey.sock ++unixsocket /run/valkey/valkey.sock +unixsocketperm 770 # Close the connection after a client is idle for N seconds (0 to disable) diff --git a/main/valkey/valkey.post-install b/main/valkey/valkey.post-install new file mode 100644 index 00000000000..7d0fa3dd46a --- /dev/null +++ b/main/valkey/valkey.post-install @@ -0,0 +1,11 @@ +#!/bin/sh + +# Create directory for the socket if OpenRC is not present (e.g. in container). +# It's conditioned using post-install script specifically to avoid easily +# overlookable mistakes in the init script (service working until the +# first restart). +if ! [ -e /sbin/openrc ]; then + install -d -m 755 -o valkey -g valkey /run/valkey +fi + +exit 0 diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD index 4ca0c1df109..2a645de2f1e 100644 --- a/main/vim/APKBUILD +++ b/main/vim/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vim -pkgver=9.1.0 -pkgrel=2 +pkgver=9.1.0414 +pkgrel=0 pkgdesc="Improved vi-style text editor" url="https://www.vim.org/" arch="all" @@ -300,6 +300,6 @@ xxd() { } sha512sums=" -d7038c5c413bfd1a125a893c0b1d3e498e9ce6b5df7d45ef536faac966ce2846b08fe2982010c31f30b34fda07ba2c6922d795806509d05d73768626edc70374 vim-9.1.0.tar.gz +df45288cbc79283e41dac191b4b6b1e9439feba0ac319935baf41327cd0a60239e23dc5f769c67c48514cdca0e7d4671670a84aa989562264e0d8f14dc838d99 vim-9.1.0414.tar.gz bb4ac5bd2862754e741e63d7b521fd9e0cb1ac19769b952672928fd26471e9486182cd8a46a7e6f25e5b87759106e642293534c5e90c3c3958308291acb26875 vimrc " diff --git a/main/wireguard-tools/APKBUILD b/main/wireguard-tools/APKBUILD index 3b5ee7703ca..4a1042e0068 100644 --- a/main/wireguard-tools/APKBUILD +++ b/main/wireguard-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=wireguard-tools pkgver=1.0.20210914 -pkgrel=3 +pkgrel=4 pkgdesc="Next generation secure network tunnel: userspace tools" arch="all" url="https://www.wireguard.com" @@ -13,14 +13,19 @@ license="GPL-2.0-only" _wg_quick_deps="iproute2 bash openresolv" makedepends="libmnl-dev $_wg_quick_deps" depends="$pkgname-wg $pkgname-wg-quick" +install="$pkgname-openrc.post-install" subpackages=" $pkgname-doc $pkgname-bash-completion $pkgname-wg:_split $pkgname-wg-quick:_split:noarch + $pkgname-openrc " options="!check" -source="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-$pkgver.tar.xz" +source=" + https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-$pkgver.tar.xz + wg-quick.initd + " build() { make -C src @@ -38,6 +43,8 @@ package() { find "$builddir"/contrib -name '.gitignore' -delete cp -rf "$builddir"/contrib "$pkgdir/usr/share/doc/$pkgname/" + + install -Dm755 "$srcdir"/wg-quick.initd "$pkgdir"/etc/init.d/wg-quick } _split() { @@ -53,4 +60,5 @@ _split() { sha512sums=" 6727ea65551dbb064457449b93a943bd6534ca93bc7fa5704c2f6826266c98688ee9ea28731fda57a5245d5f63c05f3899fcca54e40c0b6251b7c4796e957445 wireguard-tools-1.0.20210914.tar.xz +3de3edb359a786bdb8de06f496caced1293048c2ec489073c0525b4eca61365424ffde6a7eb899d7672db38872b6c67436b2e39019e92300ca5e590ba02c2e84 wg-quick.initd " diff --git a/main/wireguard-tools/wg-quick.initd b/main/wireguard-tools/wg-quick.initd new file mode 100644 index 00000000000..78047278203 --- /dev/null +++ b/main/wireguard-tools/wg-quick.initd @@ -0,0 +1,38 @@ +#!/sbin/openrc-run +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +name="WireGuard" +description="WireGuard via wg-quick(8)" + +depend() { + need net + use dns +} + +CONF="${SVCNAME#*.}" + +checkconfig() { + if [ "$CONF" = "$SVCNAME" ]; then + eerror "You cannot call this init script directly. You must create a symbolic link to it with the configuration name:" + eerror " ln -s /etc/init.d/wg-quick /etc/init.d/wg-quick.vpn0" + eerror "And then call it instead:" + eerror " /etc/init.d/wg-quick.vpn0 start" + return 1 + fi + return 0 +} + +start() { + checkconfig || return 1 + ebegin "Starting $description for $CONF" + wg-quick up "$CONF" + eend $? "Failed to start $description for $CONF" +} + +stop() { + checkconfig || return 1 + ebegin "Stopping $description for $CONF" + wg-quick down "$CONF" + eend $? "Failed to stop $description for $CONF" +} diff --git a/main/wireguard-tools/wireguard-tools-openrc.post-install b/main/wireguard-tools/wireguard-tools-openrc.post-install new file mode 100644 index 00000000000..b7d43c7d55b --- /dev/null +++ b/main/wireguard-tools/wireguard-tools-openrc.post-install @@ -0,0 +1,10 @@ +#!/bin/sh + +cat 1>&2 <<EOF +* +* To use the WireGuard OpenRC script, you need to create a symbolic link to it with the configuration name: +* ln -s /etc/init.d/wg-quick /etc/init.d/wg-quick.wg0 +* And then call it instead: +* rc-service wg-quick.wg0 start +* +EOF diff --git a/main/wireless-regdb/APKBUILD b/main/wireless-regdb/APKBUILD index 64f30c5216e..cbae82855ca 100644 --- a/main/wireless-regdb/APKBUILD +++ b/main/wireless-regdb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Stefan Wagner <stw@bit-strickerei.de> # Maintainer: Stefan Wagner <stw@bit-strickerei.de> pkgname=wireless-regdb -pkgver=2024.01.23 +pkgver=2024.05.08 pkgrel=0 pkgdesc="Central Regulatory Domain Database" url="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb" @@ -20,5 +20,5 @@ package() { } sha512sums=" -09cf2308e459bbc5755cf648aa9afcfac7232391f189403000091eef3ae4265c99c0df3364160ef48a2efa3ce6443099ac735c1d82e03f0f24f7017872afbdba wireless-regdb-2024.01.23.tar.xz +edb562d708be7119e80bb48d7520c11e409b81178168f9c6873ea97a2e4d9277d02d3b72b1af9f0302ba2e252d94d14c4468ee4cc1a6bb186a17d74c57d7594d wireless-regdb-2024.05.08.tar.xz " diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD index acda7f265b9..4367229d403 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.7.0 +pkgver=6.8.0 pkgrel=0 pkgdesc="XFS filesystem utilities" url="https://xfs.org/index.php/Main_Page" @@ -54,5 +54,5 @@ extra() { } sha512sums=" -4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74 xfsprogs-6.7.0.tar.xz +f5b5c6d8da70cc0f3361b3420982aabfabb0bc54b9eb60b93a9aaeedb33a9ecede4061d5c1300b96d7aba7d44a4207672c4a33e115bf0f5c711a151f3fc65e0d xfsprogs-6.8.0.tar.xz " diff --git a/main/xtables-addons-lts/APKBUILD b/main/xtables-addons-lts/APKBUILD index 3016f91e482..955bc1ae985 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.30 +_kver=6.6.32 _krel=0 _kpkgver="$_kver-r$_krel" @@ -19,7 +19,7 @@ pkgrel=$(( _krel + _rel )) pkgdesc="Iptables extensions kernel modules" url="https://inai.de/projects/xtables-addons/" -arch="all !armhf !mips64 !riscv64" +arch="all !armhf !riscv64" license="GPL-2.0-or-later" depends="$_kpkg=$_kpkgver" makedepends="$_kpkg-dev=$_kpkgver iptables-dev linux-headers" diff --git a/main/xtables-addons-rpi/APKBUILD b/main/xtables-addons-rpi/APKBUILD index 93537d7f6e5..a1ecc40b308 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.29 +_kver=6.6.31 _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 77a73325ba4..fa206da75f7 100644 --- a/main/zfs-lts/APKBUILD +++ b/main/zfs-lts/APKBUILD @@ -8,7 +8,7 @@ _rel=1 # when changing _kver make sure _krel=0 & _rel=0 _flavor=${FLAVOR:-lts} _kpkg=linux-$_flavor -_kver=6.6.30 +_kver=6.6.32 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/main/zfs-rpi/APKBUILD b/main/zfs-rpi/APKBUILD index 4f127d7b668..46f73dbe1e8 100644 --- a/main/zfs-rpi/APKBUILD +++ b/main/zfs-rpi/APKBUILD @@ -8,7 +8,7 @@ _rel=4 # when changing _kver/_krel make sure _rel=0 _flavor=${FLAVOR:-rpi} _kpkg=linux-$_flavor -_kver=6.6.29 +_kver=6.6.31 _krel=0 _kpkgver="$_kver-r$_krel" diff --git a/scripts/mkimg.standard.sh b/scripts/mkimg.standard.sh index a0518d357ba..f344b72c1c7 100755 --- a/scripts/mkimg.standard.sh +++ b/scripts/mkimg.standard.sh @@ -6,7 +6,7 @@ profile_standard() { profile_base profile_abbrev="std" image_ext="iso" - arch="aarch64 armv7 x86 x86_64 ppc64le riscv64 s390x loongarch64" + arch="aarch64 armv7 x86 x86_64 ppc64le s390x loongarch64" output_format="iso" kernel_addons="xtables-addons" case "$ARCH" in @@ -18,11 +18,6 @@ profile_standard() { ppc64le) initfs_cmdline="modules=loop,squashfs,sd-mod,usb-storage,ibmvscsi quiet" ;; - riscv64) - kernel_flavors="edge" - kernel_cmdline="console=tty0 console=ttyS0,115200 console=ttySIF0,115200" - kernel_addons= - ;; esac apks="$apks iw wpa_supplicant" } 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/acmetool/APKBUILD b/testing/acmetool/APKBUILD index c96ccca8f19..d4d431442fe 100644 --- a/testing/acmetool/APKBUILD +++ b/testing/acmetool/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: kpcyrd <git@rxv.cc> pkgname=acmetool pkgver=0.2.2 -pkgrel=5 +pkgrel=6 pkgdesc="An easy-to-use command line tool for automatically acquiring certificates from ACME servers (such as Let's Encrypt)" url="https://github.com/hlandau/acmetool" arch="all" diff --git a/testing/aero2solver/APKBUILD b/testing/aero2solver/APKBUILD index c486c971f53..2d9fa6948b1 100644 --- a/testing/aero2solver/APKBUILD +++ b/testing/aero2solver/APKBUILD @@ -1,7 +1,7 @@ # Contributor: nezu <nezu@nezu.cc> # Maintainer: nezu <nezu@nezu.cc> pkgname=aero2solver -pkgver=1.0.0 +pkgver=1.1.0 pkgrel=0 pkgdesc="Automatic captcha solver for aero2.pl" url="https://github.com/dumbasPL/aero2solver" @@ -57,7 +57,7 @@ package() { } sha512sums=" -d319eadf9908adc6bee4ef184226ee7b7371095fe03e204141718b90d01aeafec85c9fae1aacc04c8e67570e1c93ae916e5c3aa8a6d0bc2794e10becdd802734 aero2solver-1.0.0.tar.gz +84a834a8770f725d5bc5b3da141f6d8195c9a20b149d57b7d8505518b54db2788d8af1847c48339867c1d052fc4bebc8e434c9ae91c9190a3263f8ee08e90f20 aero2solver-1.1.0.tar.gz 5183024b38e2b2257b23f82caec82baeb2ebf8c53238c9ce52f32f790909c30f40f2ea47a58bc861da08f84dd861434faeeeb617b0463e17794dc2aa6502d1b3 aero2solver.initd 9ab94bc219108505264d94c396e979ab54da29fe8adebee247d747bd0035242d7aec6fe4e43a7f297667b51520edd6621167a7dab75987a2fd9ff587368aa2e4 aero2solver.confd 466789dc2f8877bf04e2bbf0ef142f4cb4b70b1021def3deec39fa854e9661f0c0d583030ceebb4916996c8af4ea1df9a1b3a3d130223c3eea1a23737adba39a aero2solver.logrotate 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/alda/APKBUILD b/testing/alda/APKBUILD index f68c89a1d04..33cfe8d7fd8 100644 --- a/testing/alda/APKBUILD +++ b/testing/alda/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=alda pkgver=2.2.7 -pkgrel=4 +pkgrel=5 pkgdesc="Music programming language for musicians" url="https://github.com/alda-lang/alda" arch="x86_64" diff --git a/testing/alpine-lift/APKBUILD b/testing/alpine-lift/APKBUILD index 35d4343c313..26d6b6a7d80 100644 --- a/testing/alpine-lift/APKBUILD +++ b/testing/alpine-lift/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=alpine-lift pkgver=0.2.0 -pkgrel=15 +pkgrel=16 pkgdesc="Basic cloud-init-like for Alpine Linux" url="https://github.com/bjwschaap/alpine-lift" license="MIT" diff --git a/testing/alps/APKBUILD b/testing/alps/APKBUILD index 5da273ae366..18674b5d511 100644 --- a/testing/alps/APKBUILD +++ b/testing/alps/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=alps pkgver=0_git20230807 -pkgrel=3 +pkgrel=4 _commit=652ea9c7885a6c508d3c69c37b7c65e5bbe4fe77 pkgdesc="Simple and extensible webmail" url="https://sr.ht/~migadu/alps/" diff --git a/testing/amazon-ssm-agent/APKBUILD b/testing/amazon-ssm-agent/APKBUILD index 805d862adf7..eea6eca5ee8 100644 --- a/testing/amazon-ssm-agent/APKBUILD +++ b/testing/amazon-ssm-agent/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=amazon-ssm-agent pkgver=3.3.418.0 -pkgrel=0 +pkgrel=1 pkgdesc="Amazon SSM Agent for managing EC2 Instances using the SSM APIs." url="https://aws.amazon.com/documentation/systems-manager/" license="Apache-2.0" diff --git a/testing/android-apkeep/APKBUILD b/testing/android-apkeep/APKBUILD index c376ecd09e5..612f29e67ff 100644 --- a/testing/android-apkeep/APKBUILD +++ b/testing/android-apkeep/APKBUILD @@ -5,8 +5,8 @@ pkgver=0.16.0 pkgrel=0 pkgdesc="A command-line tool for downloading Android APK files from various sources" url="https://github.com/EFForg/apkeep" -# ppc64le, riscv64, s390x: ring crate -arch="all !ppc64le !riscv64 !s390x" +# ppc64le, riscv64, s390x, loongarch64: ring crate +arch="all !ppc64le !riscv64 !s390x !loongarch64" license="MIT" makedepends=" bzip2-dev diff --git a/testing/android-translation-layer/APKBUILD b/testing/android-translation-layer/APKBUILD index e113c0ba67e..2872a07e02d 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_git20240428 +pkgver=0_git20240527 pkgrel=0 -_commit="a99dfd80ccff8b39ca7014d42c93586dbe6e7edf" +_commit="5fb7cb283f480aa084c55974d06f787bc8133252" 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" @@ -45,5 +45,5 @@ package() { } sha512sums=" -bef47fb541b61532d84f24a80743aff1d23ea9de495118f2695ceeb7794ad76cd752e379161073ad42b220eff13ef404017dae712714a19ad6b5d7b636f67fae android_translation_layer-a99dfd80ccff8b39ca7014d42c93586dbe6e7edf.tar.gz +7e0ec0f65b2b7f0a38af38f85d1de474b593b61f7f0e27b02ffd8dc91229205c96496e9a53ae6cb7ac4f4e34ce5698157a84783d63135145959c40764a4fb547 android_translation_layer-5fb7cb283f480aa084c55974d06f787bc8133252.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/ansible-bender/APKBUILD b/testing/ansible-bender/APKBUILD index e122afa16f6..16b9d12006e 100644 --- a/testing/ansible-bender/APKBUILD +++ b/testing/ansible-bender/APKBUILD @@ -4,8 +4,8 @@ pkgver=0.10.1 pkgrel=2 pkgdesc="Container image builder using Buildah and Ansible" url="https://ansible-community.github.io/ansible-bender/" -# s390x: blocked by aardvark-dns and netavark -> podman -arch="all !s390x" +# s390x, loongarch64: blocked by aardvark-dns and netavark -> podman +arch="all !s390x !loongarch64" license="MIT" depends=" ansible-core diff --git a/testing/antibody/APKBUILD b/testing/antibody/APKBUILD index 520869fd59f..09d50720653 100644 --- a/testing/antibody/APKBUILD +++ b/testing/antibody/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Aleks Bunin <alpinelinux@compuix.com> pkgname=antibody pkgver=6.1.1 -pkgrel=20 +pkgrel=21 pkgdesc="The fastest zsh shell plugin manager." url="https://github.com/getantibody/antibody" license="MIT" diff --git a/testing/apk-tools3/APKBUILD b/testing/apk-tools3/APKBUILD index 3ae7dae436a..972de780c52 100644 --- a/testing/apk-tools3/APKBUILD +++ b/testing/apk-tools3/APKBUILD @@ -3,7 +3,7 @@ pkgname=apk-tools3 pkgver=3.0.0_pre2_git20240401 _commit=b7a7ea728e242a04f32f8e56ddc3d8d85960ee28 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine Package Keeper v3 - package manager for alpine" arch="all" url="https://git.alpinelinux.org/apk-tools" @@ -17,6 +17,7 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-static $pkgname-doc $pkgname-lib # forcing this constraint makes apk upgrade musl as part of the 'critical' transaction, # and update musl first. depends="musl>=1.2.3_git20230424" +depends_doc="!apk-tools-doc" _lua="5.3" makedepends_build="openssl>3 lua$_lua lua$_lua-lzlib scdoc" makedepends_host="meson zlib-dev zstd-dev openssl-dev zlib-static zstd-static openssl-libs-static linux-headers" @@ -34,7 +35,7 @@ source="$pkgname-$pkgver.tar.gz::https://gitlab.alpinelinux.org/alpine/apk-tools builddir=$srcdir/apk-tools-$_commit build() { - abuild-meson \ + VERSION=$pkgver-r$pkgrel abuild-meson \ --bindir=/sbin \ --libdir=/lib \ -Dlua_version=$_lua -Dlua=$_d_lua \ @@ -42,7 +43,7 @@ build() { -Dhelp=enabled \ -Dstatic_apk=true \ . output - VERSION=$pkgver-r$pkgrel meson compile -C output + meson compile -C output } check() { @@ -51,6 +52,7 @@ check() { package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output + mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib install -d "$pkgdir"/lib/apk/db \ "$pkgdir"/lib/apk/exec \ "$pkgdir"/etc/apk/keys \ diff --git a/testing/apollo/APKBUILD b/testing/apollo/APKBUILD index 5b38062c137..522711647ed 100644 --- a/testing/apollo/APKBUILD +++ b/testing/apollo/APKBUILD @@ -2,7 +2,7 @@ # Contributor: David Sugar <tychosoft@gmail.com> pkgname=apollo pkgver=0.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="Web management and api services for Coventry" url="https://www.tychosoft.com/tychosoft/apollo/wiki" arch="all" diff --git a/testing/aports-glmr/APKBUILD b/testing/aports-glmr/APKBUILD index 3d062711251..aad24af826a 100644 --- a/testing/aports-glmr/APKBUILD +++ b/testing/aports-glmr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=aports-glmr pkgver=0.2 -pkgrel=20 +pkgrel=21 pkgdesc="CLI tool to search open merge requests for aports" url="https://gitlab.alpinelinux.org/ncopa/aports-glmr" license="MIT" diff --git a/testing/apulse/APKBUILD b/testing/apulse/APKBUILD index 7a5fe26915f..3efc98d6d83 100644 --- a/testing/apulse/APKBUILD +++ b/testing/apulse/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Galen Abell <galen@galenabell.com> pkgname=apulse pkgver=0.1.13 -pkgrel=1 +pkgrel=2 pkgdesc="PulseAudio emulation for ALSA" url="https://github.com/i-rinat/apulse" arch="all" @@ -10,7 +10,8 @@ license="MIT" makedepends="cmake glib-dev alsa-lib-dev" options="!check" # no tests subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/i-rinat/apulse/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/i-rinat/apulse/archive/v$pkgver.tar.gz + fix-build.patch" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -29,4 +30,7 @@ package() { DESTDIR="$pkgdir" cmake --install build } -sha512sums="366385ae2304f7ff697ba70951d0753a5b1630310922e3763fd0813a73e0b4088b715135295aa2fa9111b8edcf91d82849dc31346b292b2e9db598bcdd47b007 apulse-0.1.13.tar.gz" +sha512sums=" +366385ae2304f7ff697ba70951d0753a5b1630310922e3763fd0813a73e0b4088b715135295aa2fa9111b8edcf91d82849dc31346b292b2e9db598bcdd47b007 apulse-0.1.13.tar.gz +d49a4f4b1292b1e0c021d7e87fccdc37a5a70ba519655835c3ef74b42b2ed792078b992c01ddb29af0e65d305ab508396834c1abdd81942d389476f8562f4022 fix-build.patch +" diff --git a/testing/apulse/fix-build.patch b/testing/apulse/fix-build.patch new file mode 100644 index 00000000000..5e38e3d557b --- /dev/null +++ b/testing/apulse/fix-build.patch @@ -0,0 +1,13 @@ +diff --git a/src/apulse-misc.c b/src/apulse-misc.c +index cc36000..5312c58 100644 +--- a/src/apulse-misc.c ++++ b/src/apulse-misc.c +@@ -22,6 +22,8 @@ + * SOFTWARE. + */ + ++#include <libgen.h> ++ + #include "apulse.h" + #include "trace.h" + #include "util.h" diff --git a/testing/ardour/10-libxml2.patch b/testing/ardour/10-libxml2.patch new file mode 100644 index 00000000000..07c03c754f7 --- /dev/null +++ b/testing/ardour/10-libxml2.patch @@ -0,0 +1,55 @@ +Patch-Source: https://github.com/Ardour/ardour/commit/e995daa37529715214c6c4a2587e4134aaaba02f +-- +From e995daa37529715214c6c4a2587e4134aaaba02f Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <nils@tiptoe.de> +Date: Fri, 17 Nov 2023 23:26:06 +0100 +Subject: [PATCH] Fix failure to build with libxml2 version 2.12 + +This declared some xmlError pointers const, which probably was always +assumed, but not made explicit. + +Signed-off-by: Nils Philippsen <nils@tiptoe.de> +--- + gtk2_ardour/ardour_ui.cc | 8 ++++++-- + libs/pbd/xml++.cc | 2 +- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc +index 54ed79ea83d..77ddbbe99ca 100644 +--- a/gtk2_ardour/ardour_ui.cc ++++ b/gtk2_ardour/ardour_ui.cc +@@ -255,7 +255,7 @@ libxml_generic_error_func (void* /* parsing_context*/, + + static void + libxml_structured_error_func (void* /* parsing_context*/, +- xmlErrorPtr err) ++ const xmlError *err) + { + string msg; + +@@ -403,7 +403,11 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) + /* stop libxml from spewing to stdout/stderr */ + + xmlSetGenericErrorFunc (this, libxml_generic_error_func); +- xmlSetStructuredErrorFunc (this, libxml_structured_error_func); ++ ++ /* Cast to xmlStructuredErrorFunc to cope with different constness in different ++ * versions of libxml2. */ ++ ++ xmlSetStructuredErrorFunc (this, (xmlStructuredErrorFunc)libxml_structured_error_func); + + /* Set this up early */ + +diff --git a/libs/pbd/xml++.cc b/libs/pbd/xml++.cc +index 5c57ad8395d..1f5a85772f6 100644 +--- a/libs/pbd/xml++.cc ++++ b/libs/pbd/xml++.cc +@@ -170,7 +170,7 @@ XMLTree::write() const + result = xmlSaveFormatFileEnc(_filename.c_str(), doc, "UTF-8", 1); + #ifndef NDEBUG + if (result == -1) { +- xmlErrorPtr xerr = xmlGetLastError (); ++ const xmlError *xerr = xmlGetLastError (); + if (!xerr) { + std::cerr << "unknown XML error during xmlSaveFormatFileEnc()." << std::endl; + } else { diff --git a/testing/ardour/APKBUILD b/testing/ardour/APKBUILD index 6eccd886cab..85eb9c052a0 100644 --- a/testing/ardour/APKBUILD +++ b/testing/ardour/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Saijin-Naib <Saijin-Naib_package-maintenance@outlook.com> pkgname=ardour pkgver=7.5.0 -pkgrel=2 +pkgrel=3 pkgdesc="professional-grade digital audio workstation" url="https://ardour.org/" arch="all !ppc64le" # Does not build on ppc64le. @@ -43,6 +43,7 @@ makedepends=" # this source="https://dev.alpinelinux.org/archive/ardour/Ardour-$pkgver.tar.xz $pkgname-midi-$pkgver.zip.noauto::https://dev.alpinelinux.org/archive/ardour/ArdourBundledMedia-$pkgver.zip + 10-libxml2.patch " builddir="$srcdir/Ardour-$pkgver" ldpath="/usr/lib/ardour7" @@ -81,4 +82,5 @@ package() { sha512sums=" 5acc2937351cbaf15c365b8543eeb0836f146fab62b2aa36113dceee2f5b4c88fcc8f05612aa683f1c2e985ea4e9ffadc0d411422d1ae6fe2137c0358cb91ed0 Ardour-7.5.0.tar.xz 94b681f989e834f5de25ce87da9c174b11d90617063f8c96147d7eb470391b35f6d54b85de16da8d963cacb01b50d1c1fab0fddd18eb3b086fe17124ecfa4f65 ardour-midi-7.5.0.zip.noauto +cd3722fb36023f2154855960f74274afa03e7b535f7035fc87f0365a02e58315414277944857f1c4cfdd6b8ae25567e3ffa965b99351357c3292bc41aa0ea3e3 10-libxml2.patch " diff --git a/testing/art_standalone/APKBUILD b/testing/art_standalone/APKBUILD index bd6c04e11d1..29b95c8dd1e 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_git20240307 +pkgver=0_git20240525 pkgrel=0 -_commit="c3055ca258fc726e5fa9fd2aa1d9899a5c548e58" +_commit="62841ab48bc4bae27af5b619b65d77f89030da48" 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=" -330d2767e67282c84161eb05b33d4099c7565067904e0cc9b7df79756e0cbf30f3d7fedf9290c3540441a11c6a3889f43f0e49f96949cc72db92926fde2d5383 art_standalone-c3055ca258fc726e5fa9fd2aa1d9899a5c548e58.tar.gz +fc4f1494d231ba441180d1ada805c496423a4238b912e5ebf170947e51455f6fd63e935062a5d3f43a8610bfe87646db72e94b64094ac28fb8c3d323a78c9c1b art_standalone-62841ab48bc4bae27af5b619b65d77f89030da48.tar.gz " diff --git a/testing/asymptote/APKBUILD b/testing/asymptote/APKBUILD index a7e631f70cb..33f171feba3 100644 --- a/testing/asymptote/APKBUILD +++ b/testing/asymptote/APKBUILD @@ -5,7 +5,7 @@ pkgver=2.86 pkgrel=0 pkgdesc="A vector graphics language for technical drawing" url="https://asymptote.sourceforge.net/" -arch="all !ppc64le !s390x !riscv64" #blocked by texlive +arch="all !ppc64le !s390x !riscv64 !loongarch64" #blocked by texlive license="GPL-3.0-only" depends="texlive texlive-dvi ghostscript" ### Optional dependencies diff --git a/testing/atlas/APKBUILD b/testing/atlas/APKBUILD index 7cb0baf0e5a..5246e437697 100644 --- a/testing/atlas/APKBUILD +++ b/testing/atlas/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=atlas pkgver=0.22.0 -pkgrel=0 +pkgrel=1 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 diff --git a/testing/autobrr/APKBUILD b/testing/autobrr/APKBUILD index 500b99599ee..1b585a00d7b 100644 --- a/testing/autobrr/APKBUILD +++ b/testing/autobrr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabricio Silva <hi@fabricio.dev> # Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=autobrr -pkgver=1.40.1 +pkgver=1.42.0 pkgrel=1 pkgdesc="The modern download automation tool for torrents" url="https://autobrr.com/" @@ -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/autorestic/APKBUILD b/testing/autorestic/APKBUILD index cf6525e6222..e1d13794d83 100644 --- a/testing/autorestic/APKBUILD +++ b/testing/autorestic/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Nicolas Lorin <androw95220@gmail.com> pkgname=autorestic pkgver=1.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Config driven, easy backup cli for restic." url="https://github.com/cupcakearmy/autorestic" arch="all" diff --git a/testing/autoscan/APKBUILD b/testing/autoscan/APKBUILD index ef0acaa7e86..d8f3674c711 100644 --- a/testing/autoscan/APKBUILD +++ b/testing/autoscan/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=autoscan pkgver=1.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="Autoscan replaces the default Plex and Emby behaviour for picking up changes on the file system." url="https://github.com/Cloudbox/autoscan" arch="x86_64 aarch64 armv7" diff --git a/testing/aws-session-manager-plugin/APKBUILD b/testing/aws-session-manager-plugin/APKBUILD index 964c8331cbb..d65f9af6852 100644 --- a/testing/aws-session-manager-plugin/APKBUILD +++ b/testing/aws-session-manager-plugin/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=aws-session-manager-plugin pkgver=1.2.553.0 -pkgrel=0 +pkgrel=1 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" diff --git a/testing/awscli-plugin-endpoint/APKBUILD b/testing/awscli-plugin-endpoint/APKBUILD deleted file mode 100644 index b5bb386ffc9..00000000000 --- a/testing/awscli-plugin-endpoint/APKBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks> -# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks> -pkgname=awscli-plugin-endpoint -pkgver=0.4 -pkgrel=2 -pkgdesc="Allows overriding endpoints in AWS CLI" -url="https://github.com/wbingli/awscli-plugin-endpoint/" -# aws-cli -arch="" -#arch="noarch !armhf !armv7 !ppc64le !s390x !x86" -license="Apache-2.0" -depends="aws-cli python3" -makedepends="py3-setuptools" -options="!check" # no tests -subpackages="$pkgname-pyc" -source="https://github.com/wbingli/awscli-plugin-endpoint/archive/refs/tags/$pkgver/awscli-plugin-endpoint-$pkgver.tar.gz" - -build() { - python3 setup.py build -} - -package() { - python3 setup.py install --root="$pkgdir" --skip-build -} - -sha512sums=" -0e81130ac6baf7b43a77e37213cbc042dca0cefd4a43db92cd6d7fe53d0f81e902d35ea055669477001158ee2cb5e898f5ea9474167a18203ecb7392f183d14a awscli-plugin-endpoint-0.4.tar.gz -" diff --git a/testing/azorius/upgradedb.patch b/testing/azorius/upgradedb.patch deleted file mode 100644 index 9fc2d5080a2..00000000000 --- a/testing/azorius/upgradedb.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/upgradedb.go -+++ b/upgradedb.go -@@ -116,7 +116,7 @@ - var lnk string - err := rows.Scan(&postid, &lnk) - if err != nil { -- elog.Fatalf("can't scan link: %s") -+ elog.Fatalf("can't scan link: %s", lnk) - } - m := re_linkhost.FindStringSubmatch(lnk) - if len(m) > 1 { 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/bettercap/APKBUILD b/testing/bettercap/APKBUILD index 05e746c9328..5b9d62df6aa 100644 --- a/testing/bettercap/APKBUILD +++ b/testing/bettercap/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=bettercap pkgver=2.32.0 -pkgrel=20 +pkgrel=21 pkgdesc="The Swiss Army knife for 802.11, BLE and Ethernet networks reconnaissance and MITM attacks" url="https://www.bettercap.org" arch="all" diff --git a/testing/betula/APKBUILD b/testing/betula/APKBUILD index ae85032b8d0..65e84253a16 100644 --- a/testing/betula/APKBUILD +++ b/testing/betula/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Simon Zeni <simon@bl4ckb0ne.ca> pkgname=betula pkgver=1.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="free single-user bookmarking software" url="https://betula.mycorrhiza.wiki/" arch="all" diff --git a/testing/biometryd/APKBUILD b/testing/biometryd/APKBUILD index 14232dce1ed..88a1d74d874 100644 --- a/testing/biometryd/APKBUILD +++ b/testing/biometryd/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Brandon Boese <brandonboese@protonmail.com> pkgname=biometryd pkgver=0.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Mediates and multiplexes access to biometric devices" url="https://gitlab.com/ubports/development/core/biometryd" arch="all" diff --git a/testing/bionic_translation/APKBUILD b/testing/bionic_translation/APKBUILD index b4ddadfd0f0..8f8b8296ec0 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_git20240429 +pkgver=0_git20240525 pkgrel=0 -_commit="22655af6eed2e7cf4b8d792407c088434eefb028" +_commit="8b324301f4ba3f634b479d608eec2df2d1667757" 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=" -d3244578b1e4e9f9d4d787b5361055ebe0d022b85358100be322c44f744a73969e80341729641d238d03196529f84642458f892a75792c23d4fee88c5eb3752c bionic_translation-22655af6eed2e7cf4b8d792407c088434eefb028.tar.gz +9a522b3fe2b6e02b5683d8ac979a1ab33b8b8c7674de28f09155c21e279e5bdaffe7ab18aaa0c3d48246d90b285a682f04304d57ebda6af04e09012d41201f36 bionic_translation-8b324301f4ba3f634b479d608eec2df2d1667757.tar.gz " diff --git a/testing/bootloose/APKBUILD b/testing/bootloose/APKBUILD index bb5c7ceb1ad..93bced0a87f 100644 --- a/testing/bootloose/APKBUILD +++ b/testing/bootloose/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bootloose pkgver=0.7.1 -pkgrel=3 +pkgrel=4 pkgdesc="Manage containers that look like virtual machines" url="https://github.com/k0sproject/bootloose" arch="all" 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/btcd/APKBUILD b/testing/btcd/APKBUILD index fa857dae688..10c78fa92ab 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=1 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/buf/APKBUILD b/testing/buf/APKBUILD index 801a84c1098..4ce9bf80178 100644 --- a/testing/buf/APKBUILD +++ b/testing/buf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=buf pkgver=1.31.0 -pkgrel=0 +pkgrel=1 pkgdesc="CLI to work with Protocol Buffers" url="https://buf.build/" # 32bit: fail tests with int overflow diff --git a/testing/butane/APKBUILD b/testing/butane/APKBUILD index 67017b2460a..51f0fcc67e8 100644 --- a/testing/butane/APKBUILD +++ b/testing/butane/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=butane pkgver=0.19.0 -pkgrel=3 +pkgrel=4 pkgdesc="Butane to Ignition config generator" url="https://github.com/coreos/butane" arch="all" diff --git a/testing/calibre/APKBUILD b/testing/calibre/APKBUILD index 9578fa34bba..4ecdb04e01b 100644 --- a/testing/calibre/APKBUILD +++ b/testing/calibre/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Cowington Post <cowingtonpost@gmail.com> pkgname=calibre -pkgver=7.10.0 -pkgrel=1 +pkgver=7.11.0 +pkgrel=0 pkgdesc="Ebook management application" # qt6-webengine arch="x86_64 aarch64" @@ -110,6 +110,6 @@ package() { } sha512sums=" -f01d4c57af7f8390c17231ebc6f2fee4b331a8f143337a128119b8585b6e269b5d531a5245c6f418a8ec51ee440f99ce978b0d102f28cc955a2d31911db3b107 calibre-7.10.0.tar.xz +93216323d23919ce37f3983304f0d5e88847833c52a00a8a780db1c95860d814298358347848a439ff006827742a7c19171ed4d3e3569cd03296a682200e8160 calibre-7.11.0.tar.xz eb8e7ce40ff8b8daf6e7e55a5dff8ec4dff06c45744266bb48b3194e92ab1196bc91468203e3c2ca1e5144166a7d6be90e6cf0253513e761b56a4c85be4c2c76 0001-calibre-no-update.patch " diff --git a/testing/carapace/APKBUILD b/testing/carapace/APKBUILD index e9f170ab0c7..054b32cc409 100644 --- a/testing/carapace/APKBUILD +++ b/testing/carapace/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrej Kolchin <KAAtheWise@protonmail.com> pkgname=carapace pkgver=1.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="Multi-shell multi-command argument completer" url="https://carapace.sh/" arch="all" diff --git a/testing/cargo-deny/APKBUILD b/testing/cargo-deny/APKBUILD index 8c306fcfb96..ff7e8220d7f 100644 --- a/testing/cargo-deny/APKBUILD +++ b/testing/cargo-deny/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=cargo-deny -pkgver=0.14.23 +pkgver=0.14.24 pkgrel=0 pkgdesc="Cargo plugin for linting your dependencies" url="https://github.com/EmbarkStudios/cargo-deny" @@ -46,5 +46,5 @@ package() { } sha512sums=" -072f61312fa8bf6dfe7103854132a885df9566c82ab04ab778a756b88a6901890686cadde9d0d9a4049d443dd2ecad4e283ac5a7591b1147218cc1b8a77518e0 cargo-deny-0.14.23.tar.gz +fb43f48a603891e39ae30a78f3ca847abc6d4d729aa15ecb2affde1cc32acda1a9536b086dd4cff3dd83f8734e8d354c7e027c9de15b793b178db2108bd31fea cargo-deny-0.14.24.tar.gz " diff --git a/testing/cargo-shuttle/APKBUILD b/testing/cargo-shuttle/APKBUILD index 589be4e5942..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.44.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=" -1b66899d06dddda6f17ff26853c6ecb199340740b11fc0ade63c9d358c6df85406f0addf639b42c9daeb43ed9fd21328e29c0689f13cc951c61385e0c8ee8625 shuttle-0.44.0.tar.gz +e6a6ce2d6efe405ddb319b39bc626a2956307ded6ca2bc11bea77b1d6f5a1d8e73c815bcb65a091c9d4e5fb30c00893b89123e091270b6a9765b9d0b7bbeb30d shuttle-0.45.0.tar.gz " diff --git a/testing/cargo-vendor-filterer/APKBUILD b/testing/cargo-vendor-filterer/APKBUILD index 5bd506b1fd4..30970613a3e 100644 --- a/testing/cargo-vendor-filterer/APKBUILD +++ b/testing/cargo-vendor-filterer/APKBUILD @@ -4,7 +4,8 @@ pkgver=0.5.9 pkgrel=1 pkgdesc="cargo vendor with filtering for platforms and more" url="https://github.com/coreos/cargo-vendor-filterer" -arch="all" +# loongarch64: linux-raw-sys-0.1.4 crate fails to build +arch="all !loongarch64" license="Apache-2.0" makedepends=" cargo diff --git a/testing/certigo/APKBUILD b/testing/certigo/APKBUILD index a52f17fcaab..e4b023e97b6 100644 --- a/testing/certigo/APKBUILD +++ b/testing/certigo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=certigo pkgver=1.16.0 -pkgrel=15 +pkgrel=16 pkgdesc="Utility to examine and validate certificates in a variety of formats" url="https://github.com/square/certigo" arch="all" diff --git a/testing/certstrap/APKBUILD b/testing/certstrap/APKBUILD index 78ebe02c1ac..0a29c564c03 100644 --- a/testing/certstrap/APKBUILD +++ b/testing/certstrap/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=certstrap pkgver=1.3.0 -pkgrel=15 +pkgrel=16 pkgdesc="Tools to bootstrap CAs, certificate requests, and signed certificates" url="https://github.com/square/certstrap" arch="all" diff --git a/testing/cfssl/APKBUILD b/testing/cfssl/APKBUILD index 2cf11ff1d73..014df4845c6 100644 --- a/testing/cfssl/APKBUILD +++ b/testing/cfssl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=cfssl pkgver=1.6.4 -pkgrel=6 +pkgrel=7 pkgdesc="Cloudflare PKI and TLS toolkit" url="https://cfssl.org/" license="BSD-2-Clause" diff --git a/testing/cilium-cli/APKBUILD b/testing/cilium-cli/APKBUILD index 893d89d1ebc..3b1497f8f29 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.16.6 -pkgrel=0 +pkgrel=1 pkgdesc="CLI to install, manage and troubleshoot Kubernetes clusters running Cilium" url="https://cilium.io/" arch="all" diff --git a/testing/clementine/APKBUILD b/testing/clementine/APKBUILD index 57ec3c655e8..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=11 +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/cliphist/APKBUILD b/testing/cliphist/APKBUILD index 821b622d276..7796f1dc4a2 100644 --- a/testing/cliphist/APKBUILD +++ b/testing/cliphist/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=cliphist pkgver=0.5.0 -pkgrel=2 +pkgrel=3 pkgdesc="wayland clipboard manager" url="https://github.com/sentriz/cliphist" arch="all" diff --git a/testing/cloudflared/APKBUILD b/testing/cloudflared/APKBUILD index c092b3c7afb..63370f112d9 100644 --- a/testing/cloudflared/APKBUILD +++ b/testing/cloudflared/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Piper McCorkle <piper@cloudflare.com> pkgname=cloudflared pkgver=2023.7.3 -pkgrel=4 +pkgrel=5 pkgdesc="Cloudflare Tunnel client" url="https://github.com/cloudflare/cloudflared" # TODO: Doesn't compile with Go 1.21. diff --git a/testing/cloudfoundry-cli/APKBUILD b/testing/cloudfoundry-cli/APKBUILD index ffe50cba32b..c6254de1c02 100644 --- a/testing/cloudfoundry-cli/APKBUILD +++ b/testing/cloudfoundry-cli/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Boerger <thomas@webhippie.de> pkgname=cloudfoundry-cli pkgver=8.7.9 -pkgrel=1 +pkgrel=2 pkgdesc="A CLI for Cloud Foundry written in Go" url="https://github.com/cloudfoundry/cli" arch="all !s390x !armv7" diff --git a/testing/clustershell/APKBUILD b/testing/clustershell/APKBUILD new file mode 100644 index 00000000000..bdbab41af21 --- /dev/null +++ b/testing/clustershell/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: omni <omni+alpine@hack.org> +# Maintainer: omni <omni+alpine@hack.org> +pkgname=clustershell +pkgver=1.9.2 +pkgrel=1 +pkgdesc="Scalable cluster administration Python framework" +url="https://clustershell.readthedocs.io/en/latest/" +arch="noarch" +license="LGPL-2.1-or-later" +depends="py3-yaml" +makedepends="py3-gpep517 py3-setuptools py3-wheel" +subpackages="$pkgname-doc $pkgname-pyc" +options="!check" # TODO +source="$pkgname-$pkgver.tar.gz::https://github.com/cea-hpc/clustershell/archive/refs/tags/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 + + mv "$pkgdir"/usr/etc "$pkgdir"/etc +} + +sha512sums=" +a24ac286894cc8866aa218cafb755ffa6b808d3a8d666ab95eb15a784c9730ab3458ec2a9b18a6a57f429b1238e13e4dcd3622cbe75ba63fa814d28dc6d9a503 clustershell-1.9.2.tar.gz +" diff --git a/testing/comics-downloader/APKBUILD b/testing/comics-downloader/APKBUILD index 0f17a826b0b..1a4b01f9c6b 100644 --- a/testing/comics-downloader/APKBUILD +++ b/testing/comics-downloader/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Anjandev Momi <anjan@momi.ca> pkgname=comics-downloader pkgver=0.33.8 -pkgrel=2 +pkgrel=3 pkgdesc="Tool to download comics and manga in pdf/epub/cbr/cbz from a website" url="https://github.com/Girbons/comics-downloader" license="MIT" diff --git a/testing/compiz/APKBUILD b/testing/compiz/APKBUILD index 6dda64466c0..fa458370a3f 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=4 +pkgrel=5 pkgdesc="OpenGL window and compositing manager" url="http://www.compiz.org/" arch="all" @@ -101,7 +101,7 @@ sha512sums=" 669c32ad7e4428dbbc20bcc8f99764f2c0a28b0641b094fa89abcdf760df82d3fddaf1ac6b0596d0a80c1fe81e641c0ad64b550b93a6dfdf7f4759d687840a8f boost.patch 2bbc6456deb85474416049eed194d5df7ec6c445f61c8f691f05f86cfee761cb634011fa658f2cd04c6740fea00400d536437bc7f210730f6651c490e96cb6c9 gtest.patch 1b3ada1f7fe818cadff8729a3778f161776be4641e1bf36a2ab185921fbcff2e64b9a1d2576441913c7561e1d327612ebdd4a20fde9941a57b3f32e7084f444c libgen.patch -aa6b4ba66b512d8cb09b17cd7e30a0ac2ed64ed11ef17613587c1b16c8c6146b2b526aba580b04db03f5b653c4c08ba0e7c57f2edd732a535db5da9f61c7b8f5 opengl.patch +525cec925b490d567e2a29ef6aef0da6344f8b68a682a82d2dff9087c53ece5a901fe0b3fa87120babdbba368b7b46208f872cbea02b6fea93e55700604b1ff7 opengl.patch 9dd0d4c2361fd56645d2f7b634dee32f1d44a67d36b53e550108acc78a8400bfd3c57132a8a029e9884b9f05cdd3a7533c65355d0a3dd80564544931eaced258 protobuf.patch 2258ab2cf9cea0f3b16c0054b5471e89c11eb75b2dc337e4a2ad63d443435668f383e89e08903085ffc3de78816c41e1d3104e987d792fdf801be85e779faac3 startup-notification-long.patch " diff --git a/testing/compiz/opengl.patch b/testing/compiz/opengl.patch index c8a147da61c..c55fd5098c5 100644 --- a/testing/compiz/opengl.patch +++ b/testing/compiz/opengl.patch @@ -58,3 +58,16 @@ index fcf19ca..39bf966 100644 GL::bindTexImage = (GL::GLXBindTexImageProc) getProcAddress ("glXBindTexImageEXT"); GL::releaseTexImage = (GL::GLXReleaseTexImageProc) +diff --git a/plugins/opengl/src/vertexbuffer.cpp b/plugins/opengl/src/vertexbuffer.cpp +index b102016..4e314c2 100644 +--- a/plugins/opengl/src/vertexbuffer.cpp ++++ b/plugins/opengl/src/vertexbuffer.cpp +@@ -164,7 +164,7 @@ void GLVertexBuffer::addVertices (GLuint nVertices, const GLfloat *vertices) + + GLfloat *GLVertexBuffer::getVertices() const + { +- return &priv->vertexData[0]; ++ return priv->vertexData.data(); + } + + int GLVertexBuffer::getVertexStride() const diff --git a/testing/conntracct/APKBUILD b/testing/conntracct/APKBUILD index 3923e50b00b..2de14060dbb 100644 --- a/testing/conntracct/APKBUILD +++ b/testing/conntracct/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Mark Pashmfouroush <mark@markpash.me> pkgname=conntracct pkgver=0.2.7 -pkgrel=23 +pkgrel=24 pkgdesc="Tool for extracting network flow information from Linux hosts" url="https://github.com/ti-mo/conntracct" license="Apache-2.0" diff --git a/testing/consul-replicate/APKBUILD b/testing/consul-replicate/APKBUILD index e41e1d73981..acf00171ead 100644 --- a/testing/consul-replicate/APKBUILD +++ b/testing/consul-replicate/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=consul-replicate pkgver=0.4.0 -pkgrel=23 +pkgrel=24 pkgdesc="Consul cross-DC KV replication daemon" url="https://www.consul.io/" arch="all" diff --git a/testing/convert2json/APKBUILD b/testing/convert2json/APKBUILD index 2c0e1eea1a9..f5d8fcb663d 100644 --- a/testing/convert2json/APKBUILD +++ b/testing/convert2json/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Simon Rupf <simon@rupf.net> pkgname=convert2json pkgver=0.8.2 -pkgrel=0 +pkgrel=1 pkgdesc="Utilities to convert CSV, INI, TOML, XML & YAML to JSON, including jq/jaq wrappers." url="https://github.com/simonrupf/convert2json" arch="all" @@ -10,7 +10,7 @@ depends="jaq" makedepends=" cargo cargo-auditable - clang15-dev + clang-dev " source="https://github.com/simonrupf/convert2json/archive/$pkgver/convert2json-$pkgver.tar.gz" options="net" diff --git a/testing/coreboot-tools/APKBUILD b/testing/coreboot-tools/APKBUILD index 344fc1f0ff2..e323f2a44da 100644 --- a/testing/coreboot-tools/APKBUILD +++ b/testing/coreboot-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Nulo <alpine@nulo.in> # Maintainer: Adam Thiede <me@adamthiede.com> pkgname=coreboot-tools -pkgver=24.02 +pkgver=24.05 pkgrel=0 pkgdesc="Tools from the coreboot project" url="https://review.coreboot.org/coreboot" @@ -70,5 +70,5 @@ configurator() { } sha512sums=" -e73fa1346bccaea66d7cc6b3c336c4e2f46bbcd046202f7981b8e2b5e5b59192dce729e72daa16dc4020c004bbfab2364551718e349d939ade2985519912a377 coreboot-24.02.tar.xz +fc35a8ccd6a3c0ec1a3e1f97f8d0dce994d82751ccc2d2a3f503288cb9900c2e10ee79fca2cb1fb58dac731e17b28d579a603f541ee4c0f1c79dfcfe452f7e12 coreboot-24.05.tar.xz " diff --git a/testing/create-tauri-app/APKBUILD b/testing/create-tauri-app/APKBUILD index 91a2594e182..7c7bceffa00 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=4.0.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 +890e64015635726cd44a37d19e23bfd9f2f90da2647f90dbfc61410c77197620e5795a5c73eae75160eec79d41594ffcda3b4bbd68e01e1d5fd3746cd2189f5f create-tauri-app-4.0.0.tar.gz " diff --git a/testing/cri-o/APKBUILD b/testing/cri-o/APKBUILD index 3a21471e5a6..17a67d93687 100644 --- a/testing/cri-o/APKBUILD +++ b/testing/cri-o/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: ungleich <foss@ungleich.ch> pkgname=cri-o pkgver=1.29.1 -pkgrel=2 +pkgrel=3 pkgdesc="OCI-based implementation of Kubernetes Container Runtime Interface" url="https://github.com/cri-o/cri-o/" arch="all" diff --git a/testing/crowdsec/APKBUILD b/testing/crowdsec/APKBUILD index 80aa7a41b5a..106c10eaeb5 100644 --- a/testing/crowdsec/APKBUILD +++ b/testing/crowdsec/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Nicolas Lorin <androw95220@gmail.com> pkgname=crowdsec pkgver=1.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="behavior detection engine, coupled with a global IP reputation network" url="https://crowdsec.net/" arch="all" diff --git a/testing/dart-sass/APKBUILD b/testing/dart-sass/APKBUILD index 0794abf787f..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.76.0 +pkgver=1.77.1 pkgrel=0 pkgdesc="The primary implementation of Sass" url="https://sass-lang.com/dart-sass" @@ -49,7 +49,7 @@ package() { } sha512sums=" -0a3bf9fa2f58f2fc2eeaa4c56c93971af761cec8c914579d50d916a3da0af7387cd489779685b94ba59c2004b1000db0f6dac9aa4bef67e6814279f4c8865aae dart-sass-1.76.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/dbus-waiter/APKBUILD b/testing/dbus-waiter/APKBUILD index a28f9af0a69..a20cd2574a2 100644 --- a/testing/dbus-waiter/APKBUILD +++ b/testing/dbus-waiter/APKBUILD @@ -8,7 +8,9 @@ url="https://git.sr.ht/~whynothugo/dbus-waiter" arch="all !s390x" license="ISC" makedepends="cargo cargo-auditable" -source="dbus-waiter-$pkgver.tar.gz::https://git.sr.ht/~whynothugo/dbus-waiter/archive/v$pkgver.tar.gz" +source="dbus-waiter-$pkgver.tar.gz::https://git.sr.ht/~whynothugo/dbus-waiter/archive/v$pkgver.tar.gz +cargo-update.patch +" builddir="$srcdir/$pkgname-v$pkgver" options="net" # fetch dependencies @@ -32,4 +34,5 @@ package() { sha512sums=" abb1ab4b09ac104ba28e0c1a05d19feae13308bd6ff356653100a834d496861dcc32b4ca0de51640df5ce467b6d9ec2b90e7094f5043b0db1ee71a74315124e9 dbus-waiter-0.2.0.tar.gz +bfeea8022009dcb2fbf45f547790c0103a348734289a68b545631fcc227d9452c2ab4381a543fb70428f7d32bfe1d941f04c9f3930140bfa2225aaea5a534f6f cargo-update.patch " diff --git a/testing/dbus-waiter/cargo-update.patch b/testing/dbus-waiter/cargo-update.patch new file mode 100644 index 00000000000..7d1ec7d728c --- /dev/null +++ b/testing/dbus-waiter/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 33d2ca1..81d4316 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -534,9 +534,9 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.147" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "linux-raw-sys" diff --git a/testing/ddcci-driver-linux-src/3eb20df68a545d07b8501f13fa9d20e9c6f577ed.patch b/testing/ddcci-driver-linux-src/3eb20df68a545d07b8501f13fa9d20e9c6f577ed.patch new file mode 100644 index 00000000000..5742d14f3b3 --- /dev/null +++ b/testing/ddcci-driver-linux-src/3eb20df68a545d07b8501f13fa9d20e9c6f577ed.patch @@ -0,0 +1,34 @@ +From 7f851f5fb8fbcd7b3a93aaedff90b27124e17a7e Mon Sep 17 00:00:00 2001 +From: Bruno Inec <contact@sweenu.xyz> +Date: Wed, 20 Mar 2024 10:36:56 +0100 +Subject: [PATCH] Compatibility with Linux 6.8 + +--- + ddcci/ddcci.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ddcci/ddcci.c b/ddcci/ddcci.c +index 87b0818..6073c75 100644 +--- a/ddcci/ddcci.c ++++ b/ddcci/ddcci.c +@@ -1666,7 +1666,7 @@ static int ddcci_detect(struct i2c_client *client, struct i2c_board_info *info) + pr_debug("detected %d:%02x\n", client->adapter->nr, outer_addr); + + /* set device type */ +- strlcpy(info->type, (outer_addr == DDCCI_DEFAULT_DEVICE_ADDR) ? "ddcci" : "ddcci-dependent", I2C_NAME_SIZE); ++ strscpy(info->type, (outer_addr == DDCCI_DEFAULT_DEVICE_ADDR) ? "ddcci" : "ddcci-dependent", I2C_NAME_SIZE); + + return 0; + } +@@ -1824,7 +1824,7 @@ static struct i2c_driver ddcci_driver = { + #else + .remove = ddcci_remove, + #endif +- .class = I2C_CLASS_DDC, ++ .class = I2C_CLASS_SPD, + .detect = ddcci_detect, + .address_list = I2C_ADDRS( + DDCCI_DEFAULT_DEVICE_ADDR>>1 +-- +GitLab + diff --git a/testing/ddcci-driver-linux-src/APKBUILD b/testing/ddcci-driver-linux-src/APKBUILD index 95ca6d437f3..58e3e2b027e 100644 --- a/testing/ddcci-driver-linux-src/APKBUILD +++ b/testing/ddcci-driver-linux-src/APKBUILD @@ -2,14 +2,16 @@ pkgname=ddcci-driver-linux-src _modname=ddcci-driver-linux pkgver=0.4.4 -pkgrel=2 +pkgrel=3 pkgdesc="Linux kernel drivers for DDC/CI monitors (sources, AKMS)" url="https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/" arch="noarch" license="GPL-2.0-or-later" depends="akms" options="!check" # no tests -source="$_modname-$pkgver.tar.gz::https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/archive/v$pkgver/ddcci-driver-linux-v$pkgver.tar.gz" +source="$_modname-$pkgver.tar.gz::https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/archive/v$pkgver/ddcci-driver-linux-v$pkgver.tar.gz + 3eb20df68a545d07b8501f13fa9d20e9c6f577ed.patch +" builddir="$srcdir/$_modname-v$pkgver" prepare() { @@ -36,4 +38,5 @@ package() { sha512sums=" f88ded47818c65c91d88ae16871304d8a72785d8ca5df56464258ccf32f2d52d8623bc88e8f05ed2f6b47fc23e64aa1ef3d430912e7535d94e959fa21e7235b2 ddcci-driver-linux-0.4.4.tar.gz +879606032e048ac6f31b3a1c74d2b3e0cbaa8fc4631c81bbbca6bf7fb29833e8ea1b8d4cd3e6ba6959877d1f8c0d7e9283ada854f046e6e7aad60722c7ee968d 3eb20df68a545d07b8501f13fa9d20e9c6f577ed.patch " 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/desync/APKBUILD b/testing/desync/APKBUILD index 9fe94f29e57..948716ffd36 100644 --- a/testing/desync/APKBUILD +++ b/testing/desync/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Damian Kurek <starfire24680@gmail.com> pkgname=desync pkgver=0.9.5 -pkgrel=5 +pkgrel=6 pkgdesc="Alternative casync implementation" url="https://github.com/folbricht/desync" arch="all" diff --git a/testing/diskus/APKBUILD b/testing/diskus/APKBUILD index d744ef8f1fc..a1a727533d8 100644 --- a/testing/diskus/APKBUILD +++ b/testing/diskus/APKBUILD @@ -2,10 +2,10 @@ # Maintainer: guddaff <guddaff@protonmail.com> pkgname=diskus pkgver=0.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="fast alternative for du" url="https://github.com/sharkdp/diskus" -arch="all !s390x !riscv64" # limited by cargo +arch="all !riscv64" # the `libc` crate fails options="!check" #size_of_single_file test timout on armhf license="MIT" makedepends="cargo cargo-auditable" diff --git a/testing/dissent/APKBUILD b/testing/dissent/APKBUILD index f0c157fa186..dd5494204d2 100644 --- a/testing/dissent/APKBUILD +++ b/testing/dissent/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=dissent pkgver=0.0.22 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight and modern Discord client" url="https://libdb.so/dissent" # riscv64: https://github.com/ianlancetaylor/cgosymbolizer/issues/20 diff --git a/testing/distrobuilder/APKBUILD b/testing/distrobuilder/APKBUILD index a66f29c07f4..128f4f8b250 100644 --- a/testing/distrobuilder/APKBUILD +++ b/testing/distrobuilder/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sean McAvoy <seanmcavoy@gmail.com> pkgname=distrobuilder pkgver=2.1 -pkgrel=16 +pkgrel=17 pkgdesc="System container image builder" url="https://linuxcontainers.org/distrobuilder/" arch="all !armhf !armv7" diff --git a/testing/dive/APKBUILD b/testing/dive/APKBUILD index 741a3b43d22..d9a8e9503ac 100644 --- a/testing/dive/APKBUILD +++ b/testing/dive/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=dive pkgver=0.11.0 -pkgrel=5 +pkgrel=6 pkgdesc="Tool for exploring each layer in a docker image" url="https://github.com/wagoodman/dive" arch="all" diff --git a/testing/dnscontrol/APKBUILD b/testing/dnscontrol/APKBUILD index cac9b38a17c..4c081a16094 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.10.0 +pkgver=4.11.0 pkgrel=0 pkgdesc="Synchronize your DNS to multiple providers from a simple DSL" url="https://stackexchange.github.io/dnscontrol/" @@ -9,6 +9,7 @@ arch="all" license="MIT" makedepends="go" subpackages="$pkgname-doc" +options="net" source="$pkgname-$pkgver.tar.gz::https://github.com/StackExchange/dnscontrol/archive/v$pkgver.tar.gz dnsconfig.js" @@ -30,6 +31,6 @@ package() { } sha512sums=" -4ec4f56dea8b1e27079883d8cca55919f8e615e772e0e81d5205bcc34e5071c99531ae3fac2df919b9ea17757989174e0d9b8bc57eaad27f99f98fc164a8e966 dnscontrol-4.10.0.tar.gz +89e07d69f3bee9473bfc57b500e56ba3fa2fdc94a87783b0f1f2555a130c8e9aa1dc09b44983f04db3d77cee97b29e356402929374a73fabd1cef6802b2e9ef2 dnscontrol-4.11.0.tar.gz 5503f149662dcf4d8548bc7e60bf566b2c4e7580593a15cca8f344f37103f413b860f4cb25ed38a620cf650528f133e4dc4d51824993b4e314acba5308a225d4 dnsconfig.js " diff --git a/testing/docker-auth/APKBUILD b/testing/docker-auth/APKBUILD index 4b3d32ae8bc..2a328e1d7d4 100644 --- a/testing/docker-auth/APKBUILD +++ b/testing/docker-auth/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Conrad Hoffmann <ch@bitfehler.net> pkgname=docker-auth pkgver=1.11.0 -pkgrel=7 +pkgrel=8 pkgdesc="Authentication server for Docker Registry 2" url="https://github.com/cesanta/docker_auth" arch="all" diff --git a/testing/docker-volume-local-persist/APKBUILD b/testing/docker-volume-local-persist/APKBUILD index 52db04b89e4..8ab5080777a 100644 --- a/testing/docker-volume-local-persist/APKBUILD +++ b/testing/docker-volume-local-persist/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=docker-volume-local-persist pkgver=1.3.0 -pkgrel=25 +pkgrel=26 pkgdesc="Local Persist Volume Plugin for Docker" url="https://github.com/MatchbookLab/local-persist" arch="all" diff --git a/testing/dockerize/APKBUILD b/testing/dockerize/APKBUILD index 846c43f62f8..47519fa892a 100644 --- a/testing/dockerize/APKBUILD +++ b/testing/dockerize/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=dockerize pkgver=0.7.0 -pkgrel=5 +pkgrel=6 pkgdesc="Utility to simplify running applications in docker containers." url="https://github.com/jwilder/dockerize" arch="all" diff --git a/testing/dolt/APKBUILD b/testing/dolt/APKBUILD index 5bf883cbfa6..8e921c89eb9 100644 --- a/testing/dolt/APKBUILD +++ b/testing/dolt/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=dolt -pkgver=1.35.13 -pkgrel=0 +pkgver=1.38.0 +pkgrel=1 pkgdesc="Dolt – It's Git for Data" url="https://www.dolthub.com" arch="all !x86 !armhf !armv7" # fails on 32-bit @@ -30,5 +30,5 @@ package() { } sha512sums=" -242df57fb843d075d0d49d13b0080dea6db29ff746ce5c9c79ddfe578a12c84d132839be72d49a0532d58b3e5b73030cb57b928643c5dd6908b460fd1a74bd64 dolt-1.35.13.tar.gz +9122352d3bf2d6ec171576cdd687b557ef379335cce8f907180179ae9db3fdc173a999c08d83e3b4c7f6dd79f06188c4e6e71217b25369ba26967c693caf17e2 dolt-1.38.0.tar.gz " diff --git a/testing/draw/APKBUILD b/testing/draw/APKBUILD index 7d41c561c75..33408ca339a 100644 --- a/testing/draw/APKBUILD +++ b/testing/draw/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Guy Godfroy <guy.godfroy@gugod.fr> pkgname=draw pkgver=0.1.1 -pkgrel=5 +pkgrel=6 pkgdesc="Draw in your terminal" url="https://github.com/maaslalani/draw" arch="all" diff --git a/testing/drone-cli/APKBUILD b/testing/drone-cli/APKBUILD index f2a7eb065c3..0d1dd668a26 100644 --- a/testing/drone-cli/APKBUILD +++ b/testing/drone-cli/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=drone-cli pkgver=1.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="Drone CLI" url="https://github.com/harness/drone-cli" license="Apache-2.0" diff --git a/testing/dsnet/APKBUILD b/testing/dsnet/APKBUILD index ea822ecccb0..957be9e7934 100644 --- a/testing/dsnet/APKBUILD +++ b/testing/dsnet/APKBUILD @@ -3,7 +3,7 @@ pkgname=dsnet pkgver=0.7.3 _rev=c7096d13183159647b92aaed522a406c29b91798 # used for version command -pkgrel=2 +pkgrel=3 pkgdesc="fast command to manage a centralised wireguard VPN" url="https://github.com/naggie/dsnet" arch="all" diff --git a/testing/dstask/APKBUILD b/testing/dstask/APKBUILD index dbd57cc444c..3ea5c195380 100644 --- a/testing/dstask/APKBUILD +++ b/testing/dstask/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=dstask pkgver=0.26 -pkgrel=6 +pkgrel=7 pkgdesc="Personal task tracker designed to help you focus" url="https://dstask.org/" license="MIT" diff --git a/testing/duf/APKBUILD b/testing/duf/APKBUILD index fd454cb1085..f56888c4973 100644 --- a/testing/duf/APKBUILD +++ b/testing/duf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=duf pkgver=0.8.1 -pkgrel=18 +pkgrel=19 pkgdesc="Disk Usage/Free Utility" options="net !check" # No testsuite url="https://github.com/muesli/duf" 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 dc9b9ab4f4c..d7b083d3434 100644 --- a/testing/elastic-beats/APKBUILD +++ b/testing/elastic-beats/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ramanathan Sivagurunathan <ramzthecoder@gmail.com> # Maintainer: pkgname=elastic-beats -pkgver=8.13.3 +pkgver=8.13.4 pkgrel=0 pkgdesc="Lightweight shippers for Elasticsearch & Logstash" url="https://www.elastic.co/products/beats" @@ -144,7 +144,7 @@ metricbeat_openrc() { } sha512sums=" -f045768bf62e7a3dbb44a2e18042c25a1054e26466a803a95641342f4492c4f8ed2502a29c979a58b8bc6c29ee43b25a1b48c529035f4c5b62b155b277ce7fb9 elastic-beats-8.13.3.tar.gz +566ae0504078a00dd5c9278d448a807920a68dd8e02695c26cb9d85fb42e5e45a516faa8dc16ac6d4262bcb30b45ea5a455f6d3d261734e5fe49f123d78ca171 elastic-beats-8.13.4.tar.gz 526b149419cf51e21ab4b7b49b208dbef81571afd04f2c40ab05297d5eb4b03e64e6c7a06d1acf8771b7b0664a552082ce6f50d5cbc4218aca810440d6185990 filebeat.initd f6168b10da75919cf16b2a32a5b25847e9e49aaea7415e49d2644960fc586c60714754cbe60f5a6d290cd7b9f8d3fd86287e46e63891825feb82f747e235d58d filebeat.confd 4736fab0119bea080cb5a938d0b40e803967cbfac373d1b714a43176032ea36b9865f3c6658e33ff6befa150ccdf6ddcbfcf59bd31e4ae961d075623eac80ea6 metricbeat.initd diff --git a/testing/electron-tasje/APKBUILD b/testing/electron-tasje/APKBUILD index 71648c7b8aa..ac8776a0a61 100644 --- a/testing/electron-tasje/APKBUILD +++ b/testing/electron-tasje/APKBUILD @@ -1,7 +1,7 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=electron-tasje -pkgver=0.7.1 +pkgver=0.7.3 pkgrel=0 pkgdesc="Tiny replacement for electron-builder" url="https://codeberg.org/selfisekai/electron_tasje/" @@ -31,5 +31,5 @@ package() { } sha512sums=" -665ccbd6cb357c25d55daed4ad3b3ce008da258054951d9d069a5b12e72dd5812d534f906868e6b18e78949f058069a961c394c6f21ab3b3fab5393c330445e5 electron_tasje-0.7.1.tar.gz +251b7eabe74acdb5c7394f9d4d735b736acf555352785a9896ddaeed37632b238e823e1bb639e1f5a44a50455957ec41e1a585a3b2a9919b5818bb40843bd877 electron_tasje-0.7.3.tar.gz " diff --git a/testing/electron/APKBUILD b/testing/electron/APKBUILD index 41d5dafa5d0..d16be9e8439 100644 --- a/testing/electron/APKBUILD +++ b/testing/electron/APKBUILD @@ -1,9 +1,9 @@ # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=electron -pkgver=30.0.2 +pkgver=30.0.7 _semver="${pkgver/_beta/-beta.}" pkgrel=0 -_chromium=124.0.6367.91 +_chromium=124.0.6367.230 _copium_tag=124.5 _depot_tools=495b23b39aaba2ca3b55dd27cadc523f1cb17ee6 pkgdesc="Electron cross-platform desktop toolkit" @@ -143,6 +143,7 @@ source="https://ab-sn.lnl.gay/electron-$_semver-$_chromium.tar.zst python-jinja-3.10.patch webpack-hash.patch unbundle-node.patch + CVE-2024-5274.patch default.conf electron.desktop @@ -302,6 +303,7 @@ prepare() { ) # reusable system library settings + # flatbuffers - tensorflow has a few static_asserts for a specific patch version # libavif - https://github.com/AOMediaCodec/libavif/commit/50a541469c98009016af8dcc9f83a1be79f3a7d9 # libaom - https://aomedia.googlesource.com/aom/+/706ee36dcc82%5E%21/ # but watch this space: https://aomedia-review.googlesource.com/c/aom/+/188606 @@ -313,7 +315,6 @@ prepare() { double-conversion ffmpeg flac - flatbuffers fontconfig freetype harfbuzz-ng @@ -544,7 +545,7 @@ lang() { } sha512sums=" -0c9bed5e291483e848d46ed827e0441a19bdb8ead8449e00aefb47df020c948399d1b68cb8bf39c7764c6edc79db8234ea81a81aa5bb1edeceec9706057f98e5 electron-30.0.2-124.0.6367.91.tar.zst +4c27936ffc21c6cd2f5eef7adcc6bb178062ed246fd79a2f2372ce61778b690ef298317ece6490a6073c918b9f3c96a96d8a2b64c46e1e2cb288c5356e3864c0 electron-30.0.7-124.0.6367.230.tar.zst 13c647dc2024e27ae8a4d7e8f1202037a342f4a7054477226665c332029e1b6f1d8b99004c2b2809bcf1e6c19b1359ef5e1c971552d7ced59c5b43d5a836af88 copium-124.5.tar.gz 29bb685e03356a77df5fd347cdf55194cc8b3265c421cc76e54d64edefc329dbcb052deb26b22e8f587ce68456876c071de1b7d258dd0fcc6ee66c875ec4a020 chromium-revert-drop-of-system-java.patch 54eb147c0af2ba096d1df375a289b339ee855ab1a9114e7c747753f0274a6bafb7212c1859b7885454c4529d9a5e3bd9559fc14e8e006f23ccd381895fa68d15 compiler.patch @@ -579,6 +580,7 @@ e48693e6b7aeebf69a5acbf80d9a35defe4c23835121dfeb58b051ac7c527e758a41004f4d193274 e05180199ee1d559e4e577cedd3e589844ecf40d98a86321bf1bea5607b02eeb5feb486deddae40e1005b644550331f6b8500177aa7e79bcb3750d3c1ceb76c3 python-jinja-3.10.patch 2aa340854316f1284217c0ca17cbf44953684ad6c7da90815117df30928612eb9fb9ffb734b948dfc309cd25d1a67cd57f77aac2d052a3dd9aca07a3a58cbb30 webpack-hash.patch ebb18a0e2eba4b4606e900fa82f4b57fe91dcbdc943e17544bccb3c9a011a49b4331cdbee59629e44b80184bad4ea54ec887c0bfcd00cda8d5686060dbf365e3 unbundle-node.patch +720aeb93f5accf7df5bc63ec3400df7364868721fe9741a2087d614acfcf004aade96fa5e1c7b5a2380f9547fa9a2e495f8bb51f95b11f49bb49d9783e04135f CVE-2024-5274.patch e8ea87c547546011c4c8fc2de30e4f443b85cd4cfcff92808e2521d2f9ada03feefb8e1b0cf0f6b460919c146e56ef8d5ad4bb5e2461cc5247c30d92eb4d068e default.conf 191559fc7aa1ea0353c6fb0cc321ee1d5803a0e44848c8be941cfab96277b0de6a59962d373e2a2a1686c8f9be2bcf2d2f33706759a339a959e297d3f7fda463 electron.desktop 5f7ba5ad005f196facec1c0f26108356b64cafb1e5cfa462ff714a33b8a4c757ac00bfcb080da09eb5b65032f8eb245d9676a61ec554515d125ed63912708648 electron-launcher.sh diff --git a/testing/electron/CVE-2024-5274.patch b/testing/electron/CVE-2024-5274.patch new file mode 100644 index 00000000000..dcff7c3b7a9 --- /dev/null +++ b/testing/electron/CVE-2024-5274.patch @@ -0,0 +1,41 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shu-yu Guo <syg@chromium.org> +Date: Tue, 21 May 2024 10:06:20 -0700 +Subject: Using FunctionParsingScope for parsing class static blocks + +Class static blocks contain statements, don't inherit the +ExpressionScope stack. + +Bug: 341663589 +Change-Id: Id52a60d77781201a706fcf2290d7d103f39bed83 +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5553030 +Commit-Queue: Shu-yu Guo <syg@chromium.org> +Commit-Queue: Adam Klein <adamk@chromium.org> +Reviewed-by: Adam Klein <adamk@chromium.org> +Cr-Commit-Position: refs/heads/main@{#94014} + +diff --git a/v8/src/ast/scopes.cc b/v8/src/ast/scopes.cc +index 39e3a8d5d59acbe9405f351fa6c57121c1900657..2aa1bb6c0f8f6e098a3ddf3f54ec2d0d5af9dc24 100644 +--- a/v8/src/ast/scopes.cc ++++ b/v8/src/ast/scopes.cc +@@ -2445,7 +2445,7 @@ bool Scope::MustAllocate(Variable* var) { + var->set_is_used(); + if (inner_scope_calls_eval_ && !var->is_this()) var->SetMaybeAssigned(); + } +- DCHECK(!var->has_forced_context_allocation() || var->is_used()); ++ CHECK(!var->has_forced_context_allocation() || var->is_used()); + // Global variables do not need to be allocated. + return !var->IsGlobalObjectProperty() && var->is_used(); + } +diff --git a/v8/src/parsing/parser-base.h b/v8/src/parsing/parser-base.h +index 009befd607bbe9135d604550018e36d681340718..6001ea622dfe0d1e4ccd4b42351b7368fd0892ce 100644 +--- a/v8/src/parsing/parser-base.h ++++ b/v8/src/parsing/parser-base.h +@@ -2661,6 +2661,7 @@ typename ParserBase<Impl>::BlockT ParserBase<Impl>::ParseClassStaticBlock( + } + + FunctionState initializer_state(&function_state_, &scope_, initializer_scope); ++ FunctionParsingScope body_parsing_scope(impl()); + AcceptINScope accept_in(this, true); + + // Each static block has its own var and lexical scope, so make a new var diff --git a/testing/element-desktop/APKBUILD b/testing/element-desktop/APKBUILD index 6b3af65c5fa..db92323707c 100644 --- a/testing/element-desktop/APKBUILD +++ b/testing/element-desktop/APKBUILD @@ -1,8 +1,8 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=element-desktop -pkgver=1.11.64 -pkgrel=1 +pkgver=1.11.67 +pkgrel=0 pkgdesc="Secure and independent communication, connected via Matrix" url="https://element.io/" arch="aarch64 x86_64" # same as electron @@ -26,6 +26,7 @@ makedepends=" python3 py3-setuptools sqlcipher-dev + swc yarn " source=" @@ -127,9 +128,13 @@ build() { yarn build:res + # we need it as js to be of any use for tasje. + # fails with `yarn tsc`. https://github.com/electron-userland/electron-builder/issues/7961 + swc compile electron-builder.ts --out-file electron-builder.mjs + yarn install --frozen-lockfile --ignore-scripts --production - tasje -c electron-builder.js pack + tasje -c electron-builder.mjs pack } check() { @@ -159,12 +164,12 @@ package() { } sha512sums=" -3627b7ce207d10f73e91bca5f4bf5bd71262fa22eab678788f25fd6b89b9baaf55c41b642d855833196b1ed02dde8c73095ce5056211375b477b7c6d7ac4a4c4 element-desktop-1.11.64.tar.gz -bc74ff9330c2972e22fdcd54a9a552c9dacc792874d7d7a30929b1f973f638fa4a88827bf5bc0268761175c21077ab5482475d012512ec480512b1eb15ddbc96 element-web-1.11.64.tar.gz +094393e8cb6fd5f5c6d578e86c239ada9a8fd35071bbc1e0ec72253f1c4e1b15eb8378841a0f5b61312508cc45d4adaed8123ee7d80f447ea92a8b3eca607eb3 element-desktop-1.11.67.tar.gz +a93d5c15ea69132c1a15763731823060acd378e5b78976faf6ebf246f352af4043c209e8e0cc21755ca00d59d4e2b29586ad10ed6c4908f80f0aeb03ea5faa4f element-web-1.11.67.tar.gz 4747893ed3e43d3074e9afe1cdd668a6be0de073d439205fe8c38c5e0f4091cc76e3cd15d98818bea5139add29501d8d07e83c58e9da230a4ce5bb538d388f80 add-alpine-targets.patch 83f5e5fb197bc78e13dbb86dfcf2ef39c25ad9b54b72a911ad33fcd4a9725b6612e240edae030154b1512149408541b19f267bf517314447f1a2c6de6a45469e use-system-headers.patch -e4f74e9b5eb6f6e8ea893925e3ad4fca2bbf7d6ba64e82e230f154d1c846668fe66fdd44875b1c8ac0281e7cad6a12e462ab765281e997a16616ccf855d82aa4 tasje-one-hak.patch -9af00259f5e236f70a308f315d0c9116a68e1223d057a219344a8c72ec9b5694b92e3a1cb030c918a5be8c112dd1a5920b65b2b1eaf2b5b61fcb0d743d9a94b8 tasje-no-fuses.patch +92e69817fdc71f60c5c7dcbd3c7b13428cc18141cf5f27720326390f6817bec85fb1c60f8016b3a8fa275f601b16f646cda12b5e379a349368eef2f801b4de7a tasje-one-hak.patch +876d40639305d5258089069a01e218a2f14c32efccc3130f06398e8b4cd63bc740909162954a58ee11b909dc5b3e87c3383d73727aa13aa2d7093c9c63f04057 tasje-no-fuses.patch 31e3bde9ac13d711af3b57768eea5f60013f93ac35ec49648a66da8b4652e5049c991bfadfbe373814f237c700b95f5b9d1ed0c8f7cf8e4ec489a44b17dbfad5 use-system-fonts.patch.reactsdk 7dd96eb00dfc13e30d2274650a79aafce1bae3572ffcb4a5ce6a0ee6e4bc73cc8d6c0845d2dea930006f0fdd0ff313cd7615e6de58c95e674cb41dc978377f1d use-system-fonts.patch.web afc588311dc3b566a754e3e7fe6b37b99a06d47b8bbce0ed9acca8ef308fdab0bd1d41b406199e5cbdd86bdce695ff847cd8668857a235cbdc292ad8b899c063 element-desktop diff --git a/testing/element-desktop/tasje-no-fuses.patch b/testing/element-desktop/tasje-no-fuses.patch index 8198e5ffed4..efbfc52443b 100644 --- a/testing/element-desktop/tasje-no-fuses.patch +++ b/testing/element-desktop/tasje-no-fuses.patch @@ -1,30 +1,31 @@ we can't do fuses because we ship one binary in the electron package. and we can't import them here, since they are in devDependencies, which are uninstalled at this stage. ---- ./electron-builder.js.orig -+++ ./electron-builder.js -@@ -1,8 +1,6 @@ - const os = require("os"); - const fs = require("fs"); - const path = require("path"); --const Arch = require("electron-builder").Arch; --const { flipFuses, FuseVersion, FuseV1Options } = require("@electron/fuses"); +--- ./electron-builder.ts.orig ++++ ./electron-builder.ts +@@ -1,8 +1,7 @@ + import * as os from "os"; + import * as fs from "fs"; + import * as path from "path"; +-import { Arch, Configuration as BaseConfiguration, AfterPackContext } from "electron-builder"; +-import { flipFuses, FuseVersion, FuseV1Options } from "@electron/fuses"; ++import { Configuration as BaseConfiguration } from "electron-builder"; - // Typescript conversion blocked on https://github.com/electron-userland/electron-builder/issues/7775 - -@@ -35,43 +33,6 @@ - const config = { + /** + * This script has different outputs depending on your os platform. +@@ -54,43 +53,6 @@ + const config: Writable<Configuration> = { appId: "im.riot.app", asarUnpack: "**/*.node", -- afterPack: async (context) => { +- afterPack: async (context: AfterPackContext) => { - if (context.electronPlatformName !== "darwin" || context.arch === Arch.universal) { - // Burn in electron fuses for proactive security hardening. - // On macOS, we only do this for the universal package, as the constituent arm64 and amd64 packages are embedded within. -- const ext = { +- const ext = (<Record<string, string>>{ - darwin: ".app", - win32: ".exe", - linux: "", -- }[context.electronPlatformName]; +- })[context.electronPlatformName]; - - let executableName = context.packager.appInfo.productFilename; - if (context.electronPlatformName === "linux") { diff --git a/testing/element-desktop/tasje-one-hak.patch b/testing/element-desktop/tasje-one-hak.patch index ac584aa0a6f..a855eee856e 100644 --- a/testing/element-desktop/tasje-one-hak.patch +++ b/testing/element-desktop/tasje-one-hak.patch @@ -5,8 +5,8 @@ thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: FileAlreadyWritten("/node_modules/keytar/package.json")', src/main.rs:200:18 ``` ---- ./electron-builder.js.orig -+++ ./electron-builder.js +--- ./electron-builder.ts.orig ++++ ./electron-builder.ts @@ -74,10 +74,6 @@ }, files: [ diff --git a/testing/emulationstation/10-stat64.patch b/testing/emulationstation/10-stat64.patch new file mode 100644 index 00000000000..22749ba5c7a --- /dev/null +++ b/testing/emulationstation/10-stat64.patch @@ -0,0 +1,89 @@ +Author: Holger Jaekel <holger.jaekel@gmx.de> +Summary: the *64 apis are useless as musl is always 64-bit for them +---- + +--- a/es-core/src/utils/FileSystemUtil.cpp ++++ b/es-core/src/utils/FileSystemUtil.cpp +@@ -578,10 +578,10 @@ + CloseHandle(hFile); + } + #else // _WIN32 +- struct stat64 info; ++ struct stat info; + +- // check if lstat64 succeeded +- if(lstat64(path.c_str(), &info) == 0) ++ // check if lstat succeeded ++ if(lstat(path.c_str(), &info) == 0) + { + resolved.resize(info.st_size); + if(readlink(path.c_str(), (char*)resolved.data(), resolved.size()) > 0) +@@ -658,9 +658,9 @@ + if(pathExistsIndex.find(_path) == pathExistsIndex.cend()) + { + const std::string path = getGenericPath(_path); +- struct stat64 info; +- // check if stat64 succeeded +- pathExistsIndex[_path] = (stat64(path.c_str(), &info) == 0); ++ struct stat info; ++ // check if stat succeeded ++ pathExistsIndex[_path] = (stat(path.c_str(), &info) == 0); + } + + return pathExistsIndex.at(_path); +@@ -686,10 +686,10 @@ + bool isRegularFile(const std::string& _path) + { + const std::string path = getGenericPath(_path); +- struct stat64 info; ++ struct stat info; + +- // check if stat64 succeeded +- if(stat64(path.c_str(), &info) != 0) ++ // check if stat succeeded ++ if(stat(path.c_str(), &info) != 0) + return false; + + // check for S_IFREG attribute +@@ -702,10 +702,10 @@ + bool isDirectory(const std::string& _path) + { + const std::string path = getGenericPath(_path); +- struct stat64 info; ++ struct stat info; + +- // check if stat64 succeeded +- if(stat64(path.c_str(), &info) != 0) ++ // check if stat succeeded ++ if(stat(path.c_str(), &info) != 0) + return false; + + // check for S_IFDIR attribute +@@ -725,10 +725,10 @@ + if((Attributes != INVALID_FILE_ATTRIBUTES) && (Attributes & FILE_ATTRIBUTE_REPARSE_POINT)) + return true; + #else // _WIN32 +- struct stat64 info; ++ struct stat info; + +- // check if lstat64 succeeded +- if(lstat64(path.c_str(), &info) != 0) ++ // check if lstat succeeded ++ if(lstat(path.c_str(), &info) != 0) + return false; + + // check for S_IFLNK attribute +@@ -772,10 +772,10 @@ + // regular files and executables, but not setuid, setgid, shared text + const mode_t mask = S_IFREG; + const mode_t mask_exec = S_IXUSR | S_IXGRP | S_IXOTH; +- struct stat64 info; ++ struct stat info; + +- // check if stat64 succeeded +- if(stat64(path.c_str(), &info) != 0) ++ // check if stat succeeded ++ if(stat(path.c_str(), &info) != 0) + return false; + + // check for mask attributes diff --git a/testing/emulationstation/20-fontpaths.patch b/testing/emulationstation/20-fontpaths.patch new file mode 100644 index 00000000000..bdfb0441078 --- /dev/null +++ b/testing/emulationstation/20-fontpaths.patch @@ -0,0 +1,15 @@ +--- a/es-core/src/resources/Font.cpp ++++ b/es-core/src/resources/Font.cpp +@@ -261,9 +261,9 @@ + // Linux + + const char* paths[] = { +- "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", +- "/usr/share/fonts/truetype/freefont/FreeMono.ttf", +- "/usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf" // japanese, chinese, present on Debian ++ "/usr/share/fonts/dejavu/DejaVuSans.ttf", ++ "/usr/share/fonts/freefont/FreeMono.ttf", ++ "/usr/share/fonts/droid-nonlatin/DroidSansFallbackFull.ttf" // japanese, chinese, present on Debian + }; + + std::vector<std::string> fontPaths; diff --git a/testing/emulationstation/30-resource.patch b/testing/emulationstation/30-resource.patch new file mode 100644 index 00000000000..efe6d291caa --- /dev/null +++ b/testing/emulationstation/30-resource.patch @@ -0,0 +1,11 @@ +--- a/es-core/src/resources/ResourceManager.cpp ++++ b/es-core/src/resources/ResourceManager.cpp +@@ -33,7 +33,7 @@ + return test; + + // check in exepath +- test = Utils::FileSystem::getExePath() + "/resources/" + &path[2]; ++ test = std::string("/usr/share/emulationstation/resources/") + &path[2]; + if(Utils::FileSystem::exists(test)) + return test; + diff --git a/testing/emulationstation/APKBUILD b/testing/emulationstation/APKBUILD index 9e9133bbe04..530757e7758 100644 --- a/testing/emulationstation/APKBUILD +++ b/testing/emulationstation/APKBUILD @@ -3,7 +3,7 @@ pkgname=emulationstation pkgver=2.11.2 _gbz35="05895874b2920ab6ffeeb574d053f3d9e976c000" -pkgrel=0 +pkgrel=1 pkgdesc="EmulationStation is a cross-platform graphical front-end for emulators with controller navigation." url="https://github.com/RetroPie/EmulationStation" arch="all !armhf !s390x" # vlc-dev @@ -22,6 +22,7 @@ makedepends=" sdl2-dev vlc-dev " +depends="font-dejavu font-droid-nonlatin" subpackages="$pkgname-theme-gbz35:theme:noarch" options="!check" # No test suite @@ -31,6 +32,9 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/RetroPie/EmulationStation/ar pugixml.patch emulationstation.desktop emulationstation.png + 10-stat64.patch + 20-fontpaths.patch + 30-resource.patch " builddir="$srcdir"/EmulationStation-$pkgver @@ -38,16 +42,20 @@ build() { CFLAGS="$CFLAGS -O2 -flto=auto" \ CXXFLAGS="$CXXFLAGS -O2 -flto=auto" \ cmake -B build -G Ninja \ - -DCMAKE_BUILD_TYPE=None + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib cmake --build build } package() { depends="$pkgname-theme-gbz35=$pkgver-r$pkgrel" - install -Dm755 emulationstation -t "$pkgdir"/usr/bin/ + DESTDIR="$pkgdir" cmake --install build install -Dm644 "$srcdir"/emulationstation.png -t "$pkgdir"/usr/share/icons/hicolor/256x256/apps/ install -Dm644 "$srcdir"/emulationstation.desktop -t "$pkgdir"/usr/share/applications/ + mkdir -p "$pkgdir"/usr/share/emulationstation/ + cp -r "$builddir"/resources "$pkgdir"/usr/share/emulationstation/ mkdir -p "$pkgdir"/usr/share/emulationstation/themes cp -r "$srcdir"/es-theme-gbz35-$_gbz35 \ @@ -71,4 +79,7 @@ f97954e411078507b312b9859ff300bf2018945dedc2be593103a0aca1b0bd233a173ab6f74c9837 21755e8cb8a035cbd62318be3e45db0abc3dfce76ad82348a36e496b893e6583b1209a48dd9a001bbdd55c86479ef49bcccce67858a50273170cb9f5de62f67a pugixml.patch 814a196d234266809f2c3f64c7179e3138e017eb67d1c54dcc2e8c504c1439cb73f17352575cd582ce044b08405f3a369d049127c9f4c5a1336072435dfa54f0 emulationstation.desktop 70eb80598cd51edb1d95dd0a1784792e2e526b23efd46f1af3246e8ca321422cdd3309d11c23506cce68fca1f4bafec97d8a0436a53047bcb78b63eb3be23b7e emulationstation.png +b1119b9dca7511f61075a20b6411963da7b9fdef38911244cc0ba8355e30461ec69a096e6655ee814d1a86e674199d914cd5acbdfdd8f3a1760f82762b965152 10-stat64.patch +8fbc657226f35df7f59bc1a7571e93d20c5f1004a7c9a32d6c76c32dc29c1497e24032b35b09942fcee03f25b4517ed1a71e6d681782f19a40ab6dbd324ed6c5 20-fontpaths.patch +69224b7c78d164dc9d5cfd4d63ca41eca20a9c634b3f43e2f6d5a576801bf0d4dd2d83f65ef90f6e5dfba65279c6aa1ec17f46d12f0d40a194b1845d621fd9af 30-resource.patch " diff --git a/testing/envconsul/APKBUILD b/testing/envconsul/APKBUILD index e6f9dc6e6a7..9275d0552ee 100644 --- a/testing/envconsul/APKBUILD +++ b/testing/envconsul/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=envconsul pkgver=0.13.2 -pkgrel=5 +pkgrel=6 pkgdesc="Read and set environmental variables for processes from Consul." url="https://www.consul.io/" license="MPL-2.0" diff --git a/testing/ergo-ldap/APKBUILD b/testing/ergo-ldap/APKBUILD index 4958eb7542f..519d524dfd9 100644 --- a/testing/ergo-ldap/APKBUILD +++ b/testing/ergo-ldap/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Dekedro <dekedro@protonmail.com> pkgname=ergo-ldap pkgver=0.0.1 -pkgrel=9 +pkgrel=10 pkgdesc="LDAP authentication plugin for Ergo IRCd" url="https://github.com/ergochat/ergo-ldap" arch="all" diff --git a/testing/etcd/APKBUILD b/testing/etcd/APKBUILD index 8ab11d8d7ea..d970f63a1c4 100644 --- a/testing/etcd/APKBUILD +++ b/testing/etcd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=etcd pkgver=3.5.13 -pkgrel=1 +pkgrel=2 pkgdesc="A highly-available key value store for shared configuration and service discovery" url="https://github.com/etcd-io/etcd" license="Apache-2.0" diff --git a/testing/exercism/APKBUILD b/testing/exercism/APKBUILD index 2ff0539b671..6ac961416f5 100644 --- a/testing/exercism/APKBUILD +++ b/testing/exercism/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dmitry Zakharchenko <dmitz@disroot.org> pkgname=exercism pkgver=3.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="Command-line client for exercism.io" url="https://github.com/exercism/cli" arch="all" diff --git a/testing/fathom/APKBUILD b/testing/fathom/APKBUILD index 5fead0eb1db..1a880119dfa 100644 --- a/testing/fathom/APKBUILD +++ b/testing/fathom/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Edd Salkield <edd@salkield.uk> pkgname=fathom pkgver=1.3.1 -pkgrel=5 +pkgrel=6 pkgdesc="Privacy-focused website analytics" url="https://github.com/usefathom/fathom" arch="all" diff --git a/testing/fceux/APKBUILD b/testing/fceux/APKBUILD index 2587bcac1cb..2348ffd887f 100644 --- a/testing/fceux/APKBUILD +++ b/testing/fceux/APKBUILD @@ -3,14 +3,14 @@ # Maintainer: Danct12 <danct12@disroot.org> pkgname=fceux pkgver=2.6.6 -pkgrel=1 +pkgrel=2 pkgdesc="Fast and ultra-compatible NES/Famicom emulator" url="https://fceux.com" arch="all" license="GPL-2.0-only" makedepends=" cmake - clang15-dev + clang-dev ffmpeg-dev lua5.1-dev mesa-dev 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..245268d26ac 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=1 _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 884d9949311..60e5784856a 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 -pkgrel=1 +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, loongarch64: qt6-qtwebengine +arch="all !armhf !ppc64le !s390x !riscv64 !loongarch64" 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/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 0d16f47d81f..4edbf366653 100644 --- a/testing/felix/APKBUILD +++ b/testing/felix/APKBUILD @@ -6,7 +6,8 @@ pkgdesc="Simple TUI file manager with vim-like key mapping" url="https://kyoheiu.dev/felix/" # s390x: nix crate doesn't build yet # riscv64: tests fail -arch="all !s390x !riscv64" +# loongarch64: nix crate doesn't build yet +arch="all !s390x !riscv64 !loongarch64" license="MIT" makedepends=" bzip2-dev diff --git a/testing/filebrowser/APKBUILD b/testing/filebrowser/APKBUILD index c87e8989f04..0fcd11b57fc 100644 --- a/testing/filebrowser/APKBUILD +++ b/testing/filebrowser/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hugo Rodrigues <hugorodrigues@hugorodrigues.xyz> pkgname=filebrowser pkgver=2.27.0 -pkgrel=2 +pkgrel=3 pkgdesc="Web File Browser" url="https://github.com/filebrowser/filebrowser" arch="x86_64" diff --git a/testing/firectl/APKBUILD b/testing/firectl/APKBUILD index f8c184eebbd..fd6192dd254 100644 --- a/testing/firectl/APKBUILD +++ b/testing/firectl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=firectl pkgver=0.2.0 -pkgrel=11 +pkgrel=12 pkgdesc="command-line tool to run Firecracker microVMs" url="https://github.com/firecracker-microvm/firectl" arch="x86_64 aarch64" # blocked by firecracker diff --git a/testing/firefox-developer-edition/APKBUILD b/testing/firefox-developer-edition/APKBUILD index 06e83b2791b..a267e6d5ebd 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=126.0_beta9 +pkgver=127.0_beta7 _pkgver=${pkgver/_beta/b} -_releasedate=2024-05-04 +_releasedate=2024-05-28 pkgrel=0 pkgdesc="Firefox web browser" url="https://www.firefox.com/" @@ -252,7 +252,7 @@ package() { } sha512sums=" -e78c553ed1df36db7eb16d6f393e0afc88ab67dd74e84c30770f807027890ecb90414720b63dc69ec77696acfba674ed5e2730b3a3e524e6de4a335691b25163 firefox-126.0b9.source.tar.xz +73adc5572900a17f36c4c8e13e85397e83e945ef87b4607f18fddc33e95e821049a7a709c4caa36aecd9db6b581b05259bebe040a4f6ed08682779a1dbf191ac firefox-127.0b7.source.tar.xz 3c28e243c1c74a9bd1ea13729926b1cae3ee35843b14be92ff3287a8cd745e95954e1bc842f2add165923d159bb8d2a7bcd92ba8fb2f4017ba1aef892d77aecf fix-fortify-system-wrappers.patch cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch 305c874fdea3096e9c4c6aa6520ac64bb1c347c4b59db8360096646593fe684c3b5377874d91cecd33d56d1410b4714fbdea2b514923723ecbeff79d51265d9b fix-webrtc-glibcisms.patch diff --git a/testing/flannel/APKBUILD b/testing/flannel/APKBUILD index 851c49bdb8b..10728c035eb 100644 --- a/testing/flannel/APKBUILD +++ b/testing/flannel/APKBUILD @@ -3,7 +3,7 @@ pkgname=flannel _pkgname=flanneld pkgver=0.24.2 -pkgrel=2 +pkgrel=3 pkgdesc="An etcd backed network fabric for containers" url="https://github.com/flannel-io/flannel" arch="x86_64" diff --git a/testing/flawz/APKBUILD b/testing/flawz/APKBUILD new file mode 100644 index 00000000000..e88e0df18d4 --- /dev/null +++ b/testing/flawz/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: Orhun Parmaksız <orhunparmaksiz@gmail.com> +# Maintainer: Orhun Parmaksız <orhunparmaksiz@gmail.com> +pkgname=flawz +pkgver=0.1.1 +pkgrel=0 +pkgdesc="A Terminal UI for browsing CVEs" +url="https://github.com/orhun/flawz" +arch="all" +license="MIT OR Apache-2.0" +depends="openssl sqlite" +makedepends="cargo cargo-auditable openssl-dev sqlite-dev" +subpackages=" + $pkgname-doc + $pkgname-bash-completion + $pkgname-zsh-completion + $pkgname-fish-completion + " +options="net" +source="$pkgname-$pkgver.tar.gz::https://github.com/orhun/flawz/archive/v$pkgver.tar.gz" + +prepare() { + default_prepare + + cargo fetch --target="$CTARGET" --locked +} + +build() { + cargo auditable build --frozen --release + mkdir -p man + OUT_DIR=man/ target/release/flawz-mangen + mkdir -p completions + OUT_DIR=completions/ target/release/flawz-completions +} + +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 "man/$pkgname.1" -t "$pkgdir/usr/share/man/man1" + install -Dm 644 "completions/$pkgname.bash" "$pkgdir/usr/share/bash-completion/completions/$pkgname" + 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" +} + +sha512sums=" +6818f2776bf8c83f65b11471690310e3155e4ef1f25d17466b4410be1d551873cb2aa38513f2d031ead77164ea35c9bc8bd3a77eb8bbf2c061ce45578dd62259 flawz-0.1.1.tar.gz +" 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/flux/APKBUILD b/testing/flux/APKBUILD index 61a22101f72..d2a4bce5c13 100644 --- a/testing/flux/APKBUILD +++ b/testing/flux/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=flux pkgver=2.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="Open and extensible continuous delivery solution for Kubernetes" url="https://fluxcd.io/" arch="all" diff --git a/testing/forgejo-runner/APKBUILD b/testing/forgejo-runner/APKBUILD index 50d0bfeef70..da9e94f52e4 100644 --- a/testing/forgejo-runner/APKBUILD +++ b/testing/forgejo-runner/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=forgejo-runner pkgver=3.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="CI/CD job runner for Forgejo" url="https://code.forgejo.org/forgejo/runner" arch="all" diff --git a/testing/forgejo/APKBUILD b/testing/forgejo/APKBUILD index d2ccc9b14d3..bb73c3adc9d 100644 --- a/testing/forgejo/APKBUILD +++ b/testing/forgejo/APKBUILD @@ -3,7 +3,7 @@ # Contributor: techknowlogick <techknowlogick@gitea.io> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=forgejo -pkgver=7.0.2 +pkgver=7.0.3 pkgrel=0 pkgdesc="Self-hosted Git service written in Go" url="https://forgejo.org" @@ -25,6 +25,8 @@ builddir="$srcdir/forgejo" options="!check net chmod-clean" # broken with GIT_CEILING # secfixes: +# 7.0.3-r0: +# - CVE-2024-24788 # 1.21.10.0-r0: # - CVE-2023-45288 # 1.21.3.0-r0: @@ -100,7 +102,7 @@ package() { } sha512sums=" -c5965f6d25c5964598b9e76e0dc9962d02b7ea9bc6a74e9151635b04e323233a014a332e4d4ad68359523abaeb4c40d223d2c9d93f636c1d3aabc43fe64bec67 forgejo-7.0.2.tar.gz +2093328f74c4bfd76ca7693c582a0fdd37ea28ddb3e4d57dd11cb44e7bc7dbb3bb2d2e76fb3db5a57e874ef39c9e8fe6b8778464132487d3bcca0ea207ff9197 forgejo-7.0.3.tar.gz eb93a9f6c8f204de5c813f58727015f53f9feaab546589e016c60743131559f04fc1518f487b6d2a0e7fa8fab6d4a67cd0cd9713a7ccd9dec767a8c1ddebe129 forgejo.initd b537b41b6b3a945274a6028800f39787b48c318425a37cf5d40ace0d1b305444fd07f17b4acafcd31a629bedd7d008b0bb3e30f82ffeb3d7e7e947bdbe0ff4f3 forgejo.ini " diff --git a/testing/fq/APKBUILD b/testing/fq/APKBUILD index f1952e6d330..36b40dc4055 100644 --- a/testing/fq/APKBUILD +++ b/testing/fq/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=fq pkgver=0.10.0 -pkgrel=3 +pkgrel=4 pkgdesc="Tool, language and decoders for inspecting binary data" url="https://github.com/wader/fq" license="MIT" diff --git a/testing/freecad/APKBUILD b/testing/freecad/APKBUILD index c09d6ef4934..30c9eb51712 100644 --- a/testing/freecad/APKBUILD +++ b/testing/freecad/APKBUILD @@ -6,7 +6,8 @@ pkgrel=5 pkgdesc="Free and open source 3D parametric modeler" url="https://freecadweb.org/" license="LGPL-2.0-or-later" -arch="x86_64" # dependency OpenCascade is only x86_64 +arch="" # removed dependency py3-pyside2 +#arch="x86_64" # dependency OpenCascade is only x86_64 depends=" graphviz hdf5 diff --git a/testing/gb/APKBUILD b/testing/gb/APKBUILD index 053f8e684a0..c59fccfcaf6 100644 --- a/testing/gb/APKBUILD +++ b/testing/gb/APKBUILD @@ -3,7 +3,7 @@ pkgname=gb pkgver=0.4.4 _errors_ver=0.8.0 -pkgrel=23 +pkgrel=24 pkgdesc="Project based build tool for Go" options="!check" url="https://github.com/constabulary/gb" diff --git a/testing/gdcm/APKBUILD b/testing/gdcm/APKBUILD index 2abaa531a4b..971a6c9d60e 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 @@ -48,17 +48,17 @@ source="gdcm-$pkgver.tar.bz2::https://sourceforge.net/projects/gdcm/files/gdcm%2 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 +# Optional dependency texlive is not available on ppc64le, riscv64 and loongarch64 +case "$CARCH" in + ppc64le|riscv64|loongarch64) + _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 @@ -172,7 +172,7 @@ 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 diff --git a/testing/gedit-plugins/APKBUILD b/testing/gedit-plugins/APKBUILD new file mode 100644 index 00000000000..d54a6061bcb --- /dev/null +++ b/testing/gedit-plugins/APKBUILD @@ -0,0 +1,60 @@ +# Contributor: Rasmus Thomsen <oss@cogitri.dev> +# Maintainer: mio <miyopan@e.email> +pkgname=gedit-plugins +pkgver=47.1 +pkgrel=0 +pkgdesc="Plugins for gedit, the GNOME text editor" +url="https://gitlab.gnome.org/GNOME/gedit/blob/master/plugins/list-of-gedit-plugins.md" +arch="all !s390x" +license="GPL-2.0-only" +depends=" + gucharmap + libpeas-python3 + python3 + py3-dbus + py3-gobject3 + vte3 + " +makedepends=" + gedit-dev + glib-dev + gtk+3.0-dev + gucharmap-dev + itstool + libgedit-gtksourceview-dev + libgit2-glib-dev + libpeas-dev + py3-dbus-dev + vte3-dev + vala + meson + " +checkdepends="appstream-glib" +subpackages="$pkgname-lang $pkgname-doc $pkgname-pyc" +source="https://gitlab.gnome.org/GNOME/gedit-plugins/-/archive/$pkgver/gedit-plugins-$pkgver.tar.gz" + +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 + python3 -m compileall -fq "$pkgdir"/usr/lib/gedit +} + +pyc() { + default_pyc + find usr/lib/gedit/plugins -type d -name __pycache__ | \ + while IFS="$(printf '\n')" read -r path; do + amove "$path" + done +} + +sha512sums=" +fe4fcbdaec567c073c5528edc651a0fa4a49c3ac3556051ad062ff7059e37cf72ac8b2e4468e24d7df4c5dd5a91bf6ed95a7babdd1db6885fae893a4cdec0ea0 gedit-plugins-47.1.tar.gz +" diff --git a/community/gedit/APKBUILD b/testing/gedit/APKBUILD index 680e9618011..c3a6140fd58 100644 --- a/community/gedit/APKBUILD +++ b/testing/gedit/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Rasmus Thomsen <oss@cogitri.dev> -# Maintainer: +# Maintainer: mio <miyopan@e.email> pkgname=gedit -pkgver=44.2 -pkgrel=5 +pkgver=47.0 +pkgrel=0 pkgdesc="gedit is the GNOME text editor" -url="https://wiki.gnome.org/Apps/Gedit" +url="https://gedit-technology.github.io/apps/gedit/" arch="all !s390x" license="GPL-2.0-only" depends_dev="gedit=$pkgver-r$pkgrel" @@ -14,15 +14,14 @@ makedepends=" gspell-dev gtk+3.0-dev gtk-doc - gtksourceview4-dev itstool + libgedit-gtksourceview-dev + libgedit-tepl-dev libpeas-dev libx11-dev libxml2-dev meson perl - tepl-dev - vala " checkdepends="appstream-glib desktop-file-utils" depends="gsettings-desktop-schemas" @@ -52,5 +51,5 @@ package() { } sha512sums=" -c9dd412a16d7d0ba17214164017948bd1184ee5f9c44475e9e02880c0597b2fd9840f9488df7262cb413baedf5e16ce49dd32410b02ed0f53cf4bc94d3e3a4c7 gedit-44.2.tar.xz +d95007d62890f8ded21378d95681a20242c1bad4c94fe2fdf4413985b217aa3365ead5afee23b6b0339ab75c6235c76540b5669e42799152878af6901b82ab6d gedit-47.0.tar.xz " diff --git a/testing/geodns/APKBUILD b/testing/geodns/APKBUILD index 9ad786dc708..0974676f838 100644 --- a/testing/geodns/APKBUILD +++ b/testing/geodns/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=geodns pkgver=3.3.0 -pkgrel=5 +pkgrel=6 pkgdesc="DNS server with per-client targeted responses" url="https://github.com/abh/geodns" arch="all" diff --git a/testing/ghq/APKBUILD b/testing/ghq/APKBUILD index 2422b869040..9338338f6d8 100644 --- a/testing/ghq/APKBUILD +++ b/testing/ghq/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=ghq pkgver=1.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="CLI to manage remote repository clones" url="https://github.com/x-motemen/ghq" arch="all" diff --git a/testing/git-bug/APKBUILD b/testing/git-bug/APKBUILD index 5509907b472..677ec58d292 100644 --- a/testing/git-bug/APKBUILD +++ b/testing/git-bug/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=git-bug pkgver=0.8.0 -pkgrel=11 +pkgrel=12 pkgdesc="Distributed, offline-first bug tracker embedded in git, with bridges" url="https://github.com/MichaelMure/git-bug" arch="all" 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 index 954cfaa9c30..ce81b922c8d 100644 --- a/testing/git-quick-stats/APKBUILD +++ b/testing/git-quick-stats/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Guy Godfroy <guy.godfroy@gugod.fr> # Maintainer: Guy Godfroy <guy.godfroy@gugod.fr> pkgname=git-quick-stats -pkgver=2.5.5 +pkgver=2.5.6 pkgrel=0 pkgdesc="Access various statistics in git repository" url="https://git-quick-stats.sh" @@ -21,5 +21,5 @@ package() { } sha512sums=" -d7df73b3bf0953e334ace67aea7328f183405384df26f2b54f5b7c311c76adcfd38de52b5898094796c0b4abe1835c69b9aa664905efd27e5cc8f71f75c31f1b git-quick-stats-2.5.5.tar.gz +6eba66a2cbea0e5a871696e5341976d18d5a167dc853d98121f2c16bdfca35496af6ad9ab87b108e1696dd681868c4537ac8469dac8fb47c8ae35d293d160ee9 git-quick-stats-2.5.6.tar.gz " diff --git a/testing/glow/APKBUILD b/testing/glow/APKBUILD index 1fd8f7bd325..a4b7945e203 100644 --- a/testing/glow/APKBUILD +++ b/testing/glow/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=glow pkgver=1.5.1 -pkgrel=6 +pkgrel=7 pkgdesc="Markdown renderer on the CLI, with pizzazz" url="https://github.com/charmbracelet/glow" arch="all" diff --git a/testing/gnome-latex/APKBUILD b/testing/gnome-latex/APKBUILD index 4a8f09652a8..385a59a9b99 100644 --- a/testing/gnome-latex/APKBUILD +++ b/testing/gnome-latex/APKBUILD @@ -5,8 +5,8 @@ pkgver=3.44.0 pkgrel=5 pkgdesc="LaTeX editor for the GNOME desktop" url="https://gitlab.gnome.org/swilmet/gnome-latex" -# s390x, ppc64le and riscv64 blocked by texlive -arch="all !ppc64le !s390x !riscv64" +# s390x, ppc64le, riscv64 and loongarch64 blocked by texlive +arch="all !ppc64le !s390x !riscv64 !loongarch64" license="GPL-3.0-or-later" depends=" gsettings-desktop-schemas diff --git a/testing/gnome-metronome/APKBUILD b/testing/gnome-metronome/APKBUILD index f55ae0e30b2..71c728d8d28 100644 --- a/testing/gnome-metronome/APKBUILD +++ b/testing/gnome-metronome/APKBUILD @@ -20,7 +20,8 @@ makedepends=" rust " subpackages="$pkgname-lang" -source="https://gitlab.gnome.org/World/metronome/-/archive/$pkgver/metronome-$pkgver.tar.gz" +source="https://gitlab.gnome.org/World/metronome/-/archive/$pkgver/metronome-$pkgver.tar.gz + cargo-update.patch" builddir="$srcdir/metronome-$pkgver" @@ -39,4 +40,5 @@ package() { sha512sums=" 006f29f838895546af770d2fdddc8e947372f50c9499010b7ff4d77f2ef54d71dd4e7f8250ea5d20e0ad4842a0d6f9a87db5d6c549fb2f880f332eff56472c47 metronome-1.3.0.tar.gz +e43dd1d1d165a462c3cf9c57334747972a70611d2503e7f250224323b88f3562d0d44f6dccedda0e62691085bceec61cf1f6af0085cfeb6e70fff8a79d16a5e8 cargo-update.patch " diff --git a/testing/gnome-metronome/cargo-update.patch b/testing/gnome-metronome/cargo-update.patch new file mode 100644 index 00000000000..f905021ed22 --- /dev/null +++ b/testing/gnome-metronome/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index e7dd480..7a4207f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -659,9 +659,9 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.123" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "locale_config" diff --git a/testing/gnomecast/APKBUILD b/testing/gnomecast/APKBUILD deleted file mode 100644 index f4567d5b33a..00000000000 --- a/testing/gnomecast/APKBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks> -# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks> -pkgname=gnomecast -pkgver=1.9.11_git20220423 -_commit=d42d8915838b01c5cadacb322909e08ffa455d4f -pkgrel=2 -pkgdesc="A native Linux GUI for casting local files to Chromecast devices" -url="https://github.com/keredson/gnomecast" -arch="noarch" -license="GPL-3.0-only" -depends=" - ffmpeg - gtk+3.0 - python3 - py3-bottle - py3-dbus - py3-gobject3 - py3-html5lib - py3-paste - py3-pycaption - py3-pychromecast - " -makedepends="py3-setuptools" -checkdepends="py3-pytest" -options="!check" # broken tests -subpackages="$pkgname-pyc" -source=" - https://github.com/keredson/gnomecast/archive/$_commit/gnomecast-$_commit.tar.gz - - no-pandoc.patch - " -builddir="$srcdir/gnomecast-$_commit" - -build() { - python3 setup.py build -} - -check() { - pytest -} - -package() { - python3 setup.py install --skip-build --root="$pkgdir" - rm -rf "$pkgdir"/usr/lib/python3*/site-packages/tests -} - -sha512sums=" -00d254330b337d5bc4713de59d3ed1805ac5afb1dcf919c306c41dc6817345902717dff622f902dafa801c0289f76f7a9c328b70fe094a7829f7ec1f836c531f gnomecast-d42d8915838b01c5cadacb322909e08ffa455d4f.tar.gz -3e15f74bcae0189a37a0ed716302c858738ef10f8fc24cc335ac54b06c6f6920854ac23bf07c3570d7b329e80dc2c3421b999fcf75e95bd6420c97c574510866 no-pandoc.patch -" diff --git a/testing/gnomecast/no-pandoc.patch b/testing/gnomecast/no-pandoc.patch deleted file mode 100644 index 2717ac45d94..00000000000 --- a/testing/gnomecast/no-pandoc.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -2,20 +2,10 @@ - - from setuptools import setup - --def long_description(): -- os.system('pandoc --from=markdown --to=rst --output=README.rst README.md') -- readme_fn = os.path.join(os.path.dirname(__file__), 'README.rst') -- if os.path.exists(readme_fn): -- with open(readme_fn) as f: -- return f.read() -- else: -- return 'not available' -- - setup( - name='gnomecast', - version=__import__('gnomecast').__version__, - description='A native Linux GUI for Chromecasting local files.', -- long_description=long_description(), - author='Derek Anderson', - author_email='public@kered.org', - url='https://github.com/keredson/gnomecast', diff --git a/testing/go-jsonnet/APKBUILD b/testing/go-jsonnet/APKBUILD index cbf26ec4a88..3558a7b8155 100644 --- a/testing/go-jsonnet/APKBUILD +++ b/testing/go-jsonnet/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=go-jsonnet pkgver=0.20.0 -pkgrel=6 +pkgrel=7 pkgdesc="Implementation of Jsonnet in Go" url="https://jsonnet.org" arch="all" @@ -14,7 +14,7 @@ export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" case "$CARCH" in - s390x|riscv64) options="!check" ;; # blocked by rapidyaml -> jsonnet-dev + s390x|riscv64|loongarch64) options="!check" ;; # blocked by rapidyaml -> jsonnet-dev *) checkdepends="jsonnet-dev" ;; esac diff --git a/testing/go-mtpfs/APKBUILD b/testing/go-mtpfs/APKBUILD index 7874e81571e..96383d975ec 100644 --- a/testing/go-mtpfs/APKBUILD +++ b/testing/go-mtpfs/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Dekedro <dekedro@protonmail.com> pkgname=go-mtpfs pkgver=1.0.0 -pkgrel=19 +pkgrel=20 pkgdesc="Mount MTP devices over FUSE" url="https://github.com/hanwen/go-mtpfs" arch="all" diff --git a/testing/go-passbolt-cli/APKBUILD b/testing/go-passbolt-cli/APKBUILD index edceadae8cf..8e2f82c70a9 100644 --- a/testing/go-passbolt-cli/APKBUILD +++ b/testing/go-passbolt-cli/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=go-passbolt-cli pkgver=0.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Command-line tool to interact with Passbolt" url="https://github.com/passbolt/go-passbolt-cli" arch="all" diff --git a/testing/go-swag/APKBUILD b/testing/go-swag/APKBUILD index 09808eb35cb..c1453ff209d 100644 --- a/testing/go-swag/APKBUILD +++ b/testing/go-swag/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: leso-kn <info@lesosoftware.com> pkgname=go-swag pkgver=1.8.12 -pkgrel=4 +pkgrel=5 pkgdesc="Automatically generate RESTful API documentation with Swagger 2.0 for Go" url="https://github.com/swaggo/swag" arch="all" diff --git a/testing/gobuster/APKBUILD b/testing/gobuster/APKBUILD index 952961cb56d..be456728562 100644 --- a/testing/gobuster/APKBUILD +++ b/testing/gobuster/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Pedro Filipe <xpecex@outlook.com> pkgname=gobuster pkgver=3.6.0 -pkgrel=4 +pkgrel=5 pkgdesc="Directory/File, DNS and VHost busting tool written in Go" url="https://github.com/OJ/gobuster" arch="all !s390x" diff --git a/testing/godap/APKBUILD b/testing/godap/APKBUILD new file mode 100644 index 00000000000..11186c4c26b --- /dev/null +++ b/testing/godap/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: omni <omni+alpine@hack.org> +# Maintainer: omni <omni+alpine@hack.org> +pkgname=godap +pkgver=2.5.0 +pkgrel=0 +pkgdesc="A complete TUI for LDAP" +url="https://github.com/Macmod/godap" +license="MIT" +arch="all" +makedepends="go" +subpackages="$pkgname-doc + $pkgname-bash-completion + $pkgname-fish-completion + $pkgname-zsh-completion + " +options="net !check" # no test files +source="$pkgname-$pkgver.tar.gz::https://github.com/Macmod/godap/archive/refs/tags/v$pkgver.tar.gz" + +export GOFLAGS="$GOFLAGS -trimpath -mod=readonly -modcacherw" +export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" +export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" +export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" + +build() { + go build \ + -ldflags="-linkmode=external -extldflags \"$LDFLAGS\"" \ + -v . + + local shell; for shell in bash fish powershell zsh; do + ./godap completion "$shell" > "$pkgname"_"$shell" + done +} + +package() { + install -Dm0755 "$pkgname" -t "$pkgdir"/usr/bin + + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE + install -Dm644 README.md "$pkgdir"/usr/share/doc/"$pkgname"/README.md + + install -Dm644 "$pkgname"_bash "$pkgdir"/usr/share/bash-completion/completions/"$pkgname" + install -Dm644 "$pkgname"_fish "$pkgdir"/usr/share/fish/vendor_completions.d/"$pkgname".fish + install -Dm644 "$pkgname"_zsh "$pkgdir"/usr/share/zsh/site-functions/_"$pkgname" +} + +sha512sums=" +34dec99179c91935cffa53c734594548ec109ae2bf36e9c5c2c45f8e026ffabf509060d89bf4b2d4182e4656beadf1b8625986abf5177997b0d475bf413346a4 godap-2.5.0.tar.gz +" diff --git a/testing/gomp/APKBUILD b/testing/gomp/APKBUILD index e7d4a401b5c..e3d05ad453e 100644 --- a/testing/gomp/APKBUILD +++ b/testing/gomp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Hygna <hygna@proton.me> pkgname=gomp pkgver=1.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="MPD client inspired by ncmpcpp with builtin cover-art view and LastFM integration." url="https://github.com/aditya-K2/gomp" arch="all" diff --git a/testing/goreman/APKBUILD b/testing/goreman/APKBUILD index b14631c0305..d7965e46322 100644 --- a/testing/goreman/APKBUILD +++ b/testing/goreman/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=goreman pkgver=0.3.15 -pkgrel=5 +pkgrel=6 pkgdesc="Tool to manage Procfile-based applications" url="https://github.com/mattn/goreman" arch="all" diff --git a/testing/gortr/APKBUILD b/testing/gortr/APKBUILD index 4019390ebfa..de66e6cccd8 100644 --- a/testing/gortr/APKBUILD +++ b/testing/gortr/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Mike Crute <mike@crute.us> pkgname=gortr pkgver=0.14.8 -pkgrel=5 +pkgrel=6 pkgdesc="The RPKI-to-Router server used at Cloudflare" url="https://rpki.cloudflare.com/" arch="all" diff --git a/testing/gosu/APKBUILD b/testing/gosu/APKBUILD index 3142bfaa91e..0c686320796 100644 --- a/testing/gosu/APKBUILD +++ b/testing/gosu/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: David Huffman <storedbox@outlook.com> pkgname=gosu pkgver=1.17 -pkgrel=2 +pkgrel=3 pkgdesc="Simple Go-based setuid+setgid+setgroups+exec" url="https://github.com/tianon/gosu" arch="all" diff --git a/testing/gotestsum/APKBUILD b/testing/gotestsum/APKBUILD index d0a55a8272f..da2a2e9fe31 100644 --- a/testing/gotestsum/APKBUILD +++ b/testing/gotestsum/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Guy Godfroy <guy.godfroy@gugod.fr> pkgname=gotestsum pkgver=1.11.0 -pkgrel=2 +pkgrel=3 pkgdesc="Go test runner with output optimized for humans, JUnit XML for CI integration, and a summary of the test results" url="https://github.com/gotestyourself/gotestsum" arch="all" diff --git a/testing/grafana-image-renderer/APKBUILD b/testing/grafana-image-renderer/APKBUILD index a424a4150dd..c2fbb6fd13b 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.5 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 +2d2a6a45d2033b44128c68976c654eadcb87758a8dd3e6b9c23a2db653b49b4bce6e888929d0ea42ec002cce0ac88ef925dafbbbda0d09855b763a40a3d25fc6 grafana-image-renderer-3.10.5.tar.gz 06faad0f5abecf434c014ca91dccf3f07f18d96a8f526c3c1d2384cba8db44db5fe2b2165d8fc12a8fe8d121135077b0c70158ee29ebb1bfba8dd2a3110b349c grafana-image-renderer.initd 88a119ad18fbde490ab9213487ae16b8aeeb65437275a1112f7423fa581a7470e6fb68654c2fd439afa68c0333aeefd0711f3fffd53615fa51d0702c80ed1c1b grafana-image-renderer.confd 8fc756536a429dc3343216e64fa33af8c601d83d03d81bd6096e46b33e5d1249f95be719ea489b13bd1af936771e8eeffd3ff7d8c5cdf622c3188b342c8fbdbd grafana-image-renderer.json diff --git a/testing/grommunio-admin-api/0002-enable-openapi-core-0.19.patch b/testing/grommunio-admin-api/0002-enable-openapi-core-0.19.patch new file mode 100644 index 00000000000..9f0513128f6 --- /dev/null +++ b/testing/grommunio-admin-api/0002-enable-openapi-core-0.19.patch @@ -0,0 +1,15 @@ +# openapi_core 0.19 has the required fixes for python 3.12 +--- a/api/core.py ++++ b/api/core.py +@@ -22,9 +22,9 @@ + from openapi_core.contrib.flask import FlaskOpenAPIRequest, FlaskOpenAPIResponse + if self.version < [0, 15, 0]: + from openapi_core import create_spec +- elif self.version < [0, 18, 0]: ++ elif self.version < [0, 19, 0]: + from openapi_core.spec.shortcuts import create_spec +- if self.version < [0, 18, 0]: ++ if self.version < [0, 19, 0]: + self.spec = create_spec(apiSpec) + else: + self.spec = openapi_core.Spec.from_dict(apiSpec) diff --git a/testing/grommunio-admin-api/0003-disable-systemd-log-reader.patch b/testing/grommunio-admin-api/0003-disable-systemd-log-reader.patch new file mode 100644 index 00000000000..ed277a69076 --- /dev/null +++ b/testing/grommunio-admin-api/0003-disable-systemd-log-reader.patch @@ -0,0 +1,21 @@ +# The systemd log reader should be replaced with another solution +# For now we disable it +--- a/endpoints/system/logs.py ++++ b/endpoints/system/logs.py +@@ -11,7 +11,6 @@ + import psutil + + from tools.config import Config +-from tools.logs import LogReader + from tools.permissions import SystemAdminROPermission + + +@@ -32,7 +31,7 @@ + n = int(request.args.get("n", 10)) + skip = int(request.args.get("skip", 0)) + after = datetime.strptime(request.args["after"], "%Y-%m-%d %H:%M:%S.%f") if "after" in request.args else None +- return jsonify(data=LogReader.tail(log.get("format", "journald"), log["source"], n, skip, after)) ++ return jsonify(message="Log file not found"), 404 + + + @API.route(api.BaseRoute+"/system/updateLog/<int:pid>", methods=["GET"]) diff --git a/testing/grommunio-admin-api/0004-replace-systemd-calls.patch b/testing/grommunio-admin-api/0004-replace-systemd-calls.patch new file mode 100644 index 00000000000..bc70ba06a8f --- /dev/null +++ b/testing/grommunio-admin-api/0004-replace-systemd-calls.patch @@ -0,0 +1,22 @@ +# The systemctl calls are replaced with a proprietary openrc wrapper +--- a/services/systemd.py ++++ b/services/systemd.py +@@ -35,8 +35,7 @@ + return "--system" if self.system else "--user" + + def getServices(self, *services): +- args = ("systemctl", "-q", self.__mode, "show", +- "--property="+",".join(self.valmap), *services) ++ args = ("rcctl", "info", *services) + result = subprocess.run(args, stdout=subprocess.PIPE, universal_newlines=True) + split = [[line.split("=", 1) for line in block.split("\n") if "=" in line] for block in result.stdout.split("\n\n")] + units = [{self.valmap[key]: value for key, value in block if key in self.valmap} for block in split] +@@ -53,7 +52,7 @@ + return {unit["unit"]: unit for unit in units if "unit" in unit} + + def run(self, command, *targets): +- result = subprocess.run(("systemctl", "-q", self.__mode, command, *targets), ++ result = subprocess.run(("rcctl", "-q", command, *targets), + stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) + return result.returncode, result.stdout + diff --git a/testing/grommunio-admin-api/0005-grommunio-antispam.patch b/testing/grommunio-admin-api/0005-grommunio-antispam.patch new file mode 100644 index 00000000000..777ff122c4b --- /dev/null +++ b/testing/grommunio-admin-api/0005-grommunio-antispam.patch @@ -0,0 +1,27 @@ +--- a/data/config.yaml.in ++++ b/data/config.yaml.in +@@ -14,7 +14,6 @@ + local: 'http://localhost:8080/statusmonitor' + dashboard: + services: +- - unit: grommunio-antispam.service + - unit: gromox-delivery.service + - unit: gromox-event.service + - unit: gromox-http.service +@@ -28,6 +27,7 @@ + - unit: '@PHP_FPM_SERVICE@' + - unit: postfix.service + - unit: redis@grommunio.service ++ - unit: rspamd.service + mconf: + ldapPath: '/etc/gromox/ldap_adaptor.cfg' + authmgrPath: '/etc/gromox/authmgr.cfg' +@@ -37,7 +37,7 @@ + Admin API: + source: 'grommunio-admin-api.service' + Antispam: +- source: 'grommunio-antispam.service' ++ source: 'rspamd.service' + Gromox http: + source: 'gromox-http.service' + Gromox smtp: diff --git a/testing/grommunio-admin-api/APKBUILD b/testing/grommunio-admin-api/APKBUILD index e87cb59f09b..9debae616fe 100644 --- a/testing/grommunio-admin-api/APKBUILD +++ b/testing/grommunio-admin-api/APKBUILD @@ -1,17 +1,19 @@ # 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" +pkgver=1.15 +pkgrel=1 +# s390x: blocked by grommunio-gromox, armhv, ppce64le blocked by py3-openapi-core +arch="noarch !armhf !ppc64le !riscv64 !s390x" +url="https://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" +_php=83 +makedepends="cmake py3-yaml samurai nginx" depends="grommunio-admin-common grommunio-gromox - libexmdbpp + py3-pyexmdb py3-ldap3 py3-mysqlclient py3-redis @@ -21,14 +23,16 @@ depends="grommunio-admin-common py3-idna py3-dnspython py3-cryptography + py3-mattermostdriver + py3-openapi-core py3-psutil py3-yaml py3-flask py3-jwt py3-multidict - py3-openapi-codec py3-requests uwsgi + uwsgi-python3 " pkgusers="grommunio" @@ -36,9 +40,15 @@ pkggroups="grommunio" source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/admin-api/archive/refs/tags/$pkgver.tar.gz 0001-makefile.patch + 0002-enable-openapi-core-0.19.patch + 0003-disable-systemd-log-reader.patch + 0004-replace-systemd-calls.patch + 0005-grommunio-antispam.patch + grommunio-admin-api.initd grommunio-admin-api.confd database.yaml + rc-service-ctl.sh " builddir="$srcdir/admin-api-$pkgver" @@ -46,10 +56,12 @@ 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 + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_INSTALL_SBINDIR=/usr/sbin \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_BUILD_TYPE=MinSizeRel \ + -DPHP_FPM_SERVICE="php-fpm$_php.service" cmake --build build } @@ -61,14 +73,22 @@ package() { 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 -d -m0750 -o grommunio -g grommunio "$pkgdir"/etc/grommunio-admin-api/conf.d + install -d -m0700 -o grommunio "$pkgdir"/var/lib/grommunio-admin-api install -m644 -D "$srcdir"/database.yaml "$pkgdir"/etc/grommunio-admin-api/conf.d/database.yaml + install -m755 -D "$srcdir"/rc-service-ctl.sh "$pkgdir"/usr/bin/rcctl install -d -m0775 -o grommunio -g nginx "$pkgdir"/var/run/grommunio } sha512sums=" -3dfb6a0c194d862f0358dd854830b52f84730b8944940aa5a3ec200f50a3a5cef03184347684a08978b146ed0214d969962ac8d299b68f146551b3be3446f693 grommunio-admin-api-1.14.tar.gz +c88ab4153f867f8196db72e19b871eb882228b2fd2077b2d43e5682e0a0cba7d274412ca9b870940fc9668b30c0a2501282e02f96477dca0e1da5a5e26963d4a grommunio-admin-api-1.15.tar.gz 47dc0698ca3d107b9a37f4778c386d099bd24bfaa6104e9512166b0266898dfcb1a63eb1eb2b1bb27d7d54b56560c4cfb6f3a48c7e56e5a61c21cb445aa830ea 0001-makefile.patch +bfc5828e5f456e7be77a9c8b65d8a629d56c72184f28b53fdef488eb9522661c6ee1adb9c64fe53da86020194535fea7ea157864beb81e43859d95bd4b5dbd1e 0002-enable-openapi-core-0.19.patch +27dceea394302b2afafca84927c3fc9a57cb6502e4fd08ccd35786855c6bd3203869a357d89766e3775c4c05882105372ab6c9db5b974fc727fa8b4753387236 0003-disable-systemd-log-reader.patch +815e3151c10be79b9471c28f871af6f80afcf1cbd753091d141d2e66b7c0f32d58e2ca6f0967168c8efb6cdb6126626904384f09983f63f8a17fd80abdadab52 0004-replace-systemd-calls.patch +268830a6efe40f9ed112ac725934455ee476ee994c696081938edad7e146575710c96133415c4f57923d24e06f4c9fc240c64513c0e781cfdd25d025816fdeed 0005-grommunio-antispam.patch b87910a731ad58b86679b08674632fffb4d76a94ad67602906200acf7e36fb23508ec19f56ca2f8a1e257a7ef3a32c4dbfa7b27d9d902006eff3d92d8816c067 grommunio-admin-api.initd -b634a1d20372f45e9f9e347d9f0b0785dca561849920381e223b2a7f356d7e9a37299087b8b6e69d8caf1af87313f14d8e0ac85699bafd9258c6e7153c590cf5 grommunio-admin-api.confd +5c579c7421348839be0bb8db4ab9047e7882589e9a674d81bdd5685821ae836bbe4c6a15e478bd68977435da95b5a66427547e6d282f576f106944bffb94c328 grommunio-admin-api.confd bf166f9f46d3a6755c2273502576c63060b17d2eb7a4abbac9da5ed1b74a4ed47baf6269eda58adf04657a78028e862572cd7b24d9c8b5b6497b778338def12f database.yaml +909a211694af56277b167ff2f68a9cacf0f09b1f78364405012e1139bf3b7a931d17f971ed30233eca3e9a1039d98ec32e35f6b52699387f81016819b69468c5 rc-service-ctl.sh " diff --git a/testing/grommunio-admin-api/grommunio-admin-api.confd b/testing/grommunio-admin-api/grommunio-admin-api.confd index 4746d7a3641..529cb145e4b 100644 --- a/testing/grommunio-admin-api/grommunio-admin-api.confd +++ b/testing/grommunio-admin-api/grommunio-admin-api.confd @@ -1,3 +1,9 @@ # Configuration for /etc/init.d/grommunio-admin-api +user="grommunio" +group="nginx" +pidfile="/run/grommunio/admin-api.pid" + +error_logger="'logger -t grommunio-admin-api'" + uwsgi_opts="--ini /usr/share/grommunio-admin-api/api-config.ini" diff --git a/testing/grommunio-admin-api/rc-service-ctl.sh b/testing/grommunio-admin-api/rc-service-ctl.sh new file mode 100644 index 00000000000..9d30d399e38 --- /dev/null +++ b/testing/grommunio-admin-api/rc-service-ctl.sh @@ -0,0 +1,130 @@ +#!/bin/ash +# +# This script is a wrapper for Alpine Linux openrc tools, i.e. rc-service, rc-update, rc-status +# It allows to control multiple services at once using systemd-like commands +# NOTE: The info command is compatible with the systemctl output expected by grommunio-admin-api +# +# Copyright 2024 Miguel Da Silva, Contauro AG +# Distributed under the terms of the GNU General Public License, v2 or later +# +# Version: 0.3 - 2024-05-20 +# Last change: Fixed info command +# + +usage() { + echo >&2 "Wrapper for openrc tools to control multiple services at once" + echo >&2 + echo >&2 "Usage: $(basename "$0") [options] <command> <service>" + echo >&2 + echo >&2 "Commands: start | stop | reload | restart | | enable | disable | status | info |" + echo >&2 " try-restart | reload-or-restart | try-reload-or-restart" + echo >&2 "Service: one or multiple services separate by blanks" + echo >&2 + echo >&2 "Options:" + echo >&2 " -q, --quiet Run quietly" + exit ${1:-0} +} + +# Show usage by default +[ $# -eq 0 ] && usage + +# Retrieve options and command +prog=""; cmd=""; opt=""; combined=0; try=0 +while [ -z "$cmd" ]; do + case "$1" in + "start") prog="rc-service"; cmd="start" ;; + "stop") prog="rc-service"; cmd="stop" ;; + "reload") prog="rc-service"; cmd="reload" ;; + "restart") prog="rc-service"; cmd="restart" ;; + "enable") prog="rc-update"; cmd="add" ;; + "disable") prog="rc-update"; cmd="del" ;; + "status") prog="rc-service"; cmd="status" ;; + "info") prog="internal"; cmd="info" ;; + "try-restart") prog="rc-service"; cmd="restart" try=1 ;; + "reload-or-restart") prog="rc-service"; cmd="reload-or-restart"; combined=1 ;; + "try-reload-or-restart") prog="rc-service"; cmd="reload-or-restart"; combined=1; try=1 ;; + -h|--help) usage ;; + -q|--quiet) opt="-q"; shift ;; + *) echo >&2 "ERROR: Unknown command."; exit 1 ;; + esac +done + +# Verify service input +if [ -z "$2" ] && [ "$cmd" != "status" ]; then + echo >&2 "ERROR: Specify one or mulitple services as argument." + exit 1 +fi + + +# status command is allowed without service +[ $# -eq 1 ] && [ "$cmd" = "status" ] && rc-status && exit 0 + + +# Loop over services +while [ -n "$2" ]; do + + # Remove suffix '.service' if available + service=${2%%.service} + + # Retrieve initscript. If not found, skip this service. + initscript=$(rc-service -r $service) + if [ -z "$initscript" ]; then + [ "$cmd" != "info" ] && echo -e >&2 "\e[1;31m * \e[0m$service: unknown service" + shift + continue + fi + + # Retrieve service state + servicestate=$(rc-service $service status | awk '{print $3}') + + # No actions if try-flag is set and the service is stopped + [ $try -eq 1 ] && [ "$servicestate" = "stopped" ] && shift && continue + + + ## Invoke external commands + if [ $combined -eq 0 ]; then + # Fix status output for multiple services + statusfix="" + [ "$cmd" = "status" ] && statusfix="| sed 's/status/$service/'" + + [ "$prog" = "rc-service" ] && eval $prog $opt $service $cmd $statusfix + [ "$prog" = "rc-update" ] && eval $prog $opt $cmd $service + else + # combined commands reload/restart + if [ "$prog" = "rc-service" ] && [ "$cmd" = "reload-or-restart" ]; then + eval $prog $opt $service "reload" + [ $? -ne 0 ] && eval $prog $opt $service "restart" + fi + fi + + + ## Process info command + if [ "$prog" = "internal" ] && [ "$cmd" = "info" ]; then + # Retrieve description from init.d file + description=$(grep '^description=' $initscript | cut -d'=' -f2 | tr -d "\"") + + # Retrieve service unit state (enabled/disabled) + unitstate="disabled" + rc-update show | grep -q "$service |" && unitstate="enabled" + + # Translate service state to systemd-like activestate and substate + case "$servicestate" in + "started") activestate="active"; substate="running" ;; + "stopped") activestate="inactive"; substate="dead" ;; + "crashed") activestate="failed"; substate="failed" ;; + *) activestate="unknown"; substate="unknown" ;; + esac + + # Print out required variables. Print a newline between items + printf "Names=$service.service\n" + printf "Description=$description\n" + printf "ActiveState=$activestate\n" + printf "SubState=$substate\n" + printf "UnitFileState=$unitstate\n" + printf "ActiveEnterTimestampMonotonic=0\n" + printf "InactiveEnterTimestampMonotonic=0\n" + [ -n "$3" ] && printf "\n" + fi + shift; +done + diff --git a/testing/grommunio-admin-common/APKBUILD b/testing/grommunio-admin-common/APKBUILD index 97e2257b4d3..71c58a2719c 100644 --- a/testing/grommunio-admin-common/APKBUILD +++ b/testing/grommunio-admin-common/APKBUILD @@ -1,24 +1,38 @@ # Maintainer: Noel Kuntze <noel.kuntze@contauro.com> pkgname=grommunio-admin-common pkgdesc="Common files for grommunio management" -pkgver=1.0_git20240118 +pkgver=1.0_git20240313 pkgrel=0 arch="noarch !riscv64" -url="http://www.grommunio.com" +url="https://grommunio.com/" license="AGPL-3.0-only" options="!check" # No test suite +depends="bash" -_commithash=2a1dca824ed1a9e1dc5f5280dc559bcddde215a7 +_commithash=36c09d448d8e3120a7eb32324b3a1d47e6cc3128 -source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/admin-configs/archive/$_commithash.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/admin-configs/archive/$_commithash.tar.gz + + web-config.conf + nginx-ssl.conf + " builddir="$srcdir/admin-configs-$_commithash" package() { mkdir -p "$pkgdir" cp -rp . "$pkgdir" + + # fix nginx directory + mv "$pkgdir/etc/nginx/conf.d" "$pkgdir/etc/nginx/http.d" + + # nginx config files + install -m644 -D "$srcdir"/web-config.conf "$pkgdir"/etc/grommunio-admin-common/nginx.d/web-config.conf + install -m644 -D "$srcdir"/nginx-ssl.conf "$pkgdir"/etc/grommunio-common/nginx/nginx-ssl.conf } sha512sums=" -f238f91c942b7f88b4aef524b2259df2724bb41c1b33c04a2f9533315e3b0714ddbbcb6b4097107689ac79879952ce8811d51824671ee7c69b19a487c9593858 grommunio-admin-common-1.0_git20240118.tar.gz +78bc241cf800cd30cfbe3e739d7a51a93548d68982b9146c40b00a6071e3bfc32723884f4074e4d30c4fbfe692e181a696955f7119d0bd099d33fa47b3117a05 grommunio-admin-common-1.0_git20240313.tar.gz +152d1a061f256310e53bf10923b4a413bb4716560bee908b9d96c34df24720369d91a3ca2b58197e2d495b669aa4213b82040239067d4eb73a79c0828e651f37 web-config.conf +e2d1a010813078651ca2e728589a1c0c84b6e098c87f59b2ec07d54a9f80b8c9a2168cd853dd73fe07ee6e05cc66f762c2d9ba2511c135314bb1727f6cbfba91 nginx-ssl.conf " diff --git a/testing/grommunio-admin-common/nginx-ssl.conf b/testing/grommunio-admin-common/nginx-ssl.conf new file mode 100644 index 00000000000..59a08477a88 --- /dev/null +++ b/testing/grommunio-admin-common/nginx-ssl.conf @@ -0,0 +1,2 @@ +ssl_certificate /etc/ssl/certs/mail.example.local.cert.pem; +ssl_certificate_key /etc/ssl/private/mail.example.local.key.pem; diff --git a/testing/grommunio-admin-common/web-config.conf b/testing/grommunio-admin-common/web-config.conf new file mode 100644 index 00000000000..9921f784f4f --- /dev/null +++ b/testing/grommunio-admin-common/web-config.conf @@ -0,0 +1,3 @@ +location /config.json { + alias /etc/grommunio-admin-common/config.json; +} diff --git a/testing/grommunio-admin-web/APKBUILD b/testing/grommunio-admin-web/APKBUILD index a20480b82e4..6972a02b5d5 100644 --- a/testing/grommunio-admin-web/APKBUILD +++ b/testing/grommunio-admin-web/APKBUILD @@ -2,9 +2,10 @@ pkgname=grommunio-admin-web pkgdesc="Frontend for grommunio management" pkgver=2.9.0 -pkgrel=0 -arch="noarch !riscv64" -url="http://www.grommunio.com" +pkgrel=2 +# s390x: blocked by grommunio-gromox, armhv, ppce64le blocked by py3-openapi-core, all through grommunio-admin-api +arch="noarch !armhf !ppc64le !riscv64 !s390x" +url="https://grommunio.com/" license="AGPL-3.0-only" options="!check" # No test suite depends="grommunio-admin-api grommunio-admin-common" @@ -44,5 +45,5 @@ package() { sha512sums=" c0dccb101de6acb6b54e1f839b62417a9d7cd45687d715e193e318b3d73dfd978afd80729cd2bfb1a2b7409985da721fa9aa5a7f22f65dbf920dd205a0d2bf64 grommunio-admin-web-2.9.0.tar.gz 5faa04f1f95cccdbb79a1e09f569a915794e236cb5738b25fd2e9f85b346875b6c1a8f20c3b53ccf823921eca0708a05da5c72f3b0971847ec34bfdbebf0f26e 0001-makefile.patch -c40b0722996b9d0449c3e11f2b56f59e1109b59253ffdf13422c21c56584924fe93a381250ce915656837c1c7799821bc6b6bcf463f867d6e529e59e3a899744 config.json +41e6df23c37b786a214e3c41e1e53ee18a3bd2e6d6344245dc0879374685b0e986f5bc3daeb9068907856810457e3deca6840837d1938af55238335b2b6e99e3 config.json " diff --git a/testing/grommunio-admin-web/config.json b/testing/grommunio-admin-web/config.json index d913eb2fcfd..1539377e9c0 100644 --- a/testing/grommunio-admin-web/config.json +++ b/testing/grommunio-admin-web/config.json @@ -1,7 +1,8 @@ { - "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" + "mailWebAddress": "https://mail.example.local/web", + "rspamdWebAddress": "https://mail.example.local/antispam", + "chatWebAddress": "https://mail.example.local/chat", + "videoWebAddress": "https://mail.example.local/meet", + "fileWebAddress": "https://mail.example.local/files", + "archiveWebAddress": "https://mail.example.local/archive" } diff --git a/testing/grommunio-common/APKBUILD b/testing/grommunio-common/APKBUILD index b212594d24c..1334c144975 100644 --- a/testing/grommunio-common/APKBUILD +++ b/testing/grommunio-common/APKBUILD @@ -2,7 +2,7 @@ pkgname=grommunio-common pkgdesc="Common configuration package for grommunio" pkgver=1.0 -pkgrel=0 +pkgrel=1 arch="noarch !riscv64" url="https://grommunio.com/" license="AGPL-3.0-only" @@ -12,8 +12,9 @@ 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 + ssl_certificate.conf + redis@grommunio.initd + redis@grommunio.confd " builddir="$srcdir/configs-$pkgver" @@ -22,9 +23,16 @@ package() { mkdir -p "$pkgdir" cp -rp -- * "$pkgdir" + # service files 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 + ln -sf "/etc/init.d/redis" "$pkgdir/etc/init.d/redis@grommunio" + install -Dm644 "$srcdir"/redis@grommunio.confd "$pkgdir"/etc/conf.d/redis@grommunio + + # fix nginx directory + mv "$pkgdir/etc/nginx/conf.d" "$pkgdir/etc/nginx/http.d" + + # nginx config file + install -m644 -D "$srcdir"/ssl_certificate.conf "$pkgdir"/etc/grommunio-common/nginx/ssl_certificate.conf # remove unnecessary files rm -rf "$pkgdir/etc/zypp" @@ -33,6 +41,7 @@ package() { sha512sums=" 1e2db173a73012948be3b829919ab3092ba0399228355d7a157398bb5b4b9d6c4150b1f2aaf38cfb857dba710765408a54cf2aab09e369c28d1971a29f221b26 grommunio-common-1.0.tar.gz 89bad8ea9d28bab8815cf57c8539b49a7d1e59b01409b89539a863e74ca90d8def8a89dc5bed19bf99c0fc38a3ba45707ad33386ed94412403a779e5c71a1831 0001-redis-grommunio.patch -5aa23f4ad715bfc9cf0b8b020b55a3802aedaab0e813250a0fcf50ffa5d792c3c04d1ceb2985cf5d5be71f078b6c5704232ee5a0f891826536f72ba494e57e03 grommunio@redis.initd -1412f11520c5ebce4bdd491e6fe34254fc0e36f79acaae0d1495e77ad2fe799ec6b135d28b92aa68f3486d8ecd329e462230bc2d447aac1353226b8c28b49ccf grommunio@redis.confd +e2d1a010813078651ca2e728589a1c0c84b6e098c87f59b2ec07d54a9f80b8c9a2168cd853dd73fe07ee6e05cc66f762c2d9ba2511c135314bb1727f6cbfba91 ssl_certificate.conf +5aa23f4ad715bfc9cf0b8b020b55a3802aedaab0e813250a0fcf50ffa5d792c3c04d1ceb2985cf5d5be71f078b6c5704232ee5a0f891826536f72ba494e57e03 redis@grommunio.initd +1412f11520c5ebce4bdd491e6fe34254fc0e36f79acaae0d1495e77ad2fe799ec6b135d28b92aa68f3486d8ecd329e462230bc2d447aac1353226b8c28b49ccf redis@grommunio.confd " diff --git a/testing/grommunio-common/grommunio@redis.confd b/testing/grommunio-common/redis@grommunio.confd index b31955502ee..b31955502ee 100644 --- a/testing/grommunio-common/grommunio@redis.confd +++ b/testing/grommunio-common/redis@grommunio.confd diff --git a/testing/grommunio-common/grommunio@redis.initd b/testing/grommunio-common/redis@grommunio.initd index e76026b945d..e76026b945d 100644 --- a/testing/grommunio-common/grommunio@redis.initd +++ b/testing/grommunio-common/redis@grommunio.initd diff --git a/testing/grommunio-common/ssl_certificate.conf b/testing/grommunio-common/ssl_certificate.conf new file mode 100644 index 00000000000..59a08477a88 --- /dev/null +++ b/testing/grommunio-common/ssl_certificate.conf @@ -0,0 +1,2 @@ +ssl_certificate /etc/ssl/certs/mail.example.local.cert.pem; +ssl_certificate_key /etc/ssl/private/mail.example.local.key.pem; diff --git a/testing/grommunio-dav/APKBUILD b/testing/grommunio-dav/APKBUILD index c538f678086..dc7ad25165c 100755 --- a/testing/grommunio-dav/APKBUILD +++ b/testing/grommunio-dav/APKBUILD @@ -1,10 +1,11 @@ # 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/" +pkgver=2.0_git20240327 +pkgrel=1 +# s390x: blocked by grommunio-gromox, armhv, ppce64le blocked by py3-openapi-core +arch="noarch !armhf !ppc64le !riscv64 !s390x" +url="https://grommunio.com/" license="AGPL-3.0-only" options="!check" # No test suite _php=php83 @@ -23,12 +24,11 @@ depends="grommunio-gromox $_php-xmlwriter " -_commithash=e16f8a2e909c0b064a456266034696949218e5df -#_commithash=45e9e18483bc5ad840e15c464b954ffb1c14ce40 +_commithash=8133bc4a8d1a15011bc3d5c8de9a7a4a66191c3a 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/" @@ -53,6 +53,7 @@ package() { install -Dpm644 build/grommunio-dav-upstream.conf "$pkgdir/usr/share/grommunio-common/nginx/upstreams.d/grommunio-dav.conf" # php-fpm + sed -i "s@/php-fpm/@/php-fpm${_php##php}/@" build/pool-grommunio-dav.conf install -Dpm644 build/pool-grommunio-dav.conf "$pkgdir/etc/$_php/php-fpm.d/pool-grommunio-dav.conf" # logrotate @@ -74,6 +75,6 @@ package() { } sha512sums=" -f7a16566053650c8b1d7a7e8ebd062e74317f93a728f0ee4409476363dc679d9998485ee0bf8db8bbe1f6443eb5d39d7c20c1eba39846a18d4eb88bf37b5f698 grommunio-dav-2.0_git20240118.tar.gz -b44a1b8a7c8276c319d9fa2f283d59c11fde060d0ec6364a5b587157f1fd2c5bbda6cd0d596a081815556f4da0adf6f854ce116b0f21eaa95ac9f60e4fd72f5c grommunio-dav-2.0_git20240118-vendor.tar.gz +49603aae9f0a315f2b83e5efe33fba380b29f9b67016aa72647e78d4da2de5cdb4ca027b50252a85aaad5c2556904bf0d12d14709c9464acf066a9f6a2f1a5ba grommunio-dav-2.0_git20240327.tar.gz +c3de362d7b34130e660c3bd7615dedbec106927f2d8931ee4e44c32eb62a0d17a6449322fd21780123168cb752ab209b752b8585d54d9c9492b556c12291b11e grommunio-dav-2.0_git20240327-vendor.tar.gz " diff --git a/testing/grommunio-gromox/APKBUILD b/testing/grommunio-gromox/APKBUILD index efc91b068a6..bc280462224 100644 --- a/testing/grommunio-gromox/APKBUILD +++ b/testing/grommunio-gromox/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Noel Kuntze <noel.kuntze@contauro.com> pkgname=grommunio-gromox subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-openrc" -pkgver=2.27 +pkgver=2.28 pkgrel=0 pkgdesc="Open Source Groupware Solution" -arch="all !riscv64" +arch="all !riscv64 !s390x" # test failure on s390x url="https://grommunio.com/" license="AGPL-3.0-or-later" _php=php83 -install="$pkgname.pre-install" +install="$pkgname.pre-install $pkgname.post-install" depends=" grommunio-common mariadb @@ -59,13 +59,21 @@ source=" gromox-timer.initd gromox-zcore.initd gromox-fpm.conf + delivery.cfg + event.cfg http.cfg imap.cfg + midb.cfg mysql_adaptor.cfg pop3.cfg smtp.cfg + timer.cfg zcore.cfg autodiscover.ini + grommunio-virtual-mailbox-domains.cf + grommunio-virtual-mailbox-alias-maps.cf + grommunio-virtual-mailbox-maps.cf + grommunio-bcc-forwards.cf " builddir="$srcdir/gromox-gromox-$pkgver/" @@ -77,7 +85,12 @@ prepare() { build() { export CXXFLAGS="$CXXFLAGS -fpermissive" - ./configure --prefix=/usr + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var make } @@ -92,25 +105,12 @@ package() { # 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" + install -Dm 0755 "$srcdir/gromox-$item.initd" "$pkgdir/etc/init.d/gromox-$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" + # prepare configuration. some files are predefined, others are generated. 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 + for item in delivery event http imap midb mysql_adaptor pop3 smtp timer zcore; do install -Dm 0640 "$srcdir/$item.cfg" "$pkgdir/etc/gromox/$item.cfg" done @@ -121,6 +121,12 @@ package() { 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" + # postfix files + install -Dm 0640 -g postfix "$srcdir/grommunio-bcc-forwards.cf" "$pkgdir/etc/postfix/grommunio-bcc-forwards.cf" + install -Dm 0640 -g postfix "$srcdir/grommunio-virtual-mailbox-alias-maps.cf" "$pkgdir/etc/postfix/grommunio-virtual-mailbox-alias-maps.cf" + install -Dm 0640 -g postfix "$srcdir/grommunio-virtual-mailbox-domains.cf" "$pkgdir/etc/postfix/grommunio-virtual-mailbox-domains.cf" + install -Dm 0640 -g postfix "$srcdir/grommunio-virtual-mailbox-maps.cf" "$pkgdir/etc/postfix/grommunio-virtual-mailbox-maps.cf" + # license install -Dm 0644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" @@ -147,22 +153,30 @@ package() { } 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 +cbe23c8a490f6d34f967f9467fd9451fc9e9ab1069f57cd0d7677a623827b7218f500dbf851bc9e0e5ccd37e116c1491d63fe0cd60cda0126673952be3cdd720 gromox-2.28.tar.gz +4d84cf2a8507921f9366ab4b8c14e2c205e6ffa784b493818ae3f90a700fea5ae7450b70f53edc9ab7ec45fb0bb664e623ad446dae447f5666929f413d98991a gromox-delivery-queue.initd +484732614bbcc56108e5ba02959beede71db3597a6bec11cb85595f6f422647be18a0da04f9676d7a6f6c312fdaad0e11d0b616847e9e8b2afa2ba79636dd4eb gromox-delivery.initd +93c887ef2ee9a5d83d4ba1544b1a452bf17fcf92e9164d6e0e4a9308ab009da3735bf4e95cbada96c2e70336292cb11153f551629f5076363da8aa8ed4928b33 gromox-event.initd +7d7cbd550543e24540b6d1f872d7d71a720d176dbfa37c4c2d09352069427a641a71958b98739f065b0bbcdeee027422fc3dbabb7fd6f01df927c986392bcb56 gromox-http.initd +f2b2ca1e623d10995e509d448db6a32ebc9fc21b9e29d793abfc263d4030bfe730db5a0bc1246be98a0a55c08969553225d109153dafe55c66b564e056a49ab3 gromox-imap.initd +53453e7bd0c14fabfe8688497912a3dbab73552648cef617155467cb102eeadea7776137e6c9329a56913c910694fadb585f285d8dafb8ece9a29babff525f7c gromox-midb.initd +b96bdd82263f0b6e9c80f85401e472f1e6f9c5311ecf53ca8149a8c1965886fb0cc040877b0bbe9451b17861a332262d4250b5b286f18a69732323f55741a029 gromox-pop3.initd +7af7ba1b6158437d424994e1b84a73231fb895d1fff74093b19006f7dd03bada38eca10b9e9730f4c13f2afbd8a5ba509d0f31d21fa489c304c1b1c8f6b588ac gromox-timer.initd +ecb342fc1fded8d7b3d0abd8e6072aa967c8b2caeb821525ce8bd55c26ce029845300f8b2d50bb7616b0e98fb3e8e678581707e0f49423c7dc3120971a747f32 gromox-zcore.initd adb0da75223284a1081166597ef42d267d2187f663b7da7c66eae517e0af179217464a1e7ec6b2d082f7dd0b506e1e980724cf1fec081719b253e8ea44a37558 gromox-fpm.conf -768b63b8d6431b47546753481e67cbd27797e8813dce4ba5109b511ee751972b9b7a137d0c933f29156e5d5b1f1d9b3d1c4733d522be6141b1b56b0b7a90b2e0 http.cfg -f6bfdf6e44ed1cb7718a71fc75920d0a92b22fd17166d85c43273b53c57931344aaa1be0b61b713f2f7d586ea621c1077b6585a4fc553198e49069db8e6a0396 imap.cfg +e610fd0cb1392f08cd5cd30450fc9d6cdd6a2724ff439a38a2c6623755c9e2afdeee2f9d45d965ba0dd043b5c3942c1a0d69061f7cc9b1ecdd680109e7d756de delivery.cfg +b9f4d736c41278b320bae89e5c0d6674fd5b628bc6fb6c5b88b15e37617f39d228a884988aeaba5b2fbe05a64372ed7f8094cdc363a2a1901b0c6c1735844e92 event.cfg +281a6deb683722222a34e149003e6d361ca41f45ca73d32a46a37a757cf39847e5e90868f9af454f9ee59fcf570716c011ee5087a02e705f68b0ded73c2c4c43 http.cfg +ff5f2bb87d49c8127eefd1c26e2480a9c8e9730d10e890a69b9ba2bf9b4e8c11b5841b4c8be59a6fbeb0eb3c803fb3323a1cc971c1c571ed11719e169f4745bd imap.cfg +07997f87175bc835059d7a9c8b59fc282bb6e835c9ea34b87e7f2ec90a27d522a44f19d28b4ab9bcd009053f88756b6ebe9de7edbbde2ded24bd56c5767251db midb.cfg a4b54f32a4f8b932ea93dd71c1eaccac50a445d960f3ab37913481db3b80daad51238f4b826331111e939f5a75d522619fff9566042670b578c65c477754bd64 mysql_adaptor.cfg -1612fb72fa8417ef54670f82e829c1307256ab87b8ee478d9bddf32599888de407749ee4cd97c52e55dc72138964db531af061d9c8426d6dacb692a48b4bfbef pop3.cfg -04e234844466beff40a67d8b0f1eeea93ca1d801c88127ccb4f4475665c16c3b3cc11077e32fc34e010b63af2557e9b3a214213ee5382b3c1ffa4c3ae131dc4a smtp.cfg -b7f86af6b5a7f0d075c4c46c33c513db41ebd59a59a6e53613c2f1fcb09a03080eaede57e6040d609892d5c910dbbe03de3bf70035ecd8ed63f3161acb3425ab zcore.cfg -1323813c698159340436c7023309abc26bef3dbfa17b6ea331f172cd26c6d7eb207fcfe4a8b4ff88042f7895ea49c6d09cfa247cb6586d97928b211d91528e24 autodiscover.ini +43db0b8d9d65d5e1d86195875cc564d11a0c4d5970a571bc97dc6150d74d8f9c456adb0ac1db9cc84302923e285e2f6d9b564dfd92a8039e97e5f98834327b4a pop3.cfg +a0cf62b2982479faa3e00ec401ae1946505eb7c581507f45757663e5e9b922a126c96e56e1a64090016420f4e045c83efffe06e725c96f9887c745b6581bbfb2 smtp.cfg +f910bae21e35f79552ae79899263ca8d1ba7bfd85944cc0915e4dda83e35600cdce00b17346d788ea3c0060fea4cd1525d5781524ce086712d51b49c6bc0cd44 timer.cfg +f1ecee83fa72137bba15e11f109c8501bbc8712c8a5fa41aab3468da05e1ef6a61c5ac03488688222a7cd4e54fa9c2e6696819471d6d8deb9193865033327f8d zcore.cfg +91b433070e89dfc4b2d7ea9360547bc2d1dd37bd220c3e688994249d52f17d980c15f41ec52505aa027644633546a61742da3f3155c267d99bc0c37956f118f3 autodiscover.ini +8890e170ef2c9b1cc43ab84c2c24446f20be69dd395ec8249246568aaadcd440a304103a36d008da8cbf20ec8ec0522dadf2217ee4ee00255c58a442d94ec263 grommunio-virtual-mailbox-domains.cf +2ce6b5867a9dd9ef5091e1b167813a14900958be9fe5ba46bf333a58bd7b9fe3d8dfd2a25d65a1ae567dc362ec98ea648d4ae5a95f87370a083d6707c1bda475 grommunio-virtual-mailbox-alias-maps.cf +22161519cacb4f97577ca17216b9d2aa0212c32d7d7d6f3d82c8894628f4b6ab7471cf49530bebe22f1a96747f3907ec684ce0d9c9980a2621cc65581913dec0 grommunio-virtual-mailbox-maps.cf +929f5a44d7a343c11e3a10e5d972e4ec2362f08126efa45fa61f1b70efd01a650df2aaff7140b39d7b88b4754cabc0fac3880dfdc2e91232b6f129fe4ad2326d grommunio-bcc-forwards.cf " diff --git a/testing/grommunio-gromox/autodiscover.ini b/testing/grommunio-gromox/autodiscover.ini index dd24e4dc950..208e102e3d4 100644 --- a/testing/grommunio-gromox/autodiscover.ini +++ b/testing/grommunio-gromox/autodiscover.ini @@ -1,7 +1,7 @@ [database] host = localhost username = 'grommunio' -password = <password> +password = '<password>' dbname = 'grommunio' [exchange] diff --git a/testing/grommunio-gromox/delivery.cfg b/testing/grommunio-gromox/delivery.cfg new file mode 100644 index 00000000000..e28063d030e --- /dev/null +++ b/testing/grommunio-gromox/delivery.cfg @@ -0,0 +1,3 @@ +lda_log_file=syslog +lda_log_level=4 +default_domain=example.com diff --git a/testing/grommunio-gromox/event.cfg b/testing/grommunio-gromox/event.cfg new file mode 100644 index 00000000000..8830f33e7d3 --- /dev/null +++ b/testing/grommunio-gromox/event.cfg @@ -0,0 +1,2 @@ +event_log_file=syslog +event_log_level=4 diff --git a/testing/grommunio-gromox/grommunio-bcc-forwards.cf b/testing/grommunio-gromox/grommunio-bcc-forwards.cf new file mode 100644 index 00000000000..b21f5e7f37f --- /dev/null +++ b/testing/grommunio-gromox/grommunio-bcc-forwards.cf @@ -0,0 +1,5 @@ +user = grommunio +password = <password> +hosts = localhost +dbname = grommunio +query = SELECT destination FROM forwards WHERE username='%s' AND forward_type = 0 diff --git a/testing/grommunio-gromox/grommunio-gromox.post-install b/testing/grommunio-gromox/grommunio-gromox.post-install new file mode 100644 index 00000000000..710ea4a4ce9 --- /dev/null +++ b/testing/grommunio-gromox/grommunio-gromox.post-install @@ -0,0 +1,24 @@ +#!/bin/sh + +# Prepare customer-specific x500 org name and replace default value in provided config files +x500_org_name=$(awk 'BEGIN { srand(); print int(rand()*32768) }' /dev/null | md5sum | head -c 10) +sed -i "s/<x500_org_name>/$x500_org_name/" /etc/gromox/midb.cfg +sed -i "s/<x500_org_name>/$x500_org_name/" /etc/gromox/zcore.cfg +sed -i "s/<x500_org_name>/$x500_org_name/" /etc/gromox/autodiscover.ini + +# Create additional configuration files containing only x500_org_name +for item in exchange_emsmdb exchange_nsp exmdb_local exmdb_provider +do + if [ -f "/etc/gromox/$item.cfg" ] + then + echo "$item.cfg already exists." + echo + else + echo "Copying new $item.cfg" + grep x500_org_name > /etc/gromox/$item.cfg < /etc/gromox/zcore.cfg || echo "Copying new $item.cfg failed." + chown grommunio:gromoxcf /etc/gromox/$item.cfg + chmod 640 /etc/gromox/$item.cfg + fi +done + +exit 0 diff --git a/testing/grommunio-gromox/grommunio-virtual-mailbox-alias-maps.cf b/testing/grommunio-gromox/grommunio-virtual-mailbox-alias-maps.cf new file mode 100644 index 00000000000..d92ffebf41d --- /dev/null +++ b/testing/grommunio-gromox/grommunio-virtual-mailbox-alias-maps.cf @@ -0,0 +1,5 @@ +user = grommunio +password = <password> +hosts = localhost +dbname = grommunio +query = SELECT mainname FROM aliases WHERE aliasname='%s' UNION select destination FROM forwards WHERE username='%s' AND forward_type = 1 diff --git a/testing/grommunio-gromox/grommunio-virtual-mailbox-domains.cf b/testing/grommunio-gromox/grommunio-virtual-mailbox-domains.cf new file mode 100644 index 00000000000..9258fced97d --- /dev/null +++ b/testing/grommunio-gromox/grommunio-virtual-mailbox-domains.cf @@ -0,0 +1,5 @@ +user = grommunio +password = <password> +hosts = localhost +dbname = grommunio +query = SELECT 1 FROM domains WHERE domain_status=0 AND domainname='%s' diff --git a/testing/grommunio-gromox/grommunio-virtual-mailbox-maps.cf b/testing/grommunio-gromox/grommunio-virtual-mailbox-maps.cf new file mode 100644 index 00000000000..bd7c74eeb92 --- /dev/null +++ b/testing/grommunio-gromox/grommunio-virtual-mailbox-maps.cf @@ -0,0 +1,5 @@ +user = grommunio +password = <password> +hosts = localhost +dbname = grommunio +query = SELECT 1 FROM users WHERE username='%s' diff --git a/testing/grommunio-gromox/gromox-delivery-queue.initd b/testing/grommunio-gromox/gromox-delivery-queue.initd index c60317fe3e0..5b93e9c4b91 100644 --- a/testing/grommunio-gromox/gromox-delivery-queue.initd +++ b/testing/grommunio-gromox/gromox-delivery-queue.initd @@ -1,6 +1,7 @@ #!/sbin/openrc-run supervisor=supervise-daemon name=$RC_SVCNAME +description="Gromox local delivery agent frontend" command="/usr/libexec/gromox/delivery-queue" depend() { diff --git a/testing/grommunio-gromox/gromox-delivery.initd b/testing/grommunio-gromox/gromox-delivery.initd index a1f946e7654..05764afbe43 100644 --- a/testing/grommunio-gromox/gromox-delivery.initd +++ b/testing/grommunio-gromox/gromox-delivery.initd @@ -1,6 +1,7 @@ #!/sbin/openrc-run supervisor=supervise-daemon name=$RC_SVCNAME +description="Gromox mail spooler" command="/usr/libexec/gromox/delivery" depend() { diff --git a/testing/grommunio-gromox/gromox-event.initd b/testing/grommunio-gromox/gromox-event.initd index d90afbb5cad..55dfbffb5b3 100644 --- a/testing/grommunio-gromox/gromox-event.initd +++ b/testing/grommunio-gromox/gromox-event.initd @@ -1,6 +1,7 @@ #!/sbin/openrc-run supervisor=supervise-daemon name=$RC_SVCNAME +description="Gromox event service" command="/usr/libexec/gromox/event" depend() { diff --git a/testing/grommunio-gromox/gromox-http.initd b/testing/grommunio-gromox/gromox-http.initd index 9ec73476238..d3b88fddb6d 100644 --- a/testing/grommunio-gromox/gromox-http.initd +++ b/testing/grommunio-gromox/gromox-http.initd @@ -1,10 +1,11 @@ #!/sbin/openrc-run supervisor=supervise-daemon name=$RC_SVCNAME +description="Gromox HTTP service" command="/usr/libexec/gromox/http" depend() { - need mariadb atd + need mariadb } start_pre() { diff --git a/testing/grommunio-gromox/gromox-imap.initd b/testing/grommunio-gromox/gromox-imap.initd index 82e43ba0857..42d9a1c4581 100644 --- a/testing/grommunio-gromox/gromox-imap.initd +++ b/testing/grommunio-gromox/gromox-imap.initd @@ -1,6 +1,7 @@ #!/sbin/openrc-run supervisor=supervise-daemon name=$RC_SVCNAME +description="Gromox IMAP server" command="/usr/libexec/gromox/imap" depend() { diff --git a/testing/grommunio-gromox/gromox-midb.initd b/testing/grommunio-gromox/gromox-midb.initd index 5f1902e9de7..64857107a1d 100644 --- a/testing/grommunio-gromox/gromox-midb.initd +++ b/testing/grommunio-gromox/gromox-midb.initd @@ -1,6 +1,7 @@ #!/sbin/openrc-run supervisor=supervise-daemon name=$RC_SVCNAME +description="Gromox midb service" command="/usr/libexec/gromox/midb" depend() { diff --git a/testing/grommunio-gromox/gromox-pop3.initd b/testing/grommunio-gromox/gromox-pop3.initd index a39f3728f61..4aff1243d25 100644 --- a/testing/grommunio-gromox/gromox-pop3.initd +++ b/testing/grommunio-gromox/gromox-pop3.initd @@ -1,6 +1,7 @@ #!/sbin/openrc-run supervisor=supervise-daemon name=$RC_SVCNAME +description="Gromox POP3 server" command="/usr/libexec/gromox/pop3" depend() { diff --git a/testing/grommunio-gromox/gromox-timer.initd b/testing/grommunio-gromox/gromox-timer.initd index ac4ae0c301c..5cf641f3ca1 100644 --- a/testing/grommunio-gromox/gromox-timer.initd +++ b/testing/grommunio-gromox/gromox-timer.initd @@ -1,6 +1,7 @@ #!/sbin/openrc-run supervisor=supervise-daemon name=$RC_SVCNAME +description="Gromox timer service" command="/usr/libexec/gromox/timer" depend() { diff --git a/testing/grommunio-gromox/gromox-zcore.initd b/testing/grommunio-gromox/gromox-zcore.initd index 31075307576..93a21478e04 100644 --- a/testing/grommunio-gromox/gromox-zcore.initd +++ b/testing/grommunio-gromox/gromox-zcore.initd @@ -1,10 +1,11 @@ #!/sbin/openrc-run supervisor=supervise-daemon name=$RC_SVCNAME +description="Gromox zcore service" command="/usr/libexec/gromox/zcore" depend() { - need mariadb atd + need mariadb } start_pre() { diff --git a/testing/grommunio-gromox/http.cfg b/testing/grommunio-gromox/http.cfg index e6512397cc4..6f364518965 100644 --- a/testing/grommunio-gromox/http.cfg +++ b/testing/grommunio-gromox/http.cfg @@ -1,8 +1,10 @@ listen_port=10080 http_support_ssl=true listen_ssl_port=10443 +http_log_file=syslog +http_log_level=4 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 +# Ensure that certificate and key are accessible for user gromox +http_certificate_path=/etc/ssl/certs/mail.example.local.cert.pem +http_private_key_path=/etc/ssl/private/mail.example.local.key.pem default_domain=example.com - diff --git a/testing/grommunio-gromox/imap.cfg b/testing/grommunio-gromox/imap.cfg index 2a7ab23f8fa..06059f2514d 100644 --- a/testing/grommunio-gromox/imap.cfg +++ b/testing/grommunio-gromox/imap.cfg @@ -1,6 +1,8 @@ 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 +imap_log_file=syslog +imap_log_level=4 +# Ensure that certificate and key are accessible for user gromox +imap_certificate_path=/etc/ssl/certs/mail.example.local.cert.pem +imap_private_key_path=/etc/ssl/private/mail.example.local.key.pem default_domain=example.com - diff --git a/testing/grommunio-gromox/midb.cfg b/testing/grommunio-gromox/midb.cfg new file mode 100644 index 00000000000..c7ff7797d49 --- /dev/null +++ b/testing/grommunio-gromox/midb.cfg @@ -0,0 +1,4 @@ +midb_log_file=syslog +midb_log_level=4 +default_domain=example.com +x500_org_name=<x500_org_name> diff --git a/testing/grommunio-gromox/pop3.cfg b/testing/grommunio-gromox/pop3.cfg index 4ad30bfadc2..1ec99013562 100644 --- a/testing/grommunio-gromox/pop3.cfg +++ b/testing/grommunio-gromox/pop3.cfg @@ -1,5 +1,8 @@ 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 +pop3_log_file=syslog +pop3_log_level=4 +# Ensure that certificate and key are accessible for user gromox +pop3_certificate_path=/etc/ssl/certs/mail.example.local.cert.pem +pop3_private_key_path=/etc/ssl/private/mail.example.local.key.pem default_domain=example.com diff --git a/testing/grommunio-gromox/smtp.cfg b/testing/grommunio-gromox/smtp.cfg index 0f689b292b1..a2c1e69d1ca 100644 --- a/testing/grommunio-gromox/smtp.cfg +++ b/testing/grommunio-gromox/smtp.cfg @@ -1,2 +1,5 @@ +# Configuration for delivery-queue +lda_log_file=syslog +lda_log_level=4 listen_port=24 default_domain=example.com diff --git a/testing/grommunio-gromox/timer.cfg b/testing/grommunio-gromox/timer.cfg new file mode 100644 index 00000000000..f8d80e3dd3f --- /dev/null +++ b/testing/grommunio-gromox/timer.cfg @@ -0,0 +1,2 @@ +timer_log_file=syslog +timer_log_level=4 diff --git a/testing/grommunio-gromox/zcore.cfg b/testing/grommunio-gromox/zcore.cfg index 2e56f0aef94..9bc9575f978 100644 --- a/testing/grommunio-gromox/zcore.cfg +++ b/testing/grommunio-gromox/zcore.cfg @@ -1,2 +1,4 @@ +zcore_log_file=syslog +zcore_log_level=4 default_domain=example.com x500_org_name=<x500_org_name> diff --git a/testing/grommunio-index/APKBUILD b/testing/grommunio-index/APKBUILD index bf1ef39811d..f359605a4fb 100644 --- a/testing/grommunio-index/APKBUILD +++ b/testing/grommunio-index/APKBUILD @@ -2,12 +2,12 @@ pkgname=grommunio-index pkgdesc="Generator for grommunio-web search indexes" pkgver=1.0 -pkgrel=0 +pkgrel=1 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" +makedepends="cmake samurai 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 diff --git a/testing/grommunio-sync/APKBUILD b/testing/grommunio-sync/APKBUILD index d647dfe8b54..47b3adde326 100644 --- a/testing/grommunio-sync/APKBUILD +++ b/testing/grommunio-sync/APKBUILD @@ -1,10 +1,11 @@ # 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/" +pkgver=2.0_git20240327 +pkgrel=1 +# s390x: blocked by grommunio-gromox, armhv, ppce64le blocked by py3-openapi-core +arch="noarch !armhf !ppc64le !riscv64 !s390x" +url="https://grommunio.com/" license="AGPL-3.0-only" options="!check" # No test suite _php=php83 @@ -25,9 +26,11 @@ depends="grommunio-gromox $_php-simplexml $_php-soap" -_commithash=316257884382020bebfb4e3a2853cb560f3b208b +_commithash=655dec920595f2e181a0ad2c415d1fe2f5b04c9c -source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/grommunio-sync/archive/$_commithash.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/grommunio/grommunio-sync/archive/$_commithash.tar.gz + $pkgname-$pkgver-vendor.tar.gz::https://nerd.hu/distfiles/grommunio-sync-$_commithash-vendor.tar.gz + " builddir="$srcdir/grommunio-sync-$_commithash/" @@ -40,6 +43,9 @@ package() { 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" @@ -49,6 +55,7 @@ package() { install -Dpm644 build/grommunio-sync-upstream.conf "$pkgdir/usr/share/grommunio-common/nginx/upstreams.d/grommunio-sync.conf" # php-fpm + sed -i "s@/php-fpm/@/php-fpm${_php##php}/@" build/pool-grommunio-sync.conf install -Dpm644 build/pool-grommunio-sync.conf "$pkgdir/etc/$_php/php-fpm.d/pool-grommunio-sync.conf" # logrotate @@ -65,5 +72,6 @@ package() { } sha512sums=" -6df33c39e114c5439548d6c465a57d0b2885acac77349cde7de7f3a0a6a3fb339747f62b77c46f25300a60ffafa1be690ebaeff5c6625e11aa9a51fba2f7d67a grommunio-sync-2.0_git20240226.tar.gz +e00414e470b61c0bfe6dde54de203c45ae409f5028d945371817430fdbdf203a4230e8a89f06ad52b7f892fea395651965d01bf20edb5786c02bfc2625e7bf51 grommunio-sync-2.0_git20240327.tar.gz +d49c39cdea8ca46bc7c41f0d044ab6b015c24a0bf15da61c2b11460b05845f065af4f352fd0a0a70739113ec1cb196c47f477ddb776f24ceb37d6ffa638a288d grommunio-sync-2.0_git20240327-vendor.tar.gz " diff --git a/testing/grommunio-web/APKBUILD b/testing/grommunio-web/APKBUILD index cda77b2d0a5..239f76cd5e3 100644 --- a/testing/grommunio-web/APKBUILD +++ b/testing/grommunio-web/APKBUILD @@ -1,10 +1,11 @@ # Maintainer: Noel Kuntze <noel.kuntze@contauro.com> pkgname=grommunio-web pkgdesc="Web user interface for grommunio" -pkgver=3.7 +pkgver=3.8 pkgrel=0 -arch="noarch !riscv64" -url="http://www.grommunio.com" +# s390x: blocked by grommunio-gromox, armhv, ppce64le blocked by py3-openapi-core +arch="noarch !armhf !ppc64le !riscv64 !s390x" +url="https://grommunio.com/" license="AGPL-3.0-only" options="!check" # No test suite _php=php83 @@ -56,12 +57,13 @@ package() { install -Dpm644 build/grommunio-web-upstream.conf "$pkgdir/usr/share/grommunio-common/nginx/upstreams.d/grommunio-web.conf" # php-fpm + sed -i "s@/php-fpm/@/php-fpm${_php##php}/@" build/pool-grommunio-web.conf 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/config.php.dist" rm -f "$pkgdir/usr/share/webapps/grommunio-web/debug.php.dist" # plugin config @@ -80,7 +82,7 @@ package() { } sha512sums=" -4bd72cbfbe7dd156c8a8a6b4f58e8c78c1fe457eb5b90a159a56613e209f7fdde5c2a7dd315c8375f5030a938257602d1b9cb503df521a8f30956a343fc14d73 grommunio-web-3.7.tar.gz +f7223aac98e77cbfcd504a611507590b7a5389f00b5f89db743b3f1101ff3cd8504116ffa30889821dd7cb0fe329722ab5ba13c9155e2bfce7792868967b86c2 grommunio-web-3.8.tar.gz fcfb070ab0bb8cca6f24221fe66eeac7e0c33981c16fff947db7509cc73d39b086710e5fd75bce34a230fa18bc10828d87410d98d147d31cc6ae1c16c41b48ae 0001-makefile.patch aaf924c834454078e512a7dff44fca647416eabb328e90e7cc1d78873c2ecb8f5f4a139284f8a4a4c9119ea8aec61d34d343ec1e8bced77f3dfbcdabae32d0d7 0002-config-php-dist.patch 2e3f55bc799c712ecf453cacd9da74893b07f8cf9ec1b6954993ae15a229219c612b632b372f9bc69ae6f8eb010c65484b7b55c3e90af3a0049c525321ba606e 0003-plugins-files-config-php.patch diff --git a/testing/gron/APKBUILD b/testing/gron/APKBUILD index 9cf7928d5cc..90d5ea483aa 100644 --- a/testing/gron/APKBUILD +++ b/testing/gron/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Tiago Ilieve <tiago.myhro@gmail.com> pkgname=gron pkgver=0.7.1 -pkgrel=16 +pkgrel=17 pkgdesc="Make JSON greppable" url="https://github.com/tomnomnom/gron" arch="all" diff --git a/testing/grpcui/APKBUILD b/testing/grpcui/APKBUILD index 2a60915d19a..c91bdb89840 100644 --- a/testing/grpcui/APKBUILD +++ b/testing/grpcui/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jonas <3426-spameier@users.gitlab.alpinelinux.org> pkgname=grpcui pkgver=1.4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Interactive web UI for gRPC, along the lines of postman" url="https://github.com/fullstorydev/grpcui" arch="all" diff --git a/testing/grpcurl/APKBUILD b/testing/grpcurl/APKBUILD index 36b3a16577d..73f41b4277e 100644 --- a/testing/grpcurl/APKBUILD +++ b/testing/grpcurl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=grpcurl pkgver=1.9.1 -pkgrel=0 +pkgrel=1 pkgdesc="CLI tool to interact with gRPC servers" url="https://github.com/fullstorydev/grpcurl" arch="all" diff --git a/testing/gx-go/APKBUILD b/testing/gx-go/APKBUILD index 9df0d782c60..d7fddbd5f8d 100644 --- a/testing/gx-go/APKBUILD +++ b/testing/gx-go/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=gx-go pkgver=1.9.0 -pkgrel=24 +pkgrel=25 pkgdesc="A tool to use with the gx package manager for packages written in go" url="https://github.com/whyrusleeping/gx-go" # riscv64: dependency github.com/minio/sha512-simd does not support riscv64 diff --git a/testing/gx/APKBUILD b/testing/gx/APKBUILD index 4e5ddf238da..317d68becb8 100644 --- a/testing/gx/APKBUILD +++ b/testing/gx/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Oleg Titov <oleg.titov@gmail.com> pkgname=gx pkgver=0.14.3 -pkgrel=22 +pkgrel=23 pkgdesc="Packaging tool build around the distributed, content addressed filesystem IPFS" url="https://github.com/whyrusleeping/gx" arch="all" 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 b2b93be0b03..c9e8cdabec1 100644 --- a/testing/hare-madeline/APKBUILD +++ b/testing/hare-madeline/APKBUILD @@ -5,7 +5,7 @@ _commit=54dcf14b67f34da392be837d01889e2956905d68 pkgrel=0 pkgdesc="tiny readline-alike with some batteries included" url="https://git.sr.ht/~ecs/madeline" -arch="noarch !armhf !armv7 !ppc64le !s390x !x86" # blocked by hare +arch="noarch !armhf !armv7 !ppc64le !s390x !x86 !loongarch64" # blocked by hare license="WTFPL" checkdepends="hare" source=" 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/headscale/APKBUILD b/testing/headscale/APKBUILD index bd309558927..e96829b10d7 100644 --- a/testing/headscale/APKBUILD +++ b/testing/headscale/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=headscale pkgver=0.22.3 -pkgrel=6 +pkgrel=7 pkgdesc="Open source, self-hosted implementation of the Tailscale control server" url="https://github.com/juanfont/headscale" arch="all !ppc64le !riscv64" # go build fails diff --git a/testing/helm-ls/APKBUILD b/testing/helm-ls/APKBUILD index b3d469199f3..e28103c0614 100644 --- a/testing/helm-ls/APKBUILD +++ b/testing/helm-ls/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Galen Abell <galen@galenabell.com> pkgname=helm-ls pkgver=0.0.12 -pkgrel=1 +pkgrel=2 pkgdesc="Language server for Helm" url="https://github.com/mrjosh/helm-ls" arch="all" diff --git a/testing/helmfile/APKBUILD b/testing/helmfile/APKBUILD index f0b454e7d5b..9e24156e7e5 100644 --- a/testing/helmfile/APKBUILD +++ b/testing/helmfile/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=helmfile pkgver=0.162.0 -pkgrel=2 +pkgrel=3 pkgdesc="Declarative spec for deploying helm charts" url="https://helmfile.readthedocs.io/" # armhf: ftbfs diff --git a/testing/hexer/APKBUILD b/testing/hexer/APKBUILD index 39e0fa42465..01e3ee8f17c 100644 --- a/testing/hexer/APKBUILD +++ b/testing/hexer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bradley J Chambers <brad.chambers@gmail.com> pkgname=hexer pkgver=1.4.0 -pkgrel=14 +pkgrel=15 pkgdesc="LAS and OGR hexagonal density and boundary surface generation" url="https://github.com/hobuinc/hexer" arch="all" diff --git a/testing/hilbish/APKBUILD b/testing/hilbish/APKBUILD index 9f50ae05ff8..f71c4f50387 100644 --- a/testing/hilbish/APKBUILD +++ b/testing/hilbish/APKBUILD @@ -4,7 +4,7 @@ pkgname=hilbish pkgver=2.2.3 _lunacolors_commit=34a57c964590f89aa065188a588c7b38aff99c28 _succulent_commit=fc31cc91d9be1c1fa6209477118e8d35a4aab996 -pkgrel=0 +pkgrel=1 pkgdesc="Extensible shell configured in Lua" url="https://rosettea.github.io/Hilbish/" arch="all" diff --git a/testing/hpnssh/APKBUILD b/testing/hpnssh/APKBUILD index bbe58adb2c0..74dce2f2d48 100644 --- a/testing/hpnssh/APKBUILD +++ b/testing/hpnssh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Lukas Franek <lukas.franek@ui.com> # Maintainer: Lukas Franek <lukas.franek@ui.com> pkgname=hpnssh -pkgver=18.4.0 +pkgver=18.4.1 pkgrel=0 pkgdesc="HPNSSH: High performance SSH/SCP" url="https://psc.edu/hpn-ssh-home" @@ -45,5 +45,5 @@ package() { } sha512sums=" -b33d5fabf2eaa3524ed624276442c5e4b2ea8e77eb61fcd18371ceea1158ce09c4729107ffc14c345c852d3c76be023c5a288341ec294180aedb5bdf8f97e2bc hpn-18.4.0.tar.gz +46b84dc2a23a20d86c770109ee20b170546966ee55b1636863d92873c2e42a68accfdf4ee6a77cfa1b0af71cee8e2f8e77cbc126330280dd4ca4a572c3cc0626 hpn-18.4.1.tar.gz " diff --git a/testing/hub/APKBUILD b/testing/hub/APKBUILD index 3c59fd424fa..e3a941717dd 100644 --- a/testing/hub/APKBUILD +++ b/testing/hub/APKBUILD @@ -4,12 +4,12 @@ # Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com> pkgname=hub pkgver=2.14.2 -pkgrel=22 +pkgrel=23 pkgdesc="Extends git with extra features for GitHub" url="https://hub.github.com/" arch="all" license="MIT" -makedepends="go util-linux bash ca-certificates groff" +makedepends="go bash ca-certificates" options="net chmod-clean" subpackages=" $pkgname-doc @@ -17,7 +17,9 @@ subpackages=" $pkgname-zsh-completion $pkgname-fish-completion " -source="$pkgname-$pkgver.tar.gz::https://github.com/github/hub/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/github/hub/archive/v$pkgver.tar.gz + no-txt-man-pages.patch + " builddir="$srcdir/src/github.com/github/hub" @@ -51,4 +53,7 @@ package() { "$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish } -sha512sums="4809d12966cc983f42c8aef482e07bc4226e25fc4deba838e418664ce14ac9d2ac42842d0721a46466a80c0e492392542ecfaaccc2cea0efdd60df8b60a3ca02 hub-2.14.2.tar.gz" +sha512sums=" +4809d12966cc983f42c8aef482e07bc4226e25fc4deba838e418664ce14ac9d2ac42842d0721a46466a80c0e492392542ecfaaccc2cea0efdd60df8b60a3ca02 hub-2.14.2.tar.gz +7099aac144abc7747e8dca3ff0ac28073c2e8aed45311c84675459b9ff5f6ee6798453458ded2ade2bb261b48c6b13ca936cb81d1b8b9a16eb120944e8ce48de no-txt-man-pages.patch +" diff --git a/testing/hub/no-txt-man-pages.patch b/testing/hub/no-txt-man-pages.patch new file mode 100644 index 00000000000..fb9422c19ac --- /dev/null +++ b/testing/hub/no-txt-man-pages.patch @@ -0,0 +1,14 @@ +`col` is no longer available in `util-linux`, and these +txt files aren't installed into the final package anyway + +--- a/Makefile ++++ b/Makefile +@@ -70,7 +70,7 @@ + fmt: + go fmt ./... + +-man-pages: $(HELP_ALL:=.md) $(HELP_ALL) $(HELP_ALL:=.txt) ++man-pages: $(HELP_ALL:=.md) $(HELP_ALL) + + %.txt: % + groff -Wall -mtty-char -mandoc -Tutf8 -rLL=$(TEXT_WIDTH)n $< | col -b >$@ diff --git a/testing/hubble-cli/APKBUILD b/testing/hubble-cli/APKBUILD index 877bcd1b24e..2b9c32726ae 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.3 -pkgrel=0 +pkgrel=1 pkgdesc="CLI for the distributed networking and security observability platform" url="https://github.com/cilium/hubble" arch="all" diff --git a/testing/hyprcursor/APKBUILD b/testing/hyprcursor/APKBUILD index 522cb213790..457b2cc8ee0 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.7 +pkgver=0.1.8 pkgrel=0 pkgdesc="The hyprland cursor format, library and utilities." url="https://github.com/hyprwm/Hyprcursor" @@ -53,5 +53,5 @@ util() { sha512sums=" -dd506860fc7a0d5b1f9602330becc7f9a37fda19d92fcc10150e6e23680124d63451b98a92e33b9a820db385fdba29a7f306d0c1639426aa06c749fa1dfad04e Hyprcursor-v0.1.7.tar.gz +f03ead33b37d46f189ec16b6dcebf066a4f531e74a5a71c4aaae90cb09415fd3901793bcdf41d7ce7bd2b5a22856abda360ed63648a19f4aef40dc78ae96963e Hyprcursor-v0.1.8.tar.gz " diff --git a/testing/hyprland/APKBUILD b/testing/hyprland/APKBUILD index c6645578734..2c674739fed 100644 --- a/testing/hyprland/APKBUILD +++ b/testing/hyprland/APKBUILD @@ -1,11 +1,11 @@ # Contributor: Zach DeCook <zachdecook@librem.one> # Maintainer: Zach DeCook <zachdecook@librem.one> pkgname=hyprland -pkgver=0.39.1 +pkgver=0.40.0 pkgrel=0 -_commit="fe7b748eb668136dd0558b7c8279bfcd7ab4d759" -_wlroots_commit="611a4f24cd2384378f6e500253983107c6656c64" -_wlroots_date=20240414 +_commit="cba1ade848feac44b2eda677503900639581c3f4" +_wlroots_commit="5c1d51c5a2793480f5b6c4341ad0797052aec2ea" +_wlroots_date=20240421 pkgdesc="Highly customizable dynamic tiling Wayland compositor that doesn't sacrifice on its looks." url="https://hyprland.org" arch="all" @@ -14,6 +14,7 @@ source=" https://github.com/hyprwm/Hyprland/archive/v$pkgver/Hyprland-v$pkgver.tar.gz https://github.com/hyprwm/wlroots-hyprland/archive/$_wlroots_commit/wlroots-hyprland-$_wlroots_commit.tar.gz use-system-installed-udis86.patch + newer-hyprwayland-scanner.patch " builddir="$srcdir/Hyprland-$pkgver" makedepends=" @@ -26,6 +27,7 @@ makedepends=" hyprcursor-dev>=0.1.7 hyprland-protocols hyprlang + hyprwayland-scanner jq libcap-dev libdisplay-info-dev @@ -90,7 +92,8 @@ wallpapers() { } sha512sums=" -173dc2baea68e301fad13b1634779f859263abdba7ab60233791c6c8c8ed2def24afdfb51d3db1820646b391530f1f6aeca82d8cf6de1ef178810c11fbdef37b Hyprland-v0.39.1.tar.gz -157c94643bc630b1c97f05f620c2adb21f744cac16ed8c53ab377820ce8af2ec6b826197a41b6814a838b6e032b92a790f4214210831f8e91a6aff0346f54027 wlroots-hyprland-611a4f24cd2384378f6e500253983107c6656c64.tar.gz +e92c848aa0148fb2b38f2dea6a3f4487bbb080085b4895f4d892196fc655679ed523f0bf8c9f42f5ace6b47f0a8eb67ba3b4f1cb5fec76f5689e28bbc172c487 Hyprland-v0.40.0.tar.gz +8f6e234fcee249d4cfb610e7d999042e172af5f37d94a55abe27e0e68c612b1abe13094e748adb2faf5dee52bbe48d8647a17dee88b774c9e41882549b091f19 wlroots-hyprland-5c1d51c5a2793480f5b6c4341ad0797052aec2ea.tar.gz d2f7b35552fa0a3e992b9050f7066d983b3b7c193a888018b2e0d6fa9e17fc3deff922fa3989d0bb79e8bd82df2bc16ff0c27a82759ad0ce2e72789506eb07db use-system-installed-udis86.patch +8c73894f9c38e64d7a29fac9306b960234c5f8c476c2e43774632c1a9a9722c04163fdd8226eabaeb1b53571109f7afd42a34f54d0457706a021769336dca0f8 newer-hyprwayland-scanner.patch " diff --git a/testing/hyprland/newer-hyprwayland-scanner.patch b/testing/hyprland/newer-hyprwayland-scanner.patch new file mode 100644 index 00000000000..a5256d11801 --- /dev/null +++ b/testing/hyprland/newer-hyprwayland-scanner.patch @@ -0,0 +1,47 @@ +commit ec092bd601d9d351ff6ca34bd97f12055b2a4dd9 +Author: Vaxry <vaxry@vaxry.net> +Date: Tue May 7 14:26:26 2024 +0100 + + core: chase hyprwayland-scanner + +diff --git a/flake.lock b/flake.lock +index 976553d3..4dc7da82 100644 +--- a/flake.lock ++++ b/flake.lock +@@ -84,11 +84,11 @@ + ] + }, + "locked": { +- "lastModified": 1714755542, +- "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", ++ "lastModified": 1715088365, ++ "narHash": "sha256-cVH43+fiiCXqr6F2vUA8KmNI9ytWIQoZGnVz0IpBbZw=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", +- "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", ++ "rev": "6119dc2a965fd30ffa45c50a8398d5da3150df4c", + "type": "github" + }, + "original": { +diff --git a/src/protocols/OutputManagement.cpp b/src/protocols/OutputManagement.cpp +index 9ebcba07..e7779726 100644 +--- a/src/protocols/OutputManagement.cpp ++++ b/src/protocols/OutputManagement.cpp +@@ -166,7 +166,7 @@ void COutputHead::sendAllData() { + LOGM(LOG, " | sending current mode for {}: {}x{}@{}", pMonitor->szName, m->mode->width, m->mode->height, m->mode->refresh); + else + LOGM(LOG, " | sending current mode for {}: null (fake)", pMonitor->szName); +- resource->sendCurrentMode(m->resource->resource()); ++ resource->sendCurrentMode(m->resource.get()); + break; + } + } +@@ -197,7 +197,7 @@ void COutputHead::updateMode() { + LOGM(LOG, " | sending current mode for {}: {}x{}@{}", pMonitor->szName, m->mode->width, m->mode->height, m->mode->refresh); + else + LOGM(LOG, " | sending current mode for {}: null (fake)", pMonitor->szName); +- resource->sendCurrentMode(m->resource->resource()); ++ resource->sendCurrentMode(m->resource.get()); + break; + } + } diff --git a/testing/hyprwayland-scanner/APKBUILD b/testing/hyprwayland-scanner/APKBUILD new file mode 100644 index 00000000000..90a3b96c7d5 --- /dev/null +++ b/testing/hyprwayland-scanner/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Zach DeCook <zachdecook@librem.one> +# Maintainer: Zach DeCook <zachdecook@librem.one> +pkgname=hyprwayland-scanner +pkgver=0.3.8 +pkgrel=0 +pkgdesc="Hyprland implementation of wayland-scanner for C++" +url="https://github.com/hyprwm/hyprwayland-scanner" +arch="all" +license="BSD-3-Clause" +source="https://github.com/hyprwm/hyprwayland-scanner/archive/v0.3.8/hyprwayland-scanner-v0.3.8.tar.gz" +makedepends="cmake pugixml-dev" +subpackages="$pkgname-doc" + +build() { + cmake -B build \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=None + cmake --build build +} + +check() { + cd build + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + DESTDIR="$pkgdir" cmake --install build + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + + +sha512sums=" +c8de981b4a9dd1e309db3432686049b6285bde4b47eb2cbdf9a7f72a25e80bb4c1c418a25f5a2bca783af5fe3f0f8698dab7b6bc877829e23e0b16b8eccf05bb hyprwayland-scanner-v0.3.8.tar.gz +" diff --git a/testing/ijq/APKBUILD b/testing/ijq/APKBUILD index fe1f427e105..fefba64582a 100644 --- a/testing/ijq/APKBUILD +++ b/testing/ijq/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: TBK <alpine@jjtc.eu> pkgname=ijq pkgver=1.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Interactive jq tool" url="https://git.sr.ht/~gpanders/ijq/" license="GPL-3.0-or-later" diff --git a/testing/imgdiff/APKBUILD b/testing/imgdiff/APKBUILD index 0c669161c04..4574f72e4a5 100644 --- a/testing/imgdiff/APKBUILD +++ b/testing/imgdiff/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sergiy Stupar <owner@sestolab.pp.ua> pkgname=imgdiff pkgver=1.0.2 -pkgrel=18 +pkgrel=19 pkgdesc="Fast pixel-by-pixel image difference tool" url="https://github.com/n7olkachev/imgdiff" arch="all" diff --git a/testing/itd/APKBUILD b/testing/itd/APKBUILD index 37d9af87ec2..be7be6f8da2 100644 --- a/testing/itd/APKBUILD +++ b/testing/itd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Eloi Torrents <eloitor@disroot.org> pkgname=itd pkgver=1.1.0 -pkgrel=5 +pkgrel=6 pkgdesc="Daemon that interfaces with InfiniTime firmware on the PineTime smartwatch" url="https://gitea.elara.ws/Elara6331/itd" arch="all" diff --git a/testing/jackal/APKBUILD b/testing/jackal/APKBUILD index 035aabd65fc..901a4e0b53a 100644 --- a/testing/jackal/APKBUILD +++ b/testing/jackal/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Sam Whited <sam@samwhited.com> pkgname=jackal pkgver=0.64.0 -pkgrel=7 +pkgrel=8 pkgdesc="Instant messaging server using XMPP" url="https://github.com/ortuman/jackal" arch="all" diff --git a/testing/jellyfin-ffmpeg/0001-ffbuild-libversion.sh-add-shebang.patch b/testing/jellyfin-ffmpeg/0001-ffbuild-libversion.sh-add-shebang.patch new file mode 100644 index 00000000000..1df16917b91 --- /dev/null +++ b/testing/jellyfin-ffmpeg/0001-ffbuild-libversion.sh-add-shebang.patch @@ -0,0 +1,24 @@ +From 3eb43e2e9df80baad20722b3698e6995a546853a Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter <clandmeter@alpinelinux.org> +Date: Tue, 29 Jun 2021 11:56:32 +0000 +Subject: [PATCH] ffbuild/libversion.sh: add shebang + +when using something like qemu-user where argv[0] is qemu the script +will not be exexuted by the shell. +--- + ffbuild/libversion.sh | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ffbuild/libversion.sh b/ffbuild/libversion.sh +index 990ce9f640..30046b1d25 100755 +--- a/ffbuild/libversion.sh ++++ b/ffbuild/libversion.sh +@@ -1,3 +1,5 @@ ++#!/bin/sh ++ + toupper(){ + echo "$@" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ + } +-- +2.32.0 + diff --git a/testing/jellyfin-ffmpeg/APKBUILD b/testing/jellyfin-ffmpeg/APKBUILD new file mode 100644 index 00000000000..2a72db900ad --- /dev/null +++ b/testing/jellyfin-ffmpeg/APKBUILD @@ -0,0 +1,138 @@ +# Contributor: Sergei Lukin <sergej.lukin@gmail.com> +# Contributor: Łukasz Jendrysik <scadu@yandex.com> +# Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: FintasticMan <finlay.neon.kid@gmail.com> +pkgname=jellyfin-ffmpeg +pkgver=6.0.1_p7 +_pkgver="${pkgver/_p/-}" +pkgrel=0 +pkgdesc="Modified version of FFmpeg for Jellyfin" +url="https://github.com/jellyfin/jellyfin-ffmpeg" +arch="all" +license="GPL-3.0-only" +makedepends=" + alsa-lib-dev + bzip2-dev + chromaprint-dev + coreutils + dav1d-dev + fontconfig-dev + freetype-dev + fribidi-dev + gmp-dev + imlib2-dev + lame-dev + libass-dev + libbluray-dev + libdrm-dev + libopenmpt-dev + libplacebo-dev + libtheora-dev + libva-dev + libvorbis-dev + libvpx-dev + libwebp-dev + nasm + opencl-dev + openssl-dev + opus-dev + perl-dev + shaderc-dev + vulkan-loader-dev + x264-dev + x265-dev + xz-dev + zimg-dev + zlib-dev + " +checkdepends="rsync" +source="$pkgname-$_pkgver.tar.gz::https://github.com/jellyfin/jellyfin-ffmpeg/archive/refs/tags/v$_pkgver.tar.gz + 0001-ffbuild-libversion.sh-add-shebang.patch + " +options="!check" # tests/data/hls-lists.append.m3u8 fails +builddir="$srcdir/$pkgname-$_pkgver" + +case "$CARCH" in +x86_64) + makedepends="$makedepends onevpl-dev" + _onevpl="--enable-libvpl" + ;; +esac + +prepare() { + default_prepare + + for i in debian/patches/*.patch; do + patch -p1 -i "$i" + done +} + +build() { + case "$CARCH" in + x86) local asm="--disable-asm" ;; + esac + + ./configure \ + --prefix="/usr/lib/$pkgname" \ + --target-os=linux \ + --extra-version=Jellyfin \ + --disable-doc \ + --disable-ffplay \ + --disable-librtmp \ + --disable-libxcb \ + --disable-sdl2 \ + --disable-shared \ + --disable-xlib \ + --enable-chromaprint \ + --enable-gmp \ + --enable-gpl \ + --enable-libass \ + --enable-libbluray \ + --enable-libdav1d \ + --enable-libdrm \ + --enable-libfontconfig \ + --enable-libfreetype \ + --enable-libfribidi \ + --enable-libmp3lame \ + --enable-libopenmpt \ + --enable-libopus \ + --enable-libplacebo \ + --enable-libshaderc \ + --enable-libtheora \ + --enable-libvorbis \ + --enable-libvpx \ + --enable-libwebp \ + --enable-libx264 \ + --enable-libx265 \ + --enable-libzimg \ + --enable-opencl \ + --enable-openssl \ + --enable-pic \ + --enable-pthreads \ + --enable-static \ + --enable-vaapi \ + --enable-version3 \ + --enable-vulkan \ + $asm \ + $_onevpl + make +} + +# https://ffmpeg.org/fate.html +check() { + ./configure \ + --samples=fate-suite/ + make fate-rsync + make fate-list + make fate +} + +package() { + install -Dm755 -t "$pkgdir/usr/lib/$pkgname" ffmpeg ffprobe +} + +sha512sums=" +cd9864da887bcf2e07ea5c54337ed92cbd216561c297099719dde6c71a27cf6ede500aa6c54a78f26281ae7e8810fbc0d496616f36aeebab921e1f794e68fc72 jellyfin-ffmpeg-6.0.1-7.tar.gz +38443b570cf32b2ba8ffa9ecc5480425c7da9f93f9773fbb3f9ec5f603b369b6225f4329a1b1f34d0ef30b2c9730f25ff9cff31315ed0a89a600df8e53bd54bf 0001-ffbuild-libversion.sh-add-shebang.patch +" diff --git a/testing/jfrog-cli/APKBUILD b/testing/jfrog-cli/APKBUILD index 18f8d26ed8b..2d9ee618675 100644 --- a/testing/jfrog-cli/APKBUILD +++ b/testing/jfrog-cli/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Gennady Feldman <gena01@gmail.com> pkgname=jfrog-cli pkgver=2.45.0 -pkgrel=4 +pkgrel=5 pkgdesc="JFrog cli" url="https://jfrog.com/getcli/" arch="all" diff --git a/testing/jicofo/APKBUILD b/testing/jicofo/APKBUILD index 334fb76f6a4..54585586121 100644 --- a/testing/jicofo/APKBUILD +++ b/testing/jicofo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Noel Kuntze <noel.kuntze@contauro.com> pkgname=jicofo -pkgver=1.0.1062 -_tag="jitsi-meet_9220" +pkgver=1.0.1078 +_tag="jitsi-meet_9457" pkgrel=0 pkgdesc="Jitsi meet conference focus" url="https://github.com/jitsi/jicofo" @@ -54,7 +54,7 @@ package() { } sha512sums=" -df61ec1065dfb39c53b329bd2a1ac49232e03a75d91f800d8cad31b1f1e07f962c6b464e9908c8291284f522d3e592af0a9ae0a40f03aed784322e1dcc8ab419 jicofo-1.0.1062.tar.gz +c46c5b9e99691efcfaf4bd943c88efe02964c9b43839c0ad553f33190d055ea670642bc7f5cdb45bfd934f8d0967044ec409b9b6eb4a275d32f8f300a7326460 jicofo-1.0.1078.tar.gz d8a5a2bdde124d6e8aff7d1d26c68146ef3cc8fac988360486dcd86e3247a7cfcc311ba9a4b8e64c04524511db350ad98ad4bb6e7aa1b19162b0231d2b57d40a jicofo.initd 2e0f56e6d68edf6250714274cd8f0bcaf150b8c0f2dbdece9e97873e0fcf2e6520800f329f7d9407266cd28414523b873c159e2c32336464633b03d9608b8109 jicofo.conf f99851031af2a88590b4970106bc27cf8d5f7555f82e4c34bd33498904b36bff7efa1c85e5f2ca778a6f0e19cbe2fdd8bfc9357920f990c4b7c532c768d05cf7 jicofo.confd diff --git a/testing/jigasi/APKBUILD b/testing/jigasi/APKBUILD index 1daa975ad3a..d5255fb35d2 100644 --- a/testing/jigasi/APKBUILD +++ b/testing/jigasi/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Noel Kuntze <noel.kuntze@contauro.com> pkgname=jigasi -pkgver=20240325 +pkgver=20240523 pkgrel=0 -_gitrev=04ad08f0ab9cd079c62f47f9cecc7367ce3f4ba4 +_gitrev=7a3211b5ccc127db6bb7c2032cd6937d8fb5dce5 pkgdesc="Jitsi meet SIP gateway" url="https://github.com/jitsi/jigasi" arch="x86_64" @@ -48,7 +48,7 @@ package() { } sha512sums=" -4c5d15f9545d8fb345a9b8a09a369886b4b62a6785e9b4ddd8c0e99c23dd00abd567113ed6ed6145c46e0f0e32c200cd577bdb880be673ddb2f914624fea84a2 jigasi-20240325.tar.gz +3b2055d0028bef575ce9672e585b909caeacfaeb81e42081d48aaa939bff91b4b674f671765a1eb198d4b098b6212e9157339adad240d02a0b9beaa8d2ba6351 jigasi-20240523.tar.gz 4785f72bc3c60488df409c292f1daffc583169138cf477253cbc80226da4d5b185a044d8d7d2b5bbe39290b852bf27e4443fa1a0eda55e9a385fcf7a53215748 jigasi.initd 2fc7bdcabbdf46c01c7edb02f22d76e972f9fa060999f8f120759cb78f64475d8d36ef7b07875cbcb2309f8d0220e5cdd86ab0a3ed1c050a50f8026ccea23009 jigasi.confd 9a3c97e983d1fc67bac3066a7f13cf043bd48e0448044c32ef8c6025f59d7df476ca22ffe305054d7d17c60a366eaa16ca653e1877a373eb1f896a863dd5e343 jigasi.logrotate diff --git a/testing/jitsi-meet/APKBUILD b/testing/jitsi-meet/APKBUILD index 49914fe2e72..d4a3f192d0f 100644 --- a/testing/jitsi-meet/APKBUILD +++ b/testing/jitsi-meet/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Noel Kuntze <noel.kuntze@contauro.com> pkgname=jitsi-meet -pkgver=1.0.7762 -_tag="jitsi-meet_9220" +pkgver=1.0.7792 +_tag="jitsi-meet_9457" pkgrel=1 pkgdesc="WebRTC JavaScript video conferences" url="https://github.com/jitsi/jitsi-meet" @@ -81,6 +81,6 @@ prosody() { } sha512sums=" -3e4a577fcd2c0b9f1bb1d875780ac185cb5c8946cf9dc35f6c89f039284a577b793ddf3b611dc19cfa4edd0c1602351e6e102e4e7bfdc8cc02ccdce9f4095d1e jitsi-meet-1.0.7762.tar.gz +a1a265964847ef44438fa6c34b076734d23c9a9857b43dcf81e0092f5b608c51834254cbe7596d8bbb2e4e4cf03c71693d88ec7451f48df8429509919444fe17 jitsi-meet-1.0.7792.tar.gz f752d2eafd7f4e3a331c92b8ad25e6c150d608303fe74f32950a8deb55784853bd7225923d71ab55778b828955e150058e725d85995e4e6f776855015e4e16a9 openssl3.patch " diff --git a/testing/jitsi-videobridge/APKBUILD b/testing/jitsi-videobridge/APKBUILD index 99a8869de8a..fd78a4553ef 100644 --- a/testing/jitsi-videobridge/APKBUILD +++ b/testing/jitsi-videobridge/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Noel Kuntze <noel.kuntze@contauro.com> pkgname=jitsi-videobridge -pkgver=2.3.67 -_tag="jitsi-meet_9220" +pkgver=2.3.105 +_tag="jitsi-meet_9457" pkgrel=0 pkgdesc="Videobridge for Jitsi Meet" url="https://github.com/jitsi/jitsi-videobridge" @@ -58,7 +58,7 @@ package() { } sha512sums=" -f1840ae8fbcbbe2a4590fdf3213b512bbd24e143589a6c7364fae7493f1c60c3e7edaceaa04c2c7bf53a99454f05acb3f2eee4811643298b6ba82319459c1d7c jitsi-videobridge-2.3.67.tar.gz +7668ccf578517cdd0afbedd8abd65df62a561cf0f143826e6ede30fd8f7c9fdcba8a824b64222a146fb1edd1efca8ae8bd74b6d5ff039fdca9e439d0ee92cb18 jitsi-videobridge-2.3.105.tar.gz f10f9291187c6c44838312f73a5f5ff4cedb8970a338373ba37b7e141d018413bf176d8fd3f15cb891516238182498ac3c8bc7587880831994e17f1289a3b755 jitsi-videobridge.initd c63cd36d1710a81df255ffc9ab62e413546f37c0d244327b03381bb32381242d881a35dc7384af093976dff645e415acd0e1d82769e54c01f5a2c35dc6ef469a jitsi-videobridge.confd 86806b7fd222d5a3d0fc50daf8f2f0f2ef757011f44c8ce7ddd8836455393a7ac3e6f6d73bb6a929b796c3e877e1220c8bc2a3fe8178ed70cdede16d13ddce85 jitsi-videobridge.logrotate diff --git a/testing/jotdown/APKBUILD b/testing/jotdown/APKBUILD new file mode 100644 index 00000000000..2c3599f0fd7 --- /dev/null +++ b/testing/jotdown/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: Andrej Kolchin <KAAtheWise@protonmail.com> +# Maintainer: Andrej Kolchin <KAAtheWise@protonmail.com> +pkgname=jotdown +pkgver=0.4.0 +pkgrel=0 +pkgdesc="A parser for the Djot markup language" +url="https://hllmn.net/projects/jotdown/" +arch="all" +license="MIT" +makedepends="rust cargo cargo-auditable" +source="$pkgname-$pkgver.tar.gz::https://github.com/hellux/jotdown/archive/$pkgver.tar.gz" + +build() { + cargo auditable build --release --locked +} + +check() { + cargo test --release --locked +} + +package() { + install -Dm755 target/release/jotdown "$pkgdir"/usr/bin/jotdown +} + +sha512sums=" +237dcbd3ad047a35f4d19c7d4baa0a8de99fae9d79cc10a7e5716abf9a9a3a150e28106267525f0b65380020427214149c7a626880934c7311ec7e5a1be2c85a jotdown-0.4.0.tar.gz +" diff --git a/testing/jsonnet-bundler/APKBUILD b/testing/jsonnet-bundler/APKBUILD index 5da7e641f17..2de6eb1e5f0 100644 --- a/testing/jsonnet-bundler/APKBUILD +++ b/testing/jsonnet-bundler/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=jsonnet-bundler pkgver=0.5.1 -pkgrel=12 +pkgrel=13 pkgdesc="Jsonnet package manager" url="https://github.com/jsonnet-bundler/jsonnet-bundler" arch="all" diff --git a/testing/jsonnet-language-server/APKBUILD b/testing/jsonnet-language-server/APKBUILD index f64b679d9ae..142e6778fc3 100644 --- a/testing/jsonnet-language-server/APKBUILD +++ b/testing/jsonnet-language-server/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=jsonnet-language-server pkgver=0.13.1 -pkgrel=2 +pkgrel=3 pkgdesc="Jsonnet language server" url="https://github.com/grafana/jsonnet-language-server" arch="all" diff --git a/testing/k3sup/APKBUILD b/testing/k3sup/APKBUILD index 9dff8818a80..75a95d9c1fd 100644 --- a/testing/k3sup/APKBUILD +++ b/testing/k3sup/APKBUILD @@ -1,8 +1,8 @@ -# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks> -# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks> +# Contributor: lauren n. liberda <lauren@selfisekai.rocks> +# Maintainer: pkgname=k3sup pkgver=0.13.5 -pkgrel=2 +pkgrel=4 pkgdesc="A light-weight utility to get from zero to KUBECONFIG with k3s" url="https://k3sup.dev/" arch="all" diff --git a/testing/kanister-tools/APKBUILD b/testing/kanister-tools/APKBUILD index dc0907a67ab..187e1880aa3 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.107.0 -pkgrel=0 +pkgrel=1 pkgdesc="CLI tools for application-level data management on Kubernetes" url="https://kanister.io/" arch="all" diff --git a/testing/kapow/APKBUILD b/testing/kapow/APKBUILD index 40be1588db4..938bb7346c5 100644 --- a/testing/kapow/APKBUILD +++ b/testing/kapow/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=kapow pkgver=0.7.1 -pkgrel=5 +pkgrel=6 pkgdesc="turn shell commands into HTTP API" url="https://kapow.readthedocs.io/en/stable/" license="Apache-2.0" diff --git a/testing/katana/APKBUILD b/testing/katana/APKBUILD index 4f25da1dbe9..8e4e907c4f4 100644 --- a/testing/katana/APKBUILD +++ b/testing/katana/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sergiy Stupar <owner@sestolab.pp.ua> pkgname=katana pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Next-generation crawling and spidering framework" url="https://github.com/projectdiscovery/katana" arch="all" diff --git a/testing/keybase-client/APKBUILD b/testing/keybase-client/APKBUILD index a8f7c7e9ee2..ca05237f78e 100644 --- a/testing/keybase-client/APKBUILD +++ b/testing/keybase-client/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=keybase-client pkgver=6.2.8 -pkgrel=2 +pkgrel=3 pkgdesc="CLI client for keybase.io" url="https://github.com/keybase/client" arch="all" diff --git a/testing/keydb/APKBUILD b/testing/keydb/APKBUILD new file mode 100644 index 00000000000..1ed8418590a --- /dev/null +++ b/testing/keydb/APKBUILD @@ -0,0 +1,113 @@ +# Contributor: Milan P. Stanić <mps@arvanta.net> +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Jakub Jirutka <jakub@jirutka.cz> +pkgname=keydb +pkgver=6.3.4 +pkgrel=0 +pkgdesc="High performance multithreaded fork of Redis" +url="https://keydb.dev" +# armhf,armv7,x86: not supported +# ppc64le: fails to build (undefined reference to 'getcontext') +arch="all !armhf !armv7 !ppc64le !x86" +# hiredis: BSD-3-Clause +# hdrhistogram, jemalloc, linenoise: BSD-2-Clause +# lua: MIT +license="BSD-3-Clause AND BSD-2-Clause AND MIT" +makedepends=" + libunwind-dev + linux-headers + openssl-dev + util-linux-dev + zlib-dev + " +checkdepends=" + procps + tcl + " +pkgusers="keydb" +pkggroups="keydb" +install="$pkgname.pre-install $pkgname.post-install" +subpackages=" + $pkgname-benchmark + $pkgname-cli + $pkgname-openrc + " +source="$pkgname-$pkgver.tar.gz::https://github.com/JohnSully/KeyDB/archive/v$pkgver.tar.gz + keydb.conf.patch + sentinel.conf.patch + deps-makefile.patch + $pkgname.initd + $pkgname.confd + $pkgname-sentinel.initd + $pkgname-sentinel.confd + " +builddir="$srcdir/KeyDB-$pkgver" +options="!check" # tests fail randomly + +# USE_JEMALLOC uses bundled jemalloc +_make_opts="\ + BUILD_TLS=yes \ + NO_MOTD=yes \ + PREFIX=/usr \ + USE_JEMALLOC=yes \ + USE_SYSTEMD=no \ + " + +build() { + export CFLAGS="$CFLAGS -O2" + + make $_make_opts all +} + +check() { + make test $_make_opts +} + +package() { + make install $_make_opts INSTALL_BIN="$pkgdir/usr/bin" + + cd "$pkgdir" + + # NOTE: /etc/keydb and /etc/keydb/sentinel.conf must be writable for keydb, + # otherwise Sentinel fails to start. + install -d -m 750 -o keydb -g keydb \ + etc/keydb \ + etc/keydb/keydb.d \ + var/lib/keydb \ + var/lib/keydb/sentinel + + install -D -m 640 -o root -g keydb "$builddir"/keydb.conf etc/keydb/keydb.conf + install -D -m 640 -o keydb -g keydb "$builddir"/sentinel.conf etc/keydb/sentinel.conf + + install -D -m 755 "$srcdir"/keydb.initd etc/init.d/keydb + install -D -m 755 "$srcdir"/keydb-sentinel.initd etc/init.d/keydb-sentinel + install -D -m 644 "$srcdir"/keydb.confd etc/conf.d/keydb + install -D -m 644 "$srcdir"/keydb-sentinel.confd etc/conf.d/keydb-sentinel + + install -d -m 750 -o keydb -g keydb \ + var/lib/keydb \ + var/lib/keydb/sentinel +} + +benchmark() { + pkgdesc="KeyDB benchmarking tool" + + amove usr/bin/keydb-benchmark +} + +cli() { + pkgdesc="KeyDB CLI client" + + amove usr/bin/keydb-cli +} + +sha512sums=" +6ac5060dc60df878668830336821cac740690be5525bc8c4a31a522c629b73df2da49f6d53fe8ebfec171efef258c9253d91243fe57a470aaabeddea2ac5247b keydb-6.3.4.tar.gz +add4b21b9ecc8c18046462caaac58cc26c837136573c912b0904e107ce2ae684a409e575a924b33310955b9ac76b42330b494efcbe94e02ede5136244e7b165a keydb.conf.patch +50ce23119c1ddb6e63999740299711bd3a7a8500ce6b75f7850012b2edae13051dba43e7628788255f2d16dfe913da92222cae9908a3d8f7b619c2ee70e2a44f sentinel.conf.patch +be06084939bb8d26f638f09b21c1edcc06d738b5cd0647ab2bc3f4b01f5a61c63486e1ac913de30278a7d9474cf2fc965903b48305551aa699ec43834acaf56a deps-makefile.patch +b70d0bc0207c606be8ef3d099769075c8925c989fe2ca121e4368407fb1662010e18a745c1602679a376dd97eaf2e1ee01c1d41e7ab02e2019172b6b4adb2e6a keydb.initd +91dfd649c326c3bf0be24094e662f7347d84028527ddc6e6819564ad862deadd7b246e0f518b38a3c4e768c1ef1c54471ddb8f56c8c54177c61e15dff0d7ba60 keydb.confd +8c7825e2c6a579cca3d4197be4811bfb37d516cd5d31c667ffc589245306f4a8e8ec86eeab170d3e90d2f069c691dd779236c97848794a483206df09134e5d65 keydb-sentinel.initd +d86345a469b5ae731b7dc80577b1f71ac97928cba162f7376a9088ada52abe99c9e042ff5b827c40cab0267b95967e5ffd8fb9a23c0d55822aba22e0ab4f2086 keydb-sentinel.confd +" diff --git a/testing/keydb/deps-makefile.patch b/testing/keydb/deps-makefile.patch new file mode 100644 index 00000000000..b02735d1bfe --- /dev/null +++ b/testing/keydb/deps-makefile.patch @@ -0,0 +1,11 @@ +--- a/deps/Makefile ++++ b/deps/Makefile +@@ -95,7 +95,7 @@ + + jemalloc: .make-prerequisites + @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) +- cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --disable-cxx CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" ++ cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --disable-cxx $(JEMALLOC_OPTS) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" + cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a + + .PHONY: jemalloc diff --git a/testing/keydb/keydb-sentinel.confd b/testing/keydb/keydb-sentinel.confd new file mode 100644 index 00000000000..b19bb0f9474 --- /dev/null +++ b/testing/keydb/keydb-sentinel.confd @@ -0,0 +1,10 @@ +# Configuration for /etc/init.d/keydb-sentinel + +# KeyDB Sentinel configuration file. +#cfgfile="/etc/keydb/sentinel.conf" + +# User (and group) to run keydb as. +#command_user="keydb:keydb" + +# Uncomment to run with process supervisor. +# supervisor="supervise-daemon" diff --git a/testing/keydb/keydb-sentinel.initd b/testing/keydb/keydb-sentinel.initd new file mode 100644 index 00000000000..ab36ce8b2f1 --- /dev/null +++ b/testing/keydb/keydb-sentinel.initd @@ -0,0 +1,38 @@ +#!/sbin/openrc-run + +name="KeyDB Sentinel" + +: ${cfgfile:="/etc/keydb/sentinel.conf"} +: ${command_user:="keydb:keydb"} + +command="/usr/bin/keydb-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 keydb + provide redis-sentinel +} + +start_pre() { + # Sets start-start-daemon's --chdir. + directory="$(config_get 'dir' '/var/lib/keydb')" || 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/testing/keydb/keydb.conf.patch b/testing/keydb/keydb.conf.patch new file mode 100644 index 00000000000..2626e08396b --- /dev/null +++ b/testing/keydb/keydb.conf.patch @@ -0,0 +1,106 @@ +We force "daemonize no" in init script, so daemonize and pidfile does not +have any effect in keydb.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. It must be in a subdirectory that +is automatically created by the init script because keydb user has no +permission to create files in /run. + +--- a/keydb.conf ++++ b/keydb.conf +@@ -123,8 +123,8 @@ + # incoming connections. There is no default, so KeyDB will not listen + # on a unix socket when not specified. + # +-# unixsocket /tmp/keydb.sock +-# unixsocketperm 700 ++unixsocket /run/keydb/keydb.sock ++unixsocketperm 770 + + # Close the connection after a client is idle for N seconds (0 to disable) + timeout 0 +@@ -279,10 +279,6 @@ + + ################################# GENERAL ##################################### + +-# By default KeyDB does not run as a daemon. Use 'yes' if you need it. +-# Note that KeyDB will write a pid file in /var/run/keydb.pid when daemonized. +-daemonize no +- + # If you run KeyDB from upstart or systemd, KeyDB can interact with your + # supervision tree. Options: + # supervised no - no supervision interaction +@@ -295,17 +291,6 @@ + # They do not enable continuous pings back to your supervisor. + supervised no + +-# If a pid file is specified, KeyDB 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/keydb.pid". +-# +-# Creating a pid file is best effort: if KeyDB is not able to create it +-# nothing bad happens, the server will start and run normally. +-pidfile /var/run/keydb_6379.pid +- + # Specify the server verbosity level. + # This can be one of: + # debug (a lot of information, useful for development/testing) +@@ -317,14 +302,14 @@ + # Specify the log file name. Also the empty string can be used to force + # KeyDB 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/keydb.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 keydb ++syslog-ident keydb + + # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. + # syslog-facility local0 +@@ -350,16 +335,13 @@ + # + # However it is possible to force the pre-4.0 behavior and always show a + # ASCII art logo in startup logs by setting the following option to yes. +-always-show-logo yes ++# always-show-logo yes + + # By default, KeyDB modifies the process title (as seen in 'top' and 'ps') to + # provide some runtime information. It is possible to disable this and leave + # the process name as executed by setting the following to no. + set-proc-title yes + +-# Retrieving "message of today" using CURL requests. +-#enable-motd yes +- + # When changing the process title, KeyDB uses the following template to construct + # the modified title. + # +@@ -470,7 +452,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/keydb + + ################################# REPLICATION ################################# + +@@ -2105,4 +2087,7 @@ + # this is only exposed via the info command for clients to use, but in the future we + # we may also use this when making decisions for replication. + # +-# availability-zone "us-east-1a" +\ No newline at end of file ++# availability-zone "us-east-1a" ++ ++# Include configuration fragments. ++include /etc/keydb/keydb.d/*.conf diff --git a/testing/keydb/keydb.confd b/testing/keydb/keydb.confd new file mode 100644 index 00000000000..07c6fd58194 --- /dev/null +++ b/testing/keydb/keydb.confd @@ -0,0 +1,10 @@ +# Configuration for /etc/init.d/keydb + +# KeyDB configuration file. +#cfgfile="/etc/keydb/keydb.conf" + +# User (and group) to run keydb as. +#command_user="keydb:keydb" + +# Uncomment to run with process supervisor. +# supervisor="supervise-daemon" diff --git a/testing/keydb/keydb.initd b/testing/keydb/keydb.initd new file mode 100644 index 00000000000..df26ee8f459 --- /dev/null +++ b/testing/keydb/keydb.initd @@ -0,0 +1,46 @@ +#!/sbin/openrc-run + +name="KeyDB server" +description="High performance multithreaded fork of Redis" + +: ${cfgfile:="/etc/keydb/keydb.conf"} +: ${command_user:="keydb:keydb"} + +command="/usr/bin/keydb-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/keydb')" + 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/testing/keydb/keydb.post-install b/testing/keydb/keydb.post-install new file mode 100644 index 00000000000..f94a27c979b --- /dev/null +++ b/testing/keydb/keydb.post-install @@ -0,0 +1,11 @@ +#!/bin/sh + +# Create directory for the socket if OpenRC is not present (e.g. in container). +# It's conditioned using post-install script specifically to avoid easily +# overlookable mistakes in the init script (service working until the +# first restart). +if ! [ -e /sbin/openrc ]; then + install -d -m 755 -o keydb -g keydb /run/keydb +fi + +exit 0 diff --git a/testing/keydb/keydb.pre-install b/testing/keydb/keydb.pre-install new file mode 100644 index 00000000000..f8ec1ca84fa --- /dev/null +++ b/testing/keydb/keydb.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S keydb 2>/dev/null +adduser -S -D -H -h /var/lib/keydb -s /sbin/nologin -G keydb -g keydb keydb 2>/dev/null + +exit 0 diff --git a/testing/keydb/sentinel.conf.patch b/testing/keydb/sentinel.conf.patch new file mode 100644 index 00000000000..bed13bdd5f2 --- /dev/null +++ b/testing/keydb/sentinel.conf.patch @@ -0,0 +1,62 @@ +--- a/sentinel.conf ++++ b/sentinel.conf +@@ -20,21 +20,21 @@ + # The port that this sentinel instance will run on + port 26379 + +-# By default KeyDB Sentinel does not run as a daemon. Use 'yes' if you need it. +-# Note that KeyDB will write a pid file in /var/run/keydb-sentinel.pid when +-# daemonized. +-daemonize no +- +-# When running daemonized, KeyDB Sentinel writes a pid file in +-# /var/run/keydb-sentinel.pid by default. You can specify a custom pid file +-# location here. +-pidfile /var/run/keydb-sentinel.pid +- + # 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/keydb/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 yes ++ ++# Specify the syslog identity. ++syslog-ident sentinel ++ ++# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. ++# syslog-facility local0 ++ + # sentinel announce-ip <ip> + # sentinel announce-port <port> + # +@@ -62,7 +62,7 @@ + # For KeyDB 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/keydb/sentinel + + # sentinel monitor <master-name> <ip> <keydb-port> <quorum> + # +@@ -261,7 +261,7 @@ + # + # Example: + # +-# sentinel notification-script mymaster /var/keydb/notify.sh ++# sentinel notification-script mymaster /etc/keydb/notify.sh + + # CLIENTS RECONFIGURATION SCRIPT + # +@@ -286,7 +286,7 @@ + # + # Example: + # +-# sentinel client-reconfig-script mymaster /var/keydb/reconfig.sh ++# sentinel client-reconfig-script mymaster /etc/keydb/reconfig.sh + + # SECURITY + # 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/khinsider/APKBUILD b/testing/khinsider/APKBUILD index 02a8086e681..78283c55d56 100644 --- a/testing/khinsider/APKBUILD +++ b/testing/khinsider/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Edd Salkield <edd@salkield.uk> pkgname=khinsider pkgver=2.0.7 -pkgrel=12 +pkgrel=13 pkgdesc="A khinsider downloader written in Go" url="https://github.com/marcus-crane/khinsider" arch="all" diff --git a/testing/kind/APKBUILD b/testing/kind/APKBUILD index 3031ac85728..bf229c6b960 100644 --- a/testing/kind/APKBUILD +++ b/testing/kind/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=kind pkgver=0.22.0 -pkgrel=2 +pkgrel=3 pkgdesc="Kubernetes IN Docker - local clusters for testing Kubernetes" url="https://kind.sigs.k8s.io/" license="Apache-2.0" diff --git a/testing/kine/APKBUILD b/testing/kine/APKBUILD index 27177592516..4a875ec85cd 100644 --- a/testing/kine/APKBUILD +++ b/testing/kine/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=kine pkgver=0.10.1 -pkgrel=4 +pkgrel=5 pkgdesc="etcd API with sqlite, Postgres, Mysql, or dqlite backed" url="https://github.com/k3s-io/kine" arch="all" diff --git a/testing/knative-client/APKBUILD b/testing/knative-client/APKBUILD index 188af4d56ff..cec2ca2d444 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.14.0 -pkgrel=0 +pkgrel=1 pkgdesc="CLI client for Knative the serverless container platform in Kubernetes" url="https://knative.dev/" arch="all" 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/ko/APKBUILD b/testing/ko/APKBUILD index 0e308d6a312..9d0cda7dc8a 100644 --- a/testing/ko/APKBUILD +++ b/testing/ko/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Ariadne Conill <ariadne@dereferenced.org> pkgname=ko pkgver=0.15.2 -pkgrel=1 +pkgrel=2 pkgdesc="Build containers from Go projects" url="https://ko.build/" arch="all" diff --git a/testing/komikku/APKBUILD b/testing/komikku/APKBUILD index 523c95057fc..14b89f19b00 100644 --- a/testing/komikku/APKBUILD +++ b/testing/komikku/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jakob Meier <comcloudway@ccw.icu> # Maintainer: Jakob Meier <comcloudway@ccw.icu> pkgname=komikku -pkgver=1.39.0 -pkgrel=1 +pkgver=1.46.0 +pkgrel=0 pkgdesc="manga reader for GNOME" url="https://codeberg.org/valos/Komikku" arch="noarch !s390x" # limited by blueprint-compiler @@ -53,7 +53,6 @@ check() { package() { DESTDIR="$pkgdir" meson install -C build } - sha512sums=" -c8c8c2d6cb4beadb7eba22d6764bd49c469614ae49c345723a22cf68376262516d733495f1530206fce20333c408062c50fd88533ef841ff8cbaef7ab06e121a komikku-1.39.0.tar.gz +d6f2238fa00b87a8435fd63384f835932d8ef02e63b18b3558f19e7f21434956a39da78e5b32fbc43016ee8940f1515a99a8f401e4cef3e07166c86109e5cb99 komikku-1.46.0.tar.gz " diff --git a/testing/kompose/APKBUILD b/testing/kompose/APKBUILD index 071a6fd758b..1bb30686821 100644 --- a/testing/kompose/APKBUILD +++ b/testing/kompose/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: TBK <alpine@jjtc.eu> pkgname=kompose pkgver=1.31.2 -pkgrel=2 +pkgrel=3 pkgdesc="Tool to move from docker-compose to Kubernetes" url="https://kompose.io/" license="Apache-2.0" diff --git a/testing/kopia/APKBUILD b/testing/kopia/APKBUILD index d85b840bdf4..209aa3693c1 100644 --- a/testing/kopia/APKBUILD +++ b/testing/kopia/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=kopia pkgver=0.15.0 -pkgrel=2 +pkgrel=3 pkgdesc="Fast and secure backup tool" url="https://kopia.io/" license="Apache-2.0" diff --git a/testing/kops/APKBUILD b/testing/kops/APKBUILD index 943648c7a55..87214074afa 100644 --- a/testing/kops/APKBUILD +++ b/testing/kops/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=kops pkgver=1.28.4 -pkgrel=2 +pkgrel=3 pkgdesc="Kubernetes Operations" url="https://github.com/kubernetes/kops" arch="x86_64" 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/kube-no-trouble/APKBUILD b/testing/kube-no-trouble/APKBUILD index 31f09f8f4e5..84033077b88 100644 --- a/testing/kube-no-trouble/APKBUILD +++ b/testing/kube-no-trouble/APKBUILD @@ -3,7 +3,7 @@ pkgname=kube-no-trouble _pkgname=github.com/doitintl/kube-no-trouble pkgver=0.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="Easily check your clusters for use of deprecated APIs" url="https://github.com/doitintl/kube-no-trouble" arch="all" diff --git a/testing/kubectl-cert-manager/APKBUILD b/testing/kubectl-cert-manager/APKBUILD index 7f616df6f76..eb2a929a677 100644 --- a/testing/kubectl-cert-manager/APKBUILD +++ b/testing/kubectl-cert-manager/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=kubectl-cert-manager pkgver=1.14.4 -pkgrel=2 +pkgrel=3 pkgdesc="Manage and configure cert-manager resources for Kubernetes" url="https://cert-manager.io/" license="Apache-2.0" diff --git a/testing/kubectl-krew/APKBUILD b/testing/kubectl-krew/APKBUILD index d42528ba5e6..679e2858333 100644 --- a/testing/kubectl-krew/APKBUILD +++ b/testing/kubectl-krew/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=kubectl-krew pkgver=0.4.4 -pkgrel=4 +pkgrel=5 pkgdesc="Find and install kubectl plugins" url="https://krew.sigs.k8s.io/" arch="all !armhf !riscv64" # kubectl diff --git a/testing/kubectl-oidc_login/APKBUILD b/testing/kubectl-oidc_login/APKBUILD index 88441965eed..926ee77369d 100644 --- a/testing/kubectl-oidc_login/APKBUILD +++ b/testing/kubectl-oidc_login/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=kubectl-oidc_login pkgver=1.28.0 -pkgrel=5 +pkgrel=6 pkgdesc="kubectl plugin for Kubernetes OpenID Connect authentication" url="https://github.com/int128/kubelogin" arch="all !armhf !riscv64" # blocked by kubectl diff --git a/testing/kubeone/APKBUILD b/testing/kubeone/APKBUILD index 12546781ad6..531453c272d 100644 --- a/testing/kubeone/APKBUILD +++ b/testing/kubeone/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.7.4 # 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.13 -pkgrel=0 +pkgrel=1 pkgdesc="Automate Kubernetes cluster operations on all platforms" url="https://kubeone.io/" arch="all" diff --git a/testing/kubepug/APKBUILD b/testing/kubepug/APKBUILD index 60d7e3f5d11..8dcffed2e4c 100644 --- a/testing/kubepug/APKBUILD +++ b/testing/kubepug/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=kubepug pkgver=1.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="Kubernetes pre-upgrade deprecation checker" url="https://github.com/rikatz/kubepug" arch="all" diff --git a/testing/kumactl/APKBUILD b/testing/kumactl/APKBUILD index d38f177141d..492630e900e 100644 --- a/testing/kumactl/APKBUILD +++ b/testing/kumactl/APKBUILD @@ -3,7 +3,7 @@ pkgname=kumactl pkgver=2.7.2 # Keep this in sync with the version of envoyproxy package _envoyver=1.30.1 -pkgrel=0 +pkgrel=1 pkgdesc="CLI for the multi-zone service mesh Kuma" url="https://kuma.io/" # The only build targets for eBPF module diff --git a/testing/legume/APKBUILD b/testing/legume/APKBUILD index 5e6d4bec179..ad3344478bd 100644 --- a/testing/legume/APKBUILD +++ b/testing/legume/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sean E. Russell <ser@ser1.net> pkgname=legume pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="A distributed issue tracker base on developer code comments such as TODO and FIXME." url="https://sr.ht/~ser/legume" arch="all" diff --git a/testing/level-zero/APKBUILD b/testing/level-zero/APKBUILD index 79159c9f2af..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.15 +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=" -37f1770f1bfa71fa08d56afed53a4dd1107ff36d8790f7bb0f921237d9d0e90076ef22349e8f289cf8f154ca0e1e0fff6a7dcd55b71468989322b9892962b874 level-zero-1.16.15.tar.gz +97b9d06b5cd84b1644ca252ac5009d1350f8c72aeb908a3b93bf8e07f91354589ce4fffdd8069b301eac6b704489ca04022aa4a44a7269bc0da3ace7103b5802 level-zero-1.17.0.tar.gz " diff --git a/testing/libdbusmenu-lxqt/APKBUILD b/testing/libdbusmenu-lxqt/APKBUILD new file mode 100644 index 00000000000..d3c2b03eea9 --- /dev/null +++ b/testing/libdbusmenu-lxqt/APKBUILD @@ -0,0 +1,30 @@ +# Maintainer: Zachary L. Andrews <zcrayfish@gmail.com> +pkgname=libdbusmenu-lxqt +pkgver=0.1.0 +pkgrel=0 +pkgdesc="library to export QMenu over DBusMenu protocol" +url="https://github.com/lxqt/libdbusmenu-lxqt" +arch="all" +license="LGPL-2.1-or-later" +depends_dev="qt6-qtbase-dev" +makedepends="$depends_dev cmake doxygen samurai" +subpackages="$pkgname-dev $pkgname-doc" +source="https://github.com/lxqt/libdbusmenu-lxqt/releases/download/$pkgver/libdbusmenu-lxqt-$pkgver.tar.xz" +options="!check" # requires as-of-yet unpkg'd qjson, may require dbus? + +build() { + cmake -B build -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=None \ + -DWITH_DOC=ON + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} + +sha512sums=" +8c09f9bd4b3c60db1666f5a53ea84c67d2d120b215eca6563c32385387e100fe591cb8653a283750444356c61306cf385507edb6a507b22427eb6f18aa972fb5 libdbusmenu-lxqt-0.1.0.tar.xz +" diff --git a/testing/libexmdbpp/APKBUILD b/testing/libexmdbpp/APKBUILD index a6fb19b9dcc..7adab24b257 100755 --- a/testing/libexmdbpp/APKBUILD +++ b/testing/libexmdbpp/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Noel Kuntze <noel.kuntze@contauro.com> pkgname=libexmdbpp pkgver=1.11 -pkgrel=0 +pkgrel=1 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" +makedepends="cmake samurai 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 diff --git a/testing/libgedit-amtk/APKBUILD b/testing/libgedit-amtk/APKBUILD new file mode 100644 index 00000000000..67ac85f0bd5 --- /dev/null +++ b/testing/libgedit-amtk/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: Rasmus Thomsen <oss@cogitri.dev> +# Maintainer: mio <miyopan@e.email> +pkgname=libgedit-amtk +pkgver=5.8.0 +pkgrel=0 +pkgdesc="Actions, menus and toolbars kit for GTK applications" +url="https://github.com/gedit-technology/libgedit-amtk" +arch="all" +license="LGPL-3.0-or-later" +makedepends=" + glib-dev + gobject-introspection-dev + gtk-doc + gtk+3.0-dev + meson + " +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://github.com/gedit-technology/libgedit-amtk/archive/$pkgver/libgedit-amtk-$pkgver.tar.gz" + +build() { + abuild-meson \ + -Db_lto=true \ + -Dgobject_introspection=true \ + -Dgtk_doc=true \ + . output + meson compile -C output +} + +check() { + meson test --no-rebuild -v -C output +} + +package() { + DESTDIR="$pkgdir" meson install --no-rebuild -C output +} + +sha512sums=" +9ac0f8b7b7375cd4b68f2a61138ee61d113a1fd6c208e8e52b487ef118b4085f0893ec006f492ed1dbf702a1abcc8e372c84a926c1f4a5c5f61ca68b2227bb39 libgedit-amtk-5.8.0.tar.gz +" diff --git a/testing/libgedit-gfls/APKBUILD b/testing/libgedit-gfls/APKBUILD new file mode 100644 index 00000000000..dd580ebf4e4 --- /dev/null +++ b/testing/libgedit-gfls/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: mio <miyopan@e.email> +# Maintainer: mio <miyopan@e.email> +pkgname=libgedit-gfls +pkgver=0.1.0 +pkgrel=0 +pkgdesc="Module for file loading and saving" +url="https://github.com/gedit-technology/libgedit-gfls" +arch="all" +license="LGPL-3.0-or-later" +makedepends=" + glib-dev + gobject-introspection-dev + gtk-doc + gtk+3.0-dev + meson + " +subpackages="$pkgname-dev $pkgname-doc" +source="https://github.com/gedit-technology/libgedit-gfls/archive/$pkgver/libgedit-gfls-$pkgver.tar.gz" + +build() { + abuild-meson \ + -Db_lto=true \ + -Dgobject_introspection=true \ + -Dgtk_doc=true \ + . output + meson compile -C output +} + +check() { + meson test --no-rebuild -v -C output +} + +package() { + DESTDIR="$pkgdir" meson install --no-rebuild -C output +} + +sha512sums=" +139c5006a61055ea992a37dd7d6efa0777c41597e78bc9d065c377ace3571236bb09791ca6c410a812a668cf2c072476e4bcc2ee232d6e43a1b992f11adbdd1c libgedit-gfls-0.1.0.tar.gz +" diff --git a/testing/libgedit-gtksourceview/APKBUILD b/testing/libgedit-gtksourceview/APKBUILD new file mode 100644 index 00000000000..6856cbfcac8 --- /dev/null +++ b/testing/libgedit-gtksourceview/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: mio <miyopan@e.email> +# Maintainer: mio <miyopan@e.email> +pkgname=libgedit-gtksourceview +pkgver=299.2.1 +pkgrel=0 +pkgdesc="Source code editing widget that extends GtkTextView" +url="https://github.com/gedit-technology/libgedit-gtksourceview" +arch="all" +license="LGPL-2.1-or-later" +makedepends=" + gobject-introspection-dev + gtk-doc + gtk+3.0-dev + meson + " +checkdepends="xvfb-run" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://github.com/gedit-technology/libgedit-gtksourceview/archive/$pkgver/libgedit-gtksourceview-$pkgver.tar.gz" + +# riscv64: failed test 17/25 "test-search-context" sigsegv +case "$CARCH" in + riscv64) options="$options !check";; +esac + +build() { + abuild-meson \ + -Db_lto=true \ + -Dgobject_introspection=true \ + -Dgtk_doc=true \ + . output + meson compile -C output +} + +check() { + xvfb-run -a meson test --no-rebuild -v -C output +} + +package() { + DESTDIR="$pkgdir" meson install --no-rebuild -C output +} + +sha512sums=" +5da9c0174dcd4602f566a1af21c1cc7bb0d282df103bfbebc72d8effb2e17a2f5f1e47ca0060c692e116e6702e23ca122fa96f8db8de331935d2807de071288f libgedit-gtksourceview-299.2.1.tar.gz +" diff --git a/testing/libgedit-tepl/APKBUILD b/testing/libgedit-tepl/APKBUILD new file mode 100644 index 00000000000..d77698716bd --- /dev/null +++ b/testing/libgedit-tepl/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Rasmus Thomsen <oss@cogitri.dev> +# Maintainer: mio <miyopan@e.email> +pkgname=libgedit-tepl +pkgver=6.10.0 +pkgrel=0 +pkgdesc="Text editor product line based on GTK" +url="https://github.com/gedit-technology/libgedit-tepl" +arch="all" +license="LGPL-3.0-or-later" +depends_dev=" + glib-dev + gtk+3.0-dev + libgedit-gtksourceview-dev + " +makedepends=" + $depends_dev + gobject-introspection-dev + gsettings-desktop-schemas-dev + gtk-doc + libgedit-amtk-dev + libgedit-gfls-dev + libhandy1-dev + meson + " +checkdepends="xvfb-run" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://github.com/gedit-technology/libgedit-tepl/archive/$pkgver/libgedit-tepl-$pkgver.tar.gz" + +build() { + abuild-meson . output + meson compile -C output +} + +check() { + xvfb-run -a meson test --no-rebuild -v -C output +} + +package() { + DESTDIR="$pkgdir" meson install --no-rebuild -C output +} + +sha512sums=" +d50eb7bc98b204ba0cc892bedc748ac2ee2fbcc8689f2f225a7e6e9aad40fc055054f7b5e0328d12bcfe963438979fd89541a6105ddf9a142d280e9f5f98db25 libgedit-tepl-6.10.0.tar.gz +" diff --git a/testing/libgivaro/APKBUILD b/testing/libgivaro/APKBUILD index 2a691dc010a..e6e5ffdebcb 100644 --- a/testing/libgivaro/APKBUILD +++ b/testing/libgivaro/APKBUILD @@ -14,6 +14,11 @@ source="https://github.com/linbox-team/givaro/releases/download/v$pkgver/givaro- subpackages="$pkgname-static $pkgname-dev" builddir="$srcdir/givaro-$pkgver" +prepare() { + default_prepare + update_config_sub +} + build() { export CFLAGS="${CFLAGS/-Os/-O3}" # gotta go fast 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 b75b7fec211..3e27a1c77cd 100644 --- a/testing/libime/APKBUILD +++ b/testing/libime/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Lindsay Zhou <i@lin.moe> # Maintainer: Lindsay Zhou <i@lin.moe> pkgname=libime -pkgver=1.1.6 -pkgrel=1 +pkgver=1.1.7 +pkgrel=0 _kenlm=bcd4af619a2fa45f5876d8855f7876cc09f663af pkgdesc="Fcitx input method engine library" url="https://github.com/fcitx/libime" @@ -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/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/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/lidarr/APKBUILD b/testing/lidarr/APKBUILD index 7d933812801..dd89161e35a 100644 --- a/testing/lidarr/APKBUILD +++ b/testing/lidarr/APKBUILD @@ -1,22 +1,15 @@ # Contributor: Fabricio Silva <hi@fabricio.dev> # Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=lidarr -pkgver=2.1.7.4030 +pkgver=2.3.3.4204 pkgrel=0 pkgdesc="Music download automation for usenet and torrents." url="https://github.com/Lidarr/Lidarr" -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 - chromaprint - sqlite-libs - " -makedepends=" - dotnet6-sdk - yarn - " +options="net" # net for nuget and yarn +depends="aspnetcore6-runtime sqlite-libs chromaprint" +makedepends="dotnet6-sdk yarn" subpackages="$pkgname-openrc" install="$pkgname.pre-install" source=" @@ -30,6 +23,10 @@ builddir="$srcdir/Lidarr-$pkgver" pkgusers="lidarr" pkggroups="lidarr" +# secfixes: +# 2.3.3.4204-r0: +# - CVE-2024-32655 + # map arch to dotnet case $CARCH in x86_64) _dotnet_arch="x64" ;; @@ -79,22 +76,36 @@ build() { mv "$_output"/UI "$_artifacts" } +check() { + local _files="Lidarr.Api.Test.dll Lidarr.Common.Test.dll \ + Lidarr.Core.Test.dll Lidarr.Host.Test.dll Lidarr.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/Lidarr + dotnet test --filter "$_filters" $_files +} + 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 +1a594ac64cc7d0884f54b548259c9f980cc43c6425f89d7bee3ed7717e6b1174d7a9c22aad367c001b629968c1b0de2ffdc7f72481e36f363295c01af48387aa lidarr-2.3.3.4204.tar.gz 753520379a6c5f2899b4ddfd820d5573598a32cb105f74c6fd978a3f2c98895cf709ef2d9afe2bae8c4856da86cb6a1364f5713ea7ef6a36bb21b5a5840c1471 0001-disable-restart.patch 194dce13e5220d71ffe262d40dbd1b124166f158500a420a8032279baa8f046c1772857cb7f4ab9428384481b962ff4939de0e2cdc6197f91cd35d1c0871a8e4 lidarr.initd babbb145648ad296b53271db5c642edddb9d0a5173479c4e383c48aab1d6b616c176e1ef73ae78078f41b4e6ca0e5768a96b36d844a3669f59179226ba8e97ad lidarr.confd diff --git a/testing/linux-elm/APKBUILD b/testing/linux-elm/APKBUILD index 84f3c22923a..8621d61ac85 100644 --- a/testing/linux-elm/APKBUILD +++ b/testing/linux-elm/APKBUILD @@ -4,7 +4,7 @@ _flavor=elm pkgname=linux-${_flavor} # NOTE: this kernel is intended for testing # please resist urge to upgrade it blindly -pkgver=6.8.2 +pkgver=6.9.2 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -206,9 +206,9 @@ _dev() { } sha512sums=" -5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068 linux-6.8.tar.xz -a8e32b89f7680670c69c62f356846bb65b57614f979114627a9a2f945d7dc97c921d30197dffa993e5b18e499ba8c7196046ffdf0e721528a5378d1ee65a9ba5 patch-6.8.2.xz -4fdd734d57e6c434765bf86e80ca4163a2491079b29ae53a00f2c28ac89d0aec4c1188bd59f12607e94a2fa2eaae7ae9cc87e1513a0f246384d038e649d8f2ab config +fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579 linux-6.9.tar.xz +a27af24f0caaa5de3811b6db5acc2d72b96df9ebb5c44bad99a949d871fb06c6ffd2be10cfc35b246d430c7be2291701f802aed47eaa8818ad12b8818a60f3ec patch-6.9.2.xz +4384cb8337b921ba79e0cb46bfcdae98508926dab413ada7e8f968a4e3d84259fd887ad8f5047a5a9b2846022751e94df60bf34f93a2f37558152b06a39a125e config 112af92af4a3f61867ffc20076d057845aa8c9139e58153d0c88f4d7185d9a9628fa79d4edfa8855f095fb70d257bfbd7c4573a7431d4b17706415b411a50775 kernel.its.elm 00e7afdab1dc89a6e0426829685d85cebb98fb95cb13a253d01326fd22f78ddf792bbe3b5be4c9bc93784f1fa93f87f604a4b6c6710660319db6f2e35dd09835 fix-mmc-order.patch fcea50a1ba2356d64a9c3ee0b7b7c326654996956d68eb445fafdb4320b4104b6321f768f0ce4ceb5cd4696be3a7332908ba1de7054fb20bf8c97f4234bfa6a4 mps-ter12x24-font-kernel.patch diff --git a/testing/linux-elm/config b/testing/linux-elm/config index 72f22ff53b4..3adced85d87 100644 --- a/testing/linux-elm/config +++ b/testing/linux-elm/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.8.2 Kernel Configuration +# Linux/arm64 6.9.2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309" CONFIG_CC_IS_GCC=y @@ -240,7 +240,6 @@ CONFIG_SYSTEM_DATA_VERIFICATION=y # # CONFIG_KEXEC is not set # CONFIG_KEXEC_FILE is not set -# CONFIG_CRASH_DUMP is not set # end of Kexec and crash features # end of General setup @@ -248,7 +247,6 @@ CONFIG_ARM64=y CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_64BIT=y CONFIG_MMU=y -CONFIG_ARM64_PAGE_SHIFT=12 CONFIG_ARM64_CONT_PTE_SHIFT=4 CONFIG_ARM64_CONT_PMD_SHIFT=4 CONFIG_ARCH_MMAP_RND_BITS_MIN=18 @@ -377,6 +375,7 @@ CONFIG_ARM64_4K_PAGES=y # CONFIG_ARM64_64K_PAGES is not set # CONFIG_ARM64_VA_BITS_39 is not set CONFIG_ARM64_VA_BITS_48=y +# CONFIG_ARM64_VA_BITS_52 is not set CONFIG_ARM64_VA_BITS=48 CONFIG_ARM64_PA_BITS_48=y CONFIG_ARM64_PA_BITS=48 @@ -504,6 +503,8 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_HIBERNATION_SNAPSHOT_DEV=y +CONFIG_HIBERNATION_COMP_LZO=y +CONFIG_HIBERNATION_DEF_COMP="lzo" CONFIG_PM_STD_PARTITION="" CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -580,7 +581,6 @@ CONFIG_ARM_SCMI_CPUFREQ=m CONFIG_ARCH_SUPPORTS_ACPI=y # CONFIG_ACPI is not set -CONFIG_HAVE_KVM=y CONFIG_KVM_COMMON=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_IRQ_ROUTING=y @@ -589,6 +589,7 @@ CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y CONFIG_NEED_KVM_DIRTY_RING_WITH_BITMAP=y CONFIG_KVM_MMIO=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_READONLY_MEM=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y @@ -600,6 +601,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 @@ -632,6 +634,7 @@ CONFIG_ARCH_WANTS_NO_INSTR=y CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_RUST=y CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_PERF_REGS=y @@ -680,8 +683,11 @@ CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_ARCH_MMAP_RND_BITS=18 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 +CONFIG_HAVE_PAGE_SIZE_4KB=y +CONFIG_PAGE_SIZE_4KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SHIFT=12 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y @@ -732,6 +738,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_SIG=y # CONFIG_MODULE_SIG_FORCE is not set # CONFIG_MODULE_SIG_ALL is not set +# 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 @@ -745,6 +752,8 @@ CONFIG_MODULE_COMPRESS_NONE=y # CONFIG_MODULE_COMPRESS_ZSTD is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set CONFIG_MODPROBE_PATH="/sbin/modprobe" +CONFIG_TRIM_UNUSED_KSYMS=y +CONFIG_UNUSED_KSYMS_WHITELIST="" CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y CONFIG_BLOCK_LEGACY_AUTOLOAD=y @@ -845,7 +854,6 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set -# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set # CONFIG_ZSWAP_SHRINKER_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set @@ -958,7 +966,6 @@ CONFIG_SKB_EXTENSIONS=y CONFIG_PACKET=m CONFIG_PACKET_DIAG=m CONFIG_UNIX=y -CONFIG_UNIX_SCM=y CONFIG_AF_UNIX_OOB=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m @@ -1200,7 +1207,6 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m # CONFIG_IP_NF_IPTABLES is not set -# CONFIG_IP_NF_ARPTABLES is not set # end of IP: Netfilter Configuration # @@ -1478,6 +1484,7 @@ CONFIG_ETHTOOL_NETLINK=y # CONFIG_ARM_AMBA=y CONFIG_HAVE_PCI=y +CONFIG_GENERIC_PCI_IOMAP=y # CONFIG_PCI is not set # CONFIG_PCCARD is not set @@ -1769,6 +1776,7 @@ CONFIG_DM_CRYPT=m # CONFIG_DM_SWITCH is not set # CONFIG_DM_LOG_WRITES is not set # CONFIG_DM_INTEGRITY is not set +# CONFIG_DM_VDO is not set # CONFIG_TARGET_CORE is not set CONFIG_NETDEVICES=y CONFIG_MII=m @@ -1841,7 +1849,11 @@ CONFIG_MICROCHIP_PHY=m # CONFIG_NXP_C45_TJA11XX_PHY is not set # CONFIG_NXP_TJA11XX_PHY is not set # CONFIG_NCN26000_PHY is not set +CONFIG_QCOM_NET_PHYLIB=m CONFIG_AT803X_PHY=m +# CONFIG_QCA83XX_PHY is not set +# CONFIG_QCA808X_PHY is not set +# CONFIG_QCA807X_PHY is not set CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m # CONFIG_RENESAS_PHY is not set @@ -2133,6 +2145,8 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_EXC3000 is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GOODIX is not set +# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set +# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set @@ -2256,7 +2270,6 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -2483,6 +2496,7 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y # CONFIG_PINCTRL_AS3722 is not set +# CONFIG_PINCTRL_AW9523 is not set # CONFIG_PINCTRL_CY8C95X0 is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set @@ -2571,6 +2585,7 @@ CONFIG_GPIO_CDEV_V1=y # # MFD GPIO expanders # +CONFIG_GPIO_CROS_EC=m CONFIG_GPIO_PALMAS=y # CONFIG_GPIO_TPS6586X is not set # end of MFD GPIO expanders @@ -2689,10 +2704,12 @@ CONFIG_HWMON=m # CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set # CONFIG_SENSORS_AS370 is not set # CONFIG_SENSORS_ASC7621 is not set +# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set # CONFIG_SENSORS_AXI_FAN_CONTROL is not set CONFIG_SENSORS_ARM_SCMI=m CONFIG_SENSORS_ARM_SCPI=m # CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_CHIPCAP2 is not set # CONFIG_SENSORS_CORSAIR_CPRO is not set # CONFIG_SENSORS_CORSAIR_PSU is not set # CONFIG_SENSORS_DS620 is not set @@ -2727,6 +2744,7 @@ CONFIG_SENSORS_IIO_HWMON=m # CONFIG_SENSORS_LTC4245 is not set # CONFIG_SENSORS_LTC4260 is not set # CONFIG_SENSORS_LTC4261 is not set +# CONFIG_SENSORS_LTC4282 is not set # CONFIG_SENSORS_MAX1111 is not set # CONFIG_SENSORS_MAX127 is not set # CONFIG_SENSORS_MAX16065 is not set @@ -2775,10 +2793,12 @@ CONFIG_SENSORS_LM90=m # CONFIG_SENSORS_NCT7904 is not set # CONFIG_SENSORS_NPCM7XX is not set # CONFIG_SENSORS_NZXT_KRAKEN2 is not set +# CONFIG_SENSORS_NZXT_KRAKEN3 is not set # CONFIG_SENSORS_NZXT_SMART2 is not set # CONFIG_SENSORS_OCC_P8_I2C is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_PMBUS is not set +# CONFIG_SENSORS_PT5161L is not set # CONFIG_SENSORS_PWM_FAN is not set # CONFIG_SENSORS_SBTSI is not set # CONFIG_SENSORS_SBRMI is not set @@ -2831,7 +2851,6 @@ CONFIG_THERMAL_NETLINK=y # CONFIG_THERMAL_STATISTICS is not set CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_OF=y -CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -2874,6 +2893,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # Watchdog Device Drivers # # CONFIG_SOFT_WATCHDOG is not set +CONFIG_CROS_EC_WATCHDOG=m # CONFIG_GPIO_WATCHDOG is not set # CONFIG_XILINX_WATCHDOG is not set # CONFIG_XILINX_WINDOW_WATCHDOG is not set @@ -3477,8 +3497,8 @@ CONFIG_MEDIA_TUNER_XC5000=m # Graphics support # CONFIG_APERTURE_HELPERS=y -CONFIG_VIDEO_CMDLINE=y -CONFIG_VIDEO_NOMODESET=y +CONFIG_SCREEN_INFO=y +CONFIG_VIDEO=y # CONFIG_AUXDISPLAY is not set CONFIG_DRM=y CONFIG_DRM_MIPI_DSI=y @@ -3527,15 +3547,15 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set # CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set +# CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set -# CONFIG_DRM_PANEL_DSI_CM is not set -# CONFIG_DRM_PANEL_LVDS is not set -CONFIG_DRM_PANEL_SIMPLE=m -CONFIG_DRM_PANEL_EDP=y # CONFIG_DRM_PANEL_EBBG_FT8719 is not set # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set +# CONFIG_DRM_PANEL_DSI_CM is not set +# CONFIG_DRM_PANEL_LVDS is not set +# CONFIG_DRM_PANEL_HIMAX_HX83112A is not set # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set @@ -3545,17 +3565,17 @@ CONFIG_DRM_PANEL_EDP=y # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set -# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_JDI_LPM102A188A is not set +# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_JDI_R63452 is not set # CONFIG_DRM_PANEL_KHADAS_TS050 is not set # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set -# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set +# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set # CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set @@ -3564,8 +3584,8 @@ CONFIG_DRM_PANEL_EDP=y # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set +# CONFIG_DRM_PANEL_NOVATEK_NT36672E is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set -# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set @@ -3576,15 +3596,16 @@ CONFIG_DRM_PANEL_EDP=y # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set +# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set # CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set @@ -3595,19 +3616,21 @@ CONFIG_DRM_PANEL_EDP=y # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set -# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set # CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set +CONFIG_DRM_PANEL_EDP=y +CONFIG_DRM_PANEL_SIMPLE=m +# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set +# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set # CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set -# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels @@ -3735,6 +3758,7 @@ CONFIG_LCD_PLATFORM=y # CONFIG_LCD_OTM3225A is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_KTD253 is not set +# CONFIG_BACKLIGHT_KTD2801 is not set # CONFIG_BACKLIGHT_KTZ8866 is not set CONFIG_BACKLIGHT_PWM=y # CONFIG_BACKLIGHT_QCOM_WLED is not set @@ -4261,6 +4285,7 @@ CONFIG_USB_OTG=y # CONFIG_USB_OTG_FSM is not set # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_MON=m # @@ -4469,6 +4494,7 @@ CONFIG_TYPEC_UCSI=m # CONFIG_TYPEC_MUX_FSA4480 is not set # CONFIG_TYPEC_MUX_GPIO_SBU is not set # CONFIG_TYPEC_MUX_PI3USB30532 is not set +# CONFIG_TYPEC_MUX_IT5205 is not set # CONFIG_TYPEC_MUX_NB7VPQ904M is not set # CONFIG_TYPEC_MUX_PTN36502 is not set # CONFIG_TYPEC_MUX_WCD939X_USBSS is not set @@ -4585,6 +4611,7 @@ CONFIG_LEDS_USER=m # # CONFIG_LEDS_GROUP_MULTICOLOR is not set # CONFIG_LEDS_KTD202X is not set +# CONFIG_LEDS_NCP5623 is not set # CONFIG_LEDS_PWM_MULTICOLOR is not set # CONFIG_LEDS_QCOM_LPG is not set @@ -4880,7 +4907,6 @@ CONFIG_STAGING=y # end of IIO staging drivers # CONFIG_STAGING_MEDIA is not set -CONFIG_STAGING_BOARD=y # CONFIG_LTE_GDM724X is not set # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set @@ -5144,6 +5170,7 @@ CONFIG_MTK_PMIC_WRAP=y CONFIG_MTK_REGULATOR_COUPLER=y CONFIG_MTK_MMSYS=y # CONFIG_MTK_SVS is not set +CONFIG_MTK_SOCINFO=m # end of MediaTek SoC drivers # CONFIG_WPCM450_SOC is not set @@ -5151,6 +5178,7 @@ CONFIG_MTK_MMSYS=y # # Qualcomm SoC drivers # +# CONFIG_QCOM_PBS is not set # end of Qualcomm SoC drivers # CONFIG_SOC_TI is not set @@ -5321,6 +5349,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m # CONFIG_AD7923 is not set # CONFIG_AD7949 is not set # CONFIG_AD799X is not set +# CONFIG_AD9467 is not set # CONFIG_ADI_AXI_ADC is not set # CONFIG_CC10001_ADC is not set # CONFIG_ENVELOPE_DETECTOR is not set @@ -5348,6 +5377,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m CONFIG_MEDIATEK_MT6360_ADC=m # CONFIG_MEDIATEK_MT6577_AUXADC is not set # CONFIG_NAU7802 is not set +# CONFIG_PAC1934 is not set # CONFIG_PALMAS_GPADC is not set # CONFIG_QCOM_SPMI_IADC is not set # CONFIG_QCOM_SPMI_VADC is not set @@ -5364,6 +5394,7 @@ CONFIG_MEDIATEK_MT6360_ADC=m # CONFIG_TI_ADS1015 is not set # CONFIG_TI_ADS7924 is not set # CONFIG_TI_ADS1100 is not set +# CONFIG_TI_ADS1298 is not set # CONFIG_TI_ADS7950 is not set # CONFIG_TI_ADS8344 is not set # CONFIG_TI_ADS8688 is not set @@ -5516,6 +5547,7 @@ CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m # CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set # CONFIG_ADF4377 is not set +# CONFIG_ADMFM2000 is not set # CONFIG_ADMV1013 is not set # CONFIG_ADMV1014 is not set # CONFIG_ADMV4420 is not set @@ -5652,6 +5684,7 @@ CONFIG_TSL2583=m # # Magnetometer sensors # +# CONFIG_AF8133J is not set # CONFIG_AK8974 is not set # CONFIG_AK8975 is not set # CONFIG_AK09911 is not set @@ -5818,6 +5851,7 @@ CONFIG_MST_IRQ=y # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_GPIO is not set CONFIG_RESET_SCMI=m # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESET_TI_TPS380X is not set @@ -5846,6 +5880,7 @@ CONFIG_PHY_MTK_TPHY=y CONFIG_PHY_MTK_UFS=m CONFIG_PHY_MTK_XSPHY=m CONFIG_PHY_MTK_HDMI=y +# CONFIG_PHY_MTK_MIPI_CSI_0_5 is not set CONFIG_PHY_MTK_MIPI_DSI=y CONFIG_PHY_MTK_DP=y # CONFIG_PHY_LAN966X_SERDES is not set @@ -6008,6 +6043,7 @@ CONFIG_QUOTACTL=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m +CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -6044,13 +6080,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_DEFAULT_UTF8=y CONFIG_EXFAT_FS=m CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y CONFIG_NTFS3_FS=m # CONFIG_NTFS3_64BIT_CLUSTER is not set # CONFIG_NTFS3_LZX_XPRESS is not set # CONFIG_NTFS3_FS_POSIX_ACL is not set +CONFIG_NTFS_FS=m # end of DOS/FAT/EXFAT/NT Filesystems # @@ -6533,7 +6567,6 @@ CONFIG_GENERIC_NET_UTILS=y # CONFIG_CORDIC is not set # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y -CONFIG_GENERIC_PCI_IOMAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_ARCH_USE_SYM_ANNOTATIONS=y @@ -6711,7 +6744,7 @@ CONFIG_FRAME_POINTER=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_DEBUG_FS is not set CONFIG_HAVE_ARCH_KGDB=y -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +CONFIG_ARCH_HAS_UBSAN=y # CONFIG_UBSAN is not set CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments diff --git a/testing/linux-gru/APKBUILD b/testing/linux-gru/APKBUILD index a74f662ee76..d03f1f2f3bd 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.9.2 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -31,7 +31,6 @@ esac kernel.its.$_flavor fix-rk3399-gru-mmc-order.patch fix-gru-analogix_dp_core.patch - PATCH-v4-00-11-media-rkvdec-Add-H.264-High-10-and-4-2-2-profile-support.patch " arch="aarch64" @@ -210,11 +209,10 @@ _dev() { } sha512sums=" -5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068 linux-6.8.tar.xz -33ddb70a2df5ce51e23a82616e02197e4b812e0c094d0c88dd6ea6e2f00d843c2ff124fc15548e0ae3853fc1a6ea605e6b94eff7aa49a34961d7b20b7d27ff6c patch-6.8.1.xz -cb2e4b59b4eeaff3efdb90da5cd6ef6c8bb6a3dd2e1f8d8ed903ac54fab37176612e6fa085d6a7cc9cb8c7da491f1160830f3436e050a17020fe5f57bd145f71 config +fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579 linux-6.9.tar.xz +a27af24f0caaa5de3811b6db5acc2d72b96df9ebb5c44bad99a949d871fb06c6ffd2be10cfc35b246d430c7be2291701f802aed47eaa8818ad12b8818a60f3ec patch-6.9.2.xz +e4e7f6d0c3623f87a8753bea6f5da55a4584067fd2dd1a9990962b9009130063cead7b067a88b7819d01cd4966339bafc867c37fe7eb7795a86e203f99820fe8 config b5a2fbc0560201b4ec1d21e890cc5290c58d0544105a5bfabfe04e76bdf54b64dc07076c40414cedb38b12687cf1ae3f773ecfcac02e3d1edd84f6ef80c951da kernel.its.gru 1653cd164857fb433c32203df8254d27c28bcf64e4bd5d0291ce95a8d7e5b48815ea6e81e32060b9a4c0cb13c302f9accc8e77451e30138669337f0d20910a76 fix-rk3399-gru-mmc-order.patch 476188e5a6967fe061293a6d5b540158869f7f09eba3b0eb651bb7948003c050aa7e419c90f3135316f2ce8c1bb4a411bd3c82cde85dddbf17d971c5198893fe fix-gru-analogix_dp_core.patch -4b1a494a3821d1829a2a2bb6f959ecbfc1a2e750e8bcf5154701d13478a87e01468848182c8bad993aedf55d5e43c69d360f90a8023f90018b099a7a0dacb7aa PATCH-v4-00-11-media-rkvdec-Add-H.264-High-10-and-4-2-2-profile-support.patch " diff --git a/testing/linux-gru/config b/testing/linux-gru/config index 7420227fcf2..62edb0dc3cb 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.9.2 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 @@ -40,7 +39,7 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYSVIPC_COMPAT=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -# CONFIG_WATCH_QUEUE is not set +CONFIG_WATCH_QUEUE=y CONFIG_CROSS_MEMORY_ATTACH=y # CONFIG_USELIB is not set # CONFIG_AUDIT is not set @@ -115,9 +114,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_SCHED_THERMAL_PRESSURE=y # CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -# CONFIG_TASK_XACCT is not set +# CONFIG_TASKSTATS is not set # CONFIG_PSI is not set # end of CPU/Task time and stats accounting @@ -175,7 +172,6 @@ CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y -# CONFIG_CGROUP_PERF is not set # CONFIG_CGROUP_MISC is not set CONFIG_SOCK_CGROUP_DATA=y CONFIG_NAMESPACES=y @@ -227,12 +223,11 @@ CONFIG_KALLSYMS=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_HAVE_PERF_EVENTS=y -CONFIG_GUEST_PERF_EVENTS=y # # Kernel Performance Events And Counters # -CONFIG_PERF_EVENTS=y +# CONFIG_PERF_EVENTS is not set # end of Kernel Performance Events And Counters CONFIG_SYSTEM_DATA_VERIFICATION=y @@ -243,7 +238,6 @@ CONFIG_SYSTEM_DATA_VERIFICATION=y # # CONFIG_KEXEC is not set # CONFIG_KEXEC_FILE is not set -# CONFIG_CRASH_DUMP is not set # end of Kexec and crash features # end of General setup @@ -251,7 +245,6 @@ CONFIG_ARM64=y CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_64BIT=y CONFIG_MMU=y -CONFIG_ARM64_PAGE_SHIFT=12 CONFIG_ARM64_CONT_PTE_SHIFT=4 CONFIG_ARM64_CONT_PMD_SHIFT=4 CONFIG_ARCH_MMAP_RND_BITS_MIN=18 @@ -378,6 +371,7 @@ CONFIG_ARM64_4K_PAGES=y # CONFIG_ARM64_64K_PAGES is not set # CONFIG_ARM64_VA_BITS_39 is not set CONFIG_ARM64_VA_BITS_48=y +# CONFIG_ARM64_VA_BITS_52 is not set CONFIG_ARM64_VA_BITS=48 CONFIG_ARM64_PA_BITS_48=y CONFIG_ARM64_PA_BITS=48 @@ -396,7 +390,6 @@ CONFIG_HZ_1000=y CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_HW_PERF_EVENTS=y CONFIG_CC_HAVE_SHADOW_CALL_STACK=y # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set @@ -411,7 +404,7 @@ CONFIG_TRANS_TABLE=y CONFIG_ARCH_FORCE_MAX_ORDER=10 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y -CONFIG_RODATA_FULL_DEFAULT_ENABLED=y +# CONFIG_RODATA_FULL_DEFAULT_ENABLED is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y CONFIG_COMPAT=y @@ -505,6 +498,8 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y CONFIG_HIBERNATION_SNAPSHOT_DEV=y +CONFIG_HIBERNATION_COMP_LZO=y +CONFIG_HIBERNATION_DEF_COMP="lzo" CONFIG_PM_STD_PARTITION="" CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y @@ -555,12 +550,12 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_ATTR_SET=y CONFIG_CPU_FREQ_GOV_COMMON=y # CONFIG_CPU_FREQ_STAT is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m @@ -579,7 +574,6 @@ CONFIG_ARM_SCPI_CPUFREQ=m CONFIG_ARCH_SUPPORTS_ACPI=y # CONFIG_ACPI is not set -CONFIG_HAVE_KVM=y CONFIG_KVM_COMMON=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_IRQ_ROUTING=y @@ -588,6 +582,7 @@ CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y CONFIG_NEED_KVM_DIRTY_RING_WITH_BITMAP=y CONFIG_KVM_MMIO=y CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_READONLY_MEM=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y @@ -599,6 +594,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 @@ -631,8 +627,8 @@ CONFIG_ARCH_WANTS_NO_INSTR=y CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_RUST=y CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y -CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y @@ -679,8 +675,11 @@ CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_ARCH_MMAP_RND_BITS=18 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 +CONFIG_HAVE_PAGE_SIZE_4KB=y +CONFIG_PAGE_SIZE_4KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SHIFT=12 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y @@ -732,6 +731,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 @@ -745,7 +745,8 @@ CONFIG_MODULE_COMPRESS_NONE=y # CONFIG_MODULE_COMPRESS_ZSTD is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set CONFIG_MODPROBE_PATH="/sbin/modprobe" -CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_TRIM_UNUSED_KSYMS=y +CONFIG_UNUSED_KSYMS_WHITELIST="" CONFIG_BLOCK=y CONFIG_BLOCK_LEGACY_AUTOLOAD=y CONFIG_BLK_CGROUP_RWSTAT=y @@ -846,7 +847,6 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set -# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set # CONFIG_ZSWAP_SHRINKER_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set @@ -931,7 +931,7 @@ CONFIG_SECRETMEM=y # CONFIG_ANON_VMA_NAME is not set # CONFIG_USERFAULTFD is not set CONFIG_LRU_GEN=y -CONFIG_LRU_GEN_ENABLED=y +# CONFIG_LRU_GEN_ENABLED is not set # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN_WALKS_MMU=y CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y @@ -959,7 +959,6 @@ CONFIG_SKB_EXTENSIONS=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=m CONFIG_UNIX=y -CONFIG_UNIX_SCM=y CONFIG_AF_UNIX_OOB=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m @@ -1280,6 +1279,7 @@ CONFIG_IP_SET_LIST_SET=m # IP: Netfilter Configuration # CONFIG_NF_DEFRAG_IPV4=m +CONFIG_IP_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y @@ -1312,6 +1312,7 @@ CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_SECURITY is not set CONFIG_IP_NF_ARPTABLES=m +CONFIG_NFT_COMPAT_ARP=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m # end of IP: Netfilter Configuration @@ -1319,6 +1320,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # +CONFIG_IP6_NF_IPTABLES_LEGACY=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y @@ -1461,7 +1463,6 @@ CONFIG_NET_ACT_GACT=y # CONFIG_GACT_PROB is not set CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_SAMPLE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m # CONFIG_NET_ACT_PEDIT is not set # CONFIG_NET_ACT_SIMP 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 @@ -1640,6 +1640,7 @@ CONFIG_ETHTOOL_NETLINK=y # CONFIG_ARM_AMBA=y CONFIG_HAVE_PCI=y +CONFIG_GENERIC_PCI_IOMAP=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS_GENERIC=y @@ -2078,6 +2079,7 @@ CONFIG_DM_CRYPT=m # CONFIG_DM_SWITCH is not set # CONFIG_DM_LOG_WRITES is not set # CONFIG_DM_INTEGRITY is not set +# CONFIG_DM_VDO is not set # CONFIG_TARGET_CORE is not set # CONFIG_FUSION is not set @@ -2164,7 +2166,11 @@ CONFIG_MICROCHIP_PHY=m # CONFIG_NXP_C45_TJA11XX_PHY is not set # CONFIG_NXP_TJA11XX_PHY is not set # CONFIG_NCN26000_PHY is not set +CONFIG_QCOM_NET_PHYLIB=m CONFIG_AT803X_PHY=m +# CONFIG_QCA83XX_PHY is not set +# CONFIG_QCA808X_PHY is not set +# CONFIG_QCA807X_PHY is not set CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m # CONFIG_RENESAS_PHY is not set @@ -2439,6 +2445,8 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_EXC3000 is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GOODIX is not set +# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set +# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set @@ -2553,7 +2561,6 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -2823,6 +2830,7 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=m CONFIG_PTP_1588_CLOCK_KVM=m # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set # CONFIG_PTP_1588_CLOCK_IDTCM is not set +# CONFIG_PTP_1588_CLOCK_FC3W is not set # CONFIG_PTP_1588_CLOCK_MOCK is not set # end of PTP clock support @@ -2834,6 +2842,7 @@ CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y # CONFIG_PINCTRL_AS3722 is not set # CONFIG_PINCTRL_AXP209 is not set +# CONFIG_PINCTRL_AW9523 is not set # CONFIG_PINCTRL_CY8C95X0 is not set CONFIG_PINCTRL_MAX77620=y # CONFIG_PINCTRL_MCP23S08 is not set @@ -2901,6 +2910,7 @@ CONFIG_GPIO_PCA953X_IRQ=y # # MFD GPIO expanders # +CONFIG_GPIO_CROS_EC=m CONFIG_GPIO_MAX77620=y # CONFIG_GPIO_PALMAS is not set # CONFIG_GPIO_TPS6586X is not set @@ -3032,9 +3042,11 @@ CONFIG_SENSORS_ADT7475=m # CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set # CONFIG_SENSORS_AS370 is not set CONFIG_SENSORS_ASC7621=m +# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set # CONFIG_SENSORS_AXI_FAN_CONTROL is not set CONFIG_SENSORS_ARM_SCPI=m CONFIG_SENSORS_ATXP1=m +# CONFIG_SENSORS_CHIPCAP2 is not set # CONFIG_SENSORS_CORSAIR_CPRO is not set # CONFIG_SENSORS_CORSAIR_PSU is not set CONFIG_SENSORS_DS620=m @@ -3070,6 +3082,7 @@ CONFIG_SENSORS_LTC4222=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4260=m CONFIG_SENSORS_LTC4261=m +# CONFIG_SENSORS_LTC4282 is not set # CONFIG_SENSORS_MAX1111 is not set # CONFIG_SENSORS_MAX127 is not set CONFIG_SENSORS_MAX16065=m @@ -3119,6 +3132,7 @@ CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m # CONFIG_SENSORS_NPCM7XX is not set # CONFIG_SENSORS_NZXT_KRAKEN2 is not set +# CONFIG_SENSORS_NZXT_KRAKEN3 is not set # CONFIG_SENSORS_NZXT_SMART2 is not set # CONFIG_SENSORS_OCC_P8_I2C is not set CONFIG_SENSORS_PCF8591=m @@ -3160,6 +3174,7 @@ CONFIG_SENSORS_MAX8688=m # CONFIG_SENSORS_MP5023 is not set # CONFIG_SENSORS_MP5990 is not set # CONFIG_SENSORS_MPQ7932 is not set +# CONFIG_SENSORS_MPQ8785 is not set # CONFIG_SENSORS_PIM4328 is not set # CONFIG_SENSORS_PLI1209BC is not set # CONFIG_SENSORS_PM6764TR is not set @@ -3175,6 +3190,7 @@ CONFIG_SENSORS_UCD9200=m # CONFIG_SENSORS_XDPE152 is not set # CONFIG_SENSORS_XDPE122 is not set CONFIG_SENSORS_ZL6100=m +# CONFIG_SENSORS_PT5161L is not set CONFIG_SENSORS_PWM_FAN=m # CONFIG_SENSORS_SBTSI is not set # CONFIG_SENSORS_SBRMI is not set @@ -3232,7 +3248,6 @@ CONFIG_THERMAL=y # CONFIG_THERMAL_STATISTICS is not set CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_OF=y -CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set @@ -3268,6 +3283,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # Watchdog Device Drivers # # CONFIG_SOFT_WATCHDOG is not set +CONFIG_CROS_EC_WATCHDOG=m # CONFIG_GPIO_WATCHDOG is not set # CONFIG_XILINX_WATCHDOG is not set # CONFIG_XILINX_WINDOW_WATCHDOG is not set @@ -3897,8 +3913,7 @@ CONFIG_MEDIA_TUNER_XC5000=m # # Graphics support # -CONFIG_VIDEO_CMDLINE=y -CONFIG_VIDEO_NOMODESET=y +CONFIG_VIDEO=y # CONFIG_AUXDISPLAY is not set CONFIG_DRM=y CONFIG_DRM_MIPI_DSI=y @@ -3969,15 +3984,15 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_AUO_A030JTN01 is not set # CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set +# CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A is not set # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set -# CONFIG_DRM_PANEL_DSI_CM is not set -# CONFIG_DRM_PANEL_LVDS is not set -CONFIG_DRM_PANEL_SIMPLE=m -CONFIG_DRM_PANEL_EDP=y # CONFIG_DRM_PANEL_EBBG_FT8719 is not set # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set +# CONFIG_DRM_PANEL_DSI_CM is not set +# CONFIG_DRM_PANEL_LVDS is not set +# CONFIG_DRM_PANEL_HIMAX_HX83112A is not set # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set @@ -3987,17 +4002,17 @@ CONFIG_DRM_PANEL_EDP=y # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set -# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_JDI_LPM102A188A is not set +# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_JDI_R63452 is not set # CONFIG_DRM_PANEL_KHADAS_TS050 is not set # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set -# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set +# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set # CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set @@ -4006,8 +4021,8 @@ CONFIG_DRM_PANEL_EDP=y # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set +# CONFIG_DRM_PANEL_NOVATEK_NT36672E is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set -# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set # CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set # CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set @@ -4018,15 +4033,16 @@ CONFIG_DRM_PANEL_EDP=y # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set +# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set -# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set # CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set @@ -4037,19 +4053,21 @@ CONFIG_DRM_PANEL_EDP=y # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set -# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set # CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set +CONFIG_DRM_PANEL_EDP=y +CONFIG_DRM_PANEL_SIMPLE=m +# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set +# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set # CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set -# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels @@ -4200,6 +4218,7 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_KTD253 is not set +# CONFIG_BACKLIGHT_KTD2801 is not set # CONFIG_BACKLIGHT_KTZ8866 is not set CONFIG_BACKLIGHT_PWM=y # CONFIG_BACKLIGHT_QCOM_WLED is not set @@ -4792,6 +4811,7 @@ CONFIG_USB_OTG=y # CONFIG_USB_OTG_FSM is not set # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1 CONFIG_USB_MON=m # @@ -5022,6 +5042,7 @@ CONFIG_TYPEC_UCSI=m # CONFIG_TYPEC_MUX_FSA4480 is not set # CONFIG_TYPEC_MUX_GPIO_SBU is not set # CONFIG_TYPEC_MUX_PI3USB30532 is not set +# CONFIG_TYPEC_MUX_IT5205 is not set # CONFIG_TYPEC_MUX_NB7VPQ904M is not set # CONFIG_TYPEC_MUX_PTN36502 is not set # CONFIG_TYPEC_MUX_WCD939X_USBSS is not set @@ -5069,6 +5090,7 @@ CONFIG_MMC_DW_PLTFM=y # CONFIG_MMC_DW_BLUEFIELD is not set # CONFIG_MMC_DW_EXYNOS is not set # CONFIG_MMC_DW_HI3798CV200 is not set +# CONFIG_MMC_DW_HI3798MV200 is not set # CONFIG_MMC_DW_K3 is not set CONFIG_MMC_DW_PCI=y CONFIG_MMC_DW_ROCKCHIP=y @@ -5151,6 +5173,7 @@ CONFIG_LEDS_USER=m # # CONFIG_LEDS_GROUP_MULTICOLOR is not set # CONFIG_LEDS_KTD202X is not set +# CONFIG_LEDS_NCP5623 is not set # CONFIG_LEDS_PWM_MULTICOLOR is not set # CONFIG_LEDS_QCOM_LPG is not set @@ -5371,6 +5394,7 @@ CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_PCI_MMAP=y CONFIG_VFIO_PCI_INTX=y CONFIG_VFIO_PCI=m +# CONFIG_NVGRACE_GPU_VFIO_PCI is not set # end of VFIO support for PCI devices # @@ -5474,7 +5498,6 @@ CONFIG_VIDEO_ROCKCHIP_VDEC=m # StarFive media platform drivers # # CONFIG_STAGING_MEDIA_DEPRECATED is not set -# CONFIG_STAGING_BOARD is not set # CONFIG_LTE_GDM724X is not set # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set @@ -5651,6 +5674,7 @@ CONFIG_ROCKCHIP_IOMMU=y # # Qualcomm SoC drivers # +# CONFIG_QCOM_PBS is not set # end of Qualcomm SoC drivers CONFIG_ROCKCHIP_GRF=y @@ -5816,6 +5840,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m # CONFIG_AD7923 is not set # CONFIG_AD7949 is not set # CONFIG_AD799X is not set +# CONFIG_AD9467 is not set # CONFIG_ADI_AXI_ADC is not set # CONFIG_AXP20X_ADC is not set # CONFIG_AXP288_ADC is not set @@ -5843,6 +5868,7 @@ CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m # CONFIG_MCP3564 is not set # CONFIG_MCP3911 is not set # CONFIG_NAU7802 is not set +# CONFIG_PAC1934 is not set # CONFIG_PALMAS_GPADC is not set CONFIG_QCOM_VADC_COMMON=m # CONFIG_QCOM_SPMI_IADC is not set @@ -5861,6 +5887,7 @@ CONFIG_ROCKCHIP_SARADC=m # CONFIG_TI_ADS1015 is not set # CONFIG_TI_ADS7924 is not set # CONFIG_TI_ADS1100 is not set +# CONFIG_TI_ADS1298 is not set # CONFIG_TI_ADS7950 is not set # CONFIG_TI_ADS8344 is not set # CONFIG_TI_ADS8688 is not set @@ -6015,6 +6042,7 @@ CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m # CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set # CONFIG_ADF4377 is not set +# CONFIG_ADMFM2000 is not set # CONFIG_ADMV1013 is not set # CONFIG_ADMV1014 is not set # CONFIG_ADMV4420 is not set @@ -6152,6 +6180,7 @@ CONFIG_TSL2583=m # # Magnetometer sensors # +# CONFIG_AF8133J is not set CONFIG_AK8974=m CONFIG_AK8975=m # CONFIG_AK09911 is not set @@ -6323,6 +6352,7 @@ CONFIG_PARTITION_PERCPU=y # CONFIG_IPACK_BUS is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_GPIO is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESET_TI_TPS380X is not set @@ -6361,6 +6391,7 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y # CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set # CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY is not set CONFIG_PHY_ROCKCHIP_PCIE=y +CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y # CONFIG_PHY_ROCKCHIP_SNPS_PCIE3 is not set CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_PHY_ROCKCHIP_USB=m @@ -6372,24 +6403,6 @@ CONFIG_POWERCAP=y CONFIG_IDLE_INJECT=y # CONFIG_DTPM is not set # CONFIG_MCB is not set - -# -# Performance monitor support -# -# CONFIG_ARM_CCI_PMU is not set -# CONFIG_ARM_CCN is not set -# CONFIG_ARM_CMN is not set -CONFIG_ARM_PMU=y -# CONFIG_ARM_SMMU_V3_PMU is not set -CONFIG_ARM_PMUV3=y -# CONFIG_ARM_DSU_PMU is not set -# CONFIG_ARM_SPE_PMU is not set -# CONFIG_HISI_PCIE_PMU is not set -# CONFIG_HNS3_PMU is not set -# CONFIG_DWC_PCIE_PMU is not set -# CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set -# end of Performance monitor support - CONFIG_RAS=y # CONFIG_USB4 is not set @@ -6422,7 +6435,6 @@ CONFIG_NVMEM_ROCKCHIP_OTP=m # # CONFIG_STM is not set # CONFIG_INTEL_TH is not set -# CONFIG_HISI_PTT is not set # end of HW tracing support # CONFIG_FPGA is not set @@ -6525,6 +6537,7 @@ CONFIG_QUOTACTL=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m +CONFIG_FUSE_PASSTHROUGH=y CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y @@ -6561,13 +6574,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_DEFAULT_UTF8=y CONFIG_EXFAT_FS=m CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y CONFIG_NTFS3_FS=m # CONFIG_NTFS3_64BIT_CLUSTER is not set # CONFIG_NTFS3_LZX_XPRESS is not set # CONFIG_NTFS3_FS_POSIX_ACL is not set +# CONFIG_NTFS_FS is not set # end of DOS/FAT/EXFAT/NT Filesystems # @@ -6740,8 +6751,7 @@ CONFIG_NLS_KOI8_R=m # CONFIG_NLS_MAC_TURKISH is not set CONFIG_NLS_UTF8=m CONFIG_NLS_UCS2_UTILS=m -CONFIG_DLM=m -# CONFIG_DLM_DEBUG is not set +# CONFIG_DLM is not set # CONFIG_UNICODE is not set CONFIG_IO_WQ=y # end of File systems @@ -6757,6 +6767,7 @@ CONFIG_TRUSTED_KEYS_TPM=y CONFIG_ENCRYPTED_KEYS=y # CONFIG_USER_DECRYPTED_DATA is not set CONFIG_KEY_DH_OPERATIONS=y +# CONFIG_KEY_NOTIFICATIONS is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y # CONFIG_SECURITYFS is not set @@ -7079,7 +7090,6 @@ CONFIG_GENERIC_NET_UTILS=y # CONFIG_CORDIC is not set # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y -CONFIG_GENERIC_PCI_IOMAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_ARCH_USE_SYM_ANNOTATIONS=y @@ -7261,7 +7271,7 @@ CONFIG_FRAME_POINTER=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_DEBUG_FS is not set CONFIG_HAVE_ARCH_KGDB=y -CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +CONFIG_ARCH_HAS_UBSAN=y # CONFIG_UBSAN is not set CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments diff --git a/testing/linux-starfive/APKBUILD b/testing/linux-starfive/APKBUILD index 90a362643df..1f156653cd3 100644 --- a/testing/linux-starfive/APKBUILD +++ b/testing/linux-starfive/APKBUILD @@ -2,7 +2,7 @@ _flavor=starfive pkgname=linux-${_flavor} -pkgver=6.8.7 +pkgver=6.8.9 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -245,7 +245,7 @@ echo "***********************************" sha512sums=" 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068 linux-6.8.tar.xz -19f6ff889e643bd46bce57ff9312900ab2bf866a8c2eaf0ab545bd6f4189872346c861672babbff991dbb04e3ef1a9b805aaac491d660482bdedc30af5922a0c patch-6.8.7.xz -9d6ec9c178d5fb35669ad8f9ea86374bc26fbe998be8f285bfb2b891d6a53b0aa9ed5b0c8023e9322868488546a20dbbf5aeca2612f8813e5ade18ba3ae28f62 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 29494f3e5b2..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.7 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/linuxkit/APKBUILD b/testing/linuxkit/APKBUILD index fd987d95ef6..ac3dfa0cdf9 100644 --- a/testing/linuxkit/APKBUILD +++ b/testing/linuxkit/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=linuxkit pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Toolkit for building immutable operating systems for containers" url="https://github.com/linuxkit/linuxkit" # 32-bit platforms: github.com/rn/iso9660wrap: integer overflow diff --git a/testing/listenbrainz-mpd/APKBUILD b/testing/listenbrainz-mpd/APKBUILD index b6bde336fcc..3c1c191db82 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.5 +pkgver=2.3.6 pkgrel=0 pkgdesc="ListenBrainz submission client for MPD written in Rust" url="https://codeberg.org/elomatreb/listenbrainz-mpd" @@ -44,5 +44,5 @@ package() { } sha512sums=" -d7a590a07646e7384b7f4a557163b16fc210d36a6343ee3d79b4a113e22a16bb2a09abc428deac7279a5a9c5461587da74e7e45ddc014faa17674e1093d1dca4 listenbrainz-mpd-2.3.5.tar.gz +3e429dc14ff1310a809834321999044d17da6ae2e4efe8894ac408dc4fc725941e2913f68e2250fc0d8eb8edcfad3169b2b6e364eb2304e011bd44e037fea56f listenbrainz-mpd-2.3.6.tar.gz " diff --git a/testing/lite-xl/APKBUILD b/testing/lite-xl/APKBUILD index 2c527aa9df8..25396602e6a 100644 --- a/testing/lite-xl/APKBUILD +++ b/testing/lite-xl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jakub Panek <me@panekj.dev> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=lite-xl -pkgver=2.1.1 -pkgrel=1 +pkgver=2.1.4 +pkgrel=0 pkgdesc="Lightweight text editor written in Lua" url="https://lite-xl.github.io" arch="all" @@ -21,7 +21,10 @@ source="https://github.com/lite-xl/lite-xl/archive/v$pkgver/lite-xl-$pkgver.tar. options="!check" # no tests available build() { - abuild-meson -Darch_tuple="$CARCH-linux" . output + abuild-meson \ + -Darch_tuple="$CARCH-linux" \ + -Duse_system_lua=true \ + . output meson compile -C output } @@ -30,5 +33,5 @@ package() { } sha512sums=" -224bf8e2629f2dcd9bc5c8468a0f3f8fd6453db910241e79c8d3ba6902202a31df8381f0dd9c5fb797ad98df7bc122ea288accb58353fe310ed770d0874268e5 lite-xl-2.1.1.tar.gz +41070e533e6f4b681b1f8180310da5ddc6975ed50f4d44895f5d61925c5a7527a9161dc63cbc3140c7ca83bac572135a085dc10c547f8acb2f107aaebbcfe691 lite-xl-2.1.4.tar.gz " diff --git a/testing/lomiri-location-service/APKBUILD b/testing/lomiri-location-service/APKBUILD index af45a93b18b..45d494dbeb5 100644 --- a/testing/lomiri-location-service/APKBUILD +++ b/testing/lomiri-location-service/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=lomiri-location-service pkgver=3.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Location service aggregating position/velocity/heading updates and exporting them over dbus" arch="all" url="https://gitlab.com/ubports/development/core/location-service" diff --git a/testing/lomiri-trust-store/10-boost_1.84.patch b/testing/lomiri-trust-store/10-boost_1.84.patch new file mode 100644 index 00000000000..baa45e861c1 --- /dev/null +++ b/testing/lomiri-trust-store/10-boost_1.84.patch @@ -0,0 +1,41 @@ +From 569f6b35d8bcdb2ae5ff84549cd92cfc0899675b Mon Sep 17 00:00:00 2001 +From: Brandon Boese <brandonboese@protonmail.com> +Date: Tue, 23 Apr 2024 00:20:13 -0400 +Subject: [PATCH] remove () from boost placeholders + +--- + src/core/trust/daemon.cpp | 4 ++-- + src/core/trust/remote/posix.cpp | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/core/trust/daemon.cpp b/src/core/trust/daemon.cpp +index 82c817a..6b226bd 100644 +--- a/src/core/trust/daemon.cpp ++++ b/src/core/trust/daemon.cpp +@@ -502,8 +502,8 @@ struct Shell : public std::enable_shared_from_this<Shell> + boost::bind( + &Shell::read_finished, + shared_from_this(), +- boost::asio::placeholders::error(), +- boost::asio::placeholders::bytes_transferred())); ++ boost::asio::placeholders::error, ++ boost::asio::placeholders::bytes_transferred)); + } + + // Invoked in case of errors or if one line has been read from stdin. +diff --git a/src/core/trust/remote/posix.cpp b/src/core/trust/remote/posix.cpp +index d8750dd..fb159b4 100644 +--- a/src/core/trust/remote/posix.cpp ++++ b/src/core/trust/remote/posix.cpp +@@ -126,7 +126,7 @@ void remote::posix::Stub::start_accept() + session->socket, + boost::bind(&remote::posix::Stub::on_new_session, + shared_from_this(), +- boost::asio::placeholders::error(), ++ boost::asio::placeholders::error, + session)); + } + +-- +GitLab + diff --git a/testing/lomiri-trust-store/APKBUILD b/testing/lomiri-trust-store/APKBUILD index cd89fb42fb9..0296ca76dc1 100644 --- a/testing/lomiri-trust-store/APKBUILD +++ b/testing/lomiri-trust-store/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Luca Weiss <luca@z3ntu.xyz> pkgname=lomiri-trust-store pkgver=2.0.2 -pkgrel=0 +pkgrel=1 pkgdesc="API for creating, reading, updating and deleting trust requests answered by users" url="https://gitlab.com/ubports/development/core/trust-store" arch="all" @@ -28,7 +28,9 @@ checkdepends=" coreutils dbus " -source="https://gitlab.com/ubports/development/core/trust-store/-/archive/$pkgver/trust-store-$pkgver.tar.gz" +source="https://gitlab.com/ubports/development/core/trust-store/-/archive/$pkgver/trust-store-$pkgver.tar.gz + 10-boost_1.84.patch + " subpackages="$pkgname-dev $pkgname-lang" builddir="$srcdir/trust-store-$pkgver" options="!check" # some tests fail @@ -53,4 +55,5 @@ package() { sha512sums=" 3dab27f752ad12845a41af04c3a749d89043a2d36cdd81f4705399144b7747f1f37142df8e30e70003ab42d75171e01e99bc6678d39e277f94eb0a8267c856b7 trust-store-2.0.2.tar.gz +269b93bb39711f9e3a36d8fcc6d0505e07a42808ee4ba7b1cd15692e06f8fd333fcc6c6641b76d93a5e270e82b26dbbc4e477c2cc7e25f8715b19fe3986e8ae6 10-boost_1.84.patch " diff --git a/testing/lomiri/APKBUILD b/testing/lomiri/APKBUILD index 3a2e4ea2beb..dfd37c066ba 100644 --- a/testing/lomiri/APKBUILD +++ b/testing/lomiri/APKBUILD @@ -6,7 +6,8 @@ pkgrel=1 pkgdesc="A convergent desktop environment" # armhf: blocked by lomiri-ui-toolkit # s390x, riscv64, ppc64le: blocked by lomiri-system-settings -arch="all !armhf !s390x !riscv64 !ppc64le" +# loongarch64: blocked by qtmir +arch="all !armhf !s390x !riscv64 !ppc64le !loongarch64" url="https://gitlab.com/ubports/development/core/lomiri" license="GPL-3.0-only AND LGPL-2.1-only" depends=" diff --git a/testing/lua-language-server/APKBUILD b/testing/lua-language-server/APKBUILD index 0d0eab3cbf6..e5d6ad16f63 100644 --- a/testing/lua-language-server/APKBUILD +++ b/testing/lua-language-server/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Jordan Christiansen <xordspar0@gmail.com> pkgname=lua-language-server -pkgver=3.8.3 +pkgver=3.9.1 pkgrel=0 pkgdesc="Language Server for Lua" url="https://github.com/LuaLS/lua-language-server" @@ -43,7 +43,7 @@ package() { } sha512sums=" -d9335aef8fe36e6369aa32f042d521ea9234e2c1354e4731aa58003f9c81b3392b8315cd35a69ec980224647cc74e26216ab399a1a3a079d96a5351868a75492 lua-language-server-3.8.3.tar.gz -3f2bc7369c66f71556a45004d30b0d9926bf2b6ef692068dcbd347393b9e6599a503ee5fde9682fce870c556b88c1af3a5c9e0cd10b2c8f80341b0b3368a048d lua-language-server-submodules-3.8.3.zip.noauto +21995c21f2616f4b1f25523d13928f1d2991b45b219a34c746f830c2e4d711ade10238c6a2e3ddc16673dcdeb79bf97db0b1f4083f47aa967d5d0198320e825a lua-language-server-3.9.1.tar.gz +305b036d804d3864a0baecabf4cc9bf46f0bd9ffcf3cb5ced9f57b0b29b8d9231b7283970ef38bd1669be05da795f08627a56a5eb83a70d71e2768254cf497bc lua-language-server-submodules-3.9.1.zip.noauto d8d34d2ae8073c256b5f98f4cc7db058fbb92d63a5709894fca898ab47fcfcfca2d1419a1060c29464fbad937e3d09f0cde404b4d98609eec934ea4392044849 wrapper " diff --git a/testing/lua-resty-openssl/APKBUILD b/testing/lua-resty-openssl/APKBUILD deleted file mode 100644 index e2a5b4f9f93..00000000000 --- a/testing/lua-resty-openssl/APKBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks> -# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks> -pkgname=lua-resty-openssl -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 -# armhf, armv7, s390x, x86: failing tests -arch="aarch64 x86_64" -license="BSD-2-Clause" -depends=" - libcrypto3 - libssl3 - luajit - " -checkdepends=" - bash - openresty - perl-test-harness-utils - perl-test-nginx - " -source="https://github.com/fffonion/lua-resty-openssl/archive/refs/tags/$pkgver/lua-resty-openssl-$pkgver.tar.gz" - -check() { - prove -r t -} - -package() { - mkdir -p "$pkgdir/usr/share/lua/common" - cp -r ./lib/resty "$pkgdir/usr/share/lua/common" -} - -sha512sums=" -02d9542d716a9dd9c319a2cb5228b0461dd5c8fee9650e7f87f3c8f4c115677fcb1cea208d4e4105882198b6f6a9afe8896140b6ffb6c6200701d6d4a47813cd lua-resty-openssl-0.8.22.tar.gz -" 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/lxd-feature/APKBUILD b/testing/lxd-feature/APKBUILD index cd4485e29f7..fa2071f7347 100644 --- a/testing/lxd-feature/APKBUILD +++ b/testing/lxd-feature/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=lxd-feature pkgver=5.20 -pkgrel=2 +pkgrel=3 pkgdesc="Container hypervisor and a new user experience for LXC - 'Feature' release channel" url="https://ubuntu.com/lxd" arch="all" diff --git a/testing/lyrebird/APKBUILD b/testing/lyrebird/APKBUILD index 8a161ec2e15..0464456f9c1 100644 --- a/testing/lyrebird/APKBUILD +++ b/testing/lyrebird/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Katie Holly <holly@fuslvz.ws> # Maintainer: Katie Holly <holly@fuslvz.ws> pkgname=lyrebird -pkgver=0.1.0 -pkgrel=4 +pkgver=0.2.0 +pkgrel=0 pkgdesc="pluggable transport proxy for Tor, implementing obfs4" url="https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird" arch="all" @@ -31,5 +31,5 @@ package() { } sha512sums=" -f9b8686d1c5f9ddb41a255a1a8954e05cefd50523ada7360432b456c62475ba606872df407ba8ebd7714d4f185eef0efae63e3e53c5c1c18fd323a97912f951e lyrebird-0.1.0.tar.bz2 +66e026c1c19d418f57ab3d5550257614056f24035bd991dddb4eb71bb9000d17abcd22aeb9d36cd52e3f1c7e9a2acdafdf71e05b1bf0c91d64c2d881d08fa66b lyrebird-0.2.0.tar.bz2 " 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/maddy/APKBUILD b/testing/maddy/APKBUILD index 22aac31e1b7..01386d7a21e 100644 --- a/testing/maddy/APKBUILD +++ b/testing/maddy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=maddy pkgver=0.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="Composable all-in-one mail server" url="https://maddy.email/" license="GPL-3.0-or-later" diff --git a/testing/mage/APKBUILD b/testing/mage/APKBUILD index 6f690acae98..0a8b3ded1b1 100644 --- a/testing/mage/APKBUILD +++ b/testing/mage/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Mark Pashmfouroush <mark@markpash.me> pkgname=mage pkgver=1.13.0 -pkgrel=15 +pkgrel=16 # Commit hash that corresponds to the version _commit=3504e09d7fcfdeab6e70281edce5d5dfb205f31a pkgdesc="make-like build tool using Go" diff --git a/testing/maildir2rss/APKBUILD b/testing/maildir2rss/APKBUILD index 4ff7b5e9177..d34826a7dd2 100644 --- a/testing/maildir2rss/APKBUILD +++ b/testing/maildir2rss/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Cowington Post <cowingtonpost@gmail.com> pkgname=maildir2rss pkgver=0.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Convert a maildir to a rss feed" url="https://git.sr.ht/~cowingtonpost/maildir2rss" arch="all" diff --git a/testing/mailsec-check/APKBUILD b/testing/mailsec-check/APKBUILD index 093e13f85a8..d7ede9c7534 100644 --- a/testing/mailsec-check/APKBUILD +++ b/testing/mailsec-check/APKBUILD @@ -3,7 +3,7 @@ pkgname=mailsec-check pkgver=0_git20210729 _commit=a4aa6329a96ae6403791a51ddb8ac880af5b4eb3 -pkgrel=18 +pkgrel=19 pkgdesc="Utility to analyze state of deployment of security-related email protocols" url="https://github.com/foxcpp/mailsec-check" license="MIT" diff --git a/testing/mailtutan/APKBUILD b/testing/mailtutan/APKBUILD index 7873685dfe1..a2c7737a816 100644 --- a/testing/mailtutan/APKBUILD +++ b/testing/mailtutan/APKBUILD @@ -5,7 +5,7 @@ pkgver=0.3.0 pkgrel=0 pkgdesc="An SMTP server for test and development environments written in Rust" url="https://github.com/mailtutan/mailtutan" -arch="all !s390x !riscv64 !ppc64le" # builds fail due to ring (dependency), see issues 986, 1612 and 1630 respectively at https://github.com/briansmith/ring +arch="all !s390x !riscv64 !ppc64le !loongarch64" # builds fail due to ring (dependency), see issues 986, 1612 and 1630 respectively at https://github.com/briansmith/ring license="MIT" makedepends=" cargo diff --git a/testing/makeclapman/APKBUILD b/testing/makeclapman/APKBUILD new file mode 100644 index 00000000000..2534ac5bca2 --- /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=1 +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/mangal/APKBUILD b/testing/mangal/APKBUILD index 5fc9f5b45a2..6bb91eb466f 100644 --- a/testing/mangal/APKBUILD +++ b/testing/mangal/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=mangal pkgver=4.0.6 -pkgrel=10 +pkgrel=11 pkgdesc="Fancy TUI manga downloader" url="https://github.com/metafates/mangal" arch="all" diff --git a/testing/manifest-tool/APKBUILD b/testing/manifest-tool/APKBUILD index eb8a9870b33..bf515d2e03a 100644 --- a/testing/manifest-tool/APKBUILD +++ b/testing/manifest-tool/APKBUILD @@ -3,7 +3,7 @@ pkgname=manifest-tool pkgver=2.1.6 _pkgcommit=d96ae95374f885e40b1e7de367c72ab09d7dc362 -pkgrel=2 +pkgrel=3 pkgdesc="tool for inspecting and creating multi-platform container images" url="https://github.com/estesp/manifest-tool" arch="all" diff --git a/testing/manticore/APKBUILD b/testing/manticore/APKBUILD index 8cee589fe7d..cacf24e6431 100644 --- a/testing/manticore/APKBUILD +++ b/testing/manticore/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Noel Kuntze <noel.kuntze@contauro.com> pkgname=manticore pkgver=6.2.12 -pkgrel=0 +pkgrel=1 pkgdesc="Easy to use open source fast database for search" url="https://manticoresearch.com/" # 32-bit systems fail to build, tests fail on s390x, ppc64le doc fail. @@ -31,7 +31,7 @@ makedepends=" unixodbc-dev zstd-dev " -checkdepends="php82" +checkdepends="php83" pkgusers="manticore" pkggroups="manticore" subpackages=" diff --git a/testing/mapnik/APKBUILD b/testing/mapnik/APKBUILD index f86a372eedf..c460ed9af54 100644 --- a/testing/mapnik/APKBUILD +++ b/testing/mapnik/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Markus Juenemann <markus@juenemann.net> pkgname=mapnik pkgver=3.1.0 -pkgrel=25 +pkgrel=26 pkgdesc="An open source toolkit for developing mapping applications" url="https://mapnik.org/" arch="all" @@ -31,6 +31,8 @@ source="https://github.com/mapnik/mapnik/releases/download/v$pkgver/mapnik-v$pkg boost-1.77.patch gcc13.patch scons4.patch + libxml2.patch + boost-1.83.patch " builddir="$srcdir/$pkgname-v$pkgver" options="!check" # fail to build @@ -75,4 +77,6 @@ sha512sums=" b5961faf1bf903fca0d92408f4b9a783e61b5c06e89c9318aa7f59c6ca98be922504909ae7cf59dd09e953378952f7af3335f3f71cb1ff9f5a8a8c8f7c729f6d boost-1.77.patch b9de94825d5c9934adcfd451b1fada42d17d9b79345649c19d9d1b3db333309086b7de711e9fb44038a3ba992c27d520f6a5a66f656c267f9e8d286ad2bec920 gcc13.patch e0c60c696b9d195ad0e430c8c4fb9c36465d9635fae3e4a8b25dca4b421d90330994285c92dfcefe929a196ff87345da278a564d8fa9f3ac29a46d9e2dfa3110 scons4.patch +1333cb498f5c617ad9179f7920869c91d81f2905a97f1b3e230c486f996cfc012a44fa83863d70a30b8c29f950a16e61fd4cbbf9fc71c82bf89fa672b863aa19 libxml2.patch +9f4def2f41932c6e80c0ace4b9d80744bdd51e9dff71ec13328b220fb445739c0633e1a313d70c26f591aaeadfc0304b8544cc49b0dc8b836707c4d4b9079c74 boost-1.83.patch " diff --git a/testing/mapnik/boost-1.83.patch b/testing/mapnik/boost-1.83.patch new file mode 100644 index 00000000000..4c6463072cb --- /dev/null +++ b/testing/mapnik/boost-1.83.patch @@ -0,0 +1,53 @@ +Author: Antonio Rojas +Summary: fixes for boost 1.83 +URL: https://gitlab.archlinux.org/archlinux/packaging/packages/mapnik/-/blob/f9f723222c0af50e4db747e7c4e8138dbc769f53/boost-1.83.patch +---- + +diff --git a/include/mapnik/geometry/boost_spirit_karma_adapter.hpp b/include/mapnik/geometry/boost_spirit_karma_adapter.hpp +index a146ef1d1..bfdf00d7f 100644 +--- a/include/mapnik/geometry/boost_spirit_karma_adapter.hpp ++++ b/include/mapnik/geometry/boost_spirit_karma_adapter.hpp +@@ -25,6 +25,7 @@ + #define MAPNIK_BOOST_SPIRIT_KARMA_ADAPTER_HPP + + #include <mapnik/geometry.hpp> ++#include <cstdint> + + namespace boost { using mapbox::util::get; } + +diff --git a/include/mapnik/geometry_fusion_adapted.hpp b/include/mapnik/geometry_fusion_adapted.hpp +index 66869891a..c4b4cae13 100644 +--- a/include/mapnik/geometry_fusion_adapted.hpp ++++ b/include/mapnik/geometry_fusion_adapted.hpp +@@ -26,6 +26,7 @@ + + #include <mapnik/geometry.hpp> + #include <boost/fusion/include/adapt_struct.hpp> ++#include <cstdint> + + BOOST_FUSION_ADAPT_STRUCT( + mapnik::geometry::point<double>, +diff --git a/include/mapnik/json/generic_json.hpp b/include/mapnik/json/generic_json.hpp +index 0c4662304..b81a742c7 100644 +--- a/include/mapnik/json/generic_json.hpp ++++ b/include/mapnik/json/generic_json.hpp +@@ -32,6 +32,7 @@ + #include <boost/spirit/include/qi.hpp> + #include <boost/spirit/include/phoenix.hpp> + #include <boost/fusion/include/std_pair.hpp> ++#include <boost/regex/pending/unicode_iterator.hpp> + #pragma GCC diagnostic pop + + #include <vector> +diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp +index 916b17e01..227ee2c9b 100644 +--- a/plugins/input/csv/csv_utils.cpp ++++ b/plugins/input/csv/csv_utils.cpp +@@ -32,6 +32,7 @@ + // csv grammar + #include <mapnik/csv/csv_grammar_impl.hpp> + // ++#include <boost/algorithm/string/trim.hpp> + #include "csv_getline.hpp" + #include "csv_utils.hpp" + diff --git a/testing/mapnik/libxml2.patch b/testing/mapnik/libxml2.patch new file mode 100644 index 00000000000..3d7c4de4713 --- /dev/null +++ b/testing/mapnik/libxml2.patch @@ -0,0 +1,39 @@ +From 8cdca5f5be97b9fb4de95e0214197f879e6fcfb7 Mon Sep 17 00:00:00 2001 +From: David Hummel <6109326+hummeltech@users.noreply.github.com> +Date: Mon, 20 Nov 2023 10:21:12 -0700 +Subject: [PATCH] Fix broken builds with libxml2 >= v2.12.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +**I.E.** +``` +src/libxml2_loader.cpp:91:50: error: invalid conversion from ‘const xmlError*’ {aka ‘const _xmlError*’} to ‘xmlError*’ {aka ‘_xmlError*’} [-fpermissive] +src/libxml2_loader.cpp:131:50: error: invalid conversion from ‘const xmlError*’ {aka ‘const _xmlError*’} to ‘xmlError*’ {aka ‘_xmlError*’} [-fpermissive] +``` +--- + src/libxml2_loader.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libxml2_loader.cpp b/src/libxml2_loader.cpp +index 223d8df447..78dc8aa978 100644 +--- a/src/libxml2_loader.cpp ++++ b/src/libxml2_loader.cpp +@@ -79,7 +79,7 @@ class libxml2_loader : util::noncopyable + + if (!doc) + { +- xmlError * error = xmlCtxtGetLastError(ctx_); ++ const xmlError* error = xmlCtxtGetLastError(ctx_); + if (error) + { + std::string msg("XML document not well formed:\n"); +@@ -118,7 +118,7 @@ + if (!doc) + { + std::string msg("XML document not well formed"); +- xmlError * error = xmlCtxtGetLastError( ctx_ ); ++ const xmlError* error = xmlCtxtGetLastError(ctx_); + if (error) + { + msg += ":\n"; diff --git a/testing/mapserver/APKBUILD b/testing/mapserver/APKBUILD index 1c579db8eec..f46588bff92 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=3 +pkgrel=4 pkgdesc="CGI-based platform for publishing spatial data and interactive mapping applications to the web" url="https://mapserver.org/" # s390x: blocked by exempi-dev diff --git a/testing/mattermost-desktop/APKBUILD b/testing/mattermost-desktop/APKBUILD index 35ec8ad5a14..2d9fba67990 100644 --- a/testing/mattermost-desktop/APKBUILD +++ b/testing/mattermost-desktop/APKBUILD @@ -1,8 +1,8 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=mattermost-desktop -pkgver=5.7.0 -pkgrel=1 +pkgver=5.8.0 +pkgrel=0 _pkgver="${pkgver/_rc/-rc.}" pkgdesc="Open source collaboration for developers" url="https://mattermost.com/" @@ -75,6 +75,6 @@ package() { } sha512sums=" -b6d0e12e81bc7fa75bba9b4808480db2b64c003e41faf31157612b7f234f76b11334c4fc375adec7b1744358e28e7847e92b78dc26d4e3c10bec860095b15efd mattermost-desktop-5.7.0.tar.gz +c37b09da6129effadb1aaeec3bf0325e3eb9bbf8d4ad59a800a4e899abafc8514957e7394d3c494a337f39e2bf636ecdb734ce81154eb80a49fab3557cd47a64 mattermost-desktop-5.8.0.tar.gz 4947e5e7db708f34c812735099c83228b63be7e0f27c19272449c48405a8a49b4f5aa9b45b802c9d6e55a4898ef750d3f9d033e65bb2d0cc906429c5d2864194 mattermost-desktop " diff --git a/testing/mautrix-discord/APKBUILD b/testing/mautrix-discord/APKBUILD index 491c0f2e533..88b8cd7a961 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=4 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..f35aab8180a 100644 --- a/testing/mautrix-gmessages/APKBUILD +++ b/testing/mautrix-gmessages/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=mautrix-gmessages -pkgver=0.4.0 -pkgrel=0 +pkgver=0.4.1 +pkgrel=1 pkgdesc="Matrix-Google Messages puppeting bridge" url="https://go.mau.fi/mautrix-gmessages/" arch="all" @@ -48,8 +48,8 @@ package() { } sha512sums=" -5155910eff8f5da6f28ab264439dd1990eb07116f25744f4681e41c9bb794ae73ef997760193e439674c55bcb26c5d457c1c07b2e9b277afd61c07aed6a0b10f mautrix-gmessages-0.4.0.tar.gz -4d8d9752b97a64b1b0d97031aced7d202f9bf3462d1362a137853987de6b870b5f8a599943b63b730024ca477665f27f611090ac8c03e5fc24b5ed719d589e0a mautrix-gmessages.initd +2afcf7af5548658d9966e570241c993dd5e4b111c3701cab769eeefb9691e7688f7759e148c2a0fe91d7a33dabb957ca03feeb4d45a410a85082000a7e6ec4ee mautrix-gmessages-0.4.1.tar.gz +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..a4cea41395f 100644 --- a/testing/mautrix-meta/APKBUILD +++ b/testing/mautrix-meta/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=mautrix-meta -pkgver=0.3.0 -pkgrel=0 +pkgver=0.3.1 +pkgrel=1 pkgdesc="Matrix-Facebook Messenger and Instagram DM puppeting bridge" url="https://go.mau.fi/mautrix-meta/" arch="all" @@ -44,8 +44,8 @@ package() { } sha512sums=" -099c105ad8834f585215d0d9e3db16c1fe6d6064fe480b944e895527e44c069623f7667db8e84f90004df72dd49bdd1e1359b46e7987814e7c41a0b344ec3a67 mautrix-meta-0.3.0.tar.gz -9b870d61aa277ae3434df0167b64bb7cdff8f29bd3493f305cef40e2c132089a9a106d30161e81ec76a09c608c652caf83e1c3d481589cdf4f4791965d9fe435 mautrix-meta.initd +e0141b9adc9361236d24c94a66fdbbfcd10789f7a8f7d7a582f709c2e716eb72b7d4564c5dc58e2a5c82b37709ad2eb3a45e782aca8d74a430d2a15c0ee6db32 mautrix-meta-0.3.1.tar.gz +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..cd07cd10b9d 100644 --- a/testing/mautrix-signal/APKBUILD +++ b/testing/mautrix-signal/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=mautrix-signal -pkgver=0.6.0 +pkgver=0.6.1 _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 @@ -72,9 +72,9 @@ package() { } sha512sums=" -ac55ed462b442bc28045bd639359151b5717fef374f74a150c6597f4252cfb406c16de2b7989cb49b5e0e3c29f447427e19ac860048f7a9b2b020823694ffdba signal-0.6.0.tar.gz +36d15e65d916ddbb97d3bfb62c73b5c481fecd65d145c41d7580f5eb3f575daeb057aa6a8b9ad8b35bfc20117a2adcfe7d239aa30802e04dd2f8c9ff9a2b34ce signal-0.6.1.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..078673a575a 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=4 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/mcman/APKBUILD b/testing/mcman/APKBUILD index a0424e7df7e..b7ce195d927 100644 --- a/testing/mcman/APKBUILD +++ b/testing/mcman/APKBUILD @@ -14,6 +14,7 @@ makedepends=" subpackages="$pkgname-doc" source=" $pkgname-$pkgver.tar.gz::https://github.com/ParadigmMC/mcman/archive/refs/tags/$pkgver.tar.gz + cargo-update.patch " options="!check" # no tests @@ -34,4 +35,5 @@ package() { sha512sums=" 6b5ca9ba901d803c07932eaab38876bfe7baea767bd747692ba63de2a79924502d60fed4637578ca46cb43f3c16911e4981c85f9393c3fa0888fa5baf9ff54d5 mcman-0.4.4.tar.gz +539d864baf44e83a37ca4329f65177959bbc59f6ba899926e4f041026f34668e0b972ae44a0b3c9f26d1e9f66fc579547dfb149a70ba3ac1f91a41f78bd720f4 cargo-update.patch " diff --git a/testing/mcman/cargo-update.patch b/testing/mcman/cargo-update.patch new file mode 100644 index 00000000000..b60d1b5f9e3 --- /dev/null +++ b/testing/mcman/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 7d60dd5..56382f0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -969,9 +969,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.152" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libredox" diff --git a/testing/mdbook-katex/APKBUILD b/testing/mdbook-katex/APKBUILD index 2b6b05d17b8..a486d8cf3f3 100644 --- a/testing/mdbook-katex/APKBUILD +++ b/testing/mdbook-katex/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Cowington Post <cowingtonpost@gmail.com> pkgname=mdbook-katex -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=0 pkgdesc="Preprocessor for mdbook to render LaTeX equations in HTML" url="https://github.com/lzanini/mdbook-katex" @@ -29,5 +29,5 @@ package() { } sha512sums=" -b7091b5985a552ef9b4cfad82855fd92f663f4b632bccda1904046c23549a22916deb6adea54e583d2edf3f08115db9868be464dfbdf3e090e8197999e4230ae mdbook-katex-0.8.0.tar.gz +9f27e06d18eee97915113df0ce0ea543fe22f345e3f8d65014b0367d7e6eac1816a0acf433ee751c09e3b5133b2ba6eabf1cc85a5ba55aa3021051b1ee34c7cc mdbook-katex-0.8.1.tar.gz " diff --git a/testing/mepo/0001-zig-0.12-adapt-build.zig.patch b/testing/mepo/0001-zig-0.12-adapt-build.zig.patch deleted file mode 100644 index fd63008843b..00000000000 --- a/testing/mepo/0001-zig-0.12-adapt-build.zig.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5c4ce980285aca894c71c1bdbfce35f05d0b0261 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" <lauren@selfisekai.rocks> -Date: Sat, 20 Apr 2024 23:43:07 +0200 -Subject: [PATCH] zig 0.12: adapt build.zig - ---- - build.zig | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/build.zig b/build.zig -index c15e65d..a61082e 100644 ---- a/build.zig -+++ b/build.zig -@@ -1,8 +1,6 @@ - const std = @import("std"); --const Builder = std.build.Builder; --const LibExeObjStep = std.build.LibExeObjStep; - --fn setDependencies(step: *std.build.LibExeObjStep) void { -+fn setDependencies(step: *std.Build.Step.Compile) void { - step.linkSystemLibrary("c"); - step.linkSystemLibrary("SDL2"); - step.linkSystemLibrary("SDL2_gfx"); -@@ -11,7 +9,7 @@ fn setDependencies(step: *std.build.LibExeObjStep) void { - step.linkSystemLibrary("curl"); - } - --pub fn build(b: *Builder) void { -+pub fn build(b: *std.Build) void { - b.installDirectory(.{ - .source_dir = .{ .path = "scripts" }, - .install_dir = .{ .bin = {} }, diff --git a/testing/mepo/0002-zig-0.12-convert-some-vars-to-consts.patch b/testing/mepo/0002-zig-0.12-convert-some-vars-to-consts.patch deleted file mode 100644 index 57e0a36a9f7..00000000000 --- a/testing/mepo/0002-zig-0.12-convert-some-vars-to-consts.patch +++ /dev/null @@ -1,347 +0,0 @@ -From 48dabfd3ce237f249c63b9428462f6781eec50aa Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" <lauren@selfisekai.rocks> -Date: Sat, 20 Apr 2024 23:53:31 +0200 -Subject: [PATCH] zig 0.12: convert some vars to consts - ---- - src/Mepo.zig | 13 ++++++++----- - src/TileCache.zig | 13 ++++++------- - src/api/shellpipe_async.zig | 4 ++-- - src/blit/blit.zig | 36 +++++++++++------------------------- - src/util/utilmepolang.zig | 22 +++++++++++----------- - src/util/utilsdl.zig | 2 +- - 6 files changed, 39 insertions(+), 51 deletions(-) - -diff --git a/src/Mepo.zig b/src/Mepo.zig -index 44b7990..dc49cab 100644 ---- a/src/Mepo.zig -+++ b/src/Mepo.zig -@@ -473,7 +473,7 @@ pub fn init_video_and_sdl_stdin_loop(mepo: *@This(), enable_stdin_mepolang_repl: - - while (true) { - const stdin = &std.io.getStdIn().reader(); -- var read_slice: []const u8 = stdin.readUntilDelimiterAlloc(mepo.allocator, '\n', 102400) catch continue; -+ const read_slice: []const u8 = stdin.readUntilDelimiterAlloc(mepo.allocator, '\n', 102400) catch continue; - const slice_z = try mepo.allocator.dupeZ(u8, read_slice); - mepo.allocator.free(read_slice); - std.debug.print("Read {d} bytes, running input as mepolang\n", .{slice_z.len}); -@@ -509,7 +509,7 @@ pub fn sdl_event_loop(mepo: *@This()) !void { - - // Process SDL events - if (sdl.SDL_WaitEventTimeout(&e, config.DragThresholdTicks) > 0) { -- var pending_fn = switch (e.type) { -+ const pending_fn = switch (e.type) { - sdl.SDL_FINGERDOWN => &event_fingerdown, - sdl.SDL_FINGERUP => &event_fingerup, - sdl.SDL_KEYUP => &event_keyup, -@@ -734,7 +734,7 @@ pub fn blit(mepo: *@This()) !void { - pub fn video_init(mepo: *@This()) !void { - mepo.window = try setup_sdl_video_and_window(mepo.allocator); - mepo.renderer = renderer: { -- var r = try utilsdl.errorcheck_ptr(sdl.SDL_Renderer, sdl.SDL_CreateRenderer( -+ const r = try utilsdl.errorcheck_ptr(sdl.SDL_Renderer, sdl.SDL_CreateRenderer( - mepo.window, - -1, - switch (mepo.renderer_type) { -@@ -747,7 +747,7 @@ pub fn video_init(mepo: *@This()) !void { - }; - var sdl_renderer_info: sdl.SDL_RendererInfo = undefined; - try utilsdl.errorcheck(sdl.SDL_GetRendererInfo(mepo.renderer, &sdl_renderer_info)); -- utildbg.log("Requested renderer driver {}, using renderer: {s}\n", .{mepo.renderer_type, sdl_renderer_info.name}); -+ utildbg.log("Requested renderer driver {}, using renderer: {s}\n", .{ mepo.renderer_type, sdl_renderer_info.name }); - mepo.tile_cache.renderer = mepo.renderer; - } - -@@ -774,7 +774,10 @@ pub fn init(allocator: std.mem.Allocator, tile_cache: *TileCache, use_config: [] - return @as(@This(), .{ - .allocator = allocator, - .blit_pinlayer_cache = datastructure.EvictionHashMap( -- types.XYZ, *sdl.SDL_Texture, evict_texture, &config.MaxTextures, -+ types.XYZ, -+ *sdl.SDL_Texture, -+ evict_texture, -+ &config.MaxTextures, - ).init(allocator), - .async_shellpipe_threads = datastructure.QueueHashMap(i8, sdl.SDL_threadID).init(allocator), - .config = use_config, -diff --git a/src/TileCache.zig b/src/TileCache.zig -index 9014589..0b1fa63 100644 ---- a/src/TileCache.zig -+++ b/src/TileCache.zig -@@ -82,13 +82,13 @@ pub fn download_loop(tile_cache: *@This(), graphical_mode: bool) !void { - - // 2. Transfer from UI LIFO into transfers - while (tile_cache.queue_lifo_ui.count() > 0 and tile_cache.transfer_map.count() < p.get(p.pref.tile_cache_max_n_transfers).u) { -- var coords = tile_cache.queue_lifo_ui.pop(); -+ const coords = tile_cache.queue_lifo_ui.pop(); - try tile_cache.curl_add_to_multi_and_register_transfer(coords.key, true); - } - - // 3. Transfer from BG LIFO into transfers - while (tile_cache.queue_lifo_bg.count() > 0 and tile_cache.transfer_map.count() < p.get(p.pref.tile_cache_max_n_transfers).u) { -- var coords = tile_cache.queue_lifo_bg.pop(); -+ const coords = tile_cache.queue_lifo_bg.pop(); - try tile_cache.curl_add_to_multi_and_register_transfer(coords.key, false); - } - -@@ -259,7 +259,7 @@ pub fn tile_ui_retreive_or_queue(tile_cache: *@This(), coords: types.XYZ) !TileD - if (file_cached_png_opt) |file_cached_png| { - defer tile_cache.allocator.free(file_cached_png); - const surface = tile_cache.load_data_to_surface(file_cached_png) catch |err| { -- utildbg.log("Errored when loading data for tile {} from FS (file: {s}) to SDL Surface: {}\n", .{coords, png_fs_path, err}); -+ utildbg.log("Errored when loading data for tile {} from FS (file: {s}) to SDL Surface: {}\n", .{ coords, png_fs_path, err }); - break :load_from_fs; - }; - defer sdl.SDL_FreeSurface(surface); -@@ -285,7 +285,7 @@ pub fn tile_ui_retreive_or_queue(tile_cache: *@This(), coords: types.XYZ) !TileD - fn curl_add_to_multi_and_register_transfer(tile_cache: *@This(), coords: types.XYZ, load_to_texture: bool) !void { - if (tile_cache.transfer_map.get(coords)) |_| return; - -- var transfer_datum: *TransferDatum = datum: { -+ const transfer_datum: *TransferDatum = datum: { - var dat = try tile_cache.allocator.create(TransferDatum); - dat.client = curl.curl_easy_init().?; - dat.coords = coords; -@@ -297,7 +297,7 @@ fn curl_add_to_multi_and_register_transfer(tile_cache: *@This(), coords: types.X - }; - try tile_cache.transfer_map.put(coords, transfer_datum); - -- var tile_url = url: { -+ const tile_url = url: { - var url = try tile_cache.allocator.alloc(u8, p.get(p.pref.tile_cache_url).t.?.len + (3 * 10)); - if (cstdio.sprintf( - &url[0], -@@ -387,8 +387,7 @@ fn download_loop_progress_indicator(tile_cache: *@This(), initial_queue_size: us - \\ - , - .{ -- 100.0 * @as(f32, @floatFromInt(initial_queue_size - tile_cache.queue_lifo_bg.count())) -- / @as(f32, @floatFromInt(initial_queue_size)), -+ 100.0 * @as(f32, @floatFromInt(initial_queue_size - tile_cache.queue_lifo_bg.count())) / @as(f32, @floatFromInt(initial_queue_size)), - initial_queue_size - tile_cache.queue_lifo_bg.count(), - initial_queue_size, - tile_cache.byte_counter / 1024 / 1024, -diff --git a/src/api/shellpipe_async.zig b/src/api/shellpipe_async.zig -index 02d60c7..f45b3e4 100644 ---- a/src/api/shellpipe_async.zig -+++ b/src/api/shellpipe_async.zig -@@ -38,7 +38,7 @@ fn async_shellpipe(mepo: *Mepo, unique_handle_id: i8, cmd: []const u8) !void { - } - - fn async_shellpipe_run(userdata: ?*anyopaque) callconv(.C) c_int { -- var shellpipe_request: *AsyncShellpipeRequest = @alignCast(@ptrCast(userdata.?)); -+ const shellpipe_request: *AsyncShellpipeRequest = @alignCast(@ptrCast(userdata.?)); - async_shellpipe_run_catch_errors(shellpipe_request.mepo, shellpipe_request.unique_handle_id, shellpipe_request.cmd) catch |err| { - utildbg.log("Error running async shellpipe: {}\n", .{err}); - }; -@@ -89,7 +89,7 @@ fn async_shellpipe_run_catch_errors(mepo: *Mepo, unique_handle_id: i8, cmd: []co - if (std.mem.lastIndexOf(u8, stdout.items, ";")) |mepolang_statement_end_index| { - const statement = stdout.items[0 .. mepolang_statement_end_index + 1]; - utildbg.log("Running mepolang statement from async shellpipe: {s}\n", .{statement}); -- var heap_statement = try mepo.allocator.dupeZ(u8, statement); -+ const heap_statement = try mepo.allocator.dupeZ(u8, statement); - utilsdl.sdl_push_event_mepolang_execution(heap_statement); - try stdout.replaceRange(0, mepolang_statement_end_index + 1, &[_]u8{}); - } -diff --git a/src/blit/blit.zig b/src/blit/blit.zig -index 55f74dc..5abba0c 100644 ---- a/src/blit/blit.zig -+++ b/src/blit/blit.zig -@@ -187,7 +187,7 @@ fn blit_tile_pinlayer(mepo: *Mepo, tile_x: u32, tile_y: u32, zoom: u8, x_off: i3 - { - const pingroup_order = order: { - // E.g. place active pingroup last so its always ontop in rendering order -- var groups = [10]u8{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; -+ const groups = [10]u8{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; - var target_order: [10]u8 = undefined; - var index: u8 = 0; - for (groups) |i| { -@@ -201,7 +201,7 @@ fn blit_tile_pinlayer(mepo: *Mepo, tile_x: u32, tile_y: u32, zoom: u8, x_off: i3 - - for (pingroup_order) |pin_group_i| { - const pin_group = mepo.pin_groups[pin_group_i]; -- var is_active_path_track= false; -+ var is_active_path_track = false; - var prev_pin: ?*types.Pin = null; - for (pin_group.items, 0..) |*pin, pin_i| { - defer prev_pin = pin; -@@ -227,26 +227,12 @@ fn blit_tile_pinlayer(mepo: *Mepo, tile_x: u32, tile_y: u32, zoom: u8, x_off: i3 - } - }; - -- try blit_pin( -- mepo, -- pin, -- if (prev_pin != null) prev_pin else null, -- @intCast(pin_group_i), -- is_active_path, -- .{ .x = tile_x, .y = tile_y, .z = zoom } -- ); -+ try blit_pin(mepo, pin, if (prev_pin != null) prev_pin else null, @intCast(pin_group_i), is_active_path, .{ .x = tile_x, .y = tile_y, .z = zoom }); - } - } - - if (mepo.pin_group_active_item) |active_pin_i| { -- try blit_pin( -- mepo, -- &mepo.pin_groups[mepo.pin_group_active].items[active_pin_i], -- null, -- mepo.pin_group_active, -- true, -- .{ .x = tile_x, .y = tile_y, .z = zoom } -- ); -+ try blit_pin(mepo, &mepo.pin_groups[mepo.pin_group_active].items[active_pin_i], null, mepo.pin_group_active, true, .{ .x = tile_x, .y = tile_y, .z = zoom }); - } - } - -@@ -362,14 +348,14 @@ fn blit_pin(mepo: *Mepo, pin: *types.Pin, prev_pin: ?*types.Pin, pin_group: u8, - const font_height: i8 = @intCast(config.ZoomLevelToPinFontSize[p.get(p.pref.zoom).u]); - const n_tiles_font_overlap = 2; - const pin_in_view = r: { -- const a = pin_target_x > (-config.Tsize * n_tiles_font_overlap) and pin_target_x < (config.Tsize * n_tiles_font_overlap); -+ const a = pin_target_x > (-config.Tsize * n_tiles_font_overlap) and pin_target_x < (config.Tsize * n_tiles_font_overlap); - const b = pin_target_y > -font_height and pin_target_y - (pin_rect_size / 2) < config.Tsize; - break :r a and b; - }; - const prevpin_in_view = r: { - if (prev_pin == null) break :r false; - const a = prevpin_target_x.? > (-config.Tsize * n_tiles_font_overlap) and prevpin_target_x.? < config.Tsize * n_tiles_font_overlap; -- const b = prevpin_target_y.? > -font_height and prevpin_target_y.? - (pin_rect_size / 2) < config.Tsize; -+ const b = prevpin_target_y.? > -font_height and prevpin_target_y.? - (pin_rect_size / 2) < config.Tsize; - break :r a and b; - }; - const connecting_line_in_view = r: { -@@ -430,9 +416,9 @@ fn blit_pin(mepo: *Mepo, pin: *types.Pin, prev_pin: ?*types.Pin, pin_group: u8, - if (pin.category != .Instructive or mepo.pin_group_active != pin_group) - break :render_pin_label; - -- const pin_label_bg_value : u24 = if (is_active) 0xe8e8e8 else 0xffffff; -+ const pin_label_bg_value: u24 = if (is_active) 0xe8e8e8 else 0xffffff; - const pin_label_bg: types.Color = .{ .value = pin_label_bg_value, .opacity = 255 }; -- const pin_label_border_value : u24 = if (is_active) 0x000000 else 0xe8e8e8; -+ const pin_label_border_value: u24 = if (is_active) 0x000000 else 0xe8e8e8; - const pin_label_border = .{ .value = pin_label_border_value, .opacity = 255 }; - - const label_color: u24 = 0x000000; -@@ -525,7 +511,7 @@ fn blit_overlay_debugbar(mepo: *Mepo) !void { - fn blit_help(mepo: *Mepo) !void { - if (!p.get(p.pref.help).b) return; - -- var msg = msg: { -+ const msg = msg: { - var acc = std.ArrayList([]const u8).init(mepo.allocator); - defer acc.deinit(); - defer for (acc.items) |item| mepo.allocator.free(item); -@@ -658,7 +644,7 @@ fn blit_multiline_text( - comptime fmt_string: [:0]const u8, - args: anytype, - ) !void { -- var msg = try std.fmt.allocPrintZ(mepo.allocator, fmt_string, args); -+ const msg = try std.fmt.allocPrintZ(mepo.allocator, fmt_string, args); - defer mepo.allocator.free(msg); - - const font_size = font_size: { -@@ -673,7 +659,7 @@ fn blit_multiline_text( - var textures_height: c_int = 0; - - // Accumulate lines rendered into slice of textures -- var textures: []*sdl.SDL_Texture = textures: { -+ const textures: []*sdl.SDL_Texture = textures: { - var textures_array: [50]*sdl.SDL_Texture = undefined; - var textures_array_size: usize = 0; - -diff --git a/src/util/utilmepolang.zig b/src/util/utilmepolang.zig -index 4b859b3..40cc8a5 100644 ---- a/src/util/utilmepolang.zig -+++ b/src/util/utilmepolang.zig -@@ -128,7 +128,7 @@ test "statementize" { - { - const input = &[_][]const u8{ "foo", "bar", "baz" }; - const expect_0 = [_][]const u8{ "foo", "bar", "baz" }; -- var result = try statementize(std.heap.c_allocator, input[0..]); -+ const result = try statementize(std.heap.c_allocator, input[0..]); - try std.testing.expectEqual(@as(usize, @intCast(1)), result.len); - for (result[0], 0..) |_, idx| { - try std.testing.expect(std.mem.eql(u8, expect_0[idx], result[0][idx])); -@@ -140,7 +140,7 @@ test "statementize" { - const input = &[_][]const u8{ "foo", "bar", "baz", ";", "bil", "nil", ";" }; - const expect_0 = [_][]const u8{ "foo", "bar", "baz" }; - const expect_1 = [_][]const u8{ "bil", "nil" }; -- var result = try statementize(std.heap.c_allocator, input[0..]); -+ const result = try statementize(std.heap.c_allocator, input[0..]); - try std.testing.expectEqual(@as(usize, @intCast(2)), result.len); - for (result[0], 0..) |_, idx| { - try std.testing.expect(std.mem.eql(u8, expect_0[idx], result[0][idx])); -@@ -155,7 +155,7 @@ test "statementize" { - const input = &[_][]const u8{ "foo", "[", "bar", "[", "gill", "]", "]", "baz", ";", "bil", "nil", ";" }; - const expect_0 = [_][]const u8{ "foo", "[", "bar", "[", "gill", "]", "]", "baz" }; - const expect_1 = [_][]const u8{ "bil", "nil" }; -- var result = try statementize(std.heap.c_allocator, input[0..]); -+ const result = try statementize(std.heap.c_allocator, input[0..]); - try std.testing.expectEqual(@as(usize, @intCast(2)), result.len); - for (result[0], 0..) |_, idx| { - try std.testing.expect(std.mem.eql(u8, expect_0[idx], result[0][idx])); -@@ -168,7 +168,7 @@ test "statementize" { - // Returns error for unmatched [] inputs - { - const input = &[_][]const u8{ "foo", "]", ";" }; -- var result = statementize(std.heap.c_allocator, input[0..]); -+ const result = statementize(std.heap.c_allocator, input[0..]); - try std.testing.expectEqual(result, error.UnbalancedBrackets); - } - } -@@ -177,8 +177,8 @@ test "tokenize" { - { - // basic tokenization test based on whitespace - const input = "foo bar baz"; -- var expect = [_][]const u8{ "foo", "bar", "baz" }; -- var result = try tokenize(std.heap.c_allocator, input); -+ const expect = [_][]const u8{ "foo", "bar", "baz" }; -+ const result = try tokenize(std.heap.c_allocator, input); - try std.testing.expectEqual(@as(usize, @intCast(3)), result.len); - for (result, 0..) |_, idx| { - try std.testing.expect(std.mem.eql(u8, expect[idx], result[idx])); -@@ -188,8 +188,8 @@ test "tokenize" { - { - // e.g. treats [] brackets as individual tokens irregardless of whitespace (test [foo]) - const input = "foo bar [baz]"; -- var expect = [_][]const u8{ "foo", "bar", "[", "baz", "]" }; -- var result = try tokenize(std.heap.c_allocator, input); -+ const expect = [_][]const u8{ "foo", "bar", "[", "baz", "]" }; -+ const result = try tokenize(std.heap.c_allocator, input); - try std.testing.expectEqual(@as(usize, @intCast(5)), result.len); - for (result, 0..) |_, idx| { - try std.testing.expect(std.mem.eql(u8, expect[idx], result[idx])); -@@ -199,8 +199,8 @@ test "tokenize" { - { - // e.g. treats [] brackets as individual tokens irregardless of whitespace (test [ foo]) - const input = "foo bar [ baz]"; -- var expect = [_][]const u8{ "foo", "bar", "[", "baz", "]" }; -- var result = try tokenize(std.heap.c_allocator, input); -+ const expect = [_][]const u8{ "foo", "bar", "[", "baz", "]" }; -+ const result = try tokenize(std.heap.c_allocator, input); - try std.testing.expectEqual(@as(usize, @intCast(5)), result.len); - for (result, 0..) |_, idx| { - try std.testing.expect(std.mem.eql(u8, expect[idx], result[idx])); -@@ -217,7 +217,7 @@ test "argize" { - expect: []const types.MepoArg, - }; - -- var specs = [_]spec{ -+ const specs = [_]spec{ - .{ - // Standard check to make sure text / numbers argized properly - .input = &[_][]const u8{ "arga", "22.2" }, -diff --git a/src/util/utilsdl.zig b/src/util/utilsdl.zig -index 0ff0501..ec2f4f9 100644 ---- a/src/util/utilsdl.zig -+++ b/src/util/utilsdl.zig -@@ -52,7 +52,7 @@ pub fn sdl_push_event_signal(signal: c_int) callconv(.C) void { - } - - pub fn sdl_renderer_set_draw_color(renderer: *sdl.SDL_Renderer, color: types.Color) errors.SDLError!void { -- var sdl_color = color.to_sdl(); -+ const sdl_color = color.to_sdl(); - const blend_mode = if (sdl_color.a != sdl.SDL_ALPHA_OPAQUE) sdl.SDL_BLENDMODE_ADD else sdl.SDL_BLENDMODE_NONE; - try errorcheck(sdl.SDL_SetRenderDrawBlendMode(renderer, @intCast(blend_mode))); - try errorcheck(sdl.SDL_SetRenderDrawColor(renderer, sdl_color.r, sdl_color.g, sdl_color.b, color.opacity)); diff --git a/testing/mepo/0003-zig-0.12-roll-the-version.patch b/testing/mepo/0003-zig-0.12-roll-the-version.patch deleted file mode 100644 index 4f34632a1df..00000000000 --- a/testing/mepo/0003-zig-0.12-roll-the-version.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 04ed4198942b716728393b235e3c29d88e46c837 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" <lauren@selfisekai.rocks> -Date: Sat, 20 Apr 2024 23:54:45 +0200 -Subject: [PATCH] zig 0.12: roll the version - ---- - src/main.zig | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/main.zig b/src/main.zig -index 77b0eb4..b477ad7 100644 ---- a/src/main.zig -+++ b/src/main.zig -@@ -12,8 +12,8 @@ const utildbg = @import("./util/utildbg.zig"); - pub fn main() !void { - comptime { - const v = builtin.zig_version; -- if (v.major != 0 or v.minor != 11) -- @panic("Must be built against Zig 0.11.x"); -+ if (v.major != 0 or v.minor != 12) -+ @panic("Must be built against Zig 0.12.x"); - } - - const allocator = std.heap.c_allocator; diff --git a/testing/mepo/0004-zig-0.12-std.os.SIG-std.os.linux.SIG.patch b/testing/mepo/0004-zig-0.12-std.os.SIG-std.os.linux.SIG.patch deleted file mode 100644 index a93d39f4900..00000000000 --- a/testing/mepo/0004-zig-0.12-std.os.SIG-std.os.linux.SIG.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 70ae4c6440fef6ba58ad73fe1f7db6c976580c92 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" <lauren@selfisekai.rocks> -Date: Sun, 21 Apr 2024 00:02:27 +0200 -Subject: [PATCH] zig 0.12: std.os.SIG -> std.os.linux.SIG - ---- - src/api/bind_signal.zig | 11 +++++------ - src/api/filedump.zig | 8 ++++---- - 2 files changed, 9 insertions(+), 10 deletions(-) - -diff --git a/src/api/bind_signal.zig b/src/api/bind_signal.zig -index 235dde2..05d8a0c 100644 ---- a/src/api/bind_signal.zig -+++ b/src/api/bind_signal.zig -@@ -27,13 +27,13 @@ fn bind_signal(mepo: *Mepo, signo_str: [:0]const u8, expression: []const u8) !vo - // Signal - var signal_name: u6 = 0; - if (std.mem.orderZ(u8, signo_str, "USR1") == .eq) { -- signal_name = std.os.SIG.USR1; -+ signal_name = std.os.linux.SIG.USR1; - } else if (std.mem.orderZ(u8, signo_str, "USR2") == .eq) { -- signal_name = std.os.SIG.USR2; -+ signal_name = std.os.linux.SIG.USR2; - } else if (std.mem.orderZ(u8, signo_str, "TERM") == .eq) { -- signal_name = std.os.SIG.TERM; -+ signal_name = std.os.linux.SIG.TERM; - } else if (std.mem.orderZ(u8, signo_str, "INT") == .eq) { -- signal_name = std.os.SIG.INT; -+ signal_name = std.os.linux.SIG.INT; - } else { - return error.InvalidSignalName; - } -@@ -45,8 +45,7 @@ fn bind_signal(mepo: *Mepo, signo_str: [:0]const u8, expression: []const u8) !vo - .flags = 0, - }; - -- std.os.sigaction(signal_name, &signal_action, null) -- catch return error.FailedToSetupSighandler; -+ std.os.sigaction(signal_name, &signal_action, null) catch return error.FailedToSetupSighandler; - - if (mepo.table_signals.get(signal_name)) |heap_str| { - mepo.allocator.free(heap_str); -diff --git a/src/api/filedump.zig b/src/api/filedump.zig -index bbc892e..38adbb0 100644 ---- a/src/api/filedump.zig -+++ b/src/api/filedump.zig -@@ -105,10 +105,10 @@ fn filedump(mepo: *Mepo, save_types: []const u8, filepath: []const u8) !void { - var it_sigs = mepo.table_signals.iterator(); - while (it_sigs.next()) |sig| { - const signame = switch (sig.key_ptr.*) { -- std.os.SIG.USR1 => "USR1", -- std.os.SIG.USR2 => "USR2", -- std.os.SIG.INT => "INT", -- std.os.SIG.TERM => "TERM", -+ std.os.linux.SIG.USR1 => "USR1", -+ std.os.linux.SIG.USR2 => "USR2", -+ std.os.linux.SIG.INT => "INT", -+ std.os.linux.SIG.TERM => "TERM", - else => continue, - }; - diff --git a/testing/mepo/0005-zig-0.12-std.os.getenv-std.posix.getenv.patch b/testing/mepo/0005-zig-0.12-std.os.getenv-std.posix.getenv.patch deleted file mode 100644 index 14bdda7c9c0..00000000000 --- a/testing/mepo/0005-zig-0.12-std.os.getenv-std.posix.getenv.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b41112eac9fdf5678babe74e5f3f8cf6f2554d60 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" <lauren@selfisekai.rocks> -Date: Sun, 21 Apr 2024 00:04:09 +0200 -Subject: [PATCH] zig 0.12: std.os.getenv -> std.posix.getenv - ---- - src/Mepo.zig | 2 +- - src/util/utilfile.zig | 4 ++-- - src/util/utilplatform.zig | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/Mepo.zig b/src/Mepo.zig -index dc49cab..eb7f8cf 100644 ---- a/src/Mepo.zig -+++ b/src/Mepo.zig -@@ -710,7 +710,7 @@ fn setup_sdl_video_and_window(allocator: std.mem.Allocator) !*sdl.SDL_Window { - config.InitWindowH, - sdl.SDL_WINDOW_SHOWN | sdl.SDL_WINDOW_RESIZABLE | sdl.SDL_WINDOW_ALLOW_HIGHDPI, - )); -- if (std.os.getenv("MEPO_WINDOW_REPOSITION")) |reposition| { -+ if (std.posix.getenv("MEPO_WINDOW_REPOSITION")) |reposition| { - if (reposition.len == 1 and reposition[0] == '1') { - sdl.SDL_SetWindowPosition(w, 0, 0); - } -diff --git a/src/util/utilfile.zig b/src/util/utilfile.zig -index 950964e..d0656e9 100644 ---- a/src/util/utilfile.zig -+++ b/src/util/utilfile.zig -@@ -29,8 +29,8 @@ pub fn wordexp_filepath(allocator: std.mem.Allocator, path: []const u8) ![:0]con - .default_home_path = ".cache", - }, - }) |default_mapping| { -- if (std.os.getenv(default_mapping.env_var) != null) continue; -- if (std.os.getenv("HOME")) |home_dir| { -+ if (std.posix.getenv(default_mapping.env_var) != null) continue; -+ if (std.posix.getenv("HOME")) |home_dir| { - const value = try std.fmt.allocPrintZ(allocator, "{s}/{s}", .{ home_dir, default_mapping.default_home_path }); - defer allocator.free(value); - _ = cstdlib.setenv(&default_mapping.env_var[0], &value[0], 1); -diff --git a/src/util/utilplatform.zig b/src/util/utilplatform.zig -index 204a802..65d0dcc 100644 ---- a/src/util/utilplatform.zig -+++ b/src/util/utilplatform.zig -@@ -9,7 +9,7 @@ pub fn supports_osk() bool { - - pub fn xdg_session_desktop() enum { Phosh, Plamo, Unknown } { - var env_session_desktop: []const u8 = "unknown"; -- if (std.os.getenv("XDG_SESSION_DESKTOP")) |v| { -+ if (std.posix.getenv("XDG_SESSION_DESKTOP")) |v| { - env_session_desktop = v; - } - diff --git a/testing/mepo/0006-zig-0.12-std.os.sigaction-std.posix.sigaction.patch b/testing/mepo/0006-zig-0.12-std.os.sigaction-std.posix.sigaction.patch deleted file mode 100644 index 1dca486cb7a..00000000000 --- a/testing/mepo/0006-zig-0.12-std.os.sigaction-std.posix.sigaction.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f454182c119ea49effb328475fa4430615991672 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" <lauren@selfisekai.rocks> -Date: Sun, 21 Apr 2024 00:06:46 +0200 -Subject: [PATCH] zig 0.12: std.os.sigaction -> std.posix.sigaction - ---- - src/api/bind_signal.zig | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/api/bind_signal.zig b/src/api/bind_signal.zig -index 05d8a0c..a80033b 100644 ---- a/src/api/bind_signal.zig -+++ b/src/api/bind_signal.zig -@@ -39,13 +39,13 @@ fn bind_signal(mepo: *Mepo, signo_str: [:0]const u8, expression: []const u8) !vo - } - - // Register generic signal handler -- const signal_action = std.os.Sigaction{ -+ const signal_action = std.posix.Sigaction{ - .handler = .{ .handler = utilsdl.sdl_push_event_signal }, -- .mask = std.os.empty_sigset, -+ .mask = std.posix.empty_sigset, - .flags = 0, - }; - -- std.os.sigaction(signal_name, &signal_action, null) catch return error.FailedToSetupSighandler; -+ std.posix.sigaction(signal_name, &signal_action, null) catch return error.FailedToSetupSighandler; - - if (mepo.table_signals.get(signal_name)) |heap_str| { - mepo.allocator.free(heap_str); diff --git a/testing/mepo/0007-zig-0.12-std.mem.copy-std.mem.copyForwards.patch b/testing/mepo/0007-zig-0.12-std.mem.copy-std.mem.copyForwards.patch deleted file mode 100644 index 62d404bc168..00000000000 --- a/testing/mepo/0007-zig-0.12-std.mem.copy-std.mem.copyForwards.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 78cc65d4d5b8e5613e62751b0ce0e82992f1365d Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" <lauren@selfisekai.rocks> -Date: Sun, 21 Apr 2024 00:13:09 +0200 -Subject: [PATCH] zig 0.12: std.mem.copy -> std.mem.copyForwards - ---- - src/Mepo.zig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Mepo.zig b/src/Mepo.zig -index eb7f8cf..9541a2b 100644 ---- a/src/Mepo.zig -+++ b/src/Mepo.zig -@@ -362,7 +362,7 @@ pub fn mepolang_execute(mepo: *@This(), mepolang_text: []const u8) !void { - if (FnTable.get(statement[0])) |fn_spec| { - const args: []types.MepoArg = try utilmepolang.argize(arena.allocator(), statement[1..statement.len]); - var caller_args: [types.MepoFnNargs]types.MepoArg = undefined; -- std.mem.copy(types.MepoArg, caller_args[0..], args); -+ std.mem.copyForwards(types.MepoArg, caller_args[0..], args); - - utildbg.log("Running API function for: {s} requested by mepolang input statement: {s}\n", .{ statement[0], statement }); - _ = mepolang_execute_validate_args(fn_spec, args) catch |e| { diff --git a/testing/mepo/0008-zig-0.12-std.math.absCast-abs.patch b/testing/mepo/0008-zig-0.12-std.math.absCast-abs.patch deleted file mode 100644 index a7c322960cd..00000000000 --- a/testing/mepo/0008-zig-0.12-std.math.absCast-abs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b356b82245c728fae69b98a1023f1d046a200c48 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" <lauren@selfisekai.rocks> -Date: Sun, 21 Apr 2024 00:13:54 +0200 -Subject: [PATCH] zig 0.12: std.math.absCast -> @abs - ---- - src/api/pin_cycle.zig | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/api/pin_cycle.zig b/src/api/pin_cycle.zig -index cc1a73f..fdd33cf 100644 ---- a/src/api/pin_cycle.zig -+++ b/src/api/pin_cycle.zig -@@ -14,8 +14,7 @@ pub const spec = .{ - }; - - fn execute(mepo: *Mepo, args: [types.MepoFnNargs]types.MepoArg) !void { -- try pin_cycle(mepo, @as(i32, @intFromFloat(args[0].Number)) == 1, -- @intFromFloat(args[1].Number)); -+ try pin_cycle(mepo, @as(i32, @intFromFloat(args[0].Number)) == 1, @intFromFloat(args[1].Number)); - } - - pub fn pin_cycle(mepo: *Mepo, viewport_only: bool, delta: i32) !void { -@@ -25,7 +24,7 @@ pub fn pin_cycle(mepo: *Mepo, viewport_only: bool, delta: i32) !void { - var target_i = if (mepo.pin_group_active_item) |active_item| @as(i32, @intCast(active_item)) else 0; - const group_unordered = !p.get(p.pingroup_prop(mepo.pin_group_active, .Ordered)).b; - const add: i32 = if (delta > 0) 1 else -1; -- for (0..std.math.absCast(delta)) |_| { -+ for (0..@abs(delta)) |_| { - var pin_i = target_i + add; - // E.g. two conditions to skip and continually increase pin_i: - // 1. Within an ordered group, structural pins should be skipped diff --git a/testing/mepo/0009-zig-0.12-std.ChildProcess.exec-std.ChildProcess.run.patch b/testing/mepo/0009-zig-0.12-std.ChildProcess.exec-std.ChildProcess.run.patch deleted file mode 100644 index 2558059df86..00000000000 --- a/testing/mepo/0009-zig-0.12-std.ChildProcess.exec-std.ChildProcess.run.patch +++ /dev/null @@ -1,22 +0,0 @@ -From fe7c5c5f22c7e071249480582f7effe1a3a67a8c Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" <lauren@selfisekai.rocks> -Date: Sun, 21 Apr 2024 00:14:24 +0200 -Subject: [PATCH] zig 0.12: std.ChildProcess.exec -> std.ChildProcess.run - ---- - src/api/shellpipe_sync.zig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/api/shellpipe_sync.zig b/src/api/shellpipe_sync.zig -index a96ad1a..71051fd 100644 ---- a/src/api/shellpipe_sync.zig -+++ b/src/api/shellpipe_sync.zig -@@ -32,7 +32,7 @@ fn shellpipe_sync(mepo: *Mepo, cmd: []const u8) !void { - try mepo.blit(); - const env_vars = try get_env_vars(mepo, arena.allocator()); - const args = [_][]const u8{ "sh", "-c", cmd }; -- const process_result = try std.ChildProcess.exec(.{ -+ const process_result = try std.ChildProcess.run(.{ - .allocator = arena.allocator(), - .argv = args[0..], - .env_map = &env_vars, diff --git a/testing/mepo/0010-zig-0.12-std.os.exit-std.posix.exit.patch b/testing/mepo/0010-zig-0.12-std.os.exit-std.posix.exit.patch deleted file mode 100644 index eb915d5f107..00000000000 --- a/testing/mepo/0010-zig-0.12-std.os.exit-std.posix.exit.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 004a6d00e6cd0602d297d60ca270589684ed2f90 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" <lauren@selfisekai.rocks> -Date: Sun, 21 Apr 2024 00:18:16 +0200 -Subject: [PATCH] zig 0.12: std.os.exit -> std.posix.exit - ---- - src/Mepo.zig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Mepo.zig b/src/Mepo.zig -index 9541a2b..998f7d9 100644 ---- a/src/Mepo.zig -+++ b/src/Mepo.zig -@@ -618,7 +618,7 @@ pub fn graceful_terminate_sdl() void { - sdl.IMG_Quit(); - sdl.SDL_VideoQuit(); - sdl.SDL_Quit(); -- std.os.exit(0); -+ std.posix.exit(0); - } - - pub fn sighandle_terminate(arg: c_int) callconv(.C) void { diff --git a/testing/mepo/0011-zig-0.12-std.os.poll-std.posix.poll.patch b/testing/mepo/0011-zig-0.12-std.os.poll-std.posix.poll.patch deleted file mode 100644 index 649b45aada0..00000000000 --- a/testing/mepo/0011-zig-0.12-std.os.poll-std.posix.poll.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 691711f17be11c939e638f16098c80edd0625528 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" <lauren@selfisekai.rocks> -Date: Sun, 21 Apr 2024 00:22:56 +0200 -Subject: [PATCH] zig 0.12: std.os.poll -> std.posix.poll - ---- - src/api/shellpipe_async.zig | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/api/shellpipe_async.zig b/src/api/shellpipe_async.zig -index f45b3e4..63c919a 100644 ---- a/src/api/shellpipe_async.zig -+++ b/src/api/shellpipe_async.zig -@@ -68,19 +68,19 @@ fn async_shellpipe_run_catch_errors(mepo: *Mepo, unique_handle_id: i8, cmd: []co - var stdout = std.ArrayList(u8).init(mepo.allocator); - errdefer stdout.deinit(); - -- var poll_fds = [_]std.os.pollfd{ -- .{ .fd = child.stdout.?.handle, .events = std.os.POLL.IN, .revents = undefined }, -+ var poll_fds = [_]std.posix.pollfd{ -+ .{ .fd = child.stdout.?.handle, .events = std.posix.POLL.IN, .revents = undefined }, - }; - const bump_amt = 512; - - var continue_reading = true; - while (continue_reading) { -- const events = try std.os.poll(&poll_fds, std.math.maxInt(i32)); -+ const events = try std.posix.poll(&poll_fds, std.math.maxInt(i32)); - if (events == 0) continue; -- if (poll_fds[0].revents & std.os.POLL.IN != 0) { -+ if (poll_fds[0].revents & std.posix.POLL.IN != 0) { - try stdout.ensureTotalCapacity(@min(stdout.items.len + bump_amt, max_output_bytes)); - if (stdout.unusedCapacitySlice().len == 0) return error.StdoutStreamTooLong; -- const nread = try std.os.read(poll_fds[0].fd, stdout.unusedCapacitySlice()); -+ const nread = try std.posix.read(poll_fds[0].fd, stdout.unusedCapacitySlice()); - if (nread == 0) { - continue_reading = false; - continue; -@@ -93,7 +93,7 @@ fn async_shellpipe_run_catch_errors(mepo: *Mepo, unique_handle_id: i8, cmd: []co - utilsdl.sdl_push_event_mepolang_execution(heap_statement); - try stdout.replaceRange(0, mepolang_statement_end_index + 1, &[_]u8{}); - } -- } else if (poll_fds[0].revents & (std.os.POLL.ERR | std.os.POLL.NVAL | std.os.POLL.HUP) != 0) { -+ } else if (poll_fds[0].revents & (std.posix.POLL.ERR | std.posix.POLL.NVAL | std.posix.POLL.HUP) != 0) { - continue_reading = false; - continue; - } diff --git a/testing/mepo/0012-zig-0.12-std.math.absInt-abs.patch b/testing/mepo/0012-zig-0.12-std.math.absInt-abs.patch deleted file mode 100644 index 1e25c5b89cc..00000000000 --- a/testing/mepo/0012-zig-0.12-std.math.absInt-abs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 79df227e7d1b6af7aceebad133ec56d222861ee8 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" <lauren@selfisekai.rocks> -Date: Sun, 21 Apr 2024 00:29:55 +0200 -Subject: [PATCH] zig 0.12: std.math.absInt -> @abs - ---- - src/Mepo.zig | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/Mepo.zig b/src/Mepo.zig -index 998f7d9..b8f9fe3 100644 ---- a/src/Mepo.zig -+++ b/src/Mepo.zig -@@ -23,8 +23,8 @@ debug_message: ?[]const u8 = null, - drag: ?struct { - begin_ticks: u32, - point: sdl.SDL_Point, -- delta_x: i32 = 0, -- delta_y: i32 = 0, -+ delta_x: u32 = 0, -+ delta_y: u32 = 0, - } = null, - fingers: std.ArrayList(sdl.SDL_FingerID), - fingers_gesture_delta: isize = 0, -@@ -169,14 +169,14 @@ fn event_mousebuttonup(mepo: *@This(), e: sdl.SDL_Event) types.Pending { - var closest_match_pin: ?struct { - pin_group_i: u8, - pin_i: u32, -- delta_dist: i32, -+ delta_dist: u32, - } = null; - for (mepo.pin_groups, 0..) |pin_group, pin_group_i| { - for (pin_group.items, 0..) |*item, pin_i| { - if (item.category == .Structural) continue; - const pin_x = mepo.convert_latlon_to_xy(.LonToX, item.lon); - const pin_y = mepo.convert_latlon_to_xy(.LatToY, item.lat); -- const delta = (std.math.absInt(pin_x - cursor.x) catch continue) + (std.math.absInt(pin_y - cursor.y) catch continue); -+ const delta = @abs(pin_x - cursor.x) + @abs(pin_y - cursor.y); - if (delta < config.ClickPinMaxDelta and (closest_match_pin == null or closest_match_pin.?.delta_dist > delta)) { - closest_match_pin = .{ - .pin_group_i = @intCast(pin_group_i), -@@ -212,8 +212,8 @@ fn event_mousemotion(mepo: *@This(), e: sdl.SDL_Event) types.Pending { - if (mepo.drag != null and mepo.within_touch_bounds(cursor.x, cursor.y)) { - mepo.drag.?.point.x = cursor.x; - mepo.drag.?.point.y = cursor.y; -- mepo.drag.?.delta_x += std.math.absInt(e.motion.xrel) catch unreachable; -- mepo.drag.?.delta_y += std.math.absInt(e.motion.yrel) catch unreachable; -+ mepo.drag.?.delta_x += @abs(e.motion.xrel); -+ mepo.drag.?.delta_y += @abs(e.motion.yrel); - mepo.set_x(mepo.get_x() - (e.motion.xrel * p.get(p.pref.drag_scale).u)); - mepo.set_y(mepo.get_y() - (e.motion.yrel * p.get(p.pref.drag_scale).u)); - return .Drag; diff --git a/testing/mepo/APKBUILD b/testing/mepo/APKBUILD index 7bfbc7b13bb..f9af77482e8 100644 --- a/testing/mepo/APKBUILD +++ b/testing/mepo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Miles Alan <m@milesalan.com> pkgname=mepo -pkgver=1.2.0 -pkgrel=1 +pkgver=1.2.1 +pkgrel=0 _pkgdescbase="Fast, simple, and hackable OSM map viewer for Linux" pkgdesc="$_pkgdescbase (base SDL application)" url="https://git.sr.ht/~mil/mepo" @@ -13,22 +13,10 @@ 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 - 0001-zig-0.12-adapt-build.zig.patch - 0002-zig-0.12-convert-some-vars-to-consts.patch - 0003-zig-0.12-roll-the-version.patch - 0004-zig-0.12-std.os.SIG-std.os.linux.SIG.patch - 0005-zig-0.12-std.os.getenv-std.posix.getenv.patch - 0006-zig-0.12-std.os.sigaction-std.posix.sigaction.patch - 0007-zig-0.12-std.mem.copy-std.mem.copyForwards.patch - 0008-zig-0.12-std.math.absCast-abs.patch - 0009-zig-0.12-std.ChildProcess.exec-std.ChildProcess.run.patch - 0010-zig-0.12-std.os.exit-std.posix.exit.patch - 0011-zig-0.12-std.os.poll-std.posix.poll.patch - 0012-zig-0.12-std.math.absInt-abs.patch " subpackages=" $pkgname-doc @@ -64,17 +52,5 @@ scripts() { } sha512sums=" -e01b19a578f9ffa340eac62e1db75495b424fe9bff98b9d25cf2c3cd6a402e8c756463582757bbd979aa927cd2e8c1ded2c25f6746851fb2a39a1257794fbbf3 mepo-1.2.0.tar.gz -7b2d7cbd7c00db8863a0815f34e959c7e7e071b29e4576edb0e0e952489ab34461dfe0a054fcc933deda2fa50cdc43eded8a73e59e45955c6c0c35401e43704f 0001-zig-0.12-adapt-build.zig.patch -0c0f88fe7e28b9b220473c909b0b1fa5dac14fb6bcb18bf0a1eca9bba572fc3235ba74a92e823b13e734215c3581bd9fdd4b4a7ab93cf1bb3b9487146441667a 0002-zig-0.12-convert-some-vars-to-consts.patch -37e6ccb8e6d28167a365548f5515ca568744d4204855ac95f783d7b601291b60bbc8353007521fcb291039267eecde6085bc806793ae05ef65586cccfce91d94 0003-zig-0.12-roll-the-version.patch -c7963bad05e800ebdac128142a71392a2b5ef3f010c6dab62f7be00ef2df91f3b06404e0dcb1c85f672b051d110426decd3d8e3b2bda4093d114caca3278461b 0004-zig-0.12-std.os.SIG-std.os.linux.SIG.patch -6c7918237aad1eab69734fc3b5f2392da6039f51587072f9a809c77571d4364bd88f34decbbfb701d4dc47d0987da12b3d99b8b178819d82926977ebf73b9e74 0005-zig-0.12-std.os.getenv-std.posix.getenv.patch -9c2d6a452a4137f709480ffe7f2871561004c4b8e5c8a79d1d482f90bb1cf90c51eee1e6702ec6e790aee677a56ffdb00b6a5254895ce134abc4be65c5ace93e 0006-zig-0.12-std.os.sigaction-std.posix.sigaction.patch -68bd1633606e4db2f064b520fe6143f1a179e0b8b1d3df249cf60791132953ba6fd0a10a80f1f70a754f1a0260a43a92105f0928e09d2c786740d68324b818c5 0007-zig-0.12-std.mem.copy-std.mem.copyForwards.patch -b5af22b1f11beeb9fefc8801ffa0748c63f54248683a60531789c7ec30effb122d4f011dba50dce082668563795d9ad1722d3b96d698c79122b60b0f5819b3f9 0008-zig-0.12-std.math.absCast-abs.patch -e606a2595131a8d75fe79103c13b91257d3a104e4799aed6d75dd43de6cb46deb47a7a7e9e3ed171e0f066789a9f14ea92cbf6b0b9b4604ab7df4daa69c00c99 0009-zig-0.12-std.ChildProcess.exec-std.ChildProcess.run.patch -e855ba670adec24935c3f10ee6107648e6a9e34eb9ea27a72520e76950ee9afa69ac2e13af392ae947ec5aacc07e625af17780624ae1b473e03be66c08c33ecd 0010-zig-0.12-std.os.exit-std.posix.exit.patch -26890ba25a841d051a77e79582c1d4916f81f52f2f173eccc813878724e36835fd6a3df586c80d4d608562079d7c0a127a6a2a00ae2913d769ada716f6b0568c 0011-zig-0.12-std.os.poll-std.posix.poll.patch -fb69d64dabd1e6b4eb49dffabb4488a19b1d10ec444a55abe5d173245e715a75ef7aec5b588d16f743034aae41e565e0f3ef90f49a9ac9f131daf9bc7370307b 0012-zig-0.12-std.math.absInt-abs.patch +1db1218a1cc43e4c4838f2b96c47ed3c0589efef2bff3aa7175a658e227b339032c22c0af3a4c95eb6b95a759d62315fd2a3fdf5e11706847c7fa02db5c7d63e mepo-1.2.1.tar.gz " diff --git a/testing/mesa-asahi/APKBUILD b/testing/mesa-asahi/APKBUILD index d2860170431..511c36eb9c6 100644 --- a/testing/mesa-asahi/APKBUILD +++ b/testing/mesa-asahi/APKBUILD @@ -1,10 +1,10 @@ # Maintainer: Milan P. Stanić <mps@arvanta.net> # this package is temporary for asahi linux pkgname=mesa-asahi -_asahiver=20240228 +_asahiver=20240527 _commit=asahi-$_asahiver pkgver=24.0.0_pre$_asahiver -pkgrel=1 +pkgrel=0 pkgdesc="Mesa DRI OpenGL library for Asahi linux" url="https://gitlab.freedesktop.org/asahi/mesa" arch="aarch64" @@ -53,7 +53,10 @@ makedepends=" libxxf86vm-dev llvm$_llvmver-dev meson + py3-cparser py3-mako + py3-packaging + py3-ply python3 vulkan-loader-dev wayland-dev @@ -335,5 +338,5 @@ _vulkan_layers() { } sha512sums=" -7c0125e67ad34b283a4aebf2236d709c3d783583f7d851b725c8fd50767ca29c10337794953e291f6aa87eac2432856e00a90e363b820edd45e500e0891f78bb mesa-asahi-20240228.tar.gz +2cd7d61a3b35ecb9349da22ea513c89395993f13620c85c997e2a12a4646a69185ab3b2367d8a4e4d4c92a822ae4800cbc45ee9f248376caabd5598bfac97ff7 mesa-asahi-20240527.tar.gz " diff --git a/testing/mimalloc1/APKBUILD b/testing/mimalloc1/APKBUILD index 81bb217ea4f..3313ddf672a 100644 --- a/testing/mimalloc1/APKBUILD +++ b/testing/mimalloc1/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=mimalloc1 _projname=mimalloc -pkgver=1.8.2 +pkgver=1.8.6 pkgrel=0 _pkgdesc="A compact general purpose allocator with excellent performance" pkgdesc="$_pkgdesc (in secure mode)" @@ -19,6 +19,7 @@ subpackages=" $pkgname-debug " source="https://github.com/microsoft/mimalloc/archive/v$pkgver/$_projname-$pkgver.tar.gz + fix-align-issue-on-32bit-musl.patch cmake-add-insecure-suffix.patch " builddir="$srcdir/$_projname-$pkgver" @@ -102,6 +103,7 @@ debug() { } sha512sums=" -8648043fc94c2a998bb84464bbfb52cc85e9dcaff604433b9b0940104f314753fdedf1413c9ffb6719d6affaac6ad0d7a1289532387464bce2291a00152443a0 mimalloc-1.8.2.tar.gz +9fc05c77b2f34f9074397f53d0fbd1729a885b943473fcbb4012af31230f67e8cdf91059ab16511c4b7569efb6ded5f3438a06af0ca64038c83ea0d4d6f1f918 mimalloc-1.8.6.tar.gz +6c17d01de467018d328f65c220676ff51e313f22143cb3fda4d980db203d5b2168c84482d91fa3db6981efdcb0b716ac2fbae60c2032b15a5152999d4ffc7a19 fix-align-issue-on-32bit-musl.patch 9cfaa68a6dcf377a52a60e37a1e83f81fc9ba94afb55f10bb089e24561e791c318e7e0860c17944ef2aaa11546a32fa4a3510afe3aefefcc0a393dc2f334ef3d cmake-add-insecure-suffix.patch " diff --git a/testing/mimalloc1/fix-align-issue-on-32bit-musl.patch b/testing/mimalloc1/fix-align-issue-on-32bit-musl.patch new file mode 100644 index 00000000000..139170eeefd --- /dev/null +++ b/testing/mimalloc1/fix-align-issue-on-32bit-musl.patch @@ -0,0 +1,47 @@ +Patch-Source: https://github.com/microsoft/mimalloc/commit/e3fea8f4e1a04f4b260a78e6b5a8f0eead990445 +Patch-Source: https://github.com/microsoft/mimalloc/commit/8fd1184272fdf5c93f4776a36086911b55fb315e +See-Also: https://github.com/microsoft/mimalloc/issues/895 +-- +From 8fd1184272fdf5c93f4776a36086911b55fb315e Mon Sep 17 00:00:00 2001 +From: Daan <daanl@outlook.com> +Date: Fri, 17 May 2024 09:06:27 -0700 +Subject: [PATCH] fix alignment issue on Alpine 32-bit musl compilation (issue + #895) + +--- + src/arena.c | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +diff --git a/src/arena.c b/src/arena.c +index acfde132..aa4bfa42 100644 +--- a/src/arena.c ++++ b/src/arena.c +@@ -141,8 +141,8 @@ static bool mi_arena_memid_indices(mi_memid_t memid, size_t* arena_index, mi_bit + + #define MI_ARENA_STATIC_MAX (MI_INTPTR_SIZE*MI_KiB) // 8 KiB on 64-bit + +-static uint8_t mi_arena_static[MI_ARENA_STATIC_MAX]; +-static _Atomic(size_t) mi_arena_static_top; ++static mi_decl_cache_align uint8_t mi_arena_static[MI_ARENA_STATIC_MAX]; // must be cache aligned, see issue #895 ++static mi_decl_cache_align _Atomic(size_t) mi_arena_static_top; + + static void* mi_arena_static_zalloc(size_t size, size_t alignment, mi_memid_t* memid) { + *memid = _mi_memid_none(); +@@ -151,7 +151,7 @@ static void* mi_arena_static_zalloc(size_t size, size_t alignment, mi_memid_t* m + if ((toplow + size) > MI_ARENA_STATIC_MAX) return NULL; + + // try to claim space +- if (alignment == 0) { alignment = 1; } ++ if (alignment < MI_MAX_ALIGN_SIZE) { alignment = MI_MAX_ALIGN_SIZE; } + const size_t oversize = size + alignment - 1; + if (toplow + oversize > MI_ARENA_STATIC_MAX) return NULL; + const size_t oldtop = mi_atomic_add_acq_rel(&mi_arena_static_top, oversize); +@@ -167,7 +167,7 @@ static void* mi_arena_static_zalloc(size_t size, size_t alignment, mi_memid_t* m + memid->initially_zero = true; + const size_t start = _mi_align_up(oldtop, alignment); + uint8_t* const p = &mi_arena_static[start]; +- _mi_memzero(p, size); ++ _mi_memzero_aligned(p, size); + return p; + } + diff --git a/testing/mimir/APKBUILD b/testing/mimir/APKBUILD index 48dbcdc76e3..ed16d99b390 100644 --- a/testing/mimir/APKBUILD +++ b/testing/mimir/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Guy Godfroy <guy.godfroy@gugod.fr> pkgname=mimir pkgver=2.11.0 -pkgrel=2 +pkgrel=3 pkgdesc="Horizontally scalable, highly available, multi-tenant, long-term storage for Prometheus" options="net" url="https://github.com/grafana/mimir" diff --git a/testing/minikube/APKBUILD b/testing/minikube/APKBUILD index 18176e4938f..1b50ab8f5ae 100644 --- a/testing/minikube/APKBUILD +++ b/testing/minikube/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Magicloud <magiclouds@gmail.com> pkgname=minikube pkgver=1.32.0 -pkgrel=2 +pkgrel=3 pkgdesc="Tool that makes it easy to run Kubernetes locally" url="https://github.com/kubernetes/minikube" license="Apache-2.0" diff --git a/testing/mitra/APKBUILD b/testing/mitra/APKBUILD index 5aeae7ab443..7356b285e4d 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.17.1 +pkgver=2.20.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=" -8abd8e1e8a3f41e54b756866c50acdae9ff6230170d38499aac4a4aafe543052e996e7a089d087b0bc9ac6d561b81e346c460e5ff1ab3ccbac1553218390b802 mitra-2.17.1.tar.gz -f4f52872842e900e5f7dc9918abebb83acc94ec1a969375845aa273aae9adf0049808298c84cbd7a1ff4e08c9d73d5b05a1059abf97095ea08545e5f69f8188a mitra-web-2.17.1.tar.gz +5101cf6d4f462a0192ef5f01f4d96381e5bee1bb274f29f8b1f5295f58dab8665ca1e36953ee180ea847fa505ca2f73b3be149334be6fa401870c9743f80ec97 mitra-2.20.0.tar.gz +a24687e283271c731f597b133868a90cda25b01a03317962a5a402189746768d77260f39b111a7cdd9ace91f95b7a44b332075711c38accffa9472fc32becc81 mitra-web-2.20.0.tar.gz 691f84f5dfdddc176e75792ab03ff167054246e75ced51be47a89f405ae55ebe5eb6280b73c1b467b5ecbe8539f6108fb3d86873d50fcc4f4b8c5b182632acb0 mitra.initd 180a47f5072534418b4aac3ce7c885a4f7e4dc38aca80d6d81c79848d12fbe24799788c3575bd195030a10da5e0372f87fa2809a4ef99a48eaa6df52f4d053dd init.sql -ccc0b8efaefdb3ad08838b027895c358595429d511b2ad76502030988485bc86fa53a581bd4afdeedd8967a3d82ada6c30343c826c5dc77e5621e9154b84cee3 config.yaml +315a14179cd2cf561cc595f8c97fa1e39d714a39f95f50e09c05525e7103999de68ef33a7d47a9a0db82493de89e45e6379ea3771fa70289d2b4c60d0ee50ba8 config.yaml " diff --git a/testing/mitra/config.yaml b/testing/mitra/config.yaml index f8a7b426959..914f45418d2 100644 --- a/testing/mitra/config.yaml +++ b/testing/mitra/config.yaml @@ -87,8 +87,6 @@ retention: # Blockchain integrations # Multi-chain setups are currently not supported. -# Chain metadata for EVM chains can be found at https://github.com/ethereum-lists/chains -# Signing key for ethereum integration can be generated with `mitractl generate-ethereum-address` #blockchains: # - chain_id: monero:mainnet # chain_metadata: @@ -101,22 +99,3 @@ retention: # wallet_name: null # wallet_password: null # account_index: 0 -# - chain_id: eip155:31337 -# chain_metadata: -# chain_name: localhost -# currency_name: ETH -# currency_symbol: ETH -# currency_decimals: 18 -# public_api_url: 'http://127.0.0.1:8545' -# explorer_url: null -# contract_address: '0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9' -# contract_dir: /usr/share/mitra/contracts -# api_url: 'http://127.0.0.1:8545' -# signing_key: null -# chain_sync_step: 1000 -# chain_reorg_max_depth: 10 - -# IPFS integration -#ipfs_api_url: 'http://127.0.0.1:5001' -# IPFS gateway (for clients) -#ipfs_gateway_url: 'https://ipfs.example.tld' diff --git a/testing/mkcert/APKBUILD b/testing/mkcert/APKBUILD index 2650a0a0c19..b369c711fae 100644 --- a/testing/mkcert/APKBUILD +++ b/testing/mkcert/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=mkcert pkgver=1.4.4 -pkgrel=11 +pkgrel=12 pkgdesc="simple zero-config tool to make locally trusted development certificates with any names you'd like" url="https://mkcert.dev/" arch="all" diff --git a/testing/mmix/APKBUILD b/testing/mmix/APKBUILD index d0eacf1296a..5eda0f09ee7 100644 --- a/testing/mmix/APKBUILD +++ b/testing/mmix/APKBUILD @@ -4,8 +4,8 @@ pkgver=0_git20221025 pkgrel=0 pkgdesc="Assembler and instruction level simulator for the MMIX platform" url="http://www.mmix.cs.hm.edu/exe/index.html" -# 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="custom" makedepends="texlive" # ctangle is needed to compile .w files _commit=013719105c56e0205e003f7f6ae5c3e1314da6bc 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/mqtt2prometheus/APKBUILD b/testing/mqtt2prometheus/APKBUILD index a419fba3f6c..21630fdca32 100644 --- a/testing/mqtt2prometheus/APKBUILD +++ b/testing/mqtt2prometheus/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=mqtt2prometheus pkgver=0.1.7 -pkgrel=8 +pkgrel=9 pkgdesc="MQTT to Prometheus gateway" url="https://github.com/hikhvar/mqtt2prometheus" arch="all" diff --git a/testing/msh/APKBUILD b/testing/msh/APKBUILD index 829d5dc99f1..a473b2165de 100644 --- a/testing/msh/APKBUILD +++ b/testing/msh/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=msh pkgver=2.5.0 -pkgrel=4 +pkgrel=5 pkgdesc="Autostart and stop minecraft-server when players join/leave" url="https://github.com/gekware/minecraft-server-hibernation" arch="all" diff --git a/testing/mtg/APKBUILD b/testing/mtg/APKBUILD index a6f6f505cea..10b025cbb2e 100644 --- a/testing/mtg/APKBUILD +++ b/testing/mtg/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com> pkgname=mtg pkgver=2.1.7 -pkgrel=13 +pkgrel=14 pkgdesc="MTPROTO proxy for Telegram" url="https://github.com/9seconds/mtg" license="MIT" diff --git a/testing/netscanner/APKBUILD b/testing/netscanner/APKBUILD index fd806e511d2..c34f9480bf6 100644 --- a/testing/netscanner/APKBUILD +++ b/testing/netscanner/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Chleba <chlebik@gmail.com> # Maintainer: Chleba <chlebik@gmail.com> pkgname=netscanner -pkgver=0.4.4 +pkgver=0.5.1 pkgrel=0 -pkgdesc="Network scanning tool" +pkgdesc="Network scanning & diagnostic tool" url="https://github.com/Chleba/netscanner" # s390x, ppc64le, riscv64: not supported arch="all !s390x !ppc64le !riscv64" @@ -33,5 +33,5 @@ package() { } sha512sums=" -03e72d38d303626edbdcdd640deaf8a19638716cb3e7d45735e77f4b09f93d4a5333bc152a256bd2e1a95615e853463707ad1157c8182b972a1b79e39bd0c09b netscanner-0.4.4.tar.gz +8a068c24bb26dcd17fc3ab4e5bf4857af7543d7eaf2fdf291c28cd9f05db5366a1d913aed1d9b3dacbe4e8737863c8ec9b70e77b2aa2518be69867424838661c netscanner-0.5.1.tar.gz " diff --git a/testing/nfoview/APKBUILD b/testing/nfoview/APKBUILD new file mode 100644 index 00000000000..90b1ab81a8d --- /dev/null +++ b/testing/nfoview/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: Robin Candau <robincandau@protonmail.com> +# Maintainer: Robin Candau <robincandau@protonmail.com> +pkgname=nfoview +pkgver=2.0.1 +pkgrel=0 +pkgdesc="Simple NFO file viewer in GTK+ 3" +url="https://otsaloma.io/nfoview/" +arch="noarch" +license="GPL-3.0-or-later" +depends="gobject-introspection hicolor-icon-theme pango python3 py3-gobject3 font-cascadia-code-nerd" +checkdepends="py3-pytest xvfb-run" +makedepends="py3-build py3-installer py3-setuptools py3-wheel gtk4.0-dev" +source="$pkgname-$pkgver.tar.gz::https://github.com/otsaloma/nfoview/archive/$pkgver.tar.gz" +subpackages="$pkgname-doc" + +build() { + make PREFIX=/usr build +} + +check() { + xvfb-run pytest -v "$pkgname" +} + +package() { + make PREFIX=/usr DESTDIR="$pkgdir" install + install -Dm 644 AUTHORS.md "$pkgdir/usr/share/doc/$pkgname/AUTHORS.md" + install -Dm 644 NEWS.md "$pkgdir/usr/share/doc/$pkgname/NEWS.md" + install -Dm 644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md" +} +sha512sums=" +109cbe090ad0da1b4cbcd28418b2a8d2213972578419545d7b5523e7cf8683ca851d20d5c56f363f23f28f0274dcead128c864ce44fb551d88f229615a8d4bef nfoview-2.0.1.tar.gz +" diff --git a/testing/noggin/APKBUILD b/testing/noggin/APKBUILD index c62c1fbb63f..54f67e9141d 100644 --- a/testing/noggin/APKBUILD +++ b/testing/noggin/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: John Gebbie <me@johngebbie.com> pkgname=noggin pkgver=0.1 -pkgrel=7 +pkgrel=8 pkgdesc="Face tracking utility, often for playing games" url="https://sr.ht/~geb/noggin" # limited by onnxruntime and opencv diff --git a/testing/nom/APKBUILD b/testing/nom/APKBUILD index ec2fc1b2bde..22d52dc5929 100644 --- a/testing/nom/APKBUILD +++ b/testing/nom/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Tuan Anh Tran <me@tuananh.org> pkgname=nom pkgver=2.1.4 -pkgrel=0 +pkgrel=1 pkgdesc="RSS reader for the terminal" url="https://github.com/guyfedwards/nom" arch="all" diff --git a/testing/notification-daemon/APKBUILD b/testing/notification-daemon/APKBUILD new file mode 100644 index 00000000000..004f746037e --- /dev/null +++ b/testing/notification-daemon/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Robin Candau <robincandau@protonmail.com> +# Maintainer: Robin Candau <robincandau@protonmail.com> +pkgname=notification-daemon +pkgver=3.20.0 +pkgrel=0 +pkgdesc="Server implementation of the freedesktop.org desktop notification specification" +url="https://wiki.gnome.org/Attic/NotificationDaemon" +arch="all" +license="GPL-2.0-or-later" +makedepends="intltool gtk+3.0-dev" +source="https://download.gnome.org/sources/notification-daemon/${pkgver%.*}/notification-daemon-$pkgver.tar.xz + remove-notifications-limit.patch + " + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/notification-daemon-1.0 \ + --localstatedir=/var \ + --disable-static + make +} + +check() { + make check +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums=" +d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8 notification-daemon-3.20.0.tar.xz +c80454a874ed27be7793f8a71af719f9462d4785127d129414f7af2b04ad00a06ce29ded8ebe36c42ca33a0cd16113453ad73a3b7eb93cf9cae49a9d15505488 remove-notifications-limit.patch +" diff --git a/testing/notification-daemon/remove-notifications-limit.patch b/testing/notification-daemon/remove-notifications-limit.patch new file mode 100644 index 00000000000..2efa164468b --- /dev/null +++ b/testing/notification-daemon/remove-notifications-limit.patch @@ -0,0 +1,42 @@ +# Patch taken from the Gnome Flashback project to remove the default limit of 20 notifications at a time: +# https://gitlab.gnome.org/GNOME/gnome-flashback/-/commit/40c5db2e6b343c5afad78034a2fa93b9b000ef11 +# See the following issue for more details: +# https://gitlab.gnome.org/GNOME/gnome-flashback/-/issues/75 +diff --git a/src/nd-daemon.c b/src/nd-daemon.c +index 943e48a..5724405 100644 +--- a/src/nd-daemon.c ++++ b/src/nd-daemon.c +@@ -36,8 +36,6 @@ + #define INFO_VERSION PACKAGE_VERSION + #define INFO_SPEC_VERSION "1.2" + +-#define MAX_NOTIFICATIONS 20 +- + struct _NdDaemon + { + GObject parent; +@@ -180,24 +178,11 @@ handle_notify_cb (NdFdNotifications *object, + gpointer user_data) + { + NdDaemon *daemon; +- const gchar *error_name; +- const gchar *error_message; + NdNotification *notification; + gint new_id; + + daemon = ND_DAEMON (user_data); + +- if (nd_queue_length (daemon->queue) > MAX_NOTIFICATIONS) +- { +- error_name = "org.freedesktop.Notifications.MaxNotificationsExceeded"; +- error_message = _("Exceeded maximum number of notifications"); +- +- g_dbus_method_invocation_return_dbus_error (invocation, error_name, +- error_message); +- +- return TRUE; +- } +- + if (replaces_id > 0) + { + notification = nd_queue_lookup (daemon->queue, replaces_id); diff --git a/testing/nsq/APKBUILD b/testing/nsq/APKBUILD index 36603da41c7..c2425c601f2 100644 --- a/testing/nsq/APKBUILD +++ b/testing/nsq/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Pirogov <vbnet.ru@gmail.com> pkgname=nsq pkgver=1.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="A realtime distributed messaging platform" url="https://nsq.io/" arch="all" diff --git a/testing/ntfy-alertmanager/APKBUILD b/testing/ntfy-alertmanager/APKBUILD index 373bbabc1ca..a8aa0a744ec 100644 --- a/testing/ntfy-alertmanager/APKBUILD +++ b/testing/ntfy-alertmanager/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: fossdd <fossdd@pwned.life> pkgname=ntfy-alertmanager pkgver=0.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="A bridge between ntfy and Alertmanager" url="https://hub.xenrox.net/~xenrox/ntfy-alertmanager" arch="all" diff --git a/testing/nwg-bar/APKBUILD b/testing/nwg-bar/APKBUILD index ea57036e24b..c033ab91d68 100644 --- a/testing/nwg-bar/APKBUILD +++ b/testing/nwg-bar/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Edd Salkield <edd@salkield.uk> pkgname=nwg-bar pkgver=0.1.6 -pkgrel=2 +pkgrel=3 pkgdesc="GTK3-based button bar for sway and other wlroots-based compositors" url="https://github.com/nwg-piotr/nwg-bar/" arch="all" diff --git a/testing/nwg-dock/APKBUILD b/testing/nwg-dock/APKBUILD index f8dbde7eacb..e1ae73c4cfe 100644 --- a/testing/nwg-dock/APKBUILD +++ b/testing/nwg-dock/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Edd Salkield <edd@salkield.uk> pkgname=nwg-dock pkgver=0.3.9 -pkgrel=3 +pkgrel=4 pkgdesc="GTK3-based dock for sway and other wlroots-based compositors" url="https://github.com/nwg-piotr/nwg-dock/" arch="all" diff --git a/testing/oauth2-proxy/APKBUILD b/testing/oauth2-proxy/APKBUILD index e941a437c55..91c6c209b27 100644 --- a/testing/oauth2-proxy/APKBUILD +++ b/testing/oauth2-proxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=oauth2-proxy pkgver=7.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="Reverse proxy that provides authentication with Google, Azure, OpenID Connect and many more identity providers" url="https://oauth2-proxy.github.io/oauth2-proxy" arch="all" diff --git a/testing/octoprint/APKBUILD b/testing/octoprint/APKBUILD index aaec2c0c2db..111109a1294 100644 --- a/testing/octoprint/APKBUILD +++ b/testing/octoprint/APKBUILD @@ -1,7 +1,7 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=octoprint -pkgver=1.10.0 +pkgver=1.10.1 pkgrel=0 pkgdesc="Snappy web interface for your 3D printer" url="https://octoprint.org/" @@ -100,7 +100,7 @@ package() { } sha512sums=" -e7aece7014e2c7b3c202a2fcbb6a2c43b6b15c2ae9d2534b454d4240e58512d94c66d556d8852e0c0c666864c075fa9cc4b0027ce7a5ce9239bdb97d2d1f8106 OctoPrint-1.10.0.source.tar.gz +d601d9a66e4b4e571d9d24b00ada580aac1e4c8b4bfc31df5d4b7c073be19d5bf4627294a8493b0b013b0e0c6502480011c43e747beb05622a1abe676fd535d0 OctoPrint-1.10.1.source.tar.gz b56a37d1225d37caff1288b9c943ee86ed1f36653bbb311c835031e53e5f68e95be3ad9b53d333aad65508ba2a3ba786f80601bd74fef8efb1c3364a8fd85010 config.yaml 3edd9971cc59fb66126f063ecac50a77792c5a3f5b718e03b7cbff74ff9f842c7784e7de2a56fb2e847a2bcb8e1c4fcfc52f8d236cdf3ecd511b230eea001162 octoprint.initd d678b87aaee4529b4d96f496862e5bec86df98491330328848ac06fec8d1f4571cfac995b2e9de26dcd2efc43b9dc24578d7f50cae1893fefc76470aee074f14 fix-tests.patch diff --git a/testing/opa/APKBUILD b/testing/opa/APKBUILD index b12d3544b78..11f3336499d 100644 --- a/testing/opa/APKBUILD +++ b/testing/opa/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=opa pkgver=0.61.0 -pkgrel=2 +pkgrel=3 pkgdesc="Open source, general-purpose policy engine" url="https://www.openpolicyagent.org/" # only platforms with full +wasm support, as upstream does diff --git a/testing/opcr-policy/APKBUILD b/testing/opcr-policy/APKBUILD index e7024644427..01e8efe4498 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.13 -pkgrel=0 +pkgrel=1 pkgdesc="CLI for building, versioning and publishing authorization policies" url="https://www.openpolicycontainers.com/" arch="all" diff --git a/testing/openssl1.1-compat/APKBUILD b/testing/openssl1.1-compat/APKBUILD index 29eb65bacac..c3a40165e42 100644 --- a/testing/openssl1.1-compat/APKBUILD +++ b/testing/openssl1.1-compat/APKBUILD @@ -79,9 +79,6 @@ build() { case "$CARCH" in aarch64*) _target="linux-aarch64" ;; arm*) _target="linux-armv4" ;; - mips64*) _target="linux64-mips64" ;; - # explicit _optflags is needed to prevent automatic -mips3 addition - mips*) _target="linux-mips32"; _optflags="-mips32" ;; ppc) _target="linux-ppc" ;; ppc64) _target="linux-ppc64" ;; ppc64le) _target="linux-ppc64le" ;; @@ -89,6 +86,7 @@ build() { x86_64) _target="linux-x86_64"; _optflags="enable-ec_nistp_64_gcc_128" ;; s390x) _target="linux64-s390x";; riscv64) _target="linux-generic64";; + loongarch64) _target="linux-generic64";; *) msg "Unable to determine architecture from (CARCH=$CARCH)" ; return 1 ;; esac diff --git a/testing/opentelemetry-cpp/APKBUILD b/testing/opentelemetry-cpp/APKBUILD index 92997fa44c7..9d40a441c4e 100644 --- a/testing/opentelemetry-cpp/APKBUILD +++ b/testing/opentelemetry-cpp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Severin Neumann <neumanns@cisco.com> pkgname=opentelemetry-cpp pkgver=1.11.0 -pkgrel=2 +pkgrel=3 _opentelemetryproto_ver=1.0.0 pkgdesc="OpenTelemetry C++" url="https://opentelemetry.io/" diff --git a/testing/openvpn3/APKBUILD b/testing/openvpn3/APKBUILD index d13575a369b..5e88b438eea 100644 --- a/testing/openvpn3/APKBUILD +++ b/testing/openvpn3/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=openvpn3 -pkgver=3.8.4 +pkgver=3.8.5 pkgrel=0 pkgdesc="C++ class library that implements the functionality of an OpenVPN client" url="https://github.com/OpenVPN/openvpn3" @@ -37,6 +37,6 @@ package() { } sha512sums=" -2678cfc090ae65c3be03f2056ad009a708f1af13cbad904a6630d5ddf619cd7885b91c042b63c4a839d0603e754d69fe8d060b6ab7366db6ab69cecba4007da4 openvpn3-3.8.4.tar.gz -83bf9085f97a08abccb583a5bd0b15258594b2746e45128c1f987445a92c1de0ea6ef80b750a12dab4baf4aba6fe94d44ff4e8b886796bd107e5cd3568755c5d unvendor.patch +01e750267857d8ae23b4da4460a1e515ebbfadc17e0ff8ad0513368f51c0cf53fc5a41a92422f04812161be2b2b2f3fbc793a72150a8c902af201c2ee9028025 openvpn3-3.8.5.tar.gz +8bd3e9c92734b75701f0845398e831086a8a6d1e7f595f3873e0b599604379a0f99f9764f9ba19a16eb6a63216875ae8607a50c8fc0145ddcf05934a2ba1fb91 unvendor.patch " diff --git a/testing/openvpn3/unvendor.patch b/testing/openvpn3/unvendor.patch index 5959fae44ad..61d0b112ea8 100644 --- a/testing/openvpn3/unvendor.patch +++ b/testing/openvpn3/unvendor.patch @@ -1,8 +1,13 @@ +diff --git a/test/unittests/CMakeLists.txt b/test/unittests/CMakeLists.txt +index f0291a0..7ab3278 100644 --- a/test/unittests/CMakeLists.txt +++ b/test/unittests/CMakeLists.txt -@@ -1,28 +1,4 @@ +@@ -1,31 +1,7 @@ + if (NOT BUILD_TESTING) + return() + endif() - -# current latest GTEST version -set(OVPN_GTEST_VERSION release-1.11.0) @@ -30,5 +35,5 @@ -include(dlgoogletest) +FIND_LIBRARY(GTEST_LIB NAMES gtest) - # Extra includes/libraries that are currently only use by the core unit test - FIND_PATH(LZO_INCLUDE_DIR NAMES lzo/lzo1x.h) + set(CORE_TEST_DEFINES + -DOPENVPN_FORCE_TUN_NULL diff --git a/testing/oras-cli/APKBUILD b/testing/oras-cli/APKBUILD index b08133c7a1e..b9c2c10142e 100644 --- a/testing/oras-cli/APKBUILD +++ b/testing/oras-cli/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=oras-cli pkgver=1.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="OCI registry client" url="https://oras.land/cli" arch="all" 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/ovos/APKBUILD b/testing/ovos/APKBUILD index 73a3227138c..d05d898a318 100644 --- a/testing/ovos/APKBUILD +++ b/testing/ovos/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="Meta-package for the OpenVoiceOS system" url="https://openvoiceos.org/" # 32-bit arches blocked by py3-webrtcvad -> ovos-dinkum-listener # only x86_64 and aarch64 blocked by vosk-api -> py3-ovos-ww-plugin-vosk -arch="noarch !x86 !armhf !armv7 !s390x !ppc64le !riscv64" +arch="noarch !x86 !armhf !armv7 !s390x !ppc64le !riscv64 !loongarch64" license="custom" depends=" ovos-audio diff --git a/testing/pathvector/APKBUILD b/testing/pathvector/APKBUILD index 2bde84f04ef..05f46bddc0e 100644 --- a/testing/pathvector/APKBUILD +++ b/testing/pathvector/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dennis Przytarski <dennis@przytarski.com> pkgname=pathvector pkgver=6.3.2 -pkgrel=5 +pkgrel=6 pkgdesc="Declarative edge routing platform" url="https://pathvector.io" # broken on 32-bit diff --git a/testing/pdfcpu/APKBUILD b/testing/pdfcpu/APKBUILD index 7eadda12d22..8b50645c29d 100644 --- a/testing/pdfcpu/APKBUILD +++ b/testing/pdfcpu/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dmitry Zakharchenko <dmitz@disroot.org> pkgname=pdfcpu pkgver=0.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="PDF processor written in Go" url="https://pdfcpu.io" arch="all" 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-bsd-resource/APKBUILD b/testing/perl-bsd-resource/APKBUILD index f511eccbcf0..1863be17e27 100644 --- a/testing/perl-bsd-resource/APKBUILD +++ b/testing/perl-bsd-resource/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: Celeste <cielesti@protonmail.com> pkgname=perl-bsd-resource -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=BSD-Resource pkgver=1.2911 pkgrel=9 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=BSD-Resource pkgdesc="Perl extension implements the BSD process resource limit functions" url="https://metacpan.org/release/BSD-Resource/" arch="all" @@ -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,6 @@ check() { package() { make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/testing/perl-check-unitcheck/APKBUILD b/testing/perl-check-unitcheck/APKBUILD index 3568c23dceb..1553c508f43 100644 --- a/testing/perl-check-unitcheck/APKBUILD +++ b/testing/perl-check-unitcheck/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-check-unitcheck -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Check-UnitCheck pkgver=0.13 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Check-UnitCheck pkgdesc="Use best of CHECK or UNITCHECK" url="https://metacpan.org/release/Check-UnitCheck/" arch="all" 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-devel-refcount/APKBUILD b/testing/perl-devel-refcount/APKBUILD index e9dfea4feb5..5451f3526c5 100644 --- a/testing/perl-devel-refcount/APKBUILD +++ b/testing/perl-devel-refcount/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-devel-refcount -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Devel-Refcount pkgver=0.10 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Devel-Refcount pkgdesc="Obtain the REFCNT value of a referent" url="https://metacpan.org/release/Devel-Refcount/" arch="all" diff --git a/testing/perl-digest-crc/APKBUILD b/testing/perl-digest-crc/APKBUILD index a4b3357e1d2..9367ef72644 100644 --- a/testing/perl-digest-crc/APKBUILD +++ b/testing/perl-digest-crc/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-digest-crc -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Digest-CRC pkgver=0.24 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Digest-CRC pkgdesc="Perl module for calculating CRC sums" url="https://metacpan.org/release/Digest-CRC/" arch="all" diff --git a/testing/perl-ev-hiredis/APKBUILD b/testing/perl-ev-hiredis/APKBUILD index 9ef6a05e4c9..ff0203bd2b9 100644 --- a/testing/perl-ev-hiredis/APKBUILD +++ b/testing/perl-ev-hiredis/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-ev-hiredis -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=EV-Hiredis pkgver=0.07 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=EV-Hiredis pkgdesc="Asynchronous redis client using hiredis and EV" url="https://metacpan.org/release/EV-Hiredis/" arch="all" diff --git a/testing/perl-glib-ex-objectbits/APKBUILD b/testing/perl-glib-ex-objectbits/APKBUILD index c810081e960..d1422fa4eaa 100644 --- a/testing/perl-glib-ex-objectbits/APKBUILD +++ b/testing/perl-glib-ex-objectbits/APKBUILD @@ -1,36 +1,39 @@ -# Automatically generated by apkbuild-cpan, template 1 +# Automatically generated by apkbuild-cpan, template 4 # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-glib-ex-objectbits +pkgver=17 +pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=Glib-Ex-ObjectBits -pkgver=16 -pkgrel=5 -pkgdesc="Helpers for Glib objects." -url="https://metacpan.org/release/Glib-Ex-ObjectBits" +pkgdesc="Helpers for Glib objects" +url="https://metacpan.org/release/Glib-Ex-ObjectBits/" arch="noarch" license="GPL-3.0-or-later" -options="!check" # fixme: Failed test 'store readonly-float, g_log warning' depends="perl perl-devel-globaldestruction perl-glib" checkdepends="perl-test-weaken perl-gtk2 perl-pango" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/K/KR/KRYDE/$_pkgreal-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/K/KR/KRYDE/Glib-Ex-ObjectBits-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" 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 } 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=" -e5820d251512121f4b44cfd67bcf44b1d94dfb756c5e646436684c45ff2d12f12cbfef4d9deb5deaaec0195ae1113448f0427dfe7f175ebd0ed878fb4ddcf671 Glib-Ex-ObjectBits-16.tar.gz +759259dc261432e93c8f68303c72c6c58016c978e252d472460580dd9a0ec4dfff322cac3bdde37dc85faf6473be1349e35215cdce07c173e7c120ed16981ed5 Glib-Ex-ObjectBits-17.tar.gz " diff --git a/testing/perl-indirect/APKBUILD b/testing/perl-indirect/APKBUILD index 2c2eaabb1d0..c432f9df03f 100644 --- a/testing/perl-indirect/APKBUILD +++ b/testing/perl-indirect/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-indirect -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=indirect pkgver=0.39 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=indirect pkgdesc="Lexically warn about using the indirect method call syntax" url="https://metacpan.org/release/indirect/" arch="all" diff --git a/testing/perl-list-binarysearch-xs/APKBUILD b/testing/perl-list-binarysearch-xs/APKBUILD index 981800a82fd..86d0cc59fa9 100644 --- a/testing/perl-list-binarysearch-xs/APKBUILD +++ b/testing/perl-list-binarysearch-xs/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-list-binarysearch-xs -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=List-BinarySearch-XS pkgver=0.09 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=List-BinarySearch-XS pkgdesc="Binary Search a sorted array with XS routines" url="https://metacpan.org/release/List-BinarySearch-XS/" arch="all" diff --git a/testing/perl-net-async-redis-xs/APKBUILD b/testing/perl-net-async-redis-xs/APKBUILD index e6789d4739b..89ce2c27676 100644 --- a/testing/perl-net-async-redis-xs/APKBUILD +++ b/testing/perl-net-async-redis-xs/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-net-async-redis-xs -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Net-Async-Redis-XS pkgver=1.001 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Net-Async-Redis-XS pkgdesc="Faster version of Net::Async::Redis" url="https://metacpan.org/release/Net-Async-Redis-XS/" arch="all !armhf !armv7 !x86" # perl-net-async-redis diff --git a/testing/perl-net-idn-encode/APKBUILD b/testing/perl-net-idn-encode/APKBUILD index 4ba8ff68560..e7ef90326f4 100644 --- a/testing/perl-net-idn-encode/APKBUILD +++ b/testing/perl-net-idn-encode/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-net-idn-encode -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Net-IDN-Encode pkgver=2.500 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Net-IDN-Encode pkgdesc="Internationalizing Domain Names in Applications (IDNA)" url="https://metacpan.org/release/Net-IDN-Encode/" arch="all" diff --git a/testing/perl-net-libresolv/APKBUILD b/testing/perl-net-libresolv/APKBUILD index 68ce0e14e4f..5792cd1bf0e 100644 --- a/testing/perl-net-libresolv/APKBUILD +++ b/testing/perl-net-libresolv/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-net-libresolv -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Net-LibResolv pkgver=0.03 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Net-LibResolv pkgdesc="Perl wrapper around libresolv" url="https://metacpan.org/release/Net-LibResolv/" arch="all" @@ -18,7 +18,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 } @@ -28,7 +30,6 @@ check() { package() { ./Build install --destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } sha512sums=" diff --git a/testing/perl-promise-xs/APKBUILD b/testing/perl-promise-xs/APKBUILD index c48b5ce3588..c2231e84017 100644 --- a/testing/perl-promise-xs/APKBUILD +++ b/testing/perl-promise-xs/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-promise-xs -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Promise-XS pkgver=0.20 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Promise-XS pkgdesc="Fast promises in Perl" url="https://metacpan.org/release/Promise-XS/" arch="all" diff --git a/testing/perl-ref-util-xs/APKBUILD b/testing/perl-ref-util-xs/APKBUILD index 9a749490ea9..5c01379ac54 100644 --- a/testing/perl-ref-util-xs/APKBUILD +++ b/testing/perl-ref-util-xs/APKBUILD @@ -1,35 +1,39 @@ -# Automatically generated by apkbuild-cpan, template 1 -# Maintainer: Sergey Safarov <s.safarov@gmail.com> +# Automatically generated by apkbuild-cpan, template 4 +# Contributor: Sergey Safarov <s.safarov@gmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-ref-util-xs -_pkgreal=Ref-Util-XS pkgver=0.117 pkgrel=7 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Ref-Util-XS pkgdesc="XS implementation for Ref::Util" url="https://metacpan.org/release/Ref-Util-XS/" arch="all" license="MIT" -makedepends="perl-dev $cpanmakedepends" +depends="perl" +makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/$_pkgreal-$pkgver.tar.gz" - +source="https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/Ref-Util-XS-$pkgver.tar.gz" builddir="$srcdir/$_pkgreal-$pkgver" build() { - cd "$builddir" 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 } check() { - cd "$builddir" + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="5ebcd1bfd6c4b94c17f24c890342d4fba74a7a7c09b3d338208cd5d3fe6b6dd2c504c86ab555c27781b5ede2633d012bb7df819029ce89bec6bc269e21d567a0 Ref-Util-XS-0.117.tar.gz" +sha512sums=" +5ebcd1bfd6c4b94c17f24c890342d4fba74a7a7c09b3d338208cd5d3fe6b6dd2c504c86ab555c27781b5ede2633d012bb7df819029ce89bec6bc269e21d567a0 Ref-Util-XS-0.117.tar.gz +" diff --git a/testing/perl-sentinel/APKBUILD b/testing/perl-sentinel/APKBUILD index 34cfa9534cc..62996bcbfcb 100644 --- a/testing/perl-sentinel/APKBUILD +++ b/testing/perl-sentinel/APKBUILD @@ -2,10 +2,10 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=perl-sentinel -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=Sentinel pkgver=0.07 pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=Sentinel pkgdesc="Create lightweight SCALARs with get/set callbacks" url="https://metacpan.org/release/Sentinel/" arch="all" 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-xml-bare/APKBUILD b/testing/perl-xml-bare/APKBUILD index e4f7fdb49b8..871e820f4f1 100644 --- a/testing/perl-xml-bare/APKBUILD +++ b/testing/perl-xml-bare/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-xml-bare -#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan -_pkgreal=XML-Bare pkgver=0.53 pkgrel=12 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan +_pkgreal=XML-Bare pkgdesc="Minimal XML parser / schema checker / pretty-printer using C internally" url="https://metacpan.org/release/XML-Bare/" arch="all" @@ -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-xml-rpc/APKBUILD b/testing/perl-xml-rpc/APKBUILD index 4d73d695eff..b84e8f44d04 100644 --- a/testing/perl-xml-rpc/APKBUILD +++ b/testing/perl-xml-rpc/APKBUILD @@ -1,42 +1,38 @@ -# 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-xml-rpc +pkgver=2.1 +pkgrel=0 +#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan _pkgreal=XML-RPC -pkgver=2.0 -_pkgver=${pkgver%\.0} -pkgrel=1 pkgdesc="Pure Perl implementation for an XML-RPC client and server" -url="https://metacpan.org/release/XML-RPC" +url="https://metacpan.org/release/XML-RPC/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" depends="perl perl-libwww perl-xml-treepp perl-lwp-protocol-https" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/C/CA/CAVAC/$_pkgreal-$_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 -} +source="https://cpan.metacpan.org/authors/id/C/CA/CAVAC/XML-RPC-$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 \ + 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=" -c48f71f0b2eb2a020caa1d6ba434a236fd755235599affbe1d1c846834c688531fbc8c6b25f5c3a8031279d8ee139a7b5be7fc718f33561d11e505ecf22981b5 XML-RPC-2.tar.gz +9aefdc1b816165224c91b3018bbb7a275b3c3c9151c4804cf6ccf55e90d20d0bf763341e8704f0e0ea2ad9716c757177628539c4af126894f0175457976091e5 XML-RPC-2.1.tar.gz " 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-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 3077df1550b..ad7148adc45 100644 --- a/testing/php81/APKBUILD +++ b/testing/php81/APKBUILD @@ -108,6 +108,7 @@ source="$_pkgreal-$pkgver.tar.xz::https://php.net/distributions/$_pkgreal-$pkgve disabled-tests.riscv64.list disabled-tests.s390x.list disabled-tests.x86.list + disabled-tests.loongarch64.list install-pear.patch includedir.patch sharedir.patch @@ -119,6 +120,7 @@ source="$_pkgreal-$pkgver.tar.xz::https://php.net/distributions/$_pkgreal-$pkgve fix-curl.patch fix-libxml-1.patch fix-libxml-2.patch + loongarch64-support-for-fibers.patch " builddir="$srcdir/$_pkgreal-$pkgver" @@ -657,6 +659,7 @@ d56ecac164e00e9514cd3c6c8c453598b323118dc7d7ae7cc14ba0847d50a2e455b2391f52e0d81a 378db19d08cec29c4e56f2c82ee0a99b31e5ec3eaac56c40597de442da36a4d7efcc7551577e37a6ca22649d612d42714c93e16e3f7579aeb85a44090bde80fc disabled-tests.riscv64.list 54930246f22034e6a73020aa95915d14b2a2fcfe121df57eb17fdc663aceeb94c5c4b1800347149a8fb4eaa0edda4224a11133bdb7e0cd34a2065a2de121db0d disabled-tests.s390x.list 6d3bc15982e13ec4c065b6445e07818d589f2cc677147a57929d1739b3e6b119cc9be6a07d3a99bb5e989e47a62fa6047f967c3c962253845d4bab224b378db3 disabled-tests.x86.list +be3184e07ed3e12b0982b2ed68f12852dbff706031def4be76b89ecad51c23cf2bd4bbf7138b6d83252af4343de0b693724fac9b188941beb5e7cd89af9b07ee disabled-tests.loongarch64.list ec206639d076ddac6c2d1db697a5428ed3be979157db39417af7fbe6ab837e8dc00315ae0e55aea4f92f45ca5827c88cc4933099fad9c962f029ca81bef779d7 install-pear.patch e88ad17895742b74019912ad45c90af74817d75d7e1f71bd3d4a180b5f710a25d3c73c7410394f415eee0f428a8c5a0ea3702009ef9d2bffdebdd5da748f8b9b includedir.patch 8db38c523a8e0ed64298661d328372ea33ba0a56d23c023299ad94ee43a6db8c49393efcb679e74bbb936383dcacebdfb440bbacdf74068d78d071dd3f795101 sharedir.patch @@ -668,4 +671,5 @@ f43ab399c3b4a2b9a3a329acd32d9cbc690cad697dd0a0e87f3d654028b88af7dd1cd80cbf970c6f 9154ea68ec28b83aaa25d2be9012fde5802872b0d97b6141fcddbf93ee86fddd2d1f0e14fe64942c2a5bc51089041659e8b09cce94c634cb1898f25cdf86ed61 fix-curl.patch 6413bcd3542248974b737ecd0f01e28609b35cbc2fdb6b94b702035cb840b27d062a387c99e50abec66196beb908cacd1aa2b97feb0224266436a50dd0905d61 fix-libxml-1.patch d1722ee0429f9218886351f08fe728be3e2e0e65b9b886dd7bee2d7f0e08ffba97e0ba3d14f851c1c839d726916c45316681731891577f781129da0d05c75eea fix-libxml-2.patch +517441fdf14b7855b1843bd0d1c86126017af7a340fbf7177202db7c9e67912332abdb62e7477f45e7922c910672396ba4f953eb7dc052ed06624c682bd12791 loongarch64-support-for-fibers.patch " diff --git a/testing/php81/disabled-tests.loongarch64.list b/testing/php81/disabled-tests.loongarch64.list new file mode 100644 index 00000000000..8a3a51581cc --- /dev/null +++ b/testing/php81/disabled-tests.loongarch64.list @@ -0,0 +1,3 @@ +ext/standard/tests/array/range_variation.phpt +ext/gd/tests/avif_decode_encode.phpt +ext/gd/tests/imagecreatefromstring_avif.phpt diff --git a/testing/php81/loongarch64-support-for-fibers.patch b/testing/php81/loongarch64-support-for-fibers.patch new file mode 100644 index 00000000000..cb39daa6151 --- /dev/null +++ b/testing/php81/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/testing/php82-pecl-phalcon/APKBUILD b/testing/php82-pecl-phalcon/APKBUILD index 2e96c17f167..09cbff4e8f7 100644 --- a/testing/php82-pecl-phalcon/APKBUILD +++ b/testing/php82-pecl-phalcon/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php82-pecl-phalcon _extname=phalcon -pkgver=5.6.2 +pkgver=5.7.0 pkgrel=0 pkgdesc="High performance, full-stack PHP 8.2 framework delivered as a C extension" url="https://phalcon.io/" @@ -44,5 +44,5 @@ package() { } sha512sums=" -27fb1ba24ea6444abba142acf9fa717a9d69fbfb719335358a29d2f74e8ad6c4e76c310a7144cfb34628cd228e239de1bdca6c3365111a4fe588966ab195c7e0 php-phalcon-5.6.2.tgz +6eeddbda7aa9ab381b7d2e66347096789017d7fa07b0f3e01ba385b634d7323c8ea99ee3d1a7d6154c23c8316ca2dad42ff4c7aba2d6902781e26060a0ff5c63 php-phalcon-5.7.0.tgz " diff --git a/testing/php83-pecl-phalcon/APKBUILD b/testing/php83-pecl-phalcon/APKBUILD index 2a196bc7cc4..203ef424802 100644 --- a/testing/php83-pecl-phalcon/APKBUILD +++ b/testing/php83-pecl-phalcon/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Andy Postnikov <apostnikov@gmail.com> pkgname=php83-pecl-phalcon _extname=phalcon -pkgver=5.6.2 +pkgver=5.7.0 pkgrel=0 pkgdesc="High performance, full-stack PHP 8.3 framework delivered as a C extension" url="https://phalcon.io/" @@ -44,5 +44,5 @@ package() { } sha512sums=" -27fb1ba24ea6444abba142acf9fa717a9d69fbfb719335358a29d2f74e8ad6c4e76c310a7144cfb34628cd228e239de1bdca6c3365111a4fe588966ab195c7e0 php-phalcon-5.6.2.tgz +6eeddbda7aa9ab381b7d2e66347096789017d7fa07b0f3e01ba385b634d7323c8ea99ee3d1a7d6154c23c8316ca2dad42ff4c7aba2d6902781e26060a0ff5c63 php-phalcon-5.7.0.tgz " 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/piler/0002-manticore-conf.patch b/testing/piler/0001-manticore-conf.patch index 8721644ffcb..83f2931b851 100644 --- a/testing/piler/0002-manticore-conf.patch +++ b/testing/piler/0001-manticore-conf.patch @@ -1,10 +1,9 @@ -diff -ruN a/etc/manticore.conf.in b/etc/manticore.conf.in ---- a/etc/manticore.conf.in 2024-03-13 09:38:42.847170715 +0100 -+++ b/etc/manticore.conf.in 2024-03-13 09:41:24.847111111 +0100 -@@ -248,11 +248,11 @@ - { +--- a/etc/manticore.conf.in ++++ b/etc/manticore.conf.in +@@ -250,11 +250,11 @@ listen = 127.0.0.1:9312 - listen = 127.0.0.1:9306:mysql41 + listen = 127.0.0.1:9306:mysql + listen = 127.0.0.1:9307:mysql_readonly - log = /var/piler/manticore/manticore.log + log = /var/log/piler/manticore.log binlog_max_log_size = 256M diff --git a/testing/piler/0001-utf8_encode_char.patch b/testing/piler/0001-utf8_encode_char.patch deleted file mode 100644 index c6b52188ee5..00000000000 --- a/testing/piler/0001-utf8_encode_char.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -ruN a/src/decoder.h b/src/decoder.h ---- a/src/decoder.h 2021-02-23 07:26:47.000000000 +0100 -+++ b/src/decoder.h 2022-03-28 18:35:10.706474194 +0200 -@@ -11,5 +11,6 @@ - void decodeHTML(char *p, int utf8); - void decodeURL(char *p); - int utf8_encode(char *inbuf, int inbuflen, char *outbuf, int outbuflen, char *encoding); -+void utf8_encode_char(unsigned char c, unsigned char *buf, int buflen, int *len); - - #endif /* _DECODER_H */ diff --git a/testing/piler/0002-inline-compiler-fix.patch b/testing/piler/0002-inline-compiler-fix.patch new file mode 100644 index 00000000000..653a8114d22 --- /dev/null +++ b/testing/piler/0002-inline-compiler-fix.patch @@ -0,0 +1,51 @@ +From 4e2be5dda6429e253f60c9b1fe4a7831f7b009e1 Mon Sep 17 00:00:00 2001 +From: jsuto <sj@acts.hu> +Date: Tue, 23 Apr 2024 17:33:10 +0200 +Subject: [PATCH] Inline compiler fix (#18) + +Signed-off-by: Janos SUTO <sj@acts.hu> +--- + src/decoder.c | 2 +- + src/hash.c | 2 +- + src/session.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/decoder.c b/src/decoder.c +index fc034ff1..a22bd1b0 100644 +--- a/src/decoder.c ++++ b/src/decoder.c +@@ -67,7 +67,7 @@ static int compmi(const void *m1, const void *m2){ + } + + +-inline void utf8_encode_char(unsigned char c, unsigned char *buf, int buflen, int *len){ ++static inline void utf8_encode_char(unsigned char c, unsigned char *buf, int buflen, int *len){ + int count=0; + + memset(buf, 0, buflen); +diff --git a/src/hash.c b/src/hash.c +index bb131cbf..35947fee 100644 +--- a/src/hash.c ++++ b/src/hash.c +@@ -9,7 +9,7 @@ + #include <piler.h> + + +-inline int hash(unsigned int key){ ++static inline int hash(unsigned int key){ + return key % MAXHASH; + } + +diff --git a/src/session.c b/src/session.c +index a7ca4094..932caa0f 100644 +--- a/src/session.c ++++ b/src/session.c +@@ -199,7 +199,7 @@ void tear_down_session(struct smtp_session **sessions, int slot, int *num_connec + } + + +-inline int get_last_newline_position(char *buf, int buflen){ ++static inline int get_last_newline_position(char *buf, int buflen){ + int i; + + for(i=buflen; i>0; i--){ diff --git a/testing/piler/0003-fix_pilerpurge_for_rt_index.patch b/testing/piler/0003-fix_pilerpurge_for_rt_index.patch deleted file mode 100644 index 66dd1912157..00000000000 --- a/testing/piler/0003-fix_pilerpurge_for_rt_index.patch +++ /dev/null @@ -1,91 +0,0 @@ -From e2f6a718272585dd99737087b9c63fa7a734461c Mon Sep 17 00:00:00 2001 -From: Janos SUTO <sj@acts.hu> -Date: Wed, 1 Nov 2023 08:25:56 +0100 -Subject: [PATCH] Updated pilerpurge to remove data from manticore in case of - RT index - -Signed-off-by: Janos SUTO <sj@acts.hu> ---- - util/pilerpurge.py | 26 ++++++++++++++++++++++---- - 1 file changed, 22 insertions(+), 4 deletions(-) - -diff --git a/util/pilerpurge.py b/util/pilerpurge.py -index e2e2d61f..dc87916e 100755 ---- a/util/pilerpurge.py -+++ b/util/pilerpurge.py -@@ -9,7 +9,7 @@ import sys - import syslog - import time - --SQL_PURGE_SELECT_QUERY = "SELECT piler_id, size FROM " +\ -+SQL_PURGE_SELECT_QUERY = "SELECT id, piler_id, size FROM " +\ - "metadata WHERE deleted=0 AND retained < UNIX_TIMESTAMP(NOW()) " +\ - "AND id NOT IN (SELECT id FROM rcpt WHERE `to` IN " +\ - "(SELECT email FROM legal_hold)) AND id NOT IN (SELECT " +\ -@@ -33,7 +33,9 @@ def read_options(filename="", opts={}): - opts['password'] = config.get('piler', 'mysqlpwd') - opts['database'] = config.get('piler', 'mysqldb') - opts['storedir'] = config.get('piler', 'queuedir') -- -+ opts['rtindex'] = config.getint('piler', 'rtindex', fallback=0) -+ opts['sphxhost'] = config.get('piler', 'sphxhost', fallback='127.0.0.1') -+ opts['sphxport'] = config.getint('piler', 'sphxport', fallback=9306) - opts['server_id'] = "%02x" % config.getint('piler', 'server_id') - - -@@ -184,6 +186,17 @@ def get_attachment_file_path(piler_id='', attachment_id=0, opts={}): - str(attachment_id)]) - - -+def purge_index_data(ids=[], opts={}): -+ ''' -+ Delete from index data in case of RT index -+ ''' -+ -+ if opts['rtindex'] == 1 and opts['dry_run'] is False: -+ cursor = opts['sphx'].cursor() -+ a = "," . join([str(x) for x in ids]) -+ cursor.execute("DELETE FROM piler WHERE id IN (%s)" % (a)) -+ -+ - def main(): - parser = argparse.ArgumentParser() - parser.add_argument("-c", "--config", type=str, help="piler.conf path", -@@ -203,6 +216,7 @@ def main(): - opts['dry_run'] = args.dry_run - opts['verbose'] = args.verbose - opts['db'] = None -+ opts['sphx'] = None - opts['messages'] = 0 - opts['files'] = 0 - opts['size'] = 0 -@@ -217,6 +231,8 @@ def main(): - opts['db'] = dbapi.connect(opts['dbhost'], opts['username'], - opts['password'], opts['database']) - -+ opts['sphx'] = dbapi.connect(host=opts['sphxhost'], port=opts['sphxport']) -+ - if is_purge_enabled(opts) is False: - syslog.syslog("Purging emails is disabled") - sys.exit(1) -@@ -229,13 +245,15 @@ def main(): - if rows == (): - break - -- piler_id = [x[0] for x in rows] -- size = [x[1] for x in rows] -+ id = [x[0] for x in rows] -+ piler_id = [x[1] for x in rows] -+ size = [x[2] for x in rows] - - opts['purged_size'] = opts['purged_size'] + sum(size) - - purge_m_files(piler_id, opts) - purge_attachments_by_piler_id(piler_id, opts) -+ purge_index_data(id, opts) - - # It's possible that there's attachment duplication, thus - # refcount > 0, even though after deleting the duplicates --- -2.42.0 - diff --git a/testing/piler/APKBUILD b/testing/piler/APKBUILD index 62b95da727d..9e2fa67a7cf 100644 --- a/testing/piler/APKBUILD +++ b/testing/piler/APKBUILD @@ -1,17 +1,18 @@ # Contributor: Noel Kuntze <noel.kuntze@thermi.consulting> # Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting> pkgname=piler -pkgver=1.4.4 +pkgver=1.4.5 pkgrel=0 pkgdesc="Open source email archiving solution with all the necessary features for your enterprise" url="https://www.mailpiler.org/" -arch="all !ppc64le !s390x !x86 !armhf !armv7" # exclusions because manticore is not built for these architectures +arch="x86_64 aarch64" # libmanticore-columnar is only supported on x86_64 and aarch64 license="GPL-3.0-only" depends=" bash catdoc coreutils findutils + libmanticore-columnar libzip manticore memcached @@ -34,16 +35,16 @@ options="!check" subpackages="$pkgname-openrc" pkgusers="piler" pkggroups="piler" -source="https://bitbucket.org/jsuto/piler/downloads/piler-$pkgver.tar.gz - 0001-utf8_encode_char.patch - 0002-manticore-conf.patch - 0003-fix_pilerpurge_for_rt_index.patch - +source="https://github.com/jsuto/piler/archive/refs/tags/piler-$pkgver.tar.gz + 0001-manticore-conf.patch + 0002-inline-compiler-fix.patch + piler.initd piler-smtp.initd searchd.initd searchd.confd -" + " +builddir="$srcdir/piler-piler-$pkgver" build() { ./configure \ @@ -103,12 +104,11 @@ package() { } sha512sums=" -bd53fa14d01fe50c7fa6ccded4404d4ceb6b19ff4484cc2c4f8fde05cc9a66937c701a4378535afc939707d4c27955ec3f31337674506488b10672fc41ba7b4b piler-1.4.4.tar.gz -017f3c6241a0368efb6d1b1b734c38b52af67753f5245dad42e265f44961c90bd218d947824a02e7ff02aa11edd642a2947aeff64033f4757670948f88478f4a 0001-utf8_encode_char.patch -6bbf4c70dd51413b6568f2866a28524eb2986fee35fc4921166baa702fbf466ded7c3357ef7987403c3ad694bbd62aad9abfc90ac8313613e31b7b65784c9b08 0002-manticore-conf.patch -aefef3ff8101c62524f3cd866e3243d4e0cfb2acfd98627db29d9e2d8c12647962bf1b7b62dbd8d0f8b8b20f7719da134dde5d903b4adcf589f5494576ee3e58 0003-fix_pilerpurge_for_rt_index.patch -f3895913350ffb252455c50bb276cc9fff0603804507d2a3f6ab6167a1b8b357ca8039ccb8725849ffa99fe04673d510dfcdc09f099631a8f0dd148494def615 piler.initd -3aa8e661c1c806311abecdc76dcbd12a167e64de11785d2a3c63416cd1e5a445eb021ff4882de5fe1a145fc78483b3691262a07fc0168bbfc03b88812cc1ad17 piler-smtp.initd +65510b60797e2b3a70c5bdc513306b6848ed08312b1bc5f25c199bfc7e8690e5256c528324aa4546ffb32229f5bd2b2103fb163cc644d015c7d53c71a06fc07f piler-1.4.5.tar.gz +918c2809db685f676cf3319d687568d380eba3dd43e8c36b00648abb420fe35d036aa1b21d51fe43497aa297546341c1fbdd79ab643bfed4a9f80874a027c446 0001-manticore-conf.patch +90169f9c9b6bc3c592e28a055cf52df6551d3b7516de5b17c9eaefef51ff93d177a78841d6264d569e7b359fbc080db78b9c3a7df29bd5099e28aa2ca23e0990 0002-inline-compiler-fix.patch +89f4f2136fbe5a7d5106f79533d4b3487ef67d7f8c1added31193114bf4471cff63d1c99bfde23aafb4915e5c00292907b7fd568964ceb8b32da7009f3d4e59b piler.initd +3cf50479a0a8b79c1d41f4c4eaa7393630a03f6b007cd8d62b3538bd85d44bc68b949134ad671600073a35428aa0fef7ea2b03ff881f9dc5fdcf444f5e282a01 piler-smtp.initd c4ad4742c3bd899d8f8004f16252b4862e19683cba6d3d4a7c86d9ed90942c7b3878fc713915aa299b28852f798fedee5ae73e28844d653383d6c7a07698fde4 searchd.initd d6a57f4f972786898d39e94666daa36ba6265dbb577d97e4a9586d4e7b2f3f7b4e69537b316529123186df30f530dc54c03af10c88c8e205192d2b8568571bb3 searchd.confd " diff --git a/testing/piler/piler-smtp.initd b/testing/piler/piler-smtp.initd index 8070d2d35f7..17e0a68b4cb 100644 --- a/testing/piler/piler-smtp.initd +++ b/testing/piler/piler-smtp.initd @@ -3,10 +3,10 @@ description="Piler SMTP server" command="/usr/bin/$SVCNAME" -command_background=yes +command_args_background="-d" depend() { - need net - after firewall + need net + after firewall } diff --git a/testing/piler/piler.initd b/testing/piler/piler.initd index 3e69b9272b3..61f19dddbdf 100644 --- a/testing/piler/piler.initd +++ b/testing/piler/piler.initd @@ -3,14 +3,15 @@ description="Piler daemon" command="/usr/bin/$SVCNAME" -command_background=yes +command_args_background="-d" +pidfile="/run/piler/piler.pid" depend() { - need net - after firewall mariadb + need net + after firewall mariadb } start_pre() { - checkpath -d -m 750 -o piler:piler /run/piler + checkpath -d -m 750 -o piler:piler /run/piler } diff --git a/testing/piper-tts/APKBUILD b/testing/piper-tts/APKBUILD index a9f740f7532..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, riscv64 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/pixi/APKBUILD b/testing/pixi/APKBUILD index 6a70bbc5458..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.21.0 +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=" -c0ca407adba7eccea8d0ec6b5fb58f52b1b0be2db72234afcccf93f3c429a83ea194287e81659e0926e6ab8160e1ef3d3378410078cff4d9dee3b809f08349a1 pixi-0.21.0.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 60c67b6a88e..54809350151 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.7 -pkgrel=0 +pkgrel=1 pkgdesc="High-performance, extensible build system for reproducible multi-language builds" url="https://please.build/" # The only architectures supported upstream diff --git a/testing/pnpm/APKBUILD b/testing/pnpm/APKBUILD index 92f9089a4ea..565de106a0e 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.6 +pkgver=9.1.2 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=" -f6d863130973207cb7a336d6b439a242a26ac8068077df530d6a86069419853dc1ffe64029ec594a9c505a3a410d19643c870aba6776330f5cfddcf10a9c1617 pnpm-9.0.6.tgz +127dc83b9ea10c32be65d22a8efb4a65fb952e8fefbdfded39bdc3c97efc32d31b48b00420df2c1187ace28c921c902f0cb5a134a4d032b8b5295cbfa2c681e2 pnpm-9.1.2.tgz " diff --git a/testing/pomo/APKBUILD b/testing/pomo/APKBUILD index b7376a9ff62..4873990103f 100644 --- a/testing/pomo/APKBUILD +++ b/testing/pomo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=pomo pkgver=0.8.1 -pkgrel=15 +pkgrel=16 pkgdesc="Pomodoro CLI" url="https://kevinschoon.github.io/pomo/" license="MIT" diff --git a/testing/popeye/APKBUILD b/testing/popeye/APKBUILD index 50d84bbc36b..e7c75db40e1 100644 --- a/testing/popeye/APKBUILD +++ b/testing/popeye/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=popeye pkgver=0.21.3 -pkgrel=0 +pkgrel=1 pkgdesc="Kubernetes cluster resource sanitizer" url="https://popeyecli.io/" arch="all" 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/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-bind-exporter/APKBUILD b/testing/prometheus-bind-exporter/APKBUILD index f992cd6ffe2..b77b4bcecee 100644 --- a/testing/prometheus-bind-exporter/APKBUILD +++ b/testing/prometheus-bind-exporter/APKBUILD @@ -3,7 +3,7 @@ pkgname=prometheus-bind-exporter _pkgname=bind_exporter pkgver=0.7.0 -pkgrel=3 +pkgrel=4 pkgdesc="Prometheus Bind Exporter" url="https://github.com/prometheus-community/bind_exporter" license="Apache-2.0" diff --git a/testing/prometheus-ceph-exporter/APKBUILD b/testing/prometheus-ceph-exporter/APKBUILD index d2efde862da..dbba06fe5bc 100644 --- a/testing/prometheus-ceph-exporter/APKBUILD +++ b/testing/prometheus-ceph-exporter/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Alex Denes <caskd@redxen.eu> pkgname=prometheus-ceph-exporter pkgver=4.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="Prometheus exporter that scrapes meta information about a ceph cluster" url="https://github.com/digitalocean/ceph_exporter" license="Apache-2.0" diff --git a/testing/prometheus-podman-exporter/APKBUILD b/testing/prometheus-podman-exporter/APKBUILD index 5e0b5282098..f2a366e479c 100644 --- a/testing/prometheus-podman-exporter/APKBUILD +++ b/testing/prometheus-podman-exporter/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Tuan Anh Tran <me@tuananh.org> pkgname=prometheus-podman-exporter pkgver=1.11.0 -pkgrel=0 +pkgrel=1 pkgdesc="Prometheus exporter for podman environments exposing containers, pods, images, volumes and networks information" url="https://github.com/containers/prometheus-podman-exporter" arch="all" diff --git a/testing/prometheus-rethinkdb-exporter/APKBUILD b/testing/prometheus-rethinkdb-exporter/APKBUILD index 8887ad10dff..92a91d51868 100644 --- a/testing/prometheus-rethinkdb-exporter/APKBUILD +++ b/testing/prometheus-rethinkdb-exporter/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: TBK <alpine@jjtc.eu> pkgname=prometheus-rethinkdb-exporter pkgver=1.0.1 -pkgrel=20 +pkgrel=21 pkgdesc="Prometheus exporter for RethinkDB" url="https://github.com/rethinkdb/prometheus-exporter" license="Apache-2.0" diff --git a/testing/prometheus-smartctl-exporter/APKBUILD b/testing/prometheus-smartctl-exporter/APKBUILD index 5004566f1bc..31aedbf9d92 100644 --- a/testing/prometheus-smartctl-exporter/APKBUILD +++ b/testing/prometheus-smartctl-exporter/APKBUILD @@ -3,7 +3,7 @@ pkgname=prometheus-smartctl-exporter _pkgname=smartctl_exporter pkgver=0.12.0 -pkgrel=2 +pkgrel=3 pkgdesc="Prometheus smartctl exporter" url="https://github.com/prometheus-community/smartctl_exporter" arch="all" diff --git a/testing/prometheus-smokeping-prober/APKBUILD b/testing/prometheus-smokeping-prober/APKBUILD index b9c50c6c096..d083859311d 100644 --- a/testing/prometheus-smokeping-prober/APKBUILD +++ b/testing/prometheus-smokeping-prober/APKBUILD @@ -3,7 +3,7 @@ pkgname=prometheus-smokeping-prober _pkgname=smokeping_prober pkgver=0.7.1 -pkgrel=4 +pkgrel=5 pkgdesc="Prometheus style smokeping prober" url="https://github.com/SuperQ/smokeping_prober" license="Apache-2.0" diff --git a/testing/prometheus-unbound-exporter/APKBUILD b/testing/prometheus-unbound-exporter/APKBUILD index 65a05d01f97..a5cdb3b6908 100644 --- a/testing/prometheus-unbound-exporter/APKBUILD +++ b/testing/prometheus-unbound-exporter/APKBUILD @@ -3,7 +3,7 @@ pkgname=prometheus-unbound-exporter _pkgname=unbound_exporter pkgver=0.4.1 -pkgrel=5 +pkgrel=6 pkgdesc="Prometheus exporter for Unbound statistics" url="https://github.com/letsencrypt/unbound_exporter" license="Apache-2.0" diff --git a/testing/protoc-gen-go/APKBUILD b/testing/protoc-gen-go/APKBUILD index 295329f5c1e..f3fb092a5e4 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.34.0 -pkgrel=0 +pkgrel=1 pkgdesc="Protocol Buffers Go generator" url="https://github.com/protocolbuffers/protobuf-go" arch="all" diff --git a/testing/protoconf/APKBUILD b/testing/protoconf/APKBUILD index 6589ffe7175..bdfae74a68e 100644 --- a/testing/protoconf/APKBUILD +++ b/testing/protoconf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=protoconf pkgver=0.1.7 -pkgrel=5 +pkgrel=6 pkgdesc="Configuration as Code framework based on protobuf and Starlark" url="https://docs.protoconf.sh/" arch="all" 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 211c0359b2e..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.16.2.4435 +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,6 +74,20 @@ 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 @@ -90,8 +103,9 @@ package() { } sha512sums=" -1509ce9634e6213eb6323f87276635a44ab83ebe55b20ae6285922dd2e69b1c8519422eac9ada5fc27c42424b477e9677fbf3b9f982cbae43b4614fb65116d80 prowlarr-1.16.2.4435.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/pwru/APKBUILD b/testing/pwru/APKBUILD index b37d62d2f58..d020414d02d 100644 --- a/testing/pwru/APKBUILD +++ b/testing/pwru/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=pwru pkgver=1.0.6 -pkgrel=0 +pkgrel=1 pkgdesc="eBPF-based Linux kernel networking debugger" url="https://github.com/cilium/pwru" arch="x86_64 aarch64" # the only platforms supported upstream 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-aioitertools/APKBUILD b/testing/py3-aioitertools/APKBUILD new file mode 100644 index 00000000000..bed92b12dca --- /dev/null +++ b/testing/py3-aioitertools/APKBUILD @@ -0,0 +1,33 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=py3-aioitertools +pkgdesc="Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables" +pkgver=0.11.0 +pkgrel=0 +arch="noarch" +url="https://github.com/omnilib/aioitertools" +license="MIT" +depends="python3" +makedepends="py3-gpep517 py3-setuptools py3-wheel py3-flit-core" +subpackages="$pkgname-pyc" + +source="$pkgname-$pkgver.tar.gz::https://github.com/omnilib/aioitertools/archive/refs/tags/v$pkgver.tar.gz" + +builddir="$srcdir"/aioitertools-$pkgver + +build() { + gpep517 build-wheel \ + --wheel-dir dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python -m unittest -v aioitertools.tests +} + +package() { + python3 -m installer -d "$pkgdir" dist/*.whl +} + +sha512sums=" +0ddc884004c297cd08872b38bf3788fdf65846935e9c576638fae477ab920bb1e5f7197e3f9e668e55634f4df464348518acc55c9581b9210915af4cead98545 py3-aioitertools-0.11.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-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-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-daemon/APKBUILD b/testing/py3-daemon/APKBUILD index 194bf31f278..416cd99a3d3 100644 --- a/testing/py3-daemon/APKBUILD +++ b/testing/py3-daemon/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting> pkgname=py3-daemon pkgver=2.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="Library to implement a well-behaved Unix daemon process" url="https://pagure.io/python-daemon" options="!check" # Has lots of dependencies @@ -11,7 +11,10 @@ license="Apache-2.0 AND GPL-3.0-or-later" depends="py3-setuptools py3-lockfile" makedepends="py3-docutils" subpackages="$pkgname-pyc" -source="https://pypi.io/packages/source/p/python-daemon/python-daemon-$pkgver.tar.gz" +source=" + https://pypi.io/packages/source/p/python-daemon/python-daemon-$pkgver.tar.gz + remove-docutils-depend.patch +" builddir="$srcdir/python-daemon-$pkgver" prepare() { @@ -33,4 +36,5 @@ package() { sha512sums=" d9f6e6c376a496fae96bd9efed0a56d00a137617a3d1d5ef74802ef176bc813bb1d49bbb9164cdbec03213529f944b32b257bcc64283abfa4a3522ff00826bfd python-daemon-2.3.2.tar.gz +20bc4bce7fba9754d1c9bca298f9b4ff7fe90ecf51769df2020912f370650a5997f91c99c6be2ecffed10a6b359a29b1f64b0c391772451eb3c04769df381015 remove-docutils-depend.patch " diff --git a/testing/py3-daemon/remove-docutils-depend.patch b/testing/py3-daemon/remove-docutils-depend.patch new file mode 100644 index 00000000000..2bbc3bee30a --- /dev/null +++ b/testing/py3-daemon/remove-docutils-depend.patch @@ -0,0 +1,16 @@ +diff --git a/setup.py.orig b/setup.py +index 24f0e7cb98a..d712294c20b 100644 +--- a/setup.py.orig ++++ b/setup.py +@@ -96,11 +96,6 @@ setup_kwargs = dict( + ], + ) + +-# Docutils is only required for building, but Setuptools can't distinguish +-# dependencies properly. +-# See <URL:https://github.com/pypa/setuptools/issues/457>. +-setup_kwargs['install_requires'].append("docutils") +- + + if __name__ == '__main__': + setup(**setup_kwargs) diff --git a/testing/py3-dataclasses-json/APKBUILD b/testing/py3-dataclasses-json/APKBUILD index 59e5b533f7f..d32ddd72a38 100644 --- a/testing/py3-dataclasses-json/APKBUILD +++ b/testing/py3-dataclasses-json/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-dataclasses-json _pkgname=dataclasses-json -pkgver=0.6.4 -pkgrel=1 +pkgver=0.6.6 +pkgrel=0 pkgdesc="Provides a simple API for encoding and decoding dataclasses to and from JSON." url="https://github.com/lidatong/dataclasses-json" arch="all" @@ -34,5 +34,5 @@ package() { } sha512sums=" -78c94055e55703266de19fe0f712ca4945443f124cc75469e7b68b32cd13d0e1effcc5450f7539d9cde42698b38f4e749a912ef7bf39af4c13981a36b4234746 dataclasses-json-0.6.4.tar.gz +5838f229338b75fcd86def391bf7f9c77e055dab7570e52735f8f2a1866265bcc9cac50620e2c180745c455d7a38bef3405553befa0a8d3e7fb0912464fc0f4f dataclasses-json-0.6.6.tar.gz " diff --git a/testing/py3-django-debug-toolbar/APKBUILD b/testing/py3-django-debug-toolbar/APKBUILD index b0974d344e1..3759131cdc1 100644 --- a/testing/py3-django-debug-toolbar/APKBUILD +++ b/testing/py3-django-debug-toolbar/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=py3-django-debug-toolbar _pkgname=django-debug-toolbar -pkgver=4.3 -pkgrel=1 +pkgver=4.4.1 +pkgrel=0 pkgdesc="Configurable set of panels that display various debug information about the current request/response" options="!check" # Requires unpackaged Selenium python3 module url="https://github.com/jazzband/django-debug-toolbar" @@ -34,5 +34,5 @@ package() { } sha512sums=" -caa8563d38e8c96305828b7a07006ce2ee0afae099d70d75d332f2196fc3ffcf7f3848440ea22c00f2b918029477672a172e30714f6f73a630404175aef3b925 py3-django-debug-toolbar-4.3.tar.gz +3fd89882e3a94dc929128d1f7ff1d6f717c904ffedaec4c4cc2c857bd7ea21982c0e5d5ff8e82693c3cb000590f6314a0960932ad58017715f3203460dc0ef0a py3-django-debug-toolbar-4.4.1.tar.gz " diff --git a/testing/py3-dunamai/APKBUILD b/testing/py3-dunamai/APKBUILD index a447aab3155..8a6c3c9c269 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.21.0 +pkgver=1.21.1 pkgrel=0 pkgdesc="Dynamic versioning library and CLI" url="https://github.com/mtkennerly/dunamai" @@ -32,5 +32,5 @@ package() { } sha512sums=" -7f22fc442a419e6952a7754c51133d7d0e68c154fa34095bf033f0e44e96c096080c9f89bd5328584c5127114ebe37142c292a3e0b724bf294ce1752d87406b2 dunamai-1.21.0.tar.gz +003104714d9ef61cbb7c10a9647b8eba3645ec4a18a32a025d92ac6621697f3a75c40b4c4865403c9fd33dbf49d94ec2bed3832a2b8be4bb8223490f2f512ece dunamai-1.21.1.tar.gz " diff --git a/testing/py3-falcon/APKBUILD b/testing/py3-falcon/APKBUILD new file mode 100644 index 00000000000..507e4ce160b --- /dev/null +++ b/testing/py3-falcon/APKBUILD @@ -0,0 +1,65 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=py3-falcon +pkgdesc="Web API framework for fast and reliable microservices, proxies, and app backends" +pkgver=3.1.3 +pkgrel=0 +arch="all" +url="https://falconframework.org/" +license="Apache-2.0" +makedepends=" + py3-gpep517 + py3-setuptools + py3-wheel + python3-dev + cython + " +checkdepends=" + py3-coverage + py3-pytest + py3-pyaml + py3-requests + py3-pytest-asyncio + py3-aiofiles + py3-httpx + uvicorn + py3-websockets + py3-cbor2 + py3-msgpack + py3-mujson + py3-ujson + py3-rapidjson + py3-orjson + py3-gunicorn + py3-daphne + py3-waitress + " + +subpackages="$pkgname-pyc" + +source="$pkgname-$pkgver.tar.gz::https://github.com/falconry/falcon/archive/refs/tags/$pkgver.tar.gz + python-3.12.patch + " + +builddir="$srcdir"/falcon-$pkgver + +build() { + gpep517 build-wheel \ + --wheel-dir dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + local _site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + python3 -m installer -d test_dir dist/*.whl + export PYTHONPATH="$PWD/test_dir/$_site_packages:$PYTHONPATH" + pytest -vv tests/ +} + +package() { + python3 -m installer -d "$pkgdir" dist/*.whl +} + +sha512sums=" +66c5f563b373eb2bc2576d64d2225fa98f4d9d80dc1c93f6831f17287738797ac1f08a1ba71f4a70e6bafad7a51f70fa6fbbee99ef521419ceedcf2d892108ee py3-falcon-3.1.3.tar.gz +c9b7eb3058df517e7880584292b9a46415f437c9cddff8ddab8d1bcb7cf0e2cc5ef8ebd6e4c5ad2dd243aefc02e4664a91a885cc15b7c97e75ba430bfa669e95 python-3.12.patch +" diff --git a/testing/py3-falcon/python-3.12.patch b/testing/py3-falcon/python-3.12.patch new file mode 100644 index 00000000000..6bc9b6a2ded --- /dev/null +++ b/testing/py3-falcon/python-3.12.patch @@ -0,0 +1,116 @@ +From a78cfb38a0c0f6031cc3ff39ff8bf4afd03ef008 Mon Sep 17 00:00:00 2001 +From: Vytautas Liuolia <vytautas.liuolia@gmail.com> +Date: Thu, 21 Mar 2024 20:59:26 +0100 +Subject: [PATCH] chore(sync): use `asyncio.Runner` for `async_to_sync()` on + py311+ (#2216) + +* chore(asyncio): replace `get_event_loop()` -> `get_running_loop()` where applicable + +* chore(sync): use `asyncio.Runner` for `async_to_sync()` on py311+ + +* chore(sync): exempt a line from coverage as it can only be hit on 3.11+ + +* chore(tests/asgi): adapt to Uvicorn now propagating signals to retcode + +* chore(tests/asgi): do not check ASGI server retcode on Windows + +* chore(tests/asgi): check for a M$ Windows specific exit code constant + +* chore(sync): use a nicer pattern to get the active runner +--- + falcon/util/sync.py | 60 ++++++++++++++++++++++++--------- + pyproject.toml | 1 - + tests/asgi/test_asgi_servers.py | 10 ++++-- + tests/asgi/test_scope.py | 6 ++-- + tests/dump_asgi.py | 2 +- + 5 files changed, 56 insertions(+), 23 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index ad445ce55..5ed0c5fab 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -97,7 +97,6 @@ filterwarnings = [ + "ignore:.cgi. is deprecated and slated for removal:DeprecationWarning", + "ignore:path is deprecated\\. Use files\\(\\) instead:DeprecationWarning", + "ignore:This process \\(.+\\) is multi-threaded", +- "ignore:There is no current event loop", + ] + testpaths = [ + "tests" +diff --git a/tests/asgi/test_asgi_servers.py b/tests/asgi/test_asgi_servers.py +index 26f51ad0c..321e41f96 100644 +--- a/tests/asgi/test_asgi_servers.py ++++ b/tests/asgi/test_asgi_servers.py +@@ -4,6 +4,7 @@ + import os + import platform + import random ++import signal + import subprocess + import sys + import time +@@ -27,7 +28,9 @@ + _SERVER_HOST = '127.0.0.1' + _SIZE_1_KB = 1024 + _SIZE_1_MB = _SIZE_1_KB**2 +- ++# NOTE(vytas): Windows specific: {Application Exit by CTRL+C}. ++# The application terminated as a result of a CTRL+C. ++_STATUS_CONTROL_C_EXIT = 0xC000013A + + _REQUEST_TIMEOUT = 10 + +@@ -620,7 +623,10 @@ def server_base_url(request): + + yield base_url + +- assert server.returncode == 0 ++ # NOTE(vytas): Starting with 0.29.0, Uvicorn will propagate signal ++ # values into the return code (which is a good practice in Unix); ++ # see also https://github.com/encode/uvicorn/pull/1600 ++ assert server.returncode in (0, -signal.SIGTERM, _STATUS_CONTROL_C_EXIT) + + break + +diff --git a/tests/asgi/test_scope.py b/tests/asgi/test_scope.py +index bb60ed0e7..e368f6576 100644 +--- a/tests/asgi/test_scope.py ++++ b/tests/asgi/test_scope.py +@@ -70,7 +70,7 @@ def test_supported_asgi_version(version, supported): + resp_event_collector = testing.ASGIResponseEventCollector() + + async def task(): +- coro = asyncio.get_event_loop().create_task( ++ coro = asyncio.get_running_loop().create_task( + app(scope, req_event_emitter, resp_event_collector) + ) + +@@ -142,7 +142,7 @@ def test_lifespan_scope_default_version(): + scope = {'type': 'lifespan'} + + async def t(): +- t = asyncio.get_event_loop().create_task( ++ t = asyncio.get_running_loop().create_task( + app(scope, req_event_emitter, resp_event_collector) + ) + +@@ -196,7 +196,7 @@ def test_lifespan_scope_version(spec_version, supported): + return + + async def t(): +- t = asyncio.get_event_loop().create_task( ++ t = asyncio.get_running_loop().create_task( + app(scope, req_event_emitter, resp_event_collector) + ) + +diff --git a/tests/dump_asgi.py b/tests/dump_asgi.py +index 0742a3ca0..0dfdb4b0a 100644 +--- a/tests/dump_asgi.py ++++ b/tests/dump_asgi.py +@@ -23,5 +23,5 @@ async def app(scope, receive, send): + } + ) + +- loop = asyncio.get_event_loop() ++ loop = asyncio.get_running_loop() + loop.create_task(_say_hi()) diff --git a/testing/py3-fastapi/APKBUILD b/testing/py3-fastapi/APKBUILD index e7f882347e0..96042aca422 100644 --- a/testing/py3-fastapi/APKBUILD +++ b/testing/py3-fastapi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Steven Guikal <void@fluix.one> # Maintainer: Steven Guikal <void@fluix.one> pkgname=py3-fastapi -pkgver=0.108.0 +pkgver=0.111.0 pkgrel=0 pkgdesc="Modern, high-performance, web framework for building APIs based on standard Python type hints" url="https://github.com/tiangolo/fastapi" @@ -13,19 +13,21 @@ depends=" " makedepends=" py3-gpep517 - py3-hatchling py3-installer + py3-pdm-backend " checkdepends=" + py3-aiosqlite + py3-anyio + py3-databases py3-dirty-equals py3-email-validator py3-flask py3-httpx py3-orjson py3-passlib - py3-peewee py3-pytest - py3-pytest-xdist + py3-pydantic-settings py3-python-jose py3-python-multipart py3-sqlalchemy @@ -34,9 +36,7 @@ checkdepends=" py3-yaml " subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://github.com/tiangolo/fastapi/archive/refs/tags/$pkgver.tar.gz - pytest-markers.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/tiangolo/fastapi/archive/refs/tags/$pkgver.tar.gz" builddir="$srcdir/fastapi-$pkgver" build() { @@ -46,13 +46,15 @@ build() { } check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer .dist/*.whl - # Depends on older SQLAlchemy and slated for removal: - # https://github.com/tiangolo/fastapi/blob/dd4e78ca7b09abdf0d4646fe4697316c021a8b2e/requirements-tests.txt#L9 - .testenv/bin/python3 -m pytest -p no:warnings \ - --ignore-glob "tests/test_tutorial/*sql_databases" \ - --ignore tests/test_dependency_normal_exceptions.py + python3 -m venv --clear --without-pip --system-site-packages testenv + testenv/bin/python3 -m installer .dist/*.whl + # The deselected tests are failing with "DeprecationWarning: The 'app' shortcut is now deprecated..." + # This has to be addressed upstream + testenv/bin/python3 -m pytest \ + --deselect tests/test_tutorial/test_async_tests/test_main.py::test_root[asyncio] \ + --deselect tests/test_tutorial/test_async_tests/test_main.py::test_async_testing[asyncio] \ + --deselect tests/test_tutorial/test_async_tests/test_main.py::test_root[trio] \ + --deselect tests/test_tutorial/test_async_tests/test_main.py::test_async_testing[trio] } package() { @@ -61,6 +63,5 @@ package() { } sha512sums=" -c7f1b265c680e75e2654623e14c94d06fa880e219346d577c70bb070dbf15f424ebd4fa4450ce0e364dc4d794ba496dee8e24f20ff292ef6ee7f0eed2aee05a4 py3-fastapi-0.108.0.tar.gz -854946e3e52460edfd84cd44e254659354171e88245f4134c7f943a07bf3b08455ad81c54f4c58c50f639aa7288e25d81711f3d7867bbe2d6c83844e2fdd9921 pytest-markers.patch +3b613e4b2e7253fa08c09f961e69d384d2f44d07dc7f045b669c3e78f21a161715f3e9a0cb813a1c6e793f4a322160ec3eeb4eef90ba59db64bde9baaa539c13 py3-fastapi-0.111.0.tar.gz " diff --git a/testing/py3-fastapi/pytest-markers.patch b/testing/py3-fastapi/pytest-markers.patch deleted file mode 100644 index 58792ca7c8d..00000000000 --- a/testing/py3-fastapi/pytest-markers.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -90,6 +90,9 @@ - "--strict-markers", - "--ignore=docs_src", - ] -+markers = [ -+ "filterwarnings", -+] - xfail_strict = true - junit_family = "xunit2" - filterwarnings = [ 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-flask-limiter/APKBUILD b/testing/py3-flask-limiter/APKBUILD index 800380743c3..9555218ee6a 100644 --- a/testing/py3-flask-limiter/APKBUILD +++ b/testing/py3-flask-limiter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=py3-flask-limiter -pkgver=3.6.0 +pkgver=3.7.0 pkgrel=0 pkgdesc="Rate Limiting extension for Flask" url="https://github.com/alisaifee/flask-limiter" @@ -45,6 +45,6 @@ package() { } sha512sums=" -95bb2af7ff9d317821235212818718f7e5a13cf18f9991fa4e392a99bdc7b4aafbe510e67dd9d56860c987f954c7c4f3f0a6d29cab51bfb55606319b549e839f flask-limiter-3.6.0.tar.gz +f546536e3efb86571515aac5b578155c240049fb1ccf96e55d4b1814d9e227e41cc18fc587f115706606154bb12a84b381533cf069cdfc56453b0f170ec19449 flask-limiter-3.7.0.tar.gz 1b90e9134076cda249695d5ea741db9d205a2ae452c7d6edfe01eb37a221ce6f64b0e8ddcdbbee9b0e0fb16a28e5eabf14f1c1e41e965c7e3b93ea4f42caf553 our-std-is-good-enough.patch " 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-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-kikit/APKBUILD b/testing/py3-kikit/APKBUILD index d7330d690ca..418b0dac136 100644 --- a/testing/py3-kikit/APKBUILD +++ b/testing/py3-kikit/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 pkgdesc="Python library and CLI tool to automate several tasks in KiCAD" url="https://github.com/yaqwsx/KiKit" # riscv64: py3-shapely -# aarch64, armv7, armhf, mips64: py3-solidpython +# aarch64, armv7, armhf: py3-solidpython # s390x: kicad arch="noarch !riscv64 !aarch64 !armv7 !armhf !s390x" license="MIT" diff --git a/testing/py3-limits/APKBUILD b/testing/py3-limits/APKBUILD index 68ff82c12ae..ed4a82efd6b 100644 --- a/testing/py3-limits/APKBUILD +++ b/testing/py3-limits/APKBUILD @@ -1,7 +1,7 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=py3-limits -pkgver=3.11.0 +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" @@ -45,6 +45,6 @@ package() { } sha512sums=" -04db3e7ac67d4e3b23379e1c7271dbf112d9d3e7409148c8656564dfc4f584223127645d3eece81fc6a9e19d1a5d0bf48b5571e9c511701321f11079e9419967 limits-3.11.0.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-litex/APKBUILD b/testing/py3-litex/APKBUILD index fab2cce1e38..5a850a37fbd 100644 --- a/testing/py3-litex/APKBUILD +++ b/testing/py3-litex/APKBUILD @@ -7,14 +7,10 @@ pkgrel=1 pkgdesc="infrastructure to create FPGA Cores/SoCs and full FPGA based systems" url="https://github.com/enjoy-digital/litex" license="BSD-2-Clause" -# ppc64le: verilator verilator-dev -# s390x: verilator verilator-dev, picolibc-riscv-none-elf -# armv7: verilator verilator-dev, picolibc-riscv-none-elf -# armhf: verilator verilator-dev, picolibc-riscv-none-elf -# riscv64: verilator verilator-dev, picolibc-riscv-none-elf -# aarch64: verilator verilator-dev +# ppc64le, aarch64: blocked by verilator +# s390x, armv7, armhf, riscv64, loongarch64: blocked by verilator, picolibc-riscv-none-elf # x86: unit test failures -arch="all !ppc64le !s390x !armv7 !armhf !riscv64 !aarch64 !x86" +arch="all !ppc64le !s390x !armv7 !armhf !riscv64 !aarch64 !x86 !loongarch64" depends=" py3-migen py3-packaging diff --git a/testing/py3-marshmallow/APKBUILD b/testing/py3-marshmallow/APKBUILD index 5dc185bec5d..69e7cc338dc 100644 --- a/testing/py3-marshmallow/APKBUILD +++ b/testing/py3-marshmallow/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-marshmallow _pkgname=marshmallow -pkgver=3.21.1 -pkgrel=1 +pkgver=3.21.2 +pkgrel=0 pkgdesc="A lightweight library for converting complex objects to and from simple Python datatypes" url="https://github.com/marshmallow-code/marshmallow" arch="noarch" @@ -32,5 +32,5 @@ package() { } sha512sums=" -6de06ced6a58ef0c312ee4c1edfbe011401bba08c27fcf2dd2c3e44cb072cded1cf5f16a4d4945344d56f0d26b5eb165f6d031b50c215f122c7cc6fe25389318 py3-marshmallow-3.21.1.tar.gz +b151f7e712dc5dd5d7f592942a6a4b09d462b684f542406c8bc57237e4b2402eb287d02e4ca2ef65e10dccb1e200b9ff8ae24f69160af1c6aa02fc5dfdc9eeba py3-marshmallow-3.21.2.tar.gz " diff --git a/testing/py3-mattermostdriver/0001-ssl-context.patch b/testing/py3-mattermostdriver/0001-ssl-context.patch new file mode 100644 index 00000000000..f07026bb634 --- /dev/null +++ b/testing/py3-mattermostdriver/0001-ssl-context.patch @@ -0,0 +1,11 @@ +--- a/src/mattermostdriver/websocket.py ++++ b/src/mattermostdriver/websocket.py +@@ -26,7 +26,7 @@ + :type event_handler: Function(message) + :return: + """ +- context = ssl.create_default_context(purpose=ssl.Purpose.CLIENT_AUTH) ++ context = ssl.create_default_context(purpose=ssl.Purpose.SERVER_AUTH) + if not self.options['verify']: + context.verify_mode = ssl.CERT_NONE + diff --git a/testing/py3-mattermostdriver/APKBUILD b/testing/py3-mattermostdriver/APKBUILD new file mode 100644 index 00000000000..5beae6b6a19 --- /dev/null +++ b/testing/py3-mattermostdriver/APKBUILD @@ -0,0 +1,33 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=py3-mattermostdriver +pkgdesc="Python Mattermost Driver for APIv4" +pkgver=7.3.2 +pkgrel=0 +arch="noarch" +url="https://vaelor.github.io/python-mattermost-driver/" +license="MIT" +options="!check" # No test suite +depends="python3 py3-requests py3-websockets" +makedepends="py3-gpep517 py3-setuptools py3-wheel" +subpackages="$pkgname-pyc" + +source="$pkgname-$pkgver.tar.gz::https://github.com/Vaelor/python-mattermost-driver/archive/refs/tags/$pkgver.tar.gz + 0001-ssl-context.patch + " + +builddir="$srcdir"/python-mattermost-driver-$pkgver + +build() { + gpep517 build-wheel \ + --wheel-dir dist \ + --output-fd 3 3>&1 >&2 +} + +package() { + python3 -m installer -d "$pkgdir" dist/*.whl +} + +sha512sums=" +0da6384dce40c3ee5332409e2b29de55c3d1431fa22b70dbe0f8c02df84c5ceb6291f24e4379e611d3ef636af5e171e9f95c20591796b1128e07cfc93bb8468b py3-mattermostdriver-7.3.2.tar.gz +24154f2fe7f912a24a759cd06bef4efa52710aaf4f3743ac8996ede89fc3e0a3baa12a68c9aab8b311399f0d3799e423ff036ad98caa06d2f8c8e8fe0397ed47 0001-ssl-context.patch +" diff --git a/testing/py3-mujson/APKBUILD b/testing/py3-mujson/APKBUILD new file mode 100644 index 00000000000..80df8b5a155 --- /dev/null +++ b/testing/py3-mujson/APKBUILD @@ -0,0 +1,29 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=py3-mujson +pkgdesc="Use the fastest JSON functions available at import time" +pkgver=1.4 +pkgrel=0 +arch="noarch" +url="https://github.com/mattgiles/mujson/" +license="MIT" +options="!check" # No test suite +makedepends="py3-gpep517 py3-setuptools py3-wheel python3-dev" +subpackages="$pkgname-pyc" + +source="$pkgname-$pkgver.tar.gz::https://github.com/mattgiles/mujson/archive/refs/tags/$pkgver.tar.gz" + +builddir="$srcdir"/mujson-$pkgver + +build() { + gpep517 build-wheel \ + --wheel-dir dist \ + --output-fd 3 3>&1 >&2 +} + +package() { + python3 -m installer -d "$pkgdir" dist/*.whl +} + +sha512sums=" +ad648338ad08c17afe3d22a0b6937cf4ad5aabf5cbf8041f6147fef084f4c2f9c163932b942069593353bb245e118739205cb81c67708a398bc904cc176ea42d py3-mujson-1.4.tar.gz +" diff --git a/testing/py3-netifaces2/APKBUILD b/testing/py3-netifaces2/APKBUILD index 610b1a80f3a..4d990859e3e 100644 --- a/testing/py3-netifaces2/APKBUILD +++ b/testing/py3-netifaces2/APKBUILD @@ -18,6 +18,7 @@ options="net" subpackages="$pkgname-pyc" source=" https://github.com/SamuelYvon/netifaces-2/archive/V$pkgver/py3-netifaces2-V$pkgver.tar.gz + cargo-update.patch " builddir="$srcdir/netifaces-2-$pkgver" provides="py3-netifaces" @@ -49,4 +50,5 @@ package() { sha512sums=" eb188ef1ac16a59ca05b8c94aee380a6e55d2dc78271967a29db5b3528b55057ce4d19ed2ac64dba9a731a64ddaebb627654773012105bcf7a9e5440936aefea py3-netifaces2-V0.0.22.tar.gz +f81d1d8d41354763bfd0264d2387ab98e9bd2203dc4603c457f2a06d63ea9bc67d9adffcea47cbad272f157fe633fe699f4529f369e9b44532c967ef9708ec0f cargo-update.patch " diff --git a/testing/py3-netifaces2/cargo-update.patch b/testing/py3-netifaces2/cargo-update.patch new file mode 100644 index 00000000000..7927f88efc9 --- /dev/null +++ b/testing/py3-netifaces2/cargo-update.patch @@ -0,0 +1,28 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 60bf851..e21920f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -40,9 +40,9 @@ checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "lock_api" +@@ -254,9 +254,9 @@ dependencies = [ + + [[package]] + name = "target-lexicon" +-version = "0.12.4" ++version = "0.12.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1" ++checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + + [[package]] + name = "thiserror" diff --git a/testing/py3-nose-of-yeti/APKBUILD b/testing/py3-nose-of-yeti/APKBUILD index 17d95747933..02f21ed9a08 100644 --- a/testing/py3-nose-of-yeti/APKBUILD +++ b/testing/py3-nose-of-yeti/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-nose-of-yeti -pkgver=2.4.8 -pkgrel=1 +pkgver=2.4.9 +pkgrel=0 pkgdesc="Nose plugin that provides an RSpec inspired dsl for python" url="https://noseofyeti.readthedocs.io/" arch="noarch" @@ -34,6 +34,6 @@ package() { } sha512sums=" -b0fd267e90ec73713f4f3ce9482b93e1cc4f36dfae3bbce12dac4e9fb2851b620f8d996f0567327f1517bc4cbe5a3c634edc2341ac6ba73e785e89aa94c43dde py3-nose-of-yeti-2.4.8.tar.gz +96e7997404cf5f358d7d513483e2977a2794fcc3907d221d200a39b82e24895af884fafe8be4efff8b419a616c431c7b821ea8b7ab372df0030053fdbf522599 py3-nose-of-yeti-2.4.9.tar.gz 8c834594f02b5a98645c717b4de21ccd33f7f9d70be7f38b1745a405c2078ebc168cc72309698457811631e72f96e1e8a6ebd063d7e697390bfbed6cb850e55c use-pytest-asyncio.patch " diff --git a/testing/py3-openapi-core/APKBUILD b/testing/py3-openapi-core/APKBUILD new file mode 100644 index 00000000000..86afdafb5ef --- /dev/null +++ b/testing/py3-openapi-core/APKBUILD @@ -0,0 +1,73 @@ +# Maintainer: Noel Kuntze <noel.kuntze@contauro.com> +pkgname=py3-openapi-core +pkgdesc="Client-side and server-side support for the OpenAPI Specification v3" +pkgver=0.19.1 +pkgrel=0 +arch="noarch !armhf !ppc64le" +url="https://github.com/p1c2u/openapi-core" +license="BSD-3-Clause" +depends="python3 + py3-asgiref + py3-isodate + py3-jsonschema + py3-jsonschema-path + py3-more-itertools + py3-openapi-schema-validator + py3-openapi-spec-validator + py3-parse + py3-werkzeug + " +makedepends=" + py3-gpep517 + py3-setuptools + py3-wheel + py3-poetry-core + " +checkdepends=" + py3-pytest + py3-pytest-aiohttp + py3-pytest-asyncio + py3-aiohttp + py3-aioitertools + py3-django + py3-django-rest-framework + py3-falcon + py3-fastapi + py3-flask + py3-httpx + py3-multidict + py3-requests + py3-responses + py3-starlette + " + +subpackages="$pkgname-pyc" + +source="$pkgname-$pkgver.tar.gz::https://github.com/python-openapi/openapi-core/archive/refs/tags/$pkgver.tar.gz" + +builddir="$srcdir"/openapi-core-$pkgver + +prepare() { + default_prepare + sed -i 's/--cov\S*//' pyproject.toml +} + +build() { + gpep517 build-wheel \ + --wheel-dir dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --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=" +b345cb17038f0105fb8e062e85f18904147c52c407c37368e9a0368633819f765a7c83b3f96ff22de9e2ded7386ad031609abd599321b2afc7d7ecb1d86544d6 py3-openapi-core-0.19.1.tar.gz +" diff --git a/testing/py3-ovos-ww-plugin-vosk/APKBUILD b/testing/py3-ovos-ww-plugin-vosk/APKBUILD index cb431485c68..6a60a688c27 100644 --- a/testing/py3-ovos-ww-plugin-vosk/APKBUILD +++ b/testing/py3-ovos-ww-plugin-vosk/APKBUILD @@ -6,7 +6,7 @@ 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 -arch="noarch !x86 !armhf !armv7 !s390x !ppc64le !riscv64" +arch="noarch !x86 !armhf !armv7 !s390x !ppc64le !riscv64 !loongarch64" license="Apache-2.0" depends=" ovos-skill-installer diff --git a/testing/py3-pcbnewtransition/APKBUILD b/testing/py3-pcbnewtransition/APKBUILD index f9d39cd603f..02197766d66 100644 --- a/testing/py3-pcbnewtransition/APKBUILD +++ b/testing/py3-pcbnewtransition/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 pkgdesc="Easily support KiCAD 7, 6 and 5 in your KiCAD plugins by monkeypatching older versions to KiCAD 7 API" url="https://github.com/yaqwsx/pcbnewTransition" # riscv64: py3-shapely -# aarch64, armv7, armhf, mips64: py3-solidpython +# aarch64, armv7, armhf: py3-solidpython # s390x: kicad arch="noarch !riscv64 !aarch64 !armv7 !armhf !s390x" license="MIT" diff --git a/testing/py3-plexapi/APKBUILD b/testing/py3-plexapi/APKBUILD index 0629a98d1c1..7b4b634dde9 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.13 +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 +77efc0aa87666c5e3bd0f971f8f050671eb8ae378917be8282dba8a058352a553bade1a06942788f52d1c76ece3f8fdf3821feb73619f739a3d9182cf09df394 py3-plexapi-4.15.13.tar.gz " diff --git a/testing/py3-poetry-dynamic-versioning/APKBUILD b/testing/py3-poetry-dynamic-versioning/APKBUILD index 450d4b34ab2..cb69e140753 100644 --- a/testing/py3-poetry-dynamic-versioning/APKBUILD +++ b/testing/py3-poetry-dynamic-versioning/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=py3-poetry-dynamic-versioning -pkgver=1.2.0 -pkgrel=1 +pkgver=1.3.0 +pkgrel=0 pkgdesc="Plugin for Poetry to enable dynamic versioning based on VCS tags" url="https://github.com/mtkennerly/poetry-dynamic-versioning" arch="noarch" @@ -33,5 +33,5 @@ package() { } sha512sums=" -7e12745045dfa8b8bc7c140165cb39eef0e0231e23903ed7f58761e109dc28254906bc9609fd4b830559a8c462bd3cf80ac7a0bb71f6ba91ae9ef3a2d70cd811 py3-poetry-dynamic-versioning-1.2.0.tar.gz +2fd3910675693784e54f9734e7280fdfbf455112e4ee9afdddb04db5d33965794dfb20450a249ea984aafa5377f64606b503e41c7bd9c4287e0792c33b490268 py3-poetry-dynamic-versioning-1.3.0.tar.gz " diff --git a/testing/py3-pycaption/APKBUILD b/testing/py3-pycaption/APKBUILD index e44e2cda347..16fb2136f76 100644 --- a/testing/py3-pycaption/APKBUILD +++ b/testing/py3-pycaption/APKBUILD @@ -1,7 +1,7 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> -# Maintainer: lauren n. liberda <lauren@selfisekai.rocks> +# Maintainer: pkgname=py3-pycaption -pkgver=2.2.4 +pkgver=2.2.10 pkgrel=0 pkgdesc="Python module to read/write popular video caption formats" url="https://github.com/pbs/pycaption" @@ -14,24 +14,32 @@ depends=" py3-lxml py3-nltk " -makedepends="py3-setuptools" +makedepends=" + py3-gpep517 + py3-setuptools + py3-wheel + " checkdepends="py3-pytest" source="https://github.com/pbs/pycaption/archive/refs/tags/$pkgver/pycaption-$pkgver.tar.gz" builddir="$srcdir/pycaption-$pkgver" 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 rm -rf "$pkgdir"/usr/lib/python3*/site-packages/tests } sha512sums=" -6082cf098b2e8b97e84729538f842405c667a5eda50d5bec094b372f9e9b0ac79a64bb807fc2b75b0ee3c79d934f6e15f595cdf4882277086067207fb7637976 pycaption-2.2.4.tar.gz +9c09ac504b4d42d5dfcc9e1890205fa990380d91f884205dc718668ebcf846e784e6c1d4a7410ae7ebbbc76fb0fc8c3cbbfe00e10ac0d08bc24778265f7d43e6 pycaption-2.2.10.tar.gz " diff --git a/testing/py3-pydantic-settings/APKBUILD b/testing/py3-pydantic-settings/APKBUILD new file mode 100644 index 00000000000..d8c15a5cc79 --- /dev/null +++ b/testing/py3-pydantic-settings/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: Steven Guikal <void@fluix.one> +# Maintainer: Steven Guikal <void@fluix.one> +pkgname=py3-pydantic-settings +pkgdesc="Settings management using pydantic" +pkgver=2.2.1 +pkgrel=0 +arch="noarch" +url="https://github.com/pydantic/pydantic-settings" +license="MIT" +depends="python3 + py3-dotenv + py3-pydantic + py3-typing-extensions + " +makedepends=" + py3-gpep517 + py3-hatchling + py3-setuptools + py3-wheel + " +checkdepends=" + py3-pytest + py3-pytest-mock + " +subpackages="$pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/pydantic/pydantic-settings/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir"/pydantic-settings-$pkgver + +build() { + gpep517 build-wheel \ + --wheel-dir dist \ + --output-fd 3 3>&1 >&2 +} + +check() { + python3 -m venv --clear --system-site-packages testenv + testenv/bin/python3 -m installer dist/*.whl + # test_docs.py needs pytest-examples which is not packaged + testenv/bin/python3 -m pytest --ignore=tests/test_docs.py +} + +package() { + python3 -m installer -d "$pkgdir" dist/*.whl +} + +sha512sums=" +a90b92e85f6722321c90c0c09bd332d9ec9550c42f2c8b797bfd212532699e4d6536eec19ef172ead0aaa25fd4ef984f6694d8c957852f59ab2d45be4e29c199 py3-pydantic-settings-2.2.1.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-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-qbittorrent-api/APKBUILD b/testing/py3-qbittorrent-api/APKBUILD index 1acc1157e67..fa7748a473d 100644 --- a/testing/py3-qbittorrent-api/APKBUILD +++ b/testing/py3-qbittorrent-api/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabricio Silva <hi@fabricio.dev> # Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=py3-qbittorrent-api -pkgver=2024.3.60 +pkgver=2024.5.61 pkgrel=0 pkgdesc="Python client implementation for qBittorrent's Web API" url="https://github.com/rmartin16/qbittorrent-api" @@ -30,7 +30,7 @@ build() { gpep517 build-wheel \ --wheel-dir .dist \ --output-fd 3 3>&1 >&2 - sphinx-build -W -b man docs/source docs/build + sphinx-build -b man docs/source docs/build } package() { @@ -42,5 +42,5 @@ package() { } sha512sums=" -716b2f8eadd0556a57bfcaec6f03227c67e7412f78cbb350f7a608897bf23075a5d85986993235305be8d056926401e8438fdc4dd2e0a65183a4bd1f79fbf148 py3-qbittorrent-api-2024.3.60.tar.gz +34e56eb172095450e702375a1a703b8dbb499aab91ab74a07eab1605e230a3b78c00ce6953f2b5849728200ef0c01eb4a3892812014620fd78cb0456dde2642a py3-qbittorrent-api-2024.5.61.tar.gz " 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-sabctools/APKBUILD b/testing/py3-sabctools/APKBUILD deleted file mode 100644 index 1d92df7b4dd..00000000000 --- a/testing/py3-sabctools/APKBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Contributor: Fabricio Silva <hi@fabricio.dev> -# Maintainer: Fabricio Silva <hi@fabricio.dev> -pkgname=py3-sabctools -_pkgname=sabctools -pkgver=8.1.0 -pkgrel=1 -pkgdesc="C implementations of functions for use within SABnzbd" -url="https://github.com/sabnzbd/sabctools" -arch="all" -license="GPL-2.0-or-later AND Apache-2.0 AND CC0-1.0" -makedepends=" - linux-headers - py3-gpep517 - py3-setuptools - py3-wheel - python3-dev - " -checkdepends=" - py3-chardet - py3-jaraco.functools - py3-portend - py3-pytest - " -subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://github.com/sabnzbd/sabctools/archive/v$pkgver.tar.gz" -builddir="$srcdir/$_pkgname-$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=" -862c39f2e386622b528f120a431f214e1e2e92b7c5a751e47d0768f40ce06ad2736d867f7ac2e1810d676e980312bbfedd29951cbadeddefe75246cdcf53fcc6 py3-sabctools-8.1.0.tar.gz -" diff --git a/testing/py3-sphinx-autoapi/APKBUILD b/testing/py3-sphinx-autoapi/APKBUILD index 68de3a84ead..bd130e00606 100644 --- a/testing/py3-sphinx-autoapi/APKBUILD +++ b/testing/py3-sphinx-autoapi/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Galen Abell <galen@galenabell.com> # Maintainer: Galen Abell <galen@galenabell.com> pkgname=py3-sphinx-autoapi -_pyname=sphinx-autoapi -pkgver=3.0.0 -pkgrel=1 +_pyname=sphinx_autoapi +pkgver=3.1.1 +pkgrel=0 pkgdesc="Automatic API documentation for Sphinx" url="https://sphinx-autoapi.readthedocs.io" arch="noarch !x86" # build breaks on x86 @@ -24,16 +24,16 @@ build() { check() { python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl - # Test requires network access + # Disable tests that require network access .testenv/bin/python3 -m pytest \ - --deselect tests/python/test_pyintegration.py::TestPipeUnionModule::test_integration + --deselect tests/python/test_pyintegration.py::TestPipeUnionModule::test_integration \ + --deselect tests/python/test_pyintegration.py::TestPEP695::test_integration } package() { python3 -m installer -d "$pkgdir" \ .dist/*.whl } - sha512sums=" -f59fb203e1b867f02d5757fb3f58dcaf52b936eff67f4837ae75d9cbff24989d19bb254830bf0e2f90bae1760204e8900ea2e30573da654ad0b5223b9c39750d sphinx-autoapi-3.0.0.tar.gz +2c833279dfc00b95a83325c6fdbe61115e56c62966f2d0f260974ede2ced5699b5d56170240f4116b8f7b02254eaa68ef35a8263f54d55997bfda94c796010fb sphinx_autoapi-3.1.1.tar.gz " diff --git a/testing/py3-sphobjinv/APKBUILD b/testing/py3-sphobjinv/APKBUILD index dcb38babd47..7006f51196a 100644 --- a/testing/py3-sphobjinv/APKBUILD +++ b/testing/py3-sphobjinv/APKBUILD @@ -2,28 +2,30 @@ # Maintainer: Galen Abell <galen@galenabell.com> pkgname=py3-sphobjinv _pyname=sphobjinv -pkgver=2.3.1 -pkgrel=2 +pkgver=2.3.1.1 +pkgrel=0 pkgdesc="Sphinx objects.inv Inspection/Manipulation Tool" url="https://github.com/bskinn/sphobjinv" arch="noarch" license="MIT" -options="!check" # no tests -depends="python3 py3-attrs py3-certifi py3-jsonschema py3-fuzzywuzzy" -makedepends="py3-setuptools" -checkdepends="py3-pytest" +options="!check" # tests have a lot of unpackaged dependencies +depends="py3-attrs py3-certifi py3-jsonschema py3-fuzzywuzzy" +makedepends="py3-gpep517 py3-setuptools py3-wheel" subpackages="$pkgname-pyc" source="$_pyname-$pkgver.tar.gz::https://github.com/bskinn/sphobjinv/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir/$_pyname-$pkgver" build() { - python3 setup.py build + gpep517 build-wheel \ + --wheel-dir .dist \ + --output-fd 3 3>&1 >&2 } package() { - python3 setup.py install --skip-build --root="$pkgdir" + python3 -m installer -d "$pkgdir" \ + .dist/*.whl } sha512sums=" -7253b8b21e2027ce22013edf76a6cd397dcebf652e235a8af8b82349fb19a2f7df15d33f9f032f195a4b471f5bb5321c7de0fb195a5c0c2ce3847be23da35862 sphobjinv-2.3.1.tar.gz +c5260bbccff8531469ec67c44dfb33e46f55c4a07d25ed4a1332ebde3be09721877cf4af31feff8ff0aa81d6af68905607bf47a62cfda7893e449fd90b10bdbf sphobjinv-2.3.1.1.tar.gz " diff --git a/testing/py3-tpm2-pytss/APKBUILD b/testing/py3-tpm2-pytss/APKBUILD index 0a514a49fac..a6498400868 100644 --- a/testing/py3-tpm2-pytss/APKBUILD +++ b/testing/py3-tpm2-pytss/APKBUILD @@ -34,7 +34,7 @@ source="https://github.com/tpm2-software/tpm2-pytss/archive/$pkgver/$_pkgname-$p builddir="$srcdir/$_pkgname-$pkgver" case "$CARCH" in - armv7|ppc64le|s390x) options="!check";; # no swtpm package + armv7|ppc64le|s390x|loongarch64) options="!check" ;; # no swtpm package *) ;; esac 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 8122f767ffc..ffb1c249e0d 100644 --- a/testing/py3-xsdata/APKBUILD +++ b/testing/py3-xsdata/APKBUILD @@ -1,8 +1,8 @@ # 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" @@ -50,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/qbittorrent-cli/APKBUILD b/testing/qbittorrent-cli/APKBUILD index a206b320c11..e9673ffe94b 100644 --- a/testing/qbittorrent-cli/APKBUILD +++ b/testing/qbittorrent-cli/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Cowington Post <cowingtonpost@gmail.com> pkgname=qbittorrent-cli pkgver=2.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Cli to manage qBittorrent" url="https://github.com/ludviglundgren/qbittorrent-cli" arch="all" diff --git a/testing/qgis/APKBUILD b/testing/qgis/APKBUILD index b93cf02c49b..b21e79f89ef 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=5 +pkgrel=6 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/qtmir/APKBUILD b/testing/qtmir/APKBUILD index da2cebb4506..fb840964eea 100644 --- a/testing/qtmir/APKBUILD +++ b/testing/qtmir/APKBUILD @@ -6,8 +6,8 @@ pkgver=0.7.2 pkgrel=0 pkgdesc="QPA plugin to make Qt a Mir server" # armhf: blocked by lots of dependencies -# riscv64: blocked by valgrind -arch="all !armhf !riscv64" +# riscv64, loongarch64: blocked by valgrind +arch="all !armhf !riscv64 !loongarch64" url="https://gitlab.com/ubports/development/core/qtmir" license="LGPL-3.0-only" makedepends=" diff --git a/testing/racksdb/APKBUILD b/testing/racksdb/APKBUILD new file mode 100644 index 00000000000..05d16cb32d2 --- /dev/null +++ b/testing/racksdb/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: omni <omni+alpine@hack.org> +# Maintainer: omni <omni+alpine@hack.org> +pkgname=racksdb +pkgver=0.4.0 +pkgrel=0 +pkgdesc="YAML-based database of datacenter infrastructures" +url="https://rackslab.io/en/solutions/racksdb/" +arch="noarch" +license="GPL-3.0-or-later" +depends="clustershell py3-cairo pango py3-gobject3" +makedepends="asciidoctor py3-gpep517 py3-setuptools py3-wheel" +checkdepends="py3-pytest" +subpackages="$pkgname-doc $pkgname-pyc" +source="$pkgname-$pkgver.tar.gz::https://github.com/rackslab/RacksDB/archive/refs/tags/v$pkgver.tar.gz" +builddir="$srcdir/RacksDB-$pkgver" + +build() { + gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2 + + for adocman in docs/man/*.adoc; do + asciidoctor --backend manpage --attribute mansource='RacksDB 0.4.0' "$adocman" + done +} + +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 docs/man/*.1 -t "$pkgdir"/usr/share/man/man1/ + install -Dm644 CHANGELOG.md -t "$pkgdir"/usr/share/doc/"$pkgname"/ + mv examples "$pkgdir"/usr/share/doc/"$pkgname"/ +} + +sha512sums=" +365980fb69415ee5fab6eaf37ba296fad7481605bba3ac0ac28108ccf13f129b7ed7415cf8680b9b0c1a2e2bdb26448525fe5e338522f59a0cc7d4468590375e racksdb-0.4.0.tar.gz +" diff --git a/testing/radarr/APKBUILD b/testing/radarr/APKBUILD index bc6e8d9cfbc..37b98e882e4 100644 --- a/testing/radarr/APKBUILD +++ b/testing/radarr/APKBUILD @@ -1,21 +1,15 @@ # Contributor: Fabricio Silva <hi@fabricio.dev> # Maintainer: Fabricio Silva <hi@fabricio.dev> pkgname=radarr -pkgver=5.4.6.8723 +pkgver=5.6.0.8846 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 and yarn +depends="aspnetcore6-runtime sqlite-libs" +makedepends="dotnet6-sdk yarn" subpackages="$pkgname-openrc" install="$pkgname.pre-install" source=" @@ -29,6 +23,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 +76,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,7 +105,7 @@ package() { } sha512sums=" -c67d4dfb318ff7d5b837684775f1301cc8232cc1fc82d741e91a2e33ce2cf7c68e51dc1c060d39d1773d99a7d48f2d3fec51837fd963171f540fb9d2edee9563 radarr-5.4.6.8723.tar.gz +3ac8e0c1e9427a691ed4826eb298ce5073dbe87b433d9aa58bfbe0e147a791ac5e68456014f9478b0504b4e6fab948d876e7b0018cd2eca310b54b01c0ec2c00 radarr-5.6.0.8846.tar.gz 753520379a6c5f2899b4ddfd820d5573598a32cb105f74c6fd978a3f2c98895cf709ef2d9afe2bae8c4856da86cb6a1364f5713ea7ef6a36bb21b5a5840c1471 0001-disable-restart.patch fc61194f8cf6d87cb8ec13db39e7d953bdcd2fae0fdf47ebe7701e52bfad5a92313f76a7bdbb04608170dbaec0e5895788079d284f988fd99fe19f7e61f2e836 radarr.initd 7f30d17b9a66b34786ff9f62954eda1677296fc724dde9e2b4f1edb6f19bce8b3df5806d661e48751bd4ebdf6faecd9632d89c1fb35d41ad01ea892fdad71ded radarr.confd diff --git a/testing/rattler-build/APKBUILD b/testing/rattler-build/APKBUILD index 0271658d4e1..edbd28f7760 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.16.0 +pkgver=0.16.2 pkgrel=0 pkgdesc="A fast conda-package builder" url="https://github.com/prefix-dev/rattler-build" @@ -57,5 +57,5 @@ package() { } sha512sums=" -925dc67954aa6cedda9bc4c7a04e4cebd7749a25224dc80ec911db327e22ee5ac8430f7c1ab064413ccccd34bc313c76a85802de2d3c700297474c9499b83687 rattler-build-0.16.0.tar.gz +6c8aaafb6af62e84078e798bfb313dea922718e864c74ec7ee8d9df8b5451fa6e4b698790306e26e1ec173b2849409249a03f9ffe1e8d5b7a98d13902c041c57 rattler-build-0.16.2.tar.gz " diff --git a/testing/rauc/APKBUILD b/testing/rauc/APKBUILD index 2b57e7883af..617fcfd6561 100644 --- a/testing/rauc/APKBUILD +++ b/testing/rauc/APKBUILD @@ -30,10 +30,10 @@ checkdepends=" squashfs-tools " # grub is not available on s390x -# valgrind is not available on armhf or riscv64 +# valgrind is not available on armhf, riscv64 or loongarch64 case "$CARCH" in s390x) checkdepends="$checkdepends valgrind" ;; -armhf|riscv64) checkdepends="$checkdepends grub" ;; +armhf|riscv64|loongarch64) checkdepends="$checkdepends grub" ;; *) checkdepends="$checkdepends grub valgrind" ;; esac subpackages="$pkgname-service::noarch $pkgname-doc" diff --git a/testing/rcon-cli/APKBUILD b/testing/rcon-cli/APKBUILD index 5554af8d195..b8eb0599ce5 100644 --- a/testing/rcon-cli/APKBUILD +++ b/testing/rcon-cli/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=rcon-cli pkgver=1.6.2 -pkgrel=3 +pkgrel=4 pkgdesc="A little RCON cli based on james4k's RCON library for golang" url="https://github.com/itzg/rcon-cli" arch="all" diff --git a/testing/reaction/APKBUILD b/testing/reaction/APKBUILD index 6e7766c0de7..af6b16db05c 100644 --- a/testing/reaction/APKBUILD +++ b/testing/reaction/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Guy Godfroy <guy.godfroy@gugod.fr> # Maintainer: Guy Godfroy <guy.godfroy@gugod.fr> pkgname=reaction -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.1 +pkgrel=0 pkgdesc="Logs scanner for event triggering" url="https://framagit.org/ppom/reaction" license="AGPL-3.0-or-later" @@ -42,7 +42,7 @@ tools() { } sha512sums=" -d7f4e3a0d800e33c13dd508be77a2e6232a155e8b038439b288aa3531c6664920ca7d2fe960dc918c7cea5c770aac6a7ace8be350e032e9a30014b3afd215e2e reaction-1.3.0.tar.gz +438ebc390ef30805a5ddf2e22d85ffc8671059e02846ce0830a21b4573521360f42d861517eb5b02bf728ce6da128fec963752ad2c0bce47092c7961ca426a1a reaction-1.3.1.tar.gz c2473cf3902ec42c045cd5f748ce27937fe1cb99e8e83e4920bd4ec10554c70339478d5756909d54889ed8eb0b8ba2bfe1307ba3be5e0e12a1c67895c82df606 reaction.initd 99e0fa2b72ad3e5793b1d99b7ca4a53ac4079afa1978f51897435b2660b97871f128b3038388f42e9fdc7c3d07a077aab1e9bd78c91b61b8c4b7b05dac1cce04 reaction.confd abca80f725b14ec9d8f0c46c31658d16448ca5cc732b8c8d069c29cfb67b92abf571619a5152157dd8fc8bb44192912c698e46df9a1f18f851e20dd23123a58a reaction.yml 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/reg/APKBUILD b/testing/reg/APKBUILD index deb49f726c7..01ff16de60e 100644 --- a/testing/reg/APKBUILD +++ b/testing/reg/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=reg pkgver=0.16.1 -pkgrel=20 +pkgrel=21 pkgdesc="Docker registry v2 command line client and repo listing generator with security checks" url="https://github.com/genuinetools/reg" license="MIT" diff --git a/testing/regal/APKBUILD b/testing/regal/APKBUILD index d2e745fa2b2..4d8e6da2ae1 100644 --- a/testing/regal/APKBUILD +++ b/testing/regal/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=regal pkgver=0.21.3 -pkgrel=0 +pkgrel=1 pkgdesc="Linter for Rego files" url="https://docs.styra.com/regal" # riscv64: TestLanguageServerMultipleFiles test times out diff --git a/testing/release-plz/APKBUILD b/testing/release-plz/APKBUILD index bc76b0240b8..267bc2f51bd 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.65 +pkgver=0.3.70 pkgrel=0 pkgdesc="Release Rust packages without using the command line" url="https://github.com/MarcoIeni/release-plz" @@ -51,5 +51,5 @@ package() { } sha512sums=" -02724bd26a8227850e280076b2e74a9e63778bddd9bf5c9e1df6d52c579adf23f4cd72989cb6ea5dda087ef633c40b58466d56b6ddb38072ae31330797732e40 release-plz-v0.3.65.tar.gz +627891245e50421256c2273783a4ad0096980367bfc8fc79e6ea6b09a07aee3dad2d4b298f95962252e0c6de1188b4b247ea37ba03ff799f3e88af51736f0ca1 release-plz-v0.3.70.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/rgxg/APKBUILD b/testing/rgxg/APKBUILD index d4e41548323..0eed18c93a9 100644 --- a/testing/rgxg/APKBUILD +++ b/testing/rgxg/APKBUILD @@ -11,6 +11,11 @@ makedepends="check-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/rgxg/rgxg/releases/download/v$pkgver/rgxg-$pkgver.tar.gz" +prepare() { + default_prepare + update_config_sub +} + build() { ./configure \ --build=$CBUILD \ diff --git a/testing/rime-ls/APKBUILD b/testing/rime-ls/APKBUILD index b024e27c2b4..21f58bba7bb 100644 --- a/testing/rime-ls/APKBUILD +++ b/testing/rime-ls/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Celeste <cielesti@protonmail.com> # Maintainer: Celeste <cielesti@protonmail.com> pkgname=rime-ls -pkgver=0.2.4 +pkgver=0.3.0 pkgrel=0 pkgdesc="Language server for Rime input method engine" url="https://github.com/wlh320/rime-ls" @@ -41,6 +41,6 @@ package() { } sha512sums=" -3b9451af802d0e5a56c62eeb33c2022c10cd9196fab980ec8e1dea6014b92ffe0d03264115c8b6c345b19ae7f67507d604665bb795e11a27af4149f620bca9c7 rime-ls-0.2.4.tar.gz -5fe5ee2b0204d8167fc530277f8013f21982ce1acd7bbbdea05e86e26009a4387a851107b55e6641b5945d01cd95d2b8cc8772c43c73d0bc7ea9b40b90156227 Cargo.lock +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 index 928c970b846..bf8f67f70e1 100644 --- a/testing/rime-ls/Cargo.lock +++ b/testing/rime-ls/Cargo.lock @@ -40,26 +40,25 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn", ] [[package]] name = "auto_impl" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" @@ -95,7 +94,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.60", + "syn", "which", ] @@ -119,9 +118,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.95" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" [[package]] name = "cexpr" @@ -140,9 +139,9 @@ 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", @@ -252,7 +251,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn", ] [[package]] @@ -287,9 +286,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -310,9 +309,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -322,9 +321,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "home" @@ -380,18 +379,28 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[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" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "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]] @@ -410,9 +419,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -532,20 +541,20 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.60", + "syn", ] [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -571,7 +580,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn", ] [[package]] @@ -588,43 +597,19 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "prettyplease" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.60", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "syn", ] [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -637,7 +622,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn", "version_check", "yansi", ] @@ -653,30 +638,21 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] @@ -711,7 +687,7 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rime_ls" -version = "0.2.4" +version = "0.3.0" dependencies = [ "dashmap", "directories", @@ -739,9 +715,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -751,9 +727,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -764,9 +740,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scopeguard" @@ -776,29 +752,29 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -807,26 +783,26 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn", ] [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -848,9 +824,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -870,20 +846,9 @@ checksum = "e9557cb6521e8d009c51a8666f09356f4b817ba9ba0981a305bd86aee47bd35c" [[package]] name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.60" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -892,22 +857,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn", ] [[package]] @@ -951,21 +916,20 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -1019,7 +983,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn", ] [[package]] @@ -1047,7 +1011,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn", ] [[package]] @@ -1117,28 +1081,6 @@ dependencies = [ ] [[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1153,7 +1095,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -1173,17 +1115,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "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", + "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]] @@ -1194,9 +1137,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -1206,9 +1149,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -1218,9 +1161,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.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 = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -1230,9 +1179,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -1242,9 +1191,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -1254,9 +1203,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -1266,9 +1215,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "yansi" diff --git a/testing/rke/APKBUILD b/testing/rke/APKBUILD index 2d29d3cf40d..7868ff00988 100644 --- a/testing/rke/APKBUILD +++ b/testing/rke/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Lucas Ramage <lucas.ramage@infinite-omicron.com> pkgname=rke pkgver=1.4.3 -pkgrel=7 +pkgrel=8 pkgdesc="Rancher Kubernetes Engine" options="!check net chmod-clean" url="https://github.com/rancher/rke" 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/ruuvi-prometheus/APKBUILD b/testing/ruuvi-prometheus/APKBUILD index 435fdded786..e81b640fcf5 100644 --- a/testing/ruuvi-prometheus/APKBUILD +++ b/testing/ruuvi-prometheus/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Joonas Kuorilehto <oss@derbian.fi> pkgname=ruuvi-prometheus pkgver=0.1.7 -pkgrel=2 +pkgrel=3 pkgdesc="Ruuvi sensor Prometheus exporter" url="https://github.com/joneskoo/ruuvi-prometheus" license="BSD-2-Clause" diff --git a/testing/s-dkim-sign/APKBUILD b/testing/s-dkim-sign/APKBUILD new file mode 100644 index 00000000000..87b6bd7421e --- /dev/null +++ b/testing/s-dkim-sign/APKBUILD @@ -0,0 +1,27 @@ +# Maintainer: Steffen Nurpmeso <steffen@sdaoden.eu> +pkgname=s-dkim-sign +pkgver=0.6.1 +pkgrel=0 +pkgdesc="postfix-only DKIM sign-only milter" +url="https://www.sdaoden.eu/code.html#s-dkim-sign" +arch="all" +license="ISC" +makedepends="openssl-dev" +subpackages="$pkgname-doc" +source="https://ftp.sdaoden.eu/s-dkim-sign-$pkgver.tar.gz" + +build() { + make +} + +check() { + ./s-dkim-sign-test.sh +} + +package() { + make DESTDIR="$pkgdir" PREFIX=/usr install +} + +sha512sums=" +3df9c67fd96bc0410c75aac68a2ed3e3dbc70549527f2b8a91b252cd3bf516904164c839d1af3615f094487c6e04a770d5de42c86fb1e522c279e1c1d5b727d6 s-dkim-sign-0.6.1.tar.gz +" diff --git a/testing/s5cmd/APKBUILD b/testing/s5cmd/APKBUILD index 1994774619f..5d0b042d7b6 100644 --- a/testing/s5cmd/APKBUILD +++ b/testing/s5cmd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=s5cmd pkgver=2.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="Parallel S3 and local filesystem execution tool" url="https://github.com/peak/s5cmd" arch="all" diff --git a/testing/salt-lts/APKBUILD b/testing/salt-lts/APKBUILD new file mode 100644 index 00000000000..12d741e1880 --- /dev/null +++ b/testing/salt-lts/APKBUILD @@ -0,0 +1,189 @@ +# Contributor: Francesco Colista <fcolista@alpinelinux.org> +# Contributor: Olivier Mauras <olivier@mauras.ch> +# Contributor: Kevin Daudt <kdaudt@alpinelinux.org> +# Maintainer: Will Sinatra <wpsinatra@gmail.com> +pkgname=salt-lts +pkgver=3006.8 +pkgrel=0 +pkgdesc="parallel remote execution system LTS Channel" +url="https://github.com/saltstack/salt" +arch="noarch" +license="Apache-2.0" +depends=" + procps + py3-dateutil + py3-distro + py3-jinja2 + py3-jmespath + py3-looseversion + py3-markupsafe + py3-msgpack + py3-packaging + py3-psutil + py3-pycryptodomex + py3-pygit2 + py3-pyzmq + py3-requests + py3-tornado + py3-yaml + !salt + !salt-master + !salt-minion + !salt-syncdic + !salt-api + !salt-pyc + !salt-doc + !salt-master-openrc + !salt-minion-openrc + !salt-syndic-openrc + !salt-api-openrc + " +makedepends="python3-dev py3-setuptools py3-apache-libcloud py3-pbr" +subpackages="$pkgname-doc + $pkgname-master $pkgname-master-openrc:master_openrc + $pkgname-minion $pkgname-minion-openrc:minion_openrc + $pkgname-syndic $pkgname-syndic-openrc:syndic_openrc + $pkgname-api $pkgname-api-openrc:api_openrc + $pkgname-pyc + " +source="https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz + salt-api.confd + salt-api.initd + salt-master.confd + salt-master.initd + salt-minion.confd + salt-minion.initd + salt-syndic.confd + salt-syndic.initd + fix-cryptodome-dependency.patch + " +options="!check" # depends on pytestsalt +builddir="$srcdir/salt-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --root="$pkgdir" + mkdir -p "$pkgdir"/var/log/$pkgname +} + +master() { + pkgdesc="Management component for salt, a parallel remote execution system" + depends="$pkgname" + + _conf_copy master + + local i; for i in cp key master run; do + _submv usr/bin/salt-$i + done + _submv usr/bin/salt +} + +master_openrc() { + pkgdesc="Management component for salt, a parallel remote execution system (OpenRC init scripts)" + depends="openrc" + install_if="openrc $pkgname-master=$pkgver-r$pkgrel" + + _init_copy master +} + +minion() { + pkgdesc="Client component for Salt, a parallel remote execution system" + depends="$pkgname" + + _conf_copy minion + _conf_copy proxy + + local i; for i in call minion proxy; do + _submv usr/bin/salt-$i + done +} + +minion_openrc() { + pkgdesc="Client component for Salt, a parallel remote execution system (OpenRC init scripts)" + depends="openrc" + install_if="openrc $pkgname-minion=$pkgver-r$pkgrel" + + _init_copy minion +} + +syndic() { + pkgdesc="Master-of-master component for Salt, a parallel remote execution system" + depends="$pkgname-master" + + _submv usr/bin/salt-syndic +} + +syndic_openrc() { + pkgdesc="Master-of-master component for Salt, a parallel remote execution system (OpenRC init scripts)" + depends="openrc" + install_if="openrc $pkgname-syndic=$pkgver-r$pkgrel" + + _init_copy syndic +} + +api() { + pkgdesc="REST API for Salt, a parallel remote execution system" + depends="$pkgname-master" + + _submv usr/bin/salt-api +} + +api_openrc() { + pkgdesc="REST API for Salt, a parallel remote execution system (OpenRC init scripts)" + depends="openrc" + install_if="openrc $pkgname-api=$pkgver-r$pkgrel" + + _init_copy api +} + +cloud() { + pkgdesc="Cloud provisioner for Salt, a parallel remote execution system" + depends="$pkgname-master py3-apache-libcloud" + + _conf_copy cloud && _submv usr/bin/salt-cloud +} + +ssh() { + pkgdesc="Agentless SSH-based version of Salt, a parallel remote execution system" + depends="$pkgname" + + _conf_copy roster && _submv usr/bin/salt-ssh +} + +_submv() { + local path="$1" + mkdir -p "$subpkgdir"/${path%/*} + mv "$pkgdir"/$path "$subpkgdir"/$path +} + +_init_copy() { + local type="$1" + install -m 755 -D "$srcdir"/salt-$type.initd "$subpkgdir"/etc/init.d/salt-$type + install -m 644 -D "$srcdir"/salt-$type.confd "$subpkgdir"/etc/conf.d/salt-$type +} + +_conf_copy() { + local type="$1" + mkdir -p "$subpkgdir"/etc/salt/ + cp -r "$builddir"/conf/$type* "$subpkgdir"/etc/salt/ +} + +sha512sums=" +6d771cf1e177cb77f8eed3911b1f8537c725432c6c0038f0feac6905d09636dca95a563a74db586f52a87809748a4a86338b94cdae27f083deb20433568e5617 salt-3006.8.tar.gz +975ba2f5e681fbd62045da61cc3dc065b148683a07b5df7eca9f131e47314eb6bfa8660ca1c06a3bd93683c7097d0ff9f8e514273dd24d82fb2de6a255e6b275 salt-api.confd +435d399bfecf431d0c713031e2ae57ce25b5c6edc98b62f33bd7a4ff1c587e3cdeb988445ae0c3e9ffc1911555c3694654d98815f9562b8a14bf0688ec1ebea6 salt-api.initd +cfbbeb8023a383e7c42d84e3346edfd068c9ec7650c4ddc3caa38534da325a67497e1f06ca02cc1f0941b7348a3af6d1dca7cd6f2bcb3612ca10e1ec98997e5a salt-master.confd +40243f36a44150841ee74878029c011ab59f174640bf6c102b1f93b34d4ad2c12b291201882850ef8a4372c17dd96865cae6631d3b0f59db43c07bfbc1c5b9f6 salt-master.initd +0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed salt-minion.confd +31521a7bf9455a805652ebb2c2a258148d654169caed500dbf1fe0c26baf26b330217117fe84a13706ded75a9eedadc0bbd671ede0957ed4d60d1e766fea6b39 salt-minion.initd +bafc6ea10cdafd0aef868feb35aecbe4ae6a7dff0ae42862bded85715ad763eb89e1ed27437866a7e5f2b9f7064e3c2a3fb59814487744ba4227238d95cf3818 salt-syndic.confd +d71133e834685304e0167554035ebbc861252f972bbe981cc71e45b70f15d94a28a02a369463c9a641372919689f96b62a0408b14f824ad986d536e52b1e5ec0 salt-syndic.initd +7df577b4a7befc6a37644cbe3e909df29f626f9ccc84d05245c5d2b6a4daeb3ad6bb95b9b3a82de70d50ddc27d15956b016c44c8ad9f878c760d388da86cacbe fix-cryptodome-dependency.patch +" diff --git a/testing/salt-lts/fix-cryptodome-dependency.patch b/testing/salt-lts/fix-cryptodome-dependency.patch new file mode 100644 index 00000000000..35e659615c9 --- /dev/null +++ b/testing/salt-lts/fix-cryptodome-dependency.patch @@ -0,0 +1,8 @@ +Reason: We ship pycryptodome as a full replacement of pycrypto, so the +dependency is on pycryptodome, not pycryptodomex +Upstream: No +--- a/requirements/crypto.txt ++++ b/requirements/crypto.txt +@@ -1 +1 @@ +-pycryptodomex>=3.9.8 ++pycryptodome>=3.9.8 diff --git a/testing/salt-lts/salt-api.confd b/testing/salt-lts/salt-api.confd new file mode 100644 index 00000000000..277e3bcbecf --- /dev/null +++ b/testing/salt-lts/salt-api.confd @@ -0,0 +1,5 @@ +# /etc/conf.d/salt-api: config file for /etc/init.d/salt-api +# See man pages for salt-api or run `salt-api --help` +# for valid cmdline options + +SALT_OPTS="--log-level=warning" diff --git a/testing/salt-lts/salt-api.initd b/testing/salt-lts/salt-api.initd new file mode 100644 index 00000000000..aa62bc27935 --- /dev/null +++ b/testing/salt-lts/salt-api.initd @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/api-initd-1,v 1.1 2012/04/24 23:37:27 chutzpah Exp $ + +command="/usr/bin/salt-api" +command_args="--daemon ${SALT_OPTS}" +pidfile="/var/run/salt-api.pid" +name="SALT api daemon" + +depend() { + use net +} diff --git a/testing/salt-lts/salt-master.confd b/testing/salt-lts/salt-master.confd new file mode 100644 index 00000000000..e7fc8180a5a --- /dev/null +++ b/testing/salt-lts/salt-master.confd @@ -0,0 +1,5 @@ +# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master +# See man pages for salt-minion or run `salt-master --help` +# for valid cmdline options + +SALT_OPTS="--log-level=warning" diff --git a/testing/salt-lts/salt-master.initd b/testing/salt-lts/salt-master.initd new file mode 100644 index 00000000000..accc825f5d5 --- /dev/null +++ b/testing/salt-lts/salt-master.initd @@ -0,0 +1,7 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon + +name='SaltStack Master' +command='/usr/bin/salt-master' +command_args="${SALT_OPTS}" + diff --git a/testing/salt-lts/salt-minion.confd b/testing/salt-lts/salt-minion.confd new file mode 100644 index 00000000000..d69d83fcd60 --- /dev/null +++ b/testing/salt-lts/salt-minion.confd @@ -0,0 +1,5 @@ +# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion + +# see man pages for salt-minion or run `salt-minion --help` +# for valid cmdline options +SALT_OPTS="--log-level=warning" diff --git a/testing/salt-lts/salt-minion.initd b/testing/salt-lts/salt-minion.initd new file mode 100644 index 00000000000..b86d824ba86 --- /dev/null +++ b/testing/salt-lts/salt-minion.initd @@ -0,0 +1,6 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon + +name='SaltStack Minion' +command='/usr/bin/salt-minion' +command_args="${SALT_OPTS}" diff --git a/testing/salt-lts/salt-syndic.confd b/testing/salt-lts/salt-syndic.confd new file mode 100644 index 00000000000..534d3f527a3 --- /dev/null +++ b/testing/salt-lts/salt-syndic.confd @@ -0,0 +1,5 @@ +# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-sundic + +# see man pages for salt-minion or run `salt-syndic --help` +# for valid cmdline options +SALT_OPTS="--log-level=warning" diff --git a/testing/salt-lts/salt-syndic.initd b/testing/salt-lts/salt-syndic.initd new file mode 100644 index 00000000000..cf7ec23d79e --- /dev/null +++ b/testing/salt-lts/salt-syndic.initd @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/files/syndic-initd-1,v 1.1 2012/04/24 23:37:27 chutzpah Exp $ + +command="/usr/bin/salt-syndic" +command_args="--daemon ${SALT_OPTS}" +pidfile="/var/run/salt-syndic.pid" +name="SALT syndic daemon" + +depend() { + use net +} diff --git a/testing/satellite/APKBUILD b/testing/satellite/APKBUILD index d8f52500347..74a612db1c0 100644 --- a/testing/satellite/APKBUILD +++ b/testing/satellite/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Pedro Lucas Porcellis <porcellis@eletrotupi.com> pkgname=satellite pkgver=1.0.0 -pkgrel=20 +pkgrel=21 pkgdesc="Satellite is a small Gemini server for serving static files" url="https://git.sr.ht/~gsthnz/satellite" arch="all" diff --git a/testing/satty/APKBUILD b/testing/satty/APKBUILD index 10030a95b8d..18d60b40b5e 100644 --- a/testing/satty/APKBUILD +++ b/testing/satty/APKBUILD @@ -19,7 +19,10 @@ subpackages=" $pkgname-zsh-completion " options="!check" # no test suite -source="$pkgname-$pkgver.tar.gz::https://github.com/gabm/Satty/archive/refs/tags/v$pkgver.tar.gz" +source=" + $pkgname-$pkgver.tar.gz::https://github.com/gabm/Satty/archive/refs/tags/v$pkgver.tar.gz + cargo-update.patch + " builddir="$srcdir/Satty-$pkgver" prepare() { @@ -49,4 +52,5 @@ package() { sha512sums=" e6ede1ec91f6f70bb3aaacd57ff79f378dbf815663566fbe66d4c8f61624553c5f7268c95fb0f479e728bd5063fb8619beecb6222c7b79105ab4463bf7c6602b satty-0.12.0.tar.gz +ccdc8a6378e75a70bdb048146359fcc1bfcc207e4a360ea3a3ee415940c8822ea829cb938b93431c9b3f72962cc84f60885ffc94144727f281c73769a27fd0dc cargo-update.patch " diff --git a/testing/satty/cargo-update.patch b/testing/satty/cargo-update.patch new file mode 100644 index 00000000000..1a4aaca7598 --- /dev/null +++ b/testing/satty/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 0dedfb3..73726f2 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -966,9 +966,9 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libloading" diff --git a/testing/scaleway-cli/APKBUILD b/testing/scaleway-cli/APKBUILD index 91a7cf5aef8..cc413e284ce 100644 --- a/testing/scaleway-cli/APKBUILD +++ b/testing/scaleway-cli/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=scaleway-cli pkgver=2.29.0 -pkgrel=0 +pkgrel=1 pkgdesc="Command-line client for Scaleway Cloud" url="https://www.scaleway.com/en/cli" arch="all !x86 !armv7 !armhf" # tests are failing for x86, armv7, armhf diff --git a/testing/scalingo/APKBUILD b/testing/scalingo/APKBUILD index 85f2fa96d1d..9714f8fbfb8 100644 --- a/testing/scalingo/APKBUILD +++ b/testing/scalingo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=scalingo pkgver=1.30.0 -pkgrel=2 +pkgrel=3 pkgdesc="Command-line client for Scalingo PaaS" url="https://doc.scalingo.com/cli" arch="all" diff --git a/testing/seastar/10-c-ares.patch b/testing/seastar/10-c-ares.patch new file mode 100644 index 00000000000..2975802f94b --- /dev/null +++ b/testing/seastar/10-c-ares.patch @@ -0,0 +1,163 @@ +From 8b04c25a494abc62572b2092dc6980e7196f27a8 Mon Sep 17 00:00:00 2001 +From: Kefu Chai <kefu.chai@scylladb.com> +Date: Tue, 23 Apr 2024 18:10:59 +0800 +Subject: [PATCH] dns: use undeprecated c-ares APIs + +c-ares marked some APIs deprecated in 1.28.1. + +in this change, we conditionally use the undeprecated APIs when +they are available. please note, we don't specify the minimal +supported c-ares version in our building system. + +in which, ares_fds() and ares_process() are not changed yet, because +we need to change the way how to poll the events for name resolution. +this would need more thoughts before moving forward. + +Refs #2197 +Signed-off-by: Kefu Chai <kefu.chai@scylladb.com> +--- + src/net/dns.cc | 103 ++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 102 insertions(+), 1 deletion(-) + +diff --git a/src/net/dns.cc b/src/net/dns.cc +index 09aee14486d..79d51ad9355 100644 +--- a/src/net/dns.cc ++++ b/src/net/dns.cc +@@ -262,6 +262,32 @@ class net::dns_resolver::impl + // The following pragma is needed to work around a false-positive warning + // in Gcc 11 (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96003). + #pragma GCC diagnostic ignored "-Wnonnull" ++#if ARES_VERSION >= 0x011000 ++ ++ ares_addrinfo_hints hints = { ++ .ai_flags = ARES_AI_CANONNAME, ++ .ai_family = af, ++ .ai_socktype = 0, ++ .ai_protocol = 0, ++ }; ++ ares_getaddrinfo(_channel, p->name.c_str(), nullptr, &hints, [](void* arg, int status, int timeouts, ares_addrinfo* addrinfo) { ++ // we do potentially allocating operations below, so wrap the pointer in a ++ // unique here. ++ std::unique_ptr<promise_wrap> p(reinterpret_cast<promise_wrap *>(arg)); ++ ++ switch (status) { ++ default: ++ dns_log.debug("Query failed: {}", status); ++ p->set_exception(std::system_error(status, ares_errorc, p->name)); ++ break; ++ case ARES_SUCCESS: ++ p->set_value(make_hostent(addrinfo)); ++ break; ++ } ++ ares_freeaddrinfo(addrinfo); ++ ++ }, reinterpret_cast<void *>(p)); ++#else + ares_gethostbyname(_channel, p->name.c_str(), af, [](void* arg, int status, int timeouts, ::hostent* host) { + // we do potentially allocating operations below, so wrap the pointer in a + // unique here. +@@ -278,7 +304,7 @@ class net::dns_resolver::impl + } + + }, reinterpret_cast<void *>(p)); +- ++#endif + + poll_sockets(); + +@@ -343,6 +369,47 @@ class net::dns_resolver::impl + + dns_call call(*this); + ++#if ARES_VERSION >= 0x011c00 ++ ares_query_dnsrec(_channel, query.c_str(), ARES_CLASS_IN, ARES_REC_TYPE_SRV, ++ [](void* arg, ares_status_t status, size_t timeouts, ++ const ares_dns_record *dnsrec) { ++ auto p = std::unique_ptr<promise<srv_records>>( ++ reinterpret_cast<promise<srv_records> *>(arg)); ++ if (status != ARES_SUCCESS) { ++ dns_log.debug("Query failed: {}", fmt::underlying(status)); ++ p->set_exception(std::system_error(status, ares_errorc)); ++ return; ++ } ++ const size_t rr_count = ares_dns_record_rr_cnt(dnsrec, ARES_SECTION_ANSWER); ++ srv_records replies; ++ for (size_t i = 0; i < rr_count; i++) { ++ const ares_dns_rr_t* rr = ares_dns_record_rr_get( ++ const_cast<ares_dns_record*>(dnsrec), ++ ARES_SECTION_ANSWER, i); ++ if (!rr) { ++ // not likely, but still.. ++ status = ARES_EBADRESP; ++ break; ++ } ++ if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN || ++ ares_dns_rr_get_type(rr) != ARES_REC_TYPE_SRV) { ++ continue; ++ } ++ replies.push_back({ ++ ares_dns_rr_get_u16(rr, ARES_RR_SRV_PRIORITY), ++ ares_dns_rr_get_u16(rr, ARES_RR_SRV_WEIGHT), ++ ares_dns_rr_get_u16(rr, ARES_RR_SRV_PORT), ++ sstring{ares_dns_rr_get_str(rr, ARES_RR_SRV_TARGET)} ++ }); ++ } ++ if (status != ARES_SUCCESS) { ++ dns_log.debug("Parse failed: {}", fmt::underlying(status)); ++ p->set_exception(std::system_error(status, ares_errorc)); ++ return; ++ } ++ p->set_value(std::move(replies)); ++ }, reinterpret_cast<void *>(p.release()), nullptr); ++#else + ares_query(_channel, query.c_str(), ns_c_in, ns_t_srv, + [](void* arg, int status, int timeouts, + unsigned char* buf, int len) { +@@ -367,6 +434,7 @@ class net::dns_resolver::impl + } + ares_free_data(start); + }, reinterpret_cast<void *>(p.release())); ++#endif + + + poll_sockets(); +@@ -482,6 +550,39 @@ class net::dns_resolver::impl + return records; + } + ++#if ARES_VERSION >= 0x011000 ++ static hostent make_hostent(const ares_addrinfo* ai) { ++ hostent e; ++ if (!ai) { ++ return e; ++ } ++ if (ai->cnames) { ++ e.names.emplace_back(ai->cnames->name); ++ } else { ++ e.names.emplace_back(ai->name); ++ } ++ for (auto cname = ai->cnames; cname != nullptr; cname = cname->next) { ++ if (cname->alias == nullptr) { ++ continue; ++ } ++ e.names.emplace_back(cname->alias); ++ } ++ for (auto node = ai->nodes; node != nullptr; node = node->ai_next) { ++ switch (node->ai_family) { ++ case AF_INET: ++ e.addr_list.emplace_back(reinterpret_cast<const sockaddr_in*>(node->ai_addr)->sin_addr); ++ break; ++ case AF_INET6: ++ e.addr_list.emplace_back(reinterpret_cast<const sockaddr_in6*>(node->ai_addr)->sin6_addr); ++ break; ++ } ++ } ++ ++ dns_log.debug("Query success: {}/{}", e.names.front(), e.addr_list.front()); ++ ++ return e; ++ } ++#endif + static hostent make_hostent(const ::hostent& host) { + hostent e; + e.names.emplace_back(host.h_name); diff --git a/testing/seastar/20-c-ares-ignore.patch b/testing/seastar/20-c-ares-ignore.patch new file mode 100644 index 00000000000..35f1f2d450f --- /dev/null +++ b/testing/seastar/20-c-ares-ignore.patch @@ -0,0 +1,28 @@ +Author: Holger Jaekel <holger.jaekel@gmx.de> +Summary: ignore depreciation warnings for ares_fds and ares_process +---- + +--- a/src/net/dns.cc ++++ b/src/net/dns.cc +@@ -501,7 +501,10 @@ + FD_ZERO(&readers); + FD_ZERO(&writers); + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + n = ares_fds(_channel, &readers, &writers); ++#pragma GCC diagnostic pop + + dns_log.trace("ares_fds: {}", n); + +@@ -534,7 +537,10 @@ + } + } + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + ares_process(_channel, &readers, &writers); ++#pragma GCC diagnostic pop + } while (n != 0); + } + diff --git a/testing/seastar/APKBUILD b/testing/seastar/APKBUILD index f77470ce63f..dcc5df16853 100644 --- a/testing/seastar/APKBUILD +++ b/testing/seastar/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=seastar pkgver=22.11.0_git20240315 -pkgrel=2 +pkgrel=3 _commit="a8aa79b2b3bed89f7d90a40cfb4bd55b6e960070" _ver="${_commit:=$pkgver}" pkgdesc="High performance server-side application framework" url="https://seastar.io" -# riscv64: valgrind +# riscv64, loongarch64: valgrind # armhf armv7 x86 32bit not supported -arch="all !x86 !armhf !armv7 !riscv64" +arch="all !x86 !armhf !armv7 !riscv64 !loongarch64" license="Apache-2.0" depends_dev=" $pkgname=$pkgver-r$pkgrel @@ -42,7 +42,9 @@ case "$CARCH" in aarch64|x86_64) makedepends="$makedepends dpdk-dev" ;; esac subpackages="$pkgname-dev $pkgname-testing" -source="$pkgname-$_ver.tar.gz::https://github.com/scylladb/seastar/archive/$_ver.tar.gz" +source="$pkgname-$_ver.tar.gz::https://github.com/scylladb/seastar/archive/$_ver.tar.gz + 10-c-ares.patch + 20-c-ares-ignore.patch" builddir="$srcdir/$pkgname-$_ver" build() { @@ -93,4 +95,6 @@ testing() { sha512sums=" 3f23b6a64baaef45e1ae34cfbf364c1bdf11f5095d1dc85dfeb3fa1fc4866c734e745fcd71af1b23bb8ac29dfde9caab4d8c2ea3dd8923c4d9258a3f2d57f4e8 seastar-a8aa79b2b3bed89f7d90a40cfb4bd55b6e960070.tar.gz +428a8159fdda063ab3d58dcc974837da392ec38272c08c6e77493898db2e54048e169ce0f41605de324baf8c38933968ebeef584cdb337f8b463fe56ae6bdfa5 10-c-ares.patch +f40497f08e2f704d5da3fb9d37c8c2aba8a39e047de8664534826287873b1e90ca980b736aa2bf96bfd77bcbcc4ca612353d64c78a7cb566d59ffe55e2365eb0 20-c-ares-ignore.patch " diff --git a/testing/seaweedfs/APKBUILD b/testing/seaweedfs/APKBUILD index 479ebf98db5..10a0ebf92d8 100644 --- a/testing/seaweedfs/APKBUILD +++ b/testing/seaweedfs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: wener <wenermail@gmail.com> pkgname=seaweedfs pkgver=3.63 -pkgrel=1 +pkgrel=2 pkgdesc="SeaweedFS is a simple and highly scalable distributed file system to store and serve billions of files fast" url="https://github.com/seaweedfs/seaweedfs" license="Apache-2.0" diff --git a/testing/secsipidx/APKBUILD b/testing/secsipidx/APKBUILD index 2bcee5749ab..65d78bb5685 100644 --- a/testing/secsipidx/APKBUILD +++ b/testing/secsipidx/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=secsipidx pkgver=1.3.2 -pkgrel=4 +pkgrel=5 pkgdesc="Secure SIP/Telephony Identity Extensions" url="https://github.com/asipto/secsipidx" arch="all" diff --git a/testing/sequoia-chameleon-gnupg/APKBUILD b/testing/sequoia-chameleon-gnupg/APKBUILD index 552274409cc..2ca1e652ad6 100644 --- a/testing/sequoia-chameleon-gnupg/APKBUILD +++ b/testing/sequoia-chameleon-gnupg/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Simon Rupf <simon@rupf.net> pkgname=sequoia-chameleon-gnupg -pkgver=0.8.0 +pkgver=0.9.0 pkgrel=0 pkgdesc="Sequoia's reimplementation of the GnuPG interface" url="https://sequoia-pgp.org/" @@ -11,7 +11,7 @@ makedepends=" bzip2-dev cargo cargo-auditable - clang15-dev + clang-dev nettle-dev openssl-dev sqlite-dev @@ -41,5 +41,5 @@ package() { } sha512sums=" -e149579b144d04c1ee0c9ac8f1a7dc7844e8a035b06000e0e854e87621b51d34d49c6a27787784358460aef5e9ca011d6947c064d09b0e1601ded9dedcb9b6fe sequoia-chameleon-gnupg-v0.8.0.tar.gz +f2a8e7023d1ea8245cf3f634537690e0daf53d16d30caf41e1df6490f7d9b6c3db3f313d66c002e506d6886d520db423a1617551203d9a968ad7bf6cfce57476 sequoia-chameleon-gnupg-v0.9.0.tar.gz " 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 9037e66c20e..f47d243a272 100644 --- a/testing/signal-desktop/APKBUILD +++ b/testing/signal-desktop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: lauren n. liberda <lauren@selfisekai.rocks> pkgname=signal-desktop -pkgver=7.7.0 +pkgver=7.10.0 pkgrel=0 pkgdesc="A messaging app for simple private communication with friends" url="https://github.com/signalapp/Signal-Desktop/" @@ -66,11 +66,11 @@ options="net !check" _libsignalver=0.45.0 # follow signal-desktop package.json -> @signalapp/ringrtc -_ringrtcver=2.40.0 +_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=6261e +_webrtcver=6261g # follow @signalapp/better-sqlite3 (on version in package.json) -> deps/download.js -> TOKENIZER_VERSION # last bsqlite version: 8.7.1 @@ -471,10 +471,10 @@ package() { } sha512sums=" -e7fe2463a43ddc54b55bc459dc4fb4ee903656c3d468d1efd8259c60365d6bf107dfb97dc0090be138b2da69b0620df76adf6ca9ee9d6095603fe5e8e931df85 Signal-Desktop-7.7.0.tar.gz +cfa27de573a64abf91933307df9bbdefc37e9695648c6ea7ff58f13013d66f53d33c445e884c722a38edf7217e70a8597ffdba0f43928b4dc8b08b20d8010cea Signal-Desktop-7.10.0.tar.gz 70f2cb7d05e019235cd044c401bcf072a934fdfea4a161ef5be988d2e3932ba5233110b4b06525e6f33ea9cad036def442e70adad15eab883903d9246969896e libsignal-0.45.0.tar.gz -32c41e6136d8ca4edc66225cce9b26ba7584334b1eee83834cc9455a7eac2928432bd1b474e3b562f1f582dcf2dd2626b462b80a090b24824ab4f1fbdf404092 ringrtc-2.40.0.tar.gz -146a4727e23589433493da01073a702db78fa66a7efb5bbf2b14f5040961301c29c304244a44b634ba913e8b977b94b6f07830152d4cd13028b606d112325cab webrtc-6261e.tar.zst +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 diff --git a/testing/simpleiot/APKBUILD b/testing/simpleiot/APKBUILD index f71864f1716..594d5c6f5ef 100644 --- a/testing/simpleiot/APKBUILD +++ b/testing/simpleiot/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Khem Raj <raj.khem@gmail.com> pkgname=simpleiot pkgver=0.14.3 -pkgrel=2 +pkgrel=3 pkgdesc="Simple IoT cloud/edge application/framework" url="https://github.com/simpleiot/simpleiot" arch="x86_64" diff --git a/testing/sing-box/APKBUILD b/testing/sing-box/APKBUILD index 45d85987597..8a97f726611 100644 --- a/testing/sing-box/APKBUILD +++ b/testing/sing-box/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Anon <danilagdn.2004@gmail.com> pkgname=sing-box pkgver=1.8.4 -pkgrel=3 +pkgrel=4 pkgdesc="The universal proxy platform" url="https://sing-box.sagernet.org/" arch="all" diff --git a/testing/sipexer/APKBUILD b/testing/sipexer/APKBUILD index 67eebc0a92a..76b8497595b 100644 --- a/testing/sipexer/APKBUILD +++ b/testing/sipexer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=sipexer pkgver=1.1.0 -pkgrel=5 +pkgrel=6 pkgdesc="Modern and flexible SIP (RFC3261) command line tool." url="https://github.com/miconda/sipexer" arch="all" 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/sish/APKBUILD b/testing/sish/APKBUILD index 0bf3a2b369a..8ee8f5468cb 100644 --- a/testing/sish/APKBUILD +++ b/testing/sish/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=sish pkgver=2.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="HTTP(S)/WS(S)/TCP Tunnels to localhost using only SSH" url="https://github.com/antoniomika/sish" # s390x, riscv64: doesn't compile diff --git a/testing/snapper/APKBUILD b/testing/snapper/APKBUILD index 520fd9f1716..66ba0019d6f 100644 --- a/testing/snapper/APKBUILD +++ b/testing/snapper/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=snapper -pkgver=0.10.7 -pkgrel=1 +pkgver=0.11.0 +pkgrel=0 pkgdesc="Manage filesystem snapshots and allow undo of system modifications" url="http://snapper.io" arch="all" @@ -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/snowflake/APKBUILD b/testing/snowflake/APKBUILD index 6ceee3361fd..40232f4d958 100644 --- a/testing/snowflake/APKBUILD +++ b/testing/snowflake/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=snowflake pkgver=2.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="Pluggable Transport for Tor using WebRTC, inspired by Flashproxy" url="https://snowflake.torproject.org/" license="BSD-3-Clause" diff --git a/testing/soju/APKBUILD b/testing/soju/APKBUILD index 63c9b595a73..a3e30ba8ceb 100644 --- a/testing/soju/APKBUILD +++ b/testing/soju/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=soju pkgver=0.7.0 -pkgrel=2 +pkgrel=3 pkgdesc="User-friendly IRC bouncer" url="https://soju.im/" license="AGPL-3.0" 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/sos/APKBUILD b/testing/sos/APKBUILD index 38f15358958..34a306d26d7 100644 --- a/testing/sos/APKBUILD +++ b/testing/sos/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org> pkgname=sos pkgver=0.8 -pkgrel=23 +pkgrel=24 pkgdesc="Simple Object Storage" url="https://github.com/skx/sos" license="GPL-2.0-or-later" diff --git a/testing/spacectl/APKBUILD b/testing/spacectl/APKBUILD index 612bf1bc8a0..8841745a2fc 100644 --- a/testing/spacectl/APKBUILD +++ b/testing/spacectl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hristiyan Ivanov <hristiyan.d.ivanov@gmail.com> pkgname=spacectl pkgver=0.30.0 -pkgrel=2 +pkgrel=3 pkgdesc="A Utility wrapping Spacelift's GraphQL API for easy programmatic access in command-line contexts." url="https://github.com/spacelift-io/spacectl" arch="all" diff --git a/testing/speedtest-go/APKBUILD b/testing/speedtest-go/APKBUILD index 11e40136338..89db213a3f3 100644 --- a/testing/speedtest-go/APKBUILD +++ b/testing/speedtest-go/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Sean McAvoy <seanmcavoy@gmail.com> pkgname=speedtest-go pkgver=1.1.5 -pkgrel=7 +pkgrel=8 pkgdesc="web page based speed test, written in go" url="https://librespeed.org" arch="all" diff --git a/testing/speedtest_exporter/APKBUILD b/testing/speedtest_exporter/APKBUILD index 3fd2c81ce25..3f09145cf40 100644 --- a/testing/speedtest_exporter/APKBUILD +++ b/testing/speedtest_exporter/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Marvin Preuss <marvin@xsteadfastx.org> pkgname=speedtest_exporter pkgver=0.3.2 -pkgrel=7 +pkgrel=8 pkgdesc="Prometheus exporter for Speedtest metrics" url="https://github.com/nlamirault/speedtest_exporter" # riscv64 unsupported by Golang deps diff --git a/testing/sqawk/APKBUILD b/testing/sqawk/APKBUILD new file mode 100644 index 00000000000..138eccd93cc --- /dev/null +++ b/testing/sqawk/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Celeste <cielesti@protonmail.com> +# Maintainer: Celeste <cielesti@protonmail.com> +pkgname=sqawk +pkgver=0.24.0 +pkgrel=0 +pkgdesc="AWK-like program with SQL and table joins" +url="https://github.com/dbohdan/sqawk" +arch="noarch" +license="MIT" +depends="tcl tcl-lib sqlite-tcl" +checkdepends="jimtcl sqlite" +subpackages="$pkgname-doc" +source="https://github.com/dbohdan/sqawk/archive/refs/tags/v$pkgver/sqawk-$pkgver.tar.gz" + +build() { + make +} + +check() { + make test +} + +package() { + make DESTDIR="$pkgdir" prefix=/usr install + + install -Dvm644 README.md -t "$pkgdir"/usr/share/doc/$pkgname/ + install -Dvm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/ + + # examples/hp is mentioned in README.md + cd examples/hp + install -Dvm644 MD5SUMS du-bytes results.correct \ + -t "$pkgdir"/usr/share/doc/$pkgname/examples/hp/ +} + +sha512sums=" +fb84fdd0a7dad286006ebcb3862ee5198bb0e3fa8071866e72a3c12a4116167d3e6f9f0665eb2ddaf102c43a3e939aa57bfc3b2aa8eda27a48dab572fb88dac4 sqawk-0.24.0.tar.gz +" diff --git a/testing/sqlmap/APKBUILD b/testing/sqlmap/APKBUILD index 8728afaccb6..6b6ce1b2152 100644 --- a/testing/sqlmap/APKBUILD +++ b/testing/sqlmap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Maxim Karasev <mxkrsv@disroot.org> # Maintainer: Patrycja Rosa <alpine@ptrcnull.me> pkgname=sqlmap -pkgver=1.8.4 +pkgver=1.8.5 pkgrel=0 pkgdesc="Automatic SQL injection and database takeover tool" url="https://sqlmap.org/" @@ -53,6 +53,6 @@ package() { } sha512sums=" -3cf79e057dffabdeeb5765ed99a86f2df0e8a404174b05e1d542a231de5ab31b9609a90647c79a7f7e62ce7fe1dee8426a06129ba3cdc5fdd38838156fe1cd50 sqlmap-1.8.4.tar.gz +43d3cc4b288a822fda00a8fd1df961c53b62cbd5efc32fe9df5f29ed9765bb91af94a775ea282e009330565f76245171dfc1e0bb152f344eff449f1356750d01 sqlmap-1.8.5.tar.gz ee1d03843a6011c20da52f4dce329c8da412e08b4dcdf66a8d7685bf3816df0835d77c0ad52005ee63af6fdc8787e086db5837bdfb19c6e5122455df22ac0f11 reduce-amount-of-third-party-dependencies.patch " diff --git a/testing/ssh-cert-authority/APKBUILD b/testing/ssh-cert-authority/APKBUILD index da07472cac2..655f66f180c 100644 --- a/testing/ssh-cert-authority/APKBUILD +++ b/testing/ssh-cert-authority/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: pkgname=ssh-cert-authority pkgver=2.0.0 -pkgrel=18 +pkgrel=19 pkgdesc="An implementation of an SSH certificate authority" url="https://github.com/cloudtools/ssh-cert-authority" arch="all" diff --git a/testing/sshsrv/APKBUILD b/testing/sshsrv/APKBUILD index 3b9b5719925..b14b1ab99f2 100644 --- a/testing/sshsrv/APKBUILD +++ b/testing/sshsrv/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=sshsrv pkgver=1.0 -pkgrel=4 +pkgrel=5 pkgdesc="Connect to SSH servers using DNS SRV records" url="https://github.com/Crosse/sshsrv" arch="all" diff --git a/testing/stack/APKBUILD b/testing/stack/APKBUILD deleted file mode 100644 index e482ad8e90d..00000000000 --- a/testing/stack/APKBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Contributor: gay <gay@disroot.org> -# Maintainer: gay <gay@disroot.org> -pkgname=stack -pkgver=2.7.5 -pkgrel=0 -pkgdesc="The Haskell Tool Stack" -url="https://haskellstack.org/" -arch="aarch64 x86_64" # limited by ghc -license="BSD-3-Clause" -makedepends=" - cabal - ghc - gmp-dev - sqlite-dev - zlib-dev - " -checkdepends="ncurses-dev" -source="https://hackage.haskell.org/package/stack-$pkgver/stack-$pkgver.tar.gz - cabal.config - aeson.patch - ghc9.0.x.patch - persistent.patch - " - -export CABAL_DIR="$srcdir"/cabal - -prepare() { - default_prepare - cp "$srcdir"/cabal.config . - cabal update - cabal configure --prefix=/usr -} - -build() { - cabal build --jobs=${JOBS:-1} --enable-relocatable -} - -check() { - cabal test -} - -package() { - cd dist-newstyle/build/*-linux/ghc-*/$pkgname-$pkgver/build/$pkgname - install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname -} - -sha512sums=" -fd51f990d3ccec6103c8699a8e39c970a0233a1185587a519eda659d2b45bc4496c4f261f6897c06781d0f76d2b1d526d5acdfb502fe1494f8cf048c78ba1a8d stack-2.7.5.tar.gz -a54c0790e154105f3e96d19289a905b2b3666d61849ad69d6ed81b00a01ea30c7733ead989c02f1f782a95bcc7f0f2dff41ae1ffdd8eb0995fbbd5f54db232d7 cabal.config -818547d3d63b243daad11f2c8b811701b4b8a778196e1d69d73a4fd4829f4ad9f4134451153c80b8504f1c18fbc2ee8bca329f6c5eff9ee3c435af7a1947077d aeson.patch -209348bd04d1cdce333e71a0570ba3781aeb36a0a5ad8a0e5f08ab9aca8f4d49f681b63cab4b7f4f1ddcc79cbf850d5cb1fc79f7a099b0bb65038774ed0a0820 ghc9.0.x.patch -73d9291ade690db1838b8dbd7b132d9e808781e5419684c04008b9e967c56d3e66eb64df8ef997d74301d92a76d4071956c5593c42841ef035c39c82ac68892d persistent.patch -" diff --git a/testing/stack/aeson.patch b/testing/stack/aeson.patch deleted file mode 100644 index 68f267c30cc..00000000000 --- a/testing/stack/aeson.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 09e233ed73aa3335642f97c080ef27e42047c527 -Author: q66 <daniel@octaforge.org> -Date: Fri Mar 11 04:37:15 2022 +0100 - - constrain aeson to prevent build failures - -diff --git a/stack.cabal b/stack.cabal -index dba5bf0..0195f2c 100644 ---- a/stack.cabal -+++ b/stack.cabal -@@ -231,7 +231,7 @@ library - - build-depends: - Cabal >=3.2.1.0, -- aeson >=1.5.6.0, -+ aeson >=1.5.6.0 && <1.6, - annotated-wl-pprint >=0.7.0, - ansi-terminal >=0.10.3, - array >=0.5.4.0, -@@ -357,7 +357,7 @@ executable stack - - build-depends: - Cabal >=3.2.1.0, -- aeson >=1.5.6.0, -+ aeson >=1.5.6.0 && <1.6, - annotated-wl-pprint >=0.7.0, - ansi-terminal >=0.10.3, - array >=0.5.4.0, -@@ -485,7 +485,7 @@ executable stack-integration-test - - build-depends: - Cabal >=3.2.1.0, -- aeson >=1.5.6.0, -+ aeson >=1.5.6.0 && <1.6, - annotated-wl-pprint >=0.7.0, - ansi-terminal >=0.10.3, - array >=0.5.4.0, -@@ -621,7 +621,7 @@ test-suite stack-test - build-depends: - Cabal >=3.2.1.0, - QuickCheck >=2.14.2, -- aeson >=1.5.6.0, -+ aeson >=1.5.6.0 && <1.6, - annotated-wl-pprint >=0.7.0, - ansi-terminal >=0.10.3, - array >=0.5.4.0, diff --git a/testing/stack/cabal.config b/testing/stack/cabal.config deleted file mode 100644 index 6e9de3dc671..00000000000 --- a/testing/stack/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/stack/ghc9.0.x.patch b/testing/stack/ghc9.0.x.patch deleted file mode 100644 index bdd77de58c6..00000000000 --- a/testing/stack/ghc9.0.x.patch +++ /dev/null @@ -1,212 +0,0 @@ -From cb7e56842a25f93142545fad21306a7c1750fbbf Mon Sep 17 00:00:00 2001 -From: Brandon Chinn <brandon@leapyear.io> -Date: Fri, 4 Jun 2021 16:26:22 -0700 -Subject: [PATCH 1/6] Use Cabal 3.4.0.0 - ---- - stack.yaml | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/stack.yaml b/stack.yaml -index 005bd19f4..9472509be 100644 ---- a/stack.yaml -+++ b/stack.yaml -@@ -20,6 +20,9 @@ flags: - ghc-options: - "$locals": -fhide-source-paths - -+extra-deps: -+- Cabal-3.4.0.0 -+ - drop-packages: - # See https://github.com/commercialhaskell/stack/pull/4712 - - cabal-install - -From 11e11ab0edeba033b40a7fc62434be58dea82ce2 Mon Sep 17 00:00:00 2001 -From: Brandon Chinn <brandon@leapyear.io> -Date: Fri, 4 Jun 2021 16:40:56 -0700 -Subject: [PATCH 2/6] Fix Flag => PackageFlag - ---- - src/Stack/BuildPlan.hs | 2 +- - src/Stack/Package.hs | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/Stack/BuildPlan.hs b/src/Stack/BuildPlan.hs -index 36f82236e..c5c80efc6 100644 ---- a/src/Stack/BuildPlan.hs -+++ b/src/Stack/BuildPlan.hs -@@ -224,7 +224,7 @@ selectPackageBuildPlan platform compiler pool gpd = - flagCombinations :: NonEmpty [(FlagName, Bool)] - flagCombinations = mapM getOptions (genPackageFlags gpd) - where -- getOptions :: C.Flag -> NonEmpty (FlagName, Bool) -+ getOptions :: C.PackageFlag -> NonEmpty (FlagName, Bool) - getOptions f - | flagManual f = (fname, flagDefault f) :| [] - | flagDefault f = (fname, True) :| [(fname, False)] -diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs -index 4db50d2a4..d9bca7af5 100644 ---- a/src/Stack/Package.hs -+++ b/src/Stack/Package.hs -@@ -128,7 +128,7 @@ resolvePackage packageConfig gpkg = - (resolvePackageDescription packageConfig gpkg) - - packageFromPackageDescription :: PackageConfig -- -> [D.Flag] -+ -> [PackageFlag] - -> PackageDescriptionPair - -> Package - packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkgNoMod pkg) = -@@ -935,9 +935,9 @@ resolvePackageDescription packageConfig (GenericPackageDescription desc defaultF - -- | Make a map from a list of flag specifications. - -- - -- What is @flagManual@ for? --flagMap :: [Flag] -> Map FlagName Bool -+flagMap :: [PackageFlag] -> Map FlagName Bool - flagMap = M.fromList . map pair -- where pair :: Flag -> (FlagName, Bool) -+ where pair :: PackageFlag -> (FlagName, Bool) - pair = flagName &&& flagDefault - - data ResolveConditions = ResolveConditions -@@ -986,7 +986,7 @@ resolveConditions rc addDeps (CondNode lib deps cs) = basic <> children - case v of - OS os -> os == rcOS rc - Arch arch -> arch == rcArch rc -- Flag flag -> -+ PackageFlag flag -> - fromMaybe False $ M.lookup flag (rcFlags rc) - -- NOTE: ^^^^^ This should never happen, as all flags - -- which are used must be declared. Defaulting to - -From 8facd731ec3f2bbc15a083750740929167b33bb2 Mon Sep 17 00:00:00 2001 -From: Brandon Chinn <brandon@leapyear.io> -Date: Fri, 4 Jun 2021 16:55:30 -0700 -Subject: [PATCH 3/6] Fix CabalSpecVersion - ---- - src/Stack/Package.hs | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs -index d9bca7af5..fca039140 100644 ---- a/src/Stack/Package.hs -+++ b/src/Stack/Package.hs -@@ -32,6 +32,7 @@ import Data.List (find, isPrefixOf, unzip) - import qualified Data.Map.Strict as M - import qualified Data.Set as S - import qualified Data.Text as T -+import Distribution.CabalSpecVersion (CabalSpecVersion, cabalSpecMinimumLibraryVersion) - import Distribution.Compiler - import Distribution.ModuleName (ModuleName) - import qualified Distribution.ModuleName as Cabal -@@ -190,7 +191,7 @@ packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkg - (library pkg) - , packageBuildType = buildType pkg - , packageSetupDeps = msetupDeps -- , packageCabalSpec = either orLaterVersion id $ specVersionRaw pkg -+ , packageCabalSpec = orLaterVersion $ mkVersion $ cabalSpecMinimumLibraryVersion $ specVersion pkg - } - where - extraLibNames = S.union subLibNames foreignLibNames -@@ -696,7 +697,7 @@ packageDescModulesAndFiles pkg = do - - -- | Resolve globbing of files (e.g. data files) to absolute paths. - resolveGlobFiles -- :: Version -- ^ cabal file version -+ :: CabalSpecVersion -- ^ cabal file version - -> [String] - -> RIO Ctx (Set (Path Abs File)) - resolveGlobFiles cabalFileVersion = - -From 004f14652409b7d0645215d354b2e599eb7f76bc Mon Sep 17 00:00:00 2001 -From: Brandon Chinn <brandon@leapyear.io> -Date: Fri, 4 Jun 2021 16:55:40 -0700 -Subject: [PATCH 4/6] Fix GenericPackageDescription - ---- - src/Stack/Build.hs | 2 +- - src/Stack/Package.hs | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Stack/Build.hs b/src/Stack/Build.hs -index 23b9a9719..856903bed 100644 ---- a/src/Stack/Build.hs -+++ b/src/Stack/Build.hs -@@ -358,7 +358,7 @@ checkComponentsBuildable lps = - checkSubLibraryDependencies :: HasLogFunc env => [ProjectPackage] -> RIO env () - checkSubLibraryDependencies proj = do - forM_ proj $ \p -> do -- C.GenericPackageDescription _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p -+ C.GenericPackageDescription _ _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p - - let dependencies = concatMap getDeps subLibs <> - concatMap getDeps foreignLibs <> -diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs -index fca039140..39aad4d2f 100644 ---- a/src/Stack/Package.hs -+++ b/src/Stack/Package.hs -@@ -863,7 +863,7 @@ data PackageDescriptionPair = PackageDescriptionPair - resolvePackageDescription :: PackageConfig - -> GenericPackageDescription - -> PackageDescriptionPair --resolvePackageDescription packageConfig (GenericPackageDescription desc defaultFlags mlib subLibs foreignLibs' exes tests benches) = -+resolvePackageDescription packageConfig (GenericPackageDescription desc _ defaultFlags mlib subLibs foreignLibs' exes tests benches) = - PackageDescriptionPair - { pdpOrigBuildable = go False - , pdpModifiedBuildable = go True - -From 820797b566ef981936907f4d19658259d4a635a8 Mon Sep 17 00:00:00 2001 -From: Brandon Chinn <brandon@leapyear.io> -Date: Fri, 4 Jun 2021 17:01:01 -0700 -Subject: [PATCH 5/6] Fix generatePackageVersionMacros - ---- - src/Stack/Build/Execute.hs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs -index 1e381dd21..aedd7fee5 100644 ---- a/src/Stack/Build/Execute.hs -+++ b/src/Stack/Build/Execute.hs -@@ -1214,7 +1214,7 @@ withSingleContext ActionContext {..} ee@ExecuteEnv {..} task@Task {..} allDeps m - let macroDeps = mapMaybe snd matchedDeps - cppMacrosFile = setupDir </> relFileSetupMacrosH - cppArgs = ["-optP-include", "-optP" ++ toFilePath cppMacrosFile] -- writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros macroDeps))) -+ writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros (packageVersion package) macroDeps))) - return (packageDBArgs ++ depsArgs ++ cppArgs) - - -- This branch is usually taken for builds, and - -From 336ab515e30f03c274f89ebe1cbc6aa1e597c2a4 Mon Sep 17 00:00:00 2001 -From: Brandon Chinn <brandon@leapyear.io> -Date: Fri, 4 Jun 2021 17:04:16 -0700 -Subject: [PATCH 6/6] Fix ModuleReexport - ---- - src/Stack/Script.hs | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs -index 6bb67c049..9ebd2173d 100644 ---- a/src/Stack/Script.hs -+++ b/src/Stack/Script.hs -@@ -18,6 +18,7 @@ import Distribution.Compiler (CompilerFlavor (..)) - import Distribution.ModuleName (ModuleName) - import qualified Distribution.PackageDescription as PD - import qualified Distribution.Types.CondTree as C -+import qualified Distribution.Types.ModuleReexport as ModuleReexport - import Distribution.Types.PackageName (mkPackageName) - import Distribution.Types.VersionRange (withinRange) - import Distribution.System (Platform (..)) -@@ -280,7 +281,7 @@ allExposedModules gpd = do - mlibrary = snd . C.simplifyCondTree checkCond <$> PD.condLibrary gpd - pure $ case mlibrary of - Just lib -> PD.exposedModules lib ++ -- map PD.moduleReexportName (PD.reexportedModules lib) -+ map ModuleReexport.moduleReexportName (PD.reexportedModules lib) - Nothing -> mempty - - -- | The Stackage project introduced the concept of hidden packages, diff --git a/testing/stack/persistent.patch b/testing/stack/persistent.patch deleted file mode 100644 index cf462d7b80c..00000000000 --- a/testing/stack/persistent.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 188d7ece06ee06ed6ccaf0df0c46285bd43898f4 -Author: q66 <daniel@octaforge.org> -Date: Thu Apr 28 05:02:09 2022 +0200 - - constrain persistent to fix build - -diff --git a/stack.cabal b/stack.cabal -index dba5bf0..e221321 100644 ---- a/stack.cabal -+++ b/stack.cabal -@@ -281,7 +281,7 @@ library - pantry >=0.5.3, - path >=0.7.0, - path-io >=1.6.3, -- persistent >=2.11.0.4, -+ persistent >=2.11.0.4 && <2.14.0.0, - persistent-sqlite >=2.11.1.0, - persistent-template >=2.9.1.0, - pretty >=1.1.3.6, -@@ -407,7 +407,7 @@ executable stack - pantry >=0.5.3, - path >=0.7.0, - path-io >=1.6.3, -- persistent >=2.11.0.4, -+ persistent >=2.11.0.4 && <2.14.0.0, - persistent-sqlite >=2.11.1.0, - persistent-template >=2.9.1.0, - pretty >=1.1.3.6, -@@ -537,7 +537,7 @@ executable stack-integration-test - pantry >=0.5.3, - path >=0.7.0, - path-io >=1.6.3, -- persistent >=2.11.0.4, -+ persistent >=2.11.0.4 && <2.14.0.0, - persistent-sqlite >=2.11.1.0, - persistent-template >=2.9.1.0, - pretty >=1.1.3.6, -@@ -672,7 +672,7 @@ test-suite stack-test - pantry >=0.5.3, - path >=0.7.0, - path-io >=1.6.3, -- persistent >=2.11.0.4, -+ persistent >=2.11.0.4 && <2.14.0.0, - persistent-sqlite >=2.11.1.0, - persistent-template >=2.9.1.0, - pretty >=1.1.3.6, diff --git a/testing/stayrtr/APKBUILD b/testing/stayrtr/APKBUILD index 4a70f277d9d..b166965a774 100644 --- a/testing/stayrtr/APKBUILD +++ b/testing/stayrtr/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Nicolas Lorin <androw95220@gmail.com> pkgname=stayrtr pkgver=0.5.1 -pkgrel=2 +pkgrel=3 pkgdesc="Simple RPKI-To-Router server. (Hard fork of GoRTR)" url="https://github.com/bgp/stayrtr" arch="all" diff --git a/testing/stern/APKBUILD b/testing/stern/APKBUILD index a49a2b0380e..0f7ae6192a6 100644 --- a/testing/stern/APKBUILD +++ b/testing/stern/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=stern pkgver=1.29.0 -pkgrel=0 +pkgrel=1 pkgdesc="Multi pod and container log tailing for Kubernetes" url="https://github.com/stern/stern" arch="all" diff --git a/testing/supercollider/10-boost_1.84.patch b/testing/supercollider/10-boost_1.84.patch new file mode 100644 index 00000000000..f745fab5eb6 --- /dev/null +++ b/testing/supercollider/10-boost_1.84.patch @@ -0,0 +1,107 @@ +From 61076b5adba9eb9226c9e929af4a28b9a31e460e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 30 Jan 2024 23:56:14 +0100 +Subject: [PATCH] Import boost_string_file.hpp from boost-1.83 and put it to + use immediately + +string_file.hpp was deprecated in boost-1.79.0 and removed in 1.84.0 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + common/boost_string_file.hpp | 59 ++++++++++++++++++++++++++++++++++ + lang/LangSource/PyrLexer.cpp | 2 +- + server/scsynth/SC_GraphDef.cpp | 2 +- + 3 files changed, 61 insertions(+), 2 deletions(-) + create mode 100644 common/boost_string_file.hpp + +diff --git a/common/boost_string_file.hpp b/common/boost_string_file.hpp +new file mode 100644 +index 00000000000..1ccb63de6b2 +--- /dev/null ++++ b/common/boost_string_file.hpp +@@ -0,0 +1,59 @@ ++// filesystem/string_file.hpp --------------------------------------------------------// ++ ++// Copyright Beman Dawes 2015 ++ ++// Distributed under the Boost Software License, Version 1.0. ++// See http://www.boost.org/LICENSE_1_0.txt ++ ++// Library home page: http://www.boost.org/libs/filesystem ++ ++#ifndef BOOST_FILESYSTEM_STRING_FILE_HPP ++#define BOOST_FILESYSTEM_STRING_FILE_HPP ++ ++#include <boost/filesystem/config.hpp> ++ ++#include <cstddef> ++#include <limits> ++#include <string> ++#include <ios> ++#include <stdexcept> ++#include <boost/cstdint.hpp> ++#include <boost/filesystem/path.hpp> ++#include <boost/filesystem/fstream.hpp> ++#include <boost/filesystem/operations.hpp> ++ ++#include <boost/filesystem/detail/header.hpp> // must be the last #include ++ ++namespace boost { ++namespace filesystem { ++ ++inline void save_string_file(path const& p, std::string const& str) ++{ ++ filesystem::ofstream file; ++ file.exceptions(std::ios_base::failbit | std::ios_base::badbit); ++ file.open(p, std::ios_base::binary); ++ const std::size_t sz = str.size(); ++ if (BOOST_UNLIKELY(sz > static_cast< boost::uintmax_t >((std::numeric_limits< std::streamsize >::max)()))) ++ BOOST_FILESYSTEM_THROW(std::length_error("String size exceeds max write size")); ++ file.write(str.c_str(), static_cast< std::streamsize >(sz)); ++} ++ ++inline void load_string_file(path const& p, std::string& str) ++{ ++ filesystem::ifstream file; ++ file.exceptions(std::ios_base::failbit | std::ios_base::badbit); ++ file.open(p, std::ios_base::binary); ++ const boost::uintmax_t sz = filesystem::file_size(p); ++ if (BOOST_UNLIKELY(sz > static_cast< boost::uintmax_t >((std::numeric_limits< std::streamsize >::max)()))) ++ BOOST_FILESYSTEM_THROW(std::length_error("File size exceeds max read size")); ++ str.resize(static_cast< std::size_t >(sz), '\0'); ++ if (sz > 0u) ++ file.read(&str[0], static_cast< std::streamsize >(sz)); ++} ++ ++} // namespace filesystem ++} // namespace boost ++ ++#include <boost/filesystem/detail/footer.hpp> ++ ++#endif // BOOST_FILESYSTEM_STRING_FILE_HPP +diff --git a/lang/LangSource/PyrLexer.cpp b/lang/LangSource/PyrLexer.cpp +index 7ebe3d7262d..06c1454ca63 100644 +--- a/lang/LangSource/PyrLexer.cpp ++++ b/lang/LangSource/PyrLexer.cpp +@@ -38,7 +38,7 @@ + + #include <boost/filesystem/path.hpp> + #include <boost/filesystem/operations.hpp> +-#include <boost/filesystem/string_file.hpp> ++#include "boost_string_file.hpp" + + #include "PyrParseNode.h" + #include "Bison/lang11d_tab.h" +diff --git a/server/scsynth/SC_GraphDef.cpp b/server/scsynth/SC_GraphDef.cpp +index 957aca1934b..5f8f15741a9 100644 +--- a/server/scsynth/SC_GraphDef.cpp ++++ b/server/scsynth/SC_GraphDef.cpp +@@ -46,7 +46,7 @@ + #include <string> + + #include <boost/filesystem/operations.hpp> // recursive_directory_iterator +-#include <boost/filesystem/string_file.hpp> // load_string_file ++#include "boost_string_file.hpp" // load_string_file + + namespace bfs = boost::filesystem; + diff --git a/testing/supercollider/APKBUILD b/testing/supercollider/APKBUILD index de953cf8760..fa2e75dafed 100644 --- a/testing/supercollider/APKBUILD +++ b/testing/supercollider/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leon ROUX <leon.roux@federate.us> pkgname=supercollider pkgver=3.13.0 -pkgrel=4 +pkgrel=5 pkgdesc="An audio server, programming language, and IDE for sound synthesis and algorithmic composition." url="https://supercollider.github.io/" arch="x86_64 x86 aarch64 armv7 armhf" # blocked by qt5-qtwebengine @@ -35,6 +35,7 @@ checkdepends="xvfb-run" subpackages="$pkgname-dev" source="https://github.com/supercollider/supercollider/releases/download/Version-$pkgver/SuperCollider-$pkgver-Source.tar.bz2 00-fortified-headers.patch + 10-boost_1.84.patch " builddir="$srcdir/SuperCollider-$pkgver-Source" @@ -66,4 +67,5 @@ package() { sha512sums=" a60a128f7646f077f91adae666fa4014529aa9df78cf0dfe5d68c9bd6447f008af7da2970b8736f3f29d0adbaf67bce680a8201fcbe7e1aba29c3499a57f89cd SuperCollider-3.13.0-Source.tar.bz2 cef3e1bdaecd4278d14fcabc39d2a69cfab1216ff3dedd3e54997470955dd310e502732ff2c0f76e95f349c31deb964eff456f49f51d7e3c83421521d0c30c43 00-fortified-headers.patch +9526fc6559c04d08f008c9ec30f6896389256c0ac9ed7f8b0840329592ee8aed70afae0ce9fb66d02f50ab4e4eba46fbeb09338c37d73523cd672e21170ebcab 10-boost_1.84.patch " 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/svls/APKBUILD b/testing/svls/APKBUILD index 59959dc5028..9f63245b69b 100644 --- a/testing/svls/APKBUILD +++ b/testing/svls/APKBUILD @@ -8,7 +8,8 @@ arch="all" license="MIT" makedepends="cargo cargo-auditable" subpackages="$pkgname-doc" -source="https://github.com/dalance/svls/archive/v$pkgver/svls-$pkgver.tar.gz" +source="https://github.com/dalance/svls/archive/v$pkgver/svls-$pkgver.tar.gz + cargo-update.patch" prepare() { default_prepare @@ -32,4 +33,5 @@ package() { sha512sums=" 5cc75c80d752ea3fc7dd13aefde368425221f0572f055699f2c46c6afd4ee66322f5a76fb151050f59b2a0d537b9e96dde8874680ae8983397e5ddecddcfd14c svls-0.2.11.tar.gz +3fa18a868bad883de22fe766309b442f6b01cae0d093d88792f942700cc5d882e9c38c70efb653342e6a35cbf22ccae0755c59a14b9711e2505ea72413505098 cargo-update.patch " diff --git a/testing/svls/cargo-update.patch b/testing/svls/cargo-update.patch new file mode 100644 index 00000000000..647e24c8e46 --- /dev/null +++ b/testing/svls/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 2372b84..b8e47e5 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -363,9 +363,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.125" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libloading" 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/sympow/APKBUILD b/testing/sympow/APKBUILD index db90f0c04fd..6045a99ce98 100644 --- a/testing/sympow/APKBUILD +++ b/testing/sympow/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Grigory Kirillov <txgk@bk.ru> # Maintainer: pkgname=sympow -pkgver=2.023.6 -pkgrel=1 +pkgver=2.023.7 +pkgrel=0 pkgdesc="Program for computing special values of symmetric power elliptic curve L-functions" url="https://gitlab.com/rezozer/forks/sympow" # blocked by pari @@ -35,5 +35,5 @@ package() { } sha512sums=" -efe3b09fff0629e136b029ea615aa09ac1a4f225c06636d653ac921c7de01bf75e2b392a138c3c1af92f2b4f889f5949beeeba5b6e5e6b49e02c605bb9c16ceb sympow-v2.023.6.tar.gz +ac307f9a8700868913ee12541fad655ddf9eaccd523fa8ddb59c7157c41be6efba599add766724047774cfd8fa2b16cd566e4df483d43d9da49acf81bcbce1b1 sympow-v2.023.7.tar.gz " diff --git a/testing/tangctl/APKBUILD b/testing/tangctl/APKBUILD index c5a7e83de2d..1146f56a10f 100644 --- a/testing/tangctl/APKBUILD +++ b/testing/tangctl/APKBUILD @@ -3,7 +3,7 @@ pkgname=tangctl pkgver=0_git20220412 _gitrev=2c7f9b676e1571a5805b2e47502ac16e1dfba5da -pkgrel=15 +pkgrel=16 pkgdesc="Tool implementing server-side ECMR exchange functionality (Tang server)" url="https://github.com/anatol/tang.go" license="BSD-3-Clause" diff --git a/testing/tanka/APKBUILD b/testing/tanka/APKBUILD index 1497b81ba1e..dcc6e69b431 100644 --- a/testing/tanka/APKBUILD +++ b/testing/tanka/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=tanka pkgver=0.26.0 -pkgrel=4 +pkgrel=5 pkgdesc="Flexible, reusable and concise configuration for Kubernetes" url="https://tanka.dev" # blocked by kubectl (kubernetes) diff --git a/testing/taskcafe/APKBUILD b/testing/taskcafe/APKBUILD index 89b1b6b6e7a..8df6bc0e139 100644 --- a/testing/taskcafe/APKBUILD +++ b/testing/taskcafe/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kay Thomas <kaythomas@pm.me> pkgname=taskcafe pkgver=0.3.6 -pkgrel=5 +pkgrel=6 pkgdesc="Project management tool with Kanban boards" url="https://github.com/JordanKnott/taskcafe" # riscv64: fails to compile js diff --git a/testing/templ/APKBUILD b/testing/templ/APKBUILD index 01cf56f1e8e..7a69ddcd039 100644 --- a/testing/templ/APKBUILD +++ b/testing/templ/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=templ pkgver=0.2.663 -pkgrel=0 +pkgrel=1 pkgdesc="Language for writing HTML user interface in Go" url="https://templ.guide/" arch="all" diff --git a/testing/tetragon-client/APKBUILD b/testing/tetragon-client/APKBUILD index 7e4badbdf2c..23a711beaca 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.1.0 -pkgrel=0 +pkgrel=1 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 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/thanos/APKBUILD b/testing/thanos/APKBUILD index 21847452e5e..8c78420daaf 100644 --- a/testing/thanos/APKBUILD +++ b/testing/thanos/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: wener <wenermail@gmail.com> pkgname=thanos pkgver=0.31.0 -pkgrel=5 +pkgrel=6 pkgdesc="Highly available Prometheus setup with long term storage capabilities. CNCF Sandbox project." url="https://github.com/thanos-io/thanos" license="Apache-2.0" diff --git a/testing/ticker/APKBUILD b/testing/ticker/APKBUILD index 381174fafde..06f0644569f 100644 --- a/testing/ticker/APKBUILD +++ b/testing/ticker/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=ticker pkgver=4.5.14 -pkgrel=5 +pkgrel=6 pkgdesc="Terminal stock watcher and stock position tracker" url="https://github.com/achannarasappa/ticker" arch="all" diff --git a/testing/tillitis-key1-apps/APKBUILD b/testing/tillitis-key1-apps/APKBUILD index 525f5695b7c..47b7e043835 100644 --- a/testing/tillitis-key1-apps/APKBUILD +++ b/testing/tillitis-key1-apps/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=tillitis-key1-apps pkgver=0.0.6 -pkgrel=6 +pkgrel=7 pkgdesc="Apps and host programs for TKey, the flexible open hardware/software USB security key" url="https://www.tillitis.se/" arch="all !s390x" # s390x lack lld package diff --git a/testing/time/APKBUILD b/testing/time/APKBUILD index ba4e759b81e..84e0c47d14b 100644 --- a/testing/time/APKBUILD +++ b/testing/time/APKBUILD @@ -8,11 +8,14 @@ url="https://www.gnu.org/software/time/" arch="all" license="GPL-3.0-only" subpackages="$pkgname-doc" -source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" -builddir="$srcdir/$pkgname-$pkgver" +source="https://ftp.gnu.org/gnu/time/time-$pkgver.tar.gz" + +prepare() { + default_prepare + update_config_sub +} build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,13 +27,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5c6dabbbe71e9103a47b892b86bb914c1704122d4fe7dff1e2cbd28503297163118d295077d8e062b035d673a1f91c36f8a45c7383f374fd766942b32bde4406 time-1.9.tar.gz" +sha512sums=" +5c6dabbbe71e9103a47b892b86bb914c1704122d4fe7dff1e2cbd28503297163118d295077d8e062b035d673a1f91c36f8a45c7383f374fd766942b32bde4406 time-1.9.tar.gz +" diff --git a/testing/tmpl/APKBUILD b/testing/tmpl/APKBUILD index eb506661841..66609eaee02 100644 --- a/testing/tmpl/APKBUILD +++ b/testing/tmpl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Sergio Talens-Oliag <sto@mixinet.net> pkgname=tmpl pkgver=0.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="Tool to process templates using Golang text/template and Sprig functions" url="https://github.com/krakozaure/tmpl" arch="all" diff --git a/testing/tomcat9/APKBUILD b/testing/tomcat9/APKBUILD index c64663d81a7..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.88 +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=" -b2668f50339afdd266dbdf3ff20a98632a5552910179eda272b65ea0b18be4bef8fa9988e3cfc77e4eae4b74ae1e7abe2483b0e427a07628ed50fed3a13eefb9 apache-tomcat-9.0.88.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 c811cdeb020..130c4922a8c 100644 --- a/testing/tootik/APKBUILD +++ b/testing/tootik/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Celeste <cielesti@protonmail.com> pkgname=tootik pkgver=0.10.4 -pkgrel=0 +pkgrel=1 pkgdesc="Federated nanoblogging service with Gemini frontend" url="https://github.com/dimkr/tootik" arch="all" 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/tree-sitter-c-sharp/APKBUILD b/testing/tree-sitter-c-sharp/APKBUILD index 2b010bd1d4d..f8e468ee26b 100644 --- a/testing/tree-sitter-c-sharp/APKBUILD +++ b/testing/tree-sitter-c-sharp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou <matthias@ahouansou.cz> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=tree-sitter-c-sharp -pkgver=0.21.1 +pkgver=0.21.2 pkgrel=0 pkgdesc="C# Grammar for tree-sitter" url="https://github.com/tree-sitter/tree-sitter-c-sharp" @@ -21,5 +21,5 @@ package() { } sha512sums=" -43fe2c31ae73efff91af15d40f9b3d4b468c5b118de7b029c5c2338885bc27fedca21fe6361700012a1d5c80ff7426ef9ce2f7226da44be8302d727858e7aebb tree-sitter-c-sharp-0.21.1.tar.gz +7bab224ad23c33a982f8690c5887f7904e7498cac94cf7a28a313d2666f62d84c68035b15f6812c21aecb89c42d77f3bd697d208081dd9b11d1e3b55a5cbcf6b tree-sitter-c-sharp-0.21.2.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 a6a6b49bef0..dd640262cf4 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.5.2 +pkgver=2024.5.23 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=" -b4939ce27859e84bf49548e23fe1c98c290902de3e001b83367daa1fd676351a537cc5905ff83c7942f95213045dd4fd8377d0f6d481a50a12324e1375d3ee62 tree-sitter-ssh-client-config-2024.5.2.tar.gz +e84ce8b52b405029c2dc347b24b16e78ce5994a1f8fb46ca5525003337f2f53edaccff936723798d854676ae123deae8b353848d7427bde7775df53e122caeca tree-sitter-ssh-client-config-2024.5.23.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 ae5ae82e8dc..6dd41c88650 100644 --- a/testing/trivy/APKBUILD +++ b/testing/trivy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: TBK <alpine@jjtc.eu> pkgname=trivy pkgver=0.50.4 -pkgrel=0 +pkgrel=1 pkgdesc="Simple and comprehensive vulnerability scanner for containers" url="https://github.com/aquasecurity/trivy" arch="all" diff --git a/testing/trunk/APKBUILD b/testing/trunk/APKBUILD index 8832322c53a..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.20.0 +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=" -153af6ed7d204d6f72c529c486d089049736b18e7a4316c708d3f7e2e154333c2da1579d37e71c8501c89dd10c63a50dcfc365e00a1dc601d1f7b96898179dd4 trunk-0.20.0.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/tty-proxy/APKBUILD b/testing/tty-proxy/APKBUILD index 4b6348b0756..b58d71a420b 100644 --- a/testing/tty-proxy/APKBUILD +++ b/testing/tty-proxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=tty-proxy pkgver=0.0.2 -pkgrel=20 +pkgrel=21 pkgdesc="Proxy used by the tty-share command for public facing sessions" url="https://github.com/elisescu/tty-proxy" arch="all" diff --git a/testing/tty-share/APKBUILD b/testing/tty-share/APKBUILD index cce1a4149d6..73fab455f19 100644 --- a/testing/tty-share/APKBUILD +++ b/testing/tty-share/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Kienlen <kommander@laposte.net> pkgname=tty-share pkgver=2.4.0 -pkgrel=10 +pkgrel=11 pkgdesc="Share your terminal over the Internet" url="https://tty-share.com/" arch="all" diff --git a/testing/ttyper/APKBUILD b/testing/ttyper/APKBUILD index 2242ed09663..2bcfe51fc9c 100644 --- a/testing/ttyper/APKBUILD +++ b/testing/ttyper/APKBUILD @@ -7,7 +7,9 @@ url="https://github.com/max-niederman/ttyper/" arch="all" license="MIT" makedepends="cargo cargo-auditable" -source="https://github.com/max-niederman/ttyper/archive/refs/tags/v$pkgver/ttyper-$pkgver.tar.gz" +source="https://github.com/max-niederman/ttyper/archive/refs/tags/v$pkgver/ttyper-$pkgver.tar.gz +cargo-update.patch +" prepare() { default_prepare @@ -29,4 +31,5 @@ package() { sha512sums=" 6a7354b9725d961e2ad2709fcbe110f0e4c712a3b6a688468420bb29f507dade0de4eace140deff0ff3eec62d239d3a9484be732a6f90d1ad9d5e7f07c39e401 ttyper-1.4.1.tar.gz +8393f46e6c9064e7669f2ad53a22381d2db92410da8cd1cff9f6055eeb0a9306facc88661b88c3b434e128828683073204fca827ae86e2296a5257234c6e0c5c cargo-update.patch " diff --git a/testing/ttyper/cargo-update.patch b/testing/ttyper/cargo-update.patch new file mode 100644 index 00000000000..0abd94ccc80 --- /dev/null +++ b/testing/ttyper/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 8ab2cc3..ce2e940 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -269,9 +269,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libredox" diff --git a/testing/typstfmt/APKBUILD b/testing/typstfmt/APKBUILD index eae08b70f6b..d5d787b6203 100644 --- a/testing/typstfmt/APKBUILD +++ b/testing/typstfmt/APKBUILD @@ -10,7 +10,8 @@ arch="all !s390x !ppc64le !riscv64 !armhf" license="MIT" makedepends="cargo cargo-auditable" subpackages="$pkgname-doc" -source="https://github.com/astrale-sharp/typstfmt/archive/$pkgver/typstfmt-$pkgver.tar.gz" +source="https://github.com/astrale-sharp/typstfmt/archive/$pkgver/typstfmt-$pkgver.tar.gz + cargo-update.patch" prepare() { default_prepare @@ -33,4 +34,5 @@ package() { sha512sums=" a274b9b26e9583494080a54d6dadf3c0f26db2846659c8fa29af6ca7a42120cb549eef57be2e7d8495a44c9c51d5f2b4d1ff5140f14670b17c12b62a505b5c22 typstfmt-0.2.7.tar.gz +99933e1024dbba7f1de34cd756a025e5023518c7fb79da61885379549c3beaef7320d1acb105b64e092c9c9e922f2518b1b247ba5c1b15665ea04706596eed39 cargo-update.patch " diff --git a/testing/typstfmt/cargo-update.patch b/testing/typstfmt/cargo-update.patch new file mode 100644 index 00000000000..ca291546465 --- /dev/null +++ b/testing/typstfmt/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ecfb8d4..0bb1fff 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -229,9 +229,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" + + [[package]] + name = "libc" +-version = "0.2.150" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libredox" diff --git a/testing/ueberzug/APKBUILD b/testing/ueberzug/APKBUILD index c5a9bba09ea..23d0e064f25 100644 --- a/testing/ueberzug/APKBUILD +++ b/testing/ueberzug/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sergiy Stupar <owner@sestolab.pp.ua> # Maintainer: Sergiy Stupar <owner@sestolab.pp.ua> pkgname=ueberzug -pkgver=18.2.2 -pkgrel=1 +pkgver=18.2.3 +pkgrel=0 pkgdesc="Command line util which allows one to draw images on terminals by using child windows" url="https://github.com/ueber-devel/ueberzug" arch="all" @@ -36,5 +36,5 @@ package() { } sha512sums=" -9253b687000a36a9d90408a6760c2ee8a78e48eabb72cab8fb5fb42bb7eaaacec6695b7c1e5bb51bfe651e4a06d19df0d9a82800054ff954c4825349fa72b872 ueberzug-18.2.2.tar.gz +6f8f342b4a593e857f70c053fc5b9e75bc2c3a063221ca64850acb8c325323bee50c9d471fe55de6bbb484d8c958d5bf3037e836b52734d617f1cea4be509a08 ueberzug-18.2.3.tar.gz " diff --git a/testing/undock/APKBUILD b/testing/undock/APKBUILD index 0588f1f8449..dcb7f42877b 100644 --- a/testing/undock/APKBUILD +++ b/testing/undock/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=undock pkgver=0.7.0 -pkgrel=2 +pkgrel=3 pkgdesc="Tool to extract contents of a container image into a local folder" url="https://crazymax.dev/undock/" arch="all" diff --git a/testing/up/APKBUILD b/testing/up/APKBUILD index 256d2ed4f49..db58ef2a29c 100644 --- a/testing/up/APKBUILD +++ b/testing/up/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Camuffo <dev@fmac.xyz> pkgname=up pkgver=0.4 -pkgrel=20 +pkgrel=21 pkgdesc="Ultimate Plumber is a tool for writing Linux pipes with instant live preview" url="https://github.com/akavel/up" arch="all" diff --git a/testing/upterm/APKBUILD b/testing/upterm/APKBUILD index 6e79c43153f..1dee84b4680 100644 --- a/testing/upterm/APKBUILD +++ b/testing/upterm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=upterm pkgver=0.13.5 -pkgrel=0 +pkgrel=1 pkgdesc="Secure terminal sharing" url="https://upterm.dev/" arch="all" diff --git a/testing/usql/APKBUILD b/testing/usql/APKBUILD index dfc32a62910..706a6bedac9 100644 --- a/testing/usql/APKBUILD +++ b/testing/usql/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=usql pkgver=0.15.6 -pkgrel=4 +pkgrel=5 pkgdesc="Universal command-line interface for SQL databases" url="https://github.com/xo/usql" # riscv64: not supported by go-ole (undefined: VARIANT) 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 d9977f312fa..384469e55c1 100644 --- a/testing/vale/APKBUILD +++ b/testing/vale/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrej Kolchin <KAAtheWise@protonmail.com> pkgname=vale pkgver=3.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="A markup-aware linter for prose built with speed and extensibility in mind" url="https://vale.sh/" arch="all" diff --git a/testing/vals/APKBUILD b/testing/vals/APKBUILD index 2700087ddab..f2d032f6456 100644 --- a/testing/vals/APKBUILD +++ b/testing/vals/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=vals pkgver=0.35.0 -pkgrel=2 +pkgrel=3 pkgdesc="Helm-like configuration values loader with support for various sources" url="https://github.com/helmfile/vals" arch="all" diff --git a/testing/vcmi/APKBUILD b/testing/vcmi/APKBUILD index 3a80d61e669..1dc5d7ff045 100644 --- a/testing/vcmi/APKBUILD +++ b/testing/vcmi/APKBUILD @@ -4,7 +4,7 @@ pkgver=1.4.5 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/vectoroids/APKBUILD b/testing/vectoroids/APKBUILD index 9efa75b358f..549cdd2bdf7 100644 --- a/testing/vectoroids/APKBUILD +++ b/testing/vectoroids/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Antoni Aloy <aaloytorrens@gmail.com> pkgname=vectoroids pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Vector-based rock-shooting" url="http://www.newbreedsoftware.com/vectoroids/" arch="all" @@ -13,6 +13,8 @@ options="!check" # No test suite source="https://github.com/antonialoytorrens/nbs/raw/master/unix/x/vectoroids/src/vectoroids-$pkgver.tar.gz vectoroids.desktop vectoroids-icon.xpm + + respect-cflags.patch " build() { @@ -23,13 +25,16 @@ package() { make install \ DATA_PREFIX="$pkgdir"/usr/share/games/vectoroids \ BIN_PREFIX="$pkgdir"/usr/bin \ - MAN_PREFIX="$pkgdir"/usr/share/man + MAN_PREFIX="$pkgdir"/usr/share install -Dm644 "$srcdir"/vectoroids-icon.xpm \ "$pkgdir"/usr/share/pixmaps/vectoroids-icon.xpm install -Dm664 "$srcdir"/vectoroids.desktop \ "$pkgdir"/usr/share/applications/vectoroids.desktop } -sha512sums="d392f996c77cb7b02b25c8273623b71681c181a3d7078b6cd0068afb1ef03e7d3553c2cc662a272465882e06f73208a68665197d4dcc2206888e2768f768997d vectoroids-1.1.0.tar.gz +sha512sums=" +d392f996c77cb7b02b25c8273623b71681c181a3d7078b6cd0068afb1ef03e7d3553c2cc662a272465882e06f73208a68665197d4dcc2206888e2768f768997d vectoroids-1.1.0.tar.gz fde69036c2273c01a623e762e88d541e3e5ee5ac3b07163525b7d72f25a2caf4b81f0f954c2a415993d5e04763b2259c92ff2a6c78a94c9b936411addeaa22de vectoroids.desktop -a47d267547e766549e5425eef48442370903120b02e5c18ba92c08a6448637fd5d8e3814856990630fccf6cf407c10ccf4ef360108e284ebd0b706526c774395 vectoroids-icon.xpm" +a47d267547e766549e5425eef48442370903120b02e5c18ba92c08a6448637fd5d8e3814856990630fccf6cf407c10ccf4ef360108e284ebd0b706526c774395 vectoroids-icon.xpm +c687c3d7ccebd03570e68501c2dc0c92e8fd114b44f4ed041fd3e9426ede5640bbd08e1c69fa6beb8de17cdae5039bfcea5570e46c0bf8e2eb13c1aa24f7682e respect-cflags.patch +" diff --git a/testing/vectoroids/respect-cflags.patch b/testing/vectoroids/respect-cflags.patch new file mode 100644 index 00000000000..3b85c09dec4 --- /dev/null +++ b/testing/vectoroids/respect-cflags.patch @@ -0,0 +1,25 @@ +diff --git a/Makefile b/Makefile +index 79c993c..c5b0f73 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,9 +20,9 @@ SDL_LIB=$(shell sdl-config --libs) $(MIXER) -lSDL_image + NOSOUNDFLAG=__SOUND + MIXER=-lSDL_mixer + +-CFLAGS=-Wall -Wno-long-long -pedantic -ansi -O2 \ ++CFLAGS := -Wall -Wno-long-long -pedantic -ansi -O2 \ + $(shell sdl-config --cflags) -D$(NOSOUNDFLAG) \ +- -DDATA_PREFIX=\"$(DATA_PREFIX)\" -DJOY_$(JOY) -D$(TARGET_DEF) ++ -DDATA_PREFIX=\"$(DATA_PREFIX)\" -DJOY_$(JOY) -D$(TARGET_DEF) $(CFLAGS) + + + all: vectoroids +@@ -60,7 +60,7 @@ clean: + + + vectoroids: vectoroids.o +- $(CC) $(CFLAGS) vectoroids.o -o vectoroids $(SDL_LIB) ++ $(CC) $(CFLAGS) vectoroids.o -o vectoroids $(LDFLAGS) $(SDL_LIB) + + + vectoroids.o: vectoroids.c diff --git a/testing/vice/APKBUILD b/testing/vice/APKBUILD index 825f0e9049a..70138989b21 100644 --- a/testing/vice/APKBUILD +++ b/testing/vice/APKBUILD @@ -33,7 +33,7 @@ source="https://downloads.sourceforge.net/vice-emu/vice-$pkgver.tar.gz # Starting with version 3.8, only PDF docs are installed to # /usr/share/doc/vice, texlive is required to generate that case "$CARCH" in -ppc64le|s390x|riscv64) +ppc64le|s390x|riscv64|loongarch64) ;; *) makedepends="$makedepends texlive" diff --git a/testing/vinegar/APKBUILD b/testing/vinegar/APKBUILD index 50e7481883d..fd3b8fcaf62 100644 --- a/testing/vinegar/APKBUILD +++ b/testing/vinegar/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=vinegar pkgver=1.7.4 -pkgrel=2 +pkgrel=3 pkgdesc="An open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux" url="https://vinegarhq.org" arch="x86_64" # Roblox only has binaries for x86_64 on windows diff --git a/testing/virtctl/APKBUILD b/testing/virtctl/APKBUILD index e734c29a525..c6343f4e103 100644 --- a/testing/virtctl/APKBUILD +++ b/testing/virtctl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=virtctl pkgver=1.2.0 -pkgrel=0 +pkgrel=1 pkgdesc="CLI client for KubeVirt - the Kubernetes Virtualization API" url="https://kubevirt.io/" arch="all" diff --git a/testing/virter/APKBUILD b/testing/virter/APKBUILD index 262edcb27ff..4abd9ef6927 100644 --- a/testing/virter/APKBUILD +++ b/testing/virter/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=virter pkgver=0.27.0 -pkgrel=0 +pkgrel=1 pkgdesc="CLI tool for simple creation and cloning of libvirt virtual machines" url="https://github.com/LINBIT/virter" arch="all" diff --git a/testing/virtme-ng/APKBUILD b/testing/virtme-ng/APKBUILD index 1d032416575..d8e1df4e347 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.25 +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 +3be743d4c898ce2dbf28ba8abde38e5880b248b32af08964ebac99bfe501ae4ccf7bac2615fa29dc1fc563dec98d525a7eb082b6311531c286e0fdbbc29bc8f0 virtme-ng-1.25.tar.gz " diff --git a/testing/warp-s3/APKBUILD b/testing/warp-s3/APKBUILD index 4339b2bd48e..84a5a859940 100644 --- a/testing/warp-s3/APKBUILD +++ b/testing/warp-s3/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=warp-s3 pkgver=0.8.0 -pkgrel=3 +pkgrel=4 pkgdesc="Benchmarking tool for S3" url="https://github.com/minio/warp" license="AGPL-3.0" diff --git a/testing/watchbind/APKBUILD b/testing/watchbind/APKBUILD index b4dc030d0b5..8b302a7bcaa 100644 --- a/testing/watchbind/APKBUILD +++ b/testing/watchbind/APKBUILD @@ -10,7 +10,8 @@ license="GPL-3.0-or-later" makedepends="cargo cargo-auditable" subpackages="$pkgname-doc" options="net" -source="$pkgname-$pkgver.tar.gz::https://github.com/fritzrehde/watchbind/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/fritzrehde/watchbind/archive/v$pkgver.tar.gz + cargo-update.patch" prepare() { default_prepare @@ -33,4 +34,5 @@ package() { sha512sums=" 4084e854e070b2c9736e2ef10025f6703efcac8e9fb9c345f09e03a2048d0437e2d470b684f25306b66fca99cbeab40202d0560eba24aa2a69220b34369d2f46 watchbind-0.2.1.tar.gz +88b35a6e48e90cb1a17329fd641e7bed3ffd604b25c3ae9543ec91209b90a7491f74d7069d9c504fd44dda6a07429969ebeb2d68502bcbe0997b749b99021ece cargo-update.patch " diff --git a/testing/watchbind/cargo-update.patch b/testing/watchbind/cargo-update.patch new file mode 100644 index 00000000000..42a2bfa847f --- /dev/null +++ b/testing/watchbind/cargo-update.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c96c886..8c8f4f5 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -605,9 +605,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + + [[package]] + name = "libc" +-version = "0.2.152" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libredox" diff --git a/testing/watchmate/APKBUILD b/testing/watchmate/APKBUILD index 6b66667769d..81fd0582967 100644 --- a/testing/watchmate/APKBUILD +++ b/testing/watchmate/APKBUILD @@ -6,7 +6,8 @@ pkgrel=1 pkgdesc="Companion app for InfiniTime-powered PineTime smart watch" url="https://github.com/azymohliad/watchmate" # s390x: https://github.com/nix-rust/nix/issues/1968 -arch="all !s390x" +# loongarch64: nix crate fails to build +arch="all !s390x !loongarch64" license="GPL-3.0-only" makedepends=" cargo diff --git a/testing/watershot/APKBUILD b/testing/watershot/APKBUILD index f1b2fd77085..b05eab6724d 100644 --- a/testing/watershot/APKBUILD +++ b/testing/watershot/APKBUILD @@ -6,7 +6,8 @@ pkgrel=0 pkgdesc="A simple wayland native screenshot tool" url="https://github.com/Kirottu/watershot" # s390x: no desktop on this arch -arch="all !s390x" +# loongarch64: nix crate fails to build +arch="all !s390x !loongarch64" license="GPL-3.0-only" depends="grim" makedepends=" @@ -18,6 +19,7 @@ makedepends=" " source="https://github.com/Kirottu/watershot/archive/v$pkgver/watershot-$pkgver.tar.gz cargo-features.patch + bump-getrandom.patch " options="!check" # no tests provided @@ -44,4 +46,5 @@ package() { sha512sums=" 8997eaf8277c5abc166b064999d3ba7ddfe88b10536aea07cd91a7fc9e3720490fc6343b6b091d1c9e09d5f3de7b9251f01f926a4ad43600681527320bba4209 watershot-0.2.0.tar.gz a5b1c7b86970a056894fdb2e9cd174227982764b50fbd96a2765a2d3a1bd729593bee5ac2487dbbc94f247a76bceea17b6bf585c5bc0d734d3e978c8389103c0 cargo-features.patch +4f32b3965f6adf83282617522a2fc026a24170a92a8c1832e15674c92d0c72efe75d177f193b255e6ddb92b495fd851fc901854f9f9c8d9c42a258591b7cc9f8 bump-getrandom.patch " diff --git a/testing/watershot/bump-getrandom.patch b/testing/watershot/bump-getrandom.patch new file mode 100644 index 00000000000..fec85a6d79f --- /dev/null +++ b/testing/watershot/bump-getrandom.patch @@ -0,0 +1,30 @@ +needs at least 0.2.10 for musl-related fixes + +diff --git a/Cargo.lock b/Cargo.lock +index dd3d142..b8adc00 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -538,9 +538,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + + [[package]] + name = "getrandom" +-version = "0.2.8" ++version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" ++checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" + dependencies = [ + "cfg-if", + "libc", +@@ -836,9 +836,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.138" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libloading" 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/wazero/APKBUILD b/testing/wazero/APKBUILD index a9ae1ac12bb..50c664236b2 100644 --- a/testing/wazero/APKBUILD +++ b/testing/wazero/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Jason Staten <code.alpine@jxs.me> pkgname=wazero pkgver=1.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="WebAssembly Core Specification 1.0 and 2.0 compliant runtime" url="https://wazero.io" # Tests fail on 32-bit and ppc64le architectures diff --git a/testing/wgcf/APKBUILD b/testing/wgcf/APKBUILD index c4fbd42deb8..5aee9ed5742 100644 --- a/testing/wgcf/APKBUILD +++ b/testing/wgcf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=wgcf pkgver=2.2.22 -pkgrel=0 +pkgrel=1 pkgdesc="Unofficial CLI for Cloudflare Warp" url="https://github.com/ViRb3/wgcf" arch="all" diff --git a/testing/wine-staging/APKBUILD b/testing/wine-staging/APKBUILD index 75cbc2d6f83..dad45c4094c 100644 --- a/testing/wine-staging/APKBUILD +++ b/testing/wine-staging/APKBUILD @@ -8,9 +8,9 @@ # Contributor: sewn <sewn@disroot.org> # Maintainer: Matthias Ahouansou <matthias@ahouansou.cz> pkgname=wine-staging -pkgver=9.7 +pkgver=9.9 _pkgver="${pkgver%".${pkgver#*.*.}"}" -pkgrel=0 +pkgrel=1 pkgdesc="Compatibility layer for running Windows programs -- Staging patchset" url="https://www.winehq.org" arch="x86 x86_64" @@ -59,7 +59,7 @@ makedepends=" vulkan-loader-dev wayland-dev " -provides="wine=$pkgver-r$pkgrel" +provides="wine=1-r0" subpackages="$pkgname-dev $pkgname-doc" checkdepends="xvfb-run" source="https://dl.winehq.org/wine/source/${pkgver/.[1-9]*/.x}/wine-$_pkgver.tar.xz @@ -169,7 +169,7 @@ doc() { } sha512sums=" -0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80 wine-9.7.tar.xz -eebd079eefcaed9e021de2e00741a76b0b2f4dacbf05763de9dab94624e1ae934a7b0b391f6c5efffcb3bcadd09790609cbe77ab1a4f3cfff880352ee040c5c5 wine-staging-9.7.tar.gz +df016411933b5447bef9b48f67c58e12d6d33ef0c24045ab03c92821dcccbf84335d1a2d765e6d6cf3a743598317010b8ae6f69de3661733e4fa43febec873dd wine-9.9.tar.xz +520346c51c69ee10ab184f76462d7db2ae443eab1ca78e588f57a1c302386bb37f81e83f2de75d19d9e62dbf35e56770db456104accc2a05876d3ca148f3d90e wine-staging-9.9.tar.gz 9881abfd0e7e4589cd5724291f9ec06ccb9d88b842c69abb5ea7865b6c27c778a060e60a9776c3620a030555cf61b8cceded55db9f04d5e45d9c627306763bff rpath.patch " diff --git a/testing/wireguard-go/APKBUILD b/testing/wireguard-go/APKBUILD index 5308ead2788..2d1b3cb3e2f 100644 --- a/testing/wireguard-go/APKBUILD +++ b/testing/wireguard-go/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Stefan Reiff <kroko87@hotmail.com> pkgname=wireguard-go pkgver=0.0.20230223 -pkgrel=4 +pkgrel=5 pkgdesc="Next generation secure network tunnel: userspace implementation in go" url="https://www.wireguard.com" license="GPL-2.0-only" diff --git a/testing/wl-gammarelay/APKBUILD b/testing/wl-gammarelay/APKBUILD index 33065da8cc5..11a7c08f2fb 100644 --- a/testing/wl-gammarelay/APKBUILD +++ b/testing/wl-gammarelay/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=wl-gammarelay pkgver=0.1.1 -pkgrel=6 +pkgrel=7 pkgdesc="Control color temperature and brightness under Wayland via DBus" url="https://github.com/jeremija/wl-gammarelay" license="GPL-3.0" 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/woodpecker/APKBUILD b/testing/woodpecker/APKBUILD index aa5a5cb9a69..4a682f8b38f 100644 --- a/testing/woodpecker/APKBUILD +++ b/testing/woodpecker/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Patrycja Rosa <alpine@ptrcnull.me> # Maintainer: Will Sinatra <wpsinatra@gmail.com> pkgname=woodpecker -pkgver=2.3.0 -pkgrel=3 +pkgver=2.4.1 +pkgrel=1 pkgdesc="Simple yet powerful CI/CD engine with great extensibility" url="https://woodpecker-ci.org" arch="all" @@ -41,7 +41,9 @@ build() { } check() { - go test ./... + # temporarily skip failed test in TestStringSliceAddToMap + # at cmd/agent/core/agent_test.go:56-60,69 + go test -skip="TestStringSliceAddToMap/empty string in slice" ./... } package() { @@ -65,10 +67,10 @@ package() { } sha512sums=" -3dc50ac720dfac5f7f558b3c0168a186b35751741af889d1330f968e8d7c3a34f6451fada002987c22336d14d34c952a94928a3733402f7bb58279bf4f0b9201 woodpecker-2.3.0.tar.gz +41dc6e74d117dbccd88b444d98a698b0eaa8d7d6affb993bfd3f7b23b42e7be2c3ad027b0aeef71175efb66bc7b4c2f011657b0c8e90d8ab8f9ac0eec0fbdb6a woodpecker-2.4.1.tar.gz aecf28a0e893ef39f4a9c834aab6d9cdfef5a7f01ba5918134e2e7f3784ae102e642b9e247957da9c480ac7486b5f82027bff8df3033e90a503de57597b69917 0001-we-use-the-prebuild-webui.patch 69fe477f805dcb71b0220b9af2b3d0226b2e92f3c46764f37a139bb7303ad7cdb1caa2a711d1f9d22fccb357bbfbecb1c6cba2033c9101a11c0bb67b405c3e55 woodpecker.initd 0be91432e730cb0ad3663bebe7a257437cbefe5fa5c2f3145d621545d6cd2ff89ae41f338a5874166d2b03dc8caab73d26cd4322ed1122d4949cae5d6002b823 woodpecker.confd cb15d7ff290d9b68d5f63c20401ab622c8a7067d336841c876a6d3325e9d2a3ede3a85b792131d7d77a4126cbdb6f30a5a6113468f1efd736a2c1bbf2bfefbe4 woodpecker.conf -2e7a002378d9005a775efee97012ccf0bf1724382e89e4ff0a75cc9f29c57423d820b0ebdd3b72d5176a6e98ff82b60c9d98671d70e0c24b3e131ce513a520cb fix-cgo.patch +b0d03a8199de796579e4a15aaf586048720e95b8253e91668ed4d03cf1e0819eb47638dca2ef54f67b461ec8349feb9452aad7a4e43accce7d4f9eea4b50ffa1 fix-cgo.patch " diff --git a/testing/woodpecker/fix-cgo.patch b/testing/woodpecker/fix-cgo.patch index 74d3ec18103..a760c96f457 100644 --- a/testing/woodpecker/fix-cgo.patch +++ b/testing/woodpecker/fix-cgo.patch @@ -17,18 +17,18 @@ release-agent: ## Create agent binaries for release # compile -- GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/linux_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent -- GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/linux_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent -- GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/linux_arm/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent -- GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/windows_amd64/woodpecker-agent.exe go.woodpecker-ci.org/woodpecker/v2/cmd/agent -- GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/darwin_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent -- GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o dist/agent/darwin_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent -+ GOOS=linux GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -o dist/agent/linux_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent -+ GOOS=linux GOARCH=arm64 CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -o dist/agent/linux_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent -+ GOOS=linux GOARCH=arm CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -o dist/agent/linux_arm/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent -+ GOOS=windows GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -o dist/agent/windows_amd64/woodpecker-agent.exe go.woodpecker-ci.org/woodpecker/v2/cmd/agent -+ GOOS=darwin GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -o dist/agent/darwin_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent -+ GOOS=darwin GOARCH=arm64 CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -o dist/agent/darwin_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent +- GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o dist/agent/linux_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent +- GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o dist/agent/linux_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent +- GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o dist/agent/linux_arm/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent +- GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o dist/agent/windows_amd64/woodpecker-agent.exe go.woodpecker-ci.org/woodpecker/v2/cmd/agent +- GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o dist/agent/darwin_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent +- GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o dist/agent/darwin_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent ++ GOOS=linux GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o dist/agent/linux_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent ++ GOOS=linux GOARCH=arm64 CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o dist/agent/linux_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent ++ GOOS=linux GOARCH=arm CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o dist/agent/linux_arm/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent ++ GOOS=windows GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o dist/agent/windows_amd64/woodpecker-agent.exe go.woodpecker-ci.org/woodpecker/v2/cmd/agent ++ GOOS=darwin GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o dist/agent/darwin_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent ++ GOOS=darwin GOARCH=arm64 CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o dist/agent/darwin_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent # tar binary files tar -cvzf dist/woodpecker-agent_linux_amd64.tar.gz -C dist/agent/linux_amd64 woodpecker-agent tar -cvzf dist/woodpecker-agent_linux_arm64.tar.gz -C dist/agent/linux_arm64 woodpecker-agent diff --git a/testing/wtfutil/APKBUILD b/testing/wtfutil/APKBUILD index 59a1e303cef..160289012f7 100644 --- a/testing/wtfutil/APKBUILD +++ b/testing/wtfutil/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: guddaff <alpine@guddaff.de> pkgname=wtfutil pkgver=0.43.0 -pkgrel=5 +pkgrel=6 pkgdesc="personal information dashboard" url="https://wtfutil.com/" arch="all" diff --git a/testing/xcaddy/APKBUILD b/testing/xcaddy/APKBUILD index 165695b3a42..c6963feb44a 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=1 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/xmpp-dns/APKBUILD b/testing/xmpp-dns/APKBUILD index 7a337c34f6f..1d8988cfd89 100644 --- a/testing/xmpp-dns/APKBUILD +++ b/testing/xmpp-dns/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Anjandev Momi <anjan@momi.ca> pkgname=xmpp-dns pkgver=0.2.4 -pkgrel=16 +pkgrel=17 pkgdesc="CLI tool to check XMPP SRV records" url="https://salsa.debian.org/mdosch/xmpp-dns/" arch="all" diff --git a/testing/xremap-wlr/APKBUILD b/testing/xremap-wlr/APKBUILD index e87ea5dd697..c214ce618a6 100644 --- a/testing/xremap-wlr/APKBUILD +++ b/testing/xremap-wlr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Coco Liliace <coco@liliace.dev> # Maintainer: Coco Liliace <coco@liliace.dev> pkgname=xremap-wlr -pkgver=0.8.18 +pkgver=0.10.0 pkgrel=0 pkgdesc="Key remapper for Wayland" url="https://github.com/k0kubun/xremap" @@ -32,5 +32,5 @@ package() { } sha512sums=" -9ad0394e1824d5b423fd38d47f953844942119d69f6cf2c49f9e85dba18b6297957b30b77e265238b47e968921507620c4db1e6772d6cc69de278146556e6edf xremap-wlr-0.8.18.tar.gz +560412211d484d4a9c1ae570876b6a23a493144756627aa50723735d1a9a729de2c3884a0a990ebe86cdcda76298448039f8ed2cdd8cabfc7d1420a27c596a0c xremap-wlr-0.10.0.tar.gz " diff --git a/testing/yaegi/APKBUILD b/testing/yaegi/APKBUILD index 11ebde5c850..ed83872e235 100644 --- a/testing/yaegi/APKBUILD +++ b/testing/yaegi/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Hoang Nguyen <folliekazetani@protonmail.com> pkgname=yaegi pkgver=0.16.1 -pkgrel=0 +pkgrel=1 pkgdesc="Elegant Go interpreter" url="https://github.com/traefik/yaegi" # 32bit: TestEvalBuiltin test fails diff --git a/testing/yarr/APKBUILD b/testing/yarr/APKBUILD index 9bf86b1b66d..39030d465b9 100644 --- a/testing/yarr/APKBUILD +++ b/testing/yarr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Cowington Post <cowingtonpost@gmail.com> pkgname=yarr pkgver=2.4 -pkgrel=5 +pkgrel=6 pkgdesc="Yarr is a web-based feed aggregator which can be used both as a desktop application and a personal self-hosted server" url="https://github.com/nkanaev/yarr/" # fails tests on 32-bit 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/ytt/APKBUILD b/testing/ytt/APKBUILD index ac7d4747f90..7042ad58bd6 100644 --- a/testing/ytt/APKBUILD +++ b/testing/ytt/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: techknowlogick <techknowlogick@gitea.com> pkgname=ytt pkgver=0.47.0 -pkgrel=2 +pkgrel=3 pkgdesc="YAML templating tool that works on YAML structure instead of text" url="https://carvel.dev/ytt/" arch="all !armhf !armv7 !x86" diff --git a/testing/yubikey-agent/APKBUILD b/testing/yubikey-agent/APKBUILD index 56ce0a66076..10fa598dde9 100644 --- a/testing/yubikey-agent/APKBUILD +++ b/testing/yubikey-agent/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michał Polański <michal@polanski.me> pkgname=yubikey-agent pkgver=0.1.6 -pkgrel=4 +pkgrel=5 pkgdesc="Seamless ssh-agent for YubiKeys" url="https://github.com/FiloSottile/yubikey-agent" license="BSD-3-Clause" diff --git a/testing/zarf/APKBUILD b/testing/zarf/APKBUILD index f6d2a59844d..809c0b9332f 100644 --- a/testing/zarf/APKBUILD +++ b/testing/zarf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Walker <w_walker@icloud.com> pkgname=zarf pkgver=0.32.1 -pkgrel=2 +pkgrel=3 pkgdesc="DevSecOps for Air Gap & Limited-Connection Systems" url="https://zarf.dev/" # not useful/supported elsewhere diff --git a/testing/zed/APKBUILD b/testing/zed/APKBUILD new file mode 100644 index 00000000000..53d9991bdd8 --- /dev/null +++ b/testing/zed/APKBUILD @@ -0,0 +1,91 @@ +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Jakub Jirutka <jakub@jirutka.cz> +pkgname=zed +pkgver=0.136.2 +_pkgver=${pkgver/_/-} +pkgrel=0 +pkgdesc="High-performance multiplayer code editor (experimental package!)" +url="https://zed.dev" +# TODO: Enable on more arches later. +arch="aarch64 x86_64" +license="GPL-3.0-only" +makedepends=" + alsa-lib-dev + cargo + cargo-auditable + clang-dev + curl-dev + fontconfig-dev + libgit2-dev + libxcb-dev + libxkbcommon-dev + mimalloc2-dev + openssl-dev + protoc + sqlite-dev + vulkan-loader + wayland-dev + zstd-dev + " +source="https://github.com/zed-industries/zed/archive/v$_pkgver/zed-$_pkgver.tar.gz + system-curl.patch + system-openssl.patch + system-sqlite.patch + cargo.lock.patch + " +builddir="$srcdir/$pkgname-$_pkgver" +options="!check" # FIXME: building fails on out of memory + +# TODO: +# - unbundle fonts +# - unbundle other assets (?) +# - unbundle tree-sitter parsers + +unset CARGO_PROFILE_RELEASE_PANIC # is this needed? +export CARGO_PROFILE_RELEASE_STRIP="symbols" + +export RELEASE_VERSION="$_pkgver" + +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"] } + mimalloc = { rustc-link-lib = ["mimalloc"] } + zstd = { rustc-link-lib = ["zstd"] } + EOF + + cargo fetch --target="$CTARGET" --locked +} + +build() { + cargo auditable build --frozen --release -p zed + cargo auditable build --frozen --release -p cli +} + +check() { + cargo test --workspace --frozen +} + +package() { + install -D -m755 target/release/Zed -t "$pkgdir"/usr/libexec/ + install -D -m755 target/release/cli "$pkgdir"/usr/bin/zed + + install -D -m644 crates/zed/resources/zed.desktop -t "$pkgdir"/usr/share/applications/ + install -D -m644 crates/zed/resources/app-icon.png "$pkgdir"/usr/share/icons/hicolor/512x512/apps/zed.png + install -D -m644 crates/zed/resources/app-icon@2x.png "$pkgdir"/usr/share/icons/hicolor/1024x1024/apps/zed.png +} + +sha512sums=" +214e75ba8ac539720cd131752e434a011c82b8bf53e221bb6870b72b43d9ad799f077df7f48c369e9b15bb9df73fc1eeadf9f3b879f88a43e2bd506a6d6a6e60 zed-0.136.2.tar.gz +31f53310d35c2e9112460007c899fedda66d24561d7348f39ca8809423f4c5d6c22721c0d3e155d859c406733fb137d7be7015770e242b64b963cb2fe1b8f430 system-curl.patch +e05bd7921f5b611d7ed7857b4a613b2b01b152794d5a7e6bcc4c5767e9bd10937be29ace0a4af154104e631a8665f10433828c7744b29a7bffc825adaac30da4 system-openssl.patch +54a17784e428efc1564298f9e2a79e6c78386a4af47ea8c5d6c1df3543305258937b654d40841e281e9abadeb0f11ab6d5b1cc463d0d5770eceeace0819f833a system-sqlite.patch +69586a09cbb9ba560414ea020260e535ef25ff8d194266892d4f27c3744f00e8704a4947c898631503d0133886b31d30e06dfc12b78c4147340baf7b88d7ba04 cargo.lock.patch +" diff --git a/testing/zed/cargo.lock.patch b/testing/zed/cargo.lock.patch new file mode 100644 index 00000000000..f71e6aac4bc --- /dev/null +++ b/testing/zed/cargo.lock.patch @@ -0,0 +1,34 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -5876,6 +5876,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" + dependencies = [ ++ "bindgen 0.64.0", + "cc", + "pkg-config", + "vcpkg", +@@ -6929,15 +6930,6 @@ + checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + + [[package]] +-name = "openssl-src" +-version = "300.2.3+3.2.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +-dependencies = [ +- "cc", +-] +- +-[[package]] + name = "openssl-sys" + version = "0.9.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -6945,7 +6937,6 @@ + dependencies = [ + "cc", + "libc", +- "openssl-src", + "pkg-config", + "vcpkg", + ] diff --git a/testing/zed/system-curl.patch b/testing/zed/system-curl.patch new file mode 100644 index 00000000000..e50a0848322 --- /dev/null +++ b/testing/zed/system-curl.patch @@ -0,0 +1,6 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -278,3 +278,2 @@ + isahc = { version = "1.7.2", default-features = false, features = [ +- "static-curl", + "text-decoding", diff --git a/testing/zed/system-openssl.patch b/testing/zed/system-openssl.patch new file mode 100644 index 00000000000..a8f03125a2f --- /dev/null +++ b/testing/zed/system-openssl.patch @@ -0,0 +1,8 @@ +--- a/crates/client/Cargo.toml ++++ b/crates/client/Cargo.toml +@@ -22 +22 @@ +-async-native-tls = { version = "0.5.0", features = ["vendored"] } ++async-native-tls = { version = "0.5.0" } +@@ -64 +64 @@ +-async-native-tls = {"version" = "0.5.0", features = ["vendored"]} ++async-native-tls = {"version" = "0.5.0"} diff --git a/testing/zed/system-sqlite.patch b/testing/zed/system-sqlite.patch new file mode 100644 index 00000000000..39995690abe --- /dev/null +++ b/testing/zed/system-sqlite.patch @@ -0,0 +1,5 @@ +--- a/crates/sqlez/Cargo.toml ++++ b/crates/sqlez/Cargo.toml +@@ -17 +17 @@ +-libsqlite3-sys = { version = "0.26", features = ["bundled"] } ++libsqlite3-sys = { version = "0.26", features = ["buildtime_bindgen"] } diff --git a/testing/zfs-src/AKMBUILD b/testing/zfs-src/AKMBUILD index 1e5892ca9e8..fa0b5ca5544 100644 --- a/testing/zfs-src/AKMBUILD +++ b/testing/zfs-src/AKMBUILD @@ -1,5 +1,5 @@ modname=zfs -modver=2.2.1 +modver=2.2.4 makedepends="libtool linux-headers glib-dev e2fsprogs-dev util-linux-dev libtirpc-dev" built_modules="module/spl.ko \ module/zfs.ko" diff --git a/testing/zfs-src/APKBUILD b/testing/zfs-src/APKBUILD index 22efbc43dfc..311f74e8349 100644 --- a/testing/zfs-src/APKBUILD +++ b/testing/zfs-src/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Umar Getagazov <umar@handlerug.me> pkgname=zfs-src _modname=${pkgname%-src} -pkgver=2.2.1 +pkgver=2.2.4 pkgrel=0 pkgdesc="ZFS for Linux (sources, AKMS)" url="https://zfsonlinux.org" @@ -22,6 +22,6 @@ package() { } sha512sums=" -05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31 zfs-2.2.1.tar.gz -0300d1e3a50f2fdab590b31d74cebb2bc2a94fa3872e8659cec9cb838fd89b76efea18cdb3e04837094633aea0a14f8d4060d8f0b23df0978dfa00c865490fc2 AKMBUILD +1d17e30573d594fb5c9ea77cde104616dca362fed7530296816d1b55173594f66170fcfb23ab57c27074f85b79d3eb557b4ee9a1c420e507b2434a7902d8dcc1 zfs-2.2.4.tar.gz +19e16c3f9bca3aeb1a5ba8a60560bd43630af8beeed95093876f95850005f004769bca8618f44dedf8bb6c854b4a68f6aeee4f96002bb7f832d823958713f77b AKMBUILD " diff --git a/testing/zfsbootmenu/APKBUILD b/testing/zfsbootmenu/APKBUILD index f3fce067677..396dd718590 100644 --- a/testing/zfsbootmenu/APKBUILD +++ b/testing/zfsbootmenu/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: omni <omni+alpine@hack.org> pkgname=zfsbootmenu pkgver=2.3.0 -pkgrel=0 -pkgdesc="ZFS Bootloader for root-on-ZFS systems with support for snapshots and native full disk encryption" +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 - dracut fzf kexec-tools ncurses @@ -17,6 +17,7 @@ depends="bash 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" diff --git a/testing/zkgroup/APKBUILD b/testing/zkgroup/APKBUILD deleted file mode 100644 index 8071f771c78..00000000000 --- a/testing/zkgroup/APKBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Contributor: Siva Mahadevan <me@svmhdvn.name> -# Maintainer: Siva Mahadevan <me@svmhdvn.name> -pkgname=zkgroup -pkgver=0.9.0 -pkgrel=1 -pkgdesc="Library for the Signal Private Group System" -url="https://github.com/signalapp/zkgroup" -arch="all !s390x !ppc64le !riscv64" # limited by cargo -license="GPL-3.0-only" -makedepends="cargo cargo-auditable" -source="$pkgname-$pkgver.tar.gz::https://github.com/signalapp/zkgroup/archive/v$pkgver.tar.gz" - - -build() { - cargo auditable build --release --locked -} - -check() { - cargo test --release --locked -} - -package() { - install -Dm755 "target/release/libzkgroup.so" "$pkgdir/usr/lib/libzkgroup.so" -} - -sha512sums=" -1323a736fe72ef55d80cbcaaca77a34c6693f37b083cb9af88c9d805cf227ab42f095e690166e01b290923dfdc87207c4d0fdd30de8718d1859b83558252d4d1 zkgroup-0.9.0.tar.gz -" diff --git a/testing/zot/APKBUILD b/testing/zot/APKBUILD index 6fd97896218..21ad9673d59 100644 --- a/testing/zot/APKBUILD +++ b/testing/zot/APKBUILD @@ -2,9 +2,9 @@ pkgname=zot pkgver=2.0.4 _zui_commit=c78b303ee88555b39b9f21f136e702724b1725b0 -pkgrel=0 +pkgrel=2 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" diff --git a/testing/zrepl/APKBUILD b/testing/zrepl/APKBUILD index 17376cf571b..410f2998e28 100644 --- a/testing/zrepl/APKBUILD +++ b/testing/zrepl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Shawn Rose <shawnandrewrose@gmail.com> pkgname=zrepl pkgver=0.6.1 -pkgrel=3 +pkgrel=4 pkgdesc="one-stop, integrated solution for ZFS replication" url="https://zrepl.github.io/" # s390x: failing tests 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 +" |