From 2278e8c77bd2d713fda3591a9d3fa1732d7c9f6a Mon Sep 17 00:00:00 2001 From: "trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b" Date: Tue, 8 Mar 2005 05:45:40 +0000 Subject: BUILD : 1.7.8 (607) BUGS : N/A NOTES : Clean up after proxy was removed, some Win32 touch ups git-svn-id: svn://svn.anope.org/anope/trunk@607 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@455 5417fbe8-f217-4b02-8779-1006273d7864 --- Changes.mysql | 1 + Makefile.win32 | 161 ++++++++++++++++++++++++++++++++++ data/tables.sql | 13 --- makefile.inc.win32 | 4 +- makefile.win32 | 162 ----------------------------------- src/modules/catserv/catserv_extern.h | 4 + src/mysql.c | 4 +- src/operserv.c | 2 +- version.log | 6 +- 9 files changed, 176 insertions(+), 181 deletions(-) create mode 100644 Makefile.win32 delete mode 100644 makefile.win32 diff --git a/Changes.mysql b/Changes.mysql index 2dbb0827d..01cd74b55 100644 --- a/Changes.mysql +++ b/Changes.mysql @@ -1,5 +1,6 @@ Anope Version S V N ------------------- +- DROP TABLE `anope_os_hcache`; Anope Version 1.7.8 ------------------- diff --git a/Makefile.win32 b/Makefile.win32 new file mode 100644 index 000000000..674a57620 --- /dev/null +++ b/Makefile.win32 @@ -0,0 +1,161 @@ +# Makefile for Anope. +# +# (C) 2003-2005 Anope Team +# Contact us at info@anope.org +# +# This program is free but copyrighted software; see the file COPYING for +# details. +# +# Based on the original code of Epona by Lara. +# Based on the original code of Services by Andy Church. + +include Makefile.inc.win32 + +########################################################################### + +all: src languages anopesmtp modules install + +src: include\version.h include\sysconf.h include\language.h include\sysconf.h + cd src && $(MAKE) && cd .. + +install: + -@mkdir $(DATDEST)\backups + -@mkdir $(DATDEST)\logs + -@mkdir $(DATDEST)\languages + cd lang && $(MAKE) install && cd .. + cd src && $(MAKE) install && cd .. + cd src\modules && $(MAKE) install && cd .. + cd src\modules && $(MAKE) subs-install && cd .. + -@echo --- + -@echo Anope has been insalled successfully! + -@echo --- + +clean: + cd src && $(MAKE) spotless && cd .. + cd lang && $(MAKE) spotless && cd .. + -@erase *.exe version.h *.obj + cd src\modules && $(MAKE) spotless && cd ..\.. + +spotless: + cd lang && $(MAKE) spotless && cd .. + cd src && $(MAKE) spotless && cd .. + cd src\modules && $(MAKE) spotless && cd ..\.. + -@erase include\language.h include\version.h *~ services.exe version.sh.exe *.obj anopesmtp.exe + +mypasql: + $(MYPASQL_BUILD) + +distclean: spotless + +dist: + $(MAKE) clean +#Compile dreamforge + echo Compiling Dreamforge build + $(MAKE) IRCTYPE=/DIRC_DREAMFORGE CAPAB_C=dreamforge.c CAPAB_O=dreamforge.obj + -@copy src\$(PROGRAM) services-dreamforge.exe + $(MAKE) clean +#Compile bahamut + echo Compiling Bahamut build + $(MAKE) IRCTYPE=/DIRC_BAHAMUT CAPAB_C=bahamut.c CAPAB_O=bahamut.obj + -@copy src\$(PROGRAM) services-bahamut.exe + $(MAKE) clean +#Compile unreal + echo Compiling UnrealIRCd3.1 build + $(MAKE) IRCTYPE=/DIRC_UNREAL31 CAPAB_C=unreal31.c CAPAB_O=unreal31.obj + -@copy src\$(PROGRAM) services-unreal31.exe + $(MAKE) clean +#Compile ultimate2 + echo Compiling UltimateIRCd2 build + $(MAKE) IRCTYPE=/DIRC_ULTIMATE2 CAPAB_C=ultimate2.c CAPAB_O=ultimate2.obj + -@copy src\$(PROGRAM) services-ultimate2.exe + $(MAKE) clean +#Compile ultimate3 + echo Compiling UltimateIRCd 3.x build + $(MAKE) IRCTYPE=/DIRC_ULTIMATE3 CAPAB_C=ultimate3.c CAPAB_O=ultimate3.obj + -@copy src\$(PROGRAM) services-ultimate3.exe + $(MAKE) clean +#Compile hybrid + echo Compiling Hybrid build + $(MAKE) IRCTYPE=/DIRC_HYBRID CAPAB_C=hybrid.c CAPAB_O=hybrid.obj + -@copy src\$(PROGRAM) services-hybrid.exe + $(MAKE) clean +#Compile viagra + echo Compiling ViagraIRCd build + $(MAKE) IRCTYPE=/DIRC_VIAGRA CAPAB_C=viagra.c CAPAB_O=viagra.obj + -@copy src\$(PROGRAM) services-viagra.exe + $(MAKE) clean +#Compile ptlink + echo Compiling PTLink IRCd build + $(MAKE) IRCTYPE=/DIRC_PTLINK CAPAB_C=ptlink.c CAPAB_O=ptlink.obj + -@copy src\$(PROGRAM) services-ptlink.exe + $(MAKE) clean +#Compile rage2 + echo Compiling Rage2 IRCd build + $(MAKE) IRCTYPE=/DIRC_RAGE2 CAPAB_C=rageircd.c CAPAB_O=rageircd.obj + -@copy src\$(PROGRAM) services-rage2.exe + $(MAKE) clean +#Compile UnrealIRCD3.2 + echo Compiling UnrealIRCD3.2 IRCd build + $(MAKE) IRCTYPE=/DIRC_UNREAL32 CAPAB_C=unreal32.c CAPAB_O=unreal32.obj + -@copy src\$(PROGRAM) services-unreal32.exe + $(MAKE) clean +#Compile SolidIRCD + echo Compiling SolidIRCD IRCd build + $(MAKE) IRCTYPE=/DIRC_SOLID CAPAB_C=solidircd.c CAPAB_O=solidircd.obj + -@copy src\$(PROGRAM) services-solid.exe + $(MAKE) clean +#Compile PlexusIRCD + echo Compiling Plexus IRCd build + $(MAKE) IRCTYPE=/DIRC_PLEXUS CAPAB_C=plexus.c CAPAB_O=plexus.obj + -@copy src\$(PROGRAM) services-plexus.exe + $(MAKE) clean +#Compile Ratbox + echo Compiling Ratbox IRCd build + $(MAKE) IRCTYPE=/DIRC_RATBOX CAPAB_C=ratbox.c CAPAB_O=ratbox.obj + -@copy src\$(PROGRAM) services-ratbox.exe +#Compile ShadowIRCD + echo Compiling Shadow IRCd build + $(MAKE) IRCTYPE=/DIRC_SHADOWIRCD CAPAB_C=shadowircd.c CAPAB_O=shadwoircd.obj + -@copy src\$(PROGRAM) services-shadowircd.exe + +#Compile mypasql + $(MYPASQL_BUILD) + +#Cleanup + $(MAKE) spotless + + +########################################################################### + + +languages: FRC + cd lang && $(MAKE) && cd .. + +anopesmtp: FRC + $(CC) src\tools\anopesmtp.c /link wsock32.lib $(LFLAGS) + +modules: FRC + cd src\modules && $(MAKE) && cd ..\.. + +########################################################################### + +include\sysconf.h: + copy include\sysconf.h.win32 include\sysconf.h + +lang\language.h: lang\Makefile lang\index + cd lang && $(MAKE) language.h && cd .. + +lang\index: + cd lang && $(MAKE) index && cd .. + +include\language.h: lang\language.h + cd lang && copy language.h ..\include\language.h && cd .. + +include\version.h: version.sh.exe version.log include\services.h include\pseudo.h include\messages.h include\pseudo.h include\messages.h + version.sh.exe + copy version.h include\version.h + +version.sh.exe: + $(CC) include\version.sh.c + +FRC: diff --git a/data/tables.sql b/data/tables.sql index 342367e26..d3170c9a1 100644 --- a/data/tables.sql +++ b/data/tables.sql @@ -296,19 +296,6 @@ CREATE TABLE anope_os_exceptions ( PRIMARY KEY (oe_id) ) TYPE=MyISAM; --- --- Table structure for table `anope_os_hcache` --- - -DROP TABLE IF EXISTS anope_os_hcache; -CREATE TABLE anope_os_hcache ( - oh_id int(11) NOT NULL auto_increment, - mask text NOT NULL, - status int(11) NOT NULL default '0', - used int(11) NOT NULL default '0', - PRIMARY KEY (oh_id) -) TYPE=MyISAM; - -- -- Table structure for table `anope_os_news` -- diff --git a/makefile.inc.win32 b/makefile.inc.win32 index ea65d1abb..b10b1656d 100644 --- a/makefile.inc.win32 +++ b/makefile.inc.win32 @@ -1,5 +1,5 @@ # -# Anope IRC Services 1.7.7 for Windows +# Anope IRC Services 1.7.8 for Windows # # Contact us at info@anope.org # @@ -67,7 +67,7 @@ LFLAGS=/LIBPATH:"$(LIBPATH)" CC=cl RC=rc -MAKE=nmake -f makefile.win32 +MAKE=nmake -f Makefile.win32 BASE_CFLAGS=/O2 /MD LIBS=wsock32.lib advapi32.lib /NODEFAULTLIB:libcmtd.lib ELIBS= diff --git a/makefile.win32 b/makefile.win32 deleted file mode 100644 index 4d2a6419c..000000000 --- a/makefile.win32 +++ /dev/null @@ -1,162 +0,0 @@ -# Makefile for Anope. -# -# (C) 2003-2005 Anope Team -# Contact us at info@anope.org -# -# This program is free but copyrighted software; see the file COPYING for -# details. -# -# Based on the original code of Epona by Lara. -# Based on the original code of Services by Andy Church. - -include Makefile.inc.win32 - -########################################################################### - -all: src languages anopesmtp modules install - -src: include\version.h include\sysconf.h include\language.h include\sysconf.h - cd src && $(MAKE) && cd .. - -install: - -@mkdir $(DATDEST)\backups - -@mkdir $(DATDEST)\logs - -@mkdir $(DATDEST)\languages - cd lang && $(MAKE) install && cd .. - cd src && $(MAKE) install && cd .. - cd src\modules && $(MAKE) install && cd .. - cd src\modules && $(MAKE) subs-install && cd .. - -@echo --- - -@echo Anope has been insalled successfully! - -@echo --- - -clean: - cd src && $(MAKE) spotless && cd .. - cd lang && $(MAKE) spotless && cd .. - -@erase src\*.exe - -@erase *.exe version.h *.obj - cd src/modules && $(MAKE) spotless && cd ../.. - -spotless: - cd lang && $(MAKE) spotless && cd .. - cd src && $(MAKE) spotless && cd .. - cd src/modules && $(MAKE) spotless && cd ../.. - -@erase include\language.h include\version.h *~ services.exe version.sh.exe *.obj anopesmtp.exe - -mypasql: - $(MYPASQL_BUILD) - -distclean: spotless - -dist: - $(MAKE) clean -#Compile dreamforge - echo Compiling Dreamforge build - $(MAKE) IRCTYPE=/DIRC_DREAMFORGE CAPAB_C=dreamforge.c CAPAB_O=dreamforge.obj - -@copy src\$(PROGRAM) services-dreamforge.exe - $(MAKE) clean -#Compile bahamut - echo Compiling Bahamut build - $(MAKE) IRCTYPE=/DIRC_BAHAMUT CAPAB_C=bahamut.c CAPAB_O=bahamut.obj - -@copy src\$(PROGRAM) services-bahamut.exe - $(MAKE) clean -#Compile unreal - echo Compiling UnrealIRCd3.1 build - $(MAKE) IRCTYPE=/DIRC_UNREAL31 CAPAB_C=unreal31.c CAPAB_O=unreal31.obj - -@copy src\$(PROGRAM) services-unreal31.exe - $(MAKE) clean -#Compile ultimate2 - echo Compiling UltimateIRCd2 build - $(MAKE) IRCTYPE=/DIRC_ULTIMATE2 CAPAB_C=ultimate2.c CAPAB_O=ultimate2.obj - -@copy src\$(PROGRAM) services-ultimate2.exe - $(MAKE) clean -#Compile ultimate3 - echo Compiling UltimateIRCd 3.x build - $(MAKE) IRCTYPE=/DIRC_ULTIMATE3 CAPAB_C=ultimate3.c CAPAB_O=ultimate3.obj - -@copy src\$(PROGRAM) services-ultimate3.exe - $(MAKE) clean -#Compile hybrid - echo Compiling Hybrid build - $(MAKE) IRCTYPE=/DIRC_HYBRID CAPAB_C=hybrid.c CAPAB_O=hybrid.obj - -@copy src\$(PROGRAM) services-hybrid.exe - $(MAKE) clean -#Compile viagra - echo Compiling ViagraIRCd build - $(MAKE) IRCTYPE=/DIRC_VIAGRA CAPAB_C=viagra.c CAPAB_O=viagra.obj - -@copy src\$(PROGRAM) services-viagra.exe - $(MAKE) clean -#Compile ptlink - echo Compiling PTLink IRCd build - $(MAKE) IRCTYPE=/DIRC_PTLINK CAPAB_C=ptlink.c CAPAB_O=ptlink.obj - -@copy src\$(PROGRAM) services-ptlink.exe - $(MAKE) clean -#Compile rage2 - echo Compiling Rage2 IRCd build - $(MAKE) IRCTYPE=/DIRC_RAGE2 CAPAB_C=rageircd.c CAPAB_O=rageircd.obj - -@copy src\$(PROGRAM) services-rage2.exe - $(MAKE) clean -#Compile UnrealIRCD3.2 - echo Compiling UnrealIRCD3.2 IRCd build - $(MAKE) IRCTYPE=/DIRC_UNREAL32 CAPAB_C=unreal32.c CAPAB_O=unreal32.obj - -@copy src\$(PROGRAM) services-unreal32.exe - $(MAKE) clean -#Compile SolidIRCD - echo Compiling SolidIRCD IRCd build - $(MAKE) IRCTYPE=/DIRC_SOLID CAPAB_C=solidircd.c CAPAB_O=solidircd.obj - -@copy src\$(PROGRAM) services-solid.exe - $(MAKE) clean -#Compile PlexusIRCD - echo Compiling Plexus IRCd build - $(MAKE) IRCTYPE=/DIRC_PLEXUS CAPAB_C=plexus.c CAPAB_O=plexus.obj - -@copy src\$(PROGRAM) services-plexus.exe - $(MAKE) clean -#Compile Ratbox - echo Compiling Ratbox IRCd build - $(MAKE) IRCTYPE=/DIRC_RATBOX CAPAB_C=ratbox.c CAPAB_O=ratbox.obj - -@copy src\$(PROGRAM) services-ratbox.exe -#Compile ShadowIRCD - echo Compiling Shadow IRCd build - $(MAKE) IRCTYPE=/DIRC_SHADOWIRCD CAPAB_C=shadowircd.c CAPAB_O=shadwoircd.obj - -@copy src\$(PROGRAM) services-shadowircd.exe - -#Compile mypasql - $(MYPASQL_BUILD) - -#Cleanup - $(MAKE) spotless - - -########################################################################### - - -languages: FRC - cd lang && $(MAKE) && cd .. - -anopesmtp: FRC - $(CC) src/tools/anopesmtp.c /link wsock32.lib $(LFLAGS) - -modules: FRC - cd src\modules && $(MAKE) && cd ..\.. - -########################################################################### - -include\sysconf.h: - copy include\sysconf.h.win32 include\sysconf.h - -lang/language.h: lang/Makefile lang/index - cd lang && $(MAKE) language.h && cd .. - -lang/index: - cd lang && $(MAKE) index && cd .. - -include/language.h: lang/language.h - cd lang && copy language.h ..\include\language.h && cd .. - -include\version.h: version.sh.exe version.log include\services.h include\pseudo.h include\messages.h include\pseudo.h include\messages.h - version.sh.exe - copy version.h include\version.h - -version.sh.exe: - $(CC) include/version.sh.c - -FRC: diff --git a/src/modules/catserv/catserv_extern.h b/src/modules/catserv/catserv_extern.h index 08c76da17..02c21addb 100644 --- a/src/modules/catserv/catserv_extern.h +++ b/src/modules/catserv/catserv_extern.h @@ -1,7 +1,11 @@ #ifndef CATSERV_DEFS_H #define CATSERV_DEFS_H +#ifdef _WIN32 +extern __declspec(dllexport) char *s_CatServ; +#else E char *s_CatServ; +#endif #endif diff --git a/src/mysql.c b/src/mysql.c index d07a4648a..4eadae97a 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -644,7 +644,7 @@ void db_mysql_save_os_db(unsigned int maxucnt, unsigned int maxutime, Akill *t_ak; SXLine *t_sl; char *takuser, *takhost, *takby, *takreason, *tslmask, *tslby, - *tslreason, *thchost; + *tslreason; int i, j; @@ -1016,7 +1016,7 @@ void db_mysql_load_os_dbase(void) char sqlcmd[MAX_SQL_BUF]; Akill *ak; SXLine *sx; - int akc, sgc, sqc, szc, j; + int akc, sgc, sqc, szc; if (!do_mysql) return; diff --git a/src/operserv.c b/src/operserv.c index 390f0a11a..4f189b560 100644 --- a/src/operserv.c +++ b/src/operserv.c @@ -490,7 +490,7 @@ static void load_old_akill(void) void load_os_dbase(void) { dbFILE *f; - int16 i, ver, c; + int16 i, ver; uint16 tmp16, n; uint32 tmp32; char *s; diff --git a/version.log b/version.log index ebe997245..a38c69d57 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="8" -VERSION_BUILD="606" +VERSION_BUILD="607" # $Log$ # +# BUILD : 1.7.8 (607) +# BUGS : N/A +# NOTES : Clean up after proxy was removed, some Win32 touch ups +# # BUILD : 1.7.8 (606) # BUGS : # NOTES : Removed proxy detector code from the core, threads stuff still there. Needs good testing -- cgit