From 5001e659a7a86f730b717c1d240ebc1c1ecb8521 Mon Sep 17 00:00:00 2001
From: Ondrej Mosnacek <omosnace@redhat.com>
Date: Tue, 31 Jul 2018 09:47:34 +0200
Subject: [PATCH] Remove the kernel headers workaround

The issue has been resoved upstream [1], so the workaround patch can be
removed,

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=9ba546c01976a426292af99e682a557075d6c010
---
 ...ix-header-conflicts-for-kernel-v4.18.patch | 24 -------------------
 libkcapi.spec                                 | 10 ++++----
 2 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 9000-fix-header-conflicts-for-kernel-v4.18.patch

diff --git a/9000-fix-header-conflicts-for-kernel-v4.18.patch b/9000-fix-header-conflicts-for-kernel-v4.18.patch
deleted file mode 100644
index bb9a61b..0000000
--- a/9000-fix-header-conflicts-for-kernel-v4.18.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/lib/internal.h b/lib/internal.h
-index f9df585..b237822 100644
---- a/lib/internal.h
-+++ b/lib/internal.h
-@@ -23,7 +23,6 @@
- #define _GNU_SOURCE
- #include <unistd.h>
- #include <sys/syscall.h>
--#include <linux/aio_abi.h>
- #include <stdint.h>
- #include <fcntl.h>
- #include <sys/uio.h>
-@@ -35,6 +34,11 @@
- #include <limits.h>
- #include <stdio.h>
- 
-+/* work around aio_abi.h pulling in headers that conflict with glibc typedefs */
-+#define _UAPI_LINUX_SIGNAL_H
-+#define _LINUX_SIGNAL_H
-+
-+#include <linux/aio_abi.h>
- #include <linux/if_alg.h>
- 
- #include "atomic.h"
diff --git a/libkcapi.spec b/libkcapi.spec
index 1e53498..e8ca0a9 100644
--- a/libkcapi.spec
+++ b/libkcapi.spec
@@ -92,7 +92,7 @@ bin/kcapi-hasher -n fipshmac -d "$lib_path"/fipscheck            \\\
 
 Name:           libkcapi
 Version:        %{vmajor}.%{vminor}.%{vpatch}
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        User space interface to the Linux Kernel Crypto API
 
 License:        BSD or GPLv2
@@ -109,11 +109,6 @@ Patch5:         %{giturl}/compare/decf850ab9bb...ec9c36216623.patch#/%{name}-1.1
 Patch6:         %{giturl}/compare/4a1a30f75e70...c9ed6b2c0702.patch#/%{name}-1.1.1-Coverity_PR_follow-up.patch
 Patch7:         %{giturl}/pull/68.patch#/%{name}-1.1.1-test_Fix_AEAD_fuzz_test_for_big-endian_archs.patch
 
-# Workaround for failing builds on rawhide (F29).
-# To be removed when this issue is patched in the kernel:
-# https://github.com/smuellerDD/libkcapi/issues/59
-Patch9000:      9000-fix-header-conflicts-for-kernel-v4.18.patch
-
 BuildRequires:  clang
 BuildRequires:  coreutils
 BuildRequires:  cppcheck
@@ -426,6 +421,9 @@ popd
 
 
 %changelog
+* Tue Jul 31 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-10
+- Remove the kernel headers workaround
+
 * Fri Jul 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.1-9
 - Rebuild for new binutils