From 7e49245fddcd16de615814781a3e52038ca219d9 Mon Sep 17 00:00:00 2001 From: Gabriel Arakaki Giovanini Date: Thu, 20 Jul 2023 18:10:26 +0200 Subject: chore: Remove added package Some package were added to the 3.18 and no longer need to be here. --- README.md | 23 +---------- apks/alps/APKBUILD | 10 ++--- apks/dlib/APKBUILD | 35 ---------------- apks/prometheus-postgres-exporter/APKBUILD | 48 ---------------------- apks/prometheus-postgres-exporter/README.Alpine | 48 ---------------------- .../disable-go-race-detector.patch | 16 -------- .../postgres-exporter.confd | 22 ---------- .../postgres-exporter.initd | 22 ---------- .../prometheus-postgres-exporter.pre-install | 6 --- .../prometheus-postgres-exporter.pre-upgrade | 1 - apks/py3-jsonpickle/APKBUILD | 41 ------------------ apks/py3-jsonpickle/noaddopts.patch | 12 ------ 12 files changed, 6 insertions(+), 278 deletions(-) delete mode 100644 apks/dlib/APKBUILD delete mode 100644 apks/prometheus-postgres-exporter/APKBUILD delete mode 100644 apks/prometheus-postgres-exporter/README.Alpine delete mode 100644 apks/prometheus-postgres-exporter/disable-go-race-detector.patch delete mode 100644 apks/prometheus-postgres-exporter/postgres-exporter.confd delete mode 100755 apks/prometheus-postgres-exporter/postgres-exporter.initd delete mode 100755 apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-install delete mode 120000 apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-upgrade delete mode 100644 apks/py3-jsonpickle/APKBUILD delete mode 100644 apks/py3-jsonpickle/noaddopts.patch diff --git a/README.md b/README.md index b7fe22a..34a4bc1 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ curl https://artifacts.gabrielgio.me/repo/mail%40gabrielgio.me-62ddc4dc.rsa.pub -o /etc/apk/keys/mail@gabrielgio.me-62ddc4dc.rsa.pub ``` -# Apks Alpine 3.17 +# Apks Alpine 3.18 ## midr - **url**: https://git.sr.ht/~gabrielgio/midr @@ -43,29 +43,8 @@ curl https://artifacts.gabrielgio.me/repo/mail%40gabrielgio.me-62ddc4dc.rsa.pub - **reason**: Reddit reddit-nextcloud-importer dependency - **releases**: https://pypi.org/project/nextcloud-api-wrapper/#history -## jsonpickle -- **link**: https://jsonpickle.github.io/ -- **version**: 3.0.1 -- **reason**: Avoid edge repository and reddit-nextcloud-importer dependency -- **releases**: https://github.com/jsonpickle/jsonpickle/tags -- **source**: https://git.alpinelinux.org/aports/tree/testing/py3-jsonpickle?h=master - ## alps - **link**: https://jsonpickle.github.io/ - **version**: 0_git20221018 - **reason**: Avoid edge repository - **source**: https://git.alpinelinux.org/aports/tree/testing/alps?h=master - -## prometheus-postgres-exporter -- **link**: https://github.com/prometheus-community/postgres_exporter -- **version**: 0.11.1 -- **reason**: Avoid edge repository -- **releases**: https://github.com/prometheus-community/postgres_exporter/releases -- **source**: https://git.alpinelinux.org/aports/tree/community/prometheus-postgres-exporter?h=master - -## dlib -- **link**: https://dlib.net -- **version**: 19.24 -- **reason**: Avoid testing repository -- **releases**: https://sourceforge.net/p/dclib/news/ -- **source**: https://git.alpinelinux.org/aports/tree/testing/dlib?h=master diff --git a/apks/alps/APKBUILD b/apks/alps/APKBUILD index 7c56aca..ab0f402 100644 --- a/apks/alps/APKBUILD +++ b/apks/alps/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Patrycja Rosa # Maintainer: Patrycja Rosa pkgname=alps -pkgver=0_git20221018 -pkgrel=2 -_commit=f01fbcbc48db5e65d69a0ebd9d7cb0deb378cf13 +pkgver=0_git20230501 +pkgrel=1 +_commit=ab8b5f7678da886eb55216832ef47a730f5a4830 pkgdesc="Simple and extensible webmail" url="https://sr.ht/~migadu/alps/" -arch="x86_64" +arch="all" license="MIT" makedepends="go" install="$pkgname.pre-install" @@ -38,7 +38,7 @@ package() { } sha512sums=" -682a8dc80f5812a033c57eb91f17a3e2da7320a642a04f08abda2baeb93a69528c446323d089773061f6a6b91dcda7e4dfa0885285532d310bdcc1565d6d3e81 alps-f01fbcbc48db5e65d69a0ebd9d7cb0deb378cf13.tar.gz +10e5969934ebe0a6e7194ade1338cdd6133d1afba4b957f651acea062914d042e8ecd783d1029ba3e43d1353350a9c012ac5a22b1334812906de55dbfa1e5486 alps-ab8b5f7678da886eb55216832ef47a730f5a4830.tar.gz 789b4cae9b2c4acb5b05288c4f9858de1b5cfda87bc96c40505e9447ec9ad39fdabbd5af0c65007c51a5f3a425602ea7a81d3f6c62894dddf6790fe26793755c fix-statics-dir.patch 61c1b05851ae05fbf51cb8eb060c5677de7145a07dac3a194a3f7513b2ff3bf5f3792a749d1a2eef09fc6378f2fbf2021cc49dffe652f51230120c40a7062b6c alps.confd 6e109577d662ce61d2b753e5b82237827646f10d0af02b10b3f184a10bb747c3c8303e7d20a5cc2b7c31ac4a6f3aef62290c068868e647c9b1ce711dfb6e025a alps.initd diff --git a/apks/dlib/APKBUILD b/apks/dlib/APKBUILD deleted file mode 100644 index 919f591..0000000 --- a/apks/dlib/APKBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Contributor: Davis E. King -# Maintainer: Adriaan Groenenboom -pkgname=dlib -pkgver=19.24 -pkgrel=1 -pkgdesc="A toolkit for making real world machine learning and data analysis applications in C++" -url="http://dlib.net" -arch="x86_64" -license="BSL-1.0" -makedepends=" - cmake - libjpeg-turbo-dev - libpng-dev - libx11-dev - openblas-dev - samurai - " -subpackages="$pkgname-dev" -source="dlib-$pkgver.tar.bz2::https://downloads.sourceforge.net/project/dclib/dlib/v$pkgver/dlib-$pkgver.tar.bz2" - -build() { - cmake -B build -G Ninja \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=None - cmake --build build -} - -package() { - DESTDIR=$pkgdir cmake --install build -} - -sha512sums=" -c12c166d7c59ea632d02d8fb6d3e0b1d42212ed1f856ec015408868308374f5f1ac75abfa916dd94862269543b91bc2b4c75fd3078c14063309808a15a14d2fe dlib-19.24.tar.bz2 -" diff --git a/apks/prometheus-postgres-exporter/APKBUILD b/apks/prometheus-postgres-exporter/APKBUILD deleted file mode 100644 index 1654a27..0000000 --- a/apks/prometheus-postgres-exporter/APKBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -pkgname=prometheus-postgres-exporter -_pkgname=postgres_exporter -pkgver=0.11.1 -pkgrel=7 -pkgdesc="Prometheus exporter for PostgreSQL database" -url="https://github.com/prometheus-community/postgres_exporter" -license="Apache-2.0" -arch="x86_64" -makedepends="go>=1.14 bash sed" -install="$pkgname.pre-install $pkgname.pre-upgrade" -subpackages="$pkgname-openrc $pkgname-doc" -source="$_pkgname-$pkgver.tar.gz::https://github.com/prometheus-community/postgres_exporter/archive/v$pkgver.tar.gz - postgres-exporter.initd - postgres-exporter.confd - disable-go-race-detector.patch - README.Alpine" -builddir="$srcdir/$_pkgname-$pkgver" - -export GOFLAGS="$GOFLAGS -modcacherw -buildvcs=false" -export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" -export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" -export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" - -build() { - make build -} - -check() { - make test -} - -package() { - install -Dm755 postgres_exporter "$pkgdir"/usr/bin/postgres_exporter - - install -Dm755 "$srcdir"/postgres-exporter.initd "$pkgdir"/etc/init.d/postgres-exporter - install -Dm644 "$srcdir"/postgres-exporter.confd "$pkgdir"/etc/conf.d/postgres-exporter - install -Dm644 "$srcdir"/README.Alpine "$pkgdir"/usr/share/doc/postgres-exporter/README.Alpine -} - -sha512sums=" -e5bd0ddaac53a8693017a174842831a9bddd1e555b10c1cf61d12d1e9585e1cdaedece378681afdfda46ba6db53aadc10ceecaca0396a330d181d7f06f2665fc postgres_exporter-0.11.1.tar.gz -e083183953fee8976765a872b7e21b859a4d907ef650e0320e63da4eff388b6c7f63c82a75cbd14e8f78e06018bae6d67666ebf2451adcbe7261e30f3889125f postgres-exporter.initd -14646244988a670caa12eb6cb5e8bea7259c27ec5fe8d89ee6f73675348a66fdfec68cc06304fcf1ce637737c3be7c38e25824e6efe302ed99ced73021d045c3 postgres-exporter.confd -0e916a9216fbf21865a3672a1159836993048de1112dc8ddbd4e8283264d7fe12c5a5e2b08adeced2db6d4d35feb799c59eae7e55d010d045e825b4a524ae5e2 disable-go-race-detector.patch -d4d8131a2d4787a50f4376cda01f52cc4d40e41088342db7a559e58d464fc92e3110bed542f8622259dd45990e1a95a73806310e1f80c212065e265181e22b32 README.Alpine -" diff --git a/apks/prometheus-postgres-exporter/README.Alpine b/apks/prometheus-postgres-exporter/README.Alpine deleted file mode 100644 index 6e09049..0000000 --- a/apks/prometheus-postgres-exporter/README.Alpine +++ /dev/null @@ -1,48 +0,0 @@ -This document is adapted from README.Debian contained in Debian package. - -To use the PostgreSQL exporter, you need to connect to the database with -superuser (postgres) privileges, or with an user that has been granted enough -permissions. - -The recommended way to do this, is to create a `prometheus` user with no -password, and then connect using UNIX domain sockets. - -To do that, set this connection string in -/etc/conf.d/prometheus-postgres-exporter: - - DATA_SOURCE_NAME='user=prometheus host=/run/postgresql dbname=postgres' - -And use psql (doas -u postgres psql) to execute these SQL commands to create -the user: - - CREATE USER prometheus; - ALTER USER prometheus SET SEARCH_PATH TO prometheus,pg_catalog; - - CREATE SCHEMA prometheus AUTHORIZATION prometheus; - - CREATE FUNCTION prometheus.f_select_pg_stat_activity() - RETURNS setof pg_catalog.pg_stat_activity - LANGUAGE sql - SECURITY DEFINER - AS $$ - SELECT * from pg_catalog.pg_stat_activity; - $$; - - CREATE FUNCTION prometheus.f_select_pg_stat_replication() - RETURNS setof pg_catalog.pg_stat_replication - LANGUAGE sql - SECURITY DEFINER - AS $$ - SELECT * from pg_catalog.pg_stat_replication; - $$; - - CREATE VIEW prometheus.pg_stat_replication - AS - SELECT * FROM prometheus.f_select_pg_stat_replication(); - - CREATE VIEW prometheus.pg_stat_activity - AS - SELECT * FROM prometheus.f_select_pg_stat_activity(); - - GRANT SELECT ON prometheus.pg_stat_replication TO prometheus; - GRANT SELECT ON prometheus.pg_stat_activity TO prometheus; diff --git a/apks/prometheus-postgres-exporter/disable-go-race-detector.patch b/apks/prometheus-postgres-exporter/disable-go-race-detector.patch deleted file mode 100644 index 9ba76a3..0000000 --- a/apks/prometheus-postgres-exporter/disable-go-race-detector.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/Makefile.common -+++ b/Makefile.common -@@ -111,13 +111,6 @@ - PUBLISH_DOCKER_ARCHS = $(addprefix common-docker-publish-,$(DOCKER_ARCHS)) - TAG_DOCKER_ARCHS = $(addprefix common-docker-tag-latest-,$(DOCKER_ARCHS)) - --ifeq ($(GOHOSTARCH),amd64) -- ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux freebsd darwin windows)) -- # Only supported on amd64 -- test-flags := -race -- endif --endif -- - # This rule is used to forward a target like "build" to "common-build". This - # allows a new "build" target to be defined in a Makefile which includes this - # one and override "common-build" without override warnings. diff --git a/apks/prometheus-postgres-exporter/postgres-exporter.confd b/apks/prometheus-postgres-exporter/postgres-exporter.confd deleted file mode 100644 index cbc18de..0000000 --- a/apks/prometheus-postgres-exporter/postgres-exporter.confd +++ /dev/null @@ -1,22 +0,0 @@ -# /etc/conf.d/postgres-exporter - -# Connection string for the PostgreSQL database. You need to either connect as -# superuser, or create a user with enough rights, as described in -# /usr/share/doc/prometheus-postgres-exporter/README.Alpine - -# DATA_SOURCE_NAME='postgresql://login:password@hostname:port/' -# DATA_SOURCE_NAME='user=prometheus host=/run/postgresql dbname=postgres' - -DATA_SOURCE_NAME='' - -# Set the command-line arguments to pass to the server. - -ARGS='' - -# Available flags: -# --web.listen-address=":9187" Address to listen on for web interface and telemetry. -# --web.telemetry-path="/metrics" -# Path under which to expose metrics. -# --extend.query-path="" Path to custom queries to run. -# --log.level="info" Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal] -# --log.format="logger:stderr" Set the log target and format. Example: "logger:syslog?appname=bob&local=7" or "logger:stdout?json=true" diff --git a/apks/prometheus-postgres-exporter/postgres-exporter.initd b/apks/prometheus-postgres-exporter/postgres-exporter.initd deleted file mode 100755 index 8955c15..0000000 --- a/apks/prometheus-postgres-exporter/postgres-exporter.initd +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run -supervisor=supervise-daemon - -command="/usr/bin/postgres_exporter" -command_args="$ARGS" -command_background="yes" -command_user="prometheus:prometheus" - -export DATA_SOURCE_NAME -logdir="/var/log/prometheus" -error_log="$logdir/${SVCNAME}.log" -pidfile="/var/run/${SVCNAME}.pid" - -depend() { - need net - after firewall -} - -start_pre() { - checkpath -d -o $command_user -m755 $logdir - checkpath -f -o $command_user -m644 $error_log -} diff --git a/apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-install b/apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-install deleted file mode 100755 index 120995c..0000000 --- a/apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -addgroup -S prometheus 2>/dev/null -adduser -S -D -h /var/lib/prometheus -s /sbin/nologin -G prometheus -g prometheus prometheus 2>/dev/null - -exit 0 diff --git a/apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-upgrade b/apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-upgrade deleted file mode 120000 index 4bb179f..0000000 --- a/apks/prometheus-postgres-exporter/prometheus-postgres-exporter.pre-upgrade +++ /dev/null @@ -1 +0,0 @@ -prometheus-postgres-exporter.pre-install \ No newline at end of file diff --git a/apks/py3-jsonpickle/APKBUILD b/apks/py3-jsonpickle/APKBUILD deleted file mode 100644 index bb33ec8..0000000 --- a/apks/py3-jsonpickle/APKBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Maintainer: psykose -pkgname=py3-jsonpickle -pkgver=3.0.1 -pkgrel=1 -pkgdesc="Serializing any arbitrary object graph into JSON" -url="https://pypi.org/project/jsonpickle/" -arch="noarch" -license="BSD-3-Clause" -depends="python3" -makedepends="py3-gpep517 py3-setuptools py3-setuptools_scm py3-wheel" -checkdepends="py3-pytest py3-numpy py3-pandas" -source="https://files.pythonhosted.org/packages/source/j/jsonpickle/jsonpickle-$pkgver.tar.gz - noaddopts.patch - " -builddir="$srcdir/jsonpickle-$pkgver" - -replaces="py-jsonpickle" # Backwards compatibility -provides="py-jsonpickle=$pkgver-r$pkgrel" # Backwards compatibility - -build() { - gpep517 build-wheel \ - --wheel-dir dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages testenv - testenv/bin/python3 -m installer dist/*.whl - # no gmpy - testenv/bin/python3 -m pytest --deselect tests/ecdsa_test.py -} - -package() { - python3 -m installer -d "$pkgdir" \ - dist/*.whl -} - -sha512sums=" -88634acb751a0bac2c9d2ca9872dd92aeab3245ec7c1b0dced0272dc9104923b2143898fd3f7f2666bd2b220ab2396e0b2f065853256b5995695ca56534a5ea5 jsonpickle-3.0.1.tar.gz -4e95e2abd347cf221c33e919dba9cbe0886ae18c76e1ef221e0764d05e6f0e8d80731c9d84a0e0ddee94a9638784415a61bab2986d46ea54f7c9d5dc8e1226e1 noaddopts.patch -" diff --git a/apks/py3-jsonpickle/noaddopts.patch b/apks/py3-jsonpickle/noaddopts.patch deleted file mode 100644 index 3c57fff..0000000 --- a/apks/py3-jsonpickle/noaddopts.patch +++ /dev/null @@ -1,12 +0,0 @@ -skip nontests -diff --git a/pytest.ini b/pytest.ini -index 3cfaa92..b87cccd 100644 ---- a/pytest.ini -+++ b/pytest.ini -@@ -1,6 +1,5 @@ - [pytest] - norecursedirs=dist build .tox .eggs --addopts=--doctest-modules --cov - doctest_optionflags=ALLOW_UNICODE ELLIPSIS - filterwarnings= - # https://github.com/pytest-dev/pytest/issues/6928 -- cgit v1.2.3