summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD3
-rw-r--r--tinc-pre.install13
-rw-r--r--tinc.service20
4 files changed, 4 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 182dc862049..15b721a99bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
# Generated by mksrcinfo v8
-# Tue Sep 5 03:46:59 UTC 2017
+# Sun Jun 17 04:05:25 UTC 2018
pkgbase = tinc-pre
pkgdesc = VPN (Virtual Private Network) daemon (Pre-release)
- pkgver = 1.1pre15
+ pkgver = 1.1pre16
pkgrel = 1
url = http://www.tinc-vpn.org/
- install = tinc-pre.install
arch = i686
arch = x86_64
arch = armv7h
@@ -23,7 +22,7 @@ pkgbase = tinc-pre
provides = tinc-pre-systemd
conflicts = tinc
conflicts = tinc-pre-systemd
- source = git+https://github.com/gsliepen/tinc.git#tag=release-1.1pre15
+ source = git+https://github.com/gsliepen/tinc.git#tag=release-1.1pre16
sha256sums = SKIP
pkgname = tinc-pre
diff --git a/PKGBUILD b/PKGBUILD
index 8d4cbef09a4..c32788e6685 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Hexchain Tong <i at hexchain dot org>
pkgname=tinc-pre
-pkgver=1.1pre15
+pkgver=1.1pre16
pkgrel=1
pkgdesc="VPN (Virtual Private Network) daemon (Pre-release)"
arch=(i686 x86_64 armv7h armv6h)
@@ -12,7 +12,6 @@ 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")
sha256sums=('SKIP')
diff --git a/tinc-pre.install b/tinc-pre.install
deleted file mode 100644
index ff519974eb6..00000000000
--- a/tinc-pre.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_upgrade() {
- cat <<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
-}
diff --git a/tinc.service b/tinc.service
deleted file mode 100644
index d911fa78484..00000000000
--- a/tinc.service
+++ /dev/null
@@ -1,20 +0,0 @@
-# This is a mostly empty service, but allows commands like stop, start, reload
-# to propagate to all tinc@ service instances.
-
-[Unit]
-Description=Tinc VPN
-Documentation=info:tinc
-Documentation=man:tinc(8) man:tinc.conf(5)
-Documentation=http://tinc-vpn.org/docs/
-After=network.target
-Wants=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/true
-ExecReload=/bin/true
-WorkingDirectory=/etc/tinc
-
-[Install]
-WantedBy=multi-user.target