From ba644daa31205bf4ef3a186420ee287b94c78a42 Mon Sep 17 00:00:00 2001 From: Paul Kilar Date: Thu, 17 Jul 2014 10:04:08 -0400 Subject: testing/dante: Fix startup script --- testing/dante/APKBUILD | 12 ++++++------ testing/dante/sockd.initd | 34 +++++----------------------------- 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/testing/dante/APKBUILD b/testing/dante/APKBUILD index f3bcfa90c..2fdce1a7a 100644 --- a/testing/dante/APKBUILD +++ b/testing/dante/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Paul Kilar # Maintainer: Paul Kilar pkgname=dante -pkgver='1.4.0' -pkgrel=0 +pkgver="1.4.0" +pkgrel=1 pkgdesc="Dante is SOCKS server and a SOCKS client" url="http://www.inet.no/dante/index.html" arch="all" @@ -30,7 +30,7 @@ prepare() { build() { cd "$_builddir" - ./configure --prefix=/usr + ac_cv_func_sched_setscheduler=no ./configure --prefix=/usr make || return 1 } @@ -54,11 +54,11 @@ server() { } md5sums="c117a3ce25afb936f13b76f1d2524879 dante-1.4.0.tar.gz -2e947985f21a3b0121ac4af8adb16e0c sockd.initd +b556d2aed497062eb866bae4a647f748 sockd.initd cb49c2fc52c777cc313b089f9d333160 sockd.confd" sha256sums="55d448f2d523e69b5637ef12c05556f39201a2c397b4671a2aaaa914ba65684b dante-1.4.0.tar.gz -40792a170047097164aef164b26f3df00c75b39ca3f6d6a346322f8d286a4b16 sockd.initd +a23e2cc43a1a7c14804816e6410045b06981bbcaf31696b11c76cb2c0aff6555 sockd.initd 0b25fe45b5b4315ef3958b89d6b63fd77004ea26d9f5160380c34bbc6e7bbd9f sockd.confd" sha512sums="978a70eb789dd2d00a9ac4a7671d13450f9ac96344ae41382c38de7a12e98c2e24159c2e140c95caff0cc9119f7cf409a8716130b34957020706a17c0f96de38 dante-1.4.0.tar.gz -3859b2ccd5c4987fb1221697cba87163d23b53de29fb8b6dd3a6b5560288c2a21c1528f2d7f54fea33644dc50361d594c6fca3364e89a58d01c3de5d6b2d4ebf sockd.initd +ee5359f94858adaafa5ebea3f7b773cf2760a36c6e9bf01bc78f8644e39c07164a8bc1376977fd2f3cb796c7d5edb7c245513ea4e92ab0640ef213d820089a2a sockd.initd 09b744340c03369983a9b07e50215288e5a43d15497db479867132bee46f34a7a8e451c980e064f751ad50e5231d77fa5ae9fd5cf2efe3274ae50168bfceaa67 sockd.confd" diff --git a/testing/dante/sockd.initd b/testing/dante/sockd.initd index ebf278036..94311ddf7 100644 --- a/testing/dante/sockd.initd +++ b/testing/dante/sockd.initd @@ -10,34 +10,10 @@ depend() { use dns } -SOCKD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid} -SOCKD_BINARY=${SSHD_BINARY:-/usr/sbin/sockd} +command=/usr/sbin/sockd +pidfile=/var/run/${SVCNAME}.pid +command_args="${SOCKD_OPTS}" -check_config() { - $SOCKD_BINARY -V || return 1 -} - -######################################################################################### - -start() { - check_config || return 1 - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec "${SOCKD_BINARY}" \ - --pidfile "${SOCKD_PIDFILE}" \ - -- ${SOCKD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec "${SOCKD_BINARY}" \ - --pidfile "${SOCKD_PIDFILE}" --quiet - eend $? -} - -restart() { - ebegin "Restarting ${SVCNAME}" - stop - start - eend $? +start_pre() { + $command -V } -- cgit v1.2.3