1
0
forked from pool/boinc-client

Accepting request 126826 from home:computersalat:devel:network

update to 6.12.43

OBS-URL: https://build.opensuse.org/request/show/126826
OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=25
This commit is contained in:
Christian Wittmer 2012-07-01 20:09:47 +00:00 committed by Git OBS Bridge
parent 74b63951d2
commit 1feb96f4e2
14 changed files with 120 additions and 68 deletions

View File

@ -2,7 +2,7 @@ Index: locale/Makefile.am
===================================================================
--- locale/Makefile.am.orig
+++ locale/Makefile.am
@@ -45,9 +45,9 @@ locale_dirs = \
@@ -45,12 +45,12 @@ locale_dirs = \
install-exec-hook:
mydir=$(DESTDIR)$(datadir) ;\
for ldir in $(locale_dirs) ; do \
@ -12,5 +12,9 @@ Index: locale/Makefile.am
- $(INSTALL) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/BOINC-Manager.mo ; \
+ $(INSTALL) $$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 ; \
fi ;\
done

View File

@ -2,7 +2,7 @@ Index: lib/filesys.cpp
===================================================================
--- lib/filesys.cpp.orig
+++ lib/filesys.cpp
@@ -36,6 +36,7 @@
@@ -46,6 +46,7 @@
#include <sys/time.h>
#include <unistd.h>
#include <dirent.h>
@ -10,7 +10,7 @@ Index: lib/filesys.cpp
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
@@ -371,7 +372,8 @@ int dir_size(const char* dirpath, double
@@ -400,7 +401,8 @@ int dir_size(const char* dirpath, double
} while (FindNextFileA(hFind, &findData));
::FindClose(hFind);
#else
@ -20,7 +20,7 @@ Index: lib/filesys.cpp
int retval=0;
DIRREF dirp;
double x;
@@ -382,7 +384,7 @@ int dir_size(const char* dirpath, double
@@ -411,7 +413,7 @@ int dir_size(const char* dirpath, double
while (1) {
retval = dir_scan(filename, dirp, sizeof(filename));
if (retval) break;
@ -29,7 +29,7 @@ Index: lib/filesys.cpp
if (is_dir(subdir)) {
if (recurse) {
@@ -395,6 +397,9 @@ int dir_size(const char* dirpath, double
@@ -424,6 +426,9 @@ int dir_size(const char* dirpath, double
if (retval) continue;
size += x;
}

13
boinc-client-glib_h.patch Normal file
View File

@ -0,0 +1,13 @@
Index: clientgui/gtk/taskbarex.cpp
===================================================================
--- clientgui/gtk/taskbarex.cpp.orig
+++ clientgui/gtk/taskbarex.cpp
@@ -20,7 +20,7 @@
#include "stdwx.h"
#include <libnotify/notify.h>
-#include <glib/gtypes.h>
+#include <glib.h>
#include <glib-object.h>
#include <dlfcn.h>

View File

@ -1,12 +0,0 @@
Index: lib/str_util.h
===================================================================
--- lib/str_util.h.orig
+++ lib/str_util.h
@@ -17,6 +17,7 @@
#ifndef STR_UTIL_H
#define STR_UTIL_H
+#define HAVE_STRCASESTR
#include <cstdlib>
#include <ctime>

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Sun Jul 1 19:51:54 UTC 2012 - chris@computersalat.de
- add BOINC_DIR to sysconfig
* make BOINC_DIR configurable (a proposal of Carsten Neumann)
-------------------------------------------------------------------
Sat Feb 11 00:56:07 UTC 2012 - chris@computersalat.de
- add glib_h patch
-------------------------------------------------------------------
Fri Feb 10 23:40:19 UTC 2012 - chris@computersalat.de
- update tp 6.12.43
* sorry but there is no ChangeLog :(
- rework patches
- remove obsolete patches
* boinc-server.patch
* boinc-client-str_util.patch
- add boinc-client-lang subpkg
- fix DSOLinkChange for suse >= 1210
* see https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
for more info, special thanks to Stefan Dirsch :)
-------------------------------------------------------------------
Fri Feb 10 23:07:01 UTC 2012 - chris@computersalat.de
@ -11,12 +36,6 @@ Wed Feb 8 22:51:55 UTC 2012 - chris@computersalat.de
- fix for bnc#744389 ( boinc-client will not run )
- fix for bnc#732118 ( BOINC installs but will not run )
-------------------------------------------------------------------
Wed Feb 8 22:39:34 UTC 2012 - chris@computersalat.de
- fix replacing old sysconfig file
- revert boinc users shell to /sbin/nologin
-------------------------------------------------------------------
Mon Feb 6 15:05:05 UTC 2012 - chris@computersalat.de

View File

@ -56,7 +56,6 @@ test -r $BOINC_CONFIG || { echo "$BOINC_CONFIG not existing";
# some other VARS
BOINC_SVC="BOINC Client"
BOINC_DIR="/var/lib/boinc"
BOINCCMD_BIN="/usr/bin/boinccmd"
BOINC_LOG="/var/log/boinc-client.log"
BOINC_ERRLOG="/var/log/boinc-client.err.log"
@ -65,6 +64,7 @@ BOINC_LOCKFILE="/var/run/boinc-client.lock"
BOINC_USR=${BOINC_BOINC_USR:="boinc"}
BOINC_GRP=${BOINC_BOINC_GRP:="boinc"}
BOINC_DIR=${BOINC_BOINC_DIR:="/var/lib/boinc"}
BOINC_OPTS=${BOINC_BOINC_OPTS:=""}
# Source LSB init functions

View File

@ -22,13 +22,13 @@
%if 0%{?suse_version} >= 1140
%define __find_requires %wx_requires
%endif
%define version_ 6_10_60
%define version_ 6_12_43
%define soname 6
%define boinc_dir %{_localstatedir}/lib/boinc
Name: boinc-client
Version: 6.10.60
Release: 1
Version: 6.12.43
Release: 0
Summary: The BOINC client core
License: LGPL-3.0
Group: Productivity/Clustering/Computing
@ -64,12 +64,10 @@ Patch2: boinc-LC_MESSAGES.patch
Patch3: boinc-completion.patch
# PATCH-FIX-OPENSUSE boinc-docbook2x.patch
Patch4: boinc-docbook2x.patch
# PATCH-FIX-OPENSUSE boinc-server.patch
Patch5: boinc-server.patch
# PATCH-FIX-OPENSUSE saigkill@opensuse.org adds define HAVE_STRCASESRTR
Patch6: %{name}-str_util.patch
# PATCH-FIX-OPENSUSE pth@suse.de use asprintf to fix buffer overflow
Patch7: %{name}-dynamic_buffers.patch
Patch5: boinc-client-dynamic_buffers.patch
# PATCH-FIX-OPENSUSE computersalat - #error "Only <glib.h> can be included directly.
Patch6: %{name}-glib_h.patch
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -80,9 +78,9 @@ Requires(pre): %fillup_prereq
BuildRequires: Mesa-devel
#BuildRequires: autoconf
#BuildRequires: automake
BuildRequires: update-desktop-files
BuildRequires: docbook2x
BuildRequires: docbook_4
BuildRequires: update-desktop-files
#BuildRequires: fcgi-devel
BuildRequires: fdupes
BuildRequires: freeglut-devel
@ -92,6 +90,7 @@ BuildRequires: gettext-runtime
#BuildRequires: gnutls-devel
BuildRequires: libcurl-devel >= 7.17.1
BuildRequires: libjpeg-devel
BuildRequires: libnotify-devel
BuildRequires: libtool
BuildRequires: libxslt
#BuildRequires: m4
@ -110,8 +109,13 @@ BuildRequires: wxGTK-devel >= 2.6.0
BuildRequires: wxWidgets-devel >= 2.8.7
%endif
Requires: logrotate
Requires: cron
Requires: logrotate
### FIXME:
## updating boinc-client or boinc-manager does not update libboinc6
## hence we define this dependency
## !! Do not remove this dependency !!
Requires: libboinc%{soname} = %{version}-%{release}
%lang_package
%lang_package -n boinc-manager
@ -183,8 +187,9 @@ This package contains documentation files for %{name}.
%patch3
%patch4
%patch5
%if 0%{?suse_version} >= 1220
%patch6
%patch7
%endif
# Install user hints
%{__install} -m0644 %{S:3} README.SUSE
@ -213,8 +218,7 @@ popd
%{__rm} client/app_stats_mac.cpp
%build
#remove ltmain.sh & run libtoolize and ./_autosetup
%{__rm} ltmain.sh
#remove run libtoolize and ./_autosetup
/usr/bin/libtoolize --force
./_autosetup
@ -238,8 +242,34 @@ popd
CXXFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT" \
DESTDIR=%{_prefix} %{?_smp_mflags}
### hmm, boincmgr is not build by default (but stated in configure)
# BOINC Default enable values
# --enable-server --enable-client --enable-libraries
# --enable-manager: builds server, client, and libraries
#
# hence we jump into clientgui and build it manually
pushd clientgui
%{__make} libboinc_la_LIBADD="-L%{_libdir} -lssl -ldl" \
%if 0%{?suse_version} >= 1210
CFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT -lgtk-x11-2.0" \
CXXFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT -lgtk-x11-2.0" \
%else
CFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT" \
CXXFLAGS="%{optflags} -g -W -pipe -fno-strict-aliasing -D_REENTRANT" \
%endif
DESTDIR=%{_prefix} %{?_smp_mflags}
popd
pushd locale
%{__make}
popd
%install
%{makeinstall}
for i in clientgui locale; do
pushd $i
%{makeinstall}
popd
done
# Creates default folders
%{__install} -dm0755 %{buildroot}%{boinc_dir}
@ -279,7 +309,7 @@ popd
# Install logrotate
%{__install} -Dm0644 %{S:5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
# Install bash completition
# Install bash completion
%{__install} -Dpm0644 client/scripts/boinc.bash %{buildroot}%{_sysconfdir}/bash_completion.d/boinc
# Install template for sysconfig
@ -293,10 +323,10 @@ popd
%{__install} -Dm0644 boinc-gui-22.png %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/boinc-gui.png
%{__install} -Dm0644 boinc-gui-16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/boinc-gui.png
# Move and rename icons
%{__mv} %{buildroot}%{_datadir}/boinc/boincmgr.16x16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/boincmgr.png
%{__mv} %{buildroot}%{_datadir}/boinc/boincmgr.32x32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/boincmgr.png
%{__mv} %{buildroot}%{_datadir}/boinc/boincmgr.48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/boincmgr.png
# install icons
%{__install} -m0644 clientgui/res/boincmgr.16x16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/boincmanager.png
%{__install} -m0644 clientgui/res/boincmgr.32x32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/boincmanager.png
%{__install} -m0644 clientgui/res/boincmgr.48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/boincmanager.png
# Install *.desktop File
%suse_update_desktop_file -i boinc-gui Utility
@ -305,9 +335,9 @@ popd
%{__rm} %{buildroot}%{_libdir}/*.la
# Relinking Manpages
/bin/ln -sf boincmgr.1.gz %{buildroot}%{_mandir}/man1/boincmanager.1.gz
/bin/ln -sf boinccmd.1.gz %{buildroot}%{_mandir}/man1/boinccmd.1.gz
/bin/ln -sf boinc.1.gz %{buildroot}%{_mandir}/man1/boinc.1.gz
%{__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
%{__ln_s} -f boinc.1.gz %{buildroot}%{_mandir}/man1/boinc.1.gz
# Fix spurious-executable-perm
%{__chmod} 0644 doc/*.php
@ -316,6 +346,7 @@ popd
%{__install} -dm0755 %{buildroot}%{_var}/lib/boinc
# Prepare $LANG Packages
%find_lang BOINC-Client
%find_lang BOINC-Manager
%fdupes -s %{buildroot}
@ -340,7 +371,7 @@ fi
%post
%fillup_and_insserv %{name}
%{_sbindir}/usermod -c "BOINC Client" boinc 2>/dev/null || :
%{_sbindir}/usermod -c "BOINC Client" -s /sbin/nologin boinc 2>/dev/null || :
%postun
%restart_on_update %{name}
@ -397,7 +428,9 @@ fi
%{_datadir}/applications/boinc-gui.desktop
%{_datadir}/icons/hicolor/*/apps/*
%{_mandir}/man1/boincmgr.1.gz
%{_mandir}/man1/boincmanager.1.gz
%{_mandir}/man1/boinc-manager.1.gz
%files -n %{name}-lang -f BOINC-Client.lang
%files -n boinc-manager-lang -f BOINC-Manager.lang

View File

@ -7,7 +7,7 @@ Index: client/scripts/boinc.bash
fi
}
-complete -F _boinc -o default boinc
+complete -F _boinc -o default boinc-client
+complete -F _boinc -o default-boinc
_boinccmd()
{

View File

@ -2,7 +2,7 @@ Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -284,7 +284,7 @@ AC_SUBST([TOP_BUILD_DIR], [`pwd`])
@@ -285,7 +285,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.

View File

@ -2,7 +2,7 @@ Index: client/gui_rpc_server.cpp
===================================================================
--- client/gui_rpc_server.cpp.orig
+++ client/gui_rpc_server.cpp
@@ -146,12 +146,7 @@ int GUI_RPC_CONN_SET::get_password() {
@@ -145,12 +145,7 @@ int GUI_RPC_CONN_SET::get_password() {
// they can cause code to execute as this user.
// So better protect it.
//

View File

@ -1,15 +0,0 @@
Index: sched/handle_request.cpp
===================================================================
--- sched/handle_request.cpp.orig
+++ sched/handle_request.cpp
@@ -143,7 +143,9 @@ int lock_sched() {
// write PID into the CGI_<HOSTID> file and flush to disk
//
count = sprintf(pid_string, "%d\n", getpid());
- write(fd, pid_string, count);
+ if( write(fd, pid_string, count) < 0 ) {
+ perror("Cannot write PID to host-file") ; exit(errno) ;
+ };
fsync(fd);
g_reply->lockfile_fd = fd;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dcfbf80fe432d3332f9a407e8a014234840431b5e97f562db204790c80321189
size 17848931

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:16f1bb32459fc12178dd1e6f69e5398d1c0952f861eea5548877ae4393d39133
size 18792133

View File

@ -19,6 +19,16 @@ BOINC_BOINC_USR="boinc"
#
BOINC_BOINC_GRP="boinc"
## Path: Productivity/Clustering/Computing
## Description: define BOINC DIR
## Type: string
## Default: "/var/lib/boinc"
## Config: BOINC
##
## An empty setting will point to /var/lib/boinc
##
BOINC_BOINC_DIR=""
## Path: Productivity/Clustering/Computing
## Description: define BOINC options
## Type: string