community/dillo/mbedtls.patch

-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");

community/distrobox/APKBUILD

 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=distrobox
-pkgver=1.7.1
+pkgver=1.7.2.0
 pkgrel=0
 pkgdesc="Use any Linux distribution inside your terminal"
 url="https://distrobox.privatedns.org/"
@@ -22,5 +22,5 @@ package() {
 }
 
 sha512sums="
-a86a49b9f6158af3172369a201ce3852a349258c46ebb8dfb269f7b96dfbe2bf2fe9f80a5cf9b9236432d99f4f67fb3d95ab4663964fcdb0f888d48cbdd82c39  distrobox-1.7.1.tar.gz
+ae5c9ef7ee63beec6b99488091cdb5bc73dfb219988a71c624af2278ea2efc775895ae2106c6bc35783a317b5b3e92fceed2fdba5be05f94028d28a7a2fb8ce1  distrobox-1.7.2.0.tar.gz
 "

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
 "

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
 }

community/edk2/APKBUILD

@@ -6,14 +6,14 @@ pkgver=0.0.202308
 _realver=edk2-stable${pkgver##*.}
 _sslver=3.0.9
 _sfver=3e
-pkgrel=0
+pkgrel=1
 pkgdesc="EFI Development Kit II"
 url="https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/"
 arch="x86_64 aarch64"
 license="BSD-2-Clause-Patent"
 makedepends="bash python3 iasl nasm util-linux-dev util-linux-misc"
 options="!archcheck !check" # has no checks
-subpackages="$pkgname-pyc"
+subpackages="$pkgname-pyc $pkgname-shell:_shell"
 _mipisyst_commit=370b5944c046bab043dd8b133727b2135af7747a
 source="$pkgname-$pkgver.tar.gz::https://github.com/tianocore/edk2/archive/$_realver.tar.gz
 	mipisyst-$_mipisyst_commit.tar.gz::https://github.com/MIPI-Alliance/public-mipi-sys-t/archive/$_mipisyst_commit.tar.gz
@@ -25,19 +25,20 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/tianocore/edk2/archive/$_rea
 	"
 builddir="$srcdir/$pkgname-$_realver"
 
+PLATFORM="ShellPkg/ShellPkg.dsc"
 case "$CARCH" in
 	x86)
 		TARGET_ARCH=IA32
-		PLATFORM=OvmfPkg/OvmfPkgIa32X64.dsc
+		PLATFORM="$PLATFORM OvmfPkg/OvmfPkgIa32X64.dsc"
 		;;
 	x86_64)
 		TARGET_ARCH=X64
-		PLATFORM="OvmfPkg/OvmfPkgX64.dsc OvmfPkg/OvmfXen.dsc"
+		PLATFORM="$PLATFORM OvmfPkg/OvmfPkgX64.dsc OvmfPkg/OvmfXen.dsc"
 		subpackages="$subpackages ovmf:_ovmf:noarch ovmf-xen:_xen:noarch"
 		;;
 	aarch64)
 		TARGET_ARCH=AARCH64
-		PLATFORM=ArmVirtPkg/ArmVirtQemu.dsc
+		PLATFORM="$PLATFORM ArmVirtPkg/ArmVirtQemu.dsc"
 		subpackages="$subpackages aavmf::noarch"
 		;;
 esac
@@ -110,6 +111,22 @@ package() {
 	done
 }
 
+_shell() {
+	pkgdesc="EDK2 UEFI Shell"
+
+	# taken from arch
+	# minimal UEFI shell, as defined in ShellPkg/Application/Shell/Shell.inf
+	local _min='7C04A583-9E3E-4f1c-AD65-E05268D0B4D1'
+	# full UEFI shell, as defined in ShellPkg/ShellPkg.dsc
+	local _full='EA4BB293-2D7F-4456-A681-1F22F42CD0BC'
+
+	install -D "$builddir"/Build/Shell/"$RELEASE"_"$TOOLCHAIN"/$TARGET_ARCH/Shell_$_min.efi \
+		"$subpkgdir"/usr/share/edk2-shell/Shell.efi
+
+	install -D "$builddir"/Build/Shell/"$RELEASE"_"$TOOLCHAIN"/$TARGET_ARCH/Shell_$_full.efi \
+		"$subpkgdir"/usr/share/edk2-shell/ShellFull.efi
+}
+
 _ovmf() {
 	pkgdesc="Open Virtual Machine Firmware (OVMF) BIOS"
 	license="BSD MIT"

community/enchant2/APKBUILD

 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=enchant2
-pkgver=2.7.2
+pkgver=2.7.3
 pkgrel=0
 pkgdesc="wrapper library for generic spell checking (v2)"
 url="https://abiword.github.io/enchant/"
@@ -78,5 +78,5 @@ nuspell() {
 }
 
 sha512sums="
-8612dcca965b49c25ab08a99c08cd6c0fddd7c5e26508245f48b9e7829ba80e05c9299e0c974bb52b2fa800598f550ec074339634d6bf8485fd17669bf1620fc  enchant-2.7.2.tar.gz
+ca20ae45a42c1c3fec5ef81753f2bbfd1faaa33a6b0c60adc8ac77ab5eb0015be488a5b128b56cdface5f16c5bd3ea1623e9035a39d8453f7a3a713b04f392c7  enchant-2.7.3.tar.gz
 "

community/ergo/APKBUILD

 # Contributor: Kay Thomas <kaythomas@pm.me>
 # Maintainer: Kay Thomas <kaythomas@pm.me>
 pkgname=ergo
-pkgver=2.13.0
-pkgrel=2
+pkgver=2.13.1
+pkgrel=0
 pkgdesc="A modern IRC server (daemon/ircd) written in Go"
 url="https://ergo.chat"
 arch="all"
@@ -51,7 +51,7 @@ package() {
 }
 
 sha512sums="
-870e852e1d4a9bbeb9485de33bcf027bfbf92f7fffa125640cbb28798441e52c334a5e14b3a5ba009094eb8f31d24f664601394b1d22fe30828116c55da28826  ergo-2.13.0.tar.gz
+dcaec6e9c9f8871633862740980eca7e07f92b0d41c1d8becad09fe20f3ab9c5920a966286b577523e6fdc683018bec1938ed5237eacbe922b70cbfb19ed2bca  ergo-2.13.1.tar.gz
 1fd4e2a31ebbf7ade88294b18e2705a6caac4f0b0d402a3f324f929cc786d2dee104f600ec4213817f1fd7f22fa10c1303307ee342eb57968be9dfba7851e912  ergo.initd
 c9856c141ab4b8b2dee63996678613a787d1aae8345d8baa2df9bc4427306f00b71a8a0fd7e30fd4e7b78cece982ec189ca1e73e703f2617e353d30fbd736491  ergo.confd
 79d3608fdf0c271633e1b9fcbe7a654596c4433fb0a625e26d1ecb10826aeb1357200df758bc89f46a6077c189beff3f0218510296141ff6c1b0c76e4529e636  ircd.yaml

community/eza/APKBUILD

 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=eza
-pkgver=0.18.13
+pkgver=0.18.14
 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
+6e52a679a8e4fb29db3f7f9270b5bc6e80662790a1b2e2801eef8839d909686e9de66442e9e7317778de1581b16a4e9e9c0c39e1311092188ab92d48231f52bc  eza-0.18.14.tar.gz
 a6d4139bc1e420ad85e88611551ed79274a6a994f1db1bb29cf833145c2c8be816d6ed540ce4f1393431c607dbb2755519f464f40ab9f163545f49cf78eeb12b  completions-exa.patch
 "

community/fastfetch/APKBUILD

 # Contributor: Carter Li <zhangsongcui@live.cn>
 # Maintainer: Carter Li <zhangsongcui@live.cn>
 pkgname=fastfetch
-pkgver=2.11.2
+pkgver=2.11.5
 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="
-75e5a90c6ac9a70f55bf89040ffe9905804d51f07234e5bea89cf1a6639b3ced91d1741fcb192164e5226bc33954e9d35d9c34092e802936658a823fe2ed9f5c  fastfetch-2.11.2.tar.gz
+d599b863259dcfaae77f1f47827814d6ca311a0cbfb2e5dfe38be144a23327db80eb646ee70e41b6872336afdb6e2754e692f393263d31e9901f588311df1059  fastfetch-2.11.5.tar.gz
 "

community/fossil/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: David Demelier <markand@malikania.fr>
 pkgname=fossil
-pkgver=2.23
+pkgver=2.24
 pkgrel=0
 pkgdesc="Simple, high-reliability, distributed software configuration management"
 url="https://www.fossil-scm.org"
@@ -11,7 +11,10 @@ license="BSD-2-Clause"
 makedepends="openssl-dev>3 tcl-dev zlib-dev"
 checkdepends="coreutils ed tcl-lib"
 subpackages="$pkgname-bash-completion $pkgname-zsh-completion"
-source="https://www.fossil-scm.org/home/tarball/version-$pkgver/fossil-src-$pkgver.tar.gz"
+source="https://www.fossil-scm.org/home/tarball/version-$pkgver/fossil-src-$pkgver.tar.gz
+	fix-tests.patch
+	"
+patch_args="-p0"
 builddir="$srcdir/$pkgname-src-$pkgver"
 
 build() {
@@ -43,5 +46,6 @@ package() {
 }
 
 sha512sums="
-bba67e16b26b97aa40023a4a2aa3b2abfc9393ec8d3244ec88dab5b7d2c4d46e7d6ee89b008a6bce1f18c96c351c8d41d64f02ba28c0eb3eb04d01e308f3335b  fossil-src-2.23.tar.gz
+7fc7de7d947b0946866df38c6cb2215f6452d31903cae6470bb4a692816b2803eb66ea372280256e5cd00759e4d02a0ae459de2f56f39af10e873579d53d33ee  fossil-src-2.24.tar.gz
+2ce139acca006a754616409e2b713e814d7daf3633c3171e5ac2f98778fcb990638a4bb2037e2c02e7e3e9227fd1f7e0fad33e7ed8f98cc9a0fdc2f698629ccf  fix-tests.patch
 "

community/fossil/fix-tests.patch

+Patch-Source: https://fossil-scm.org/home/vpatch?from=merge-in:17c01c549e73c6b8&to=17c01c549e73c6b8
+--
+Index: test/amend.test
+==================================================================
+--- test/amend.test
++++ test/amend.test
+@@ -313,10 +313,11 @@
+   }
+   foreach res [lsort -nocase $result] {
+     append t2exp "sym-$res*"
+   }
+   eval fossil amend $HASH $tags
++  set t1exp [string trimleft $t1exp ,]
+   test amend-tag-$tc.1 {[string match "*hash:*$HASH*tags:*$t1exp*" $RESULT]}
+   fossil tag ls --raw $HASH
+   test amend-tag-$tc.2 {[string match $t2exp $RESULT]}
+   fossil timeline -n 1
+   test amend-tag-$tc.3 {[string match $t3exp $RESULT]}
+
+Index: test/json.test
+==================================================================
+--- test/json.test
++++ test/json.test
+@@ -107,11 +107,11 @@
+     set request [subst {POST $url HTTP/1.0\r
+ Host: localhost\r
+ User-Agent: Fossil-Test\r
+ Cookie: $cookie\r
+ Content-Type: application/json
+-Content-Length $len
++Content-Length: $len
+ \r
+ $data}]
+   } else {
+     set request [subst {GET $url HTTP/1.0\r
+ Host: localhost\r
+
+Index: test/merge5.test
+==================================================================
+--- test/merge5.test
++++ test/merge5.test
+@@ -23,11 +23,11 @@
+ }
+ protOut {
+ fossil sqlite3 --no-repository reacts badly to SQL dumped from
+ repositories created from fossil older than version 2.0.
+ }
+-test merge5-sqlite3-issue false knownBug
++#test merge5-sqlite3-issue false knownBug
+ test_cleanup_then_return
+ 
+ # Verify the results of a check-out
+ #
+ proc checkout-test {testid expected_content} {
+
+Index: test/stash.test
+==================================================================
+--- test/stash.test
++++ test/stash.test
+@@ -168,14 +168,14 @@
+ 
+ ########
+ # fossil stash show|cat ?STASHID? ?DIFF-OPTIONS?
+ # fossil stash [g]diff ?STASHID? ?DIFF-OPTIONS?
+ 
+-fossil stash show
+-test stash-1-show {[normalize_result] eq $diff_stash_1}
+-fossil stash diff
+-test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug
++#fossil stash show
++#test stash-1-show {[normalize_result] eq $diff_stash_1}
++#fossil stash diff
++#test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug
+ 
+ ########
+ # fossil stash pop
+ 
+ stash-test 2 pop {
+@@ -206,16 +206,16 @@
+ # fossil: ./src/delta.c:231: checksum: Assertion '...' failed.
+ # Should be triggered by this stash-WY-1 test.
+ fossil checkout --force c1
+ fossil clean
+ fossil mv --soft f1 f1new
+-stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
+-  REVERT   f1
+-  DELETE   f1new
+-} -changes {
+-} -addremove {
+-} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
++#stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
++#  REVERT   f1
++#  DELETE   f1new
++#} -changes {
++#} -addremove {
++#} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
+ # TODO: add tests that verify the saved stash is sensible. Possibly
+ # by applying it and checking results. But until the SQLITE_CONSTRAINT
+ # error is fixed, there is nothing stashed to test.
+ 
+ 
+@@ -296,16 +296,17 @@
+ }] -changes {
+   RENAMED f2  ->  f2n
+ } -addremove {
+ } -exists {f1 f2n} -notexists {f2}
+ 
+-stash-test 3-2 {save -m f2n} {
+-  REVERT f2
+-  DELETE f2n
+-} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
++fossil stash save -m f2n
++#stash-test 3-2 {save -m f2n} {
++#  REVERT f2
++#  DELETE f2n
++#} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
+ fossil stash show
+-test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
++#test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
+ test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]}
+ stash-test 3-2-pop {pop} {
+   UPDATE f1
+   UPDATE f2n
+ } -changes {
+
+Index: test/tester.tcl
+==================================================================
+--- test/tester.tcl
++++ test/tester.tcl
+@@ -308,10 +308,11 @@
+       comment-format \
+       crlf-glob \
+       crnl-glob \
+       default-csp \
+       default-perms \
++      default-skin \
+       diff-binary \
+       diff-command \
+       dont-commit \
+       dont-push \
+       dotfiles \
+
+Index: test/utf.test
+==================================================================
+--- test/utf.test
++++ test/utf.test
+@@ -35,11 +35,11 @@
+   set i 1
+   foreach {fileName result} $args {
+     set fileName [file join $tempPath $fileName]
+     fossil test-looks-like-utf $fileName
+     set result [string map [list %TEMP% $tempPath \r\n \n] $result]
+-    # if {$::RESULT ne $result} {puts stdout $::RESULT}
++    # if {$::RESULT ne $result} {puts stdout $::RESULT; exit}
+     test utf-check-$testname.$i {$::RESULT eq $result}
+     incr i
+   }
+ }
+ 
+@@ -17609,25 +17609,25 @@
+ Has flag LOOK_LONG: no
+ Has flag LOOK_INVALID: no
+ Has flag LOOK_ODD: no
+ Has flag LOOK_SHORT: no}
+ 
+-utf-check 1179 utf-check-1179-2-129-1.jnk \
+-{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
+-Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: yes
+-Looks like UTF-8: no
+-Has flag LOOK_NUL: yes
+-Has flag LOOK_CR: no
+-Has flag LOOK_LONE_CR: no
+-Has flag LOOK_LF: no
+-Has flag LOOK_LONE_LF: no
+-Has flag LOOK_CRLF: no
+-Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: yes
+-Has flag LOOK_ODD: no
+-Has flag LOOK_SHORT: no}
++#utf-check 1179 utf-check-1179-2-129-1.jnk \
++#{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
++#Starts with UTF-8 BOM: no
++#Starts with UTF-16 BOM: yes
++#Looks like UTF-8: yes
++#Has flag LOOK_NUL: no
++#Has flag LOOK_CR: no
++#Has flag LOOK_LONE_CR: no
++#Has flag LOOK_LF: no
++#Has flag LOOK_LONE_LF: no
++#Has flag LOOK_CRLF: no
++#Has flag LOOK_LONG: no
++#Has flag LOOK_INVALID: yes
++#Has flag LOOK_ODD: no
++#Has flag LOOK_SHORT: no}
+ 
+ utf-check 1180 utf-check-1180-2-130-0.jnk \
+ {File "%TEMP%/utf-check-1180-2-130-0.jnk" has 4 bytes.
+ Starts with UTF-8 BOM: no
+ Starts with UTF-16 BOM: yes
+@@ -24121,41 +24121,41 @@
+ Has flag LOOK_LONG: no
+ Has flag LOOK_INVALID: yes
+ Has flag LOOK_ODD: no
+ Has flag LOOK_SHORT: no}
+ 
+-utf-check 1586 utf-check-1586-3-128-0.jnk \
+-{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
+-Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: no
+-Looks like UTF-8: no
+-Has flag LOOK_NUL: yes
+-Has flag LOOK_CR: no
+-Has flag LOOK_LONE_CR: no
+-Has flag LOOK_LF: no
+-Has flag LOOK_LONE_LF: no
+-Has flag LOOK_CRLF: no
+-Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: yes
+-Has flag LOOK_ODD: no
+-Has flag LOOK_SHORT: no}
+-
+-utf-check 1587 utf-check-1587-3-128-1.jnk \
+-{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
+-Starts with UTF-8 BOM: no
+-Starts with UTF-16 BOM: no
+-Looks like UTF-8: no
+-Has flag LOOK_NUL: yes
+-Has flag LOOK_CR: no
+-Has flag LOOK_LONE_CR: no
+-Has flag LOOK_LF: no
+-Has flag LOOK_LONE_LF: no
+-Has flag LOOK_CRLF: no
+-Has flag LOOK_LONG: no
+-Has flag LOOK_INVALID: yes
+-Has flag LOOK_ODD: no
+-Has flag LOOK_SHORT: no}
++#utf-check 1586 utf-check-1586-3-128-0.jnk \
++#{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
++#Starts with UTF-8 BOM: no
++#Starts with UTF-16 BOM: reversed
++#Looks like UTF-16: no
++#Has flag LOOK_NUL: yes
++#Has flag LOOK_CR: no
++#Has flag LOOK_LONE_CR: no
++#Has flag LOOK_LF: no
++#Has flag LOOK_LONE_LF: no
++#Has flag LOOK_CRLF: no
++#Has flag LOOK_LONG: no
++#Has flag LOOK_INVALID: no
++#Has flag LOOK_ODD: no
++#Has flag LOOK_SHORT: no}
++
++#utf-check 1587 utf-check-1587-3-128-1.jnk \
++#{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
++#Starts with UTF-8 BOM: no
++#Starts with UTF-16 BOM: reversed
++#Looks like UTF-8: no
++#Has flag LOOK_NUL: yes
++#Has flag LOOK_CR: no
++#Has flag LOOK_LONE_CR: no
++#Has flag LOOK_LF: no
++#Has flag LOOK_LONE_LF: no
++#Has flag LOOK_CRLF: no
++#Has flag LOOK_LONG: no
++#Has flag LOOK_INVALID: yes
++#Has flag LOOK_ODD: no
++#Has flag LOOK_SHORT: no}
+ 
+ utf-check 1588 utf-check-1588-3-129-0.jnk \
+ {File "%TEMP%/utf-check-1588-3-129-0.jnk" has 6 bytes.
+ Starts with UTF-8 BOM: no
+ Starts with UTF-16 BOM: no
+

community/fractal/APKBUILD

 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fractal
-pkgver=6
+pkgver=7
 pkgrel=0
 pkgdesc="Matrix group messaging app"
 url="https://wiki.gnome.org/Apps/Fractal"
@@ -55,5 +55,5 @@ package() {
 }
 
 sha512sums="
-4a57aedba9cd6e79999457837d2932ddbe5b62a2cb7d22dc8afd15c509c30484a663697cec91c2f5b40ab5153aadb0fac65a3d2ce59f444ff6ffe1f566d566ab  fractal-6.tar.gz
+389d9c51068fbfe5b1f2ee3591a3fead4e94cf8a525d262ad89701c023d21ff8621d055ab07ffd785bcfd77df05234536e0d0848866da979f5a7a1cb875cdf4a  fractal-7.tar.gz
 "

community/frp/APKBUILD

@@ -5,7 +5,7 @@ pkgver=0.57.0
 pkgrel=0
 pkgdesc="A fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet."
 url="https://github.com/fatedier/frp"
-arch="all"
+arch="all !loongarch64"
 license="Apache-2.0"
 makedepends="go"
 subpackages="$pkgname-openrc"

community/fscrypt/APKBUILD

 # Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
 # Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=fscrypt
-pkgver=0.3.4
-pkgrel=9
+pkgver=0.3.5
+pkgrel=0
 pkgdesc="Manage Linux native filesystem encryption"
 url="https://github.com/google/fscrypt"
 # Tests fail on ppc64le with SIGSEGV and memory lock errors
@@ -46,5 +46,5 @@ package() {
 }
 
 sha512sums="
-e99ade63092281f3db948564458ddd259420bb7295c6ad896fb5e22697405aa471725c929cf98631e91c05615141c9715bce3eb1b37cbe7c07a7c7c248117b06  fscrypt-0.3.4.tar.gz
+1d3dcd3bfa651a6a70709d58f2da07160646e779ebb65ce5213e257ba49b87123ad78428a1e3b5ed022386340ea1ba492bd43b148fb2f28b2b4bda971beed193  fscrypt-0.3.5.tar.gz
 "

community/gimp/APKBUILD

 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gimp
-pkgver=2.10.36
-pkgrel=1
+pkgver=2.10.38
+pkgrel=0
 pkgdesc="GNU Image Manipulation Program"
 url="https://www.gimp.org/"
 # nobody is using this on s390x
@@ -84,5 +84,5 @@ dev() {
 }
 
 sha512sums="
-dbe6152ea6ff99cca59bbf2c88a64fb4ff6b529d98ace7723eadf5dfb0e10d9cbaf2de1e0d5251e9ecf9abca73da9ae1a501f229997802fd4077fb9594f4ba66  gimp-2.10.36.tar.bz2
+343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa  gimp-2.10.38.tar.bz2
 "

community/git-branchless/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=git-branchless
 pkgver=0.8.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Suite of tools to help you visualize, navigate, manipulate, and repair your commit graph"
 url="https://github.com/arxanas/git-branchless"
 # riscv64: test fails
@@ -23,6 +23,8 @@ checkdepends="
 	"
 source="https://github.com/arxanas/git-branchless/archive/v$pkgver/git-branchless-$pkgver.tar.gz
 	unbundle-sqlite.patch
+	fix-git-2.44-auto_merge.patch
+	fix-tests-git-2.42.patch
 	"
 options="net"
 
@@ -69,4 +71,6 @@ package() {
 sha512sums="
 ad3435948ffabe256fff2f7b0fe654818fc280049fea0df845ce593ccd713faf5988c843062cfae28c10641c84ed15abaeb0ae774d21e88364f83c0c82852964  git-branchless-0.8.0.tar.gz
 a6edb671e188bb53cbe43c760c922233ed9e2e7cfdc3d2a32a020dfb847cff413a0c30333d03e76acf920459c438672cd2b975d515b57bfddd1ecc1bbceb1de4  unbundle-sqlite.patch
+d4a259751283137034b662b29de66203f54caf72be8549e2bde5e65b5c7dc193feb5b3b5f3e9b91d7bda7b2bfab9c4fc28e3f58ee859308835beeb429d527e13  fix-git-2.44-auto_merge.patch
+055e3f3559b0d5eefc1a43e2fde0cfadff631ec4bf28de720dc7f6ba502687be94748afe63cf5698288d34d843b92b3b7bef174e12f61914e9945d782e9f4eda  fix-tests-git-2.42.patch
 "

community/git-branchless/fix-git-2.44-auto_merge.patch

+Patch-Source: https://github.com/arxanas/git-branchless/commit/8b1ae8b29f2abf10e5585d48cea4bd85862a529b
+--
+From 8b1ae8b29f2abf10e5585d48cea4bd85862a529b Mon Sep 17 00:00:00 2001
+From: Waleed Khan <me@waleedkhan.name>
+Date: Sun, 18 Feb 2024 16:36:55 -0800
+Subject: [PATCH] tests: Try to fix failing `git-next` tests
+
+---
+ git-branchless-lib/src/core/eventlog.rs   | 8 +++++++-
+ git-branchless-lib/src/testing.rs         | 7 +++++++
+ git-branchless-lib/tests/test_eventlog.rs | 4 ++++
+ git-branchless/tests/test_bug_report.rs   | 2 +-
+ git-branchless/tests/test_eventlog.rs     | 2 +-
+ git-branchless/tests/test_hooks.rs        | 2 +-
+ git-branchless/tests/test_undo.rs         | 8 ++++++--
+ git-branchless/tests/test_wrap.rs         | 5 +++--
+ 8 files changed, 30 insertions(+), 8 deletions(-)
+
+diff --git a/git-branchless-lib/src/core/eventlog.rs b/git-branchless-lib/src/core/eventlog.rs
+index 31fce007d..bcdc214d1 100644
+--- a/git-branchless-lib/src/core/eventlog.rs
++++ b/git-branchless-lib/src/core/eventlog.rs
+@@ -710,7 +710,13 @@ pub fn should_ignore_ref_updates(reference_name: &ReferenceName) -> bool {
+ 
+     matches!(
+         reference_name.as_str(),
+-        "ORIG_HEAD" | "CHERRY_PICK" | "REBASE_HEAD" | "CHERRY_PICK_HEAD" | "FETCH_HEAD"
++        "ORIG_HEAD"
++            | "CHERRY_PICK"
++            | "REBASE_HEAD"
++            | "CHERRY_PICK_HEAD"
++            // From Git's `is_special_ref` in `refs.c`:
++            | "AUTO_MERGE"
++            | "FETCH_HEAD"
+     )
+ }
+ 
+diff --git a/git-branchless-lib/src/testing.rs b/git-branchless-lib/src/testing.rs
+index 6799bc5f8..d1cea37a6 100644
+--- a/git-branchless-lib/src/testing.rs
++++ b/git-branchless-lib/src/testing.rs
+@@ -654,6 +654,13 @@ then you can only run tests in the main `git-branchless` and \
+         Ok(version >= GitVersion(2, 27, 0))
+     }
+ 
++    /// Git v2.44 produces `AUTO_MERGE` refs as part of some operations, which
++    /// changes the event log according to the `reference-transaction` hook.
++    pub fn produces_auto_merge_refs(&self) -> eyre::Result<bool> {
++        let version = self.get_version()?;
++        Ok(version >= GitVersion(2, 44, 0))
++    }
++
+     /// Resolve a file during a merge or rebase conflict with the provided
+     /// contents.
+     #[instrument]
+diff --git a/git-branchless-lib/tests/test_eventlog.rs b/git-branchless-lib/tests/test_eventlog.rs
+index 461019b70..e69e44fb6 100644
+--- a/git-branchless-lib/tests/test_eventlog.rs
++++ b/git-branchless-lib/tests/test_eventlog.rs
+@@ -46,6 +46,10 @@ fn test_drop_non_meaningful_events() -> eyre::Result<()> {
+ fn test_different_event_transaction_ids() -> eyre::Result<()> {
+     let git = make_git()?;
+ 
++    if git.produces_auto_merge_refs()? {
++        return Ok(());
++    }
++
+     git.init_repo()?;
+     git.commit_file("test1", 1)?;
+     git.branchless("hide", &["--no-delete-branches", "HEAD"])?;
+diff --git a/git-branchless/tests/test_bug_report.rs b/git-branchless/tests/test_bug_report.rs
+index 5788024eb..0cc1596c3 100644
+--- a/git-branchless/tests/test_bug_report.rs
++++ b/git-branchless/tests/test_bug_report.rs
+@@ -16,7 +16,7 @@ fn redact_timestamp(str: String) -> String {
+ fn test_bug_report() -> eyre::Result<()> {
+     let git = make_git()?;
+ 
+-    if !git.supports_reference_transactions()? {
++    if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? {
+         return Ok(());
+     }
+     git.init_repo()?;
+diff --git a/git-branchless/tests/test_eventlog.rs b/git-branchless/tests/test_eventlog.rs
+index cc2cbf9e6..21b51fd6a 100644
+--- a/git-branchless/tests/test_eventlog.rs
++++ b/git-branchless/tests/test_eventlog.rs
+@@ -8,7 +8,7 @@ use lib::testing::make_git;
+ fn test_git_v2_31_events() -> eyre::Result<()> {
+     let git = make_git()?;
+ 
+-    if !git.supports_reference_transactions()? {
++    if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? {
+         return Ok(());
+     }
+ 
+diff --git a/git-branchless/tests/test_hooks.rs b/git-branchless/tests/test_hooks.rs
+index 57fc5d4b7..7acb6e278 100644
+--- a/git-branchless/tests/test_hooks.rs
++++ b/git-branchless/tests/test_hooks.rs
+@@ -222,7 +222,7 @@ fn test_pre_auto_gc() -> eyre::Result<()> {
+ fn test_merge_commit_recorded() -> eyre::Result<()> {
+     let git = make_git()?;
+ 
+-    if !git.supports_reference_transactions()? {
++    if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? {
+         return Ok(());
+     }
+ 
+diff --git a/git-branchless/tests/test_undo.rs b/git-branchless/tests/test_undo.rs
+index 8cd289427..9bf46e7f1 100644
+--- a/git-branchless/tests/test_undo.rs
++++ b/git-branchless/tests/test_undo.rs
+@@ -136,7 +136,7 @@ fn test_undo_help() -> eyre::Result<()> {
+ fn test_undo_navigate() -> eyre::Result<()> {
+     let git = make_git()?;
+ 
+-    if !git.supports_reference_transactions()? {
++    if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? {
+         return Ok(());
+     }
+ 
+@@ -225,7 +225,7 @@ fn test_undo_navigate() -> eyre::Result<()> {
+ fn test_go_to_event() -> eyre::Result<()> {
+     let git = make_git()?;
+ 
+-    if !git.supports_reference_transactions()? {
++    if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? {
+         return Ok(());
+     }
+ 
+@@ -433,6 +433,10 @@ fn test_undo_move_refs() -> eyre::Result<()> {
+ fn test_historical_smartlog_visibility() -> eyre::Result<()> {
+     let git = make_git()?;
+ 
++    if git.produces_auto_merge_refs()? {
++        return Ok(());
++    }
++
+     git.init_repo()?;
+     git.detach_head()?;
+     git.commit_file("test1", 1)?;
+diff --git a/git-branchless/tests/test_wrap.rs b/git-branchless/tests/test_wrap.rs
+index fb78e369a..3223bd18f 100644
+--- a/git-branchless/tests/test_wrap.rs
++++ b/git-branchless/tests/test_wrap.rs
+@@ -9,7 +9,7 @@ use lib::testing::{make_git, GitRunOptions};
+ fn test_wrap_rebase_in_transaction() -> eyre::Result<()> {
+     let git = make_git()?;
+ 
+-    if !git.supports_reference_transactions()? {
++    if !git.supports_reference_transactions()? || git.produces_auto_merge_refs()? {
+         return Ok(());
+     }
+ 
+@@ -28,7 +28,8 @@ fn test_wrap_rebase_in_transaction() -> eyre::Result<()> {
+     let event_replayer = EventReplayer::from_event_log_db(&effects, &repo, &event_log_db)?;
+     let events: Vec<Event> = get_event_replayer_events(&event_replayer)
+         .iter()
+-        .map(|event| redact_event_timestamp(event.clone()))
++        .cloned()
++        .map(redact_event_timestamp)
+         .collect();
+ 
+     // Bug fixed in Git v2.35: https://github.com/git/git/commit/4866a64508465938b7661eb31afbde305d83e234

community/git-branchless/fix-tests-git-2.42.patch

+Patch-Source: https://github.com/arxanas/git-branchless/commit/dbbaed74a6dc9a3aa098375845cbfab74b380ae6
+--
+From dbbaed74a6dc9a3aa098375845cbfab74b380ae6 Mon Sep 17 00:00:00 2001
+From: Waleed Khan <me@waleedkhan.name>
+Date: Sat, 23 Dec 2023 17:44:05 -0600
+Subject: [PATCH] fix(undo): fix `test_git_bisect_produces_empty_event`
+
+Broken on the Git `next` branch. Probably broken by https://github.com/git/git/commit/3460e3d6676870713ef17b300b03f70ee8f3cc44 or a commit slightly before that.
+---
+ git-branchless/tests/test_undo.rs | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/git-branchless/tests/test_undo.rs b/git-branchless/tests/test_undo.rs
+index 1ee81acca..8cd289427 100644
+--- a/git-branchless/tests/test_undo.rs
++++ b/git-branchless/tests/test_undo.rs
+@@ -660,6 +660,11 @@ fn test_git_bisect_produces_empty_event() -> eyre::Result<()> {
+     if !git.supports_reference_transactions()? {
+         return Ok(());
+     }
++    if git.get_version()? >= GitVersion(2, 42, 0) {
++        // Later versions of Git write `BISECT_EXPECTED_REV` to the filesystem
++        // as well, causing the below test to fail.
++        return Ok(());
++    }
+     git.init_repo()?;
+ 
+     git.commit_file("test1", 1)?;

community/gjs/APKBUILD

@@ -36,7 +36,7 @@ esac
 
 build() {
 	case "$CARCH" in
-	aarch64|arm*|riscv64)
+	aarch64|arm*|riscv64|loongarch64)
 		# not supported by clang here
 		export CFLAGS="${CFLAGS/-fstack-clash-protection}"
 		export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection}"