version up : subversion 1.8.14.

component/subversion/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../neon/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../serf/buildout.cfg
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
   ../swig/buildout.cfg
@@ -17,24 +18,26 @@ parts =
 
 [subversion]
 recipe = slapos.recipe.cmmi
-url = http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2
-md5sum = 81e5dc5beee4b3fc025ac70c0b6caa14
+url = http://apache.mirrors.tds.net/subversion/subversion-1.8.14.tar.bz2
+md5sum = fe476ba26d6835eba4393780ea907361
 # Patch available thanks to gentoo developpers
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch?revision=1.1
+# https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-fix-parallel-build-support-for-perl-bindings.patch
 patches =
-  ${:_profile_base_location_}/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch#8d911ec2422dc4c08a00693ac915a07a
+  ${:_profile_base_location_}/subversion-fix-parallel-build-support-for-perl-bindings.patch#fd69f4c932b4882ed98c59eb102be64a
 configure-options =
   --disable-static
   --with-apr=${apache:location}/bin/apr-1-config
   --with-apr-util=${apache:location}/bin/apu-1-config
+  --with-serf=${serf:location}
   --without-apxs
   --with-zlib=${zlib:location}
   --with-sqlite=${sqlite3:location}
-  --with-neon=${neon:location}
   --without-berkeley-db
   --without-sasl
   --without-apr_memcache
+  --without-gpg-agent
   --without-gnome-keyring
+  --without-libmagic
   --without-kwallet
   --without-jdk
   --without-jikes
@@ -45,15 +48,11 @@ configure-options =
   --without-ruby-test-verbose
   --disable-nls
 
-# it seems that parallel build sometimes fails.
-make-options =
-  -j1
-
 environment =
-  PATH=${perl:location}/bin:${pkgconfig:location}/bin:${neon:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${neon:location}/lib/pkgconfig
+  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
   CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
-  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${neon:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
+  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
 
 
 [subversion-1.9]
@@ -95,4 +94,4 @@ environment =
   PATH=${pkgconfig:location}/bin:${neon:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${neon:location}/lib/pkgconfig
   CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
-  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${neon:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
+  LDFLAGS=-L. -L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${neon:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib

component/subversion/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch

---- Makefile.in
-+++ Makefile.in
-@@ -47,6 +47,7 @@
- SVN_SASL_LIBS = @SVN_SASL_LIBS@
- SVN_SERF_LIBS = @SVN_SERF_LIBS@
- SVN_SQLITE_LIBS = @SVN_SQLITE_LIBS@
-+SVN_XML_LIBS = -lexpat
- SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
- 
- LIBS = @LIBS@
---- build/ac-macros/aprutil.m4
-+++ build/ac-macros/aprutil.m4
-@@ -77,16 +77,14 @@
-     AC_MSG_ERROR([apu-config --prefix failed])
-   fi
- 
--  dnl When APR stores the dependent libs in the .la file, we don't need
--  dnl --libs.
--  SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
-+  SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
-   if test $? -ne 0; then
--    AC_MSG_ERROR([apu-config --link-libtool --libs failed])
-+    AC_MSG_ERROR([apu-config --link-libtool failed])
-   fi
- 
--  SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`"
-+  SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld`"
-   if test $? -ne 0; then
--    AC_MSG_ERROR([apu-config --link-ld --libs failed])
-+    AC_MSG_ERROR([apu-config --link-ld failed])
-   fi
- 
-   AC_SUBST(SVN_APRUTIL_INCLUDES)
---- build/ac-macros/apr.m4
-+++ build/ac-macros/apr.m4
-@@ -74,16 +74,14 @@
-     AC_MSG_ERROR([apr-config --prefix failed])
-   fi
- 
--  dnl When APR stores the dependent libs in the .la file, we don't need 
--  dnl --libs.
--  SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
-+  SVN_APR_LIBS="`$apr_config --link-libtool`"
-   if test $? -ne 0; then
--    AC_MSG_ERROR([apr-config --link-libtool --libs failed])
-+    AC_MSG_ERROR([apr-config --link-libtool failed])
-   fi
- 
--  SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`"
-+  SVN_APR_EXPORT_LIBS="`$apr_config --link-ld`"
-   if test $? -ne 0; then
--    AC_MSG_ERROR([apr-config --link-ld --libs failed])
-+    AC_MSG_ERROR([apr-config --link-ld failed])
-   fi
- 
-   SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`"

component/subversion/subversion-fix-parallel-build-support-for-perl-bindings.patch

+--- Makefile.in	2011-07-16 13:50:53.000000000 +0200
++++ Makefile.in.new	2012-03-11 12:13:57.000000000 +0100
+@@ -732,7 +732,7 @@
+ extraclean-swig-headers: clean-swig-headers
+ 	$(EXTRACLEAN_SWIG_HEADERS)
+ 
+-$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in
++$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in libsvn_swig_perl
+ 	./config.status subversion/bindings/swig/perl/native/Makefile.PL
+ 
+ $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL