[arch-commits] Commit in tinc/repos (6 files)
Timothy Redaelli
tredaelli at archlinux.org
Fri Dec 16 16:08:06 UTC 2016
Date: Friday, December 16, 2016 @ 16:08:06
Author: tredaelli
Revision: 199875
archrelease: copy trunk to community-i686, community-x86_64
Added:
tinc/repos/community-i686/0001-Remove-ExecStop-in-tinc-.service.patch
(from rev 199874, tinc/trunk/0001-Remove-ExecStop-in-tinc-.service.patch)
tinc/repos/community-i686/PKGBUILD
(from rev 199874, tinc/trunk/PKGBUILD)
tinc/repos/community-x86_64/0001-Remove-ExecStop-in-tinc-.service.patch
(from rev 199874, tinc/trunk/0001-Remove-ExecStop-in-tinc-.service.patch)
tinc/repos/community-x86_64/PKGBUILD
(from rev 199874, tinc/trunk/PKGBUILD)
Deleted:
tinc/repos/community-i686/PKGBUILD
tinc/repos/community-x86_64/PKGBUILD
--------------------------------------------------------------+
/PKGBUILD | 86 ++++++++++
community-i686/0001-Remove-ExecStop-in-tinc-.service.patch | 26 +++
community-i686/PKGBUILD | 35 ----
community-x86_64/0001-Remove-ExecStop-in-tinc-.service.patch | 26 +++
community-x86_64/PKGBUILD | 35 ----
5 files changed, 138 insertions(+), 70 deletions(-)
Copied: tinc/repos/community-i686/0001-Remove-ExecStop-in-tinc-.service.patch (from rev 199874, tinc/trunk/0001-Remove-ExecStop-in-tinc-.service.patch)
===================================================================
--- community-i686/0001-Remove-ExecStop-in-tinc-.service.patch (rev 0)
+++ community-i686/0001-Remove-ExecStop-in-tinc-.service.patch 2016-12-16 16:08:06 UTC (rev 199875)
@@ -0,0 +1,26 @@
+From c443a1c5d64d4827e12bd914b3925150fc202692 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie at bouttier.eu>
+Date: Mon, 31 Oct 2016 21:06:32 +0100
+Subject: [PATCH] Remove ExecStop in tinc at .service
+
+This avoid tinc to receive SIGTERM twice (through ExecStop and through systemd
+directly) which prevented tinc-down script to be executed.
+---
+ distro/tinc at .service | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/distro/tinc at .service b/distro/tinc at .service
+index 4bb4d2dd..c823fa5a 100644
+--- a/distro/tinc at .service
++++ b/distro/tinc at .service
+@@ -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
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-12-16 16:07:57 UTC (rev 199874)
+++ community-i686/PKGBUILD 2016-12-16 16:08:06 UTC (rev 199875)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: helios
-# Contributor: Lothar Gesslein
-# Contributor: Dominik George <nik at naturalnet.de>
-
-pkgname=tinc
-pkgver=1.0.30
-pkgrel=1
-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})
-md5sums=('f3ca1fc1154ed1f2cac408ea06a1c1ca'
- 'SKIP')
-validpgpkeys=('D62BDD168EFBE48BC60E8E234A6084B9C0D71F4A')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin --with-systemdsystemunitdir=/usr/lib/systemd/system
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- 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 {} +
-}
Copied: tinc/repos/community-i686/PKGBUILD (from rev 199874, tinc/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-12-16 16:08:06 UTC (rev 199875)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: helios
+# Contributor: Lothar Gesslein
+# Contributor: Dominik George <nik at naturalnet.de>
+
+pkgname=tinc
+pkgver=1.0.30
+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}
+ 0001-Remove-ExecStop-in-tinc-.service.patch)
+md5sums=('f3ca1fc1154ed1f2cac408ea06a1c1ca'
+ 'SKIP'
+ 'eb61a50de5125a39ac47c29b450210a4')
+validpgpkeys=('D62BDD168EFBE48BC60E8E234A6084B9C0D71F4A')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 -i "$srcdir/0001-Remove-ExecStop-in-tinc-.service.patch"
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin --with-systemdsystemunitdir=/usr/lib/systemd/system
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ 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 {} +
+}
Copied: tinc/repos/community-x86_64/0001-Remove-ExecStop-in-tinc-.service.patch (from rev 199874, tinc/trunk/0001-Remove-ExecStop-in-tinc-.service.patch)
===================================================================
--- community-x86_64/0001-Remove-ExecStop-in-tinc-.service.patch (rev 0)
+++ community-x86_64/0001-Remove-ExecStop-in-tinc-.service.patch 2016-12-16 16:08:06 UTC (rev 199875)
@@ -0,0 +1,26 @@
+From c443a1c5d64d4827e12bd914b3925150fc202692 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie at bouttier.eu>
+Date: Mon, 31 Oct 2016 21:06:32 +0100
+Subject: [PATCH] Remove ExecStop in tinc at .service
+
+This avoid tinc to receive SIGTERM twice (through ExecStop and through systemd
+directly) which prevented tinc-down script to be executed.
+---
+ distro/tinc at .service | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/distro/tinc at .service b/distro/tinc at .service
+index 4bb4d2dd..c823fa5a 100644
+--- a/distro/tinc at .service
++++ b/distro/tinc at .service
+@@ -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
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-12-16 16:07:57 UTC (rev 199874)
+++ community-x86_64/PKGBUILD 2016-12-16 16:08:06 UTC (rev 199875)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: helios
-# Contributor: Lothar Gesslein
-# Contributor: Dominik George <nik at naturalnet.de>
-
-pkgname=tinc
-pkgver=1.0.30
-pkgrel=1
-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})
-md5sums=('f3ca1fc1154ed1f2cac408ea06a1c1ca'
- 'SKIP')
-validpgpkeys=('D62BDD168EFBE48BC60E8E234A6084B9C0D71F4A')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin --with-systemdsystemunitdir=/usr/lib/systemd/system
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- 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 {} +
-}
Copied: tinc/repos/community-x86_64/PKGBUILD (from rev 199874, tinc/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-12-16 16:08:06 UTC (rev 199875)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: helios
+# Contributor: Lothar Gesslein
+# Contributor: Dominik George <nik at naturalnet.de>
+
+pkgname=tinc
+pkgver=1.0.30
+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}
+ 0001-Remove-ExecStop-in-tinc-.service.patch)
+md5sums=('f3ca1fc1154ed1f2cac408ea06a1c1ca'
+ 'SKIP'
+ 'eb61a50de5125a39ac47c29b450210a4')
+validpgpkeys=('D62BDD168EFBE48BC60E8E234A6084B9C0D71F4A')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 -i "$srcdir/0001-Remove-ExecStop-in-tinc-.service.patch"
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin --with-systemdsystemunitdir=/usr/lib/systemd/system
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ 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 {} +
+}
More information about the arch-commits
mailing list