From e4084ff7dbd1137860d6a5081512e7b347951c22 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 16:17:02 +0000
Subject: [PATCH 01/18] system/skalibs: simplify APKBUILD
---
system/skalibs/APKBUILD | 40 +++++++---------------------------------
1 file changed, 7 insertions(+), 33 deletions(-)
diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD
index 5922ef183f..90b07644dd 100644
--- a/system/skalibs/APKBUILD
+++ b/system/skalibs/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=skalibs
pkgver=2.14.1.1
-pkgrel=0
+pkgrel=1
pkgdesc="A set of general-purpose C programming libraries for skarnet.org software"
url="https://skarnet.org/software/skalibs/"
arch="all"
options="!check" # No test suite.
license="ISC"
-subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
@@ -21,40 +21,14 @@ build() {
package() {
make DESTDIR="$pkgdir" install
+ mkdir -p -m 0755 "$pkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
-
-libs() {
- pkgdesc="$pkgdesc (shared libraries)"
- depends=""
- mkdir -p "$subpkgdir/lib"
- mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/"
-}
-
-
dev() {
- pkgdesc="$pkgdesc (development files)"
- depends=""
- install_if="dev $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir"
- mv "$pkgdir/usr" "$subpkgdir/"
-}
-
-
-libsdev() {
- pkgdesc="$pkgdesc (development files for dynamic linking)"
- depends="$pkgname-dev"
- mkdir -p "$subpkgdir/lib"
- mv "$pkgdir"/lib/*.so "$subpkgdir/lib/"
-}
-
-
-doc() {
- pkgdesc="$pkgdesc (documentation)"
- depends=""
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ default_dev
+ mkdir -p -m 0755 "$subpkgdir/usr/lib/skalibs"
+ mv "$pkgdir/usr/lib/skalibs/sysdeps" "$subpkgdir/usr/lib/skalibs/"
}
sha512sums="01b3da7614ee626f838b62aff6fa2d4677ab5c5dfffcb3145232db9ac0b5bf70c063f4d83abdee809139fee721c75550eb997e2c3e265417b9493c98886236f9 skalibs-2.14.1.1.tar.gz"
--
GitLab
From 2a5548f8d66da1529df1223a77188d5558a5b967 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 13:30:10 +0000
Subject: [PATCH 02/18] system/execline: upgrade to 2.9.5.0
---
system/execline/APKBUILD | 41 +++++-----------------------------------
1 file changed, 5 insertions(+), 36 deletions(-)
diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD
index 03636477f9..766903e64b 100644
--- a/system/execline/APKBUILD
+++ b/system/execline/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=execline
-pkgver=2.9.4.0
+pkgver=2.9.5.0
pkgrel=0
pkgdesc="A small scripting language for non-interactive scripts"
url="https://skarnet.org/software/execline/"
@@ -10,7 +10,7 @@ options="!check" # No test suite.
license="ISC"
_skalibs_version=2.14
makedepends="skalibs-dev>=$_skalibs_version"
-subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
+subpackages="$pkgname-libs $pkgname-dev $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
@@ -27,39 +27,8 @@ build() {
package() {
make DESTDIR="$pkgdir" install
+ mkdir -p -m 0755 "$pkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
-libs() {
- pkgdesc="$pkgdesc (shared libraries)"
- depends="skalibs-libs>=$_skalibs_version"
- mkdir -p "$subpkgdir/lib"
- mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/"
-}
-
-
-dev() {
- pkgdesc="$pkgdesc (development files)"
- depends="skalibs-dev>=$_skalibs_version"
- install_if="dev $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr"
- mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/"
-}
-
-
-libsdev() {
- pkgdesc="$pkgdesc (development files for dynamic linking)"
- depends="$pkgname-dev"
- mkdir -p "$subpkgdir/lib"
- mv "$pkgdir"/lib/*.so "$subpkgdir/lib/"
-}
-
-
-doc() {
- pkgdesc="$pkgdesc (documentation)"
- depends=""
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
-}
-
-sha512sums="11d96863d2f90abc371656e17bac9fd83f1303337444db5a1f24e8a02cab654a3b5e9081af130d5cbca5a4f6ea5cf5f6c2affa66e2b4a9eb39c20410efeb8795 execline-2.9.4.0.tar.gz"
+sha512sums="a625dbf8d8ee461aaa4e8a1482ea4f5925c6e37ebd0c68fc39df8ebd25ed2d24769b36e9370a3b44eb6891ed7dc7954db998aa16b3a83d46e04bf1acce5570ca execline-2.9.5.0.tar.gz"
--
GitLab
From 86d4e09940879f1959e6afeaf2302c29cfe87394 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 16:55:56 +0000
Subject: [PATCH 03/18] system/utmps: simplify APKBUILD
---
system/utmps/APKBUILD | 39 +++++----------------------------------
1 file changed, 5 insertions(+), 34 deletions(-)
diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD
index 9653da1284..2a10a007bd 100644
--- a/system/utmps/APKBUILD
+++ b/system/utmps/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=utmps
pkgver=0.1.2.2
-pkgrel=0
+pkgrel=1
pkgdesc="A secure utmp/wtmp implementation"
url="https://skarnet.org/software/utmps/"
arch="all"
@@ -11,7 +11,7 @@ license="ISC"
depends="execline s6"
_skalibs_version=2.14
makedepends="skalibs-dev>=$_skalibs_version"
-subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc $pkgname-openrc"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-openrc"
install="$pkgname.post-upgrade"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
utmpd.run
@@ -35,9 +35,10 @@ build() {
package() {
make DESTDIR="$pkgdir" install
runimage="$pkgdir/etc/s6-linux-init/current/run-image"
- mkdir -p -m 0755 "$runimage/utmps"
+ mkdir -p -m 0755 "$runimage/utmps" "$pkgdir/usr/share/doc"
chown utmp:utmp "$runimage/utmps"
- install -D -m755 "$srcdir/utmps.initd" "$pkgdir/etc/init.d/utmps"
+ install -D -m 0755 "$srcdir/utmps.initd" "$pkgdir/etc/init.d/utmps"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
openrc() {
@@ -61,36 +62,6 @@ openrc() {
ln -s ../../init.d/utmps "$rldir/utmps"
}
-libs() {
- pkgdesc="$pkgdesc (shared libraries)"
- depends="skalibs-libs>=$_skalibs_version"
- mkdir -p "$subpkgdir/lib"
- mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/"
-}
-
-dev() {
- pkgdesc="$pkgdesc (development files)"
- depends="skalibs-dev>=$_skalibs_version"
- install_if="dev $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr"
- mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/"
-}
-
-libsdev() {
- pkgdesc="$pkgdesc (development files for dynamic linking)"
- depends="$pkgname-dev"
- mkdir -p "$subpkgdir/lib"
- mv "$pkgdir"/lib/*.so "$subpkgdir/lib/"
-}
-
-doc() {
- pkgdesc="$pkgdesc (documentation)"
- depends=""
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
-}
-
sha512sums="57a73658ecb947af9dfad7a5e2931660ad1b8fa61d36c803c373e8aba13e9afa8398c1522765f5ea2b5df87d942cea17062faf30f589afa6acc744ff3ae4a409 utmps-0.1.2.2.tar.gz
0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run
9e875a5cd37be531320a8e582afed2c980dd0a1bdfc2f6f3d826d5e5389fc6ab93f973ed1506edb23f4c73cf24a2357aefe856148eaacff86c2aafe376c575e2 wtmpd.run
--
GitLab
From 0d5a660ecab48aa1174dc3e82e95c27b8d11db79 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 16:59:55 +0000
Subject: [PATCH 04/18] system/s6: simplify APKBUILD
---
system/s6/APKBUILD | 43 +++++--------------------------------------
1 file changed, 5 insertions(+), 38 deletions(-)
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index c3460458c9..4a6d060cf4 100644
--- a/system/s6/APKBUILD
+++ b/system/s6/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6
-pkgver=2.12.0.3
+pkgver=2.12.0.4
pkgrel=0
pkgdesc="skarnet.org's small & secure supervision software suite"
url="https://skarnet.org/software/s6/"
@@ -12,7 +12,7 @@ _skalibs_version=2.14.1
depends="execline"
makedepends="skalibs-dev>=$_skalibs_version execline-dev"
install="$pkgname.post-upgrade"
-subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
triggers="$pkgname.trigger=/run/service"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
@@ -30,41 +30,8 @@ build() {
package() {
make DESTDIR="$pkgdir" install
- mkdir -p -m 0755 "$pkgdir/var/lib/s6/services"
+ mkdir -p -m 0755 "$pkgdir/var/lib/s6/services" "$pkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
-
-libs() {
- pkgdesc="$pkgdesc (shared libraries)"
- depends="skalibs-libs>=$_skalibs_version"
- mkdir -p "$subpkgdir/lib"
- mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/"
-}
-
-
-dev() {
- pkgdesc="$pkgdesc (development files)"
- depends="skalibs-dev>=$_skalibs_version"
- install_if="dev $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr"
- mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/"
-}
-
-
-libsdev() {
- pkgdesc="$pkgdesc (development files for dynamic linking)"
- depends="$pkgname-dev"
- mkdir -p "$subpkgdir/lib"
- mv "$pkgdir"/lib/*.so "$subpkgdir/lib/"
-}
-
-
-doc() {
- pkgdesc="$pkgdesc (documentation)"
- depends=""
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
-}
-
-sha512sums="ecc57b5a06fb413d74337324f8942c905075cf14d87c1471568a836c747271cf95d0edecac69dea54cee55f7a3dbd102493876356c2d36065ab35962b87b559a s6-2.12.0.3.tar.gz"
+sha512sums="dfdb9c0189177762a89d1f47e1d6b0a82bba5554baef4fa899b1c0a85c192d5e1dac2b929173d750df3707f0d699b28591f1eab3e63b8791e4a51af1c65e3e56 s6-2.12.0.4.tar.gz"
--
GitLab
From 503e8ce2cbe2e0498f9227e5da4e9a50d9de6b61 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 16:10:12 +0000
Subject: [PATCH 05/18] user/tipidee: new package
---
user/tipidee/APKBUILD | 80 +++++++++++++++++++++++++++++++
user/tipidee/httpd.run | 19 ++++++++
user/tipidee/httpsd.run | 23 +++++++++
user/tipidee/logger.run | 5 ++
user/tipidee/tipidee.conf | 18 +++++++
user/tipidee/tipidee.confd | 33 +++++++++++++
user/tipidee/tipidee.initd | 65 +++++++++++++++++++++++++
user/tipidee/tipidee.post-install | 7 +++
user/tipidee/tipidee.pre-install | 7 +++
9 files changed, 257 insertions(+)
create mode 100644 user/tipidee/APKBUILD
create mode 100644 user/tipidee/httpd.run
create mode 100644 user/tipidee/httpsd.run
create mode 100644 user/tipidee/logger.run
create mode 100644 user/tipidee/tipidee.conf
create mode 100644 user/tipidee/tipidee.confd
create mode 100644 user/tipidee/tipidee.initd
create mode 100644 user/tipidee/tipidee.post-install
create mode 100644 user/tipidee/tipidee.pre-install
diff --git a/user/tipidee/APKBUILD b/user/tipidee/APKBUILD
new file mode 100644
index 0000000000..593b19daed
--- /dev/null
+++ b/user/tipidee/APKBUILD
@@ -0,0 +1,80 @@
+# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
+# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
+pkgname=tipidee
+pkgver=0.0.4.0
+pkgrel=0
+pkgdesc="The skarnet.org web server"
+url="https://skarnet.org/software/tipidee/"
+arch="all"
+options="!check" # No test suite.
+license="ISC"
+depends="execline s6 s6-networking"
+makedepends="skalibs-dev>=2.14.1.1"
+subpackages="tipidee-dev tipidee-libs tipidee-doc tipidee-openrc"
+source="
+ https://skarnet.org/software/tipidee/tipidee-$pkgver.tar.gz
+ httpd.run
+ httpsd.run
+ logger.run
+ tipidee.conf
+ tipidee.confd
+ tipidee.initd
+ "
+install="
+ tipidee.pre-install
+ tipidee.post-install
+ "
+
+build() {
+ ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --enable-shared \
+ --enable-static \
+ --disable-allstatic \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libdir=/usr/lib \
+ --libexecdir="/usr/lib/$pkgname" \
+ --with-dynlib=/lib
+ make
+}
+
+_makeservicedir() {
+ name="http${1}d-${2}"
+ fn="$pkgdir/var/lib/tipidee/services/$name"
+ mkdir -p -m 0755 "$fn/log"
+ echo 3 > "$fn/log/notification-fd"
+ sed -e "s/@S@/${1}/g; s/@V@/${2}/g;" "$srcdir/logger.run" > "$fn/log/run"
+ chmod 0755 "$fn/log/run"
+ echo 3 > "$fn/notification-fd"
+ sed -e "s/@V@/${2}/g;" "$srcdir/http${1}d.run" > "$fn/run"
+ chmod 0755 "$fn/run"
+}
+
+package() {
+ mkdir -p -m 0755 "$pkgdir/etc" "$pkgdir/usr/share/doc" "$pkgdir/var/lib/tipidee/docroot"
+ make DESTDIR="$pkgdir" install
+ cp "$srcdir/tipidee.conf" "$pkgdir/etc/tipidee.conf"
+ for i in '' s ; do for j in 4 6 ; do
+ _makeservicedir "$i" "$j"
+ done ; done
+ install -m 0644 -D "$srcdir/tipidee.confd" "$pkgdir/etc/conf.d/tipidee"
+ install -m 0755 -D "$srcdir/tipidee.initd" "$pkgdir/etc/init.d/tipidee"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
+}
+
+dev() {
+ default_dev
+
+ # default_dev please stop being stupid
+ mv "$subpkgdir/usr/bin/tipidee-config" "$pkgdir/usr/bin/tipidee-config"
+}
+
+sha512sums="d177f4c00db9855792dbddc4c96d2c75bd302443f29376e1d35d511d56964e5de11dd2cf4af3190d7465404c429eedfc17264715e4850d6b830a9e492ff25741 tipidee-0.0.4.0.tar.gz
+0de0d6bd39adfd6e65694335e9cf06cec7625032e6af5cf5e54ced5c009707ca4e27b2dbdff8b7825575fbef7cd98ac0333e07b1924f24fda23019c92c08023f httpd.run
+65cdbfb5a6485aed0203ed910af124b202994d5253cb365ed25432f0c906471dd30f96eb862b6f25004c6ec8ec4cb38a5b49cde717e7a00d7c9d7fd07025f225 httpsd.run
+b5af306fe7040f966b13da84bfb0c4b528683c03205519d08fe429ee826ffad27c9ddb32be8c8bf8b42ce7964ef15572e3c66a96494aed833ee951c769f81bd2 logger.run
+bb2681a3000133724bb8fd4918bc3209ea676c2e4f96ad8b298d8e7302aeebd6876341ea205f2d808f34e4c9b5c138bba032694c6069c17026b0ddf23702f9ba tipidee.conf
+7a999200ad21b2b0737ce82136bc8e055d7ab4a865b7727e6dc8df0eaeea6ace11eb5756b64231ce7938d11b5ec218944173ea1df3db059d033bf3f848c9a608 tipidee.confd
+13e27b5c9f8ed6b1186b41bce6ffc280146643cb7b568958f24b63a4d73fcb7a147b68cd7cf74812ca55a2a5ae3b3717f177ea1546be7d30a86ff09954d9ec0f tipidee.initd"
diff --git a/user/tipidee/httpd.run b/user/tipidee/httpd.run
new file mode 100644
index 0000000000..356ad99524
--- /dev/null
+++ b/user/tipidee/httpd.run
@@ -0,0 +1,19 @@
+#!/bin/execlineb -S1
+
+fdmove -c 2 1
+emptyenv -p
+fdmove 1 3
+envfile /etc/conf.d/tipidee
+unexport HTTP
+unexport HTTPS
+multisubstitute
+{
+ importas -ui TIPIDEED_IPv@V@ TIPIDEED_IPv@V@
+ importas -ui TIPIDEED_ROOT TIPIDEED_ROOT
+ importas -u -D1000 TIPIDEED_CONCURRENCY TIPIDEED_CONCURRENCY
+ importas -u -D10 TIPIDEED_LOCAL_CONCURRENCY TIPIDEED_LOCAL_CONCURRENCY
+}
+s6-envuidgid tipideed
+cd ${TIPIDEED_ROOT}
+s6-tcpserver -1 -U -c ${TIPIDEED_CONCURRENCY} -C ${TIPIDEED_LOCAL_CONCURRENCY} -- ${TIPIDEED_IPv@V@} 80
+tipideed
diff --git a/user/tipidee/httpsd.run b/user/tipidee/httpsd.run
new file mode 100644
index 0000000000..9d710158a0
--- /dev/null
+++ b/user/tipidee/httpsd.run
@@ -0,0 +1,23 @@
+#!/bin/execlineb -S1
+
+fdmove -c 2 1
+emptyenv -p
+fdmove 1 3
+envfile /etc/conf.d/tipidee
+unexport HTTP
+unexport HTTPS
+multisubstitute
+{
+ importas -ui TIPIDEED_IPv@V@ TIPIDEED_IPv@V@
+ importas -ui TIPIDEED_ROOT TIPIDEED_ROOT
+ importas -ui KEYFILE KEYFILE
+ importas -ui CERTFILE CERTFILE
+ importas -u -D1000 TIPIDEED_CONCURRENCY TIPIDEED_CONCURRENCY
+ importas -u -D10 TIPIDEED_LOCAL_CONCURRENCY TIPIDEED_LOCAL_CONCURRENCY
+}
+s6-envuidgid tipideed
+export TLS_UID 65534
+export TLS_GID 65534
+cd ${TIPIDEED_ROOT}
+s6-tlsserver -1 -U -K 5000 -c ${TIPIDEED_CONCURRENCY} -C ${TIPIDEED_LOCAL_CONCURRENCY} -- ${TIPIDEED_IPv@V@} 443
+tipideed
diff --git a/user/tipidee/logger.run b/user/tipidee/logger.run
new file mode 100644
index 0000000000..3f17857033
--- /dev/null
+++ b/user/tipidee/logger.run
@@ -0,0 +1,5 @@
+#!/bin/execlineb -S1
+
+s6-setuidgid tipideelog
+exec -c
+s6-log -d3 -- t s1000000 /var/log/http@S@d-@V@
diff --git a/user/tipidee/tipidee.conf b/user/tipidee/tipidee.conf
new file mode 100644
index 0000000000..40bba13f9f
--- /dev/null
+++ b/user/tipidee/tipidee.conf
@@ -0,0 +1,18 @@
+# This is where the behaviour of the tipidee web server is
+# configured.
+# See https://skarnet.org/software/tipidee/tipidee.conf.html
+# for the full documentation of the syntax.
+
+# The defaults work well, but here are some example directives that
+# you can uncomment if you find them applicable to your setup.
+
+# global read_timeout 60000
+# global write_timeout 60000
+# global cgi_timeout 5000
+# index-file index.html index.cgi
+# log start ip hostname request resource answer answer_size
+# custom-header always Strict-Transport-Security max-age=63072000; includeSubDomains; preload
+#
+# domain example.com
+# nph-prefix nph-
+# cgi /cgi-bin/
diff --git a/user/tipidee/tipidee.confd b/user/tipidee/tipidee.confd
new file mode 100644
index 0000000000..d47fb589f0
--- /dev/null
+++ b/user/tipidee/tipidee.confd
@@ -0,0 +1,33 @@
+# Configuration for the tipidee web server.
+
+# The IPs you want the tipidee server to listen on.
+# Comment to disable.
+TIPIDEED_IPv4=0.0.0.0
+TIPIDEED_IPv6=::
+
+# Serve plaintext HTTP? true or false
+HTTP=true
+
+# Serve HTTPS? true or false
+HTTPS=false
+
+# If HTTPS is true, KEYFILE should point to
+# your private key, and CERTFILE should point to your certificate.
+# KEYFILE=
+# CERTFILE=
+
+# Total authorized concurrent connections. Don't go above 5000 or so.
+TIPIDEED_CONCURRENCY=1000
+
+# Authorized concurrent connections *per IP*.
+TIPIDEED_LOCAL_CONCURRENCY=10
+
+# The server root. Make sure this directory exists, is readable by
+# the tipideed user, and does *not* belong to the tipideed user.
+# The documents need to be stored under subdirectories of TIPIDEED_ROOT,
+# one subdirectory per virtual domain you're serving.
+TIPIDEED_ROOT=/var/lib/tipidee/docroot
+
+# Also check the /etc/tipidee.conf file for detailed configuration of
+# logging, document attributes, etc.
+# Run tipidee-config after editing /etc/tipidee.conf.
diff --git a/user/tipidee/tipidee.initd b/user/tipidee/tipidee.initd
new file mode 100644
index 0000000000..ebd0787a7c
--- /dev/null
+++ b/user/tipidee/tipidee.initd
@@ -0,0 +1,65 @@
+#!/sbin/openrc-run
+
+description="Start/stop the tipidee services"
+
+depend()
+{
+ after net
+ after localmount
+}
+
+_get_services()
+{
+ . /etc/conf.d/tipidee
+ list=
+ if "$HTTP" ; then
+ if test -n "$TIPIDEED_IPv4" ; then
+ list="httpd-4"
+ fi
+ if test -n "$TIPIDEED_IPv6" ; then
+ list="$list httpd-6"
+ fi
+ fi
+ if "$HTTPS" ; then
+ if test -n "$TIPIDEED_IPV4" ; then
+ list="httpsd-4"
+ fi
+ if test -n "$TIPIDEED_IPV6" ; then
+ list="$list httpsd-6"
+ fi
+ fi
+ echo $list
+}
+
+stop()
+{
+ ebegin "Stopping the tipidee services"
+ for i in `_get_services` ; do
+ s6-svunlink /run/service "$i"
+ done
+ eend $?
+}
+
+start()
+{
+ ebegin "Starting the tipidee services"
+ for i in `_get_services` ; do
+ s6-svlink -t10000 /run/service "/var/lib/tipidee/services/$i"
+ done
+ eend $?
+}
+
+status()
+{
+ for i in `_get_services` ; do
+ echo -n "${i}: "
+ s6-svstat "/run/service/${i}"
+ done
+}
+
+restart()
+{
+ for i in `_get_services` ; do
+ s6-svc -rwR "/run/service/$i"
+ done
+}
diff --git a/user/tipidee/tipidee.post-install b/user/tipidee/tipidee.post-install
new file mode 100644
index 0000000000..9ff3c9691a
--- /dev/null
+++ b/user/tipidee/tipidee.post-install
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+list="/var/log/httpd-4 /var/log/httpd-6 /var/log/httpsd-4 /var/log/httpsd-6"
+mkdir -p -m 0755 $list
+chown tipideelog:tipidee $list
+chmod 02755 $list
+exec tipidee-config
diff --git a/user/tipidee/tipidee.pre-install b/user/tipidee/tipidee.pre-install
new file mode 100644
index 0000000000..0ef043441f
--- /dev/null
+++ b/user/tipidee/tipidee.pre-install
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+addgroup -S tipidee 2>/dev/null
+adduser -S -D -h / -H -s /sbin/nologin -G tipidee -g tipideelog tipideelog 2>/dev/null
+adduser -S -D -h / -H -s /sbin/nologin -G tipidee -g tipideed tipideed 2>/dev/null
+
+exit 0
--
GitLab
From 7730de23769b58eaa968bdf2421f279eef2e1120 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Wed, 10 Apr 2024 15:36:32 +0000
Subject: [PATCH 06/18] user/apaste: fix and simplify APKBUILD
---
user/apaste/APKBUILD | 27 ++++++++++---------
...rver.post-install => apasted.post-install} | 0
...server.pre-install => apasted.pre-install} | 0
3 files changed, 14 insertions(+), 13 deletions(-)
rename user/apaste/{apaste-server.post-install => apasted.post-install} (100%)
rename user/apaste/{apaste-server.pre-install => apasted.pre-install} (100%)
diff --git a/user/apaste/APKBUILD b/user/apaste/APKBUILD
index 23a289a3ef..42c4a0c171 100644
--- a/user/apaste/APKBUILD
+++ b/user/apaste/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=apaste
pkgver=0.0.2.0
-pkgrel=0
+pkgrel=2
pkgdesc="A command-line pastebin"
url="https://skarnet.org/software/apaste/"
arch="all"
@@ -10,7 +10,7 @@ options="!check" # No test suite.
license="ISC"
depends="s6-networking"
makedepends="skalibs-dev>=2.14.1.1 s6-networking-dev>=2.7.0.2"
-subpackages="apasted:server apasted-openrc:openrc"
+subpackages="apaste-doc apasted:server apasted-openrc:apasted_openrc"
source="
https://skarnet.org/software/apaste/apaste-$pkgver.tar.gz
apasted.run
@@ -45,26 +45,27 @@ _makeservicedir() {
package() {
make DESTDIR="$pkgdir" install
+ install -D -m 0644 "$srcdir/apasted.confd" "$pkgdir/etc/conf.d/apasted"
+ install -D -m 0755 "$srcdir/apasted.initd" "$pkgdir/etc/init.d/apasted"
+ mkdir -p -m 0755 "$pkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
server() {
depends="execline s6 s6-networking>=2.7.0.2 apasted-openrc"
pkgdesc="A server for the apaste command-line pastebin"
- install="apaste-server.pre-install"
+ install="apasted.pre-install apasted.post-install"
mkdir -p -m 0755 "$subpkgdir/usr/bin" "$subpkgdir/var/lib/apasted/services"
mv "$pkgdir/usr/bin/apasted" "$subpkgdir/usr/bin/"
- _makeservicedir "" 4
- _makeservicedir "" 6
- _makeservicedir s 4
- _makeservicedir s 6
+ for i in '' s ; do for j in 4 6 ; do
+ _makeservicedir "$i" "$j"
+ done ; done
}
-openrc() {
- depends="apasted"
- mkdir -p -m 0755 "$subpkgdir/etc/conf.d" "$subpkgdir/etc/init.d"
- cp "$srcdir/apasted.confd" "$subpkgdir/etc/conf.d/apasted"
- cp "$srcdir/apasted.initd" "$subpkgdir/etc/init.d/apasted"
- chmod 0755 "$subpkgdir/etc/init.d/apasted"
+apasted_openrc() {
+ default_openrc
+ pkgdesc="A server for the apaste command-line pastebin (OpenRC init scripts)"
+ install_if="openrc apasted=$pkgver-r$pkgrel"
}
sha512sums="b1550d738801ddee528d0ce62333aa9a8fc9824183a61be295e767fbcdb1ae4d15a5e34295754cc5e8c51c8b410a56972bac28c5812099652fb8bb5140fb4c15 apaste-0.0.2.0.tar.gz
diff --git a/user/apaste/apaste-server.post-install b/user/apaste/apasted.post-install
similarity index 100%
rename from user/apaste/apaste-server.post-install
rename to user/apaste/apasted.post-install
diff --git a/user/apaste/apaste-server.pre-install b/user/apaste/apasted.pre-install
similarity index 100%
rename from user/apaste/apaste-server.pre-install
rename to user/apaste/apasted.pre-install
--
GitLab
From 9371e11f4f155fa4278d23d9690e7373d3964c43 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 17:23:54 +0000
Subject: [PATCH 07/18] system/mdevd: simplify APKBUILD
---
system/mdevd/APKBUILD | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD
index e9ea9cf21c..94e05d5d0a 100644
--- a/system/mdevd/APKBUILD
+++ b/system/mdevd/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=mdevd
pkgver=0.1.6.3
-pkgrel=0
+pkgrel=1
pkgdesc="A small uevent manager daemon"
url="https://skarnet.org/software/mdevd/"
arch="all"
@@ -20,23 +20,14 @@ build() {
package() {
make DESTDIR="$pkgdir" install
- mkdir -p -m 0755 "$pkgdir/etc/init.d"
+ mkdir -p -m 0755 "$pkgdir/etc/init.d" "$pkgdir/usr/share/doc"
cp -f "$srcdir/mdev.conf" "$pkgdir/etc/"
chmod 0644 "$pkgdir/etc/mdev.conf"
cp -f "$srcdir/mdevd.initd" "$pkgdir/etc/init.d/mdevd"
chmod 0755 "$pkgdir/etc/init.d/mdevd"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
-
-doc() {
- pkgdesc="$pkgdesc (documentation)"
- depends=
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
-}
-
-
openrc() {
rldir="$subpkgdir"/etc/runlevels/sysinit
svcdir="$subpkgdir/etc/s6-linux-init/current/run-image/service/mdevd"
--
GitLab
From 5b7306b3b5c7cebb305be2ce92cfe2d7d4a7987f Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 17:26:53 +0000
Subject: [PATCH 08/18] system/s6-rc: simplify APKBUILD
---
system/s6-rc/APKBUILD | 41 ++++-------------------------------------
1 file changed, 4 insertions(+), 37 deletions(-)
diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD
index a72fe5e2c3..35eebddfa3 100644
--- a/system/s6-rc/APKBUILD
+++ b/system/s6-rc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-rc
pkgver=0.5.4.2
-pkgrel=0
+pkgrel=1
pkgdesc="skarnet.org's service manager, working on top of s6"
url="https://skarnet.org/software/s6-rc/"
arch="all"
@@ -12,7 +12,7 @@ _skalibs_version=2.14
_s6_version=2.12
depends="execline"
makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev>=$_s6_version"
-subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
@@ -29,41 +29,8 @@ build() {
package() {
make DESTDIR="$pkgdir" install
-}
-
-
-libs() {
- pkgdesc="$pkgdesc (shared libraries)"
- depends="skalibs-libs>=$_skalibs_version s6-libs>=$_s6_version"
- mkdir -p "$subpkgdir/lib"
- mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/"
-}
-
-
-dev() {
- pkgdesc="$pkgdesc (development files)"
- depends="skalibs-dev>=$_skalibs_version s6-dev>=$_s6_version"
- install_if="dev $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib"
- mv "$pkgdir/usr/include" "$subpkgdir/usr/"
- mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/"
-}
-
-
-libsdev() {
- pkgdesc="$pkgdesc (development files for dynamic linking)"
- depends="$pkgname-dev"
- mkdir -p "$subpkgdir/lib"
- mv "$pkgdir"/lib/*.so "$subpkgdir/lib/"
-}
-
-
-doc() {
- pkgdesc="$pkgdesc (documentation)"
- depends=""
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ mkdir -p -m 0755 "$pkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
sha512sums="f04e94db957e6d0033e328cc63530f64c9db101815bcafdb00a23205f4e75039dd3e593f93d48e4d9877b0696ea734ca62f672d92ff31e4e07aa19d26d809443 s6-rc-0.5.4.2.tar.gz"
--
GitLab
From 8647a29c5dd73bec993b17db3865002b0815711d Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 17:31:43 +0000
Subject: [PATCH 09/18] user/s6-dns: simplify APKBUILD
---
user/s6-dns/APKBUILD | 37 +++++--------------------------------
1 file changed, 5 insertions(+), 32 deletions(-)
diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD
index afaf04e302..cd6c7cc034 100644
--- a/user/s6-dns/APKBUILD
+++ b/user/s6-dns/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-dns
pkgver=2.3.7.1
-pkgrel=0
+pkgrel=1
pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities"
url="https://skarnet.org/software/s6-dns/"
arch="all"
@@ -10,8 +10,8 @@ options="!check"
license="ISC"
_skalibs_version=2.14
depends=""
-makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
-subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
+makedepends="skalibs-dev>=$_skalibs_version"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
@@ -28,35 +28,8 @@ build() {
package() {
make DESTDIR="$pkgdir" install
-}
-
-libs() {
- pkgdesc="$pkgdesc (shared libraries)"
- depends="skalibs-libs>=$_skalibs_version"
- mkdir -p "$subpkgdir/usr/lib"
- mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/"
-}
-
-dev() {
- pkgdesc="$pkgdesc (development files)"
- depends="skalibs-dev>=$_skalibs_version"
- install_if="dev $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib"
- mv "$pkgdir/usr/include" "$subpkgdir/usr/"
- mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/"
-}
-
-libsdev() {
- pkgdesc="$pkgdesc (development files for dynamic linking)"
- depends="$pkgname-dev"
- mkdir -p "$subpkgdir/usr/lib"
- mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/"
-}
-
-doc() {
- default_doc
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ mkdir -p -m 0755 "$pkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
sha512sums="9dabee86d9a27fb0e4a3c10563694bb5734c08c4d730a69daec17dad140274aa104bd6edbd501261c7a7c7bcee505f79134b7119457d5fbedcbb2be6b352ebb0 s6-dns-2.3.7.1.tar.gz"
--
GitLab
From e0ff0c85c2b776737d66506d309583b1a8fbd1b9 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 17:38:22 +0000
Subject: [PATCH 10/18] user/s6-networking: simplify APKBUILD
---
user/s6-networking/APKBUILD | 39 +++++--------------------------------
1 file changed, 5 insertions(+), 34 deletions(-)
diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD
index 8450370a4c..a129c6931b 100644
--- a/user/s6-networking/APKBUILD
+++ b/user/s6-networking/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-networking
pkgver=2.7.0.2
-pkgrel=0
+pkgrel=1
pkgdesc="skarnet.org's UCSPI TCP and TLS tools, access control tools, and network time management utilities."
url="https://skarnet.org/software/s6-networking/"
arch="all"
@@ -10,8 +10,8 @@ options="!check" # No test suite.
license="ISC"
_skalibs_version=2.14.1
depends="execline"
-makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version execline-dev s6-dev s6-libs-dev s6-dns-dev s6-dns-libs-dev bearssl-dev"
-subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
+makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev s6-dns-dev bearssl-dev"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
@@ -29,37 +29,8 @@ build() {
package() {
make DESTDIR="$pkgdir" install
-}
-
-libs() {
- pkgdesc="$pkgdesc (shared libraries)"
- depends="skalibs-libs>=$_skalibs_version"
- mkdir -p "$subpkgdir/usr/lib"
- mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/"
-}
-
-dev() {
- pkgdesc="$pkgdesc (development files)"
- depends="skalibs-dev>=$_skalibs_version"
- install_if="dev $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib"
- mv "$pkgdir/usr/include" "$subpkgdir/usr/"
- mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/"
-}
-
-libsdev() {
- pkgdesc="$pkgdesc (development files for dynamic linking)"
- depends="$pkgname-dev"
- mkdir -p "$subpkgdir/usr/lib"
- mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/"
-}
-
-doc() {
- pkgdesc="$pkgdesc (documentation)"
- depends=""
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ mkdir -p -m 0755 "$pkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
sha512sums="49f80c68d639f2b7ac7451ca2ace828ca4e8c1eeffec4a9b31f8157c26a87228275ea14d8b6495b0af0879a961b37910aa2b769d8db56d8731d0827c96053631 s6-networking-2.7.0.2.tar.gz"
--
GitLab
From 7933effdb0eff6a52fcf574e8f53b54d717a3803 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 17:41:24 +0000
Subject: [PATCH 11/18] user/s6-portable-utils: simplify APKBUILD
---
user/s6-portable-utils/APKBUILD | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD
index 18fb731f33..0a4386fe41 100644
--- a/user/s6-portable-utils/APKBUILD
+++ b/user/s6-portable-utils/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-portable-utils
pkgver=2.3.0.3
-pkgrel=0
+pkgrel=1
pkgdesc="skarnet.org's portable miscellaneous utilities"
url="https://skarnet.org/software/s6-portable-utils/"
arch="all"
@@ -10,7 +10,7 @@ options="!check"
license="ISC"
_skalibs_version=2.14
depends=""
-makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
+makedepends="skalibs-dev>=$_skalibs_version"
subpackages="$pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
@@ -24,13 +24,8 @@ build() {
package() {
make DESTDIR="$pkgdir" install
-}
-
-doc() {
- pkgdesc="$pkgdesc (documentation)"
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ mkdir -p -m 0755 "$pkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
sha512sums="f75242ac6c06ffd5bd66b8a35bbdf39938cf3bfa6e79abd214af37e9e4acc732ca1760566862482bc964a5cca05bbce8bd24d7167b02dc66c5f397c85ee0d37f s6-portable-utils-2.3.0.3.tar.gz"
--
GitLab
From 4d4e34490f1bdfdf62bf35f7d87e25c4fe8ed1d6 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 17:43:54 +0000
Subject: [PATCH 12/18] user/s6-linux-utils: simplify APKBUILD
---
user/s6-linux-utils/APKBUILD | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/user/s6-linux-utils/APKBUILD b/user/s6-linux-utils/APKBUILD
index 5e95e932c3..d232f09d85 100644
--- a/user/s6-linux-utils/APKBUILD
+++ b/user/s6-linux-utils/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-linux-utils
pkgver=2.6.2.0
-pkgrel=0
+pkgrel=1
pkgdesc="skarnet.org's Linux-specific miscellaneous utilities"
url="https://skarnet.org/software/s6-linux-utils/"
arch="all"
@@ -10,7 +10,7 @@ options="!check"
license="ISC"
_skalibs_version=2.14
depends=""
-makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
+makedepends="skalibs-dev>=$_skalibs_version"
subpackages="$pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
@@ -24,14 +24,8 @@ build() {
package() {
make DESTDIR="$pkgdir" install
-}
-
-doc() {
- pkgdesc="$pkgdesc (documentation)"
- depends=""
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ mkdir -p -m 0755 "$pkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
sha512sums="b7bc96ef3aa81bc01c6ca2a82591201be0966d8aa2b71545c963f67dba8441a05631e0ea593f0a693ee04d6d2637754e9543eddbfe70ed9c0529ff49081aa54d s6-linux-utils-2.6.2.0.tar.gz"
--
GitLab
From 847c08cf4c653ea3f8f57af648312a426729ce75 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 17:48:59 +0000
Subject: [PATCH 13/18] user/smtpd-starttls-proxy: add -doc package
---
user/smtpd-starttls-proxy/APKBUILD | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/user/smtpd-starttls-proxy/APKBUILD b/user/smtpd-starttls-proxy/APKBUILD
index 5e287d70c6..72c2cc0fcf 100644
--- a/user/smtpd-starttls-proxy/APKBUILD
+++ b/user/smtpd-starttls-proxy/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=smtpd-starttls-proxy
pkgver=0.0.1.3
-pkgrel=0
+pkgrel=1
pkgdesc="An SMTP proxy implementing STARTTLS"
url="https://skarnet.org/software/smtpd-starttls-proxy/"
arch="all"
@@ -10,7 +10,7 @@ options="!check" # No test suite.
license="ISC"
depends="s6 s6-networking"
makedepends="skalibs-dev>=2.14 s6-dev>=2.12"
-subpackages="$pkgname-dev"
+subpackages="$pkgname-dev $pkgname-doc"
source="https://skarnet.org/software/smtpd-starttls-proxy/smtpd-starttls-proxy-$pkgver.tar.gz"
build() {
@@ -26,6 +26,8 @@ build() {
package() {
make DESTDIR="$pkgdir" install
+ mkdir -p -m 0755 "$pkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
sha512sums="55fc24d3923b7f3cf3137f4d36ed90ebfd2b603f55cfb6cd6d9ae3f67ec38706540c21c2f1a6257f5702e0a93dcba2e31fbfb99fae9d27e20002b265e78b0cf9 smtpd-starttls-proxy-0.0.1.3.tar.gz"
--
GitLab
From 147011dc0b52b7caaa45671585612c626687ffd8 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Tue, 16 Apr 2024 16:43:37 +0000
Subject: [PATCH 14/18] system/execline: upgrade to 2.9.5.1
---
system/execline/APKBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD
index 766903e64b..96da1fb5a0 100644
--- a/system/execline/APKBUILD
+++ b/system/execline/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=execline
-pkgver=2.9.5.0
+pkgver=2.9.5.1
pkgrel=0
pkgdesc="A small scripting language for non-interactive scripts"
url="https://skarnet.org/software/execline/"
@@ -31,4 +31,4 @@ package() {
cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
-sha512sums="a625dbf8d8ee461aaa4e8a1482ea4f5925c6e37ebd0c68fc39df8ebd25ed2d24769b36e9370a3b44eb6891ed7dc7954db998aa16b3a83d46e04bf1acce5570ca execline-2.9.5.0.tar.gz"
+sha512sums="11bfd825b0b72cba118eff9ecb97672d0c015e0bd50c7c8f83e101ee41c323b3a3c82e42fed75b6bc65ab6edb85a8bbeef8900b594cf651825b6313a5123c88f execline-2.9.5.1.tar.gz"
--
GitLab
From a13ce58908653b32ec910c381db3aa8d54aced30 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Tue, 16 Apr 2024 17:05:19 +0000
Subject: [PATCH 15/18] user/tipidee: improve APKBUILD, fix packaging nits
---
user/tipidee/APKBUILD | 14 ++++++++++----
user/tipidee/tipidee.initd | 5 ++---
user/tipidee/tipidee.post-install | 8 ++------
user/tipidee/tipidee.pre-install | 6 +++---
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/user/tipidee/APKBUILD b/user/tipidee/APKBUILD
index 593b19daed..81751848c4 100644
--- a/user/tipidee/APKBUILD
+++ b/user/tipidee/APKBUILD
@@ -24,6 +24,8 @@ install="
tipidee.pre-install
tipidee.post-install
"
+pkggroups="tipidee"
+pkgusers="tipideelog tipideed"
build() {
./configure \
@@ -43,22 +45,26 @@ build() {
_makeservicedir() {
name="http${1}d-${2}"
fn="$pkgdir/var/lib/tipidee/services/$name"
- mkdir -p -m 0755 "$fn/log"
+ mkdir -p "$fn/log"
echo 3 > "$fn/log/notification-fd"
sed -e "s/@S@/${1}/g; s/@V@/${2}/g;" "$srcdir/logger.run" > "$fn/log/run"
chmod 0755 "$fn/log/run"
echo 3 > "$fn/notification-fd"
sed -e "s/@V@/${2}/g;" "$srcdir/http${1}d.run" > "$fn/run"
chmod 0755 "$fn/run"
+ fn="$pkgdir/var/log/$name"
+ mkdir -p "$fn"
+ chown tipideelog:tipidee "$fn"
+ chmod 02755 "$fn"
}
package() {
- mkdir -p -m 0755 "$pkgdir/etc" "$pkgdir/usr/share/doc" "$pkgdir/var/lib/tipidee/docroot"
+ mkdir -p "$pkgdir/usr/share/doc" "$pkgdir/var/lib/tipidee/docroot"
make DESTDIR="$pkgdir" install
- cp "$srcdir/tipidee.conf" "$pkgdir/etc/tipidee.conf"
for i in '' s ; do for j in 4 6 ; do
_makeservicedir "$i" "$j"
done ; done
+ install -m 0644 -D "$srcdir/tipidee.conf" "$pkgdir/etc/tipidee.conf"
install -m 0644 -D "$srcdir/tipidee.confd" "$pkgdir/etc/conf.d/tipidee"
install -m 0755 -D "$srcdir/tipidee.initd" "$pkgdir/etc/init.d/tipidee"
cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
@@ -77,4 +83,4 @@ sha512sums="d177f4c00db9855792dbddc4c96d2c75bd302443f29376e1d35d511d56964e5de11d
b5af306fe7040f966b13da84bfb0c4b528683c03205519d08fe429ee826ffad27c9ddb32be8c8bf8b42ce7964ef15572e3c66a96494aed833ee951c769f81bd2 logger.run
bb2681a3000133724bb8fd4918bc3209ea676c2e4f96ad8b298d8e7302aeebd6876341ea205f2d808f34e4c9b5c138bba032694c6069c17026b0ddf23702f9ba tipidee.conf
7a999200ad21b2b0737ce82136bc8e055d7ab4a865b7727e6dc8df0eaeea6ace11eb5756b64231ce7938d11b5ec218944173ea1df3db059d033bf3f848c9a608 tipidee.confd
-13e27b5c9f8ed6b1186b41bce6ffc280146643cb7b568958f24b63a4d73fcb7a147b68cd7cf74812ca55a2a5ae3b3717f177ea1546be7d30a86ff09954d9ec0f tipidee.initd"
+5001d079b1ca7920d163cc2d58a5855e2740e72ed85df25414b4719c52133bd0f2f9e69c63c57f31645159189fc046c7d213048fc1cbd0f640336e43874e4482 tipidee.initd"
diff --git a/user/tipidee/tipidee.initd b/user/tipidee/tipidee.initd
index ebd0787a7c..f196bcd236 100644
--- a/user/tipidee/tipidee.initd
+++ b/user/tipidee/tipidee.initd
@@ -4,13 +4,12 @@ description="Start/stop the tipidee services"
depend()
{
- after net
- after localmount
+ after net
+ after localmount
}
_get_services()
{
- . /etc/conf.d/tipidee
list=
if "$HTTP" ; then
if test -n "$TIPIDEED_IPv4" ; then
diff --git a/user/tipidee/tipidee.post-install b/user/tipidee/tipidee.post-install
index 9ff3c9691a..425ab5aaac 100644
--- a/user/tipidee/tipidee.post-install
+++ b/user/tipidee/tipidee.post-install
@@ -1,7 +1,3 @@
-#!/bin/sh -e
+#!/bin/execlineb -P
-list="/var/log/httpd-4 /var/log/httpd-6 /var/log/httpsd-4 /var/log/httpsd-6"
-mkdir -p -m 0755 $list
-chown tipideelog:tipidee $list
-chmod 02755 $list
-exec tipidee-config
+tipidee-config
diff --git a/user/tipidee/tipidee.pre-install b/user/tipidee/tipidee.pre-install
index 0ef043441f..e92fd1d0ae 100644
--- a/user/tipidee/tipidee.pre-install
+++ b/user/tipidee/tipidee.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
-addgroup -S tipidee 2>/dev/null
-adduser -S -D -h / -H -s /sbin/nologin -G tipidee -g tipideelog tipideelog 2>/dev/null
-adduser -S -D -h / -H -s /sbin/nologin -G tipidee -g tipideed tipideed 2>/dev/null
+groupadd -r -- tipidee 2>/dev/null
+useradd -r -d / -M -N -s /sbin/nologin -g tipidee -c tipideelog -- tipideelog 2>/dev/null
+useradd -r -d / -M -N -s /sbin/nologin -g tipidee -c tipideed -- tipideed 2>/dev/null
exit 0
--
GitLab
From 2ecb3816c62624b25e06864c71831890df26e869 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Tue, 16 Apr 2024 17:33:28 +0000
Subject: [PATCH 16/18] user/tipidee: fix default logdir permissions
---
user/tipidee/APKBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/user/tipidee/APKBUILD b/user/tipidee/APKBUILD
index 81751848c4..edac71c1de 100644
--- a/user/tipidee/APKBUILD
+++ b/user/tipidee/APKBUILD
@@ -55,7 +55,7 @@ _makeservicedir() {
fn="$pkgdir/var/log/$name"
mkdir -p "$fn"
chown tipideelog:tipidee "$fn"
- chmod 02755 "$fn"
+ chmod 02700 "$fn"
}
package() {
--
GitLab
From 57f6cb635913a9ec567960e7ff0d9501a6d7e062 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Thu, 18 Apr 2024 12:35:29 +0000
Subject: [PATCH 17/18] user/tipidee: clean up compiled db on deinstall
---
user/tipidee/APKBUILD | 1 +
user/tipidee/tipidee.post-deinstall | 3 +++
2 files changed, 4 insertions(+)
create mode 100644 user/tipidee/tipidee.post-deinstall
diff --git a/user/tipidee/APKBUILD b/user/tipidee/APKBUILD
index edac71c1de..613be9e3cb 100644
--- a/user/tipidee/APKBUILD
+++ b/user/tipidee/APKBUILD
@@ -23,6 +23,7 @@ source="
install="
tipidee.pre-install
tipidee.post-install
+ tipidee.post-deinstall
"
pkggroups="tipidee"
pkgusers="tipideelog tipideed"
diff --git a/user/tipidee/tipidee.post-deinstall b/user/tipidee/tipidee.post-deinstall
new file mode 100644
index 0000000000..9912c95032
--- /dev/null
+++ b/user/tipidee/tipidee.post-deinstall
@@ -0,0 +1,3 @@
+#!/bin/execlineb -P
+
+rm -f /etc/tipidee.conf.cdb
--
GitLab
From 8b4c8e990191e7146a7691d66835d8a3ed3af30e Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Thu, 25 Apr 2024 02:47:29 +0000
Subject: [PATCH 18/18] user/elogind: add required changes from skaware
cleanup.
---
user/elogind/APKBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/user/elogind/APKBUILD b/user/elogind/APKBUILD
index 0073d616ea..977d4a8c85 100644
--- a/user/elogind/APKBUILD
+++ b/user/elogind/APKBUILD
@@ -9,8 +9,8 @@ arch="all"
license="LGPL-2.1+"
depends="dbus eudev utmps"
makedepends="meson ninja acl-dev dbus-dev docbook-xsl eudev-dev gperf libcap-dev
- libxslt-dev linux-headers linux-pam-dev m4 py3-jinja2 skalibs-libs-dev
- utmps-libs-dev"
+ libxslt-dev linux-headers linux-pam-dev m4 py3-jinja2 skalibs-dev
+ utmps-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc $pkgname-dracut"
install="$pkgname.post-install $pkgname.post-deinstall"
source="elogind-$pkgver.tar.gz::https://github.com/elogind/elogind/archive/v$pkgver.tar.gz
--
GitLab