Update to 3.0.0beta12

Submitted by:	Lewis <moggie@elasticmind.net> (maintainer) via private mail

2 files changed, 8 insertions, 22 deletions

diff --git a/irc/ircd-ratbox-devel/files/patch-doc_example.efnet.conf b/irc/ircd-ratbox-devel/files/patch-doc_example.efnet.conf
index 464546550e5e..f0d60a6ba6bb 100644
--- a/irc/ircd-ratbox-devel/files/patch-doc_example.efnet.conf
+++ b/irc/ircd-ratbox-devel/files/patch-doc_example.efnet.conf
@@ -1,5 +1,5 @@
---- ./doc/example.efnet.conf.orig	2008-08-08 19:17:31.000000000 +0100
-+++ ./doc/example.efnet.conf	2008-08-21 00:41:22.000000000 +0100
+--- ./doc/example.efnet.conf.orig	2008-08-23 23:05:37.000000000 +0100
++++ ./doc/example.efnet.conf	2008-09-05 21:00:26.000000000 +0100
 @@ -60,7 +60,7 @@
  	/* description: the description of our server.  '[' and ']' may not
  	 * be used here for compatibility with older servers.
@@ -53,7 +53,7 @@
  };
  
  /* class {}: contain information about classes for users (OLD Y:) */
-@@ -351,7 +351,7 @@
+@@ -353,7 +353,7 @@
  	 * A password should not be defined when this is used, see 
  	 * doc/challenge.txt for more information.
  	 */
@@ -62,21 +62,7 @@
  
  	/* umodes: the specific umodes this oper gets when they oper.
  	 * If this is specified an oper will not be given oper_umodes
-@@ -967,13 +967,6 @@
- 	/* oper umodes: default usermodes opers get when they /oper */
- 	oper_umodes = locops, servnotice, operwall, wallop;
- 
--	/* servlink path: path to 'servlink' program used by ircd to handle
--	 * encrypted/compressed server <-> server links.
--	 *
--	 * only define if servlink is not in same directory as ircd itself.
--	 */
--	#servlink_path = "/usr/local/ircd/bin/servlink";
--
- 	/* use egd: if your system does not have *random devices yet you
- 	 * want to use OpenSSL and encrypted links, enable this.  Beware -
- 	 * EGD is *very* CPU intensive when gathering data for its pool
-@@ -1025,8 +1018,9 @@
+@@ -1022,8 +1022,9 @@
  	/* module path: paths to search for modules specified below and 
  	 * in /modload.
  	 */
diff --git a/irc/ircd-ratbox-devel/files/pkg-message.in b/irc/ircd-ratbox-devel/files/pkg-message.in
index 312c3b1f817d..bc5e25e25a60 100644
--- a/irc/ircd-ratbox-devel/files/pkg-message.in
+++ b/irc/ircd-ratbox-devel/files/pkg-message.in
@@ -18,10 +18,10 @@ using the following rc.d script command:
 	%%PREFIX%%/etc/rc.d/ircd-ratbox conftest
 
 An update of the ban.db database will be necessary if upgrading from a
-pre-beta5 release. Those upgrading from 3.0.0-beta5 to this version
-should be able to omit this step. Though it doesn't do any harm to check
-anyway. Database updates must be performed using 'bantool -u' while no
-ircd is running and before starting the newer version.
+pre-beta5 release. Those upgrading from 3.0.0-beta5 or later, to this
+version should be able to omit this step. Though it doesn't do any harm to
+check anyway. Database updates must be performed using 'bantool -u' while
+no ircd is running and before starting the newer version.
 
 	%%PREFIX%%/bin/bantool -u