diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | tinc-pre.install | 11 | ||||
| -rw-r--r-- | tincd.service | 11 | ||||
| -rw-r--r-- | tincd@.service | 13 |
5 files changed, 24 insertions, 44 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Apr 9 13:14:23 UTC 2016 +# Sun Apr 24 15:20:44 UTC 2016 pkgbase = tinc-pre pkgdesc = VPN (Virtual Private Network) daemon (Pre-release) - pkgver = 1.1pre11 - pkgrel = 5 + pkgver = 1.1pre12 + pkgrel = 1 url = http://www.tinc-vpn.org/ install = tinc-pre.install arch = i686 @@ -12,6 +12,7 @@ pkgbase = tinc-pre makedepends = git makedepends = autoconf depends = lzo2 + depends = zlib depends = openssl optdepends = python2 optdepends = wxpython: gui support @@ -19,12 +20,8 @@ pkgbase = tinc-pre provides = tinc-pre-systemd conflicts = tinc conflicts = tinc-pre-systemd - source = git+https://github.com/gsliepen/tinc.git#tag=release-1.1pre11 - source = tincd.service - source = tincd@.service + source = git+https://github.com/gsliepen/tinc.git#tag=release-1.1pre12 sha256sums = SKIP - sha256sums = 44959a62e7738d5febc7705165b0eb9e4265f9d2680e408c22d31c14cfe06410 - sha256sums = 98bd9941313822b30f66caeb6df9bbe225ed0a8eeed217a3a7eb1de72d9fa704 pkgname = tinc-pre @@ -1,23 +1,20 @@ # Maintainer: Hexchain Tong <i at hexchain dot org> pkgname=tinc-pre -pkgver=1.1pre11 -pkgrel=5 +pkgver=1.1pre12 +pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon (Pre-release)" arch=(i686 x86_64) url="http://www.tinc-vpn.org/" license=('GPL') -depends=('lzo2' 'openssl') +depends=('lzo2' 'zlib' 'openssl') makedepends=('git' 'autoconf') optdepends=('python2' 'wxpython: gui support') provides=('tinc-pre' 'tinc-pre-systemd') conflicts=('tinc' 'tinc-pre-systemd') install="${pkgname}.install" -source=("git+https://github.com/gsliepen/tinc.git#tag=release-$pkgver" "tincd.service" "tincd@.service") -#sha256sums=('942594563d3aef926a2d04e9ece90c16daf1c700e99e3b91ff749e8377fbf757') -sha256sums=('SKIP' - '44959a62e7738d5febc7705165b0eb9e4265f9d2680e408c22d31c14cfe06410' - '98bd9941313822b30f66caeb6df9bbe225ed0a8eeed217a3a7eb1de72d9fa704') +source=("git+https://github.com/gsliepen/tinc.git#tag=release-$pkgver") +sha256sums=('SKIP') build() { cd "$srcdir/tinc" @@ -34,8 +31,7 @@ package() { mkdir -p "$pkgdir/etc/tinc/" 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" + install -Dm644 "$srcdir/tinc/bash_completion.d/tinc" -t "$pkgdir/usr/share/bash-completion/completions/" + install -Dm644 "$srcdir/tinc/systemd/tinc.service" -t "$pkgdir/usr/lib/systemd/system/" + install -Dm644 "$srcdir/tinc/systemd/tinc@.service" -t "$pkgdir/usr/lib/systemd/system/" } diff --git a/tinc-pre.install b/tinc-pre.install index 7d5dea46349c..dece9caeaf62 100644 --- a/tinc-pre.install +++ b/tinc-pre.install @@ -8,6 +8,17 @@ post_install() { post_upgrade() { post_install $1 + echo <<EOF +Starting from 1.1pre12, tinc ships its own systemd unit files, which are +different from previous ones: + +1. Unit file name changes from tincd(@) to tinc(@) +2. Network without network name is not supported anymore +3. tinc.service now serves to start all tinc@.service + +Please reload systemd and do appropriate configuration according to these +changes. +EOF } pre_remove() { diff --git a/tincd.service b/tincd.service deleted file mode 100644 index 700b88f06ab9..000000000000 --- a/tincd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=tinc vpn -After=network.target - -[Service] -Type=simple -ExecStart=/usr/sbin/tincd --no-detach -ExecReload=/usr/bin/tinc reload - -[Install] -WantedBy=multi-user.target diff --git a/tincd@.service b/tincd@.service deleted file mode 100644 index 4b2d850d808a..000000000000 --- a/tincd@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=tinc vpn on network %i -After=network.target - -[Service] -Type=simple -ExecStart=/usr/sbin/tincd --no-detach --net=%i -ExecReload=/usr/bin/tinc --net %I reload -Restart=on-failure -RestartSec=5 - -[Install] -WantedBy=multi-user.target |