diff --git a/subversion-1.7.4-ruby-1.9-RbConfig.patch b/subversion-1.7.4-ruby-1.9-RbConfig.patch index 626c07f..24e10da 100644 --- a/subversion-1.7.4-ruby-1.9-RbConfig.patch +++ b/subversion-1.7.4-ruby-1.9-RbConfig.patch @@ -1,7 +1,36 @@ -Index: build/ac-macros/swig.m4 +From: Andreas Stieger +Date: Sat, 12 May 2012 00:20:35 +0100 +Subject: [PATCH] fix Ruby 1.9 deprecation warning for Config, use RbConfig +References: http://mail-archives.apache.org/mod_mbox/subversion-dev/201205.mbox/%3C4FAD9EC3.1030207%40gmx.de%3E https://mail-archives.apache.org/mod_mbox/subversion-commits/201205.mbox/%3C20120512111900.C40DB2388860%40eris.apache.org%3E +Upstream: merged + +Fixes warning/error in ruby 1.9 "Use RbConfig instead of obsolete and deprecated Config" + +$ svn log -r1337514 -v https://svn.apache.org/repos/asf/subversion/trunk/ +------------------------------------------------------------------------ +r1337514 | astieger | 2012-05-12 12:19:00 +0100 (Sat, 12 May 2012) | 9 lines +Changed paths: + M /subversion/trunk/build/ac-macros/swig.m4 + M /subversion/trunk/configure.ac + +fix Ruby 1.9 deprecation warning for Config, use RbConfig + +* configure.ac + replace Config with RbConfig +* build/ac-macros/swig.m4 + replace Config with RbConfig + +Approved by: gstein + +--- + build/ac-macros/swig.m4 | 2 +- + configure.ac | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +Index: subversion-1.7.8/build/ac-macros/swig.m4 =================================================================== ---- build/ac-macros/swig.m4.orig 2011-06-22 15:45:03.000000000 +0100 -+++ build/ac-macros/swig.m4 2012-10-04 18:38:50.000000000 +0100 +--- subversion-1.7.8.orig/build/ac-macros/swig.m4 2011-06-22 15:45:03.000000000 +0100 ++++ subversion-1.7.8/build/ac-macros/swig.m4 2012-12-11 13:00:18.000000000 +0000 @@ -187,7 +187,7 @@ AC_DEFUN(SVN_FIND_SWIG, for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \ rubyhdrdir sitedir sitelibdir sitearchdir libdir @@ -11,10 +40,10 @@ Index: build/ac-macros/swig.m4 eval "rbconfig_$var_name=\"$rbconfig_tmp\"" done -Index: configure.ac +Index: subversion-1.7.8/configure.ac =================================================================== ---- configure.ac.orig 2012-10-02 18:18:00.000000000 +0100 -+++ configure.ac 2012-10-04 18:38:50.000000000 +0100 +--- subversion-1.7.8.orig/configure.ac 2012-10-02 18:18:00.000000000 +0100 ++++ subversion-1.7.8/configure.ac 2012-12-11 13:00:18.000000000 +0000 @@ -1117,12 +1117,12 @@ if test "$RUBY" != "none"; then AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18, none) fi diff --git a/subversion-1.7.5-libsvn_auth_kwallet-r1345740.patch b/subversion-1.7.5-libsvn_auth_kwallet-r1345740.patch deleted file mode 100644 index 2bb8857..0000000 --- a/subversion-1.7.5-libsvn_auth_kwallet-r1345740.patch +++ /dev/null @@ -1,59 +0,0 @@ -svn diff -c1345740 https://svn.apache.org/repos/asf/subversion/trunk - -r1345740 | peters | 2012-06-03 19:54:26 +0100 (Sun, 03 Jun 2012) | 7 lines -Changed paths: - M /subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp - -Remove a cast that is both ugly, and apparently illegal in g++ 4.7. - -* subversion/libsvn_auth_kwallet/kwallet.cpp - (q_argc, q_argv): New. - (kwallet_password_get, kwallet_password_set): - Use q_argc and q_argv instead of trying to open-code them. - -Index: subversion/libsvn_auth_kwallet/kwallet.cpp -=================================================================== ---- subversion/libsvn_auth_kwallet/kwallet.cpp.orig 2012-10-02 18:18:00.000000000 +0100 -+++ subversion/libsvn_auth_kwallet/kwallet.cpp 2012-10-04 18:38:58.000000000 +0100 -@@ -60,6 +60,9 @@ - /* KWallet simple provider, puts passwords in KWallet */ - /*-----------------------------------------------------------------------*/ - -+static int q_argc = 1; -+static char q_argv0[] = "svn"; // Build non-const char * from string constant -+static char *q_argv[] = { q_argv0 }; - - static const char * - get_application_name(apr_hash_t *parameters, -@@ -212,12 +215,11 @@ kwallet_password_get(svn_boolean_t *done - QCoreApplication *app; - if (! qApp) - { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -+ int argc = q_argc; -+ app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(1, -- (char *[1]) {(char *) "svn"}, -+ KCmdLineArgs::init(q_argc, q_argv, - get_application_name(parameters, pool), - "subversion", - ki18n(get_application_name(parameters, pool)), -@@ -289,12 +291,11 @@ kwallet_password_set(svn_boolean_t *done - QCoreApplication *app; - if (! qApp) - { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -+ int argc = q_argc; -+ app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(1, -- (char *[1]) {(char *) "svn"}, -+ KCmdLineArgs::init(q_argc, q_argv, - get_application_name(parameters, pool), - "subversion", - ki18n(get_application_name(parameters, pool)), diff --git a/subversion-1.7.7.tar.bz2 b/subversion-1.7.7.tar.bz2 deleted file mode 100644 index c8a0b70..0000000 --- a/subversion-1.7.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc85a9341d1dc275b279e470776014b02328a028e48a7ac7868ac07d4a40a321 -size 6023686 diff --git a/subversion-1.7.8-TestHarness_run_py_test_exit_code.patch b/subversion-1.7.8-TestHarness_run_py_test_exit_code.patch new file mode 100644 index 0000000..9ed3672 --- /dev/null +++ b/subversion-1.7.8-TestHarness_run_py_test_exit_code.patch @@ -0,0 +1,35 @@ +Date: Wed, 12 Dec 2012 20:01:11 +0000 +From: Andreas Stieger +Subject: [PATCH] Prevent false negative results of "make check" in Python +References: http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?r1=1420904&r2=1420944&pathrev=1420944 +Upstream: merged + +Patch changes the test harness to prevent some false negatives when +running the test suite. Specifically, if a python test initialisation +returns in such a way that the test runner doesn't know how to handle +the result, change to code to return a non-zero exit code like and, +subsequently, have "make check" fail correctly. Reproducible by using +Python < 2.5 or missing sqlite3 Python bindings, exit triggered by +subversion/tests/cmdline/svntest/__init__.py + +In the openSUSE obs, affects SLE 11 only, when building with unit tests. + +svn diff -c1420944 https://svn.apache.org/repos/asf/subversion/trunk + +--- + build/run_tests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: subversion-1.7.8/build/run_tests.py +=================================================================== +--- subversion-1.7.8.orig/build/run_tests.py 2012-09-29 05:02:11.000000000 +0100 ++++ subversion-1.7.8/build/run_tests.py 2012-12-12 20:48:29.000000000 +0000 +@@ -378,7 +378,7 @@ class TestHarness: + ('.py', 'U', imp.PY_SOURCE)) + except: + print('Don\'t know what to do about ' + progbase) +- raise ++ sys.exit(1) + + import svntest.main + diff --git a/subversion-1.7.8.tar.bz2 b/subversion-1.7.8.tar.bz2 new file mode 100644 index 0000000..450b12b --- /dev/null +++ b/subversion-1.7.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc83d4d98ccea8b7bfa8f5c20fff545c8baa7d035db930977550c51c6ca23686 +size 6023912 diff --git a/subversion.changes b/subversion.changes index 5853106..1bbd1cb 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Mon Dec 17 00:00:00 UTC 2012 - andreas.stieger@gmx.de + +- update to 1.7.8 [bnc#794676] + + Client- and server-side bugfixes: + * Fix typos in pt_BR, es and zh_TW translations + + Client-side bugfixes: + * add missing attributes to "svn log -v --xml" output + * fix svn patch ignoring hunks after no trailing newline + * fix hang with ra_serf during error processing + * ignore file externals with mergeinfo when merging + * fix SEGV with "svnmucc cp rev arg" during argv processing + * fix conflict handling on symlinks + + Server-side bugfixes: + * properly detect threading availability + * fix "svnadmin load --bypass-prop-validation" + * fix parsing of [groupsfoo] sections in authz file + * add Vary: header to GET responses to improve cacheability + * fix fs_fs to cleanup after failed rep transmission + * fix mod_dav_svn to complain about revisions > HEAD + + Developer-visible changes: + * fix incorrect status returned by 1.6 API + * fix compilation with g++ 4.7 +- drop subversion-1.7.5-libsvn_auth_kwallet-r1345740.patch + as it was merged upstream +- update annotation of subversion-1.7.4-ruby-1.9-RbConfig.patch +- remove excess logging from optional regression tests to reduce + spurious build failures in OBS due to size of log +- remove commands trailing "make check" which masked build failures +- add subversion-1.7.8-TestHarness_run_py_test_exit_code.patch + to ensure "make check" fails when certain Python tests fail + ------------------------------------------------------------------- Sat Dec 8 12:11:19 UTC 2012 - andreas.stieger@gmx.de diff --git a/subversion.spec b/subversion.spec index 31b1ea4..d292476 100644 --- a/subversion.spec +++ b/subversion.spec @@ -46,7 +46,7 @@ %endif Name: subversion -Version: 1.7.7 +Version: 1.7.8 Release: 0 # in-tree SWIG version to use for the build: %define swig_version 1.3.36 @@ -165,10 +165,8 @@ Patch31: subversion.perl.LD_RUN_PATH.patch Patch37: subversion-no-build-date.patch # PATCH-FEATURE-UPSTREAM subversion-neon-systemproxy.patch dimstar@opensuse.org -- Use system proxy offered by neon, if no specific config is used (Thus, actually using libproxy in the background to use 'the right proxy' as configured in the system). Patch38: subversion-neon-systemproxy.patch -# PATCH-FIX-UPSTREAM subversion-1.7.4-ruby-1.9-RbConfig.patch andreas.stieger@gmx.de -- Fixes warning/error in ruby 1.9 "Use RbConfig instead of obsolete and deprecated Config" Patch39: subversion-1.7.4-ruby-1.9-RbConfig.patch -# PATCH-FIX-UPSTREAM subversion-1.7.5-libsvn_auth_kwallet-r1345740.patch peters@apache.org -- Remove a cast that is both ugly, and apparently illegal in g++ 4.7. -Patch40: subversion-1.7.5-libsvn_auth_kwallet-r1345740.patch +Patch40: subversion-1.7.8-TestHarness_run_py_test_exit_code.patch # %if %with_ruby %if %{!?rb_arch:1}0 @@ -341,8 +339,8 @@ popd #./sqlite-amalgamation %patch31 %patch37 %patch38 -%patch39 -%patch40 +%patch39 -p1 +%patch40 -p1 SQLITE_RECOMMENDED_VER=$(grep -E '^SQLITE_RECOMMENDED_VER=' configure.ac|cut -f2 -d=|cut -f2 -d\") #" @@ -631,7 +629,7 @@ export LD_LIBRARY_PATH="$PWD/subversion/libsvn_auth_kwallet/.libs:$PWD/subversio CHECK_FS_TYPE=fsfs # run tests over ra_local (file://) -%__make check LOG_TO_STDOUT=true CLEANUP=true FS_TYPE="$CHECK_FS_TYPE" +%__make check CLEANUP=true FS_TYPE="$CHECK_FS_TYPE" SVNSERVE_PIDFILE="$PWD/svnserve.pid" HTTPD_PIDFILE="$PWD/httpd.pid" @@ -677,7 +675,7 @@ find_next_free_port # run tests over ra_svn (svn://) "$PWD/subversion/svnserve/svnserve" --listen-host 127.0.0.1 --listen-port "$free_port" --pid-file "$SVNSERVE_PIDFILE" -d -r "$PWD/subversion/tests/cmdline" -%__make check LOG_TO_STDOUT=true CLEANUP=true FS_TYPE="$CHECK_FS_TYPE" BASE_URL="svn://127.0.0.1:$free_port" || cat $RPM_SOURCE_DIR/%name*/tests.log +%__make check CLEANUP=true FS_TYPE="$CHECK_FS_TYPE" BASE_URL="svn://127.0.0.1:$free_port" kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null` %__rm "$SVNSERVE_PIDFILE" @@ -693,7 +691,7 @@ APACHE_LIBEXECDIR="%{apache_libexecdir}" sed "s/REPLACE_BUILDDIR/${PWD//\//\\/}/g" | \ sed "s/REPLACE_APACHE_LIBEXECDIR/${APACHE_LIBEXECDIR//\//\\/}/g" > httpd.conf LD_LIBRARY_PATH="%{buildroot}%{_libdir}:$LD_LIBRARY_PATH" /usr/sbin/httpd2 -d "$PWD" -f httpd.conf -%__make check LOG_TO_STDOUT=true CLEANUP=true FS_TYPE="$CHECK_FS_TYPE" BASE_URL=http://127.0.0.1:$free_port HTTP_LIBRARY=neon || cat $RPM_SOURCE_DIR/%name*/tests.log +%__make check CLEANUP=true FS_TYPE="$CHECK_FS_TYPE" BASE_URL=http://127.0.0.1:$free_port HTTP_LIBRARY=neon kill -9 `cat "$HTTPD_PIDFILE" 2>/dev/null` %__rm "$HTTPD_PIDFILE" %endif # neon @@ -710,7 +708,7 @@ APACHE_LIBEXECDIR="%{apache_libexecdir}" sed "s/REPLACE_BUILDDIR/${PWD//\//\\/}/g" | \ sed "s/REPLACE_APACHE_LIBEXECDIR/${APACHE_LIBEXECDIR//\//\\/}/g" > httpd.conf LD_LIBRARY_PATH="%{buildroot}%{_libdir}:$LD_LIBRARY_PATH" /usr/sbin/httpd2 -d "$PWD" -f httpd.conf -%__make check LOG_TO_STDOUT=true CLEANUP=true FS_TYPE="$CHECK_FS_TYPE" BASE_URL=http://127.0.0.1:$free_port HTTP_LIBRARY=serf || cat $RPM_SOURCE_DIR/%name*/tests.log +%__make check CLEANUP=true FS_TYPE="$CHECK_FS_TYPE" BASE_URL=http://127.0.0.1:$free_port HTTP_LIBRARY=serf kill -9 `cat "$HTTPD_PIDFILE" 2>/dev/null` %__rm "$HTTPD_PIDFILE" %endif # serf