Date: Tue, 22 Jul 2008 14:10:52 +0100 (BST) From: Lewis <moggie@elasticmind.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/125868: [maintainer-update|patch] irc/ircd-ratbox-devel: update to ratbox-3 beta8 Message-ID: <200807221310.m6MDAqoZ008933@ewok.elasticmind.net> Resent-Message-ID: <200807221330.m6MDU1xw005556@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 125868 >Category: ports >Synopsis: [maintainer-update|patch] irc/ircd-ratbox-devel: update to ratbox-3 beta8 >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: Tue Jul 22 13:30:00 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 Port build tested on tinderbox: 7-STABLE, 6-STABLE, 8, 7.0, 6.3 >Description: Updated ircd-ratbox-devel port to latest beta8 testing release of ircd-ratbox-3.0.0. Port changes: o Example EFnet configuration file updated for ratbox-3 and re-included in the port install. Software changes include: o Some cleanups in the checksplit code. o Some cleanups in the /trace code. o Show reasons for failed outbound SSL handshakes to opers. o Log SSL errors for servers and handshakes in serverlog. o Make sqlite3 checking more robust. o Change the resolver to use the code from charybdis instead of adns. o Fix identd checking so it is no longer broken as in beta7. o Fix a bug where the ircd could stop reading from the client on the CAP command. o Add some functions for random number generation for the nossl case in libratbox. >How-To-Repeat: >Fix: --- ircd-ratbox-devel-3.0.0beta8.diff begins here --- diff -ruN ircd-ratbox-devel.orig/Makefile ircd-ratbox-devel/Makefile --- ircd-ratbox-devel.orig/Makefile 2008-07-19 21:21:46.000000000 +0100 +++ ircd-ratbox-devel/Makefile 2008-07-19 20:40:40.000000000 +0100 @@ -8,7 +8,7 @@ PORTNAME= ircd-ratbox #PORTVERSION= 3.0.0 -DISTVERSION= 3.0.0beta7 +DISTVERSION= 3.0.0beta8 CATEGORIES= irc ipv6 MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/ \ ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/ \ @@ -204,7 +204,7 @@ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install ${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${PREFIX}/etc/${PORTNAME}/ircd.motd.sample ${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${PREFIX}/etc/${PORTNAME}/ircd.conf.sample -# ${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${PREFIX}/etc/${PORTNAME}/ircd-efnet.conf.sample + ${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${PREFIX}/etc/${PORTNAME}/ircd-efnet.conf.sample ${INSTALL_DATA} ${WRKSRC}/doc/genssl.sh ${PREFIX}/etc/${PORTNAME}/genssl.sh # ----- We need to install the shortcut.pl module ---- diff -ruN ircd-ratbox-devel.orig/distinfo ircd-ratbox-devel/distinfo --- ircd-ratbox-devel.orig/distinfo 2008-07-19 21:21:46.000000000 +0100 +++ ircd-ratbox-devel/distinfo 2008-07-19 20:36:41.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (ircd-ratbox-3.0.0beta7.tar.bz2) = 7fd345c89c17c078dcbc2258a3a78710 -SHA256 (ircd-ratbox-3.0.0beta7.tar.bz2) = 5791ea30da68c4401f1427888e112679b5a96ac21654e9f1649f4ba79f19c455 -SIZE (ircd-ratbox-3.0.0beta7.tar.bz2) = 1982786 +MD5 (ircd-ratbox-3.0.0beta8.tar.bz2) = e13346ee8d8fbce452f100c271d22bc4 +SHA256 (ircd-ratbox-3.0.0beta8.tar.bz2) = dbbfda934b67cc8ebd6a9e0c363567d3d3a512b88513ae2f277e6f99c4e263bf +SIZE (ircd-ratbox-3.0.0beta8.tar.bz2) = 1939368 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-07-19 21:21:46.000000000 +0100 +++ ircd-ratbox-devel/files/patch-doc_example.efnet.conf 2008-07-22 13:53:48.000000000 +0100 @@ -0,0 +1,85 @@ +--- example.efnet.conf.orig 2008-07-22 13:32:47.000000000 +0100 ++++ example.efnet.conf 2008-07-22 13:53:46.000000000 +0100 +@@ -60,7 +60,7 @@ + /* description: the description of our server. '[' and ']' may not + * be used here for compatibility with older servers. + */ +- description = "ircd-ratbox EFNet server"; ++ description = "ircd-ratbox EFNet testing server"; + + /* 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 @@ + 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 cpu/cpu cores you have might be useful +@@ -130,16 +130,16 @@ + * - operspylog: operspy usage + * - ioerrorlog: IO errors + */ +- fname_userlog = "logs/userlog"; +- #fname_fuserlog = "logs/fuserlog"; +- fname_operlog = "logs/operlog"; +- #fname_foperlog = "logs/foperlog"; +- fname_serverlog = "logs/serverlog"; +- fname_glinelog = "logs/glinelog"; +- #fname_klinelog = "logs/klinelog"; +- fname_killlog = "logs/killlog"; +- fname_operspylog = "logs/operspylog"; +- #fname_ioerrorlog = "logs/ioerror"; ++ fname_userlog = "%%LOGDIR%%/userlog"; ++ #fname_fuserlog = "%%LOGDIR%%/fuserlog"; ++ fname_operlog = "%%LOGDIR%%/operlog"; ++ #fname_foperlog = "%%LOGDIR%%/foperlog"; ++ fname_serverlog = "%%LOGDIR%%/serverlog"; ++ fname_glinelog = "%%LOGDIR%%/glinelog"; ++ #fname_klinelog = "%%LOGDIR%%/klinelog"; ++ fname_killlog = "%%LOGDIR%%/killlog"; ++ fname_operspylog = "%%LOGDIR%%/operspylog"; ++ #fname_ioerrorlog = "%%LOGDIR%%/ioerror"; + }; + + /* class {}: contain information about classes for users (OLD Y:) */ +@@ -335,7 +335,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"; ++ #rsa_public_key_file = "%%PREFIX%%/etc/ircd-ratbox/oper.pub"; + + /* 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. + */ +- #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 @@ + /* 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"; + + /* module: the name of a module to load on startup/rehash */ + #module = "some_module.so"; diff -ruN ircd-ratbox-devel.orig/pkg-plist ircd-ratbox-devel/pkg-plist --- ircd-ratbox-devel.orig/pkg-plist 2008-07-19 21:21:46.000000000 +0100 +++ ircd-ratbox-devel/pkg-plist 2008-07-19 20:42:52.000000000 +0100 @@ -237,6 +237,7 @@ @dirrm %%DATADIR%%/help @dirrm %%DATADIR%% etc/ircd-ratbox/genssl.sh +etc/ircd-ratbox/ircd-efnet.conf.sample @unexec if cmp -s %D/etc/ircd-ratbox/ircd.conf.sample %D/etc/ircd-ratbox/ircd.conf; then rm -f %D/etc/ircd-ratbox/ircd.conf; fi etc/ircd-ratbox/ircd.conf.sample @exec if [ ! -f %D/etc/ircd-ratbox/ircd.conf ] ; then cp -p %D/%F %B/ircd.conf; fi --- ircd-ratbox-devel-3.0.0beta8.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?200807221310.m6MDAqoZ008933>