Partial fix for failing to bind to port 53

3 files changed, 14 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index cc167c9..fa9595d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _url="https://raw.githubusercontent.com/gentoo/gentoo/master"
 
 pkgname=dnscrypt-proxy-openrc
-pkgver=20180714
+pkgver=20180717
 pkgrel=1
 pkgdesc="OpenRC dnscrypt-proxy init script"
 arch=('any')
@@ -15,8 +15,8 @@ backup=('etc/init.d/dnscrypt-proxy'
         'etc/conf.d/dnscrypt-proxy')
 source=("dnscrypt-proxy.initd"
         "dnscrypt-proxy.confd")
-sha256sums=('da9e05aaa2f835f5d458145dc1f05a914a47ebfe053d2bed92fbe3ad1005624d'
-            '5839ea21a543e380c6a55f646ea2c15854ea295a9df73f690522892d7c8f9228')
+sha256sums=('61143a519c2961f39e4eb577153c350afb6acb12508aa50ffed798ce8234f362'
+            '5978784777f0a9ec7830be9af454f3669c88306d617297c43f713e38647f9a1b')
 
 pkgver() {
     date +%Y%m%d
diff --git a/dnscrypt-proxy.confd b/dnscrypt-proxy.confd
index 638fdbe..598b63c 100644
--- a/dnscrypt-proxy.confd
+++ b/dnscrypt-proxy.confd
@@ -1,3 +1,5 @@
-DNSCRYPT_OPTS="--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
-DNSCRYPT_USER="dnscrypt-proxy"
-DNSCRYPT_GROUP="dnscrypt-proxy"
+#rc_use="tor"
+DNSCRYPT_PROXY_OPTS="--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
+DNSCRYPT_PROXY_USER="dnscrypt-proxy"
+DNSCRYPT_PROXY_GROUP="dnscrypt-proxy"
+DNSCRYPT_PROXY_DUAL="${DNSCRYPT_PROXY_USER}:${DNSCRYPT_PROXY_GROUP}"
diff --git a/dnscrypt-proxy.initd b/dnscrypt-proxy.initd
index 2e6ad1b..12e73e5 100644
--- a/dnscrypt-proxy.initd
+++ b/dnscrypt-proxy.initd
@@ -3,17 +3,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/bin/dnscrypt-proxy"
-command_args="${DNSCRYPT_OPTS:---config /etc/dnscrypt-proxy/dnscrypt-proxy.toml}"
-command_user="${DNSCRYPT_USER:-dnscrypt-proxy}:${DNSCRYPT_GROUP:-dnscrypt-proxy}"
-pidfile="/run/${SVCNAME}.pid"
+command_args="${DNSCRYPT_PROXY_OPTS}"
+#command_user="${DNSCRYPT_PROXY_USER}:${DNSCRYPT_PROXY_GROUP}"
+pidfile="/run/${RC_SVCNAME}.pid"
 start_stop_daemon_args="--background --make-pidfile"
 
 depend() {
-        use net logger
+        use logger net
         provide dns
 }
 
 start_pre() {
-        checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${SVCNAME}"
-        checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${SVCNAME}"
+        checkpath -q -d -m 0775 -o "${DNSCRYPT_PROXY_DUAL}" /var/cache/"${RC_SVCNAME}"
+        checkpath -q -d -m 0775 -o "${DNSCRYPT_PROXY_DUAL}" /var/log/"${RC_SVCNAME}"
 }