rpms/policycoreutils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Thu Feb 16 2010 Dan Walsh <dwalsh@redhat.com> 2.0.79-1

Browse Source 
- Update to upstream
	* Fix double-free in newrole
- Fix python language handling
This commit is contained in:
Daniel J Walsh 2010-02-16 21:35:16 +00:00
parent f354d4ef3b
commit be45950990
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
policycoreutils-rhat.patch
View File

@ -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 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 --- 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 @@ @@ -1,4 +1,5 @@
#include "restore.h" #include "restore.h"
+#include <glob.h> +#include <glob.h>
@ -4206,19 +4206,23 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.19 --exclude=gui --exclude=po
} }
void restore_init(struct restore_opts *opts) void restore_init(struct restore_opts *opts)
@@ -303,6 +302,12 @@ @@ -300,8 +299,14 @@
FTS *fts_handle; int rc = 0;
FTSENT *ftsent; 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){ + if (r_opts == NULL){
+ fprintf(stderr, + fprintf(stderr,
+ "Must call initialize first!"); + "Must call initialize first!");
+ goto err; + goto err;
+ } + }
+
fts_handle = fts_open((char **)namelist, r_opts->fts_flags, NULL); fts_handle = fts_open((char **)namelist, r_opts->fts_flags, NULL);
if (fts_handle == NULL) { if (fts_handle == NULL) {
fprintf(stderr,
@@ -357,6 +362,29 @@ @@ -357,6 +362,29 @@
goto out; goto out;
} }

2
policycoreutils.spec
View File

@ -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: 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: 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: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed
Requires: libsepol >= %{libsepolver} coreutils checkpolicy libselinux-utils >= %{libselinuxver} Requires: libsepol >= %{libsepolver} coreutils checkpolicy libselinux-utils >= %{libselinuxver}
Requires(post): /sbin/chkconfig Requires(post): /sbin/chkconfig
@ -308,6 +309,7 @@ exit 0
* Thu Feb 16 2010 Dan Walsh <dwalsh@redhat.com> 2.0.79-1 * Thu Feb 16 2010 Dan Walsh <dwalsh@redhat.com> 2.0.79-1
- Update to upstream - Update to upstream
* Fix double-free in newrole * Fix double-free in newrole
- Fix python language handling
* Thu Feb 11 2010 Dan Walsh <dwalsh@redhat.com> 2.0.78-21 * Thu Feb 11 2010 Dan Walsh <dwalsh@redhat.com> 2.0.78-21
- Fix display of command in sandbox - Fix display of command in sandbox