From 87c28fa85f13917b37de0e04cf4b3181da1ab3934d2723f042534ebc7d68b538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 3 Oct 2024 17:59:36 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main sharutils revision 5d5074be22f4fc3d124c93a9a5d1b545 --- sharutils-CVE-2018-1000097-fix_buffer_overflow.patch | 2 +- sharutils.changes | 12 ++++++++++++ sharutils.spec | 10 +++++----- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/sharutils-CVE-2018-1000097-fix_buffer_overflow.patch b/sharutils-CVE-2018-1000097-fix_buffer_overflow.patch index fe4f199..7be8be6 100644 --- a/sharutils-CVE-2018-1000097-fix_buffer_overflow.patch +++ b/sharutils-CVE-2018-1000097-fix_buffer_overflow.patch @@ -11,7 +11,7 @@ Index: src/unshar.c looks_like_shell_code (char const * buf) { - while (isspace ((int) *buf)) buf++; -+ intptr_t buf_end = buf + rw_base_size; ++ intptr_t buf_end = (intptr_t)buf + rw_base_size; + while (isspace ((int) *buf) && buf < buf_end) buf++; switch (*buf) { diff --git a/sharutils.changes b/sharutils.changes index 4d6b30f..51adf16 100644 --- a/sharutils.changes +++ b/sharutils.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue May 14 08:47:48 UTC 2024 - pgajdos@suse.com + +- fix build with gcc14 +- modified patches + % sharutils-CVE-2018-1000097-fix_buffer_overflow.patch + +------------------------------------------------------------------- +Mon Feb 26 13:10:44 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Wed Apr 20 20:54:04 UTC 2022 - Dirk Müller diff --git a/sharutils.spec b/sharutils.spec index 7706a8c..16eed9c 100644 --- a/sharutils.spec +++ b/sharutils.spec @@ -1,7 +1,7 @@ # # spec file for package sharutils # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -52,10 +52,10 @@ bytes. uudecode does the converse transformation. %prep %setup -q -%patch0 -%patch1 -%patch2 -p1 -%patch3 -p1 +%patch -P 0 +%patch -P 1 +%patch -P 2 -p1 +%patch -P 3 -p1 chmod +w src/scripts.x %build