policycoreutils: /usr merge

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

7 files changed, 88 insertions, 63 deletions

diff --git a/patches/policycoreutils-2.1.13/0001-restorecond-use-pkg-config.patch b/patches/policycoreutils-2.1.13/0001-restorecond-use-pkg-config.patch
index 89ff58637..83a9859fe 100644
--- a/patches/policycoreutils-2.1.13/0001-restorecond-use-pkg-config.patch
+++ b/patches/policycoreutils-2.1.13/0001-restorecond-use-pkg-config.patch
@@ -7,11 +7,11 @@ Subject: [PATCH] restorecond: use pkg-config
 Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- restorecond/Makefile |    8 ++++----
+ restorecond/Makefile | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/restorecond/Makefile b/restorecond/Makefile
-index 3074542..16e60e8 100644
+index 30745426db39..16e60e86ff39 100644
 --- a/restorecond/Makefile
 +++ b/restorecond/Makefile
 @@ -10,13 +10,13 @@ autostart_DATA = sealertauto.desktop
diff --git a/patches/policycoreutils-2.1.13/0002-makefile-remove-host-path-from-list-of-header-search.patch b/patches/policycoreutils-2.1.13/0002-makefile-remove-host-path-from-list-of-header-search.patch
index daa548110..1d1f8a80c 100644
--- a/patches/policycoreutils-2.1.13/0002-makefile-remove-host-path-from-list-of-header-search.patch
+++ b/patches/policycoreutils-2.1.13/0002-makefile-remove-host-path-from-list-of-header-search.patch
@@ -4,24 +4,24 @@ Subject: [PATCH] makefile: remove host path from list of header search dirs
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- load_policy/Makefile      |    2 +-
- newrole/Makefile          |    2 +-
- run_init/Makefile         |    2 +-
- sandbox/Makefile          |    2 +-
- secon/Makefile            |    2 +-
- semodule/Makefile         |    2 +-
- semodule_deps/Makefile    |    2 +-
- semodule_expand/Makefile  |    2 +-
- semodule_link/Makefile    |    2 +-
- semodule_package/Makefile |    2 +-
- sepolgen-ifgen/Makefile   |    2 +-
- sestatus/Makefile         |    2 +-
- setfiles/Makefile         |    2 +-
- setsebool/Makefile        |    2 +-
+ load_policy/Makefile      | 2 +-
+ newrole/Makefile          | 2 +-
+ run_init/Makefile         | 2 +-
+ sandbox/Makefile          | 2 +-
+ secon/Makefile            | 2 +-
+ semodule/Makefile         | 2 +-
+ semodule_deps/Makefile    | 2 +-
+ semodule_expand/Makefile  | 2 +-
+ semodule_link/Makefile    | 2 +-
+ semodule_package/Makefile | 2 +-
+ sepolgen-ifgen/Makefile   | 2 +-
+ sestatus/Makefile         | 2 +-
+ setfiles/Makefile         | 2 +-
+ setsebool/Makefile        | 2 +-
  14 files changed, 14 insertions(+), 14 deletions(-)
 
 diff --git a/load_policy/Makefile b/load_policy/Makefile
-index 5da2e0d..fb2dcae 100644
+index 5da2e0d21b6d..fb2dcae3a0ae 100644
 --- a/load_policy/Makefile
 +++ b/load_policy/Makefile
 @@ -6,7 +6,7 @@ MANDIR ?= $(PREFIX)/share/man
@@ -34,7 +34,7 @@ index 5da2e0d..fb2dcae 100644
  
  TARGETS=$(patsubst %.c,%,$(wildcard *.c))
 diff --git a/newrole/Makefile b/newrole/Makefile
-index 646cd4d..734b162 100644
+index 646cd4dd7214..734b1629e8ad 100644
 --- a/newrole/Makefile
 +++ b/newrole/Makefile
 @@ -22,7 +22,7 @@ VERSION = $(shell cat ../VERSION)
@@ -47,7 +47,7 @@ index 646cd4d..734b162 100644
  ifeq ($(PAMH), /usr/include/security/pam_appl.h)
  	override CFLAGS += -DUSE_PAM
 diff --git a/run_init/Makefile b/run_init/Makefile
-index 12b39b4..0949085 100644
+index 12b39b44a1f9..094908511a7f 100644
 --- a/run_init/Makefile
 +++ b/run_init/Makefile
 @@ -9,7 +9,7 @@ PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
@@ -60,7 +60,7 @@ index 12b39b4..0949085 100644
  ifeq ($(PAMH), /usr/include/security/pam_appl.h)
  	override CFLAGS += -DUSE_PAM
 diff --git a/sandbox/Makefile b/sandbox/Makefile
-index 981c56c..fcaef50 100644
+index 981c56c757bb..fcaef507e9b6 100644
 --- a/sandbox/Makefile
 +++ b/sandbox/Makefile
 @@ -7,7 +7,7 @@ SBINDIR ?= $(PREFIX)/sbin
@@ -73,7 +73,7 @@ index 981c56c..fcaef50 100644
  SEUNSHARE_OBJS = seunshare.o
  
 diff --git a/secon/Makefile b/secon/Makefile
-index a2d9ca6..4bd6e18 100644
+index a2d9ca6ef40b..4bd6e18d5680 100644
 --- a/secon/Makefile
 +++ b/secon/Makefile
 @@ -8,7 +8,7 @@ LIBDIR ?= $(PREFIX)/lib
@@ -86,7 +86,7 @@ index a2d9ca6..4bd6e18 100644
  
  all: secon
 diff --git a/semodule/Makefile b/semodule/Makefile
-index a90babe..e45b705 100644
+index a90babebe414..e45b7056f76b 100644
 --- a/semodule/Makefile
 +++ b/semodule/Makefile
 @@ -6,7 +6,7 @@ MANDIR = $(PREFIX)/share/man
@@ -99,7 +99,7 @@ index a90babe..e45b705 100644
  SEMODULE_OBJS = semodule.o
  
 diff --git a/semodule_deps/Makefile b/semodule_deps/Makefile
-index 28d667e..285e0d6 100644
+index 28d667e9f4b8..285e0d629075 100644
 --- a/semodule_deps/Makefile
 +++ b/semodule_deps/Makefile
 @@ -6,7 +6,7 @@ LIBDIR ?= $(PREFIX)/lib
@@ -112,7 +112,7 @@ index 28d667e..285e0d6 100644
  
  all: semodule_deps
 diff --git a/semodule_expand/Makefile b/semodule_expand/Makefile
-index d34d396..9bfecdf 100644
+index d34d3967b0a7..9bfecdf992d7 100644
 --- a/semodule_expand/Makefile
 +++ b/semodule_expand/Makefile
 @@ -6,7 +6,7 @@ LIBDIR ?= $(PREFIX)/lib
@@ -125,7 +125,7 @@ index d34d396..9bfecdf 100644
  
  all: semodule_expand
 diff --git a/semodule_link/Makefile b/semodule_link/Makefile
-index 5c11348..f8fc271 100644
+index 5c113483c34c..f8fc271b1242 100644
 --- a/semodule_link/Makefile
 +++ b/semodule_link/Makefile
 @@ -6,7 +6,7 @@ MANDIR ?= $(PREFIX)/share/man
@@ -138,7 +138,7 @@ index 5c11348..f8fc271 100644
  
  all: semodule_link
 diff --git a/semodule_package/Makefile b/semodule_package/Makefile
-index 928b5e3..dad21ec 100644
+index 928b5e36fc91..dad21ecb303c 100644
 --- a/semodule_package/Makefile
 +++ b/semodule_package/Makefile
 @@ -6,7 +6,7 @@ LIBDIR ?= $(PREFIX)/lib
@@ -151,7 +151,7 @@ index 928b5e3..dad21ec 100644
  
  all: semodule_package semodule_unpackage
 diff --git a/sepolgen-ifgen/Makefile b/sepolgen-ifgen/Makefile
-index 07af599..08f80b0 100644
+index 07af599124bb..08f80b01a1f8 100644
 --- a/sepolgen-ifgen/Makefile
 +++ b/sepolgen-ifgen/Makefile
 @@ -5,7 +5,7 @@ LIBDIR ?= $(PREFIX)/lib
@@ -164,7 +164,7 @@ index 07af599..08f80b0 100644
  
  all: sepolgen-ifgen-attr-helper
 diff --git a/sestatus/Makefile b/sestatus/Makefile
-index c5db7a3..46d4b81 100644
+index c5db7a33558b..46d4b81a7f72 100644
 --- a/sestatus/Makefile
 +++ b/sestatus/Makefile
 @@ -6,7 +6,7 @@ ETCDIR ?= $(DESTDIR)/etc
@@ -177,7 +177,7 @@ index c5db7a3..46d4b81 100644
  
  all: sestatus
 diff --git a/setfiles/Makefile b/setfiles/Makefile
-index 4b44b3c..579dc34 100644
+index 4b44b3c7a4e3..579dc3426908 100644
 --- a/setfiles/Makefile
 +++ b/setfiles/Makefile
 @@ -9,7 +9,7 @@ PROGRESS_STEP=$(shell grep "^\#define STAR_COUNT" restore.h | awk -S '{ print $$
@@ -190,7 +190,7 @@ index 4b44b3c..579dc34 100644
  
  ifeq ($(AUDITH), /usr/include/libaudit.h)
 diff --git a/setsebool/Makefile b/setsebool/Makefile
-index a6addc5..5fb13f2 100644
+index a6addc52e88e..5fb13f2667b5 100644
 --- a/setsebool/Makefile
 +++ b/setsebool/Makefile
 @@ -7,7 +7,7 @@ LIBDIR ?= $(PREFIX)/lib
diff --git a/patches/policycoreutils-2.1.13/0003-makefile-remove-host-path-from-list-of-linker-search.patch b/patches/policycoreutils-2.1.13/0003-makefile-remove-host-path-from-list-of-linker-search.patch
index 4c7c124c9..3a0145596 100644
--- a/patches/policycoreutils-2.1.13/0003-makefile-remove-host-path-from-list-of-linker-search.patch
+++ b/patches/policycoreutils-2.1.13/0003-makefile-remove-host-path-from-list-of-linker-search.patch
@@ -4,22 +4,22 @@ Subject: [PATCH] makefile: remove host path from list of linker search dirs
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- load_policy/Makefile      |    2 +-
- newrole/Makefile          |    2 +-
- run_init/Makefile         |    2 +-
- sandbox/Makefile          |    2 +-
- secon/Makefile            |    2 +-
- semodule/Makefile         |    2 +-
- semodule_expand/Makefile  |    2 +-
- semodule_link/Makefile    |    2 +-
- semodule_package/Makefile |    2 +-
- sestatus/Makefile         |    2 +-
- setfiles/Makefile         |    2 +-
- setsebool/Makefile        |    2 +-
+ load_policy/Makefile      | 2 +-
+ newrole/Makefile          | 2 +-
+ run_init/Makefile         | 2 +-
+ sandbox/Makefile          | 2 +-
+ secon/Makefile            | 2 +-
+ semodule/Makefile         | 2 +-
+ semodule_expand/Makefile  | 2 +-
+ semodule_link/Makefile    | 2 +-
+ semodule_package/Makefile | 2 +-
+ sestatus/Makefile         | 2 +-
+ setfiles/Makefile         | 2 +-
+ setsebool/Makefile        | 2 +-
  12 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/load_policy/Makefile b/load_policy/Makefile
-index fb2dcae..9478c0d 100644
+index fb2dcae3a0ae..9478c0dc220b 100644
 --- a/load_policy/Makefile
 +++ b/load_policy/Makefile
 @@ -7,7 +7,7 @@ LOCALEDIR ?= /usr/share/locale
@@ -32,7 +32,7 @@ index fb2dcae..9478c0d 100644
  TARGETS=$(patsubst %.c,%,$(wildcard *.c))
  
 diff --git a/newrole/Makefile b/newrole/Makefile
-index 734b162..e9834a3 100644
+index 734b1629e8ad..e9834a3c9310 100644
 --- a/newrole/Makefile
 +++ b/newrole/Makefile
 @@ -23,7 +23,7 @@ VERSION = $(shell cat ../VERSION)
@@ -45,7 +45,7 @@ index 734b162..e9834a3 100644
  	override CFLAGS += -DUSE_PAM
  	EXTRA_OBJS += hashtab.o
 diff --git a/run_init/Makefile b/run_init/Makefile
-index 0949085..da45cc2 100644
+index 094908511a7f..da45cc2ffff4 100644
 --- a/run_init/Makefile
 +++ b/run_init/Makefile
 @@ -10,7 +10,7 @@ AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
@@ -58,7 +58,7 @@ index 0949085..da45cc2 100644
  	override CFLAGS += -DUSE_PAM
  	LDLIBS += -lpam -lpam_misc
 diff --git a/sandbox/Makefile b/sandbox/Makefile
-index fcaef50..d0a7d5a 100644
+index fcaef507e9b6..d0a7d5a01735 100644
 --- a/sandbox/Makefile
 +++ b/sandbox/Makefile
 @@ -8,7 +8,7 @@ MANDIR ?= $(PREFIX)/share/man
@@ -71,7 +71,7 @@ index fcaef50..d0a7d5a 100644
  
  all: sandbox seunshare sandboxX.sh start
 diff --git a/secon/Makefile b/secon/Makefile
-index 4bd6e18..1f074ff 100644
+index 4bd6e18d5680..1f074ff1b0f7 100644
 --- a/secon/Makefile
 +++ b/secon/Makefile
 @@ -9,7 +9,7 @@ WARNS=-Werror -W -Wall -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wca
@@ -84,7 +84,7 @@ index 4bd6e18..1f074ff 100644
  all: secon
  
 diff --git a/semodule/Makefile b/semodule/Makefile
-index e45b705..5ac4393 100644
+index e45b7056f76b..5ac43930160b 100644
 --- a/semodule/Makefile
 +++ b/semodule/Makefile
 @@ -7,7 +7,7 @@ LIBDIR ?= $(PREFIX)/lib
@@ -97,7 +97,7 @@ index e45b705..5ac4393 100644
  
  all: semodule
 diff --git a/semodule_expand/Makefile b/semodule_expand/Makefile
-index 9bfecdf..9d9c3c9 100644
+index 9bfecdf992d7..9d9c3c9d8a45 100644
 --- a/semodule_expand/Makefile
 +++ b/semodule_expand/Makefile
 @@ -7,7 +7,7 @@ MANDIR ?= $(PREFIX)/share/man
@@ -110,7 +110,7 @@ index 9bfecdf..9d9c3c9 100644
  all: semodule_expand
  
 diff --git a/semodule_link/Makefile b/semodule_link/Makefile
-index f8fc271..cbb7cb7 100644
+index f8fc271b1242..cbb7cb76c9b0 100644
 --- a/semodule_link/Makefile
 +++ b/semodule_link/Makefile
 @@ -7,7 +7,7 @@ LIBDIR ?= $(PREFIX)/lib
@@ -123,7 +123,7 @@ index f8fc271..cbb7cb7 100644
  all: semodule_link
  
 diff --git a/semodule_package/Makefile b/semodule_package/Makefile
-index dad21ec..9238014 100644
+index dad21ecb303c..923801487112 100644
 --- a/semodule_package/Makefile
 +++ b/semodule_package/Makefile
 @@ -7,7 +7,7 @@ MANDIR ?= $(PREFIX)/share/man
@@ -136,7 +136,7 @@ index dad21ec..9238014 100644
  all: semodule_package semodule_unpackage
  
 diff --git a/sestatus/Makefile b/sestatus/Makefile
-index 46d4b81..1007d64 100644
+index 46d4b81a7f72..1007d6426d2c 100644
 --- a/sestatus/Makefile
 +++ b/sestatus/Makefile
 @@ -7,7 +7,7 @@ LIBDIR ?= $(PREFIX)/lib
@@ -149,7 +149,7 @@ index 46d4b81..1007d64 100644
  all: sestatus
  
 diff --git a/setfiles/Makefile b/setfiles/Makefile
-index 579dc34..33f1c11 100644
+index 579dc3426908..33f1c1100190 100644
 --- a/setfiles/Makefile
 +++ b/setfiles/Makefile
 @@ -10,7 +10,7 @@ ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{
@@ -162,7 +162,7 @@ index 579dc34..33f1c11 100644
  ifeq ($(AUDITH), /usr/include/libaudit.h)
  	override CFLAGS += -DUSE_AUDIT
 diff --git a/setsebool/Makefile b/setsebool/Makefile
-index 5fb13f2..f4bde6b 100644
+index 5fb13f2667b5..f4bde6b0be34 100644
 --- a/setsebool/Makefile
 +++ b/setsebool/Makefile
 @@ -8,7 +8,7 @@ BASHCOMPLETIONDIR ?= $(DESTDIR)/etc/bash_completion.d/
diff --git a/patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-and-AUDITH-to-be-overwritten-by-.patch b/patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-and-AUDITH-to-be-overwritten-by-.patch
index dc71a9a5e..94de5f4ee 100644
--- a/patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-and-AUDITH-to-be-overwritten-by-.patch
+++ b/patches/policycoreutils-2.1.13/0004-makefile-Allow-PAMH-and-AUDITH-to-be-overwritten-by-.patch
@@ -4,13 +4,13 @@ Subject: [PATCH] makefile: Allow PAMH and AUDITH to be overwritten by ENV
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- newrole/Makefile  |    4 ++--
- run_init/Makefile |    4 ++--
- setfiles/Makefile |    2 +-
+ newrole/Makefile  | 4 ++--
+ run_init/Makefile | 4 ++--
+ setfiles/Makefile | 2 +-
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/newrole/Makefile b/newrole/Makefile
-index e9834a3..96bf978 100644
+index e9834a3c9310..96bf978af16d 100644
 --- a/newrole/Makefile
 +++ b/newrole/Makefile
 @@ -4,8 +4,8 @@ BINDIR ?= $(PREFIX)/bin
@@ -25,7 +25,7 @@ index e9834a3..96bf978 100644
  # 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
+index da45cc2ffff4..43bd9350d3dd 100644
 --- a/run_init/Makefile
 +++ b/run_init/Makefile
 @@ -5,8 +5,8 @@ SBINDIR ?= $(PREFIX)/sbin
@@ -40,7 +40,7 @@ index da45cc2..43bd935 100644
  CFLAGS ?= -Werror -Wall -W
  override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
 diff --git a/setfiles/Makefile b/setfiles/Makefile
-index 33f1c11..4b3aaa0 100644
+index 33f1c1100190..4b3aaa0619c6 100644
 --- a/setfiles/Makefile
 +++ b/setfiles/Makefile
 @@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr
diff --git a/patches/policycoreutils-2.1.13/0005-fixfiles-tweaks-to-make-it-work-better-with-busybox.patch b/patches/policycoreutils-2.1.13/0005-fixfiles-tweaks-to-make-it-work-better-with-busybox.patch
index 16c10d74c..4c0b6cbff 100644
--- a/patches/policycoreutils-2.1.13/0005-fixfiles-tweaks-to-make-it-work-better-with-busybox.patch
+++ b/patches/policycoreutils-2.1.13/0005-fixfiles-tweaks-to-make-it-work-better-with-busybox.patch
@@ -4,11 +4,11 @@ Subject: [PATCH] fixfiles: tweaks to make it work better with busybox
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- scripts/fixfiles |   21 ++++++++++++---------
+ scripts/fixfiles | 21 ++++++++++++---------
  1 file changed, 12 insertions(+), 9 deletions(-)
 
 diff --git a/scripts/fixfiles b/scripts/fixfiles
-index 989b1ae..dc7d262 100755
+index 989b1ae618f5..dc7d26271966 100755
 --- a/scripts/fixfiles
 +++ b/scripts/fixfiles
 @@ -1,4 +1,4 @@
diff --git a/patches/policycoreutils-2.1.13/0006-don-t-overwrite-load_policy-with-a-link.patch b/patches/policycoreutils-2.1.13/0006-don-t-overwrite-load_policy-with-a-link.patch
new file mode 100644
index 000000000..41ece5a24
--- /dev/null
+++ b/patches/policycoreutils-2.1.13/0006-don-t-overwrite-load_policy-with-a-link.patch
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 11 Jan 2017 14:07:32 +0100
+Subject: [PATCH] don't overwrite load_policy with a link
+
+This may happen if SBINDIR is set to USRSBINDIR externaly.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ load_policy/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/load_policy/Makefile b/load_policy/Makefile
+index 9478c0dc220b..8510bb3f3866 100644
+--- a/load_policy/Makefile
++++ b/load_policy/Makefile
+@@ -19,7 +19,7 @@ install: all
+ 	test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8
+ 	install -m 644 load_policy.8 $(MANDIR)/man8/
+ 	-mkdir -p $(USRSBINDIR)
+-	-ln -sf /sbin/load_policy $(USRSBINDIR)/load_policy
++	-test $(SBINDIR)!= $(USRSBINDIR) && ln -sf /sbin/load_policy $(USRSBINDIR)/load_policy
+ 
+ clean:
+ 	-rm -f $(TARGETS) *.o 
diff --git a/patches/policycoreutils-2.1.13/series b/patches/policycoreutils-2.1.13/series
index 15ca306be..8ed668355 100644
--- a/patches/policycoreutils-2.1.13/series
+++ b/patches/policycoreutils-2.1.13/series
@@ -5,4 +5,5 @@
 0003-makefile-remove-host-path-from-list-of-linker-search.patch
 0004-makefile-Allow-PAMH-and-AUDITH-to-be-overwritten-by-.patch
 0005-fixfiles-tweaks-to-make-it-work-better-with-busybox.patch
-# b68072807b5c8140404f88de335c127e  - git-ptx-patches magic
+0006-don-t-overwrite-load_policy-with-a-link.patch
+# 4e764c33fa11d2732339b4d354a927e7  - git-ptx-patches magic