From 3c43993d6c579aabdecbc709efc383bfa10d793a Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Jan 15 2009 20:56:45 +0000 Subject: - Fix link to only link on sandbox --- diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch index 8349206..d5c0cbb 100644 --- a/libsemanage-rhat.patch +++ b/libsemanage-rhat.patch @@ -1,7 +1,7 @@ -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.30/src/genhomedircon.c +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.31/src/genhomedircon.c --- nsalibsemanage/src/genhomedircon.c 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.30/src/genhomedircon.c 2009-01-12 10:29:24.000000000 -0500 -@@ -794,6 +792,12 @@ ++++ libsemanage-2.0.31/src/genhomedircon.c 2009-01-15 15:53:31.000000000 -0500 +@@ -794,6 +794,12 @@ * /root */ continue; } @@ -14,12 +14,34 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libseman if (push_user_entry(&head, name, seuname, prefix, pwent->pw_dir) != STATUS_SUCCESS) { *errors = STATUS_ERR; -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.30/src/semanage.conf +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.31/src/semanage.conf --- nsalibsemanage/src/semanage.conf 2008-08-28 09:34:24.000000000 -0400 -+++ libsemanage-2.0.30/src/semanage.conf 2009-01-12 10:29:24.000000000 -0500 ++++ libsemanage-2.0.31/src/semanage.conf 2009-01-15 15:53:31.000000000 -0500 @@ -35,4 +35,4 @@ # given in . Change this setting if a different # version is necessary. #policy-version = 19 - +expand-check=0 +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.31/src/semanage_store.c +--- nsalibsemanage/src/semanage_store.c 2009-01-13 08:45:35.000000000 -0500 ++++ libsemanage-2.0.31/src/semanage_store.c 2009-01-15 15:53:46.000000000 -0500 +@@ -440,8 +440,6 @@ + char tmp[PATH_MAX]; + char buf[4192]; + +- if (link(src,dst) == 0) return 0; +- + n = snprintf(tmp, PATH_MAX, "%s.tmp", dst); + if (n < 0 || n >= PATH_MAX) + return -1; +@@ -509,7 +507,8 @@ + goto cleanup; + } + } else if (S_ISREG(sb.st_mode)) { +- if (semanage_copy_file(path, path2, sb.st_mode) == -1) { ++ if ((link(path,path2) == -1) && ++ (semanage_copy_file(path, path2, sb.st_mode) == -1)) { + goto cleanup; + } + } diff --git a/libsemanage.spec b/libsemanage.spec index 9894301..fe99de2 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -3,7 +3,7 @@ Summary: SELinux binary policy manipulation library Name: libsemanage Version: 2.0.31 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz @@ -90,6 +90,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/python*/site-packages/* %changelog +* Thu Jan 15 2009 Dan Walsh - 2.0.31-2 +- Fix link to only link on sandbox + * Mon Jan 12 2009 Dan Walsh - 2.0.31-1 - Update to upstream * Policy module compression (bzip) support from Dan Walsh.