- Add xlocale.diff

- Refresh boinc-guirpcauth.patch, boinc-docbook2x.patch,
  0001-Fix-1530-null-pointer-dereference.patch

OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=57

0001-Fix-1530-null-pointer-dereference.patch

@@ -4,14 +4,14 @@ Date: Tue, 26 Apr 2016 23:06:57 -0500
 Subject: [PATCH] Fix #1530 (null pointer dereference)
 
 ---
- client/hostinfo_unix.cpp | 9 +++++----
+ client/hostinfo_unix.cpp |    9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
-diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp
+Index: boinc-client_release-7.6-7.6.33/client/hostinfo_unix.cpp
-index 38a0cf5..54f577e 100644
+===================================================================
---- a/client/hostinfo_unix.cpp
+--- boinc-client_release-7.6-7.6.33.orig/client/hostinfo_unix.cpp
-+++ b/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_initialize() {
+@@ -1989,11 +1989,12 @@ const vector<string> X_display_values_in
          "[idle_detection] Error (%d) opening %s.", errno, dir.c_str());
      }
    }
@@ -28,6 +28,3 @@ index 38a0cf5..54f577e 100644
  
    // Get rid of non-matching elements and format the matching ones.
    for ( it = display_values.begin() ; it != display_values.end() ; ) {
--- 
-2.10.2
-

boinc-client.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Sep  2 22:12:09 UTC 2017 - jengelh@inai.de
+
+- Add xlocale.diff
+- Refresh boinc-guirpcauth.patch, boinc-docbook2x.patch,
+  0001-Fix-1530-null-pointer-dereference.patch
+
 -------------------------------------------------------------------
 Sat Feb 25 17:53:03 UTC 2017 - chris@computersalat.de
 

boinc-client.spec

@@ -47,15 +47,10 @@ Source6:        boinc-manager
 Source10:       %{name}.init
 Source20:       %{name}.service
 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.diff
-# 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 BuildRequires:  Mesa-devel
@@ -120,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
 of scientific and mathematical research.
 
-%if %{with manager}
 %package -n boinc-manager
 Summary:        GUI to control and monitor boinc-client
 Group:          Productivity/Scientific/Astronomy
@@ -133,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
 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
@@ -167,9 +160,7 @@ This package contains documentation files for the BOINC client.
 
 %prep
 %setup -q -n %{name}_release-7.6-%{version} -D -a 1
-%patch0
+%patch -P 1 -P 2 -P 3 -P 4 -p1
-%patch4
-%patch -P 5 -p1
 
 %build
 # Install user hints
@@ -377,7 +368,6 @@ 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
@@ -389,7 +379,6 @@ 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
 

boinc-docbook2x.patch

@@ -1,8 +1,13 @@
-Index: configure.ac
+# PATCH-FIX-OPENSUSE boinc-docbook2x.patch
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
-@@ -333,7 +333,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 doc/manpages, and set the conditional HAVE_DOCBOOK2X_MAN to build
  dnl the manpages only if docbook2x-man is available.

boinc-guirpcauth.patch

@@ -1,7 +1,18 @@
-Index: client/gui_rpc_server.cpp
+
+# 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.
+
+---
+ 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
 ===================================================================
---- 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() {
      // they can cause code to execute as this user.
      // So better protect it.

xlocale.diff

@@ -0,0 +1,35 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2017-09-03 00:10:38.255132582 +0200
+
+build: no more xlocale.h with glibc-2.26
+---
+ clientgui/AsyncRPC.cpp |    2 +-
+ 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
+===================================================================
+--- boinc-client_release-7.6-7.6.33.orig/clientgui/AsyncRPC.cpp
++++ boinc-client_release-7.6-7.6.33/clientgui/AsyncRPC.cpp
+@@ -20,7 +20,7 @@
+ #endif
+ 
+ #if !(defined(_WIN32) || (defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)))
+-#include <xlocale.h>
++#include <locale.h>
+ #endif
+ 
+ #include "stdwx.h"
+Index: boinc-client_release-7.6-7.6.33/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
+@@ -801,7 +801,7 @@ struct RPC {
+ 
+ #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)
+ // uselocale() is not available in OS 10.3.9 so use weak linking
+-#include <xlocale.h>
++#include <locale.h>
+ extern int		freelocale(locale_t) __attribute__((weak_import));
+ extern locale_t	newlocale(int, __const char *, locale_t) __attribute__((weak_import));
+ extern locale_t	uselocale(locale_t) __attribute__((weak_import));