New initd file. Thanks to Simone Scanzoni <nonno.cicala@libero.it>. Fixes bug #438336. Remove old ebuilds

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

6 files changed, 40 insertions, 148 deletions

diff --git a/net-misc/logmein-hamachi/ChangeLog b/net-misc/logmein-hamachi/ChangeLog
index b2233e8b39dd..6d9379ba188c 100644
--- a/net-misc/logmein-hamachi/ChangeLog
+++ b/net-misc/logmein-hamachi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/logmein-hamachi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.7 2012/10/03 21:11:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.8 2012/10/15 18:22:42 hwoarang Exp $
+
+*logmein-hamachi-2.1.0.76-r1 (15 Oct 2012)
+
+  15 Oct 2012; Markos Chandras <hwoarang@gentoo.org>
+  +logmein-hamachi-2.1.0.76-r1.ebuild, -logmein-hamachi-2.1.0.17.ebuild,
+  -logmein-hamachi-2.1.0.68-r1.ebuild, -logmein-hamachi-2.1.0.68.ebuild,
+  files/logmein-hamachi.initd:
+  New initd file. Thanks to Simone Scanzoni <nonno.cicala@libero.it>. Fixes bug
+  #438336. Remove old ebuilds
 
 *logmein-hamachi-2.1.0.76 (03 Oct 2012)
 
diff --git a/net-misc/logmein-hamachi/Manifest b/net-misc/logmein-hamachi/Manifest
index 6730e0651002..7ab35a346064 100644
--- a/net-misc/logmein-hamachi/Manifest
+++ b/net-misc/logmein-hamachi/Manifest
@@ -2,33 +2,27 @@
 Hash: SHA256
 
 AUX logmein-hamachi.confd 541 SHA256 661be1f7ca7ce360933ab275a9f0a43961c00940534c1c156a985fe346bcb058 SHA512 8d28891af13b597d9a29dcdc3a92e3c933e6cd3c122d720f6ec140619fbf26e2a2c4d3c729ed0499fc844e7b4480149dae76268bfe024b88f7c2e44b39e5ac14 WHIRLPOOL e1019d4bc29884932691f49f5bd2889c1331a14f63b9b98d30a68b15d366ca236e56bce606f3082c6ee678ffa1621204e706fdfe3f62da3d8d1eb36840ac96f3
-AUX logmein-hamachi.initd 1299 SHA256 a1652e35dfe544739fd9464eb1e9f51b442f225b911d6ad80e81db0d5cbdc95a SHA512 78fb1f5c19b143d1807828dd2c69d47e8f01f3d7658c4773ba4fde57631afcbf17045f43e469374caa862f753c48cb177cddae0c026e3f9da6f7c3e4d482a5c9 WHIRLPOOL 672c4121147f73ee92f7150f49a158e6c4b8fc4030976ee67b57c801828b77a6c1a16eb00cb25b5e5b50528bf5ca8716c84748b377a45b7946d4700582287913
-DIST logmein-hamachi-2.1.0.17-x64.tgz 1055901 SHA256 5de15e39d00d993fcd9d7a84ad6f8a89f6fa1162d7f55309d803c9b9718ef2f9
-DIST logmein-hamachi-2.1.0.17-x86.tgz 997313 SHA256 a1f026c0266fe07835c72e3a432528f11fbde7e1ec4cbfbcba731cef8f51feec
-DIST logmein-hamachi-2.1.0.68-x64.tgz 1070317 SHA256 4a32bb07eac35f03c23787d31b86469545b520fd3c0337b8ddaed788c2754869
-DIST logmein-hamachi-2.1.0.68-x86.tgz 1010497 SHA256 41138f1c52b810a3ac107f93a161302b72805d71a389353070d5daead1cf70d7
+AUX logmein-hamachi.initd 1526 SHA256 49337e88fb6b42bd830b108471ab87335a5890c2250f01f3dfa7069b4406984d SHA512 4f76dff322af85e89627a50feb43d46745057a65cbad27e57449f572ecf725df1407b66a651fcf3a41fd787eb6c95ac0a59afd1e4bf7a4b3542319285fec62e6 WHIRLPOOL ce0e3bac91a071b402f6166a06e8a3e10fa47b9e62fb536fa375769db493e1ec1b31f2667fd610b4ba84c6105fe70acc13e1cae4d4c124ce2dd5ddc293338cc8
 DIST logmein-hamachi-2.1.0.76-x64.tgz 1091221 SHA256 c6c59ce1ac4db42458b038e28cad114bad9fa6cb386de73050843d47e88645e3 SHA512 913aa516d7430085c04d33a6079c8ad82a19309f59ea91a8f0304b4d08c3b35932522a1315100ecf4a8ab1ab385564a46726c489e669d3beb1b972655228c981 WHIRLPOOL 4994184c4b46db3f1b50add3d6e5e0b57f9bcb96e2ccd78a560e7eabcb7ab4b3ea8163e143871e5701ebbbf9d1e9ea00660c921d10795f9073efcd09a6663def
 DIST logmein-hamachi-2.1.0.76-x86.tgz 1031594 SHA256 1172f32ccb0ca63a726fa31aa5398f57591aabcfa688282a1f1c82c099e9fe19 SHA512 c533bd4fa7af814e12842d68072d6f05b58bf586105a75e267dab231b81112944ccc61f12377b498b78b8f4d90d0173cf32fb7fad208fae0633f7f99fd294855 WHIRLPOOL 9b631ae8ce5fb33aa647eee4b256d4c63b7a81929f1f26c71273d82a092b873c8021fbb1fb3b1a37cd186ab551bd4e29a8f5d2fa7a3e8393b1e2949522311818
-EBUILD logmein-hamachi-2.1.0.17.ebuild 1715 SHA256 4b782d243f17c5a92f5655d4a1cd12539e79ce5bd8348b3db99ed25f07c0667f SHA512 78be607d7dfba677b72ca05efa367ab173b2a8bdd174a857739e8fe1ca1413288cd65e1100a3eeef026db3ee0d9219e48db4393c666a6b4741d02503a8e46372 WHIRLPOOL 537003b17ba9d268186211e0cf28e6253110fa001c44fbaf78c54619ef546e6a33b3f6e70b46fde631aa0662cf96a67d4abfa2156e8837671e85184510f6d260
-EBUILD logmein-hamachi-2.1.0.68-r1.ebuild 1758 SHA256 832e1794dec78885a1fa97954e0a25fa5d46f452cb50f699bf83e49271c893ab SHA512 24026684f6eea159b03660fce63c18c7a2b3e058c40444b83724feb1617b98d4da622d166a2a1b1c63ac6a9cec19673e900650613cfabe508e96eb758f55c999 WHIRLPOOL 9348c1aaec3443d19e90e86251b2e6d29c096e80acc0e63957296f88b298575686cb043de271aa5db77d8bd10edc53d5826269b14ea6eb7a4076ee0455b137e3
-EBUILD logmein-hamachi-2.1.0.68.ebuild 1716 SHA256 437169993b9e9317f324d2dbf17fd5395525ab16ea1bb3d86a73c3d0a4907e71 SHA512 134044bf514e43d6f6c0172bd9e4c65432ba78cbfb8e2616ad0709373ac7b5774253eda298d8c4cf742036c10812bc68440b87b9bcb82eaa6134026323e55eef WHIRLPOOL 677c744e17d5ee60f9c20b06138c6a33b2c0b346a452e8b31f5e8acf6b986c59cfab863cfb66f96b48c2849bde4e93ad184a4c0655610d70ba0be591214a0299
+EBUILD logmein-hamachi-2.1.0.76-r1.ebuild 1775 SHA256 a59d2c1de50114c2c32311225b95c7af7639a27d9ec90aa19d15845063f511de SHA512 49fd340ebbbef2c865ce90a2e654ac575a7f27dbc1e962399ff8aa3285ca5fe98d55fc63990476003c354f9227dc4411d83a533fb7902243828cf7015af13ced WHIRLPOOL 96aa1745ae21edb4dd54a489f33357f743a76766b6668d316f9621dde775cceec9cc1bec11f69454de1db216c96687592cf5977a3466266a17d1b67e1f40390a
 EBUILD logmein-hamachi-2.1.0.76.ebuild 1753 SHA256 7a46dd5d2f075eeb9e4fe66fe538a7c50f3584a44b50d85bfe5bf34387a7bb8c SHA512 a24990b27f45d9ed62cbde3104653bceddf1a5b6be10975ae618fd473ef20732768924bbe6eb7af0e547f4fe30ea817e300a13fb24d6ae104012792b61eeeca3 WHIRLPOOL f455a8bc569e621e7908640f32103531c53957ef260488870bf7682bff0df3bf3de12643397ea7785bd17bc20d61ba9b6b3cec1ff0fc912efb83da5f7d9475b9
-MISC ChangeLog 2004 SHA256 62069c818b0a7d11cab658f1a0767c8ce1eb71ee3e10d47916fe4bb1286575aa SHA512 ca815fbd7846375627d04adc20ff59ca22b7d5d8cf8aa5533e61dc54923b9ba784a0553999efdb0397b6774ab69b50be191ad0ffa4c9e85383124498ee9bede8 WHIRLPOOL 300d47284051403a532c89defd584ad3d579bcaded2e16fa6db775f6a7a4af44bfc5c0bf152d4f701b37e10566c7f9629d0c4dc4670e230799ddce29556e672b
+MISC ChangeLog 2389 SHA256 6148db753a4b5ab4998e8024c4016bb38a47c97e1c4f28e22e5ab6c5b552548b SHA512 88aada79522e00d2131b75033c3c1a275b39735c5baac04e45d308bd2e36236aee409a145d3fc988e6b451a2e0f0d4a4b5978e161b3467d655a366bd1547ecc8 WHIRLPOOL d3f63fc758fa230348bba7f559add4fc5277335c4ce6a640974b6698fa5e74597219de6419767ef764c99b34a1a082f8dd2f17f79d4a3036f114c1dd8293e91a
 MISC metadata.xml 271 SHA256 fbb3d4a4ac430596956b69e0435bad93c2a660fa52c7503cefd1d7b615770185 SHA512 8e0d07e4d7817e26452a71f4c35f1becf91c842da68ff67f4f09cb5c6d2d42a60d1cc424118841ce9d891594008de066e823537e69e5d983f056b87ef8a42079 WHIRLPOOL 3c41fce26ea8420680f397d6b68f0b0fd9b4b9c787c2c802535138f73e82db575943ade214f5a29d0447e7e0a532b2451f503b88be1b3499abb9746e1ab4f719
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQbKoJAAoJEPqDWhW0r/LCBrwP/2l5aNlWI6em1GEY5MlM3H5Q
-l9yDVcmuflxPjuCr1bZ48/Kng6zmC4nVDzPgtJ4X0ZMpad5HxZt6ff5xJaMwHKWo
-k1F17IPJzlN6fRXkseey1Ol9rW/qDM5JxJZ2Wy8a6btKekKmcfPOXFwVGZT25/G/
-pJIBJA9ZptqypgIzHcdOmetqmbqY76rDIE0UW/bFMF0hP6e/Fu1x0qgzX6mvb1E5
-nH7t0MJHbQMZIjcAeY73Mlwux9zg6/5dz5pZwFk1fQMok9psQNFHW4y0evVYLroM
-Q28GKYevZaGjThu7vyvstplDLt5i6OxtavUBZXW0gRKffr5Uubs6i2wKTYeVputb
-T2D2FNmoYAhMalAFgmNkWjzY8Y5id7A8IpSZ621kTUZkrZWUrMcfYvGGvWQ5ZdlU
-jHVgLOAhqqVEnfEQp2EG3tlmEM/fWz6cq9g3PASLO9gB/HnitSxChbgVUvbFWmob
-M6S8ZQgLyoxFRlM46XUdfjvSc1TlE9oGbUqruBJhqlfW+suuisKUelpT8hjVv+H4
-2gCcPl2jzj3/ylQLDDLWraFjkf4xE35YfZiep7aLU1Avmg3wS9Myxvb7Ca0pkgEs
-Hr+bx5LkrhmYCoXFfbdhS4UwlVctMC6l4zqiBNH+LKamkvSCvXNXgcILjxJMOSyd
-RVW8VI037VVJkBQCxM8b
-=VoQ3
+iQIcBAEBCAAGBQJQfFRzAAoJEPqDWhW0r/LCoYsP/2dBtEkprQABievvQfV3WeAt
+VAMl/QxwRIfzhtEAoe1leKejU/lmqD3PuYMjltud+58U5Gqa2TkxDq56X7+UyLnZ
+97KnqqJLru6UlWQvRv5D5h88EO/g2vcb9ogZnewdwawhC9OuxdarBgADm5LcZfXQ
+Mf4LjEwHSO6sxYvIl7f5NbXqvHU1Z5FhokQkWeXJVAhjb9D1nadpyU9NEvfV0cjC
+CKzbD4ReKYnMoNT/NPEOXjcgjj0gO+ksOOUdqkhEXIjttAc0gx1q4fpa4vVQi5Q6
+0qRA82eWlVmpZzw09iZBMYkiOrJPo0Aty6Vuvy/gD0bO0+Tp/QYVAS4gthV5dVA3
+KVsXwV9IRUENTS8IUedUabqt/35WBXUruDhO9FPZQJ/SzUJIUwBwnA3o3Yr3zFZs
+xl/U9K++gJaE5ZOGkgWpuAfPTQcYankGIxtNoabX7e8CUz6G56VQn/gMINueFn/e
+XlphNO/pYmQq2o9cdSBxGxqjiqdm4QK5JZmInNQJiMQmcFodJ4SNLPPEbsuhQpXF
+FEP0qFqqxZGULJ57k8BjUOSyqrAqnMIb3ATk3Kcbb1wqQVeK+YChHlVbYeOLrU0D
+TnV/ofJTlUUFBFWNdug6lRV3pXKcIA24JUmEG1weY986AUxkzO2DEg0mdvtgNBBS
+chIHXpO5FCBNZb/GVIG5
+=YRBD
 -----END PGP SIGNATURE-----
diff --git a/net-misc/logmein-hamachi/files/logmein-hamachi.initd b/net-misc/logmein-hamachi/files/logmein-hamachi.initd
index 7fcf11322559..7b704e19b722 100644
--- a/net-misc/logmein-hamachi/files/logmein-hamachi.initd
+++ b/net-misc/logmein-hamachi/files/logmein-hamachi.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 DAEMON=/opt/logmein-hamachi/bin/hamachid
@@ -9,6 +9,15 @@ depend() {
 	need net
 }
 
+checktun() {
+	[ $(uname -s) = "Linux" ] || return 0
+        [ -e /dev/net/tun ] && return 0
+        modprobe tun && return 0
+
+	eerror "TUN/TAP support is not available in the running kernel"
+	return 1
+}
+
 start()
 {
 	# returns
@@ -16,6 +25,8 @@ start()
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
 
+	checktun || return 2
+
 	ebegin "Starting hamachi"
 
 	start-stop-daemon --quiet --start --exec "${DAEMON}" \
diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild
deleted file mode 100644
index cb76205f5802..000000000000
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild,v 1.1 2011/08/24 11:07:13 hwoarang Exp $
-
-inherit eutils linux-info
-
-DESCRIPTION="LogMeIn Hamachi VPN tunneling engine"
-HOMEPAGE="https://secure.logmein.com/products/hamachi2"
-SRC_URI="x86?	( https://secure.logmein.com/labs/${P}-x86.tgz )
-	amd64?	( https://secure.logmein.com/labs/${P}-x64.tgz )"
-
-LICENSE="LogMeIn"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!net-misc/hamachi"
-
-RESTRICT="mirror"
-
-QA_PRESTRIPPED="/opt/${PN}/bin/hamachid"
-
-pkg_setup() {
-	einfo "Checking your kernel configuration for TUN/TAP support."
-	CONFIG_CHECK="~TUN"
-	check_extra_config
-}
-
-src_unpack() {
-	unpack ${A}
-	mv ${P}-$(use x86 && echo x86 || echo x64) "${S}" || die
-}
-
-src_install() {
-	into /opt/${PN}
-	dobin hamachid dnsup dnsdown || die
-	dosym /opt/${PN}/bin/hamachid /usr/bin/hamachi || die "Couldn't create hamachi symlink"
-
-	dodir /var/run/${PN} || die
-
-	# Config and log directory
-	dodir /var/lib/${PN} || die
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-
-	dodoc CHANGES README || die
-}
-
-pkg_postinst() {
-	elog "LogMeIn Hamachi2 is installed."
-	elog "Consult the README file on how to configure your client."
-	elog "You can run the client 'hamachi' as root,"
-	elog "or as a user if you add a line:"
-	elog "Ipc.User      <login name>"
-	elog "to the file '/var/lib/${PN}/h2-engine-override.cfg'"
-	elog "and restart the daemon with"
-	elog "/etc/init.d/${PN} restart"
-	elog "To enable auto-login when the service starts set a nickname in"
-	elog "/etc/conf.d/${PN}"
-}
diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.68.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.68.ebuild
deleted file mode 100644
index 40583675f353..000000000000
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.68.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.68.ebuild,v 1.1 2012/06/29 08:06:49 maksbotan Exp $
-
-inherit eutils linux-info
-
-DESCRIPTION="LogMeIn Hamachi VPN tunneling engine"
-HOMEPAGE="https://secure.logmein.com/products/hamachi2"
-SRC_URI="x86?	( https://secure.logmein.com/labs/${P}-x86.tgz )
-	amd64?	( https://secure.logmein.com/labs/${P}-x64.tgz )"
-
-LICENSE="LogMeIn"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!net-misc/hamachi"
-
-RESTRICT="mirror"
-
-QA_PRESTRIPPED="/opt/${PN}/bin/hamachid"
-
-pkg_setup() {
-	einfo "Checking your kernel configuration for TUN/TAP support."
-	CONFIG_CHECK="~TUN"
-	check_extra_config
-}
-
-src_unpack() {
-	unpack ${A}
-	mv ${P}-$(use x86 && echo x86 || echo x64) "${S}" || die
-}
-
-src_install() {
-	into /opt/${PN}
-	dobin hamachid dnsup dnsdown || die
-	dosym /opt/${PN}/bin/hamachid /usr/bin/hamachi || die "Couldn't create hamachi symlink"
-
-	dodir /var/run/${PN} || die
-
-	# Config and log directory
-	dodir /var/lib/${PN} || die
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-
-	dodoc CHANGES README || die
-}
-
-pkg_postinst() {
-	elog "LogMeIn Hamachi2 is installed."
-	elog "Consult the README file on how to configure your client."
-	elog "You can run the client 'hamachi' as root,"
-	elog "or as a user if you add a line:"
-	elog "Ipc.User      <login name>"
-	elog "to the file '/var/lib/${PN}/h2-engine-override.cfg'"
-	elog "and restart the daemon with"
-	elog "/etc/init.d/${PN} restart"
-	elog "To enable auto-login when the service starts set a nickname in"
-	elog "/etc/conf.d/${PN}"
-}
diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.68-r1.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.76-r1.ebuild
index 364e95d590fb..5da862f11b51 100644
--- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.68-r1.ebuild
+++ b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.76-r1.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/logmein-hamachi/logmein-hamachi-2.1.0.68-r1.ebuild,v 1.1 2012/08/17 11:54:58 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.76-r1.ebuild,v 1.1 2012/10/15 18:22:42 hwoarang Exp $
 
 inherit eutils linux-info
 
@@ -52,7 +52,7 @@ pkg_postinst() {
 	elog "LogMeIn Hamachi2 is installed."
 	elog "Consult the README file on how to configure your client."
 	elog "You can run the client 'hamachi' as root,"
-	elog "or as a user if you add a line:"
+	elog "or as a user if you add a newline terminated line:"
 	elog "Ipc.User      <login name>"
 	elog "to the file '/var/lib/${PN}/h2-engine-override.cfg'"
 	elog "and restart the daemon with"