Version bump, bug #98493.

(Portage version: 2.0.51.22-r2)

5 files changed, 66 insertions, 11 deletions

diff --git a/net-irc/ircd-hybrid/files/7.1.0-default-config.patch b/net-irc/ircd-hybrid/files/7.1.0-default-config.patch
new file mode 100644
index 000000000000..ffa8ce950660
--- /dev/null
+++ b/net-irc/ircd-hybrid/files/7.1.0-default-config.patch
@@ -0,0 +1,29 @@
+--- include/defaults.h.orig	2005-07-20 16:37:34.918105546 +0000
++++ include/defaults.h	2005-07-20 16:38:51.034577293 +0000
+@@ -46,12 +46,12 @@
+  */
+ 
+ /* dirs */
+-#define DPATH   IRCD_PREFIX                                                     
++#define DPATH   IRCD_PREFIX
+ #define BINPATH IRCD_PREFIX "/bin/"
+-#define MSGPATH IRCD_PREFIX "/messages/"
+-#define ETCPATH IRCD_PREFIX "/etc"
+-#define LOGPATH IRCD_PREFIX "/logs"
+-#define MODPATH IRCD_PREFIX "/modules/"
++#define MSGPATH IRCD_PREFIX "/share/ircd-hybrid-7/messages/"
++#define ETCPATH "/etc/ircd"
++#define LOGPATH "/var/log/ircd"
++#define MODPATH IRCD_PREFIX "/lib/ircd-hybrid-7/modules/"
+ 
+ /* files */
+ #define SPATH   BINPATH "/ircd"                 /* ircd executable */
+@@ -65,7 +65,7 @@
+ #define XPATH   ETCPATH "/xline.conf"           /* xline file */
+ #define MPATH   ETCPATH "/ircd.motd"            /* MOTD file */
+ #define LPATH   LOGPATH "/ircd.log"             /* ircd logfile */
+-#define PPATH   ETCPATH "/ircd.pid"             /* pid file */
++#define PPATH   "/var/run/ircd/ircd.pid"             /* pid file */
+ #define OPATH   ETCPATH "/opers.motd"           /* oper MOTD file */
+ #define LIPATH  ETCPATH "/links.txt"            /* cached links file */
+ 
diff --git a/net-irc/ircd-hybrid/files/conf.d_ircd b/net-irc/ircd-hybrid/files/conf.d_ircd
index a9098271ec8e..6f700ac108dd 100644
--- a/net-irc/ircd-hybrid/files/conf.d_ircd
+++ b/net-irc/ircd-hybrid/files/conf.d_ircd
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/conf.d_ircd,v 1.3 2004/07/14 23:47:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/conf.d_ircd,v 1.4 2005/07/20 19:11:02 swegener Exp $
 
 # Config file for /etc/init.d/ircd
 
diff --git a/net-irc/ircd-hybrid/files/digest-ircd-hybrid-7.1.0 b/net-irc/ircd-hybrid/files/digest-ircd-hybrid-7.1.0
new file mode 100644
index 000000000000..ee7b92a579fb
--- /dev/null
+++ b/net-irc/ircd-hybrid/files/digest-ircd-hybrid-7.1.0
@@ -0,0 +1 @@
+MD5 87a6f28706584cebdd4e5ed2c315c9dc ircd-hybrid-7.1.0.tgz 1218466
diff --git a/net-irc/ircd-hybrid/files/init.d_ircd b/net-irc/ircd-hybrid/files/init.d_ircd
index 99e6f48f9ee6..d793add87f18 100644
--- a/net-irc/ircd-hybrid/files/init.d_ircd
+++ b/net-irc/ircd-hybrid/files/init.d_ircd
@@ -1,19 +1,18 @@
 #!/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/ircd-hybrid/files/init.d_ircd,v 1.3 2004/09/27 00:35:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/files/init.d_ircd,v 1.4 2005/07/20 19:11:02 swegener Exp $
 
 opts="${opts} rehash"
 
 ipv4pid="/var/run/ircd/ircd-ipv4.pid"
 ipv6pid="/var/run/ircd/ircd-ipv6.pid"
 
-depend()
-{
+depend() {
 	need net
 }
 
-start()
-{
+start() {
 	if [ "${IPV4_OPTS}" != "no" ]
 	then
 		ebegin "Starting IRCd-Hybrid7 IPv4 daemon"
@@ -31,8 +30,7 @@ start()
 	fi
 }
 
-stop()
-{
+stop() {
 	if [ -r "${ipv4pid}" ]
 	then
 		ebegin "Stopping IRCd-Hybrid7 IPv4 daemon"
@@ -50,8 +48,7 @@ stop()
 	fi
 }
 
-rehash()
-{
+rehash() {
 	if [ -r "${ipv4pid}" ]
 	then
 		ebegin "Rehashing IRCd-Hybrid7 IPv4 daemon"
diff --git a/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0 b/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0
new file mode 100644
index 000000000000..57bbcae9965a
--- /dev/null
+++ b/net-irc/ircd-hybrid/files/init.d_ircd-7.1.0
@@ -0,0 +1,28 @@
+#!/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/ircd-hybrid/files/init.d_ircd-7.1.0,v 1.1 2005/07/20 19:11:02 swegener Exp $
+
+opts="${opts} rehash"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting IRCd-Hybrid7 daemon"
+	start-stop-daemon --start --quiet --chuid hybrid --exec /usr/bin/ircd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping IRCd-Hybrid7 daemon"
+	start-stop-daemon --stop --quiet --pidfile /var/run/ircd/ircd.pid
+	eend $?
+}
+
+rehash() {
+	ebegin "Rehashing IRCd-Hybrid7 IPv4 daemon"
+	kill -s SIGHUP $(</var/run/ircd/ircd.pid)
+	eend $?
+}