Dirk Mueller
5f72b04a2c
* Fix svn:mergeinfo diff parser bug when parsing forward merges * Fix redirected URL handling with file externals * swig-rb: Fix uses of 'File.exist?', deprecated since Ruby 2.1 * Build: Fix uses of deprecated Python APIs * Build: Retain ability to build SWIG Python 2 bindings * Fix reading WC lock status with svn_wc_status2_t * JavaHL: Add @Deprecated to silence compiler warnings * JavaHL: Fix crash in case of null message in getMessage * Fix build breakage of release tarballs by installed swig * Add regression test for issue #4711 "invalid xml file" * swig-py: Fix building with SWIG 4.1.0 (r1904167) * Makefile.in: Fix cleaning of __pycache__ dirs and *.pyc * swig-py: Avoid deprecated options to SWIG >= 4.1.0 (r1904198, r1904287) * swig-py: Use sysconfig to allow building with Python 3.12 * INSTALL: Document not to use SVN with APR 1.7.3 on Windows * Fix test suite broken by syntax error when --enable-sasl * swig-py: Fix issues #4916, #4917, #4918 (r1912500 et al) * swig-py: Improve error when no external diff (r1912724, -743, issue #1778) * autogen.sh: Fix building when Python is not named "python" - drop ruby32-fixes.patch, swig4.patch: upstream/obsolete - rebase all patches to -p1 to be able to switch to autosetup - add swig4.patch for better support with SWIG 4.x (bsc#1209110) - add ruby32-fixes.patch (https://svn.apache.org/viewvc?view=revision&revision=1904472) * fix-javahl-test.patch- rpm output /usr/lib/tmpfiles.d/svnserve.conf:1: Line references path below * Reject bad PUT before CHECKOUT in v1 HTTP protocol OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=364
87 lines
4.4 KiB
Diff
87 lines
4.4 KiB
Diff
From: Andreas Stieger <andreas.stieger@gmx.de>
|
|
Date: Wed, 06 Mar 2013 00:05:08 +0000
|
|
Subject: Remove volatile build information
|
|
Upstream: never
|
|
|
|
Prevent unneccessary rebuilds of binary packages differing only by date, time and build host.
|
|
|
|
---
|
|
subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java | 4 ++--
|
|
subversion/libsvn_subr/opt.c | 8 ++------
|
|
subversion/libsvn_subr/version.c | 4 ++--
|
|
subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout | 1 -
|
|
subversion/tests/cmdline/getopt_tests_data/svn--version_stdout | 1 -
|
|
5 files changed, 6 insertions(+), 12 deletions(-)
|
|
|
|
Index: subversion-1.14.3/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
|
|
===================================================================
|
|
--- subversion-1.14.3.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
|
|
+++ subversion-1.14.3/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
|
|
@@ -149,10 +149,10 @@ public class BasicTests extends SVNTests
|
|
{
|
|
vx = client.getVersionExtended(false);
|
|
String result = vx.getBuildDate();
|
|
- if (result == null || result.trim().length() == 0)
|
|
+ if (result == null)
|
|
throw new Exception("Build date empty");
|
|
result = vx.getBuildTime();
|
|
- if (result == null || result.trim().length() == 0)
|
|
+ if (result == null)
|
|
throw new Exception("Build time empty");
|
|
result = vx.getBuildHost();
|
|
if (result == null || result.trim().length() == 0)
|
|
Index: subversion-1.14.3/subversion/libsvn_subr/opt.c
|
|
===================================================================
|
|
--- subversion-1.14.3.orig/subversion/libsvn_subr/opt.c
|
|
+++ subversion-1.14.3/subversion/libsvn_subr/opt.c
|
|
@@ -1147,12 +1147,8 @@ svn_opt__print_version_info(const char *
|
|
if (quiet)
|
|
return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER);
|
|
|
|
- SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n"
|
|
- " compiled %s, %s on %s\n\n"),
|
|
- pgm_name, SVN_VERSION,
|
|
- svn_version_ext_build_date(info),
|
|
- svn_version_ext_build_time(info),
|
|
- svn_version_ext_build_host(info)));
|
|
+ SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n\n"),
|
|
+ pgm_name, SVN_VERSION));
|
|
SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info)));
|
|
|
|
if (footer)
|
|
Index: subversion-1.14.3/subversion/libsvn_subr/version.c
|
|
===================================================================
|
|
--- subversion-1.14.3.orig/subversion/libsvn_subr/version.c
|
|
+++ subversion-1.14.3/subversion/libsvn_subr/version.c
|
|
@@ -139,8 +139,8 @@ svn_version_extended(svn_boolean_t verbo
|
|
{
|
|
svn_version_extended_t *info = apr_pcalloc(pool, sizeof(*info));
|
|
|
|
- info->build_date = __DATE__;
|
|
- info->build_time = __TIME__;
|
|
+ info->build_date = "";
|
|
+ info->build_time = "";
|
|
info->build_host = SVN_BUILD_HOST;
|
|
info->copyright = apr_pstrdup
|
|
(pool, _("Copyright (C) 2023 The Apache Software Foundation.\n"
|
|
Index: subversion-1.14.3/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
|
|
===================================================================
|
|
--- subversion-1.14.3.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
|
|
+++ subversion-1.14.3/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
|
|
@@ -1,5 +1,4 @@
|
|
svn, version 1.9.0-dev (under development)
|
|
- compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5
|
|
|
|
Copyright (C) 2012 The Apache Software Foundation.
|
|
This software consists of contributions made by many people;
|
|
Index: subversion-1.14.3/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
|
|
===================================================================
|
|
--- subversion-1.14.3.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
|
|
+++ subversion-1.14.3/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
|
|
@@ -1,5 +1,4 @@
|
|
svn, version 1.9.0-dev (under development)
|
|
- compiled Feb 26 2014, 15:15:42 on x86_64-unknown-openbsd5.5
|
|
|
|
Copyright (C) 2014 The Apache Software Foundation.
|
|
This software consists of contributions made by many people;
|