1diff --git a/README.md b/README.md
2index b7fe22afab465130a212594e727f4cd6d73c0eed..34a4bc16c9097aefa634f50e7b630a5b67e53244 100644
3--- a/README.md
4+++ b/README.md
5@@ -20,7 +20,7 @@ curl https://artifacts.gabrielgio.me/repo/mail%40gabrielgio.me-62ddc4dc.rsa.pub \
6 -o /etc/apk/keys/mail@gabrielgio.me-62ddc4dc.rsa.pub
7 ```
8
9-# Apks Alpine 3.17
10+# Apks Alpine 3.18
11
12 ## midr
13 - **url**: https://git.sr.ht/~gabrielgio/midr
14@@ -43,29 +43,8 @@ - **version**: 0.2.3
15 - **reason**: Reddit reddit-nextcloud-importer dependency
16 - **releases**: https://pypi.org/project/nextcloud-api-wrapper/#history
17
18-## jsonpickle
19-- **link**: https://jsonpickle.github.io/
20-- **version**: 3.0.1
21-- **reason**: Avoid edge repository and reddit-nextcloud-importer dependency
22-- **releases**: https://github.com/jsonpickle/jsonpickle/tags
23-- **source**: https://git.alpinelinux.org/aports/tree/testing/py3-jsonpickle?h=master
24-
25 ## alps
26 - **link**: https://jsonpickle.github.io/
27 - **version**: 0_git20221018
28 - **reason**: Avoid edge repository
29 - **source**: https://git.alpinelinux.org/aports/tree/testing/alps?h=master
30-
31-## prometheus-postgres-exporter
32-- **link**: https://github.com/prometheus-community/postgres_exporter
33-- **version**: 0.11.1
34-- **reason**: Avoid edge repository
35-- **releases**: https://github.com/prometheus-community/postgres_exporter/releases
36-- **source**: https://git.alpinelinux.org/aports/tree/community/prometheus-postgres-exporter?h=master
37-
38-## dlib
39-- **link**: https://dlib.net
40-- **version**: 19.24
41-- **reason**: Avoid testing repository
42-- **releases**: https://sourceforge.net/p/dclib/news/
43-- **source**: https://git.alpinelinux.org/aports/tree/testing/dlib?h=master
44diff --git a/apks/alps/APKBUILD b/apks/alps/APKBUILD
45index 7c56acac3a6df06fdb00251af959553f3e69f4b0..ab0f402ce0ed5f926dbe33cf40312084cf55eac4 100644
46--- a/apks/alps/APKBUILD
47+++ b/apks/alps/APKBUILD
48@@ -1,12 +1,12 @@
49 # Contributor: Patrycja Rosa <alpine@ptrcnull.me>
50 # Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
51 pkgname=alps
52-pkgver=0_git20221018
53-pkgrel=2
54-_commit=f01fbcbc48db5e65d69a0ebd9d7cb0deb378cf13
55+pkgver=0_git20230501
56+pkgrel=1
57+_commit=ab8b5f7678da886eb55216832ef47a730f5a4830
58 pkgdesc="Simple and extensible webmail"
59 url="https://sr.ht/~migadu/alps/"
60-arch="x86_64"
61+arch="all"
62 license="MIT"
63 makedepends="go"
64 install="$pkgname.pre-install"
65@@ -38,7 +38,7 @@ install -Dm644 "$srcdir"/alps.confd "$pkgdir"/etc/conf.d/alps
66 }
67
68 sha512sums="
69-682a8dc80f5812a033c57eb91f17a3e2da7320a642a04f08abda2baeb93a69528c446323d089773061f6a6b91dcda7e4dfa0885285532d310bdcc1565d6d3e81 alps-f01fbcbc48db5e65d69a0ebd9d7cb0deb378cf13.tar.gz
70+10e5969934ebe0a6e7194ade1338cdd6133d1afba4b957f651acea062914d042e8ecd783d1029ba3e43d1353350a9c012ac5a22b1334812906de55dbfa1e5486 alps-ab8b5f7678da886eb55216832ef47a730f5a4830.tar.gz
71 789b4cae9b2c4acb5b05288c4f9858de1b5cfda87bc96c40505e9447ec9ad39fdabbd5af0c65007c51a5f3a425602ea7a81d3f6c62894dddf6790fe26793755c fix-statics-dir.patch
72 61c1b05851ae05fbf51cb8eb060c5677de7145a07dac3a194a3f7513b2ff3bf5f3792a749d1a2eef09fc6378f2fbf2021cc49dffe652f51230120c40a7062b6c alps.confd
73 6e109577d662ce61d2b753e5b82237827646f10d0af02b10b3f184a10bb747c3c8303e7d20a5cc2b7c31ac4a6f3aef62290c068868e647c9b1ce711dfb6e025a alps.initd
74diff --git a/apks/dlib/APKBUILD b/apks/dlib/APKBUILD
75deleted file mode 100644
76index 919f591e66c6460cfca0c579ab6f00b09301483f..0000000000000000000000000000000000000000
77--- a/apks/dlib/APKBUILD
78+++ /dev/null
79@@ -1,35 +0,0 @@
80-# Contributor: Davis E. King <davis@dlib.net>
81-# Maintainer: Adriaan Groenenboom <agboom@pm.me>
82-pkgname=dlib
83-pkgver=19.24
84-pkgrel=1
85-pkgdesc="A toolkit for making real world machine learning and data analysis applications in C++"
86-url="http://dlib.net"
87-arch="x86_64"
88-license="BSL-1.0"
89-makedepends="
90- cmake
91- libjpeg-turbo-dev
92- libpng-dev
93- libx11-dev
94- openblas-dev
95- samurai
96- "
97-subpackages="$pkgname-dev"
98-source="dlib-$pkgver.tar.bz2::https://downloads.sourceforge.net/project/dclib/dlib/v$pkgver/dlib-$pkgver.tar.bz2"
99-
100-build() {
101- cmake -B build -G Ninja \
102- -DCMAKE_INSTALL_PREFIX=/usr \
103- -DBUILD_SHARED_LIBS=ON \
104- -DCMAKE_BUILD_TYPE=None
105- cmake --build build
106-}
107-
108-package() {
109- DESTDIR=$pkgdir cmake --install build
110-}
111-
112-sha512sums="
113-c12c166d7c59ea632d02d8fb6d3e0b1d42212ed1f856ec015408868308374f5f1ac75abfa916dd94862269543b91bc2b4c75fd3078c14063309808a15a14d2fe dlib-19.24.tar.bz2
114-"
115diff --git a/apks/prometheus-postgres-exporter/APKBUILD b/apks/prometheus-postgres-exporter/APKBUILD
116deleted file mode 100644
117index 1654a2740592617a96fd863bad7f1aa29cafe972..0000000000000000000000000000000000000000
118--- a/apks/prometheus-postgres-exporter/APKBUILD
119+++ /dev/null
120@@ -1,48 +0,0 @@
121-# Contributor: Alex Denes <caskd@redxen.eu>
122-# Maintainer: Alex Denes <caskd@redxen.eu>
123-pkgname=prometheus-postgres-exporter
124-_pkgname=postgres_exporter
125-pkgver=0.11.1
126-pkgrel=7
127-pkgdesc="Prometheus exporter for PostgreSQL database"
128-url="https://github.com/prometheus-community/postgres_exporter"
129-license="Apache-2.0"
130-arch="x86_64"
131-makedepends="go>=1.14 bash sed"
132-install="$pkgname.pre-install $pkgname.pre-upgrade"
133-subpackages="$pkgname-openrc $pkgname-doc"
134-source="$_pkgname-$pkgver.tar.gz::https://github.com/prometheus-community/postgres_exporter/archive/v$pkgver.tar.gz
135- postgres-exporter.initd
136- postgres-exporter.confd
137- disable-go-race-detector.patch
138- README.Alpine"
139-builddir="$srcdir/$_pkgname-$pkgver"
140-
141-export GOFLAGS="$GOFLAGS -modcacherw -buildvcs=false"
142-export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}"
143-export GOTMPDIR="${GOTMPDIR:-"$srcdir"}"
144-export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}"
145-
146-build() {
147- make build
148-}
149-
150-check() {
151- make test
152-}
153-
154-package() {
155- install -Dm755 postgres_exporter "$pkgdir"/usr/bin/postgres_exporter
156-
157- install -Dm755 "$srcdir"/postgres-exporter.initd "$pkgdir"/etc/init.d/postgres-exporter
158- install -Dm644 "$srcdir"/postgres-exporter.confd "$pkgdir"/etc/conf.d/postgres-exporter
159- install -Dm644 "$srcdir"/README.Alpine "$pkgdir"/usr/share/doc/postgres-exporter/README.Alpine
160-}
161-
162-sha512sums="
163-e5bd0ddaac53a8693017a174842831a9bddd1e555b10c1cf61d12d1e9585e1cdaedece378681afdfda46ba6db53aadc10ceecaca0396a330d181d7f06f2665fc postgres_exporter-0.11.1.tar.gz
164-e083183953fee8976765a872b7e21b859a4d907ef650e0320e63da4eff388b6c7f63c82a75cbd14e8f78e06018bae6d67666ebf2451adcbe7261e30f3889125f postgres-exporter.initd
165-14646244988a670caa12eb6cb5e8bea7259c27ec5fe8d89ee6f73675348a66fdfec68cc06304fcf1ce637737c3be7c38e25824e6efe302ed99ced73021d045c3 postgres-exporter.confd
166-0e916a9216fbf21865a3672a1159836993048de1112dc8ddbd4e8283264d7fe12c5a5e2b08adeced2db6d4d35feb799c59eae7e55d010d045e825b4a524ae5e2 disable-go-race-detector.patch
167-d4d8131a2d4787a50f4376cda01f52cc4d40e41088342db7a559e58d464fc92e3110bed542f8622259dd45990e1a95a73806310e1f80c212065e265181e22b32 README.Alpine
168-"
169diff --git a/apks/prometheus-postgres-exporter/README.Alpine b/apks/prometheus-postgres-exporter/README.Alpine
170deleted file mode 100644
171index 6e0904919e48cf68e01daa5f4cf68e0a25a40868..0000000000000000000000000000000000000000
172--- a/apks/prometheus-postgres-exporter/README.Alpine
173+++ /dev/null
174@@ -1,48 +0,0 @@
175-This document is adapted from README.Debian contained in Debian package.
176-
177-To use the PostgreSQL exporter, you need to connect to the database with
178-superuser (postgres) privileges, or with an user that has been granted enough
179-permissions.
180-
181-The recommended way to do this, is to create a `prometheus` user with no
182-password, and then connect using UNIX domain sockets.
183-
184-To do that, set this connection string in
185-/etc/conf.d/prometheus-postgres-exporter:
186-
187- DATA_SOURCE_NAME='user=prometheus host=/run/postgresql dbname=postgres'
188-
189-And use psql (doas -u postgres psql) to execute these SQL commands to create
190-the user:
191-
192- CREATE USER prometheus;
193- ALTER USER prometheus SET SEARCH_PATH TO prometheus,pg_catalog;
194-
195- CREATE SCHEMA prometheus AUTHORIZATION prometheus;
196-
197- CREATE FUNCTION prometheus.f_select_pg_stat_activity()
198- RETURNS setof pg_catalog.pg_stat_activity
199- LANGUAGE sql
200- SECURITY DEFINER
201- AS $$
202- SELECT * from pg_catalog.pg_stat_activity;
203- $$;
204-
205- CREATE FUNCTION prometheus.f_select_pg_stat_replication()
206- RETURNS setof pg_catalog.pg_stat_replication
207- LANGUAGE sql
208- SECURITY DEFINER
209- AS $$
210- SELECT * from pg_catalog.pg_stat_replication;
211- $$;
212-
213- CREATE VIEW prometheus.pg_stat_replication
214- AS
215- SELECT * FROM prometheus.f_select_pg_stat_replication();
216-
217- CREATE VIEW prometheus.pg_stat_activity
218- AS
219- SELECT * FROM prometheus.f_select_pg_stat_activity();
220-
221- GRANT SELECT ON prometheus.pg_stat_replication TO prometheus;
222- GRANT SELECT ON prometheus.pg_stat_activity TO prometheus;
223diff --git a/apks/prometheus-postgres-exporter/disable-go-race-detector.patch b/apks/prometheus-postgres-exporter/disable-go-race-detector.patch
224deleted file mode 100644
225index 9ba76a3100014cc7f0b839201caa7f54e8951382..0000000000000000000000000000000000000000
226--- a/apks/prometheus-postgres-exporter/disable-go-race-detector.patch
227+++ /dev/null
228@@ -1,16 +0,0 @@
229---- a/Makefile.common
230-+++ b/Makefile.common
231-@@ -111,13 +111,6 @@
232- PUBLISH_DOCKER_ARCHS = $(addprefix common-docker-publish-,$(DOCKER_ARCHS))
233- TAG_DOCKER_ARCHS = $(addprefix common-docker-tag-latest-,$(DOCKER_ARCHS))
234-
235--ifeq ($(GOHOSTARCH),amd64)
236-- ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux freebsd darwin windows))
237-- # Only supported on amd64
238-- test-flags := -race
239-- endif
240--endif
241--
242- # This rule is used to forward a target like "build" to "common-build". This
243- # allows a new "build" target to be defined in a Makefile which includes this
244- # one and override "common-build" without override warnings.
245diff --git a/apks/prometheus-postgres-exporter/postgres-exporter.confd b/apks/prometheus-postgres-exporter/postgres-exporter.confd
246deleted file mode 100644
247index cbc18de585ea2946dd63b430a1af8eca294da893..0000000000000000000000000000000000000000
248--- a/apks/prometheus-postgres-exporter/postgres-exporter.confd
249+++ /dev/null
250@@ -1,22 +0,0 @@
251-# /etc/conf.d/postgres-exporter
252-
253-# Connection string for the PostgreSQL database. You need to either connect as
254-# superuser, or create a user with enough rights, as described in
255-# /usr/share/doc/prometheus-postgres-exporter/README.Alpine
256-
257-# DATA_SOURCE_NAME='postgresql://login:password@hostname:port/'
258-# DATA_SOURCE_NAME='user=prometheus host=/run/postgresql dbname=postgres'
259-
260-DATA_SOURCE_NAME=''
261-
262-# Set the command-line arguments to pass to the server.
263-
264-ARGS=''
265-
266-# Available flags:
267-# --web.listen-address=":9187" Address to listen on for web interface and telemetry.
268-# --web.telemetry-path="/metrics"
269-# Path under which to expose metrics.
270-# --extend.query-path="" Path to custom queries to run.
271-# --log.level="info" Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]
272-# --log.format="logger:stderr" Set the log target and format. Example: "logger:syslog?appname=bob&local=7" or "logger:stdout?json=true"
273diff --git a/apks/prometheus-postgres-exporter/postgres-exporter.initd b/apks/prometheus-postgres-exporter/postgres-exporter.initd
274deleted file mode 100755
275index 8955c15c542f26c706400b6d86a27950cfc18e0a..0000000000000000000000000000000000000000
276--- a/apks/prometheus-postgres-exporter/postgres-exporter.initd
277+++ /dev/null
278@@ -1,22 +0,0 @@
279-#!/sbin/openrc-run
280-supervisor=supervise-daemon
281-
282-command="/usr/bin/postgres_exporter"
283-command_args="$ARGS"
284-command_background="yes"
285-command_user="prometheus:prometheus"
286-
287-export DATA_SOURCE_NAME
288-logdir="/var/log/prometheus"
289-error_log="$logdir/${SVCNAME}.log"
290-pidfile="/var/run/${SVCNAME}.pid"
291-
292-depend() {
293- need net
294- after firewall
295-}
296-
297-start_pre() {
298- checkpath -d -o $command_user -m755 $logdir
299- checkpath -f -o $command_user -m644 $error_log
300-}
301diff --git a/apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-install b/apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-install
302deleted file mode 100755
303index 120995cf35351d604d1aeeafb04ad551607b835a..0000000000000000000000000000000000000000
304--- a/apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-install
305+++ /dev/null
306@@ -1,6 +0,0 @@
307-#!/bin/sh
308-
309-addgroup -S prometheus 2>/dev/null
310-adduser -S -D -h /var/lib/prometheus -s /sbin/nologin -G prometheus -g prometheus prometheus 2>/dev/null
311-
312-exit 0
313diff --git a/apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-upgrade b/apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-upgrade
314deleted file mode 120000
315index 4bb179f511f2528347b928f4eeb624acfe8c4fe7..0000000000000000000000000000000000000000
316--- a/apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-upgrade
317+++ /dev/null
318@@ -1 +0,0 @@
319-prometheus-postgres-exporter.pre-install
320\ No newline at end of file
321diff --git a/apks/py3-jsonpickle/APKBUILD b/apks/py3-jsonpickle/APKBUILD
322deleted file mode 100644
323index bb33ec8598069666d4cd399bae57301b1082d6a6..0000000000000000000000000000000000000000
324--- a/apks/py3-jsonpickle/APKBUILD
325+++ /dev/null
326@@ -1,41 +0,0 @@
327-# Maintainer: psykose <alice@ayaya.dev>
328-pkgname=py3-jsonpickle
329-pkgver=3.0.1
330-pkgrel=1
331-pkgdesc="Serializing any arbitrary object graph into JSON"
332-url="https://pypi.org/project/jsonpickle/"
333-arch="noarch"
334-license="BSD-3-Clause"
335-depends="python3"
336-makedepends="py3-gpep517 py3-setuptools py3-setuptools_scm py3-wheel"
337-checkdepends="py3-pytest py3-numpy py3-pandas"
338-source="https://files.pythonhosted.org/packages/source/j/jsonpickle/jsonpickle-$pkgver.tar.gz
339- noaddopts.patch
340- "
341-builddir="$srcdir/jsonpickle-$pkgver"
342-
343-replaces="py-jsonpickle" # Backwards compatibility
344-provides="py-jsonpickle=$pkgver-r$pkgrel" # Backwards compatibility
345-
346-build() {
347- gpep517 build-wheel \
348- --wheel-dir dist \
349- --output-fd 3 3>&1 >&2
350-}
351-
352-check() {
353- python3 -m venv --clear --without-pip --system-site-packages testenv
354- testenv/bin/python3 -m installer dist/*.whl
355- # no gmpy
356- testenv/bin/python3 -m pytest --deselect tests/ecdsa_test.py
357-}
358-
359-package() {
360- python3 -m installer -d "$pkgdir" \
361- dist/*.whl
362-}
363-
364-sha512sums="
365-88634acb751a0bac2c9d2ca9872dd92aeab3245ec7c1b0dced0272dc9104923b2143898fd3f7f2666bd2b220ab2396e0b2f065853256b5995695ca56534a5ea5 jsonpickle-3.0.1.tar.gz
366-4e95e2abd347cf221c33e919dba9cbe0886ae18c76e1ef221e0764d05e6f0e8d80731c9d84a0e0ddee94a9638784415a61bab2986d46ea54f7c9d5dc8e1226e1 noaddopts.patch
367-"
368diff --git a/apks/py3-jsonpickle/noaddopts.patch b/apks/py3-jsonpickle/noaddopts.patch
369deleted file mode 100644
370index 3c57fff9a09931a10cf82859aa46cbc2c6997b55..0000000000000000000000000000000000000000
371--- a/apks/py3-jsonpickle/noaddopts.patch
372+++ /dev/null
373@@ -1,12 +0,0 @@
374-skip nontests
375-diff --git a/pytest.ini b/pytest.ini
376-index 3cfaa92..b87cccd 100644
377---- a/pytest.ini
378-+++ b/pytest.ini
379-@@ -1,6 +1,5 @@
380- [pytest]
381- norecursedirs=dist build .tox .eggs
382--addopts=--doctest-modules --cov
383- doctest_optionflags=ALLOW_UNICODE ELLIPSIS
384- filterwarnings=
385- # https://github.com/pytest-dev/pytest/issues/6928