rpms/icecream/F-11 icecream.fc, 1.2, 1.3 icecream.spec, 1.21, 1.22 icecream.te, 1.8, 1.9 initscript-scheduler, 1.1, 1.2

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/icecream/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30240

Modified Files:
	icecream.fc icecream.spec icecream.te initscript-scheduler 
Log Message:
* Fri Aug 14 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-3
- Create the logfile for the scheduler in the initscript.
- Allow the scheduler to write to the log in the SELinux policy (BZ#517251).



Index: icecream.fc
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-11/icecream.fc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- icecream.fc	16 Feb 2009 13:54:52 -0000	1.2
+++ icecream.fc	15 Aug 2009 21:41:45 -0000	1.3
@@ -3,3 +3,4 @@
 /var/cache/icecream(/.*)?			gen_context(system_u:object_r:iceccd_cache_t,s0)
 /var/log/iceccd				--	gen_context(system_u:object_r:iceccd_log_t,s0)
 /usr/sbin/icecc-scheduler		--	gen_context(system_u:object_r:icecc_scheduler_exec_t,s0)
+/var/log/icecc[-_]scheduler		--	gen_context(system_u:object_r:icecc_scheduler_log_t,s0)


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-11/icecream.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- icecream.spec	30 Apr 2009 13:32:02 -0000	1.21
+++ icecream.spec	15 Aug 2009 21:41:45 -0000	1.22
@@ -11,7 +11,7 @@
 
 Name:		icecream
 Version:	0.9.4
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -233,6 +233,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Fri Aug 14 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-3
+- Create the logfile for the scheduler in the initscript.
+- Allow the scheduler to write to the log in the SELinux policy (BZ#517251).
+
 * Thu Apr 30 2009 Michal Schmidt <mschmidt at redhat.com> - 0.9.4-1
 - Upstream release 0.9.4.
 - Dropped merged patches.


Index: icecream.te
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-11/icecream.te,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- icecream.te	5 Apr 2009 23:00:36 -0000	1.8
+++ icecream.te	15 Aug 2009 21:41:45 -0000	1.9
@@ -41,6 +41,9 @@ type icecc_scheduler_t;
 type icecc_scheduler_exec_t;
 init_daemon_domain(icecc_scheduler_t, icecc_scheduler_exec_t)
 
+type icecc_scheduler_log_t;
+logging_log_file(icecc_scheduler_log_t)
+
 ########################################
 #
 # iceccd_untrusted declarations
@@ -188,6 +191,9 @@ can_exec(iceccd_untrusted_t, iceccd_cach
 allow icecc_scheduler_t self:tcp_socket create_stream_socket_perms;
 allow icecc_scheduler_t self:udp_socket create_socket_perms;
 
+manage_files_pattern(icecc_scheduler_t, icecc_scheduler_log_t, icecc_scheduler_log_t)
+logging_log_filetrans(icecc_scheduler_t, icecc_scheduler_log_t, file)
+
 corenet_all_recvfrom_unlabeled(icecc_scheduler_t)
 corenet_all_recvfrom_netlabel(icecc_scheduler_t)
 corenet_tcp_sendrecv_generic_if(icecc_scheduler_t)


Index: initscript-scheduler
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-11/initscript-scheduler,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- initscript-scheduler	21 Nov 2007 00:32:33 -0000	1.1
+++ initscript-scheduler	15 Aug 2009 21:41:45 -0000	1.2
@@ -30,15 +30,16 @@ start() {
 	[ -x $exec ] || exit 5
 	[ -f $config ] || exit 6
 	echo -n $"Starting distributed compiler scheduler: "
-	params=""
+	netname=
 	if [ -n "$ICECREAM_NETNAME" ] ; then
-		params="$params -n $ICECREAM_NETNAME"
+		netname="-n $ICECREAM_NETNAME"
 	fi
 	logfile=${ICECREAM_SCHEDULER_LOG_FILE:-/var/log/icecc-scheduler}
-	params="$params -l $logfile"
-#	touch "$logfile"
-#	chown icecream:icecream $logfile
-	daemon --user icecream --check $service $exec -d $params
+	touch "$logfile"
+	chown icecream:icecream "$logfile"
+	chmod 0640 "$logfile"
+	[ -x /sbin/restorecon ] && /sbin/restorecon "$logfile"
+	daemon --user icecream --check $service $exec -d -l "$logfile" $netname
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $lockfile