From e99f6d8d7671287bb51f4362c27a42ffe25149d4 Mon Sep 17 00:00:00 2001
From: Miloš Jakubíček <mjakubicek@fedoraproject.org>
Date: Mar 08 2009 21:14:38 +0000
Subject: - Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init

    script (BZ#489199).
- Fixed boinc-gccflags.patch
- Honour data dir in boincmgr wrapper script.

---

diff --git a/boinc-client-init-d b/boinc-client-init-d
index 5d7a594..da70907 100644
--- a/boinc-client-init-d
+++ b/boinc-client-init-d
@@ -36,7 +36,7 @@
 # Department of Physics and Astronomy, Vassar College, Poughkeepsie NY
 # Eric Myers <myers@spy-hill.net> 
 # Spy Hill Research, Poughkeepsie, New York
-# @(#) $Id: boinc-client-init-d,v 1.5 2008/12/13 14:52:48 mjakubicek Exp $
+# @(#) $Id: boinc-client-init-d,v 1.6 2009/03/08 21:14:38 mjakubicek Exp $
 ########################################################################
 
 # Defaults, which can be overridden by putting new NAME=value lines 
@@ -67,6 +67,11 @@ BOINCCMD=/usr/bin/boinc_cmd
 LOGFILE=/var/log/boinc.log
 ERRORLOG=/var/log/boincerr.log
 
+# BOINC options: for the command line when running the client.  
+# Be aware that --allow_remote_gui_rpc opens up your machine to the world!
+#
+#BOINCOPTS="--allow_remote_gui_rpc"   
+BOINCOPTS=" --daemon"
 
 # Subsys lock file ...
 
@@ -101,10 +106,10 @@ fi
 
 ## Look for any local configuration settings which override all above
 
-if [ -f /etc/sysconfig/boinc ]; then
-  . /etc/sysconfig/boinc
-elif [ -f /etc/default/boinc ]; then
-  . /etc/default/boinc
+if [ -f /etc/sysconfig/boinc-client ]; then
+  . /etc/sysconfig/boinc-client
+elif [ -f /etc/default/boinc-client ]; then
+  . /etc/default/boinc-client
 fi
 
 
@@ -117,12 +122,6 @@ if [ ! -d $BOINCDIR ]; then
   exit 7
 fi
 
-# BOINC options: for the command line when running the client.  
-# Be aware that --allow_remote_gui_rpc opens up your machine to the world!
-#
-#BOINCOPTS="--allow_remote_gui_rpc"   
-BOINCOPTS="--daemon --dir $BOINCDIR"
-
 
 # Some additional places to look for the client executable
 # (Should do this after init.d/functions and sysconfig/boinc, which sets PATH)
@@ -172,7 +171,7 @@ case "$1" in
           exit 4
         fi
 	
-	daemon --check $BOINCEXE --user $BOINCUSER +19 "$BOINCEXE $BOINCOPTS" >>$LOGFILE 2>>$ERRORLOG &
+	daemon --check $BOINCEXE --user $BOINCUSER +19 "$BOINCEXE" $BOINCOPTS --dir $BOINCDIR >>$LOGFILE 2>>$ERRORLOG &
         try=0
 	while [ $try -lt 10 ] ; do
             PID=`pidof -s -x -o $$ -o $PPID -o %PPID $BOINCEXE`
diff --git a/boinc-client.spec b/boinc-client.spec
index 2ca003a..4f91681 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.4.7
-Release:	1.r%{revision}svn%{?dist}
+Release:	2.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -176,11 +176,24 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}/upper_case
 pushd $RPM_BUILD_ROOT%{_bindir}
 ln -s boinc_client boinc
 mv boinc_cmd boinccmd
-cat > boincmgr <<-EOF
-	#!/bin/bash
-	# wrapper script to allow passwordless manager connections from users of the boinc group
-	cd %{_localstatedir}/lib/boinc
-	boinc_gui
+cat > boincmgr <<EOF
+#!/bin/bash
+# wrapper script to allow passwordless manager connections from users of the boinc group
+
+# Look for any local configuration settings of \$BOINCDIR
+if [ -f %{_sysconfdir}/sysconfig/%{name} ]; then
+	. %{_sysconfdir}/sysconfig/%{name} 
+elif [ -f %{_sysconfdir}/default/%{name} ]; then
+	. %{_sysconfdir}/default/%{name}
+fi
+
+# Otherwise pull \$BOINCDIR from the init script
+if [ -z \$BOINCDIR ]; then
+	BOINCDIR='\`grep "BOINCDIR=" %{_sysconfdir}/init.d/%{name} | sed "s|BOINCDIR=||"\`';
+fi
+
+cd \$BOINCDIR
+boinc_gui
 EOF
 chmod a+x boincmgr
 popd
@@ -300,6 +313,12 @@ fi
 %{_includedir}/boinc/*
 
 %changelog
+* Sun Mar 08 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 6.4.7-2.r17542svn
+- Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script
+  (BZ#489199).
+- Fixed boinc-gccflags.patch
+- Honour data dir in boincmgr wrapper script.
+
 * Fri Mar 06 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 6.4.7-1.r17542svn
 - i386 arch conditional replaced by the %%{ix86} macro.
 - Rebase to current 6.4 branch, therefore using new suffix "r[revision]svn"
diff --git a/boinc-gccflags.patch b/boinc-gccflags.patch
index 74611cb..69f6492 100644
--- a/boinc-gccflags.patch
+++ b/boinc-gccflags.patch
@@ -5,7 +5,7 @@
  
  boinc_client_DEPENDENCIES =
 -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)
-+boinc_client_CPPFLAGS = -O3 -ffast-math $(AM_CPPFLAGS)
++boinc_client_CPPFLAGS = -O3 -fforce-addr $(AM_CPPFLAGS)
  boinc_client_LDFLAGS = -static-libgcc
  boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)
  
@@ -16,7 +16,7 @@
  
  boinc_client_DEPENDENCIES = 
 -boinc_client_CPPFLAGS = -O3 -fomit-frame-pointer -fforce-addr -ffast-math $(AM_CPPFLAGS)
-+boinc_client_CPPFLAGS = -O3 -ffast-math $(AM_CPPFLAGS)
++boinc_client_CPPFLAGS = -O3 -fforce-addr $(AM_CPPFLAGS)
  boinc_client_LDFLAGS = -static-libgcc
  boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)
  boinc_clientdir = $(bindir)