Fix bug #401873

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 19 insertions, 13 deletions

diff --git a/net-misc/tinc/ChangeLog b/net-misc/tinc/ChangeLog
index c3371b622be8..a3f3d66f05fe 100644
--- a/net-misc/tinc/ChangeLog
+++ b/net-misc/tinc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tinc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.29 2012/01/31 22:53:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/ChangeLog,v 1.30 2012/02/02 20:29:33 blueness Exp $
+
+*tinc-1.0.16-r4 (02 Feb 2012)
+
+  02 Feb 2012; Anthony G. Basile <blueness@gentoo.org> -tinc-1.0.16-r3.ebuild,
+  +tinc-1.0.16-r4.ebuild, files/tincd.1, files/tincd.lo.1:
+  Fix bug #401873
 
 *tinc-1.0.16-r3 (31 Jan 2012)
 
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest
index 643e1f5f1b39..fe611b82b824 100644
--- a/net-misc/tinc/Manifest
+++ b/net-misc/tinc/Manifest
@@ -5,22 +5,22 @@ AUX fix-compile-vde-uml.patch 1321 RMD160 e75a27f2420f416bba858a6ff64f1f1d455b29
 AUX fix-missing-vde.patch 3667 RMD160 a433b5ddb8c3b9a6b22b2471852054efeedddf50 SHA1 071c5b0c40c9f9a7b1676683a9147fe4a4ffd4cf SHA256 47eb44c5c4ed3eefae69c1b5a59f94b9afc31eff62f281ca9211cea422664e61
 AUX tinc.networks 387 RMD160 cc842d8ab6fb137d87276553fbf7465baeccf871 SHA1 8339d5882e494a0fd2390e1abfd0f24163949ce4 SHA256 7165721abd3706c95973118fbb503e18f9a008da6bdbf21a4ce35ecf7818d5ad
 AUX tincd 1621 RMD160 8f398357762bbe598bb78c4cbca537db5a334aa3 SHA1 3b97a4b1f28b30ac3a0bfe416c05c4d75ed5b026 SHA256 be40d0ef2757d74c161eb4831b6b5fedd77196b84d9d069c4fa5d7eb45c8450c
-AUX tincd.1 1760 RMD160 3485e35af05561da5b0d693b9b585f884f1a56b0 SHA1 de34baeaa5fd927553e408628a4998205a55f890 SHA256 c9fe2fa155c8f3eef6558469121ead1d737d57b45ea3eeb571bdda1f41e330ee
+AUX tincd.1 1783 RMD160 827d2367b78ac717b9d68d877bd045e3bc372ccf SHA1 d3ebf5a4032bf6fdb8b317042932534011baf0d1 SHA256 47261d991a86ce73d3eff6870470139247f6ad31e231fc2c436cb5926bf16d35
 AUX tincd.conf 19 RMD160 907e8fbeeeeda7fd5c0916ebea6bf90d14539723 SHA1 e41eb0392c8265a9f55bf8c4069f7b25085ced14 SHA256 cdbdbf4c8ca3dc805c645a404df7cc7d10908ef4e5b59f1c1d056ca6301f34cb
 AUX tincd.conf.1 157 RMD160 72e67087f4f88a4958a54eb8cf8270cdfebe4339 SHA1 82dda948f1982c9289d6732f20b7e0da33ca2f6a SHA256 eef883d3cf4ba8376f6b37518f39df103b0d999c5faa2a82653926ce50255060
 AUX tincd.lo 1189 RMD160 93abc6f48e7fbd439f8563e5d8678541ae1cb571 SHA1 9c5085e892ac20d56f878c58acf6f615c865261f SHA256 e433f2707219c0f4e56f12a411152933f1a15f14f8d5a3232caf91b15dc3468d
-AUX tincd.lo.1 1364 RMD160 e70505f8b717e1a1ec1fb34f749d7482cc4e4a9e SHA1 44b50e15d251bf453150b0759cbca0f4e570164b SHA256 57639601369e2a82d5b8778dc7bb053d7b767bbfea5cf069ee46b08dfdf908c8
+AUX tincd.lo.1 1387 RMD160 aab253f15bcb28eb615cdbdb51621453cafd3152 SHA1 9a560078ca004a4d5f9af9e9eda124aa7e9e2ed0 SHA256 fbf179cb4e4383d8f7a0c44574cd5c324e71a4bc83d699aeb7e2c1e3fad2ea69
 DIST tinc-1.0.13.tar.gz 508903 RMD160 72e3063887546fb82e5c740a71b52840bd04237d SHA1 d84070502d693cf46c93d324cdf1686d67617db4 SHA256 6d86518161e91d0d4f8f2697ea959c90e92a409e833cdce5c92d6f0c0cb01091
 DIST tinc-1.0.16.tar.gz 519460 RMD160 a4d44bd90d4c19f4cc8bc27c1f92a8fb437698d3 SHA1 6700e63c548228b1675f243f0075f98511f1e3a8 SHA256 f20863cb1155ba4e4dd4cf16c35a5d706cd326eb8fe62b8b0a31fd57241a5400
 EBUILD tinc-1.0.13.ebuild 1049 RMD160 5d7498f943b260e89662ef2aca40d93d9dc5b4cb SHA1 99586c0c96f382a8d7e3b488136ee1ed6f18a216 SHA256 f78730591f2e34e7b82ad476fe09df387881f72e0a32193d40a562c138cdbdb6
-EBUILD tinc-1.0.16-r3.ebuild 1915 RMD160 d4736735ed4e27a7c38549614608b06b753a3f54 SHA1 5c2dde67ba1f8b5169bca3884e171faa3a851a53 SHA256 00ad3a0e7a668d91d018a6f74624efc73a819615bcac9196f5fa622d5b317bd2
+EBUILD tinc-1.0.16-r4.ebuild 1915 RMD160 58ce82cc1d9d67b52e6789dfbf5aaebf35c6c45e SHA1 bb78812be0fbb2ff0eb131318e32ab865e9ca265 SHA256 dce2d3ef6cbc583b15c6ac1518dd46e21d44936133e2fb6cc9b57957f16d6153
 EBUILD tinc-1.0.16.ebuild 1070 RMD160 c62b38596f6ad8fc0affb80fa7f0bdfe09775d6b SHA1 09a6d6b8af92be06eeb8e9a361022509f4495256 SHA256 6934f068171dcc6ca6105168e5dbfc9d6e1a9f9515c744a52d3ca80c58ce96d9
-MISC ChangeLog 4970 RMD160 76d2c94c44d35389c91c5618a0bdb5939a4ac766 SHA1 0b226f1f8437dbe96d2d066e40c9ab2e1cfbc20e SHA256 ee44206340818df21719f0e45a61315c9077b9755957deae9c2d259e6ba63fa6
+MISC ChangeLog 5158 RMD160 cfa5e1cd5741a6098c2601e0ce6b6db3950b4801 SHA1 bb62c606f866db71d5b4817025dd41d365038254 SHA256 1cba3fad6bbcf0ad78e423f384aa1c5be2fbdac4336f72dc2e7c7bb3110762b4
 MISC metadata.xml 552 RMD160 5c5409d1828ecc369ae2de83f0c37561650ac554 SHA1 5269ecc96eb0fd5ecc66b26570f34ceb90d490df SHA256 7ce6544bd535e945c4c3da2c159fc5c1f4a3cc9f36fd14375fa301b592506fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk8ocNgACgkQl5yvQNBFVTWa1gCfX19+EsSUsUO3fCVS1nE8TyX2
-/ogAoIIBnUx7y4TheITRkSA3JgtFRa9B
-=ucAW
+iEYEAREIAAYFAk8q8jYACgkQl5yvQNBFVTWBSwCdHsYGBSpwTjPGbL298Le3Pe7Y
+EYsAoJJq99PVMmoEM5DpX3AWVDSeqvog
+=wNmK
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tinc/files/tincd.1 b/net-misc/tinc/files/tincd.1
index b0b1869d938f..0e2db59737ef 100644
--- a/net-misc/tinc/files/tincd.1
+++ b/net-misc/tinc/files/tincd.1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.1,v 1.3 2012/01/31 22:53:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.1,v 1.4 2012/02/02 20:29:33 blueness Exp $
 
 extra_started_commands="reload"
 
@@ -37,7 +37,7 @@ start() {
 			else
 				LOG="--logfile=/var/log/tinc.${NETNAME}.log"
 			fi
-			start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}" -- --net="${NETNAME}" "${LOG}"
+			start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}"
 			eend $?
 		fi
 	done
diff --git a/net-misc/tinc/files/tincd.lo.1 b/net-misc/tinc/files/tincd.lo.1
index 6b04ad28915f..86dfce1ac4bb 100644
--- a/net-misc/tinc/files/tincd.lo.1
+++ b/net-misc/tinc/files/tincd.lo.1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.lo.1,v 1.3 2012/01/31 22:53:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.lo.1,v 1.4 2012/02/02 20:29:33 blueness Exp $
 
 extra_started_commands="reload"
 
@@ -28,7 +28,7 @@ start()
 		else
 			LOG="--logfile=/var/log/tinc.${NETNAME}.log"
 		fi
-		start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}" -- --net="${NETNAME}" "${LOG}"
+		start-stop-daemon --start --exec "${DAEMON}" --pidfile "${PIDFILE}" -- --net="${NETNAME}" "${LOG}" --pidfile "${PIDFILE}"
 		eend $?
 	fi
 }
diff --git a/net-misc/tinc/tinc-1.0.16-r3.ebuild b/net-misc/tinc/tinc-1.0.16-r4.ebuild
index ce18345389b9..559a6a3c3dcc 100644
--- a/net-misc/tinc/tinc-1.0.16-r3.ebuild
+++ b/net-misc/tinc/tinc-1.0.16-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.16-r3.ebuild,v 1.1 2012/01/31 22:53:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/tinc-1.0.16-r4.ebuild,v 1.1 2012/02/02 20:29:33 blueness Exp $
 
 EAPI="4"