- Major release update to 3.0.7. Read /usr/ports/UPDATING

PR:		ports/166931
Submitted by:	moggie <moggie@elasticmind.net> (maintainer)
Reviewed by:	scheidell (me)

14 files changed, 128 insertions, 164 deletions

diff --git a/irc/ircd-ratbox/files/patch-Makefile.in b/irc/ircd-ratbox/files/patch-Makefile.in
deleted file mode 100644
index 199c2bf72f8e..000000000000
--- a/irc/ircd-ratbox/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig    Fri Dec 10 21:28:20 2004
-+++ Makefile.in Mon Jan 23 17:10:28 2006
-@@ -46,7 +46,7 @@
- # the system one.
- #CFLAGS= -DNDEBUG -g -O2 -D"FD_SETSIZE=1024"
- SHELL=/bin/sh
--SUBDIRS=modules adns src tools servlink doc help
-+SUBDIRS=modules adns src tools servlink doc help contrib
- CLEANDIRS = ${SUBDIRS} contrib
- RSA_FILES=rsa_respond/README rsa_respond/respond.c rsa_respond/Makefile
-
diff --git a/irc/ircd-ratbox/files/patch-contrib_Makefile.in b/irc/ircd-ratbox/files/patch-contrib_Makefile.in
deleted file mode 100644
index b6eecae32e76..000000000000
--- a/irc/ircd-ratbox/files/patch-contrib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig	Sun Jan 13 02:35:03 2008
-+++ contrib/Makefile.in	Sun Jan 13 02:38:59 2008
-@@ -44,7 +44,7 @@
-   spy_stats_p_notice.c		\
-   spy_whois_notice.c            \
-   spy_whois_notice_global.c	\
--  example_module.c
-+  m_rsshortcut.c
- 
- OBJS = ${SRCS:.c=.so}
- 
diff --git a/irc/ircd-ratbox/files/patch-contrib_ircd-shortcut.pl b/irc/ircd-ratbox/files/patch-contrib_ircd-shortcut.pl
index 9ec6882642da..8e2b4532bf84 100644
--- a/irc/ircd-ratbox/files/patch-contrib_ircd-shortcut.pl
+++ b/irc/ircd-ratbox/files/patch-contrib_ircd-shortcut.pl
@@ -1,5 +1,5 @@
---- contrib/ircd-shortcut.pl.orig	Fri Jan 11 20:28:57 2008
-+++ contrib/ircd-shortcut.pl	Sun Jan 13 14:55:34 2008
+--- ./contrib/ircd-shortcut.pl.orig	2008-04-24 16:43:42.000000000 +0100
++++ ./contrib/ircd-shortcut.pl	2008-11-15 02:55:35.000000000 +0000
 @@ -36,7 +36,7 @@
  ######################################
  
diff --git a/irc/ircd-ratbox/files/patch-doc_Makefile.in b/irc/ircd-ratbox/files/patch-doc_Makefile.in
index 5d60cc8aab3d..fd1595236f2d 100644
--- a/irc/ircd-ratbox/files/patch-doc_Makefile.in
+++ b/irc/ircd-ratbox/files/patch-doc_Makefile.in
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	Fri Jun 18 01:19:00 2004
-+++ doc/Makefile.in	Fri Jan 27 07:03:15 2006
-@@ -53,28 +53,9 @@
+--- ./doc/Makefile.in.orig	2008-04-23 20:59:46.000000000 +0100
++++ ./doc/Makefile.in	2008-11-15 02:55:35.000000000 +0000
+@@ -43,24 +43,6 @@
  	fi
  
  install: install-mkdirs build
@@ -12,21 +12,16 @@
 -		$(INSTALL_DATA) $$i $(DESTDIR)$(confdir); \
 -	done
 -
--	@for i in $(DEFAULTCONFS); do \
--		if test ! -f $(DESTDIR)$(confdir)/$$i; then \
--			echo "ircd: creating config file ($$i)"; \
--			${TOUCH} $(DESTDIR)$(confdir)/$$i; \
--		fi; \
--	done
--
- 	-@if test ! -f $(DESTDIR)$(confdir)/ircd.motd; then \
- 		echo "ircd: installing motd file (ircd.motd)"; \
+-	-@if test ! -f $(DESTDIR)$(confdir)/ircd.motd; then \
+-		echo "ircd: installing motd file (ircd.motd)"; \
 -		$(INSTALL_DATA) ircd.motd $(DESTDIR)$(confdir); \
 -	fi
 -
+-	$(INSTALL_BIN) genssl.sh $(DESTDIR)$(confdir)
+-
 -	-@if test -f $(DESTDIR)$(confdir)/links.txt; then \
 -		$(RM) $(DESTDIR)$(confdir)/links.txt; \
-+		$(INSTALL_DATA) ircd.motd $(DESTDIR)$(confdir)/ircd.motd.sample; \
- 	fi
+-	fi
  
- 	@echo "ircd: installing manpage"
+ all:
+ build:
diff --git a/irc/ircd-ratbox/files/patch-doc_example.conf b/irc/ircd-ratbox/files/patch-doc_example.conf
index ac40435cf404..da5a6f1c74d6 100644
--- a/irc/ircd-ratbox/files/patch-doc_example.conf
+++ b/irc/ircd-ratbox/files/patch-doc_example.conf
@@ -1,6 +1,32 @@
---- doc/example.conf.orig	Tue Aug 21 00:37:55 2007
-+++ doc/example.conf	Tue Aug 21 00:37:55 2007
-@@ -117,16 +117,16 @@
+--- ./doc/example.conf.orig	2012-04-13 14:54:05.000000000 +0100
++++ ./doc/example.conf	2012-04-13 14:59:46.000000000 +0100
+@@ -98,13 +98,13 @@
+ 	default_max_clients = 10000;
+ 
+ 	/* ssl_private_key: our ssl private key */
+-	ssl_private_key = "etc/test.key";
++	ssl_private_key = "%%PREFIX%%/etc/ssl/test.key";
+ 
+ 	/* ssl_cert: certificate for our ssl server */
+-	ssl_cert = "etc/test.cert";
++	ssl_cert = "%%PREFIX%%/etc/ssl/test.cert";
+ 
+ 	/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */
+-	ssl_dh_params = "etc/dh.pem";
++	ssl_dh_params = "%%PREFIX%%/etc/ssl/dh.pem";
+ 
+ 	/* ssld_count: number of ssld processes you want to start, if you
+ 	 * have a really busy server, using N-1 where N is the number of
+@@ -115,7 +115,7 @@
+ 	ssld_count = 1;
+ 
+ 	/* bandb: path to the ban database - default is PREFIX/etc/ban.db */
+-	bandb = "etc/ban.db";
++	bandb = "%%DBDIR%%/ban.db";
+ };
+ 
+ /* admin {}: contains admin information about the server. (OLD A:) */
+@@ -142,16 +142,16 @@
  	 * - operspylog: operspy usage
  	 * - ioerrorlog: IO errors
  	 */
@@ -27,8 +53,8 @@
  };
  
  /* class {}: contain information about classes for users (OLD Y:) */
-@@ -314,7 +314,7 @@
- 	 * A password should not be defined when this is used, see
+@@ -354,7 +354,7 @@
+ 	 * A password should not be defined when this is used, see 
  	 * doc/challenge.txt for more information.
  	 */
 -	#rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
@@ -36,17 +62,8 @@
  
  	/* umodes: the specific umodes this oper gets when they oper.
  	 * If this is specified an oper will not be given oper_umodes
-@@ -898,7 +898,7 @@
- 	 *
- 	 * only define if servlink is not in same directory as ircd itself.
- 	 */
--	#servlink_path = "/usr/local/ircd/bin/servlink";
-+	#servlink_path = "%%PREFIX%%/bin/servlink";
- 
- 	/* use egd: if your system does not have *random devices yet you
- 	 * want to use OpenSSL and encrypted links, enable this.  Beware -
-@@ -948,8 +948,9 @@
- 	/* module path: paths to search for modules specified below and
+@@ -1022,8 +1022,9 @@
+ 	/* module path: paths to search for modules specified below and 
  	 * in /modload.
  	 */
 -	path = "/usr/local/ircd/modules";
diff --git a/irc/ircd-ratbox/files/patch-doc_example.efnet.conf b/irc/ircd-ratbox/files/patch-doc_example.efnet.conf
index d9e521b3c1a3..9200b6d79d4a 100644
--- a/irc/ircd-ratbox/files/patch-doc_example.efnet.conf
+++ b/irc/ircd-ratbox/files/patch-doc_example.efnet.conf
@@ -1,6 +1,32 @@
---- doc/example.efnet.conf.orig	Tue Aug 21 00:37:55 2007
-+++ doc/example.efnet.conf	Tue Aug 21 00:37:55 2007
-@@ -119,16 +119,16 @@
+--- ./doc/example.efnet.conf.orig	2012-04-13 14:59:57.000000000 +0100
++++ ./doc/example.efnet.conf	2012-04-13 15:02:33.000000000 +0100
+@@ -101,13 +101,13 @@
+ 	default_max_clients = 10000;
+ 
+ 	/* ssl_private_key: our ssl private key */
+-	ssl_private_key = "etc/test.key";
++	ssl_private_key = "%%PREFIX%%/etc/ssl/test.key";
+ 
+ 	/* ssl_cert: certificate for our ssl server */
+-	ssl_cert = "etc/test.cert";
++	ssl_cert = "%%PREFIX%%/etc/ssl/test.cert";
+ 
+ 	/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */
+-	ssl_dh_params = "etc/dh.pem";
++	ssl_dh_params = "%%PREFIX%%/etc/ssl/dh.pem";
+ 
+ 	/* ssld_count: number of ssld processes you want to start, if you
+ 	 * have a really busy server, using N-1 where N is the number of
+@@ -118,7 +118,7 @@
+ 	ssld_count = 1;
+ 
+ 	/* bandb: path to the ban database - default is PREFIX/etc/ban.db */
+-	bandb = "etc/ban.db";
++	bandb = "%%DBDIR%%/ban.db";
+ };
+ 
+ /* admin {}: contains admin information about the server. (OLD A:) */
+@@ -145,16 +145,16 @@
  	 * - operspylog: operspy usage
  	 * - ioerrorlog: IO errors
  	 */
@@ -27,8 +53,8 @@
  };
  
  /* class {}: contain information about classes for users (OLD Y:) */
-@@ -317,7 +317,7 @@
- 	 * A password should not be defined when this is used, see
+@@ -357,7 +357,7 @@
+ 	 * A password should not be defined when this is used, see 
  	 * doc/challenge.txt for more information.
  	 */
 -	#rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
@@ -36,24 +62,15 @@
  
  	/* umodes: the specific umodes this oper gets when they oper.
  	 * If this is specified an oper will not be given oper_umodes
-@@ -908,7 +908,7 @@
- 	 *
- 	 * only define if servlink is not in same directory as ircd itself.
- 	 */
--	#servlink_path = "/usr/local/ircd/bin/servlink";
-+	#servlink_path = "%%PREFIX%%/bin/servlink";
- 
- 	/* use egd: if your system does not have *random devices yet you
- 	 * want to use OpenSSL and encrypted links, enable this.  Beware -
-@@ -958,8 +958,9 @@
- 	/* module path: paths to search for modules specified below and
+@@ -1038,8 +1038,9 @@
+ 	/* module path: paths to search for modules specified below and 
  	 * in /modload.
  	 */
 -	path = "/usr/local/ircd/modules";
 -	path = "/usr/local/ircd/modules/autoload";
-+	path = "%%PREFIX%%/lib/ircd-ratbox/modules/";
-+	path = "%%PREFIX%%/lib/ircd-ratbox/modules/autoload/";
-+	path = "%%PREFIX%%/lib/ircd-ratbox/modules/contrib/";
++	path = "%%PREFIX%%/lib/ircd-ratbox/modules";
++	path = "%%PREFIX%%/lib/ircd-ratbox/modules/autoload";
++	path = "%%PREFIX%%/lib/ircd-ratbox/modules/contrib";
  
  	/* module: the name of a module to load on startup/rehash */
  	#module = "some_module.so";
diff --git a/irc/ircd-ratbox/files/patch-help_Makefile.in b/irc/ircd-ratbox/files/patch-help_Makefile.in
deleted file mode 100644
index 8c7be9fe25b0..000000000000
--- a/irc/ircd-ratbox/files/patch-help_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- help/Makefile.in.orig	Mon Sep 12 16:58:45 2005
-+++ help/Makefile.in	Mon Jan 23 23:15:32 2006
-@@ -63,14 +63,6 @@
- 	rm -f opers/index.tmp
- 
- install:
--	-@if test -d $(DESTDIR)$(helpdir)-old; then \
--		rm -rf $(DESTDIR)$(helpdir)-old; \
--	fi
--	-@if test -d $(DESTDIR)$(helpdir); then \
--		echo "ircd: backing up old help files"; \
--		mv $(DESTDIR)$(helpdir) $(DESTDIR)$(helpdir)-old; \
--	fi
--
- 	@echo "ircd: setting up help directory structure"
- 	@mkdir -p -m 755 $(DESTDIR)$(helpdir)
- 	@mkdir -p -m 755 $(DESTDIR)$(helpdir)/opers
diff --git a/irc/ircd-ratbox/files/patch-include_config.h b/irc/ircd-ratbox/files/patch-include_config.h
index 523b94915e00..7bb614ee8244 100644
--- a/irc/ircd-ratbox/files/patch-include_config.h
+++ b/irc/ircd-ratbox/files/patch-include_config.h
@@ -1,19 +1,22 @@
---- include/config.h.orig	Thu Jan 20 11:04:40 2005
-+++ include/config.h	Fri Jan 27 02:25:37 2006
-@@ -56,6 +56,7 @@
+--- ./include/config.h.orig	2012-04-13 15:02:51.000000000 +0100
++++ ./include/config.h	2012-04-13 15:06:23.000000000 +0100
+@@ -54,15 +54,17 @@
  #define LOGPATH LOG_DIR
  #define UHPATH   HELP_DIR "/users"
  #define HPATH  HELP_DIR "/opers"
-+#define RUNPATH "%%RUNDIR%%"
++#define RUNPATH	"%%RUNDIR%%"
++#define DBPTH	"%%DBDIR%%"
  
  /* files */
  #define SPATH    BINPATH "/ircd"	/* ircd executable */
-@@ -68,7 +69,7 @@
- #define RPATH    ETCPATH "/ircd.rsa"	/* ircd rsa private keyfile */
+ #define CPATH    ETCPATH "/ircd.conf"	/* ircd.conf file */
+-#define DBPATH   ETCPATH "/ban.db"
++#define DBPATH   DBPTH "/ban.db"
  #define MPATH    ETCPATH "/ircd.motd"	/* MOTD file */
  #define LPATH    LOGPATH "/ircd.log"	/* ircd logfile */
--#define PPATH    ETCPATH "/ircd.pid"	/* pid file */
-+#define PPATH    RUNPATH "/ircd.pid"	/* pid file */
- #define OPATH    ETCPATH "/opers.motd"	/* oper MOTD file */
+ #define PPATH    ETCPATH "/ircd.pid"	/* pid file */
+-#define OPATH    ETCPATH "/opers.motd"	/* oper MOTD file */
++#define OPATH    RUNPATH "/opers.motd"	/* oper MOTD file */
  
- /* IGNORE_BOGUS_TS
+ /* HANGONGOODLINK and HANGONGOODLINK
+  * Often net breaks for a short time and it's useful to try to
diff --git a/irc/ircd-ratbox/files/patch-modules_Makefile.in b/irc/ircd-ratbox/files/patch-modules_Makefile.in
deleted file mode 100644
index 09c39d6f5f7f..000000000000
--- a/irc/ircd-ratbox/files/patch-modules_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- modules/Makefile.in.orig	Sun Jul 17 18:55:27 2005
-+++ modules/Makefile.in	Mon Jan 23 23:19:03 2006
-@@ -147,13 +147,6 @@
- 	-@if test ! -d $(DESTDIR)$(moduledir); then \
-                 mkdir $(DESTDIR)$(moduledir); \
-         fi
--	-@if test -d $(DESTDIR)$(moduledir)-old; then \
--		rm -rf $(DESTDIR)$(moduledir)-old; \
--	fi
--	-@if test -d $(DESTDIR)$(moduledir); then \
--		echo "ircd: backing up modules"; \
--		mv $(DESTDIR)$(moduledir) $(DESTDIR)$(moduledir)-old; \
--	fi
- 
- 	@mkdir -p -m 755 $(DESTDIR)$(moduledir)
- 	@mkdir -p -m 755 $(DESTDIR)$(automoduledir)
diff --git a/irc/ircd-ratbox/files/patch-servlink_Makefile.in b/irc/ircd-ratbox/files/patch-servlink_Makefile.in
deleted file mode 100644
index 39832cf4f987..000000000000
--- a/irc/ircd-ratbox/files/patch-servlink_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- servlink/Makefile.in.orig	Thu Jun 17 23:19:00 2004
-+++ servlink/Makefile.in	Fri Jan 27 02:29:59 2006
-@@ -51,9 +51,6 @@
- install: build
- 	@echo "ircd: installing servlink ($(PROGS))"
- 	@for i in $(PROGS); do \
--                if test -f $(DESTDIR)$(bindir)/$$i; then \
--                        $(MV) $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.old; \
--                fi; \
-                 $(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \
-         done
- 
diff --git a/irc/ircd-ratbox/files/patch-src_Makefile.in b/irc/ircd-ratbox/files/patch-src_Makefile.in
deleted file mode 100644
index 8c05204e83d8..000000000000
--- a/irc/ircd-ratbox/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makefile.in.orig	Thu Feb 24 01:48:06 2005
-+++ src/Makefile.in	Fri Jan 27 02:29:08 2006
-@@ -125,9 +125,6 @@
- 	fi
- 	@echo "ircd: installing ircd ($(PROGS))"
- 	@for i in $(PROGS); do \
--		if test -f $(DESTDIR)$(bindir)/$$i; then \
--			$(MV) $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.old; \
--		fi; \
- 		$(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \
- 	done
- 
diff --git a/irc/ircd-ratbox/files/patch-tools_Makefile.in b/irc/ircd-ratbox/files/patch-tools_Makefile.in
deleted file mode 100644
index 7d3a70444b7d..000000000000
--- a/irc/ircd-ratbox/files/patch-tools_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/Makefile.in.orig	Thu Jun 17 23:19:00 2004
-+++ tools/Makefile.in	Fri Jan 27 02:30:32 2006
-@@ -92,9 +92,6 @@
- install: install-mkdirs build
- 	@echo "ircd: installing tools ($(PROGS))"
- 	@for i in $(PROGS); do \
--		if test -f $(DESTDIR)$(bindir)/$$i; then \
--			$(MV) $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.old; \
--		fi; \
- 		$(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \
- 	done; \
- 	$(RM) -f $(DESTDIR)$(bindir)/vimotd $(DESTDIR)$(bindir)/viklines
diff --git a/irc/ircd-ratbox/files/pkg-install.in b/irc/ircd-ratbox/files/pkg-install.in
index dab2ae6b1d38..74fc38e357b1 100644
--- a/irc/ircd-ratbox/files/pkg-install.in
+++ b/irc/ircd-ratbox/files/pkg-install.in
@@ -6,9 +6,9 @@
 #-----------------------------------------------------------------------
 if [ "x$2" = "xPRE-INSTALL" ]; then
 #-----------------------------------------------------------------------
-#
+
 # ${DO_NADA}
-#
+
 #-----------------------------------------------------------------------
 elif [ "x$2" = "xPOST-INSTALL" ]; then
 #-----------------------------------------------------------------------
@@ -21,12 +21,20 @@ mkdir -p %%RUNDIR%%           \
 && chown ircd:ircd %%RUNDIR%% \
 && chmod 750 %%RUNDIR%%
 
-# Secure permissions if we think this is a fresh install
+mkdir -p %%DBDIR%%		\
+&& chown ircd:ircd %%DBDIR%%	\
+&& chmod 750 %%DBDIR%%
 
-if [ ! -f ${PKG_PREFIX}/etc/ircd-ratbox/ircd.conf ]; then
-	chown -R ircd:ircd ${PKG_PREFIX}/etc/ircd-ratbox/
-	chmod 750 ${PKG_PREFIX}/etc/ircd-ratbox/
-	chmod 640 ${PKG_PREFIX}/etc/ircd-ratbox/*
+# Secure permissions if we think this is a fresh install
+conffile="%%PREFIX%%/etc/ircd-ratbox/ircd.conf"
+samplefile="%%PREFIX%%/etc/ircd-ratbox/ircd.conf.sample"
+if cmp -s $conffile $samplefile; then
+	echo "Setting default permissions for config dir and files."
+	chown -R root:ircd %%PREFIX%%/etc/ircd-ratbox/
+	chmod 750 %%PREFIX%%/etc/ircd-ratbox/
+	chmod 640 %%PREFIX%%/etc/ircd-ratbox/*
+else
+	echo "Modified ircd.conf file found, permissions unchanged."
 fi
 
 #-----------------------------------------------------------------------
diff --git a/irc/ircd-ratbox/files/pkg-message.in b/irc/ircd-ratbox/files/pkg-message.in
index 6ac6c08989a9..45d3fb825fef 100644
--- a/irc/ircd-ratbox/files/pkg-message.in
+++ b/irc/ircd-ratbox/files/pkg-message.in
@@ -12,10 +12,25 @@ server can be started by running:
 
 	%%PREFIX%%/etc/rc.d/ircd-ratbox start
 
-If you specified options for ircd-shortcut commands, these will have
-been added and the module included in the contrib module directory.
-You may wish to add an entry to your ircd.conf file for this module to
-be loaded when your IRCD starts.
+You can check your ircd.conf configuration file for syntactical errors
+using the following rc.d script command:
+
+	%%PREFIX%%/etc/rc.d/ircd-ratbox conftest
+
+The ban.db database should be checked and updated using 'bantool -u'.
+For safety, bantool updates must be done while no ircd is running and
+before starting the new version.
+
+	%%PREFIX%%/bin/bantool -u
+
+Notice: ircd-ratbox has been updated to follow the current stable
+release branch (3.0.x). All previous branches are no longer supported
+by the ratbox team. Users of ircd-ratbox are advised to create new ircd
+configuration files based on the examples provided.
+
+For more information on upgrading, see:
+
+	http://svn.ratbox.org/svnroot/ircd-ratbox/trunk/INSTALL
 
 Be sure to check out 'ratbox-services' if you need a services package.
 ------------------------------------------------------------------------