diff --git a/boinc-client.spec b/boinc-client.spec index 7be0884..2ca003a 100644 --- a/boinc-client.spec +++ b/boinc-client.spec @@ -1,10 +1,10 @@ -%define snap 20081217 -%define version_ 6_4_5 +%define revision 17542 +%define version_ 6_4 Summary: The BOINC client core Name: boinc-client -Version: 6.4.5 -Release: 2.%{snap}svn%{?dist} +Version: 6.4.7 +Release: 1.r%{revision}svn%{?dist} License: LGPLv2+ Group: Applications/Engineering URL: http://boinc.berkeley.edu/ @@ -13,7 +13,6 @@ URL: http://boinc.berkeley.edu/ # svn export http://boinc.berkeley.edu/svn/tags/boinc_core_release_%{version_} # pushd boinc_core_release_%{version_} # ./_autosetup -# ./unicode . Convert changelogs to UTF8 # ./trim . Trim all binaries and other unnecessary things. # popd # tar -cjvf boinc-%{version}.tar.bz2 boinc_core_release_%{version_}/ @@ -22,17 +21,24 @@ Source1: boinc-client-init-d Source2: boinc-client-logrotate-d Source3: boinc-manager.desktop Source8: trim -Source9: unicode #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 #Change locales filenames from "BOINC Manager.mo" into "BOINC-Manager.mo" #so that we can use the find_lang macro. #Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/722 #Fixed in SVN trunk, not yet in BOINC 6 branch. Patch3: boinc-locales.patch +#Both of these patches fix the gcc 4.4 build +#Reported in upstream bugtracker: http://boinc.berkeley.edu/trac/ticket/823 +#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. +Patch6: boinc-guirpcauth.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: logrotate @@ -98,9 +104,25 @@ This package contains development files for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 +#%patch4 +#%patch5 -p1 +%patch6 + +# fix utf8 +iconv -f ISO88591 -t UTF8 < checkin_notes_2004 > checkin_notes_2004.utf8 +touch -r checkin_notes_2004 checkin_notes_2004.utf8 +mv checkin_notes_2004.utf8 checkin_notes_2004 + +iconv -f ISO88591 -t UTF8 < checkin_notes_2005 > checkin_notes_2005.utf8 +touch -r checkin_notes_2005 checkin_notes_2005.utf8 +mv checkin_notes_2005.utf8 checkin_notes_2005 + +iconv -f ISO88591 -t UTF8 < checkin_notes_2006 > checkin_notes_2006.utf8 +touch -r checkin_notes_2006 checkin_notes_2006.utf8 +mv checkin_notes_2006.utf8 checkin_notes_2006 %build -%ifarch i386 +%ifarch %{ix86} %define boinc_platform i686-pc-linux-gnu %endif %ifarch powerpc ppc @@ -125,7 +147,7 @@ echo "install:" >> samples/example_app/Makefile # Parallel make does not work. -make -k +make %install rm -rf $RPM_BUILD_ROOT @@ -152,9 +174,15 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}/updater rm -rf $RPM_BUILD_ROOT%{_bindir}/upper_case pushd $RPM_BUILD_ROOT%{_bindir} - ln -s boinc_client boinc - mv boinc_gui boincmgr - mv boinc_cmd boinccmd +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 +EOF +chmod a+x boincmgr popd rm $RPM_BUILD_ROOT%{_bindir}/ca-bundle.crt @@ -188,6 +216,11 @@ find $RPM_BUILD_ROOT%{_datadir}/locale -name "BOINC Manager.mo" -execdir mv {} B # 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 @@ -230,15 +263,9 @@ fi %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/bash_completion.d/ -%doc COPYING -%doc COPYRIGHT -%doc checkin_notes -%doc checkin_notes_2007 -%doc checkin_notes_2006 -%doc checkin_notes_2005 -%doc checkin_notes_2004 -%doc checkin_notes_2003 -%doc checkin_notes_2002 +%doc COPYING COPYRIGHT checkin_notes checkin_notes_2007 checkin_notes_2006 +%doc checkin_notes_2005 checkin_notes_2004 checkin_notes_2003 checkin_notes_2002 +%doc USAGE_FEDORA %{_bindir}/boinc %{_bindir}/boinc_client %{_bindir}/boinccmd @@ -253,6 +280,7 @@ fi %files -n boinc-manager -f BOINC-Manager.lang %defattr(-,root,root,-) +%{_bindir}/boinc_gui %{_bindir}/boincmgr %{_datadir}/applications/fedora-boinc-manager.desktop %{_datadir}/icons/hicolor/16x16/apps/boincmgr.png @@ -272,6 +300,28 @@ fi %{_includedir}/boinc/* %changelog +* Fri Mar 06 2009 Milos Jakubicek - 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" + instead of "[date]svn", fixes help button in the simple GUI (BZ#478713). +- Trim CUDA prebuilt libraries from sources. +- UTF8 conversion now done in spec, not in a separate 'unicode' script. +- Add a short link to upstream's wiki about usage in Fedora into %%doc. +- boincmgr turned into a wrapper script to allow passwordless connections + from users of the boinc group (fix BZ#478715). + +* Tue Feb 24 2009 Milos Jakubicek - 6.4.5-6.20081217svn +- Added boinc-client-6.4.5-event.patch to fix build with gcc 4.4 + +* Mon Feb 23 2009 Fedora Release Engineering - 6.4.5-5.20081217svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 4 2009 Milos Jakubicek - 6.4.5-4.20081217svn +- Added boinc-gcc44.patch to fix build with gcc 4.4 + +* Mon Jan 26 2009 Tomas Mraz - 6.4.5-3.20081217svn +- rebuild with new openssl and mysql + * Thu Jan 15 2009 Milos Jakubicek - 6.4.5-2.20081217svn - Fix security bug BZ#479664 diff --git a/boinc-guirpcauth.patch b/boinc-guirpcauth.patch new file mode 100644 index 0000000..8938f07 --- /dev/null +++ b/boinc-guirpcauth.patch @@ -0,0 +1,16 @@ +--- client/gui_rpc_server.cpp.orig 2009-03-07 02:00:20.000000000 +0100 ++++ client/gui_rpc_server.cpp 2009-03-07 02:01:00.000000000 +0100 +@@ -129,12 +129,7 @@ + // they can cause code to execute as this user. + // So better protect it. + // +- if (g_use_sandbox) { +- // Allow group access so authorized administrator can modify it +- chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR | S_IRGRP | S_IWGRP); +- } else { +- chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR); +- } ++ chmod(GUI_RPC_PASSWD_FILE, S_IRUSR|S_IWUSR | S_IRGRP | S_IWGRP); + #endif + } + } diff --git a/sources b/sources index 1417191..54dac3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98433ea90755d0579dcc778da99b9fa0 boinc-6.4.5.tar.bz2 +9593e6daa2d8604e274470065bd31b80 boinc-6.4.7.tar.bz2 diff --git a/unicode b/unicode deleted file mode 100755 index 7e2cfc6..0000000 --- a/unicode +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -z $1 ]; then - echo "No path specified: use \"unicode [PATH_TO_SOURCE_TOP_DIR]\""; - exit 1; -fi - -iconv -f ISO88591 -t UTF8 < $1/checkin_notes_2005 > $1/checkin_notes_2005_unicode_tmp -mv $1/checkin_notes_2005_unicode_tmp $1/checkin_notes_2005 - -iconv -f ISO88591 -t UTF8 < $1/checkin_notes_2004 > $1/checkin_notes_2004_unicode_tmp -mv $1/checkin_notes_2004_unicode_tmp $1/checkin_notes_2004 - -iconv -f ISO88591 -t UTF8 < $1/checkin_notes_2006 > $1/checkin_notes_2006_unicode_tmp -mv $1/checkin_notes_2006_unicode_tmp $1/checkin_notes_2006