sopos / rpms / fapolicyd

Forked from rpms/fapolicyd 2 years ago
Clone

Blame fapolicyd-uthash-bundle.patch

907e9a0
diff -up ./configure.ac.uthash ./configure.ac
907e9a0
--- ./configure.ac.uthash	2021-03-25 22:12:48.164450403 +0100
907e9a0
+++ ./configure.ac	2021-03-25 22:13:01.067282788 +0100
907e9a0
@@ -67,10 +67,6 @@ AC_CHECK_HEADER(sys/fanotify.h, , [AC_MS
907e9a0
 ["Couldn't find sys/fanotify.h...your kernel might not be new enough"] )])
907e9a0
 AC_CHECK_FUNCS(fexecve, [], [])
907e9a0
 
907e9a0
-AC_CHECK_HEADER(uthash.h, , [AC_MSG_ERROR(
907e9a0
-["Couldn't find uthash.h...uthash-devel is missing"] )])
907e9a0
-
907e9a0
-
907e9a0
 echo .
907e9a0
 echo Checking for required libraries
907e9a0
 AC_CHECK_LIB(udev, udev_device_get_devnode, , [AC_MSG_ERROR([libudev not found])], -ludev)
907e9a0
diff -up ./src/library/rpm-backend.c.uthash ./src/library/rpm-backend.c
907e9a0
--- ./src/library/rpm-backend.c.uthash	2021-01-05 16:27:53.000000000 +0100
907e9a0
+++ ./src/library/rpm-backend.c	2021-03-25 22:12:33.212644641 +0100
907e9a0
@@ -32,7 +32,7 @@
907e9a0
 #include <rpm/rpmdb.h>
907e9a0
 #include <fnmatch.h>
907e9a0
 
907e9a0
-#include <uthash.h>
907e9a0
+#include "uthash.h"
907e9a0
 
907e9a0
 #include "message.h"
907e9a0
 
907e9a0
diff -up ./src/Makefile.am.uthash ./src/Makefile.am
907e9a0
--- ./src/Makefile.am.uthash	2021-01-05 16:27:53.000000000 +0100
907e9a0
+++ ./src/Makefile.am	2021-03-25 22:12:33.212644641 +0100
907e9a0
@@ -5,6 +5,9 @@ AM_CPPFLAGS = \
907e9a0
 	-I${top_srcdir} \
907e9a0
 	-I${top_srcdir}/src/library
907e9a0
 
907e9a0
+AM_CPPFLAGS += \
907e9a0
+	-I${top_srcdir}/uthash-2.3.0/include
907e9a0
+
907e9a0
 sbin_PROGRAMS = fapolicyd fapolicyd-cli
907e9a0
 lib_LTLIBRARIES= libfapolicyd.la
907e9a0