diff options
author | Johannes Heimansberg <git@jhe.dedyn.io> | 2021-07-30 13:08:24 +0200 |
---|---|---|
committer | Milan P. Stanić <mps@arvanta.net> | 2021-08-03 17:51:06 +0000 |
commit | 31a79bf234d515e0ee569dad4acc1e1e0502fbf1 (patch) | |
tree | 3d06ab1ef198f08c46c0fdb9aa4c3db64492a71d | |
parent | 79dd1ca85481f3cf18dcee81b52e28bd94c3183a (diff) |
community/fwknop: allow use of supervise-daemon and make config file required
-rw-r--r-- | community/fwknop/APKBUILD | 18 | ||||
-rw-r--r-- | community/fwknop/fwknopd.confd | 10 | ||||
-rw-r--r-- | community/fwknop/fwknopd.initd | 10 |
3 files changed, 27 insertions, 11 deletions
diff --git a/community/fwknop/APKBUILD b/community/fwknop/APKBUILD index f86afed8bbe..a058e598920 100644 --- a/community/fwknop/APKBUILD +++ b/community/fwknop/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=fwknop pkgver=2.6.10 -pkgrel=1 +pkgrel=2 pkgdesc="Single Packet Authorization (SPA) implementation" url="http://www.cipherdyne.org/fwknop/" arch="all" @@ -11,6 +11,7 @@ makedepends="libpcap-dev gpgme-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc $pkgname-server" source="http://cipherdyne.org/fwknop/download/fwknop-$pkgver.tar.gz fwknopd.initd + fwknopd.confd gcc10.patch " @@ -35,11 +36,7 @@ check() { package() { make DESTDIR="$pkgdir" install install -Dm755 "$srcdir"/fwknopd.initd "$pkgdir"/etc/init.d/fwknopd - cat <<- __EOF__ >> "$pkgdir"/etc/fwknop/access.conf - \# If using gnupg2 see https://www.gnupg.org/faq/GnuPG-FAQ.html#how-can-i-use-gnupg-in-an-automated-environment & sign the client public key on the server with a normal key which has a password" - \# disable GPG_DECRYPT_PW & enable the following variable: - \#GPG_ALLOW_NO_PW: Y; - __EOF__ + install -Dm755 "$srcdir"/fwknopd.confd "$pkgdir"/etc/conf.d/fwknopd } server() { @@ -49,6 +46,9 @@ server() { && mv "$pkgdir"/etc "$subpkgdir"/ } -sha512sums="3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80 fwknop-2.6.10.tar.gz -e3558c4a1579ea66b19451acc476f3cfec782b052f6d96a57ffc520169db755739e2bf3a815802cc5958a7b2fdeb9b39cf2182e5d89882cf4502985401352465 fwknopd.initd -e045c0936ea03e0f472e3bee7911c01e6ec16b51231f572ec943e1bff5a7e8e5d57739c040affe4d77f6b463d29e52bbe035e9f84a1e03c9a1de9b4c50b27e21 gcc10.patch" +sha512sums=" +3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80 fwknop-2.6.10.tar.gz +eb20a697aabc6d114602243afa1a799d9441e4b70fe37c1ed1ee4e4a23b117537c3a199a454070b039c1370221de619bf4da47f050153d41e5dca4853b215b7b fwknopd.initd +9b975bdc735753260f55ab67b8bc99675246a22e096984de28a20d6bddfc042b709c7d7bd02974f84d45de0a1e34be94e94b71faf43d7e133e0ff259c562b406 fwknopd.confd +e045c0936ea03e0f472e3bee7911c01e6ec16b51231f572ec943e1bff5a7e8e5d57739c040affe4d77f6b463d29e52bbe035e9f84a1e03c9a1de9b4c50b27e21 gcc10.patch +" diff --git a/community/fwknop/fwknopd.confd b/community/fwknop/fwknopd.confd new file mode 100644 index 00000000000..96742b15c57 --- /dev/null +++ b/community/fwknop/fwknopd.confd @@ -0,0 +1,10 @@ +# Configuration file for /etc/init.d/fwknopd + +# Path to configuration file. +#cfgfile="/etc/fwknop/fwknopd.conf" + +# Additional options to pass to fwknopd. +#command_args= + +# Uncomment to use process supervisor. +#supervisor=supervise-daemon diff --git a/community/fwknop/fwknopd.initd b/community/fwknop/fwknopd.initd index 62494d3e41c..d453c1dee11 100644 --- a/community/fwknop/fwknopd.initd +++ b/community/fwknop/fwknopd.initd @@ -1,12 +1,18 @@ #!/sbin/openrc-run +: ${cfgfile:="/etc/fwknop/fwknopd.conf"} + pidfile="/var/run/fwknop/fwknopd.pid" command=/usr/sbin/fwknopd -command_args="--pid-file $pidfile $fwknopd_args" +# $fwknopd_args is here for backward compatibility only +command_args="-f -c $cfgfile ${command_args:-$fwknopd_args}" +command_background="yes" + +required_files="$cfgfile" depend() { use logger - after net + after net } start_pre() { |