diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 7ed3ebb..6883eb3 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -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 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycore 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 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policy 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 diff --git a/policycoreutils.spec b/policycoreutils.spec index 64b8541..14b8a1d 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -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 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Wed Jan 25 2006 Dan Walsh 1.29.11-2 +- Correct handling of symbolic links in restorecon + * Wed Jan 25 2006 Dan Walsh 1.29.11-1 - Added translation support to semanage - Update from upstream