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

[fedora-cvs-commits at redhat.com]

Author: mmaslano

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

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_52-bz181439_2.patch 
Removed Files:
	vixie-cron-4.1-_52-bz181439p2.patch 
Log Message:
Removed changes from makefile to correct form.


vixie-cron-4.1-_52-bz181439_2.patch:
 security.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE vixie-cron-4.1-_52-bz181439_2.patch ---
--- 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.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- vixie-cron.spec	30 Aug 2006 06:42:19 -0000	1.76
+++ vixie-cron.spec	30 Aug 2006 08:18:20 -0000	1.77
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: 	 vixie-cron
 Version: 4.1
-Release: 62%{?dist}
+Release: 63%{?dist}
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -75,7 +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
+Patch58: vixie-cron-4.1-_52-bz181439_2.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: syslog, bash >= 2.0
@@ -170,10 +170,10 @@
 %patch55 -p1 -b .man-page-typo
 %patch56 -p1 -b .bz203746
 %patch57 -p1 -b .delayed_database
-%patch58 -p1 -b .bz181439p2
+%patch58 -p1 -b .bz181439_2
 
 %build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" \
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint" \
 %if %{WITH_SELINUX}
 WITH_SELINUX=1 \
 %endif
@@ -243,7 +243,7 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
-* Wed Aug 30 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-62
+* Wed Aug 30 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-63
 - fix problem with selinux (#181439)
 
 * Mon Aug 28 2006 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-61


--- vixie-cron-4.1-_52-bz181439p2.patch DELETED ---