From c6f7a6803bd20a8db416b5645dccd66df928f60884c18a4c8d767717f7be375a Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Sat, 22 Mar 2014 14:01:27 +0000 Subject: [PATCH] Accepting request 227113 from home:computersalat:devel:network update to 7.2.42 OBS-URL: https://build.opensuse.org/request/show/227113 OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=34 --- README.SUSE | 8 +- boinc-7.2.42.tar.bz2 | 3 + boinc-LC_MESSAGES.patch | 10 +- boinc-client-7.0.36-dynamic_buffers.patch | 41 ------ ...patch => boinc-client-AM_CONDITIONAL.patch | 12 +- boinc-client.changes | 35 +++++ boinc-client-systemd => boinc-client.service | 0 boinc-client.spec | 132 +++++++++++------- boinc-configure.patch | 20 +++ boinc-docbook2x.patch | 2 +- boinc-guirpcauth.patch | 26 ++-- boinc-init.patch | 89 ------------ boinc_core_release-7_0_36.tar.bz2 | 3 - 13 files changed, 166 insertions(+), 215 deletions(-) create mode 100644 boinc-7.2.42.tar.bz2 delete mode 100644 boinc-client-7.0.36-dynamic_buffers.patch rename boinc-client-7.0.36-AM_CONDITIONAL.patch => boinc-client-AM_CONDITIONAL.patch (84%) rename boinc-client-systemd => boinc-client.service (100%) create mode 100644 boinc-configure.patch delete mode 100644 boinc-init.patch delete mode 100644 boinc_core_release-7_0_36.tar.bz2 diff --git a/README.SUSE b/README.SUSE index 7c60d44..d2e9b55 100644 --- a/README.SUSE +++ b/README.SUSE @@ -34,8 +34,8 @@ are: 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/. + 2. Places the BOINC binaries (boinc-client, boinccmd, boinc-gui + 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. @@ -52,7 +52,7 @@ are: 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| + list of running processes. You should see |boinc-client --dir ...| in that list, if not then something went wrong in the steps above. @@ -95,7 +95,7 @@ manager, you can: 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| + 1. |/usr/sbin/usermod -A boinc 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 diff --git a/boinc-7.2.42.tar.bz2 b/boinc-7.2.42.tar.bz2 new file mode 100644 index 0000000..bd0a502 --- /dev/null +++ b/boinc-7.2.42.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfff203487f9d030f916891074f978abde6c0d34b3147cfc36e42a5060b8d4b8 +size 40873943 diff --git a/boinc-LC_MESSAGES.patch b/boinc-LC_MESSAGES.patch index 2d3398f..5716b06 100644 --- a/boinc-LC_MESSAGES.patch +++ b/boinc-LC_MESSAGES.patch @@ -3,18 +3,18 @@ Index: locale/Makefile.am --- locale/Makefile.am.orig +++ locale/Makefile.am @@ -45,12 +45,12 @@ locale_dirs = \ - install-exec-hook: + install-data-hook: mydir=$(DESTDIR)$(datadir) ;\ for ldir in $(locale_dirs) ; do \ - $(INSTALL) -d $$mydir/$$ldir ; \ + $(INSTALL) -d $$mydir/$$ldir/LC_MESSAGES ; \ if [ -f $$ldir/BOINC-Manager.mo ] ; then \ -- $(INSTALL) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/BOINC-Manager.mo ; \ -+ $(INSTALL) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/LC_MESSAGES/BOINC-Manager.mo ; \ +- $(INSTALL_DATA) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/BOINC-Manager.mo ; \ ++ $(INSTALL_DATA) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/LC_MESSAGES/BOINC-Manager.mo ; \ fi ;\ if [ -f $$ldir/BOINC-Client.mo ] ; then \ -- $(INSTALL) $$ldir/BOINC-Client.mo $$mydir/$$ldir/BOINC-Client.mo ; \ -+ $(INSTALL) $$ldir/BOINC-Client.mo $$mydir/$$ldir/LC_MESSAGES/BOINC-Client.mo ; \ +- $(INSTALL_DATA) $$ldir/BOINC-Client.mo $$mydir/$$ldir/BOINC-Client.mo ; \ ++ $(INSTALL_DATA) $$ldir/BOINC-Client.mo $$mydir/$$ldir/LC_MESSAGES/BOINC-Client.mo ; \ fi ;\ done diff --git a/boinc-client-7.0.36-dynamic_buffers.patch b/boinc-client-7.0.36-dynamic_buffers.patch deleted file mode 100644 index e5cf029..0000000 --- a/boinc-client-7.0.36-dynamic_buffers.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: lib/filesys.cpp -=================================================================== ---- lib/filesys.cpp.orig -+++ lib/filesys.cpp -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - #if HAVE_SYS_RESOURCE_H - #include -@@ -412,7 +413,8 @@ - } while (FindNextFileA(hFind, &findData)); - ::FindClose(hFind); - #else -- char filename[1024], subdir[1024]; -+ char filename[PATH_MAX]; -+ char *subdir;; - int retval=0; - DIRREF dirp; - double x; -@@ -423,7 +425,7 @@ - while (1) { - retval = dir_scan(filename, dirp, sizeof(filename)); - if (retval) break; -- sprintf(subdir, "%s/%s", dirpath, filename); -+ asprintf(&subdir, "%s/%s", dirpath, filename); - - if (is_dir(subdir)) { - if (recurse) { -@@ -436,6 +438,9 @@ - if (retval) continue; - size += x; - } -+ -+ if(subdir != NULL) -+ free(subdir); - } - dir_close(dirp); - #endif diff --git a/boinc-client-7.0.36-AM_CONDITIONAL.patch b/boinc-client-AM_CONDITIONAL.patch similarity index 84% rename from boinc-client-7.0.36-AM_CONDITIONAL.patch rename to boinc-client-AM_CONDITIONAL.patch index fa4aad1..159e49b 100644 --- a/boinc-client-7.0.36-AM_CONDITIONAL.patch +++ b/boinc-client-AM_CONDITIONAL.patch @@ -2,15 +2,15 @@ Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac -@@ -39,6 +39,7 @@ - AC_PROG_CXX +@@ -45,6 +45,7 @@ m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCX + dnl ------ AC_PROG_F77 AC_PROG_CPP +AC_PROG_OBJCXX AC_PROG_MAKE_SET SAH_LINKS AC_LANG_PUSH(C) -@@ -744,6 +745,8 @@ +@@ -793,6 +794,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test " AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) @@ -19,9 +19,11 @@ Index: configure.ac dnl ====================================================================== dnl some more vodoo required for building portable client-binary (client, clientgui) dnl ====================================================================== +Index: clientgui/Makefile.am +=================================================================== --- clientgui/Makefile.am.orig +++ clientgui/Makefile.am -@@ -118,9 +118,8 @@ +@@ -117,9 +117,8 @@ EXTRA_DIST = *.h \ ../lib/error_numbers.h \ locale $(mac_headers) @@ -29,7 +31,7 @@ Index: configure.ac -boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0` -boincmgr_LDFLAGS = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) `pkg-config --libs gtk+-2.0` -lnotify +boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK2_CFLAGS) -+boincmgr_LDFLAGS = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK2_LIBS) ++boincmgr_LDFLAGS = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK2_LIBS) -lnotify win_config.h: $(top_srcdir)/config.h grep '#define.*BOINC.*VERSION' $^ > $@ diff --git a/boinc-client.changes b/boinc-client.changes index d1c3155..ceeaaad 100644 --- a/boinc-client.changes +++ b/boinc-client.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Mar 18 15:21:19 UTC 2014 - chris@computersalat.de + +- fix README.SUSE + +------------------------------------------------------------------- +Sun Mar 16 22:23:48 UTC 2014 - chris@computersalat.de + +# fix for bnc#779335 + * disabled boinc-completion.patch +- update to 7.2.42 + * Fix problem that was causing scheduler RPCs to fail on Yoyo@home + (HTTP status code 400) + * for mor info have a look at + http://boinc.berkeley.edu/wiki/Release_Notes +- removed obsolete patches: + * boinc-client-dynamic_buffers.patch + * boinc-init.patch +- rebased patches: + * boinc-LC_MESSAGES.patch + * boinc-client-AM_CONDITIONAL.patch + * boinc-configure.patch + * boinc-docbook2x.patch + * boinc-guirpcauth.patch + ------------------------------------------------------------------- Sat Oct 26 09:45:58 UTC 2013 - p.drouand@gmail.com @@ -10,6 +35,16 @@ Sat Oct 26 09:45:58 UTC 2013 - p.drouand@gmail.com - Remove boinc-client-glib_h.patch; fixed on upstream - Do not copy INSTALL in documentation +------------------------------------------------------------------- +Wed May 1 20:53:41 UTC 2013 - chris@computersalat.de + +- update to 7.0.28 + * sorry but there is no ChangeLog :( +- rebase patches + * dynamic_buffers, guirpcauth, AM_CONDITIONAL +- add configure patch +- remove obsolete glib_h patch + ------------------------------------------------------------------- Wed Apr 3 11:12:16 UTC 2013 - coolo@suse.com diff --git a/boinc-client-systemd b/boinc-client.service similarity index 100% rename from boinc-client-systemd rename to boinc-client.service diff --git a/boinc-client.spec b/boinc-client.spec index 08c5edf..ee015a1 100644 --- a/boinc-client.spec +++ b/boinc-client.spec @@ -1,7 +1,7 @@ # # spec file for package boinc-client # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 by Sascha Manns # # All modifications and additions to the file contributed by third parties @@ -22,18 +22,30 @@ %if 0%{?suse_version} >= 1140 %define __find_requires %wx_requires %endif -%define version_ 7_0_36 +#define version_ 6_12_43 %define soname 7 %define boinc_dir %{_localstatedir}/lib/boinc Name: boinc-client -Version: 7.0.36 +Version: 7.2.42 Release: 0 -Summary: The BOINC client core -License: LGPL-3.0 +Summary: The BOINC client +License: GPL-3.0+, LGPL-3.0+ Group: Productivity/Clustering/Computing Url: http://boinc.berkeley.edu/ -Source0: boinc_core_release-%{version_}.tar.bz2 +#Source0: boinc_core_release_%{version_}.tar.bz2 +# There is no real tarball, hence I did +# +# git clone git://boinc.berkeley.edu/boinc.git +# git checkout master +# git checkout -t client_release/7.2/7.2.42 +# +# then I created an archive via git +# +# git archive -v --format=tar --prefix=boinc-7.2.42/ \ +# client_release/7.2/7.2.42 | bzip2 >../boinc-7.2.42.tar.bz2 + +Source0: boinc-%{version}.tar.bz2 Source1: boinc-icons.tar.bz2 Source2: boinc-gui.desktop Source3: README.SUSE @@ -48,7 +60,7 @@ Source6: boinc-manager # Trim all binaries and other unnecessary things. Source8: generate-tarball.sh Source10: %{name}.init -Source20: boinc-client-systemd +Source20: %{name}.service Source100: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE boinc-guirpcauth.patch @@ -58,27 +70,35 @@ Source100: %{name}-rpmlintrc # without setting proper group ownership of the password file. Patch0: boinc-guirpcauth.patch # PATCH-FIX-OPENSUSE boinc-init.patch -Patch1: boinc-init.patch +#Patch1: boinc-init.patch # PATCH-FIX-OPENSUSE boinc-LC_MESSAGES.patch Patch2: boinc-LC_MESSAGES.patch # PATCH-FIX-OPENSUSE boinc-completion.patch -Patch3: boinc-completion.patch +# patch disabled: fix for bnc#779335 +#Patch3: boinc-completion.patch # PATCH-FIX-OPENSUSE boinc-docbook2x.patch Patch4: boinc-docbook2x.patch # PATCH-FIX-OPENSUSE pth@suse.de use asprintf to fix buffer overflow -Patch5: boinc-client-7.0.36-dynamic_buffers.patch +#Patch5: boinc-client-dynamic_buffers.patch +# PATCH-FIX-OPENSUSE computersalat - #error "Only can be included directly. +#Patch6: %{name}-glib_h.patch # PATCH-FIX-OPENSUSE coolo - #error: am__fastdepOBJCXX does not appear in AM_CONDITIONAL -Patch7: boinc-client-7.0.36-AM_CONDITIONAL.patch +Patch7: %{name}-AM_CONDITIONAL.patch +# PATCH-FIX-OPENSUSE computersalat - error: +# configure.ac:898: required file `test/version.inc.in' not found +# configure.ac:898: required file `py/Boinc/version.py.in' not found +Patch8: boinc-configure.patch # BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): pwdutils -%if 0%{?suse_version} < 1230 +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%{?systemd_requires} +%define has_systemd 1 +%else Requires(pre): %insserv_prereq Requires(pre): %fillup_prereq -%else -BuildRequires: pkgconfig(systemd) -%{?systemd_requires} %endif BuildRequires: Mesa-devel @@ -90,6 +110,12 @@ BuildRequires: update-desktop-files #BuildRequires: fcgi-devel BuildRequires: fdupes BuildRequires: freeglut-devel +%if 0%{?suse_version} >= 1310 +BuildRequires: libXScrnSaver-devel +BuildRequires: libXi-devel +BuildRequires: libxcb-devel +BuildRequires: xcb-util-devel +%endif BuildRequires: gcc-c++ BuildRequires: gcc-fortran BuildRequires: gettext-runtime @@ -112,7 +138,7 @@ BuildRequires: xorg-x11-libXmu-devel %if 0%{?suse_version} <= 1130 BuildRequires: wxGTK-devel >= 2.6.0 %else -BuildRequires: wxWidgets-devel >= 2.8.7 +BuildRequires: wxWidgets-devel >= 2.8.0 %endif Requires: cron @@ -186,16 +212,19 @@ BuildArch: noarch This package contains documentation files for %{name}. %prep -%setup -q -n boinc_core_release_%{version_} -D -a 1 +#setup -q -n boinc_core_release_%{version_} -D -a 1 +%setup -q -n boinc-%{version} -D -a 1 %patch0 -%patch1 +#patch1 %patch2 -%patch3 +#patch3 %patch4 -%patch5 +#patch5 %if 0%{?suse_version} >= 1220 +#patch6 %patch7 %endif +%patch8 # Install user hints %{__install} -m0644 %{S:3} README.SUSE @@ -216,21 +245,17 @@ pushd clientgui/res/skins/default/graphic/ popd # fix utf8 -iconv -f ISO88591 -t UTF8 < checkin_notes > checkin_notes.utf8 -touch -r checkin_notes checkin_notes.utf8 -mv checkin_notes.utf8 checkin_notes - -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 +iconv -f ISO88591 -t UTF8 < checkin_notes_2009 > checkin_notes_2009.utf8 +touch -r checkin_notes_2009 checkin_notes_2009.utf8 +mv checkin_notes_2009.utf8 checkin_notes_2009 + +iconv -f ISO88591 -t UTF8 < checkin_notes_2010 > checkin_notes_2010.utf8 +touch -r checkin_notes_2010 checkin_notes_2010.utf8 +mv checkin_notes_2010.utf8 checkin_notes_2010 # fix permissions and newlines on source files chmod 644 clientgui/{DlgItemProperties.h,AsyncRPC.cpp,DlgItemProperties.cpp} @@ -329,11 +354,10 @@ popd %{__rm} -f %{buildroot}%{_sysconfdir}/sysconfig/%{name} # Install init and create symlink to /etc/init.d/boinc-client -%if 0%{?suse_version} >=1230 -chmod -x %{S:20} -%{__install} -Dm0755 %{S:20} %{buildroot}%{_unitdir}/%{name}.service +%if 0%{?has_systemd} +%{__install} -D -m0644 %{S:20} %{buildroot}%{_unitdir}/%{name}.service # And remove sysvinit script installed by boinc -rm -r %{buildroot}/%{_initrddir} +%{__rm} -r %{buildroot}/%{_initrddir} %else %{__install} -Dm0755 %{S:10} %{buildroot}%{_initrddir}/%{name} %{__install} -dm0755 %{buildroot}%{_sbindir} @@ -365,10 +389,9 @@ rm -r %{buildroot}/%{_initrddir} # Install *.desktop File %suse_update_desktop_file -i boinc-gui Utility -# Remove libtool archives -%{__rm} %{buildroot}%{_libdir}/*.la -# Remove static libraries -%{__rm} %{buildroot}%{_libdir}/*.a +# Remove static libraries, libtool archives +%{__rm} %{buildroot}%{_libdir}/*.{a,la} + # Relinking Manpages %{__ln_s} -f boincmgr.1.gz %{buildroot}%{_mandir}/man1/boinc-manager.1.gz %{__ln_s} -f boinccmd.1.gz %{buildroot}%{_mandir}/man1/boinccmd.1.gz @@ -377,9 +400,6 @@ rm -r %{buildroot}/%{_initrddir} # Fix spurious-executable-perm %{__chmod} 0644 doc/*.php -# Don't pick INSTALL file in %doc macro - - # Install fake /var/lib/boinc %{__install} -dm0755 %{buildroot}%{_var}/lib/boinc @@ -400,16 +420,19 @@ if [ -f %{_sysconfdir}/sysconfig/%{name} ]; then mv -f %{_sysconfdir}/sysconfig/%{name} %{_sysconfdir}/sysconfig/%{name}.save fi fi +%if 0%{?has_systemd} +%service_add_pre %{name}.service +%endif %preun -%if 0%{?suse_version} >=1230 +%if 0%{?has_systemd} %service_del_preun %{name}.service %else %stop_on_removal %{name} %endif %post -%if 0%{?suse_version} >=1230 +%if 0%{?has_systemd} %service_add_post %{name}.service %else %fillup_and_insserv %{name} @@ -417,8 +440,8 @@ fi %{_sbindir}/usermod -c "BOINC Client" -s /sbin/nologin boinc 2>/dev/null || : %postun -%if 0%{?suse_version} >=1230 -%service_del_postun +%if 0%{?has_systemd} +%service_del_postun %{name}.service %else %restart_on_update %{name} %insserv_cleanup @@ -446,22 +469,23 @@ fi %files %defattr(-,root,root,-) -%doc COPYING* COPYRIGHT notes todo TODO_OLD README.SUSE +%doc COPYING* COPYRIGHT notes todo README.SUSE %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/bash_completion.d/* -%if 0%{?suse_version} >=1230 -%{_unitdir}/%{name}.service -%else -/var/adm/fillup-templates/sysconfig.%{name} -%{_sbindir}/rc%{name} -%{_initrddir}/%{name} -%endif %{_bindir}/boinc %{_bindir}/%{name} %{_bindir}/boinccmd +%{_bindir}/boincscr %{_bindir}/switcher %{_mandir}/man1/boinccmd.1.gz %{_mandir}/man1/boinc.1.gz +%if 0%{?has_systemd} +%{_unitdir}/%{name}.service +%else +%{_sbindir}/rc%{name} +%{_initrddir}/%{name} +/var/adm/fillup-templates/sysconfig.%{name} +%endif %defattr(-,boinc,boinc,-) %{_localstatedir}/lib/boinc/ diff --git a/boinc-configure.patch b/boinc-configure.patch new file mode 100644 index 0000000..0b83522 --- /dev/null +++ b/boinc-configure.patch @@ -0,0 +1,20 @@ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -968,7 +968,6 @@ AC_CONFIG_FILES([ + lib/Makefile + locale/Makefile + Makefile +- py/Boinc/version.py + py/Makefile + py/boinc_path_config.py:py/boinc_path_config.py.in + py/setup.py +@@ -990,7 +989,6 @@ AC_CONFIG_FILES([ + packages/solaris/CSW/boincmanager/prototype + test/boinc_path_config.py:py/boinc_path_config.py.in + test/Makefile +- test/version.inc + tools/boinc_path_config.py:py/boinc_path_config.py.in + tools/Makefile + vda/Makefile diff --git a/boinc-docbook2x.patch b/boinc-docbook2x.patch index d95cae2..68a5c1d 100644 --- a/boinc-docbook2x.patch +++ b/boinc-docbook2x.patch @@ -2,7 +2,7 @@ Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac -@@ -285,7 +285,7 @@ AC_SUBST([TOP_BUILD_DIR], [`pwd`]) +@@ -297,7 +297,7 @@ AC_SUBST([TOP_BUILD_DIR], [`pwd`]) dnl Check for docbook2x-man, which we use to create the manpages in dnl doc/manpages, and set the conditional HAVE_DOCBOOK2X_MAN to build dnl the manpages only if docbook2x-man is available. diff --git a/boinc-guirpcauth.patch b/boinc-guirpcauth.patch index f29f0aa..92b7b5c 100644 --- a/boinc-guirpcauth.patch +++ b/boinc-guirpcauth.patch @@ -2,17 +2,17 @@ Index: client/gui_rpc_server.cpp =================================================================== --- client/gui_rpc_server.cpp.orig +++ client/gui_rpc_server.cpp -@@ -145,12 +145,7 @@ int GUI_RPC_CONN_SET::get_password() { - // 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); +@@ -169,12 +169,7 @@ void GUI_RPC_CONN_SET::get_password() { + // 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/boinc-init.patch b/boinc-init.patch deleted file mode 100644 index 059337c..0000000 --- a/boinc-init.patch +++ /dev/null @@ -1,89 +0,0 @@ -Index: client/scripts/boinc-client.in -=================================================================== ---- client/scripts/boinc-client.in.orig -+++ client/scripts/boinc-client.in -@@ -19,14 +19,16 @@ - # For more information about BOINC (the Berkeley Open Infrastructure - # for Network Computing) see http://boinc.berkeley.edu - # processname: boinc --# config: /etc/sysconfig/boinc -+# config: /etc/sysconfig/boinc-client - # - ### BEGIN INIT INFO --# Provides: boinc --# Required-Start: $network --# Required-Stop: $network --# Default-Start: 3 4 5 --# Default-Stop: 0 1 2 6 -+# Provides: boinc-client -+# Required-Start: $network $remote_fs -+# Should-Start: $time -+# Required-Stop: $network $remote_fs -+# Should-Stop: $time -+# Default-Start: 3 5 -+# Default-Stop: 0 1 2 6 - # Short-Description: This script monitors the BOINC client. - # Description: This script starts the local BOINC client as a daemon - # For more information about BOINC (the Berkeley Open Infrastructure -@@ -117,6 +119,10 @@ fi - # - BOINCUSER=boinc - -+# Name of group to run as: -+# -+BOINCUSER=boinc -+ - # Working directory. Could be /home/boinc, /var/lib/boinc, etc.. - # The reason I prefer /var/lib/boinc is that this works best for a - # cluster of computers where /home/anything might be shared between machines -@@ -128,7 +134,7 @@ BOINCDIR=/var/lib/boinc - # but I like to rename it and put it in a public place. - # (Hint: move boincmgr to /usr/local/bin too so anyone can easily use it). - # --BOINCEXE_NAME=boinc_client -+BOINCEXE_NAME=boinc-client - BOINCEXE=${bindir}/${BOINCEXE_NAME} - BOINCCMD_NAME=boinccmd - BOINCCMD=${bindir}/${BOINCCMD_NAME} -@@ -161,9 +167,7 @@ BOINCOPTS= - # Subsys lock file ... - - # If there is the subsys directory, then use it ... --if [ -d /var/lock/subsys/ ]; then -- LOCKFILE=/var/lock/subsys/${BOINCEXE_NAME} --elif [ -d /var/lock ]; then -+if [ -d /var/lock ]; then - LOCKFILE=/var/lock/${BOINCEXE_NAME} - elif [ -d /var/run ]; then - LOCKFILE=/var/run/${BOINCEXE_NAME}.lock -@@ -178,8 +182,8 @@ export TERM=dumb - # but if the functions are not found we create our own simple replacements. - # (The idea for replacing the functions comes from OpenAFS. Thanks guys!) - --if [ -f /etc/rc.d/init.d/functions ] ; then -- . /etc/rc.d/init.d/functions -+if [ -f /etc/init.d/functions ] ; then -+ . /etc/init.d/functions - else - if printf "Hello" >/dev/null 2>/dev/null ; then - # printf works -@@ -279,7 +283,7 @@ if [ ! -d $BOINCDIR ]; then - echo -n "Creating $BOINCDIR " - if mkdir -p $BOINCDIR 2>/dev/null ; then - if [ -n "$BOINCUSER" ] ; then -- if chown $BOINCUSER $BOINCDIR ; then -+ if chown $BOINCUSER $BOINCGROUP $BOINCDIR ; then - echo_success - else - echo_failure -@@ -329,8 +333,8 @@ if [ "${USERNOW}" = "${BOINCUSER}" ] ; t - exit 8 - fi - elif [ "${USERNOW}" = "root" ] ; then -- cmd="if test -O ${BOINCDIR} ; then echo success ; fi" -- if [ -z `su $BOINCUSER -c "$cmd"` ]; then -+ # cmd="if test -O ${BOINCDIR} ; then echo success ; fi" -+ # if [ -z `su $BOINCUSER -c "$cmd"` ]; then - echo -n ERROR: $BOINCDIR is not owned by $BOINCUSER. - echo_failure - echo diff --git a/boinc_core_release-7_0_36.tar.bz2 b/boinc_core_release-7_0_36.tar.bz2 deleted file mode 100644 index 1df9bc4..0000000 --- a/boinc_core_release-7_0_36.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:061700382a0bdedb182e501f8ce51d5e84831a010bdc322c03820cc5bab0291e -size 39793308