Changes - j0ke.net Open Build Service

Changes of Revision 27

[-] [+]	Changed	subversion.changes
@@ -1,4 +1,352 @@ ------------------------------------------------------------------- +Mon Nov 10 11:16:34 CET 2008 - olh@suse.de + +- add .git dir to excludepath in svngrep + +------------------------------------------------------------------- +Wed Oct 15 10:42:30 CEST 2008 - olh@suse.de + +- fix incorrect path to svn binary in svn_load_dirs.pl (bnc#408952) + +------------------------------------------------------------------- +Mon Sep 1 17:27:42 CEST 2008 - olh@suse.de + +- build swig bindings with empty SWIG_LDFLAGS= because it defaults + to LDFLAGS which contains -pie + +------------------------------------------------------------------- +Mon Sep 1 11:23:54 CEST 2008 - olh@suse.de + +- update to 1.5.2 final + User-visible changes: + * Set correct permissions on created fsfs shards (r32355, -7) + * Pass client capabilities to start-commit hook (issue #3255) + * Disallow creating nested repositories (issue #3269) + * Support Neon 0.28.3 + * Properly canonicalize URIs with an empty hostname (issue #2116) + * Improved merge performance for superfluous ranges (r32643) + * Better error message for 'Malformed URL for repository' (r31867, r32365) + * Improved svn:externals parsing (r32672, -673, -674, -739) + * fixed: improper ordering in 'svnlook diff' output (r32019) + * fixed: mod_dav_svn memory leak with 'SVNPathAuthz short_circuit' (r32360) + * fixed: duplicate svn:externals targets fail on co/up (issue #3246) + * fixed: 'svn merge --depth' inconsistencies (issue #2825) + * fixed: ra_serf test failures (1.5.x-ra_serf-backports branch) + * fixed: memory leak and crashes in FS (r32545, -58, -82) + * fixed: core dump with relative externals (issue #3237) + * fixed: 'svn copy' working copy corruption (r32467, -70) + * fixed: perl bindings errors in non-English locale (issue #3258) + * fixed: 'svn merge' incorrectly reverses previous merges (r32494, -522, -523) + * fixed: 'svn merge' errors with subtree mergeinfo (issue #3067) + + Developer-visible changes: + * make libsvn_ra_neon initialization thread-safe (r32497, r32510) + * respect LDFLAGS in Swig bindings (r32416, r32421, r32442) + * fixed: test failures in non-English locales (r32491) + +------------------------------------------------------------------- +Tue Jul 29 08:32:56 CEST 2008 - olh@suse.de + +- update to 1.5.1 final + User-visible changes: + * mergeinfo on switched subtrees should elide in repos (issue #3188) + * Add support for --config-dir to svnmerge.py (r31727) + * improve performance of bdb post-commit deltification (r31820, -59) + * return faster when there is nothing to be merged (r30748) + * don't commit an add of a missing item (issue #3198) + * don't create unneeded self-referential mergeinfo (issue #3157) + * support 'http-library' (if --enable-runtime-module-search) (r31425, -722) + * support Berkeley DB 4.7 (r32017, -29) + * fixed: make serf usable with root-level authz (r31464) + * fixed: 'svndumpfilter' partial-path matching bug (r31833) + * fixed: crash on invalid dates in 'log' and 'blame' (issue #2721) + * fixed: 'svn status --xml' outputting invalid XML (issue #2887) + * fixed: 'svn merge' prints incorrect range (r30746, -47) + * fixed: using neon/serf, can not replace branch (issue #2939) + * fixed: 'file not found' error when merging to a broken symlink (r31159, -79) + * fixed: using serf, crash or endless loop fetching authn data (r31619) + * fixed: ArrayIndexOutOfBoundsException in JavaHL bindings (r31719, -806) + * fixed: authn password lookup used wrong username (issue #2242) + * fixed: unbounded memory usage in wc-to-wc copy and move (r31868) + * fixed: subtree merges broken for non-intersecting ranges (issue #3199) + * fixed: invalid XML from 'svn log --xml' against pre-1.2 servers (r31875) + * fixed: 'svnlook diff' ignores --diff-copy-from for properties (issue #3248) + * fixed: 'svnlook diff' doesn't report that binary files differ (issue #3249) + * fixed: bogus results from commits to subtrees added by merge (issue #3240) + * fixed: non-existent subtree in destination breaks the merge (issue #3067) + * fixed: serf merge bug too complex to describe here (r32056) + * fixed: 'svn log -g' correctness and speed (issue #3220, issue #3235) + * fixed: merge chokes on renamed subtrees (issue #3174) + + Developer-visible changes: + * export svn_path_is_url() to the bindings (r31603) + * don't clobber LDFLAGS in configure when given '--with-zlib' (r31825) + * make libsvn_ra depend on libsvn_delta unconditionally (r31852) + * correctly set the peg revision for copy in JavaHL (r31994) + * 'svn mergeinfo' handles wc paths (r31023, -873, -874, -929, -930, -038) + * fixed: crash when when svn_ra_open3() is passed a bogus URL (r31223) + * fixed: JavaHL compilation on Windows (r31737) + * fixed: crash in calling apr_pstrcat (affects TortoiseSVN) (r32080) + +------------------------------------------------------------------- +Fri Jul 11 09:39:33 CEST 2008 - poeml@suse.de + +- build fixes to get the Factory package building in the Build + Service again: + * change BuildRequires java2-devel-packages to java-devel, which + seems to be more universally defined + * don't build javahl bindings on 10.1/SLE10 or older -- build + doesn't work with that currently. + * fix build on SLES9 -- by not applying + subversion.libtool-pie-flags.patch there and + fixing LDFLAGS in the Makefile to use the correct libdir + * add workaround for (bnc#395110) -- build error on 10.1/sle10 on + x86_64: add update-alternatives to BuildRequires (but not on + sles9 where the package didn't exist) + +------------------------------------------------------------------- +Thu Jun 19 17:45:53 CEST 2008 - olh@suse.de + +- add svn_apply_autoprops.py to subversion-tools (bnc#401638) + +------------------------------------------------------------------- +Thu Jun 19 17:41:32 CEST 2008 - olh@suse.de + +- update to 1.5.0 final + User-visible changes: + * many, compared to 1.4.4 + Developer-visible changes: + * many, compared to 1.4.4 + +------------------------------------------------------------------- +Wed Jun 11 08:58:26 CEST 2008 - olh@suse.de + +- update to rev 31701, 1.5.0-rc11 + translation update, fix API violation in diff command + +------------------------------------------------------------------- +Mon Jun 9 13:03:12 CEST 2008 - olh@suse.de + +- update to rev 31654, 1.5.0-rc10 + translation update, fix possible segfault in start-commit-hook + +------------------------------------------------------------------- +Wed Jun 4 07:23:25 CEST 2008 - olh@suse.de + +- update to rev 31577, 1.5.0-rc9 + translation update, two small bugfixes + +------------------------------------------------------------------- +Tue Jun 3 20:47:56 CEST 2008 - poeml@suse.de + +- fix changelog, which wasn't in chronological order anymore, after + new upstream changes from Factory, by setting my changelog entry + (from the 28th) to the 25th of May + +------------------------------------------------------------------- +Thu May 29 11:55:40 CEST 2008 - olh@suse.de + +- update to rev 31507, 1.5.0-rc8 + translation update, handle NULL pointers in ra_loader + +------------------------------------------------------------------- +Mon May 26 09:24:31 CEST 2008 - olh@suse.de + +- update to rev 31448, 1.5.0-rc7 + fix API for bindings, translation update + +------------------------------------------------------------------- +Wed May 25 23:01:54 CEST 2008 - poeml@suse.de + +- build the Build Service package from openSUSE:Factory again -- + thereby updating to subversion 1.5 release candidate (r31325) + + * installations that have been running earlier pre-1.5 * + * versions may need to dump/reload. This can still be * + * done after upgrading to 1.5. * + +- build fixes to get the Factory package building in the Build + Service again: + * change BuildRequires java2-devel-packages to java-devel, which + seems to be more universally defined + * don't build javahl bindings on 10.1/SLE10 or older -- build + doesn't work with that currently. + * fix build on SLES9 -- by not applying + subversion.libtool-pie-flags.patch there and + fixing LDFLAGS in the Makefile to use the correct libdir + * add workaround for bug 395110 -- build error on 10.1/sle10 on + x86_64: add update-alternatives to BuildRequires (but not on + sles9 where the package didn't exist) + +------------------------------------------------------------------- +Wed May 21 18:42:46 CEST 2008 - olh@suse.de + +- update to rev 31325 + various minor bugfixes, translation updates + +------------------------------------------------------------------- +Fri May 16 10:20:46 CEST 2008 - olh@suse.de + +- update to rev 31218 + various minor bugfixes + +------------------------------------------------------------------- +Sun May 4 11:55:50 CEST 2008 - olh@suse.de + +- update to rev 31014, 1.5.0-rc5 + various bugfixes + +-------------------------------------------------------------------
[-] [+]	Changed	subversion.spec ^
@@ -1,19 +1,36 @@ # -# spec file for package subversion (Version 1.4.6) +# spec file for package subversion (Version 1.5.2) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: subversion -BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages neon-devel openldap2-devel python-devel swig -Version: 1.4.6 -Release: 1 +%if 0%{?suse_version} > 910 +BuildRequires: update-alternatives +%endif +BuildRequires: apache2-devel db-devel gcc-c++ java-devel python-devel swig zlib-devel +%if 0%{?suse_version} > 1030 +BuildRequires: libneon-devel +%else +BuildRequires: neon-devel openldap2-devel +%endif +BuildRequires: sqlite-devel +Version: 1.5.2 +Release: 11 # %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services # @@ -41,39 +58,30 @@ Source43: subversion.svndiff.sh # Patch11: subversion.libtool-verbose.patch -Patch12: subversion.svn_swig_pl_info_receiver.patch # build fixes Patch20: subversion-swig-perl-install_vendor.patch -Patch22: subversion-1.1.x-COMPILE_CXX.dif Patch23: subversion.libtool-pie-flags.patch -Patch24: subversion.svn_swig_perl.dep.patch Patch31: subversion.perl.LD_RUN_PATH.patch -Patch32: subversion.fallback-to-ipv4.patch Patch33: subversion.header_wrappers.patch -Patch34: subversion-neon-027.diff +Patch34: subversion.allowed-neon.patch Patch35: subversion.java14.patch +Patch36: subversion-1.5.x-no-neon-la.patch # %description Subversion does the same thing cvs (CVS (Concurrent Versioning System)) -but has major enhancements compared to CVS. +but has major enhancements compared to CVS. The name of the cmdline +client is svn. %package devel +License: The Apache Software License Group: Development/Libraries/C and C++ Summary: Development package for Subversion developers Requires: subversion = %{version} -Requires: neon-devel gdbm-devel db-devel zlib-devel openssl-devel libapr-util1-devel libapr1-devel python-devel openldap2-devel -%if 0%{?suse_version} <= 1010 -Requires: expat -%endif -%if 0%{?suse_version} == 1020 -Requires: expat-devel -%endif -%if 0%{?suse_version} >= 1030 -Requires: libexpat-devel -%endif +# this pulls in libapr1-devel and libexpat-devel +Requires: libapr-util1-devel %description devel The subversion-devel package includes the static libraries and include @@ -82,15 +90,33 @@ %package tools +License: The Apache Software License; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control Summary: Tools for Subversion %description tools -Tools for Subversion +This package contains a lot of tools for subversion server and + repository admins: * hot-backup makes a backup of a svn repo + without stopping + +* various scripts for client (bash_completion, showchange.pl, + svn-graph.pl, ...) and server (svn-backup-dumps.py, ...) site + +* po file translation scripts + +* hook scripts + +* xslt example + +* some scripts and code examples + +An overview of the scripts can be found at: +http://subversion.tigris.org/tools_contrib.html %package perl +License: The Apache Software License; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control Summary: Allows Perl scripts to directly use Subversion repositories. Requires: subversion = %{version} @@ -102,6 +128,7 @@ %package python +License: The Apache Software License; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control Summary: Allows Python scripts to directly use Subversion repositories. Requires: subversion = %{version} @@ -112,6 +139,7 @@ %package server +License: The Apache Software License Group: Development/Tools/Version Control Summary: Apache server module for Subversion server Requires: subversion = %{version} @@ -135,24 +163,18 @@ esac %setup -q -n subversion-%{version} # -# warning: no newline at end of file -echo "" >> subversion/bindings/java/javahl/native/Path.cpp -echo "" >> subversion/bindings/java/javahl/native/Targets.cpp # %patch11 -p1 -%patch12 -p1 # %patch20 -p1 -%patch22 -p1 %if 0%{?suse_version} > 930 %patch23 -p1 %endif -%patch24 -p1 %patch31 -p1 -%patch32 -p1 %patch33 -p1 -%patch34 +%patch34 -p1 %patch35 -p1 +%patch36 -p1 %build with_jdk=none @@ -177,6 +199,10 @@ break fi done +%if 0%{?suse_version} < 1020 + # disable javahl bindings + with_jdk=none +%endif if [ "$with_jdk" != "none" ] ; then with_jdk="--with-jdk=$with_jdk --enable-javahl" echo with_jdk > with_jdk @@ -200,16 +226,15 @@ # ### these possibly need further discussion # swig_pydir = @libdir@/svn-python/libsvn # swig_pydir_extra = @libdir@/svn-python/svn -mv Makefile.in{,.} -sed " +sed --in-place=~ " s@^swig_pydir = .@swig_pydir = %{site_python}/libsvn@ s@^swig_pydir_extra = .@swig_pydir_extra = %{site_python}/svn@ -" < Makefile.in. > Makefile.in -diff -u Makefile.in. Makefile.in \|\| true +" Makefile.in +diff -u Makefile.in~ Makefile.in \|\| true sh -x autogen.sh -for i in subversion/bindings/java/javahl/native/.cpp +for i in subversion/bindings/javahl/native/.cpp do - d=$(sed -n '/^#include "..\/include/{s@^[^/]\+$[^"]\+$.@subversion/bindings/java/javahl\1@;H};${x;s@\n@ @gp}' $i) + d=$(sed -n '/^#include "..\/include/{s@^[^/]\+$[^"]\+$.@subversion/bindings/javahl\1@;H};${x;s@\n@ @gp}' $i) echo
[-] [+]	Deleted	subversion-1.1.x-COMPILE_CXX.dif ^
@@ -1,16 +0,0 @@ - Makefile.in \| 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: subversion-1.4.x/Makefile.in -=================================================================== ---- subversion-1.4.x.orig/Makefile.in -+++ subversion-1.4.x/Makefile.in -@@ -140,7 +140,7 @@ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) - LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) - - COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) --COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) -+COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) - LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) - - # special compilation for files destined for mod_dav_svn
[-] [+]	Added	subversion-1.5.x-no-neon-la.patch ^
@@ -0,0 +1,15 @@ +--- + build/ac-macros/neon.m4 \| 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/build/ac-macros/neon.m4 ++++ b/build/ac-macros/neon.m4 +@@ -153,7 +153,7 @@ AC_DEFUN(SVN_NEON_CONFIG, + test "$svn_allowed_neon" = "any"; then + svn_allowed_neon_on_system="yes" + SVN_NEON_INCLUDES=[`$neon_config --cflags \| sed -e 's/-D[^ ]//g'`] +- NEON_LIBS=`$neon_config --la-file` ++ NEON_LIBS=`$neon_config --libs` + CFLAGS=["$CFLAGS `$neon_config --cflags \| sed -e 's/-I[^ ]//g'`"] + svn_lib_neon="yes" + break
[-] [+]	Deleted	subversion-neon-027.diff ^
@@ -1,30 +0,0 @@ ---- build/ac-macros/neon.m4 -+++ build/ac-macros/neon.m4 -@@ -50,11 +50,11 @@ AC_DEFUN(SVN_LIB_NEON, - NEON_VERSION=`cat $abs_srcdir/neon/.version` - AC_MSG_RESULT([$NEON_VERSION]) - -- if test -n "`echo \"$NEON_VERSION\" \| grep '^0\.2[[56]]\.'`" ; then -+ if test -n "`echo \"$NEON_VERSION\" \| grep '^0\.2[[56789]]\.'`" ; then - AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1], - [Define to 1 if you have Neon 0.25 or later.]) - fi -- if test -n "`echo \"$NEON_VERSION\" \| grep '^0\.26\.'`" ; then -+ if test -n "`echo \"$NEON_VERSION\" \| grep '^0\.2[[6789]]\.'`" ; then - AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1], - [Define to 1 if you have Neon 0.26 or later.]) - fi ---- subversion/libsvn_ra_dav/ra_dav.h -+++ subversion/libsvn_ra_dav/ra_dav.h -@@ -21,6 +21,11 @@ - #ifndef SVN_LIBSVN_RA_DAV_H - #define SVN_LIBSVN_RA_DAV_H - -+#ifndef SVN_NEON_0_25 -+#define SVN_NEON_0_25 1 -+#define SVN_NEON_0_26 1 -+#endif -+ - #include <apr_pools.h> - #include <apr_tables.h> -
[-] [+]	Changed	subversion-swig-perl-install_vendor.patch ^
@@ -1,11 +1,9 @@ Makefile.in \| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: subversion-1.4.x/Makefile.in -=================================================================== ---- subversion-1.4.x.orig/Makefile.in -+++ subversion-1.4.x/Makefile.in -@@ -616,7 +616,7 @@ check-swig-pl: swig-pl swig-pl-lib +--- a/Makefile.in ++++ b/Makefile.in +@@ -652,7 +652,7 @@ check-swig-pl: swig-pl swig-pl-lib cd $(SWIG_PL_DIR)/native; $(MAKE) test install-swig-pl: swig-pl install-swig-pl-lib
[-] [+]	Added	subversion.allowed-neon.patch ^
@@ -0,0 +1,15 @@ +--- + configure.ac \| 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -69,7 +69,7 @@ SVN_LIB_APRUTIL($APU_VER_REGEXES) + + # Either a space-separated list of allowable Neon versions, or "any" to + # mean allow anything. +-NEON_ALLOWED_LIST="0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4 0.27.2 0.28.0 0.28.1 0.28.2 0.28.3" ++NEON_ALLOWED_LIST="0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4 0.27.0 0.27.1 0.27.2 0.27.3 0.27.4 0.27.5 0.28.0 0.28.1 0.28.2 0.28.3 0.28.4 0.28.5 0.29.0 0.29.1 0.29.2 0.29.3" + NEON_RECOMMENDED_VER=0.28.3 + NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz" + dnl You can skip the neon version check only if you know what you are doing
[-] [+]	Deleted	subversion.fallback-to-ipv4.patch ^
@@ -1,42 +0,0 @@ -Fall back to ipv4 if the host has an ipv6 address, -but doesnt respond to ipv6 right now. - ---- - subversion/libsvn_ra_svn/client.c \| 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -Index: subversion-1.4.x/subversion/libsvn_ra_svn/client.c -=================================================================== ---- subversion-1.4.x.orig/subversion/libsvn_ra_svn/client.c -+++ subversion-1.4.x/subversion/libsvn_ra_svn/client.c -@@ -139,10 +139,30 @@ static svn_error_t make_connection(cons - return svn_error_wrap_apr(status, _("Can't create socket")); - - status = apr_socket_connect(sock, sa); -+ if (!status) -+ goto out; -+ if (sa->family == APR_INET6) { -+ status = apr_sockaddr_info_get(&sa, hostname, APR_INET, port, 0, pool); -+ if (status) -+ return svn_error_createf(status, NULL, _("Unknown hostname '%s'"), -+ hostname); -+#ifdef MAX_SECS_TO_LINGER -+ /* ### old APR interface / -+ status = apr_socket_create(sock, sa->family, SOCK_STREAM, pool); -+#else -+ status = apr_socket_create(sock, sa->family, SOCK_STREAM, APR_PROTO_TCP, -+ pool); -+#endif -+ if (status) -+ return svn_error_wrap_apr(status, _("Can't create socket")); -+ -+ status = apr_socket_connect(sock, sa); -+ } - if (status) - return svn_error_wrap_apr(status, _("Can't connect to host '%s'"), - hostname); - -+out: - return SVN_NO_ERROR; - } -
[-] [+]	Changed	subversion.header_wrappers.patch ^
@@ -8,11 +8,9 @@ build/generator/swig/header_wrappers.py \| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: subversion-1.4.x/build/generator/swig/header_wrappers.py -=================================================================== ---- subversion-1.4.x.orig/build/generator/swig/header_wrappers.py -+++ subversion-1.4.x/build/generator/swig/header_wrappers.py -@@ -146,7 +146,7 @@ class Generator(generator.swig.Generator +--- a/build/generator/swig/header_wrappers.py ++++ b/build/generator/swig/header_wrappers.py +@@ -239,7 +239,7 @@ class Generator(generator.swig.Generator self.proxy_filename(base_fname)) # Open the output file @@ -21,7 +19,7 @@ self.ofile.write('/* Proxy classes for %s\n' % base_fname) self.ofile.write(' * DO NOT EDIT -- AUTOMATICALLY GENERATED */\n') -@@ -165,6 +165,7 @@ class Generator(generator.swig.Generator +@@ -264,6 +264,7 @@ class Generator(generator.swig.Generator # Close our output file self.ofile.close()
[-] [+]	Changed	subversion.java14.patch ^
@@ -1,41 +1,11 @@ --- - build/generator/gen_make.py \| 2 +- - build/generator/gen_win.py \| 2 +- - configure.in \| 2 +- - subversion/bindings/java/javahl/build/build.xml \| 4 ++-- - 4 files changed, 5 insertions(+), 5 deletions(-) + configure.ac \| 2 +- + subversion/bindings/javahl/build/build.xml \| 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) -Index: subversion-1.4.x/build/generator/gen_make.py -=================================================================== ---- subversion-1.4.x.orig/build/generator/gen_make.py -+++ subversion-1.4.x/build/generator/gen_make.py -@@ -292,7 +292,7 @@ class Generator(gen_base.GeneratorBase): - self.ofile.write( - '%s_SRC = %s\n' - '$(%s_OBJECTS): $(%s_SRC)\n' -- '\t%s -d %s -classpath %s:$(%s_CLASSPATH) $(%s_SRC)\n' -+ '\t%s -source 1.4 -target 1.4 -d %s -classpath %s:$(%s_CLASSPATH) $(%s_SRC)\n' - % (targ_varname, string.join(object_srcs), - - targ_varname, targ_varname, -Index: subversion-1.4.x/build/generator/gen_win.py -=================================================================== ---- subversion-1.4.x.orig/build/generator/gen_win.py -+++ subversion-1.4.x/build/generator/gen_win.py -@@ -315,7 +315,7 @@ class WinGeneratorBase(GeneratorBase): - - sourcepath = self.path(source.sourcepath) - -- cbuild = "javac -g -target 1.2 -source 1.3 -classpath %s -d %s " \ -+ cbuild = "javac -g -target 1.4 -source 1.4 -classpath %s -d %s " \ - "-sourcepath %s $(InputPath)" \ - % tuple(map(self.quote, (classes, targetdir, sourcepath))) - -Index: subversion-1.4.x/configure.in -=================================================================== ---- subversion-1.4.x.orig/configure.in -+++ subversion-1.4.x/configure.in -@@ -552,7 +552,7 @@ fi +--- a/configure.ac ++++ b/configure.ac +@@ -539,7 +539,7 @@ fi AC_PATH_PROGS(PYTHON, "$PYTHON", none) # The minimum version for the JVM runtime for our Java bytecode. @@ -44,21 +14,21 @@ # SVN_CHECK_JDK sets $JAVA_CLASSPATH SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER) -Index: subversion-1.4.x/subversion/bindings/java/javahl/build/build.xml -=================================================================== ---- subversion-1.4.x.orig/subversion/bindings/java/javahl/build/build.xml -+++ subversion-1.4.x/subversion/bindings/java/javahl/build/build.xml -@@ -17,13 +17,13 @@ - </javah> - </target> - <target name="javac" unless="junit.path"> +--- a/subversion/bindings/javahl/build/build.xml ++++ b/subversion/bindings/javahl/build/build.xml +@@ -21,7 +21,7 @@ + + <target name="compile" unless="junit.path" + description="Compile the Java binding source files"> - <javac compiler="modern" destdir="classes"> + <javac source="1.4" target="1.4" destdir="classes"> <src path="src"/> <exclude name="org/tigris/subversion/javahl/tests/**"/> </javac> - </target> - <target name="javac-tests" if="junit.path"> +@@ -29,7 +29,7 @@ + + <target name="compile-tests" if="junit.path" + description="Compile the Java test source files"> - <javac compiler="modern" destdir="classes"> + <javac source="1.4" target="1.4" destdir="classes"> <src path="src"/>
[-] [+]	Changed	subversion.libtool-pie-flags.patch ^
@@ -1,40 +1,40 @@ - Makefile.in \| 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) + Makefile.in \| 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) -Index: subversion-1.4.x/Makefile.in -=================================================================== ---- subversion-1.4.x.orig/Makefile.in -+++ subversion-1.4.x/Makefile.in -@@ -139,24 +139,25 @@ CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS) +--- a/Makefile.in ++++ b/Makefile.in +@@ -150,24 +150,27 @@ CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS) CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) -+PIEFLAGS = -fno-pie -fno-PIE ++NOPIECFLAGS = -fno-pie -fno-PIE ++PIECFLAGS = -fpie -fPIE ++PIELDFLAGS = -pie COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -+LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) $(PIEFLAGS) ++LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) $(NOPIECFLAGS) # special compilation for files destined for mod_dav_svn -COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c -+COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(PIEFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c ++COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(NOPIECFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c # special compilation for files destined for libsvn_swig_* (e.g. swigutil_*.c) -COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c -COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c -COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(CFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c -+COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(PIEFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c -+COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(PIEFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c -+COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(CFLAGS) $(PIEFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c ++COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(NOPIECFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c ++COMPILE_SWIG_PL = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(NOPIECFLAGS) $(SWIG_PL_INCLUDES) $(INCLUDES) -o $@ -c ++COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_RB_COMPILE) $(CPPFLAGS) $(CFLAGS) $(NOPIECFLAGS) $(SWIG_RB_INCLUDES) $(INCLUDES) -o $@ -c # special compilation for files destined for javahl (i.e. C++) -COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(JAVAHL_INCLUDES) -o $@ -c -+COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(PIEFLAGS) $(JAVAHL_INCLUDES) -o $@ -c ++COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(NOPIECFLAGS) $(JAVAHL_INCLUDES) -o $@ -c COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) COMPILE_JAVAHL_JAVAH = $(JAVAH) -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(PIEFLAGS) -rpath $(libdir) ++LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(PIELDFLAGS) -rpath $(libdir) # special link rule for mod_dav_svn LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
[-] [+]	Changed	subversion.libtool-verbose.patch ^
@@ -1,18 +1,16 @@ Makefile.in \| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: subversion-1.4.x/Makefile.in -=================================================================== ---- subversion-1.4.x.orig/Makefile.in -+++ subversion-1.4.x/Makefile.in -@@ -90,8 +90,8 @@ EXEEXT = @EXEEXT@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -95,8 +95,8 @@ EXEEXT = @EXEEXT@ SHELL = @SHELL@ LIBTOOL = @SVN_LIBTOOL@ --LTFLAGS = @SVN_LT_CCTAG@ --silent --LTCXXFLAGS = @SVN_LT_CXXTAG@ --silent -+LTFLAGS = @SVN_LT_CCTAG@ -+LTCXXFLAGS = @SVN_LT_CXXTAG@ +-LTFLAGS = --tag=CC --silent +-LTCXXFLAGS = --tag=CXX --silent ++LTFLAGS = --tag=CC ++LTCXXFLAGS = --tag=CXX LT_LDFLAGS = @LT_LDFLAGS@ LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ LT_CXX_LIBADD = @LT_CXX_LIBADD@
[-] [+]	Changed	subversion.perl.LD_RUN_PATH.patch ^
@@ -1,18 +1,19 @@ clear LD_RUN_PATH, it will end up as RPATH in ELF binaries +ERROR: RPATH "/usr/src/packages/BUILD/subversion-1.5.x/subversion/libsvn_subr/.libs" on /var/tmp/subversion-1.5.0-build/usr/lib/perl5/vendor_perl/5.10.0/ppc-linux-thread-multi-64int/auto/SVN/_Wc/_Wc.so is not allowed + +--- Makefile.in \| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: subversion-1.4.x/Makefile.in -=================================================================== ---- subversion-1.4.x.orig/Makefile.in -+++ subversion-1.4.x/Makefile.in -@@ -605,7 +605,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI +--- a/Makefile.in ++++ b/Makefile.in +@@ -641,7 +641,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI ./config.status subversion/bindings/swig/perl/native/Makefile.PL - $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL $(swig-pl_native_Makefile_DEPS) + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ; for i in `grep -wl ^LD_RUN_PATH Makefile Makefile.[^P]` ; do sed -i 's@^LD_RUN_PATH.@LD_RUN_PATH=@' $$i ; done - swig-pl_DEPS = $(SWIG_PL_DIR)/native/Makefile - swig-pl: $(swig-pl_DEPS) + swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ + $(SWIG_PL_DIR)/native/Makefile
[-] [+]	Deleted	subversion.svn_swig_perl.dep.patch ^
@@ -1,43 +0,0 @@ - Note (probably harmless): No library found for -lsvn_swig_perl-1 - Writing Makefile for SVN::_Core - Note (probably harmless): No library found for -lsvn_swig_perl-1 - Writing Makefile.client for SVN::_Client - Note (probably harmless): No library found for -lsvn_swig_perl-1 - Writing Makefile.delta for SVN::_Delta - Note (probably harmless): No library found for -lsvn_swig_perl-1 - Writing Makefile.fs for SVN::_Fs - Note (probably harmless): No library found for -lsvn_swig_perl-1 - Writing Makefile.ra for SVN::_Ra - Note (probably harmless): No library found for -lsvn_swig_perl-1 - Writing Makefile.repos for SVN::_Repos - Note (probably harmless): No library found for -lsvn_swig_perl-1 - Writing Makefile.wc for SVN::_Wc - - Makefile.in \| 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -Index: subversion-1.4.x/Makefile.in -=================================================================== ---- subversion-1.4.x.orig/Makefile.in -+++ subversion-1.4.x/Makefile.in -@@ -598,15 +598,16 @@ clean-swig-headers: - extraclean-swig-headers: clean-swig-headers - $(EXTRACLEAN_SWIG_HEADERS) - -+swig-pl_native_Makefile_DEPS = autogen-swig-pl libsvn_client libsvn_delta libsvn_diff \ -+ libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl -+ - $(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in - ./config.status subversion/bindings/swig/perl/native/Makefile.PL - --$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL -+$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL $(swig-pl_native_Makefile_DEPS) - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL - --swig-pl_DEPS = autogen-swig-pl libsvn_client libsvn_delta libsvn_diff \ -- libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl \ -- $(SWIG_PL_DIR)/native/Makefile -+swig-pl_DEPS = $(SWIG_PL_DIR)/native/Makefile - swig-pl: $(swig-pl_DEPS) - if test "$(SWIG_PL_DIR)" != "$(SWIG_PL_SRC_DIR)"; then \ - ln -sf $(SWIG_PL_SRC_DIR)/native/*.c $(SWIG_PL_DIR)/native; \
[-] [+]	Deleted	subversion.svn_swig_pl_info_receiver.patch ^
@@ -1,19 +0,0 @@ -/usr/src/packages/BUILD/subversion-1.4.x/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c:1134: warning: 'return' with no value, in function returning non-void - ---- - subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c \| 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: subversion-1.4.x/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c -=================================================================== ---- subversion-1.4.x.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c -+++ subversion-1.4.x/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c -@@ -1132,7 +1132,7 @@ svn_error_t svn_swig_pl_info_receiver(v - swig_type_info infoinfo = _SWIG_TYPE("svn_info_t "); - - if (!SvOK((SV )baton)) -- return; -+ return SVN_NO_ERROR; - - svn_swig_pl_callback_thunk(CALL_SV, baton, &result, "sSS", path, info, - infoinfo, pool, POOLINFO);
	Added	ready ^
	Deleted	subversion-1.4.x.tar.bz2 ^
	Changed	subversion-1.5.2.tar.bz2 ^
[-] [+]	Changed	subversion.svngrep.sh ^
@@ -1,2 +1,2 @@ #!/bin/sh -find $ -path '/.pc' -o -path '/.svn' $ -prune -o -type f -print0 \| xargs -0 grep "$@" +find $ -path '/.pc' -o -path '/.svn' -o -path '*/.git' $ -prune -o -type f -print0 \| xargs -0 grep "$@"