~dricottone/huttese-apk

31f82abfc96d08223180936f5f6632f016631f83 — Dominic Ricottone 2 years ago 82ab309
Updates from first deployment

git.sr.ht target was mangled.

py3-colour, builds.sr.ht, and py3-srht target versions had to be bumped
down. The first is due to a unit test error; the others are due to
unreleased versions that apparently upstream is keeping private.

Several APKBUILD files had to be updated for version numbers and
checksums. Notably, py3-pygments had to be bumped down a version. It
seems that an updated APKBUILD was pushed to the repo before an updated
apk was pushed to the mirror. I am choosing to follow the mirror as the
canonical target.
M Makefile => Makefile +43 -10
@@ 6,11 6,11 @@ keys:
	openssl genrsa -out keys/me@dominic-ricottone.com.rsa 2048
	openssl rsa -in keys/me@dominic-ricottone.com.rsa -pubout -out keys/me@dominic-ricottone.com.rsa.pub

BUILDS_SR_HT=pkg/aarch64/builds.sr.ht-0.82.8-r0.apk
BUILDS_SR_HT=pkg/aarch64/builds.sr.ht-0.82.7-r0.apk
$(BUILDS_SR_HT): pkgsrc/builds.sr.ht/APKBUILD $(PY3_ANSI2HTML) $(PY3_CELERY) $(PY3_PGPY) $(PY3_SRHT)
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder builds.sr.ht

GIT_SR_HT=pkg/aarch64/git.sr.ht-78-22.0-r0.apk
GIT_SR_HT=pkg/aarch64/git.sr.ht-0.78.22-r0.apk
$(GIT_SR_HT): pkgsrc/git.sr.ht/APKBUILD $(PY3_MINIO) $(PY3_SCMSRHT)
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder git.sr.ht



@@ 18,11 18,11 @@ META_SR_HT=pkg/aarch64/meta.sr.ht-0.59.0-r0.apk
$(META_SR_HT): pkgsrc/meta.sr.ht/APKBUILD $(PY3_PGPY) $(PY3_SSHPUBKEYS) $(PY3_SRHT) $(PY3_ZXCVBN)
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder meta.sr.ht

PY3_AIOSMTPD=pkg/aarch64/py3-aiosmtpd-1.4.2-r0.apk
PY3_AIOSMTPD=pkg/aarch64/py3-aiosmtpd-1.4.2-r1.apk
$(PY3_AIOSMTPD): pkgsrc/py3-aiosmtpd/APKBUILD $(PY3_ATPUBLIC)
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-aiosmtpd

PY3_AMQP=pkg/aarch64/py3-amqp-5.1.0-r1.apk
PY3_AMQP=pkg/aarch64/py3-amqp-5.1.1-r0.apk
$(PY3_AMQP): pkgsrc/py3-amqp/APKBUILD $(PY3_VINE)
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-amqp



@@ 34,11 34,11 @@ PY3_ANYJSON=pkg/aarch64/py3-anyjson-0.3.3-r0.apk
$(PY3_ANYJSON): pkgsrc/py3-anyjson/APKBUILD
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-anyjson

PY3_ATPUBLIC=pkg/aarch64/py3-atpublic-2.3-r1.apk
PY3_ATPUBLIC=pkg/aarch64/py3-atpublic-2.3-r2.apk
$(PY3_ATPUBLIC): pkgsrc/py3-atpublic/APKBUILD
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-atpublic

PY3_BILLIARD=pkg/aarch64/py3-billiard-3.6.4.0-r0.apk
PY3_BILLIARD=pkg/aarch64/py3-billiard-4.0.0-r0.apk
$(PY3_BILLIARD): pkgsrc/py3-billiard/APKBUILD
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-billiard



@@ 46,7 46,7 @@ PY3_CASE=pkg/aarch64/py3-case-1.5.3-r0.apk
$(PY3_CASE): pkgsrc/py3-case/APKBUILD
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-case

PY3_CELERY=pkg/aarch64/py3-celery-5.2.6-r0.apk
PY3_CELERY=pkg/aarch64/py3-celery-5.2.7-r0.apk
$(PY3_CELERY): pkgsrc/py3-celery/APKBUILD $(PY3_AMQP) $(PY3_BILLIARD) $(PY3_CLICK_DIDYOUMEAN) $(PY3_CLICK_REPL) $(PY3_KOMBU) $(PY3_VINE)
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-celery



@@ 58,7 58,7 @@ PY3_CLICK_REPL=pkg/aarch64/py3-click-repl-0.2.0-r0.apk
$(PY3_CLICK_REPL): pkgsrc/py3-click-repl/APKBUILD
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-click-repl

PY3_COLOUR=pkg/aarch64/py3-colour-0.1.5-r3.apk
PY3_COLOUR=pkg/aarch64/py3-colour-0.1.5-r0.apk
$(PY3_COLOUR): pkgsrc/py3-colour/APKBUILD
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-colour



@@ 102,7 102,7 @@ PY3_PYGMENTS=pkg/aarch64/py3-pygments-2.11.2-r2.apk
$(PY3_PYGMENTS): pkgsrc/py3-pygments/APKBUILD $(PY3_WCAG_CONTRAST_RATIO)
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-pygments

PY3_SCMSRHT=pkg/aarch64/py3-scmsrht-0.22.21-r0.apk
PY3_SCMSRHT=pkg/aarch64/py3-scmsrht-0.22.22-r0.apk
$(PY3_SCMSRHT): pkgsrc/py3-scmsrht/APKBUILD $(BUILDS_SR_HT) $(PY3_SRHT)
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-scmsrht



@@ 114,7 114,7 @@ PY3_SSHPUBKEYS=pkg/aarch64/py3-sshpubkeys-3.3.1-r0.apk
$(PY3_SSHPUBKEYS): pkgsrc/py3-sshpubkeys/APKBUILD
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-sshpubkeys

PY3_SRHT=pkg/aarch64/py3-srht-0.69.5-r0.apk
PY3_SRHT=pkg/aarch64/py3-srht-0.69.4-r0.apk
$(PY3_SRHT): $(PY3_CELERY) $(PY3_HUMANIZE) $(PY3_MISTLETOE) $(PY3_PGPY) $(PY3_PYGMENTS) $(PY3_SQLALCHEMY_UTILS)
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-srht



@@ 134,3 134,36 @@ TODO_SR_HT=pkg/aarch64/todo.sr.ht-0.72.8-r0.apk
$(TODO_SR_HT): pkgsrc/todo.sr.ht/APKBUILD $(PY3_AIOSMTPD) $(PY3_SRHT)
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder todo.sr.ht

all: $(BUILDS_SR_HT) \
	$(GIT_SR_HT) \
	$(META_SR_HT) \
	$(PY3_AIOSMTPD) \
	$(PY3_AMQP) \
	$(PY3_ANSI2HTML) \
	$(PY3_ANYJSON) \
	$(PY3_ATPUBLIC) \
	$(PY3_BILLIARD) \
	$(PY3_CASE) \
	$(PY3_CELERY) \
	$(PY3_CLICK_DIDYOUMEAN) \
	$(PY3_CLICK_REPL) \
	$(PY3_COLOUR) \
	$(PY3_FURL) \
	$(PY3_HUMANIZE) \
	$(PY3_INFINITY) \
	$(PY3_INTERVALS) \
	$(PY3_KOMBU) \
	$(PY3_MINIO) \
	$(PY3_MISTLETOE) \
	$(PY3_ORDEREDMULTIDICT) \
	$(PY3_PGPY) \
	$(PY3_PYGMENTS) \
	$(PY3_SCMSRHT) \
	$(PY3_SQLALCHEMY_UTILS) \
	$(PY3_SSHPUBKEYS) \
	$(PY3_SRHT) \
	$(PY3_VINE) \
	$(PY3_WCAG_CONTRAST_RATIO) \
	$(PY3_ZXCVBN) \
	$(TODO_SR_HT)


A README.md => README.md +26 -0
@@ 0,0 1,26 @@
# huttese-apk

A containerized build process for huttese APKs.

The package source code (chiefly `APKBUILD` files) are found in `pkgsrc/`.

The packages are found in `pkg/` after building (i.e. `make $pkg`).
To use these packages, update `/etc/apk/repositories` to include this folder.
Works for Dockerfiles, too; just mount the directory.

The packaging keys are found in `keys/` after generating (i.e. `make keys`)

## To Do

The `make all` recipe does not order packages intelligently.
There are interdependencies and as such the packages need to built in an order.
The recipe should be updated to reflect this.
In the meantime, run `make all` repeatedly until there is nothing to do.

## License

Derivative of Drew DeVault's sr.ht-apkbuilds.
His license is redistributed here in `LICENSE`.
The original license can be found at
[https://git.sr.ht/~sircmpwn/sr.ht-apkbuilds/tree/master/item/LICENSE].


M pkgsrc/builds.sr.ht/APKBUILD => pkgsrc/builds.sr.ht/APKBUILD +3 -3
@@ 1,6 1,6 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=builds.sr.ht
pkgver=0.74.10
pkgver=0.82.7
pkgrel=0
pkgdesc="sr.ht build service"
url="https://git.sr.ht/~sircmpwn/builds.sr.ht"


@@ 87,8 87,8 @@ _nginx() {
}

sha512sums="
668ea5cda4ff65b6c3de87dffe993dd33232ae7ace0f45630410c991cd54038e82f8088bb039db5360125a87b650af47e9e5491ded0148bc067fc2a1c7b7e695  builds.sr.ht-0.74.10.tar.gz
917bbc9a493f6aa756af3f3597f9edf2e25227efe30f6ab635f99a7d9f4ecd6e9f36a7f2b9b40cc95b6e584dd62e1a0badb46e4ff9d3c3d5ce959455b15a95b6  sr.ht-nginx-0.74.10.tar.gz
bfb61e6c2411be5b5196025f273bf2e4eb01b2a471f73b108d702e2e5afc54c3dab8b6fa0fbc607d573f5dd1154ec7df125fe94b53ed2ebdba3489bb94709416  builds.sr.ht-0.82.7.tar.gz
6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20  sr.ht-nginx-0.82.7.tar.gz
d205043f3fe0dc022d25f8714ad5fb095a7dc92a10fe4eb4a1c6d6a500b54692773c1e314e9337a320f9b6043225a9a5a9e50d9a5dc30e7c80305b7ad538ea0f  builds.sr.ht.confd
ea8b25d92e53d62bff2466d048d9a34482d9d06a2d6bdb828ce9d036009cdb2ca7435c288f79b51860539399acdb3c27eda268e8ec7a7fcfa2969961959b2d0e  builds.sr.ht.initd
a507ea33f4e87d41d68b42f816914d357ff687e249e424f2278e3c44e980774080377ca5daa02212776095402ba7e271355d427750270005cf6f6db079040a08  builds.sr.ht-api.confd

M pkgsrc/git.sr.ht/APKBUILD => pkgsrc/git.sr.ht/APKBUILD +3 -3
@@ 1,6 1,6 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=git.sr.ht
pkgver=0.75.1
pkgver=0.78.22
pkgrel=0
pkgdesc="sr.ht git service"
url="https://git.sr.ht/~sircmpwn/git.sr.ht"


@@ 68,8 68,8 @@ _nginx() {
}

sha512sums="
bef609483179a366cd4d467b07f8b4419a11a1c49d32beafc30245bf9cdab4ef65960cb462f7a47b43a1976186dac43d755395d1fe4c0e008541e51a0b5c8795  git.sr.ht-0.75.1.tar.gz
917bbc9a493f6aa756af3f3597f9edf2e25227efe30f6ab635f99a7d9f4ecd6e9f36a7f2b9b40cc95b6e584dd62e1a0badb46e4ff9d3c3d5ce959455b15a95b6  sr.ht-nginx-0.75.1.tar.gz
c047e9ff085b06a2d60ff3a1ed720490e5e2db78053b6421e6ae267db9657b8b02f73497e34e20e9acdfbd557331c3f6dcdee77b641e66738ccc42b27ec4d40e  git.sr.ht-0.78.22.tar.gz
6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20  git.sr.ht-nginx-0.78.22.tar.gz
bab6312b5a6d1bd9808cb6eae2b33f1fc4f544ac286ce9a67f4c07fc8d4679dc81d93f3d1ec7f8adad3dedead9203b5d10ab63aff478fb11780790e7a01a232a  git.sr.ht.initd
7462f15928aa24b10e63041b0021aa5a69fa92d071f497d6b1dc353dac3bff30818cb560c6011effbd619d450e8b8c6f8f3ab07a1df9714ea79b00e4d12dcf44  git.sr.ht.confd
370a9f710704d7dfe88632f0ae2b7d2b406621322cab1f87f4f4c3984c741fba616f9c2a806d83e79250dc58aba89161a2db8ca424794dbd2cacbffb6e1a9adb  git.sr.ht-api.initd

M pkgsrc/meta.sr.ht/APKBUILD => pkgsrc/meta.sr.ht/APKBUILD +3 -3
@@ 1,6 1,6 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=meta.sr.ht
pkgver=0.57.0
pkgver=0.59.0
pkgrel=0
pkgdesc="sr.ht account service"
url="https://git.sr.ht/~sircmpwn/meta.sr.ht"


@@ 75,8 75,8 @@ _nginx() {
}

sha512sums="
fc2c4560425d715e10cf3ff00b4afc7efbb537d08b6a654a64466f16f0943bb76818c00a7f1d54a647fcdbb78d82b70134c28bdb5a537030d189cf2de9a74145  meta.sr.ht-0.57.0.tar.gz
917bbc9a493f6aa756af3f3597f9edf2e25227efe30f6ab635f99a7d9f4ecd6e9f36a7f2b9b40cc95b6e584dd62e1a0badb46e4ff9d3c3d5ce959455b15a95b6  sr.ht-nginx-0.57.0.tar.gz
6f1ebee27a1d6b44bbf0d032638e7af3a8d950b232a464e731fb62c7f785a19b7685e4154428693bbda9706fdbe01c78b1ff54d5fbfa6593e16851b945f0f7b4  meta.sr.ht-0.59.0.tar.gz
6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20  sr.ht-nginx-0.59.0.tar.gz
f84bb7c0532a27b1a2425726a79b329d4782eb459571c289d793beabfe9334ffbca53bcb19a699e1f0a7d696fe57cf8c0692f72576351d9cf4b9f8f325222eaf  meta.sr.ht.initd
01ef7929b8a4cb52eed0909b665dade805b6973ed6d30fc8e1aa7b72471a59951495cf7669f7bf80ffae8d681002be7d548bcc2b04365c3295b1c3794b2b9759  meta.sr.ht.confd
8377026251395fa74980a6733a6715c5dcfa6b893ad846d556479d3170605ba7cbe5dcc1c482f90a20e0b6332732cba9480d198dfcc9d73d2d6e338e5276bc65  meta.sr.ht-api.initd

M pkgsrc/py3-pygments/APKBUILD => pkgsrc/py3-pygments/APKBUILD +3 -3
@@ 2,8 2,8 @@
# Maintainer: Matt Smith <mcs@darkregion.net>
pkgname=py3-pygments
_pkgname=Pygments
pkgver=2.12.0
pkgrel=0
pkgver=2.11.2
pkgrel=2
pkgdesc="Syntax highlighting package written in Python"
url="https://pygments.org/"
arch="noarch"


@@ 59,6 59,6 @@ doc() {
}

sha512sums="
70bbfaefeb34f9afb5d74aa924ac3da4a913d1c7f607c0b3f80b6cd25c88a8996e516a689062bf2009c472b29999e309eb044f0f427fa1ea8479bf921b51c524  Pygments-2.12.0.tar.gz
606ff0c35fa47882f4c5c3794827132e1ee6ccbb4895ae858f9c93ea0c92b73163c9f4d630b51a8bb782ba0b4944a66d1059ad5d017d3191a0a5b30c1e5b8f9f  Pygments-2.11.2.tar.gz
9787753652d4ae322d8fdb11464a6b1682e77070284a2b173e0087435a6aeb10b7320b327a957363a7eb94ff763446ee451e04dd91b25f901a72128fb2e2bb56  0001-lexers-add-Hare.patch
"

M pkgsrc/py3-scmsrht/APKBUILD => pkgsrc/py3-scmsrht/APKBUILD +2 -2
@@ 1,7 1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgbase=scm.sr.ht
pkgname=py3-scmsrht
pkgver=0.22.21
pkgver=0.22.22
pkgrel=0
pkgdesc="sr.ht shared code"
url="https://git.sr.ht/~sircmpwn/scm.sr.ht"


@@ 34,5 34,5 @@ package() {
}

sha512sums="
903432f6ba104949bbc83b77538b45e36fe8a3354afbac0e053fe4bb33380a44ec7208a0bb3a333c5933df3bed5c23cd4883ba39ca4161ccc70df3b0ff863087  scm.sr.ht-0.22.21.tar.gz
11ef7c1368a0f76ff273d49820b87a5a0c008057ed1c51c47460468bf4252f5e835a828e2a9dff8d289f83931d9f1e67038a63c18c621ec481765ab3247884ae  scm.sr.ht-0.22.22.tar.gz
"

M pkgsrc/py3-srht/APKBUILD => pkgsrc/py3-srht/APKBUILD +2 -2
@@ 1,7 1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgbase=core.sr.ht
pkgname=py3-srht
pkgver=0.68.14
pkgver=0.69.4
pkgrel=0
pkgdesc="sr.ht shared code"
url="https://git.sr.ht/~sircmpwn/core.sr.ht"


@@ 58,5 58,5 @@ package() {
}

sha512sums="
333702c31f57052e0631e283db9c859e54d51ff7d7ec2f7cab3f7e83293a5ca313b972d2f08ecc30c5587ae894b42dd2c78852abb2a675acba3f6c802e5a8f6b  core.sr.ht-0.68.14.tar.gz
a76bd858fb96f20d9a2036cb48e19fc9f2519d82e87955cb6bb301693cfbc82fd6a5fd99c36930419813e14e7c5ab2a83e983c35145c8d8c22a4774a03636b17  core.sr.ht-0.69.4.tar.gz
"

M pkgsrc/todo.sr.ht/APKBUILD => pkgsrc/todo.sr.ht/APKBUILD +3 -3
@@ 1,6 1,6 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=todo.sr.ht
pkgver=0.65.3
pkgver=0.72.8
pkgrel=0
pkgdesc="sr.ht ticket tracking service"
url="https://git.sr.ht/~sircmpwn/todo.sr.ht"


@@ 68,8 68,8 @@ _nginx() {
}

sha512sums="
80be26b91afc1da906518a9edeb8855fa3ea721c22faaf61929b1531f15bfc05343a4ffd66cacd4f8333d63d528f06459181e363cb18b27682bbf18bafa0a239  todo.sr.ht-0.65.3.tar.gz
917bbc9a493f6aa756af3f3597f9edf2e25227efe30f6ab635f99a7d9f4ecd6e9f36a7f2b9b40cc95b6e584dd62e1a0badb46e4ff9d3c3d5ce959455b15a95b6  sr.ht-nginx-0.65.3.tar.gz
982aa32a7e429bb2c5321c6b96c93ddca9f366c93f770f50ea0368bff6ff65a8e00603c884f53a3c047c93623cd454681551035c9f0d0865ca4d96b289cf5500  todo.sr.ht-0.72.8.tar.gz
6a1be43d5e3caa98ebcfc9546cb46a9abf4691a6a772c24ba8872b54c3dca6c65f2615443be74d59f262d0be3b0972a326f659fd860f6fc73e48b08b07283f20  sr.ht-nginx-0.72.8.tar.gz
946a15e8a723dea178edc451b461f756761a9429fd434820df1955225a9fe73c7aefb838ec32bb9f3a3f7b80a5921641540cdf5fcde3fff272420ea1abe3970e  todo.sr.ht.initd
a71116bd25e0c6e8e3e14e4dadb653e6360e2b468bd415439559b56ffc18724efa9bcb593181d8f0fe0cbccf96f3196a452659bb4375e687faf0b09a48ef5557  todo.sr.ht.confd
c4ac342b5fa506c1323d9c55f36b800e16cb9afdecc32f94bf7261c8fa2710db839b84137d24f3e43ac28e036cf21f63c381a650661e722e416c61a6cf44c938  todo.sr.ht-lmtp.initd