diff --git a/subversion-1.7.2.tar.bz2 b/subversion-1.7.2.tar.bz2 deleted file mode 100644 index 6f6239d..0000000 --- a/subversion-1.7.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517 -size 5944987 diff --git a/subversion-1.7.3.tar.bz2 b/subversion-1.7.3.tar.bz2 new file mode 100644 index 0000000..0579012 --- /dev/null +++ b/subversion-1.7.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f68ac8f96047a2d7775085d8c9795457feb24dafa21ac1fdeafa3b39d112fd0e +size 5956842 diff --git a/subversion-no-build-date.patch b/subversion-no-build-date.patch index b6aa675..fccb2a5 100644 --- a/subversion-no-build-date.patch +++ b/subversion-no-build-date.patch @@ -1,7 +1,7 @@ Index: subversion/libsvn_subr/opt.c =================================================================== ---- subversion/libsvn_subr/opt.c.orig 2011-06-24 16:55:09.000000000 +0100 -+++ subversion/libsvn_subr/opt.c 2011-12-21 17:32:39.000000000 +0000 +--- subversion/libsvn_subr/opt.c.orig 2012-01-25 17:16:44.000000000 +0000 ++++ subversion/libsvn_subr/opt.c 2012-02-13 20:48:43.000000000 +0000 @@ -1070,9 +1070,8 @@ svn_opt__print_version_info(const char * if (quiet) return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER); @@ -12,5 +12,5 @@ Index: subversion/libsvn_subr/opt.c + SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n\n"), pgm_name, + SVN_VERSION)); SVN_ERR(svn_cmdline_fputs( - _("Copyright (C) 2011 The Apache Software Foundation.\n" + _("Copyright (C) 2012 The Apache Software Foundation.\n" "This software consists of contributions made by many " diff --git a/subversion.README.SuSE b/subversion.README.SuSE index b62b171..d229714 100644 --- a/subversion.README.SuSE +++ b/subversion.README.SuSE @@ -3,6 +3,7 @@ Topics: 1. backup and restore your repository data 2. create svn user/group for svnserve 3. mini-howto for 2 projects +4. quickstart for mod_dontdothat ================================================================================ @@ -209,3 +210,46 @@ Now import the data, e.g. svn import /path/to/project2-tree http://host/repos/project2 + + + + +4. quickstart for mod_dontdothat + +The apache module mod_dontdothat can be used to prevent users from causing high +load on the server, e.g. checking out the root of the tree or the tags or +branches directories. + +Make sure mod_dontdothat is loaded: +$ a2enmod dontdothat + +Add configuration for the module, e.g. + + + DAV svn + SVNParentPath /srv/svn/repositories/ + SVNListParentPath on + # [...other configuration...] + + DontDoThatConfigFile /srv/svn/mod_dontdothat.config + DontDoThatDisallowReplay off + + + +Restart apache to make the change effective. + +A fairly standard file /srv/svn/mod_dontdothat.config may contain: + +[recursive-actions] +/*/trunk = allow +/ = deny +/* = deny +/*/tags = deny +/*/branches = deny +/*/* = deny +/*/*/tags = deny +/*/*/branches = deny + +This allows checking out of /trunk and each branch, but disallows checking out +all branches or the complete repository at once. + diff --git a/subversion.changes b/subversion.changes index 6285196..c1f97b8 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Mon Feb 13 23:16:44 UTC 2012 - andreas.stieger@gmx.de + +- refresh subversion-no-build-date.patch +- add mod_dontdothat to subversion-server package +- add section to README.SuSE about mod_dontdothat +- add inactive sample mod_dontdothat configuration to subversion.conf +- update to upstream 1.7.3 + + General: + * ship mod_dontdothat with the standard release + + User-visible changes: + * fix segfault on 'svn rm $ROOT_URL' (issue #4074) + * replace a couple of assertions in favor of errors (r1207858, -949) + * fix a server assert after being upgraded (r1210195) + * fix segfault on 'svn mkdir svn://localhost' (r1211483) + * make 'svnadmin recover' prune the rep cache (r1213331, et al) + * make svnmucc use values from --config-dir option + * update and clarify the merge help text (r1154121, et al) + * replace wc assertion with informative error (r1222521, -693) + * copy permissions correctly for FSFS dirs (r1229252) + * improve 'svn log --with-all-revprops' over ra-dav (issue #4082) + * fix segfault when remapping a file external (issue #4093) + * fix segfault caused by obstructing unversioned dir (r1229677) + * fix regression on first update of external dir with '-r' (issue #4053) + * fix various EOL-handling problems in 'svn patch' (issues #3814, #3991) + * fix segfault in 'svn revert' (r1229303) + * improve correctness of 'svn patch --dry-run' (r1231944, -5) + * enforce revisions given in 'svn:externals' (issue #4053) + * fix potential corruption on 32-bit FSFS with large files (r1230212) + * make 'svn status --xml' show new files (issue #4097) + * fix 'svn mergeinfo' correctness (issue #4050) + * return the correct status for non-present nodes (r1232202, -07, -21, -22) + * improve SASL error messages (r1236343, et al) + * improve server cert error code for ra_serf (r1232413) + * fix SVNParentPath listings for parent path symlinks (r1221767, -80) + * fix mod_dav_svn's handling of POST errors (issue #4086) + * log some mod_dav_svn errors, rather than ignoring them (r1237720, -9596) + * relax requirements for canonicalization in mod_dav_svn (r1236173) + * fix a rare source of FSFS corruption (r1240752) + * allow committing the result of some copy operations (issue #4059) + * prevent one-byte buffer overflow in base64 decoding (r1242337) + + Developer-visible changes: + * JavaHL: Add missing notify action, fixing an exception (r1221793) + * fix swig-py memory leak (r1235264, -296, -302, -736) + * fix spurious test suite failure (r1220742, -50) + * allow running tests on UNC shares (r1225491) + * bindings: see platform-specific password providers (r1242660, -1) + * skip 'svnrdump dump' tests over ra_serf (r1242537) + * convert a few ra_serf assertions to errors (r1242607) + ------------------------------------------------------------------- Wed Dec 21 18:57:10 UTC 2011 - andreas.stieger@gmx.de diff --git a/subversion.conf b/subversion.conf index be40846..fa7b4b4 100644 --- a/subversion.conf +++ b/subversion.conf @@ -83,6 +83,15 @@ # # Require valid-user # +# # +# # Optional configuration for mod_dontdothat +# # prevent users from causing high load on the server, e.g. checking out +# # the root of the tree or the tags or branches directories +# # +# # +# # DontDoThatConfigFile /srv/svn/mod_dontdothat.config +# # DontDoThatDisallowReplay off +# # # # diff --git a/subversion.spec b/subversion.spec index 432d033..24575c8 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,7 +1,7 @@ # # spec file for package subversion # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009-2010 Pascal Bleser # # All modifications and additions to the file contributed by third parties @@ -41,7 +41,7 @@ %bcond_without regression_tests Name: subversion -Version: 1.7.2 +Version: 1.7.3 Release: 1 # in-tree SWIG version to use for the build: %define swig_version 1.3.36 @@ -733,6 +733,7 @@ kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null` %dir %{apache_libexecdir} %{apache_libexecdir}/mod_dav_svn.* %{apache_libexecdir}/mod_authz_svn.* +%{apache_libexecdir}/mod_dontdothat.* %if %with_gnome_keyring %files -n libsvn_auth_gnome_keyring-1-0