Polish around some of the problems found while trying to run this in production.

(Portage version: 2.2_rc92/cvs/Linux x86_64)

3 files changed, 21 insertions, 12 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/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,"