|
@@ -11,25 +11,14 @@ Updated to work with version 2.5
|
|
|
Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
|
|
|
Signed-off-by: Niranjan Reddy <niranjan.reddy@rockwellcollins.com>
|
|
|
Signed-off-by: Adam Duskett <AdamDuskett@outlook.com>
|
|
|
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
+[Update for 2.8]
|
|
|
---
|
|
|
load_policy/Makefile | 2 +-
|
|
|
newrole/Makefile | 6 +++---
|
|
|
run_init/Makefile | 6 +++---
|
|
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
|
|
-diff --git a/load_policy/Makefile b/load_policy/Makefile
|
|
|
-index b85833c..6a45f31 100644
|
|
|
---- a/load_policy/Makefile
|
|
|
-+++ b/load_policy/Makefile
|
|
|
-@@ -2,7 +2,7 @@
|
|
|
- PREFIX ?= $(DESTDIR)/usr
|
|
|
- SBINDIR ?= $(DESTDIR)/sbin
|
|
|
- MANDIR ?= $(PREFIX)/share/man
|
|
|
--LOCALEDIR ?= /usr/share/locale
|
|
|
-+LOCALEDIR ?= $(PREFIX)/share/locale
|
|
|
-
|
|
|
- CFLAGS ?= -Werror -Wall -W
|
|
|
- override CFLAGS += $(LDFLAGS) -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
|
|
|
diff --git a/newrole/Makefile b/newrole/Makefile
|
|
|
index 196af92..896708f 100644
|
|
|
--- a/newrole/Makefile
|
|
@@ -37,13 +26,12 @@ index 196af92..896708f 100644
|
|
|
@@ -3,9 +3,9 @@ PREFIX ?= $(DESTDIR)/usr
|
|
|
BINDIR ?= $(PREFIX)/bin
|
|
|
MANDIR ?= $(PREFIX)/share/man
|
|
|
- ETCDIR ?= $(DESTDIR)/etc
|
|
|
--LOCALEDIR = /usr/share/locale
|
|
|
+ ETCDIR ?= /etc
|
|
|
+ LOCALEDIR = $(DESTDIR)$(PREFIX)/share/locale
|
|
|
-PAMH ?= $(shell test -f /usr/include/security/pam_appl.h && echo y)
|
|
|
-AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y)
|
|
|
-+LOCALEDIR = $(PREFIX)/share/locale
|
|
|
-+PAMH ?= $(shell test -f $(PREFIX)/include/security/pam_appl.h && echo y)
|
|
|
-+AUDITH ?= $(shell test -f $(PREFIX)/include/libaudit.h && echo y)
|
|
|
++PAMH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/security/pam_appl.h && echo y)
|
|
|
++AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y)
|
|
|
# Enable capabilities to permit newrole to generate audit records.
|
|
|
# This will make newrole a setuid root program.
|
|
|
# The capabilities used are: CAP_AUDIT_WRITE.
|
|
@@ -54,13 +42,12 @@ index 921f0b0..e1566fc 100644
|
|
|
@@ -4,9 +4,9 @@ PREFIX ?= $(DESTDIR)/usr
|
|
|
SBINDIR ?= $(PREFIX)/sbin
|
|
|
MANDIR ?= $(PREFIX)/share/man
|
|
|
- ETCDIR ?= $(DESTDIR)/etc
|
|
|
--LOCALEDIR ?= /usr/share/locale
|
|
|
+ ETCDIR ?= /etc
|
|
|
+ LOCALEDIR ?= $(DESTDIR)$(PREFIX)/share/locale
|
|
|
-PAMH ?= $(shell test -f /usr/include/security/pam_appl.h && echo y)
|
|
|
-AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y)
|
|
|
-+LOCALEDIR ?= $(PREFIX)/share/locale
|
|
|
-+PAMH ?= $(shell test -f $(PREFIX)/include/security/pam_appl.h && echo y)
|
|
|
-+AUDITH ?= $(shell test -f $(PREFIX)/include/libaudit.h && echo y)
|
|
|
++PAMH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/security/pam_appl.h && echo y)
|
|
|
++AUDITH ?= $(shell test -f $(DESTDIR)$(PREFIX)/include/libaudit.h && echo y)
|
|
|
|
|
|
CFLAGS ?= -Werror -Wall -W
|
|
|
override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
|