ports/166914: [maintainer-update|patch] irc/ircd-ratbox-devel: Fix MASTER_SITES and update to ratbox-3.0.7
Moggie
moggie at elasticmind.net
Fri Apr 13 19:00:33 UTC 2012
The following reply was made to PR ports/166914; it has been noted by GNATS.
From: Moggie <moggie at elasticmind.net>
To: bug-followup at FreeBSD.org, moggie at elasticmind.net
Cc:
Subject: Re: ports/166914: [maintainer-update|patch] irc/ircd-ratbox-devel:
Fix MASTER_SITES and update to ratbox-3.0.7
Date: Fri, 13 Apr 2012 19:56:33 +0100
This is a multi-part message in MIME format.
--------------000509070002070001000308
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Updated patch to include pkg-descr change.
--------------000509070002070001000308
Content-Type: text/plain;
name="ircd-ratbox-devel-3.0.7.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="ircd-ratbox-devel-3.0.7.diff"
diff -ruN ircd-ratbox-devel.orig/Makefile ircd-ratbox-devel/Makefile
--- ircd-ratbox-devel.orig/Makefile 2012-04-12 20:20:52.000000000 +0100
+++ ircd-ratbox-devel/Makefile 2012-04-13 15:12:54.000000000 +0100
@@ -7,18 +7,18 @@
# ex: ts=8
PORTNAME= ircd-ratbox
-PORTVERSION= 3.0.6
+PORTVERSION= 3.0.7
CATEGORIES= irc ipv6
-MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/ \
- ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/ \
- http://www.ircd-ratbox.org/download/testing/ \
- ftp://ftp.parodius.com/pub/ircd-ratbox/testing/old/ \
- http://www.ircd-ratbox.org/download/testing/old/
+MASTER_SITES= http://www.ratbox.org/download/ \
+ ftp://ftp.parodius.com/pub/ircd-ratbox/ \
+ http://www.ratbox.org/download/old/
PKGNAMESUFFIX= -devel
MAINTAINER= moggie at elasticmind.net
COMMENT= Advanced, stable IRC daemon, used widely on EFnet ('testing' release)
+LICENSE= GPLv2
+
CONFLICTS= ircd-ratbox-[0-9]*
USE_BZIP2= yes
diff -ruN ircd-ratbox-devel.orig/distinfo ircd-ratbox-devel/distinfo
--- ircd-ratbox-devel.orig/distinfo 2012-04-12 20:20:52.000000000 +0100
+++ ircd-ratbox-devel/distinfo 2012-04-12 20:40:24.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (ircd-ratbox-3.0.6.tar.bz2) = 3acef6a692678d287033c9c7ba3e8d2f4c163d044f3b9859628e55041cb54b74
-SIZE (ircd-ratbox-3.0.6.tar.bz2) = 1977354
+SHA256 (ircd-ratbox-3.0.7.tar.bz2) = 71626a0eadc41822afb93a7abb374e38ec425129df6a20ee2fc431df0e5c4f6e
+SIZE (ircd-ratbox-3.0.7.tar.bz2) = 2379425
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 2012-04-12 20:20:50.000000000 +0100
+++ ircd-ratbox-devel/files/patch-doc_example.conf 2012-04-13 15:33:51.000000000 +0100
@@ -1,24 +1,24 @@
---- ./doc/example.conf.orig 2008-12-16 03:08:43.000000000 +0000
-+++ ./doc/example.conf 2008-12-17 12:52:47.000000000 +0000
+--- ./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_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_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";
+- 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
-@@ -112,7 +112,7 @@
- ssld_count = 1;
+ /* 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";
@@ -26,7 +26,7 @@
};
/* admin {}: contains admin information about the server. (OLD A:) */
-@@ -139,16 +139,16 @@
+@@ -142,16 +142,16 @@
* - operspylog: operspy usage
* - ioerrorlog: IO errors
*/
@@ -53,7 +53,7 @@
};
/* class {}: contain information about classes for users (OLD Y:) */
-@@ -351,7 +351,7 @@
+@@ -354,7 +354,7 @@
* A password should not be defined when this is used, see
* doc/challenge.txt for more information.
*/
@@ -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
-@@ -1015,8 +1015,9 @@
+@@ -1022,8 +1022,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 2012-04-12 20:20:50.000000000 +0100
+++ ircd-ratbox-devel/files/patch-doc_example.efnet.conf 2012-04-13 15:32:43.000000000 +0100
@@ -1,33 +1,24 @@
---- ./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.
- */
-- 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.
+--- ./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
@@ -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_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_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";
+- 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
-@@ -115,7 +115,7 @@
- ssld_count = 1;
+ /* 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";
@@ -35,7 +26,7 @@
};
/* admin {}: contains admin information about the server. (OLD A:) */
-@@ -142,16 +142,16 @@
+@@ -145,16 +145,16 @@
* - operspylog: operspy usage
* - ioerrorlog: IO errors
*/
@@ -62,7 +53,7 @@
};
/* class {}: contain information about classes for users (OLD Y:) */
-@@ -355,7 +355,7 @@
+@@ -357,7 +357,7 @@
* A password should not be defined when this is used, see
* doc/challenge.txt for more information.
*/
@@ -71,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
-@@ -1029,8 +1029,9 @@
+@@ -1038,8 +1038,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 2012-04-12 20:20:50.000000000 +0100
+++ ircd-ratbox-devel/files/patch-include_config.h 2012-04-13 15:07:47.000000000 +0100
@@ -1,13 +1,9 @@
---- ./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
+--- ./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 LOGPATH LOG_DIR
--#define UHPATH HELP_DIR "/users"
--#define HPATH HELP_DIR "/opers"
-+#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%%"
@@ -18,8 +14,9 @@
+#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 PPATH RUNPATH "/ircd.pid" /* pid file */
- #define OPATH ETCPATH "/opers.motd" /* oper MOTD file */
+ #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
diff -ruN ircd-ratbox-devel.orig/pkg-descr ircd-ratbox-devel/pkg-descr
--- ircd-ratbox-devel.orig/pkg-descr 2012-04-12 20:20:52.000000000 +0100
+++ ircd-ratbox-devel/pkg-descr 2012-04-13 19:47:40.000000000 +0100
@@ -21,4 +21,4 @@
o New ssld and bandb processes for SSL connections and ban checking;
these allow ratbox-3 to make better use of multi-processor systems.
-WWW: http://www.ircd-ratbox.org/
+WWW: http://www.ratbox.org/
diff -ruN ircd-ratbox-devel.orig/pkg-plist ircd-ratbox-devel/pkg-plist
--- ircd-ratbox-devel.orig/pkg-plist 2012-04-12 20:20:52.000000000 +0100
+++ ircd-ratbox-devel/pkg-plist 2012-04-13 15:20:34.000000000 +0100
@@ -21,6 +21,7 @@
%%DATADIR%%/help/opers/error
%%DATADIR%%/help/opers/etrace
%%DATADIR%%/help/opers/gline
+%%DATADIR%%/help/opers/gungline
%%DATADIR%%/help/opers/help
%%DATADIR%%/help/opers/index
%%DATADIR%%/help/opers/info
--------------000509070002070001000308--
More information about the freebsd-ports-bugs
mailing list