From be45950990e6651a63872d6fa4a500ae2b0d8aeb Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 16 Feb 2010 21:35:16 +0000 Subject: [PATCH] * Thu Feb 16 2010 Dan Walsh 2.0.79-1 - Update to upstream * Fix double-free in newrole - Fix python language handling --- policycoreutils-rhat.patch | 18 +++++++++++------- policycoreutils.spec | 2 ++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index f1d109e..ead4dd0 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -4183,7 +4183,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po } diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.79/setfiles/restore.c --- nsapolicycoreutils/setfiles/restore.c 2009-11-03 09:21:40.000000000 -0500 -+++ policycoreutils-2.0.79/setfiles/restore.c 2010-02-16 13:46:01.000000000 -0500 ++++ policycoreutils-2.0.79/setfiles/restore.c 2010-02-16 16:32:12.000000000 -0500 @@ -1,4 +1,5 @@ #include "restore.h" +#include @@ -4206,19 +4206,23 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po } void restore_init(struct restore_opts *opts) -@@ -303,6 +302,12 @@ - FTS *fts_handle; - FTSENT *ftsent; - +@@ -300,8 +299,14 @@ + int rc = 0; + const char *namelist[2] = {name, NULL}; + dev_t dev_num = 0; +- FTS *fts_handle; +- FTSENT *ftsent; ++ FTS *fts_handle = NULL; ++ FTSENT *ftsent = NULL; ++ + if (r_opts == NULL){ + fprintf(stderr, + "Must call initialize first!"); + goto err; + } -+ + fts_handle = fts_open((char **)namelist, r_opts->fts_flags, NULL); if (fts_handle == NULL) { - fprintf(stderr, @@ -357,6 +362,29 @@ goto out; } diff --git a/policycoreutils.spec b/policycoreutils.spec index 9501328..a722ede 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -33,6 +33,7 @@ Obsoletes: policycoreutils < 2.0.61-2 BuildRequires: pam-devel libsepol-static >= %{libsepolver} libsemanage-static >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel >= %{libauditver} gettext BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel +BuildRequires: python-devel Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed Requires: libsepol >= %{libsepolver} coreutils checkpolicy libselinux-utils >= %{libselinuxver} Requires(post): /sbin/chkconfig @@ -308,6 +309,7 @@ exit 0 * Thu Feb 16 2010 Dan Walsh 2.0.79-1 - Update to upstream * Fix double-free in newrole +- Fix python language handling * Thu Feb 11 2010 Dan Walsh 2.0.78-21 - Fix display of command in sandbox