rpms/icecream/devel icecream.csh.in, 1.1, 1.2 icecream.sh.in, 1.1, 1.2 icecream.spec, 1.3, 1.4 icecream.te, 1.1, 1.2

[Michal Schmidt (michich)]

Author: michich

Update of /cvs/pkgs/rpms/icecream/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8346

Modified Files:
	icecream.csh.in icecream.sh.in icecream.spec icecream.te 
Log Message:
* Tue Nov 27 2007 Michal Schmidt <mschmidt at redhat.com> - 0.8.0-5.20071101svn
- SELinux: Allow iceccd to contact the scheduler via UDP.
- Don't add icecream to PATH in the profile scripts if ccache is installed
  to avoid recursive invocations (bz #377761).




Index: icecream.csh.in
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.csh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icecream.csh.in	12 Nov 2007 00:02:32 -0000	1.1
+++ icecream.csh.in	27 Nov 2007 22:36:12 -0000	1.2
@@ -1,3 +1,7 @@
-if ( "$path" !~ *@LIBDIR@/icecc/bin* ) then
-    set path = ( @LIBDIR@/icecc/bin $path )
+# If icecream and ccache are installed, we must not put both in PATH
+# to prevent recursive invocations.
+# Note: ccache.csh (if present) will be sourced before icecream.csh
+
+if ( "$path" !~ *@LIBDIR@/icecc/bin* && "$path" !~ *@LIBDIR@/ccache* ) then
+	set path = ( @LIBDIR@/icecc/bin "$path" )
 endif


Index: icecream.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icecream.sh.in	12 Nov 2007 00:02:32 -0000	1.1
+++ icecream.sh.in	27 Nov 2007 22:36:12 -0000	1.2
@@ -1,3 +1,8 @@
-if ! echo "$PATH" | grep -qw @LIBDIR@/icecc/bin ; then
-    PATH="@LIBDIR@/icecc/bin:$PATH"
+# If icecream and ccache are installed, we must not put both in PATH
+# to prevent recursive invocations.
+# Note: ccache.sh (if present) will be sourced before icecream.sh
+
+if ! echo "$PATH" | /bin/grep -q "@LIBDIR@/icecc/bin\|@LIBDIR@/ccache"
+then
+	PATH="@LIBDIR@/icecc/bin:$PATH"
 fi


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- icecream.spec	21 Nov 2007 00:32:33 -0000	1.3
+++ icecream.spec	27 Nov 2007 22:36:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		icecream
 Version:	0.8.0
-Release:	4.20071101svn%{?dist}
+Release:	5.20071101svn%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -210,6 +210,11 @@
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Tue Nov 27 2007 Michal Schmidt <mschmidt at redhat.com> - 0.8.0-5.20071101svn
+- SELinux: Allow iceccd to contact the scheduler via UDP.
+- Don't add icecream to PATH in the profile scripts if ccache is installed
+  to avoid recursive invocations (bz #377761).
+
 * Tue Nov 20 2007 Michal Schmidt <mschmidt at redhat.com> - 0.8.0-4.20071101svn
 - Add a SELinux policy for iceccd
 - Initscripts as sources instead of patches in the .spec file


Index: icecream.te
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/devel/icecream.te,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icecream.te	21 Nov 2007 00:32:33 -0000	1.1
+++ icecream.te	27 Nov 2007 22:36:12 -0000	1.2
@@ -58,6 +58,7 @@
 allow iceccd_t self:udp_socket create_socket_perms;
 allow iceccd_t iceccd_port_t:tcp_socket name_bind;
 allow iceccd_t icecc_scheduler_port_t:tcp_socket { send_msg recv_msg name_connect };
+allow iceccd_t icecc_scheduler_port_t:udp_socket { send_msg recv_msg };
 allow iceccd_t self:fifo_file { read write ioctl getattr };
 # why exactly?:
 allow iceccd_t self:capability { chown dac_override fsetid kill };