From a99b7efd3ea909b2b5788e519a16d96a664547d8 Mon Sep 17 00:00:00 2001 From: Radovan Sroka Date: Thu, 29 Sep 2022 14:19:15 +0200 Subject: [PATCH] Fix eln building Signed-off-by: Radovan Sroka --- fapolicyd-uthash-bundle.patch | 16 ++++++++-------- fapolicyd.spec | 7 ++++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/fapolicyd-uthash-bundle.patch b/fapolicyd-uthash-bundle.patch index c482992..81c4ea8 100644 --- a/fapolicyd-uthash-bundle.patch +++ b/fapolicyd-uthash-bundle.patch @@ -1,7 +1,7 @@ diff -up ./configure.ac.uthash ./configure.ac ---- ./configure.ac.uthash 2021-03-25 22:12:48.164450403 +0100 -+++ ./configure.ac 2021-03-25 22:13:01.067282788 +0100 -@@ -67,10 +67,6 @@ AC_CHECK_HEADER(sys/fanotify.h, , [AC_MS +--- ./configure.ac.uthash 2022-09-27 16:34:59.000000000 +0200 ++++ ./configure.ac 2022-09-29 11:57:26.297879027 +0200 +@@ -81,10 +81,6 @@ AC_CHECK_HEADER(sys/fanotify.h, , [AC_MS ["Couldn't find sys/fanotify.h...your kernel might not be new enough"] )]) AC_CHECK_FUNCS(fexecve, [], []) @@ -13,8 +13,8 @@ diff -up ./configure.ac.uthash ./configure.ac echo Checking for required libraries AC_CHECK_LIB(udev, udev_device_get_devnode, , [AC_MSG_ERROR([libudev not found])], -ludev) diff -up ./src/library/rpm-backend.c.uthash ./src/library/rpm-backend.c ---- ./src/library/rpm-backend.c.uthash 2021-01-05 16:27:53.000000000 +0100 -+++ ./src/library/rpm-backend.c 2021-03-25 22:12:33.212644641 +0100 +--- ./src/library/rpm-backend.c.uthash 2022-09-29 11:57:26.297879027 +0200 ++++ ./src/library/rpm-backend.c 2022-09-29 11:58:45.470119807 +0200 @@ -32,7 +32,7 @@ #include #include @@ -23,10 +23,10 @@ diff -up ./src/library/rpm-backend.c.uthash ./src/library/rpm-backend.c +#include "uthash.h" #include "message.h" - + #include "gcc-attributes.h" diff -up ./src/Makefile.am.uthash ./src/Makefile.am ---- ./src/Makefile.am.uthash 2021-01-05 16:27:53.000000000 +0100 -+++ ./src/Makefile.am 2021-03-25 22:12:33.212644641 +0100 +--- ./src/Makefile.am.uthash 2022-09-27 16:34:59.000000000 +0200 ++++ ./src/Makefile.am 2022-09-29 11:57:26.297879027 +0200 @@ -5,6 +5,9 @@ AM_CPPFLAGS = \ -I${top_srcdir} \ -I${top_srcdir}/src/library diff --git a/fapolicyd.spec b/fapolicyd.spec index 438bb35..4cadc74 100644 --- a/fapolicyd.spec +++ b/fapolicyd.spec @@ -5,7 +5,7 @@ Summary: Application Whitelisting Daemon Name: fapolicyd Version: 1.1.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: http://people.redhat.com/sgrubb/fapolicyd Source0: https://people.redhat.com/sgrubb/fapolicyd/%{name}-%{version}.tar.gz @@ -84,7 +84,8 @@ interpret=`readelf -e /usr/bin/bash \ sed -i "s|%ld_so_path%|`realpath $interpret`|g" rules.d/*.rules %build -#./autogen.sh +cp INSTALL INSTALL.tmp +./autogen.sh %configure \ --with-audit \ --with-rpm \ @@ -209,7 +210,7 @@ fi %selinux_relabel_post -s %{selinuxtype} %changelog -* Thu Sep 29 2022 Radovan Sroka - 1.1.5.1 +* Thu Sep 29 2022 Radovan Sroka - 1.1.5.2 - rebase to 1.1.5 * Wed Aug 31 2022 Radovan Sroka - 1.1.4-4