diff --git a/backport-checkpolicy-Improve-error-message-for-type-bounds.patch b/backport-checkpolicy-Improve-error-message-for-type-bounds.patch deleted file mode 100644 index 7deb412f7b31c5e4ec0f378228647beb7b14e9ca..0000000000000000000000000000000000000000 --- a/backport-checkpolicy-Improve-error-message-for-type-bounds.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1d33c911f514449bbc8cab71332752c22561b911 Mon Sep 17 00:00:00 2001 -From: Vit Mojzis -Date: Thu, 24 Nov 2022 17:31:52 +0100 -Subject: [PATCH] checkpolicy: Improve error message for type bounds - -Make the error message consistent with other occurrences of the -same issue: -https://github.com/SELinuxProject/selinux/blob/master/checkpolicy/module_compiler.c#L243 -https://github.com/SELinuxProject/selinux/blob/master/checkpolicy/module_compiler.c#L488 - -Signed-off-by: Vit Mojzis -Acked-by: James Carter ---- - policy_define.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/policy_define.c b/policy_define.c -index 41e44631..86d57017 100644 ---- a/policy_define.c -+++ b/policy_define.c -@@ -1416,7 +1416,7 @@ static int define_typebounds_helper(char *bounds_id, char *type_id) - if (!type->bounds) - type->bounds = bounds->s.value; - else if (type->bounds != bounds->s.value) { -- yyerror2("type %s has inconsistent master {%s,%s}", -+ yyerror2("type %s has inconsistent bounds %s/%s", - type_id, - policydbp->p_type_val_to_name[type->bounds - 1], - policydbp->p_type_val_to_name[bounds->s.value - 1]); --- -2.39.2.windows.1 - diff --git a/backport-checkpolicy-delete-invalid-spaces.patch b/backport-checkpolicy-delete-invalid-spaces.patch deleted file mode 100644 index c4e960851f57dbf1058edc3aaba9f7f9abda26d7..0000000000000000000000000000000000000000 --- a/backport-checkpolicy-delete-invalid-spaces.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 27e1c7c8e90b98da53bfcce291b03d8f2f0f0b4d Mon Sep 17 00:00:00 2001 -From: lujiev <572084868@qq.com> -Date: Thu, 27 Oct 2022 16:02:18 +0800 -Subject: [PATCH] checkpolicy: delete invalid spaces - -Closes: https://github.com/SELinuxProject/selinux/pull/372 -Signed-off-by: lujiev <572084868@qq.com> -Acked-by: Jason Zaman ---- - policy_define.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/policy_define.c b/policy_define.c -index 86d57017..c2ae7fe5 100644 ---- a/policy_define.c -+++ b/policy_define.c -@@ -2208,7 +2208,7 @@ static int avrule_ioctl_partialdriver(struct av_ioctl_range_list *rangelist, - xperms = calloc(1, sizeof(av_extended_perms_t)); - if (!xperms) { - yyerror("out of memory"); -- return - 1; -+ return -1; - } - - r = rangelist; -@@ -2245,7 +2245,7 @@ static int avrule_ioctl_completedriver(struct av_ioctl_range_list *rangelist, - xperms = calloc(1, sizeof(av_extended_perms_t)); - if (!xperms) { - yyerror("out of memory"); -- return - 1; -+ return -1; - } - - r = rangelist; -@@ -2289,7 +2289,7 @@ static int avrule_ioctl_func(struct av_ioctl_range_list *rangelist, - xperms = calloc(1, sizeof(av_extended_perms_t)); - if (!xperms) { - yyerror("out of memory"); -- return - 1; -+ return -1; - } - - r = rangelist; -@@ -2352,11 +2352,11 @@ static int avrule_cpy(avrule_t *dest, const avrule_t *src) - dest->flags = src->flags; - if (type_set_cpy(&dest->stypes, &src->stypes)) { - yyerror("out of memory"); -- return - 1; -+ return -1; - } - if (type_set_cpy(&dest->ttypes, &src->ttypes)) { - yyerror("out of memory"); -- return - 1; -+ return -1; - } - dest->line = src->line; - dest->source_filename = strdup(source_file); --- -2.39.2.windows.1 - diff --git a/checkpolicy-3.4.tar.gz b/checkpolicy-3.4.tar.gz deleted file mode 100644 index 4f3180c9023cc4a415ac9190f9d852c011f7fcb0..0000000000000000000000000000000000000000 Binary files a/checkpolicy-3.4.tar.gz and /dev/null differ diff --git a/checkpolicy-3.5.tar.gz b/checkpolicy-3.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..871b4efc2345e0dd57ff14780a852424e66b0b45 Binary files /dev/null and b/checkpolicy-3.5.tar.gz differ diff --git a/checkpolicy.spec b/checkpolicy.spec index 176eb9c7fe7031b30263df6211d2856ff11b7a4c..b13399f8b89d788193a49e5a0e98772856d592eb 100644 --- a/checkpolicy.spec +++ b/checkpolicy.spec @@ -1,14 +1,11 @@ Name: checkpolicy -Version: 3.4 -Release: 2 +Version: 3.5 +Release: 1 Summary: SELinux policy compiler License: GPLv2 URL: https://github.com/SELinuxProject/selinux Source0: https://github.com/SELinuxProject/selinux/releases/download/%{version}/checkpolicy-%{version}.tar.gz -Patch0: backport-checkpolicy-Improve-error-message-for-type-bounds.patch -Patch1: backport-checkpolicy-delete-invalid-spaces.patch - BuildRequires: gcc byacc bison flex flex-static libsepol-static >= %{version} libselinux-devel >= %{version} Conflicts: selinux-policy-base < 3.13.1-138 @@ -49,7 +46,7 @@ install test/dispol %{buildroot}%{_bindir}/sedispol %files %defattr(-,root,root) -%license COPYING +%license LICENSE %{_bindir}/* %files help @@ -57,6 +54,9 @@ install test/dispol %{buildroot}%{_bindir}/sedispol %{_mandir}/*/* %changelog +* Mon Jul 17 2023 zhangguangzhi - 3.5-1 +- update version to 3.5 + * Fri Mar 10 2023 zhangchenfeng - 3.4-2 - backport upstrem bugfix