From ee3f4907af002e53cd6ec364f4fc631d9c655fdd Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Thu, 4 Jun 2009 07:40:35 +0000 Subject: Change root directory as daemon writes files in it, bug #267134. Also revbump 6.0 to pick this change (Portage version: 2.2_rc33/cvs/Linux x86_64) --- net-misc/gateway6/ChangeLog | 9 +++- net-misc/gateway6/files/gw6c.rc | 4 +- net-misc/gateway6/gateway6-6.0-r1.ebuild | 80 ++++++++++++++++++++++++++++++++ net-misc/gateway6/gateway6-6.0.ebuild | 80 -------------------------------- 4 files changed, 90 insertions(+), 83 deletions(-) create mode 100644 net-misc/gateway6/gateway6-6.0-r1.ebuild delete mode 100644 net-misc/gateway6/gateway6-6.0.ebuild (limited to 'net-misc/gateway6') diff --git a/net-misc/gateway6/ChangeLog b/net-misc/gateway6/ChangeLog index 94c60d7bdc9e..1fb7559d7c91 100644 --- a/net-misc/gateway6/ChangeLog +++ b/net-misc/gateway6/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/gateway6 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/gateway6/ChangeLog,v 1.1 2009/06/03 15:06:34 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/gateway6/ChangeLog,v 1.2 2009/06/04 07:40:34 voyageur Exp $ + +*gateway6-6.0-r1 (04 Jun 2009) + + 04 Jun 2009; Bernard Cafarelli files/gw6c.rc, + -gateway6-6.0.ebuild, +gateway6-6.0-r1.ebuild: + Change root directory as daemon writes files in it, bug #267134. Also + revbump 6.0 to pick this change *gateway6-6.0 (03 Jun 2009) *gateway6-5.1 (03 Jun 2009) diff --git a/net-misc/gateway6/files/gw6c.rc b/net-misc/gateway6/files/gw6c.rc index 45cbf71525d0..9dc5217da1e5 100644 --- a/net-misc/gateway6/files/gw6c.rc +++ b/net-misc/gateway6/files/gw6c.rc @@ -25,8 +25,8 @@ start() { checkconfig || return 1 ebegin "Starting Gateway6 IPv6 Client" - start-stop-daemon --start --quiet \ - --exec $GATEWAY6_CLIENT -- -f /etc/gateway6/gw6c.conf + start-stop-daemon --start --quiet --exec $GATEWAY6_CLIENT \ + --chdir /var/lib/gateway6 -- -f /etc/gateway6/gw6c.conf eend $? } diff --git a/net-misc/gateway6/gateway6-6.0-r1.ebuild b/net-misc/gateway6/gateway6-6.0-r1.ebuild new file mode 100644 index 000000000000..98ec2bf1a977 --- /dev/null +++ b/net-misc/gateway6/gateway6-6.0-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/gateway6/gateway6-6.0-r1.ebuild,v 1.1 2009/06/04 07:40:34 voyageur Exp $ + +inherit eutils versionator toolchain-funcs + +MY_P=gw6c-$(replace_all_version_separators "_") +MY_P=${MY_P/_beta/-BETA} + +DESCRIPTION="Client to connect to a tunnel broker using the TSP protocol (freenet6 for example)" +HOMEPAGE="http://go6.net/4105/application.asp" +SRC_URI="http://go6.net/4105/file.asp?file_id=158&file=/${MY_P}.tar.gz" + +LICENSE="VPL-1.0" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~sparc ~x86" +IUSE="radvd" + +DEPEND="dev-libs/openssl + sys-apps/iproute2 + radvd? ( net-misc/radvd )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}-RELEASE" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${PN}-6.0_beta4-no-template-validation.patch + + for i in gw6c-config gw6c-messaging ; do + sed -i -e "s/-O2//" \ + -e "s/CXXFLAGS=/CXXFLAGS+=/" \ + -e "s/CFLAGS=/CFLAGS+=/" \ + -e "s/LDFAGS=/LDFLAGS+=/" \ + ${i}/Makefile || die "sed failed in ${i}" + done + + cd tspc-advanced + for i in platform/linux platform/unix-common src/lib src/net src/tsp src/xml ; do + sed -i -e "s/-O2//" \ + -e "s/CXXFLAGS=/CXXFLAGS+=/" \ + -e "s/CFLAGS=/CFLAGS+=/" \ + -e "s/LDFAGS=/LDFLAGS+=/" \ + ${i}/Makefile || die "sed failed in ${i}" + done +} + +src_compile() { + # Parallel compilation broken + emake -j1\ + AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ + all configdir=/etc/gateway6 target=linux || die "Build Failed" +} + +src_install() { + cd "${S}"/tspc-advanced + dosbin bin/gw6c + + insopts -m 600 + insinto /etc/gateway6 + doins "${FILESDIR}"/gw6c.conf + exeinto /etc/gateway6/template + doexe template/linux.sh + + newinitd "${FILESDIR}"/gw6c.rc gw6c + + doman man/{man5/gw6c.conf.5,man8/gw6c.8} + dodir /var/lib/gateway6 + + dodoc "${S}"/*.pdf +} + +pkg_postinst() { + elog "To add support for a TSP IPv6 connection at startup," + elog "remember to run:" + elog "# rc-update add gw6c default" +} diff --git a/net-misc/gateway6/gateway6-6.0.ebuild b/net-misc/gateway6/gateway6-6.0.ebuild deleted file mode 100644 index fc2c5b249be6..000000000000 --- a/net-misc/gateway6/gateway6-6.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/gateway6/gateway6-6.0.ebuild,v 1.1 2009/06/03 15:06:34 voyageur Exp $ - -inherit eutils versionator toolchain-funcs - -MY_P=gw6c-$(replace_all_version_separators "_") -MY_P=${MY_P/_beta/-BETA} - -DESCRIPTION="Client to connect to a tunnel broker using the TSP protocol (freenet6 for example)" -HOMEPAGE="http://go6.net/4105/application.asp" -SRC_URI="http://go6.net/4105/file.asp?file_id=158&file=/${MY_P}.tar.gz" - -LICENSE="VPL-1.0" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~sparc ~x86" -IUSE="radvd" - -DEPEND="dev-libs/openssl - sys-apps/iproute2 - radvd? ( net-misc/radvd )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}-RELEASE" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-6.0_beta4-no-template-validation.patch - - for i in gw6c-config gw6c-messaging ; do - sed -i -e "s/-O2//" \ - -e "s/CXXFLAGS=/CXXFLAGS+=/" \ - -e "s/CFLAGS=/CFLAGS+=/" \ - -e "s/LDFAGS=/LDFLAGS+=/" \ - ${i}/Makefile || die "sed failed in ${i}" - done - - cd tspc-advanced - for i in platform/linux platform/unix-common src/lib src/net src/tsp src/xml ; do - sed -i -e "s/-O2//" \ - -e "s/CXXFLAGS=/CXXFLAGS+=/" \ - -e "s/CFLAGS=/CFLAGS+=/" \ - -e "s/LDFAGS=/LDFLAGS+=/" \ - ${i}/Makefile || die "sed failed in ${i}" - done -} - -src_compile() { - # Parallel compilation broken - emake -j1\ - AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ - all configdir=/etc/gateway6 target=linux || die "Build Failed" -} - -src_install() { - cd "${S}"/tspc-advanced - dosbin bin/gw6c - - insopts -m 600 - insinto /etc/gateway6 - doins "${FILESDIR}"/gw6c.conf - exeinto /etc/gateway6/template - doexe template/linux.sh - - newinitd "${FILESDIR}"/gw6c.rc gw6c - - doman man/{man5/gw6c.conf.5,man8/gw6c.8} - dodir /var/lib/gateway6 - - dodoc "${S}"/*.pdf -} - -pkg_postinst() { - elog "To add support for a TSP IPv6 connection at startup," - elog "remember to run:" - elog "# rc-update add gw6c default" -} -- cgit v1.2.3-65-gdbad