X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from mail-qg0-f49.google.com (mail-qg0-f49.google.com [209.85.192.49]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 6F0E0DC00B6 for ; Thu, 17 Jul 2014 14:04:13 +0000 (UTC) Received: by mail-qg0-f49.google.com with SMTP id j107so1906097qga.36 for ; Thu, 17 Jul 2014 07:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=sVxyFMasK3yZtwvEJCBW9MDtSXGEyi/F1l19NbNiK1s=; b=aiCKSKGkS3CG2a+sxsezly6wzD4P12op4d3jccW7EkEQP7SsKBIYG3z9dalHnVqWqU v0XZ0Vtyc/DsMblCiD71ZeBg1pRK6ILmdfiXWI1aNaE0j57r3tztlExz9qfnaEHAsqLT Jh5CJ2FPYq/RZM1An5yYX4sBoRZwpvPnJGoEWp3oZnPNraJwKoAxEyBqQB3E9rIYw5dE OuEWidD3lCMQu3OiPa9kRYIwXvvKltHekyQVeoPVI2oxiluLZtk1ZO9UN+AbYJiwez74 uQUdGdDNVjx4vB23/t2MxMKIeUP78uEHGZGeqEeX4VxUy2MpBWoWHZJPM3xHGrJq/V5Q cv/w== X-Received: by 10.224.13.4 with SMTP id z4mr57705490qaz.51.1405605851551; Thu, 17 Jul 2014 07:04:11 -0700 (PDT) Received: from alpine3-dev.mezocliq.com ([38.122.241.27]) by mx.google.com with ESMTPSA id k7sm4653359qas.24.2014.07.17.07.04.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Jul 2014 07:04:11 -0700 (PDT) From: Paul Kilar To: alpine-devel@lists.alpinelinux.org Cc: Paul Kilar Subject: [alpine-devel] [PATCH] Fixed startup script Date: Thu, 17 Jul 2014 10:04:08 -0400 Message-Id: <1405605848-16863-1-git-send-email-pkilar@gmail.com> X-Mailer: git-send-email 2.0.0 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/dante/APKBUILD | 8 ++++---- testing/dante/sockd.initd | 34 +++++----------------------------- 2 files changed, 9 insertions(+), 33 deletions(-) diff --git a/testing/dante/APKBUILD b/testing/dante/APKBUILD index f3bcfa9..40e2ba1 100644 --- a/testing/dante/APKBUILD +++ b/testing/dante/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Paul Kilar pkgname=dante pkgver='1.4.0' -pkgrel=0 +pkgrel=1 pkgdesc="Dante is SOCKS server and a SOCKS client" url="http://www.inet.no/dante/index.html" arch="all" @@ -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 ebf2780..94311dd 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 } -- 2.0.0 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---