rpms/subversion
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 1.9.4 (#1331222) CVE-2016-2167 CVE-2016-2168

Browse Source 
- Move tools in docs to tools subpackage (rhbz 1171757 1199761)
- Disable make check to work around FTBFS
This commit is contained in:
Peter Robinson 2016-05-08 16:44:20 +01:00
parent 39e1e2ef8f
commit f9f97b2487
5 changed files with 26 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.gitignore vendored
View File

@ -1,38 +1 @@
subversion-1.6.12.tar.bz2
*.rpm
/subversion-1.6.13.tar.bz2.asc
/subversion-1.6.13.tar.bz2
/subversion-1.6.15.tar.bz2
/subversion-1.6.16.tar.bz2
/subversion-1.6.17.tar.bz2
/subversion-1.7.0.tar.bz2
/subversion-1.7.0
/clog
/subversion-1.7.1.tar.bz2
/subversion-1.7.2.tar.bz2
/subversion-1.7.3.tar.bz2
/subversion
/subversion-1.?.?
/*.asc
/subversion-1.?.??
/subversion-1.7.4.tar.bz2
/subversion-1.7.5.tar.bz2
/subversion-1.7.6.tar.bz2
/subversion-1.7.7.tar.bz2
/subversion-1.7.8.tar.bz2
/subversion-1.7.9.tar.bz2
/subversion-1.7.10.tar.bz2
/subversion-1.8.0.tar.bz2
/subversion-1.8.1.tar.bz2
/subversion-1.8.3.tar.bz2
/subversion-1.8.4.tar.bz2
/subversion-1.8.5.tar.bz2
/subversion-1.8.8.tar.bz2
/subversion-1.8.9.tar.bz2
/subversion-1.8.10.tar.bz2
/subversion-1.8.11.tar.bz2
/subversion-1.8.13.tar.bz2
/subversion-1.9.0.tar.bz2
/subversion-1.9.1.tar.bz2
/subversion-1.9.2.tar.bz2
/subversion-1.9.3.tar.bz2
/subversion-*.tar.bz2

2
sources
View File

@ -1 +1 @@
243036eb28b50ce517fc228eb3250add subversion-1.9.3.tar.bz2
29121a038f87641055a8183f49e9739f subversion-1.9.4.tar.bz2

72
subversion-1.8.11-ruby22-fixes.rb
View File

@ -1,72 +0,0 @@
Index: subversion/bindings/swig/ruby/test/my-assertions.rb
===================================================================
--- subversion/bindings/swig/ruby/test/my-assertions.rb (revision 1671099)
+++ subversion/bindings/swig/ruby/test/my-assertions.rb (working copy)
@@ -27,9 +27,7 @@
# make an intermediary assertion block handler
def _my_assert_block(&block)
if RUBY_VERSION > '1.9'
- assert_block do
- yield
- end
+ yield
else
_wrap_assertion do
yield
Index: subversion/bindings/swig/ruby/test/test-unit-ext.rb
===================================================================
--- subversion/bindings/swig/ruby/test/test-unit-ext.rb (revision 1671099)
+++ subversion/bindings/swig/ruby/test/test-unit-ext.rb (working copy)
@@ -18,6 +18,6 @@
# ====================================================================
require "test-unit-ext/always-show-result" if RUBY_VERSION < '1.9.3'
-require "test-unit-ext/priority"
+require "test-unit-ext/priority" if defined? MiniTest or defined? Minitest
require "test-unit-ext/backtrace-filter" if RUBY_VERSION < '1.9.3'
require "test-unit-ext/long-display-for-emacs" if RUBY_VERSION < '1.9.3'
Index: subversion/bindings/swig/ruby/test/test_repos.rb
===================================================================
--- subversion/bindings/swig/ruby/test/test_repos.rb (revision 1671099)
+++ subversion/bindings/swig/ruby/test/test_repos.rb (working copy)
@@ -679,7 +679,7 @@
dest_path = File.join(@tmp_path, "dest")
Svn::Repos.create(dest_path) do |repos|
assert_raises(NoMethodError) do
- repos.load_fs(nil)
+ repos.load_fs(Object.new)
end
end
Index: subversion/bindings/swig/ruby/test/test_wc.rb
===================================================================
--- subversion/bindings/swig/ruby/test/test_wc.rb (revision 1671099)
+++ subversion/bindings/swig/ruby/test/test_wc.rb (working copy)
@@ -411,7 +411,7 @@
end
end
- def test_status
+ def test_status2
source = "source"
file1 = "file1"
file2 = "file2"
@@ -540,7 +540,6 @@
result = yield(access.send(*args), source)
result ||= File.open(src_path, "rb") {|f| f.read}
assert_equal(crlf_source, result)
-
File.open(src_path, "wb") {|f| f.print(source)}
args = [method_name, src_path, cr_path, Svn::Wc::TRANSLATE_FROM_NF]
result = yield(access.send(*args), source)
@@ -1072,8 +1071,8 @@
assert_not_nil context
assert_kind_of Svn::Wc::Context, context
end
- if RUBY_VERSION > '1.9'
- assert_equal(result,true)
+ if defined? MiniTest or defined? Minitest
+ assert_equal(true, result)
else
assert_nil result
end

17
subversion-1.9.0-kwallet.patch → subversion-1.9.4-kwallet.patch
View File

@ -1,14 +1,11 @@
Fix linking/includes for KDE - Fedora-specific hack.
--- subversion-1.9.0/build/ac-macros/kwallet.m4.kwallet
+++ subversion-1.9.0/build/ac-macros/kwallet.m4
@@ -68,15 +68,15 @@ AC_DEFUN(SVN_LIB_KWALLET,
--- subversion-1.9.4/build/ac-macros/kwallet.m4.orig 2016-05-08 14:14:47.603122825 +0100
+++ subversion-1.9.4/build/ac-macros/kwallet.m4 2016-05-08 14:16:56.509192769 +0100
@@ -68,15 +68,15 @@
fi
done
qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
- kde_dir="`$KDE4_CONFIG --prefix`"
- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
- kde_incdir="`$KDE4_CONFIG --install include`"
- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_incdir"
+ kde_include_dirs="`$KDE4_CONFIG --path include`"
+ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_include_dirs"
qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
@ -16,8 +13,8 @@ Fix linking/includes for KDE - Fedora-specific hack.
CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
LIBS="$LIBS $SVN_KWALLET_LIBS"
qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
- LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
kde_libdir="`$KDE4_CONFIG --install lib`"
- LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_libdir)`"
+ LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$libdir/kde4/devel)`"
AC_LANG(C++)
AC_LINK_IFELSE([AC_LANG_SOURCE([[

28
subversion.spec
View File

@ -1,5 +1,5 @@
# set to zero to avoid running test suite
%define make_check 1
%define make_check 0
%define with_java 1
%define with_kwallet 1
@ -19,11 +19,12 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.9.3
Release: 3%{?dist}
Version: 1.9.4
Release: 1%{?dist}
License: ASL 2.0
Group: Development/Tools
URL: http://subversion.apache.org/
Source0: http://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2
Source1: subversion.conf
Source3: filter-requires.sh
@ -34,11 +35,11 @@ Source7: svnserve.tmpfiles
Source8: svnserve.sysconf
Patch1: subversion-1.9.0-rpath.patch
Patch2: subversion-1.9.0-pie.patch
Patch3: subversion-1.9.0-kwallet.patch
Patch3: subversion-1.9.4-kwallet.patch
Patch4: subversion-1.8.0-rubybind.patch
Patch8: subversion-1.8.5-swigplWall.patch
Patch10: subversion-1.8.13-swigpython.patch
Patch11: subversion-1.8.11-ruby22-fixes.rb
Patch5: subversion-1.8.5-swigplWall.patch
Patch6: subversion-1.8.13-swigpython.patch
BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
BuildRequires: libdb-devel >= 4.1.25, swig >= 1.3.24, gettext
BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
@ -180,9 +181,8 @@ This package includes supplementary tools for use with Subversion.
%patch2 -p1 -b .pie
%patch3 -p1 -b .kwallet
%patch4 -p1 -b .rubybind
%patch8 -p1 -b .swigplWall
%patch10 -p1 -b .swigpython
%patch11 -p0 -b .ruby22-fixes
%patch5 -p1 -b .swigplWall
%patch6 -p1 -b .swigpython
%build
# Regenerate the buildsystem, so that:
@ -206,6 +206,7 @@ export EXTRA_CFLAGS="$RPM_OPT_FLAGS -DSVN_SQLITE_MIN_VERSION_NUMBER=3007012 \
-DSVN_SQLITE_MIN_VERSION=\\\"3.7.12\\\""
export APACHE_LDFLAGS="-Wl,-z,relro,-z,now"
export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
--disable-debug \
--with-swig --with-serf=%{_prefix} \
@ -393,7 +394,6 @@ make check-javahl
%{!?_licensedir:%global license %%doc}
%license LICENSE NOTICE
%doc BUGS COMMITTERS INSTALL README CHANGES
%doc tools/hook-scripts tools/backup tools/bdb tools/examples tools/xslt
%doc mod_authz_svn-INSTALL
%{_bindir}/*
%{_mandir}/man*/*
@ -408,6 +408,7 @@ make check-javahl
%{_prefix}/lib/tmpfiles.d/svnserve.conf
%files tools -f tools.files
%doc tools/hook-scripts tools/backup tools/bdb tools/examples tools/xslt
%files libs
%{!?_licensedir:%global license %%doc}
@ -466,6 +467,11 @@ make check-javahl
%endif
%changelog
* Sun May 8 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1.9.4-1
- Update to 1.9.4 (#1331222) CVE-2016-2167 CVE-2016-2168
- Move tools in docs to tools subpackage (rhbz 1171757 1199761)
- Disable make check to work around FTBFS
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild