rpms/patch
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix deprecated patch macro

Browse Source
This commit is contained in:
Than Ngo 2023-03-28 12:37:16 +02:00
parent 2a8662ddca
commit b578021338
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
patch.spec
View File

@ -3,7 +3,7 @@
Summary: Utility for modifying/upgrading files Summary: Utility for modifying/upgrading files
Name: patch Name: patch
Version: 2.7.6 Version: 2.7.6
Release: 20%{?dist} Release: 21%{?dist}
License: GPL-3.0-or-later License: GPL-3.0-or-later
URL: https://savannah.gnu.org/projects/patch/ URL: https://savannah.gnu.org/projects/patch/
Source: https://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz Source: https://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz
@ -57,35 +57,35 @@ applications.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .avoid-set_file_attributes-sign-conversion-warnings %patch 0 -p1 -b .avoid-set_file_attributes-sign-conversion-warnings
%patch1 -p1 -b .test-suite-compatibility-fixes %patch 1 -p1 -b .test-suite-compatibility-fixes
%patch2 -p1 -b .fix-korn-shell-incompatibility %patch 2 -p1 -b .fix-korn-shell-incompatibility
%patch3 -p1 -b .fix-segfault-with-mangled-rename-patch %patch 3 -p1 -b .fix-segfault-with-mangled-rename-patch
%patch4 -p1 -b .allow-input-files-to-be-missing-for-ed-style-patches %patch 4 -p1 -b .allow-input-files-to-be-missing-for-ed-style-patches
# CVE-2018-1000156, Malicious patch files cause ed to execute arbitrary commands # CVE-2018-1000156, Malicious patch files cause ed to execute arbitrary commands
%patch5 -p1 -b .CVE-2018-1000156 %patch 5 -p1 -b .CVE-2018-1000156
%patch6 -p1 -b .CVE-2019-13638-invoked-ed-directly-instead-of-using-the-shell %patch 6 -p1 -b .CVE-2019-13638-invoked-ed-directly-instead-of-using-the-shell
%patch7 -p1 -b .switch-from-fork-execlp-to-execute %patch 7 -p1 -b .switch-from-fork-execlp-to-execute
%patch8 -p1 -b .cleanups-in-do_ed_script %patch 8 -p1 -b .cleanups-in-do_ed_script
%patch9 -p1 -b .avoid-warnings-gcc8 %patch 9 -p1 -b .avoid-warnings-gcc8
%patch10 -p1 -b .check-of-return-value-of-fwrite %patch 10 -p1 -b .check-of-return-value-of-fwrite
%patch11 -p1 -b .fix-ed-style-test-failure %patch 11 -p1 -b .fix-ed-style-test-failure
%patch12 -p1 -b .dont-leak-temporary-file-on-failed-ed-style-patch %patch 12 -p1 -b .dont-leak-temporary-file-on-failed-ed-style-patch
%patch13 -p1 -b .dont-leak-temporary-file-on-failed-multi-file-ed-style-patch %patch 13 -p1 -b .dont-leak-temporary-file-on-failed-multi-file-ed-style-patch
%patch14 -p1 -b .make-debug-output-more-useful %patch 14 -p1 -b .make-debug-output-more-useful
%patch15 -p1 -b .CVE-2018-6952-fix-swapping-fake-lines-in-pch_swap %patch 15 -p1 -b .CVE-2018-6952-fix-swapping-fake-lines-in-pch_swap
%patch16 -p1 -b .improve_support_for_memory_leak_detection %patch 16 -p1 -b .improve_support_for_memory_leak_detection
%patch17 -p1 -b .skip-ed-test-when-the-ed-utility-is-not-installed %patch 17 -p1 -b .skip-ed-test-when-the-ed-utility-is-not-installed
%patch18 -p1 -b .abort_when_cleaning_up_fails %patch 18 -p1 -b .abort_when_cleaning_up_fails
%patch19 -p1 -b .crash-RLIMIT_NOFILE %patch 19 -p1 -b .crash-RLIMIT_NOFILE
%patch20 -p1 -b .CVE-2019-13636-symlinks %patch 20 -p1 -b .CVE-2019-13636-symlinks
%patch21 -p1 -b .avoid-invalid-memory-access-in-context-format-diffs %patch 21 -p1 -b .avoid-invalid-memory-access-in-context-format-diffs
# CVE-2018-17942 gnulib: heap-based buffer overflow # CVE-2018-17942 gnulib: heap-based buffer overflow
%patch22 -p1 -b .CVE-2018-17942-gnulib_buffer_overflow %patch 22 -p1 -b .CVE-2018-17942-gnulib_buffer_overflow
%patch23 -p1 -b .failed_assertion %patch 23 -p1 -b .failed_assertion
# SELinux support. # SELinux support.
%patch100 -p1 -b .selinux %patch 100 -p1 -b .selinux
%patch101 -p1 %patch 101 -p1
%build %build
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
@ -109,6 +109,9 @@ make check
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Tue Mar 28 2023 Than Ngo <than@redhat.com> - 2.7.6-21
- Fix deprecated patch macro
* Tue Feb 21 2023 Than Ngo <than@redhat.com> - 2.7.6-20 * Tue Feb 21 2023 Than Ngo <than@redhat.com> - 2.7.6-20
- migrated to SPDX license - migrated to SPDX license