rpms/policycoreutils/devel .cvsignore, 1.147, 1.148 policycoreutils-rhat.patch, 1.299, 1.300 policycoreutils.spec, 1.404, 1.405 sources, 1.152, 1.153
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 24 14:44:09 UTC 2007
Author: dwalsh
Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2750
Modified Files:
.cvsignore policycoreutils-rhat.patch policycoreutils.spec
sources
Log Message:
* Tue Apr 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-1
- Updated version of policycoreutils
* Merged chcat, fixfiles, genhomedircon, restorecond, and restorecon patches from Dan Walsh.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- .cvsignore 12 Apr 2007 16:51:50 -0000 1.147
+++ .cvsignore 24 Apr 2007 14:44:06 -0000 1.148
@@ -145,3 +145,4 @@
policycoreutils-2.0.8.tgz
sepolgen-1.0.8.tgz
policycoreutils-2.0.9.tgz
+policycoreutils-2.0.10.tgz
policycoreutils-rhat.patch:
ChangeLog | 3 ---
Makefile | 2 +-
audit2allow/Makefile | 3 ++-
audit2why/Makefile | 2 +-
restorecon/restorecon.c | 15 +++++++++++----
restorecond/restorecond.c | 12 +++++++-----
restorecond/restorecond.conf | 3 +++
scripts/genhomedircon | 24 +++++++++++++++++-------
semanage/seobject.py | 10 +++++++---
9 files changed, 49 insertions(+), 25 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- policycoreutils-rhat.patch 20 Apr 2007 18:01:26 -0000 1.299
+++ policycoreutils-rhat.patch 24 Apr 2007 14:44:06 -0000 1.300
@@ -1,6 +1,6 @@
diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-2.0.9/audit2allow/Makefile
--- nsapolicycoreutils/audit2allow/Makefile 2007-02-07 12:11:49.000000000 -0500
-+++ policycoreutils-2.0.9/audit2allow/Makefile 2007-04-18 14:32:01.000000000 -0400
++++ policycoreutils-2.0.9/audit2allow/Makefile 2007-04-23 13:08:07.000000000 -0400
@@ -1,6 +1,7 @@
# Installation directories.
PREFIX ?= ${DESTDIR}/usr
@@ -29,6 +29,16 @@
LIBDIR ?= ${PREFIX}/lib
MANDIR ?= $(PREFIX)/share/man
LOCALEDIR ?= /usr/share/locale
+diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/ChangeLog policycoreutils-2.0.9/ChangeLog
+--- nsapolicycoreutils/ChangeLog 2007-04-24 10:36:17.000000000 -0400
++++ policycoreutils-2.0.9/ChangeLog 2007-04-12 12:43:10.000000000 -0400
+@@ -1,6 +1,3 @@
+-2.0.10 2007-04-24
+- * Merged chcat, fixfiles, genhomedircon, restorecond, and restorecon patches from Dan Walsh.
+-
+ 2.0.9 2007-04-12
+ * Merged seobject setransRecords patch to return the first alias from Xavier Toth.
+
diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.9/Makefile
--- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500
+++ policycoreutils-2.0.9/Makefile 2007-04-16 13:26:34.000000000 -0400
@@ -39,7 +49,7 @@
all install relabel clean indent:
@for subdir in $(SUBDIRS); do \
diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-2.0.9/restorecon/restorecon.c
---- nsapolicycoreutils/restorecon/restorecon.c 2006-11-16 17:14:26.000000000 -0500
+--- nsapolicycoreutils/restorecon/restorecon.c 2007-04-24 10:36:17.000000000 -0400
+++ policycoreutils-2.0.9/restorecon/restorecon.c 2007-04-18 14:26:39.000000000 -0400
@@ -16,6 +16,7 @@
* -v Show changes in file labels.
@@ -57,7 +67,7 @@
#define STAT_BLOCK_SIZE 1
static int pipe_fds[2] = { -1, -1 };
static unsigned long long count = 0;
-@@ -326,18 +328,20 @@
+@@ -326,17 +328,19 @@
rc = fork();
if (rc == 0) {
close(pipe_fds[0]);
@@ -75,13 +85,11 @@
if (!file_exist && errno == ENOENT)
return;
fprintf(stderr,
-- "%s: error while labeling files under %s\n",
-- progname, buf);
+- "%s: error while traversing %s: %s\n",
+ "%s: %s: %s\n",
-+ progname, buf, strerror(errno));
+ progname, buf, strerror(errno));
errors++;
}
- }
@@ -367,11 +371,14 @@
set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
@@ -141,75 +149,10 @@
+/etc/lvm/.cache
~/public_html
~/.mozilla/plugins/libflashplayer.so
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.9/restorecond/restorecond.init
---- nsapolicycoreutils/restorecond/restorecond.init 2007-03-01 17:23:40.000000000 -0500
-+++ policycoreutils-2.0.9/restorecond/restorecond.init 2007-04-16 13:26:34.000000000 -0400
-@@ -73,6 +73,7 @@
- ;;
- status)
- status restorecond
-+ RETVAL=$?
- ;;
- restart|reload)
- restart
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.9/scripts/chcat
---- nsapolicycoreutils/scripts/chcat 2007-02-22 08:53:22.000000000 -0500
-+++ policycoreutils-2.0.9/scripts/chcat 2007-04-16 13:26:34.000000000 -0400
-@@ -74,9 +74,11 @@
- if i not in cats:
- cats.append(i)
-
-- new_serange = "%s-%s:%s" % (serange[0], top[0], string.join(cats, ","))
-- if new_serange[-1:] == ":":
-- new_serange = new_serange[:-1]
-+
-+ if len(cats) > 0:
-+ new_serange = "%s-%s:%s" % (serange[0], top[0], ",".join(cats))
-+ else
-+ new_serange = "%s-%s" % (serange[0], top[0])
-
- if add_ind:
- cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u)
-@@ -151,10 +153,11 @@
- if i in cats:
- cats.remove(i)
-
-- new_serange = "%s-%s:%s" % (serange[0], top[0], string.join(cats, ","))
-- if new_serange[-1:] == ":":
-- new_serange = new_serange[:-1]
--
-+ if len(cats) > 0:
-+ new_serange = "%s-%s:%s" % (serange[0], top[0], ",".join(cats))
-+ else
-+ new_serange = "%s-%s" % (serange[0], top[0])
-+
- if add_ind:
- cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u)
- else:
-diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.9/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles 2007-01-11 08:56:30.000000000 -0500
-+++ policycoreutils-2.0.9/scripts/fixfiles 2007-04-16 13:26:34.000000000 -0400
-@@ -138,7 +138,7 @@
- exit $?
- fi
- LogReadOnly
--${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
-+${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
- exit $?
- }
-
diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.9/scripts/genhomedircon
---- nsapolicycoreutils/scripts/genhomedircon 2006-11-28 09:24:33.000000000 -0500
+--- nsapolicycoreutils/scripts/genhomedircon 2007-04-24 10:36:17.000000000 -0400
+++ policycoreutils-2.0.9/scripts/genhomedircon 2007-04-20 13:58:01.000000000 -0400
-@@ -26,6 +26,7 @@
-
- import sys, os, pwd, string, getopt, re
- from semanage import *;
-+import selinux
- import gettext
- gettext.install('policycoreutils')
-
-@@ -135,6 +136,9 @@
+@@ -136,6 +136,9 @@
self.contextdir = "/contexts"
self.filecontextdir = self.contextdir+"/files"
self.usepwd = usepwd
@@ -219,7 +162,7 @@
def getFileContextDir(self):
return self.selinuxdir+self.type+self.filecontextdir
-@@ -211,6 +215,10 @@
+@@ -212,6 +215,10 @@
prefs["prefix"] = prefix
prefs["home"] = home
udict[user] = prefs
@@ -230,7 +173,7 @@
def getUsers(self):
udict = {}
-@@ -219,7 +227,11 @@
+@@ -220,7 +227,11 @@
for seuser in list:
user = []
seusername = semanage_seuser_get_sename(seuser)
@@ -243,19 +186,7 @@
else:
try:
-@@ -249,7 +261,10 @@
- i = i.replace("HOME_DIR", home)
- i = i.replace("ROLE", prefix)
- i = i.replace("system_u", seuser)
-- ret = ret+i
-+ # Validate if the generated context exists. Some user types may not exist
-+ scon = i.split()[-1]
-+ if selinux.security_check_context(scon) == 0:
-+ ret = ret+i
- fd.close()
- return ret
-
-@@ -266,12 +281,11 @@
+@@ -270,12 +281,11 @@
return ret
def genHomeDirContext(self):
@@ -271,7 +202,7 @@
return ret+"\n"
def checkExists(self, home):
-@@ -318,9 +332,9 @@
+@@ -322,9 +332,9 @@
def genoutput(self):
ret = self.heading()
for h in self.getHomeDirs():
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- policycoreutils.spec 20 Apr 2007 18:01:27 -0000 1.404
+++ policycoreutils.spec 24 Apr 2007 14:44:07 -0000 1.405
@@ -5,8 +5,8 @@
%define sepolgenver 1.0.8
Summary: SELinux policy core utilities.
Name: policycoreutils
-Version: 2.0.9
-Release: 10%{?dist}
+Version: 2.0.10
+Release: 1%{?dist}
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -192,6 +192,10 @@
fi
%changelog
+* Tue Apr 24 2007 Dan Walsh <dwalsh at redhat.com> 2.0.10-1
+- Updated version of policycoreutils
+ * Merged chcat, fixfiles, genhomedircon, restorecond, and restorecon patches from Dan Walsh.
+
* Fri Apr 20 2007 Dan Walsh <dwalsh at redhat.com> 2.0.9-10
- Fix genhomedircon to handle non user_u for the default user
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- sources 12 Apr 2007 16:51:50 -0000 1.152
+++ sources 24 Apr 2007 14:44:07 -0000 1.153
@@ -1,2 +1,2 @@
4d6e57c7fc396efbcf96b7accab4ba30 sepolgen-1.0.8.tgz
-daa0a6e388b811b1a64a1504ca37b41d policycoreutils-2.0.9.tgz
+6c44f3d0aa3f76efff635669b8d189d3 policycoreutils-2.0.10.tgz
More information about the fedora-cvs-commits
mailing list