summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD28
-rw-r--r--tincd.service4
-rw-r--r--tincd@.service7
4 files changed, 29 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1ecaf24e002..483c9f8fcde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,29 @@
+# Generated by mksrcinfo v8
+# Sat Apr 9 13:04:40 UTC 2016
pkgbase = tinc-pre
pkgdesc = VPN (Virtual Private Network) daemon (Pre-release)
pkgver = 1.1pre11
- pkgrel = 4
+ pkgrel = 5
url = http://www.tinc-vpn.org/
install = tinc-pre.install
arch = i686
arch = x86_64
license = GPL
+ makedepends = autoconf
depends = lzo2
depends = openssl
+ optdepends = python2
optdepends = wxpython: gui support
provides = tinc-pre
provides = tinc-pre-systemd
conflicts = tinc
conflicts = tinc-pre-systemd
- source = http://www.tinc-vpn.org/packages/tinc-1.1pre11.tar.gz
+ source = git+https://github.com/gsliepen/tinc.git#tag=release-1.1pre11
source = tincd.service
source = tincd@.service
- sha256sums = 942594563d3aef926a2d04e9ece90c16daf1c700e99e3b91ff749e8377fbf757
- sha256sums = 35d76d63e0403550bf68632603cf6e51352f6b85f0269853af875f6b434fb9e1
- sha256sums = 4783faab2589ba67dc6fceb2e37a736914cc5afc2f741aadf990e027f0b957f2
+ sha256sums = SKIP
+ sha256sums = 44959a62e7738d5febc7705165b0eb9e4265f9d2680e408c22d31c14cfe06410
+ sha256sums = 98bd9941313822b30f66caeb6df9bbe225ed0a8eeed217a3a7eb1de72d9fa704
pkgname = tinc-pre
diff --git a/PKGBUILD b/PKGBUILD
index 4005875cc50..c82d675aad4 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')
diff --git a/tincd.service b/tincd.service
index 993fc21b449..700b88f06ab 100644
--- a/tincd.service
+++ b/tincd.service
@@ -3,8 +3,8 @@ Description=tinc vpn
After=network.target
[Service]
-Type=forking
-ExecStart=/usr/sbin/tincd --no-detach --user=nobody
+Type=simple
+ExecStart=/usr/sbin/tincd --no-detach
ExecReload=/usr/bin/tinc reload
[Install]
diff --git a/tincd@.service b/tincd@.service
index 9be81b41dad..4b2d850d808 100644
--- a/tincd@.service
+++ b/tincd@.service
@@ -3,10 +3,11 @@ Description=tinc vpn on network %i
After=network.target
[Service]
-Type=forking
-ExecStart=/usr/sbin/tincd --user=nobody --net=%i
+Type=simple
+ExecStart=/usr/sbin/tincd --no-detach --net=%i
ExecReload=/usr/bin/tinc --net %I reload
-Restart=on-abnormal
+Restart=on-failure
+RestartSec=5
[Install]
WantedBy=multi-user.target