Attachment #91523 for bug #128890

View | Details | Raw Unified | Return to bug 128890
Collapse All | Expand All




# ex: ts=8

PORTNAME=	ircd-ratbox
PORTVERSION=	3.0.0
DISTVERSION=	3.0.0rc3
CATEGORIES=	irc ipv6
MASTER_SITES=	ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/	\
		ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/	\

CONFIGURE_ARGS+=	--disable-openssl
.endif

.if defined(WITHOUT_IPV6)
CONFIGURE_ARGS+=	--disable-ipv6
.endif

.if defined(WITHOUT_ZIPLINKS)


pre-build:
	@${REINPLACE_CMD} -e "s#-O2##" ${WRKSRC}/configure
	@${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	\

Lines 1-3 Link Here

(-)ircd-ratbox-devel/distinfo (-3 / +3 lines)
1	MD5 (ircd-ratbox-3.0.0rc3.tar.bz2) = 9d430b0e66ee55435c1d76772d712fb0	1	MD5 (ircd-ratbox-3.0.0.tar.bz2) = 3bab4271c6b6dd197202b6ac52f805a4
2	SHA256 (ircd-ratbox-3.0.0rc3.tar.bz2) = 625479614d3bdfbf5c20125e82efdc3172ff8cdb34b345dbb36ec84111803f91	2	SHA256 (ircd-ratbox-3.0.0.tar.bz2) = 1f754c71fc7a519d70a664096ec5e8b5dd991d714a7ff8476b1b5a3c104a0f9e
3	SIZE (ircd-ratbox-3.0.0rc3.tar.bz2) = 1950606	3	SIZE (ircd-ratbox-3.0.0.tar.bz2) = 1956342




--- ./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)
 	{

Lines 1-5 Link Here

(-)ircd-ratbox-devel/files/patch-contrib_ircd-shortcut.pl (-2 / +2 lines)
1	--- ./contrib/ircd-shortcut.pl.orig 2008-06-29 14:05:58.000000000 +0100	1	--- ./contrib/ircd-shortcut.pl.orig 2008-04-24 16:43:42.000000000 +0100
2	+++ ./contrib/ircd-shortcut.pl 2008-06-29 14:07:11.000000000 +0100	2	+++ ./contrib/ircd-shortcut.pl 2008-11-15 02:55:35.000000000 +0000
3	@@ -36,7 +36,7 @@	3	@@ -36,7 +36,7 @@
4	######################################	4	######################################
5		5

Lines 1-5 Link Here

(-)ircd-ratbox-devel/files/patch-doc_Makefile.in (-1 / +1 lines)
1	--- ./doc/Makefile.in.orig 2008-04-23 20:59:46.000000000 +0100	1	--- ./doc/Makefile.in.orig 2008-04-23 20:59:46.000000000 +0100
2	+++ ./doc/Makefile.in 2008-06-29 14:29:39.000000000 +0100	2	+++ ./doc/Makefile.in 2008-11-15 02:55:35.000000000 +0000
3	@@ -43,24 +43,6 @@	3	@@ -43,24 +43,6 @@
4	fi	4	fi
5		5

Lines 1-5 Link Here

(-)ircd-ratbox-devel/files/patch-doc_example.conf (-4 / +4 lines)
1	--- ./doc/example.conf.orig 2008-08-17 14:16:36.000000000 +0100	1	--- ./doc/example.conf.orig 2008-11-14 16:37:10.000000000 +0000
2	+++ ./doc/example.conf 2008-08-21 00:15:05.000000000 +0100	2	+++ ./doc/example.conf 2008-11-15 02:55:35.000000000 +0000
3	@@ -98,13 +98,13 @@	3	@@ -98,13 +98,13 @@
4	default_max_clients = 10000;	4	default_max_clients = 10000;
5		5
Lines 44-50 Link Here
44	};	44	};
45		45
46	/* class {}: contain information about classes for users (OLD Y:) */	46	/* class {}: contain information about classes for users (OLD Y:) */
47	@@ -347,7 +347,7 @@	47	@@ -349,7 +349,7 @@
48	* A password should not be defined when this is used, see	48	* A password should not be defined when this is used, see
49	* doc/challenge.txt for more information.	49	* doc/challenge.txt for more information.
50	*/	50	*/
Lines 53-59 Link Here
53		53
54	/* umodes: the specific umodes this oper gets when they oper.	54	/* umodes: the specific umodes this oper gets when they oper.
55	* If this is specified an oper will not be given oper_umodes	55	* If this is specified an oper will not be given oper_umodes
56	@@ -1003,8 +1003,9 @@	56	@@ -1013,8 +1013,9 @@
57	/* module path: paths to search for modules specified below and	57	/* module path: paths to search for modules specified below and
58	* in /modload.	58	* in /modload.
59	*/	59	*/

Lines 1-5 Link Here

(-)ircd-ratbox-devel/files/patch-doc_example.efnet.conf (-3 / +3 lines)
1	--- ./doc/example.efnet.conf.orig 2008-08-23 23:05:37.000000000 +0100	1	--- ./doc/example.efnet.conf.orig 2008-09-22 19:38:10.000000000 +0100
2	+++ ./doc/example.efnet.conf 2008-09-05 21:00:26.000000000 +0100	2	+++ ./doc/example.efnet.conf 2008-11-15 02:55:35.000000000 +0000
3	@@ -60,7 +60,7 @@	3	@@ -60,7 +60,7 @@
4	/* description: the description of our server. '[' and ']' may not	4	/* description: the description of our server. '[' and ']' may not
5	* be used here for compatibility with older servers.	5	* be used here for compatibility with older servers.
Lines 62-68 Link Here
62		62
63	/* umodes: the specific umodes this oper gets when they oper.	63	/* umodes: the specific umodes this oper gets when they oper.
64	* If this is specified an oper will not be given oper_umodes	64	* If this is specified an oper will not be given oper_umodes
65	@@ -1022,8 +1022,9 @@	65	@@ -1027,8 +1027,9 @@
66	/* module path: paths to search for modules specified below and	66	/* module path: paths to search for modules specified below and
67	* in /modload.	67	* in /modload.
68	*/	68	*/

Lines 1-8 Link Here

(-)ircd-ratbox-devel/files/patch-include_config.h (-3 / +3 lines)
1	--- ./include/config.h.orig 2008-08-17 14:16:36.000000000 +0100	1	--- ./include/config.h.orig 2008-09-19 16:33:46.000000000 +0100
2	+++ ./include/config.h 2008-08-21 00:30:16.000000000 +0100	2	+++ ./include/config.h 2008-11-15 02:55:35.000000000 +0000
3	@@ -52,16 +52,18 @@	3	@@ -52,16 +52,18 @@
4	#define AUTOMODPATH MODULE_DIR "/autoload/"	4	#define AUTOMODPATH MODULE_DIR "/autoload/"
5	#define ETCPATH ETC_DIR	5	#define ETCPATH ETC_DIR
6	#define LOGPATH LOG_DIR	6	#define LOGPATH LOG_DIR
7	-#define UHPATH HELP_DIR "/users"	7	-#define UHPATH HELP_DIR "/users"
8	-#define HPATH HELP_DIR "/opers"	8	-#define HPATH HELP_DIR "/opers"

Lines 17-27 Link Here

(-)ircd-ratbox-devel/files/pkg-message.in (-5 / +3 lines)
17		17
18	%%PREFIX%%/etc/rc.d/ircd-ratbox conftest	18	%%PREFIX%%/etc/rc.d/ircd-ratbox conftest
19		19
20	An update of the ban.db database will be necessary if upgrading from a	20	The ban.db database can be checked and updated using 'bantool -u'.
21	pre-beta5 release. Those upgrading from 3.0.0-beta5 or later, to this	21	For safety, updates should be done while no ircd is running and before
22	version, should be able to omit this step. Though it doesn't do any harm to	22	starting the new version.
23	check anyway. Database updates must be performed using 'bantool -u' while
24	no ircd is running and before starting the newer version.
25		23
26	%%PREFIX%%/bin/bantool -u	24	%%PREFIX%%/bin/bantool -u

Return to bug 128890

Lines 7-14 Link Here

(-)ircd-ratbox-devel/Makefile (-6 / +5 lines)
7	# ex: ts=8	7	# ex: ts=8
8		8
9	PORTNAME= ircd-ratbox	9	PORTNAME= ircd-ratbox
10	#PORTVERSION= 3.0.0	10	PORTVERSION= 3.0.0
11	DISTVERSION= 3.0.0rc3
12	CATEGORIES= irc ipv6	11	CATEGORIES= irc ipv6
13	MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/ \	12	MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/ \
14	ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/ \	13	ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/ \
Lines 68-75 Link Here
68	CONFIGURE_ARGS+= --disable-openssl	67	CONFIGURE_ARGS+= --disable-openssl
69	.endif	68	.endif
70		69
71	.if !defined(WITHOUT_IPV6)	70	.if defined(WITHOUT_IPV6)
72	CONFIGURE_ARGS+= --enable-ipv6	71	CONFIGURE_ARGS+= --disable-ipv6
73	.endif	72	.endif
74		73
75	.if defined(WITHOUT_ZIPLINKS)	74	.if defined(WITHOUT_ZIPLINKS)
Lines 122-129 Link Here
122		121
123	pre-build:	122	pre-build:
124	@${REINPLACE_CMD} -e "s#-O2##" ${WRKSRC}/configure	123	@${REINPLACE_CMD} -e "s#-O2##" ${WRKSRC}/configure
125	@${REINPLACE_CMD} -e "s#%%PREFIX%%#${PREFIX}#g" \	124	@${REINPLACE_CMD} -e "s#%%PREFIX%%#${PREFIX}#g" \
126	${WRKSRC}/doc/example.conf \	125	${WRKSRC}/doc/example.conf \
127	${WRKSRC}/doc/example.efnet.conf	126	${WRKSRC}/doc/example.efnet.conf
128	@${REINPLACE_CMD} -e "s#%%LOGDIR%%#${LOGDIR}#g" \	127	@${REINPLACE_CMD} -e "s#%%LOGDIR%%#${LOGDIR}#g" \
129	${WRKSRC}/doc/example.conf \	128	${WRKSRC}/doc/example.conf \

Line 0 Link Here

(-)ircd-ratbox-devel/files/patch-bandb_rsdb_sqlite3.c (+24 lines)
	1	--- ./bandb/rsdb_sqlite3.c.orig 2008-11-15 02:59:20.000000000 +0000
	2	+++ ./bandb/rsdb_sqlite3.c 2008-11-15 02:59:59.000000000 +0000
	3	@@ -58,18 +58,13 @@
	4	int
	5	rsdb_init(rsdb_error_cb * ecb)
	6	{
	7	- const char *bandb_dpath;
	8	char dbpath[PATH_MAX];
	9	char errbuf[128];
	10	error_cb = ecb;
	11
	12	- /* try a path from the environment first, useful for basedir overrides */
	13	- bandb_dpath = getenv("BANDB_DPATH");
	14	-
	15	- if(bandb_dpath != NULL)
	16	- rb_snprintf(dbpath, sizeof(dbpath), "%s/etc/ban.db", bandb_dpath);
	17	- else
	18	- rb_strlcpy(dbpath, DBPATH, sizeof(dbpath));
	19	+ /* remove the getenv checks and just use the DBPATH value so bandb
	20	+ gets the right value for fbsd ban.db locateion. */
	21	+ rb_strlcpy(dbpath, DBPATH, sizeof(dbpath));
	22
	23	if(sqlite3_open(dbpath, &rb_bandb) != SQLITE_OK)
	24	{