[arch-commits] Commit in dnscrypt-proxy/trunk (PKGBUILD dnscrypt-proxy.install)

[Felix Yan]

    Date: Tuesday, December 20, 2016 @ 03:55:44
  Author: felixonmars
Revision: 200384

upgpkg: dnscrypt-proxy 1.8.1-1

Modified:
  dnscrypt-proxy/trunk/PKGBUILD
  dnscrypt-proxy/trunk/dnscrypt-proxy.install

------------------------+
 PKGBUILD               |   14 +++++++++-----
 dnscrypt-proxy.install |    5 ++---
 2 files changed, 11 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-20 03:30:47 UTC (rev 200383)
+++ PKGBUILD	2016-12-20 03:55:44 UTC (rev 200384)
@@ -4,27 +4,31 @@
 # Contributor: peace4all <markspost at rocketmail dot com>
 
 pkgname=dnscrypt-proxy
-pkgver=1.7.0
+pkgver=1.8.1
 pkgrel=1
 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' 'systemd')
+depends=('libsodium' 'systemd' 'libtool')
 install=dnscrypt-proxy.install
+backup=('etc/dnscrypt-proxy.conf')
 source=("http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.gz")
-sha512sums=('611d9cd9d9c086ec8e2b60f6c574451eae71ea07de85973049be7090cfbd8bf790d41f8a4a2b39d74091fba7091551967b93b85a8661c03ecad43d868df597a3')
+sha512sums=('5bfbdee4c7a29ac41317bb2ac2e3ee89ce11ebfc28dc13b9931734e5bd5b4afab8435b4f28c72edf73193d4ee94c5fcec82e0572df68cd3724f90e7fe120e459')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  sed -i 's|/usr/local/sbin|/usr/bin|' dnscrypt-proxy.service
+  sed -e '/--resolver-name/d' \
+      -e '/--user/d' \
+      -e 's|^ExecStart=.*|ExecStart=/usr/bin/dnscrypt-proxy /etc/dnscrypt-proxy.conf|' \
+      -i dnscrypt-proxy.service
 }
 
 build() {
   cd $pkgname-$pkgver
 
-  ./configure --prefix=/usr --sbindir=/usr/bin --with-systemd
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --with-systemd
   make -j2
 }
 

Modified: dnscrypt-proxy.install
===================================================================
--- dnscrypt-proxy.install	2016-12-20 03:30:47 UTC (rev 200383)
+++ dnscrypt-proxy.install	2016-12-20 03:55:44 UTC (rev 200384)
@@ -1,7 +1,6 @@
 post_upgrade() {
-  if [ "$(vercmp $2 1.6.0-2)" -lt 0 ]
+  if [ "$(vercmp $2 1.8.1-1)" -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.'
+    echo 'Since 1.8.1-1 there is a new configuration file at /etc/dnscrypt-proxy.conf. The systemd unit has been configured to use it, so please adjust your settings there.'
   fi
 }