From d581399e6033ee0750c1b9ae27ee22aa95128cf4 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Thu, 25 Aug 2022 11:03:33 -0400 Subject: [PATCH] patch: do not patch automake Makefile template We do not build the tests for this package, so we can avoid needing autoreconf when the host automake version doesn't match the version this package was bootstrapped with by not changing the .am file in this patch. Signed-off-by: Michael Pratt --- devel/patch/Makefile | 2 +- devel/patch/patches/020-CVE-2018-1000156.patch | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/devel/patch/Makefile b/devel/patch/Makefile index 5ea67c7a8d..c842675034 100644 --- a/devel/patch/Makefile +++ b/devel/patch/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=patch PKG_VERSION:=2.7.6 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/patch diff --git a/devel/patch/patches/020-CVE-2018-1000156.patch b/devel/patch/patches/020-CVE-2018-1000156.patch index bf16f8e641..e3c9f23198 100644 --- a/devel/patch/patches/020-CVE-2018-1000156.patch +++ b/devel/patch/patches/020-CVE-2018-1000156.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Fix arbitrary command execution in ed-style patches of piping it to ed: this will cause ed to abort on invalid commands instead of rejecting them and carrying on. * tests/ed-style: New test case. -* tests/Makefile.am (TESTS): Add test case. +* tests/Makefile.am (TESTS): Add test case. (OPENWRT REMOVED) --- src/pch.c | 89 +++++++++++++++++++++++++++++++++++------------ - tests/Makefile.am | 1 + + tests/Makefile.am | 1 + (OPENWRT REMOVED) tests/ed-style | 41 ++++++++++++++++++++++ 3 files changed, 108 insertions(+), 23 deletions(-) create mode 100644 tests/ed-style @@ -143,16 +143,6 @@ instead of rejecting them and carrying on. if (ofp) { ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -32,6 +32,7 @@ TESTS = \ - crlf-handling \ - dash-o-append \ - deep-directories \ -+ ed-style \ - empty-files \ - false-match \ - fifo \ --- /dev/null +++ b/tests/ed-style @@ -0,0 +1,41 @@