Date: Friday, December 16, 2016 @ 16:07:57 Author: tredaelli Revision: 199874
upgpkg: tinc 1.0.30-2 FS#52170 Added: tinc/trunk/0001-Remove-ExecStop-in-tinc-.service.patch Modified: tinc/trunk/PKGBUILD ---------------------------------------------+ 0001-Remove-ExecStop-in-tinc-.service.patch | 26 ++++++++++++++++++++++++++ PKGBUILD | 14 +++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) Added: 0001-Remove-ExecStop-in-tinc-.service.patch =================================================================== --- 0001-Remove-ExecStop-in-tinc-.service.patch (rev 0) +++ 0001-Remove-ExecStop-in-tinc-.service.patch 2016-12-16 16:07:57 UTC (rev 199874) @@ -0,0 +1,26 @@ +From c443a1c5d64d4827e12bd914b3925150fc202692 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89lie=20Bouttier?= <[email protected]> +Date: Mon, 31 Oct 2016 21:06:32 +0100 +Subject: [PATCH] Remove ExecStop in [email protected] + +This avoid tinc to receive SIGTERM twice (through ExecStop and through systemd +directly) which prevented tinc-down script to be executed. +--- + distro/[email protected] | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/distro/[email protected] b/distro/[email protected] +index 4bb4d2dd..c823fa5a 100644 +--- a/distro/[email protected] ++++ b/distro/[email protected] +@@ -8,7 +8,6 @@ Type=simple + WorkingDirectory=/etc/tinc/%i + ExecStart=/usr/sbin/tincd -n %i -D + ExecReload=/usr/sbin/tincd -n %i -kHUP +-ExecStop=/usr/sbin/tincd -n %i -k + TimeoutStopSec=5 + Restart=always + RestartSec=60 +-- +2.10.2 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-12-16 14:17:30 UTC (rev 199873) +++ PKGBUILD 2016-12-16 16:07:57 UTC (rev 199874) @@ -6,17 +6,25 @@ pkgname=tinc pkgver=1.0.30 -pkgrel=1 +pkgrel=2 pkgdesc="VPN (Virtual Private Network) daemon" arch=('i686' 'x86_64') url="http://www.tinc-vpn.org/"; license=('GPL') depends=('lzo' 'openssl' 'zlib') -source=(https://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}) +source=(https://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig} + 0001-Remove-ExecStop-in-tinc-.service.patch) md5sums=('f3ca1fc1154ed1f2cac408ea06a1c1ca' - 'SKIP') + 'SKIP' + 'eb61a50de5125a39ac47c29b450210a4') validpgpkeys=('D62BDD168EFBE48BC60E8E234A6084B9C0D71F4A') +prepare() { + cd "$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/0001-Remove-ExecStop-in-tinc-.service.patch" +} + build() { cd "$srcdir/$pkgname-$pkgver"
