perfinion 14/12/06 23:28:23
Modified: 0030-make-inotify-check-use-flag-triggered.patch
0020-disable-autodetection-of-pam-and-audit.patch
Log:
version bump and ebuild clean up, drop old RC
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
0x7EF137EC935B0EAF)
Revision Changes Path
1.2
sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch?r1=1.1&r2=1.2
Index: 0030-make-inotify-check-use-flag-triggered.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0030-make-inotify-check-use-flag-triggered.patch 21 Sep 2014 10:22:56
-0000 1.1
+++ 0030-make-inotify-check-use-flag-triggered.patch 6 Dec 2014 23:28:23
-0000 1.2
@@ -5,10 +5,10 @@
SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init secon
audit2allow sestatus semodule_package semodule semodule_link semodule_expand
semodule_deps sepolgen-ifgen setsebool scripts po man gui hll
-INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
-+INOTIFYH ?= n
++INOTIFYH ?= no
-ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
-+ifeq (${INOTIFYH}, y)
++ifeq (${INOTIFYH}, yes)
SUBDIRS += restorecond
endif
1.2
sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch?r1=1.1&r2=1.2
Index: 0020-disable-autodetection-of-pam-and-audit.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0020-disable-autodetection-of-pam-and-audit.patch 21 Sep 2014 10:22:56
-0000 1.1
+++ 0020-disable-autodetection-of-pam-and-audit.patch 6 Dec 2014 23:28:23
-0000 1.2
@@ -7,8 +7,8 @@
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 ?= n
-+AUDITH ?= n
++PAMH ?= no
++AUDITH ?= no
# Enable capabilities to permit newrole to generate audit records.
# This will make newrole a setuid root program.
# The capabilities used are: CAP_AUDIT_WRITE.
@@ -17,7 +17,7 @@
override CFLAGS += -DVERSION=\"$(VERSION)\" $(LDFLAGS) -I$(PREFIX)/include
-DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
LDLIBS += -lselinux -L$(PREFIX)/lib
-ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), y)
++ifeq ($(PAMH), yes)
override CFLAGS += -DUSE_PAM
EXTRA_OBJS += hashtab.o
LDLIBS += -lpam -lpam_misc
@@ -26,7 +26,7 @@
LDLIBS += -lcrypt
endif
-ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), y)
++ifeq ($(AUDITH), yes)
override CFLAGS += -DUSE_AUDIT
LDLIBS += -laudit
endif
@@ -44,7 +44,7 @@
install -m $(MODE) newrole $(BINDIR)
install -m 644 newrole.1 $(MANDIR)/man1/
-ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), y)
++ifeq ($(PAMH), yes)
test -d $(ETCDIR)/pam.d || install -m 755 -d $(ETCDIR)/pam.d
ifeq ($(LSPP_PRIV),y)
install -m 644 newrole-lspp.pamd $(ETCDIR)/pam.d/newrole
@@ -57,14 +57,14 @@
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 ?= n
-+AUDITH ?= n
++PAMH ?= no
++AUDITH ?= no
CFLAGS ?= -Werror -Wall -W
override CFLAGS += -I$(PREFIX)/include -DUSE_NLS
-DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
LDLIBS += -lselinux -L$(PREFIX)/lib
-ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), y)
++ifeq ($(PAMH), yes)
override CFLAGS += -DUSE_PAM
LDLIBS += -lpam -lpam_misc
else
@@ -72,7 +72,7 @@
LDLIBS += -lcrypt
endif
-ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), y)
++ifeq ($(AUDITH), yes)
override CFLAGS += -DUSE_AUDIT
LDLIBS += -laudit
endif
@@ -81,7 +81,7 @@
install -m 644 run_init.8 $(MANDIR)/man8/
install -m 644 open_init_pty.8 $(MANDIR)/man8/
-ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), y)
++ifeq ($(PAMH), yes)
install -m 644 run_init.pamd $(ETCDIR)/pam.d/run_init
endif
@@ -93,7 +93,7 @@
MANDIR = $(PREFIX)/share/man
LIBDIR ?= $(PREFIX)/lib
-AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+AUDITH ?= n
++AUDITH ?= no
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 }')
@@ -102,7 +102,7 @@
LDLIBS = -lselinux -lsepol -L$(LIBDIR)
-ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), y)
++ifeq ($(AUDITH), yes)
override CFLAGS += -DUSE_AUDIT
LDLIBS += -laudit
endif
