From 1a23ccf788ba484d03ee64fddea4472eddb96ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?=
 <coadde@parabola.nu>
Date: Wed, 4 Nov 2015 22:47:05 -0300
Subject: tinc-pre: rebuild pkg

---
 pcr/tinc-pre/PKGBUILD       | 36 ++++++++++++++++++++++--------------
 pcr/tinc-pre/tinc.install   | 20 ++++++++++++++++++++
 pcr/tinc-pre/tincd@.service |  2 +-
 3 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 pcr/tinc-pre/tinc.install

(limited to 'pcr')

diff --git a/pcr/tinc-pre/PKGBUILD b/pcr/tinc-pre/PKGBUILD
index cc5613461..869a5e8f9 100644
--- a/pcr/tinc-pre/PKGBUILD
+++ b/pcr/tinc-pre/PKGBUILD
@@ -1,39 +1,47 @@
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor (Arch): helios
+# Contributor (Arch): Lothar Gesslein
+# Contributor (Arch): Dominik George <nik@naturalnet.de>
+
+_pkgname=tinc
 pkgname=tinc-pre
 pkgver=1.1pre11
-pkgrel=1
-pkgdesc="VPN (Virtual Private Network) daemon (Pre-release)"
-arch=(i686 x86_64)
+pkgrel=2
+pkgdesc='VPN (Virtual Private Network) daemon (Pre-release)'
+arch=('i686' 'x86_64' 'armv7h')
 url="http://www.tinc-vpn.org/"
 license=('GPL')
-depends=('lzo2' 'zlib' 'openssl')
+depends=('lzo2' 'openssl')
 optdepends=('wxpython: gui support')
 provides=('tinc-pre')
 conflicts=('tinc')
+install=tinc.install
 source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
         tincd@.service)
-sha256sums=('942594563d3aef926a2d04e9ece90c16daf1c700e99e3b91ff749e8377fbf757'
-            'SKIP'
-            '43d086b76e2a6ff6d91a2ace2d6d048fc7109fefecd5047ab6c437ba0e9252ed')
+md5sums=('e9cc2971927d31e703f0c2b1791a4edf'
+         'SKIP'
+         '8fe22441f4bd4abaa5d87bbd7886deff')
+validpgpkeys=('D62BDD168EFBE48BC60E8E234A6084B9C0D71F4A')
 
 build() {
-  cd "$srcdir/tinc-$pkgver"
+  cd "$_pkgname-$pkgver"
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
   make
 }
 
 package() {
-  cd "$srcdir/tinc-$pkgver"
+  cd "$_pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir/" install
 
   install -dm755 "$pkgdir"/usr/share/tinc/examples
   tar xozvf doc/sample-config.tar.gz -C $pkgdir/usr/share/tinc/examples
   find "$pkgdir"/usr/share/tinc/examples -type f -exec chmod 644 {} +
   find "$pkgdir"/usr/share/tinc/examples -type d -exec chmod 755 {} +
 
-  install -Dm644 "$srcdir/tincd@.service" \
-                 "$pkgdir/usr/lib/systemd/system/tincd@.service"
+  install -Dm644 "$srcdir/tincd@.service" "$pkgdir/usr/lib/systemd/system/tincd@.service"
 
-  sed -e 's,#!/usr/bin/python,#!/usr/bin/python2,' \
-      -i $pkgdir/usr/bin/tinc-gui
+  sed -e 's,#!/usr/bin/python,#!/usr/bin/python2,' -i $pkgdir/usr/bin/tinc-gui
 }
diff --git a/pcr/tinc-pre/tinc.install b/pcr/tinc-pre/tinc.install
new file mode 100644
index 000000000..1b804fd8d
--- /dev/null
+++ b/pcr/tinc-pre/tinc.install
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(tinc.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/pcr/tinc-pre/tincd@.service b/pcr/tinc-pre/tincd@.service
index 069bf4570..d03e9a138 100644
--- a/pcr/tinc-pre/tincd@.service
+++ b/pcr/tinc-pre/tincd@.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/tincd -n %i
+ExecStart=/usr/bin/tincd --pidfile /run/tinc.%i.pid -n %I
 
 [Install]
 WantedBy=multi-user.target
-- 
cgit v1.2.3-2-g168b