From d95f03f4aff2a940fca82fa394cc0706d62ee44e Mon Sep 17 00:00:00 2001 From: yixiangzhike Date: Wed, 19 Feb 2025 16:04:42 +0800 Subject: [PATCH] use macro autosetup instead of patchN for merging patch file (cherry picked from commit 6b310afb07efcb38841220d9ba2b30ce25e57ffb) --- backport-mcstrans-check-memory-allocations.patch | 8 ++++---- backport-mcstrans-free-constraint-in-error-branch.patch | 8 ++++---- mcstrans.spec | 9 +++++---- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/backport-mcstrans-check-memory-allocations.patch b/backport-mcstrans-check-memory-allocations.patch index 443f38c..f19e9ea 100644 --- a/backport-mcstrans-check-memory-allocations.patch +++ b/backport-mcstrans-check-memory-allocations.patch @@ -13,13 +13,13 @@ Reported by GCC analyzer. Signed-off-by: Christian Göttsche Acked-by: James Carter --- - mcstrans/src/mls_level.c | 5 +++++ + src/mls_level.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/mcstrans/src/mls_level.c b/mcstrans/src/mls_level.c +diff --git a/src/mls_level.c b/src/mls_level.c index 2017f117..2ee1a231 100644 ---- a/mcstrans/src/mls_level.c -+++ b/mcstrans/src/mls_level.c +--- a/src/mls_level.c ++++ b/src/mls_level.c @@ -13,6 +13,8 @@ mls_level_t *mls_level_from_string(char *mls_context) } diff --git a/backport-mcstrans-free-constraint-in-error-branch.patch b/backport-mcstrans-free-constraint-in-error-branch.patch index 2f05689..5bf18eb 100644 --- a/backport-mcstrans-free-constraint-in-error-branch.patch +++ b/backport-mcstrans-free-constraint-in-error-branch.patch @@ -12,13 +12,13 @@ Reported-by: Cppcheck Signed-off-by: Christian Göttsche Acked-by: James Carter --- - mcstrans/src/mcstrans.c | 1 + + src/mcstrans.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/mcstrans/src/mcstrans.c b/mcstrans/src/mcstrans.c +diff --git a/src/mcstrans.c b/src/mcstrans.c index fded3235..7667e131 100644 ---- a/mcstrans/src/mcstrans.c -+++ b/mcstrans/src/mcstrans.c +--- a/src/mcstrans.c ++++ b/src/mcstrans.c @@ -477,6 +477,7 @@ add_constraint(char op, char *raw, char *tok) { } if (asprintf(&constraint->text, "%s%c%s", raw, op, tok) < 0) { diff --git a/mcstrans.spec b/mcstrans.spec index d3a1d0f..5cfc896 100644 --- a/mcstrans.spec +++ b/mcstrans.spec @@ -1,6 +1,6 @@ Name: mcstrans Version: 3.5 -Release: 3 +Release: 4 Summary: SELinux Translation Daemon License: GPL2 URL: https://github.com/SELinuxProject/selinux/wiki @@ -40,9 +40,7 @@ Summary: Mcstrans help document mcstrans-help include help files for man page %prep -%setup -q -%patch1 -p2 -%patch2 -p2 +%autosetup -n %{name}-%{version} -p1 %build %set_build_flags @@ -92,6 +90,9 @@ rm -rf %{buildroot}/%{_sysconfdir}/rc.d/init.d/mcstrans %{_mandir}/ru/man8/*.8.gz %changelog +* Wed Feb 19 2025 yixiangzhike - 3.5-4 +- use macro autosetup instead of patchN for merging patch file + * Wed Oct 23 2024 yixiangzhike - 3.5-3 - backport upstream patch to free constraint in error branch -- Gitee