rpms/icecream/F-12 icecream-fix-createenv-when-ldconfig-fails.patch, NONE, 1.1 icecream.spec, 1.24, 1.25 icecream-0.9.3-fix-gcc44-ftbfs.patch, 1.1, NONE icecream-0.9.3-fix-perms-of-cache.patch, 1.1, NONE icecream-0.9.3-tighten-security.patch, 1.1, NONE

[Michal Schmidt]

Author: michich

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

Modified Files:
	icecream.spec 
Added Files:
	icecream-fix-createenv-when-ldconfig-fails.patch 
Removed Files:
	icecream-0.9.3-fix-gcc44-ftbfs.patch 
	icecream-0.9.3-fix-perms-of-cache.patch 
	icecream-0.9.3-tighten-security.patch 
Log Message:
* Mon Oct 12 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-5
- Fix failure to build native environment in SELinux enforcing mode.
- 'cvs rm ...' unused patches.


icecream-fix-createenv-when-ldconfig-fails.patch:
 icecc-create-env |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE icecream-fix-createenv-when-ldconfig-fails.patch ---
Patch sent to Stephan Kulow on 2009-10-12
-----------------------------------------
[PATCH icecream] allow ldconfig to fail when creating the environment

We should only expect ld.so.cache to be created if ldconfig finished
successfully.

ld.so.cache is not essential for correct functioning of the
created environment.

ldconfig may fail for example if SELinux enforcing policy prevents
it from working in the confined domain. That's actually how I
noticed this. The tar at the end of the script was failing because of
it. And yes, I will look at fixing the policy too...

Michal

Index: icecc-0.9.4/client/icecc-create-env
===================================================================
--- icecc-0.9.4.orig/client/icecc-create-env
+++ icecc-0.9.4/client/icecc-create-env
@@ -157,8 +157,8 @@ for i in $target_files; do 
 done
 
 if test -x /sbin/ldconfig; then
-   /sbin/ldconfig -r $tempdir
-   new_target_files="$new_target_files etc/ld.so.cache"
+   /sbin/ldconfig -r $tempdir && \
+      new_target_files="$new_target_files etc/ld.so.cache"
 fi
 
 md5sum=NONE


Index: icecream.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icecream/F-12/icecream.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- icecream.spec	18 Aug 2009 21:46:08 -0000	1.24
+++ icecream.spec	12 Oct 2009 15:14:00 -0000	1.25
@@ -11,7 +11,7 @@
 
 Name:		icecream
 Version:	0.9.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
@@ -29,6 +29,7 @@ Source7:	initscript-scheduler
 Source8:	%{name}-manpages.tar.bz2
 Patch0:		%{name}-rename-scheduler.patch
 Patch1:		%{name}-cleanup-conffile.patch
+Patch2:		%{name}-fix-createenv-when-ldconfig-fails.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,6 +77,7 @@ This package contains development files 
 %setup -q -a 8 -n icecc-%{version}
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' %{SOURCE2} > icecream.csh
 mkdir SELinux
@@ -233,6 +235,10 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Mon Oct 12 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-5
+- Fix failure to build native environment in SELinux enforcing mode.
+- 'cvs rm ...' unused patches.
+
 * Mon Aug 17 2009 Michal Schmidt <mschmidt at redhat.com> 0.9.4-4
 - SELinux policy: Allow untrusted binaries to getattr all filesystems.
   (BSD process accounting does vfs_getattr() to check disk space.)


--- icecream-0.9.3-fix-gcc44-ftbfs.patch DELETED ---


--- icecream-0.9.3-fix-perms-of-cache.patch DELETED ---


--- icecream-0.9.3-tighten-security.patch DELETED ---