diff --git a/apache2-mod_security2.changes b/apache2-mod_security2.changes index c750e47..eb2d09f 100644 --- a/apache2-mod_security2.changes +++ b/apache2-mod_security2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Jan 25 17:43:33 UTC 2014 - thomas.worm@sicsec.de + + - Raised to version 2.7.7. + - modified patches: + * modsecurity-apache_2.7.5-build_fix_pcre.diff, + renamed to modsecurity-apache_2.7.7-build_fix_pcre.diff. + ------------------------------------------------------------------- Thu Jan 23 13:06:09 UTC 2014 - aj@ajaissle.de diff --git a/apache2-mod_security2.spec b/apache2-mod_security2.spec index aaafdab..0341eb4 100644 --- a/apache2-mod_security2.spec +++ b/apache2-mod_security2.spec @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_security2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ Name: apache2-mod_security2 -Version: 2.7.5 +Version: 2.7.7 Release: 0 -%define aversion 2.7.5 +%define aversion 2.7.7 # # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,7 +56,8 @@ Source4: %{faq}.bz2 Source5: modsecurity_diagram_apache_request_cycle.jpg Source6: README-SUSE-mod_security2.txt # -Patch0: modsecurity-apache_2.7.5-build_fix_pcre.diff +# PATCH-FIX-OPENSUSE modsecurity-apache_2.7.7-build_fix_pcre.diff +Patch0: modsecurity-apache_2.7.7-build_fix_pcre.diff Summary: ModSecurity Open Source Web Application Firewall License: Apache-2.0 Group: Productivity/Networking/Web/Servers @@ -79,9 +80,7 @@ ruleset. Please have a look at http://www.modsecurity.org/ for more details. mv -v SpiderLabs* rules bzip2 -dc %{SOURCE3} > %{_sourcedir}/%{refman} && touch -r %{SOURCE3} %{_sourcedir}/%{refman} bzip2 -dc %{SOURCE4} > %{_sourcedir}/%{faq} && touch -r %{SOURCE4} %{_sourcedir}/%{faq} -%patch0 -#%patch1 -#%patch2 +%patch0 -p1 %build %configure --with-apxs=%{apxs} --enable-request-early --enable-htaccess-config diff --git a/modsecurity-apache_2.7.5-build_fix_pcre.diff b/modsecurity-apache_2.7.5-build_fix_pcre.diff deleted file mode 100644 index 5df5ef1..0000000 --- a/modsecurity-apache_2.7.5-build_fix_pcre.diff +++ /dev/null @@ -1,199 +0,0 @@ -diff -rNU 30 ../modsecurity-apache_2.7.5-o/apache2/Makefile.am ./apache2/Makefile.am ---- ../modsecurity-apache_2.7.5-o/apache2/Makefile.am 2013-07-28 05:58:49.000000000 +0200 -+++ ./apache2/Makefile.am 2013-08-01 15:08:21.000000000 +0200 -@@ -17,61 +17,61 @@ - mod_security2_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \ - @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@ - mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@ - mod_security2_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ - - if AIX - mod_security2_la_LDFLAGS = -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - endif - - if HPUX - mod_security2_la_LDFLAGS = -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - endif - - if MACOSX - mod_security2_la_LDFLAGS = -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - endif - - if SOLARIS - mod_security2_la_LDFLAGS = -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - endif - - if LINUX --mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH@ \ -+mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - endif - - if FREEBSD - mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - endif - - if OPENBSD - mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - endif - - if NETBSD - mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ - @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - endif - - if LINUX - install-exec-hook: $(pkglib_LTLIBRARIES) - @echo "Removing unused static libraries..."; \ - for m in $(pkglib_LTLIBRARIES); do \ - base=`echo $$m | sed 's/\..*//'`; \ - rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \ - install -D -m444 $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES)/$$base.so; \ - done -diff -rNU 30 ../modsecurity-apache_2.7.5-o/apache2/Makefile.in ./apache2/Makefile.in ---- ../modsecurity-apache_2.7.5-o/apache2/Makefile.in 2013-07-28 05:59:01.000000000 +0200 -+++ ./apache2/Makefile.in 2013-08-01 15:08:56.000000000 +0200 -@@ -303,61 +303,61 @@ - #include_HEADERS = re.h modsecurity.h msc_logging.h msc_multipart.h \ - # msc_parsers.h msc_pcre.h msc_util.h msc_xml.h \ - # persist_dbm.h apache2.h msc_geo.h acmp.h utf8tables.h \ - # msc_lua.h msc_release.h - mod_security2_la_SOURCES = mod_security2.c \ - apache2_config.c apache2_io.c apache2_util.c \ - re.c re_operators.c re_actions.c re_tfns.c \ - re_variables.c msc_logging.c msc_xml.c \ - msc_multipart.c modsecurity.c msc_parsers.c \ - msc_util.c msc_pcre.c persist_dbm.c msc_reqbody.c \ - msc_geo.c msc_gsb.c msc_crypt.c msc_tree.c msc_unicode.c acmp.c msc_lua.c msc_release.c \ - libinjection/libinjection_sqli.c - - mod_security2_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \ - @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@ - - mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@ - mod_security2_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ - @AIX_TRUE@mod_security2_la_LDFLAGS = -module -avoid-version \ - @AIX_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @AIX_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - - @FREEBSD_TRUE@mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ - @FREEBSD_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @FREEBSD_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - - @HPUX_TRUE@mod_security2_la_LDFLAGS = -module -avoid-version \ - @HPUX_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @HPUX_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - --@LINUX_TRUE@mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH@ \ -+@LINUX_TRUE@mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ - @LINUX_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @LINUX_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - - @MACOSX_TRUE@mod_security2_la_LDFLAGS = -module -avoid-version \ - @MACOSX_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @MACOSX_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - - @NETBSD_TRUE@mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ - @NETBSD_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @NETBSD_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - - @OPENBSD_TRUE@mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ - @OPENBSD_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @OPENBSD_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - - @SOLARIS_TRUE@mod_security2_la_LDFLAGS = -module -avoid-version \ - @SOLARIS_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ - @SOLARIS_TRUE@ @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ - - all: modsecurity_config_auto.h - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj - $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ -diff -rNU 30 ../modsecurity-apache_2.7.5-o/configure ./configure ---- ../modsecurity-apache_2.7.5-o/configure 2013-07-28 05:59:03.000000000 +0200 -+++ ./configure 2013-08-01 15:02:59.000000000 +0200 -@@ -13103,61 +13103,62 @@ - if test -e "${x}/bin/${PCRE_CONFIG}"; then - pcre_path="${x}/bin" - break - elif test -e "${x}/${PCRE_CONFIG}"; then - pcre_path="${x}" - break - else - pcre_path="" - fi - done - if test -n "$pcre_path"; then - break - fi - done - - if test -n "${pcre_path}"; then - if test "${pcre_path}" != "no"; then - PCRE_CONFIG="${pcre_path}/${PCRE_CONFIG}" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PCRE_CONFIG}" >&5 - $as_echo "${PCRE_CONFIG}" >&6; } - PCRE_VERSION="`${PCRE_CONFIG} --version`" - if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: pcre VERSION: $PCRE_VERSION" >&5 - $as_echo "$as_me: pcre VERSION: $PCRE_VERSION" >&6;}; fi - PCRE_CFLAGS="`${PCRE_CONFIG} --cflags`" - if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: pcre CFLAGS: $PCRE_CFLAGS" >&5 - $as_echo "$as_me: pcre CFLAGS: $PCRE_CFLAGS" >&6;}; fi - PCRE_LDADD="`${PCRE_CONFIG} --libs`" - if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: pcre LDADD: $PCRE_LDADD" >&5 - $as_echo "$as_me: pcre LDADD: $PCRE_LDADD" >&6;}; fi -- PCRE_LD_PATH="/`${PCRE_CONFIG} --libs | cut -d'/' -f2,3,4,5,6 | cut -d ' ' -f1`" -+# PCRE_LD_PATH="/`${PCRE_CONFIG} --libs | cut -d'/' -f2,3,4,5,6 | cut -d ' ' -f1`" -+ PCRE_LD_PATH="" - if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: pcre PCRE_LD_PATH: $PCRE_LD_PATH" >&5 - $as_echo "$as_me: pcre PCRE_LD_PATH: $PCRE_LD_PATH" >&6;}; fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - - - - - - - - - if test -z "${PCRE_VERSION}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: *** pcre library not found." >&5 - $as_echo "$as_me: *** pcre library not found." >&6;} - as_fn_error "pcre library is required" "$LINENO" 5 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: using pcre v${PCRE_VERSION}" >&5 - $as_echo "$as_me: using pcre v${PCRE_VERSION}" >&6;} - - fi - - if test "$build_apache2_module" -ne 0 -o "$build_mlogc" -ne 0; then - - - # Check whether --with-apr was given. - if test "${with_apr+set}" = set; then : diff --git a/modsecurity-apache_2.7.5.tar.gz b/modsecurity-apache_2.7.5.tar.gz deleted file mode 100644 index 6f8078c..0000000 --- a/modsecurity-apache_2.7.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e907536278d8da80d3dbb29aeffe9c4ec37ce9b641035b2da64e993135647a2 -size 1045387 diff --git a/modsecurity-apache_2.7.7-build_fix_pcre.diff b/modsecurity-apache_2.7.7-build_fix_pcre.diff new file mode 100644 index 0000000..c9aecc9 --- /dev/null +++ b/modsecurity-apache_2.7.7-build_fix_pcre.diff @@ -0,0 +1,37 @@ +diff -rupN modsecurity-apache_2.7.7.orig/apache2/Makefile.am modsecurity-apache_2.7.7/apache2/Makefile.am +--- modsecurity-apache_2.7.7.orig/apache2/Makefile.am 2013-12-17 00:55:17.000000000 +0100 ++++ modsecurity-apache_2.7.7/apache2/Makefile.am 2014-01-25 18:28:47.542133608 +0100 +@@ -90,7 +90,7 @@ mod_security2_la_LDFLAGS = -module -avoi + endif + + if LINUX +-mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH@ \ ++mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ + @APR_LDFLAGS@ \ + @APU_LDFLAGS@ \ + @APXS_LDFLAGS@ \ +diff -rupN modsecurity-apache_2.7.7.orig/apache2/Makefile.in modsecurity-apache_2.7.7/apache2/Makefile.in +--- modsecurity-apache_2.7.7.orig/apache2/Makefile.in 2013-12-18 12:50:41.000000000 +0100 ++++ modsecurity-apache_2.7.7/apache2/Makefile.in 2014-01-25 18:28:59.621134193 +0100 +@@ -476,7 +476,7 @@ mod_security2_la_LIBADD = @APR_LDADD@ \ + @HPUX_TRUE@ @LUA_LDFLAGS@ \ + @HPUX_TRUE@ @PCRE_LDFLAGS@ + +-@LINUX_TRUE@mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH@ \ ++@LINUX_TRUE@mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ + @LINUX_TRUE@ @APR_LDFLAGS@ \ + @LINUX_TRUE@ @APU_LDFLAGS@ \ + @LINUX_TRUE@ @APXS_LDFLAGS@ \ +diff -rupN modsecurity-apache_2.7.7.orig/configure modsecurity-apache_2.7.7/configure +--- modsecurity-apache_2.7.7.orig/configure 2013-12-18 12:50:42.000000000 +0100 ++++ modsecurity-apache_2.7.7/configure 2014-01-25 18:32:31.913144475 +0100 +@@ -14225,7 +14225,8 @@ $as_echo "$as_me: pcre CFLAGS: $PCRE_CFL + PCRE_LDADD="`${PCRE_CONFIG} --libs`" + if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: pcre LDADD: $PCRE_LDADD" >&5 + $as_echo "$as_me: pcre LDADD: $PCRE_LDADD" >&6;}; fi +- PCRE_LD_PATH="/`${PCRE_CONFIG} --libs | cut -d'/' -f2,3,4,5,6 | cut -d ' ' -f1`" ++ #PCRE_LD_PATH="/`${PCRE_CONFIG} --libs | cut -d'/' -f2,3,4,5,6 | cut -d ' ' -f1`" ++ PCRE_LD_PATH="" + if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: pcre PCRE_LD_PATH: $PCRE_LD_PATH" >&5 + $as_echo "$as_me: pcre PCRE_LD_PATH: $PCRE_LD_PATH" >&6;}; fi + else diff --git a/modsecurity-apache_2.7.7.tar.gz b/modsecurity-apache_2.7.7.tar.gz new file mode 100644 index 0000000..2a865fa --- /dev/null +++ b/modsecurity-apache_2.7.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11e05cfa6b363c2844c6412a40ff16f0021e302152b38870fd1f2f44b204379b +size 1003835