diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 102199d..d95e3e4 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,6 +1,6 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.29/audit2allow/avc.py --- nsapolicycoreutils/audit2allow/avc.py 2006-09-14 08:07:24.000000000 -0400 -+++ policycoreutils-1.30.29/audit2allow/avc.py 2006-09-21 10:20:57.000000000 -0400 ++++ policycoreutils-1.30.29/audit2allow/avc.py 2006-09-21 17:14:25.000000000 -0400 @@ -357,6 +357,15 @@ break else: @@ -17,10 +17,9 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/audit2a if found: self.translate(dict) found = 0 -Binary files nsapolicycoreutils/restorecon/restorecon and policycoreutils-1.30.29/restorecon/restorecon differ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecon/restorecon.8 policycoreutils-1.30.29/restorecon/restorecon.8 --- nsapolicycoreutils/restorecon/restorecon.8 2006-08-28 16:58:19.000000000 -0400 -+++ policycoreutils-1.30.29/restorecon/restorecon.8 2006-09-21 10:20:57.000000000 -0400 ++++ policycoreutils-1.30.29/restorecon/restorecon.8 2006-09-21 17:14:25.000000000 -0400 @@ -23,6 +23,9 @@ .SH "OPTIONS" @@ -33,7 +32,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restore .TP diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.30.29/restorecon/restorecon.c --- nsapolicycoreutils/restorecon/restorecon.c 2006-09-01 22:32:11.000000000 -0400 -+++ policycoreutils-1.30.29/restorecon/restorecon.c 2006-09-21 13:54:34.000000000 -0400 ++++ policycoreutils-1.30.29/restorecon/restorecon.c 2006-09-21 17:14:25.000000000 -0400 @@ -11,9 +11,10 @@ * restorecon [-Rnv] pathname... * @@ -188,17 +187,17 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restore + return errors; } -Binary files nsapolicycoreutils/restorecon/restorecon.o and policycoreutils-1.30.29/restorecon/restorecon.o differ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.30.29/restorecond/Makefile --- nsapolicycoreutils/restorecond/Makefile 2006-08-28 16:58:19.000000000 -0400 -+++ policycoreutils-1.30.29/restorecond/Makefile 2006-09-21 17:03:00.000000000 -0400 ++++ policycoreutils-1.30.29/restorecond/Makefile 2006-09-21 17:16:12.000000000 -0400 @@ -5,14 +5,14 @@ INITDIR = $(DESTDIR)/etc/rc.d/init.d SELINUXDIR = $(DESTDIR)/etc/selinux -CFLAGS ?= -g -Werror -Wall -W -+CFLAGS ?= -g -Werror -Wall -W -fPIE - override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64 +-override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64 ++CFLAGS ?= -g -Werror -Wall -W ++override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64 -fPIE LDLIBS += -lselinux -lsepol -L$(PREFIX)/lib all: restorecond @@ -211,7 +210,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restore [ -d $(MANDIR)/man8 ] || mkdir -p $(MANDIR)/man8 diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.29/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-09-01 22:32:11.000000000 -0400 -+++ policycoreutils-1.30.29/scripts/fixfiles 2006-09-21 10:20:57.000000000 -0400 ++++ policycoreutils-1.30.29/scripts/fixfiles 2006-09-21 17:14:25.000000000 -0400 @@ -117,7 +117,7 @@ exit $? fi @@ -240,7 +239,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts usage diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-1.30.29/scripts/fixfiles.8 --- nsapolicycoreutils/scripts/fixfiles.8 2006-08-28 16:58:19.000000000 -0400 -+++ policycoreutils-1.30.29/scripts/fixfiles.8 2006-09-21 10:20:57.000000000 -0400 ++++ policycoreutils-1.30.29/scripts/fixfiles.8 2006-09-21 17:14:25.000000000 -0400 @@ -3,9 +3,9 @@ fixfiles \- fix file security contexts. diff --git a/policycoreutils.spec b/policycoreutils.spec index ac6fbdb..e3cde97 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -81,7 +81,7 @@ rm -rf %{buildroot} %{_bindir}/semodule_deps %{_bindir}/semodule_expand %{_bindir}/semodule_link -%{_bindir}/semodule_package +%{_ppbindir}/semodule_package %{_mandir}/man8/chcat.8.gz %{_mandir}/man8/restorecond.8.gz %{_mandir}/man8/restorecon.8.gz