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: 16-May-2005 14:07:36
Branch: HEAD Handle: 2005051613073600
Added files:
openpkg-src/ratbox ratbox-resv.conf
Modified files:
openpkg-src/ratbox ratbox-server.conf ratbox-services.conf
ratbox.patch ratbox.spec
Log:
upgrade to latest ratbox-services CVS snapshot
Summary:
Revision Changes Path
1.1 +9 -0 openpkg-src/ratbox/ratbox-resv.conf
1.3 +6 -14 openpkg-src/ratbox/ratbox-server.conf
1.7 +9 -0 openpkg-src/ratbox/ratbox-services.conf
1.13 +60 -0 openpkg-src/ratbox/ratbox.patch
1.15 +30 -24 openpkg-src/ratbox/ratbox.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ratbox/ratbox-resv.conf
============================================================================
$ cvs diff -u -r0 -r1.1 ratbox-resv.conf
--- /dev/null 2005-05-16 14:00:15 +0200
+++ ratbox-resv.conf 2005-05-16 14:07:36 +0200
@@ -0,0 +1,9 @@
+"#services", "reserved channel for Ratbox-Services"
+"global", "reserved nickname for Ratbox-Services"
+"alis", "reserved nickname for Ratbox-Services"
+"nickserv", "reserved nickname for Ratbox-Services"
+"userserv", "reserved nickname for Ratbox-Services"
+"chanserv", "reserved nickname for Ratbox-Services"
+"operserv", "reserved nickname for Ratbox-Services"
+"operbot", "reserved nickname for Ratbox-Services"
+"jupeserv", "reserved nickname for Ratbox-Services"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ratbox/ratbox-server.conf
============================================================================
$ cvs diff -u -r1.2 -r1.3 ratbox-server.conf
--- openpkg-src/ratbox/ratbox-server.conf 17 Apr 2005 07:57:10 -0000
1.2
+++ openpkg-src/ratbox/ratbox-server.conf 16 May 2005 12:07:36 -0000
1.3
@@ -11,6 +11,7 @@
network_name = "ExNet";
network_desc = "Example IRC Network";
hub = no;
+ vhost = "127.0.0.1";
};
admin {
@@ -69,6 +70,10 @@
die, rehash, admin, xline, operwall;
};
+service {
+ name = "irc-services.example.com";
+};
+
connect "irc-services.example.com" {
host = "127.0.0.1";
send_password = "services-secret";
@@ -80,19 +85,7 @@
cluster {
name = "*";
- type = all;
-};
-
-resv {
- reason = "There are no services on this network";
- nick = "userserv";
- nick = "chanserv";
- nick = "operserv";
- nick = "jupeserv";
- nick = "operbot";
- nick = "alis";
- nick = "global";
- channel = "#services";
+ flags = all;
};
channel {
@@ -107,7 +100,6 @@
max_bans = 25;
default_split_user_count = 0;
default_split_server_count = 0;
- default_split_delay = 15 seconds;
no_create_on_split = no;
no_join_on_split = no;
no_oper_resvs = no;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ratbox/ratbox-services.conf
============================================================================
$ cvs diff -u -r1.6 -r1.7 ratbox-services.conf
--- openpkg-src/ratbox/ratbox-services.conf 3 May 2005 13:06:32 -0000
1.6
+++ openpkg-src/ratbox/ratbox-services.conf 16 May 2005 12:07:36 -0000
1.7
@@ -39,6 +39,13 @@
password = "bar";
encrypted = no;
flags = admin, dcc, route;
+ userserv = admin;
+ chanserv = admin;
+ nickserv = drop;
+ operserv = admin;
+ operbot = channel;
+ global = netmsg;
+ jupeserv = jupe;
};
service "global" {
@@ -68,6 +75,8 @@
flags = opered, msg_self;
loglevel = 5;
max_nicks = 2;
+ allow_set_warn = yes;
+ warn_string = "This nickname is registered, you may be
disconnected if a user regains this nickname.";
};
service "userserv" {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ratbox/ratbox.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 ratbox.patch
--- openpkg-src/ratbox/ratbox.patch 15 May 2005 18:30:26 -0000 1.12
+++ openpkg-src/ratbox/ratbox.patch 16 May 2005 12:07:36 -0000 1.13
@@ -10,3 +10,63 @@
.so.sl:
$(LD) -b $< -o $@
+Index: ratbox-services/Makefile.in
+--- ratbox-services/Makefile.in.orig 2005-05-16 10:34:03 +0200
++++ ratbox-services/Makefile.in 2005-05-16 10:57:51 +0200
+@@ -35,15 +35,15 @@
+ done
+
+ install: build
+- $(INSTALL) -m 750 -d $(prefix)
+- $(INSTALL) -m 750 -d $(sbindir)
+- $(INSTALL) -m 750 -d $(sysconfdir)
+- $(INSTALL) -m 750 -d $(logdir)
+- $(INSTALL) -m 750 -d $(rundir)
+- $(INSTALL) -m 750 -d $(helpdir)
+- $(INSTALL) -m 750 src/$(BIN) $(sbindir)
+- $(INSTALL) -m 640 doc/example.conf $(sysconfdir)
+- $(INSTALL) -m 640 doc/schema.txt $(sysconfdir)
++ $(INSTALL) -m 750 -d $(DESTDIR)$(prefix)
++ $(INSTALL) -m 750 -d $(DESTDIR)$(sbindir)
++ $(INSTALL) -m 750 -d $(DESTDIR)$(sysconfdir)
++ $(INSTALL) -m 750 -d $(DESTDIR)$(logdir)
++ $(INSTALL) -m 750 -d $(DESTDIR)$(rundir)
++ $(INSTALL) -m 750 -d $(DESTDIR)$(helpdir)
++ $(INSTALL) -m 750 src/$(BIN) $(DESTDIR)$(sbindir)
++ $(INSTALL) -m 640 doc/example.conf $(DESTDIR)$(sysconfdir)
++ $(INSTALL) -m 640 doc/schema.txt $(DESTDIR)$(sysconfdir)
+ @for i in $(SUBDIRS); do \
+ echo "install -> $$i"; \
+ cd $$i; \
+Index: ratbox-services/help/Makefile.in
+--- ratbox-services/help/Makefile.in.orig 2005-05-16 10:34:03 +0200
++++ ratbox-services/help/Makefile.in 2005-05-16 10:59:39 +0200
+@@ -10,13 +10,13 @@
+ SUBDIRS=alis main operbot chanserv userserv jupeserv operserv nickserv
+
+ install:
+- $(INSTALL) -m 750 -d $(helpdir)
++ $(INSTALL) -m 750 -d $(DESTDIR)$(helpdir)
+
+ @for i in $(SUBDIRS); do \
+- $(INSTALL) -m 750 -d $(helpdir)/$$i; \
++ $(INSTALL) -m 750 -d $(DESTDIR)$(helpdir)/$$i; \
+ for j in $$i/*; do \
+ if [ -f $$j ]; then \
+- $(INSTALL_DATA) $$j $(helpdir)/$$i; \
++ $(INSTALL_DATA) $$j $(DESTDIR)$(helpdir)/$$i; \
+ fi \
+ done \
+ done
+Index: ratbox-services/include/config.h
+--- ratbox-services/include/config.h.orig 2005-05-16 10:34:04 +0200
++++ ratbox-services/include/config.h 2005-05-16 11:22:36 +0200
+@@ -9,7 +9,7 @@
+ #define PID_PATH RUNDIR "/ratbox-services.pid"
+ #define LOG_PATH LOGDIR "/ratbox-services.log"
+ #define HELP_PATH HELPDIR
+-#define DB_PATH SYSCONFDIR "/ratbox-services.db"
++#define DB_PATH RUNDIR "/ratbox-services.db"
+
+ /* SMALL_NETWORK
+ * If your network is fairly small, enable this to save some memory.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ratbox/ratbox.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 ratbox.spec
--- openpkg-src/ratbox/ratbox.spec 15 May 2005 18:30:26 -0000 1.14
+++ openpkg-src/ratbox/ratbox.spec 16 May 2005 12:07:36 -0000 1.15
@@ -24,7 +24,7 @@
# package version
%define V_server 2.1.2
-%define V_services 1.0snap20050503
+%define V_services 1.0snap20050516
# package information
Name: ratbox
@@ -37,7 +37,7 @@
Group: Network
License: GPL
Version: %{V_server}
-Release: 20050515
+Release: 20050516
# list of sources
Source0:
ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/ircd-ratbox-%{V_server}.tgz
@@ -45,6 +45,7 @@
Source2: rc.ratbox
Source3: ratbox-server.conf
Source4: ratbox-services.conf
+Source5: ratbox-resv.conf
Patch0: ratbox.patch
# build information
@@ -102,32 +103,32 @@
--enable-zlib \
--with-zlib-path=%{l_prefix} \
--enable-small-net \
- --enable-shared-modules
+ --enable-shared-modules \
+ --enable-services
%{l_make} %{l_mflags -O}
) || exit $?
# build IRC services
( cd ratbox-services
%{l_shtool} subst \
- -e 's;PREFIX
"/services.conf";"%{l_prefix}/etc/ratbox/services.conf";' \
- -e 's;PREFIX
"/services.pid";"%{l_prefix}/var/ratbox/services.pid";' \
- -e 's;LOG_DIR
"/services.log";"%{l_prefix}/var/ratbox/services.log";' \
- -e 's;PREFIX "/services.db";"%{l_prefix}/var/ratbox/services.db";'
\
- -e 's;PREFIX "/help/";"%{l_prefix}/share/ratbox/services/help/";' \
+ -e 's;ratbox-services\.conf;services.conf;' \
+ -e 's;ratbox-services\.pid;services.pid;' \
+ -e 's;ratbox-services\.log;services.log;' \
+ -e 's;ratbox-services\.db;services.db;' \
include/config.h
- LIBS=""
- case "%{l_platform -t}" in
- *-sunos* ) LIBS="$LIBS -lsocket -lnsl" ;;
- esac
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
- LIBS="$LIBS" \
./configure \
--prefix=%{l_prefix} \
+ --sbindir=%{l_prefix}/bin \
+ --sysconfdir=%{l_prefix}/etc/ratbox \
+ --with-logdir=%{l_prefix}/var/ratbox \
+ --with-rundir=%{l_prefix}/var/ratbox \
+ --with-helpdir=%{l_prefix}/share/ratbox/services \
--with-sqlite=%{l_prefix}
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
) || exit $?
%install
@@ -155,15 +156,21 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/ratbox/server.motd
mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/ircd.8 \
$RPM_BUILD_ROOT%{l_prefix}/man/man8/ratbox-ircd.8
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/etc
+ mv $RPM_BUILD_ROOT%{l_prefix}/etc/ratbox/example.conf \
+ $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/etc/server.conf.sample
) || exit $?
# install IRC services
( cd ratbox-services
- %{l_make} %{l_mflags} install
PREFIX=$RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services
- mv $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services/ratbox-services \
- $RPM_BUILD_ROOT%{l_prefix}/bin/ratbox-services
- rmdir $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services/logs
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services -type d -print |
xargs chmod 755
+ mv $RPM_BUILD_ROOT%{l_prefix}/etc/ratbox/example.conf \
+ $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/etc/services.conf.sample
+ mv $RPM_BUILD_ROOT%{l_prefix}/etc/ratbox/schema.txt \
+ $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services/schema.txt
+ chmod a+r $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services/schema.txt
) || exit $?
# post-adjust installation
@@ -172,14 +179,10 @@
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
chmod 755 $RPM_BUILD_ROOT%{l_prefix}/bin/*
chmod 644 $RPM_BUILD_ROOT%{l_prefix}/etc/ratbox/*
+ chmod 755 $RPM_BUILD_ROOT%{l_prefix}/etc/ratbox
+ chmod 755 $RPM_BUILD_ROOT%{l_prefix}/var/ratbox
# install default configuration
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/etc
- mv $RPM_BUILD_ROOT%{l_prefix}/etc/ratbox/example.conf \
- $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/etc/server.conf.sample
- mv $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services/example.conf \
- $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/etc/services.conf.sample
chmod 644 $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/etc/*
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE ratbox-server.conf} \
@@ -187,6 +190,9 @@
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE ratbox-services.conf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/ratbox/services.conf
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ %{SOURCE ratbox-resv.conf} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/ratbox/resv.conf
( echo "Welcome to the Example IRC service"
echo "running on server irc.example.com."
) >$RPM_BUILD_ROOT%{l_prefix}/etc/ratbox/server.motd
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
