From 72075ad523fb742ef8c5ba02d9496c5addee4f65 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Thu, 10 Oct 2024 07:01:38 +0000 Subject: user/apaste: upgrade to 0.0.2.1 --- user/apaste/APKBUILD | 27 ++++++++++++++------------- user/apaste/apasted.run | 14 +++++++------- user/apaste/apastesd.run | 18 +++++++++--------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/user/apaste/APKBUILD b/user/apaste/APKBUILD index 9da6d259a..13db635b0 100644 --- a/user/apaste/APKBUILD +++ b/user/apaste/APKBUILD @@ -1,15 +1,19 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=apaste -pkgver=0.0.2.0 -pkgrel=2 +pkgver=0.0.2.1 +pkgrel=0 pkgdesc="A command-line pastebin" url="https://skarnet.org/software/apaste/" arch="all" options="!check" # No test suite. license="ISC" +_skalibs_version=2.14.3 +_execline_version=2.9.6 +_s6_version=2.13.1 +_s6net_version=2.7.0 depends="s6-networking" -makedepends="skalibs-dev>=2.14.1.1 s6-networking-dev>=2.7.0.2" +makedepends="skalibs-dev>=$_skalibs_version s6-networking-dev>=$_s6net_version" subpackages="apaste-doc apasted:server apasted-openrc:apasted_openrc" source=" https://skarnet.org/software/apaste/apaste-$pkgver.tar.gz @@ -24,12 +28,9 @@ pkgusers="apastedlog apasted" build() { ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var + --enable-shared \ + --disable-allstatic \ + --prefix=/usr make } @@ -58,7 +59,7 @@ package() { } server() { - depends="execline s6 s6-networking>=2.7.0.2 apasted-openrc" + depends="execline>=$_execline_version s6>=$_s6_version s6-networking>=$_s6net_version apasted-openrc" pkgdesc="A server for the apaste command-line pastebin" install="apasted.pre-install" mkdir -p "$subpkgdir/usr/bin" "$subpkgdir/var/lib/apasted/services" @@ -74,9 +75,9 @@ apasted_openrc() { install -D -m 0755 "$srcdir/apasted.initd" "$subpkgdir/etc/init.d/apasted" } -sha512sums="b1550d738801ddee528d0ce62333aa9a8fc9824183a61be295e767fbcdb1ae4d15a5e34295754cc5e8c51c8b410a56972bac28c5812099652fb8bb5140fb4c15 apaste-0.0.2.0.tar.gz -27f6b3ac98f52a6ed11d225ea19e34160b1fef2dd980a32a43ff03499e121b6418612be4c94d1139388bee47b14a5ea24edc383fcfcfe55abe7daf12be2d514c apasted.run -8cd74ba6c6579912083f9605056b46ca2887faaf23a0d1981043a5ac4d6e724def51a7c087fb719f2b0189e6b0a0d9469a1e955fcbf04c8ea9f2d818649c122e apastesd.run +sha512sums="262c149941d414130e7bfcbf7ecbc858427f5acd20880a68216935f79ad2632b9d82ff87cc09874d3d7215db9ebc4c55de7355ac9e29740751f44e9b2b4f8229 apaste-0.0.2.1.tar.gz +970a79b6da5a7c58539cd9d47cba36855eb4f37e1e0bbd841ade15022b5fb291a077f7ad118ff662a45f3b2b59162264a180c338f23f964ea3e48364c68ac606 apasted.run +817b276ae51e9bd769e39a8313a84449d181c65749640119ba1e4af3c21d2572152c7bdd5eec70cbcfaa3255fd6cba966dfc1dc7a818a60d329283c39ae058a8 apastesd.run 9341c1c69c1d45b35052b0042665fffb9cff6583fad558ed37a19af574b53a5e298727c43a6c718fd40936e8f16d1a10e9c229392595ba1e06ddb21d1d8b055b apasted-log.run 3b91225252d95d676097d337ca77ef2bdffb52baa657197efe079b82c663baeaed0882993eeed7f7ce260f051e439159c61368f8a1d4b84d1daa74fe358c39d7 apasted.confd f9e6dd5aa6d5efe678f370431e7b58a52f903eed9b698f60b1853d601a4d9c0a53ccb996034d401dfd7ddbe573fc2651cf5c87164de599c42f754ad015b8e302 apasted.initd" diff --git a/user/apaste/apasted.run b/user/apaste/apasted.run index 4b49c6320..8ad8aa487 100644 --- a/user/apaste/apasted.run +++ b/user/apaste/apasted.run @@ -6,13 +6,13 @@ fdmove 1 3 envfile /etc/conf.d/apasted multisubstitute { - importas -ui APASTED_IPv@V@ APASTED_IPv@V@ - importas -ui APASTED_PORT APASTED_PORT - importas -ui APASTED_ROOT APASTED_ROOT - importas -uD "" APASTED_PREFIX APASTED_PREFIX - importas -uD 10 APASTED_MAXFILES APASTED_MAXFILES - importas -uD 1048576 APASTED_MAXSIZE APASTED_MAXSIZE - importas -uD 10485760 APASTED_MAXTOTALSIZE APASTED_MAXTOTALSIZE + importas -uSi APASTED_IPv@V@ + importas -uSi APASTED_PORT + importas -uSi APASTED_ROOT + importas -uSD "" APASTED_PREFIX + importas -uSD10 APASTED_MAXFILES + importas -uSD1048576 APASTED_MAXSIZE + importas -uSD10485760 APASTED_MAXTOTALSIZE } s6-envuidgid apasted s6-tcpserver -1 -U -- ${APASTED_IPv@V@} ${APASTED_PORT} diff --git a/user/apaste/apastesd.run b/user/apaste/apastesd.run index b5d0813f6..a1205ed4c 100644 --- a/user/apaste/apastesd.run +++ b/user/apaste/apastesd.run @@ -6,15 +6,15 @@ fdmove 1 3 envfile /etc/conf.d/apasted multisubstitute { - importas -ui APASTED_IPv@V@ APASTED_IPv@V@ - importas -ui APASTED_TLS_PORT APASTED_TLS_PORT - importas -ui APASTED_ROOT APASTED_ROOT - importas -uD "" APASTED_PREFIX APASTED_PREFIX - importas -uD 10 APASTED_MAXFILES APASTED_MAXFILES - importas -uD 1048576 APASTED_MAXSIZE APASTED_MAXSIZE - importas -uD 10485760 APASTED_MAXTOTALSIZE APASTED_MAXTOTALSIZE - importas -ui KEYFILE KEYFILE - importas -ui CERTFILE CERTFILE + importas -uSi APASTED_IPv@V@ + importas -uSi APASTED_TLS_PORT + importas -uSi APASTED_ROOT + importas -uSD "" APASTED_PREFIX + importas -uSD10 APASTED_MAXFILES + importas -uSD1048576 APASTED_MAXSIZE + importas -uSD10485760 APASTED_MAXTOTALSIZE + importas -uSi KEYFILE + importas -uSi CERTFILE } s6-envuidgid apasted export TLS_UID 65534 -- cgit v1.2.3-70-g09d2