Added r6406 for Dave Summers
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/release-0.25@846507 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
index a3300c9..907e218 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,7 +20,7 @@
* now requre apache 2.0.47 (and apr 0.9.4)
* fix 2 commit leaks
* fix mod_dav_svn path-escaping bug
- *
+
Developer-visible changes:
* Win32 build system
diff --git a/packages/rpm/redhat-7.x/httpd.davcheck.conf b/packages/rpm/redhat-7.x/httpd.davcheck.conf
index 260e380..4f4d96b 100644
--- a/packages/rpm/redhat-7.x/httpd.davcheck.conf
+++ b/packages/rpm/redhat-7.x/httpd.davcheck.conf
@@ -124,7 +124,7 @@
LoadModule auth_anon_module modules/mod_auth_anon.so
LoadModule auth_dbm_module modules/mod_auth_dbm.so
LoadModule auth_digest_module modules/mod_auth_digest.so
-LoadModule ext_filter_module modules/mod_ext_filter.so
+#LoadModule ext_filter_module modules/mod_ext_filter.so
LoadModule include_module modules/mod_include.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule env_module modules/mod_env.so
diff --git a/packages/rpm/redhat-7.x/install.patch b/packages/rpm/redhat-7.x/install.patch
index 4f80e9f..6a9fd61 100644
--- a/packages/rpm/redhat-7.x/install.patch
+++ b/packages/rpm/redhat-7.x/install.patch
@@ -1,12 +1,13 @@
---- subversion-0.23.0/build-outputs.mk 2003/06/11 02:58:05 1.1
-+++ subversion-0.23.0/build-outputs.mk 2003/06/11 03:00:37
-@@ -339,7 +339,7 @@
+--- ./build-outputs.mk.orig Mon Jul 7 17:49:50 2003
++++ ./build-outputs.mk Mon Jul 7 17:56:02 2003
+@@ -338,8 +338,8 @@
+ CLEAN_FILES = subversion/bindings/swig/swig_client subversion/bindings/swig/swig_core subversion/bindings/swig/swig_delta subversion/bindings/swig/swig_fs subversion/bindings/swig/swig_ra subversion/bindings/swig/swig_repos subversion/bindings/swig/swig_wc subversion/clients/cmdline/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_diff/diff-test$(EXEEXT) subversion/tests/libsvn_diff/diff3-test$(EXEEXT) subversion/tests/libsvn_diff/diff4-test$(EXEEXT) subversion/tests/libsvn_fs/changes-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/key-test$(EXEEXT) subversion/tests/libsvn_fs/skel-test$(EXEEXT) subversion/tests/libsvn_fs/strings-reps-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/md5args$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_wc/translate-test$(EXEEXT)
- install-mods-shared: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la
-- cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
+ install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la
- cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
-+ cd subversion/mod_authz_svn ; $(MKDIR) $(RPM_BUILD_ROOT)/usr/local/apache2/modules; cp ./.libs/mod_authz_svn.so ./mod_authz_svn.la $(RPM_BUILD_ROOT)/usr/local/apache2/modules
+- cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
+ cd subversion/mod_dav_svn ; $(MKDIR) $(RPM_BUILD_ROOT)/usr/local/apache2/modules; cp ./.libs/mod_dav_svn.so ./mod_dav_svn.la $(RPM_BUILD_ROOT)/usr/local/apache2/modules
++ cd subversion/mod_authz_svn ; $(MKDIR) $(RPM_BUILD_ROOT)/usr/local/apache2/modules; cp ./.libs/mod_authz_svn.so ./mod_authz_svn.la $(RPM_BUILD_ROOT)/usr/local/apache2/modules
- install-mods-static: subversion/libsvn_fs/libsvn_fs-1.la-a subversion/mod_dav_svn/mod_dav_svn.la-a subversion/libsvn_delta/libsvn_delta-1.la-a subversion/mod_authz_svn/mod_authz_svn.la-a subversion/libsvn_repos/libsvn_repos-1.la-a subversion/libsvn_subr/libsvn_subr-1.la-a subversion/mod_dav_svn/static/config.m4 subversion/mod_dav_svn/static/Makefile.in
+ install-mods-static: subversion/libsvn_repos/libsvn_repos-1.la-a subversion/libsvn_fs/libsvn_fs-1.la-a subversion/libsvn_subr/libsvn_subr-1.la-a subversion/libsvn_delta/libsvn_delta-1.la-a subversion/mod_dav_svn/mod_dav_svn.la-a subversion/mod_authz_svn/mod_authz_svn.la-a subversion/mod_dav_svn/static/config.m4 subversion/mod_dav_svn/static/Makefile.in
$(MKDIR) $(DESTDIR)$(APACHE_TARGET)/.libs
diff --git a/packages/rpm/redhat-8+/httpd.davcheck.conf b/packages/rpm/redhat-8+/httpd.davcheck.conf
index b8ae19b..2da22e0 100644
--- a/packages/rpm/redhat-8+/httpd.davcheck.conf
+++ b/packages/rpm/redhat-8+/httpd.davcheck.conf
@@ -124,7 +124,7 @@
LoadModule auth_anon_module modules/mod_auth_anon.so
LoadModule auth_dbm_module modules/mod_auth_dbm.so
LoadModule auth_digest_module modules/mod_auth_digest.so
-LoadModule ext_filter_module modules/mod_ext_filter.so
+#LoadModule ext_filter_module modules/mod_ext_filter.so
LoadModule include_module modules/mod_include.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule env_module modules/mod_env.so
diff --git a/packages/rpm/redhat-8+/install.patch b/packages/rpm/redhat-8+/install.patch
index cc052bb..58f615f 100644
--- a/packages/rpm/redhat-8+/install.patch
+++ b/packages/rpm/redhat-8+/install.patch
@@ -1,12 +1,13 @@
---- subversion-0.23.0/build-outputs.mk 2003/06/11 02:58:05 1.1
-+++ subversion-0.23.0/build-outputs.mk 2003/06/11 03:00:37
-@@ -339,7 +339,7 @@
+--- ./build-outputs.mk.orig 2003-07-07 14:32:23.000000000 -0500
++++ ./build-outputs.mk 2003-07-07 14:42:26.000000000 -0500
+@@ -338,8 +338,8 @@
+ CLEAN_FILES = subversion/bindings/swig/swig_client subversion/bindings/swig/swig_core subversion/bindings/swig/swig_delta subversion/bindings/swig/swig_fs subversion/bindings/swig/swig_ra subversion/bindings/swig/swig_repos subversion/bindings/swig/swig_wc subversion/clients/cmdline/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_diff/diff-test$(EXEEXT) subversion/tests/libsvn_diff/diff3-test$(EXEEXT) subversion/tests/libsvn_diff/diff4-test$(EXEEXT) subversion/tests/libsvn_fs/changes-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/key-test$(EXEEXT) subversion/tests/libsvn_fs/skel-test$(EXEEXT) subversion/tests/libsvn_fs/strings-reps-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/md5args$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_wc/translate-test$(EXEEXT)
- install-mods-shared: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la
-- cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
+ install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la
- cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
-+ cd subversion/mod_authz_svn ; $(MKDIR) $(RPM_BUILD_ROOT)/usr/lib/httpd/modules; cp ./.libs/mod_authz_svn.so ./mod_authz_svn.la $(RPM_BUILD_ROOT)/usr/lib/httpd/modules
+- cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
+ cd subversion/mod_dav_svn ; $(MKDIR) $(RPM_BUILD_ROOT)/usr/lib/httpd/modules; cp ./.libs/mod_dav_svn.so ./mod_dav_svn.la $(RPM_BUILD_ROOT)/usr/lib/httpd/modules/
++ cd subversion/mod_authz_svn ; $(MKDIR) $(RPM_BUILD_ROOT)/usr/lib/httpd/modules; cp ./.libs/mod_authz_svn.so ./mod_authz_svn.la $(RPM_BUILD_ROOT)/usr/lib/httpd/modules
- install-mods-static: subversion/libsvn_fs/libsvn_fs-1.la-a subversion/mod_dav_svn/mod_dav_svn.la-a subversion/libsvn_delta/libsvn_delta-1.la-a subversion/mod_authz_svn/mod_authz_svn.la-a subversion/libsvn_repos/libsvn_repos-1.la-a subversion/libsvn_subr/libsvn_subr-1.la-a subversion/mod_dav_svn/static/config.m4 subversion/mod_dav_svn/static/Makefile.in
+ install-mods-static: subversion/libsvn_fs/libsvn_fs-1.la-a subversion/mod_dav_svn/mod_dav_svn.la-a subversion/libsvn_delta/libsvn_delta-1.la-a subversion/mod_authz_svn/mod_authz_svn.la-a subversion/libsvn_repos/libsvn_repos-1.la-a subversion/libsvn_subr/libsvn_subr-1.la-a subversion/mod_dav_svn/static/Makefile.in subversion/mod_dav_svn/static/config.m4
$(MKDIR) $(DESTDIR)$(APACHE_TARGET)/.libs
