Update to 7.0 adding lot's of new features.

*** IMPORTANT: ***
- The old config format WILL NOT WORK
- The old kline format WILL NOT WORK
Please read the INSTALL file for more information

PR:		60372
Submitted by:	maintainer

6 files changed, 104 insertions, 199 deletions

diff --git a/irc/ircd-hybrid/files/ircd.sh b/irc/ircd-hybrid/files/ircd-hybrid.sh
index 4e2918d..4e2918d 100644
--- a/irc/ircd-hybrid/files/ircd.sh
+++ b/irc/ircd-hybrid/files/ircd-hybrid.sh
diff --git a/irc/ircd-hybrid/files/patch-ab b/irc/ircd-hybrid/files/patch-ab
index 13c95d6..f139d55 100644
--- a/irc/ircd-hybrid/files/patch-ab
+++ b/irc/ircd-hybrid/files/patch-ab
@@ -1,20 +1,30 @@
---- configure.orig	Thu Mar 21 16:58:58 2002
-+++ configure	Thu Mar 21 17:00:54 2002
-@@ -2517,7 +2517,7 @@
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
+--- help/Makefile.in.orig	Sat Feb  2 09:01:13 2002
++++ help/Makefile.in	Tue Jan  6 02:08:07 2004
+@@ -8,8 +8,8 @@
  
--trap 'rm -fr `echo "Makefile adns/Makefile src/Makefile tools/Makefile include/setup.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "Makefile adns/Makefile src/Makefile tools/Makefile include/setup.h include/config.h tools/install_ircd" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
+ prefix=		@prefix@
+ exec_prefix=	@execprefix@
+-uhelpdir=	${prefix}/help/users
+-ohelpdir=	${prefix}/help/opers
++uhelpdir=	@uhelpdir@
++ohelpdir=	@ohelpdir@
  
-@@ -2615,7 +2615,7 @@
- 
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile adns/Makefile src/Makefile tools/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile adns/Makefile src/Makefile tools/Makefile include/config.h tools/install_ircd"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+ SYMLINKS=	topic accept cjoin cmode admin names links away whowas \
+ 		version kick who invite quit join list nick oper part \
+@@ -63,12 +63,10 @@
+ install:
+ 	@echo installing help files...
+ 	-@if test ! -d $(prefix)/help; then \
+-		echo "mkdir $(prefix)/help"; \
+-		mkdir $(prefix)/help; \
+-		echo "mkdir $(prefix)/help/users"; \
+-		mkdir $(prefix)/help/users; \
+-		echo "mkdir $(prefix)/help/opers"; \
+-		mkdir $(prefix)/help/opers; \
++		echo "mkdir $(uhelpdir)"; \
++		mkdir -p $(uhelpdir); \
++		echo "mkdir $(ohelpdir)"; \
++		mkdir -p $(ohelpdir); \
+ 	fi
+ 	@for help in opers/*; do \
+ 	if [ -f $$help ]; then \
diff --git a/irc/ircd-hybrid/files/patch-ac b/irc/ircd-hybrid/files/patch-ac
index d49d309..4ecc896 100644
--- a/irc/ircd-hybrid/files/patch-ac
+++ b/irc/ircd-hybrid/files/patch-ac
@@ -1,25 +1,13 @@
---- include/config.h.in.orig	Thu Mar 21 16:37:57 2002
-+++ include/config.h.in	Thu Mar 21 16:41:01 2002
-@@ -100,8 +100,9 @@
-  *
-  */
+--- modules/Makefile.in.orig	Sun Jun 16 10:31:25 2002
++++ modules/Makefile.in	Tue Jan  6 01:10:40 2004
+@@ -29,8 +29,8 @@
  
--#define DPATH   "/usr/local/ircd/"
--#define SPATH   "/usr/local/ircd/ircd"
-+#define BPATH   "@prefix@/bin/"
-+#define DPATH   "@prefix@/etc/ircd/"
-+#define SPATH   "@prefix@/bin/ircd"
- #define CPATH   "ircd.conf"
- #define KPATH   "kline.conf"
- #define DLPATH  "kline.conf"
-@@ -208,8 +209,8 @@
-  *
-  * These need to be defined if you want to use SYSLOG logging, too.
-  */
--#define FNAME_USERLOG "/usr/local/ircd/users"
--#define FNAME_OPERLOG "/usr/local/ircd/opers"
-+#define FNAME_USERLOG "@prefix@/share/ircd/users"
-+#define FNAME_OPERLOG "@prefix@/share/ircd/opers"
+ prefix          = @prefix@
+ # Change this later! -- adrian
+-moduledir       = @prefix@/modules
+-automoduledir   = @prefix@/modules/autoload
++moduledir       = @moduledir@
++automoduledir   = @automoduledir@
  
- /* RFC1035_ANAL
-  * Defining this causes ircd to reject hostnames with non-compliant chars.
+ INCLUDES	= -I../include -I../adns $(SSL_INCLUDES)
+ CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
diff --git a/irc/ircd-hybrid/files/patch-ad b/irc/ircd-hybrid/files/patch-ad
index 45a9c35..04039c8 100644
--- a/irc/ircd-hybrid/files/patch-ad
+++ b/irc/ircd-hybrid/files/patch-ad
@@ -1,151 +1,11 @@
---- tools/install_ircd.in.orig	Thu Mar 21 16:41:59 2002
-+++ tools/install_ircd.in	Thu Mar 21 16:47:07 2002
-@@ -7,6 +7,14 @@
- # Fixed.
- #
+--- messages/Makefile.in.ori	Thu Jan  1 03:36:00 2004
++++ messages/Makefile.in	Thu Jan  1 03:36:29 2004
+@@ -16,7 +16,7 @@
+ libexecdir      = @libexecdir@
+ sysconfdir      = @sysconfdir@
+ localstatedir   = @localstatedir@
+-messagedir       = @prefix@/messages
++messagedir      = @messagedir@
  
-+if [ "x@prefix@" != "x${PREFIX}" ]; then
-+  echo "ERROR: Different prefix used to install than for configure/build."
-+  echo "The prefix is compiled into the binary, thus this will not work."
-+  echo "Please be sure to use the same \$PREFIX throughout building of"
-+  echo "this port."
-+  exit 1
-+fi
-+
- # Path to install-sh
- INSTALL_SH="autoconf/install-sh"
  
-@@ -39,6 +47,7 @@
-   fi
- }
- 
-+BPATH=`grep '#define.BPATH' include/config.h|awk '{print $3}'|tr -d \"`;
- DPATH=`grep '#define.DPATH' include/config.h|awk '{print $3}'|tr -d \"`;
- SPATH=`grep '#define.SPATH' include/config.h|awk '{print $3}'|tr -d \"`;
- CPATH=`grep '#define.CPATH' include/config.h|awk '{print $3}'|tr -d \"`;
-@@ -48,6 +57,7 @@
- PPATH=`grep '#define.PPATH' include/config.h|awk '{print $3}'|tr -d \"`;
- HPATH=`grep '#define.HPATH' include/config.h|awk '{print $3}'|tr -d \"`;
- 
-+BPATH=`dir_concat ${BPATH}`;
- SPATH=`dir_concat ${SPATH}`;
- CPATH=`dir_concat ${CPATH}`;
- KPATH=`dir_concat ${KPATH}`;
-@@ -56,6 +66,7 @@
- PPATH=`dir_concat ${PPATH}`;
- HPATH=`dir_concat ${HPATH}`;
- 
-+#   BPATH = binary directory
- #   DPATH = directory,
- #   SPATH = server executable,
- #   CPATH = conf file,
-@@ -76,86 +87,46 @@
- # try to install their ircd.conf file, unless it already exists.
- # install ircd, save old one as ircd.old
- dir_make `dirname ${SPATH}`
--if [ ! -f ${SPATH}${EXESUFFIX} ]; then
--  echo installing ircd as ${SPATH}${EXESUFFIX}
--  $INSTALL_SH -c src/ircd${EXESUFFIX} ${SPATH}${EXESUFFIX};
--else
--  echo installing ircd as ${SPATH}${EXESUFFIX}
--  echo previous ircd saved as ircd${EXESUFFIX}.old
--  mv ${SPATH}${EXESUFFIX} ${SPATH}${EXESUFFIX}.old
--  $INSTALL_SH -c src/ircd${EXESUFFIX} ${SPATH}${EXESUFFIX};
--fi
-+echo installing ircd as ${SPATH}${EXESUFFIX}
-+$INSTALL_SH -o 72 -g 72 -c src/ircd${EXESUFFIX} ${SPATH}${EXESUFFIX};
-+strip ${SPATH}${EXESUFFIX};
- 
- dir_make `dirname ${CPATH}`
--if [ ! -f ${CPATH} ]; then
--  echo installing example.conf as ${CPATH}
--  $INSTALL_SH -c doc/example.conf ${CPATH};
--else
--  echo You already have ${CPATH}.;
--fi
-+echo installing example.conf as ${CPATH}.sample
-+$INSTALL_SH -o 72 -g 72 -c doc/example.conf ${CPATH}.sample;
- 
- # try to install their motd file, unless it already exists.
- dir_make `dirname ${MPATH}`
--if [ ! -f ${MPATH} ]; then
--  echo installing a sample MOTD in ${MPATH}
--  echo "This is ircd-hybrid MOTD replace it with something better" > ${MPATH};
--else
--  echo You already have an MOTD in ${MPATH}.;
--fi
-+echo installing a sample MOTD in ${MPATH}.sample
-+echo "This is ircd-hybrid MOTD replace it with something better" \
-+       > ${MPATH}.sample;
-+chown 72:72 ${MPATH}.sample;
- 
- # try to install their kpath file unless it already exists.
- dir_make `dirname ${KPATH}`
--if [ ! -f ${KPATH} ]; then
--  echo touching K-line file ${KPATH}
--  touch ${KPATH};
--else
--  echo You already have a K-line file in ${KPATH}.;
--fi
-+touch ${KPATH}.sample;
-+chown 72:72 ${KPATH}.sample;
- 
- # try to install their opers.txt file, in all cases 
- dir_make `dirname ${HPATH}`
--if [ ! -f ${HPATH} ]; then
--  echo installing opers.txt as ${HPATH}
--  $INSTALL_SH -c opers.txt ${HPATH};
--else
--   echo installing opers.txt as ${HPATH}
--   echo previous opers.txt saved as opers.txt.old
--   mv ${HPATH} ${HPATH}.old
--   $INSTALL_SH -c opers.txt ${HPATH};
--fi
-+echo installing opers.txt as ${HPATH}.sample
-+$INSTALL_SH -o 72 -g 72 -c opers.txt ${HPATH}.sample;
- 
- # install mkpasswd
--if [ ! -f ${DPATH}mkpasswd ]; then
--  echo installing mkpasswd as ${DPATH}mkpasswd${EXESUFFIX}
--  $INSTALL_SH -c tools/mkpasswd${EXESUFFIX} ${DPATH}mkpasswd${EXESUFFIX};
--else
--   echo installing mkpasswd as ${DPATH}mkpasswd${EXESUFFIX}
--   echo previous mkpasswd saved as mkpasswd${EXESUFFIX}.old
--   mv ${DPATH}mkpasswd${EXESUFFIX} ${DPATH}mkpasswd${EXESUFFIX}.old
--   $INSTALL_SH -c tools/mkpasswd${EXESUFFIX} ${DPATH}mkpasswd${EXESUFFIX};
--fi 
-+echo installing mkpasswd as ${BPATH}mkpasswd${EXESUFFIX}
-+$INSTALL_SH  -o 72 -g 72 -c tools/mkpasswd${EXESUFFIX} ${BPATH}mkpasswd${EXESUFFIX};
- 
- # install viconf
--if [ ! -f ${DPATH}viconf ]; then
--  echo installing viconf as ${DPATH}viconf${EXESUFFIX}
--  $INSTALL_SH -c tools/viconf${EXESUFFIX} ${DPATH}viconf${EXESUFFIX}
--  rm -f ${DPATH}vimotd${EXESUFFIX} ${DPATH}viklines${EXESUFFIX}
--  ln ${DPATH}viconf${EXESUFFIX} ${DPATH}vimotd${EXESUFFIX}
--  ln ${DPATH}viconf${EXESUFFIX} ${DPATH}viklines${EXESUFFIX};
--else
--   echo installing viconf as ${DPATH}viconf${EXESUFFIX}
--   echo previous viconf saved as viconf${EXESUFFIX}.old
--   mv ${DPATH}viconf${EXESUFFIX} ${DPATH}viconf${EXESUFFIX}.old
--   $INSTALL_SH -c tools/viconf${EXESUFFIX} ${DPATH}viconf${EXESUFFIX}
--   rm -f ${DPATH}vimotd${EXESUFFIX} ${DPATH}viklines${EXESUFFIX}
--   ln ${DPATH}viconf${EXESUFFIX} ${DPATH}vimotd${EXESUFFIX}
--   ln ${DPATH}viconf${EXESUFFIX} ${DPATH}viklines${EXESUFFIX};
--fi
-+echo installing viconf as ${BPATH}viconf${EXESUFFIX}
-+$INSTALL_SH -o 72 -g 72 -c tools/viconf${EXESUFFIX} ${BPATH}viconf${EXESUFFIX}
-+rm -f ${BPATH}vimotd${EXESUFFIX} ${BPATH}viklines${EXESUFFIX}
-+ln ${BPATH}viconf${EXESUFFIX} ${BPATH}vimotd${EXESUFFIX}
-+ln ${BPATH}viconf${EXESUFFIX} ${BPATH}viklines${EXESUFFIX};
- 
- # install ircd.8
--dir_make ${DPATH}man8
--echo installing ircd.8 as ${DPATH}man8/ircd.8
--$INSTALL_SH -c doc/ircd.8 ${DPATH}man8/ircd.8
-+dir_make ${PREFIX}/man/man8
-+echo installing ircd.8 as ${PREFIX}/man/man8/ircd.8
-+$INSTALL_SH -o 72 -g 72 -c doc/ircd.8 ${PREFIX}/man/man8/ircd.8
- 
- # finished.
- echo install complete!
+ all: ${OBJS}
diff --git a/irc/ircd-hybrid/files/patch-ae b/irc/ircd-hybrid/files/patch-ae
index 67ba1b5..98924a9 100644
--- a/irc/ircd-hybrid/files/patch-ae
+++ b/irc/ircd-hybrid/files/patch-ae
@@ -1,11 +1,23 @@
---- Makefile.in.orig	Thu Mar 21 16:47:44 2002
-+++ Makefile.in	Thu Mar 21 16:47:57 2002
-@@ -22,7 +22,7 @@
- RM=@RM@
+--- src/Makefile.in.ori	Wed Jan  7 02:57:37 2004
++++ src/Makefile.in	Wed Jan  7 03:02:12 2004
+@@ -23,6 +23,7 @@
+ libexecdir	= @libexecdir@
+ sysconfdir	= @sysconfdir@
+ localstatedir	= @localstatedir@
++logsdir		= @logsdir@
  
- # Default CFLAGS
--CFLAGS = -g -O2 -DNDEBUG
-+CFLAGS += -DNDEBUG
+ DOLLAR = $$
  
- # Default make flags - you may want to uncomment this on a multicpu machine
- #MFLAGS = -j 4
+@@ -140,9 +141,9 @@
+ 		echo "mkdir $(sysconfdir)"; \
+ 		mkdir $(sysconfdir); \
+ 	fi
+-	-@if test ! -d $(localstatedir)/logs; then \
+-		echo "mkdir $(localstatedir)/logs"; \
+-		mkdir $(localstatedir)/logs; \
++	-@if test ! -d $(logsdir); then \
++		echo "mkdir $(logsdir)"; \
++		mkdir $(logsdir); \
+ 	fi
+ 
+ install: install-mkdirs build
diff --git a/irc/ircd-hybrid/files/patch-af b/irc/ircd-hybrid/files/patch-af
new file mode 100644
index 0000000..ca25bf5
--- /dev/null
+++ b/irc/ircd-hybrid/files/patch-af
@@ -0,0 +1,35 @@
+--- tools/Makefile.in.orig	Thu Jul 11 17:40:27 2002
++++ tools/Makefile.in	Wed Jan  7 03:41:07 2004
+@@ -29,8 +29,8 @@
+ sysconfdir	= @sysconfdir@
+ localstatedir	= @localstatedir@
+ # Change this later! -- adrian
+-moduledir	= @prefix@/modules
+-automoduledir	= @prefix@/modules/autoload
++moduledir	= @moduledir@
++automoduledir	= @automoduledir@
+ 
+ PROGS		= viconf mkpasswd convertconf convertilines convertklines encspeed
+ 
+@@ -99,8 +99,6 @@
+ sysconfdir	= @sysconfdir@
+ localstatedir	= @localstatedir@
+ # Change this later! -- adrian
+-moduledir	= @prefix@/modules
+-automoduledir	= @prefix@/modules/autoload
+ 
+ 
+  
+@@ -129,9 +127,9 @@
+ 		echo "mkdir $(sysconfdir)"; \
+ 		mkdir $(sysconfdir); \
+ 	fi
+-	-@if test ! -d $(localstatedir)/logs; then \
+-		echo "mkdir $(localstatedir)/logs"; \
+-		mkdir $(localstatedir)/logs; \
++	-@if test ! -d $(logsdir); then \
++		echo "mkdir $(logsdir)"; \
++		mkdir $(logsdir); \
+ 	fi
+ 
+ install: install-mkdirs build