adopted and improved

2 files changed, 36 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 91dca592f4f0..14a5d05454ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,26 @@
 pkgbase = chaosvpn
-	pkgdesc = Config generator for chaosVPN
+	pkgdesc = Configuration generator for ChaosVPN
 	pkgver = 2.19
-	pkgrel = 1
-	url = http://wiki.hamburg.ccc.de
+	pkgrel = 2
+	url = https://wiki.hamburg.ccc.de/ChaosVPN
 	arch = i686
 	arch = x86_64
 	license = Apache
-	makedepends = git
 	makedepends = flex
 	depends = tinc
 	depends = iproute2
 	backup = etc/tinc/chaosvpn.conf
-	source = git://github.com/ryd/chaosvpn.git
+	backup = etc/tinc/warzone.conf
+	source = chaosvpn-2.19.tar.gz::https://github.com/ryd/chaosvpn/archive/v2.19.tar.gz
+	source = crypto.c.patch::https://github.com/ryd/chaosvpn/commit/c842faae63b562acc7d989a9cdc815def9ee2ed6.diff
 	source = iproute2-chaosvpn.patch
 	source = iproute2-warzone.patch
 	source = chaosvpn.service
-	md5sums = SKIP
-	md5sums = 31f1d9c064d3cdefb424e6b44805e824
-	md5sums = 8d8a99003bf186b6dd7e5fd2e80e0cad
-	md5sums = 97e364f361231d1f2cba0c784719be55
+	sha256sums = 53625d131140529e88d8a14c34cc4d8d5d0134292d90f4ae55e9df29d3232828
+	sha256sums = 8380e23126b12aa38e44d43d34c29da3cc67ba1cb626ce98899af2d8e4d13bcc
+	sha256sums = 4c975e57867aae2291f4dfe2c024f8b98907ec8f83345672ee0641700da433a8
+	sha256sums = b7baf5d649c7acf09f3afbc91097caaa8fbe762b212fd47adc88d330e9dfa102
+	sha256sums = bb00812aa6fd254f495aa4024f5a6cc7192987ca538c0880298d58e655f70cc4
 
 pkgname = chaosvpn
 
diff --git a/PKGBUILD b/PKGBUILD
index a3f03ff3ce5e..db1911d50669 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,48 @@
+# Maintainer: Stephan Springer <buzo+arch@Lini.de>
+# Contributor:Moritz Kaspar Rudert (mortzu) <me@mortzu.de>
+
 pkgname=chaosvpn
 pkgver=2.19
-pkgrel=1
-pkgdesc="Config generator for chaosVPN"
+pkgrel=2
+pkgdesc="Configuration generator for ChaosVPN"
 arch=('i686' 'x86_64')
-url="http://wiki.hamburg.ccc.de"
+url='https://wiki.hamburg.ccc.de/ChaosVPN'
 license=('Apache')
-makedepends=('git' 'flex')
+makedepends=('flex')
 depends=('tinc' 'iproute2')
-backup=(etc/tinc/chaosvpn.conf)
+backup=('etc/tinc/chaosvpn.conf' 'etc/tinc/warzone.conf')
 
-source=(git://github.com/ryd/chaosvpn.git
+source=("$pkgname-$pkgver.tar.gz::https://github.com/ryd/chaosvpn/archive/v$pkgver.tar.gz"
+        "crypto.c.patch::https://github.com/ryd/chaosvpn/commit/c842faae63b562acc7d989a9cdc815def9ee2ed6.diff"
         iproute2-chaosvpn.patch
         iproute2-warzone.patch
         chaosvpn.service)
-md5sums=('SKIP'
-         '31f1d9c064d3cdefb424e6b44805e824'
-         '8d8a99003bf186b6dd7e5fd2e80e0cad'
-         '97e364f361231d1f2cba0c784719be55')
-
-pkgver() {
-  cd "$pkgname"
-  git describe | sed 's/^v//;s/-/./g'
-}
+sha256sums=('53625d131140529e88d8a14c34cc4d8d5d0134292d90f4ae55e9df29d3232828'
+            '8380e23126b12aa38e44d43d34c29da3cc67ba1cb626ce98899af2d8e4d13bcc'
+            '4c975e57867aae2291f4dfe2c024f8b98907ec8f83345672ee0641700da433a8'
+            'b7baf5d649c7acf09f3afbc91097caaa8fbe762b212fd47adc88d330e9dfa102'
+            'bb00812aa6fd254f495aa4024f5a6cc7192987ca538c0880298d58e655f70cc4')
 
 prepare() {
-  cd "$pkgname"
-  sed 's#/sbin#/bin#g' -i Makefile
+  cd "$pkgname-$pkgver"
+  sed -e 's|/sbin|/bin|g' -e 's|-D_BSD_SOURCE|-D_DEFAULT_SOURCE|' -i Makefile
+  patch -p1 -i "$srcdir"/crypto.c.patch
 }
 
 build() {
-  cd "$pkgname"
+  cd "$pkgname-$pkgver"
   make
 }
 
 package() {
-  cd "$pkgname"
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  install -Dm644 "$srcdir/chaosvpn.service" "$pkgdir/usr/lib/systemd/system/chaosvpn.service"
+  install -D -m644 "$srcdir"/chaosvpn.service "$pkgdir"/usr/lib/systemd/system/chaosvpn.service
 
-  patch -d "$pkgdir/etc/tinc" -p0 -i "$srcdir/iproute2-chaosvpn.patch"
-  patch -d "$pkgdir/etc/tinc" -p0 -i "$srcdir/iproute2-warzone.patch"
+  patch -d "$pkgdir"/etc/tinc -p0 -i "$srcdir"/iproute2-chaosvpn.patch
+  patch -d "$pkgdir"/etc/tinc -p0 -i "$srcdir"/iproute2-warzone.patch
+  install -d -m755 "$pkgdir"/etc/tinc/chaos
 
-  sed -e 's|/sbin/ip|/usr/sbin/ip|g' -i "$pkgdir/etc/tinc/chaosvpn.conf" "$pkgdir/etc/tinc/warzone.conf"
+  sed -e 's|/sbin/ip|/usr/sbin/ip|g' -i "$pkgdir"/etc/tinc/{chaosvpn,warzone}.conf
 }