rpms/boinc-client/F-10 boinc-client-init-d, 1.5, 1.6 boinc-client.spec, 1.22, 1.23 boinc-gccflags.patch, 1.3, 1.4
Miloš Jakubíček
mjakubicek at fedoraproject.org
Sun Mar 8 21:14:44 UTC 2009
- Previous message: rpms/perl-Moose/devel .cvsignore, 1.25, 1.26 perl-Moose.spec, 1.35, 1.36 sources, 1.25, 1.26
- Next message: rpms/boinc-client/F-9 boinc-client-init-d, 1.5, 1.6 boinc-client.spec, 1.16, 1.17 boinc-gccflags.patch, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mjakubicek
Update of /cvs/pkgs/rpms/boinc-client/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25362
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).
- Fixed boinc-gccflags.patch
- Honour data dir in boincmgr wrapper script.
Index: boinc-client-init-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-10/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:25:36 -0000 1.5
+++ boinc-client-init-d 8 Mar 2009 21:14:14 -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/F-10/boinc-client.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- boinc-client.spec 7 Mar 2009 02:57:06 -0000 1.22
+++ boinc-client.spec 8 Mar 2009 21:14:14 -0000 1.23
@@ -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 @@
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 @@
%{_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).
+- Fixed boinc-gccflags.patch
+- Honour data dir in boincmgr wrapper script.
+
* 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/F-10/boinc-gccflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- boinc-gccflags.patch 15 Jan 2009 01:23:57 -0000 1.3
+++ boinc-gccflags.patch 8 Mar 2009 21:14:14 -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: rpms/perl-Moose/devel .cvsignore, 1.25, 1.26 perl-Moose.spec, 1.35, 1.36 sources, 1.25, 1.26
- Next message: rpms/boinc-client/F-9 boinc-client-init-d, 1.5, 1.6 boinc-client.spec, 1.16, 1.17 boinc-gccflags.patch, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list