From ada71328a984fa145ddb27c8e6f2ca80dbb9524e Mon Sep 17 00:00:00 2001 From: "trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b" Date: Sun, 19 Dec 2004 17:42:17 +0000 Subject: [PATCH] BUILD : 1.7.6 (489) BUGS : 244, 246, 247, 248, 249, 250, 251, 252, 254, 255 NOTES : 1. In some cases READONLY was not respected, and data was saved. 2. Corrected a few mistakes in example.conf. 3. Wrong column type in tables.sql for nick alias status fiag. 4. listchans and listnicks work under Cygwin. 5. NickRegDelay no longer accepts negative values. 6. -is44 option not show if converter not built. 7. Removed #ifndef STREAMLINE from the code as its no longer set during build time 8. MS MAX LIMIT was set incorrectly 9. Segfault if USERDB enabled and tables does not exist 10. Provides clear message of SUPERADMIN is not enabled git-svn-id: svn://svn.anope.org/anope/trunk@489 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@343 5417fbe8-f217-4b02-8779-1006273d7864 --- Changes | 11 +++++++++++ Changes.lang | 1 + Makefile.in | 3 ++- configure | 31 +++++++++++++++++++++++-------- configure.in | 38 ++++++++++++++++++++++++++++---------- data/example.conf | 4 ++-- data/tables.sql | 2 +- include/services.h | 2 +- lang/cat.l | 2 ++ lang/de.l | 3 ++- lang/en_us.l | 2 ++ lang/es.l | 3 +++ lang/fr.l | 3 +++ lang/gr.l | 3 +++ lang/hun.l | 3 +++ lang/it.l | 3 +++ lang/nl.l | 2 ++ lang/pl.l | 3 +++ lang/pt.l | 3 +++ lang/ru.l | 3 +++ lang/tr.l | 3 +++ src/Makefile | 16 +++++++--------- src/config.c | 2 +- src/init.c | 2 ++ src/main.c | 26 +++++++++++++++++--------- src/mysql.c | 16 ++++++++++++++++ src/news.c | 12 ++++++++---- src/nickserv.c | 4 ---- src/operserv.c | 10 ++++------ src/servers.c | 2 -- src/users.c | 6 ------ version.log | 15 ++++++++++++++- 32 files changed, 173 insertions(+), 66 deletions(-) diff --git a/Changes b/Changes index 31c58efc3..2b4752e8b 100644 --- a/Changes +++ b/Changes @@ -13,6 +13,14 @@ Provided by Anope Dev. - 2004 11/19 A Added anope_cmd_ctcp() to code API, for sending CTCP messages. [ #00] 11/18 A Unable to use registered nicknames as bot nicks from now on. [ #00] 11/18 A NSAddAccessOnReg to control access list on registration. [ #00] +12/19 F Segfault if USERDB enabled and tables don't exist [#255] +12/18 F Now only builds the ircd you selected. [ #00] +12/17 F In some cases READONLY was not respected, and data was saved. [#244] +12/17 F Corrected a few mistakes in example.conf. [#251] +12/17 F Wrong column type in tables.sql for nick alias status fiag. [#248] +12/17 F listchans and listnicks work under Cygwin. [#247] +12/17 F NickRegDelay no longer accepts negative values. [#250] +12/17 F -is44 option not show if converter not built. [#249] 12/11 F Fixed possible crashbug (NULL-free) in nickserv's delcore(). [ #00] 12/09 F Hybrid crash on unsetting registration mode. [ #00] 12/09 F BotServ !seen not recognizing founder. [#167] @@ -54,6 +62,9 @@ Provided by DrStein - 2004 11/23 F Moving Services Operators to Services Admins and vice-versa. [#230] 11/22 F HelpChan +h mode not being given if status was greater then op. [#223] +Provided by Jens Hoffrichter - 2004 +12/17 F Provides clear message of SUPERADMIN is not enabled. [#246] + Anope Version 1.7.6 ------------------- Provided by Anope Dev. - 2004 diff --git a/Changes.lang b/Changes.lang index 97243393e..26018fa84 100644 --- a/Changes.lang +++ b/Changes.lang @@ -15,6 +15,7 @@ Anope Version S V N OPER_SET_LIST_OPTION_ON OPER_SET_LIST_OPTION_OFF OPER_HELP_SET_LIST + OPER_SUPER_ADMIN_NOT_ENABLED *** Mod Strings: diff --git a/Makefile.in b/Makefile.in index cf5aa6e1c..73b25df79 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,6 +16,7 @@ MYSQL=@MYSQL@ RDB=@RDB@ LDFLAGS=@LDFLAGS@ RUNGROUP=@RUNGROUP@ +IRCDFILE=@IRCDFILE@ all: language headers build modules strict: language headers strict_build strict_modules @@ -25,7 +26,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ 'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \ 'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \ 'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' 'RDB=${RDB}'\ - 'MYSQL=${MYSQL}' + 'MYSQL=${MYSQL}' 'IRCDFILE=${IRCDFILE}' build: @for i in $(SUBDIRS); do \ diff --git a/configure b/configure index b53440450..f6b282005 100755 --- a/configure +++ b/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RM CP TOUCH INSTALL CPP EGREP MYSQL RDB MYSQLCLIENT_LDFLAGS MYSQLCLIENT_CFLAGS MYSQLCLIENT_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS ANOPELIBS RUNGROUP BINDEST DATDEST MODULE_PATH LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RM CP TOUCH INSTALL CPP EGREP MYSQL RDB MYSQLCLIENT_LDFLAGS MYSQLCLIENT_CFLAGS MYSQLCLIENT_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS ANOPELIBS RUNGROUP BINDEST DATDEST MODULE_PATH IRCDFILE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -8513,72 +8513,86 @@ fi; if test "${with_ircd+set}" = set; then withval="$with_ircd" - if test "$withval" = "IRC_DREAMFORGE"; then - -cat >>confdefs.h <<\_ACEOF -#define IRC_DREAMFORGE 1 -_ACEOF - - elif test "$withval" = "IRC_BAHAMUT"; then + if test "$withval" = "IRC_BAHAMUT"; then cat >>confdefs.h <<\_ACEOF #define IRC_BAHAMUT 1 _ACEOF + IRCDFILE=" bahamut.c " + elif test "$withval" = "IRC_UNREAL31"; then cat >>confdefs.h <<\_ACEOF #define IRC_UNREAL31 1 _ACEOF + IRCDFILE=" unreal31.c " + elif test "$withval" = "IRC_ULTIMATE2"; then cat >>confdefs.h <<\_ACEOF #define IRC_ULTIMATE2 1 _ACEOF + IRCDFILE=" ultimate2.c " + elif test "$withval" = "IRC_ULTIMATE3"; then cat >>confdefs.h <<\_ACEOF #define IRC_ULTIMATE3 1 _ACEOF + IRCDFILE=" ultimate3.c " + elif test "$withval" = "IRC_HYBRID"; then cat >>confdefs.h <<\_ACEOF #define IRC_HYBRID 1 _ACEOF + IRCDFILE=" hybrid.c " + elif test "$withval" = "IRC_VIAGRA"; then cat >>confdefs.h <<\_ACEOF #define IRC_VIAGRA 1 _ACEOF + IRCDFILE=" viagra.c " + elif test "$withval" = "IRC_PTLINK"; then cat >>confdefs.h <<\_ACEOF #define IRC_PTLINK 1 _ACEOF + IRCDFILE=" ptlink.c " + elif test "$withval" = "IRC_RAGE2"; then cat >>confdefs.h <<\_ACEOF #define IRC_RAGE2 1 _ACEOF + IRCDFILE=" rageircd.c " + elif test "$withval" = "IRC_UNREAL32"; then cat >>confdefs.h <<\_ACEOF #define IRC_UNREAL32 1 _ACEOF + IRCDFILE=" unreal32.c " + elif test "$withval" = "IRC_SOLID"; then cat >>confdefs.h <<\_ACEOF #define IRC_SOLID 1 _ACEOF + IRCDFILE=" solidircd.c " + fi @@ -9248,6 +9262,7 @@ s,@RUNGROUP@,$RUNGROUP,;t t s,@BINDEST@,$BINDEST,;t t s,@DATDEST@,$DATDEST,;t t s,@MODULE_PATH@,$MODULE_PATH,;t t +s,@IRCDFILE@,$IRCDFILE,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/configure.in b/configure.in index f821a414e..448ef60f0 100644 --- a/configure.in +++ b/configure.in @@ -193,28 +193,46 @@ AC_SUBST(DATDEST) AC_SUBST(MODULE_PATH) AC_ARG_WITH(ircd, [ --with-ircd=ircd Specify the first ircd type], [ - if test "$withval" = "IRC_DREAMFORGE"; then - AC_DEFINE(IRC_DREAMFORGE,1,"Frist IRCD type") - elif test "$withval" = "IRC_BAHAMUT"; then + if test "$withval" = "IRC_BAHAMUT"; then AC_DEFINE(IRC_BAHAMUT,1,"First IRCD type") + IRCDFILE=" bahamut.c " + AC_SUBST(IRCDFILE) elif test "$withval" = "IRC_UNREAL31"; then - AC_DEFINE(IRC_UNREAL31,1,"First IRCD type") + AC_DEFINE(IRC_UNREAL31,1,"First IRCD type") + IRCDFILE=" unreal31.c " + AC_SUBST(IRCDFILE) elif test "$withval" = "IRC_ULTIMATE2"; then - AC_DEFINE(IRC_ULTIMATE2,1,"First IRCD type") + AC_DEFINE(IRC_ULTIMATE2,1,"First IRCD type") + IRCDFILE=" ultimate2.c " + AC_SUBST(IRCDFILE) elif test "$withval" = "IRC_ULTIMATE3"; then - AC_DEFINE(IRC_ULTIMATE3,1,"First IRCD type") + AC_DEFINE(IRC_ULTIMATE3,1,"First IRCD type") + IRCDFILE=" ultimate3.c " + AC_SUBST(IRCDFILE) elif test "$withval" = "IRC_HYBRID"; then AC_DEFINE(IRC_HYBRID,1,"First IRCD type") + IRCDFILE=" hybrid.c " + AC_SUBST(IRCDFILE) elif test "$withval" = "IRC_VIAGRA"; then - AC_DEFINE(IRC_VIAGRA,1,"First IRCD type") + AC_DEFINE(IRC_VIAGRA,1,"First IRCD type") + IRCDFILE=" viagra.c " + AC_SUBST(IRCDFILE) elif test "$withval" = "IRC_PTLINK"; then AC_DEFINE(IRC_PTLINK,1,"First IRCD type") + IRCDFILE=" ptlink.c " + AC_SUBST(IRCDFILE) elif test "$withval" = "IRC_RAGE2"; then - AC_DEFINE(IRC_RAGE2,1,"First IRCD type") + AC_DEFINE(IRC_RAGE2,1,"First IRCD type") + IRCDFILE=" rageircd.c " + AC_SUBST(IRCDFILE) elif test "$withval" = "IRC_UNREAL32"; then - AC_DEFINE(IRC_UNREAL32,1,"First IRCD type") + AC_DEFINE(IRC_UNREAL32,1,"First IRCD type") + IRCDFILE=" unreal32.c " + AC_SUBST(IRCDFILE) elif test "$withval" = "IRC_SOLID"; then - AC_DEFINE(IRC_SOLID,1,"First IRCD type") + AC_DEFINE(IRC_SOLID,1,"First IRCD type") + IRCDFILE=" solidircd.c " + AC_SUBST(IRCDFILE) fi ]) diff --git a/data/example.conf b/data/example.conf index 49d751adc..288c694ce 100644 --- a/data/example.conf +++ b/data/example.conf @@ -664,7 +664,7 @@ ProxyTestServer "1.2.3.4" 6667 # ProxyExpire