backports/py3-{pyqt6-sip, qt6, sip}: new aport

backports/py3-pyqt6-sip/APKBUILD

@@ -0,0 +1,36 @@
+# Contributor: Rosie K Languet <rkl@rosiesworkshop.net>
+# Maintainer: Rosie K Languet <rkl@rosiesworkshop.net>
+pkgname=py3-pyqt6-sip
+pkgver=13.6.0
+pkgrel=1
+pkgdesc="The sip module support for PyQt6"
+url="https://riverbankcomputing.com/software/sip"
+arch="all"
+license="custom:sip"
+depends="python3"
+makedepends="
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
+	python3-dev
+	"
+source="https://pypi.python.org/packages/source/P/PyQt6-sip/PyQt6_sip-$pkgver.tar.gz"
+options="!check" # No tests
+builddir="$srcdir/PyQt6_sip-$pkgver"
+
+build() {
+	export CFLAGS="$CFLAGS -O2 -flto=auto"
+	export CXXFLAGS="$CXXFLAGS -O2 -flto=auto"
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+bd2fa70d64544d8104d3477cb650a0e6bcefa0008680afcf7d187ba3fb1117871c0237d3a7f047144c8a8a8eeb8da941a3b206f8ee0601cb2cc734243cdb9d46  PyQt6_sip-13.6.0.tar.gz
+"

backports/py3-qt6/APKBUILD

@@ -0,0 +1,59 @@
+# Contributor: Rosie K Languet <rkl@rosiesworkshop.net>
+# Maintainer: Rosie K Languet <rkl@rosiesworkshop.net>
+pkgname=py3-qt6
+pkgver=6.7.1
+pkgrel=0
+pkgdesc="Python 3 bindings for the Qt toolkit"
+url="https://www.riverbankcomputing.com/software/pyqt/"
+arch="all"
+license="GPL-3.0-only"
+depends="
+	py3-pyqt6-sip
+	python3
+	"
+makedepends="
+	libx11-dev
+	py3-dbus-dev
+	py3-opengl
+	py3-pyqt-builder
+	py3-sip
+	python3-dev
+	qt6-qtbase-dev
+	qt6-qtconnectivity-dev
+	qt6-qtdeclarative-dev
+	qt6-qtmultimedia-dev
+	qt6-qtserialport-dev
+	qt6-qtsvg-dev
+	qt6-qttools-dev
+	qt6-qtwebchannel-dev
+	qt6-qtwebsockets-dev
+	"
+
+subpackages="$pkgname-pyc"
+source="https://pypi.python.org/packages/source/P/PyQt6/PyQt6-$pkgver.tar.gz"
+builddir="$srcdir/PyQt6-$pkgver"
+
+build() {
+	export CFLAGS="$CFLAGS -O2 -flto=auto"
+	export CXXFLAGS="$CXXFLAGS -O2 -flto=auto"
+	sip-build \
+		--confirm-license \
+		--qmake /usr/lib/qt6/bin/qmake \
+		--api-dir /usr/share/qt6/qsci/api/python \
+		--pep484-pyi \
+		--no-make
+	make -C build
+}
+
+check() {
+	make -C build check
+}
+
+package() {
+	make DESTDIR="$pkgdir" INSTALL_ROOT="$pkgdir" -C build install -j1
+	python3 -m compileall -j 0 "$pkgdir"/usr/lib/python3*
+}
+
+sha512sums="
+1e0fec009e1823b06460fd96eddc00ed31388c20f6d832aa0ebaa130baf06d83514df43af7961c3cb2872570d27e539d6db7bf6143ccdfd61a19da7521be2c7e  PyQt6-6.7.1.tar.gz
+"

backports/py3-sip/APKBUILD

@@ -0,0 +1,38 @@
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=py3-sip
+pkgver=6.8.6
+pkgrel=0
+pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
+options="!check" # No testsuite
+url="https://www.riverbankcomputing.com/software/sip/"
+arch="all"
+license="custom:sip"
+depends="
+	py3-packaging
+	py3-ply
+	py3-setuptools
+	py3-toml
+	"
+makedepends="python3-dev py3-gpep517 py3-wheel"
+subpackages="$pkgname-pyc"
+source="https://pypi.python.org/packages/source/s/sip/sip-$pkgver.tar.gz"
+builddir="$srcdir/sip-$pkgver"
+
+replaces="py-sip" # Backwards comptibility
+provides="py-sip=$pkgver-r$pkgrel" # Backwards comptibility
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/sip-*.whl
+}
+
+sha512sums="
+c884c58fc51708e2dd247453f2214e6b01d7e1a9a0166b4228feb5d996310ace2665238dde26af34907e596a0a1c710fc130ae79297f430f73f639a3eb781a50  sip-6.8.6.tar.gz
+"

backports/signal-desktop/APKBUILD

@@ -1,13 +1,12 @@
 # Contributor: lauren n. liberda <lauren@selfisekai.rocks>
 # Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
 pkgname=signal-desktop
-pkgver=7.9.0
+pkgver=7.14.0
 pkgrel=0
 pkgdesc="A messaging app for simple private communication with friends"
 url="https://github.com/signalapp/Signal-Desktop/"
 # same as electron
-# build failure
-#arch="aarch64 x86_64"
+arch="aarch64 x86_64"
 license="AGPL-3.0-only"
 depends="
 	electron
@@ -64,14 +63,14 @@ makedepends="
 options="net !check"
 
 # follow signal-desktop package.json -> @signalapp/libsignal-client
-_libsignalver=0.45.0
+_libsignalver=0.51.1
 
 # follow signal-desktop package.json -> @signalapp/ringrtc
-_ringrtcver=2.41.0
+_ringrtcver=2.44.0
 
 # follow ringrtc (on version above) -> config/version.properties -> webrtc.version
 # downloading tarball generated with abuild snapshot (with gclient dependencies fetched)
-_webrtcver=6261g
+_webrtcver=6261l
 
 # follow @signalapp/better-sqlite3 (on version in package.json) -> deps/download.js -> TOKENIZER_VERSION
 # last bsqlite version: 8.7.1
@@ -472,17 +471,17 @@ package() {
 }
 
 sha512sums="
-53ef9feccdbe1c52eee88d2e2ed337746dcaf0fd18ee0d462ba3faaef02b38e9ba7269857e975f241c719d6750ce01fc42b0d90bbd9ef7bbee14b9b4540adbb8  Signal-Desktop-7.9.0.tar.gz
-70f2cb7d05e019235cd044c401bcf072a934fdfea4a161ef5be988d2e3932ba5233110b4b06525e6f33ea9cad036def442e70adad15eab883903d9246969896e  libsignal-0.45.0.tar.gz
-3adccc33d4efa29e003175d0e00cceb169426a73f467ea32406e9cd721c72aeaa45a7816985e484b8adceb2de2a6405f306f6d609b43a25c950b18dd49a14476  ringrtc-2.41.0.tar.gz
-6dc8c709986816e724a57d056a165cf72db70644593e8de8e3026e511d1f8f3d6d5e171d500cfabe760309c5a81795b667b4399c9885be30163d326cbc82c1b4  webrtc-6261g.tar.zst
+44374149f9e0e6ebad0e8f1e6bef3fd7b5d0d8d8f28b15e25b83270164eae2175e6932fccb3de505422e656f2b55bbcbb16e488f31ba47f1c0a0e220f22085fd  Signal-Desktop-7.14.0.tar.gz
+6fb2084cff88aa18019e7117cf06ff5c29e63c1de6a31caf38c1e3f07225919ca86085c46a99b13973b3626e833fc2bb28d2134a62a1cb707e38ddae3efb295a  libsignal-0.51.1.tar.gz
+097fe40bff8165f0e0f55790556d8b08d3ed8e4fa71dfa23be5e2cd88e5deaee4ae1029e64a75b72ac942cbd414a678e6950863523709294ebe6f7c02d86fae1  ringrtc-2.44.0.tar.gz
+dc2acaf14b01821ae04d5fe578d37c09cda73191b76e94cce8c94558f944c61c95b092abf2c71a6eed1ae90ffc6990c5f258a957471e0e3981853efdb3fce18a  webrtc-6261l.tar.zst
 84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28  stokenizer-0.2.1.tar.gz
 be5b4e823543b79175a12314f10c6326d9f0d59f470136962daed4665887006acc05b48b40dc1b67747396d8f6f7d23be298c1e110ccdd35ff9b09d5e6b80bab  bettersqlite-use-system-sqlcipher.patch
-92de6fc7cc5f2b6d65bedbd74cc733dd86dafc9cbfb9b727c3267aef63a71a07247cde9b163c68fddfeb9096dcd7f554d36d0b2de078d8905e3825645ddbd6eb  libsignal-auditable.patch
+fb7c5c193eb9256ca71b260dd58eaef180f8201b2b7660d6ba1c598213cdbadda5dd56823b8ecca739267fa9eeadaec9443cc678738f496725011492ebca7438  libsignal-auditable.patch
 152435231cdcf52a17a9e24aadf95d77511258e818172941ba074a73a90a541f0136feb58868674f2bcb19191a6d12933fe6cd5baf3ee99e508915c72523163b  signal-disable-updates.patch
 d50eb5724502df9ea4d795db8cfc27af767c25168d7db2af512e615be7cc2ca290210a9ae78e1abb153c0198677e858ad3d74926c958099d0319295e7d9e7f1d  signal-update-links.patch
 646d303fe58cae3f0896ae0275a66695b902fae6ddde7c568cc9798157dee9f45ceff907bc951fadc4c511d512a73d114b4e4f7c8914e2311c63929d29e1621a  signal-show-window-please.patch
-ab51b8fdcda1d8811213d2c5d8cb5d8457b478a02e23ce40f36b38ec56d45a3bd7a2d184720c27046f98a27771551cfad93c1290fe93856cc02695d318b33e47  ringrtc-webrtc-renamed.patch
+b11fdd930943ca327650e4738ed85cd6b5eea779455a5895bccebba98e449bafc6b0f09bcf4545f2b2e16644355664e9768dd6d4d62f87619207c430367f72c5  ringrtc-webrtc-renamed.patch
 9d92389637cdda83a0a7039fa6c52516d7bc491d0b1e42d5374b9d1f4fa7b9c930642f2dca896da17a2dc3344fa1bb97434c8dddd0539a4fedfd0dec809fc875  webrtc-shared-like-my-wife.patch
 e07ae8544988d402aaf0fbd95ea36a64c94c59566c561132578aa6dcf8ff11a34058530e64dc204e5cadc2482f1401e74b32384a144e5e08017c663d0cf7c2fc  webrtc-compiler.patch
 88515d8b8cc82355c9f9b0f44fac83b7ff149b13e9fb102fd46036ec5234cfb2385fa5ad58a0520ee604b93dc4ddd6ae18a7005978ef207841645724ef7a9749  webrtc-gcc13.patch

backports/signal-desktop/libsignal-auditable.patch

@@ -1,11 +1,11 @@
 --- ./node/build_node_bridge.py.orig
 +++ ./node/build_node_bridge.py
-@@ -63,7 +63,7 @@
+@@ -67,7 +67,7 @@
+     if 'npm_config_libsignal_debug_level_logs' not in os.environ:
+         features.append('log/release_max_level_info')
  
-     out_dir = options.out_dir.strip('"') or os.path.join('build', configuration_name)
- 
--    cmdline = ['cargo', 'build', '--target', cargo_target, '-p', 'libsignal-node', '--features', 'testing-fns']
-+    cmdline = ['cargo', 'auditable', 'build', '--target', cargo_target, '-p', 'libsignal-node', '--features', 'testing-fns']
+-    cmdline = ['cargo', 'build', '--target', cargo_target, '-p', 'libsignal-node', '--features', ','.join(features)]
++    cmdline = ['cargo', 'auditable', 'build', '--target', cargo_target, '-p', 'libsignal-node', '--features', ','.join(features)]
      if configuration_name == 'Release':
          cmdline.append('--release')
      print("Running '%s'" % (' '.join(cmdline)))

backports/signal-desktop/ringrtc-webrtc-renamed.patch

@@ -1,19 +1,23 @@
 --- ./src/rust/build.rs.orig
 +++ ./src/rust/build.rs
-@@ -41,15 +41,15 @@
-     if cfg!(feature = "native") {
-         if let Ok(out_dir) = out_dir {
-             println!(
--                "cargo:rustc-link-search=native={}/{}/obj/",
-+                "cargo:rustc-link-search=native={}/{}/",
-                 out_dir, build_type,
-             );
--            println!("cargo:rerun-if-changed={}/{}/obj/", out_dir, build_type,);
-+            println!("cargo:rerun-if-changed={}/{}/", out_dir, build_type,);
-         } else {
-             println!("cargo:warning=No WebRTC output directory (OUTPUT_DIR) defined!");
-         }
+@@ -79,6 +79,7 @@
  
+     if cfg!(feature = "native") {
+         let webrtc_dir = if cfg!(feature = "prebuilt_webrtc") {
++            panic!("trying to download prebuild webrtc");
+             if let Err(e) = fs::create_dir_all(&out_dir) {
+                 panic!("Failed to create webrtc out directory: {:?}", e);
+             }
+@@ -86,12 +87,12 @@
+             // Ignore build type since we only have release prebuilts
+             format!("{}/release/obj/", out_dir)
+         } else {
+-            format!("{}/{}/obj", out_dir, build_type)
++            format!("{}/{}", out_dir, build_type)
+         };
+         println!("cargo:rerun-if-changed={}", webrtc_dir);
+         println!("cargo:rerun-if-changed={}", config_dir());
+         println!("cargo:rustc-link-search=native={}", webrtc_dir);
 -        println!("cargo:rustc-link-lib=webrtc");
 +        println!("cargo:rustc-link-lib=dylib=signaldeswebrtc");
  

unmaintained/firefly-iii-plaid-connector/APKBUILD

@@ -1,32 +1,29 @@
-# Maintainer: Antoine Martin <dev@ayakael.net>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 
 pkgname=firefly-iii-plaid-connector
 pkgver=0.3.1
-pkgrel=5
-pkgdesc='The Free Software Media System'
-arch='i686 x86_64'
-url='https://gitlab.com/GeorgeHahn/firefly-plaid-connector'
-license='MIT'
-options="!strip !check"
-#depends='firefly-iii dotnet31-runtime'
-makedepends='dotnet31-sdk'
-source="firefly-plaid-connector-$pkgver.tar.gz::https://gitlab.com/GeorgeHahn/firefly-plaid-connector/-/archive/v${pkgver}/firefly-plaid-connector-v${pkgver}.tar.gz"
-builddir="${srcdir}/firefly-plaid-connector-v${pkgver}"
+pkgrel=7
+pkgdesc="The Free Software Media System"
+#arch="x86_64"
+url="https://gitlab.com/GeorgeHahn/firefly-plaid-connector"
+license="MIT"
+options="!check"
+depends="firefly-iii dotnet6-runtime"
+makedepends="dotnet6-sdk"
+source="firefly-plaid-connector-$pkgver.tar.gz::https://gitlab.com/GeorgeHahn/firefly-plaid-connector/-/archive/v$pkgver/firefly-plaid-connector-v$pkgver.tar.gz net6-support.patch"
+builddir="$srcdir/firefly-plaid-connector-v$pkgver"
 
 build() {
-  cd "${builddir}"
-
-  # Disable dotnet telemetry
-  export DOTNET_CLI_TELEMETRY_OPTOUT=1
-
-  # publish app and libraries
-  dotnet publish --configuration Release --output "$PWD"/publish
+	dotnet publish --configuration Release --output ./publish --use-current-runtime --no-self-contained
 }
 
 package() {
-  mkdir -p "${pkgdir}"/var/lib
-  cp -r "${builddir}"/publish "$pkgdir"/var/lib/firefly-plaid-connector
-
+	mkdir -p "$pkgdir"/usr/lib
+	cp -r "$builddir"/publish "$pkgdir"/usr/lib/firefly-plaid-connector
 }
-sha512sums="57a64673bf2e8cae00cb215e1dc90eb02bddf50010835a9318f55f83313c00f19d6c8d8af65e2739b0fb6fd4522a2327941bdc7d11cbe59c9537ff6c1575765e  firefly-plaid-connector-0.3.1.tar.gz"
 
+sha512sums="
+57a64673bf2e8cae00cb215e1dc90eb02bddf50010835a9318f55f83313c00f19d6c8d8af65e2739b0fb6fd4522a2327941bdc7d11cbe59c9537ff6c1575765e  firefly-plaid-connector-0.3.1.tar.gz
+f795fe58659763082e3f2bba0e6e2a70c4732bc6b402a4e586104bf09525ffca1d3586acda43ccba3b71d15e1a0a62794574f72a2fc6cd3d1905dcb2e8782dc2  net6-support.patch
+"

user/authentik/APKBUILD

@@ -1,8 +1,8 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=authentik
-pkgver=2024.4.2
-pkgrel=0
+pkgver=2024.4.3
+pkgrel=1
 pkgdesc="An open-source Identity Provider focused on flexibility and versatility"
 url="https://github.com/goauthentik/authentik"
 # s390x: missing py3-celery py3-flower and py3-kombu
@@ -60,8 +60,10 @@ depends="
 	py3-django-otp
 	py3-django-prometheus
 	py3-django-redis
-	py3-django-rest-framework
+	py3-django-rest-framework~=3.14.0
 	py3-django-rest-framework-guardian
+	py3-django-storages
+	py3-django-tenants
 	py3-docker-py
 	py3-dotenv
 	py3-dumb-init
@@ -69,6 +71,7 @@ depends="
 	py3-drf-spectacular
 	py3-email-validator
 	py3-facebook-sdk
+	py3-fido2
 	py3-flower
 	py3-frozenlist
 	py3-geoip2
@@ -101,7 +104,6 @@ depends="
 	py3-prompt_toolkit
 	py3-psycopg
 	py3-psycopg-c
-	py3-pycryptodome
 	py3-pydantic-scim
 	py3-pynacl
 	py3-pyrsistent
@@ -110,6 +112,8 @@ depends="
 	py3-requests
 	py3-requests-oauthlib
 	py3-rsa
+	py3-scim2-filter-parser
+	py3-setproctitle
 	py3-sentry-sdk
 	py3-service_identity
 	py3-setuptools
@@ -122,6 +126,7 @@ depends="
 	py3-twilio
 	py3-twisted
 	py3-txaio
+	py3-tenant-schemas-celery
 	py3-typing-extensions
 	py3-tz
 	py3-ua-parser
@@ -158,6 +163,7 @@ source="
 	authentik-ldap.openrc
 	authentik-ldap.conf
 	authentik-manage.sh
+	fix-ak-bash.patch
 	root-settings-csrf_trusted_origins.patch
 	"
 builddir="$srcdir/"authentik-version-$pkgver
@@ -225,6 +231,11 @@ package() {
 	install -Dm640 "$builddir"/authentik/lib/default.yml \
 		"$pkgdir"/etc/authentik/config.yml
 	chown root:www-data "$pkgdir"/etc/authentik/config.yml
+
+	mv "$pkgdir"/usr/share/webapps/authentik/web/dist/custom.css "$pkgdir"/etc/authentik/custom.css
+	ln -s "/etc/authentik/custom.css" "$pkgdir"/usr/share/webapps/authentik/web/dist/custom.css
+	chown root:www-data "$pkgdir"/etc/authentik/custom.css
+
 	sed -i 's|cert_discovery_dir.*|cert_discovery_dir: /var/lib/authentik/certs|' "$pkgdir"/etc/authentik/config.yml
 	sed -i 's|blueprints_dir.*|blueprints_dir: /var/lib/authentik/blueprints|' "$pkgdir"/etc/authentik/config.yml
 	sed -i 's|template_dir.*|template_dir: /var/lib/authentik/templates|' "$pkgdir"/etc/authentik/config.yml
@@ -236,11 +247,12 @@ package() {
 }
 
 sha512sums="
-58642829e320b1480706363712a73c82e55f79ed6451d5db82482c51b9c1ee13b9999caf152da0944ca277344d38c99a5636a7e9e718f858ca558f17ae9da104  authentik-2024.4.2.tar.gz
+121ed925d81a5cb2a14fed8ec8b324352e40b1fcbba83573bfdc1d1f66a91d9670cd64d7ef752c8a2df6c34fc3e19e8aec5c6752d33e87b487a462a590212ab0  authentik-2024.4.3.tar.gz
 4defb4fe3a4230f4aa517fbecd5e5b8bcef2a64e1b40615660ae9eec33597310a09df5e126f4d39ce7764bd1716c0a7040637699135c103cbc1879593c6c06f1  authentik.openrc
-5d7f28bf5a9f358a0fc3634b2bac6d070c276c3f8181d26fa7e94a17503a4d54556bf7c3207ccd6cb924b81754ed965795d5e2a8aa1af409fd9e32d390ec4cf5  authentik-worker.openrc
+6cb03b9b69df39bb4539fe05c966536314d766b2e9307a92d87070ba5f5b7e7ab70f1b5ee1ab3c0c50c23454f9c5a4caec29e63fdf411bbb7a124ad687569b89  authentik-worker.openrc
 351e6920d987861f8bf0d7ab2f942db716a8dbdad1f690ac662a6ef29ac0fd46cf817cf557de08f1c024703503d36bc8b46f0d9eb1ecaeb399dce4c3bb527d17  authentik-ldap.openrc
 89ee5f0ffdade1c153f3a56ff75b25a7104aa81d8c7a97802a8f4b0eab34850cee39f874dabe0f3c6da3f71d6a0f938f5e8904169e8cdd34d407c8984adee6b0  authentik-ldap.conf
-d2df285e09d05bb78b17cdbf156cb19883764d0ae61d4c8faed599c015277b75c3f51e5fcb35e01fc25d5847f667ff2089d5e6c48b85a3a6b4523278b2eea89d  authentik-manage.sh
-a50ceddb239851d869212cd5064df117ab977d0e01bf0bc5fa7b5fa6e6428a4af59f802ca223a7e840753f86bfdb0df17d330f9ba4cbaa30a167f51d8aecb9bd  root-settings-csrf_trusted_origins.patch
+f1a3cb215b6210fa7d857a452a9f2bc4dc0520e49b9fa7027547cff093d740a7e2548f1bf1f8831f7d5ccb80c8e523ee0c8bafcc4dc42d2788725f2137d21bee  authentik-manage.sh
+3e47db684a3f353dcecdb7bab8836b9d5198766735d77f676a51d952141a0cf9903fcb92e6306c48d2522d7a1f3028b37247fdc1dc74d4d6e043da7eb4f36d49  fix-ak-bash.patch
+5c60e54b6a7829d611af66f5cb8184a002b5ae927efbd024c054a7c176fcb9efcfbe5685279ffcf0390b0f0abb3bb03e02782c6867c2b38d1ad2d508aae83fa0  root-settings-csrf_trusted_origins.patch
 "

user/authentik/authentik-manage.sh

@@ -1,4 +1,3 @@
-
 #!/bin/sh
 
 BUNDLE_DIR='/usr/share/webapps/authentik'

user/authentik/authentik-worker.openrc

@@ -4,8 +4,8 @@ name="$RC_SVCNAME"
 cfgfile="/etc/conf.d/$RC_SVCNAME.conf"
 pidfile="/run/$RC_SVCNAME.pid"
 working_directory="/usr/share/webapps/authentik"
-command="celery"
-command_args="-A authentik.root.celery worker -Ofair --max-tasks-per-child=1 --autoscale 3,1 -E -B -s /tmp/celerybeat-schedule -Q authentik,authentik_scheduled,authentik_events"
+command="/usr/bin/authentik-manage"
+command_args="worker"
 command_user="authentik"
 command_group="authentik"
 start_stop_daemon_args=""

user/authentik/fix-ak-bash.patch

@@ -0,0 +1,10 @@
+diff --git a/lifecycle/ak.orig b/lifecycle/ak
+index 615bfe9..1646274 100755
+--- a/lifecycle/ak.orig
++++ b/lifecycle/ak
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env -S bash -e
++#!/usr/bin/env bash
+ MODE_FILE="${TMPDIR}/authentik-mode"
+ 
+ function log {

user/authentik/root-settings-csrf_trusted_origins.patch

@@ -1,8 +1,8 @@
-diff --git a/authentik/root/settings.py.orig b/authentik/root/settings.py
-index ebfc471..ce1ef3b 100644
---- a/authentik/root/settings.py.orig
+diff --git a/authentik/root/settings.py b/authentik/root/settings.py
+index 15e689b06..8b0c1d744 100644
+--- a/authentik/root/settings.py
 +++ b/authentik/root/settings.py
-@@ -56,6 +56,7 @@ AUTH_USER_MODEL = "authentik_core.User"
+@@ -33,6 +33,7 @@ AUTH_USER_MODEL = "authentik_core.User"
  
  CSRF_COOKIE_NAME = "authentik_csrf"
  CSRF_HEADER_NAME = "HTTP_X_AUTHENTIK_CSRF"

user/firefly-iii-plaid-connector/APKBUILD

@@ -1,29 +0,0 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-
-pkgname=firefly-iii-plaid-connector
-pkgver=0.3.1
-pkgrel=7
-pkgdesc="The Free Software Media System"
-#arch="x86_64"
-url="https://gitlab.com/GeorgeHahn/firefly-plaid-connector"
-license="MIT"
-options="!check"
-depends="firefly-iii dotnet6-runtime"
-makedepends="dotnet6-sdk"
-source="firefly-plaid-connector-$pkgver.tar.gz::https://gitlab.com/GeorgeHahn/firefly-plaid-connector/-/archive/v$pkgver/firefly-plaid-connector-v$pkgver.tar.gz net6-support.patch"
-builddir="$srcdir/firefly-plaid-connector-v$pkgver"
-
-build() {
-	dotnet publish --configuration Release --output ./publish --use-current-runtime --no-self-contained
-}
-
-package() {
-	mkdir -p "$pkgdir"/usr/lib
-	cp -r "$builddir"/publish "$pkgdir"/usr/lib/firefly-plaid-connector
-}
-
-sha512sums="
-57a64673bf2e8cae00cb215e1dc90eb02bddf50010835a9318f55f83313c00f19d6c8d8af65e2739b0fb6fd4522a2327941bdc7d11cbe59c9537ff6c1575765e  firefly-plaid-connector-0.3.1.tar.gz
-f795fe58659763082e3f2bba0e6e2a70c4732bc6b402a4e586104bf09525ffca1d3586acda43ccba3b71d15e1a0a62794574f72a2fc6cd3d1905dcb2e8782dc2  net6-support.patch
-"

user/firefly-iii/APKBUILD

@@ -5,11 +5,11 @@ pkgname=firefly-iii
 pkgver=5.7.18
 pkgrel=0
 pkgdesc="PHP personal finances manager"
-#arch="noarch"
+arch="noarch"
 url="https://github.com/firefly-iii/firefly-iii"
 license="AGPL-3.0-only"
 options="!check" # No testsuite
-_php=php82
+_php=php83
 _php_mods="-intl -curl -bcmath -zip -gd -xml -mbstring -ldap -session -fileinfo -simplexml -sodium -tokenizer -xmlwriter -dom -pdo"
 depends="$_php ${_php_mods//-/$_php-}"
 makedepends="composer"

user/gitaly/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=gitaly
-pkgver=16.9.3
+pkgver=17.0.3
 pkgrel=0
 pkgdesc="A Git RPC service for handling all the git calls made by GitLab"
 url="https://gitlab.com/gitlab-org/gitaly/"
@@ -80,7 +80,7 @@ praefect() {
 }
 
 sha512sums="
-c3784b7fb692d2e57a484b3a33b719de76d3ee8bfabc95919e7dabd89f5429f06000c615e433c99f18c1a6706ecd389dcf15d55a59ed546f62c10b585e20ad7b  gitaly-v16.9.3.tar.gz
+7f5a302dd505e2917f32c319df77fedc4ad50fdd6c61f99777a1ca1c50b7984572de0a0272c7d42922e8c4064ee524c3fca7e48c22a6d833992d0db468e7b094  gitaly-v17.0.3.tar.gz
 7685330e637c3a34db941c9e6b8776d0611ec16297e8be998a3eb4716c455d9f015d433a4d27720c24e520d489dd56bdab7c0e4264f2852b4b0bfd6ecaa7f773  config.patch
 c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122  gitaly.initd
 "

user/gitlab-foss/APKBUILD

@@ -3,12 +3,12 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=gitlab-foss
 _pkgname=${pkgname%-foss}
-pkgver=16.9.3
+pkgver=17.0.3
 _gittag=v$pkgver
 pkgrel=0
 pkgdesc="A version control for your server"
 url="https://gitlab.com/gitlab-org/gitlab-foss"
-#arch="x86_64 aarch64"
+arch="x86_64 aarch64"
 license="MIT"
 # ruby-irb is needed only for Rails console (gitlab-rails console)
 depends="
@@ -17,8 +17,8 @@ depends="
 	cmd:dpkg-deb
 	exiftool
 	git>=2.42.0
-	gitaly~=16.9
-	gitlab-shell~=14.34
+	gitaly~=17.0
+	gitlab-shell>=14.35
 	graphicsmagick
 	http-parser
 	procps
@@ -59,8 +59,6 @@ makedepends="
 	protobuf-dev
 	re2-dev
 	ruby3.2-dev
-	ruby3.2-grpc~=1.58
-	ruby3.2-rugged
 	rust
 	yarn>=1.2.0
 	"
@@ -78,7 +76,7 @@ source="https://gitlab.com/gitlab-org/gitlab-foss/-/archive/$_gittag/gitlab-foss
 	$_pkgname.confd
 	$_pkgname.logrotate
 	bin-wrapper.in
-	downgrade-sys-filesystem-depend.patch
+	upgrade-sys-filesystem-depend.patch
 	"
 builddir="$srcdir/gitlab-foss-$_gittag"
 
@@ -91,8 +89,6 @@ export BUNDLE_FROZEN=true
 export BUNDLE_JOBS=1
 
 prepare() {
-	local sysgemdir=$(ruby -e 'puts Gem.default_dir')
-
 	default_prepare
 
 	# The default log level is very chatty.
@@ -108,17 +104,6 @@ prepare() {
 
 	# Allow use of any bundler
 	sed -i -e '/BUNDLED/,+1d' Gemfile.lock
-
-	# Some gems are broken, so we copy our fixed version
-	# instead of installing it from RubyGems using Bundler.
-	for i in grpc rugged; do
-		mkdir -p vendor/gems/$i/src/ruby/lib/$i
-		cp -r "$sysgemdir"/gems/$i-*/* vendor/gems/$i/
-		cp "$sysgemdir"/specifications/$i-*.gemspec \
-			vendor/gems/$i/$i.gemspec
-		cp "$sysgemdir"/extensions/*/*/$i-*/$i/*.so \
-			vendor/gems/$i/src/ruby/lib/$i/
-	done
 }
 
 build() {
@@ -154,9 +139,6 @@ build() {
 	# Remove faulty RPATH.
 	chrpath -d vendor/bundle/ruby/*/extensions/*/*/ruby-magic-*/magic/magic.so
 
-	# cp grpc lib
-	cp vendor/gems/grpc/src/ruby/lib/grpc/grpc_c.so vendor/bundle/ruby/*/gems/grpc-*/src/ruby/lib/grpc/grpc_c.so
-
 	# Patch installed gem gitlab-markup to use python3.
 	# Option "-S" causes that Python cannot find docutils module.
 	sed -i 's/python2 -S/python3/g' \
@@ -239,10 +221,7 @@ package() {
 		"$datadir"/packages \
 		"$datadir"/pages \
 		"$datadir"/terraform_state \
-		"$datadir"/uploads \
-		"$pkgdir"/var/tmp/gitlab \
-		"$pkgdir"/var/tmp/gitlab/downloads \
-		"$pkgdir"/var/tmp/gitlab/backups
+		"$datadir"/uploads
 
 	install -d -m0750 -o git -g www-data \
 		"$datadir"/pages
@@ -382,15 +361,15 @@ assets() {
 }
 
 sha512sums="
-d17ff841977d157965337774ac8ebed409e058bb1617d3fadeb8330d46efe32a091483ba30955c883e654b138d9a3ae7740a528418cd30eb1ed18cced508ddb8  gitlab-foss-v16.9.3.tar.gz
+38678e8d6c42673ecd983db28d32e322958c3cf366756b847d729609a5eb13602cfedbbf003953adeb7b8d566ad3431e29d5081089f1fac7813afb3499b7800b  gitlab-foss-v17.0.3.tar.gz
 daa496f3d9146f9dbddff62477bf49d5c7bd2f2a4cdbadc70ee51c8230f3ef01dc950ef157154b31c7e7bef0beecc5cbac50fbac65a79d6d9099b27bcba8b2ab  database-config.patch
 55b0667d3969113ffd6860652ee8bdb9a534c25f413f33b2739e922c886988e7cea72c1c00c7eecf29fcff3682b1324156365605ffc6aae45d1e0ccddf96288b  gitlab.initd
 1f451b67a5d5e58650b0fe862a2b65cfb8bff5502b37d94ae90619c1ff9affbecf24428303a2849bebce5f94bef37078f0e5710e344bbab616134e910938384a  gitlab.mailroom.initd
-b6a6d9ba20557e61efa24f2d5a489873fefbb981f7d4465794a857b2971263c08ec29cc001c372522cdc0d48245e59751307c9f44f6ef4d87bf2e3ec5c23fb1c  gitlab.rails.initd
+d8cdeb54c46f8204936bf5750833649e4586d3dd1942eed45955ed1661ae5f5080f59184fcb59a8f73c1405faccbf02b3db3d2c12fc2a4a81424cd35ce390768  gitlab.rails.initd
 cb4ec100f0ea7ffcbb37aead8423e636629e2f4848b2974a7b2468e96cb1081ca732ac336417b08dd943afb961df888c73af1334dcbe054dfd361e74f492fd86  gitlab.sidekiq.initd
 85c4e257a030832bd70ad1e257ae7cb568b31e01201fc845abac02d00f02492ca694be1fa2bf743dd8c8623e6a79d36adee3f4de02040134c11158a6001c064b  gitlab.workhorse.initd
 4dc00b16462f30591297fcb535fc364185d3ed76e9956597f0423a8dfd8a9a351f6ac29d9f0c73052c11324fba4768eb89a21c6bef4da99f15baaea8c9ab8407  gitlab.confd
 57f258246925fbef0780caebdf005983c72fe3db1ab3242a1e00137bd322f5ec6c0fd958db7178b8fc22103d071f550d6f71f08422bcd9e859d2a734b2ecef00  gitlab.logrotate
 a944c3886388ba1574bf8c96b6de4d9f24ef4a83f553c31a224e17a3b01f2a5c65b60c59b7ed7ca4b25670c60ea8dd41b96a8a623d909d2bb09bdf2520ed7f23  bin-wrapper.in
-ab9a09fca6126b18b76e61380990dc217f915162985880e90b905b3210a1fef229af3db1f1ca180177d3cba91ab5fe33798ac685055abf0adc44a1b630f71b39  downgrade-sys-filesystem-depend.patch
+0eaa7de9a906ddb0fe84b7afbaec893a134bbbdb9e71da75cf4095ef40404643e51447aee88d3cad6e565bc709b34ffd8901cc93061e4a2a410838aed42d3644  upgrade-sys-filesystem-depend.patch
 "

user/gitlab-foss/gitlab.rails.initd

@@ -77,6 +77,11 @@ start_pre() {
 	if [ -n "$downloads_path" ]; then
 		checkpath -d -m 700 -o $command_user -q "$downloads_path"
 	fi
+
+	checkpath --directory --owner $command_user --mode 0775 \
+		/var/tmp/gitlab/downloads \
+		/var/tmp/gitlab/backups
+
 }
 
 reload() {

user/gitlab-foss/upgrade-sys-filesystem-depend.patch

@@ -7,31 +7,29 @@ index c1e9e34..a4448b7 100644
  # System information
  gem 'vmstat', '~> 2.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
 -gem 'sys-filesystem', '~> 1.4.3' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'sys-filesystem', '= 1.3.2' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'sys-filesystem', '~> 1.4.5' # rubocop:todo Gemfile/MissingFeatureCategory
  
  # NTP client
  gem 'net-ntp' # rubocop:todo Gemfile/MissingFeatureCategory
 diff --git a/Gemfile.lock.orig b/Gemfile.lock
-index e2ebb91..39b6df3 100644
+index bb66169..a4da10b 100644
 --- a/Gemfile.lock.orig
 +++ b/Gemfile.lock
-@@ -1605,8 +1605,8 @@ GEM
+@@ -1657,7 +1657,7 @@ GEM
        attr_required (>= 0.0.5)
        httpclient (>= 2.4)
      sync (0.5.0)
 -    sys-filesystem (1.4.3)
--      ffi (~> 1.1)
-+    sys-filesystem (1.3.2)
-+      ffi (>= 0)
++    sys-filesystem (1.4.5)
+       ffi (~> 1.1)
      sysexits (1.2.0)
      table_print (1.5.7)
-     tanuki_emoji (0.9.0)
-@@ -2061,7 +2059,7 @@ DEPENDENCIES
-   ssh_data (~> 1.3)
+@@ -2123,7 +2123,7 @@ DEPENDENCIES
    stackprof (~> 0.2.25)
    state_machines-activerecord (~> 0.8.0)
+   static_holmes (~> 0.7.7)
 -  sys-filesystem (~> 1.4.3)
-+  sys-filesystem (= 1.3.2)
++  sys-filesystem (~> 1.4.5)
    tanuki_emoji (~> 0.9)
    telesignenterprise (~> 2.2)
    terser (= 1.0.2)

user/gitlab-pages/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=gitlab-pages
-pkgver=16.9.3
+pkgver=17.0.3
 _gittag="v$pkgver"
 pkgrel=0
 pkgdesc="A daemon used to serve static websites for GitLab users"
@@ -29,7 +29,7 @@ package() {
 }
 
 sha512sums="
-5a97176d820f787b96cac54dc040a0232c6b0e8a98f7e737af2f5c9a0cff10ce79263a35fdf560c58eb84eaaf1ed109a75121b050f059b4bdf493d05b58861bc  gitlab-pages-v16.9.3.tar.gz
+58f5c5864f79d9edec07760b9ca209a7f56ced4be7194ef1cd52ac8274baf978205612b29f031e6e362b2c8baf693a35be5adf05bbd799643fa12ef521cc6fc2  gitlab-pages-v17.0.3.tar.gz
 710a9b652327e57e620c2bdb02bf912a6f61044eaaf61d36c6612284e9b951d2ac6f5eef77dfea16a0cde328bd4c556d9e47791c560139c27cb9659076f809b1  ungit-makefile.patch
 20bc66c1c3548568ed353ca8d584f9108b9688f9375f212a18efc7b8386fdaafb3b2dc9e865f21c7f8fd31ada6e91842a8bb8d397f64851d853bb0de3e0e60bb  gitlab-pages.initd
 "

user/gitlab-shell/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=gitlab-shell
-pkgver=14.34.0
+pkgver=14.36.0
 pkgrel=0
 pkgdesc="GitLab Shell handles git SSH sessions for GitLab"
 url="https://gitlab.com/gitlab-org/gitlab-shell"
@@ -59,8 +59,8 @@ package() {
 }
 
 sha512sums="
-703685c8aae6498ad42103a70a65e18b4d2a617687a5488a52bf4c8147cd56a724a109ea27456ca93a723b458499ab09590ad5d1591eb5d3c38d8d33870736eb  gitlab-shell-v14.34.0.tar.gz
-5123f639de976b83a961f5d0a9f53b0ff7559ceb4e73b25a8029423932ba6249c430b8bb04dae4dce2e13330e95d4a7a88e63376ead2d6369f6adb264fd36d49  config.patch
+6b302be3630e60e3c9f76e58c61674bf08c3fe1395c9af5f354b9a557ecd1ddb43d27c9a995f868c4e4e2e734dd424a37c73e78d26b00f1f6a78f8670b45c371  gitlab-shell-v14.36.0.tar.gz
+e9dd69c57c65197493f75bdde682075c6ab22892ed07d37c7a73129fb42a8349a676d5986bfd17f1df331645334248383845f21ce08d1e9664c38e4bbf5343ba  config.patch
 499b3a46ea94a33a23b01f6a7509d74f5a6781b930619b3b8ae42bdeae8a052cc636578744d7992b4ae4f9b9f72b11ee3d3c0f5e50986fa3f7e35b979b08aada  change-config-path.patch
 c53da7f145593693392d9fa880ad5a1909bfc7504fd1c93d94a468c3e0f5cc80f712f41ee1dc8bf38105b410c1165658f208bd88a70c4674104c78af33d8d09c  gitconfig
 "

user/gitlab-shell/config.patch

@@ -1,5 +1,5 @@
 diff --git a/config.yml.example.orig b/config.yml.example
-index 13850e6..98eb0e3 100644
+index fb147c4..98eb0e3 100644
 --- a/config.yml.example.orig
 +++ b/config.yml.example
 @@ -13,7 +13,7 @@ user: git
@@ -47,7 +47,7 @@ index 13850e6..98eb0e3 100644
  
  # Audit usernames.
  # Set to true to see real usernames in the logs instead of key ids, which is easier to follow, but
-@@ -62,60 +62,6 @@ audit_usernames: false
+@@ -62,62 +62,6 @@ audit_usernames: false
  # For more details, visit https://docs.gitlab.com/ee/development/distributed_tracing.html
  # gitlab_tracing: opentracing://driver
  
@@ -87,6 +87,8 @@ index 13850e6..98eb0e3 100644
 -  kex_algorithms: [curve25519-sha256, curve25519-sha256@libssh.org, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, diffie-hellman-group14-sha256, diffie-hellman-group14-sha1]
 -  # Specified the ciphers allowed
 -  ciphers: [aes128-gcm@openssh.com, chacha20-poly1305@openssh.com, aes256-gcm@openssh.com, aes128-ctr, aes192-ctr,aes256-ctr]
+-  # Specified the available Public Key algorithms
+-  public_key_algorithms: [ssh-rsa, ssh-dss, ecdsa-sha2-nistp256, sk-ecdsa-sha2-nistp256@openssh.com, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521, ssh-ed25519, sk-ssh-ed25519@openssh.com, rsa-sha2-256, rsa-sha2-512]
 -  # SSH host key files.
 -  host_key_files:
 -    - /run/secrets/ssh-hostkeys/ssh_host_rsa_key

user/mastodon/APKBUILD

@@ -2,11 +2,11 @@
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=mastodon
 _pkgname=$pkgname
-pkgver=4.2.8
+pkgver=4.2.10
 _gittag=v$pkgver
 pkgrel=1
 pkgdesc="Self-hosted social media and network server based on ActivityPub and OStatus"
-#arch="x86_64"
+arch="x86_64"
 url="https://github.com/mastodon/mastodon"
 license="AGPL-3.0-only"
 depends="
@@ -192,11 +192,11 @@ assets() {
 }
 
 sha512sums="
-c48a04df9c59518f7325b8119bf943436e29ccbfaecff3f7b96162e77fa2012df3f5d4e92e209e233ca7c4646205f5e34bf5f7d22b973115b8e16b3b5ada1fb0  mastodon-v4.2.8.tar.gz
-36604cd630f0f5b4d88b630b1512cd26e922f859e5d19cbb85106ff29fc9048d2349f926d5c4b6947c655f67e60ec33e2f524a8154405a4369f283e00be7cdce  mastodon.initd
-9e77061fbdebe90492398f8089a7d2612ff4b6e70b5462dd67330b66d9788cb0133eab38c372b1f27a7214aacdd9f7f70381d4ecc6e92c8c38d794404ae0f840  mastodon.web.initd
-6dacafca86dd39f6a6efa773cfe35b4632098175605a7c64488027237b01028d9785e50a3a0532b88ebf8f857c9a594c7b68f9e577b46e95104e7cffde51ccf8  mastodon.sidekiq.initd
-63b67ec16107e4d1747ae956cdd41edd03be71da1ed96d21a18710cbba69ce37c856f4abc080a61f172a10859d0b9a33ba9290fc69213e1bc15a1ce8f8d40108  mastodon.streaming.initd
+1fe5417136bc020a83b83eaccef7f1f46c13fc8318681f12ba556b1b6b03e25ef7b6335c28f4e6722101e97b63020cbd0d3fbacdaf9b3b5a4b73c3cf3e230813  mastodon-v4.2.10.tar.gz
+d49fea9451c97ccefe5e35b68e4274aeb427f9d1e910b89c1f6c810489c3bec1ccff72952fdaef95abf944b8aff0da84a52347540d36ff1fba5ccc19e1d935c6  mastodon.initd
+eefe12a31268245f802222c0001dac884e03adb0d301e53a1512a3cd204836ca03ad083908cd14d146cf0dce99e3a4366570efd0e40a9a490ccd381d4c63c32f  mastodon.web.initd
+8fc9249c01693bb02b8d1a6177288d5d3549addde8c03eb35cc7a32dde669171872ebc2b5deb8019dc7a12970098f1af707171fa41129be31b04e1dc1651a777  mastodon.sidekiq.initd
+03433a2f58600ca0d58e7c3713df2146ccdfc92033ccfe801dbd38bac39b66d6297f2b5ca02300caa36455b484eab2caa68c912c2f72150203bfa0e106c375fc  mastodon.streaming.initd
 83b3bae5b6fdb4d0dbc1cbe546c62c0aa77397b97d1a5d5377af032466677de188065b556710c0d96576bbae89cc76800f1ffb8cd718155eb2784da818f27619  mastodon.logrotate
 dfd0e43ac6c28387bd4aa57fd98ae41aeb5a098b6deb3e44b89f07818e2470773b025364afee7ef6fd0f664cb86bbbbe8796c9f222f5436c256a787282fbe3e1  bin-wrapper.in
 "

user/mastodon/mastodon.initd

@@ -6,6 +6,7 @@ description="Meta script for starting/stopping all the Mastodon components"
 subservices="mastodon.sidekiq mastodon.streaming mastodon.web"
 
 depend() {
+	need redis postgresql
 	use net
 }
 

user/mastodon/mastodon.sidekiq.initd

@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 
 name="Mastodon background workers Service"
-root="/usr/share/webapps/mastodon"
+root="/usr/lib/bundles/mastodon"
 pidfile="/run/mastodon-sidekiq.pid"
 logfile="/var/log/mastodon/sidekiq.log"
 

user/mastodon/mastodon.streaming.initd

@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 
 name="Mastodon streaming API service"
-root="/usr/share/webapps/mastodon"
+root="/usr/lib/bundles/mastodon"
 pidfile="/run/mastodon-streaming.pid"
 logfile="/var/log/mastodon/streaming.log"
 

user/mastodon/mastodon.web.initd

@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 
 name="Mastodon Web Service"
-root="/usr/share/webapps/mastodon"
+root="/usr/lib/bundles/mastodon"
 pidfile="/run/mastodon-web.pid"
 logfile="/var/log/mastodon/web.log"
 

user/peertube/APKBUILD

@@ -4,7 +4,7 @@ pkgname=peertube
 pkgver=6.0.2
 pkgrel=0
 pkgdesc="ActivityPub-federated video streaming platform using P2P directly in your web browser"
-#arch="x86_64"
+arch="x86_64"
 url="https://joinpeertube.org/"
 license="AGPL"
 depends="

user/php82-pecl-inotify/APKBUILD

@@ -4,7 +4,7 @@ pkgname=php82-pecl-inotify
 _extname=inotify
 pkgver=3.0.0
 pkgrel=0
-pkgdesc="Inotify bindings for PHP 8.2"
+pkgdesc="Inotify bindings for PHP 8.3"
 url="https://pecl.php.net/package/inotify"
 arch="all"
 license="PHP-3.01"
@@ -30,4 +30,6 @@ package() {
 	echo "extension=$_extname" > $_confdir/70_$_extname.ini
 }
 
-sha512sums="f8b29f8611f16b92136ab8de89181c254bba1abee1e61cac2344440567a3155aae4b9b54b10fdb1b0254fd7a96da8c14b7dc5c9f7f08a03db30ab1645aca1eee  php-pecl-inotify-3.0.0.tgz"
+sha512sums="
+f8b29f8611f16b92136ab8de89181c254bba1abee1e61cac2344440567a3155aae4b9b54b10fdb1b0254fd7a96da8c14b7dc5c9f7f08a03db30ab1645aca1eee  php-pecl-inotify-3.0.0.tgz
+"

user/php83-pecl-inotify/APKBUILD

@@ -0,0 +1,35 @@
+# Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
+# Maintainer: Andy Postnikov <apostnikov@gmail.com>
+pkgname=php83-pecl-inotify
+_extname=inotify
+pkgver=3.0.0
+pkgrel=0
+pkgdesc="Inotify bindings for PHP 8.3"
+url="https://pecl.php.net/package/inotify"
+arch="all"
+license="PHP-3.01"
+depends="php83-common"
+makedepends="php83-dev"
+source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
+builddir="$srcdir"/$_extname-$pkgver
+
+build() {
+	phpize83
+	./configure --prefix=/usr --with-php-config=php-config83
+	make
+}
+
+check() {
+	make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 test
+}
+
+package() {
+	make INSTALL_ROOT="$pkgdir" install
+	local _confdir="$pkgdir"/etc/php83/conf.d
+	install -d $_confdir
+	echo "extension=$_extname" > $_confdir/70_$_extname.ini
+}
+
+sha512sums="
+f8b29f8611f16b92136ab8de89181c254bba1abee1e61cac2344440567a3155aae4b9b54b10fdb1b0254fd7a96da8c14b7dc5c9f7f08a03db30ab1645aca1eee  php-pecl-inotify-3.0.0.tgz
+"

user/py3-django-rest-framework/APKBUILD

@@ -0,0 +1,59 @@
+# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
+# Contributor: Justin Berthault <justin.berthault@zaclys.net>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+pkgname=py3-django-rest-framework
+_pkgname=django-rest-framework
+pkgver=3.14.0
+pkgrel=0
+pkgdesc="Web APIs for Django"
+url="https://github.com/encode/django-rest-framework"
+arch="noarch"
+license="Custom"
+depends="
+	py3-django
+	py3-tz
+"
+makedepends="
+	py3-setuptools
+	py3-gpep517
+	py3-wheel
+"
+checkdepends="
+	py3-pytest-django
+	py3-pytest-cov
+	py3-core-api
+	py3-jinja2
+	py3-uritemplate
+	py3-django-guardian
+	py3-psycopg2
+	py3-markdown
+	py3-yaml
+	py3-inflection
+"
+subpackages="$pkgname-pyc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/encode/$_pkgname/archive/$pkgver.tar.gz"
+options="!check" # Failing tests
+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 "$builddir"/.dist/*.whl
+	# test_urlpatterns: AssertionError: assert [<URLPattern ''>] is not [<URLPattern ''>]
+	# test_markdown: rather hard to decipher assertion error
+	.testenv/bin/python3 -m pytest -v -k 'not test_urlpatterns and not test_markdown'
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+c1012c656b427e0318b2056e2f984ddc75a5b4e85f375c76fba165ad06e285848eee1bc6dc76c097daec57d780efb2551110199d62ce636a03951aec13ab4013  py3-django-rest-framework-3.14.0.tar.gz
+"

user/py3-django-tenants/APKBUILD

@@ -0,0 +1,43 @@
+# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+pkgname=py3-django-tenants
+#_pkgreal is used by apkbuild-pypi to find modules at PyPI
+_pkgreal=django-tenants
+pkgver=3.6.1
+pkgrel=0
+pkgdesc="Tenant support for Django using PostgreSQL schemas."
+url="https://pypi.python.org/project/django-tenants"
+arch="noarch"
+license="KIT"
+depends="py3-django py3-psycopg py3-gunicorn py3-coverage"
+checkdepends="python3-dev py3-pytest"
+makedepends="py3-setuptools py3-gpep517 py3-wheel"
+source="
+	$pkgname-$pkgver.tar.gz::https://codeload.github.com/django-tenants/django-tenants/tar.gz/refs/tags/v$pkgver
+	997_update-from-pgclone-schema.patch
+	"
+builddir="$srcdir/$_pkgreal-$pkgver"
+options="!check" # Requires setting up test database
+subpackages="$pkgname-pyc"
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	DJANGO_SETTINGS_MODULE=tests.settings .testenv/bin/python3 -m pytest -v
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+b18afce81ccc89e49fcc4ebe85d90be602415ca898c1660a4e71e2bef6a3ed2e8c724e94b61d8c6f48f3fb19eb2a87d6a6f5bbf449b3e2f661f87e4b5638eafb  py3-django-tenants-3.6.1.tar.gz
+f2424bb188db2e3c7d13c15e5bdf0959c6f794e68dbc677c8b876d4faa321f78aded5565539f1bfd97583c6df0fcc19ec05abe203b08407e4446dd7194756825  997_update-from-pgclone-schema.patch
+"

user/py3-scim2-filter-parser/APKBUILD

@@ -0,0 +1,38 @@
+# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+pkgname=py3-scim2-filter-parser
+#_pkgreal is used by apkbuild-pypi to find modules at PyPI
+_pkgreal=scim2-filter-parser
+pkgver=0.5.0
+pkgrel=0
+pkgdesc="A customizable parser/transpiler for SCIM2.0 filters"
+url="https://pypi.python.org/project/scim2-filter-parser"
+arch="noarch"
+license="MIT"
+depends="py3-django py3-sly"
+checkdepends="py3-pytest"
+makedepends="py3-setuptools py3-gpep517 py3-wheel poetry"
+source="$pkgname-$pkgver.tar.gz::https://github.com/15five/scim2-filter-parser/archive/refs/tags/$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+subpackages="$pkgname-pyc"
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest -v
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+5347852af6b82a764a32bc491a7e0f05f06b4f4d93dfa375668b5ca1a15ee58f488702536e350100fe5c96a5c94c492ea8cbd0e1952c5920d5a10e1453357f8c  py3-scim2-filter-parser-0.5.0.tar.gz
+"

user/py3-tenant-schemas-celery/APKBUILD

@@ -0,0 +1,41 @@
+# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+pkgname=py3-tenant-schemas-celery
+#_pkgreal is used by apkbuild-pypi to find modules at PyPI
+_pkgreal=tenant-schemas-celery
+pkgver=2.2.0
+pkgrel=0
+pkgdesc="Celery integration for django-tenant-schemas and django-tenants"
+url="https://pypi.python.org/project/tenant-schemas-celery"
+arch="noarch"
+license="MIT"
+depends="py3-django-tenants py3-celery"
+checkdepends="python3-dev py3-pytest"
+makedepends="py3-setuptools py3-gpep517 py3-wheel"
+source="
+	$pkgname-$pkgver.tar.gz::https://codeload.github.com/maciej-gol/tenant-schemas-celery/tar.gz/refs/tags/$pkgver
+	"
+options="!check" # Test suite wants docker
+builddir="$srcdir/$_pkgreal-$pkgver"
+subpackages="$pkgname-pyc"
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	DJANGO_SETTINGS_MODULE=tests.settings .testenv/bin/python3 -m pytest -v
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+dad71011306936dc84d966797b113008780750e9e973513092bec892be0d1468e0a0e7e8e2fcca9765309a27767e1c72bdaad7c8aca16353ae1eef783c239148  py3-tenant-schemas-celery-2.2.0.tar.gz
+"

user/zotero/APKBUILD

@@ -1,18 +1,18 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=zotero
-pkgver=7.0.0_beta76
+pkgver=7.0.0_beta83
 pkgrel=0
 _fxver=115.9.1
 _gittag=$pkgver
 # Date of release, YY-MM-DD for metainfo file (see package())
 # https://www.mozilla.org/firefox/organizations/notes/
-_releasedate=2024-03-22
+_releasedate=2024-06-03
 pkgdesc="A free, easy-to-use tool to help you collect, organize, cite, and share your research sources."
 url="https://www.mozilla.org/en-US/firefox/organizations/"
 # s390x and riscv64: blocked by rust and cargo
 # armhf: build failure on armhf due to wasm
-#arch="x86_64 armv7 aarch64 x86 ppc64le"
+arch="x86_64 armv7 aarch64 x86 ppc64le"
 license="GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND MPL-2.0"
 depends="
 	ffmpeg-libavcodec
@@ -82,6 +82,8 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${_fxver}esr/source/firefox
 	ppc-webrtc.patch
 	python-deps.patch
 	rust-lto-thin.patch
+	https://dev.alpinelinux.org/archive/firefox/rust1.78-packed-to-portable_simd.patch
+	rust1.78-qcms-stdsimd.patch
 	sandbox-fork.patch
 	sandbox-largefile.patch
 	sandbox-sched_setscheduler.patch
@@ -93,9 +95,9 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${_fxver}esr/source/firefox
 	vendor-prefs.js
 
 	zotero.desktop
+	zotero_drop-phantomjs.patch
 	https://lab.ilot.io/mirrors/zotero-client/-/releases/$_gittag/downloads/tarball/zotero-client-$_gittag.tar.gz
 	zotero_build-modifications.patch
-	zotero_drop-phantomjs.patch
 	zotero_test-drop-build.patch
 	zotero_test-fix-chars.patch
 	zotero_test-push-timeout-to-30sec.patch
@@ -157,12 +159,15 @@ prepare() {
 
 		# zotero build expects to be in a git repo
 		git init
+		git config user.name info
+		git config user.email info@example.org
 		git commit --allow-empty -m 'Initial'
 
 		npm i --legacy-peer-deps
 	)
 	default_prepare
 
+	rm -rf third_party/rust/packed_simd/
 	cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/
 
 	_clear_vendor_checksums audio_thread_priority
@@ -372,6 +377,8 @@ c0437a6753f3f350968fa12d250efdfe1bea77baf0e4c06b072b5cc9e78c774dbf4506bc53633703
 6f60e83599041db1b707c21784197ea9816b2c936b89a274bfc24554a600981e6f28448fe41fab0942bd31acd49b1c00beb2eb0961149f2ffa6a4154be123ea7  ppc-webrtc.patch
 4e40b34c5f77a1a21fe971a6fcd8a21b1a63423a3a7932a5a6e1c7a2779f9f06a561c806614a01931679a4b1c6afdfd8ae1f3cc6b673f259ccd368e8e54f6e90  python-deps.patch
 1c6918dd6655d3a1251bfd4af2e1c561cbb00d540a883b4c1ebf7f5de530d754d9ac07b4b5f56cdab6c511d25c8910ec94043f5733e97501a67abffe1bafaeb1  rust-lto-thin.patch
+e4795b88e572bb3b6f009dbacc7872b59db2f8facbe2b07f14dd4f45a77c22049783581869f18c6bb3f04d6edb3da59347278321cce2bfa629a4d35e136cda5c  rust1.78-packed-to-portable_simd.patch
+eae1afad93cc5fa7699b156619600ca4b41e67943b8b6e05ab972d449aece93bbf1e68a5ea1a7b1c9278633dbf7cf31503255558e3e06ddf168b3937a0e014e8  rust1.78-qcms-stdsimd.patch
 2518f2fc75b5db30058e0735f47d60fdf1e7adfaeee4b33fb2afb1bd9a616ce943fd88f4404d0802d4083703f4acf1d5ad42377218d025bc768807fbaf7e1609  sandbox-fork.patch
 b7d0a6126bdf6c0569f80aabf5b37ed2c7a35712eb8a0404a2d85381552f5555d4f97d213ea26cec6a45dc2785f22439376ed5f8e78b4fd664ef0223307b333e  sandbox-largefile.patch
 f8c3555ef6207933cbffbf4fc101a9b4c0d2990c0063162f0f0bde70ef0b46f86bfac42e7110695183424a87948de593f3927b2d8509ede3e4fc7bd8a1fad1ce  sandbox-sched_setscheduler.patch
@@ -380,9 +387,9 @@ d354f48a29bfc16719f3b230b1395063239d4420f9e47522de4662392d9697b15f931ca3bf6055d1
 382510375b1a2fa79be0ab79e3391a021ae2c022429ffbaa7e7a69166f99bb56d01e59a1b10688592a29238f21c9d6977672bd77f9fae439b66bdfe0c55ddb15  mozilla-location.keys
 fc45bc3ffb9404e5338ea26a9f04807b40f6f516324972cddd48bedb91b8bd7c6b8d4e03a0209020f5e67b703bc4ff89389985791b9bd544a0fc3951e2dc338e  vendor-prefs.js
 e1a0a4ff5cc1b53f13776ca11927d671426b0691e78e74a4adf2166d57bb2ae8ac409cc11a37ce5e2f680fdf05d5bc3849c33a9717aca1bb62d03ae5231a67fb  zotero.desktop
-e8442e68c53d0057947e4abb4d7ab2f4d52dbb88372d362006c43780d65cae1fe579ab167c772d36113c7937c296b7e4306027319757fb0d36f76a851be6e0e3  zotero-client-7.0.0_beta76.tar.gz
+abbcb92fe89029833bbfb15a8a65204c4043c8c9a372d1aa3d18756584cea32078238caded7f0099314228093b09ac10e18ac3c8ecb8138d30f57664c63f7f8a  zotero_drop-phantomjs.patch
+4b5125ae1cc235803e6f4eb89787c631b3b55c6b34263fe16aef4b2c371df28d9daf05d83a7e2fa36c05a2153585d674a23bec98e0488d9dc9eabe5f5924a873  zotero-client-7.0.0_beta83.tar.gz
 746dbabbb3ea9199d17891e2079b9256d04843f548132178862117d2334694d98e2cc981945d72f31d0e5b2c42904d371633f6905996bb580aa0b5ae95c64ddc  zotero_build-modifications.patch
-cfe583f2da7508a4e07734a42519d7c28265928fe14c14b2f650ca6e56c35cb79272b03ed3bfb81e06c4e01458b55e04d10df5cbdd549da0d97206b2c10c3530  zotero_drop-phantomjs.patch
 337070ee4c44ccb35c6b6290c18327740bb9fccfd1a6ad1045782e83daa290b6ced7d53955d3a889f661d588738a64f2e7f383639f4c46be9fdf891168abc9ff  zotero_test-drop-build.patch
 f0e4f09496531222e8400959f9ef12852bca269eb3bf4c3b87ccaf92f28a12b9374461a1c79ad294a4393dbe30800aa1c85497033d0bc304fa8c198dfab3efd2  zotero_test-fix-chars.patch
 9dc390d8bae42e645cae45fe5551751d8f38d5c1b8b2cc0eec1c2191f4bde293ffb2c67cfc4de765f2d48b1da4d5fcd4f1c03711e5da3180cd1b63710ccf5599  zotero_test-push-timeout-to-30sec.patch

user/zotero/rust1.78-qcms-stdsimd.patch

@@ -0,0 +1,64 @@
+Relevant bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=1882291
+
+
+diff --git a/Cargo.lock b/Cargo.lock
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -4274,10 +4274,11 @@
+ [[package]]
+ name = "qcms"
+ version = "0.2.0"
+ dependencies = [
+  "libc",
++ "version_check",
+ ]
+ 
+ [[package]]
+ name = "qlog"
+ version = "0.4.0"
+diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml
+--- a/gfx/qcms/Cargo.toml
++++ b/gfx/qcms/Cargo.toml
+@@ -18,5 +18,8 @@
+ iccv4-enabled = []
+ cmyk = []
+ 
+ [dependencies]
+ libc = {version = "0.2", optional = true }
++
++[build-dependencies]
++version_check = "0.9"
+diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs
+new file mode 100644
+--- /dev/null
++++ b/gfx/qcms/build.rs
+@@ -0,0 +1,7 @@
++extern crate version_check as rustc;
++
++fn main() {
++    if rustc::is_min_version("1.78.0").unwrap_or(false) {
++        println!("cargo:rustc-cfg=stdsimd_split");
++    }
++}
+diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs
+--- a/gfx/qcms/src/lib.rs
++++ b/gfx/qcms/src/lib.rs
+@@ -5,13 +5,15 @@
+ #![allow(non_camel_case_types)]
+ #![allow(non_snake_case)]
+ #![allow(non_upper_case_globals)]
+ // These are needed for the neon SIMD code and can be removed once the MSRV supports the
+ // instrinsics we use
+-#![cfg_attr(feature = "neon", feature(stdsimd))]
++#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))]
++#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))]
++#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))]
+ #![cfg_attr(
+-    feature = "neon",
++    all(target_arch = "arm", feature = "neon"),
+     feature(arm_target_feature, raw_ref_op)
+ 
+ )]
+ 
+ /// These values match the Rendering Intent values from the ICC spec
+

user/zotero/zotero_drop-phantomjs.patch

@@ -1,117 +1,8 @@
-diff --git a/zotero/reader/epubjs/epub.js/package.json.orig b/zotero/reader/epubjs/epub.js/package.json
-index bb440ac..b4c5c32 100644
---- a/zotero/reader/epubjs/epub.js/package.json.orig
-+++ b/zotero/reader/epubjs/epub.js/package.json
-@@ -41,7 +41,6 @@
-     "karma-chrome-launcher": "^3.1.0",
-     "karma-mocha": "^2.0.1",
-     "karma-mocha-reporter": "^2.2.5",
--    "karma-phantomjs-launcher": "^1.0.4",
-     "karma-sourcemap-loader": "^0.3.7",
-     "karma-webpack": "^5.0.0",
-     "mocha": "^7.2.0",
-diff --git a/zotero/reader/epubjs/epub.js/package-lock.json.orig b/zotero/reader/epubjs/epub.js/package-lock.json
-index 6d728e7..c889b68 100644
---- a/zotero/reader/epubjs/epub.js/package-lock.json.orig
-+++ b/zotero/reader/epubjs/epub.js/package-lock.json
-@@ -28,7 +28,6 @@
-         "karma-chrome-launcher": "^3.1.0",
-         "karma-mocha": "^2.0.1",
-         "karma-mocha-reporter": "^2.2.5",
--        "karma-phantomjs-launcher": "^1.0.4",
-         "karma-sourcemap-loader": "^0.3.7",
-         "karma-webpack": "^5.0.0",
-         "mocha": "^7.2.0",
-@@ -8855,16 +8854,6 @@
-         "node": ">=4"
-       }
-     },
--    "node_modules/karma-phantomjs-launcher": {
--      "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz",
--      "integrity": "sha1-0jyjSAG9qYY60xjju0vUBisTrNI=",
--      "dev": true,
--      "dependencies": {
--        "lodash": "^4.0.1",
--        "phantomjs-prebuilt": "^2.1.7"
--      }
--    },
-     "node_modules/karma-sourcemap-loader": {
-       "version": "0.3.7",
-       "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz",
-@@ -11342,26 +11331,6 @@
-       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-       "dev": true
-     },
--    "node_modules/phantomjs-prebuilt": {
--      "version": "2.1.14",
--      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz",
--      "integrity": "sha1-1T0xH8+30dCN2yQBRVjxGIxRbaA=",
--      "dev": true,
--      "dependencies": {
--        "es6-promise": "~4.0.3",
--        "extract-zip": "~1.5.0",
--        "fs-extra": "~1.0.0",
--        "hasha": "~2.2.0",
--        "kew": "~0.7.0",
--        "progress": "~1.1.8",
--        "request": "~2.79.0",
--        "request-progress": "~2.0.1",
--        "which": "~1.2.10"
--      },
--      "bin": {
--        "phantomjs": "bin/phantomjs"
--      }
--    },
-     "node_modules/picocolors": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-@@ -22124,16 +22093,6 @@
-         }
-       }
-     },
--    "karma-phantomjs-launcher": {
--      "version": "1.0.4",
--      "resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz",
--      "integrity": "sha1-0jyjSAG9qYY60xjju0vUBisTrNI=",
--      "dev": true,
--      "requires": {
--        "lodash": "^4.0.1",
--        "phantomjs-prebuilt": "^2.1.7"
--      }
--    },
-     "karma-sourcemap-loader": {
-       "version": "0.3.7",
-       "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz",
-@@ -23984,23 +23943,6 @@
-       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-       "dev": true
-     },
--    "phantomjs-prebuilt": {
--      "version": "2.1.14",
--      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz",
--      "integrity": "sha1-1T0xH8+30dCN2yQBRVjxGIxRbaA=",
--      "dev": true,
--      "requires": {
--        "es6-promise": "~4.0.3",
--        "extract-zip": "~1.5.0",
--        "fs-extra": "~1.0.0",
--        "hasha": "~2.2.0",
--        "kew": "~0.7.0",
--        "progress": "~1.1.8",
--        "request": "~2.79.0",
--        "request-progress": "~2.0.1",
--        "which": "~1.2.10"
--      }
--    },
-     "picocolors": {
-       "version": "1.0.0",
-       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
 diff --git a/zotero/reader/package-lock.json.orig b/zotero/reader/package-lock.json
-index 949e5de..0485ddd 100644
+index e3a638f..0800781 100644
 --- a/zotero/reader/package-lock.json.orig
 +++ b/zotero/reader/package-lock.json
-@@ -83,7 +83,6 @@
+@@ -84,7 +84,6 @@
  				"karma-chrome-launcher": "^3.1.0",
  				"karma-mocha": "^2.0.1",
  				"karma-mocha-reporter": "^2.2.5",
@@ -119,7 +10,7 @@ index 949e5de..0485ddd 100644
  				"karma-sourcemap-loader": "^0.3.7",
  				"karma-webpack": "^5.0.0",
  				"mocha": "^7.2.0",
-@@ -12332,20 +12331,6 @@
+@@ -12342,20 +12341,6 @@
  				"node": ">=4"
  			}
  		},
@@ -140,7 +31,7 @@ index 949e5de..0485ddd 100644
  		"node_modules/karma-sourcemap-loader": {
  			"version": "0.3.8",
  			"resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz",
-@@ -15330,40 +15315,6 @@
+@@ -15340,40 +15325,6 @@
  			"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
  			"dev": true
  		},
@@ -181,7 +72,7 @@ index 949e5de..0485ddd 100644
  		"node_modules/picocolors": {
  			"version": "1.0.0",
  			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-@@ -27177,7 +27128,6 @@
+@@ -27192,7 +27143,6 @@
  				"karma-chrome-launcher": "^3.1.0",
  				"karma-mocha": "^2.0.1",
  				"karma-mocha-reporter": "^2.2.5",
@@ -189,7 +80,7 @@ index 949e5de..0485ddd 100644
  				"karma-sourcemap-loader": "^0.3.7",
  				"karma-webpack": "^5.0.0",
  				"mocha": "^7.2.0",
-@@ -30497,16 +30447,6 @@
+@@ -30512,16 +30462,6 @@
  				}
  			}
  		},
@@ -206,7 +97,7 @@ index 949e5de..0485ddd 100644
  		"karma-sourcemap-loader": {
  			"version": "0.3.8",
  			"resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz",
-@@ -32672,34 +32612,6 @@
+@@ -32687,34 +32627,6 @@
  			"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
  			"dev": true
  		},