policycoreutils/selinux-sandbox-fedora.patch

diff --git selinux-sandbox-2.7/Makefile selinux-sandbox-2.7/Makefile
index 05c3d65..49c1d3f 100644
--- selinux-sandbox-2.7/Makefile
+++ selinux-sandbox-2.7/Makefile
@@ -1,13 +1,11 @@
 PYTHON ?= python
 
 # Installation directories.
-PREFIX ?= $(DESTDIR)/usr
-SYSCONFDIR ?= $(DESTDIR)/etc/sysconfig
-LIBDIR ?= $(PREFIX)/lib
+PREFIX ?= /usr
+SYSCONFDIR ?= /etc/sysconfig
 BINDIR ?= $(PREFIX)/bin
 SBINDIR ?= $(PREFIX)/sbin
 MANDIR ?= $(PREFIX)/share/man
-LOCALEDIR ?= /usr/share/locale
 SHAREDIR ?= $(PREFIX)/share/sandbox
 override CFLAGS += -DPACKAGE="\"policycoreutils\"" -Wall -Werror -Wextra -W
 override LDLIBS += -lselinux -lcap-ng
@@ -18,20 +16,20 @@ all: sandbox seunshare sandboxX.sh start
 seunshare: $(SEUNSHARE_OBJS)
 
 install: all
-	-mkdir -p $(BINDIR)
-	install -m 755 sandbox $(BINDIR)
-	-mkdir -p $(MANDIR)/man8
-	install -m 644 sandbox.8 $(MANDIR)/man8/
-	install -m 644 seunshare.8 $(MANDIR)/man8/
-	-mkdir -p $(MANDIR)/man5
-	install -m 644 sandbox.5 $(MANDIR)/man5/
-	-mkdir -p $(SBINDIR)
-	install -m 4755 seunshare $(SBINDIR)/
-	-mkdir -p $(SHAREDIR)
-	install -m 755 sandboxX.sh $(SHAREDIR)
-	install -m 755 start $(SHAREDIR)
-	-mkdir -p $(SYSCONFDIR)
-	install -m 644 sandbox.conf $(SYSCONFDIR)/sandbox
+	-mkdir -p $(DESTDIR)$(BINDIR)
+	install -m 755 sandbox $(DESTDIR)$(BINDIR)
+	-mkdir -p $(DESTDIR)$(MANDIR)/man8
+	install -m 644 sandbox.8 $(DESTDIR)$(MANDIR)/man8/
+	install -m 644 seunshare.8 $(DESTDIR)$(MANDIR)/man8/
+	-mkdir -p $(DESTDIR)$(MANDIR)/man5
+	install -m 644 sandbox.5 $(DESTDIR)$(MANDIR)/man5/
+	-mkdir -p $(DESTDIR)$(SBINDIR)
+	install -m 4755 seunshare $(DESTDIR)$(SBINDIR)/
+	-mkdir -p $(DESTDIR)$(SHAREDIR)
+	install -m 755 sandboxX.sh $(DESTDIR)$(SHAREDIR)
+	install -m 755 start $(DESTDIR)$(SHAREDIR)
+	-mkdir -p $(DESTDIR)$(SYSCONFDIR)
+	install -m 644 sandbox.conf $(DESTDIR)$(SYSCONFDIR)/sandbox
 
 test:
 	@$(PYTHON) test_sandbox.py -v
diff --git selinux-sandbox-2.7/sandboxX.sh selinux-sandbox-2.7/sandboxX.sh
index eaa500d..4774528 100644
--- selinux-sandbox-2.7/sandboxX.sh
+++ selinux-sandbox-2.7/sandboxX.sh
@@ -20,7 +20,7 @@ cat > ~/.config/openbox/rc.xml << EOF
 </openbox_config>
 EOF
 
-(/usr/bin/Xephyr -resizeable -title "$TITLE" -terminate -screen $SCREENSIZE -dpi $DPI -nolisten tcp -displayfd 5 5>&1 2>/dev/null) | while read D; do
+(/usr/bin/Xephyr -resizeable -title "$TITLE" -terminate -reset -screen $SCREENSIZE -dpi $DPI -nolisten tcp -displayfd 5 5>&1 2>/dev/null) | while read D; do
     export DISPLAY=:$D
     cat > ~/seremote << __EOF
 #!/bin/sh
policycoreutils-2.7-15 - sepolicy: Fix translated strings with parameters - sepolicy: Support non-MLS policy - sepolicy: Initialize policy.ports as a dict in generate.py - gui/polgengui.py: Use stop_emission_by_name instead of emit_stop_by_name - Minor update for bash completion - semodule_package: fix semodule_unpackage man page - gui/semanagePage: Close "edit" and "add" dialogues when successfull - gui/fcontextPage: Set default object class in addDialog\ - sepolgen: fix typo in PolicyGenerator - build: follow standard semantics for DESTDIR and PREFIX 2018-03-13 13:43:27 +00:00			`diff --git selinux-sandbox-2.7/Makefile selinux-sandbox-2.7/Makefile`
			`index 05c3d65..49c1d3f 100644`
			`--- selinux-sandbox-2.7/Makefile`
			`+++ selinux-sandbox-2.7/Makefile`
			`@@ -1,13 +1,11 @@`
			`PYTHON ?= python`

			`# Installation directories.`
			`-PREFIX ?= $(DESTDIR)/usr`
			`-SYSCONFDIR ?= $(DESTDIR)/etc/sysconfig`
			`-LIBDIR ?= $(PREFIX)/lib`
			`+PREFIX ?= /usr`
			`+SYSCONFDIR ?= /etc/sysconfig`
			`BINDIR ?= $(PREFIX)/bin`
			`SBINDIR ?= $(PREFIX)/sbin`
			`MANDIR ?= $(PREFIX)/share/man`
			`-LOCALEDIR ?= /usr/share/locale`
			`SHAREDIR ?= $(PREFIX)/share/sandbox`
			`override CFLAGS += -DPACKAGE="\"policycoreutils\"" -Wall -Werror -Wextra -W`
			`override LDLIBS += -lselinux -lcap-ng`
			`@@ -18,20 +16,20 @@ all: sandbox seunshare sandboxX.sh start`
			`seunshare: $(SEUNSHARE_OBJS)`

			`install: all`
			`- -mkdir -p $(BINDIR)`
			`- install -m 755 sandbox $(BINDIR)`
			`- -mkdir -p $(MANDIR)/man8`
			`- install -m 644 sandbox.8 $(MANDIR)/man8/`
			`- install -m 644 seunshare.8 $(MANDIR)/man8/`
			`- -mkdir -p $(MANDIR)/man5`
			`- install -m 644 sandbox.5 $(MANDIR)/man5/`
			`- -mkdir -p $(SBINDIR)`
			`- install -m 4755 seunshare $(SBINDIR)/`
			`- -mkdir -p $(SHAREDIR)`
			`- install -m 755 sandboxX.sh $(SHAREDIR)`
			`- install -m 755 start $(SHAREDIR)`
			`- -mkdir -p $(SYSCONFDIR)`
			`- install -m 644 sandbox.conf $(SYSCONFDIR)/sandbox`
			`+ -mkdir -p $(DESTDIR)$(BINDIR)`
			`+ install -m 755 sandbox $(DESTDIR)$(BINDIR)`
			`+ -mkdir -p $(DESTDIR)$(MANDIR)/man8`
			`+ install -m 644 sandbox.8 $(DESTDIR)$(MANDIR)/man8/`
			`+ install -m 644 seunshare.8 $(DESTDIR)$(MANDIR)/man8/`
			`+ -mkdir -p $(DESTDIR)$(MANDIR)/man5`
			`+ install -m 644 sandbox.5 $(DESTDIR)$(MANDIR)/man5/`
			`+ -mkdir -p $(DESTDIR)$(SBINDIR)`
			`+ install -m 4755 seunshare $(DESTDIR)$(SBINDIR)/`
			`+ -mkdir -p $(DESTDIR)$(SHAREDIR)`
			`+ install -m 755 sandboxX.sh $(DESTDIR)$(SHAREDIR)`
			`+ install -m 755 start $(DESTDIR)$(SHAREDIR)`
			`+ -mkdir -p $(DESTDIR)$(SYSCONFDIR)`
			`+ install -m 644 sandbox.conf $(DESTDIR)$(SYSCONFDIR)/sandbox`

			`test:`
			`@$(PYTHON) test_sandbox.py -v`
policycoreutils-2.7-1 - Update to upstream release 2017-08-04 - Move DBUS API from -gui to -dbus package 2017-08-07 15:13:28 +00:00			`diff --git selinux-sandbox-2.7/sandboxX.sh selinux-sandbox-2.7/sandboxX.sh`
			`index eaa500d..4774528 100644`
			`--- selinux-sandbox-2.7/sandboxX.sh`
			`+++ selinux-sandbox-2.7/sandboxX.sh`
			`@@ -20,7 +20,7 @@ cat > ~/.config/openbox/rc.xml << EOF`
			`</openbox_config>`
			`EOF`

			`-(/usr/bin/Xephyr -resizeable -title "$TITLE" -terminate -screen $SCREENSIZE -dpi $DPI -nolisten tcp -displayfd 5 5>&1 2>/dev/null) \| while read D; do`
			`+(/usr/bin/Xephyr -resizeable -title "$TITLE" -terminate -reset -screen $SCREENSIZE -dpi $DPI -nolisten tcp -displayfd 5 5>&1 2>/dev/null) \| while read D; do`
			`export DISPLAY=:$D`
			`cat > ~/seremote << __EOF`
			`#!/bin/sh`