forked from pool/apache2-mod_security2
Kristyna Streitova
8a706f0f57
- update to 2.9.2
* release notes
https://github.com/SpiderLabs/ModSecurity/releases/tag/v2.9.2
* refresh apache2-mod_security2-no_rpath.diff
* remove apache2-mod_security2-lua-5.3.patch that was applied
upstream
- remove outdated html pages and diagram (they can be accessed
online at https://github.com/SpiderLabs/ModSecurity/wiki)
* Reference-Manual.html.bz2
* ModSecurity-Frequently-Asked-Questions-FAQ.html.bz2
* modsecurity_diagram_apache_request_cycle.jpg
- don't pack the whole doc directory as it contains also Makefiles
or doxygen configuration files
- disable mlogc as we don't pack it and it also can't be built for
curl <=7.34
- add basic and regression test suite (but disabled for now)
* add apache2-mod_security2_tests_conf.patch for apache2
configuration file used for tests that was trying to load
mpm_worker_module (it's static for our apache2 package)
* add "BuildRequires: perl-libwww-perl" needed for the test suite
OBS-URL: https://build.opensuse.org/request/show/556963
OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_security2?expand=0&rev=75
58 lines
3.1 KiB
Diff
58 lines
3.1 KiB
Diff
Index: apache2/Makefile.am
|
|
===================================================================
|
|
--- apache2/Makefile.am.orig
|
|
+++ apache2/Makefile.am
|
|
@@ -118,7 +118,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@ \
|
|
Index: apache2/Makefile.in
|
|
===================================================================
|
|
--- apache2/Makefile.in.orig
|
|
+++ apache2/Makefile.in
|
|
@@ -691,7 +691,7 @@ libinjection/mod_security2_la-libinjecti
|
|
libinjection/$(DEPDIR)/$(am__dirstamp)
|
|
|
|
mod_security2.la: $(mod_security2_la_OBJECTS) $(mod_security2_la_DEPENDENCIES) $(EXTRA_mod_security2_la_DEPENDENCIES)
|
|
- $(AM_V_CCLD)$(mod_security2_la_LINK) -rpath $(pkglibdir) $(mod_security2_la_OBJECTS) $(mod_security2_la_LIBADD) $(LIBS)
|
|
+ $(AM_V_CCLD)$(mod_security2_la_LINK) $(mod_security2_la_OBJECTS) $(mod_security2_la_LIBADD) $(LIBS)
|
|
|
|
mostlyclean-compile:
|
|
-rm -f *.$(OBJEXT)
|
|
Index: build/libtool.m4
|
|
===================================================================
|
|
--- build/libtool.m4.orig
|
|
+++ build/libtool.m4
|
|
@@ -5053,7 +5053,7 @@ dnl Note also adjust exclude_expsyms for
|
|
# are reset later if shared libraries are not supported. Putting them
|
|
# here allows them to be overridden if necessary.
|
|
runpath_var=LD_RUN_PATH
|
|
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
|
|
_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
|
|
# ancient GNU ld didn't support --whole-archive et. al.
|
|
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
|
|
@@ -5322,7 +5322,7 @@ _LT_EOF
|
|
# DT_RUNPATH tag from executables and libraries. But doing so
|
|
# requires that you compile everything twice, which is a pain.
|
|
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
|
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
|
|
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
|
else
|
|
@@ -6409,7 +6409,7 @@ if test yes != "$_lt_caught_CXX_error";
|
|
_LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
|
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
|
|
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
|
|
_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
|
|
|
|
# If archive_cmds runs LD, not CC, wlarc should be empty
|