diff --git a/subversion-1.1.x-COMPILE_CXX.dif b/subversion-1.1.x-COMPILE_CXX.dif
index a0736e0..c7cbed5 100644
--- a/subversion-1.1.x-COMPILE_CXX.dif
+++ b/subversion-1.1.x-COMPILE_CXX.dif
@@ -1,11 +1,11 @@
  Makefile.in |    2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: subversion-1.3.x/Makefile.in
+Index: subversion-1.4.x/Makefile.in
 ===================================================================
---- subversion-1.3.x.orig/Makefile.in
-+++ subversion-1.3.x/Makefile.in
-@@ -144,7 +144,7 @@ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
+--- 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)
diff --git a/subversion-1.4.x.tar.bz2 b/subversion-1.4.x.tar.bz2
index 3d14c70..18bdb04 100644
--- a/subversion-1.4.x.tar.bz2
+++ b/subversion-1.4.x.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30c6a4490b63b597d54cd4dc3a713d6b34ceecf7cf7e9d33b49d225ab61f8066
-size 3998549
+oid sha256:478f717830d7c00f37ad2bdac0d7afce9ea81ac4158582388e306b856f76351c
+size 4008873
diff --git a/subversion-swig-perl-install_vendor.patch b/subversion-swig-perl-install_vendor.patch
index e81245e..14f49b1 100644
--- a/subversion-swig-perl-install_vendor.patch
+++ b/subversion-swig-perl-install_vendor.patch
@@ -1,16 +1,16 @@
  Makefile.in |    2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: subversion-1.3.x/Makefile.in
+Index: subversion-1.4.x/Makefile.in
 ===================================================================
---- subversion-1.3.x.orig/Makefile.in
-+++ subversion-1.3.x/Makefile.in
-@@ -630,7 +630,7 @@ check-swig-pl: swig-pl swig-pl-lib
+--- 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
  	cd $(SWIG_PL_DIR)/native; $(MAKE) test
  
  install-swig-pl: swig-pl install-swig-pl-lib
 -	cd $(SWIG_PL_DIR)/native; $(MAKE) install
 +	cd $(SWIG_PL_DIR)/native; $(MAKE) install_vendor
  
- # Running Makefile.PL at this point *fails* (cannot find ..../.libs) so if the
- # Makefile does not exist, DO NOT try to make it. But, if it doesn't exist,
+ EXTRACLEAN_SWIG_PL=rm -f $(SWIG_PL_SRC_DIR)/native/svn_*.c \
+                          $(SWIG_PL_SRC_DIR)/native/core.c
diff --git a/subversion.allowed-neon.patch b/subversion.allowed-neon.patch
index 57a0fcc..1beeeb3 100644
--- a/subversion.allowed-neon.patch
+++ b/subversion.allowed-neon.patch
@@ -1,42 +1,19 @@
 ---
- build/ac-macros/neon.m4 |    4 ++--
- configure.in            |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ configure.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: subversion-1.3.x/configure.in
+Index: subversion-1.4.x/configure.in
 ===================================================================
---- subversion-1.3.x.orig/configure.in
-+++ subversion-1.3.x/configure.in
-@@ -226,8 +226,8 @@ AC_SUBST(LT_NO_UNDEFINED)
+--- subversion-1.4.x.orig/configure.in
++++ subversion-1.4.x/configure.in
+@@ -69,8 +69,8 @@ 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.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5"
+-NEON_ALLOWED_LIST="0.24.7 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"
 -NEON_LATEST_WORKING_VER=0.25.5
-+NEON_ALLOWED_LIST="0.24.4 0.24.7 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"
-+NEON_LATEST_WORKING_VER=0.26.3
++NEON_ALLOWED_LIST="0.24.4 0.24.7 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"
++NEON_LATEST_WORKING_VER=0.26.4
  NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
  dnl You can skip the neon version check only if you know what you are doing 
  AC_ARG_ENABLE(neon-version-check,
-Index: subversion-1.3.x/build/ac-macros/neon.m4
-===================================================================
---- subversion-1.3.x.orig/build/ac-macros/neon.m4
-+++ subversion-1.3.x/build/ac-macros/neon.m4
-@@ -50,7 +50,7 @@ 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\.25\.'`" ; then
-+      if test -n "`echo \"$NEON_VERSION\" | grep -E '^0\.2(5|6)\.'`" ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
-                            [Defined if have Neon 0.25.x instead of 0.24.7.])
-       fi
-@@ -123,7 +123,7 @@ AC_DEFUN(SVN_NEON_CONFIG,
-       NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
-       AC_MSG_RESULT([$NEON_VERSION])
- 
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then
-+      if test -n "`echo \"$NEON_VERSION\" | grep -E '^0\.2(5|6)\.'`" ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
-                            [Defined if have Neon 0.25.x instead of 0.24.7.])
-       fi
diff --git a/subversion.changes b/subversion.changes
index 3f3572a..ecf4681 100644
--- a/subversion.changes
+++ b/subversion.changes
@@ -1,3 +1,89 @@
+-------------------------------------------------------------------
+Sun Feb 25 16:48:11 CET 2007 - olh@suse.de
+
+- update viewvc to 1.0.3
+  * fix bug in path shown for Subversion deleted-under-copy items (issue #265)
+  * minor documentation fixes
+  * fix annotate assertions on uncanonicalized #include paths (issue #208)
+  * make RSS URL method match the method used to generate it (issue #245)
+  * fix Subversion annotation to run non-interactively, preventing hangs
+  * fix bug in custom syntax highlighter fallback logic
+  * fix bug in PHP CGI hack to avoid force-cgi-redirect errors
+- update cvs2svn to 1.5.1
+  New features:
+  * Support multiproject conversions (each gets its own trunk, tags, branches).
+  * New --options option to allow run-time options to be defined via a file.
+  * --co, --cvs, and --sort options to specify the paths to executables.
+  * Add new --fallback-encoding option.
+  Bugs fixed:
+  * Add missing import in cvs2svn_lib/process.py.
+  * Fix issue #86: Support multiple project roots per repository.
+  * Fix issue #104: Allow path to "sort" executable to be specified.
+  * Fix issue #8: Allow multiple --encoding options.
+  * Fix issue #109: Improve handling of fallback encodings.
+  Improvements and output changes:
+  * Further reduce conversion time and temporary space requirements.
+  Miscellaneous:
+  * Deprecate the --dump-only option (it is now implied by --dumpfile).
+
+-------------------------------------------------------------------
+Sat Feb 24 21:55:39 CET 2007 - olh@suse.de
+
+- Version 1.4.3
+  User-visible-changes:
+   - Client:
+     * fixed: crash using automatic auth protocols with Neon 0.26 (r22440, -61)
+     * fixed: svn_load_dirs.pl cannot import file names containing '@' (r22203)
+     * fixed: error when committing replaced directories (r22991, -8)
+     * fixed: inability to change file perms due to existing file perms (r23018)
+     * include newest version of svn-graph.pl (r22969)
+     * install a manpage for svnsync (r21403)
+     * translation updates for all languages
+     * dramatically speed up commit of wc-to-wc copy (r21471)
+     * fixed: support 'svn co URL@{DATE}' (issue #2602)
+     * fixed: cannot access repositories with spaces via svn:// (issue #2612)
+     * fixed: passing full URL in some DAV requests, breaking proxies (r21526)
+     * fixed: history-tracing can fail for renamed directories (issue #2600)
+     * fixed: crash if interrupted while opening a working copy (r21792)
+     * fixed: 'svn merge' should notify about conflicted files (issue #2584)
+     * fixed: 'svn revert' should notify about prop-only reverts (issue #2517)
+     * fixed: 'svn status -u' not showing props changed on wc root (issue #2533)
+     * fixed: 'svn status -u' fails in a read-only working copy (r21904, -19)
+     * fixed: 'svn up' failing with checksum mismatch error (issue #2618)
+     * fixed: 'svnsync sync' copying missing implicit revprops (issue #2613)
+     * fixed: svnsync unable to synchronise copies of URL-unsafe paths (r22092)
+     * svnshell tool: support "setrev head" (r20992)
+     * include newest version of svnmerge.py
+   - Server:
+     * fixed: incorrectly reporting authz circular dependencies (issue #2684)
+     * fixed: potential filesystem memory leak in commit finalisation (r22729)
+     * FSFS: improve detection of disk write errors (r21346)
+     * FSFS: prevent API violation from corrupting repository (issue #2467)
+     * improved error checking when running hook scripts, etc (r21483)
+     * mailer.py: new commit_url option links to web page for a commit (r21333)
+   - Client and Server:
+     * fixed: potential string corruption when resizing string buffers (r22689)
+     * translation updates for Korean, Spanish, Italian, Simplified Chinese,
+           and Japanese (fixing issues #2649 and #2681)
+ Developer-visible-changes:
+ * update (experimental) ra_serf repository access module for DAV (r22872)
+ * fixed: svn_{ra,repos}_replay() doesn't send checksums (r22346, -51, -52)
+ * fixed: error when calling svn_repos_replay2() with a txn root (r22609)
+ * support current CVS versions of libtool (post-1.5.22) (r22120)
+ * javahl bindings:
+     - fixed: auth cache is created in the current directory (r22780)
+     - fixed: SVNAdmin's setLog() method always fails (r22387)
+     - fixed: target dependency order in generated build scripts (r22209)
+     - compile Java bytecode for Java 1.2 VM (r21765, -7, r21814)
+     - fixed: crash if using 1.4.x bindings with older libraries (r21316, -429)
+     - fixed: crash when empty destination path passed to checkout (r21770)
+ * SWIG/perl bindings:
+     - fixed: ra_do_{update,switch,status} work with Perl delta editors (r22311)
+     - fixed: memory leak when calling methods on a Perl commit editor (r22332)
+     - fixed: ra_replay works with Perl delta editors (r20666)
+ * SWIG/python bindings:
+     - fixed: crash when using an apr_hash_t typemap (issue #2606)
+
 -------------------------------------------------------------------
 Thu Jan 25 13:21:33 CET 2007 - olh@suse.de
 
diff --git a/subversion.cvs2svn-1.4.x.tar.bz2 b/subversion.cvs2svn-1.4.x.tar.bz2
deleted file mode 100644
index 90c0d72..0000000
--- a/subversion.cvs2svn-1.4.x.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:753cd20a17e47cd6783a7ca52e6d1a44eb7b9dc30428663a04db75f8f3c18f32
-size 346131
diff --git a/subversion.cvs2svn-1.5.x.tar.bz2 b/subversion.cvs2svn-1.5.x.tar.bz2
new file mode 100644
index 0000000..e4eb6b4
--- /dev/null
+++ b/subversion.cvs2svn-1.5.x.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5271c7584fc9a24f470b0b6eca6af423a1b5da63c6417fed661cc0991765adda
+size 383392
diff --git a/subversion.cvs2svn.install-prefix.patch b/subversion.cvs2svn.install-prefix.patch
index 435af4a..3901e9b 100644
--- a/subversion.cvs2svn.install-prefix.patch
+++ b/subversion.cvs2svn.install-prefix.patch
@@ -4,18 +4,18 @@ According to bug #149809, prefix must be /usr/local
  Makefile |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: cvs2svn-trunk/Makefile
+Index: cvs2svn-1.5.x/Makefile
 ===================================================================
---- cvs2svn-trunk/Makefile
-+++ cvs2svn-trunk/Makefile
-@@ -14,8 +14,8 @@ install:
- 	./setup.py install ; \
+--- cvs2svn-1.5.x.orig/Makefile
++++ cvs2svn-1.5.x/Makefile
+@@ -18,8 +18,8 @@ install:
+ 	${PYTHON} ./setup.py install ; \
  	;; \
  	*) \
--	echo ./setup.py install --root=${DESTDIR} ; \
--	./setup.py install --root=${DESTDIR} ; \
-+	echo ./setup.py install --root=${DESTDIR} --prefix=/usr ; \
-+	./setup.py install --root=${DESTDIR} --prefix=/usr ; \
+-	echo ${PYTHON} ./setup.py install --root=${DESTDIR} ; \
+-	${PYTHON} ./setup.py install --root=${DESTDIR} ; \
++	echo ${PYTHON} ./setup.py install --root=${DESTDIR} --prefix=/usr ; \
++	${PYTHON} ./setup.py install --root=${DESTDIR} --prefix=/usr ; \
  	;; \
  	esac
  
diff --git a/subversion.fallback-to-ipv4.patch b/subversion.fallback-to-ipv4.patch
index 0f69518..05de1a9 100644
--- a/subversion.fallback-to-ipv4.patch
+++ b/subversion.fallback-to-ipv4.patch
@@ -5,11 +5,11 @@ but doesnt respond to ipv6 right now.
  subversion/libsvn_ra_svn/client.c |   20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
-Index: subversion-1.3.x/subversion/libsvn_ra_svn/client.c
+Index: subversion-1.4.x/subversion/libsvn_ra_svn/client.c
 ===================================================================
---- subversion-1.3.x.orig/subversion/libsvn_ra_svn/client.c
-+++ subversion-1.3.x/subversion/libsvn_ra_svn/client.c
-@@ -137,10 +137,30 @@ static svn_error_t *make_connection(cons
+--- 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);
diff --git a/subversion.header_wrappers.patch b/subversion.header_wrappers.patch
index f12ff3d..6e3f101 100644
--- a/subversion.header_wrappers.patch
+++ b/subversion.header_wrappers.patch
@@ -8,11 +8,11 @@
  build/generator/swig/header_wrappers.py |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: subversion-1.3.x/build/generator/swig/header_wrappers.py
+Index: subversion-1.4.x/build/generator/swig/header_wrappers.py
 ===================================================================
---- subversion-1.3.x.orig/build/generator/swig/header_wrappers.py
-+++ subversion-1.3.x/build/generator/swig/header_wrappers.py
-@@ -129,7 +129,7 @@ class Generator(generator.swig.Generator
+--- 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
        self.proxy_filename(base_fname))
  
      # Open the output file
@@ -21,7 +21,7 @@ Index: subversion-1.3.x/build/generator/swig/header_wrappers.py
      self.ofile.write('/* Proxy classes for %s\n' % base_fname)
      self.ofile.write(' * DO NOT EDIT -- AUTOMATICALLY GENERATED */\n')
  
-@@ -148,6 +148,7 @@ class Generator(generator.swig.Generator
+@@ -165,6 +165,7 @@ class Generator(generator.swig.Generator
  
      # Close our output file
      self.ofile.close()
diff --git a/subversion.java14.patch b/subversion.java14.patch
index 59d0ee3..52f6755 100644
--- a/subversion.java14.patch
+++ b/subversion.java14.patch
@@ -1,6 +1,15 @@
---- subversion-1.4.x/build/generator/gen_make.py
+---
+ 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(-)
+
+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,6 +292,6 @@
+@@ -292,7 +292,7 @@ class Generator(gen_base.GeneratorBase):
            self.ofile.write(
              '%s_SRC = %s\n'
              '$(%s_OBJECTS): $(%s_SRC)\n'
@@ -8,7 +17,36 @@
 +            '\t%s -source 1.4 -target 1.4 -d %s -classpath %s:$(%s_CLASSPATH) $(%s_SRC)\n'
              % (targ_varname, string.join(object_srcs),
  
---- subversion-1.4.x/subversion/bindings/java/javahl/build/build.xml
+                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
+ AC_PATH_PROGS(PYTHON, "$PYTHON", none)
+ 
+ # The minimum version for the JVM runtime for our Java bytecode.
+-JAVA_OLDEST_WORKING_VER='1.2'
++JAVA_OLDEST_WORKING_VER='1.4'
+ # 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>
diff --git a/subversion.libtool-pie-flags.patch b/subversion.libtool-pie-flags.patch
index a9adf3b..4ac4f80 100644
--- a/subversion.libtool-pie-flags.patch
+++ b/subversion.libtool-pie-flags.patch
@@ -1,11 +1,11 @@
  Makefile.in |   15 ++++++++-------
- 1 files changed, 8 insertions(+), 7 deletions(-)
+ 1 file changed, 8 insertions(+), 7 deletions(-)
 
-Index: subversion-1.3.x/Makefile.in
+Index: subversion-1.4.x/Makefile.in
 ===================================================================
---- subversion-1.3.x.orig/Makefile.in
-+++ subversion-1.3.x/Makefile.in
-@@ -143,24 +143,25 @@ CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
+--- subversion-1.4.x.orig/Makefile.in
++++ subversion-1.4.x/Makefile.in
+@@ -139,24 +139,25 @@ CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
  CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
  LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
  
@@ -37,4 +37,4 @@ Index: subversion-1.3.x/Makefile.in
 +LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(PIEFLAGS) -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
+ LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
diff --git a/subversion.libtool-verbose.patch b/subversion.libtool-verbose.patch
index 4718bd3..fcb6e34 100644
--- a/subversion.libtool-verbose.patch
+++ b/subversion.libtool-verbose.patch
@@ -1,11 +1,11 @@
  Makefile.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: subversion-1.3.x/Makefile.in
+Index: subversion-1.4.x/Makefile.in
 ===================================================================
---- subversion-1.3.x.orig/Makefile.in
-+++ subversion-1.3.x/Makefile.in
-@@ -94,8 +94,8 @@ EXEEXT = @EXEEXT@
+--- subversion-1.4.x.orig/Makefile.in
++++ subversion-1.4.x/Makefile.in
+@@ -90,8 +90,8 @@ EXEEXT = @EXEEXT@
  
  SHELL = @SHELL@
  LIBTOOL = @SVN_LIBTOOL@
diff --git a/subversion.ne_lock_discover-args.patch b/subversion.ne_lock_discover-args.patch
deleted file mode 100644
index c0b4242..0000000
--- a/subversion.ne_lock_discover-args.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-neon-0.26.1:
-subversion/libsvn_ra_dav/session.c:1536: warning: passing argument 3 of 'ne_lock_discover' from incompatible pointer type
-
----
- subversion/libsvn_ra_dav/session.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: subversion-1.4.x/subversion/libsvn_ra_dav/session.c
-===================================================================
---- subversion-1.4.x.orig/subversion/libsvn_ra_dav/session.c
-+++ subversion-1.4.x/subversion/libsvn_ra_dav/session.c
-@@ -1448,7 +1448,7 @@ struct receiver_baton
- static void
- lock_receiver(void *userdata,
-               const struct ne_lock *lock,
--              const char *uri,
-+              const ne_uri *uri,
-               const ne_status *status)
- {
-   struct receiver_baton *rb = userdata;
diff --git a/subversion.perl.LD_RUN_PATH.patch b/subversion.perl.LD_RUN_PATH.patch
index d7eb2f0..f99dc1b 100644
--- a/subversion.perl.LD_RUN_PATH.patch
+++ b/subversion.perl.LD_RUN_PATH.patch
@@ -1,13 +1,13 @@
 clear LD_RUN_PATH, it will end up as RPATH in ELF binaries
 
  Makefile.in |    2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: subversion-1.3.x/Makefile.in
+Index: subversion-1.4.x/Makefile.in
 ===================================================================
---- subversion-1.3.x.orig/Makefile.in
-+++ subversion-1.3.x/Makefile.in
-@@ -622,7 +622,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
+--- subversion-1.4.x.orig/Makefile.in
++++ subversion-1.4.x/Makefile.in
+@@ -605,7 +605,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)
diff --git a/subversion.spec b/subversion.spec
index 4c7f3cf..253b1bd 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package subversion (Version 1.4.0)
+# spec file for package subversion (Version 1.4.3)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,8 +12,8 @@
 
 Name:           subversion
 BuildRequires:  apache2-devel db-devel gcc-c++ java2-devel-packages neon-devel openldap2-devel python-devel swig
-Version:        1.4.0
-Release:        40
+Version:        1.4.3
+Release:        1
 #
 %define	apxs	/usr/sbin/apxs2
 %define	apache_libexecdir	%(%{apxs} -q LIBEXECDIR)
@@ -37,11 +37,10 @@ Source7:        subversion.viewvc-1.0.x.tar.bz2
 Source8:        subversion.viewvc.conf
 Source9:        subversion.rcsvnserve
 Source10:       subversion.sysconfig.svnserve
-Source11:       subversion.cvs2svn-1.4.x.tar.bz2
+Source11:       subversion.cvs2svn-1.5.x.tar.bz2
 Source42:       subversion.svngrep.sh
 Source43:       subversion.svndiff.sh
 #
-Patch10:        subversion.ne_lock_discover-args.patch
 Patch11:        subversion.libtool-verbose.patch
 Patch12:        subversion.svn_swig_pl_info_receiver.patch
 # build fixes
@@ -56,11 +55,6 @@ patch34:         subversion.allowed-neon.patch
 Patch35:        subversion.java14.patch
 #
 Patch42:        subversion.viewvc-buglink.patch
-Patch43:        subversion.viewvc-r1397.patch
-Patch44:        subversion.viewvc-r1415.patch
-Patch45:        subversion.viewvc-r1418.patch
-Patch46:        subversion.viewvc-r1419.patch
-Patch47:        subversion.viewvc-r1423.patch
 #
 Patch51:        subversion.cvs2svn.install-prefix.patch
 #
@@ -129,10 +123,10 @@ http://subversion.tigris.org
 
 
 
-%define cvs2svn_dir cvs2svn-1.4.x
+%define cvs2svn_dir cvs2svn-1.5.x
 %package -n cvs2svn
-Version:        1.4.0
-Release:        34
+Version:        1.5.1
+Release:        1
 Provides:       subversion-cvs2svn
 Obsoletes:      subversion-cvs2svn
 Group:          Development/Tools/Version Control
@@ -151,8 +145,8 @@ See /usr/share/doc/packages/cvs2svn directory for more information.
 
 
 %package -n viewvc
-Version:        1.0.1
-Release:        36
+Version:        1.0.3
+Release:        1
 Requires:       subversion-python
 Provides:       subversion-viewcvs viewcvs
 Obsoletes:      subversion-viewcvs viewcvs
@@ -196,7 +190,6 @@ esac
 echo "" >> subversion/bindings/java/javahl/native/Path.cpp
 echo "" >> subversion/bindings/java/javahl/native/Targets.cpp
 #
-%patch10 -p1
 %patch11 -p1
 %patch12 -p1
 #
@@ -213,11 +206,6 @@ echo "" >> subversion/bindings/java/javahl/native/Targets.cpp
 %patch35 -p1
 #
 pushd viewvc-1.0.x
-%patch43
-%patch44
-%patch45
-%patch46
-%patch47
 %patch42
 popd
 pushd %{cvs2svn_dir}
@@ -494,7 +482,87 @@ cp -a %_sourcedir/subversion.sysconfig.svnserve $RPM_BUILD_ROOT/var/adm/fillup-t
 %dir %{apache_sysconfdir}/conf.d
 %config (noreplace) %{apache_sysconfdir}/conf.d/subversion.viewvc.conf
 
-%changelog -n subversion
+%changelog
+* Sun Feb 25 2007 - olh@suse.de
+- update viewvc to 1.0.3
+  * fix bug in path shown for Subversion deleted-under-copy items (issue #265)
+  * minor documentation fixes
+  * fix annotate assertions on uncanonicalized #include paths (issue #208)
+  * make RSS URL method match the method used to generate it (issue #245)
+  * fix Subversion annotation to run non-interactively, preventing hangs
+  * fix bug in custom syntax highlighter fallback logic
+  * fix bug in PHP CGI hack to avoid force-cgi-redirect errors
+- update cvs2svn to 1.5.1
+  New features:
+  * Support multiproject conversions (each gets its own trunk, tags, branches).
+  * New --options option to allow run-time options to be defined via a file.
+  * --co, --cvs, and --sort options to specify the paths to executables.
+  * Add new --fallback-encoding option.
+  Bugs fixed:
+  * Add missing import in cvs2svn_lib/process.py.
+  * Fix issue #86: Support multiple project roots per repository.
+  * Fix issue #104: Allow path to "sort" executable to be specified.
+  * Fix issue #8: Allow multiple --encoding options.
+  * Fix issue #109: Improve handling of fallback encodings.
+  Improvements and output changes:
+  * Further reduce conversion time and temporary space requirements.
+  Miscellaneous:
+  * Deprecate the --dump-only option (it is now implied by --dumpfile).
+* Sat Feb 24 2007 - olh@suse.de
+- Version 1.4.3
+  User-visible-changes:
+   - Client:
+  * fixed: crash using automatic auth protocols with Neon 0.26 (r22440, -61)
+  * fixed: svn_load_dirs.pl cannot import file names containing '@' (r22203)
+  * fixed: error when committing replaced directories (r22991, -8)
+  * fixed: inability to change file perms due to existing file perms (r23018)
+  * include newest version of svn-graph.pl (r22969)
+  * install a manpage for svnsync (r21403)
+  * translation updates for all languages
+  * dramatically speed up commit of wc-to-wc copy (r21471)
+  * fixed: support 'svn co URL@{DATE}' (issue #2602)
+  * fixed: cannot access repositories with spaces via svn:// (issue #2612)
+  * fixed: passing full URL in some DAV requests, breaking proxies (r21526)
+  * fixed: history-tracing can fail for renamed directories (issue #2600)
+  * fixed: crash if interrupted while opening a working copy (r21792)
+  * fixed: 'svn merge' should notify about conflicted files (issue #2584)
+  * fixed: 'svn revert' should notify about prop-only reverts (issue #2517)
+  * fixed: 'svn status -u' not showing props changed on wc root (issue #2533)
+  * fixed: 'svn status -u' fails in a read-only working copy (r21904, -19)
+  * fixed: 'svn up' failing with checksum mismatch error (issue #2618)
+  * fixed: 'svnsync sync' copying missing implicit revprops (issue #2613)
+  * fixed: svnsync unable to synchronise copies of URL-unsafe paths (r22092)
+  * svnshell tool: support "setrev head" (r20992)
+  * include newest version of svnmerge.py
+   - Server:
+  * fixed: incorrectly reporting authz circular dependencies (issue #2684)
+  * fixed: potential filesystem memory leak in commit finalisation (r22729)
+  * FSFS: improve detection of disk write errors (r21346)
+  * FSFS: prevent API violation from corrupting repository (issue #2467)
+  * improved error checking when running hook scripts, etc (r21483)
+  * mailer.py: new commit_url option links to web page for a commit (r21333)
+   - Client and Server:
+  * fixed: potential string corruption when resizing string buffers (r22689)
+  * translation updates for Korean, Spanish, Italian, Simplified Chinese,
+  and Japanese (fixing issues #2649 and #2681)
+  Developer-visible-changes:
+  * update (experimental) ra_serf repository access module for DAV (r22872)
+  * fixed: svn_{ra,repos}_replay() doesn't send checksums (r22346, -51, -52)
+  * fixed: error when calling svn_repos_replay2() with a txn root (r22609)
+  * support current CVS versions of libtool (post-1.5.22) (r22120)
+  * javahl bindings:
+     - fixed: auth cache is created in the current directory (r22780)
+     - fixed: SVNAdmin's setLog() method always fails (r22387)
+     - fixed: target dependency order in generated build scripts (r22209)
+     - compile Java bytecode for Java 1.2 VM (r21765, -7, r21814)
+     - fixed: crash if using 1.4.x bindings with older libraries (r21316, -429)
+     - fixed: crash when empty destination path passed to checkout (r21770)
+  * SWIG/perl bindings:
+     - fixed: ra_do_{update,switch,status} work with Perl delta editors (r22311)
+     - fixed: memory leak when calling methods on a Perl commit editor (r22332)
+     - fixed: ra_replay works with Perl delta editors (r20666)
+  * SWIG/python bindings:
+     - fixed: crash when using an apr_hash_t typemap (issue #2606)
 * Thu Jan 25 2007 - olh@suse.de
 - add svnmerge.py to subversion-tools (236700)
 * Sun Oct 29 2006 - meissner@suse.de
diff --git a/subversion.svn_swig_perl.dep.patch b/subversion.svn_swig_perl.dep.patch
index 07aefa9..8e8453a 100644
--- a/subversion.svn_swig_perl.dep.patch
+++ b/subversion.svn_swig_perl.dep.patch
@@ -14,15 +14,15 @@
  Writing Makefile.wc for SVN::_Wc
 
  Makefile.in |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
+ 1 file changed, 5 insertions(+), 4 deletions(-)
 
-Index: subversion-1.3.x/Makefile.in
+Index: subversion-1.4.x/Makefile.in
 ===================================================================
---- subversion-1.3.x.orig/Makefile.in
-+++ subversion-1.3.x/Makefile.in
-@@ -615,15 +615,16 @@ clean-swig-headers:
- 	  rm -f $(SWIG_PY_DIR)/*.py; \
- 	fi
+--- 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
@@ -39,5 +39,5 @@ Index: subversion-1.3.x/Makefile.in
 -  $(SWIG_PL_DIR)/native/Makefile
 +swig-pl_DEPS = $(SWIG_PL_DIR)/native/Makefile
  swig-pl: $(swig-pl_DEPS)
- 	cd $(SWIG_PL_DIR)/native; $(MAKE)
- 
+ 	if test "$(SWIG_PL_DIR)" != "$(SWIG_PL_SRC_DIR)"; then \
+ 	  ln -sf $(SWIG_PL_SRC_DIR)/native/*.c $(SWIG_PL_DIR)/native; \
diff --git a/subversion.svn_swig_pl_info_receiver.patch b/subversion.svn_swig_pl_info_receiver.patch
index 1c6e1ae..6860312 100644
--- a/subversion.svn_swig_pl_info_receiver.patch
+++ b/subversion.svn_swig_pl_info_receiver.patch
@@ -8,7 +8,7 @@ Index: subversion-1.4.x/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_
 ===================================================================
 --- 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
-@@ -1131,7 +1131,7 @@ svn_error_t *svn_swig_pl_info_receiver(v
+@@ -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))
diff --git a/subversion.viewvc-1.0.x.tar.bz2 b/subversion.viewvc-1.0.x.tar.bz2
index 1ac555f..e2aa166 100644
--- a/subversion.viewvc-1.0.x.tar.bz2
+++ b/subversion.viewvc-1.0.x.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c005e0347a2f0d525126cc1817d5ec8c4318d4d0da74d60e968cf7d2a68873d
-size 369236
+oid sha256:89657e9277256b6cf5137de6ef4a0446290788e8faa0d9c554037faad67af00b
+size 555136
diff --git a/subversion.viewvc-r1397.patch b/subversion.viewvc-r1397.patch
deleted file mode 100644
index 1993c1b..0000000
--- a/subversion.viewvc-r1397.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-------------------------------------------------------------------------
-r1397 | cmpilato | 2006-07-21 09:51:13 +0000 (Fri, 21 Jul 2006) | 9 lines
-Changed paths:
-   M /branches/1.0.x/lib/vclib/svn/__init__.py
-
-Backport to the 1.0.x branch r1396, whose log message readly thusly:
-
-   Fix issue #18 (Annotate not working in windows for subversion).
-   Thanks to Hern?\195?\161n Mart?\195?\173nez Foffani <hernan.martinez@ecc.es> for testing
-   this patch on Windows.
-   
-   * lib/vclib/svn/__init__.py
-     (BlameSource.__init__): Patch up the URLs passed to 'svn blame' on
-       systems that don't use forward-slashes for path separators.
----
- lib/vclib/svn/__init__.py |    7 +++++++
- 1 file changed, 7 insertions(+)
-
-Index: lib/vclib/svn/__init__.py
-===================================================================
---- lib/vclib/svn/__init__.py.orig
-+++ lib/vclib/svn/__init__.py
-@@ -483,7 +483,14 @@ class BlameSource:
-     self.last = None
-     self.first_rev = first_rev
-     
-+    # Do a little dance to get a URL that works in both Unix-y and
-+    # Windows worlds.
-     rootpath = os.path.abspath(rootpath)
-+    if rootpath and rootpath[0] != '/':
-+      rootpath = '/' + rootpath
-+    if os.sep != '/':
-+      rootpath = string.replace(rootpath, os.sep, '/')
-+      
-     url = 'file://' + string.join([rootpath, fs_path], "/")
-     fp = popen.popen(svn_client_path,
-                      ('blame', "-r%d" % int(rev), "%s@%d" % (url, int(rev))),
diff --git a/subversion.viewvc-r1415.patch b/subversion.viewvc-r1415.patch
deleted file mode 100644
index 24b8e47..0000000
--- a/subversion.viewvc-r1415.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-------------------------------------------------------------------------
-r1415 | cmpilato | 2006-08-01 16:48:48 +0000 (Tue, 01 Aug 2006) | 11 lines
-
-Backport fix for issue #208 (r1414) to the 1.0.x branch.
-
-* lib/blame.py
-  (link_includes): Calculate include paths in such a way that '.' is
-    dropped and '..' is normalized.  This should prevent us from
-    sending paths through Subversion's APIs that aren't legal (and
-    cause assertions to fire).
-
----
- lib/blame.py |   37 ++++++++++++++++++++-----------------
- 1 file changed, 20 insertions(+), 17 deletions(-)
-
-Index: lib/blame.py
-===================================================================
---- lib/blame.py.orig
-+++ lib/blame.py
-@@ -42,25 +42,28 @@ def link_includes(text, repos, path_part
-   match = re_includes.match(text)
-   if match:
-     incfile = match.group(3)
--
--    # check current directory and parent directory for file
--    for depth in (-1, -2):
--      include_path = path_parts[:depth] + [incfile]
--      try:
--        # will throw if path doesn't exist
--        if repos.itemtype(include_path, None) == vclib.FILE:
--          break
--      except vclib.ItemNotFound:
--        pass
--    else:
--      include_path = None
-+    include_path_parts = path_parts[:-1]
-+    for part in filter(None, string.split(incfile, '/')):
-+      if part == "..":
-+        if not include_path_parts:
-+          # nothing left to pop; don't bother marking up this include.
-+          return text
-+        include_path_parts.pop()
-+      elif part and part != ".":
-+        include_path_parts.append(part)
-+
-+    include_path = None
-+    try:
-+      if repos.itemtype(include_path_parts, None) == vclib.FILE:
-+        include_path = string.join(include_path_parts, '/')
-+    except vclib.ItemNotFound:
-+      pass
- 
-     if include_path:
--        url = string.replace(include_url, '/WHERE/', 
--                             string.join(include_path, '/'))
--        return '#%sinclude%s<a href="%s">"%s"</a>' % \
--               (match.group(1), match.group(2), url, incfile)
--       
-+      return '#%sinclude%s<a href="%s">"%s"</a>' % \
-+             (match.group(1), match.group(2),
-+              string.replace(include_url, '/WHERE/', include_path), incfile)
-+    
-   return text
- 
- 
diff --git a/subversion.viewvc-r1418.patch b/subversion.viewvc-r1418.patch
deleted file mode 100644
index 24567d6..0000000
--- a/subversion.viewvc-r1418.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-------------------------------------------------------------------------
-r1418 | cmpilato | 2006-08-01 18:15:32 +0000 (Tue, 01 Aug 2006) | 10 lines
-
-Backport fix for issue #245 (r1417) to the 1.0.x branch.
-
-* lib/viewvc.py
-  (build_commit): If the environment variable HTTPS is set to "on", then
-    construct the rss_url data dictionary item with an "https" method instead
-    of an "http" one.
-
----
- lib/viewvc.py |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: lib/viewvc.py
-===================================================================
---- lib/viewvc.py.orig
-+++ lib/viewvc.py
-@@ -3205,8 +3205,9 @@ def build_commit(request, files, limited
-   commit.rss_date = make_rss_time_string(files[0].GetTime(), request.cfg)
-   if request.roottype == 'svn':
-     commit.rev = files[0].GetRevision()
--    commit.rss_url = 'http://%s%s' % \
--      (request.server.getenv("HTTP_HOST"),
-+    commit.rss_url = '%s://%s%s' % \
-+      (request.server.getenv("HTTPS") == "on" and "https" or "http",
-+       request.server.getenv("HTTP_HOST"),
-        request.get_url(view_func=view_revision,
-                        params={'revision': commit.rev},
-                        escape=1))
diff --git a/subversion.viewvc-r1419.patch b/subversion.viewvc-r1419.patch
deleted file mode 100644
index 3d2b843..0000000
--- a/subversion.viewvc-r1419.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-------------------------------------------------------------------------
-r1419 | cmpilato | 2006-08-01 18:17:39 +0000 (Tue, 01 Aug 2006) | 9 lines
-
-Backport r1416 to the 1.0.x branch.
-
-* lib/vclib/svn/__init__.py
-  (BlameSource.__init__):  Pass the --non-interactive flag to 'svn blame'
-    so it doesn't wedge when cache authstuffs aren't available or sufficient.
-
----
- lib/vclib/svn/__init__.py |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: lib/vclib/svn/__init__.py
-===================================================================
---- lib/vclib/svn/__init__.py.orig
-+++ lib/vclib/svn/__init__.py
-@@ -493,7 +493,8 @@ class BlameSource:
-       
-     url = 'file://' + string.join([rootpath, fs_path], "/")
-     fp = popen.popen(svn_client_path,
--                     ('blame', "-r%d" % int(rev), "%s@%d" % (url, int(rev))),
-+                     ('blame', "-r%d" % int(rev), "--non-interactive",
-+                      "%s@%d" % (url, int(rev))),
-                      'rb', 1)
-     self.fp = fp
-     
diff --git a/subversion.viewvc-r1423.patch b/subversion.viewvc-r1423.patch
deleted file mode 100644
index 47afd71..0000000
--- a/subversion.viewvc-r1423.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-------------------------------------------------------------------------
-r1423 | cmpilato | 2006-08-16 16:32:09 +0000 (Wed, 16 Aug 2006) | 7 lines
-
-Port r1422 to the 1.0.x branch.
-
-* lib/viewvc.py
-  (view_markup): Correct the syntax highlighter choosing logic.
-
----
- lib/viewvc.py |   19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
-
-Index: lib/viewvc.py
-===================================================================
---- lib/viewvc.py.orig
-+++ lib/viewvc.py
-@@ -1425,14 +1425,17 @@ def view_markup(request):
-     streamer = markup_streamers.get(ext)
-     if streamer:
-       markup_fp = streamer(fp, cfg)
--    elif cfg.options.use_enscript:
--      markup_fp = MarkupEnscript(cfg, fp, request.path_parts[-1])
--    elif cfg.options.use_highlight:
--      markup_fp = MarkupHighlight(cfg, fp, request.path_parts[-1])
--
--  # If no one has a suitable markup handler, we'll use the default.
--  if not markup_fp:
--    markup_fp = MarkupPipeWrapper(fp)
-+
-+    # If there wasn't a custom streamer, or the streamer wasn't enabled, we'll
-+    # try to use one of the configured syntax highlighting programs.
-+    if not markup_fp:
-+      if cfg.options.use_enscript:
-+        markup_fp = MarkupEnscript(cfg, fp, request.path_parts[-1])
-+      elif cfg.options.use_highlight:
-+        markup_fp = MarkupHighlight(cfg, fp, request.path_parts[-1])
-+      else:
-+        # If no one has a suitable markup handler, we'll use the default.
-+        markup_fp = MarkupPipeWrapper(fp)
-     
-   data['markup'] = markup_fp
-