forked from pool/apache2-mod_security2
70581c9f39
- 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.
OBS-URL: https://build.opensuse.org/request/show/215135
OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_security2?expand=0&rev=44
38 lines
2.1 KiB
Diff
38 lines
2.1 KiB
Diff
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
|