From 9d2bba42d7f13b05473fc3a52a40ed6597065b7648922d294a9a091286063855 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 20 Nov 2019 13:10:03 +0000 Subject: [PATCH] Accepting request 749837 from home:marxin:branches:Base:System - Add disable-null-ptr-argument.patch in order to fix boo#1157218. OBS-URL: https://build.opensuse.org/request/show/749837 OBS-URL: https://build.opensuse.org/package/show/Base:System/sed?expand=0&rev=40 --- disable-null-ptr-argument.patch | 14 ++++++++++++++ sed.changes | 6 ++++++ sed.spec | 4 +++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 disable-null-ptr-argument.patch diff --git a/disable-null-ptr-argument.patch b/disable-null-ptr-argument.patch new file mode 100644 index 0000000..23b4b47 --- /dev/null +++ b/disable-null-ptr-argument.patch @@ -0,0 +1,14 @@ +diff --git a/gnulib-tests/test-canonicalize-lgpl.c b/gnulib-tests/test-canonicalize-lgpl.c +index 4cec490..c91aa1f 100644 +--- a/gnulib-tests/test-canonicalize-lgpl.c ++++ b/gnulib-tests/test-canonicalize-lgpl.c +@@ -71,9 +71,6 @@ main (void) + ASSERT (result == NULL); + ASSERT (errno == ENOENT); + errno = 0; +- result = canonicalize_file_name (null_ptr ()); +- ASSERT (result == NULL); +- ASSERT (errno == EINVAL); + } + + /* Check that a non-directory with trailing slash yields NULL. */ diff --git a/sed.changes b/sed.changes index 65659e9..280901c 100644 --- a/sed.changes +++ b/sed.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 20 09:09:47 UTC 2019 - Martin Liška + +- Add disable-null-ptr-argument.patch in order to fix + boo#1157218. + ------------------------------------------------------------------- Thu Sep 19 11:48:38 UTC 2019 - Ludwig Nussel diff --git a/sed.spec b/sed.spec index 926597c..506aac0 100644 --- a/sed.spec +++ b/sed.spec @@ -1,7 +1,7 @@ # # spec file for package sed # -# 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 @@ -28,6 +28,7 @@ Source1: https://ftp.gnu.org/gnu/sed/%{name}-%{version}.tar.xz.sig Source2: %{name}.keyring # PATCH-FIX-SLE sed-dont_close_twice.patch bnc@880817 tcech@suse.cz -- Fix double close. Patch0: sed-dont_close_twice.patch +Patch1: disable-null-ptr-argument.patch BuildRequires: libacl-devel BuildRequires: libselinux-devel Requires(post): %{install_info_prereq} @@ -45,6 +46,7 @@ occurrences of a string within a file. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %define warn_flags -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security