- up to 1.8.10 (fixes CVE-2014-3522, CVE-2014-3528)

[packages/subversion.git] / subversion-DESTDIR.patch

diff --git a/subversion-DESTDIR.patch b/subversion-DESTDIR.patch
index d4759e604314231847c04e4b082f59144f35d66b..c6c16d9d04063876c3253021ddd70c0a5238cd1d 100644 (file)
--- a/subversion-DESTDIR.patch
+++ b/subversion-DESTDIR.patch
@@ -18,15 +18,14 @@
  INSTALL_DATA = $(INSTALL) -m 644
  INSTALL_LOCALE = $(INSTALL_DATA)
  
---- subversion-1.7.0-rc3/build/generator/templates/makefile.ezt~       2011-04-27 23:54:33.000000000 +0200
-+++ subversion-1.7.0-rc3/build/generator/templates/makefile.ezt        2011-09-16 08:46:27.559338812 +0200
-@@ -125,7 +125,7 @@
+--- subversion-1.7.0-rc3/build/generator/templates/build-outputs.mk.ezt~       2011-04-27 23:54:33.000000000 +0200
++++ subversion-1.7.0-rc3/build/generator/templates/build-outputs.mk.ezt        2011-09-16 08:46:27.559338812 +0200
+@@ -128,7 +128,7 @@
  ########################################
  [for areas]
- [is areas.type "apache-mod"]install-mods-shared:[for areas.files] [areas.files.fullname][end][for areas.files]
--      cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
-+      cd [areas.files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
- [else]install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end]
-       $(MKDIR) $(DESTDIR)$([areas.varname]dir)[for areas.files][is areas.type "locale"]
-       $(MKDIR) [areas.files.installdir]
-
+ install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end]
+-[if-any areas.files][for areas.files] [is areas.files.mode "apache-mod"][if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][if-any areas.files.when] ; fi[else][end][else][if-index areas.files first]$(MKDIR) $(DESTDIR)$([areas.varname]dir)
++[if-any areas.files][for areas.files] [is areas.files.mode "apache-mod"][if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][if-any areas.files.when] ; fi[else][end][else][if-index areas.files first]$(MKDIR) $(DESTDIR)$([areas.varname]dir)
+       [else][end][is areas.type "locale"]$(MKDIR) [areas.files.installdir]
+       [if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][if-any areas.files.when] ; fi[else][end][else][if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][if-any areas.files.when] ; fi[else][end][end][end]
+ [end][else]   $(MKDIR) $(DESTDIR)$([areas.varname]dir)