OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Jan-2007 14:10:00
Branch: HEAD Handle: 2007010813100000
Modified files:
openpkg-src/ratbox ratbox-services.conf ratbox.patch ratbox.spec
Log:
upgrade to Ratbox Services 1.1.0 (now finally SQLite 3 based)
Summary:
Revision Changes Path
1.9 +52 -10 openpkg-src/ratbox/ratbox-services.conf
1.27 +3 -3 openpkg-src/ratbox/ratbox.patch
1.43 +8 -5 openpkg-src/ratbox/ratbox.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ratbox/ratbox-services.conf
============================================================================
$ cvs diff -u -r1.8 -r1.9 ratbox-services.conf
--- openpkg-src/ratbox/ratbox-services.conf 15 Jun 2005 18:05:58 -0000
1.8
+++ openpkg-src/ratbox/ratbox-services.conf 8 Jan 2007 13:10:00 -0000
1.9
@@ -4,6 +4,7 @@
##
serverinfo {
+ sid = "000";
name = "irc-services.example.com";
description = "Example IRC Network Services";
vhost = "127.0.0.1";
@@ -25,6 +26,22 @@
email = "<[EMAIL PROTECTED]>";
};
+database {
+ host = "127.0.0.1";
+ name = "ratbox_services";
+ username = "ratbox_services";
+ password = "ratbox_services";
+};
+
+email {
+ disable_email = yes;
+ email_program = "@l_prefix@/sbin/sendmail", "-t";
+ email_name = "Ratbox Services";
+ email_address = "[EMAIL PROTECTED]";
+ email_number = 15;
+ email_duration = 1 minute;
+};
+
connect "irc.example.com" {
vhost = "127.0.0.1";
host = "127.0.0.1";
@@ -94,9 +111,20 @@
register_amount = 10;
register_email = no;
register_url = "http://irc.example.com/";;
+ register_verify = no;
allow_set_email = yes;
- expire_time = 4 weeks;
allow_set_password = yes;
+ allow_resetpass = no;
+ allow_resetemail = no;
+ expire_time = 4 weeks;
+ expire_suspended_time = 4 weeks;
+ expire_unverified_time = 1 day;
+ expire_bonus = 1 day;
+ expire_bonus_per_time = 2 weeks;
+ expire_bonus_max = 4 weeks;
+ resetpass_duration = 1 day;
+ resetemail_duration = 1 day;
+ reset_regtime_duration = 2 weeks;
max_logins = 2;
};
@@ -111,9 +139,13 @@
register_time = 1 minute;
register_amount = 5;
expire_time = 4 weeks;
+ expire_suspended_time = 4 weeks;
expireban_frequency = 15 minutes;
enforcetopic_frequency = 1 hour;
max_bans = 50;
+ email_delowner = no;
+ delowner_duration = 1 day;
+ autojoin_empty = no;
};
service "operserv" {
@@ -123,6 +155,7 @@
realname = "Operator Service";
flags = disabled, opered, msg_self, stealth;
loglevel = 1;
+ allow_die = no;
};
service "operbot" {
@@ -148,14 +181,23 @@
};
service "banserv" {
- nick = "BANSERV";
- username = "banserv";
- host = "irc-services.example.com";
- realname = "Ban Service";
- flags = disabled, opered, msg_self, stealth;
- loglevel = 1;
- unban_time = 2 weeks;
- autosync_frequency = 2 weeks;
- temp_workaround = no;
+ nick = "BANSERV";
+ username = "banserv";
+ host = "irc-services.example.com";
+ realname = "Ban Service";
+ flags = disabled, opered, msg_self, stealth;
+ loglevel = 1;
+ unban_time = 2 weeks;
+ autosync_frequency = 2 weeks;
+ temp_workaround = no;
+};
+
+service "watchserv" {
+ nick = "WATCHSERV";
+ username = "watchserv";
+ host = "irc-services.example.com";
+ realname = "Command Watching Service";
+ flags = msg_self, stealth;
+ loglevel = 1;
};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ratbox/ratbox.patch
============================================================================
$ cvs diff -u -r1.26 -r1.27 ratbox.patch
--- openpkg-src/ratbox/ratbox.patch 7 Jan 2007 09:30:42 -0000 1.26
+++ openpkg-src/ratbox/ratbox.patch 8 Jan 2007 13:10:00 -0000 1.27
@@ -10,9 +10,9 @@
.so.sl:
$(LD) -b $< -o $@
-Index: ratbox-services-1.0.3/include/config.h
---- ratbox-services-1.0.3/include/config.h.orig 2005-05-23 17:01:31
+0200
-+++ ratbox-services-1.0.3/include/config.h 2005-05-23 19:30:44 +0200
+Index: ratbox-services-1.1.0/include/config.h
+--- ratbox-services-1.1.0/include/config.h.orig 2005-05-23 17:01:31
+0200
++++ ratbox-services-1.1.0/include/config.h 2005-05-23 19:30:44 +0200
@@ -9,7 +9,7 @@
#define PID_PATH RUNDIR "/ratbox-services.pid"
#define LOG_PATH LOGDIR "/ratbox-services.log"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ratbox/ratbox.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 ratbox.spec
--- openpkg-src/ratbox/ratbox.spec 7 Jan 2007 09:30:42 -0000 1.42
+++ openpkg-src/ratbox/ratbox.spec 8 Jan 2007 13:10:00 -0000 1.43
@@ -24,7 +24,7 @@
# package version
%define V_server 2.2.4
-%define V_services 1.0.3
+%define V_services 1.1.0
%define V_respond 1.0
# package information
@@ -38,7 +38,7 @@
Group: InstantMessaging
License: GPL
Version: %{V_server}
-Release: 20070107
+Release: 20070108
# list of sources
Source0:
ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/ircd-ratbox-%{V_server}.tgz
@@ -55,8 +55,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, bison, flex
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: openssl, zlib, sqlite, sqlite::with_v2 = yes
-PreReq: openssl, zlib, sqlite, sqlite::with_v2 = yes
+BuildPreReq: openssl, zlib, sqlite
+PreReq: openssl, zlib, sqlite
AutoReq: no
AutoReqProv: no
@@ -124,6 +124,9 @@
-e 's;ratbox-services\.log;services.log;' \
-e 's;ratbox-services\.db;services.db;' \
include/config.h
+ %{l_shtool} subst \
+ -e 's;==;=;g' \
+ configure
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
@@ -135,7 +138,7 @@
--with-logdir=%{l_prefix}/var/ratbox \
--with-rundir=%{l_prefix}/var/ratbox \
--with-helpdir=%{l_prefix}/share/ratbox/services \
- --with-sqlite=%{l_prefix}
+ --enable-sqlite3=%{l_prefix}
%{l_make} %{l_mflags}
) || exit $?
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
