pool/checkpolicy
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 764693 from home:jsegitz:branches:security:SELinux

Browse Source 
- Add extern_te_assert_t.patch to mark te_assert_t as extern. 
  Prevents build failures on gcc10 (bsc#1160259)

OBS-URL: https://build.opensuse.org/request/show/764693
OBS-URL: https://build.opensuse.org/package/show/security:SELinux/checkpolicy?expand=0&rev=49
This commit is contained in:
Johannes Segitz 2020-01-15 14:40:03 +00:00 committed by Git OBS Bridge
parent 6f28f50290
commit 1f573b48d3
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
checkpolicy.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 15 14:25:45 UTC 2020 - Johannes Segitz <jsegitz@suse.de>
- Add extern_te_assert_t.patch to mark te_assert_t as extern.
Prevents build failures on gcc10 (bsc#1160259)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 20 14:58:08 UTC 2019 - jsegitz@suse.com Wed Mar 20 14:58:08 UTC 2019 - jsegitz@suse.com

6
checkpolicy.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package checkpolicy # spec file for package checkpolicy
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -26,6 +26,7 @@ Group: Productivity/Security
Url: https://github.com/SELinuxProject/selinux Url: https://github.com/SELinuxProject/selinux
Source0: https://github.com/SELinuxProject/selinux/releases/download/20190315/%{name}-%{version}.tar.gz Source0: https://github.com/SELinuxProject/selinux/releases/download/20190315/%{name}-%{version}.tar.gz
Source1: checkpolicy-tests.tar.gz Source1: checkpolicy-tests.tar.gz
Patch0: extern_te_assert_t.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
@ -67,6 +68,7 @@ to use checkpolicy from Python.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
make clean make clean

13
extern_te_assert_t.patch Normal file
View File

@ -0,0 +1,13 @@
Index: checkpolicy-2.9/checkpolicy.h
===================================================================
--- checkpolicy-2.9.orig/checkpolicy.h 2019-03-15 10:32:30.000000000 +0000
+++ checkpolicy-2.9/checkpolicy.h 2020-01-15 14:23:04.742118559 +0000
@@ -13,7 +13,7 @@ typedef struct te_assert {
struct te_assert *next;
} te_assert_t;
-te_assert_t *te_assertions;
+extern te_assert_t *te_assertions;
extern unsigned int policyvers;