diff options
Diffstat (limited to 'net-misc/gogoc')
| -rw-r--r-- | net-misc/gogoc/ChangeLog | 9 | ||||
| -rw-r--r-- | net-misc/gogoc/Manifest | 12 | ||||
| -rw-r--r-- | net-misc/gogoc/files/gogoc.rc | 11 | ||||
| -rw-r--r-- | net-misc/gogoc/gogoc-1.2-r1.ebuild (renamed from net-misc/gogoc/gogoc-1.2.ebuild) | 13 |
4 files changed, 27 insertions, 18 deletions
diff --git a/net-misc/gogoc/ChangeLog b/net-misc/gogoc/ChangeLog index c05b8174e391..dbdca244bb75 100644 --- a/net-misc/gogoc/ChangeLog +++ b/net-misc/gogoc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/gogoc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/gogoc/ChangeLog,v 1.1 2010/10/11 21:34:24 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/gogoc/ChangeLog,v 1.2 2010/10/11 23:00:38 flameeyes Exp $ + +*gogoc-1.2-r1 (11 Oct 2010) + + 11 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org> -gogoc-1.2.ebuild, + +gogoc-1.2-r1.ebuild, files/gogoc.rc: + Polish around some of the problems found while trying to run this in + production. *gogoc-1.2 (11 Oct 2010) diff --git a/net-misc/gogoc/Manifest b/net-misc/gogoc/Manifest index 244bd9a5819e..3980ed1ba2db 100644 --- a/net-misc/gogoc/Manifest +++ b/net-misc/gogoc/Manifest @@ -2,15 +2,15 @@ Hash: SHA1 AUX gogoc-1.2-overflow.patch 1299 RMD160 550763713be30aa0482526588d9875293757308a SHA1 5ead36a88e84adc36aebb12dee4be7901ca924da SHA256 5a803ac4a930ac4e16b4fad931546bded68164a3910c554f34705beb8fbc71d1 -AUX gogoc.rc 1103 RMD160 a44ea264294961b5c74d8504ff6c25db54aa4939 SHA1 7df2fc5bc1ea508716527856046f61bd7e39e287 SHA256 d98a0e268ae1a95c0657aa8885e0c765e6578abeaf0d5494950b60e6f72f35db +AUX gogoc.rc 923 RMD160 b340bf31f8d1dc5f83fa9d54328379c55cf0d9cb SHA1 5ca55afd9a09ba02ebd77902c2e1525db9b87316 SHA256 1d1b705877ea64c6f70994e4d8d2c570d6c6eb20a94cd410808b3c1795664d8d DIST gogoc-1_2-RELEASE.tar.gz 249286 RMD160 1af2fe3d4c0d23b1550983dcf72b692946b8c699 SHA1 a9f694b9ce404b1f4fd8cecbefbcb3005d6d6e54 SHA256 a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49 -EBUILD gogoc-1.2.ebuild 2072 RMD160 fabcac5df4efa1f46167148dffc1fb3ceca9ea1c SHA1 4ef3415ec367ae35750f0ef20764dbce0258844e SHA256 3b9dc74e911bafeb331d320d3e0133e741842517cf5b441bbce4bd5dc38c30dd -MISC ChangeLog 454 RMD160 8b65622ccfbff41a8939586f0895f03da42bc3e6 SHA1 7886e385a05983ef630872116a691e010c5b2c99 SHA256 346727430f899420453dffed67ef74797ddb23db5b61a627094bfa92b88afe37 +EBUILD gogoc-1.2-r1.ebuild 2232 RMD160 4f0a5b66e3c23aec7027f6d1134e073674dbeb07 SHA1 a5e320ac4af08f0df806d2c64eb43abb5e8e0362 SHA256 c4b0abc5c00f1a141f5f1de5d50eaa262a6b0a5f743c6e38508974e1f4061677 +MISC ChangeLog 684 RMD160 a1fa3297614c95ddaf1f3ef634ff0ae55d67079e SHA1 14b6f7ceab440220ebfabbbe8eb757a13f42eccd SHA256 37519f27c558dda4955abc9f194acab833e9eee1d9f74b85def3a597f46329c7 MISC metadata.xml 749 RMD160 7859b3220055accdcc2b62674d8de7fcd74bfbc3 SHA1 8bcbea505643d6a4794815ff1afd28a1db7ab1f8 SHA256 0299694180894d00712fa887c9cc5f75f552027ad9cac462e8a1661468f16dff -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkyzgsAACgkQAiZjviIA2XjhHgCgrztfONCUDyUUy7IOOI5jp0oa -KfgAoORIxRh0gT0gj2+rGAhFw3MB+YIX -=CjSJ +iEYEARECAAYFAkyzlvYACgkQAiZjviIA2XjOvgCbBJYLTpTsUN2L54sw0arLe3mi +HEUAoJW5ajwz4bIxQZqpONBo7jB04qle +=tog7 -----END PGP SIGNATURE----- diff --git a/net-misc/gogoc/files/gogoc.rc b/net-misc/gogoc/files/gogoc.rc index 83eb3c79176e..c5f4b498459a 100644 --- a/net-misc/gogoc/files/gogoc.rc +++ b/net-misc/gogoc/files/gogoc.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/gogoc/files/gogoc.rc,v 1.1 2010/10/11 21:34:24 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/gogoc/files/gogoc.rc,v 1.2 2010/10/11 23:00:39 flameeyes Exp $ depend() { need net localmount @@ -19,15 +19,10 @@ checktun() { } checkconfig() { - if ! [ -f /etc/gogoc.conf ]; then + if ! [ -f /etc/gogoc/gogoc.conf ]; then eerror "Unable to find configuration file /etc/gogoc.conf" return 1 fi - - if [ `stat -c '%a' /etc/fstab | cut -c 2-` != '00' ]; then - eerror "Configuration file /etc/gogoc.conf should not be user-readable" - return 1 - fi } start() { @@ -36,7 +31,7 @@ start() { ebegin "Starting gogoCLIENT" start-stop-daemon --start --exec /usr/sbin/gogoc \ - --chdir /var/lib/gogoc -- -f /etc/gogoc.conf + --chdir /var/lib/gogoc eend $? } diff --git a/net-misc/gogoc/gogoc-1.2.ebuild b/net-misc/gogoc/gogoc-1.2-r1.ebuild index cc952a5e7d80..29ac0e8c90b2 100644 --- a/net-misc/gogoc/gogoc-1.2.ebuild +++ b/net-misc/gogoc/gogoc-1.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/gogoc/gogoc-1.2.ebuild,v 1.1 2010/10/11 21:34:24 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/gogoc/gogoc-1.2-r1.ebuild,v 1.1 2010/10/11 23:00:38 flameeyes Exp $ EAPI=2 @@ -36,6 +36,10 @@ src_prepare() { -e 's:LDFLAGS:LDLIBS:g' \ -e '/\$(LDLIBS)/s:-o:$(LDFLAGS) -o:' \ {} + || die "multised failed" + + sed -i -e 's:/usr/local/etc/gogoc:/etc/gogoc:' \ + gogoc-tsp/platform/*/tsp_local.c \ + || die "sed failed" } src_configure() { :; } @@ -60,17 +64,20 @@ src_install() { dodoc bin/gogoc.conf.sample || die - exeinto /etc/gateway6/template + exeinto /etc/gogoc/template doexe template/linux.sh || die newinitd "${FILESDIR}"/gogoc.rc gogoc || die doman man/{man5/gogoc.conf.5,man8/gogoc.8} || die keepdir /var/lib/gogoc || die + + diropts -m0700 + keepdir /etc/gogoc || die } pkg_postinst() { - elog "You should create an /etc/gogoc.conf file starting from" + elog "You should create an /etc/gogoc/gogoc.conf file starting from" elog "the sample configuration in /usr/share/doc/${PF}/gogo.conf.sample.*" elog "" elog "To add support for a TSP IPv6 connection at startup," |