version up : subversion 1.7.22.

component/subversion/buildout.cfg

@@ -17,12 +17,8 @@ parts =
 
 [subversion]
 recipe = slapos.recipe.cmmi
-url = http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2
-md5sum = 81e5dc5beee4b3fc025ac70c0b6caa14
-# 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
-patches =
-  ${:_profile_base_location_}/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch#8d911ec2422dc4c08a00693ac915a07a
+url = http://archive.apache.org/dist/subversion/subversion-1.7.22.tar.bz2
+md5sum = ba8b54b53147effa266c8d5cbc845d50
 configure-options =
   --disable-static
   --with-apr=${apache:location}/bin/apr-1-config
@@ -33,6 +29,7 @@ configure-options =
   --with-neon=${neon:location}
   --without-berkeley-db
   --without-sasl
+  --without-gssapi
   --without-apr_memcache
   --without-gnome-keyring
   --without-kwallet
@@ -54,45 +51,3 @@ environment =
   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
-
-
-[subversion-1.9]
-recipe = hexagonit.recipe.cmmi
-url = http://www.apache.org/dist/subversion/subversion-1.7.9.tar.gz
-md5sum = dfb083e8bfac88aa28d606168b08e4ff
-configure-options =
-  --disable-static
-  --with-apr=${apache:location}/bin/apr-1-config
-  --with-apr-util=${apache:location}/bin/apu-1-config
-  --with-apxs=${apache:location}/bin/apxs
-  --with-zlib=${zlib:location}
-  --with-sqlite=${sqlite3:location}
-  --with-neon=${neon:location}
-  --with-swig=${swig:location}/bin/swig
-  --without-berkeley-db
-  --without-sasl
-  --without-apr_memcache
-  --without-gnome-keyring
-  --without-kwallet
-  --without-jdk
-  --without-jikes
-  --without-junit
-  --without-ctypesgen
-  --without-ruby-sitedir
-  --without-ruby-test-verbose
-  --disable-nls
-
-# it seems that parallel build sometimes fails.
-make-options =
-  -j1
-
-make-targets = 
-  install
-  swig-py
-  install-swig-py
-
-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

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`"

software/unstable/trac-svn/instance-trac.cfg

@@ -253,7 +253,7 @@ trac_env = $${trac-config:project_dir}
 trac_admin = ${buildout:bin-directory}
 python_bin = ${python2.7:location}/bin
 python_lib = ${python2.7:location}/lib
-svn_python = ${subversion-1.9:location}/lib/svn-python
+svn_python = ${subversion:location}/lib/svn-python
 
 [trac-git-hook-script]
 recipe = slapos.recipe.template
@@ -277,8 +277,8 @@ url = ${create-svn-repo:location}/${create-svn-repo:filename}
 output = $${rootdirectory:bin}/create-svn-repository.sh
 mode = 0700
 trac_admin = ${buildout:bin-directory}
-svn_bin = ${subversion-1.9:location}/bin
-svn_python = ${subversion-1.9:location}/lib/svn-python
+svn_bin = ${subversion:location}/bin
+svn_python = ${subversion:location}/lib/svn-python
 python_lib = ${python2.7:location}/lib
 
 [gitweb-conf]
@@ -356,7 +356,7 @@ user-list = $${slap-parameter:trac-user-list}
 [httpd]
 recipe = slapos.cookbook:wrapper
 command-line = ${apache:location}/bin/httpd -DFOREGROUND -f "$${httpd-conf:output}"
-environment = PYTHONPATH=${subversion-1.9:location}/lib/svn-python:$${inittrac:python_path}
+environment = PYTHONPATH=${subversion:location}/lib/svn-python:$${inittrac:python_path}
   LD_LIBRARY_PATH=${python2.7:location}/lib
 wrapper-path = $${basedirectory:services}/httpd
 wait-for-files = $${inittrac:file-status}
@@ -409,7 +409,7 @@ key-file = $${directory:shellinabox}/private.key
 [shell-wrapper]
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/trac-admin $${inittrac:site-dir}
-environment = PYTHONPATH=${subversion-1.9:location}/lib/svn-python:$${inittrac:python_path}
+environment = PYTHONPATH=${subversion:location}/lib/svn-python:$${inittrac:python_path}
     ENV=$${inittrac:site-dir}
     SNV_REPOS=$${inittrac:site-dir}/svn
     GIT_REPOS=$${inittrac:site-dir}/git

software/unstable/trac-svn/software.cfg

@@ -8,7 +8,7 @@ parts =
   apache-wsgi
   slapos-cookbook
   gitweb  
-  subversion-1.9
+  subversion
   instance-egg
   instance  
   instance-trac  
@@ -62,7 +62,7 @@ eggs =
 
 [trac-plugins-egg]
 recipe = plone.recipe.command
-svn = ${subversion-1.9:location}/bin/svn
+svn = ${subversion:location}/bin/svn
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 #command = ${:svn} co http://trac-hacks.org/svn/simplemultiprojectplugin/trunk/ ${:multipleproject}
 command = ${:svn} co http://trac-hacks.org/svn/accountmanagerplugin/0.11 ${:location}/accountmanager