From a502b6e5171d3d2d56ed8ecd2ae9e32dae210fe5b67d5ca10a722982d4a6561c Mon Sep 17 00:00:00 2001 From: Bernhard Voelker Date: Thu, 21 Nov 2019 00:00:29 +0000 Subject: [PATCH] Accepting request 749944 from home:marxin:branches:Base:System - Add disable-null-ptr-test.patch in order to fix boo#1157342. OBS-URL: https://build.opensuse.org/request/show/749944 OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=81 --- disable-null-ptr-test.patch | 15 +++++++++++++++ findutils.changes | 5 +++++ findutils.spec | 6 ++++-- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 disable-null-ptr-test.patch diff --git a/disable-null-ptr-test.patch b/disable-null-ptr-test.patch new file mode 100644 index 0000000..6df57a3 --- /dev/null +++ b/disable-null-ptr-test.patch @@ -0,0 +1,15 @@ +diff --git a/gnulib-tests/test-canonicalize.c b/gnulib-tests/test-canonicalize.c +index 8d1ff86..0f3c5e3 100644 +--- a/gnulib-tests/test-canonicalize.c ++++ b/gnulib-tests/test-canonicalize.c +@@ -71,10 +71,6 @@ main (void) + ASSERT (result2 == NULL); + ASSERT (errno == ENOENT); + errno = 0; +- result1 = canonicalize_file_name (null_ptr ()); +- ASSERT (result1 == NULL); +- ASSERT (errno == EINVAL); +- errno = 0; + result2 = canonicalize_filename_mode (NULL, CAN_EXISTING); + ASSERT (result2 == NULL); + ASSERT (errno == EINVAL); diff --git a/findutils.changes b/findutils.changes index 5712834..58b21f3 100644 --- a/findutils.changes +++ b/findutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 20 15:03:07 UTC 2019 - Martin Liška + +- Add disable-null-ptr-test.patch in order to fix boo#1157342. + ------------------------------------------------------------------- Thu Aug 29 22:07:53 UTC 2019 - Bernhard Voelker diff --git a/findutils.spec b/findutils.spec index ee773cf..ebda3f6 100644 --- a/findutils.spec +++ b/findutils.spec @@ -1,7 +1,7 @@ # # spec file for package findutils # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: findutils -Url: http://www.gnu.org/software/findutils/ +URL: http://www.gnu.org/software/findutils/ Version: 4.7.0 Release: 0 Summary: The GNU versions of find utilities (find and xargs) @@ -44,6 +44,7 @@ Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=%{ # adds a new option -xautofs to find to not descend into directories on autofs file systems Patch0: findutils-xautofs.patch +Patch1: disable-null-ptr-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # BuildRequire dejagnu for 'runtest' to execute all tests. @@ -74,6 +75,7 @@ useful for finding things on your system. %prep %setup -q %patch0 +%patch1 -p1 %build %if 0%{?qemu_user_space_build}