diff options
| author | Martin Weinelt | 2015-09-28 03:11:55 +0200 |
|---|---|---|
| committer | Martin Weinelt | 2015-09-28 03:11:55 +0200 |
| commit | 123b8c5127828cac62b0bcdc854db366d3d41b99 (patch) | |
| tree | b9cf5cc1115ecf88faf105343b718b91bccacd3e | |
| parent | 395579a93f33f8f3dfdf4725b3a5f06856bc4863 (diff) | |
| download | aur-123b8c5127828cac62b0bcdc854db366d3d41b99.tar.gz | |
Update 1.1pre11.173 and use the shipped systemd unit
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | tinc@.service | 12 |
3 files changed, 5 insertions, 26 deletions
@@ -1,6 +1,6 @@ pkgbase = tinc-pre-git pkgdesc = Virtual Private Network daemon (prerelease) - pkgver = 1.1pre11.168.gae89a25 + pkgver = 1.1pre11.173.g7306823 pkgrel = 1 url = http://www.tinc-vpn.org/ arch = any @@ -14,9 +14,7 @@ pkgbase = tinc-pre-git conflicts = tinc-pre conflicts = tinc-pre-systemd source = git+https://github.com/gsliepen/tinc#branch=1.1 - source = tinc@.service md5sums = SKIP - md5sums = 8029b9d35e0abe980d4677c41647f395 pkgname = tinc-pre-git @@ -4,7 +4,7 @@ # OPTIONS+=(debug !strip) pkgname=tinc-pre-git -pkgver=1.1pre11.168.gae89a25 +pkgver=1.1pre11.173.g7306823 pkgrel=1 pkgdesc="Virtual Private Network daemon (prerelease)" arch=('any') @@ -14,8 +14,7 @@ depends=('lzo2' 'zlib' 'openssl') optdepends=('wxpython: gui support') provides=('tinc-pre') conflicts=('tinc' 'tinc-pre' 'tinc-pre-systemd') -source=('git+https://github.com/gsliepen/tinc#branch=1.1' - 'tinc@.service') +source=('git+https://github.com/gsliepen/tinc#branch=1.1') _gitname=tinc pkgver() { @@ -26,19 +25,13 @@ pkgver() { build() { cd "$_gitname" autoreconf -fsi - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin --with-systemd=/usr/lib/systemd/system make } package() { cd "$_gitname" make DESTDIR="$pkgdir" install - - # tinc-gui is a python2 application, and horribly outdated - sed 's,#!/usr/bin/env python,#!/usr/bin/env python2,' $pkgdir/usr/bin/tinc-gui > $pkgdir/usr/bin/tinc-gui - - install -D -m644 "$srcdir/tinc@.service" "$pkgdir/usr/lib/systemd/system/tinc@.service" } -md5sums=('SKIP' - '8029b9d35e0abe980d4677c41647f395') +md5sums=('SKIP') diff --git a/tinc@.service b/tinc@.service deleted file mode 100644 index 9be81b41dad3..000000000000 --- a/tinc@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=tinc vpn on network %i -After=network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/tincd --user=nobody --net=%i -ExecReload=/usr/bin/tinc --net %I reload -Restart=on-abnormal - -[Install] -WantedBy=multi-user.target |