From 3ba3702e624da0a89a4a79b7ee9f89721ffe0160 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Dec 2021 18:38:57 +0000 Subject: [PATCH] ima-evm-utils: 1.1 -> 1.4 --- .../linux/ima-evm-utils/default.nix | 8 +- .../linux/ima-evm-utils/xattr.patch | 73 ------------------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 4 insertions(+), 81 deletions(-) delete mode 100644 pkgs/os-specific/linux/ima-evm-utils/xattr.patch diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index 14ddc21bb6b..afd46f0d9e8 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -2,20 +2,18 @@ stdenv.mkDerivation rec { pname = "ima-evm-utils"; - version = "1.1"; + version = "1.4"; src = fetchgit { url = "git://git.code.sf.net/p/linux-ima/ima-evm-utils"; rev = "v${version}"; - sha256 = "1dhfw6d9z4dv82q9zg2g025hgr179kamz9chy7v5w9b71aam8jf8"; + sha256 = "1zmyv82232lzqk52m0s7fap9zb9hb1x6nsi5gznk0cbsnq2m67pc"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl attr keyutils asciidoc libxslt ]; - patches = [ ./xattr.patch ]; - - buildPhase = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"; + MANPAGE_DOCBOOK_XSL = "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"; meta = { description = "evmctl utility to manage digital signatures of the Linux kernel integrity subsystem (IMA/EVM)"; diff --git a/pkgs/os-specific/linux/ima-evm-utils/xattr.patch b/pkgs/os-specific/linux/ima-evm-utils/xattr.patch deleted file mode 100644 index 2d27570a578..00000000000 --- a/pkgs/os-specific/linux/ima-evm-utils/xattr.patch +++ /dev/null @@ -1,73 +0,0 @@ -commit 6aea54d2ad2287b3e8894c262ee895f3d4a60516 -Author: André Draszik -Date: Mon Oct 17 12:45:32 2016 +0100 - - evmctl: use correct include for xattr.h - - The xattr API/ABI is provided by both the c-library, as well as by the - libattr package. The c-library's header file is sys/xattr.h, whereas - libattr's header file can be found in attr/xattr.h. - - Given none of the code here *links* against the libattr.so shared library, it - is wrong to *compile* against libattr's API (header file). - - Doing so avoids confusion as to which xattr.h is used as the least problem, - and potential ABI differences as the worst problem due the mismatching header - file used. - - So make sure we compile and link against the same thing, the c-library in - both cases. - - Signed-off-by: André Draszik - Signed-off-by: Mimi Zohar - -diff --git a/configure.ac b/configure.ac -index 0497eb7..a5b4288 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -30,7 +30,7 @@ AC_SUBST(OPENSSL_LIBS) - AC_CHECK_HEADER(unistd.h) - AC_CHECK_HEADERS(openssl/conf.h) - --AC_CHECK_HEADERS(attr/xattr.h, , [AC_MSG_ERROR([attr/xattr.h header not found. You need the libattr development package.])]) -+AC_CHECK_HEADERS(sys/xattr.h, , [AC_MSG_ERROR([sys/xattr.h header not found. You need the c-library development package.])]) - AC_CHECK_HEADERS(keyutils.h, , [AC_MSG_ERROR([keyutils.h header not found. You need the libkeyutils development package.])]) - - #debug support - yes for a while -diff --git a/packaging/ima-evm-utils.spec b/packaging/ima-evm-utils.spec -index a11a27a..63388d2 100644 ---- a/packaging/ima-evm-utils.spec -+++ b/packaging/ima-evm-utils.spec -@@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - BuildRequires: autoconf - BuildRequires: automake - BuildRequires: openssl-devel --BuildRequires: libattr-devel - BuildRequires: keyutils-libs-devel - - %description -diff --git a/packaging/ima-evm-utils.spec.in b/packaging/ima-evm-utils.spec.in -index 7ca6c6f..65c32f9 100644 ---- a/packaging/ima-evm-utils.spec.in -+++ b/packaging/ima-evm-utils.spec.in -@@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - BuildRequires: autoconf - BuildRequires: automake - BuildRequires: openssl-devel --BuildRequires: libattr-devel - BuildRequires: keyutils-libs-devel - - %description -diff --git a/src/evmctl.c b/src/evmctl.c -index 2ffee78..3fbcd33 100644 ---- a/src/evmctl.c -+++ b/src/evmctl.c -@@ -49,7 +49,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33b494c083c..5b6ba36ef64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22321,9 +22321,7 @@ with pkgs; ifmetric = callPackage ../os-specific/linux/ifmetric {}; - ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { - openssl = openssl_1_0_2; - }; + ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils {}; intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { };