From a835e72e16a9005483526da329b59d4e64964c72ee0b98312140e3619034f377 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 19 Jan 2009 01:10:52 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libsemanage?expand=0&rev=6 --- libsemanage-2.0.31-rhat.patch | 22 ++++++++++++++++++++++ libsemanage.changes | 5 +++++ libsemanage.spec | 4 +++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/libsemanage-2.0.31-rhat.patch b/libsemanage-2.0.31-rhat.patch index dadbfeb..0fdaa4a 100644 --- a/libsemanage-2.0.31-rhat.patch +++ b/libsemanage-2.0.31-rhat.patch @@ -23,3 +23,25 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanag #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.changes b/libsemanage.changes index 5b0507b..92be80a 100644 --- a/libsemanage.changes +++ b/libsemanage.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 16 14:24:38 CET 2009 - prusnak@suse.cz + +- fix assignment of wrong context [bnc#466793] + ------------------------------------------------------------------- Wed Jan 14 14:06:28 CET 2009 - prusnak@suse.cz diff --git a/libsemanage.spec b/libsemanage.spec index c93c461..6236a28 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -25,7 +25,7 @@ BuildRequires: libsepol-devel >= %{libsepol_ver} Name: libsemanage Version: 2.0.31 -Release: 1 +Release: 2 Url: http://www.nsa.gov/selinux/ License: LGPL v2.1 only Group: System/Libraries @@ -168,6 +168,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/python*/site-packages/* %changelog +* Fri Jan 16 2009 prusnak@suse.cz +- fix assignment of wrong context [bnc#466793] * Wed Jan 14 2009 prusnak@suse.cz - updated to 2.0.31 * policy module compression (bzip) support from Dan Walsh