From 1f573b48d3e4db19f38720ead30ff9d43dbe888c31640fa9d9e7b55de4ec8121 Mon Sep 17 00:00:00 2001
From: Johannes Segitz <jsegitz@suse.com>
Date: Wed, 15 Jan 2020 14:40:03 +0000
Subject: [PATCH] Accepting request 764693 from
 home:jsegitz:branches:security:SELinux

- 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
---
 checkpolicy.changes      |  6 ++++++
 checkpolicy.spec         |  6 ++++--
 extern_te_assert_t.patch | 13 +++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 extern_te_assert_t.patch

diff --git a/checkpolicy.changes b/checkpolicy.changes
index ac03aca..4a65cba 100644
--- a/checkpolicy.changes
+++ b/checkpolicy.changes
@@ -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
 
diff --git a/checkpolicy.spec b/checkpolicy.spec
index 112bc09..ff9d4e5 100644
--- a/checkpolicy.spec
+++ b/checkpolicy.spec
@@ -1,7 +1,7 @@
 #
 # 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
 # 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)
 # 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
 Source0:        https://github.com/SELinuxProject/selinux/releases/download/20190315/%{name}-%{version}.tar.gz
 Source1:        checkpolicy-tests.tar.gz
+Patch0:         extern_te_assert_t.patch
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  libselinux-devel
@@ -67,6 +68,7 @@ to use checkpolicy from Python.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make clean
diff --git a/extern_te_assert_t.patch b/extern_te_assert_t.patch
new file mode 100644
index 0000000..7980fd1
--- /dev/null
+++ b/extern_te_assert_t.patch
@@ -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;
+