build from git; don't force privilege dropping

1 files changed, 14 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4005875cc504..c82d675aad4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,40 +2,40 @@
 
 pkgname=tinc-pre
 pkgver=1.1pre11
-pkgrel=4
+pkgrel=5
 pkgdesc="VPN (Virtual Private Network) daemon (Pre-release)"
 arch=(i686 x86_64)
 url="http://www.tinc-vpn.org/"
 license=('GPL')
 depends=('lzo2' 'openssl')
-optdepends=('wxpython: gui support')
+makedepends=('autoconf')
+optdepends=('python2' 'wxpython: gui support')
 provides=('tinc-pre' 'tinc-pre-systemd')
 conflicts=('tinc' 'tinc-pre-systemd')
 install="${pkgname}.install"
-source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz
-        tincd.service
-        tincd@.service)
+source=("git+https://github.com/gsliepen/tinc.git#tag=release-$pkgver" "tincd.service" "tincd@.service")
+#sha256sums=('942594563d3aef926a2d04e9ece90c16daf1c700e99e3b91ff749e8377fbf757')
+sha256sums=('SKIP'
+            '44959a62e7738d5febc7705165b0eb9e4265f9d2680e408c22d31c14cfe06410'
+            '98bd9941313822b30f66caeb6df9bbe225ed0a8eeed217a3a7eb1de72d9fa704')
 
 build() {
-    cd "$srcdir/tinc-$pkgver"
+    cd "$srcdir/tinc"
 
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
+    autoreconf -i
+    ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var
     make
 }
 
 package() {
-    cd "$srcdir/tinc-$pkgver"
+    cd "$srcdir/tinc"
     make DESTDIR="$pkgdir" install
 
     mkdir -p "$pkgdir/etc/tinc/"
-    install -Dm644 "$srcdir/tinc-$pkgver/doc/sample-config.tar.gz" -t "$pkgdir/usr/share/doc/tinc-pre/"
-
+    mkdir -p "$pkgdir/usr/share/doc/tinc-pre/"
+    cp -rv "$srcdir/tinc/doc/sample-config/" "$pkgdir/usr/share/doc/tinc-pre/"
     install -Dm644 "$srcdir/tincd.service" -t "$pkgdir/usr/lib/systemd/system"
     install -Dm644 "$srcdir/tincd@.service" -t "$pkgdir/usr/lib/systemd/system"
 
     sed -i 's,#!/usr/bin/env python,#!/usr/bin/env python2,' "$pkgdir/usr/bin/tinc-gui"
 }
-
-sha256sums=('942594563d3aef926a2d04e9ece90c16daf1c700e99e3b91ff749e8377fbf757'
-            '35d76d63e0403550bf68632603cf6e51352f6b85f0269853af875f6b434fb9e1'
-            '4783faab2589ba67dc6fceb2e37a736914cc5afc2f741aadf990e027f0b957f2')