Date: Thu, 18 Dec 2008 01:27:56 +0000 (GMT) From: Lewis <moggie@elasticmind.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/129725: [maintainer-update|patch] irc/ircd-ratbox-devel: Update to ratbox-3.0.1 Message-ID: <20081218012756.4E7AE26D168@mail.elasticmind.net> Resent-Message-ID: <200812180130.mBI1U1Rf084114@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129725 >Category: ports >Synopsis: [maintainer-update|patch] irc/ircd-ratbox-devel: Update to ratbox-3.0.1 >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 Dec 18 01:30:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Lewis >Release: FreeBSD 6.4-RELEASE amd64 >Organization: >Environment: System: FreeBSD 6.4-RELEASE FreeBSD 6.4-RELEASE #0: Fri Dec 5 00:14:33 GMT 2008 amd64 Port build tested on tinderbox: 7-STABLE, 6-STABLE, 8-CURRENT, 7.0, 6.3, 6.4 >Description: Updated ircd-ratbox-devel port to official testing release of ircd-ratbox-3.0.1. Port changes: o Removed patch on 'rsdb_sqlite3.c' that fixed ban.db path code in previous release. Software changes included in this release: o Call rb_helper_close on bandb errors to kill off old bandb processes. o Report correct files/line numbers for spoof warnings. o SID in the serverinfo struct should be 4 bytes, not 3. o Rebuild the included ircd_lexer.c. o Fix ports and /dev/poll for solaris. o Report libratbox version on -version and /info. o libratbox version info includes SSL info. o Fix installing when using install-sh. o Re-enable ziplinks + SSL server connections. o Fix a gnutls related core dump. o Add support for a serverinfo::bandb setting in ircd.conf for the ban database. o Report adding throttles when an oper is set umode +r. o Report throttle stats in /stats T. >How-To-Repeat: >Fix: --- ircd-ratbox-devel-3.0.1.diff begins here --- diff -ruN ircd-ratbox-devel.orig/Makefile ircd-ratbox-devel/Makefile --- ircd-ratbox-devel.orig/Makefile 2008-12-17 12:10:47.000000000 +0000 +++ ircd-ratbox-devel/Makefile 2008-12-17 14:29:14.000000000 +0000 @@ -7,7 +7,7 @@ # ex: ts=8 PORTNAME= ircd-ratbox -PORTVERSION= 3.0.0 +PORTVERSION= 3.0.1 CATEGORIES= irc ipv6 MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/ \ ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/ \ @@ -127,6 +127,9 @@ @${REINPLACE_CMD} -e "s#%%LOGDIR%%#${LOGDIR}#g" \ ${WRKSRC}/doc/example.conf \ ${WRKSRC}/doc/example.efnet.conf + @${REINPLACE_CMD} -e "s#%%DBDIR%%#${DBDIR}#g" \ + ${WRKSRC}/doc/example.conf \ + ${WRKSRC}/doc/example.efnet.conf @${REINPLACE_CMD} -e "s#%%RUNDIR%%#${RUNDIR}#g" ${WRKSRC}/include/config.h @${REINPLACE_CMD} -e "s#%%DBDIR%%#${DBDIR}#g" ${WRKSRC}/include/config.h @${REINPLACE_CMD} -e "s#%%WRKSRC%%#${WRKSRC}#g" ${WRKSRC}/contrib/ircd-shortcut.pl diff -ruN ircd-ratbox-devel.orig/distinfo ircd-ratbox-devel/distinfo --- ircd-ratbox-devel.orig/distinfo 2008-12-17 12:10:47.000000000 +0000 +++ ircd-ratbox-devel/distinfo 2008-12-17 12:20:00.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (ircd-ratbox-3.0.0.tar.bz2) = 3bab4271c6b6dd197202b6ac52f805a4 -SHA256 (ircd-ratbox-3.0.0.tar.bz2) = 1f754c71fc7a519d70a664096ec5e8b5dd991d714a7ff8476b1b5a3c104a0f9e -SIZE (ircd-ratbox-3.0.0.tar.bz2) = 1956342 +MD5 (ircd-ratbox-3.0.1.tar.bz2) = e866c51270f77ef7906b7437eb234a34 +SHA256 (ircd-ratbox-3.0.1.tar.bz2) = 6e7102d6e1b4a6363bb28feb0cf25784cfe722de089a3f8ac1047a4c0e9e4c95 +SIZE (ircd-ratbox-3.0.1.tar.bz2) = 1958864 diff -ruN ircd-ratbox-devel.orig/files/patch-bandb_rsdb_sqlite3.c ircd-ratbox-devel/files/patch-bandb_rsdb_sqlite3.c --- ircd-ratbox-devel.orig/files/patch-bandb_rsdb_sqlite3.c 2008-12-17 12:10:47.000000000 +0000 +++ ircd-ratbox-devel/files/patch-bandb_rsdb_sqlite3.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ ---- ./bandb/rsdb_sqlite3.c.orig 2008-11-15 02:59:20.000000000 +0000 -+++ ./bandb/rsdb_sqlite3.c 2008-11-15 02:59:59.000000000 +0000 -@@ -58,18 +58,13 @@ - int - rsdb_init(rsdb_error_cb * ecb) - { -- const char *bandb_dpath; - char dbpath[PATH_MAX]; - char errbuf[128]; - error_cb = ecb; - -- /* try a path from the environment first, useful for basedir overrides */ -- bandb_dpath = getenv("BANDB_DPATH"); -- -- if(bandb_dpath != NULL) -- rb_snprintf(dbpath, sizeof(dbpath), "%s/etc/ban.db", bandb_dpath); -- else -- rb_strlcpy(dbpath, DBPATH, sizeof(dbpath)); -+ /* remove the getenv checks and just use the DBPATH value so bandb -+ gets the right value for fbsd ban.db locateion. */ -+ rb_strlcpy(dbpath, DBPATH, sizeof(dbpath)); - - if(sqlite3_open(dbpath, &rb_bandb) != SQLITE_OK) - { 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-12-17 12:10:47.000000000 +0000 +++ ircd-ratbox-devel/files/patch-doc_example.conf 2008-12-17 12:55:02.000000000 +0000 @@ -1,5 +1,5 @@ ---- ./doc/example.conf.orig 2008-11-14 16:37:10.000000000 +0000 -+++ ./doc/example.conf 2008-11-15 02:55:35.000000000 +0000 +--- ./doc/example.conf.orig 2008-12-16 03:08:43.000000000 +0000 ++++ ./doc/example.conf 2008-12-17 12:52:47.000000000 +0000 @@ -98,13 +98,13 @@ default_max_clients = 10000; @@ -17,7 +17,16 @@ /* 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 -@@ -137,16 +137,16 @@ +@@ -112,7 +112,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:) */ +@@ -139,16 +139,16 @@ * - operspylog: operspy usage * - ioerrorlog: IO errors */ @@ -44,7 +53,7 @@ }; /* class {}: contain information about classes for users (OLD Y:) */ -@@ -349,7 +349,7 @@ +@@ -351,7 +351,7 @@ * A password should not be defined when this is used, see * doc/challenge.txt for more information. */ @@ -53,7 +62,7 @@ /* umodes: the specific umodes this oper gets when they oper. * If this is specified an oper will not be given oper_umodes -@@ -1013,8 +1013,9 @@ +@@ -1015,8 +1015,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-12-17 12:10:47.000000000 +0000 +++ ircd-ratbox-devel/files/patch-doc_example.efnet.conf 2008-12-17 12:55:12.000000000 +0000 @@ -1,5 +1,5 @@ ---- ./doc/example.efnet.conf.orig 2008-09-22 19:38:10.000000000 +0100 -+++ ./doc/example.efnet.conf 2008-11-15 02:55:35.000000000 +0000 +--- ./doc/example.efnet.conf.orig 2008-12-16 03:08:43.000000000 +0000 ++++ ./doc/example.efnet.conf 2008-12-17 12:53:08.000000000 +0000 @@ -60,7 +60,7 @@ /* description: the description of our server. '[' and ']' may not * be used here for compatibility with older servers. @@ -26,7 +26,16 @@ /* 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 -@@ -140,16 +140,16 @@ +@@ -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 */ @@ -53,7 +62,7 @@ }; /* class {}: contain information about classes for users (OLD Y:) */ -@@ -353,7 +353,7 @@ +@@ -355,7 +355,7 @@ * A password should not be defined when this is used, see * doc/challenge.txt for more information. */ @@ -62,7 +71,7 @@ /* umodes: the specific umodes this oper gets when they oper. * If this is specified an oper will not be given oper_umodes -@@ -1027,8 +1027,9 @@ +@@ -1029,8 +1029,9 @@ /* module path: paths to search for modules specified below and * in /modload. */ diff -ruN ircd-ratbox-devel.orig/files/pkg-message.in ircd-ratbox-devel/files/pkg-message.in --- ircd-ratbox-devel.orig/files/pkg-message.in 2008-12-17 12:10:47.000000000 +0000 +++ ircd-ratbox-devel/files/pkg-message.in 2008-12-17 13:19:19.000000000 +0000 @@ -23,9 +23,9 @@ %%PREFIX%%/bin/bantool -u -Note that the ssl_only_channel configure option has been removed and is -now available as a setting in the channel section of the ircd -configuration file. +Note that the ssl_only_channel compile option has been removed, and +should be added as a configuration setting (use_sslonly) in the +ircd.conf file in order to activate the +S channel mode. Be sure to check out 'ratbox-services' if you need a services package. ------------------------------------------------------------------------ --- ircd-ratbox-devel-3.0.1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20081218012756.4E7AE26D168>