rpms/vixie-cron/devel vixie-cron-4.1-_52-bz181439p2.patch, NONE, 1.1 vixie-cron.spec, 1.75, 1.76

[fedora-cvs-commits at redhat.com]

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3174

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_52-bz181439p2.patch 
Log Message:
Add patch for fix selinux bug #181439.


vixie-cron-4.1-_52-bz181439p2.patch:
 Makefile   |    2 +-
 security.c |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE vixie-cron-4.1-_52-bz181439p2.patch ---
--- vixie-cron-4.1/Makefile.bz181439p2	2006-08-30 08:31:44.000000000 +0200
+++ vixie-cron-4.1/Makefile	2006-08-30 08:32:15.000000000 +0200
@@ -76,7 +76,7 @@
 #<<optimize or debug?>>
 #CDEBUG		=	-O
 #CDEBUG		=	-g
-CDEBUG		=       $(RPM_OPT_FLAGS)
+#CDEBUG		=       $(RPM_OPT_FLAGS)
 #<<lint flags of choice?>>
 LINTFLAGS	=	-hbxa $(INCLUDE) $(DEBUGGING)
 #<<want to use a nonstandard CC?>>
--- vixie-cron-4.1/security.c.bz181439p2	2006-08-30 08:31:44.000000000 +0200
+++ vixie-cron-4.1/security.c	2006-08-30 08:31:44.000000000 +0200
@@ -78,17 +78,15 @@
 	return -1;
     }	
 
+#if WITH_SELINUX
     if ( cron_change_selinux_context( u, scontext, file_context ) != 0 )
     {
         syslog(LOG_INFO,"CRON (%s) ERROR: failed to change SELinux context", 
 	       e->pwd->pw_name);
-#if WITH_SELINUX
 	if ( file_context )
 		freecon(file_context);
-#endif
 	return -1;
     }
-#if WITH_SELINUX
     if ( file_context )
 	freecon(file_context);
 #endif


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- vixie-cron.spec	28 Aug 2006 09:20:28 -0000	1.75
+++ vixie-cron.spec	30 Aug 2006 06:42:19 -0000	1.76
@@ -2,7 +2,7 @@
 %define WITH_SELINUX 1
 %endif
 %if %{?WITH_PAM:0}%{!?WITH_PAM:1}
-%define WITH_PAM 0
+%define WITH_PAM 1
 %endif
 %if %{?WITH_AUDIT:0}%{!?WITH_AUDIT:1}
 %define WITH_AUDIT 1
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: 	 vixie-cron
 Version: 4.1
-Release: 61%{?dist}
+Release: 62%{?dist}
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -75,6 +75,7 @@
 Patch55: vixie-cron-4.1-man-page-typo.patch
 Patch56: vixie-cron-4.1-_55-bz203746.patch
 Patch57: vixie-cron-4.1-_44-delayed_database.patch 
+Patch58: vixie-cron-4.1-_52-bz181439p2.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: syslog, bash >= 2.0
@@ -169,6 +170,7 @@
 %patch55 -p1 -b .man-page-typo
 %patch56 -p1 -b .bz203746
 %patch57 -p1 -b .delayed_database
+%patch58 -p1 -b .bz181439p2
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" \
@@ -241,6 +243,9 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Wed Aug 30 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-62
+- fix problem with selinux (#181439)
+
 * Mon Aug 28 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-61
 - changes in spec file (#204230)