--- a/components/subversion/patches/001-configure.patch Thu Feb 26 06:52:41 2015 -0800
+++ b/components/subversion/patches/001-configure.patch Thu Feb 26 10:02:54 2015 -0800
@@ -1,5 +1,9 @@
---- configure 2012-05-10 11:52:02.000000000 -0700
-+++ configure 2013-03-20 14:20:04.139519952 -0700
+# Internal patch.
+# apr-config and apu-config use the wrong options
+# neon library pkg-config should not print the library path
+# Our Kerberos installation is not 100% compatible with MIT-Kerberos
+--- configure 2014-12-08 23:32:25.000000000 -0800
++++ configure 2015-01-20 10:36:42.439487008 -0800
@@ -4686,14 +4686,14 @@
fi
@@ -12,7 +16,7 @@
fi
else
- SVN_APR_LIBS="`$apr_config --link-ld`"
-+ SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
++ SVN_APR_LIBS="`$apr_config --link-libtool`"
if test $? -ne 0; then
- as_fn_error $? "apr-config --link-ld failed" "$LINENO" 5
+ as_fn_error $? "apr-config --link-libtool failed" "$LINENO" 5
@@ -31,10 +35,10 @@
fi
else
- SVN_APRUTIL_LIBS="`$apu_config --link-ld`"
-+ SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
++ SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
if test $? -ne 0; then
- as_fn_error $? "apu-config --link-ld failed" "$LINENO" 5
-+ as_fn_error $? "apu-config --link-libtool --libs failed" "$LINENO" 5
++ as_fn_error $? "apu-config --link-libtool failed" "$LINENO" 5
fi
fi
SVN_APRUTIL_LIBS="`
@@ -51,8 +55,8 @@
conftest$ac_exeext conftest.$ac_ext
if test "$shared_linking" = "no"; then
NEON_LIBS=`$PKG_CONFIG neon --libs --static`
-+ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
-+ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
++ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
LIBS="$LIBS $NEON_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -60,8 +64,8 @@
old_CFLAGS="$CFLAGS"
old_LIBS="$LIBS"
NEON_LIBS=`$PKG_CONFIG neon --libs`
-+ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
-+ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
++ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
LIBS="$LIBS $NEON_LIBS"
neon_test_code="
@@ -69,35 +73,25 @@
conftest$ac_exeext conftest.$ac_ext
if test "$shared_linking" = "no"; then
NEON_LIBS=`$PKG_CONFIG neon --libs --static`
-+ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
-+ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
++ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
LIBS="$LIBS $NEON_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -5520,6 +5528,8 @@
- SVN_NEON_INCLUDES=`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'`
- CFLAGS="$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`"
- NEON_LIBS=`$neon_config --libs`
-+ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
-+ NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
- fi
- svn_lib_neon="yes"
- break
-@@ -5576,8 +5586,9 @@
+@@ -5576,9 +5584,9 @@
fi
-
-
+-
+NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
+NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
+export NEON_LIBS
+ if test "$svn_lib_neon" = "yes"; then
- if test "$svn_lib_neon" = "yes"; then
---- configure 2013-07-29 12:50:28.716771506 -0700
-+++ configure 2013-07-29 13:04:59.668934315 -0700
-@@ -6098,8 +6098,8 @@
+@@ -6106,11 +6114,11 @@
old_CFLAGS="$CFLAGS"
old_LIBS="$LIBS"
CFLAGS=""
@@ -105,6 +99,11 @@
- SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`"
+ SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5"
+ SVN_GSSAPI_LIBS="-lgss"
- SVN_GSSAPI_LIBS="`
- input_flags="$SVN_GSSAPI_LIBS"
- output_flags=""
+ if test $? -ne 0; then
+- SVN_GSSAPI_INCLUDES="$SVN_GSSAPI_INCLUDES -I/usr/include/gssapi"
+- SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs krb5` -lgss"
++ SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5"
++ SVN_GSSAPI_LIBS="-lgss"
+ if test $? -ne 0; then
+ as_fn_error $? "krb5-config returned an error" "$LINENO" 5
+ fi