switch to latest bleeding edge CVS version of ratbox-services to get the functionality of NickServ

ratbox/ratbox-services.conf

@@ -60,6 +60,16 @@ service "alis" {
     max_matches                = 60;
 };
 
+service "nickserv" {
+    nick                       = "NICKSERV";
+    username                   = "nickserv";
+    host                       = "irc-services.example.com";
+    realname                   = "Nick Registration Services";
+    flags                      = opered, msg_self;
+    loglevel                   = 5;
+    max_nicks                  = 2;
+};
+
 service "userserv" {
     nick                       = "USERSERV";
     username                   = "userserv";

ratbox/ratbox.patch

@@ -1,6 +1,6 @@
 Index: ircd-ratbox-2.0.8/modules/Makefile.in
 --- ircd-ratbox-2.0.8/modules/Makefile.in.orig	2005-01-14 18:25:51 +0100
-+++ ircd-ratbox-2.0.8/modules/Makefile.in	2005-04-13 13:58:04 +0200
++++ ircd-ratbox-2.0.8/modules/Makefile.in	2005-04-13 15:30:42 +0200
 @@ -182,7 +182,7 @@
  	${CC} ${CPPFLAGS} ${CFLAGS} -DMODNAME=`basename $< .c`_mheader -c $< -o $@
  
@@ -10,21 +10,45 @@ Index: ircd-ratbox-2.0.8/modules/Makefile.in
  
  .so.sl:
  	$(LD) -b $< -o $@
-Index: ratbox-services-1.0beta1/src/Makefile.in
---- ratbox-services-1.0beta1/src/Makefile.in.orig	2005-01-04 20:58:50 +0100
-+++ ratbox-services-1.0beta1/src/Makefile.in	2005-04-13 13:58:04 +0200
-@@ -12,7 +12,7 @@
- INCLUDES=-I ../include/ @SQLITE_INCLUDES@
- LDFLAGS=@LDFLAGS@
- LIBS=@LIBS@
--CFLAGS=-g -O0 -Wall -Werror -Wunused -Wshadow -Wmissing-declarations -Wwrite-strings -DPREFIX=\"$(PREFIX)\"
-+CFLAGS=@CPPFLAGS@ @CFLAGS@ -g -O0 -Wall -Werror -Wunused -Wshadow -Wmissing-declarations -Wwrite-strings -DPREFIX=\"$(PREFIX)\"
- MAKE = make
+Index: ircd-ratbox-2.0.8/modules/m_resv.c
+--- ircd-ratbox-2.0.8/modules/m_resv.c.orig	2004-12-04 22:28:50 +0100
++++ ircd-ratbox-2.0.8/modules/m_resv.c	2005-04-13 15:30:42 +0200
+@@ -405,7 +405,7 @@
+ 	/* parv[0]  parv[1]        parv[2]
+ 	 * oper     target server  resv to remove
+ 	 */
+-	propagate_generic(source_p, "UNRESV", parv[3], CAP_CLUSTER,
++	propagate_generic(source_p, "UNRESV", parv[1], CAP_CLUSTER,
+ 			"%s", parv[2]);
  
- # Anything marked with the .PHONY attribute is always considered "out of date"
-Index: ratbox-services-1.0beta1/include/conf.h
---- ratbox-services-1.0beta1/include/conf.h.orig	2005-02-14 18:40:12 +0100
-+++ ratbox-services-1.0beta1/include/conf.h	2005-04-13 14:12:26 +0200
+ 	if(!match(me.name, parv[1]))
+Index: ircd-ratbox-2.0.8/modules/m_xline.c
+--- ircd-ratbox-2.0.8/modules/m_xline.c.orig	2005-01-14 23:10:40 +0100
++++ ircd-ratbox-2.0.8/modules/m_xline.c	2005-04-13 15:30:42 +0200
+@@ -494,7 +494,7 @@
+ 	/* parv[0]  parv[1]        parv[2]
+ 	 * oper     target server  gecos
+ 	 */
+-	propagate_generic(source_p, "UNXLINE", parv[3], CAP_CLUSTER,
++	propagate_generic(source_p, "UNXLINE", parv[1], CAP_CLUSTER,
+ 			"%s", parv[2]);
+ 
+ 	if(!match(parv[1], me.name))
+Index: ratbox-services/help/Makefile.in
+--- ratbox-services/help/Makefile.in.orig	2005-01-04 21:01:20 +0100
++++ ratbox-services/help/Makefile.in	2005-04-13 15:30:42 +0200
+@@ -6,7 +6,7 @@
+ INSTALL_DATA=@INSTALL_DATA@
+ PREFIX=@prefix@
+ 
+-SUBDIRS=alis main operbot chanserv userserv jupeserv operserv
++SUBDIRS=alis main operbot chanserv userserv jupeserv operserv nickserv
+ 
+ install: 
+ 	$(INSTALL) -m 750 -d $(PREFIX)/help
+Index: ratbox-services/include/conf.h
+--- ratbox-services/include/conf.h.orig	2005-04-07 01:58:28 +0200
++++ ratbox-services/include/conf.h	2005-04-13 15:30:42 +0200
 @@ -47,6 +47,7 @@
  	int allow_set_password;
  	int allow_set_email;
@@ -33,10 +57,22 @@ Index: ratbox-services-1.0beta1/include/conf.h
  
  	/* chanserv */
  	int disable_cregister;
-Index: ratbox-services-1.0beta1/src/conf.c
---- ratbox-services-1.0beta1/src/conf.c.orig	2005-02-14 18:40:14 +0100
-+++ ratbox-services-1.0beta1/src/conf.c	2005-04-13 14:11:17 +0200
-@@ -55,6 +55,7 @@
+Index: ratbox-services/src/Makefile.in
+--- ratbox-services/src/Makefile.in.orig	2005-04-07 01:58:30 +0200
++++ ratbox-services/src/Makefile.in	2005-04-13 15:30:42 +0200
+@@ -12,7 +12,7 @@
+ INCLUDES=-I ../include/ @SQLITE_INCLUDES@
+ LDFLAGS=@LDFLAGS@
+ LIBS=@LIBS@
+-CFLAGS=-g -O0 -Wall -Werror -Wunused -Wshadow -Wmissing-declarations -Wwrite-strings -DPREFIX=\"$(PREFIX)\"
++CFLAGS=@CPPFLAGS@ @CFLAGS@ -g -O0 -Wall -Werror -Wunused -Wshadow -Wmissing-declarations -Wwrite-strings -DPREFIX=\"$(PREFIX)\"
+ MAKE = make
+ 
+ # Anything marked with the .PHONY attribute is always considered "out of date"
+Index: ratbox-services/src/conf.c
+--- ratbox-services/src/conf.c.orig	2005-04-07 19:26:29 +0200
++++ ratbox-services/src/conf.c	2005-04-13 15:30:42 +0200
+@@ -79,6 +79,7 @@
  	config_file.allow_set_password = 1;
  	config_file.allow_set_email = 1;
  	config_file.umax_logins = 5;
@@ -44,10 +80,10 @@ Index: ratbox-services-1.0beta1/src/conf.c
  
  	config_file.disable_cregister = 0;
  	config_file.cregister_time = 60;
-Index: ratbox-services-1.0beta1/src/newconf.c
---- ratbox-services-1.0beta1/src/newconf.c.orig	2005-02-14 18:40:14 +0100
-+++ ratbox-services-1.0beta1/src/newconf.c	2005-04-13 14:11:38 +0200
-@@ -849,6 +849,7 @@
+Index: ratbox-services/src/newconf.c
+--- ratbox-services/src/newconf.c.orig	2005-04-07 01:58:30 +0200
++++ ratbox-services/src/newconf.c	2005-04-13 15:30:42 +0200
+@@ -850,6 +850,7 @@
  	{ "allow_set_password",	CF_YESNO, NULL, 0, &config_file.allow_set_password	},
  	{ "allow_set_email",	CF_YESNO, NULL, 0, &config_file.allow_set_email		},
  	{ "max_logins",		CF_INT,   NULL, 0, &config_file.umax_logins		},
@@ -55,10 +91,10 @@ Index: ratbox-services-1.0beta1/src/newconf.c
  	{ "\0", 0, NULL, 0, NULL }
  };
  
-Index: ratbox-services-1.0beta1/src/s_userserv.c
---- ratbox-services-1.0beta1/src/s_userserv.c.orig	2005-02-16 01:26:48 +0100
-+++ ratbox-services-1.0beta1/src/s_userserv.c	2005-04-13 14:24:19 +0200
-@@ -686,6 +686,15 @@
+Index: ratbox-services/src/s_userserv.c
+--- ratbox-services/src/s_userserv.c.orig	2005-04-07 19:26:29 +0200
++++ ratbox-services/src/s_userserv.c	2005-04-13 15:30:42 +0200
+@@ -722,6 +722,15 @@
  		return 1;
  	}
  

ratbox/ratbox.spec

@@ -24,7 +24,7 @@
 
 #   package version
 %define       V_server   2.0.8
-%define       V_services 1.0beta1
+%define       V_services 1.0snap20050413
 
 #   package information
 Name:         ratbox
@@ -41,12 +41,11 @@ Release:      20050413
 
 #   list of sources
 Source0:      ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/ircd-ratbox-%{V_server}.tgz
-Source1:      ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/ratbox-services/ratbox-services-%{V_services}.tgz
+Source1:      ftp://ftp.openpkg.org/sources/CPY/ratbox/ratbox-services-%{V_services}.tar.gz
 Source2:      rc.ratbox
 Source3:      ratbox-server.conf
 Source4:      ratbox-services.conf
-Patch0:       ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/ircd-ratbox-%{V_server}+unxr.diff
-Patch1:       ratbox.patch
+Patch0:       ratbox.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -79,8 +78,7 @@ AutoReqProv:  no
 %prep
     %setup -q -c
     %setup -q -T -D -a 1
-    %patch -p0 -d ircd-ratbox-%{V_server}
-    %patch -p0 -P 1
+    %patch -p0
 
 %build
     #   build IRC server
@@ -109,7 +107,7 @@ AutoReqProv:  no
     ) || exit $?
 
     #   build IRC services
-    ( cd ratbox-services-%{V_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";' \
@@ -155,7 +153,7 @@ AutoReqProv:  no
     ) || exit $?
 
     #   install IRC services
-    ( cd ratbox-services-%{V_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