rpms/boinc-client/devel USAGE_FEDORA, NONE, 1.1 boinc-client.spec, 1.36, 1.37 boinc-gcc44.patch, 1.2, 1.3 sources, 1.6, 1.7 boinc-client-6.4.5-event.patch, 1.2, NONE boinc-cuda.patch, 1.1, NONE boinc-gccflags.patch, 1.4, NONE boinc-rsa.patch, 1.1, NONE
Miloš Jakubíček
mjakubicek at fedoraproject.org
Tue Jul 21 22:36:16 UTC 2009
Author: mjakubicek
Update of /cvs/pkgs/rpms/boinc-client/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18430
Modified Files:
boinc-client.spec boinc-gcc44.patch sources
Added Files:
USAGE_FEDORA
Removed Files:
boinc-client-6.4.5-event.patch boinc-cuda.patch
boinc-gccflags.patch boinc-rsa.patch
Log Message:
- Rebase to 6.6a branch (resolves BZ#477882)
- Ship shared libraries too, link client dynamically to them
- Dropped boinc-rsa.patch (merged upstream)
- Dropped boinc-client-6.4.5-event.patch (merged upstream)
- Dropped boinc-cuda.patch (merged upstream)
- Dropped boinc-gccflags.patch (merged upstream)
- Updated boinc-gcc44.patch (merged partially)
- Disable newly appeared standard rpaths
- Added short user guide exported from wiki as USAGE_FEDORA
--- NEW FILE USAGE_FEDORA ---
#####################################################################################################################
Exported from http://boinc.berkeley.edu/wiki/Installing_BOINC_on_Fedora on July 22, 2009, see current version online.
#####################################################################################################################
Installing BOINC on Fedora
* 1 Basic installation
* 2 What the installer does
* 3 Verify the installation
* 4 Set up your accounts
* 5 Optional setup hints
* 6 Uninstallation
* 7 Known problems
Basic installation
Installs BOINC Client as a daemon (autostarts the BOINC client at boot
time) and puts a BOINC Manager icon on the applications menu. The steps
are:
1. Open a terminal, enter |su|, give the root password when prompted.
2. Enter |yum install boinc-client boinc-manager|
(be patient while the BOINC package downloads and installs).
3. Optional: after the installation is finished, enter
|/sbin/chkconfig boinc-client on|
to have Linux auto-start the boinc-client daemon at boot time.
(See Stop or start BOINC daemon after boot
page for helpful
commands for managing the daemon)
What the installer does
1. Creates the daemon script at /etc/init.d/boinc-client.
2. Places the BOINC binaries (boinc_client, boinc_cmd and boincmgr)
in /usr/bin/.
3. Creates /var/lib/boinc/ for BOINC data files and the slots and
projects directories.
4. Names the daemon boinc-client.
5. Creates a user named boinc. For security, boinc owns the BOINC
data directory (/var/lib/boinc/) and all the data files and
sub-directories it creates in the data directory.
Verify the installation
1. If you elected to have Linux start the daemon at boot time (see
step 3 in section Basic installation), logout and reboot Linux now
and login under your normal user account.
2. If you elected to not have Linux start the daemon at boot time,
start the daemon manually with |/sbin/service boinc-client start|
3. Open a terminal and enter |ps aux | grep boinc| to print a partial
list of running processes. You should see |boinc_client --daemon|
in that list, if not then something went wrong in the steps above.
Set up your accounts
To use the GUI to set up your accounts and monitor progress:
* Start "boincmgr" on the command line or select Applications ->
System Tools -> Boinc Manager from the GNOME menu.
* Select Advanced -> Select computer... from the Boinc Manager menu.
* Put "localhost" in for "Host name" and the contents of
/var/lib/boinc/gui_rpc_auth.cfg for "Password" and hit "OK".
If you do only the basic installation as described above, BOINC manager
will not be able to automatically connect to the client. To connect the
client you will be required to give the GUI RPC password every time you
start BOINC manager. That is not a bug, it is a security feature to
prevent other users from using the manager to manipulate the client,
change your projects, etc.
If you don't want to put the password every time you run the BOINC
manager, you can:
1. disable the password at all [*not recommended*]
To make the GUI passwordless, do "echo >
/var/lib/boinc/gui_rpc_auth.cfg" (which replaces the contents of
the file with a newline) and then restart boinc-client (with e.g.
"/sbin/service boinc-client restart").
2. *with boinc-client-6.4.7-1.r17542svn and newer* it is enough if
you just add your user account into the "boinc" group, e.g. by
typing |/usr/sbin/usermod -G boinc -a username|
3. *with older versions* the procedure is a bit more complicated:
Boinc (the user named boinc) owns /var/lib/boinc/ and all the
files and directories in it so you will not be able to edit those
files easily from your regular user account. The steps below add
your username to the boinc group and adjust some permissions so
that BOINC manager will automatically connect to BOINC client
whenever you start the manager from your regular Linux user
account. Also you will be able to edit files in the BOINC
directory without becoming root. As you type in each command
below, substitute your Linux username wherever you see |username|.
Enter the following commands in a terminal, as root:
1. |/usr/sbin/usermod -G boinc -a username|
2. |chmod g+rw /var/lib/boinc|
3. |chmod g+rw /var/lib/boinc/*.*|
4. |ln -s /var/lib/boinc/gui_rpc_auth.cfg
/home/username/gui_rpc_auth.cfg|
5. |chown boinc:boinc /home/username/gui_rpc_auth.cfg|
Uninstallation
As root, in a terminal, enter
yum remove boinc-client boinc-manager
Known problems
boinc-client sometimes has problems connecting to the network, if the
network connection comes up after the client has already started. This
is a known BOINC bug, which is filed as #707.
In the meantime, you can fix this by restarting boinc-client. On the
command line as root, do "/sbin/service boinc-client restart".
Alternatively, from the GNOME menu, you can choose System ->
Administration -> Services and then stop and start the boinc-client
service.
Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-client.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- boinc-client.spec 20 Jul 2009 00:00:55 -0000 1.36
+++ boinc-client.spec 21 Jul 2009 22:35:45 -0000 1.37
@@ -1,10 +1,10 @@
-%define revision 18631
-%define version_ 6_6
+%global revision 18632
+%global version_ 6_6a
Summary: The BOINC client core
Name: boinc-client
Version: 6.6.37
-Release: 1.r%{revision}svn%{?dist}
+Release: 2.r%{revision}svn%{?dist}
License: LGPLv2+
Group: Applications/Engineering
URL: http://boinc.berkeley.edu/
@@ -12,11 +12,6 @@ URL: http://boinc.berkeley.edu/
# following commands to generate the tarball:
# svn export http://boinc.berkeley.edu/svn/tags/boinc_core_release_%{version_}
# pushd boinc_core_release_%{version_}
-# mkdir locale/client
-# touch locale/client/Makefile.in
-# mkdir -p packages/generic/sea/
-# touch packages/generic/sea/Makefile.in
-# sed -i "s/BUILD_CLIENTGUI/ENABLE_MANAGER/" doc/manpages/Makefile.am
# ./_autosetup
# ./trim . Trim all binaries and other unnecessary things.
# popd
@@ -26,25 +21,16 @@ Source1: boinc-client-init-d
Source2: boinc-client-logrotate-d
Source3: boinc-manager.desktop
Source8: trim
-#Remove -fomit-frame-pointer and -ffast-math gcc flags:
-#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/647
-Patch1: boinc-gccflags.patch
-#Fix security bug BZ#479664
-#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/823
-Patch2: boinc-rsa.patch
-#Both of these patches fix the gcc 4.4 build
+#Fix the gcc 4.4 at glibc2.10 build
#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/854
Patch4: boinc-gcc44.patch
-Patch5: boinc-client-6.4.5-event.patch
#Create password file rw for group, this enables passwordless connection
#of manager from users of the boinc group.
#This won't be probably upstreamed as it might be unsafe for common usage
#without setting proper group ownership of the password file.
Patch6: boinc-guirpcauth.patch
-#Enable dlopening libcudart.so from standard paths
-#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/863
-Patch7: boinc-cuda.patch
#Fix Mac build:
+#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/941
Patch8: boinc-macbuild.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -104,11 +90,19 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: openssl-devel
Requires: mysql-devel
-Provides: %{name}-static = %{version}-%{release}
%description devel
This package contains development files for %{name}.
+%package static
+Summary: Static libraries for %{name}
+Group: Development/Libraries
+
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+This package contains static libraries for %{name}.
+
%package doc
Summary: Documentation files for %{name}
Group: Documentation
@@ -121,12 +115,8 @@ This package contains documentation file
%prep
%setup -q -n boinc_core_release_%{version_}
-%patch1 -p1
-%patch2 -p1
%patch4
-%patch5 -p1
%patch6
-%patch7
%patch8 -p1
# fix utf8
@@ -142,32 +132,25 @@ iconv -f ISO88591 -t UTF8 < checkin_note
touch -r checkin_notes_2006 checkin_notes_2006.utf8
mv checkin_notes_2006.utf8 checkin_notes_2006
+# fix permissions and newlines on source files
+chmod 644 clientgui/{DlgItemProperties.h,AsyncRPC.cpp,DlgItemProperties.cpp}
+sed -i 's/\r//' clientgui/DlgItemProperties.cpp
+
%build
%ifarch %{ix86}
-%define boinc_platform i686-pc-linux-gnu
+%global boinc_platform i686-pc-linux-gnu
%endif
%ifarch powerpc ppc
-%define boinc_platform powerpc-linux-gnu
+%global boinc_platform powerpc-linux-gnu
%endif
%ifarch powerpc64 ppc64
-%define boinc_platform ppc64-linux-gnu
+%global boinc_platform ppc64-linux-gnu
%endif
-#quick fixes to make build & install to work, filed in upstream's bugtracker under
-#http://boinc.berkeley.edu/trac/ticket/811
-# - this should just go away
-sed -i "s/boincmgr.16x16.png boincmgr.32x32.png boincmgr.48x48.png//" clientgui/res/Makefile.in
-# - missing in the Makefile
-echo "install:" >> samples/example_app/Makefile
-# - because "-lssl" is needed
-sed -i 's/crypt_prog_LDADD = $(lib_LIBRARIES) $(RSA_LIBS) $(PTHREAD_LIBS)/crypt_prog_LDADD = $(lib_LIBRARIES) $(RSA_LIBS) $(PTHREAD_LIBS) $(BOINC_EXTRA_LIBS)/' lib/Makefile.in
-# - because "-lcurl" is needed
-sed -i 's/boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS)/boinc_client_LDADD = $(LIBBOINC) $(PTHREAD_LIBS) $(BOINC_EXTRA_LIBS)/' client/Makefile.in
-
-#We want to install .mo, not .po files, see http://boinc.berkeley.edu/trac/ticket/940
+# We want to install .mo, not .po files, see http://boinc.berkeley.edu/trac/ticket/940
sed -i 's/BOINC-Manager\.po/BOINC-Manager\.mo/g' locale/Makefile.in
-%define confflags --disable-static --disable-server --disable-fcgi --enable-unicode --with-ssl --with-x STRIP=: DOCBOOK2X_MAN=/usr/bin/db2x_docbook2man
+%global confflags --disable-dependency-tracking --enable-dynamic-client-linkage --disable-server --disable-fcgi --enable-unicode --with-ssl --with-x STRIP=: DOCBOOK2X_MAN=/usr/bin/db2x_docbook2man
%if %{defined boinc_platform}
%configure %{confflags} --with-boinc-platform=%{boinc_platform}
@@ -175,10 +158,12 @@ sed -i 's/BOINC-Manager\.po/BOINC-Manage
%configure %{confflags}
%endif
+# Disable rpaths
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
# Parallel make does not work, see upstream bugtracker at:
# http://boinc.berkeley.edu/trac/ticket/775
-echo -e "all:\ninstall:" >> locale/client/Makefile
make
%install
@@ -206,8 +191,17 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}/updater
rm -rf $RPM_BUILD_ROOT%{_bindir}/upper_case
pushd $RPM_BUILD_ROOT%{_bindir}
+
+# use symlink instead of hardlink
+rm boinc
ln -s boinc_client boinc
-mv boinc_cmd boinccmd
+
+# remove libtool archives
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
+# rename boincmgr and wrap it
+mv $RPM_BUILD_ROOT%{_bindir}/boincmgr $RPM_BUILD_ROOT%{_bindir}/boinc_gui
+
cat > boincmgr <<EOF
#!/bin/bash
# wrapper script to allow passwordless manager connections from users of the boinc group
@@ -230,21 +224,15 @@ EOF
chmod a+x boincmgr
popd
-rm $RPM_BUILD_ROOT%{_bindir}/ca-bundle.crt
-#because it's already included in curl
-
# own init script and logrotate configuration file
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
# icon
-install -p -m644 sea/boincmgr.16x16.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/boincmgr.png
-install -p -m644 sea/boincmgr.32x32.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/boincmgr.png
-install -p -m644 sea/boincmgr.48x48.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/boincmgr.png
+mv $RPM_BUILD_ROOT%{_datadir}/boinc/boincmgr.16x16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/boincmgr.png
+mv $RPM_BUILD_ROOT%{_datadir}/boinc/boincmgr.32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/boincmgr.png
+mv $RPM_BUILD_ROOT%{_datadir}/boinc/boincmgr.48x48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/boincmgr.png
desktop-file-install %{?_remove_encoding} --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -255,11 +243,6 @@ desktop-file-install %{?_remove_encoding
# bash-completion
install -Dp -m644 client/scripts/boinc.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/boinc-client
-# usability hints
-cat > USAGE_FEDORA <<-EOF
- For up-to-date instructions on how to setup BOINC client on Fedora, please have a look at: http://boinc.berkeley.edu/wiki/Installing_BOINC_on_Fedora
-EOF
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -273,6 +256,7 @@ useradd -r -g boinc -d %{_localstatedir}
exit 0
%post
+/sbin/ldconfig
/sbin/chkconfig --add boinc-client
#correct wrong owner and group on files under /var/lib/boinc and log files
@@ -287,6 +271,8 @@ if [ $1 -eq 0 ]; then #if uninstalling,
fi
%postun
+/sbin/ldconfig
+
if [ "$1" -ge "1" ] ; then
/sbin/service boinc-client condrestart >/dev/null 2>&1 || :
fi
@@ -313,13 +299,13 @@ fi
%{_bindir}/boinc
%{_bindir}/boinc_client
%{_bindir}/boinccmd
-%{_bindir}/crypt_prog
%{_bindir}/switcher
%{_initrddir}/%{name}
%{_mandir}/man1/boinccmd.1.gz
%{_mandir}/man1/boinc.1.gz
%defattr(-,boinc,boinc,-)
%{_localstatedir}/lib/boinc/
+%{_libdir}/*.so.*
%files doc
%defattr(-,root,root,-)
@@ -335,21 +321,35 @@ fi
%{_datadir}/icons/hicolor/48x48/apps/boincmgr.png
%{_mandir}/man1/boincmgr.1.gz
-%files devel
+%files static
%defattr(-,root,root,-)
%{_libdir}/libboinc.a
%{_libdir}/libboinc_api.a
%{_libdir}/libboinc_graphics2.a
-%dir %{_includedir}/boinc
-%{_includedir}/boinc/*
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/*.so
+%{_includedir}/boinc
%changelog
+* Tue Jul 21 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.6.37-2.r18632svn
+- Rebase to 6.6a branch (resolves BZ#477882)
+- Ship shared libraries too, link client dynamically to them
+- Dropped boinc-rsa.patch (merged upstream)
+- Dropped boinc-client-6.4.5-event.patch (merged upstream)
+- Dropped boinc-cuda.patch (merged upstream)
+- Dropped boinc-gccflags.patch (merged upstream)
+- Updated boinc-gcc44.patch (merged partially)
+- Disable newly appeared standard rpaths
+- Added short user guide exported from wiki as USAGE_FEDORA
+
* Sun Jul 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.6.37-1.r18631svn
- Update to 6.6 branch
- Removed boinc-locales.patch (merged upstream)
- Added boinc-macbuild.patch to fix ppc/ppc64 build failure
- Fixed typo in upstream bugtracker link
+- Fix SELinux issue in logrotate script, resolves BZ#498165
* Thu May 14 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-11.r17542svn
- Condrestart the service after package update.
boinc-gcc44.patch:
str_util.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: boinc-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/boinc-gcc44.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- boinc-gcc44.patch 15 Feb 2009 22:31:47 -0000 1.2
+++ boinc-gcc44.patch 21 Jul 2009 22:35:45 -0000 1.3
@@ -1,16 +1,6 @@
---- sched/sched_driver.cpp.orig 2009-02-04 00:51:45.000000000 +0100
-+++ sched/sched_driver.cpp 2009-02-04 00:52:00.000000000 +0100
-@@ -40,6 +40,7 @@
- #define HOSTID "7"
- // ID of a host belonging to that user
-
-+#include <cstdio>
- #include <vector>
- #include "util.h"
-
---- lib/str_util.h.orig 2009-02-05 17:24:36.000000000 +0100
-+++ lib/str_util.h 2009-02-05 17:28:46.000000000 +0100
-@@ -38,7 +38,7 @@
+--- lib/str_util.h.orig 2009-07-20 22:41:29.000000000 +0200
++++ lib/str_util.h 2009-07-20 22:41:50.000000000 +0200
+@@ -38,7 +39,7 @@
#endif
#if !defined(HAVE_STRCASESTR)
@@ -19,14 +9,3 @@
#endif
extern int ndays_to_string(double x, int smallest_timescale, char *buf);
---- sched/sched_util.cpp.orig 2009-02-05 17:34:18.000000000 +0100
-+++ sched/sched_util.cpp 2009-02-05 17:39:20.000000000 +0100
-@@ -104,7 +104,7 @@
- #else
- int try_fopen(const char* path, FCGI_FILE*& f, const char *mode) {
- #endif
-- char* p;
-+ const char* p;
- DIR* d;
- char dirpath[256];
-
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 20 Jul 2009 00:00:56 -0000 1.6
+++ sources 21 Jul 2009 22:35:45 -0000 1.7
@@ -1 +1 @@
-77f5a1cc0b305ff448cb1030956426f1 boinc-6.6.37.tar.bz2
+b5c60cbad27be3a136b2384151ec6b17 boinc-6.6.37.tar.bz2
--- boinc-client-6.4.5-event.patch DELETED ---
--- boinc-cuda.patch DELETED ---
--- boinc-gccflags.patch DELETED ---
--- boinc-rsa.patch DELETED ---
More information about the fedora-extras-commits
mailing list