summaryrefslogtreecommitdiffstats
path: root/patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-AUDITH-and-INOTIFYH-to-be-overwr.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-AUDITH-and-INOTIFYH-to-be-overwr.patch')
-rw-r--r--patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-AUDITH-and-INOTIFYH-to-be-overwr.patch68
1 files changed, 68 insertions, 0 deletions
diff --git a/patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-AUDITH-and-INOTIFYH-to-be-overwr.patch b/patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-AUDITH-and-INOTIFYH-to-be-overwr.patch
new file mode 100644
index 000000000..27f46209b
--- /dev/null
+++ b/patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-AUDITH-and-INOTIFYH-to-be-overwr.patch
@@ -0,0 +1,68 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Tue, 15 Jan 2013 11:33:01 +0100
+Subject: [PATCH] makefile: Allow PAMH, AUDITH and INOTIFYH to be overwritten
+ by ENV
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ Makefile | 2 +-
+ newrole/Makefile | 4 ++--
+ run_init/Makefile | 4 ++--
+ setfiles/Makefile | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 77d8c80..7c85244 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ SUBDIRS = setfiles semanage load_policy newrole run_init sandbox secon audit2allow audit2why sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui
+
+-INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
++INOTIFYH ?= $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
+
+ ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
+ SUBDIRS += restorecond
+diff --git a/newrole/Makefile b/newrole/Makefile
+index e9834a3..96bf978 100644
+--- a/newrole/Makefile
++++ b/newrole/Makefile
+@@ -4,8 +4,8 @@ BINDIR ?= $(PREFIX)/bin
+ MANDIR ?= $(PREFIX)/share/man
+ ETCDIR ?= $(DESTDIR)/etc
+ LOCALEDIR = /usr/share/locale
+-PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
+-AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
++PAMH ?= $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
++AUDITH ?= $(shell ls /usr/include/libaudit.h 2>/dev/null)
+ # Enable capabilities to permit newrole to generate audit records.
+ # This will make newrole a setuid root program.
+ # The capabilities used are: CAP_AUDIT_WRITE.
+diff --git a/run_init/Makefile b/run_init/Makefile
+index da45cc2..43bd935 100644
+--- a/run_init/Makefile
++++ b/run_init/Makefile
+@@ -5,8 +5,8 @@ SBINDIR ?= $(PREFIX)/sbin
+ MANDIR ?= $(PREFIX)/share/man
+ ETCDIR ?= $(DESTDIR)/etc
+ LOCALEDIR ?= /usr/share/locale
+-PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
+-AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
++PAMH ?= $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
++AUDITH ?= $(shell ls /usr/include/libaudit.h 2>/dev/null)
+
+ CFLAGS ?= -Werror -Wall -W
+ override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
+diff --git a/setfiles/Makefile b/setfiles/Makefile
+index 33f1c11..4b3aaa0 100644
+--- a/setfiles/Makefile
++++ b/setfiles/Makefile
+@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr
+ SBINDIR ?= $(DESTDIR)/sbin
+ MANDIR = $(PREFIX)/share/man
+ LIBDIR ?= $(PREFIX)/lib
+-AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
++AUDITH ?= $(shell ls /usr/include/libaudit.h 2>/dev/null)
+
+ PROGRESS_STEP=$(shell grep "^\#define STAR_COUNT" restore.h | awk -S '{ print $$3 }')
+ ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }')