[arch-commits] Commit in dnscrypt-proxy/trunk (4 files)

[Felix Yan]

    Date: Thursday, August 6, 2015 @ 11:08:00
  Author: fyan
Revision: 138010

upgpkg: dnscrypt-proxy 1.6.0-2

enable systemd support (FS#45910) and drop the conf.d file

Added:
  dnscrypt-proxy/trunk/dnscrypt-proxy.install
Modified:
  dnscrypt-proxy/trunk/PKGBUILD
Deleted:
  dnscrypt-proxy/trunk/conf.d.file
  dnscrypt-proxy/trunk/dnscrypt-proxy.service

------------------------+
 PKGBUILD               |   23 ++++++++++++-----------
 conf.d.file            |    7 -------
 dnscrypt-proxy.install |    7 +++++++
 dnscrypt-proxy.service |   18 ------------------
 4 files changed, 19 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-06 08:27:05 UTC (rev 138009)
+++ PKGBUILD	2015-08-06 09:08:00 UTC (rev 138010)
@@ -5,24 +5,25 @@
 
 pkgname=dnscrypt-proxy
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for securing communications between a client and a DNS resolver"
 arch=('i686' 'x86_64')
 url="http://dnscrypt.org/"
 license=('custom:ISC')
-depends=('libsodium')
-source=(http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.gz
-        conf.d.file
-        dnscrypt-proxy.service)
+depends=('libsodium' 'systemd')
 backup=(etc/conf.d/dnscrypt-proxy)
-sha512sums=('1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02'
-            '26e5ce3198c25ff25542dc399f2bb5467ac349dbc11c2ebd6d3ba978ffaef09607088d9401e62ba33c6f50b8b29a59f56fe97d964f55e63ee9d8ca23862c3e00'
-            '9a1072f83e83e55dcdd7b80d1943f60963fa240da8a50d7491cc219797c6b85b8d79d087c0f7bb9766a4d467dec58eaae2bef31b759652545ace65a6a8afb608')
+install=dnscrypt-proxy.install
+source=("http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.gz")
+sha512sums=('1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02')
 
+prepare() {
+  sed -i 's|/usr/local/sbin|/usr/bin|' $pkgname-$pkgver/dnscrypt-proxy.service
+}
+
 build() {
   cd $pkgname-$pkgver
 
-  ./configure --prefix=/usr --sbindir=/usr/bin
+  ./configure --prefix=/usr --sbindir=/usr/bin --with-systemd
   make -j2
 }
 
@@ -33,6 +34,6 @@
   mkdir -p "$pkgdir"/{usr/share/{licenses,doc}/$pkgname,etc/conf.d,usr/lib/systemd/system}
   install -m 644 COPYING "$pkgdir"/usr/share/licenses/$pkgname
   install -m 644 AUTHORS NEWS README README.markdown "$pkgdir"/usr/share/doc/$pkgname
-  install -m 644 "$srcdir"/conf.d.file "$pkgdir"/etc/conf.d/$pkgname
-  install -m 644 "$srcdir"/dnscrypt-proxy.service "$pkgdir"/usr/lib/systemd/system
+  install -m 644 dnscrypt-proxy.service "$pkgdir"/usr/lib/systemd/system
+  install -m 644 dnscrypt-proxy.socket "$pkgdir"/usr/lib/systemd/system
 }

Deleted: conf.d.file
===================================================================
--- conf.d.file	2015-08-06 08:27:05 UTC (rev 138009)
+++ conf.d.file	2015-08-06 09:08:00 UTC (rev 138010)
@@ -1,7 +0,0 @@
-DNSCRYPT_LOCALIP=127.0.0.1
-DNSCRYPT_LOCALPORT=53
-DNSCRYPT_USER=nobody
-DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.opendns.com
-DNSCRYPT_PROVIDER_KEY=B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79
-DNSCRYPT_RESOLVERIP=208.67.220.220
-DNSCRYPT_RESOLVERPORT=443

Added: dnscrypt-proxy.install
===================================================================
--- dnscrypt-proxy.install	                        (rev 0)
+++ dnscrypt-proxy.install	2015-08-06 09:08:00 UTC (rev 138010)
@@ -0,0 +1,7 @@
+post_upgrade() {
+  if [ "$(vercmp $2 1.6.0-2)" -lt 0 ]
+  then
+    echo 'Since 1.6.0-2 the conf.d file is no longer in use. We have enabled systemd support and providing upstream systemd units.'
+    echo 'You will need to use the systemd way (overriding in /etc/systemd/system/dnscrypt-proxy.{service,socket}.d) to apply your customization.'
+  fi
+}

Deleted: dnscrypt-proxy.service
===================================================================
--- dnscrypt-proxy.service	2015-08-06 08:27:05 UTC (rev 138009)
+++ dnscrypt-proxy.service	2015-08-06 09:08:00 UTC (rev 138010)
@@ -1,18 +0,0 @@
-[Unit]
-Description=A tool for securing communications between a client and a DNS resolver.
-After=network.target
-# Only needed if you use pdnsd, other caching DNS servers can go here. Could be ignored too.
-#Before=pdnsd.service
-
-[Service]
-EnvironmentFile=/etc/conf.d/dnscrypt-proxy
-ExecStart=/usr/bin/dnscrypt-proxy \
-	--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
-    --resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \
-    --provider-name=${DNSCRYPT_PROVIDER_NAME} \
-    --provider-key=${DNSCRYPT_PROVIDER_KEY} \
-	--user=${DNSCRYPT_USER}
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target