From 5a4c610a49fcd50ca994d7aafcd8345f73ab713636b8dc24183cdcf05dedbbc7 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Sat, 2 Sep 2017 23:42:48 +0000 Subject: [PATCH] Accepting request 520383 from home:computersalat:devel:network recover removals and undocumented changes OBS-URL: https://build.opensuse.org/request/show/520383 OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=58 --- 0001-Fix-1530-null-pointer-dereference.patch | 6 ++--- boinc-client.changes | 20 +++++++++++++++ boinc-client.spec | 26 +++++++++++++++----- boinc-docbook2x.patch | 6 ++--- boinc-guirpcauth.patch | 6 ++--- xlocale.diff | 12 ++++----- 6 files changed, 55 insertions(+), 21 deletions(-) diff --git a/0001-Fix-1530-null-pointer-dereference.patch b/0001-Fix-1530-null-pointer-dereference.patch index cf10178..8e3cd28 100644 --- a/0001-Fix-1530-null-pointer-dereference.patch +++ b/0001-Fix-1530-null-pointer-dereference.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Fix #1530 (null pointer dereference) client/hostinfo_unix.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -Index: boinc-client_release-7.6-7.6.33/client/hostinfo_unix.cpp +Index: client/hostinfo_unix.cpp =================================================================== ---- boinc-client_release-7.6-7.6.33.orig/client/hostinfo_unix.cpp -+++ boinc-client_release-7.6-7.6.33/client/hostinfo_unix.cpp +--- client/hostinfo_unix.cpp.orig ++++ client/hostinfo_unix.cpp @@ -1989,11 +1989,12 @@ const vector X_display_values_in "[idle_detection] Error (%d) opening %s.", errno, dir.c_str()); } diff --git a/boinc-client.changes b/boinc-client.changes index 1370a33..16720a0 100644 --- a/boinc-client.changes +++ b/boinc-client.changes @@ -1,3 +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 @@ -5,6 +16,15 @@ Sat Sep 2 22:12:09 UTC 2017 - jengelh@inai.de - Refresh boinc-guirpcauth.patch, boinc-docbook2x.patch, 0001-Fix-1530-null-pointer-dereference.patch +------------------------------------------------------------------- +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 diff --git a/boinc-client.spec b/boinc-client.spec index 95c242c..70ed11f 100644 --- a/boinc-client.spec +++ b/boinc-client.spec @@ -47,10 +47,16 @@ Source6: boinc-manager Source10: %{name}.init Source20: %{name}.service Source100: %{name}-rpmlintrc -Patch1: boinc-guirpcauth.patch -Patch2: boinc-docbook2x.patch -Patch3: 0001-Fix-1530-null-pointer-dereference.patch -Patch4: xlocale.diff +# PATCH-FIX-OPENSUSE boinc-guirpcauth.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. +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 # BuildRequires: Mesa-devel @@ -71,9 +77,10 @@ BuildRequires: pkg-config BuildRequires: pwdutils BuildRequires: sqlite3-devel BuildRequires: xorg-x11-libXmu-devel +Requires(pre): pwdutils +Requires: ca-certificates-mozilla Recommends: boinc-client-lang = %{version} Recommends: logrotate -Requires(pre): pwdutils # %if 0%{?suse_version} >= 1310 BuildRequires: libXScrnSaver-devel @@ -115,6 +122,7 @@ computer time to search for cures for diseases, model protein folding, study global warming, discover sources of gravitational waves, and many other types of scientific and mathematical research. +%if %{with manager} %package -n boinc-manager Summary: GUI to control and monitor boinc-client Group: Productivity/Scientific/Astronomy @@ -127,6 +135,7 @@ 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 which it only displays the most important information and the "Advanced View" in which all information and all control elements are available. +%endif %package devel Summary: Development files for boinc-client @@ -160,7 +169,10 @@ This package contains documentation files for the BOINC client. %prep %setup -q -n %{name}_release-7.6-%{version} -D -a 1 -%patch -P 1 -P 2 -P 3 -P 4 -p1 +%patch0 +%patch4 +%patch5 +%patch6 %build # Install user hints @@ -368,6 +380,7 @@ fi %insserv_cleanup %endif +%if %{with manager} %post -n boinc-manager %{_bindir}/touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then @@ -379,6 +392,7 @@ fi if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%endif %post -n libboinc%{sonum} -p /sbin/ldconfig diff --git a/boinc-docbook2x.patch b/boinc-docbook2x.patch index cd68a29..ee38258 100644 --- a/boinc-docbook2x.patch +++ b/boinc-docbook2x.patch @@ -3,10 +3,10 @@ configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: boinc-client_release-7.6-7.6.33/configure.ac +Index: configure.ac =================================================================== ---- boinc-client_release-7.6-7.6.33.orig/configure.ac -+++ boinc-client_release-7.6-7.6.33/configure.ac +--- configure.ac.orig ++++ configure.ac @@ -334,7 +334,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 diff --git a/boinc-guirpcauth.patch b/boinc-guirpcauth.patch index a596078..0ae1d68 100644 --- a/boinc-guirpcauth.patch +++ b/boinc-guirpcauth.patch @@ -9,10 +9,10 @@ client/gui_rpc_server.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -Index: boinc-client_release-7.6-7.6.33/client/gui_rpc_server.cpp +Index: client/gui_rpc_server.cpp =================================================================== ---- boinc-client_release-7.6-7.6.33.orig/client/gui_rpc_server.cpp -+++ boinc-client_release-7.6-7.6.33/client/gui_rpc_server.cpp +--- client/gui_rpc_server.cpp.orig ++++ client/gui_rpc_server.cpp @@ -175,12 +175,7 @@ void GUI_RPC_CONN_SET::get_password() { // they can cause code to execute as this user. // So better protect it. diff --git a/xlocale.diff b/xlocale.diff index 619b40b..e600c98 100644 --- a/xlocale.diff +++ b/xlocale.diff @@ -7,10 +7,10 @@ build: no more xlocale.h with glibc-2.26 lib/gui_rpc_client.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: boinc-client_release-7.6-7.6.33/clientgui/AsyncRPC.cpp +Index: clientgui/AsyncRPC.cpp =================================================================== ---- boinc-client_release-7.6-7.6.33.orig/clientgui/AsyncRPC.cpp -+++ boinc-client_release-7.6-7.6.33/clientgui/AsyncRPC.cpp +--- clientgui/AsyncRPC.cpp.orig ++++ clientgui/AsyncRPC.cpp @@ -20,7 +20,7 @@ #endif @@ -20,10 +20,10 @@ Index: boinc-client_release-7.6-7.6.33/clientgui/AsyncRPC.cpp #endif #include "stdwx.h" -Index: boinc-client_release-7.6-7.6.33/lib/gui_rpc_client.h +Index: lib/gui_rpc_client.h =================================================================== ---- boinc-client_release-7.6-7.6.33.orig/lib/gui_rpc_client.h -+++ boinc-client_release-7.6-7.6.33/lib/gui_rpc_client.h +--- lib/gui_rpc_client.h.orig ++++ lib/gui_rpc_client.h @@ -801,7 +801,7 @@ struct RPC { #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)