mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2026-01-13 06:57:10 +03:00
Add a verbose output option to build.
Cleanup mlogc build and warnings.
This commit is contained in:
b1v1r
7
CHANGES
7
CHANGES
@@ -1,3 +1,10 @@
|
||||
05 Mar 2009 - 2.5.9-dev1
|
||||
------------------------
|
||||
|
||||
* Cleaned up build, adding an option for verbose configure output and making
|
||||
the mlogc build more portable.
|
||||
|
||||
|
||||
21 Nov 2008 - 2.5.8
|
||||
-------------------
|
||||
|
||||
|
||||
@@ -66,8 +66,8 @@ install: install-mods
|
||||
|
||||
clean-extras:
|
||||
@for dir in mlogc-src; do \
|
||||
if test -d $$dir; then \
|
||||
$(MAKE) -C $$dir clean; \
|
||||
if test -d $$dir; then \
|
||||
(cd $$dir && $(MAKE) clean); \
|
||||
fi; \
|
||||
done
|
||||
@rm -rf ../tools/mlogc ../tools/mlogc-batch-load.pl
|
||||
@@ -97,7 +97,7 @@ mod_security2.la: $(MOD_SECURITY2_H) *.c
|
||||
|
||||
### MLogC
|
||||
mlogc:
|
||||
@$(MAKE) -C mlogc-src mlogc \
|
||||
@(cd mlogc-src && $(MAKE) mlogc) \
|
||||
&& cp -p mlogc-src/mlogc ../tools \
|
||||
&& cp -p mlogc-src/mlogc-batch-load.pl ../tools \
|
||||
&& echo \
|
||||
|
||||
392
apache2/configure
vendored
392
apache2/configure
vendored
@@ -1296,6 +1296,7 @@ if test -n "$ac_init_help"; then
|
||||
Optional Features:
|
||||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
||||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
||||
--enable-verbose-output Enable more verbose configure output.
|
||||
--enable-strict-compile Enable strict compilation (warnings are errors).
|
||||
--enable-debug-conf Enable debug during configuration.
|
||||
--enable-debug-cache Enable debug for transformation caching.
|
||||
@@ -5017,182 +5018,25 @@ MSC_REGRESSION_DOCROOT_DIR="$MSC_REGRESSION_SERVERROOT_DIR/htdocs"
|
||||
|
||||
|
||||
|
||||
# Find apxs
|
||||
{ echo "$as_me:$LINENO: looking for Apache module support via DSO through APXS" >&5
|
||||
echo "$as_me: looking for Apache module support via DSO through APXS" >&6;}
|
||||
|
||||
# Check whether --with-apxs was given.
|
||||
if test "${with_apxs+set}" = set; then
|
||||
withval=$with_apxs;
|
||||
if test "$withval" = "yes"; then
|
||||
APXS=apxs
|
||||
else
|
||||
APXS="$withval"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$APXS"; then
|
||||
for i in /usr/local/apache22/bin \
|
||||
/usr/local/apache2/bin \
|
||||
/usr/local/apache/bin \
|
||||
/usr/local/sbin \
|
||||
/usr/local/bin \
|
||||
/usr/sbin \
|
||||
/usr/bin;
|
||||
do
|
||||
if test -f "$i/apxs2"; then
|
||||
APXS="$i/apxs2"
|
||||
break
|
||||
elif test -f "$i/apxs"; then
|
||||
APXS="$i/apxs"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# arbitrarily picking the same version subversion looks for, don't know how
|
||||
# accurate this really is, but at least it'll force us to have apache2...
|
||||
HTTPD_WANTED_MMN=20020903
|
||||
|
||||
if test -n "$APXS" -a "$APXS" != "no" -a -x "$APXS" ; then
|
||||
APXS_INCLUDE="`$APXS -q INCLUDEDIR`"
|
||||
if test -r $APXS_INCLUDE/httpd.h; then
|
||||
{ echo "$as_me:$LINENO: found apxs at $APXS" >&5
|
||||
echo "$as_me: found apxs at $APXS" >&6;}
|
||||
{ echo "$as_me:$LINENO: checking httpd version" >&5
|
||||
echo "$as_me: checking httpd version" >&6;}
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include "$APXS_INCLUDE/ap_mmn.h"
|
||||
#if AP_MODULE_MAGIC_AT_LEAST($HTTPD_WANTED_MMN,0)
|
||||
VERSION_OK
|
||||
#endif
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "VERSION_OK" >/dev/null 2>&1; then
|
||||
{ echo "$as_me:$LINENO: httpd is recent enough" >&5
|
||||
echo "$as_me: httpd is recent enough" >&6;}
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: apache is too old" >&5
|
||||
echo "$as_me: error: apache is too old" >&2;}
|
||||
{ (exit mmn must be at least $HTTPD_WANTED_MMN); exit mmn must be at least $HTTPD_WANTED_MMN; }; }
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
APXS_INCLUDEDIR="`$APXS -q INCLUDEDIR`"
|
||||
# Make sure the include dir is used
|
||||
if test -n "$APXS_INCLUDEDIR"; then
|
||||
APXS_INCLUDES="-I${APXS_INCLUDEDIR} `$APXS -q INCLUDES` `$APXS -q EXTRA_INCLUDES`"
|
||||
else
|
||||
APXS_INCLUDES="`$APXS -q INCLUDES` `$APXS -q EXTRA_INCLUDES`"
|
||||
fi
|
||||
APXS_CFLAGS="`$APXS -q CFLAGS` `$APXS -q EXTRA_CFLAGS`"
|
||||
APXS_LDFLAGS="`$APXS -q LDFLAGS` `$APXS -q EXTRA_LDFLAGS`"
|
||||
APXS_LIBDIR="`$APXS -q LIBDIR`"
|
||||
# Make sure the lib dir is used
|
||||
if test -n "$APXS_LIBDIR"; then
|
||||
APXS_LIBS="-L{$APXS_LIBDIR} `$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
|
||||
else
|
||||
APXS_LIBS="`$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
|
||||
fi
|
||||
APXS_LIBTOOL="`$APXS -q LIBTOOL`"
|
||||
APXS_CC="`$APXS -q CC`"
|
||||
APXS_BINDIR="`$APXS -q BINDIR`"
|
||||
APXS_SBINDIR="`$APXS -q SBINDIR`"
|
||||
APXS_PROGNAME="`$APXS -q PROGNAME`"
|
||||
APXS_LIBEXECDIR="`$APXS -q LIBEXECDIR`"
|
||||
if test "$APXS_SBINDIR" = "/"; then
|
||||
APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME"
|
||||
else
|
||||
APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME"
|
||||
fi
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: couldn't find APXS" >&5
|
||||
echo "$as_me: error: couldn't find APXS" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
# Use Apache httpd source srclib as base for pcre, apr and apu config scripts
|
||||
|
||||
# Check whether --with-httpd-src was given.
|
||||
if test "${with_httpd_src+set}" = set; then
|
||||
withval=$with_httpd_src;
|
||||
if test -n "$withval"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/srclib/pcre"
|
||||
LDFLAGS="$LDFLAGS -L$withval/srclib/pcre"
|
||||
pcre_path="$withval/srclib/pcre"
|
||||
apr_path="$withval/srclib/apr"
|
||||
apu_path="$withval/srclib/apr-util"
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: --with-httpd-src requires a path" >&5
|
||||
echo "$as_me: error: --with-httpd-src requires a path" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# Include M4 macros
|
||||
|
||||
PCRE_CONFIG="pcre-config"
|
||||
PCRE_CFLAGS=""
|
||||
PCRE_LIBS=""
|
||||
|
||||
|
||||
|
||||
|
||||
APR_CONFIG=""
|
||||
APR_CFLAGS=""
|
||||
APR_LDFLAGS=""
|
||||
APR_LIBS=""
|
||||
APR_LINK_LD=""
|
||||
|
||||
|
||||
|
||||
|
||||
APU_CONFIG=""
|
||||
APU_CFLAGS=""
|
||||
APU_LDFLAGS=""
|
||||
APU_LIBS=""
|
||||
APU_LINK_LD=""
|
||||
|
||||
|
||||
|
||||
|
||||
LIBXML_CONFIG="xml2-config"
|
||||
LIBXML_CFLAGS=""
|
||||
LIBXML_LIBS=""
|
||||
|
||||
|
||||
|
||||
|
||||
LUA_CONFIG="pkg-config"
|
||||
LUA_PKGNAMES="lua5.1 lua5 lua"
|
||||
LUA_CFLAGS=""
|
||||
LUA_LIBS=""
|
||||
LUA_SONAMES="so la sl dll dylib"
|
||||
|
||||
|
||||
|
||||
|
||||
CURL_CONFIG="curl-config"
|
||||
CURL_CFLAGS=""
|
||||
CURL_LIBS=""
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
### Configure Options
|
||||
|
||||
# Verbose output
|
||||
# Check whether --enable-verbose-output was given.
|
||||
if test "${enable_verbose_output+set}" = set; then
|
||||
enableval=$enable_verbose_output;
|
||||
if test "$enableval" != "no"; then
|
||||
verbose_output=1
|
||||
else
|
||||
verbose_output=0
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
verbose_output=0
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# Strict Compile
|
||||
# Check whether --enable-strict-compile was given.
|
||||
if test "${enable_strict_compile+set}" = set; then
|
||||
@@ -5312,6 +5156,206 @@ else
|
||||
fi
|
||||
|
||||
|
||||
# Find apxs
|
||||
{ echo "$as_me:$LINENO: looking for Apache module support via DSO through APXS" >&5
|
||||
echo "$as_me: looking for Apache module support via DSO through APXS" >&6;}
|
||||
|
||||
# Check whether --with-apxs was given.
|
||||
if test "${with_apxs+set}" = set; then
|
||||
withval=$with_apxs;
|
||||
if test "$withval" = "yes"; then
|
||||
APXS=apxs
|
||||
else
|
||||
APXS="$withval"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$APXS"; then
|
||||
for i in /usr/local/apache22/bin \
|
||||
/usr/local/apache2/bin \
|
||||
/usr/local/apache/bin \
|
||||
/usr/local/sbin \
|
||||
/usr/local/bin \
|
||||
/usr/sbin \
|
||||
/usr/bin;
|
||||
do
|
||||
if test -f "$i/apxs2"; then
|
||||
APXS="$i/apxs2"
|
||||
break
|
||||
elif test -f "$i/apxs"; then
|
||||
APXS="$i/apxs"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# arbitrarily picking the same version subversion looks for, don't know how
|
||||
# accurate this really is, but at least it'll force us to have apache2...
|
||||
HTTPD_WANTED_MMN=20020903
|
||||
|
||||
if test -n "$APXS" -a "$APXS" != "no" -a -x "$APXS" ; then
|
||||
APXS_INCLUDE="`$APXS -q INCLUDEDIR`"
|
||||
if test -r $APXS_INCLUDE/httpd.h; then
|
||||
{ echo "$as_me:$LINENO: found apxs at $APXS" >&5
|
||||
echo "$as_me: found apxs at $APXS" >&6;}
|
||||
{ echo "$as_me:$LINENO: checking httpd version" >&5
|
||||
echo "$as_me: checking httpd version" >&6;}
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include "$APXS_INCLUDE/ap_mmn.h"
|
||||
#if AP_MODULE_MAGIC_AT_LEAST($HTTPD_WANTED_MMN,0)
|
||||
VERSION_OK
|
||||
#endif
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "VERSION_OK" >/dev/null 2>&1; then
|
||||
{ echo "$as_me:$LINENO: httpd is recent enough" >&5
|
||||
echo "$as_me: httpd is recent enough" >&6;}
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: apache is too old" >&5
|
||||
echo "$as_me: error: apache is too old" >&2;}
|
||||
{ (exit mmn must be at least $HTTPD_WANTED_MMN); exit mmn must be at least $HTTPD_WANTED_MMN; }; }
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
APXS_INCLUDEDIR="`$APXS -q INCLUDEDIR`"
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs INCLUDEDIR: $APXS_INCLUDEDIR" >&5
|
||||
echo "$as_me: apxs INCLUDEDIR: $APXS_INCLUDEDIR" >&6;}; fi
|
||||
# Make sure the include dir is used
|
||||
if test -n "$APXS_INCLUDEDIR"; then
|
||||
APXS_INCLUDES="-I${APXS_INCLUDEDIR} `$APXS -q INCLUDES` `$APXS -q EXTRA_INCLUDES`"
|
||||
else
|
||||
APXS_INCLUDES="`$APXS -q INCLUDES` `$APXS -q EXTRA_INCLUDES`"
|
||||
fi
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs INCLUDES: $APXS_INCLUDES" >&5
|
||||
echo "$as_me: apxs INCLUDES: $APXS_INCLUDES" >&6;}; fi
|
||||
APXS_CFLAGS="`$APXS -q CFLAGS` `$APXS -q EXTRA_CFLAGS`"
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs CFLAGS: $APXS_CFLAGS" >&5
|
||||
echo "$as_me: apxs CFLAGS: $APXS_CFLAGS" >&6;}; fi
|
||||
APXS_LDFLAGS="`$APXS -q LDFLAGS` `$APXS -q EXTRA_LDFLAGS`"
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs LDFLAGS: $APXS_LDFLAGS" >&5
|
||||
echo "$as_me: apxs LDFLAGS: $APXS_LDFLAGS" >&6;}; fi
|
||||
APXS_LIBDIR="`$APXS -q LIBDIR`"
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs LIBDIR: $APXS_LIBDIR" >&5
|
||||
echo "$as_me: apxs LIBDIR: $APXS_LIBDIR" >&6;}; fi
|
||||
# Make sure the lib dir is used
|
||||
if test -n "$APXS_LIBDIR"; then
|
||||
APXS_LIBS="-L{$APXS_LIBDIR} `$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
|
||||
else
|
||||
APXS_LIBS="`$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
|
||||
fi
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs LIBS: $APXS_LIBS" >&5
|
||||
echo "$as_me: apxs LIBS: $APXS_LIBS" >&6;}; fi
|
||||
APXS_LIBTOOL="`$APXS -q LIBTOOL`"
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs LIBTOOL: $APXS_LIBTOOL" >&5
|
||||
echo "$as_me: apxs LIBTOOL: $APXS_LIBTOOL" >&6;}; fi
|
||||
APXS_CC="`$APXS -q CC`"
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs CC: $APXS_CC" >&5
|
||||
echo "$as_me: apxs CC: $APXS_CC" >&6;}; fi
|
||||
APXS_BINDIR="`$APXS -q BINDIR`"
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs BINDIR: $APXS_BINDIR" >&5
|
||||
echo "$as_me: apxs BINDIR: $APXS_BINDIR" >&6;}; fi
|
||||
APXS_SBINDIR="`$APXS -q SBINDIR`"
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs SBINDIR: $APXS_SBINDIR" >&5
|
||||
echo "$as_me: apxs SBINDIR: $APXS_SBINDIR" >&6;}; fi
|
||||
APXS_PROGNAME="`$APXS -q PROGNAME`"
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs PROGNAME: $APXS_PROGNAME" >&5
|
||||
echo "$as_me: apxs PROGNAME: $APXS_PROGNAME" >&6;}; fi
|
||||
APXS_LIBEXECDIR="`$APXS -q LIBEXECDIR`"
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs LIBEXECDIR: $APXS_LIBEXECDIR" >&5
|
||||
echo "$as_me: apxs LIBEXECDIR: $APXS_LIBEXECDIR" >&6;}; fi
|
||||
if test "$APXS_SBINDIR" = "/"; then
|
||||
APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME"
|
||||
else
|
||||
APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME"
|
||||
fi
|
||||
if test "$verbose_output" -eq 1; then { echo "$as_me:$LINENO: apxs HTTPD: $APXS_HTTPD" >&5
|
||||
echo "$as_me: apxs HTTPD: $APXS_HTTPD" >&6;}; fi
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: couldn't find APXS" >&5
|
||||
echo "$as_me: error: couldn't find APXS" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
# Use Apache httpd source srclib as base for pcre, apr and apu config scripts
|
||||
|
||||
# Check whether --with-httpd-src was given.
|
||||
if test "${with_httpd_src+set}" = set; then
|
||||
withval=$with_httpd_src;
|
||||
if test -n "$withval"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/srclib/pcre"
|
||||
LDFLAGS="$LDFLAGS -L$withval/srclib/pcre"
|
||||
pcre_path="$withval/srclib/pcre"
|
||||
apr_path="$withval/srclib/apr"
|
||||
apu_path="$withval/srclib/apr-util"
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: --with-httpd-src requires a path" >&5
|
||||
echo "$as_me: error: --with-httpd-src requires a path" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# Include M4 macros
|
||||
|
||||
PCRE_CONFIG="pcre-config"
|
||||
PCRE_CFLAGS=""
|
||||
PCRE_LIBS=""
|
||||
|
||||
|
||||
|
||||
|
||||
APR_CONFIG=""
|
||||
APR_CFLAGS=""
|
||||
APR_LDFLAGS=""
|
||||
APR_LIBS=""
|
||||
APR_LINK_LD=""
|
||||
|
||||
|
||||
|
||||
|
||||
APU_CONFIG=""
|
||||
APU_CFLAGS=""
|
||||
APU_LDFLAGS=""
|
||||
APU_LIBS=""
|
||||
APU_LINK_LD=""
|
||||
|
||||
|
||||
|
||||
|
||||
LIBXML_CONFIG="xml2-config"
|
||||
LIBXML_CFLAGS=""
|
||||
LIBXML_LIBS=""
|
||||
|
||||
|
||||
|
||||
|
||||
LUA_CONFIG="pkg-config"
|
||||
LUA_PKGNAMES="lua5.1 lua5 lua"
|
||||
LUA_CFLAGS=""
|
||||
LUA_LIBS=""
|
||||
LUA_SONAMES="so la sl dll dylib"
|
||||
|
||||
|
||||
|
||||
|
||||
CURL_CONFIG="curl-config"
|
||||
CURL_CFLAGS=""
|
||||
CURL_LIBS=""
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
### Build *EXTRA_CFLAGS vars
|
||||
|
||||
if test -n "$debug_mem"; then
|
||||
|
||||
@@ -58,114 +58,23 @@ AC_SUBST(MSC_REGRESSION_CONF_DIR)
|
||||
AC_SUBST(MSC_REGRESSION_LOGS_DIR)
|
||||
AC_SUBST(MSC_REGRESSION_DOCROOT_DIR)
|
||||
|
||||
# Find apxs
|
||||
AC_MSG_NOTICE(looking for Apache module support via DSO through APXS)
|
||||
AC_ARG_WITH(apxs,
|
||||
[AS_HELP_STRING([[--with-apxs=FILE]],
|
||||
[FILE is the path to apxs; defaults to "apxs".])],
|
||||
[
|
||||
if test "$withval" = "yes"; then
|
||||
APXS=apxs
|
||||
else
|
||||
APXS="$withval"
|
||||
fi
|
||||
])
|
||||
|
||||
if test -z "$APXS"; then
|
||||
for i in /usr/local/apache22/bin \
|
||||
/usr/local/apache2/bin \
|
||||
/usr/local/apache/bin \
|
||||
/usr/local/sbin \
|
||||
/usr/local/bin \
|
||||
/usr/sbin \
|
||||
/usr/bin;
|
||||
do
|
||||
if test -f "$i/apxs2"; then
|
||||
APXS="$i/apxs2"
|
||||
break
|
||||
elif test -f "$i/apxs"; then
|
||||
APXS="$i/apxs"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# arbitrarily picking the same version subversion looks for, don't know how
|
||||
# accurate this really is, but at least it'll force us to have apache2...
|
||||
HTTPD_WANTED_MMN=20020903
|
||||
|
||||
if test -n "$APXS" -a "$APXS" != "no" -a -x "$APXS" ; then
|
||||
APXS_INCLUDE="`$APXS -q INCLUDEDIR`"
|
||||
if test -r $APXS_INCLUDE/httpd.h; then
|
||||
AC_MSG_NOTICE(found apxs at $APXS)
|
||||
AC_MSG_NOTICE(checking httpd version)
|
||||
AC_EGREP_CPP(VERSION_OK,
|
||||
[
|
||||
#include "$APXS_INCLUDE/ap_mmn.h"
|
||||
#if AP_MODULE_MAGIC_AT_LEAST($HTTPD_WANTED_MMN,0)
|
||||
VERSION_OK
|
||||
#endif],
|
||||
[AC_MSG_NOTICE(httpd is recent enough)],
|
||||
[AC_MSG_ERROR(apache is too old, mmn must be at least $HTTPD_WANTED_MMN)])
|
||||
fi
|
||||
APXS_INCLUDEDIR="`$APXS -q INCLUDEDIR`"
|
||||
# Make sure the include dir is used
|
||||
if test -n "$APXS_INCLUDEDIR"; then
|
||||
APXS_INCLUDES="-I${APXS_INCLUDEDIR} `$APXS -q INCLUDES` `$APXS -q EXTRA_INCLUDES`"
|
||||
else
|
||||
APXS_INCLUDES="`$APXS -q INCLUDES` `$APXS -q EXTRA_INCLUDES`"
|
||||
fi
|
||||
APXS_CFLAGS="`$APXS -q CFLAGS` `$APXS -q EXTRA_CFLAGS`"
|
||||
APXS_LDFLAGS="`$APXS -q LDFLAGS` `$APXS -q EXTRA_LDFLAGS`"
|
||||
APXS_LIBDIR="`$APXS -q LIBDIR`"
|
||||
# Make sure the lib dir is used
|
||||
if test -n "$APXS_LIBDIR"; then
|
||||
APXS_LIBS="-L{$APXS_LIBDIR} `$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
|
||||
else
|
||||
APXS_LIBS="`$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
|
||||
fi
|
||||
APXS_LIBTOOL="`$APXS -q LIBTOOL`"
|
||||
APXS_CC="`$APXS -q CC`"
|
||||
APXS_BINDIR="`$APXS -q BINDIR`"
|
||||
APXS_SBINDIR="`$APXS -q SBINDIR`"
|
||||
APXS_PROGNAME="`$APXS -q PROGNAME`"
|
||||
APXS_LIBEXECDIR="`$APXS -q LIBEXECDIR`"
|
||||
if test "$APXS_SBINDIR" = "/"; then
|
||||
APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME"
|
||||
else
|
||||
APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME"
|
||||
fi
|
||||
else
|
||||
AC_MSG_ERROR(couldn't find APXS)
|
||||
fi
|
||||
|
||||
# Use Apache httpd source srclib as base for pcre, apr and apu config scripts
|
||||
AC_ARG_WITH(httpd-src,
|
||||
[AS_HELP_STRING([[--with-httpd-src=PATH]],
|
||||
[PATH is to the Apache httpd source tree where srclib will be used as a base for pcre, apr and apu config scripts.])],
|
||||
[
|
||||
if test -n "$withval"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/srclib/pcre"
|
||||
LDFLAGS="$LDFLAGS -L$withval/srclib/pcre"
|
||||
pcre_path="$withval/srclib/pcre"
|
||||
apr_path="$withval/srclib/apr"
|
||||
apu_path="$withval/srclib/apr-util"
|
||||
else
|
||||
AC_MSG_ERROR(--with-httpd-src requires a path)
|
||||
fi
|
||||
])
|
||||
|
||||
# Include M4 macros
|
||||
sinclude(build/find_pcre.m4)
|
||||
sinclude(build/find_apr.m4)
|
||||
sinclude(build/find_apu.m4)
|
||||
sinclude(build/find_xml.m4)
|
||||
sinclude(build/find_lua.m4)
|
||||
sinclude(build/find_curl.m4)
|
||||
|
||||
|
||||
### Configure Options
|
||||
|
||||
# Verbose output
|
||||
AC_ARG_ENABLE(verbose-output,
|
||||
AS_HELP_STRING([--enable-verbose-output],
|
||||
[Enable more verbose configure output.]),
|
||||
[
|
||||
if test "$enableval" != "no"; then
|
||||
verbose_output=1
|
||||
else
|
||||
verbose_output=0
|
||||
fi
|
||||
],
|
||||
[
|
||||
verbose_output=0
|
||||
])
|
||||
|
||||
# Strict Compile
|
||||
AC_ARG_ENABLE(strict-compile,
|
||||
AS_HELP_STRING([--enable-strict-compile],
|
||||
@@ -271,6 +180,125 @@ AC_ARG_ENABLE(modsec-api,
|
||||
modsec_api=
|
||||
])
|
||||
|
||||
# Find apxs
|
||||
AC_MSG_NOTICE(looking for Apache module support via DSO through APXS)
|
||||
AC_ARG_WITH(apxs,
|
||||
[AS_HELP_STRING([[--with-apxs=FILE]],
|
||||
[FILE is the path to apxs; defaults to "apxs".])],
|
||||
[
|
||||
if test "$withval" = "yes"; then
|
||||
APXS=apxs
|
||||
else
|
||||
APXS="$withval"
|
||||
fi
|
||||
])
|
||||
|
||||
if test -z "$APXS"; then
|
||||
for i in /usr/local/apache22/bin \
|
||||
/usr/local/apache2/bin \
|
||||
/usr/local/apache/bin \
|
||||
/usr/local/sbin \
|
||||
/usr/local/bin \
|
||||
/usr/sbin \
|
||||
/usr/bin;
|
||||
do
|
||||
if test -f "$i/apxs2"; then
|
||||
APXS="$i/apxs2"
|
||||
break
|
||||
elif test -f "$i/apxs"; then
|
||||
APXS="$i/apxs"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# arbitrarily picking the same version subversion looks for, don't know how
|
||||
# accurate this really is, but at least it'll force us to have apache2...
|
||||
HTTPD_WANTED_MMN=20020903
|
||||
|
||||
if test -n "$APXS" -a "$APXS" != "no" -a -x "$APXS" ; then
|
||||
APXS_INCLUDE="`$APXS -q INCLUDEDIR`"
|
||||
if test -r $APXS_INCLUDE/httpd.h; then
|
||||
AC_MSG_NOTICE(found apxs at $APXS)
|
||||
AC_MSG_NOTICE(checking httpd version)
|
||||
AC_EGREP_CPP(VERSION_OK,
|
||||
[
|
||||
#include "$APXS_INCLUDE/ap_mmn.h"
|
||||
#if AP_MODULE_MAGIC_AT_LEAST($HTTPD_WANTED_MMN,0)
|
||||
VERSION_OK
|
||||
#endif],
|
||||
[AC_MSG_NOTICE(httpd is recent enough)],
|
||||
[AC_MSG_ERROR(apache is too old, mmn must be at least $HTTPD_WANTED_MMN)])
|
||||
fi
|
||||
APXS_INCLUDEDIR="`$APXS -q INCLUDEDIR`"
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs INCLUDEDIR: $APXS_INCLUDEDIR); fi
|
||||
# Make sure the include dir is used
|
||||
if test -n "$APXS_INCLUDEDIR"; then
|
||||
APXS_INCLUDES="-I${APXS_INCLUDEDIR} `$APXS -q INCLUDES` `$APXS -q EXTRA_INCLUDES`"
|
||||
else
|
||||
APXS_INCLUDES="`$APXS -q INCLUDES` `$APXS -q EXTRA_INCLUDES`"
|
||||
fi
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs INCLUDES: $APXS_INCLUDES); fi
|
||||
APXS_CFLAGS="`$APXS -q CFLAGS` `$APXS -q EXTRA_CFLAGS`"
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs CFLAGS: $APXS_CFLAGS); fi
|
||||
APXS_LDFLAGS="`$APXS -q LDFLAGS` `$APXS -q EXTRA_LDFLAGS`"
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs LDFLAGS: $APXS_LDFLAGS); fi
|
||||
APXS_LIBDIR="`$APXS -q LIBDIR`"
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs LIBDIR: $APXS_LIBDIR); fi
|
||||
# Make sure the lib dir is used
|
||||
if test -n "$APXS_LIBDIR"; then
|
||||
APXS_LIBS="-L{$APXS_LIBDIR} `$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
|
||||
else
|
||||
APXS_LIBS="`$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
|
||||
fi
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs LIBS: $APXS_LIBS); fi
|
||||
APXS_LIBTOOL="`$APXS -q LIBTOOL`"
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs LIBTOOL: $APXS_LIBTOOL); fi
|
||||
APXS_CC="`$APXS -q CC`"
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs CC: $APXS_CC); fi
|
||||
APXS_BINDIR="`$APXS -q BINDIR`"
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs BINDIR: $APXS_BINDIR); fi
|
||||
APXS_SBINDIR="`$APXS -q SBINDIR`"
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs SBINDIR: $APXS_SBINDIR); fi
|
||||
APXS_PROGNAME="`$APXS -q PROGNAME`"
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs PROGNAME: $APXS_PROGNAME); fi
|
||||
APXS_LIBEXECDIR="`$APXS -q LIBEXECDIR`"
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs LIBEXECDIR: $APXS_LIBEXECDIR); fi
|
||||
if test "$APXS_SBINDIR" = "/"; then
|
||||
APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME"
|
||||
else
|
||||
APXS_HTTPD="$APXS_SBINDIR/$APXS_PROGNAME"
|
||||
fi
|
||||
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs HTTPD: $APXS_HTTPD); fi
|
||||
else
|
||||
AC_MSG_ERROR(couldn't find APXS)
|
||||
fi
|
||||
|
||||
# Use Apache httpd source srclib as base for pcre, apr and apu config scripts
|
||||
AC_ARG_WITH(httpd-src,
|
||||
[AS_HELP_STRING([[--with-httpd-src=PATH]],
|
||||
[PATH is to the Apache httpd source tree where srclib will be used as a base for pcre, apr and apu config scripts.])],
|
||||
[
|
||||
if test -n "$withval"; then
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/srclib/pcre"
|
||||
LDFLAGS="$LDFLAGS -L$withval/srclib/pcre"
|
||||
pcre_path="$withval/srclib/pcre"
|
||||
apr_path="$withval/srclib/apr"
|
||||
apu_path="$withval/srclib/apr-util"
|
||||
else
|
||||
AC_MSG_ERROR(--with-httpd-src requires a path)
|
||||
fi
|
||||
])
|
||||
|
||||
# Include M4 macros
|
||||
sinclude(build/find_pcre.m4)
|
||||
sinclude(build/find_apr.m4)
|
||||
sinclude(build/find_apu.m4)
|
||||
sinclude(build/find_xml.m4)
|
||||
sinclude(build/find_lua.m4)
|
||||
sinclude(build/find_curl.m4)
|
||||
|
||||
|
||||
### Build *EXTRA_CFLAGS vars
|
||||
|
||||
if test -n "$debug_mem"; then
|
||||
|
||||
@@ -363,7 +363,7 @@ static void error_log(int level, void *thread, const char *text, ...)
|
||||
apr_file_write_full(error_log_fd, msg2, nbytes, &nbytes_written);
|
||||
}
|
||||
else {
|
||||
fprintf(stderr, msg2);
|
||||
fprintf(stderr, "%s", msg2);
|
||||
}
|
||||
|
||||
va_end(ap);
|
||||
@@ -1051,7 +1051,7 @@ static void logc_init()
|
||||
/* Pre-configure the handle. */
|
||||
curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE);
|
||||
curl_easy_setopt(curl, CURLOPT_PUT, TRUE);
|
||||
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, NULL);
|
||||
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, (char *)NULL);
|
||||
curl_easy_setopt(curl, CURLOPT_URL, console_uri);
|
||||
curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
|
||||
@@ -1289,7 +1289,7 @@ static void * APR_THREAD_FUNC thread_worker(apr_thread_t *thread, void *data)
|
||||
curl_easy_setopt(curl, CURLOPT_DEBUGDATA, thread);
|
||||
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_error_buffer);
|
||||
curl_easy_setopt(curl, CURLOPT_USERPWD, credentials);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, response_buf);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, (char *)response_buf);
|
||||
|
||||
headerlist = curl_slist_append(headerlist, "Expect:");
|
||||
headerlist = curl_slist_append(headerlist, hash);
|
||||
|
||||
@@ -47,9 +47,9 @@ extern DSOLOCAL modsec_build_type_rec modsec_build_type[];
|
||||
|
||||
#define MODSEC_VERSION_MAJOR "2"
|
||||
#define MODSEC_VERSION_MINOR "5"
|
||||
#define MODSEC_VERSION_MAINT "8"
|
||||
#define MODSEC_VERSION_TYPE ""
|
||||
#define MODSEC_VERSION_RELEASE "0"
|
||||
#define MODSEC_VERSION_MAINT "9"
|
||||
#define MODSEC_VERSION_TYPE "-dev"
|
||||
#define MODSEC_VERSION_RELEASE "1"
|
||||
|
||||
#define MODSEC_VERSION_SUFFIX MODSEC_VERSION_TYPE MODSEC_VERSION_RELEASE
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
Manual</title>
|
||||
|
||||
<articleinfo>
|
||||
<releaseinfo>Version 2.5.8 (November 21, 2008)</releaseinfo>
|
||||
<releaseinfo>Version 2.5.9-dev1 (March 5, 2008)</releaseinfo>
|
||||
|
||||
<copyright>
|
||||
<year>2004-2008</year>
|
||||
|
||||
Reference in New Issue
Block a user