Add patch to work around FTBFS on rawhide

This commit adds a temporary workaround for failing builds with the new
4.18-rcX kernel on rawhide. The issue will likely be fixed in the kernel
before the final 4.18 release. The workaround can be removed then.

Upstream issue: https://github.com/smuellerDD/libkcapi/issues/59
This commit is contained in:
Ondrej Mosnacek 2018-07-12 09:17:12 +02:00
parent 8d36778e3a
commit 2fb9e7a34e
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,24 @@
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"

View File

@ -91,7 +91,7 @@ bin/kcapi-hasher -n fipshmac "$lib_path"/libkcapi.so.%{version} \\\
Name: libkcapi
Version: %{vmajor}.%{vminor}.%{vpatch}
Release: 3%{?dist}
Release: 4%{?dist}
Summary: User space interface to the Linux Kernel Crypto API
License: BSD or GPLv2
@ -102,6 +102,11 @@ Source1: http://www.chronox.de/%{name}/%{name}-%{version}.tar.xz.asc
Patch0: %{giturl}/pull/60.patch#/%{name}-1.1.1-kcapi-hasher_Fix_command-line_parsing.patch
Patch1: %{giturl}/pull/61.patch#/%{name}-1.1.1-kcapi-hasher_Fix_off-by-one_error.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
@ -419,6 +424,9 @@ popd
%changelog
* Thu Jul 12 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-4
- Add patch to work around FTBFS on rawhide
* Wed Jul 11 2018 Ondrej Mosnáček <omosnace@redhat.com> - 1.1.1-3
- Fix off-by-one error in checkfile parsing