diff options
| -rw-r--r-- | user/tipidee/APKBUILD | 29 | ||||
| -rw-r--r-- | user/tipidee/httpd.run | 8 | ||||
| -rw-r--r-- | user/tipidee/httpsd.run | 12 | ||||
| -rw-r--r-- | user/tipidee/tipidee.pc.in | 6 |
4 files changed, 31 insertions, 24 deletions
diff --git a/user/tipidee/APKBUILD b/user/tipidee/APKBUILD index 473818fd7..120e57e8c 100644 --- a/user/tipidee/APKBUILD +++ b/user/tipidee/APKBUILD @@ -1,15 +1,18 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=tipidee -pkgver=0.0.5.0 +pkgver=0.0.5.1 pkgrel=0 pkgdesc="The skarnet.org web server" url="https://skarnet.org/software/tipidee/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.1.1 -depends="execline s6 s6-networking" +_skalibs_version=2.14.3 +_execline_version=2.9.6 +_s6_version=2.13.1 +_s6net_version=2.7.0 +depends="execline>=$_execline_version s6>=$_s6_version s6-networking>=$_s6net_version" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev" subpackages="tipidee-dev tipidee-libs tipidee-doc tipidee-openrc" @@ -21,6 +24,7 @@ source=" tipidee.conf tipidee.confd tipidee.initd + tipidee.pc.in " install=" tipidee.pre-install @@ -32,16 +36,10 @@ pkgusers="tipideelog tipideed" 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 + --libexecdir="/usr/lib/$pkgname" make } @@ -70,6 +68,8 @@ package() { 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" + sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" + install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } @@ -80,10 +80,11 @@ dev() { mv "$subpkgdir/usr/bin/tipidee-config" "$pkgdir/usr/bin/tipidee-config" } -sha512sums="861d5509a00d3943e9a483d191d92df91be1aead519b16d1fac96740357670ff9f32cf0ff2b8dd08d0cac059732c59233632379562a508ab3705fd68103f370c tipidee-0.0.5.0.tar.gz -0de0d6bd39adfd6e65694335e9cf06cec7625032e6af5cf5e54ced5c009707ca4e27b2dbdff8b7825575fbef7cd98ac0333e07b1924f24fda23019c92c08023f httpd.run -65cdbfb5a6485aed0203ed910af124b202994d5253cb365ed25432f0c906471dd30f96eb862b6f25004c6ec8ec4cb38a5b49cde717e7a00d7c9d7fd07025f225 httpsd.run +sha512sums="2f0ae2b3f7c7782785e8498e482bb4cfbb58c0bbe1689b2d3a5a4970783704147e8e5b96737970e2a542ee409e2b179a199a990fbf20b3ea4083cd47d16960cf tipidee-0.0.5.1.tar.gz +560048b2b767053770e37ce3fd69540f2fad23236f012da115c1f985240f42d0bb7809630d8991e39169e255e3d36ebfdc85f895d16675119a95d3a6e64fd2b2 httpd.run +1c9333785c63662039580504dd36af21d05eb9972e6770af17e87e062bd7d9fa67695f4120221e241e10503ca0fb3b5347f032b6c1eef309f2ff8cd636266f2b httpsd.run b5af306fe7040f966b13da84bfb0c4b528683c03205519d08fe429ee826ffad27c9ddb32be8c8bf8b42ce7964ef15572e3c66a96494aed833ee951c769f81bd2 logger.run bb2681a3000133724bb8fd4918bc3209ea676c2e4f96ad8b298d8e7302aeebd6876341ea205f2d808f34e4c9b5c138bba032694c6069c17026b0ddf23702f9ba tipidee.conf 7a999200ad21b2b0737ce82136bc8e055d7ab4a865b7727e6dc8df0eaeea6ace11eb5756b64231ce7938d11b5ec218944173ea1df3db059d033bf3f848c9a608 tipidee.confd -5001d079b1ca7920d163cc2d58a5855e2740e72ed85df25414b4719c52133bd0f2f9e69c63c57f31645159189fc046c7d213048fc1cbd0f640336e43874e4482 tipidee.initd" +5001d079b1ca7920d163cc2d58a5855e2740e72ed85df25414b4719c52133bd0f2f9e69c63c57f31645159189fc046c7d213048fc1cbd0f640336e43874e4482 tipidee.initd +21e71ed438270598de55631c46006bcb66528889477d1a09c76db4160d46651b1c657b31913393115c01aae4853afa4fe425a6fb3985ea8fa403de1d36e3f2f1 tipidee.pc.in" diff --git a/user/tipidee/httpd.run b/user/tipidee/httpd.run index 356ad9952..8619bd856 100644 --- a/user/tipidee/httpd.run +++ b/user/tipidee/httpd.run @@ -8,10 +8,10 @@ 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 + importas -uSi TIPIDEED_IPv@V@ + importas -uSi TIPIDEED_ROOT + importas -uSD1000 TIPIDEED_CONCURRENCY + importas -uSD10 TIPIDEED_LOCAL_CONCURRENCY } s6-envuidgid tipideed cd ${TIPIDEED_ROOT} diff --git a/user/tipidee/httpsd.run b/user/tipidee/httpsd.run index 9d710158a..bfc3eebd0 100644 --- a/user/tipidee/httpsd.run +++ b/user/tipidee/httpsd.run @@ -8,12 +8,12 @@ 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 + importas -uSi TIPIDEED_IPv@V@ + importas -uSi TIPIDEED_ROOT + importas -uSi KEYFILE + importas -uSi CERTFILE + importas -uSD1000 TIPIDEED_CONCURRENCY + importas -uSD10 TIPIDEED_LOCAL_CONCURRENCY } s6-envuidgid tipideed export TLS_UID 65534 diff --git a/user/tipidee/tipidee.pc.in b/user/tipidee/tipidee.pc.in new file mode 100644 index 000000000..e200f758a --- /dev/null +++ b/user/tipidee/tipidee.pc.in @@ -0,0 +1,6 @@ +Name: tipidee +Description: A C interface to some HTTP server functions +URL: https://skarnet.org/software/tipidee/ +Version: @@VERSION@@ +Requires.private: skalibs >= @@SKALIBS_VERSION@@ +Libs: -ltipidee |