rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.155, 1.156 policycoreutils.spec, 1.225, 1.226
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 25 19:08:00 UTC 2006
- Previous message (by thread): rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.45, 1.46 java-1.4.2-gcj-compat.spec, 1.120, 1.121 sources, 1.49, 1.50
- Next message (by thread): rpms/rhgb/devel rhgb-0.16.2-scale-logos.patch, NONE, 1.1 rhgb.spec, 1.45, 1.46
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4163
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Wed Jan 25 2006 Dan Walsh <dwalsh at redhat.com> 1.29.11-2
- Correct handling of symbolic links in restorecon
policycoreutils-rhat.patch:
restorecon/restorecon.c | 8 +-
scripts/chcat | 2
semanage/semanage | 149 +++++++++++-------------------------------------
semanage/semanage.8 | 26 ++++----
4 files changed, 55 insertions(+), 130 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- policycoreutils-rhat.patch 25 Jan 2006 16:07:46 -0000 1.155
+++ policycoreutils-rhat.patch 25 Jan 2006 19:07:56 -0000 1.156
@@ -1,6 +1,39 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.10/scripts/chcat
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.29.11/restorecon/restorecon.c
+--- nsapolicycoreutils/restorecon/restorecon.c 2006-01-13 09:47:40.000000000 -0500
++++ policycoreutils-1.29.11/restorecon/restorecon.c 2006-01-25 14:03:12.000000000 -0500
+@@ -140,6 +140,7 @@
+ fprintf(stderr,"Warning! %s refers to a symbolic link, not following last component.\n", filename);
+ char *p = NULL, *file_sep;
+ char *tmp_path = strdupa(filename);
++ size_t len=0;
+ if (!tmp_path) {
+ fprintf(stderr,"strdupa on %s failed: %s\n", filename,strerror(errno));
+ return 1;
+@@ -150,8 +151,11 @@
+ *file_sep = 0;
+ file_sep++;
+ p = realpath(tmp_path, path);
++ }
++ else {
++ file_sep = tmp_path;
++ p = realpath("./", path);
+ }
+- size_t len;
+ if(p)
+ len = strlen(p);
+ if (!p || len + strlen(file_sep) + 2 > PATH_MAX) {
+@@ -162,7 +166,7 @@
+ *p = '/';
+ p++;
+ strcpy(p, file_sep);
+- filename = p;
++ filename = path;
+ } else {
+ char *p;
+ p = realpath(filename, path);
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.11/scripts/chcat
--- nsapolicycoreutils/scripts/chcat 2006-01-19 16:00:44.000000000 -0500
-+++ policycoreutils-1.29.10/scripts/chcat 2006-01-20 17:17:02.000000000 -0500
++++ policycoreutils-1.29.11/scripts/chcat 2006-01-25 11:13:33.000000000 -0500
@@ -356,7 +356,7 @@
if list_ind==0 and len(cmds) < 1:
@@ -10,9 +43,9 @@
usage()
if delete_ind:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.10/semanage/semanage
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.11/semanage/semanage
--- nsapolicycoreutils/semanage/semanage 2006-01-20 10:37:37.000000000 -0500
-+++ policycoreutils-1.29.10/semanage/semanage 2006-01-20 15:17:56.000000000 -0500
++++ policycoreutils-1.29.11/semanage/semanage 2006-01-25 11:13:33.000000000 -0500
@@ -30,28 +30,27 @@
def usage(message = ""):
@@ -264,9 +297,9 @@
if object == "port":
OBJECT.delete(target, proto)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.10/semanage/semanage.8
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.11/semanage/semanage.8
--- nsapolicycoreutils/semanage/semanage.8 2006-01-20 10:37:37.000000000 -0500
-+++ policycoreutils-1.29.10/semanage/semanage.8 2006-01-20 15:10:15.000000000 -0500
++++ policycoreutils-1.29.11/semanage/semanage.8 2006-01-25 11:13:33.000000000 -0500
@@ -3,19 +3,19 @@
semanage \- SELinux Policy Management tool
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- policycoreutils.spec 25 Jan 2006 16:18:51 -0000 1.225
+++ policycoreutils.spec 25 Jan 2006 19:07:56 -0000 1.226
@@ -4,7 +4,7 @@
Summary: SELinux policy core utilities.
Name: policycoreutils
Version: 1.29.11
-Release: 1
+Release: 2
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -97,6 +97,9 @@
%{_libdir}/python2.4/site-packages/seobject.py*
%changelog
+* Wed Jan 25 2006 Dan Walsh <dwalsh at redhat.com> 1.29.11-2
+- Correct handling of symbolic links in restorecon
+
* Wed Jan 25 2006 Dan Walsh <dwalsh at redhat.com> 1.29.11-1
- Added translation support to semanage
- Update from upstream
- Previous message (by thread): rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.45, 1.46 java-1.4.2-gcj-compat.spec, 1.120, 1.121 sources, 1.49, 1.50
- Next message (by thread): rpms/rhgb/devel rhgb-0.16.2-scale-logos.patch, NONE, 1.1 rhgb.spec, 1.45, 1.46
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list