32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
|
From: Andreas Stieger <andreas.stieger@gmx.de>
|
||
|
|
Date: Wed, 07 May 2014 20:55:04 +0100
|
||
|
|
Subject: Allow building against blacklisted Apache httpd 2.4.6
|
||
|
|
References: [bnc#864308]
|
||
|
|
Upstream: no
|
||
|
|
|
||
|
|
Apache httpd in openSUSE 13.1 is 2.4.6. The mod_dav in this version
|
||
|
|
is problematic for Apache Subversion and it is blacklisted in via
|
||
|
|
configure macros in the 1.8.9 release of svn and up.
|
||
|
|
|
||
|
|
The relevant patches have been applied to the apache2 package in
|
||
|
|
openSUSE:13.1:Update and the update has been released, [bnc#864308].
|
||
|
|
This patch enables building Subversion against this fixed package.
|
||
|
|
|
||
|
|
---
|
||
|
|
build/ac-macros/apache.m4 | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
Index: subversion-1.8.9/build/ac-macros/apache.m4
|
||
|
|
===================================================================
|
||
|
|
--- subversion-1.8.9.orig/build/ac-macros/apache.m4 2014-04-24 05:01:08.000000000 +0100
|
||
|
|
+++ subversion-1.8.9/build/ac-macros/apache.m4 2014-05-07 20:52:04.000000000 +0100
|
||
|
|
@@ -128,7 +128,7 @@ if test -n "$APXS" && test "$APXS" != "n
|
||
|
|
AC_MSG_CHECKING([mod_dav version])
|
||
|
|
old_CPPFLAGS="$CPPFLAGS"
|
||
|
|
CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
|
||
|
|
- blacklisted_versions_regex=["\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[56]\")"]
|
||
|
|
+ blacklisted_versions_regex=["\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[5]\")"]
|
||
|
|
AC_EGREP_CPP([apache_version= *$blacklisted_versions_regex],
|
||
|
|
[
|
||
|
|
#include "$APXS_INCLUDE/ap_release.h"
|