From 2142ef319d43a37e96a57fd86d7e05b9430139de Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 17 Dec 2018 11:07:37 -0800 Subject: Minimized variations from upstream | Removed clutter --- PKGBUILD | 26 +++++++++++++++----------- dnscrypt-proxy.confd | 3 --- dnscrypt-proxy.initd | 1 - 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index dffbf80..20ab68e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,38 +1,42 @@ # Maintainer: jc_gargma +# Maintainer (Artix): Rafli Akmal +# Contributor (Artix): artoo +# Contributor (Artix): Oscar Campos # # I maintain this because: -# Artix lacks this init script entirely -# Gentoo version uses /usr/sbin +# Artix version uses /usr/sbin +# Artix version doesn't drop to user +# Artix version broken pkgname=dnscrypt-proxy-openrc -pkgver=20181030 +pkgver=20181217 pkgrel=1 pkgdesc="OpenRC dnscrypt-proxy init script" arch=('any') url="https://neueland.iserlohn-fortress.net/gitea/jc_gargma" license=('GPL2') -groups=('openrc-system') +groups=('openrc-galaxy') depends=('openrc' 'dnscrypt-proxy') backup=('etc/init.d/dnscrypt-proxy' 'etc/conf.d/dnscrypt-proxy') source=("dnscrypt-proxy.initd" "dnscrypt-proxy.confd") -sha256sums=('bb2a7fe87add8a8e41adf61a4c217db3735181b275fa6217d3bb23f8001690f6' - '5978784777f0a9ec7830be9af454f3669c88306d617297c43f713e38647f9a1b') +sha256sums=('1cdd38fc14dfaf727423e021d43130523eda992429b49b1c6f9e015cb79bd02a' + '080c190453dd94e1ace9d8c6bbe99ade198c8a453b9ecdd030fc14359581cfc7') -pkgver() { - date +%Y%m%d -} +# pkgver() { +# date +%Y%m%d +# } _inst_initd(){ install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 } _inst_confd(){ - install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 + install -Dm644 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 } package() { - _inst_initd 'dnscrypt-proxy' _inst_confd 'dnscrypt-proxy' + _inst_initd 'dnscrypt-proxy' } diff --git a/dnscrypt-proxy.confd b/dnscrypt-proxy.confd index 598b63c..be5d36b 100644 --- a/dnscrypt-proxy.confd +++ b/dnscrypt-proxy.confd @@ -1,5 +1,2 @@ #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 67828be..fe57450 100644 --- a/dnscrypt-proxy.initd +++ b/dnscrypt-proxy.initd @@ -4,7 +4,6 @@ command="/usr/bin/dnscrypt-proxy" 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" -- cgit v1.2.1