From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 21 17:40:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F19B61065671 for ; Thu, 21 Aug 2008 17:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CE47C8FC18 for ; Thu, 21 Aug 2008 17:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m7LHe1c2067411 for ; Thu, 21 Aug 2008 17:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m7LHe1Xj067410; Thu, 21 Aug 2008 17:40:01 GMT (envelope-from gnats) Resent-Date: Thu, 21 Aug 2008 17:40:01 GMT Resent-Message-Id: <200808211740.m7LHe1Xj067410@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Lewis Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F6E2106576C for ; Thu, 21 Aug 2008 17:37:36 +0000 (UTC) (envelope-from moggie@elasticmind.net) Received: from mail.elasticmind.net (mail.elasticmind.net [85.113.90.11]) by mx1.freebsd.org (Postfix) with ESMTP id E18268FC21 for ; Thu, 21 Aug 2008 17:37:35 +0000 (UTC) (envelope-from moggie@elasticmind.net) Received: by mail.elasticmind.net (Postfix, from userid 1001) id 4F39526D051; Thu, 21 Aug 2008 18:37:22 +0100 (BST) Message-Id: <20080821173722.4F39526D051@mail.elasticmind.net> Date: Thu, 21 Aug 2008 18:37:22 +0100 (BST) From: Lewis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/126719: [maintainer-update|patch] irc/ircd-ratbox-devel: Update to ratbox-3 beta11 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Lewis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Aug 2008 17:40:02 -0000 >Number: 126719 >Category: ports >Synopsis: [maintainer-update|patch] irc/ircd-ratbox-devel: Update to ratbox-3 beta11 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Aug 21 17:40:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Lewis >Release: FreeBSD 6.3-RELEASE-p3 amd64 >Organization: >Environment: System: FreeBSD 6.3-RELEASE-p3 FreeBSD 6.3-RELEASE-p3 #0: Fri Jul 18 16:48:40 BST 2008 amd64 >Description: Updated ircd-ratbox-devel port to beta11 testing release of ircd-ratbox-3.0.0. Software changes include: o Remove the remains of servlink_path from the config file parser. o Userlog now logs the users IP address as well as their hostname. o Whowas now supports showing the users IP address as well as hostname. The same rules apply to showing the whowas IP as apply to showing whois_actually and uses the same numeric. o Double the size of the whowas array for large networks. This comes at a hit of about 2MB or so of memory. o Really, really fix the block heap garbage collection code. >How-To-Repeat: >Fix: --- ircd-ratbox-devel-3.0.0beta11.patch begins here --- diff -ruN ircd-ratbox-devel.orig/Makefile ircd-ratbox-devel/Makefile --- ircd-ratbox-devel.orig/Makefile 2008-08-21 00:11:24.000000000 +0100 +++ ircd-ratbox-devel/Makefile 2008-08-21 00:13:07.000000000 +0100 @@ -8,7 +8,7 @@ PORTNAME= ircd-ratbox #PORTVERSION= 3.0.0 -DISTVERSION= 3.0.0beta10 +DISTVERSION= 3.0.0beta11 CATEGORIES= irc ipv6 MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/ \ ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/ \ diff -ruN ircd-ratbox-devel.orig/distinfo ircd-ratbox-devel/distinfo --- ircd-ratbox-devel.orig/distinfo 2008-08-21 00:11:24.000000000 +0100 +++ ircd-ratbox-devel/distinfo 2008-08-21 00:13:34.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (ircd-ratbox-3.0.0beta10.tar.bz2) = fc12559faa924f9dbd9c556bd0442676 -SHA256 (ircd-ratbox-3.0.0beta10.tar.bz2) = dcaed10e4c579dd48e20f54bafdc3e53a19e2f0bc7f488a993ed5388950e3e26 -SIZE (ircd-ratbox-3.0.0beta10.tar.bz2) = 1942144 +MD5 (ircd-ratbox-3.0.0beta11.tar.bz2) = b2a90cc53beb0959e7787ef35da0959f +SHA256 (ircd-ratbox-3.0.0beta11.tar.bz2) = 2cf940db564e72db697087061a900ad2d9edbbf9386ddda0f2ac930ddb60dabe +SIZE (ircd-ratbox-3.0.0beta11.tar.bz2) = 1943183 diff -ruN ircd-ratbox-devel.orig/files/patch-doc_example.conf ircd-ratbox-devel/files/patch-doc_example.conf --- ircd-ratbox-devel.orig/files/patch-doc_example.conf 2008-08-21 00:11:24.000000000 +0100 +++ ircd-ratbox-devel/files/patch-doc_example.conf 2008-08-21 00:25:19.000000000 +0100 @@ -1,6 +1,6 @@ ---- ./doc/example.conf.orig 2008-06-18 18:49:53.000000000 +0100 -+++ ./doc/example.conf 2008-06-29 14:39:37.000000000 +0100 -@@ -88,13 +88,13 @@ +--- ./doc/example.conf.orig 2008-08-17 14:16:36.000000000 +0100 ++++ ./doc/example.conf 2008-08-21 00:15:05.000000000 +0100 +@@ -98,13 +98,13 @@ default_max_clients = 10000; /* ssl_private_key: our ssl private key */ @@ -17,7 +17,7 @@ /* 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 cpu/cpu cores you have might be useful -@@ -127,16 +127,16 @@ +@@ -137,16 +137,16 @@ * - operspylog: operspy usage * - ioerrorlog: IO errors */ @@ -44,7 +44,7 @@ }; /* class {}: contain information about classes for users (OLD Y:) */ -@@ -332,7 +332,7 @@ +@@ -347,7 +347,7 @@ * A password should not be defined when this is used, see * doc/challenge.txt for more information. */ @@ -53,16 +53,7 @@ /* umodes: the specific umodes this oper gets when they oper. * If this is specified an oper will not be given oper_umodes -@@ -942,7 +942,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 - -@@ -995,8 +995,9 @@ +@@ -1003,8 +1003,9 @@ /* module path: paths to search for modules specified below and * in /modload. */ diff -ruN ircd-ratbox-devel.orig/files/patch-doc_example.efnet.conf ircd-ratbox-devel/files/patch-doc_example.efnet.conf --- ircd-ratbox-devel.orig/files/patch-doc_example.efnet.conf 2008-08-21 00:11:24.000000000 +0100 +++ ircd-ratbox-devel/files/patch-doc_example.efnet.conf 2008-08-21 00:41:52.000000000 +0100 @@ -1,5 +1,5 @@ ---- doc/example.efnet.conf.orig 2008-07-22 13:32:47.000000000 +0100 -+++ doc/example.efnet.conf 2008-07-22 13:53:46.000000000 +0100 +--- ./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 @@ -60,7 +60,7 @@ /* description: the description of our server. '[' and ']' may not * be used here for compatibility with older servers. @@ -9,7 +9,7 @@ /* network info: the name and description of the network this server * is on. Shown in the 005 reply and used with serverhiding. -@@ -91,13 +91,13 @@ +@@ -101,13 +101,13 @@ default_max_clients = 10000; /* ssl_private_key: our ssl private key */ @@ -26,7 +26,7 @@ /* 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 cpu/cpu cores you have might be useful -@@ -130,16 +130,16 @@ +@@ -140,16 +140,16 @@ * - operspylog: operspy usage * - ioerrorlog: IO errors */ @@ -53,7 +53,7 @@ }; /* class {}: contain information about classes for users (OLD Y:) */ -@@ -335,7 +335,7 @@ +@@ -351,7 +351,7 @@ * A password should not be defined when this is used, see * doc/challenge.txt for more information. */ @@ -62,16 +62,21 @@ /* umodes: the specific umodes this oper gets when they oper. * If this is specified an oper will not be given oper_umodes -@@ -956,7 +956,7 @@ - * - * only define if servlink is not in same directory as ircd itself. - */ +@@ -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"; -+ #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 - -@@ -1009,8 +1009,9 @@ + * EGD is *very* CPU intensive when gathering data for its pool +@@ -1025,8 +1018,9 @@ /* module path: paths to search for modules specified below and * in /modload. */ diff -ruN ircd-ratbox-devel.orig/files/patch-include_config.h ircd-ratbox-devel/files/patch-include_config.h --- ircd-ratbox-devel.orig/files/patch-include_config.h 2008-08-21 00:11:24.000000000 +0100 +++ ircd-ratbox-devel/files/patch-include_config.h 2008-08-21 00:31:16.000000000 +0100 @@ -1,15 +1,18 @@ ---- ./include/config.h.orig 2008-06-09 19:32:50.000000000 +0100 -+++ ./include/config.h 2008-06-29 14:51:42.000000000 +0100 -@@ -54,15 +54,17 @@ +--- ./include/config.h.orig 2008-08-17 14:16:36.000000000 +0100 ++++ ./include/config.h 2008-08-21 00:30:16.000000000 +0100 +@@ -52,16 +52,18 @@ + #define AUTOMODPATH MODULE_DIR "/autoload/" + #define ETCPATH ETC_DIR #define LOGPATH LOG_DIR - #define UHPATH HELP_DIR "/users" - #define HPATH HELP_DIR "/opers" +-#define UHPATH HELP_DIR "/users" +-#define HPATH HELP_DIR "/opers" ++#define UHPATH HELP_DIR "/users" ++#define HPATH HELP_DIR "/opers" +#define RUNPATH "%%RUNDIR%%" -+#define DBPTH "%%DBDIR%%" ++#define DBPTH "%%DBDIR%%" /* files */ #define SPATH BINPATH "/ircd" /* ircd executable */ - #define SLPATH BINPATH "/servlink" /* servlink executable */ #define CPATH ETCPATH "/ircd.conf" /* ircd.conf file */ -#define DBPATH ETCPATH "/ban.db" +#define DBPATH DBPTH "/ban.db" --- ircd-ratbox-devel-3.0.0beta11.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: