use macro autosetup instead of patchN for merging patch file
(cherry picked from commit 6b310afb07efcb38841220d9ba2b30ce25e57ffb)
This commit is contained in:
parent
3f710ffba2
commit
06818ae19a
@ -13,13 +13,13 @@ Reported by GCC analyzer.
|
||||
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
||||
Acked-by: James Carter <jwcart2@gmail.com>
|
||||
---
|
||||
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)
|
||||
}
|
||||
|
||||
|
||||
@ -12,13 +12,13 @@ Reported-by: Cppcheck
|
||||
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
||||
Acked-by: James Carter <jwcart2@gmail.com>
|
||||
---
|
||||
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) {
|
||||
|
||||
@ -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 <yixiangzhike007@163.com> - 3.5-4
|
||||
- use macro autosetup instead of patchN for merging patch file
|
||||
|
||||
* Wed Oct 23 2024 yixiangzhike <yixiangzhike007@163.com> - 3.5-3
|
||||
- backport upstream patch to free constraint in error branch
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user