From: <ps...@us...> - 2011-01-05 19:41:01
|
Revision: 2248 http://znc.svn.sourceforge.net/znc/?rev=2248&view=rev Author: psychon Date: 2011-01-05 19:40:54 +0000 (Wed, 05 Jan 2011) Log Message: ----------- Use AC_DEFINE for -D-style definitions Modified Paths: -------------- trunk/configure trunk/configure.in Modified: trunk/configure =================================================================== --- trunk/configure 2011-01-05 19:08:07 UTC (rev 2247) +++ trunk/configure 2011-01-05 19:40:54 UTC (rev 2248) @@ -2971,7 +2971,8 @@ # Check whether --enable-run-from-source was given. if test "${enable_run_from_source+set}" = set; then : enableval=$enable_run_from_source; if test "x$enableval" = "xyes" ; then - appendCXX -DRUN_FROM_SOURCE + $as_echo "#define RUN_FROM_SOURCE 1" >>confdefs.h + fi RUNFROMSOURCE="$enableval" else @@ -2987,9 +2988,15 @@ if test "$DEBUG" != "no"; then - appendCXX -ggdb -D_DEBUG + $as_echo "#define _DEBUG 1" >>confdefs.h + # These enable some debug options in g++'s STL, e.g. invalid use of iterators - appendCXX -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_CONCEPT_CHECKS + $as_echo "#define _GLIBCXX_DEBUG 1" >>confdefs.h + + $as_echo "#define _GLIBCXX_DEBUG_PEDANTIC 1" >>confdefs.h + + $as_echo "#define _GLIBCXX_CONCEPT_CHECKS 1" >>confdefs.h + else if test "x$OPTIMIZE" = "xyes"; then appendCXX -O2 @@ -2997,7 +3004,8 @@ fi if test "$IPV6" != "no"; then - appendCXX -DHAVE_IPV6 + $as_echo "#define HAVE_IPV6 1" >>confdefs.h + fi if test "x$GXX" = "xyes"; then @@ -3005,7 +3013,8 @@ fi if test "$POLL" = "yes"; then - appendCXX -DCSOCK_USE_POLL + $as_echo "#define CSOCK_USE_POLL 1" >>confdefs.h + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getopt_long in -lgnugetopt" >&5 @@ -3055,7 +3064,8 @@ ac_fn_cxx_check_func "$LINENO" "lstat" "ac_cv_func_lstat" if test "x$ac_cv_func_lstat" = x""yes; then : - appendCXX -DHAVE_LSTAT + $as_echo "#define HAVE_LSTAT 1" >>confdefs.h + fi @@ -3340,7 +3350,9 @@ fi else - appendCXX $c_ares_CFLAGS -DHAVE_C_ARES + $as_echo "#define HAVE_C_ARES 1" >>confdefs.h + + appendCXX $c_ares_CFLAGS appendLib $c_ares_LIBS ARES=yes fi @@ -3638,7 +3650,8 @@ NOSSL=1 else - appendCXX -DHAVE_LIBSSL + $as_echo "#define HAVE_LIBSSL 1" >>confdefs.h + SSL=yes fi else Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2011-01-05 19:08:07 UTC (rev 2247) +++ trunk/configure.in 2011-01-05 19:40:54 UTC (rev 2248) @@ -124,7 +124,7 @@ AC_ARG_ENABLE( [run-from-source], AS_HELP_STRING([--enable-run-from-source], [znc will be runnable without installation]), [if test "x$enableval" = "xyes" ; then - appendCXX -DRUN_FROM_SOURCE + AC_DEFINE([RUN_FROM_SOURCE]) fi RUNFROMSOURCE="$enableval"], [RUNFROMSOURCE="no"]) @@ -134,9 +134,11 @@ [POLL="yes"]) if test "$DEBUG" != "no"; then - appendCXX -ggdb -D_DEBUG + AC_DEFINE([_DEBUG]) # These enable some debug options in g++'s STL, e.g. invalid use of iterators - appendCXX -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_CONCEPT_CHECKS + AC_DEFINE([_GLIBCXX_DEBUG]) + AC_DEFINE([_GLIBCXX_DEBUG_PEDANTIC]) + AC_DEFINE([_GLIBCXX_CONCEPT_CHECKS]) else if test "x$OPTIMIZE" = "xyes"; then appendCXX -O2 @@ -144,7 +146,7 @@ fi if test "$IPV6" != "no"; then - appendCXX -DHAVE_IPV6 + AC_DEFINE([HAVE_IPV6]) fi if test "x$GXX" = "xyes"; then @@ -152,11 +154,11 @@ fi if test "$POLL" = "yes"; then - appendCXX -DCSOCK_USE_POLL + AC_DEFINE([CSOCK_USE_POLL]) fi AC_CHECK_LIB( gnugetopt, getopt_long,) -AC_CHECK_FUNC([lstat], [appendCXX -DHAVE_LSTAT]) +AC_CHECK_FUNC([lstat], [AC_DEFINE([HAVE_LSTAT])]) PKG_PROG_PKG_CONFIG() # ----- Check for dlopen @@ -196,7 +198,8 @@ Disabling c-ares may result in a slight performance decrease but will not have any other side-effects], [c-ares was not found and thus disabled]) else - appendCXX $c_ares_CFLAGS -DHAVE_C_ARES + AC_DEFINE([HAVE_C_ARES]) + appendCXX $c_ares_CFLAGS appendLib $c_ares_LIBS ARES=yes fi @@ -230,7 +233,7 @@ [OpenSSL was not found and thus disabled]) NOSSL=1 else - appendCXX -DHAVE_LIBSSL + AC_DEFINE([HAVE_LIBSSL]) SSL=yes fi else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ps...@us...> - 2011-01-05 19:54:26
|
Revision: 2249 http://znc.svn.sourceforge.net/znc/?rev=2249&view=rev Author: psychon Date: 2011-01-05 19:54:20 +0000 (Wed, 05 Jan 2011) Log Message: ----------- Fix for autoheader autoheader wants a description for all definitions, so we have to provide one. Meh. Modified Paths: -------------- trunk/configure trunk/configure.in Modified: trunk/configure =================================================================== --- trunk/configure 2011-01-05 19:40:54 UTC (rev 2248) +++ trunk/configure 2011-01-05 19:54:20 UTC (rev 2249) @@ -2971,8 +2971,9 @@ # Check whether --enable-run-from-source was given. if test "${enable_run_from_source+set}" = set; then : enableval=$enable_run_from_source; if test "x$enableval" = "xyes" ; then - $as_echo "#define RUN_FROM_SOURCE 1" >>confdefs.h +$as_echo "#define RUN_FROM_SOURCE 1" >>confdefs.h + fi RUNFROMSOURCE="$enableval" else @@ -2988,15 +2989,19 @@ if test "$DEBUG" != "no"; then - $as_echo "#define _DEBUG 1" >>confdefs.h +$as_echo "#define _DEBUG 1" >>confdefs.h + # These enable some debug options in g++'s STL, e.g. invalid use of iterators - $as_echo "#define _GLIBCXX_DEBUG 1" >>confdefs.h - $as_echo "#define _GLIBCXX_DEBUG_PEDANTIC 1" >>confdefs.h +$as_echo "#define _GLIBCXX_DEBUG 1" >>confdefs.h - $as_echo "#define _GLIBCXX_CONCEPT_CHECKS 1" >>confdefs.h +$as_echo "#define _GLIBCXX_DEBUG_PEDANTIC 1" >>confdefs.h + + +$as_echo "#define _GLIBCXX_CONCEPT_CHECKS 1" >>confdefs.h + else if test "x$OPTIMIZE" = "xyes"; then appendCXX -O2 @@ -3004,8 +3009,9 @@ fi if test "$IPV6" != "no"; then - $as_echo "#define HAVE_IPV6 1" >>confdefs.h +$as_echo "#define HAVE_IPV6 1" >>confdefs.h + fi if test "x$GXX" = "xyes"; then @@ -3013,8 +3019,9 @@ fi if test "$POLL" = "yes"; then - $as_echo "#define CSOCK_USE_POLL 1" >>confdefs.h +$as_echo "#define CSOCK_USE_POLL 1" >>confdefs.h + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getopt_long in -lgnugetopt" >&5 @@ -3062,11 +3069,16 @@ fi -ac_fn_cxx_check_func "$LINENO" "lstat" "ac_cv_func_lstat" +for ac_func in lstat +do : + ac_fn_cxx_check_func "$LINENO" "lstat" "ac_cv_func_lstat" if test "x$ac_cv_func_lstat" = x""yes; then : - $as_echo "#define HAVE_LSTAT 1" >>confdefs.h + cat >>confdefs.h <<_ACEOF +#define HAVE_LSTAT 1 +_ACEOF fi +done @@ -3350,8 +3362,9 @@ fi else - $as_echo "#define HAVE_C_ARES 1" >>confdefs.h +$as_echo "#define HAVE_C_ARES 1" >>confdefs.h + appendCXX $c_ares_CFLAGS appendLib $c_ares_LIBS ARES=yes @@ -3650,8 +3663,9 @@ NOSSL=1 else - $as_echo "#define HAVE_LIBSSL 1" >>confdefs.h +$as_echo "#define HAVE_LIBSSL 1" >>confdefs.h + SSL=yes fi else Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2011-01-05 19:40:54 UTC (rev 2248) +++ trunk/configure.in 2011-01-05 19:54:20 UTC (rev 2249) @@ -124,7 +124,8 @@ AC_ARG_ENABLE( [run-from-source], AS_HELP_STRING([--enable-run-from-source], [znc will be runnable without installation]), [if test "x$enableval" = "xyes" ; then - AC_DEFINE([RUN_FROM_SOURCE]) + AC_DEFINE([RUN_FROM_SOURCE], [1], + [Define if ZNC should be runnable without installation]) fi RUNFROMSOURCE="$enableval"], [RUNFROMSOURCE="no"]) @@ -134,11 +135,11 @@ [POLL="yes"]) if test "$DEBUG" != "no"; then - AC_DEFINE([_DEBUG]) + AC_DEFINE([_DEBUG], [1], [Define for debugging]) # These enable some debug options in g++'s STL, e.g. invalid use of iterators - AC_DEFINE([_GLIBCXX_DEBUG]) - AC_DEFINE([_GLIBCXX_DEBUG_PEDANTIC]) - AC_DEFINE([_GLIBCXX_CONCEPT_CHECKS]) + AC_DEFINE([_GLIBCXX_DEBUG], [1], [Enable extra debugging checks in libstdc++]) + AC_DEFINE([_GLIBCXX_DEBUG_PEDANTIC], [1], [Enable extra debugging checks in libstdc++]) + AC_DEFINE([_GLIBCXX_CONCEPT_CHECKS], [1], [Enable extra debugging checks in libstdc++]) else if test "x$OPTIMIZE" = "xyes"; then appendCXX -O2 @@ -146,7 +147,7 @@ fi if test "$IPV6" != "no"; then - AC_DEFINE([HAVE_IPV6]) + AC_DEFINE([HAVE_IPV6], [1], [Define if IPv6 support is enabled]) fi if test "x$GXX" = "xyes"; then @@ -154,11 +155,11 @@ fi if test "$POLL" = "yes"; then - AC_DEFINE([CSOCK_USE_POLL]) + AC_DEFINE([CSOCK_USE_POLL], [1], [Use poll() instead of select()]) fi AC_CHECK_LIB( gnugetopt, getopt_long,) -AC_CHECK_FUNC([lstat], [AC_DEFINE([HAVE_LSTAT])]) +AC_CHECK_FUNCS([lstat]) PKG_PROG_PKG_CONFIG() # ----- Check for dlopen @@ -198,7 +199,7 @@ Disabling c-ares may result in a slight performance decrease but will not have any other side-effects], [c-ares was not found and thus disabled]) else - AC_DEFINE([HAVE_C_ARES]) + AC_DEFINE([HAVE_C_ARES], [1], [Define if c-ares is enabled]) appendCXX $c_ares_CFLAGS appendLib $c_ares_LIBS ARES=yes @@ -233,7 +234,7 @@ [OpenSSL was not found and thus disabled]) NOSSL=1 else - AC_DEFINE([HAVE_LIBSSL]) + AC_DEFINE([HAVE_LIBSSL], [1], [Define if openssl is enabled]) SSL=yes fi else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ps...@us...> - 2011-01-07 15:01:16
|
Revision: 2250 http://znc.svn.sourceforge.net/znc/?rev=2250&view=rev Author: psychon Date: 2011-01-07 15:01:08 +0000 (Fri, 07 Jan 2011) Log Message: ----------- Use autoheader This commit adds a zncconfig.h to ZNC that is automatically generated by configure. This is done because the -DPACKAGE_STRING=\"znc\ 0.097\" that configure adds to CXXFLAGS breaks znc-buildmod. This means that we have to include zncconfig.h as the very first header in every C++ file that is compiled. This commit kinda cheats and instead adds this include as the very first thing to all header files we have. This should hopefully mean that modules don't have to include this. Because Csocket includes defines.h too late, this commit causes znc to divert from upstream Csocket once again. :( Modified Paths: -------------- trunk/Buffer.h trunk/Chan.h trunk/Client.h trunk/Csocket.h trunk/DCCBounce.h trunk/DCCSock.h trunk/FileUtils.h trunk/HTTPSock.h trunk/IRCSock.h trunk/Listener.h trunk/MD5.h trunk/Makefile.in trunk/Modules.h trunk/Nick.h trunk/SHA256.h trunk/Server.h trunk/Socket.h trunk/Template.h trunk/User.h trunk/Utils.h trunk/WebModules.h trunk/ZNCString.h trunk/configure trunk/configure.in trunk/main.h trunk/modules/Makefile.in trunk/znc.h Modified: trunk/Buffer.h =================================================================== --- trunk/Buffer.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/Buffer.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _BUFFER_H #define _BUFFER_H +#include "zncconfig.h" #include "ZNCString.h" #include <deque> Modified: trunk/Chan.h =================================================================== --- trunk/Chan.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/Chan.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _CHAN_H #define _CHAN_H +#include "zncconfig.h" #include "FileUtils.h" #include "Nick.h" #include "ZNCString.h" Modified: trunk/Client.h =================================================================== --- trunk/Client.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/Client.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _CLIENT_H #define _CLIENT_H +#include "zncconfig.h" #include "Socket.h" #include "Utils.h" #include "main.h" Modified: trunk/Csocket.h =================================================================== --- trunk/Csocket.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/Csocket.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -34,6 +34,9 @@ #ifndef _HAS_CSOCKET_ #define _HAS_CSOCKET_ + +#include "zncconfig.h" + #include <stdio.h> #include <unistd.h> #include <sys/time.h> Modified: trunk/DCCBounce.h =================================================================== --- trunk/DCCBounce.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/DCCBounce.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _DCCBOUNCE_H #define _DCCBOUNCE_H +#include "zncconfig.h" #include "Socket.h" class CUser; Modified: trunk/DCCSock.h =================================================================== --- trunk/DCCSock.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/DCCSock.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _DCCSOCK_H #define _DCCSOCK_H +#include "zncconfig.h" #include "FileUtils.h" // Forward Declarations Modified: trunk/FileUtils.h =================================================================== --- trunk/FileUtils.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/FileUtils.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _FILEUTILS_H #define _FILEUTILS_H +#include "zncconfig.h" #include "Socket.h" #include "ZNCString.h" #include <dirent.h> Modified: trunk/HTTPSock.h =================================================================== --- trunk/HTTPSock.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/HTTPSock.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _HTTPSOCK_H #define _HTTPSOCK_H +#include "zncconfig.h" #include "Socket.h" class CModule; Modified: trunk/IRCSock.h =================================================================== --- trunk/IRCSock.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/IRCSock.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _IRCSOCK_H #define _IRCSOCK_H +#include "zncconfig.h" #include "Socket.h" #include "Nick.h" Modified: trunk/Listener.h =================================================================== --- trunk/Listener.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/Listener.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _LISTENER_H #define _LISTENER_H +#include "zncconfig.h" #include "znc.h" // Forward Declarations Modified: trunk/MD5.h =================================================================== --- trunk/MD5.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/MD5.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -3,6 +3,7 @@ #ifndef _MD5_H #define _MD5_H +#include "zncconfig.h" #include <string> using std::string; Modified: trunk/Makefile.in =================================================================== --- trunk/Makefile.in 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/Makefile.in 2011-01-07 15:01:08 UTC (rev 2250) @@ -15,7 +15,7 @@ sbindir := @sbindir@ localstatedir := @localstatedir@ CXX := @CXX@ -CXXFLAGS := @DEFS@ @CPPFLAGS@ @CXXFLAGS@ +CXXFLAGS := @DEFS@ @CPPFLAGS@ @CXXFLAGS@ -I. LDFLAGS := @LDFLAGS@ LIBS := @LIBS@ LIBZNC := @LIBZNC@ Modified: trunk/Modules.h =================================================================== --- trunk/Modules.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/Modules.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _MODULES_H #define _MODULES_H +#include "zncconfig.h" #include "WebModules.h" #include "FileUtils.h" #include "Utils.h" Modified: trunk/Nick.h =================================================================== --- trunk/Nick.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/Nick.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _NICK_H #define _NICK_H +#include "zncconfig.h" #include "ZNCString.h" #include <set> #include <vector> Modified: trunk/SHA256.h =================================================================== --- trunk/SHA256.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/SHA256.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -37,6 +37,8 @@ #define SHA256_DIGEST_SIZE ( 256 / 8) #define SHA256_BLOCK_SIZE ( 512 / 8) +#include "zncconfig.h" + // C99 defines stdint.h which defines a uint32_t and uint8_t type. // But the other kids didn't want to play with poor little Solaris 9 and so he // just defines these in inttypes.h which is also part of C99 and is supposed to Modified: trunk/Server.h =================================================================== --- trunk/Server.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/Server.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _SERVER_H #define _SERVER_H +#include "zncconfig.h" #include "ZNCString.h" class CServer { Modified: trunk/Socket.h =================================================================== --- trunk/Socket.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/Socket.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef SOCKET_H #define SOCKET_H +#include "zncconfig.h" #include "Csocket.h" class CModule; Modified: trunk/Template.h =================================================================== --- trunk/Template.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/Template.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _TEMPLATE_H #define _TEMPLATE_H +#include "zncconfig.h" #include "Utils.h" #include <iostream> Modified: trunk/User.h =================================================================== --- trunk/User.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/User.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _USER_H #define _USER_H +#include "zncconfig.h" #include "Buffer.h" #include "FileUtils.h" #include "Modules.h" Modified: trunk/Utils.h =================================================================== --- trunk/Utils.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/Utils.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _UTILS_H #define _UTILS_H +#include "zncconfig.h" #include "ZNCString.h" #include <assert.h> #include <cstdio> Modified: trunk/WebModules.h =================================================================== --- trunk/WebModules.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/WebModules.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _WEBMODULES_H #define _WEBMODULES_H +#include "zncconfig.h" #include "Client.h" #include "Template.h" #include "HTTPSock.h" Modified: trunk/ZNCString.h =================================================================== --- trunk/ZNCString.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/ZNCString.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef ZNCSTRING_H #define ZNCSTRING_H +#include "zncconfig.h" #include <map> #include <set> #include <string> Modified: trunk/configure =================================================================== --- trunk/configure 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/configure 2011-01-07 15:01:08 UTC (rev 2250) @@ -1936,9 +1936,13 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_config_headers="$ac_config_headers zncconfig.h" + + + # AC_PROG_CXX sets CXXFLAGS to "-O2 -g" if it is unset which we don't want CXXFLAGS="$CXXFLAGS " ac_ext=cpp @@ -4347,44 +4351,8 @@ # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -ac_script=' -:mline -/\\$/{ - N - s,\\\n,, - b mline -} -t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` +DEFS=-DHAVE_CONFIG_H - ac_libobjs= ac_ltlibobjs= U= @@ -4828,11 +4796,15 @@ "*) set x $ac_config_files; shift; ac_config_files=$*;; esac +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" +config_headers="$ac_config_headers" _ACEOF @@ -4853,10 +4825,15 @@ --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files +Configuration headers: +$config_headers + Report bugs to the package provider." _ACEOF @@ -4918,7 +4895,18 @@ esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) @@ -4974,6 +4962,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in + "zncconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS zncconfig.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "znc-config") CONFIG_FILES="$CONFIG_FILES znc-config" ;; "znc-buildmod") CONFIG_FILES="$CONFIG_FILES znc-buildmod" ;; @@ -4993,6 +4982,7 @@ # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers fi # Have a temporary directory for convenience. Make it in the build tree @@ -5178,8 +5168,116 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF -eval set X " :F $CONFIG_FILES " +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' <confdefs.h | sed ' +s/'"$ac_delim"'/"\\\ +"/g' >>$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " shift for ac_tag do @@ -5391,9 +5489,32 @@ esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi + ;; - esac done # for ac_tag Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/configure.in 2011-01-07 15:01:08 UTC (rev 2250) @@ -2,6 +2,10 @@ AC_INIT([znc], [0.097]) AC_CONFIG_SRCDIR([znc.cpp]) AC_LANG([C++]) +AC_CONFIG_HEADERS([zncconfig.h]) +AH_TOP([#ifndef ZNCCONFIG_H +#define ZNCCONFIG_H]) +AH_BOTTOM([#endif /* ZNCCONFIG_H */]) AC_DEFUN([ZNC_AUTO_FAIL], [ # This looks better in the summary at the end Modified: trunk/main.h =================================================================== --- trunk/main.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/main.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,8 @@ #ifndef _MAIN_H #define _MAIN_H +#include "zncconfig.h" + // The following defines are for #if comparison (preprocessor only likes ints) #define VERSION_MAJOR 0 #define VERSION_MINOR 97 Modified: trunk/modules/Makefile.in =================================================================== --- trunk/modules/Makefile.in 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/modules/Makefile.in 2011-01-07 15:01:08 UTC (rev 2250) @@ -17,7 +17,7 @@ localstatedir := @localstatedir@ CXX := @CXX@ # CXXFLAGS are for the main binary, so don't use them here, use MODFLAGS instead -MODFLAGS := @DEFS@ @CPPFLAGS@ @MODFLAGS@ -I$(srcdir)/.. +MODFLAGS := @DEFS@ @CPPFLAGS@ @MODFLAGS@ -I$(srcdir)/.. -I.. MODLINK := @MODLINK@ LDFLAGS := @LDFLAGS@ # LIBS are not and should not be used in here. Modified: trunk/znc.h =================================================================== --- trunk/znc.h 2011-01-05 19:54:20 UTC (rev 2249) +++ trunk/znc.h 2011-01-07 15:01:08 UTC (rev 2250) @@ -9,6 +9,7 @@ #ifndef _ZNC_H #define _ZNC_H +#include "zncconfig.h" #include "Client.h" #include "FileUtils.h" #include "Modules.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ps...@us...> - 2011-01-07 16:34:22
|
Revision: 2252 http://znc.svn.sourceforge.net/znc/?rev=2252&view=rev Author: psychon Date: 2011-01-07 16:34:13 +0000 (Fri, 07 Jan 2011) Log Message: ----------- Remove all generated/copied scripts from SVN This commits removes all files which are generated by aclocal or autoconf or copied from automake (yes, autoconf requires config.{guess,sub}, yet they are part of automake!). Instead, we now have a shell script autogen.sh which calls all the needed parts in the right order (aclocal ; autoheader ; autoconf ; automake). Additionally, configure.in is renamed to configure.ac because that seems to be the more proper name for it. Let's see if anyone notices me sneaking this in. ;) Added Paths: ----------- trunk/autogen.sh trunk/configure.ac Removed Paths: ------------- trunk/aclocal.m4 trunk/config.guess trunk/config.sub trunk/configure.in trunk/install-sh trunk/zncconfig.h.in Deleted: trunk/aclocal.m4 =================================================================== --- trunk/aclocal.m4 2011-01-07 15:02:57 UTC (rev 2251) +++ trunk/aclocal.m4 2011-01-07 16:34:13 UTC (rev 2252) @@ -1,171 +0,0 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant <sc...@ne...>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES - Added: trunk/autogen.sh =================================================================== --- trunk/autogen.sh (rev 0) +++ trunk/autogen.sh 2011-01-07 16:34:13 UTC (rev 2252) @@ -0,0 +1,51 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. +# This is based on various examples which can be found everywhere. +set -e + +FLAGS=${FLAGS--Wall} +ACLOCAL=${ACLOCAL-aclocal} +AUTOHEADER=${AUTOHEADER-autoheader} +AUTOCONF=${AUTOCONF-autoconf} +AUTOMAKE=${AUTOMAKE-automake} +ACLOCAL_FLAGS="${ACLOCAL_FLAGS} ${FLAGS}" +AUTOHEADER_FLAGS="${AUTOHEADER_FLAGS} ${FLAGS}" +AUTOCONF_FLAGS="${AUTOCONF_FLAGS} ${FLAGS}" +AUTOMAKE_FLAGS="${AUTOMAKE_FLAGS---add-missing} ${FLAGS}" + +# Allow invocation from a separate build directory +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd "$srcdir" + +die() { + echo "$@" + exit 1 +} +do_cmd() { + echo "Running '$@'" + $@ +} + +test -f configure.ac || die "No $srcdir/configure.ac found." + +# Generate aclocal.m4 for use by autoconf +do_cmd $ACLOCAL $ACLOCAL_FLAGS +# Generate zncconfig.h.in for configure +do_cmd $AUTOHEADER $AUTOHEADER_FLAGS +# Generate configure +do_cmd $AUTOCONF $AUTOCONF_FLAGS +# Copy config.sub, config.guess, install.sh, ... +# This will complain that we don't use automake, let's just ignore that +do_cmd $AUTOMAKE $AUTOMAKE_FLAGS || true +test -f config.guess -a -f config.sub -a -f install-sh || + die "Automake didn't install config.guess, config.sub and install-sh!" + +cd "$ORIGDIR" || exit 1 + +if test -z "$NOCONFIGURE" +then + do_cmd "$srcdir/configure" --cache-file=config.cache ${1+"$@"} || exit 1 +fi Property changes on: trunk/autogen.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:eol-style + native Deleted: trunk/config.guess =================================================================== --- trunk/config.guess 2011-01-07 15:02:57 UTC (rev 2251) +++ trunk/config.guess 2011-01-07 16:34:13 UTC (rev 2252) @@ -1,1533 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. - -timestamp='2009-06-10' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner <pe...@bo...>. -# Please send patches to <con...@gn...>. Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to <con...@gn...>." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (gh...@no... 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # ak...@wp... (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include <stdio.h> /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <sys/systemcfg.h> - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include <stdlib.h> - #include <unistd.h> - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <unistd.h> - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd | genuineintel) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <features.h> - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` - echo ${UNAME_MACHINE}-pc-isc$UNAME_REL - elif /bin/uname -X 2>/dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says <Ric...@cc...> - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes <he...@op...>. - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From se...@sw.... - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Pau...@st.... - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Pau...@st.... - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c <<EOF -#ifdef _SEQUENT_ -# include <sys/types.h> -# include <sys/utsname.h> -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include <sys/param.h> - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include <sys/param.h> -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 <<EOF -$0: unable to guess system type - -This script, last modified $timestamp, has failed to recognize -the operating system you are using. It is advised that you -download the most up to date version of the config scripts from - - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - -If the version you run ($0) is already up to date, please -send the following data and any information you think might be -pertinent to <con...@gn...> in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: Deleted: trunk/config.sub =================================================================== --- trunk/config.sub 2011-01-07 15:02:57 UTC (rev 2251) +++ trunk/config.sub 2011-01-07 16:34:13 UTC (rev 2252) @@ -1,1693 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. - -timestamp='2009-06-11' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Please send patches to <con...@gn...>. Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to <con...@gn...>." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - ex... [truncated message content] |
From: <ps...@us...> - 2011-01-08 18:26:37
|
Revision: 2258 http://znc.svn.sourceforge.net/znc/?rev=2258&view=rev Author: psychon Date: 2011-01-08 18:26:31 +0000 (Sat, 08 Jan 2011) Log Message: ----------- Protect ZNC against CTCP floods Ingredients: - A couple of bots (3 are plenty) - Boredom - A target you want to annoy Recipe: Connect your bots to the same IRC network that your target is on. Then let each of your bot flood him with CTCP VERSION request. If the target is gentle enough to reply to each of those request, he will be disconnected from the network due to excess flood. This commit makes ZNC only reply to 5 CTCPs within 5 seconds. If more are sent, they aren't replied to. This does NOT protect clients that are connected to ZNC. They will still get the chance to reply to the flood. Modified Paths: -------------- trunk/IRCSock.cpp trunk/IRCSock.h Modified: trunk/IRCSock.cpp =================================================================== --- trunk/IRCSock.cpp 2011-01-08 11:33:06 UTC (rev 2257) +++ trunk/IRCSock.cpp 2011-01-08 18:26:31 UTC (rev 2258) @@ -13,6 +13,10 @@ #include "User.h" #include "znc.h" +// These are used in OnGeneralCTCP() +const unsigned int CIRCSock::m_uCTCPFloodTime = 5; +const unsigned int CIRCSock::m_uCTCPFloodCount = 5; + CIRCSock::CIRCSock(CUser* pUser) : CZNCSock() { m_pUser = pUser; m_bISpoofReleased = false; @@ -25,6 +29,8 @@ m_uMaxNickLen = 9; m_uCapPaused = 0; + m_lastCTCP = 0; + m_uNumCTCP = 0; m_sPerms = "*!@%+"; m_sPermModes = "qaohv"; m_mueChanModes['b'] = ListArg; @@ -839,6 +845,18 @@ } if (!sReply.empty()) { + time_t now = time(NULL); + // If the last CTCP is older than m_uCTCPFloodTime, reset the counter + if (m_lastCTCP + m_uCTCPFloodTime < now) + m_uNumCTCP = 0; + m_lastCTCP = now; + // If we are over the limit, don't reply to this CTCP + if (m_uNumCTCP >= m_uCTCPFloodCount) { + DEBUG("CTCP flood detected - not replying to query"); + return false; + } + m_uNumCTCP++; + PutIRC("NOTICE " + Nick.GetNick() + " :\001" + sQuery + " " + sReply + "\001"); return true; } Modified: trunk/IRCSock.h =================================================================== --- trunk/IRCSock.h 2011-01-08 11:33:06 UTC (rev 2257) +++ trunk/IRCSock.h 2011-01-08 18:26:31 UTC (rev 2258) @@ -117,6 +117,10 @@ unsigned int m_uCapPaused; SCString m_ssAcceptedCaps; SCString m_ssPendingCaps; + time_t m_lastCTCP; + unsigned int m_uNumCTCP; + static const unsigned int m_uCTCPFloodTime; + static const unsigned int m_uCTCPFloodCount; }; #endif // !_IRCSOCK_H This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ps...@us...> - 2011-01-14 17:03:34
|
Revision: 2260 http://znc.svn.sourceforge.net/znc/?rev=2260&view=rev Author: psychon Date: 2011-01-14 17:03:24 +0000 (Fri, 14 Jan 2011) Log Message: ----------- Oh, shiny... NOT (Yes, it's that time of the year again) Signed-off-by: Uli Schlachter <ps...@zn...> Modified Paths: -------------- trunk/Buffer.cpp trunk/Buffer.h trunk/Chan.cpp trunk/Chan.h trunk/Client.cpp trunk/Client.h trunk/ClientCommand.cpp trunk/DCCBounce.cpp trunk/DCCBounce.h trunk/DCCSock.cpp trunk/DCCSock.h trunk/FileUtils.cpp trunk/FileUtils.h trunk/HTTPSock.cpp trunk/HTTPSock.h trunk/IRCSock.cpp trunk/IRCSock.h trunk/Listener.cpp trunk/Listener.h trunk/Modules.cpp trunk/Modules.h trunk/Nick.cpp trunk/Nick.h trunk/Server.cpp trunk/Server.h trunk/Socket.cpp trunk/Socket.h trunk/Template.cpp trunk/Template.h trunk/User.cpp trunk/User.h trunk/Utils.cpp trunk/Utils.h trunk/WebModules.cpp trunk/ZNCString.cpp trunk/ZNCString.h trunk/defines.h trunk/main.cpp trunk/main.h trunk/modules/admin.cpp trunk/modules/adminlog.cpp trunk/modules/autoattach.cpp trunk/modules/autocycle.cpp trunk/modules/autoop.cpp trunk/modules/autoreply.cpp trunk/modules/away.cpp trunk/modules/awaynick.cpp trunk/modules/blockuser.cpp trunk/modules/buffextras.cpp trunk/modules/certauth.cpp trunk/modules/chansaver.cpp trunk/modules/clientnotify.cpp trunk/modules/crypt.cpp trunk/modules/disconkick.cpp trunk/modules/extra/antiidle.cpp trunk/modules/extra/autovoice.cpp trunk/modules/extra/binds.tcl trunk/modules/extra/charset.cpp trunk/modules/extra/clearbufferonmsg.cpp trunk/modules/extra/ctcpflood.cpp trunk/modules/extra/email.cpp trunk/modules/extra/fakeonline.cpp trunk/modules/extra/imapauth.cpp trunk/modules/extra/listsockets.cpp trunk/modules/extra/log.cpp trunk/modules/extra/modtcl.cpp trunk/modules/extra/modtcl.tcl trunk/modules/extra/motdfile.cpp trunk/modules/extra/notify_connect.cpp trunk/modules/extra/saslauth.cpp trunk/modules/extra/send_raw.cpp trunk/modules/extra/shell.cpp trunk/modules/fail2ban.cpp trunk/modules/fixfreenode.cpp trunk/modules/keepnick.cpp trunk/modules/kickrejoin.cpp trunk/modules/lastseen.cpp trunk/modules/modperl/codegen.pl trunk/modules/modperl/modperl.i trunk/modules/modperl/module.h trunk/modules/modperl/pstring.h trunk/modules/modperl/startup.pl trunk/modules/modperl.cpp trunk/modules/modpython/codegen.pl trunk/modules/modpython/compiler.cpp trunk/modules/modpython/modpython.i trunk/modules/modpython.cpp trunk/modules/nickserv.cpp trunk/modules/notes.cpp trunk/modules/partyline.cpp trunk/modules/perform.cpp trunk/modules/q.cpp trunk/modules/raw.cpp trunk/modules/route_replies.cpp trunk/modules/sample.cpp trunk/modules/savebuff.cpp trunk/modules/schat.cpp trunk/modules/simple_away.cpp trunk/modules/stickychan.cpp trunk/modules/watch.cpp trunk/modules/webadmin.cpp trunk/znc.cpp trunk/znc.h Modified: trunk/Buffer.cpp =================================================================== --- trunk/Buffer.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Buffer.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Buffer.h =================================================================== --- trunk/Buffer.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Buffer.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Chan.cpp =================================================================== --- trunk/Chan.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Chan.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Chan.h =================================================================== --- trunk/Chan.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Chan.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Client.cpp =================================================================== --- trunk/Client.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Client.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Client.h =================================================================== --- trunk/Client.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Client.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/ClientCommand.cpp =================================================================== --- trunk/ClientCommand.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/ClientCommand.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/DCCBounce.cpp =================================================================== --- trunk/DCCBounce.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/DCCBounce.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/DCCBounce.h =================================================================== --- trunk/DCCBounce.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/DCCBounce.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/DCCSock.cpp =================================================================== --- trunk/DCCSock.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/DCCSock.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/DCCSock.h =================================================================== --- trunk/DCCSock.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/DCCSock.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/FileUtils.cpp =================================================================== --- trunk/FileUtils.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/FileUtils.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/FileUtils.h =================================================================== --- trunk/FileUtils.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/FileUtils.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/HTTPSock.cpp =================================================================== --- trunk/HTTPSock.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/HTTPSock.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/HTTPSock.h =================================================================== --- trunk/HTTPSock.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/HTTPSock.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/IRCSock.cpp =================================================================== --- trunk/IRCSock.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/IRCSock.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/IRCSock.h =================================================================== --- trunk/IRCSock.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/IRCSock.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Listener.cpp =================================================================== --- trunk/Listener.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Listener.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Listener.h =================================================================== --- trunk/Listener.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Listener.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Modules.cpp =================================================================== --- trunk/Modules.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Modules.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Modules.h =================================================================== --- trunk/Modules.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Modules.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Nick.cpp =================================================================== --- trunk/Nick.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Nick.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Nick.h =================================================================== --- trunk/Nick.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Nick.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Server.cpp =================================================================== --- trunk/Server.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Server.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Server.h =================================================================== --- trunk/Server.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Server.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Socket.cpp =================================================================== --- trunk/Socket.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Socket.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Socket.h =================================================================== --- trunk/Socket.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Socket.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Template.cpp =================================================================== --- trunk/Template.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Template.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Template.h =================================================================== --- trunk/Template.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Template.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/User.cpp =================================================================== --- trunk/User.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/User.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/User.h =================================================================== --- trunk/User.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/User.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Utils.cpp =================================================================== --- trunk/Utils.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Utils.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/Utils.h =================================================================== --- trunk/Utils.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/Utils.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/WebModules.cpp =================================================================== --- trunk/WebModules.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/WebModules.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/ZNCString.cpp =================================================================== --- trunk/ZNCString.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/ZNCString.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/ZNCString.h =================================================================== --- trunk/ZNCString.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/ZNCString.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/defines.h =================================================================== --- trunk/defines.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/defines.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/main.cpp =================================================================== --- trunk/main.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/main.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/main.h =================================================================== --- trunk/main.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/main.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/admin.cpp =================================================================== --- trunk/modules/admin.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/admin.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * Copyright (C) 2008 by Stefan Rado * based on admin.cpp by Sebastian Ramacher * based on admin.cpp in crox branch Modified: trunk/modules/adminlog.cpp =================================================================== --- trunk/modules/adminlog.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/adminlog.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/autoattach.cpp =================================================================== --- trunk/modules/autoattach.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/autoattach.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/autocycle.cpp =================================================================== --- trunk/modules/autocycle.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/autocycle.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/autoop.cpp =================================================================== --- trunk/modules/autoop.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/autoop.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/autoreply.cpp =================================================================== --- trunk/modules/autoreply.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/autoreply.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * Copyright (C) 2008 Michael "Svedrin" Ziegler die...@fu... * * This program is free software; you can redistribute it and/or modify it Modified: trunk/modules/away.cpp =================================================================== --- trunk/modules/away.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/away.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/awaynick.cpp =================================================================== --- trunk/modules/awaynick.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/awaynick.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/blockuser.cpp =================================================================== --- trunk/modules/blockuser.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/blockuser.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/buffextras.cpp =================================================================== --- trunk/modules/buffextras.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/buffextras.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/certauth.cpp =================================================================== --- trunk/modules/certauth.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/certauth.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/chansaver.cpp =================================================================== --- trunk/modules/chansaver.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/chansaver.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/clientnotify.cpp =================================================================== --- trunk/modules/clientnotify.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/clientnotify.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/crypt.cpp =================================================================== --- trunk/modules/crypt.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/crypt.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/disconkick.cpp =================================================================== --- trunk/modules/disconkick.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/disconkick.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/antiidle.cpp =================================================================== --- trunk/modules/extra/antiidle.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/antiidle.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/autovoice.cpp =================================================================== --- trunk/modules/extra/autovoice.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/autovoice.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/binds.tcl =================================================================== --- trunk/modules/extra/binds.tcl 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/binds.tcl 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2010 See the AUTHORS file for details. +# Copyright (C) 2004-2011 See the AUTHORS file for details. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/charset.cpp =================================================================== --- trunk/modules/extra/charset.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/charset.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/clearbufferonmsg.cpp =================================================================== --- trunk/modules/extra/clearbufferonmsg.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/clearbufferonmsg.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/ctcpflood.cpp =================================================================== --- trunk/modules/extra/ctcpflood.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/ctcpflood.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/email.cpp =================================================================== --- trunk/modules/extra/email.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/email.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/fakeonline.cpp =================================================================== --- trunk/modules/extra/fakeonline.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/fakeonline.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2010 See the AUTHORS file for details. + * Copyright (C) 2008-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/imapauth.cpp =================================================================== --- trunk/modules/extra/imapauth.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/imapauth.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/listsockets.cpp =================================================================== --- trunk/modules/extra/listsockets.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/listsockets.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/log.cpp =================================================================== --- trunk/modules/extra/log.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/log.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2010 See the AUTHORS file for details. + * Copyright (C) 2008-2011 See the AUTHORS file for details. * Copyright (C) 2006-2007, CNU <bs...@br...> (http://cnu.dieplz.net/znc) * * This program is free software; you can redistribute it and/or modify it Modified: trunk/modules/extra/modtcl.cpp =================================================================== --- trunk/modules/extra/modtcl.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/modtcl.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/modtcl.tcl =================================================================== --- trunk/modules/extra/modtcl.tcl 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/modtcl.tcl 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2010 See the AUTHORS file for details. +# Copyright (C) 2004-2011 See the AUTHORS file for details. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/motdfile.cpp =================================================================== --- trunk/modules/extra/motdfile.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/motdfile.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/notify_connect.cpp =================================================================== --- trunk/modules/extra/notify_connect.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/notify_connect.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/saslauth.cpp =================================================================== --- trunk/modules/extra/saslauth.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/saslauth.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,6 +1,6 @@ /** * Copyright (C) 2008 Heiko Hund <he...@is...> - * Copyright (C) 2008-2010 See the AUTHORS file for details. + * Copyright (C) 2008-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/send_raw.cpp =================================================================== --- trunk/modules/extra/send_raw.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/send_raw.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/extra/shell.cpp =================================================================== --- trunk/modules/extra/shell.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/extra/shell.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/fail2ban.cpp =================================================================== --- trunk/modules/fail2ban.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/fail2ban.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/fixfreenode.cpp =================================================================== --- trunk/modules/fixfreenode.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/fixfreenode.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/keepnick.cpp =================================================================== --- trunk/modules/keepnick.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/keepnick.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/kickrejoin.cpp =================================================================== --- trunk/modules/kickrejoin.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/kickrejoin.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/lastseen.cpp =================================================================== --- trunk/modules/lastseen.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/lastseen.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/modperl/codegen.pl =================================================================== --- trunk/modules/modperl/codegen.pl 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/modperl/codegen.pl 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# Copyright (C) 2004-2010 See the AUTHORS file for details. +# Copyright (C) 2004-2011 See the AUTHORS file for details. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 as published @@ -17,7 +17,7 @@ print $out <<'EOF'; /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/modperl/modperl.i =================================================================== --- trunk/modules/modperl/modperl.i 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/modperl/modperl.i 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/modperl/module.h =================================================================== --- trunk/modules/modperl/module.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/modperl/module.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/modperl/pstring.h =================================================================== --- trunk/modules/modperl/pstring.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/modperl/pstring.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/modperl/startup.pl =================================================================== --- trunk/modules/modperl/startup.pl 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/modperl/startup.pl 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ # -# Copyright (C) 2004-2010 See the AUTHORS file for details. +# Copyright (C) 2004-2011 See the AUTHORS file for details. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/modperl.cpp =================================================================== --- trunk/modules/modperl.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/modperl.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/modpython/codegen.pl =================================================================== --- trunk/modules/modpython/codegen.pl 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/modpython/codegen.pl 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# Copyright (C) 2004-2010 See the AUTHORS file for details. +# Copyright (C) 2004-2011 See the AUTHORS file for details. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 as published @@ -18,7 +18,7 @@ print $out <<'EOF'; /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/modpython/compiler.cpp =================================================================== --- trunk/modules/modpython/compiler.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/modpython/compiler.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/modpython/modpython.i =================================================================== --- trunk/modules/modpython/modpython.i 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/modpython/modpython.i 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/modpython.cpp =================================================================== --- trunk/modules/modpython.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/modpython.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/nickserv.cpp =================================================================== --- trunk/modules/nickserv.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/nickserv.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/notes.cpp =================================================================== --- trunk/modules/notes.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/notes.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/partyline.cpp =================================================================== --- trunk/modules/partyline.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/partyline.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/perform.cpp =================================================================== --- trunk/modules/perform.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/perform.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/q.cpp =================================================================== --- trunk/modules/q.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/q.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2010 See the AUTHORS file for details. + * Copyright (C) 2008-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/raw.cpp =================================================================== --- trunk/modules/raw.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/raw.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/route_replies.cpp =================================================================== --- trunk/modules/route_replies.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/route_replies.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/sample.cpp =================================================================== --- trunk/modules/sample.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/sample.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/savebuff.cpp =================================================================== --- trunk/modules/savebuff.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/savebuff.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/schat.cpp =================================================================== --- trunk/modules/schat.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/schat.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/simple_away.cpp =================================================================== --- trunk/modules/simple_away.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/simple_away.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/stickychan.cpp =================================================================== --- trunk/modules/stickychan.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/stickychan.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/watch.cpp =================================================================== --- trunk/modules/watch.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/watch.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/modules/webadmin.cpp =================================================================== --- trunk/modules/webadmin.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/modules/webadmin.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/znc.cpp =================================================================== --- trunk/znc.cpp 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/znc.cpp 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published Modified: trunk/znc.h =================================================================== --- trunk/znc.h 2011-01-08 22:07:36 UTC (rev 2259) +++ trunk/znc.h 2011-01-14 17:03:24 UTC (rev 2260) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 See the AUTHORS file for details. + * Copyright (C) 2004-2011 See the AUTHORS file for details. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ps...@us...> - 2011-01-14 20:22:08
|
Revision: 2261 http://znc.svn.sourceforge.net/znc/?rev=2261&view=rev Author: psychon Date: 2011-01-14 20:22:02 +0000 (Fri, 14 Jan 2011) Log Message: ----------- Keep a list of web sessions per IP address Modified Paths: -------------- trunk/WebModules.cpp trunk/WebModules.h Modified: trunk/WebModules.cpp =================================================================== --- trunk/WebModules.cpp 2011-01-14 17:03:24 UTC (rev 2260) +++ trunk/WebModules.cpp 2011-01-14 20:22:02 UTC (rev 2261) @@ -16,7 +16,25 @@ // Sessions are valid for a day, (24h, ...) CWebSessionMap CWebSock::m_mspSessions(24 * 60 * 60 * 1000); +static std::multimap<CString, CWebSession*> mIPSessions; +typedef std::multimap<CString, CWebSession*>::iterator mIPSessionsIterator; +CWebSession::~CWebSession() { + // Find our entry in mIPSessions + pair<mIPSessionsIterator, mIPSessionsIterator> p = + mIPSessions.equal_range(m_sIP); + mIPSessionsIterator it = p.first; + mIPSessionsIterator end = p.second; + + while (it != end) { + if (it->second == this) { + mIPSessions.erase(it++); + } else { + ++it; + } + } +} + CZNCTagHandler::CZNCTagHandler(CWebSock& WebSock) : CTemplateTagHandler(), m_WebSock(WebSock) { } @@ -30,8 +48,9 @@ return false; } -CWebSession::CWebSession(const CString& sId) : m_sId(sId) { +CWebSession::CWebSession(const CString& sId, const CString& sIP) : m_sId(sId), m_sIP(sIP) { m_pUser = NULL; + mIPSessions.insert(make_pair(sIP, this)); } bool CWebSession::IsAdmin() const { return IsLoggedIn() && m_pUser->IsAdmin(); } @@ -676,7 +695,7 @@ DEBUG("Auto generated session: [" + sSessionID + "]"); } while (m_mspSessions.HasItem(sSessionID)); - CSmartPtr<CWebSession> spSession(new CWebSession(sSessionID)); + CSmartPtr<CWebSession> spSession(new CWebSession(sSessionID, GetRemoteIP())); m_mspSessions.AddItem(spSession->GetId(), spSession); m_spSession = spSession; Modified: trunk/WebModules.h =================================================================== --- trunk/WebModules.h 2011-01-14 17:03:24 UTC (rev 2260) +++ trunk/WebModules.h 2011-01-14 20:22:02 UTC (rev 2261) @@ -35,8 +35,8 @@ class CWebSession { public: - CWebSession(const CString& sId); - virtual ~CWebSession() {} + CWebSession(const CString& sId, const CString& sIP); + ~CWebSession(); const CString& GetId() const { return m_sId; } CUser* GetUser() const { return m_pUser; } @@ -51,6 +51,7 @@ size_t AddSuccess(const CString& sMessage); private: CString m_sId; + CString m_sIP; CUser* m_pUser; VCString m_vsErrorMsgs; VCString m_vsSuccessMsgs; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ps...@us...> - 2011-01-14 20:22:30
|
Revision: 2262 http://znc.svn.sourceforge.net/znc/?rev=2262&view=rev Author: psychon Date: 2011-01-14 20:22:23 +0000 (Fri, 14 Jan 2011) Log Message: ----------- WebMods: Verify a session belongs to the remote IP address Modified Paths: -------------- trunk/WebModules.cpp trunk/WebModules.h Modified: trunk/WebModules.cpp =================================================================== --- trunk/WebModules.cpp 2011-01-14 20:22:02 UTC (rev 2261) +++ trunk/WebModules.cpp 2011-01-14 20:22:23 UTC (rev 2262) @@ -500,6 +500,11 @@ } CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CString& sPageRet) { + if (GetSession()->GetIP() != GetRemoteIP()) { + PrintErrorPage(403, "Access denied", "This session does not belong to your IP."); + return PAGE_DONE; + } + // Check that they really POSTed from one our forms by checking if they // know the "secret" CSRF check value. Don't do this for login since // CSRF against the login form makes no sense and the login form does a Modified: trunk/WebModules.h =================================================================== --- trunk/WebModules.h 2011-01-14 20:22:02 UTC (rev 2261) +++ trunk/WebModules.h 2011-01-14 20:22:23 UTC (rev 2262) @@ -39,6 +39,7 @@ ~CWebSession(); const CString& GetId() const { return m_sId; } + const CString& GetIP() const { return m_sIP; } CUser* GetUser() const { return m_pUser; } bool IsLoggedIn() const { return m_pUser != NULL; } bool IsAdmin() const; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ps...@us...> - 2011-01-14 20:22:49
|
Revision: 2263 http://znc.svn.sourceforge.net/znc/?rev=2263&view=rev Author: psychon Date: 2011-01-14 20:22:43 +0000 (Fri, 14 Jan 2011) Log Message: ----------- Limit the number of web sessions per IP to 5 Modified Paths: -------------- trunk/WebModules.cpp trunk/WebModules.h Modified: trunk/WebModules.cpp =================================================================== --- trunk/WebModules.cpp 2011-01-14 20:22:23 UTC (rev 2262) +++ trunk/WebModules.cpp 2011-01-14 20:22:43 UTC (rev 2263) @@ -19,6 +19,8 @@ static std::multimap<CString, CWebSession*> mIPSessions; typedef std::multimap<CString, CWebSession*>::iterator mIPSessionsIterator; +const unsigned int CWebSock::m_uiMaxSessions = 5; + CWebSession::~CWebSession() { // Find our entry in mIPSessions pair<mIPSessionsIterator, mIPSessionsIterator> p = @@ -689,6 +691,11 @@ return *pSession; } + if (mIPSessions.count(GetRemoteIP()) > m_uiMaxSessions) { + mIPSessionsIterator it = mIPSessions.find(GetRemoteIP()); + mIPSessions.erase(it); + } + CString sSessionID; do { sSessionID = CString::RandomString(32); Modified: trunk/WebModules.h =================================================================== --- trunk/WebModules.h 2011-01-14 20:22:23 UTC (rev 2262) +++ trunk/WebModules.h 2011-01-14 20:22:43 UTC (rev 2263) @@ -172,6 +172,7 @@ CSmartPtr<CWebSession> m_spSession; static CWebSessionMap m_mspSessions; + static const unsigned int m_uiMaxSessions; }; #endif // !_WEBMODULES_H This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ps...@us...> - 2011-01-14 22:03:39
|
Revision: 2264 http://znc.svn.sourceforge.net/znc/?rev=2264&view=rev Author: psychon Date: 2011-01-14 22:03:33 +0000 (Fri, 14 Jan 2011) Log Message: ----------- WebModules: Fix a crash during shutdown During shutdown, the global list of sessions is destroyed. The new multimap which counts sessions per address is also destroyed. However, they are destroyed in unspecified order. This is not what we want because destructing the session map also destroyed all the sessions which then has to access the sessions-per-ip multimap. This obviously crashes if the multimap was already destroyed. The fix here is to introduce a new class that contains both of those maps and makes sure all the sessions are destroyed before the maps are destroyed themselves. I hope this description makes some sense... Modified Paths: -------------- trunk/WebModules.cpp trunk/WebModules.h Modified: trunk/WebModules.cpp =================================================================== --- trunk/WebModules.cpp 2011-01-14 20:22:43 UTC (rev 2263) +++ trunk/WebModules.cpp 2011-01-14 22:03:33 UTC (rev 2264) @@ -14,23 +14,40 @@ /// @todo Do we want to make this a configure option? #define _SKINDIR_ _DATADIR_ "/webskins" -// Sessions are valid for a day, (24h, ...) -CWebSessionMap CWebSock::m_mspSessions(24 * 60 * 60 * 1000); -static std::multimap<CString, CWebSession*> mIPSessions; +const unsigned int CWebSock::m_uiMaxSessions = 5; + +// We need this class to make sure the contained maps and their content is +// destroyed in the order that we want. +struct CSessionManager { + // Sessions are valid for a day, (24h, ...) + CSessionManager() : m_mspSessions(24 * 60 * 60 * 1000) {} + ~CSessionManager() { + // Make sure all sessions are destroyed before any of our maps + // are destroyed + m_mspSessions.Clear(); + } + + CWebSessionMap m_mspSessions; + std::multimap<CString, CWebSession*> m_mIPSessions; +}; typedef std::multimap<CString, CWebSession*>::iterator mIPSessionsIterator; -const unsigned int CWebSock::m_uiMaxSessions = 5; +static CSessionManager Sessions; +void CWebSock::FinishUserSessions(const CUser& User) { + Sessions.m_mspSessions.FinishUserSessions(User); +} + CWebSession::~CWebSession() { // Find our entry in mIPSessions pair<mIPSessionsIterator, mIPSessionsIterator> p = - mIPSessions.equal_range(m_sIP); + Sessions.m_mIPSessions.equal_range(m_sIP); mIPSessionsIterator it = p.first; mIPSessionsIterator end = p.second; while (it != end) { if (it->second == this) { - mIPSessions.erase(it++); + Sessions.m_mIPSessions.erase(it++); } else { ++it; } @@ -52,7 +69,7 @@ CWebSession::CWebSession(const CString& sId, const CString& sIP) : m_sId(sId), m_sIP(sIP) { m_pUser = NULL; - mIPSessions.insert(make_pair(sIP, this)); + Sessions.m_mIPSessions.insert(make_pair(sIP, this)); } bool CWebSession::IsAdmin() const { return IsLoggedIn() && m_pUser->IsAdmin(); } @@ -681,19 +698,19 @@ } const CString sCookieSessionId = GetRequestCookie("SessionId"); - CSmartPtr<CWebSession> *pSession = m_mspSessions.GetItem(sCookieSessionId); + CSmartPtr<CWebSession> *pSession = Sessions.m_mspSessions.GetItem(sCookieSessionId); if (pSession != NULL) { // Refresh the timeout - m_mspSessions.AddItem((*pSession)->GetId(), *pSession); + Sessions.m_mspSessions.AddItem((*pSession)->GetId(), *pSession); m_spSession = *pSession; DEBUG("Found existing session from cookie: [" + sCookieSessionId + "] IsLoggedIn(" + CString((*pSession)->IsLoggedIn() ? "true" : "false") + ")"); return *pSession; } - if (mIPSessions.count(GetRemoteIP()) > m_uiMaxSessions) { - mIPSessionsIterator it = mIPSessions.find(GetRemoteIP()); - mIPSessions.erase(it); + if (Sessions.m_mIPSessions.count(GetRemoteIP()) > m_uiMaxSessions) { + mIPSessionsIterator it = Sessions.m_mIPSessions.find(GetRemoteIP()); + Sessions.m_mIPSessions.erase(it); } CString sSessionID; @@ -705,10 +722,10 @@ sSessionID = sSessionID.SHA256(); DEBUG("Auto generated session: [" + sSessionID + "]"); - } while (m_mspSessions.HasItem(sSessionID)); + } while (Sessions.m_mspSessions.HasItem(sSessionID)); CSmartPtr<CWebSession> spSession(new CWebSession(sSessionID, GetRemoteIP())); - m_mspSessions.AddItem(spSession->GetId(), spSession); + Sessions.m_mspSessions.AddItem(spSession->GetId(), spSession); m_spSession = spSession; Modified: trunk/WebModules.h =================================================================== --- trunk/WebModules.h 2011-01-14 20:22:43 UTC (rev 2263) +++ trunk/WebModules.h 2011-01-14 22:03:33 UTC (rev 2264) @@ -147,9 +147,7 @@ CString GetRequestCookie(const CString& sKey); bool SendCookie(const CString& sKey, const CString& sValue); - static void FinishUserSessions(const CUser& User) { - m_mspSessions.FinishUserSessions(User); - } + static void FinishUserSessions(const CUser& User); protected: using CHTTPSock::PrintErrorPage; @@ -171,7 +169,6 @@ CString m_sPage; // Gets filled by ParsePath() CSmartPtr<CWebSession> m_spSession; - static CWebSessionMap m_mspSessions; static const unsigned int m_uiMaxSessions; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sil...@us...> - 2011-01-18 14:21:23
|
Revision: 2270 http://znc.svn.sourceforge.net/znc/?rev=2270&view=rev Author: silverleo Date: 2011-01-18 14:21:17 +0000 (Tue, 18 Jan 2011) Log Message: ----------- Fix a compile warning on 32bit systems. Modified Paths: -------------- trunk/IRCSock.cpp trunk/IRCSock.h Modified: trunk/IRCSock.cpp =================================================================== --- trunk/IRCSock.cpp 2011-01-15 21:04:25 UTC (rev 2269) +++ trunk/IRCSock.cpp 2011-01-18 14:21:17 UTC (rev 2270) @@ -14,7 +14,7 @@ #include "znc.h" // These are used in OnGeneralCTCP() -const unsigned int CIRCSock::m_uCTCPFloodTime = 5; +const time_t CIRCSock::m_uCTCPFloodTime = 5; const unsigned int CIRCSock::m_uCTCPFloodCount = 5; CIRCSock::CIRCSock(CUser* pUser) : CZNCSock() { Modified: trunk/IRCSock.h =================================================================== --- trunk/IRCSock.h 2011-01-15 21:04:25 UTC (rev 2269) +++ trunk/IRCSock.h 2011-01-18 14:21:17 UTC (rev 2270) @@ -119,7 +119,7 @@ SCString m_ssPendingCaps; time_t m_lastCTCP; unsigned int m_uNumCTCP; - static const unsigned int m_uCTCPFloodTime; + static const time_t m_uCTCPFloodTime; static const unsigned int m_uCTCPFloodCount; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ps...@us...> - 2011-02-14 17:51:58
|
Revision: 2279 http://znc.svn.sourceforge.net/znc/?rev=2279&view=rev Author: psychon Date: 2011-02-14 17:51:52 +0000 (Mon, 14 Feb 2011) Log Message: ----------- ZNC moved to http://github.com/znc/znc Modified Paths: -------------- trunk/autogen.sh trunk/configure.ac Added Paths: ----------- trunk/README.MOVE Added: trunk/README.MOVE =================================================================== --- trunk/README.MOVE (rev 0) +++ trunk/README.MOVE 2011-02-14 17:51:52 UTC (rev 2279) @@ -0,0 +1,3 @@ +ZNC has moved to git. +You can now find us at: + http://github.com/znc/znc Modified: trunk/autogen.sh =================================================================== --- trunk/autogen.sh 2011-02-13 08:05:20 UTC (rev 2278) +++ trunk/autogen.sh 2011-02-14 17:51:52 UTC (rev 2279) @@ -3,6 +3,12 @@ # This is based on various examples which can be found everywhere. set -e +echo "ZNC has moved to git." +echo "You can now find us at:" +echo " http://github.com/znc/znc" + +exit 1 + FLAGS=${FLAGS--Wall} ACLOCAL=${ACLOCAL-aclocal} AUTOHEADER=${AUTOHEADER-autoheader} Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2011-02-13 08:05:20 UTC (rev 2278) +++ trunk/configure.ac 2011-02-14 17:51:52 UTC (rev 2279) @@ -7,6 +7,8 @@ #define ZNCCONFIG_H]) AH_BOTTOM([#endif /* ZNCCONFIG_H */]) +AC_MSG_ERROR([ZNC has moved to github: http://github.com/znc/znc]) + AC_DEFUN([ZNC_AUTO_FAIL], [ # This looks better in the summary at the end $1="not found" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |