Attachment 91523 Details for Bug 128890 – ircd-ratbox-devel-3.0.0.diff

[patch] ircd-ratbox-devel-3.0.0.diff

ircd-ratbox-devel-3.0.0.diff (text/plain), 7.73 KB, created by moggie on 2008-11-15 16:50:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: moggie

Created: 2008-11-15 16:50:02 UTC

Size: 7.73 KB

patch

obsolete

>diff -ruN ircd-ratbox-devel.orig/Makefile ircd-ratbox-devel/Makefile
>--- ircd-ratbox-devel.orig/Makefile	2008-11-14 19:34:44.000000000 +0000
>+++ ircd-ratbox-devel/Makefile	2008-11-14 19:39:19.000000000 +0000
>@@ -7,8 +7,7 @@
> # ex: ts=8
> 
> PORTNAME=	ircd-ratbox
>-#PORTVERSION=	3.0.0
>-DISTVERSION=	3.0.0rc3
>+PORTVERSION=	3.0.0
> CATEGORIES=	irc ipv6
> MASTER_SITES=	ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/	\
> 		ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/	\
>@@ -68,8 +67,8 @@
> CONFIGURE_ARGS+=	--disable-openssl
> .endif
> 
>-.if !defined(WITHOUT_IPV6)
>-CONFIGURE_ARGS+=	--enable-ipv6
>+.if defined(WITHOUT_IPV6)
>+CONFIGURE_ARGS+=	--disable-ipv6
> .endif
> 
> .if defined(WITHOUT_ZIPLINKS)
>@@ -122,8 +121,8 @@
> 
> pre-build:
> 	@${REINPLACE_CMD} -e "s#-O2##" ${WRKSRC}/configure
>-	@${REINPLACE_CMD} -e "s#%%PREFIX%%#${PREFIX}#g"		  \
>-			  ${WRKSRC}/doc/example.conf		  \
>+	@${REINPLACE_CMD} -e "s#%%PREFIX%%#${PREFIX}#g"		\
>+			  ${WRKSRC}/doc/example.conf		\
> 			  ${WRKSRC}/doc/example.efnet.conf
> 	@${REINPLACE_CMD} -e "s#%%LOGDIR%%#${LOGDIR}#g"		\
> 				${WRKSRC}/doc/example.conf	\
>diff -ruN ircd-ratbox-devel.orig/distinfo ircd-ratbox-devel/distinfo
>--- ircd-ratbox-devel.orig/distinfo	2008-11-14 19:34:44.000000000 +0000
>+++ ircd-ratbox-devel/distinfo	2008-11-14 19:45:35.000000000 +0000
>@@ -1,3 +1,3 @@
>-MD5 (ircd-ratbox-3.0.0rc3.tar.bz2) = 9d430b0e66ee55435c1d76772d712fb0
>-SHA256 (ircd-ratbox-3.0.0rc3.tar.bz2) = 625479614d3bdfbf5c20125e82efdc3172ff8cdb34b345dbb36ec84111803f91
>-SIZE (ircd-ratbox-3.0.0rc3.tar.bz2) = 1950606
>+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
>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	1970-01-01 01:00:00.000000000 +0100
>+++ ircd-ratbox-devel/files/patch-bandb_rsdb_sqlite3.c	2008-11-15 03:00:57.000000000 +0000
>@@ -0,0 +1,24 @@
>+--- ./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-contrib_ircd-shortcut.pl ircd-ratbox-devel/files/patch-contrib_ircd-shortcut.pl
>--- ircd-ratbox-devel.orig/files/patch-contrib_ircd-shortcut.pl	2008-11-14 19:34:44.000000000 +0000
>+++ ircd-ratbox-devel/files/patch-contrib_ircd-shortcut.pl	2008-11-15 03:00:09.000000000 +0000
>@@ -1,5 +1,5 @@
>---- ./contrib/ircd-shortcut.pl.orig	2008-06-29 14:05:58.000000000 +0100
>-+++ ./contrib/ircd-shortcut.pl	2008-06-29 14:07:11.000000000 +0100
>+--- ./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 -ruN ircd-ratbox-devel.orig/files/patch-doc_Makefile.in ircd-ratbox-devel/files/patch-doc_Makefile.in
>--- ircd-ratbox-devel.orig/files/patch-doc_Makefile.in	2008-11-14 19:34:44.000000000 +0000
>+++ ircd-ratbox-devel/files/patch-doc_Makefile.in	2008-11-15 03:00:09.000000000 +0000
>@@ -1,5 +1,5 @@
> --- ./doc/Makefile.in.orig	2008-04-23 20:59:46.000000000 +0100
>-+++ ./doc/Makefile.in	2008-06-29 14:29:39.000000000 +0100
>++++ ./doc/Makefile.in	2008-11-15 02:55:35.000000000 +0000
> @@ -43,24 +43,6 @@
>  	fi
>  
>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-11-14 19:34:44.000000000 +0000
>+++ ircd-ratbox-devel/files/patch-doc_example.conf	2008-11-15 03:00:09.000000000 +0000
>@@ -1,5 +1,5 @@
>---- ./doc/example.conf.orig	2008-08-17 14:16:36.000000000 +0100
>-+++ ./doc/example.conf	2008-08-21 00:15:05.000000000 +0100
>+--- ./doc/example.conf.orig	2008-11-14 16:37:10.000000000 +0000
>++++ ./doc/example.conf	2008-11-15 02:55:35.000000000 +0000
> @@ -98,13 +98,13 @@
>  	default_max_clients = 10000;
>  
>@@ -44,7 +44,7 @@
>  };
>  
>  /* class {}: contain information about classes for users (OLD Y:) */
>-@@ -347,7 +347,7 @@
>+@@ -349,7 +349,7 @@
>  	 * A password should not be defined when this is used, see 
>  	 * doc/challenge.txt for more information.
>  	 */
>@@ -53,7 +53,7 @@
>  
>  	/* umodes: the specific umodes this oper gets when they oper.
>  	 * If this is specified an oper will not be given oper_umodes
>-@@ -1003,8 +1003,9 @@
>+@@ -1013,8 +1013,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-11-14 19:34:44.000000000 +0000
>+++ ircd-ratbox-devel/files/patch-doc_example.efnet.conf	2008-11-15 03:00:09.000000000 +0000
>@@ -1,5 +1,5 @@
>---- ./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
>+--- ./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
> @@ -60,7 +60,7 @@
>  	/* description: the description of our server.  '[' and ']' may not
>  	 * be used here for compatibility with older servers.
>@@ -62,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
>-@@ -1022,8 +1022,9 @@
>+@@ -1027,8 +1027,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-11-14 19:34:44.000000000 +0000
>+++ ircd-ratbox-devel/files/patch-include_config.h	2008-11-15 03:00:09.000000000 +0000
>@@ -1,8 +1,8 @@
>---- ./include/config.h.orig	2008-08-17 14:16:36.000000000 +0100
>-+++ ./include/config.h	2008-08-21 00:30:16.000000000 +0100
>+--- ./include/config.h.orig	2008-09-19 16:33:46.000000000 +0100
>++++ ./include/config.h	2008-11-15 02:55:35.000000000 +0000
> @@ -52,16 +52,18 @@
>  #define AUTOMODPATH MODULE_DIR "/autoload/"
>- #define ETCPATH ETC_DIR 
>+ #define ETCPATH ETC_DIR
>  #define LOGPATH LOG_DIR
> -#define UHPATH   HELP_DIR "/users"
> -#define HPATH  HELP_DIR "/opers"
>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-11-14 19:34:44.000000000 +0000
>+++ ircd-ratbox-devel/files/pkg-message.in	2008-11-14 20:16:10.000000000 +0000
>@@ -17,11 +17,9 @@
> 
> 	%%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 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.
>+The ban.db database can be checked and updated using 'bantool -u'.
>+For safety, updates should be done while no ircd is running and before
>+starting the new version.
> 
> 	%%PREFIX%%/bin/bantool -u

Actions: View | Diff

Attachments on bug 128890: 91523