Fix systemd unit file, bug #479596

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 26 insertions, 19 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index 14a8f813734f..63a138a7aa7c 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tinc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.43 2013/08/30 23:58:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.44 2013/08/31 10:17:17 blueness Exp $
+
+*tinc-1.0.22-r2 (31 Aug 2013)
+
+  31 Aug 2013; Anthony G. Basile <blueness@gentoo.org> +tinc-1.0.22-r2.ebuild,
+  -tinc-1.0.22-r1.ebuild, files/tincd_at.service:
+  Fix systemd unit file, bug #479596
 
 *tinc-1.0.22-r1 (30 Aug 2013)
 
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index e3f443bf36a6..c058b9c65464 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -5,28 +5,28 @@ AUX tinc.networks 387 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce
 AUX tincd 1781 SHA256 ef360bb381bc743d938d98dbe33241157fcf1fbcd3b6b96b130c25929d944c7f SHA512 7b11dac3377ba1fb6267adb9130d7e9494372850d934c216667ec3e7ce428a7a13606dfeaf7f0d3d1021fc87a2aec44ed78e0b8891bdf5601c03eef84f1cecfa WHIRLPOOL f590ba3f02bc7246541d6d2748a2a6eb5866f793c1983ac789af5cb2380bbbcac8a6707eab7a40b019649a33a5ca3e448f2dc272a9fee1a1b9b73d4ca51fe28f
 AUX tincd.conf 157 SHA256 eef883d3cf4ba8376f6b37518f39df103b0d999c5faa2a82653926ce50255060 SHA512 fb3af4b4638fefedd5c45c0a41a6e295c8407fbe6f680d98c75a2614baf0bfa1677eb78b4a4d44044ab6ff015d6e3d100bf1bdf39818120a11e65b712bba7691 WHIRLPOOL 04b9bd378ed311b53aec2ccdbb107fba427ca89e3b003d5a835603b3ee821d07badd39e3785a19c3b8dd92287685ea23ecf3a3c225a8d202f11d45450f9e1831
 AUX tincd.lo 1385 SHA256 c2452bfb04d73df7fb61fbc89f4bf189780519880a457840e3f87915c9ff1e88 SHA512 f9ad2460de2ff9e6b5390463e53e55ed488bfb8f67739e975ba2b1ed64245125e4618efdb86487269bcac37ba6666442e626306517ade34a49804332d6a55425 WHIRLPOOL e7eaf2dcf18f1e785394d1803736b052dacca9f9b278708654a6380e5d53d97adf5e16aba0fad7d1ec9e07955207e90967448e9028acb39502d2498599242390
-AUX tincd_at.service 151 SHA256 063875edbdd26598c72e1cff0f688b258f0701a225a99cf1c877c05e260572ed SHA512 94d7f492d97dc0046be52344a28fa396908959aa6dc18b5acd5d62e50f42965e4af87b25e4f0021e87497aad89fbf9b7adfd39bb062431dce507614ab176c43f WHIRLPOOL e6afc37e0cf6a460f0f922ead8a212959138337a8283ab98056daef1b273930eec32a0abf8eda6a69b70fc74051195c953984a1ab9fd2947e7fb179e97eceef8
+AUX tincd_at.service 197 SHA256 7c4d4309ee14dc3e7a5a51a9b982d5a7693d74210b45a4e35dafc6bcdb022557 SHA512 866f8adbc9c39cc6030e6046e4265a4f6e893960045df15abc0a1865599cf2576ac12468bd1a286df47248ebe2c6b16ba64a60f0ebeeb0212d850a9d7886c98a WHIRLPOOL 521982b219a290b27cd61c186ae6ec399f09c81f8b44924d20b8df7ba4ede8a474d8277cd7178df41c52cc626bff7a95345c606f83840b56ff7962be4f15633a
 DIST tinc-1.0.21.tar.gz 467114 SHA256 6ac15eab766c021629992053aa1a23f31a0c429eb0f3eb8f49c923476eea618b SHA512 03b65b503478a4f17b5f7784c9eea0f3265226ac76341351cf9b409bb3a292a428f2b072e4c0f4c90a60788ca339eb081f33276f7a0536ea17a8556e3c23e07b WHIRLPOOL 3b4aca29ad4d2cb56bb33c7f7e53fe2417b41a77c1beccf92b6503757109031fd40fa814f76ead337c2936bb702d5faa04bbc143f78e449707221aab28bcb34c
 DIST tinc-1.0.22.tar.gz 473407 SHA256 4739dd1ec11070ea14aefa0e78e55957d343714a3c29815dd5487fc0a22c5c2c SHA512 3d93f88a63b30783e25fa52ec0d6ff52fc090cbd7f1b1967ff51ec69d55038ffbf81891ab21081ca5a6710ff6ef979748b2e0bf0148434471a2b49acffee78e0 WHIRLPOOL b1175eeb9d686472ce10ae5936b32aca8bcdf0f9d54a6b9b63766ef2de254981a7a827dcbcb66e559065df12568bce920ffa6c381638311c2567411682c3a73f
 EBUILD tinc-1.0.21.ebuild 1213 SHA256 b66cb307bc8ca435a2578d141574e55c0eae7b3c439927c84ad856bcff101e96 SHA512 c1ce999902b7f53a2d7009cf99a72ec0277f2bdc6cb3eac26a6ea9448f48cd2319edaad391d6710133066fa42dbf1d32f41f285198a23d38df75aca59104ce5d WHIRLPOOL f5552bb96818ddd2990bc4a73fd7f59f85e75592ca50b27adccf502ed35803835a9f40e739386772851f3675503071ebb1a30a044f89f6642b752bab90035f9b
-EBUILD tinc-1.0.22-r1.ebuild 1297 SHA256 116d050613bea252f8e06b939d22be7d7dd0620b484df83d4977f45a1ebd04ac SHA512 d7de5f59d7de170611e63d2d2d28b4637d0889cf9aa97a1847c14f83f473f35b82ce07e9a1c911c760f606fd2c40296c796eddd11cc966d7266b8935732e08e1 WHIRLPOOL 36ecb73bf745ba5904812967fe4503356717e201e4bcd027cec24ac354d630e333e71c3c059d39e91bf6f253bc8d7422d943d119e8e2d671de781ba049d9a0e8
+EBUILD tinc-1.0.22-r2.ebuild 1297 SHA256 39eea30998a8184da2a95d9e356da8d0e0d070c1278385cf8d33c4c7ea2eee9b SHA512 4973f29947d9039d911aa425031dbdef0961b65fc187f7fc8d88b2dc462717cc6bc1f9c8a64124c58ef3fab7ec341753fbb2f19a3142ddce2a9a1e842c25adbd WHIRLPOOL 3e8e1fae6f84eb5021f7388b64b2c444fbed59bbf9265705a6e073ab9bd86d0780a329cd67104ae33068d39e2195a8d89a720468b3a02dcb87155c0251e46104
 EBUILD tinc-1.0.22.ebuild 1213 SHA256 c42432b8496da1e31f7a58aeed407d23852061be4559c6f8cc12f53d684654f8 SHA512 9e63b4d25f7260de629a8552c8091f14d9e6b62674976ed2ec142f04ca95c56f4ea2a124d888f62f695e4c294885a04f8924798737d25884522c06db0b316604 WHIRLPOOL 1ed8e92f8ad39fb6d1e95377181d540a1ff0983ac04bbac6e3c2b7f6cd3215e503116173ea3809330083e420a4f65df354f14a59df4bf2820537bfe1e4939587
-MISC ChangeLog 7245 SHA256 214ad120ef8223ce1b818cd774c25df692b5a217ccf55cf676633d319d9392ee SHA512 f325713b914794133c387f68ccbb9a4381d6a061bebc8061c385e2421b3c39bf8a59d89e6459eacf42d5ff3507472ae7c000dcffa808de01ef4378b129c2be4e WHIRLPOOL 4c6c04f9605f97363e10e73bae32320cac056b33d5fb07d4725325532024d7397dca206d8829ff7599fa468e723d97c070973c2e59da35c527adc87e4996ea19
+MISC ChangeLog 7443 SHA256 3d2f1861d527aef960b13d999aa3b4bbcfcd3d71b8e22eed62db319dba13e9c1 SHA512 2f0442f835b5eab1fbbe6d6b86ada54bc4dd1f3b8be05143c2b5463d1eda7e16b40f030221abcd89762b4accd6e22ba2caeec8a6fa1e18ea7e645266bb676cbd WHIRLPOOL 2c4ddda6e0656a170c6a52a4260b61ee10c8c235cfb063dff6ba056eb0850abd3740e1308674849876ea788089261ea486ef54e3a8a4f19b54a24893d10a4723
 MISC metadata.xml 494 SHA256 d99f82d792eff2fd721fe34ce221d1a6c9296806d413312037ef99a6e3e18c50 SHA512 6e9aa698597b0740a7419efe8fa99dde53bf03b3b736c12f13c9078e1a281abd6a61ad901b693b9959f70191a5387807bc9fb15989f5f2c93f6e097bf03f2121 WHIRLPOOL 889f9182eddda4c895f4907f617e637c5cecda8ca66d81ee2a7ba934e5d2cf78c430e6633f9b2b961d4874f97749dc5da24526699fccca4896af57e846375f46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSITGpAAoJEJOE+m71LUu6YNYQAKk140Q7WMDH/8nL3P8kFONB
-H55ALA53NbP6cq//GJG7eOsvKnvximMWiwyp5Pkd06PphanXQCB2y50mCxYl/37I
-j5k7Fyxs3hiJknmIZQUS/+uwl2WZukoimfWldUII8nPtqiQaCADpYGhb0cgsuKS+
-7SFajnwtWLe9UZyr1PRfN/TSv0/DsP8e2hiPK9igaI21rwv0NWMUCoCdByu8kMVQ
-88LlKNS6wXsMCxEvQlC8wVL4/PhGClcjFi1jCGlwu8foGIrpqLo6nYnRe2sTZtTQ
-OedgbpIr3XNDQYe2a0gsqCHtT3/HHT80yw+Zus+rjw0Qrctjr1qV0yRgFUEQ6J0p
-xEZ3+8g9m4HgtUmYhYyjrE/sqnMS6zCfby0pzf/WGysZpu7Qyp/AM7q2SEv1BABa
-hKr7BCcA0q5qpq6KCzi1EglO3o3WEL6A6ugbnZGFtb7cqIt9D3ImjrYmQzta8BxO
-ccV/TqnwVY3vgNOzNtS3xQ+u6zdOlkspNl+JgfV1gRYnakdutOp36aWZXdSCXaZI
-J/ZKKg/q+MkTV6qfVSs5JLFgFZNBEPGAqmQI2MhcA7Cc4gYMu8fqEvEONwIXImkG
-M4eHTlZPqolbgSlxzQhoNXL/kVSG3EviCG/G0+gHYhdkj1WpAKW7wuiRHBSlAw3C
-lVVFsAR2gMd1EcsM1Q7M
-=vm9f
+iQIcBAEBCAAGBQJSIcLNAAoJEJOE+m71LUu6+9wP+QGL7REPpWO5QJUVd4t51uXH
+A7KlNY+BYg3nZZyXSp7lRp+/I0RYlZAenSJkZj3/8DT317c1KtMSUz+lF6yviDu1
+Lw6wqMFbLlTF8wTUTy+DT4CcdkgVhsbQOZ5W+u28u1XSWleOlTPxXiSJIcJ1QJ+v
+BSOEHZwklunM9GG93gFM8jPyPWak9nYTiL06iP4q4Zix0IUgO/yzwFIrSWwKrgM6
+ZmBWQ9ZxEjAbZqZYV+fVkcqRLPNZ+l/64poeOuVVVzFd3E7f9bbnuHfcyt+K3XOh
++gkf81USeRN4oVQf82ihjh/tFAvif3tZayczVtAvovFP4K0H/O1sAzFE5PlK962u
+fPO0e/RPN9LhLTIsOhDL5DnvKMxxgeP/6GTBy08N0an7jQtzepbqSUt1fTh68297
+Xv+s+CoJNYvJU8ZX3QzUZ+AV8ntkaPe/jU7YN+BM4ZZnGaNv4RBSoAr1ql+4L5+m
+8B8pPMO7e7wwUlhYs8lbMIXym6MOvbQqMqSWlTePfymPUI4TfbSi6ElxWjw6OHKz
+efYHmmyFYqiTx8OHFy2EQC7zVYsPB7oUvOftmunFNP4XS2/RQjX9JmOl+lAvBie8
+deCJZ3uR1iMOQXdleqGZ9+Szg8gnSfowEynKM0lR1XvOKaccjkFUUg0t8VXsgYtH
+ZbEnUbyukZwP00dmx1ak
+=0827
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tinc/files/tincd_at.service b/net-misc/tinc/files/tincd_at.service
index 1cbf8af28dd7..71f358a39d95 100644
--- a/net-misc/tinc/files/tincd_at.service
+++ b/net-misc/tinc/files/tincd_at.service
@@ -3,7 +3,8 @@ Description=Tinc daemon for network %i
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/tincd -D -n %i
+ExecStart=/usr/sbin/tincd -D --pidfile /run/tinc.%i.pid -n %i
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/net-misc/tinc/tinc-1.0.22-r1.ebuild b/net-misc/tinc/tinc-1.0.22-r2.ebuild
index 0c9cd5bd6905..4c59f0c3606d 100644
--- a/net-misc/tinc/tinc-1.0.22-r1.ebuild
+++ b/net-misc/tinc/tinc-1.0.22-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.22-r1.ebuild,v 1.1 2013/08/30 23:58:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.22-r2.ebuild,v 1.1 2013/08/31 10:17:17 blueness Exp $
 
 EAPI="5"
 inherit systemd