jengelh/boinc-client
SHA256
1
0
Fork 0
forked from pool/boinc-client
Code Pull Requests Activity

add more metadata and more .changes lines

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=59
This commit is contained in:
Jan Engelhardt 2017-09-03 10:14:15 +00:00 committed by Git OBS Bridge
parent 5a4c610a49
commit 604f91080f
6 changed files with 46 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-Fix-1530-null-pointer-dereference.patch
View File

@ -2,15 +2,17 @@ From 8416d8a1a423535fbc5d4e7416d6eac8ac5c050b Mon Sep 17 00:00:00 2001
From: Preston Maness <aggroskater@gmail.com> From: Preston Maness <aggroskater@gmail.com>
Date: Tue, 26 Apr 2016 23:06:57 -0500 Date: Tue, 26 Apr 2016 23:06:57 -0500
Subject: [PATCH] Fix #1530 (null pointer dereference) Subject: [PATCH] Fix #1530 (null pointer dereference)
X-Patch-added-by: Jan Engelhardt <jengelh@inai.de>
X-Patch-added-on: 2016-12-27 21:25:14 +0000
--- ---
client/hostinfo_unix.cpp | 9 +++++---- client/hostinfo_unix.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-) 1 file changed, 5 insertions(+), 4 deletions(-)
Index: client/hostinfo_unix.cpp Index: boinc-client_release-7.6-7.6.33/client/hostinfo_unix.cpp
=================================================================== ===================================================================
--- client/hostinfo_unix.cpp.orig --- boinc-client_release-7.6-7.6.33.orig/client/hostinfo_unix.cpp
+++ client/hostinfo_unix.cpp +++ boinc-client_release-7.6-7.6.33/client/hostinfo_unix.cpp
@@ -1989,11 +1989,12 @@ const vector<string> X_display_values_in @@ -1989,11 +1989,12 @@ const vector<string> X_display_values_in
"[idle_detection] Error (%d) opening %s.", errno, dir.c_str()); "[idle_detection] Error (%d) opening %s.", errno, dir.c_str());
} }

29
boinc-client.changes
View File

@ -1,29 +1,14 @@
-------------------------------------------------------------------
Sat Sep 2 23:40:47 UTC 2017 - chris@computersalat.de
- recover removed comments
- recover removed 'if %{with manager}'
- rebase patches to be p0 (quilt)
* 0001-Fix-1530-null-pointer-dereference.patch
* boinc-docbook2x.patch
* boinc-guirpcauth.patch
* xlocale.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 2 22:12:09 UTC 2017 - jengelh@inai.de Sat Sep 2 22:12:09 UTC 2017 - jengelh@inai.de
- Add xlocale.diff - Remove unnecessary %if..%endif markers that do not affect the
rpmbuild output files.
- Move patch metadata into patch so it stays with the patch.
Add more authorship info.
- Add xlocale.patch to fix build error with glibc-2.26.
- Refresh boinc-guirpcauth.patch, boinc-docbook2x.patch, - Refresh boinc-guirpcauth.patch, boinc-docbook2x.patch,
0001-Fix-1530-null-pointer-dereference.patch 0001-Fix-1530-null-pointer-dereference.patch to quilt's default
p1 level.
-------------------------------------------------------------------
Mon Mar 27 10:59:02 UTC 2017 - chris@computersalat.de
- fix deps
* add missing ca-certificates-mozilla
needed in minimal install, e.g. JeOS images,
without - boinc-client will fail to load config from
e.g. www.worldcommunitygrid.org/get_project_config.php
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 25 17:53:03 UTC 2017 - chris@computersalat.de Sat Feb 25 17:53:03 UTC 2017 - chris@computersalat.de

26
boinc-client.spec
View File

@ -47,16 +47,10 @@ Source6: boinc-manager
Source10: %{name}.init Source10: %{name}.init
Source20: %{name}.service Source20: %{name}.service
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE boinc-guirpcauth.patch Patch1: boinc-guirpcauth.patch
# Create password file rw for group, this enables passwordless connection Patch2: boinc-docbook2x.patch
# of manager from users of the boinc group. Patch3: 0001-Fix-1530-null-pointer-dereference.patch
# This won't be probably upstreamed as it might be unsafe for common usage Patch4: xlocale.patch
# without setting proper group ownership of the password file.
Patch0: boinc-guirpcauth.patch
# PATCH-FIX-OPENSUSE boinc-docbook2x.patch
Patch4: boinc-docbook2x.patch
Patch5: 0001-Fix-1530-null-pointer-dereference.patch
Patch6: xlocale.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# #
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
@ -77,10 +71,9 @@ BuildRequires: pkg-config
BuildRequires: pwdutils BuildRequires: pwdutils
BuildRequires: sqlite3-devel BuildRequires: sqlite3-devel
BuildRequires: xorg-x11-libXmu-devel BuildRequires: xorg-x11-libXmu-devel
Requires(pre): pwdutils
Requires: ca-certificates-mozilla
Recommends: boinc-client-lang = %{version} Recommends: boinc-client-lang = %{version}
Recommends: logrotate Recommends: logrotate
Requires(pre): pwdutils
# #
%if 0%{?suse_version} >= 1310 %if 0%{?suse_version} >= 1310
BuildRequires: libXScrnSaver-devel BuildRequires: libXScrnSaver-devel
@ -122,7 +115,6 @@ computer time to search for cures for diseases, model protein folding, study
global warming, discover sources of gravitational waves, and many other types global warming, discover sources of gravitational waves, and many other types
of scientific and mathematical research. of scientific and mathematical research.
%if %{with manager}
%package -n boinc-manager %package -n boinc-manager
Summary: GUI to control and monitor boinc-client Summary: GUI to control and monitor boinc-client
Group: Productivity/Scientific/Astronomy Group: Productivity/Scientific/Astronomy
@ -135,7 +127,6 @@ core client. It gives a detailed overview of the state of the client it is
monitoring. The BOINC Manager has two modes of operation, the "Simple View" in monitoring. The BOINC Manager has two modes of operation, the "Simple View" in
which it only displays the most important information and the "Advanced View" which it only displays the most important information and the "Advanced View"
in which all information and all control elements are available. in which all information and all control elements are available.
%endif
%package devel %package devel
Summary: Development files for boinc-client Summary: Development files for boinc-client
@ -169,10 +160,7 @@ This package contains documentation files for the BOINC client.
%prep %prep
%setup -q -n %{name}_release-7.6-%{version} -D -a 1 %setup -q -n %{name}_release-7.6-%{version} -D -a 1
%patch0 %patch -P 1 -P 2 -P 3 -P 4 -p1
%patch4
%patch5
%patch6
%build %build
# Install user hints # Install user hints
@ -380,7 +368,6 @@ fi
%insserv_cleanup %insserv_cleanup
%endif %endif
%if %{with manager}
%post -n boinc-manager %post -n boinc-manager
%{_bindir}/touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@ -392,7 +379,6 @@ fi
if [ -x %{_bindir}/gtk-update-icon-cache ]; then if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi fi
%endif
%post -n libboinc%{sonum} -p /sbin/ldconfig %post -n libboinc%{sonum} -p /sbin/ldconfig

13
boinc-docbook2x.patch
View File

@ -1,12 +1,17 @@
# PATCH-FIX-OPENSUSE boinc-docbook2x.patch From: (unknown, dates back beyond OBS history start)
X-Upstream: no
In opensuse, the docbook utility is named docbook-to-man instead
of docbook2x-man.
--- ---
configure.ac | 2 +- configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: configure.ac Index: boinc-client_release-7.6-7.6.33/configure.ac
=================================================================== ===================================================================
--- configure.ac.orig --- boinc-client_release-7.6-7.6.33.orig/configure.ac
+++ configure.ac +++ boinc-client_release-7.6-7.6.33/configure.ac
@@ -334,7 +334,7 @@ AC_SUBST([TOP_BUILD_DIR], [`pwd`]) @@ -334,7 +334,7 @@ AC_SUBST([TOP_BUILD_DIR], [`pwd`])
dnl Check for docbook2x-man, which we use to create the manpages in 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 doc/manpages, and set the conditional HAVE_DOCBOOK2X_MAN to build

18
boinc-guirpcauth.patch
View File

@ -1,18 +1,20 @@
From: <saigkill@opensuse.org>
Date: 2011-04-28 17:29:54 +0000
X-Upstream: no
# PATCH-FIX-OPENSUSE boinc-guirpcauth.patch Create password file rw for group, this enables passwordless connection
# Create password file rw for group, this enables passwordless connection of manager from users of the boinc group. This won't be probably
# of manager from users of the boinc group. upstreamed as it might be unsafe for common usage without setting
# This won't be probably upstreamed as it might be unsafe for common usage proper group ownership of the password file.
# without setting proper group ownership of the password file.
--- ---
client/gui_rpc_server.cpp | 7 +------ client/gui_rpc_server.cpp | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-) 1 file changed, 1 insertion(+), 6 deletions(-)
Index: client/gui_rpc_server.cpp Index: boinc-client_release-7.6-7.6.33/client/gui_rpc_server.cpp
=================================================================== ===================================================================
--- client/gui_rpc_server.cpp.orig --- boinc-client_release-7.6-7.6.33.orig/client/gui_rpc_server.cpp
+++ client/gui_rpc_server.cpp +++ boinc-client_release-7.6-7.6.33/client/gui_rpc_server.cpp
@@ -175,12 +175,7 @@ void GUI_RPC_CONN_SET::get_password() { @@ -175,12 +175,7 @@ void GUI_RPC_CONN_SET::get_password() {
// they can cause code to execute as this user. // they can cause code to execute as this user.
// So better protect it. // So better protect it.

16
xlocale.diff → xlocale.patch
View File

@ -1,16 +1,18 @@
From: Jan Engelhardt <jengelh@inai.de> From: Jan Engelhardt <jengelh@inai.de>
Date: 2017-09-03 00:10:38.255132582 +0200 Date: 2017-09-03 00:10:38.255132582 +0200
build: no more xlocale.h with glibc-2.26 build: use xlocale.h instead of locale.h
glibc-2.26 has dropped xlocale.h.
--- ---
clientgui/AsyncRPC.cpp | 2 +- clientgui/AsyncRPC.cpp | 2 +-
lib/gui_rpc_client.h | 2 +- lib/gui_rpc_client.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
Index: clientgui/AsyncRPC.cpp Index: boinc-client_release-7.6-7.6.33/clientgui/AsyncRPC.cpp
=================================================================== ===================================================================
--- clientgui/AsyncRPC.cpp.orig --- boinc-client_release-7.6-7.6.33.orig/clientgui/AsyncRPC.cpp
+++ clientgui/AsyncRPC.cpp +++ boinc-client_release-7.6-7.6.33/clientgui/AsyncRPC.cpp
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
#endif #endif
@ -20,10 +22,10 @@ Index: clientgui/AsyncRPC.cpp
#endif #endif
#include "stdwx.h" #include "stdwx.h"
Index: lib/gui_rpc_client.h Index: boinc-client_release-7.6-7.6.33/lib/gui_rpc_client.h
=================================================================== ===================================================================
--- lib/gui_rpc_client.h.orig --- boinc-client_release-7.6-7.6.33.orig/lib/gui_rpc_client.h
+++ lib/gui_rpc_client.h +++ boinc-client_release-7.6-7.6.33/lib/gui_rpc_client.h
@@ -801,7 +801,7 @@ struct RPC { @@ -801,7 +801,7 @@ struct RPC {
#elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4) #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)