head 1.32; access; symbols OPENPKG_E1_MP_HEAD:1.25 OPENPKG_E1_MP:1.25 OPENPKG_E1_MP_2_STABLE:1.24.2.1 OPENPKG_E1_FP:1.24.2.1 OPENPKG_2_STABLE_MP:1.29 OPENPKG_2_STABLE_20061018:1.24.2.1 OPENPKG_2_STABLE_20060622:1.24 OPENPKG_2_STABLE:1.24.0.2 OPENPKG_2_STABLE_BP:1.24 OPENPKG_2_5_RELEASE:1.19 OPENPKG_2_5_SOLID:1.19.0.2 OPENPKG_2_5_SOLID_BP:1.19 OPENPKG_2_4_RELEASE:1.16 OPENPKG_2_4_SOLID:1.16.0.2 OPENPKG_2_4_SOLID_BP:1.16; locks; strict; comment @# @; 1.32 date 2009.04.23.13.00.04; author rse; state Exp; branches; next 1.31; commitid 4XBZADgX6UUxP8Lt; 1.31 date 2007.07.24.15.01.00; author cs; state Exp; branches; next 1.30; commitid M9npzWGWF8yu22rs; 1.30 date 2007.04.27.05.43.28; author rse; state Exp; branches; next 1.29; commitid hFtcvOizF8xBMFfs; 1.29 date 2007.02.27.07.31.56; author rse; state Exp; branches; next 1.28; commitid MeuHp0GO0P7oh68s; 1.28 date 2007.01.13.08.22.28; author rse; state Exp; branches; next 1.27; commitid uyxgHz6rfIyp0k2s; 1.27 date 2007.01.08.13.10.00; author rse; state Exp; branches; next 1.26; commitid PrOUyv9m3ac1LH1s; 1.26 date 2007.01.07.09.30.42; author rse; state Exp; branches; next 1.25; commitid bD47N8Nak5ZLzy1s; 1.25 date 2006.07.24.07.09.09; author rse; state Exp; branches; next 1.24; commitid 10gy0CevWo52a5Gr; 1.24 date 2006.05.08.18.05.30; author rse; state Exp; branches 1.24.2.1; next 1.23; commitid 7zrNuFFz8G6Cgfwr; 1.23 date 2006.05.07.06.59.08; author rse; state Exp; branches; next 1.22; commitid 8nUWExg7usy2C3wr; 1.22 date 2006.03.14.07.16.55; author rse; state Exp; branches; next 1.21; commitid kUfXBZAJq05Kr7pr; 1.21 date 2006.03.07.07.36.33; author rse; state Exp; branches; next 1.20; commitid SbKtRCk7HgErMdor; 1.20 date 2005.10.27.08.21.29; author rse; state Exp; branches; next 1.19; commitid wagZ7mf6y7KVeo7r; 1.19 date 2005.09.08.10.47.49; author rse; state Exp; branches; next 1.18; 1.18 date 2005.08.24.18.16.21; author rse; state Exp; branches; next 1.17; 1.17 date 2005.07.01.08.37.29; author rse; state Exp; branches; next 1.16; 1.16 date 2005.06.15.18.05.58; author rse; state Exp; branches; next 1.15; 1.15 date 2005.05.23.17.36.08; author rse; state Exp; branches; next 1.14; 1.14 date 2005.05.17.13.54.57; author rse; state Exp; branches; next 1.13; 1.13 date 2005.05.16.12.07.36; author rse; state Exp; branches; next 1.12; 1.12 date 2005.05.15.18.30.26; author rse; state Exp; branches; next 1.11; 1.11 date 2005.05.03.09.46.04; author rse; state Exp; branches; next 1.10; 1.10 date 2005.05.02.13.47.38; author rse; state Exp; branches; next 1.9; 1.9 date 2005.04.25.07.45.08; author rse; state Exp; branches; next 1.8; 1.8 date 2005.04.18.15.06.13; author rse; state Exp; branches; next 1.7; 1.7 date 2005.04.18.08.49.47; author rse; state Exp; branches; next 1.6; 1.6 date 2005.04.17.17.36.26; author rse; state Exp; branches; next 1.5; 1.5 date 2005.04.17.16.23.37; author rse; state Exp; branches; next 1.4; 1.4 date 2005.04.17.11.32.44; author rse; state Exp; branches; next 1.3; 1.3 date 2005.04.13.14.01.08; author rse; state Exp; branches; next 1.2; 1.2 date 2005.04.13.12.50.39; author rse; state Exp; branches; next 1.1; 1.1 date 2005.04.11.19.54.41; author rse; state Exp; branches; next ; 1.24.2.1 date 2006.10.16.14.55.28; author rse; state Exp; branches; next 1.24.2.2; commitid iZxwRSmmWscPXUQr; 1.24.2.2 date 2007.02.07.20.36.46; author thl; state Exp; branches; next 1.24.2.3; commitid buiDpkvFRFCkgB5s; 1.24.2.3 date 2007.03.18.23.32.58; author thl; state Exp; branches; next ; commitid j886gsownDQWXCas; desc @@ 1.32 log @modifying package: ratbox-2.2.8 20080112 -> 20090423 @ text @Index: ratbox-respond-1.0/ratbox-respond/configure --- ratbox-respond-1.0/ratbox-respond/configure.orig 2006-01-11 22:52:17 +0100 +++ ratbox-respond-1.0/ratbox-respond/configure 2007-02-27 08:29:19 +0100 @@@@ -2889,8 +2889,6 @@@@ fi -CPPFLAGS="-I /usr/include" -LIBS="-L /usr/lib" echo "$as_me:$LINENO: checking for OpenSSL" >&5 echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6 Index: ratbox-services-1.2.1/include/config.h --- ratbox-services-1.2.1/include/config.h.orig 2008-05-20 21:11:01 +0200 +++ ratbox-services-1.2.1/include/config.h 2008-05-21 20:27:53 +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. Index: ratbox-services-1.2.1/configure --- ratbox-services-1.2.1/configure.orig 2008-06-27 19:56:02 +0200 +++ ratbox-services-1.2.1/configure 2008-06-29 10:24:44 +0200 @@@@ -5595,7 +5595,7 @@@@ { echo "$as_me:$LINENO: checking for -lsqlite3 in given path" >&5 echo $ECHO_N "checking for -lsqlite3 in given path... $ECHO_C" >&6; } - if test -e "$ac_cv_sqlite3_path/lib/libsqlite3.so"; then + if test -e "$ac_cv_sqlite3_path/lib/libsqlite3.a"; then { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } ac_cv_found_sqlite3_lib="yes" @@@@ -6316,7 +6316,7 @@@@ # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. ( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + for ac_var in `set 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do eval ac_val=\$$ac_var case $ac_val in #( *${as_nl}*) @ 1.31 log @modifying package: ratbox-2.2.6 20070623 -> 20070724 @ text @d13 3 a15 33 Index: ratbox-services-1.1.2/configure --- ratbox-services-1.1.2/configure.orig 2006-07-17 20:17:32 +0200 +++ ratbox-services-1.1.2/configure 2007-02-27 08:29:19 +0100 @@@@ -2464,7 +2464,7 @@@@ echo $ac_n "checking for -lsqlite3 in given path""... $ac_c" 1>&6 echo "configure:2467: checking for -lsqlite3 in given path" >&5 - if test -e "$ac_cv_sqlite3_path/lib/libsqlite3.so"; then + if test -f "$ac_cv_sqlite3_path/lib/libsqlite3.a"; then echo "$ac_t""yes" 1>&6 ac_cv_found_sqlite3_lib="yes" else @@@@ -2571,7 +2571,7 @@@@ echo $ac_n "checking for -lmysqlclient in given path""... $ac_c" 1>&6 echo "configure:2574: checking for -lmysqlclient in given path" >&5 - if test -e "$ac_cv_mysql_path/lib/libmysqlclient.so"; then + if test -f "$ac_cv_mysql_path/lib/libmysqlclient.a"; then echo "$ac_t""yes" 1>&6 ac_cv_found_mysql_lib="yes" else @@@@ -2734,7 +2734,7 @@@@ echo $ac_n "checking for -lpq in given path""... $ac_c" 1>&6 echo "configure:2737: checking for -lpq in given path" >&5 - if test -e "$ac_cv_pgsql_path/lib/libpq.so"; then + if test -f "$ac_cv_pgsql_path/lib/libpq.a"; then echo "$ac_t""yes" 1>&6 ac_cv_found_pgsql_lib="yes" else Index: ratbox-services-1.1.2/include/config.h --- ratbox-services-1.1.2/include/config.h.orig 2007-02-26 19:41:30 +0100 +++ ratbox-services-1.1.2/include/config.h 2007-02-27 08:29:19 +0100 d25 21 @ 1.30 log @upgrading package: ratbox 2.2.4 -> 2.2.5 @ text @d13 3 a15 3 Index: ratbox-services-1.1.1/configure --- ratbox-services-1.1.1/configure.orig 2006-07-17 20:17:32 +0200 +++ ratbox-services-1.1.1/configure 2007-02-27 08:29:19 +0100 d43 3 a45 3 Index: ratbox-services-1.1.1/include/config.h --- ratbox-services-1.1.1/include/config.h.orig 2007-02-26 19:41:30 +0100 +++ ratbox-services-1.1.1/include/config.h 2007-02-27 08:29:19 +0100 @ 1.29 log @modifying package: ratbox-2.2.4 20070113 -> 20070227 @ text @a0 12 Index: ircd-ratbox-2.2.4/modules/Makefile.in --- ircd-ratbox-2.2.4/modules/Makefile.in.orig 2006-01-07 20:44:44 +0100 +++ ircd-ratbox-2.2.4/modules/Makefile.in 2007-02-27 08:29:19 +0100 @@@@ -186,7 +186,7 @@@@ ${CC} ${CPPFLAGS} ${CFLAGS} -DMODNAME=`basename $< .c`_mheader -c $< -o $@@ .c.so: - ${CC} ${PICFLAGS} ${CPPFLAGS} ${CFLAGS} $< -o $@@ + ${CC} ${PICFLAGS} ${CPPFLAGS} ${CFLAGS} $< -o $@@ ${IRCDLIBS} .so.sl: $(LD) -b $< -o $@@ @ 1.28 log @workaround Solaris configure-time problems (Solaris /bin/sh's internal test(1) doesn't know how to handle option '-e') @ text @d3 1 a3 1 +++ ircd-ratbox-2.2.4/modules/Makefile.in 2007-01-13 09:19:25 +0100 d15 1 a15 1 +++ ratbox-respond-1.0/ratbox-respond/configure 2007-01-13 09:19:25 +0100 d25 3 a27 3 Index: ratbox-services-1.1.0/configure --- ratbox-services-1.1.0/configure.orig 2006-07-17 20:17:32 +0200 +++ ratbox-services-1.1.0/configure 2007-01-13 09:20:07 +0100 d55 3 a57 3 Index: ratbox-services-1.1.0/include/config.h --- ratbox-services-1.1.0/include/config.h.orig 2007-01-07 20:54:34 +0100 +++ ratbox-services-1.1.0/include/config.h 2007-01-13 09:19:25 +0100 @ 1.27 log @upgrade to Ratbox Services 1.1.0 (now finally SQLite 3 based) @ text @d2 3 a4 3 --- ircd-ratbox-2.2.4/modules/Makefile.in.orig 2005-01-14 18:25:51 +0100 +++ ircd-ratbox-2.2.4/modules/Makefile.in 2005-04-13 15:30:42 +0200 @@@@ -182,7 +182,7 @@@@ a12 12 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" #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. d15 1 a15 1 +++ ratbox-respond-1.0/ratbox-respond/configure 2006-05-07 08:55:33 +0200 d25 42 @ 1.26 log @upgrading package: ratbox 2.2.3 -> 2.2.4 @ text @d13 3 a15 3 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 @ 1.25 log @upgrading package: ratbox 2.1.8 -> 2.2.3 @ text @d1 3 a3 3 Index: ircd-ratbox-2.2.3/modules/Makefile.in --- ircd-ratbox-2.2.3/modules/Makefile.in.orig 2005-01-14 18:25:51 +0100 +++ ircd-ratbox-2.2.3/modules/Makefile.in 2005-04-13 15:30:42 +0200 @ 1.24 log @upgrading package: ratbox 2.1.7 -> 2.1.8 @ text @d1 3 a3 3 Index: ircd-ratbox-2.1.8/modules/Makefile.in --- ircd-ratbox-2.1.8/modules/Makefile.in.orig 2005-01-14 18:25:51 +0100 +++ ircd-ratbox-2.1.8/modules/Makefile.in 2005-04-13 15:30:42 +0200 @ 1.24.2.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @d1 3 a3 3 Index: ircd-ratbox-2.2.3/modules/Makefile.in --- ircd-ratbox-2.2.3/modules/Makefile.in.orig 2005-01-14 18:25:51 +0100 +++ ircd-ratbox-2.2.3/modules/Makefile.in 2005-04-13 15:30:42 +0200 @ 1.24.2.2 log @MFC: make up leeway for 2_STABLE by virtue of build-time results @ text @d1 4 a4 4 Index: ircd-ratbox-2.2.4/modules/Makefile.in --- ircd-ratbox-2.2.4/modules/Makefile.in.orig 2006-01-07 20:44:44 +0100 +++ ircd-ratbox-2.2.4/modules/Makefile.in 2007-01-13 09:19:25 +0100 @@@@ -186,7 +186,7 @@@@ d13 12 d27 1 a27 1 +++ ratbox-respond-1.0/ratbox-respond/configure 2007-01-13 09:19:25 +0100 a36 42 Index: ratbox-services-1.1.0/configure --- ratbox-services-1.1.0/configure.orig 2006-07-17 20:17:32 +0200 +++ ratbox-services-1.1.0/configure 2007-01-13 09:20:07 +0100 @@@@ -2464,7 +2464,7 @@@@ echo $ac_n "checking for -lsqlite3 in given path""... $ac_c" 1>&6 echo "configure:2467: checking for -lsqlite3 in given path" >&5 - if test -e "$ac_cv_sqlite3_path/lib/libsqlite3.so"; then + if test -f "$ac_cv_sqlite3_path/lib/libsqlite3.a"; then echo "$ac_t""yes" 1>&6 ac_cv_found_sqlite3_lib="yes" else @@@@ -2571,7 +2571,7 @@@@ echo $ac_n "checking for -lmysqlclient in given path""... $ac_c" 1>&6 echo "configure:2574: checking for -lmysqlclient in given path" >&5 - if test -e "$ac_cv_mysql_path/lib/libmysqlclient.so"; then + if test -f "$ac_cv_mysql_path/lib/libmysqlclient.a"; then echo "$ac_t""yes" 1>&6 ac_cv_found_mysql_lib="yes" else @@@@ -2734,7 +2734,7 @@@@ echo $ac_n "checking for -lpq in given path""... $ac_c" 1>&6 echo "configure:2737: checking for -lpq in given path" >&5 - if test -e "$ac_cv_pgsql_path/lib/libpq.so"; then + if test -f "$ac_cv_pgsql_path/lib/libpq.a"; then echo "$ac_t""yes" 1>&6 ac_cv_found_pgsql_lib="yes" else Index: ratbox-services-1.1.0/include/config.h --- ratbox-services-1.1.0/include/config.h.orig 2007-01-07 20:54:34 +0100 +++ ratbox-services-1.1.0/include/config.h 2007-01-13 09:19:25 +0100 @@@@ -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. @ 1.24.2.3 log @MFC: make up leeway for 2_STABLE by virtue of build-time results @ text @d3 1 a3 1 +++ ircd-ratbox-2.2.4/modules/Makefile.in 2007-02-27 08:29:19 +0100 d15 1 a15 1 +++ ratbox-respond-1.0/ratbox-respond/configure 2007-02-27 08:29:19 +0100 d25 3 a27 3 Index: ratbox-services-1.1.1/configure --- ratbox-services-1.1.1/configure.orig 2006-07-17 20:17:32 +0200 +++ ratbox-services-1.1.1/configure 2007-02-27 08:29:19 +0100 d55 3 a57 3 Index: ratbox-services-1.1.1/include/config.h --- ratbox-services-1.1.1/include/config.h.orig 2007-02-26 19:41:30 +0100 +++ ratbox-services-1.1.1/include/config.h 2007-02-27 08:29:19 +0100 @ 1.23 log @add new challenge/response client @ text @d1 3 a3 3 Index: ircd-ratbox-2.1.7/modules/Makefile.in --- ircd-ratbox-2.1.7/modules/Makefile.in.orig 2005-01-14 18:25:51 +0100 +++ ircd-ratbox-2.1.7/modules/Makefile.in 2005-04-13 15:30:42 +0200 @ 1.22 log @modifying package: ratbox-2.1.7 20060307 -> 20060314 @ text @d25 12 @ 1.21 log @modifying package: ratbox-2.1.7 20051106 -> 20060307 @ text @d13 3 a15 3 Index: ratbox-services-1.0.2/include/config.h --- ratbox-services-1.0.2/include/config.h.orig 2005-05-23 17:01:31 +0200 +++ ratbox-services-1.0.2/include/config.h 2005-05-23 19:30:44 +0200 @ 1.20 log @upgrading package: ratbox 2.1.5 -> 2.1.7 @ text @d13 3 a15 3 Index: ratbox-services-1.0.1/include/config.h --- ratbox-services-1.0.1/include/config.h.orig 2005-05-23 17:01:31 +0200 +++ ratbox-services-1.0.1/include/config.h 2005-05-23 19:30:44 +0200 @ 1.19 log @upgrading package: ratbox 2.1.3 -> 2.1.5 @ text @d1 3 a3 3 Index: ircd-ratbox-2.1.5/modules/Makefile.in --- ircd-ratbox-2.1.5/modules/Makefile.in.orig 2005-01-14 18:25:51 +0100 +++ ircd-ratbox-2.1.5/modules/Makefile.in 2005-04-13 15:30:42 +0200 @ 1.18 log @modifying package: ratbox-2.1.3 20050701 -> 20050824 @ text @d1 3 a3 3 Index: ircd-ratbox-2.1.3/modules/Makefile.in --- ircd-ratbox-2.1.3/modules/Makefile.in.orig 2005-01-14 18:25:51 +0100 +++ ircd-ratbox-2.1.3/modules/Makefile.in 2005-04-13 15:30:42 +0200 @ 1.17 log @modifying package: ratbox-2.1.3 20050615 -> 20050701 @ text @d13 3 a15 3 Index: ratbox-services-1.0/include/config.h --- ratbox-services-1.0/include/config.h.orig 2005-05-23 17:01:31 +0200 +++ ratbox-services-1.0/include/config.h 2005-05-23 19:30:44 +0200 @ 1.16 log @upgrading package: ratbox 2.1.2 -> 2.1.3 @ text @d13 3 a15 3 Index: ratbox-services-1.0rc1/include/config.h --- ratbox-services-1.0rc1/include/config.h.orig 2005-05-23 17:01:31 +0200 +++ ratbox-services-1.0rc1/include/config.h 2005-05-23 19:30:44 +0200 @ 1.15 log @modifying package: ratbox-2.1.2 20050519 -> 20050523 @ text @d1 3 a3 3 Index: ircd-ratbox-2.1.2/modules/Makefile.in --- ircd-ratbox-2.1.2/modules/Makefile.in.orig 2005-01-14 18:25:51 +0100 +++ ircd-ratbox-2.1.2/modules/Makefile.in 2005-04-13 15:30:42 +0200 d13 3 a15 3 Index: ratbox-services-1.0beta3/include/config.h --- ratbox-services-1.0beta3/include/config.h.orig 2005-05-23 17:01:31 +0200 +++ ratbox-services-1.0beta3/include/config.h 2005-05-23 19:30:44 +0200 @ 1.14 log @patch taken over by upstream author @ text @d13 3 a15 3 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 @ 1.13 log @upgrade to latest ratbox-services CVS snapshot @ text @a12 48 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 @ 1.12 log @upgrading package: ratbox 2.1.1 -> 2.1.2 @ text @d13 60 @ 1.11 log @upstream author tool over our changes (just with different names) @ text @d1 3 a3 3 Index: ircd-ratbox-2.1.1/modules/Makefile.in --- ircd-ratbox-2.1.1/modules/Makefile.in.orig 2005-01-14 18:25:51 +0100 +++ ircd-ratbox-2.1.1/modules/Makefile.in 2005-04-13 15:30:42 +0200 @ 1.10 log @refine NOVOICES to REFUSEVOICES/SHUTUPVOICES @ text @a12 130 Index: ratbox-services/help/chanserv/set --- ratbox-services/help/chanserv/set.orig 2005-04-25 09:36:09 +0200 +++ ratbox-services/help/chanserv/set 2005-05-02 15:15:38 +0200 @@@@ -4,7 +4,8 @@@@ automatically enabled by NOOPS/NOVOICES. NOOPS [on|off]: Disallow any user being opped. RESTRICTOPS [on|off]: Disallow any users without OP access being opped. - NOVOICES [on|off]: Disallow any user being voiced. + REFUSEVOICES [on|off]: Disallow any user being voiced. + SHUTUPVOICES [on|off]: Disallow any user stay voiced. WARNOVERRIDE [on|off]: Warns chanops when INVITE/GETKEY are used. Requires AUTOJOIN. CREATEMODES [modes] : Channel modes used on channel creation. Set to "+" Index: ratbox-services/include/s_chanserv.h --- ratbox-services/include/s_chanserv.h.orig 2005-04-18 16:59:22 +0200 +++ ratbox-services/include/s_chanserv.h 2005-05-02 15:15:38 +0200 @@@@ -11,12 +11,13 @@@@ #define CS_FLAGS_AUTOJOIN 0x0004 #define CS_FLAGS_WARNOVERRIDE 0x0008 #define CS_FLAGS_RESTRICTOPS 0x0010 -#define CS_FLAGS_NOVOICES 0x0020 +#define CS_FLAGS_REFUSEVOICES 0x0020 +#define CS_FLAGS_SHUTUPVOICES 0x0040 /* those flags shown in CHANSERV::INFO */ #define CS_FLAGS_SHOW (CS_FLAGS_NOOPS|CS_FLAGS_AUTOJOIN|\ CS_FLAGS_WARNOVERRIDE|CS_FLAGS_RESTRICTOPS|\ - CS_FLAGS_NOVOICES) + CS_FLAGS_REFUSEVOICES|CS_FLAGS_SHUTUPVOICES) /* Flags not stored in the DB: 0xFFFF0000 */ #define CS_FLAGS_NEEDUPDATE 0x00010000 Index: ratbox-services/src/s_chanserv.c --- ratbox-services/src/s_chanserv.c.orig 2005-05-02 12:43:09 +0200 +++ ratbox-services/src/s_chanserv.c 2005-05-02 15:15:38 +0200 @@@@ -941,7 +941,7 @@@@ return 0; /* only thing we're testing here.. */ - if(!(chreg_p->flags & CS_FLAGS_NOVOICES)) + if(!(chreg_p->flags & CS_FLAGS_SHUTUPVOICES)) return 0; modebuild_start(chanserv_p, chptr); @@@@ -1127,7 +1127,7 @@@@ hit++; } - if(is_voiced(member_p) && (chreg_p->flags & CS_FLAGS_NOVOICES)) + if(is_voiced(member_p) && (chreg_p->flags & CS_FLAGS_SHUTUPVOICES)) { if(dlink_list_length(&chptr->users) == 1) enable_autojoin(chreg_p); @@@@ -1155,7 +1155,7 @@@@ } else if(mreg_p->flags & CS_MEMBER_AUTOVOICE && !is_voiced(member_p) && - !(chreg_p->flags & CS_FLAGS_NOVOICES)) + !(chreg_p->flags & (CS_FLAGS_REFUSEVOICES|CS_FLAGS_SHUTUPVOICES))) { modebuild_add(DIR_ADD, "v", member_p->client_p->name); @@@@ -1223,7 +1223,7 @@@@ } else if(mreg_p->flags & CS_MEMBER_AUTOVOICE && !is_voiced(member_p) && - !(chreg_p->flags & CS_FLAGS_NOVOICES)) + !(chreg_p->flags & (CS_FLAGS_REFUSEVOICES|CS_FLAGS_SHUTUPVOICES))) { sendto_server(":%s MODE %s +v %s", chanserv_p->name, chptr->name, @@@@ -2103,9 +2103,14 @@@@ return 1; } - else if(!strcasecmp(parv[1], "NOVOICES")) + else if(!strcasecmp(parv[1], "REFUSEVOICES")) { - retval = s_chan_set_flag(client_p, chreg_p, parv[1], arg, CS_FLAGS_NOVOICES); + s_chan_set_flag(client_p, chreg_p, parv[1], arg, CS_FLAGS_REFUSEVOICES); + return 1; + } + else if(!strcasecmp(parv[1], "SHUTUPVOICES")) + { + retval = s_chan_set_flag(client_p, chreg_p, parv[1], arg, CS_FLAGS_SHUTUPVOICES); if(retval == 1) { @@@@ -2398,15 +2403,23 @@@@ if((reg_p = verify_member_reg_name(client_p, &chptr, parv[0], S_C_USER)) == NULL) return 1; - /* noone is allowed to be voiced.. */ - if(reg_p->channel_reg->flags & CS_FLAGS_NOVOICES) + /* noone is allowed to receive voice... */ + if(reg_p->channel_reg->flags & (CS_FLAGS_REFUSEVOICES)) { service_error(chanserv_p, client_p, - "Channel %s is set NOVOICES", + "Channel %s is set REFUSEVOICES", reg_p->channel_reg->name); return 1; } + /* noone is allowed to keep voice... */ + if(reg_p->channel_reg->flags & (CS_FLAGS_SHUTUPVOICES)) + { + service_error(chanserv_p, client_p, + "Channel %s is set SHUTUPVOICES", + reg_p->channel_reg->name); + return 1; + } if((msptr = find_chmember(chptr, client_p)) == NULL) { @@@@ -2902,11 +2915,12 @@@@ if(chreg_p->flags & CS_FLAGS_SHOW) service_send(chanserv_p, client_p, conn_p, - "[%s] Settings: %s%s%s%s%s", + "[%s] Settings: %s%s%s%s%s%s", chreg_p->name, (chreg_p->flags & CS_FLAGS_AUTOJOIN) ? "AUTOJOIN " : "", (chreg_p->flags & CS_FLAGS_NOOPS) ? "NOOPS " : "", - (chreg_p->flags & CS_FLAGS_NOVOICES) ? "NOVOICES " : "", + (chreg_p->flags & CS_FLAGS_REFUSEVOICES) ? "REFUSEVOICES " : "", + (chreg_p->flags & CS_FLAGS_SHUTUPVOICES) ? "SHUTUPVOICES " : "", (chreg_p->flags & CS_FLAGS_RESTRICTOPS) ? "RESTRICTOPS " : "", (chreg_p->flags & CS_FLAGS_WARNOVERRIDE) ? "WARNOVERRIDE" : ""); @ 1.9 log @upgrading package: ratbox 2.0.8 -> 2.1.1 @ text @d13 130 @ 1.8 log @upstream author took over our NOVOICE feature and remove our conflicting login_nick_only patch @ text @d1 3 a3 3 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 15:30:42 +0200 a12 24 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]); 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)) @ 1.7 log @add ChanServ NOVOICE flag for allowing a manual voice control on a channel @ text @a36 145 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; int umax_logins; + int login_nick_only; /* chanserv */ int disable_cregister; 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; + config_file.login_nick_only = 0; config_file.disable_cregister = 0; config_file.cregister_time = 60; 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 }, + { "login_nick_only", CF_YESNO, NULL, 0, &config_file.login_nick_only }, { "\0", 0, NULL, 0, NULL } }; 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; } + if(config_file.login_nick_only && + strcmp(parv[0], client_p->name) != 0) + { + service_error(userserv_p, client_p, + "Login failed, username %s does not match nickname %s", + parv[0], client_p->name); + return 1; + } + password = get_crypt(parv[1], reg_p->password); if(strcmp(password, reg_p->password)) Index: ratbox-services/help/chanserv/set --- ratbox-services/help/chanserv/set.orig 2005-04-07 01:00:11 +0200 +++ ratbox-services/help/chanserv/set 2005-04-18 10:05:31 +0200 @@@@ -1,8 +1,9 @@@@ -SET