From deafcc45532d13738838e7822b5e272009aaf7ffd57510d974e9f32f22835347 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Oct 2007 15:15:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=11 --- subversion-1.4.x.tar.bz2 | 4 ++-- subversion-neon-027.diff | 30 ++++++++++++++++++++++++++++++ subversion.allowed-neon.patch | 17 ----------------- subversion.changes | 8 ++++++++ subversion.spec | 18 ++++++++++++------ 5 files changed, 52 insertions(+), 25 deletions(-) create mode 100644 subversion-neon-027.diff delete mode 100644 subversion.allowed-neon.patch diff --git a/subversion-1.4.x.tar.bz2 b/subversion-1.4.x.tar.bz2 index 7f5e8d8..c1bd14e 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:8b05aefb24f230be29e2b573a47e13a48ff9d59a83d226a696693fc60205786c -size 4017373 +oid sha256:ba0d4745028d134469c5fdbbfaa27876372b6d7d86a20cb4e3ad6c71e6b3c746 +size 4026893 diff --git a/subversion-neon-027.diff b/subversion-neon-027.diff new file mode 100644 index 0000000..1236821 --- /dev/null +++ b/subversion-neon-027.diff @@ -0,0 +1,30 @@ +--- 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 + #include + diff --git a/subversion.allowed-neon.patch b/subversion.allowed-neon.patch deleted file mode 100644 index a3807d0..0000000 --- a/subversion.allowed-neon.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - configure.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/configure.in -+++ b/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 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 0.26.4 0.27.0 0.27.1 0.27.1 0.27.2 0.27.3 0.27.4" -+NEON_LATEST_WORKING_VER=0.27.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, diff --git a/subversion.changes b/subversion.changes index bd2e92d..f4146c2 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Oct 15 16:38:15 CEST 2007 - dmueller@suse.de + +- update to 1.4.5: + * Security fix (for w32 only) + * no other changelog available +- fix build + ------------------------------------------------------------------- Fri Oct 12 10:58:41 CEST 2007 - olh@suse.de diff --git a/subversion.spec b/subversion.spec index 0035524..1b2ae4a 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,5 +1,5 @@ # -# spec file for package subversion (Version 1.4.4) +# spec file for package subversion (Version 1.4.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,9 +11,9 @@ # norootforbuild Name: subversion -BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages neon-devel openldap2-devel python-devel swig -Version: 1.4.4 -Release: 33 +BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages libneon-devel openldap2-devel python-devel swig +Version: 1.4.5 +Release: 1 # %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services # @@ -50,7 +50,7 @@ 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.allowed-neon.patch +Patch34: subversion-neon-027.diff Patch35: subversion.java14.patch # @@ -142,7 +142,7 @@ echo "" >> subversion/bindings/java/javahl/native/Targets.cpp %patch31 -p1 %patch32 -p1 %patch33 -p1 -%patch34 -p1 +%patch34 %patch35 -p1 %build @@ -232,6 +232,7 @@ export CXXFLAGS="$CFLAGS" $with_jdk \ --with-jikes=no \ --enable-swig-bindings \ + --disable-neon-version-check \ --disable-mod-activation make %{?jobs:-j%jobs} # @@ -394,6 +395,11 @@ rm -rf $RPM_BUILD_ROOT %{apache_libexecdir}/mod_dav_svn.* %{apache_libexecdir}/mod_authz_svn.* %changelog +* Mon Oct 15 2007 - dmueller@suse.de +- update to 1.4.5: + * Security fix (for w32 only) + * no other changelog available +- fix build * Fri Oct 12 2007 - olh@suse.de - allow neon 0.27 * Thu Jun 21 2007 - olh@suse.de