From e88104977058fcf1bc42ef1f3f102a8293ebfafb Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 24 Aug 2011 11:07:13 +0000 Subject: [PATCH] Version bump. Bug #378969. Thanks to Simone Scanzoni for the new initd file Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- net-misc/logmein-hamachi/ChangeLog | 10 ++- net-misc/logmein-hamachi/Manifest | 41 ++++++------ .../files/logmein-hamachi.initd | 8 ++- .../logmein-hamachi-2.0.1.15.ebuild | 62 ------------------- ...ebuild => logmein-hamachi-2.1.0.17.ebuild} | 3 +- 5 files changed, 36 insertions(+), 88 deletions(-) delete mode 100644 net-misc/logmein-hamachi/logmein-hamachi-2.0.1.15.ebuild rename net-misc/logmein-hamachi/{logmein-hamachi-2.0.1.13.ebuild => logmein-hamachi-2.1.0.17.ebuild} (92%) diff --git a/net-misc/logmein-hamachi/ChangeLog b/net-misc/logmein-hamachi/ChangeLog index 7166c799baf8..b4adb3c9641c 100644 --- a/net-misc/logmein-hamachi/ChangeLog +++ b/net-misc/logmein-hamachi/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/logmein-hamachi # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.2 2011/06/13 09:00:21 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.3 2011/08/24 11:07:13 hwoarang Exp $ + +*logmein-hamachi-2.1.0.17 (24 Aug 2011) + + 24 Aug 2011; Markos Chandras + -logmein-hamachi-2.0.1.13.ebuild, -logmein-hamachi-2.0.1.15.ebuild, + +logmein-hamachi-2.1.0.17.ebuild, files/logmein-hamachi.initd: + Version bump. Bug #378969. Thanks to Simone Scanzoni + for the new initd file *logmein-hamachi-2.0.1.15 (13 Jun 2011) diff --git a/net-misc/logmein-hamachi/Manifest b/net-misc/logmein-hamachi/Manifest index 5498771df0f5..8be12a2a10a0 100644 --- a/net-misc/logmein-hamachi/Manifest +++ b/net-misc/logmein-hamachi/Manifest @@ -2,29 +2,26 @@ Hash: SHA512 AUX logmein-hamachi.confd 541 RMD160 d51555bbc26f38ac018d161174fcac0ca914ad16 SHA1 1a0c00fcc9744a9bf4c5ee25f703f40b60800373 SHA256 661be1f7ca7ce360933ab275a9f0a43961c00940534c1c156a985fe346bcb058 -AUX logmein-hamachi.initd 1194 RMD160 a2982eec5861e97a1c8ebaded5de8181b5a0105b SHA1 5fb56dd77f04417b2c870348358b34ae4521bdff SHA256 4d236ce8c70c13652e1f3cfa4c672cab5e43406aaea35f8967f43b6cd259595e -DIST logmein-hamachi-2.0.1.13-x64.tgz 920813 RMD160 b2fba25a6dcb01760a3823746bf1e23b6cb17f36 SHA1 2c71fa14c1b8d68e3dc8a93a17e84b1e3ac7df97 SHA256 308bfa589a7c413e4b153984cd2e1676fd7b6c01ec628ae9d30e0416b5ca69b7 -DIST logmein-hamachi-2.0.1.13-x86.tgz 865762 RMD160 f2c36171ad92de13981e35fc0904e0c2fe68435a SHA1 01ef90a5df95c863d983561f39534bfc70bb7d0a SHA256 877f3315d0d75b0c5ce986baa16cb0e71e8607641c0157ed300c433aee280293 -DIST logmein-hamachi-2.0.1.15-x64.tgz 1015015 RMD160 e58e58d1405e4a206ea134aeef5b24e713518ddc SHA1 306effb5bc97ab1d443aefed4c246b0cd7e56064 SHA256 a67464f25927eef1b5ed3d09b3a70275b7e0b1a9464a4da259d6205ae2f858ab -DIST logmein-hamachi-2.0.1.15-x86.tgz 948837 RMD160 17b67374e4a7ccde45803456b5403946e7d5a023 SHA1 386dc9f603a8ab2bab5cd454f91e735a44c7ef05 SHA256 e192c08cf4bd8d60b94cc0f9450334cebd7c8eabe7259df2f41c3942cd042971 -EBUILD logmein-hamachi-2.0.1.13.ebuild 1781 RMD160 91cf9d709c2d50aebf25cfac1cf953d56d729cbc SHA1 5fa888fa8396d7a2b94e387fdc6c3f726e802a81 SHA256 6d56efc80136e026cb85e79aef8faaf8cea7241a103a734b8cd56ef5f1ca9da5 -EBUILD logmein-hamachi-2.0.1.15.ebuild 1781 RMD160 10c6d121aa0b0e9c3107d5f8fd85bd1950dda1bf SHA1 d1d631c277399afdfde14b136bd631047dd367fc SHA256 ad5cdcf6130780755be55bb8fd5e69fd5dc0c3ba6e17e5b03a29342bc7075bd4 -MISC ChangeLog 957 RMD160 f91956456d00c25db6069117b597d7805d550890 SHA1 fb45f739e0b8edefedf9ebbb3c186ae792ac73a5 SHA256 cb52041a7c13d1d643f20cd41fdaa998a4d53049c8337e6ba8eb38eafee2392c +AUX logmein-hamachi.initd 1299 RMD160 87c3b83dec6f027fabd63b8f322f06c0127e2c1f SHA1 d319e39922154da1874c1a2cb5d9458933c83512 SHA256 a1652e35dfe544739fd9464eb1e9f51b442f225b911d6ad80e81db0d5cbdc95a +DIST logmein-hamachi-2.1.0.17-x64.tgz 1055901 RMD160 41edf1ae6d40e1c876a2d0bc0c057f96c3d1b9ab SHA1 fe5e311b702205a317bd598d8029d03b36d2ffec SHA256 5de15e39d00d993fcd9d7a84ad6f8a89f6fa1162d7f55309d803c9b9718ef2f9 +DIST logmein-hamachi-2.1.0.17-x86.tgz 997313 RMD160 b822e6d8a714f8c9cf2342bb1a39761b42a89e21 SHA1 306e537c2dff541ace8bfbdd69514c12343f53d1 SHA256 a1f026c0266fe07835c72e3a432528f11fbde7e1ec4cbfbcba731cef8f51feec +EBUILD logmein-hamachi-2.1.0.17.ebuild 1715 RMD160 0e6fbe716ada5e7a2ac92959e7c5c4ca474db521 SHA1 2570cba84bc0224f4ea04a3f5678f07fa1e968b9 SHA256 4b782d243f17c5a92f5655d4a1cd12539e79ce5bd8348b3db99ed25f07c0667f +MISC ChangeLog 1292 RMD160 b876d46839ea11e277dcbb17c2318dd4966cf27b SHA1 346f0b08e90a028756fef8fe8b1264223da77390 SHA256 d347035f7c87b184186a74d24cc3555004d84eeaf9557e945fbb7bb1def3d707 MISC metadata.xml 511 RMD160 b638b0aa62791d76b7b6820326ef0d553c76548e SHA1 36ba12c5d7bd7313f24ddf7a3ef3953f1b05a890 SHA256 ba0ead6648dd3f5fac8f3f0e493b59a84efe374e94f9fa07feefe6de3bb93921 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJN9dHxAAoJEPqDWhW0r/LCzX4P/2oO4J39RFolm7DK4n3okzNy -okz9wvwyHuR+OXQXMbzRNkendfP3DXr54WDAo/N4CL+iG+uSpSptNIRnPotVSA2q -uf+IZkLySnS44Ddpjk4/CB8DQJD8bH2L03K1kR1aIbO0fz8XEtbsRp5vXmUpcp95 -t57e+rtGPrV2iyP5NF03gQ9HZoXv1eYgR4T1nouN9/em/bMnHEpl/37HD7MkcV7I -XgCZnBwrmEiwPQUtVilrF61qnx1Mu1gSaKUpTck6BtcdESIOxxTtNskTco6xZ7fn -PVEwVVbF8EKCQ0op5JmmUm7JHaL77Laoms+iG5ZNZquIif1GKDSurdRYa/0NG2K8 -ktTgAyJOs6LE50Z9kprtyCFlmjFzHFQSgW7GoDMvU/MAE9wc3jt326YuL8npJPUr -bx12Qsv6yH3OuEApCGfM3U7wpZ86yWl6o/4Xl8qmd+RxPMUMbCHJlzd99C2dpfM6 -lv7rRiAkUQNkXQ6jH9np2lvcaMZnOewbeBjNN7Twe3blckUtT2nhAcVW7ctFzm/Y -ROlNG7eqT62PUDwwnuKEu8VrFDsI+Ug5F1zFpdIvvaCO1mC8u7AB/wYjfYyaQuuF -/RYiU9jH3LTYrthyqOzFscIoctTwpdzznNbZxyUP5oS8S85IahlIQcUh1CnP/kY+ -8ejEDVwZkniFuZ+TiSpu -=jeip +iQIcBAEBCgAGBQJOVNtRAAoJEPqDWhW0r/LCq/YQAIy4iqeDgQ1Ns3i2tiiv/jFG +zqIfSKGYZHtjqC5JI9jHT6GehpgcsEc/vdwCQU6o030DWZyib+z6Uq7p2bbCtlOX +uNwErW8xHIaya90mWEaTLCd7Mvfz72w09q/GtMIXe1StBfHYkjMQuNWPmbg0/Moo +q8QpKLY4Ntm+Yzr8u9Xr60TlplwKCQRi9N6vpNIdpisBnivpnVGnSVnw3T37uDuX +dDmmrSPAi8fLCQIJea6ueoaBWRtbW0mFSI/dZ0ew9Mgh6U1CXXKVOcYDL389sbuz +nEFG3RTgEiBYcJLVSNUEoJtlbWKuoEA1SKoqCzwztSFnIzxiLxapvWgz+T4ThEuV +rh++8Rx1XpSnEWBfjdsVXgrSm0uyUJRE16lV4n+WoLAzpEQXZwyYXISuF8OiAPLv +1FNOcVYaMG+0HZ3l0qBbXfa34qm5dFOrPdgVpc7VmD8QTmJTtepeHbwCdwzHmJuQ +0zMlGcicavAXGC6Ib0itwTN9mYDWRPknK8mkJfv6GhuKn+ZFHHuz+W1mPYGs7XPF +G5sz9xc2Q43iE+/3g13RlHbfbcMFTyed6y3EThgQ/Ma2EG1Q9dswPYlpnyauwE+J +Yh0/u/l4Fm2NTcPKhPgmv6mtkbKvEpMBOPQ8/r07e6y5O7SgA8mbt+4eNy7fkfnK +cbjlzecA5EZkQGY5hSad +=nVxh -----END PGP SIGNATURE----- diff --git a/net-misc/logmein-hamachi/files/logmein-hamachi.initd b/net-misc/logmein-hamachi/files/logmein-hamachi.initd index f62674362f26..7fcf11322559 100644 --- a/net-misc/logmein-hamachi/files/logmein-hamachi.initd +++ b/net-misc/logmein-hamachi/files/logmein-hamachi.initd @@ -48,9 +48,15 @@ stop() ebegin "Stopping hamachi" - /usr/bin/hamachi logout >> /dev/null + /usr/bin/hamachi logout start-stop-daemon --quiet --stop --exec "${DAEMON}" \ --pidfile "${PIDFILE}" eend $? } + +status() { + service_started "${SVCNAME}" || return 1 + /usr/bin/hamachi + /usr/bin/hamachi list +} diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.0.1.15.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.0.1.15.ebuild deleted file mode 100644 index 315089ff3f65..000000000000 --- a/net-misc/logmein-hamachi/logmein-hamachi-2.0.1.15.ebuild +++ /dev/null @@ -1,62 +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.0.1.15.ebuild,v 1.1 2011/06/13 09:00:21 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 " - 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}" - elog "Running 'hamachi' without arguments may crash the daemon." -} diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.0.1.13.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild similarity index 92% rename from net-misc/logmein-hamachi/logmein-hamachi-2.0.1.13.ebuild rename to net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild index a6295beb3a44..cb76205f5802 100644 --- a/net-misc/logmein-hamachi/logmein-hamachi-2.0.1.13.ebuild +++ b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.17.ebuild @@ -1,6 +1,6 @@ # 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.0.1.13.ebuild,v 1.1 2011/01/15 21:13:25 hwoarang Exp $ +# $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 @@ -58,5 +58,4 @@ pkg_postinst() { elog "/etc/init.d/${PN} restart" elog "To enable auto-login when the service starts set a nickname in" elog "/etc/conf.d/${PN}" - elog "Running 'hamachi' without arguments may crash the daemon." } -- 2.26.2