summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD28
-rw-r--r--tinc-pre.install15
-rw-r--r--tinc.service20
4 files changed, 45 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 17ce41eab25..41c67a2a7b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Apr 26 06:12:46 UTC 2016
+# Sun May 1 07:11:58 UTC 2016
pkgbase = tinc-pre
pkgdesc = VPN (Virtual Private Network) daemon (Pre-release)
- pkgver = 1.1pre12
- pkgrel = 2
+ pkgver = 1.1pre13
+ pkgrel = 1
url = http://www.tinc-vpn.org/
install = tinc-pre.install
arch = i686
@@ -14,14 +14,17 @@ pkgbase = tinc-pre
depends = lzo2
depends = zlib
depends = openssl
+ depends = miniupnpc
optdepends = python2
optdepends = wxpython: gui support
provides = tinc-pre
provides = tinc-pre-systemd
conflicts = tinc
conflicts = tinc-pre-systemd
- source = git+https://github.com/gsliepen/tinc.git#tag=release-1.1pre12
+ source = git+https://github.com/gsliepen/tinc.git#tag=release-1.1pre13
+ source = tinc.service
sha256sums = SKIP
+ sha256sums = f66139ba4770b1de9c172e33462087d3df60371f22191707c5ee98386323c5bb
pkgname = tinc-pre
diff --git a/PKGBUILD b/PKGBUILD
index 4f09235b595..2edb97a31ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,33 @@
# Maintainer: Hexchain Tong <i at hexchain dot org>
pkgname=tinc-pre
-pkgver=1.1pre12
-pkgrel=2
+pkgver=1.1pre13
+pkgrel=1
pkgdesc="VPN (Virtual Private Network) daemon (Pre-release)"
arch=(i686 x86_64)
url="http://www.tinc-vpn.org/"
license=('GPL')
-depends=('lzo2' 'zlib' 'openssl')
+depends=('lzo2' 'zlib' 'openssl' 'miniupnpc')
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')
+source=("git+https://github.com/gsliepen/tinc.git#tag=release-$pkgver" "tinc.service")
+sha256sums=('SKIP'
+ 'f66139ba4770b1de9c172e33462087d3df60371f22191707c5ee98386323c5bb')
build() {
cd "$srcdir/tinc"
- autoreconf -i
- ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var
+ autoreconf -fsi
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-systemd=/usr/lib/systemd/system \
+ --enable-miniupnpc
make
}
@@ -30,8 +37,9 @@ 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/"
+ cp -rv --no-preserve='ownership' "$srcdir/tinc/doc/sample-config/" "$pkgdir/usr/share/doc/tinc-pre/"
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/"
+
+ install -Dm644 "$srcdir/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 03914427ed7..ff519974eb6 100644
--- a/tinc-pre.install
+++ b/tinc-pre.install
@@ -1,13 +1,4 @@
-infodir=/usr/share/info
-file=tinc.info
-
-post_install() {
- [[ -x /usr/bin/install-info ]] || return 0
- install-info $infodir/$file.gz $infodir/dir
-}
-
post_upgrade() {
- post_install $1
cat <<EOF
Starting from 1.1pre12, tinc ships its own systemd unit files, which are
different from previous ones:
@@ -20,9 +11,3 @@ Please reload systemd and do appropriate configuration according to these
changes.
EOF
}
-
-pre_remove() {
- [[ -x /usr/bin/install-info ]] || return 0
- install-info --delete $infodir/$file.gz $infodir/dir
-}
-
diff --git a/tinc.service b/tinc.service
new file mode 100644
index 00000000000..d911fa78484
--- /dev/null
+++ b/tinc.service
@@ -0,0 +1,20 @@
+# 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