rpms/boinc-client/devel boinc-client-init-d, 1.5, 1.6 boinc-client.spec, 1.27, 1.28 boinc-gccflags.patch, 1.3, 1.4
Miloš Jakubíček
mjakubicek at fedoraproject.org
Sun Mar 8 17:46:12 UTC 2009
- Previous message (by thread): rpms/perl/devel perl.spec,1.205,1.206
- Next message (by thread): rpms/purple-msn-pecan/devel purple-msn-pecan-0.0.18_ru-po.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 purple-msn-pecan.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mjakubicek
Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1337
Modified Files:
boinc-client-init-d boinc-client.spec boinc-gccflags.patch
Log Message:
- Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script
(BZ#489199).
- Fix reference to sample sysconfig configuration file (boinc-client instead of
boinc).
- Fixed boinc-gccflags.patch
Index: boinc-client-init-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client-init-d,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- boinc-client-init-d 13 Dec 2008 14:02:56 -0000 1.5
+++ boinc-client-init-d 8 Mar 2009 17:45:41 -0000 1.6
@@ -67,6 +67,11 @@
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 @@
## 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 @@
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 @@
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`
Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- boinc-client.spec 7 Mar 2009 01:36:17 -0000 1.27
+++ boinc-client.spec 8 Mar 2009 17:45:41 -0000 1.28
@@ -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/
@@ -300,6 +300,13 @@
%{_includedir}/boinc/*
%changelog
+* Sun Mar 08 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-2.r17542svn
+- Fix overriding $BOINCOPTS from /etc/sysconfig/boinc-client in the init script
+ (BZ#489199).
+- Fix reference to sample sysconfig configuration file (boinc-client instead of
+ boinc).
+- Fixed boinc-gccflags.patch
+
* Fri Mar 06 2009 Milos Jakubicek <xjakub at 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"
boinc-gccflags.patch:
Index: boinc-gccflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-gccflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- boinc-gccflags.patch 2 Jan 2009 07:08:23 -0000 1.3
+++ boinc-gccflags.patch 8 Mar 2009 17:45:41 -0000 1.4
@@ -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)
- Previous message (by thread): rpms/perl/devel perl.spec,1.205,1.206
- Next message (by thread): rpms/purple-msn-pecan/devel purple-msn-pecan-0.0.18_ru-po.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 purple-msn-pecan.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list