rpms/checkpolicy
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix -fno-common issues discovered by GCC 10

Browse Source
This commit is contained in:
Petr Lautrbach 2020-01-28 13:07:09 +01:00
parent 460f6f4eee
commit ea213d0249
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
0001-checkpolicy-remove-unused-te_assertions.patch Normal file
View File

@ -0,0 +1,42 @@
From 95d8f16ece96829109eb75a605b1459a25b5a6be Mon Sep 17 00:00:00 2001
From: Ondrej Mosnacek <omosnace@redhat.com>
Date: Thu, 23 Jan 2020 13:57:15 +0100
Subject: [PATCH] checkpolicy: remove unused te_assertions
This variable is declared in a header file, but never defined or used.
The te_assert structure definition is only used in this declaration, so
remove both.
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
---
checkpolicy/checkpolicy.h | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/checkpolicy/checkpolicy.h b/checkpolicy/checkpolicy.h
index 3868f1fa023b..f127687e72a6 100644
--- a/checkpolicy/checkpolicy.h
+++ b/checkpolicy/checkpolicy.h
@@ -1,20 +1,6 @@
#ifndef _CHECKPOLICY_H_
#define _CHECKPOLICY_H_
-#include <sepol/policydb/ebitmap.h>
-
-typedef struct te_assert {
- ebitmap_t stypes;
- ebitmap_t ttypes;
- ebitmap_t tclasses;
- int self;
- sepol_access_vector_t *avp;
- unsigned long line;
- struct te_assert *next;
-} te_assert_t;
-
-te_assert_t *te_assertions;
-
extern unsigned int policyvers;
#endif
--
2.24.1

6
checkpolicy.spec
View File

@ -4,7 +4,7 @@
Summary: SELinux policy compiler Summary: SELinux policy compiler
Name: checkpolicy Name: checkpolicy
Version: 3.0 Version: 3.0
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2 License: GPLv2
Source0: https://github.com/SELinuxProject/selinux/releases/download/20191204/checkpolicy-3.0.tar.gz Source0: https://github.com/SELinuxProject/selinux/releases/download/20191204/checkpolicy-3.0.tar.gz
# $ git clone https://github.com/fedora-selinux/selinux.git # $ git clone https://github.com/fedora-selinux/selinux.git
@ -12,6 +12,7 @@ Source0: https://github.com/SELinuxProject/selinux/releases/download/20191204/ch
# $ git format-patch -N checkpolicy-3.0 -- checkpolicy # $ git format-patch -N checkpolicy-3.0 -- checkpolicy
# $ i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done # $ i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done
# Patch list start # Patch list start
Patch0001: 0001-checkpolicy-remove-unused-te_assertions.patch
# Patch list end # Patch list end
BuildRequires: gcc BuildRequires: gcc
BuildRequires: byacc bison flex flex-static libsepol-static >= %{libsepolver} libselinux-devel >= %{libselinuxver} BuildRequires: byacc bison flex flex-static libsepol-static >= %{libsepolver} libselinux-devel >= %{libselinuxver}
@ -61,6 +62,9 @@ install test/dispol ${RPM_BUILD_ROOT}%{_bindir}/sedispol
%{_bindir}/sedispol %{_bindir}/sedispol
%changelog %changelog
* Tue Jan 28 2020 Petr Lautrbach <plautrba@redhat.com> - 3.0-3
- Fix -fno-common issues discovered by GCC 10
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-2 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild