~sircmpwn/sr.ht-packages

sr.ht-pkgbuilds: Update and improve packages v1 APPLIED

I have updated a few packages, added a missing graphql api service and
two systemd timers that could be used instead of cron.
For my own packages I changed the git.sr.ht user from gitsrht to git, so
that clone urls look better, but I am not sure about upstreaming that
one: https://git.xenrox.net/~xenrox/sr.ht-pkgbuilds/commit/933ec1f3a046d67c643fa7fdb865a2dd5060c044

Thorben Günther (6):
  python-pgpy: Update, remove python2 subpackage
  meta.sr.ht: Remove unneeded python-pystache dependency
  python-minio: Upstream update
  lists.sr.ht: Update, add api service
  git.sr.ht: Add periodic job as systemd timer
  meta.sr.ht: Add daily job as systemd timer

 git.sr.ht/PKGBUILD                   | 12 +++++++---
 git.sr.ht/git.sr.ht-periodic.service |  1 +
 git.sr.ht/git.sr.ht-periodic.timer   |  9 +++++++
 lists.sr.ht/PKGBUILD                 | 16 +++++++++----
 lists.sr.ht/lists.sr.ht-api.service  | 13 ++++++++++
 meta.sr.ht/PKGBUILD                  | 13 ++++++----
 meta.sr.ht/meta.sr.ht-daily.service  |  8 +++++++
 meta.sr.ht/meta.sr.ht-daily.timer    |  9 +++++++
 python-minio/PKGBUILD                |  4 ++--
 python-pgpy/PKGBUILD                 | 36 +++++++---------------------
 10 files changed, 79 insertions(+), 42 deletions(-)
 create mode 120000 git.sr.ht/git.sr.ht-periodic.service
 create mode 100644 git.sr.ht/git.sr.ht-periodic.timer
 create mode 100644 lists.sr.ht/lists.sr.ht-api.service
 create mode 100644 meta.sr.ht/meta.sr.ht-daily.service
 create mode 100644 meta.sr.ht/meta.sr.ht-daily.timer

-- 
2.32.0
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~sircmpwn/sr.ht-packages/patches/24408/mbox | git am -3
Learn more about email & git
View this thread in the archives

[PATCH sr.ht-pkgbuilds 1/6] python-pgpy: Update, remove python2 subpackage Export this patch

---
 python-pgpy/PKGBUILD | 36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/python-pgpy/PKGBUILD b/python-pgpy/PKGBUILD
index f43005a..fe32103 100644
--- a/python-pgpy/PKGBUILD
+++ b/python-pgpy/PKGBUILD
@@ -1,47 +1,27 @@
# $Id$
# Maintainer: James Morris <jmorris@securityinnovation.com>

pkgbase=python-pgpy
pkgname=('python-pgpy' 'python2-pgpy')
pkgver=0.5.3
pkgname='python-pgpy'
pkgver=0.5.4
pkgrel=1
pkgdesc="Pretty Good Privacy for Python - a pure Python OpenPGP implementation."
arch=('any')
license=('BSD')
url="https://github.com/SecurityInnovation/PGPy"
makedepends=('python-setuptools' 'python-cryptography' 'python-six' 'python-pyasn1'
             'python2-setuptools' 'python2-cryptography' 'python2-enum34' 'python2-singledispatch' 'python2-six' 'python2-pyasn1')
depends=('python-cryptography>=1.1.0' 'python-six>=1.9.0' 'python-pyasn1')
makedepends=('python-setuptools' 'python-wheel')
source=("https://github.com/SecurityInnovation/PGPy/releases/download/v${pkgver}/PGPy-${pkgver}.tar.gz")
sha256sums=('a49c269cedcaf82ac6999bcae5fd3f543ecb1c759f9d48a15ad8d8fa4ac03987')
sha384sums=('6e60f5f8e6125299c84e0e0ec70642f65b21eb43818b251314f824bb18f522ce05b94525af9a2b366c5832b0580ca7ea')
sha512sums=('5f27292af764164dc15cd491a297c4a41b3ce9c56e50cd8c71da05b4a886d402d530674592db8e8ea02f323d760342d9d69bfeb88e6109c4345bd701ee285587')

prepare() {
    cp -a PGPy-${pkgver}{,-python2}
}
sha256sums=('bdd3da1e006fc8e81cc02232969924d6e8c98a4af1621a925d99bba09164183b')
sha384sums=('cecb31ab93e396ecb1daa63f0554d301042172f7ee827970bd732174433e46377e9628b0a7c4dd843378966cee0e660d')
sha512sums=('bf19a72d5113cb88e6538d515a06a115a7f329ee1331553100140848226773db0a539a0cbe480f04b0f26cd587fc0c3c8e5fe392e2421d6e6210e86bd0ab70c1')

build() {
    # Build Python 3 module
    cd ${srcdir}/PGPy-${pkgver}
    python3 setup.py build

    # Build python2 module
    cd ${srcdir}/PGPy-${pkgver}-python2
    python2 setup.py build
}

package_python-pgpy() {
    depends=('python-cryptography>=1.1.0' 'python-six>=1.9.0' 'python-pyasn1')

package() {
    cd PGPy-${pkgver}
    python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
    install -D -m 644 LICENSE ${pkgdir}/usr/share/licenses/python-pgpy/LICENSE
}

package_python2-pgpy() {
    depends=('python2-cryptography>=1.1.0' 'python2-six>=1.9.0' 'python2-enum34' 'python2-singledispatch' 'python2-pyasn1')

    cd PGPy-${pkgver}-python2
    python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
    install -D -m 644 LICENSE ${pkgdir}/usr/share/licenses/python2-pgpy/LICENSE
}
-- 
2.32.0

[PATCH sr.ht-pkgbuilds 2/6] meta.sr.ht: Remove unneeded python-pystache dependency Export this patch

---
 meta.sr.ht/PKGBUILD | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta.sr.ht/PKGBUILD b/meta.sr.ht/PKGBUILD
index ffa6073..f698652 100644
--- a/meta.sr.ht/PKGBUILD
+++ b/meta.sr.ht/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=meta.sr.ht
pkgver=0.52.16
pkgrel=1
pkgver=0.54.4
pkgrel=2
pkgdesc="sr.ht core account services"
arch=("x86_64")
license=("AGPL3")
@@ -9,7 +9,6 @@ install=meta.sr.ht.install
depends=(
	"python-dnspython"
	"python-bcrypt"
	"python-pystache"
	"python-qrcode"
	"python-redis"
	"python-srht"
@@ -30,7 +29,7 @@ source=(
	"meta.sr.ht-webhooks.service"
	"sysusers.conf"
)
sha256sums=('a2690b265611f2902f1dc2c9b526aceb045a460cb42a0a55cdcf1ba827e73bea'
sha256sums=('66b93ea959464eff4112aa965f54d5620b4a25409b9b18bb4376272c707395f8'
            '79b30d4b2275005a78cf29a185fab07301455557d631d6263ee28a2592a75067'
            'ac04fff6a22f1b194cf84f3a296cf2225f38c393e437f24bc3af3e3b677017a1'
            'ab67c3a803d8a06606584e0923223336c1bb297eb1384f77d00a035e68dbb7a3'
-- 
2.32.0

[PATCH sr.ht-pkgbuilds 3/6] python-minio: Upstream update Export this patch

---
 python-minio/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python-minio/PKGBUILD b/python-minio/PKGBUILD
index d0dda98..78469eb 100644
--- a/python-minio/PKGBUILD
+++ b/python-minio/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=python-minio
_pkgname=minio
pkgver=7.0.1
pkgver=7.1.0
pkgrel=1
pkgdesc='MinIO Python Library for Amazon S3 Compatible Cloud Storage'
arch=(any)
@@ -10,7 +10,7 @@ license=('Apache')
depends=("python-certifi" "python-urllib3")
makedepends=(python-setuptools)
source=($pkgname-$pkgver.tar.gz::https://github.com/minio/minio-py/archive/$pkgver.tar.gz)
sha256sums=('a5a21574c708fda7a6ffffb3268ce0040e6279f08a8cce081eb8f3a70db0ee71')
sha256sums=('6df75c4d87b9287d177b34e8a9cb0aa38c0df6e5bf0ce2505dbab81f64a9450c')

build() {
  cd "${srcdir}"/minio-py-${pkgver}
-- 
2.32.0

[PATCH sr.ht-pkgbuilds 4/6] lists.sr.ht: Update, add api service Export this patch

---
 lists.sr.ht/PKGBUILD                | 16 +++++++++++-----
 lists.sr.ht/lists.sr.ht-api.service | 13 +++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 lists.sr.ht/lists.sr.ht-api.service

diff --git a/lists.sr.ht/PKGBUILD b/lists.sr.ht/PKGBUILD
index 2054871..92bb52a 100644
--- a/lists.sr.ht/PKGBUILD
+++ b/lists.sr.ht/PKGBUILD
@@ -1,15 +1,15 @@
pkgname=lists.sr.ht
pkgver=0.47.1
pkgrel=2
pkgver=0.49.3
pkgrel=1
pkgdesc="sr.ht mailing list services"
arch=("any")
arch=("x86_64")
license=("AGPL3")
url="https://git.sr.ht/~sircmpwn/lists.sr.ht"
depends=(
	"python-pygit2" "python-srht" "python-celery" "python-aiosmtpd"
	"python-asyncpg" "python-redis" "gunicorn" "python-emailthreads"
)
makedepends=("python-setuptools" "nodejs" "sassc")
makedepends=("python-setuptools" "nodejs" "sassc" "go")
optdepends=(
	"redis: dispatching emails for archiving and forwarding"
)
@@ -20,19 +20,23 @@ source=(
	"lists.sr.ht-lmtp.service"
	"lists.sr.ht-process.service"
	"lists.sr.ht-webhooks.service"
	"lists.sr.ht-api.service"
	"sysusers.conf"
)
sha256sums=('27c2fe2042b5b2bcbefa7baad5d8868b95dd6431d72aa98da6ff9d0aa2530f29'
sha256sums=('a8aea88ebdc0d0e180fb61bb033346f294d07b64b25e947782b72a67c3e59bb6'
            '3bfc68d7945fa1d996fdf2ca202ceebbe5511ca6618f9a123ea1ac61ac1df062'
            'ed8890a9593dc7d3fe59e7b1fc8dd6c510f123ac4c289ac88d8320a395106c65'
            '7581e8415a271421030fc112eb5a690752a3ce5e7b72d8c8c8b0e023508a179a'
            'ba90af29b39b40ba8a6e749faf86325498739c4bbb5d2be1032c07e9f7a02937'
            '7c57f1910a08fb7007386d4f4316e5aa0d94e5b57c947726fc9579ebf24cfbee'
            '753453b055e613e7c0fb22991ca8d9f588fe1ba705e26f0e8c2504c464f4e5d0')
export PKGVER=$pkgver

build() {
	cd $pkgbase-$pkgver
	python3 setup.py build
	cd api
	go build -o listssrht-api
}

package() {
@@ -41,6 +45,8 @@ package() {
	install -Dm0644 ../lists.sr.ht-lmtp.service -t "$pkgdir"/usr/lib/systemd/system/
	install -Dm0644 ../lists.sr.ht-process.service -t "$pkgdir"/usr/lib/systemd/system/
	install -Dm0644 ../lists.sr.ht-webhooks.service -t "$pkgdir"/usr/lib/systemd/system/
	install -Dm644 ../lists.sr.ht-api.service -t "$pkgdir"/usr/lib/systemd/system/
	install -Dm0644 ../sysusers.conf "$pkgdir/usr/lib/sysusers.d/lists.sr.ht.conf"
	install -Dm755 api/listssrht-api "$pkgdir"/usr/bin/listssrht-api
	python3 setup.py install --root="${pkgdir}" --optimize=1
}
diff --git a/lists.sr.ht/lists.sr.ht-api.service b/lists.sr.ht/lists.sr.ht-api.service
new file mode 100644
index 0000000..ae09ae1
--- /dev/null
+++ b/lists.sr.ht/lists.sr.ht-api.service
@@ -0,0 +1,13 @@
[Unit]
Description=lists.sr.ht API service
Requires=redis.service postgresql.service
After=redis.service postgresql.service network.target

[Service]
Type=simple
User=listssrht
Restart=always
ExecStart=/usr/bin/listssrht-api -b :5106

[Install]
WantedBy=multi-user.target
-- 
2.32.0

[PATCH sr.ht-pkgbuilds 5/6] git.sr.ht: Add periodic job as systemd timer Export this patch

---
 git.sr.ht/PKGBUILD                   | 12 +++++++++---
 git.sr.ht/git.sr.ht-periodic.service |  1 +
 git.sr.ht/git.sr.ht-periodic.timer   |  9 +++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 120000 git.sr.ht/git.sr.ht-periodic.service
 create mode 100644 git.sr.ht/git.sr.ht-periodic.timer

diff --git a/git.sr.ht/PKGBUILD b/git.sr.ht/PKGBUILD
index aff9ae4..b4c5c0e 100644
--- a/git.sr.ht/PKGBUILD
+++ b/git.sr.ht/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=git.sr.ht
pkgver=0.70.4
pkgrel=1
pkgver=0.72.44
pkgrel=2
pkgdesc="sr.ht git services"
arch=("x86_64")
license=("AGPL3")
@@ -20,13 +20,17 @@ source=(
	"git.sr.ht.service"
	"git.sr.ht-api.service"
	"git.sr.ht-webhooks.service"
	"git.sr.ht-periodic.service"
	"git.sr.ht-periodic.timer"
	"sysusers.conf"
	"tmpfiles.conf"
)
sha256sums=('8a0879a717c757a12f36eff8cf2527d752c0e2ea21b335433b0d764e67d6bcb5'
sha256sums=('87108d4e77bb1d2a1f277a1ca5f02f125e5551fa8d88dc93577eb01ddedca15e'
            'fdc573980dce542774229ea9036e99e019ee0a382a271c08ddded9a5077a3e4b'
            'a01bf05bb49ee007d4527fa62dd0050507142d081fdeff22fd9aab85fe9c5230'
            'e19466f6f7430105e4f0cf777b7601bc2cb4ddb13835a3c82b646bc19376090b'
            '0eb513ad5c8753fc5dd352e784ab25a30f9f6310866084133acf0cb7998875f2'
            '9612d15a29539c30935369edb09554e1e54ce91dadfc205bcb9b8caecf3d7f69'
            '7ea576c62c70f7a26f135e8ea7aedc82ab2d670b213d8d8e861819bc84e99802'
            '0049eb8469635888d344599840e26495d225c34b4be5564e1b3e12ba0ac15eb5')
export PKGVER=$pkgver
@@ -51,6 +55,8 @@ package() {
	install -Dm0644 ../git.sr.ht.service -t "$pkgdir"/usr/lib/systemd/system/
	install -Dm0644 ../git.sr.ht-api.service -t "$pkgdir"/usr/lib/systemd/system/
	install -Dm0644 ../git.sr.ht-webhooks.service -t "$pkgdir"/usr/lib/systemd/system/
	install -Dm0644 ../git.sr.ht-periodic.service -t "$pkgdir"/usr/lib/systemd/system/
	install -Dm0644 ../git.sr.ht-periodic.timer -t "$pkgdir"/usr/lib/systemd/system/
	install -Dm0644 ../sysusers.conf "$pkgdir/usr/lib/sysusers.d/git.sr.ht.conf"
	install -Dm0644 ../tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/git.sr.ht.conf"
	python3 setup.py install --root="${pkgdir}" --optimize=1
diff --git a/git.sr.ht/git.sr.ht-periodic.service b/git.sr.ht/git.sr.ht-periodic.service
new file mode 120000
index 0000000..b981b6b
--- /dev/null
+++ b/git.sr.ht/git.sr.ht-periodic.service
@@ -0,0 +1 @@
/home/xenrox/git/sr.ht-pkgbuilds/git.sr.ht/git.sr.ht-periodic.service
\ No newline at end of file
diff --git a/git.sr.ht/git.sr.ht-periodic.timer b/git.sr.ht/git.sr.ht-periodic.timer
new file mode 100644
index 0000000..09f86f7
--- /dev/null
+++ b/git.sr.ht/git.sr.ht-periodic.timer
@@ -0,0 +1,9 @@
[Unit]
Description=Periodic git.sr.ht maintenance tasks

[Timer]
OnBootSec=20m
OnUnitActiveSec=20m

[Install]
WantedBy=timers.target
-- 
2.32.0

[PATCH sr.ht-pkgbuilds 6/6] meta.sr.ht: Add daily job as systemd timer Export this patch

---
 meta.sr.ht/PKGBUILD                 | 8 +++++++-
 meta.sr.ht/meta.sr.ht-daily.service | 8 ++++++++
 meta.sr.ht/meta.sr.ht-daily.timer   | 9 +++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 meta.sr.ht/meta.sr.ht-daily.service
 create mode 100644 meta.sr.ht/meta.sr.ht-daily.timer

diff --git a/meta.sr.ht/PKGBUILD b/meta.sr.ht/PKGBUILD
index f698652..d7e037a 100644
--- a/meta.sr.ht/PKGBUILD
+++ b/meta.sr.ht/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=meta.sr.ht
pkgver=0.54.4
pkgrel=2
pkgrel=3
pkgdesc="sr.ht core account services"
arch=("x86_64")
license=("AGPL3")
@@ -27,12 +27,16 @@ source=(
	"meta.sr.ht.service"
	"meta.sr.ht-api.service"
	"meta.sr.ht-webhooks.service"
	"meta.sr.ht-daily.service"
	"meta.sr.ht-daily.timer"
	"sysusers.conf"
)
sha256sums=('66b93ea959464eff4112aa965f54d5620b4a25409b9b18bb4376272c707395f8'
            '79b30d4b2275005a78cf29a185fab07301455557d631d6263ee28a2592a75067'
            'ac04fff6a22f1b194cf84f3a296cf2225f38c393e437f24bc3af3e3b677017a1'
            'ab67c3a803d8a06606584e0923223336c1bb297eb1384f77d00a035e68dbb7a3'
            '03c4404aa3a90eede3d03dbdf68abde261d89505979939e9c7f3cb1a7bd0d84d'
            '70e32d30d15551b70b5529df5805386d703ea39df9973175b79062d1b847f342'
            'b98af4986b4a470cf80d8651563946706717fb556cf31433581f22173ada93db')
export PKGVER=$pkgver

@@ -49,6 +53,8 @@ package() {
	install -Dm0644 ../meta.sr.ht-api.service -t "$pkgdir"/usr/lib/systemd/system/
	install -Dm0644 ../meta.sr.ht-webhooks.service \
		-t "$pkgdir"/usr/lib/systemd/system/
	install -Dm0644 ../meta.sr.ht-daily.service -t "$pkgdir"/usr/lib/systemd/system/
	install -Dm0644 ../meta.sr.ht-daily.timer -t "$pkgdir"/usr/lib/systemd/system/
	install -Dm0644 ../sysusers.conf "$pkgdir/usr/lib/sysusers.d/meta.sr.ht.conf"
	python3 setup.py install --root="${pkgdir}" --optimize=1
	cd api
diff --git a/meta.sr.ht/meta.sr.ht-daily.service b/meta.sr.ht/meta.sr.ht-daily.service
new file mode 100644
index 0000000..2642ec9
--- /dev/null
+++ b/meta.sr.ht/meta.sr.ht-daily.service
@@ -0,0 +1,8 @@
[Unit]
Description=meta.sr.ht job
After=network.target

[Service]
Type=oneshot
User=metasrht
ExecStart=/usr/bin/metasrht-daily
diff --git a/meta.sr.ht/meta.sr.ht-daily.timer b/meta.sr.ht/meta.sr.ht-daily.timer
new file mode 100644
index 0000000..2462204
--- /dev/null
+++ b/meta.sr.ht/meta.sr.ht-daily.timer
@@ -0,0 +1,9 @@
[Unit]
Description=Daily meta.sr.ht job

[Timer]
OnCalendar=daily
Persistent=true

[Install]
WantedBy=timers.target
-- 
2.32.0