Fix log files dir, make it run as ircd user, etc, bug #218052, enhancements by Ville Mattila <vm at iki dot fi>

(Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 i686)

4 files changed, 44 insertions, 13 deletions

diff --git a/net-irc/irc-server/ChangeLog b/net-irc/irc-server/ChangeLog
index c8a623026bd5..7d663e0f86ba 100644
--- a/net-irc/irc-server/ChangeLog
+++ b/net-irc/irc-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/irc-server
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/ChangeLog,v 1.12 2007/02/22 12:21:51 armin76 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/ChangeLog,v 1.13 2008/07/14 14:41:53 armin76 Exp $
+
+*irc-server-2.11.1_p1-r2 (14 Jul 2008)
+
+  14 Jul 2008; Raúl Porcel <armin76@gentoo.org> +files/ircd.confd,
+  files/ircd.rc, -irc-server-2.11.1_p1-r1.ebuild,
+  +irc-server-2.11.1_p1-r2.ebuild:
+  Fix log files dir, make it run as ircd user, etc, bug #218052, enhancements
+  by Ville Mattila <vm at iki dot fi>
 
   22 Feb 2007; Raúl Porcel <armin76@gentoo.org>
   irc-server-2.11.1_p1-r1.ebuild:
diff --git a/net-irc/irc-server/files/ircd.confd b/net-irc/irc-server/files/ircd.confd
new file mode 100644
index 000000000000..19766668e76c
--- /dev/null
+++ b/net-irc/irc-server/files/ircd.confd
@@ -0,0 +1,10 @@
+# /etc/conf.d/ircd: configuration for /etc/init.d/ircd
+
+# User account to run ircd as.
+
+#IRCD_USER="ircd"
+
+# Put any additional options for ircd here.
+# See ircd(8) for more information.
+
+#IRCD_OPTS=""
diff --git a/net-irc/irc-server/files/ircd.rc b/net-irc/irc-server/files/ircd.rc
index 0ed3fbc92066..33a659bfd72e 100644
--- a/net-irc/irc-server/files/ircd.rc
+++ b/net-irc/irc-server/files/ircd.rc
@@ -1,20 +1,31 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/files/ircd.rc,v 1.4 2005/09/02 15:10:50 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/files/ircd.rc,v 1.5 2008/07/14 14:41:54 armin76 Exp $
 
 depend() {
 	use net
 }
 
+IRCD_USER=${IRCD_USER:-ircd}
+
+checkconfig() {
+	if [ ! -e /etc/ircd/ircd.conf ] ; then
+		eerror "You need to create /etc/ircd/ircd.conf first."
+		eerror "An example can be found in /etc/ircd/ircd.conf.example"
+		return 1
+	fi
+}
+
 start() {
+        checkconfig || return $?
 	ebegin "Starting ircd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/ircd
-	eend ${?}
+	start-stop-daemon --start --quiet --chuid "${IRCD_USER}" --exec /usr/sbin/ircd -- ${IRCD_OPTS}
+	eend $?
 }
 
 stop() {
 	ebegin "Stopping ircd"
 	start-stop-daemon --stop --quiet --pidfile /var/run/ircd/ircd.pid
-	eend ${?}
+	eend $?
 }
diff --git a/net-irc/irc-server/irc-server-2.11.1_p1-r1.ebuild b/net-irc/irc-server/irc-server-2.11.1_p1-r2.ebuild
index 045807ee676a..50129bfc2cb8 100644
--- a/net-irc/irc-server/irc-server-2.11.1_p1-r1.ebuild
+++ b/net-irc/irc-server/irc-server-2.11.1_p1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/irc-server-2.11.1_p1-r1.ebuild,v 1.2 2007/02/22 12:21:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-server/irc-server-2.11.1_p1-r2.ebuild,v 1.1 2008/07/14 14:41:53 armin76 Exp $
 
 inherit eutils versionator flag-o-matic
 
@@ -37,8 +37,6 @@ src_unpack() {
 }
 
 src_compile () {
-	append-ldflags -lm
-
 	sed -i \
 		-e "s/^#undef\tOPER_KILL$/#define\tOPER_KILL/" \
 		-e "s/^#undef\tOPER_RESTART$/#define\tOPER_RESTART/" \
@@ -51,11 +49,13 @@ src_compile () {
 		-e "s/^#undef USE_SERVICES$/#define\tUSE_SERVICES/" \
 		"${S}"/support/config.h.dist
 
-	use zlib && sed -i -e "s/^#undef\tZIP_LINKS$/#define\tZIP_LINKS/" ${S}/support/config.h.dist
+	use zlib && sed -i -e "s/^#undef\tZIP_LINKS$/#define\tZIP_LINKS/" "${S}"/support/config.h.dist
 
 	econf \
 		--sysconfdir=/etc/ircd \
 		--localstatedir=/var/run/ircd \
+		--with-logdir=/var/log/ircd \
+		--with-rundir=/var/run/ircd \
 		--mandir='${prefix}/share/man' \
 		$(use_with zlib) \
 		$(use_enable ipv6 ip6) \
@@ -72,16 +72,17 @@ src_install() {
 		prefix=${D}/usr \
 		ircd_conf_dir=${D}/etc/ircd \
 		ircd_var_dir=${D}/var/run/ircd \
-		ircd_log_dir=${D}/var/log \
+		ircd_log_dir=${D}/var/log/ircd \
 		install-server \
 		install-tkserv \
 		|| die "make install failed"
 
 	fowners ircd:ircd /var/run/ircd
+	fowners ircd:ircd /var/log/ircd
 
 	cd ../doc
 	dodoc \
-		*-New alt-irc-faq Authors BUGS ChangeLog Etiquette example.conf \
+		*-New alt-irc-faq Authors BUGS ChangeLog Etiquette \
 		iauth-internals.txt INSTALL.appendix INSTALL.* LICENSE \
 		m4macros README RELEASE* rfc* SERVICE*
 
@@ -98,4 +99,5 @@ src_install() {
 	dodoc Nets/Europe/*
 
 	newinitd "${FILESDIR}"/ircd.rc ircd
+	newconfd "${FILESDIR}"/ircd.confd ircd
 }