Attachment #123559 for bug #166914




# ex: ts=8

PORTNAME=	ircd-ratbox
PORTVERSION=	3.0.7
CATEGORIES=	irc ipv6
MASTER_SITES=	http://www.ratbox.org/download/				\
		ftp://ftp.parodius.com/pub/ircd-ratbox/			\
		http://www.ratbox.org/download/old/
		ftp://ftp.parodius.com/pub/ircd-ratbox/testing/old/	\
		http://www.ircd-ratbox.org/download/testing/old/
PKGNAMESUFFIX=	-devel

MAINTAINER=	moggie@elasticmind.net
COMMENT=	Advanced, stable IRC daemon, used widely on EFnet ('testing' release)

LICENSE=	GPLv2

CONFLICTS=	ircd-ratbox-[0-9]*

USE_BZIP2=	yes

Lines 1-2 Link Here

(-)ircd-ratbox-devel/distinfo (-2 / +2 lines)
1	SHA256 (ircd-ratbox-3.0.6.tar.bz2) = 3acef6a692678d287033c9c7ba3e8d2f4c163d044f3b9859628e55041cb54b74	1	SHA256 (ircd-ratbox-3.0.7.tar.bz2) = 71626a0eadc41822afb93a7abb374e38ec425129df6a20ee2fc431df0e5c4f6e
2	SIZE (ircd-ratbox-3.0.6.tar.bz2) = 1977354	2	SIZE (ircd-ratbox-3.0.7.tar.bz2) = 2379425




--- ./doc/example.conf.orig	2012-04-13 14:54:05.000000000 +0100
+++ ./doc/example.conf	2012-04-13 14:59:46.000000000 +0100
@@ -98,13 +98,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
@@ -115,7 +115,7 @@
 	ssld_count = 1;
 
 	/* bandb: path to the ban database - default is PREFIX/etc/ban.db */
-	bandb = "etc/ban.db";

 };
 
 /* admin {}: contains admin information about the server. (OLD A:) */
@@ -142,16 +142,16 @@
 	 * - operspylog: operspy usage
 	 * - ioerrorlog: IO errors
 	 */

 };
 
 /* class {}: contain information about classes for users (OLD Y:) */
@@ -354,7 +354,7 @@
 	 * A password should not be defined when this is used, see 
 	 * doc/challenge.txt for more information.
 	 */

 
 	/* 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 @@
 	/* module path: paths to search for modules specified below and 
 	 * in /modload.
 	 */




--- ./doc/example.efnet.conf.orig	2012-04-13 14:59:57.000000000 +0100
+++ ./doc/example.efnet.conf	2012-04-13 15:02:33.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.
@@ -101,13 +101,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
@@ -118,7 +118,7 @@
 	ssld_count = 1;
 
 	/* bandb: path to the ban database - default is PREFIX/etc/ban.db */
-	bandb = "etc/ban.db";

 };
 
 /* admin {}: contains admin information about the server. (OLD A:) */
@@ -145,16 +145,16 @@
 	 * - operspylog: operspy usage
 	 * - ioerrorlog: IO errors
 	 */

 };
 
 /* class {}: contain information about classes for users (OLD Y:) */
@@ -357,7 +357,7 @@
 	 * A password should not be defined when this is used, see 
 	 * doc/challenge.txt for more information.
 	 */

 
 	/* umodes: the specific umodes this oper gets when they oper.
 	 * If this is specified an oper will not be given oper_umodes
@@ -1038,8 +1038,9 @@
 	/* module path: paths to search for modules specified below and 
 	 * in /modload.
 	 */




--- ./include/config.h.orig	2012-04-13 15:02:51.000000000 +0100
+++ ./include/config.h	2012-04-13 15:06:23.000000000 +0100
@@ -54,15 +54,17 @@
 #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 RUNPATH	"%%RUNDIR%%"
+#define DBPTH	"%%DBDIR%%"
 

+#define DBPATH   DBPTH "/ban.db"
 #define MPATH    ETCPATH "/ircd.motd"	/* MOTD file */
 #define LPATH    LOGPATH "/ircd.log"	/* ircd logfile */
 #define PPATH    ETCPATH "/ircd.pid"	/* pid file */
-#define OPATH    ETCPATH "/opers.motd"	/* oper MOTD file */
+#define OPATH    RUNPATH "/opers.motd"	/* oper MOTD file */
 
 /* HANGONGOODLINK and HANGONGOODLINK
  * Often net breaks for a short time and it's useful to try to

Lines 21-24 Link Here

(-)ircd-ratbox-devel/pkg-descr (-1 / +1 lines)
21	o New ssld and bandb processes for SSL connections and ban checking;	21	o New ssld and bandb processes for SSL connections and ban checking;
22	these allow ratbox-3 to make better use of multi-processor systems.	22	these allow ratbox-3 to make better use of multi-processor systems.
23		23
24	WWW: http://www.ircd-ratbox.org/	24	WWW: http://www.ratbox.org/

Lines 21-26 Link Here

(-)ircd-ratbox-devel/pkg-plist (+1 lines)
21	%%DATADIR%%/help/opers/error	21	%%DATADIR%%/help/opers/error
22	%%DATADIR%%/help/opers/etrace	22	%%DATADIR%%/help/opers/etrace
23	%%DATADIR%%/help/opers/gline	23	%%DATADIR%%/help/opers/gline
		24	%%DATADIR%%/help/opers/gungline
24	%%DATADIR%%/help/opers/help	25	%%DATADIR%%/help/opers/help
25	%%DATADIR%%/help/opers/index	26	%%DATADIR%%/help/opers/index
26	%%DATADIR%%/help/opers/info	27	%%DATADIR%%/help/opers/info

Return to bug 166914

Lines 7-24 Link Here

(-)ircd-ratbox-devel/Makefile (-6 / +6 lines)
7	# ex: ts=8	7	# ex: ts=8
8		8
9	PORTNAME= ircd-ratbox	9	PORTNAME= ircd-ratbox
10	PORTVERSION= 3.0.6	10	PORTVERSION= 3.0.7
11	CATEGORIES= irc ipv6	11	CATEGORIES= irc ipv6
12	MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/ \	12	MASTER_SITES= http://www.ratbox.org/download/ \
13	ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/ \	13	ftp://ftp.parodius.com/pub/ircd-ratbox/ \
14	http://www.ircd-ratbox.org/download/testing/ \	14	http://www.ratbox.org/download/old/
15	ftp://ftp.parodius.com/pub/ircd-ratbox/testing/old/ \
16	http://www.ircd-ratbox.org/download/testing/old/
17	PKGNAMESUFFIX= -devel	15	PKGNAMESUFFIX= -devel
18		16
19	MAINTAINER= moggie@elasticmind.net	17	MAINTAINER= moggie@elasticmind.net
20	COMMENT= Advanced, stable IRC daemon, used widely on EFnet ('testing' release)	18	COMMENT= Advanced, stable IRC daemon, used widely on EFnet ('testing' release)
21		19
		20	LICENSE= GPLv2
		21
22	CONFLICTS= ircd-ratbox-[0-9]*	22	CONFLICTS= ircd-ratbox-[0-9]*
23		23
24	USE_BZIP2= yes	24	USE_BZIP2= yes

Lines 1-24 Link Here

(-)ircd-ratbox-devel/files/patch-doc_example.conf (-15 / +15 lines)
1	--- ./doc/example.conf.orig 2008-12-16 03:08:43.000000000 +0000	1	--- ./doc/example.conf.orig 2012-04-13 14:54:05.000000000 +0100
2	+++ ./doc/example.conf 2008-12-17 12:52:47.000000000 +0000	2	+++ ./doc/example.conf 2012-04-13 14:59:46.000000000 +0100
3	@@ -98,13 +98,13 @@	3	@@ -98,13 +98,13 @@
4	default_max_clients = 10000;	4	default_max_clients = 10000;
5		5
6	/* ssl_private_key: our ssl private key */	6	/* ssl_private_key: our ssl private key */
7	- ssl_private_key = "etc/test.key";	7	- ssl_private_key = "etc/test.key";
8	+ ssl_private_key = "%%PREFIX%%/etc/ssl/test.key";	8	+ ssl_private_key = "%%PREFIX%%/etc/ssl/test.key";
9		9
10	/* ssl_cert: certificate for our ssl server */	10	/* ssl_cert: certificate for our ssl server */
11	- ssl_cert = "etc/test.cert";	11	- ssl_cert = "etc/test.cert";
12	+ ssl_cert = "%%PREFIX%%/etc/ssl/test.cert";	12	+ ssl_cert = "%%PREFIX%%/etc/ssl/test.cert";
13		13
14	/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */	14	/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */
15	- ssl_dh_params = "etc/dh.pem";	15	- ssl_dh_params = "etc/dh.pem";
16	+ ssl_dh_params = "%%PREFIX%%/etc/ssl/dh.pem";	16	+ ssl_dh_params = "%%PREFIX%%/etc/ssl/dh.pem";
17		17
18	/* ssld_count: number of ssld processes you want to start, if you have a really busy	18	/* ssld_count: number of ssld processes you want to start, if you
19	* server, using N-1 where N is the number of cpu/cpu cores you have might be useful	19	* have a really busy server, using N-1 where N is the number of
20	@@ -112,7 +112,7 @@	20	@@ -115,7 +115,7 @@
21	ssld_count = 1;	21	ssld_count = 1;
22		22
23	/* bandb: path to the ban database - default is PREFIX/etc/ban.db */	23	/* bandb: path to the ban database - default is PREFIX/etc/ban.db */
24	- bandb = "etc/ban.db";	24	- bandb = "etc/ban.db";
Lines 26-32 Link Here
26	};	26	};
27		27
28	/* admin {}: contains admin information about the server. (OLD A:) */	28	/* admin {}: contains admin information about the server. (OLD A:) */
29	@@ -139,16 +139,16 @@	29	@@ -142,16 +142,16 @@
30	* - operspylog: operspy usage	30	* - operspylog: operspy usage
31	* - ioerrorlog: IO errors	31	* - ioerrorlog: IO errors
32	*/	32	*/
Lines 53-59 Link Here
53	};	53	};
54		54
55	/* class {}: contain information about classes for users (OLD Y:) */	55	/* class {}: contain information about classes for users (OLD Y:) */
56	@@ -351,7 +351,7 @@	56	@@ -354,7 +354,7 @@
57	* A password should not be defined when this is used, see	57	* A password should not be defined when this is used, see
58	* doc/challenge.txt for more information.	58	* doc/challenge.txt for more information.
59	*/	59	*/
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	@@ -1015,8 +1015,9 @@	65	@@ -1022,8 +1022,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-33 Link Here

(-)ircd-ratbox-devel/files/patch-doc_example.efnet.conf (-24 / +15 lines)
1	--- ./doc/example.efnet.conf.orig 2008-12-16 03:08:43.000000000 +0000	1	--- ./doc/example.efnet.conf.orig 2012-04-13 14:59:57.000000000 +0100
2	+++ ./doc/example.efnet.conf 2008-12-17 12:53:08.000000000 +0000	2	+++ ./doc/example.efnet.conf 2012-04-13 15:02:33.000000000 +0100
3	@@ -60,7 +60,7 @@
4	/* description: the description of our server. '[' and ']' may not
5	* be used here for compatibility with older servers.
6	*/
7	- description = "ircd-ratbox EFNet server";
8	+ description = "ircd-ratbox EFNet testing server";
9
10	/* network info: the name and description of the network this server
11	* is on. Shown in the 005 reply and used with serverhiding.
12	@@ -101,13 +101,13 @@	3	@@ -101,13 +101,13 @@
13	default_max_clients = 10000;	4	default_max_clients = 10000;
14		5
15	/* ssl_private_key: our ssl private key */	6	/* ssl_private_key: our ssl private key */
16	- ssl_private_key = "etc/test.key";	7	- ssl_private_key = "etc/test.key";
17	+ ssl_private_key = "%%PREFIX%%/etc/ssl/test.key";	8	+ ssl_private_key = "%%PREFIX%%/etc/ssl/test.key";
18		9
19	/* ssl_cert: certificate for our ssl server */	10	/* ssl_cert: certificate for our ssl server */
20	- ssl_cert = "etc/test.cert";	11	- ssl_cert = "etc/test.cert";
21	+ ssl_cert = "%%PREFIX%%/etc/ssl/test.cert";	12	+ ssl_cert = "%%PREFIX%%/etc/ssl/test.cert";
22		13
23	/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */	14	/* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */
24	- ssl_dh_params = "etc/dh.pem";	15	- ssl_dh_params = "etc/dh.pem";
25	+ ssl_dh_params = "%%PREFIX%%/etc/ssl/dh.pem";	16	+ ssl_dh_params = "%%PREFIX%%/etc/ssl/dh.pem";
26		17
27	/* ssld_count: number of ssld processes you want to start, if you have a really busy	18	/* ssld_count: number of ssld processes you want to start, if you
28	* server, using N-1 where N is the number of cpu/cpu cores you have might be useful	19	* have a really busy server, using N-1 where N is the number of
29	@@ -115,7 +115,7 @@	20	@@ -118,7 +118,7 @@
30	ssld_count = 1;	21	ssld_count = 1;
31		22
32	/* bandb: path to the ban database - default is PREFIX/etc/ban.db */	23	/* bandb: path to the ban database - default is PREFIX/etc/ban.db */
33	- bandb = "etc/ban.db";	24	- bandb = "etc/ban.db";
Lines 35-41 Link Here
35	};	26	};
36		27
37	/* admin {}: contains admin information about the server. (OLD A:) */	28	/* admin {}: contains admin information about the server. (OLD A:) */
38	@@ -142,16 +142,16 @@	29	@@ -145,16 +145,16 @@
39	* - operspylog: operspy usage	30	* - operspylog: operspy usage
40	* - ioerrorlog: IO errors	31	* - ioerrorlog: IO errors
41	*/	32	*/
Lines 62-68 Link Here
62	};	53	};
63		54
64	/* class {}: contain information about classes for users (OLD Y:) */	55	/* class {}: contain information about classes for users (OLD Y:) */
65	@@ -355,7 +355,7 @@	56	@@ -357,7 +357,7 @@
66	* A password should not be defined when this is used, see	57	* A password should not be defined when this is used, see
67	* doc/challenge.txt for more information.	58	* doc/challenge.txt for more information.
68	*/	59	*/
Lines 71-77 Link Here
71		62
72	/* umodes: the specific umodes this oper gets when they oper.	63	/* umodes: the specific umodes this oper gets when they oper.
73	* 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
74	@@ -1029,8 +1029,9 @@	65	@@ -1038,8 +1038,9 @@
75	/* module path: paths to search for modules specified below and	66	/* module path: paths to search for modules specified below and
76	* in /modload.	67	* in /modload.
77	*/	68	*/

Lines 1-13 Link Here

(-)ircd-ratbox-devel/files/patch-include_config.h (-12 / +9 lines)
1	--- ./include/config.h.orig 2008-09-19 16:33:46.000000000 +0100	1	--- ./include/config.h.orig 2012-04-13 15:02:51.000000000 +0100
2	+++ ./include/config.h 2008-11-15 02:55:35.000000000 +0000	2	+++ ./include/config.h 2012-04-13 15:06:23.000000000 +0100
3	@@ -52,16 +52,18 @@	3	@@ -54,15 +54,17 @@
4	#define AUTOMODPATH MODULE_DIR "/autoload/"
5	#define ETCPATH ETC_DIR
6	#define LOGPATH LOG_DIR	4	#define LOGPATH LOG_DIR
7	-#define UHPATH HELP_DIR "/users"	5	#define UHPATH HELP_DIR "/users"
8	-#define HPATH HELP_DIR "/opers"	6	#define HPATH HELP_DIR "/opers"
9	+#define UHPATH HELP_DIR "/users"
10	+#define HPATH HELP_DIR "/opers"
11	+#define RUNPATH "%%RUNDIR%%"	7	+#define RUNPATH "%%RUNDIR%%"
12	+#define DBPTH "%%DBDIR%%"	8	+#define DBPTH "%%DBDIR%%"
13		9
Lines 18-25 Link Here
18	+#define DBPATH DBPTH "/ban.db"	14	+#define DBPATH DBPTH "/ban.db"
19	#define MPATH ETCPATH "/ircd.motd" /* MOTD file */	15	#define MPATH ETCPATH "/ircd.motd" /* MOTD file */
20	#define LPATH LOGPATH "/ircd.log" /* ircd logfile */	16	#define LPATH LOGPATH "/ircd.log" /* ircd logfile */
21	-#define PPATH ETCPATH "/ircd.pid" /* pid file */	17	#define PPATH ETCPATH "/ircd.pid" /* pid file */
22	+#define PPATH RUNPATH "/ircd.pid" /* pid file */	18	-#define OPATH ETCPATH "/opers.motd" /* oper MOTD file */
23	#define OPATH ETCPATH "/opers.motd" /* oper MOTD file */	19	+#define OPATH RUNPATH "/opers.motd" /* oper MOTD file */
24		20
25	/* HANGONGOODLINK and HANGONGOODLINK	21	/* HANGONGOODLINK and HANGONGOODLINK
		22	* Often net breaks for a short time and it's useful to try to