diff options
author | 2013-01-09 10:47:19 +0000 | |
---|---|---|
committer | 2013-01-09 10:47:19 +0000 | |
commit | ce377e9994c6615c2b8542130a3d3662731845e8 (patch) | |
tree | 9a305b0b84220d26e5e9b8bb433e4b1855b4ad9c /net-misc | |
parent | Cleanup of php versions (diff) | |
download | gentoo-2-ce377e9994c6615c2b8542130a3d3662731845e8.tar.gz gentoo-2-ce377e9994c6615c2b8542130a3d3662731845e8.tar.bz2 gentoo-2-ce377e9994c6615c2b8542130a3d3662731845e8.zip |
Properly create /var/run/... directory in initscript, wrt bug #450872. Drop old versions
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/logmein-hamachi/ChangeLog | 10 | ||||
-rw-r--r-- | net-misc/logmein-hamachi/files/logmein-hamachi.initd | 6 | ||||
-rw-r--r-- | net-misc/logmein-hamachi/logmein-hamachi-2.1.0.81.ebuild | 62 | ||||
-rw-r--r-- | net-misc/logmein-hamachi/logmein-hamachi-2.1.0.86-r1.ebuild (renamed from net-misc/logmein-hamachi/logmein-hamachi-2.1.0.86.ebuild) | 21 |
4 files changed, 25 insertions, 74 deletions
diff --git a/net-misc/logmein-hamachi/ChangeLog b/net-misc/logmein-hamachi/ChangeLog index cf451fcbea1a..87cb1edfdd09 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-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.10 2013/01/02 09:23:53 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/ChangeLog,v 1.11 2013/01/09 10:47:19 pinkbyte Exp $ + +*logmein-hamachi-2.1.0.86-r1 (09 Jan 2013) + + 09 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> + -logmein-hamachi-2.1.0.81.ebuild, -logmein-hamachi-2.1.0.86.ebuild, + +logmein-hamachi-2.1.0.86-r1.ebuild, files/logmein-hamachi.initd: + Properly create /var/run/... directory in initscript, wrt bug #450872. Drop + old versions *logmein-hamachi-2.1.0.86 (02 Jan 2013) diff --git a/net-misc/logmein-hamachi/files/logmein-hamachi.initd b/net-misc/logmein-hamachi/files/logmein-hamachi.initd index 7b704e19b722..25dce7d0947a 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-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 DAEMON=/opt/logmein-hamachi/bin/hamachid @@ -18,6 +18,10 @@ checktun() { return 1 } +start_pre() { + checkpath -d /var/run/logmein-hamachi +} + start() { # returns diff --git a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.81.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.81.ebuild deleted file mode 100644 index e901add07b8a..000000000000 --- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.81.ebuild +++ /dev/null @@ -1,62 +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.81.ebuild,v 1.1 2012/11/22 19:29:20 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_PREBUILT="/opt/${PN}/bin/hamachid" -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 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" - 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.86.ebuild b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.86-r1.ebuild index 9e1c5bafa6a2..1824410a0e9b 100644 --- a/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.86.ebuild +++ b/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.86-r1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2013 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.86.ebuild,v 1.1 2013/01/02 09:23:53 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/logmein-hamachi/logmein-hamachi-2.1.0.86-r1.ebuild,v 1.1 2013/01/09 10:47:19 pinkbyte Exp $ + +EAPI=5 inherit eutils linux-info @@ -20,6 +22,7 @@ RESTRICT="mirror" QA_PREBUILT="/opt/${PN}/bin/hamachid" QA_PRESTRIPPED="/opt/${PN}/bin/hamachid" +QA_WX_LOAD="/opt/${PN}/bin/hamachid" pkg_setup() { einfo "Checking your kernel configuration for TUN/TAP support." @@ -29,23 +32,21 @@ pkg_setup() { src_unpack() { unpack ${A} - mv ${P}-$(use x86 && echo x86 || echo x64) "${S}" || die + 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 + dobin hamachid dnsup dnsdown + dosym /opt/${PN}/bin/hamachid /usr/bin/hamachi # Config and log directory - dodir /var/lib/${PN} || die + dodir /var/lib/${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} || die + newconfd "${FILESDIR}"/${PN}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} - dodoc CHANGES README || die + dodoc CHANGES README } pkg_postinst() { |