subversion: updated to 1.7.7

3 files changed, 3 insertions, 41 deletions

diff --git a/subversion/.md5sum b/subversion/.md5sum
index 55dfcfe6e..7de8040d1 100644
--- a/subversion/.md5sum
+++ b/subversion/.md5sum
@@ -1,2 +1 @@
-d2af2b10f79a05c5110a10320d546035  mod_dontdothat.patch
-4baa434db7709bb059b05d02a2547663  subversion-1.7.6.tar.bz2
+5a42b7d0f1366a8d60f9ad7d5890295d  subversion-1.7.7.tar.bz2
diff --git a/subversion/Pkgfile b/subversion/Pkgfile
index e6a97fbdd..b4a19eae5 100644
--- a/subversion/Pkgfile
+++ b/subversion/Pkgfile
@@ -5,17 +5,13 @@
 # Depends on: apr neon expat sqlite3
 
 name=subversion
-version=1.7.6
+version=1.7.7
 release=1
-source=(http://www.apache.org/dist/$name/$name-$version.tar.bz2 \
-        mod_dontdothat.patch)
+source=(http://www.apache.org/dist/$name/$name-$version.tar.bz2)
 
 build() {
     cd $name-$version
 
-    # fix build issues with server-side modules
-    patch -p1 -i $SRC/mod_dontdothat.patch
-
     ./configure --prefix=/usr \
        --mandir=/usr/man \
        --with-apr=/usr --with-apr-util=/usr --with-neon=/usr \
diff --git a/subversion/mod_dontdothat.patch b/subversion/mod_dontdothat.patch
deleted file mode 100644
index 09af3dff5..000000000
--- a/subversion/mod_dontdothat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur subversion-1.7.6/build-outputs.mk subversion-1.7.6.patched/build-outputs.mk

---- subversion-1.7.6/build-outputs.mk	2012-08-08 16:21:32.000000000 +0200

-+++ subversion-1.7.6.patched/build-outputs.mk	2012-08-16 09:22:09.000000000 +0200

-@@ -825,7 +825,7 @@

- # Section 6: Install-Group build targets

- ########################################

- 

--apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la

-+apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la

- 

- bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la

- 

-@@ -877,7 +877,7 @@

- 

- test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT)

- 

--tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)

-+tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)

- 

- 

- ########################################

-diff -Naur subversion-1.7.6/build.conf subversion-1.7.6.patched/build.conf

---- subversion-1.7.6/build.conf	2012-08-02 06:02:59.000000000 +0200

-+++ subversion-1.7.6.patched/build.conf	2012-08-16 09:22:24.000000000 +0200

-@@ -367,7 +367,7 @@

- path = tools/server-side/mod_dontdothat

- nonlibs = mod_dav_svn apr aprutil

- libs = libsvn_subr xml

--install = tools

-+install = apache-mod

- msvc-libs = libhttpd.lib

- 

- # ----------------------------------------------------------------------------