From 6c41ba29e81672cda8cdcddd5396571fb79e790e Mon Sep 17 00:00:00 2001 From: Steve Grubb Date: Mon, 28 Jun 2021 18:08:19 -0400 Subject: [PATCH] Do not use custom sbindir and libdir in configure --- audit-3.0.3-lmrt.patch | 12 ++++++++++++ audit.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 audit-3.0.3-lmrt.patch diff --git a/audit-3.0.3-lmrt.patch b/audit-3.0.3-lmrt.patch new file mode 100644 index 0000000..1d7c8ae --- /dev/null +++ b/audit-3.0.3-lmrt.patch @@ -0,0 +1,12 @@ +diff -urp audit-3.0.3.orig/src/Makefile.in audit-3.0.3/src/Makefile.in +--- audit-3.0.3.orig/src/Makefile.in 2021-06-28 18:04:56.450429090 -0400 ++++ audit-3.0.3/src/Makefile.in 2021-06-28 18:05:37.325424715 -0400 +@@ -487,7 +487,7 @@ auditd_SOURCES = auditd.c auditd-event.c + $(am__append_1) + auditd_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pthread -Wno-pointer-sign + auditd_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now +-auditd_LDADD = @LIBWRAP_LIBS@ ${top_builddir}/src/libev/libev.la ${top_builddir}/audisp/libdisp.la ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la -lpthread -lm -lrt $(gss_libs) ${top_builddir}/common/libaucommon.la ++auditd_LDADD = @LIBWRAP_LIBS@ ${top_builddir}/src/libev/libev.la ${top_builddir}/audisp/libdisp.la ${top_builddir}/lib/libaudit.la ${top_builddir}/auparse/libauparse.la -lpthread $(gss_libs) ${top_builddir}/common/libaucommon.la + auditctl_SOURCES = auditctl.c auditctl-llist.c delete_all.c auditctl-listing.c + auditctl_CFLAGS = -fPIE -DPIE -g -D_GNU_SOURCE + auditctl_LDFLAGS = -pie -Wl,-z,relro -Wl,-z,now diff --git a/audit.spec b/audit.spec index 4654336..c0a1056 100644 --- a/audit.spec +++ b/audit.spec @@ -7,6 +7,7 @@ License: GPLv2+ URL: http://people.redhat.com/sgrubb/audit/ Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz Source1: https://www.gnu.org/licenses/lgpl-2.1.txt +Patch1: audit-3.0.3-lmrt.patch BuildRequires: make gcc swig BuildRequires: openldap-devel @@ -87,6 +88,7 @@ Management Facility) database, through an IBM Tivoli Directory Server %prep %setup -q cp %{SOURCE1} . +%patch1 -p1 # Remove the ids code, its not ready sed -i 's/ ids / /' audisp/plugins/Makefile.in