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

[Bartłomiej Piotrowski]

    Date: Saturday, September 5, 2015 @ 12:32:04
  Author: bpiotrowski
Revision: 139230

upgpkg: dnscrypt-proxy 1.6.0-3

* remove network.target dependency from dnscrypt-proxy.socket (FS#45970)
* do not provide and backup /etc/conf.d/dnscrypt-proxy

Added:
  dnscrypt-proxy/trunk/Remove-network.target-dependency-from-dnscrypt-proxy.patch
Modified:
  dnscrypt-proxy/trunk/PKGBUILD

------------------------------------------------------------+
 PKGBUILD                                                   |   16 ++++---
 Remove-network.target-dependency-from-dnscrypt-proxy.patch |   25 +++++++++++
 2 files changed, 35 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-05 10:31:32 UTC (rev 139229)
+++ PKGBUILD	2015-09-05 10:32:04 UTC (rev 139230)
@@ -5,19 +5,23 @@
 
 pkgname=dnscrypt-proxy
 pkgver=1.6.0
-pkgrel=2
+pkgrel=3
 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')
-backup=(etc/conf.d/dnscrypt-proxy)
 install=dnscrypt-proxy.install
-source=("http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.gz")
-sha512sums=('1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02')
+source=("http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.gz"
+        'Remove-network.target-dependency-from-dnscrypt-proxy.patch')
+sha512sums=('1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02'
+            'a3fd405cc635ec3b8564fbfc769504eeaf77b693fa521df44be7beb1d5abea971b81905a11357870a6fb5ba8d129c91bf9cc337cb730b733c3d3c047854a4021')
 
 prepare() {
-  sed -i 's|/usr/local/sbin|/usr/bin|' $pkgname-$pkgver/dnscrypt-proxy.service
+  cd $pkgname-$pkgver
+
+  sed -i 's|/usr/local/sbin|/usr/bin|' dnscrypt-proxy.service
+  patch -p1 -i ../Remove-network.target-dependency-from-dnscrypt-proxy.patch
 }
 
 build() {
@@ -31,7 +35,7 @@
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
-  mkdir -p "$pkgdir"/{usr/share/{licenses,doc}/$pkgname,etc/conf.d,usr/lib/systemd/system}
+  mkdir -p "$pkgdir"/{usr/share/{licenses,doc}/$pkgname,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 dnscrypt-proxy.service "$pkgdir"/usr/lib/systemd/system

Added: Remove-network.target-dependency-from-dnscrypt-proxy.patch
===================================================================
--- Remove-network.target-dependency-from-dnscrypt-proxy.patch	                        (rev 0)
+++ Remove-network.target-dependency-from-dnscrypt-proxy.patch	2015-09-05 10:32:04 UTC (rev 139230)
@@ -0,0 +1,25 @@
+From f20d71fb863b6d1f4588b6b175efa9f2fd331d90 Mon Sep 17 00:00:00 2001
+From: Frank Denis <github at pureftpd.org>
+Date: Mon, 17 Aug 2015 22:41:24 +0200
+Subject: [PATCH] Remove network.target dependency from dnscrypt-proxy.socket
+ If this is not correct, I'd love some input from omebody who knows systemd
+ more than I do (i.e. virtually anyone).
+
+---
+ dnscrypt-proxy.socket | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/dnscrypt-proxy.socket b/dnscrypt-proxy.socket
+index 22e62b9..ea20922 100644
+--- a/dnscrypt-proxy.socket
++++ b/dnscrypt-proxy.socket
+@@ -1,6 +1,5 @@
+ [Unit]
+ Description=dnscrypt-proxy listening socket
+-After=network.target
+ 
+ [Socket]
+ ListenStream=127.0.0.1:53
+-- 
+2.5.1
+