[arch-commits] Commit in dnscrypt-proxy/repos (10 files)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Sat Sep 5 10:32:25 UTC 2015


    Date: Saturday, September 5, 2015 @ 12:32:25
  Author: bpiotrowski
Revision: 139232

archrelease: copy trunk to community-i686, community-x86_64

Added:
  dnscrypt-proxy/repos/community-i686/PKGBUILD
    (from rev 139230, dnscrypt-proxy/trunk/PKGBUILD)
  dnscrypt-proxy/repos/community-i686/Remove-network.target-dependency-from-dnscrypt-proxy.patch
    (from rev 139230, dnscrypt-proxy/trunk/Remove-network.target-dependency-from-dnscrypt-proxy.patch)
  dnscrypt-proxy/repos/community-i686/dnscrypt-proxy.install
    (from rev 139230, dnscrypt-proxy/trunk/dnscrypt-proxy.install)
  dnscrypt-proxy/repos/community-x86_64/PKGBUILD
    (from rev 139231, dnscrypt-proxy/trunk/PKGBUILD)
  dnscrypt-proxy/repos/community-x86_64/Remove-network.target-dependency-from-dnscrypt-proxy.patch
    (from rev 139231, dnscrypt-proxy/trunk/Remove-network.target-dependency-from-dnscrypt-proxy.patch)
  dnscrypt-proxy/repos/community-x86_64/dnscrypt-proxy.install
    (from rev 139231, dnscrypt-proxy/trunk/dnscrypt-proxy.install)
Deleted:
  dnscrypt-proxy/repos/community-i686/PKGBUILD
  dnscrypt-proxy/repos/community-i686/dnscrypt-proxy.install
  dnscrypt-proxy/repos/community-x86_64/PKGBUILD
  dnscrypt-proxy/repos/community-x86_64/dnscrypt-proxy.install

-----------------------------------------------------------------------------+
 /PKGBUILD                                                                   |   86 ++++++++++
 /dnscrypt-proxy.install                                                     |   14 +
 community-i686/PKGBUILD                                                     |   39 ----
 community-i686/Remove-network.target-dependency-from-dnscrypt-proxy.patch   |   25 ++
 community-i686/dnscrypt-proxy.install                                       |    7 
 community-x86_64/PKGBUILD                                                   |   39 ----
 community-x86_64/Remove-network.target-dependency-from-dnscrypt-proxy.patch |   25 ++
 community-x86_64/dnscrypt-proxy.install                                     |    7 
 8 files changed, 150 insertions(+), 92 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-09-05 10:32:18 UTC (rev 139231)
+++ community-i686/PKGBUILD	2015-09-05 10:32:25 UTC (rev 139232)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Techlive Zheng <techlivezheng at gmail dot com>
-# Contributor: peace4all <markspost at rocketmail dot com>
-
-pkgname=dnscrypt-proxy
-pkgver=1.6.0
-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' 'systemd')
-backup=(etc/conf.d/dnscrypt-proxy)
-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 --with-systemd
-  make -j2
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  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 dnscrypt-proxy.service "$pkgdir"/usr/lib/systemd/system
-  install -m 644 dnscrypt-proxy.socket "$pkgdir"/usr/lib/systemd/system
-}

Copied: dnscrypt-proxy/repos/community-i686/PKGBUILD (from rev 139230, dnscrypt-proxy/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-09-05 10:32:25 UTC (rev 139232)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Techlive Zheng <techlivezheng at gmail dot com>
+# Contributor: peace4all <markspost at rocketmail dot com>
+
+pkgname=dnscrypt-proxy
+pkgver=1.6.0
+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')
+install=dnscrypt-proxy.install
+source=("http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.gz"
+        'Remove-network.target-dependency-from-dnscrypt-proxy.patch')
+sha512sums=('1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02'
+            'a3fd405cc635ec3b8564fbfc769504eeaf77b693fa521df44be7beb1d5abea971b81905a11357870a6fb5ba8d129c91bf9cc337cb730b733c3d3c047854a4021')
+
+prepare() {
+  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() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --sbindir=/usr/bin --with-systemd
+  make -j2
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  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
+  install -m 644 dnscrypt-proxy.socket "$pkgdir"/usr/lib/systemd/system
+}

Copied: dnscrypt-proxy/repos/community-i686/Remove-network.target-dependency-from-dnscrypt-proxy.patch (from rev 139230, dnscrypt-proxy/trunk/Remove-network.target-dependency-from-dnscrypt-proxy.patch)
===================================================================
--- community-i686/Remove-network.target-dependency-from-dnscrypt-proxy.patch	                        (rev 0)
+++ community-i686/Remove-network.target-dependency-from-dnscrypt-proxy.patch	2015-09-05 10:32:25 UTC (rev 139232)
@@ -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
+

Deleted: community-i686/dnscrypt-proxy.install
===================================================================
--- community-i686/dnscrypt-proxy.install	2015-09-05 10:32:18 UTC (rev 139231)
+++ community-i686/dnscrypt-proxy.install	2015-09-05 10:32:25 UTC (rev 139232)
@@ -1,7 +0,0 @@
-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
-}

Copied: dnscrypt-proxy/repos/community-i686/dnscrypt-proxy.install (from rev 139230, dnscrypt-proxy/trunk/dnscrypt-proxy.install)
===================================================================
--- community-i686/dnscrypt-proxy.install	                        (rev 0)
+++ community-i686/dnscrypt-proxy.install	2015-09-05 10:32:25 UTC (rev 139232)
@@ -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: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-09-05 10:32:18 UTC (rev 139231)
+++ community-x86_64/PKGBUILD	2015-09-05 10:32:25 UTC (rev 139232)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Techlive Zheng <techlivezheng at gmail dot com>
-# Contributor: peace4all <markspost at rocketmail dot com>
-
-pkgname=dnscrypt-proxy
-pkgver=1.6.0
-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' 'systemd')
-backup=(etc/conf.d/dnscrypt-proxy)
-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 --with-systemd
-  make -j2
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  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 dnscrypt-proxy.service "$pkgdir"/usr/lib/systemd/system
-  install -m 644 dnscrypt-proxy.socket "$pkgdir"/usr/lib/systemd/system
-}

Copied: dnscrypt-proxy/repos/community-x86_64/PKGBUILD (from rev 139231, dnscrypt-proxy/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-09-05 10:32:25 UTC (rev 139232)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Techlive Zheng <techlivezheng at gmail dot com>
+# Contributor: peace4all <markspost at rocketmail dot com>
+
+pkgname=dnscrypt-proxy
+pkgver=1.6.0
+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')
+install=dnscrypt-proxy.install
+source=("http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.gz"
+        'Remove-network.target-dependency-from-dnscrypt-proxy.patch')
+sha512sums=('1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02'
+            'a3fd405cc635ec3b8564fbfc769504eeaf77b693fa521df44be7beb1d5abea971b81905a11357870a6fb5ba8d129c91bf9cc337cb730b733c3d3c047854a4021')
+
+prepare() {
+  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() {
+  cd $pkgname-$pkgver
+
+  ./configure --prefix=/usr --sbindir=/usr/bin --with-systemd
+  make -j2
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  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
+  install -m 644 dnscrypt-proxy.socket "$pkgdir"/usr/lib/systemd/system
+}

Copied: dnscrypt-proxy/repos/community-x86_64/Remove-network.target-dependency-from-dnscrypt-proxy.patch (from rev 139231, dnscrypt-proxy/trunk/Remove-network.target-dependency-from-dnscrypt-proxy.patch)
===================================================================
--- community-x86_64/Remove-network.target-dependency-from-dnscrypt-proxy.patch	                        (rev 0)
+++ community-x86_64/Remove-network.target-dependency-from-dnscrypt-proxy.patch	2015-09-05 10:32:25 UTC (rev 139232)
@@ -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
+

Deleted: community-x86_64/dnscrypt-proxy.install
===================================================================
--- community-x86_64/dnscrypt-proxy.install	2015-09-05 10:32:18 UTC (rev 139231)
+++ community-x86_64/dnscrypt-proxy.install	2015-09-05 10:32:25 UTC (rev 139232)
@@ -1,7 +0,0 @@
-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
-}

Copied: dnscrypt-proxy/repos/community-x86_64/dnscrypt-proxy.install (from rev 139231, dnscrypt-proxy/trunk/dnscrypt-proxy.install)
===================================================================
--- community-x86_64/dnscrypt-proxy.install	                        (rev 0)
+++ community-x86_64/dnscrypt-proxy.install	2015-09-05 10:32:25 UTC (rev 139232)
@@ -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
+}



More information about the arch-commits mailing list