rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.449, 1.450 policycoreutils.spec, 1.650, 1.651
Daniel J Walsh
dwalsh at fedoraproject.org
Wed Oct 14 14:47:52 UTC 2009
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26783
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Wed Oct 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-9
- Move fixfiles man pages into the correct package
- Add genhomedircon to fixfiles restore
policycoreutils-rhat.patch:
Makefile | 2
audit2allow/audit2allow | 14
load_policy/Makefile | 5
restorecond/Makefile | 24 -
restorecond/org.selinux.Restorecond.service | 3
restorecond/restorecond |binary
restorecond/restorecond.c | 422 +++---------------
restorecond/restorecond.conf | 5
restorecond/restorecond.desktop | 7
restorecond/restorecond.h | 18
restorecond/restorecond.init | 5
restorecond/restorecond.o |binary
restorecond/restorecond_user.conf | 2
restorecond/stringslist.o |binary
restorecond/user.c | 237 ++++++++++
restorecond/user.o |binary
restorecond/utmpwatcher.o |binary
restorecond/watch.c | 253 +++++++++++
restorecond/watch.o |binary
sandbox/Makefile | 31 +
sandbox/deliverables/README | 32 +
sandbox/deliverables/basicwrapper | 4
sandbox/deliverables/run-in-sandbox.py | 49 ++
sandbox/deliverables/sandbox | 216 +++++++++
sandbox/sandbox | 242 ++++++++++
sandbox/sandbox.8 | 26 +
sandbox/sandboxX.sh | 16
sandbox/seunshare.c | 265 +++++++++++
scripts/Makefile | 2
scripts/chcat | 2
scripts/fixfiles | 1
semanage/semanage | 99 ++--
semanage/seobject.py | 209 +++++----
semodule/semodule.8 | 6
semodule/semodule.c | 53 ++
setfiles/Makefile | 2
setfiles/restore.c | 519 ++++++++++++++++++++++
setfiles/restore.h | 49 ++
setfiles/restore.o |binary
setfiles/setfiles.c | 643 +++-------------------------
40 files changed, 2399 insertions(+), 1064 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -p -r1.449 -r1.450
--- policycoreutils-rhat.patch 6 Oct 2009 16:09:52 -0000 1.449
+++ policycoreutils-rhat.patch 14 Oct 2009 14:47:50 -0000 1.450
@@ -124,6 +124,7 @@ diff --exclude-from=exclude --exclude=se
+[D-BUS Service]
+Name=org.selinux.Restorecond
+Exec=/usr/sbin/restorecond -u
+Binary files nsapolicycoreutils/restorecond/restorecond and policycoreutils-2.0.74/restorecond/restorecond differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.74/restorecond/restorecond.c
--- nsapolicycoreutils/restorecond/restorecond.c 2009-08-20 15:49:21.000000000 -0400
+++ policycoreutils-2.0.74/restorecond/restorecond.c 2009-09-24 22:59:01.000000000 -0400
@@ -690,12 +691,14 @@ diff --exclude-from=exclude --exclude=se
exit $RETVAL
-
+Binary files nsapolicycoreutils/restorecond/restorecond.o and policycoreutils-2.0.74/restorecond/restorecond.o differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.74/restorecond/restorecond_user.conf
--- nsapolicycoreutils/restorecond/restorecond_user.conf 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.74/restorecond/restorecond_user.conf 2009-09-20 21:26:36.000000000 -0400
@@ -0,0 +1,2 @@
+~/*
+~/public_html/*
+Binary files nsapolicycoreutils/restorecond/stringslist.o and policycoreutils-2.0.74/restorecond/stringslist.o differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.74/restorecond/user.c
--- nsapolicycoreutils/restorecond/user.c 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.74/restorecond/user.c 2009-09-20 21:26:36.000000000 -0400
@@ -937,6 +940,8 @@ diff --exclude-from=exclude --exclude=se
+ return 0;
+}
+
+Binary files nsapolicycoreutils/restorecond/user.o and policycoreutils-2.0.74/restorecond/user.o differ
+Binary files nsapolicycoreutils/restorecond/utmpwatcher.o and policycoreutils-2.0.74/restorecond/utmpwatcher.o differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.74/restorecond/watch.c
--- nsapolicycoreutils/restorecond/watch.c 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.74/restorecond/watch.c 2009-10-06 12:06:56.000000000 -0400
@@ -1194,6 +1199,7 @@ diff --exclude-from=exclude --exclude=se
+ exitApp("Error watching config file.");
+}
+
+Binary files nsapolicycoreutils/restorecond/watch.o and policycoreutils-2.0.74/restorecond/watch.o differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/deliverables/basicwrapper policycoreutils-2.0.74/sandbox/deliverables/basicwrapper
--- nsapolicycoreutils/sandbox/deliverables/basicwrapper 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.74/sandbox/deliverables/basicwrapper 2009-08-14 10:53:53.000000000 -0400
@@ -2123,6 +2129,17 @@ diff --exclude-from=exclude --exclude=se
sys.exit(errors)
+diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.74/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles 2009-08-05 15:10:56.000000000 -0400
++++ policycoreutils-2.0.74/scripts/fixfiles 2009-10-14 08:51:36.000000000 -0400
+@@ -136,6 +136,7 @@
+ fi
+ return
+ fi
++[ -x /usr/sbin/genhomedircon ] && /usr/sbin/genhomedircon
+ LogReadOnly
+ ${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
+ rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-*
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.74/scripts/Makefile
--- nsapolicycoreutils/scripts/Makefile 2008-08-28 09:34:24.000000000 -0400
+++ policycoreutils-2.0.74/scripts/Makefile 2009-09-20 21:26:36.000000000 -0400
@@ -3388,6 +3405,7 @@ diff --exclude-from=exclude --exclude=se
+int process_one(char *name, int recurse);
+
+#endif
+Binary files nsapolicycoreutils/setfiles/restore.o and policycoreutils-2.0.74/setfiles/restore.o differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.74/setfiles/setfiles.c
--- nsapolicycoreutils/setfiles/setfiles.c 2009-09-17 08:59:43.000000000 -0400
+++ policycoreutils-2.0.74/setfiles/setfiles.c 2009-09-20 21:26:36.000000000 -0400
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.650
retrieving revision 1.651
diff -u -p -r1.650 -r1.651
--- policycoreutils.spec 6 Oct 2009 16:09:53 -0000 1.650
+++ policycoreutils.spec 14 Oct 2009 14:47:51 -0000 1.651
@@ -6,7 +6,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.74
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -133,8 +133,6 @@ The policycoreutils-python package conta
%{_mandir}/ru/man8/chcat.8*
%{_mandir}/man8/semanage.8*
%{_mandir}/ru/man8/semanage.8*
-%{_mandir}/man8/fixfiles.8*
-%{_mandir}/ru/man8/fixfiles.8*
%post python
[ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen
@@ -249,6 +247,8 @@ rm -rf %{buildroot}
%{_sysconfdir}/xdg/autostart/restorecond.desktop
%{_datadir}/dbus-1/services/org.selinux.Restorecond.service
# selinux-policy Requires: policycoreutils, so we own this set of directories and our files within them
+%{_mandir}/man8/fixfiles.8*
+%{_mandir}/ru/man8/fixfiles.8*
%{_mandir}/man8/load_policy.8*
%{_mandir}/ru/man8/load_policy.8*
%{_mandir}/man8/open_init_pty.8*
@@ -296,6 +296,10 @@ fi
exit 0
%changelog
+* Wed Oct 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-9
+- Move fixfiles man pages into the correct package
+- Add genhomedircon to fixfiles restore
+
* Thu Oct 6 2009 Dan Walsh <dwalsh at redhat.com> 2.0.74-8
- Add check to sandbox to verify save changes - Chris Pardy
- Fix memory leak in restorecond - Steve Grubb
More information about the fedora-extras-commits
mailing list