diff --git a/0002-checkpolicy-destroy-the-class-datum-if-it-fails-to-initialize.patch b/0002-checkpolicy-destroy-the-class-datum-if-it-fails-to-initialize.patch deleted file mode 100644 index a100aeee471633d326c3b589240ecf6d7c67d2f7..0000000000000000000000000000000000000000 --- a/0002-checkpolicy-destroy-the-class-datum-if-it-fails-to-initialize.patch +++ /dev/null @@ -1,29 +0,0 @@ -From daa00b28998af811f92aa821090f0ac2dd71f2bc Mon Sep 17 00:00:00 2001 -From: Nicolas Iooss -Date: Sat, 26 May 2018 18:15:07 +0200 -Subject: [PATCH] checkpolicy: destroy the class datum if it fails to - initialize - -require_class() allocate memory for its variable "class_datum_t *datum" -and calls symtab_init(&datum->permissions, PERM_SYMTAB_SIZE). If this -second call fails, datum is not freed. - -Fix this memory leak. - -Signed-off-by: Nicolas Iooss ---- - module_compiler.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/module_compiler.c b/module_compiler.c -index 155702f2..ada7cb2a 100644 ---- a/module_compiler.c -+++ b/module_compiler.c -@@ -802,6 +802,7 @@ int require_class(int pass) - if ((datum = calloc(1, sizeof(*datum))) == NULL || - symtab_init(&datum->permissions, PERM_SYMTAB_SIZE)) { - yyerror("Out of memory!"); -+ class_datum_destroy(datum); - return -1; - } - ret = diff --git a/checkpolicy-2.8.tar.gz b/checkpolicy-2.8.tar.gz deleted file mode 100644 index 329da54a327a2c586a9f086d4ca2af50092713ef..0000000000000000000000000000000000000000 Binary files a/checkpolicy-2.8.tar.gz and /dev/null differ diff --git a/checkpolicy-3.1.tar.gz b/checkpolicy-3.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..57bb2e5c93c5f4462637be7c8272dcf1f5e49b1a Binary files /dev/null and b/checkpolicy-3.1.tar.gz differ diff --git a/checkpolicy.spec b/checkpolicy.spec index 30c4bf0b629929b4f247de24cc34948d44dc5326..cfade5da547d4b4b24c6ddf6cbc7c4f6fb8b9e38 100644 --- a/checkpolicy.spec +++ b/checkpolicy.spec @@ -1,14 +1,13 @@ Name: checkpolicy -Version: 2.8 -Release: 6 +Version: 3.1 +Release: 1 Summary: SELinux policy compiler License: GPLv2 URL: https://github.com/SELinuxProject/selinux -Source0: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/checkpolicy-2.8.tar.gz +Source0: https://github.com/SELinuxProject/selinux/releases/download/20200710/checkpolicy-3.1.tar.gz -Patch6000: 0002-checkpolicy-destroy-the-class-datum-if-it-fails-to-initialize.patch +BuildRequires: gcc byacc bison flex flex-static libsepol-static libselinux-devel git -BuildRequires: gcc byacc bison flex flex-static libsepol-static >= 2.8-1 libselinux-devel >= 2.8-1 git Conflicts: selinux-policy-base < 3.13.1-138 %description @@ -55,6 +54,9 @@ install test/dispol %{buildroot}%{_bindir}/sedispol %{_mandir}/*/* %changelog +* Fri Jul 17 2019 openEuler Buildteam - 3.1-1 +- update to 3.1 + * Sat Sep 21 2019 openEuler Buildteam - 2.8-6 - Type:enhancement - ID:NA