From fcfb46ffadca872284f43db5cfb95675102d22df Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Wed, 9 Jan 2008 09:41:16 +0000 Subject: [PATCH] - fix the selinux patch --- logrotate-3.7.6-selinux.patch | 6 +++--- logrotate.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/logrotate-3.7.6-selinux.patch b/logrotate-3.7.6-selinux.patch index 72b66fa..04cf333 100644 --- a/logrotate-3.7.6-selinux.patch +++ b/logrotate-3.7.6-selinux.patch @@ -73,9 +73,9 @@ diff -up logrotate-3.7.6/logrotate.c.selinux logrotate-3.7.6/logrotate.c +#ifdef WITH_SELINUX + if (selinux_enabled) { + setfscreatecon_raw(savedContext); -+ if (prev_context != NULL) { -+ freecon(prev_context); -+ prev_context = NULL; ++ if (savedContext != NULL) { ++ freecon(savedContext); ++ savedContext = NULL; + } + } +#endif diff --git a/logrotate.spec b/logrotate.spec index 28f24a9..62b47ba 100644 --- a/logrotate.spec +++ b/logrotate.spec @@ -1,7 +1,7 @@ Summary: Rotates, compresses, removes and mails system log files Name: logrotate Version: 3.7.6 -Release: 2%{?dist} +Release: 2.1%{?dist} License: GPL+ Group: System Environment/Base # The source for this package was pulled from cvs. @@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status %changelog +* Wed Jan 09 2008 Tomas Smetana 3.7.6-2.1 +- fix the selinux patch + * Wed Jan 09 2008 Tomas Smetana 3.7.6-2 - fix #427274 - logrotate fails to preserve SELinux file contexts - fix #427661 - SELinux stops vsftpd from working correctly