pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-03 17:43:13 +02:00
Code Activity

Merge branch 'anopeng' into anopeng-config

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1428 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-10-07 23:38:25 +00:00
parent 728fe3e1d4
commit 3324e62bae
26 changed files with 253 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changes
+7
View File
@@ -1,3 +1,10 @@
Anope Version SVN
--------------------
Anope Version 1.7.23b
--------------------
10/06 F Fixed issue with encrypted nick databases [ #00]
Anope Version 1.7.23
--------------------
10/01 A Added modular database back-end for IGNORE. [#948]
Changes.conf
+16
View File
@@ -1,3 +1,19 @@
Anope Version SVN
--------------------
** ADDED CONFIGURATION DIRECTIVES **
** MODIFIED CONFIGURATION DIRECTIVES **
** DELETED CONFIGURATION DIRECTIVES **
Anope Version 1.7.23b
--------------------
** ADDED CONFIGURATION DIRECTIVES **
** MODIFIED CONFIGURATION DIRECTIVES **
** DELETED CONFIGURATION DIRECTIVES **
Anope Version 1.7.23
--------------------
** ADDED CONFIGURATION DIRECTIVES **
Changes.lang
+16
View File
@@ -1,3 +1,19 @@
Anope Version SVN
--------------------
*** New Strings:
*** Mod Strings:
*** Del Strings:
Anope Version 1.7.23b
--------------------
*** New Strings:
*** Mod Strings:
*** Del Strings:
Anope Version 1.7.23
--------------------
*** New Strings:
Changes.mysql
+8
View File
@@ -1,3 +1,11 @@
Anope Version SVN
--------------------
- NONE
Anope Version 1.7.23b
--------------------
- NONE
Anope Version 1.7.23
--------------------
- NONE
Makefile.in
+30 -57
View File
@@ -1,12 +1,10 @@
CC=g++ # probably wrong but oh well.
INCLUDEDIR=../include
ANOPELIBS=@ANOPELIBS@
CFLAGS=@CFLAGS@ -Wall -pedantic -Wshadow
STRICT=-Wall -ansi -pedantic
CFLAGS=@CFLAGS@ -Wall -ansi -pedantic -Wshadow
PROFILE=-pg
LDPROFILE=
SHELL=/bin/sh
SUBDIRS=src
BINDEST=@BINDEST@
DATDEST=@DATDEST@
INSTALL=@INSTALL@
@@ -22,7 +20,6 @@ SHARED=@SHARED@
MODULEFLAGS=@MODULEFLAGS@
all: language headers build core protocols tools modules
strict: language headers strict_build strict_core strict_protocols strict_tools strict_modules
profile: language headers profile_build profile_core profile_protocols profile_tools profile_modules
MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
@@ -33,99 +30,75 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'MYSQL=${MYSQL}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
build: language headers
@for i in $(SUBDIRS); do \
echo "*** Building $$i";\
( cd $$i; ${MAKE} ${MAKEARGS} all; ) \
done
strict_build:
@for i in $(SUBDIRS); do \
echo "*** Strict Building $$i";\
( cd $$i; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' all; ) \
done
@${MAKE} -C src ${MAKEARGS} all
profile_build:
@for i in $(SUBDIRS); do \
echo "*** Strict Building $$i";\
( cd $$i; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' 'LDFLAGS=${LDFLAGS} ${PROFILE}' all; ) \
done
@${MAKE} -C src ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' 'LDFLAGS=${LDFLAGS} ${PROFILE}' all
modules: build
(cd src/modules ; ./configure ; ${MAKE} ${MAKEARGS} all; )
@src/modules/configure src/modules
@${MAKE} -C src/modules ${MAKEARGS} all
@echo "*** All done, now (g)make install to install Anope/Modules";
clean_modules:
(cd src ; ${MAKE} ${MAKEARGS} clean_modules )
@${MAKE} -C src ${MAKEARGS} clean_modules
distclean_modules:
(cd src ; ${MAKE} ${MAKEARGS} distclean_modules )
@${MAKE} -C src ${MAKEARGS} distclean_modules
protocols: build
@echo "*** Building protocol support";
(cd src/protocol ; ./configure ; ${MAKE} ${MAKEARGS} all; )
strict_protocols: build
@echo "*** Building protocol support";
(cd src/protocol ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' all; )
@src/protocol/configure src/protocol
@${MAKE} -C src/protocol ${MAKEARGS} all
profile_protocols: build
@echo "*** Building protocol support";
(cd src/protocol ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all; )
@src/protocol/configure src/protocol
@${MAKE} -C src/protocol ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all
core: build
@echo "*** Building Core modules";
(cd src/ ; ${MAKE} ${MAKEARGS} core; )
strict_core: build
@echo "*** Building Core modules";
(cd src/ ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' core; )
@${MAKE} -C src ${MAKEARGS} core
profile_core: build
@echo "*** Building Core modules";
(cd src/ ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' core; )
@${MAKE} -C src ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' core
tools: build
(cd src/tools ; ${MAKE} ${MAKEARGS} all; )
@echo "*** All done, now (g)make install to install Anope/Modules/Tools";
strict_tools: strict_build
(cd src/tools ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(STRICT)' all; )
@${MAKE} -C src/tools ${MAKEARGS} all
@echo "*** All done, now (g)make install to install Anope/Modules/Tools";
profile_tools: profile_build
(cd src/tools ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' all; )
@${MAKE} -C src/tools ${MAKEARGS} 'CFLAGS=${CFLAGS} $(PROFILE)' all
@echo "*** All done, now (g)make install to install Anope/Modules/Tools";
strict_modules: strict_build
(cd src/modules ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=$(CFLAGS) $(STRICT)' all; )
@echo "*** All done, now (g)make install to install Anope/Modules";
profile_modules: profile_build
(cd src/modules ; ./configure ; ${MAKE} ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all; )
@src/modules/configure src/modules
@${MAKE} -C src/modules ${MAKEARGS} 'CFLAGS=${CFLAGS} ${PROFILE}' 'PROFILE=${PROFILE}' all
@echo "*** All done, now (g)make install to install Anope/Modules";
language:
(cd lang ; $(MAKE) ${MAKEARGS} all language.h ; )
@$(MAKE) -C lang ${MAKEARGS} all language.h
headers:
(cd include ; ${MAKE} ${MAKEARGS} )
@${MAKE} -C include ${MAKEARGS}
clean:
(cd lang ; ${MAKE} ${MAKEARGS} clean )
(cd include ; ${MAKE} ${MAKEARGS} clean )
(cd src ; ${MAKE} ${MAKEARGS} clean )
(cd src/tools ; ${MAKE} ${MAKEARGS} clean )
${MAKE} -C lang ${MAKEARGS} clean
${MAKE} -C include ${MAKEARGS} clean
${MAKE} -C src ${MAKEARGS} clean
${MAKE} -C src/tools ${MAKEARGS} clean
distclean: clean
(cd lang ; ${MAKE} distclean )
(cd include ; ${MAKE} distclean )
(cd src ; ${MAKE} distclean )
(cd src/tools ; ${MAKE} distclean )
${MAKE} -C lang ${MAKEARGS} distclean
${MAKE} -C include ${MAKEARGS} distclean
${MAKE} -C src ${MAKEARGS} distclean
${MAKE} -C src/tools ${MAKEARGS} distclean
rm -f config.log config.status config.cache Makefile src/bin/anoperc
install: DUMMY
(cd src ; ${MAKE} ${MAKEARGS} install)
(cd src/tools ; ${MAKE} ${MAKEARGS} install)
${MAKE} -C src ${MAKEARGS} install
${MAKE} -C src/tools ${MAKEARGS} install
@echo "*** All done, Anope is now installed. Please read docs/INSTALL for details on what to do now.";
DUMMY:
TODO
+4
View File
@@ -61,3 +61,7 @@ anopeng-uid branch TODO
- chan_set_modes should take BotInfo, possibly with override for User *?
- SendClientIntroduction should take a UID param, rather than generating one(?)
anopeng-config branch TODO
- remove old config, replace with insp-inspired (albeit bind format) config
configure
Vendored
-388
View File
@@ -6761,297 +6761,6 @@ fi
for ac_func in strerror
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
#endif
int
main ()
{
return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_STRERROR 1
_ACEOF
fi
done
for ac_func in sys_errlist
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
#endif
int
main ()
{
return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_SYS_ERRLIST 1
_ACEOF
fi
done
for ac_func in snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
#endif
int
main ()
{
return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_SNPRINTF 1
_ACEOF
fi
done
for ac_func in stricmp
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -7440,103 +7149,6 @@ fi
done
for ac_func in strsignal
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
#endif
int
main ()
{
return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_STRSIGNAL 1
_ACEOF
fi
done
for ac_func in gettimeofday
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
configure.in
-4
View File
@@ -232,14 +232,10 @@ AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H,1,""))
AC_CHECK_HEADER(sys/select.h,AC_DEFINE(HAVE_SYS_SELECT_H,1,""))
AC_CHECK_HEADER(execinfo.h,AC_DEFINE(HAVE_BACKTRACE,1,""))
AC_CHECK_FUNCS(strerror,AC_DEFINE(HAVE_STRERROR,1))
AC_CHECK_FUNCS(sys_errlist,AC_DEFINE(HAVE_SYS_ERRLIST,1))
AC_CHECK_FUNCS(snprintf,AC_DEFINE(HAVE_SNPRINTF,1))
AC_CHECK_FUNCS(stricmp,AC_DEFINE(HAVE_STRICMP,1))
AC_CHECK_FUNCS(strcasecmp,AC_DEFINE(HAVE_STRCASECMP,1))
AC_CHECK_FUNCS(strdup,AC_DEFINE(HAVE_STRDUP,1))
AC_CHECK_FUNCS(strspn,AC_DEFINE(HAVE_STRSPN,1))
AC_CHECK_FUNCS(strsignal,AC_DEFINE(HAVE_STRSIGNAL,1))
AC_CHECK_FUNCS(gettimeofday,AC_DEFINE(HAVE_GETTIMEOFDAY,1))
AC_CHECK_FUNCS(setgrent,AC_DEFINE(HAVE_SETGRENT,1))
AC_CHECK_FUNCS(umask,AC_DEFINE(HAVE_UMASK,1))
include/extern.h
-14
View File
@@ -213,14 +213,6 @@ E char *get_mlock_modes(ChannelInfo * ci, int complete);
/**** compat.c ****/
#if !HAVE_SNPRINTF
# if BAD_SNPRINTF
# define snprintf my_snprintf
# endif
# define vsnprintf my_vsnprintf
E int vsnprintf(char *buf, size_t size, const char *fmt, va_list args);
E int snprintf(char *buf, size_t size, const char *fmt, ...);
#endif
#if !HAVE_STRICMP && !HAVE_STRCASECMP
E int stricmp(const char *s1, const char *s2);
E int strnicmp(const char *s1, const char *s2, size_t len);
@@ -231,12 +223,6 @@ E char *strdup(const char *s);
#if !HAVE_STRSPN
E size_t strspn(const char *s, const char *accept);
#endif
#if !HAVE_STRERROR
E char *strerror(int errnum);
#endif
#if !HAVE_STRSIGNAL
char *strsignal(int signum);
#endif
#ifdef _WIN32
char *sockstrerror(int error);
#endif
include/services.h
-6
View File
@@ -23,12 +23,6 @@
#define MAX_CMD_HASH 1024
#endif
/* Some Linux boxes (or maybe glibc includes) require this for the
* prototype of strsignal(). */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
/* Some SUN fixs */
#ifdef __sun
/* Solaris specific code, types that do not exist in Solaris'
include/sysconf.h.in
-41
View File
@@ -33,9 +33,6 @@
/* Define to 1 if you have the `setgrent' function. */
#undef HAVE_SETGRENT
/* Define to 1 if you have the `snprintf' function. */
#undef HAVE_SNPRINTF
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@@ -48,9 +45,6 @@
/* Define to 1 if you have the `strdup' function. */
#undef HAVE_STRDUP
/* Define to 1 if you have the `strerror' function. */
#undef HAVE_STRERROR
/* Define to 1 if you have the `stricmp' function. */
#undef HAVE_STRICMP
@@ -66,15 +60,9 @@
/* Define to 1 if you have the `strlcpy' function. */
#undef HAVE_STRLCPY
/* Define to 1 if you have the `strsignal' function. */
#undef HAVE_STRSIGNAL
/* Define to 1 if you have the `strspn' function. */
#undef HAVE_STRSPN
/* Define to 1 if you have the `sys_errlist' function. */
#undef HAVE_SYS_ERRLIST
/* "" */
#undef HAVE_SYS_SELECT_H
@@ -185,35 +173,6 @@
#ifdef __STRICT_ANSI__
#include <stdarg.h>
#include <stdio.h>
/* We KNOW these are not ansi, we are defining them here to suppress the warning
* * s messages on a "make strict" compile */
#ifndef snprintf
int snprintf(char *str, size_t size, const char *format, ...);
#endif
#ifndef vprintf
int vprintf(const char *format, va_list ap);
#endif
#ifndef vfprintf
int vfprintf(FILE *stream, const char *format, va_list ap);
#endif
#ifndef vsprintf
int vsprintf(char *str, const char *format, va_list ap);
#endif
#ifndef vsnprintf
int vsnprintf(char *str, size_t size, const char *format, va_list ap);
#endif
FILE *popen(const char *command, const char *type);
int pclose(FILE *stream);
FILE *fdopen(int fildes, const char *mode);
int ftruncate(int fd, off_t length);
#ifdef HAVE_STRSIGNAL
char *strsignal(int sig);
#endif
#endif
include/sysconf.h.win32
-4
View File
@@ -16,10 +16,6 @@ typedef unsigned __int8 u_int8_t;
#define HAVE_SYS_SELECT_H 0
#define HAVE_SYS_SYSPROTO_H 0
#define HAVE_STRERROR 1
#define HAVE_SYS_ERRLIST 0
#define HAVE_SNPRINTF 1
#define BAD_SNPRINTF 0
#define HAVE_STRICMP 1
#define HAVE_STRCASECMP 0
#define HAVE_STRDUP 1
include/version.sh.c
+16 -8
View File
@@ -16,6 +16,8 @@
#include <stdio.h>
#include <string.h>
#include <cstdlib>
#include <cctype>
#define CTRL "version.log"
@@ -46,10 +48,10 @@ int main()
load_ctrl(fd);
fclose(fd);
_snprintf(version, 1024, "%d.%d.%d%s (%d)", version_major, version_minor,
_snprintf(version, 1024, "%ld.%ld.%ld%s (%ld)", version_major, version_minor,
version_patch, (version_extra ? version_extra : ""), version_build);
_snprintf(version_dotted, 1024, "%d.%d.%d%s.%d", version_major, version_minor,
_snprintf(version_dotted, 1024, "%ld.%ld.%ld%s.%ld", version_major, version_minor,
version_patch, (version_extra ? version_extra : ""), version_build);
fd = fopen("version.h", "r");
@@ -106,7 +108,11 @@ char *strip(char *str)
long get_value(char *string)
{
return atol(get_value_str(string));
// XXX : if the fields in version.log are empty strtok returns a double quote, dont try to atol it then
if (*string != '"')
return atol(get_value_str(string));
else
return 0;
}
char *get_value_str(char *string)
@@ -165,10 +171,12 @@ void write_version(FILE * fd)
strip(buf);
if (until_eof)
{
if (!strcmp(buf, "EOF"))
break;
else
parse_line(fd, buf);
}
if (!strcmp(buf, "cat >version.h <<EOF"))
until_eof = 1;
@@ -197,18 +205,18 @@ void parse_line(FILE * fd, char *line)
*var = 0;
if (!strcmp(varbegin, "VERSION_MAJOR"))
fprintf(fd, "%d", version_major);
fprintf(fd, "%ld", version_major);
else if (!strcmp(varbegin, "VERSION_MINOR"))
fprintf(fd, "%d", version_minor);
fprintf(fd, "%ld", version_minor);
else if (!strcmp(varbegin, "VERSION_PATCH"))
fprintf(fd, "%d", version_patch);
fprintf(fd, "%ld", version_patch);
else if (!strcmp(varbegin, "VERSION_EXTRA")) {
if (version_extra)
fprintf(fd, "%s", version_extra);
} else if (!strcmp(varbegin, "VERSION_BUILD"))
fprintf(fd, "%d", version_build);
fprintf(fd, "%ld", version_build);
else if (!strcmp(varbegin, "BUILD"))
fprintf(fd, "%d", build);
fprintf(fd, "%ld", build);
else if (!strcmp(varbegin, "VERSION"))
fprintf(fd, "%s", version);
else if (!strcmp(varbegin, "VERSIONDOTTED"))
install.js
+3 -3
View File
@@ -147,11 +147,11 @@ var buildPackages = [
'name' : 'Microsoft Visual Studio .NET 2003',
'libpaths' : [
'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\Lib',
'Program Files\\Microsoft Visual Studio .NET 2003\\PlatformSDK\\Lib'
'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\PlatformSDK\\Lib'
],
'incpaths' : [
'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\Include',
'Program Files\\Microsoft Visual Studio .NET 2003\\PlatformSDK\\Include'
'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\PlatformSDK\\Include'
],
'nmake' : [
'Program Files\\Microsoft Visual Studio .NET 2003\\VC7\\Bin',
@@ -368,7 +368,7 @@ var buildPackages = [
f.WriteLine("CC=cl");
f.WriteLine("RC=rc");
f.WriteLine("MAKE=nmake -f Makefile.win32");
f.WriteLine("BASE_CFLAGS=$(VC6) /O2 /MD $(INCFLAGS)");
f.WriteLine("BASE_CFLAGS=$(VC6) /O2 /MD /TP /EHsc $(INCFLAGS)");
f.WriteLine("RC_FLAGS="+path_line_rc);
f.WriteLine("LIBS=wsock32.lib advapi32.lib /NODEFAULTLIB:libcmtd.lib");
f.WriteLine("LFLAGS=$(LIBPATH)");
lang/Makefile
+16 -16
View File
@@ -44,39 +44,39 @@ spotless: clean
cat: cat.l langcomp index
./langcomp $@.l
@./langcomp $@.l
de: de.l langcomp index
./langcomp $@.l
@./langcomp $@.l
en_us: en_us.l langcomp index
./langcomp $@.l
@./langcomp $@.l
es: es.l langcomp index
./langcomp $@.l
@./langcomp $@.l
fr: fr.l langcomp index
./langcomp $@.l
@./langcomp $@.l
gr: gr.l langcomp index
./langcomp $@.l
@./langcomp $@.l
hun: hun.l langcomp index
./langcomp $@.l
@./langcomp $@.l
it: it.l langcomp index
./langcomp $@.l
@./langcomp $@.l
nl: nl.l langcomp index
./langcomp $@.l
@./langcomp $@.l
pl: pl.l langcomp index
./langcomp $@.l
@./langcomp $@.l
pt: pt.l langcomp index
./langcomp $@.l
@./langcomp $@.l
ru: ru.l langcomp index
./langcomp $@.l
@./langcomp $@.l
tr: tr.l langcomp index
./langcomp $@.l
@./langcomp $@.l
langcomp: langcomp.c
$(CC) $(CFLAGS) langcomp.c -o $@
@../run-cc.pl $(CC) $(CFLAGS) langcomp.c -o $@
language.h: index Makefile
@perl -e <index >$@ 'print STDERR "Generating language.h... "; $$i=0; while (<>) { chop; printf "#define %-32s %d\n", $$_, $$i++; } print "\n#define NUM_STRINGS $$i\n"; print STDERR "$$i strings\n";'
cp language.h ../include
@cp language.h ../include
index: en_us.l
grep '^[A-Z]' en_us.l >index
@grep '^[A-Z]' en_us.l >index
lang/langcomp.c
+1 -1
View File
@@ -188,7 +188,7 @@ int main(int ac, char **av)
s = strrchr(filename, '.');
if (!s)
s = filename + strlen(filename);
if (s-filename > sizeof(langname)-3)
if (s-filename > (int)sizeof(langname)-3)
s = filename + sizeof(langname)-1;
strncpy(langname, filename, s-filename);
langname[s-filename] = '\0';
lang/langtool.c
+75 -73
View File
@@ -1,74 +1,76 @@
/* Language stuff generator for win32.
*
* (C) 2003-2008 Anope Team
* Contact us at info@anope.org
*
* Please read COPYING and README for furhter details.
*
* Based on the original code of Epona by Lara.
* Based on the original code of Services by Andy Church.
*
* Written by Dominick Meglio <codemastr@unrealircd.com>
*
*/
#include <string.h>
#include <stdio.h>
char *strip(char *str)
{
char *c;
if ((c = strchr(str,'\n')))
*c = 0;
if ((c = strchr(str,'\r')))
*c = 0;
return str;
}
int main(int argc, char *argv[])
{
if (argc < 2)
exit(1);
/* Build the index file */
if (!strcmp(argv[1], "index"))
{
FILE *fd = fopen("en_us.l", "rb");
FILE *fdout = fopen("index", "wb");
char buf[1024];
if (!fd || !fdout)
exit(2);
while (fgets(buf, 1023, fd))
{
if (isupper(*buf))
fprintf(fdout, "%s", buf);
}
fclose(fd);
fclose(fdout);
}
/* Build the language.h file */
else if (!strcmp(argv[1], "language.h"))
{
FILE *fd = fopen("index", "r");
FILE *fdout = fopen("language.h", "w");
char buf[1024];
int i = 0;
if (!fd || !fdout)
exit(2);
fprintf(stderr, "Generating language.h... ");
while (fgets(buf, 1023, fd)) {
fprintf(fdout, "#define %-32s %d\n", strip(buf), i++);
}
fprintf(fdout, "#define NUM_STRINGS %d\n", i);
fprintf(stderr, "%d strings\n", i);
/* Language stuff generator for win32.
*
* (C) 2003-2008 Anope Team
* Contact us at info@anope.org
*
* Please read COPYING and README for furhter details.
*
* Based on the original code of Epona by Lara.
* Based on the original code of Services by Andy Church.
*
* Written by Dominick Meglio <codemastr@unrealircd.com>
*
*/
#include <string.h>
#include <stdio.h>
#include <cstdlib>
#include <cctype>
char *strip(char *str)
{
char *c;
if ((c = strchr(str,'\n')))
*c = 0;
if ((c = strchr(str,'\r')))
*c = 0;
return str;
}
int main(int argc, char *argv[])
{
if (argc < 2)
exit(1);
/* Build the index file */
if (!strcmp(argv[1], "index"))
{
FILE *fd = fopen("en_us.l", "rb");
FILE *fdout = fopen("index", "wb");
char buf[1024];
if (!fd || !fdout)
exit(2);
while (fgets(buf, 1023, fd))
{
if (isupper(*buf))
fprintf(fdout, "%s", buf);
}
fclose(fd);
fclose(fdout);
}
return 0;
}
fclose(fdout);
}
/* Build the language.h file */
else if (!strcmp(argv[1], "language.h"))
{
FILE *fd = fopen("index", "r");
FILE *fdout = fopen("language.h", "w");
char buf[1024];
int i = 0;
if (!fd || !fdout)
exit(2);
fprintf(stderr, "Generating language.h... ");
while (fgets(buf, 1023, fd)) {
fprintf(fdout, "#define %-32s %d\n", strip(buf), i++);
}
fprintf(fdout, "#define NUM_STRINGS %d\n", i);
fprintf(stderr, "%d strings\n", i);
fclose(fd);
fclose(fdout);
}
return 0;
}
src/Makefile
+16 -12
View File
@@ -36,7 +36,7 @@ distclean: spotless
distclean_modules: clean_modules spotless
services: $(OBJS) mod_version
$(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
@../run-cc.pl $(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
$(OBJS): Makefile
actions.o: actions.c $(INCLUDES)
@@ -80,35 +80,39 @@ mysql.o: mysql.c $(INCLUDES)
rdb.o: rdb.c $(INCLUDES)
mod_version: mod_version.c $(INCLUDES)
$(CC) $(CDEFS) $(CFLAGS) $(MODULEFLAGS) -I../include/ -c mod_version.c
@../run-cc.pl $(CC) $(CDEFS) $(CFLAGS) $(MODULEFLAGS) -I../include/ -c mod_version.c
modules: DUMMY
(cd modules ; ./configure ; ${MAKE} ${MAKEARGS} all)
@modules/configure modules
@${MAKE} -C modules ${MAKEARGS} all
protocols: DUMMY
(cd protocol ; ./configure ; ${MAKE} ${MAKEARGS} all)
@protocol/configure protocol
@${MAKE} -C protocol ${MAKEARGS} all
core: DUMMY
(cd core ; ./configure ; ${MAKE} ${MAKEARGS} all)
@core/configure core
@${MAKE} -C core ${MAKEARGS} all
clean: clean_modules clean_protocols clean_core
rm -f *.o services a.out
clean_modules:
@touch modules/Makefile.inc # Horribly ugly...
(cd modules ; ${MAKE} clean)
@${MAKE} -C modules clean
clean_protocols:
@touch protocol/Makefile.inc
(cd protocol ; ${MAKE} clean)
@${MAKE} -C protocol clean
clean_core:
@touch core/Makefile.inc
(cd core ; ${MAKE} clean)
@${MAKE} -C core clean
spotless:
(cd modules ; ${MAKE} distclean)
(cd protocol ; ${MAKE} distclean)
(cd core ; ${MAKE} distclean)
@${MAKE} -C modules distclean
@${MAKE} -C protocol distclean
@${MAKE} -C core distclean
install: services
test -d ${BINDEST} || mkdir ${BINDEST}
src/compat.c
-143
View File
@@ -16,38 +16,6 @@
/*************************************************************************/
#if !HAVE_SNPRINTF
/* [v]snprintf: Like [v]sprintf, but don't write more than len bytes
* (including null terminator). Return the number of bytes
* written.
*/
#if BAD_SNPRINTF
int vsnprintf(char *buf, size_t len, const char *fmt, va_list args)
{
if (len <= 0)
return 0;
*buf = 0;
vsnprintf(buf, len, fmt, args);
buf[len - 1] = 0;
return strlen(buf);
}
#endif /* BAD_SNPRINTF */
int snprintf(char *buf, size_t len, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
return vsnprintf(buf, len, fmt, args);
va_end(args);
}
#endif /* !HAVE_SNPRINTF */
/*************************************************************************/
#if !HAVE_STRICMP && !HAVE_STRCASECMP
/* stricmp, strnicmp: Case-insensitive versions of strcmp() and
@@ -112,115 +80,4 @@ size_t strspn(const char *s, const char *accept)
}
#endif
/*************************************************************************/
#if !HAVE_STRERROR
# if HAVE_SYS_ERRLIST
extern char *sys_errlist[];
# endif
char *strerror(int errnum)
{
# if HAVE_SYS_ERRLIST
return sys_errlist[errnum];
# else
static char buf[20];
snprintf(buf, sizeof(buf), "Error %d", errnum);
return buf;
# endif
}
#endif
/*************************************************************************/
#if !HAVE_STRSIGNAL
/* Windows only supports 6 signals:
* SIGINT, SIGILL, SIGABRT, SIGFPE, SIGSEGV, SIGTERM
* -- codemastr
*/
char *strsignal(int signum)
{
static char buf[32];
switch (signum) {
#ifndef _WIN32
case SIGHUP:
strscpy(buf, "Hangup", sizeof(buf));
break;
#endif
case SIGINT:
strscpy(buf, "Interrupt", sizeof(buf));
break;
#ifndef _WIN32
case SIGQUIT:
strscpy(buf, "Quit", sizeof(buf));
break;
#endif
#ifdef SIGILL
case SIGILL:
strscpy(buf, "Illegal instruction", sizeof(buf));
break;
#endif
#ifdef SIGABRT
case SIGABRT:
strscpy(buf, "Abort", sizeof(buf));
break;
#endif
#if defined(SIGIOT) && (!defined(SIGABRT) || SIGIOT != SIGABRT)
case SIGIOT:
strscpy(buf, "IOT trap", sizeof(buf));
break;
#endif
#ifdef SIGBUS
case SIGBUS:
strscpy(buf, "Bus error", sizeof(buf));
break;
#endif
case SIGFPE:
strscpy(buf, "Floating point exception", sizeof(buf));
break;
#ifndef _WIN32
case SIGKILL:
strscpy(buf, "Killed", sizeof(buf));
break;
case SIGUSR1:
strscpy(buf, "User signal 1", sizeof(buf));
break;
#endif
case SIGSEGV:
strscpy(buf, "Segmentation fault", sizeof(buf));
break;
#ifndef _WIN32
case SIGUSR2:
strscpy(buf, "User signal 2", sizeof(buf));
break;
case SIGPIPE:
strscpy(buf, "Broken pipe", sizeof(buf));
break;
case SIGALRM:
strscpy(buf, "Alarm clock", sizeof(buf));
break;
#endif
case SIGTERM:
strscpy(buf, "Terminated", sizeof(buf));
break;
#ifndef _WIN32
case SIGSTOP:
strscpy(buf, "Suspended (signal)", sizeof(buf));
break;
case SIGTSTP:
strscpy(buf, "Suspended", sizeof(buf));
break;
case SIGIO:
strscpy(buf, "I/O error", sizeof(buf));
break;
#endif
default:
snprintf(buf, sizeof(buf), "Signal %d\n", signum);
break;
}
return buf;
}
#endif
/*************************************************************************/
src/core/configure
Vendored
+8 -1
View File
@@ -1,5 +1,11 @@
#!/bin/sh
oldpath=`pwd`
if [ $1 ]; then
cd $1
fi
echo2 () {
$ECHO2 "$*$ECHO2SUF" # these are defined later
}
@@ -49,5 +55,6 @@ do
fi
done
exit 0
cd $oldpath
exit 0
src/datafiles.c
+1 -1
View File
@@ -329,7 +329,7 @@ void restore_db(dbFILE * f)
}
if (!ok && f->backupfp) {
char buf[1024];
int i;
unsigned int i;
ok = 1;
if (fseek(f->fp, 0, SEEK_SET) < 0)
ok = 0;
src/main.c
+2 -8
View File
@@ -461,8 +461,8 @@ void sighandler(int signum)
default:
snprintf(buf, sizeof(buf), "waiting=%d", waiting);
}
ircdproto->SendGlobops(NULL, "PANIC! %s (%s)", buf, strsignal(signum));
alog("PANIC! %s (%s)", buf, strsignal(signum));
ircdproto->SendGlobops(NULL, "PANIC! %s (caught signal %d)", buf, signum);
alog("PANIC! %s (caught signal %d)", buf, signum);
modules_unload_all(false, true);
}
}
@@ -474,13 +474,7 @@ void sighandler(int signum)
!(quitmsg = (const char *)calloc(BUFSIZE, 1))) {
quitmsg = "Out of memory!";
} else {
// Yes, this isn't the "nicest" of ideas, but we know it's safe, if bad practice. -- w00t
#if HAVE_STRSIGNAL
snprintf((char *)quitmsg, BUFSIZE, "Services terminating: %s", strsignal(signum));
#else
snprintf((char *)quitmsg, BUFSIZE, "Services terminating on signal %d", signum);
#endif
}
if (signum == SIGSEGV) {
src/modules/configure
Vendored
+8 -1
View File
@@ -1,5 +1,11 @@
#!/bin/sh
oldpath=`pwd`
if [ $1 ]; then
cd $1
fi
echo2 () {
$ECHO2 "$*$ECHO2SUF" # these are defined later
}
@@ -54,5 +60,6 @@ do
fi
done
exit 0
cd $oldpath
exit 0
src/nickserv.c
+2 -4
View File
@@ -492,10 +492,8 @@ void load_ns_dbase(void)
if (ver < 14) {
SAFE(read_string(&pass, f));
if (pass) {
len = strlen(pass);
enc_encrypt(pass, len, nc->pass, PASSMAX);
memset(pass, 0, len);
free(pass);
memset(nc->pass, 0, PASSMAX);
memcpy(nc->pass, pass, strlen(pass));
} else
memset(nc->pass, 0, PASSMAX);
} else
src/protocol/configure
Vendored
+8 -1
View File
@@ -1,5 +1,11 @@
#!/bin/sh
oldpath=`pwd`
if [ $1 ]; then
cd $1
fi
echo2 () {
$ECHO2 "$*$ECHO2SUF" # these are defined later
}
@@ -49,5 +55,6 @@ do
fi
done
exit 0
cd $oldpath
exit 0
version.log
+16
View File
@@ -13,6 +13,22 @@ VERSION_BUILD=""
# $Log$
#
# BUILD : 1.7.23 (1471)
# BUGS :
# NOTES : Development Framework
#
# BUILD : 1.7.23 (1469)
# BUGS :
# NOTES : 1.7.23b Release (fixes encrypted nick.db issue on .23)
#
# BUILD : 1.7.23 (1468)
# BUGS :
# NOTES : Fixed fuckup in nickserv.c. Passwords should not be encrypted when loading an old nick.db, only when loading pre-nick.db.
#
# BUILD : 1.7.23 (1467)
# BUGS :
# NOTES : Development Framework
#
# BUILD : 1.7.23 (1465)
# BUGS :
# NOTES : Anope 1.7.23 Release