rpms/policycoreutils/F-13 policycoreutils-rhat.patch, 1.496, 1.497 policycoreutils.spec, 1.708, 1.709 selinux-polgengui.desktop, 1.3, 1.4 system-config-selinux.desktop, 1.4, 1.5
Daniel J Walsh
dwalsh at fedoraproject.org
Fri May 14 13:03:05 UTC 2010
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30566
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
selinux-polgengui.desktop system-config-selinux.desktop
Log Message:
* Thu May 13 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-18
- Fix sandbox error handling on copyfile
- Fix desktop files
policycoreutils-rhat.patch:
Makefile | 2
audit2allow/Makefile | 1
audit2allow/audit2allow | 53 --
audit2allow/audit2allow.1 | 3
audit2allow/sepolgen-ifgen | 89 ---
newrole/newrole.c | 3
restorecond/Makefile | 24
restorecond/org.selinux.Restorecond.service | 3
restorecond/restorecond.8 | 15
restorecond/restorecond.c | 429 +++--------------
restorecond/restorecond.conf | 5
restorecond/restorecond.desktop | 7
restorecond/restorecond.h | 19
restorecond/restorecond.init | 7
restorecond/restorecond_user.conf | 2
restorecond/user.c | 239 +++++++++
restorecond/watch.c | 260 ++++++++++
sandbox/Makefile | 41 +
sandbox/deliverables/README | 32 +
sandbox/deliverables/basicwrapper | 4
sandbox/deliverables/run-in-sandbox.py | 49 +
sandbox/deliverables/sandbox | 216 ++++++++
sandbox/sandbox | 421 ++++++++++++++++
sandbox/sandbox.8 | 57 ++
sandbox/sandbox.config | 2
sandbox/sandbox.init | 67 ++
sandbox/sandboxX.sh | 15
sandbox/seunshare.c | 288 +++++++++++
sandbox/test.txt | 1
sandbox/test_sandbox.py | 98 +++
scripts/fixfiles | 46 -
semanage/default_encoding/Makefile | 8
semanage/default_encoding/default_encoding.c | 59 ++
semanage/default_encoding/policycoreutils/__init__.py | 17
semanage/default_encoding/setup.py | 38 +
semanage/semanage | 162 +++++-
semanage/semanage.8 | 128 ++++-
semanage/seobject.py | 451 ++++++++++++++----
sepolgen-ifgen/Makefile | 26 +
sepolgen-ifgen/sepolgen-ifgen | 131 +++++
sepolgen-ifgen/sepolgen-ifgen-attr-helper.c | 230 +++++++++
setfiles/restore.c | 109 +++-
setfiles/restore.h | 4
setfiles/restorecon.8 | 7
setfiles/setfiles.8 | 3
setfiles/setfiles.c | 78 ---
46 files changed, 3197 insertions(+), 752 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/policycoreutils-rhat.patch,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- policycoreutils-rhat.patch 11 May 2010 20:28:00 -0000 1.496
+++ policycoreutils-rhat.patch 14 May 2010 13:03:01 -0000 1.497
@@ -1814,8 +1814,8 @@ diff --exclude-from=exclude --exclude=se
+relabel:
diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.82/sandbox/sandbox
--- nsapolicycoreutils/sandbox/sandbox 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.82/sandbox/sandbox 2010-05-11 16:22:45.000000000 -0400
-@@ -0,0 +1,416 @@
++++ policycoreutils-2.0.82/sandbox/sandbox 2010-05-13 08:55:59.000000000 -0400
+@@ -0,0 +1,421 @@
+#! /usr/bin/python -E
+# Authors: Dan Walsh <dwalsh at redhat.com>
+# Authors: Josh Cogliati
@@ -1895,10 +1895,15 @@ diff --exclude-from=exclude --exclude=se
+ os.makedirs(newdir)
+ dest = newdir + "/" + bname
+
-+ if os.path.isdir(file):
-+ shutil.copytree(file, dest)
-+ else:
-+ shutil.copy2(file, dest)
++ try:
++ if os.path.isdir(file):
++ shutil.copytree(file, dest)
++ else:
++ shutil.copy2(file, dest)
++ except shutil.Error, elist:
++ for e in elist:
++ print e[1]
++
+ X_FILES[file] = (dest, os.path.getmtime(dest))
+
+def savefile(new, orig, X_ind):
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/policycoreutils.spec,v
retrieving revision 1.708
retrieving revision 1.709
diff -u -p -r1.708 -r1.709
--- policycoreutils.spec 11 May 2010 20:28:01 -0000 1.708
+++ policycoreutils.spec 14 May 2010 13:03:04 -0000 1.709
@@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.82
-Release: 17%{?dist}
+Release: 18%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -143,7 +143,7 @@ The policycoreutils-python package conta
%{_mandir}/ru/man8/semanage.8*
%post python
-selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen
+selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 2>/dev/null
exit 0
%package sandbox
@@ -167,7 +167,8 @@ The policycoreutils-python package conta
%{_datadir}/sandbox/sandboxX.sh
%triggerin python -- selinux-policy
-selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen
+. /etc/selinux/config
+selinuxenabled && [ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen 2>/dev/null
exit 0
%post sandbox
@@ -306,6 +307,10 @@ fi
exit 0
%changelog
+* Thu May 13 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-18
+- Fix sandbox error handling on copyfile
+- Fix desktop files
+
* Tue May 11 2010 Dan Walsh <dwalsh at redhat.com> 2.0.82-17
- Fix policy tool to have correct name in menus
- Fix seunshare to handle /tmp being in ~/home
Index: selinux-polgengui.desktop
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/selinux-polgengui.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- selinux-polgengui.desktop 11 May 2010 19:53:45 -0000 1.3
+++ selinux-polgengui.desktop 14 May 2010 13:03:04 -0000 1.4
@@ -2,7 +2,7 @@
Name=SELinux Policy Generation Tool
Comment=Generate SELinux policy modules
StartupNotify=true
-Icon=system-config-selinux.png
+Icon=system-config-selinux
Exec=/usr/bin/selinux-polgengui
Type=Application
Terminal=false
Index: system-config-selinux.desktop
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-13/system-config-selinux.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- system-config-selinux.desktop 23 Aug 2007 14:24:19 -0000 1.4
+++ system-config-selinux.desktop 14 May 2010 13:03:04 -0000 1.5
@@ -1,9 +1,8 @@
[Desktop Entry]
Name=SELinux Management
-GenericName=SELinux
Comment=Configure SELinux in a graphical setting
StartupNotify=true
-Icon=/usr/share/system-config-selinux/system-config-selinux.png
+Icon=system-config-selinux
Exec=/usr/bin/system-config-selinux
Type=Application
Terminal=false
More information about the scm-commits
mailing list