Accepting request 536999 from network

update to 7.8.3 (forwarded request 536998 from computersalat)

OBS-URL: https://build.opensuse.org/request/show/536999
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boinc-client?expand=0&rev=38

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

@@ -1,32 +0,0 @@
-From 8416d8a1a423535fbc5d4e7416d6eac8ac5c050b Mon Sep 17 00:00:00 2001
-From: Preston Maness <aggroskater@gmail.com>
-Date: Tue, 26 Apr 2016 23:06:57 -0500
-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 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-Index: boinc-client_release-7.6-7.6.33/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
-@@ -1989,11 +1989,12 @@ const vector<string> X_display_values_in
-         "[idle_detection] Error (%d) opening %s.", errno, dir.c_str());
-     }
-   }
--
--  while ((dirp = readdir(dp)) != NULL) {
--    display_values.push_back(string(dirp->d_name));
-+  else {
-+    while ((dirp = readdir(dp)) != NULL) {
-+      display_values.push_back(string(dirp->d_name));
-+    }
-+    closedir(dp);
-   }
--  closedir(dp);
- 
-   // Get rid of non-matching elements and format the matching ones.
-   for ( it = display_values.begin() ; it != display_values.end() ; ) {

0001-MGR-support-wxWidgets-without-webview.patch

@@ -10,10 +10,10 @@ with a wxHtmlWindow instead.
  clientgui/NoticeListCtrl.h   |    8 ++++++++
  2 files changed, 33 insertions(+)
 
-Index: boinc-client_release-7.6-7.6.33/clientgui/NoticeListCtrl.cpp
+Index: boinc-client_release-7.8-7.8.3/clientgui/NoticeListCtrl.cpp
 ===================================================================
---- boinc-client_release-7.6-7.6.33.orig/clientgui/NoticeListCtrl.cpp
+--- boinc-client_release-7.8-7.8.3.orig/clientgui/NoticeListCtrl.cpp
-+++ boinc-client_release-7.6-7.6.33/clientgui/NoticeListCtrl.cpp
++++ boinc-client_release-7.8-7.8.3/clientgui/NoticeListCtrl.cpp
 @@ -49,10 +49,14 @@ IMPLEMENT_DYNAMIC_CLASS( CNoticeListCtrl
   
  BEGIN_EVENT_TABLE( CNoticeListCtrl, wxWindow )
@@ -41,19 +41,19 @@ Index: boinc-client_release-7.6-7.6.33/clientgui/NoticeListCtrl.cpp
  ////@end CNoticeListCtrl creation
  
      wxBoxSizer *topsizer;
-@@ -236,7 +244,11 @@ void CNoticeListCtrl::SetItemCount(int n
+@@ -238,7 +246,11 @@ void CNoticeListCtrl::SetItemCount(int n
-         m_noticesBody += strBuffer;
-     }
      m_noticesBody += wxT("</font></body></html>");
+     // baseURL is not needed here (see comments above) and it
+     // must be an empty string for this to work under OS 10.12.4
 +#if wxUSE_WEBVIEW
-     m_browser->SetPage(m_noticesBody, wxT("http://"));
+     m_browser->SetPage(m_noticesBody, wxEmptyString);
 +#else
 +    m_browser->SetPage(m_noticesBody);
 +#endif
  }
  
  
-@@ -246,6 +258,7 @@ void CNoticeListCtrl::Clear() {
+@@ -248,6 +260,7 @@ void CNoticeListCtrl::Clear() {
  }
  
  
@@ -61,7 +61,7 @@ Index: boinc-client_release-7.6-7.6.33/clientgui/NoticeListCtrl.cpp
  void CNoticeListCtrl::OnLinkClicked( wxWebViewEvent& event ) {
      if (event.GetURL().StartsWith(wxT("http://")) || event.GetURL().StartsWith(wxT("https://"))) {
          event.Veto();   // Tell wxWebView not to follow link
-@@ -262,6 +275,18 @@ void CNoticeListCtrl::OnWebViewError( wx
+@@ -264,6 +277,18 @@ void CNoticeListCtrl::OnWebViewError( wx
  
      event.Skip();
  }
@@ -80,10 +80,10 @@ Index: boinc-client_release-7.6-7.6.33/clientgui/NoticeListCtrl.cpp
  
  
  /*!
-Index: boinc-client_release-7.6-7.6.33/clientgui/NoticeListCtrl.h
+Index: boinc-client_release-7.8-7.8.3/clientgui/NoticeListCtrl.h
 ===================================================================
---- boinc-client_release-7.6-7.6.33.orig/clientgui/NoticeListCtrl.h
+--- boinc-client_release-7.8-7.8.3.orig/clientgui/NoticeListCtrl.h
-+++ boinc-client_release-7.6-7.6.33/clientgui/NoticeListCtrl.h
++++ boinc-client_release-7.8-7.8.3/clientgui/NoticeListCtrl.h
 @@ -45,8 +45,12 @@ public:
      
  ////@begin CNoticeListCtrl event handler declarations

7.6.33.tar.gz

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

7.8.3.tar.gz

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

boinc-client.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Oct 26 22:39:03 UTC 2017 - chris@computersalat.de
+
+- Update to version 7.8.3. (aaronpuchert)
+- Removed the deprecated "Encoding" line from the .desktop file.
+- Updated the cleanup code:
+  * Permissions seem to be correct now.
+  * Line endings seem to be correct.
+  * Applied the UTF-8 conversion to the 2011 notes as well.
+- Removed the entire coprocs/NVIDIA directory, since all files in
+  there have a doubtful license.
+- Removed components that are not required for a Linux build. 
+
+-------------------------------------------------------------------
+Sun Sep 10 00:49:25 UTC 2017 - chris@computersalat.de
+
+- update to 7.8.2
+  * no changelog available
+- add {minor_version}
+- rm wrong sim_web link
+- fix files for SLES 11
+- remove obsolete patch
+  * 0001-Fix-1530-null-pointer-dereference.patch
+
 -------------------------------------------------------------------
 Fri Sep  8 09:38:10 UTC 2017 - jengelh@inai.de
 

boinc-client.spec

@@ -29,7 +29,9 @@
 %endif
 
 Name:           boinc-client
-Version:        7.6.33
+%define rel_name        %{name}_release
+%define minor_version   7.8
+Version:        %{minor_version}.3
 Release:        0
 Summary:        The BOINC client
 License:        GPL-3.0+ or LGPL-3.0+
@@ -37,7 +39,7 @@ Group:          Productivity/Clustering/Computing
 Url:            http://boinc.berkeley.edu/
 
 #Git-Clone:	git://github.com/BOINC/boinc
-Source0:        https://github.com/BOINC/boinc/archive/client_release/7.6/%{version}.tar.gz
+Source0:        https://github.com/BOINC/boinc/archive/client_release/%{minor_version}/%{version}.tar.gz
 Source1:        boinc-icons.tar.bz2
 Source2:        boinc-gui.desktop
 Source3:        README.SUSE
@@ -49,7 +51,6 @@ Source20:       %{name}.service
 Source100:      %{name}-rpmlintrc
 Patch1:         boinc-guirpcauth.patch
 Patch2:         boinc-docbook2x.patch
-Patch3:         0001-Fix-1530-null-pointer-dereference.patch
 Patch4:         xlocale.patch
 Patch5:         0001-MGR-support-wxWidgets-without-webview.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -161,8 +162,8 @@ BuildArch:      noarch
 This package contains documentation files for the BOINC client.
 
 %prep
-%setup -q -n %{name}_release-7.6-%{version} -D -a 1
+%setup -q -n %{name}_release-%{minor_version}-%{version} -D -a 1
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
+%patch -P 1 -P 2 -P 4 -P 5 -p1
 
 %build
 # Install user hints
@@ -172,28 +173,22 @@ install -m0644 %{SOURCE3} README.SUSE
 mv locale/pt_PT locale/pt
 
 # fix utf8
-iconv -f ISO88591 -t UTF8 < checkin_notes_2005 > checkin_notes_2005.utf8
+for i in 2005 2009 2010 2011; do
-touch -r checkin_notes_2005 checkin_notes_2005.utf8
+  iconv -f ISO88591 -t UTF8 < checkin_notes_$i > checkin_notes_$i.utf8
-mv checkin_notes_2005.utf8 checkin_notes_2005
+  touch -r checkin_notes_$i checkin_notes_$i.utf8
-
+  mv checkin_notes_$i.utf8 checkin_notes_$i
-iconv -f ISO88591 -t UTF8 < checkin_notes_2009 > checkin_notes_2009.utf8
+done
-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
-
-%if %{with manager}
-# fix permissions and newlines on source files
-chmod 644 clientgui/{DlgItemProperties.h,AsyncRPC.cpp,DlgItemProperties.cpp}
-sed -i 's/\r//' clientgui/DlgItemProperties.cpp
-%endif
 
 ## remove files with questionable licenses
 # removing NVIDIA owned file that does not clearly allow redistribution or
 # modification
-rm coprocs/NVIDIA/include/nvapi.h
+rm -r coprocs/NVIDIA
+
+# Remove unnecessary components and files for other platforms.
+rm -r android drupal mac_build mac_installer mac3rdParty win_build xcompile
+
+# Remove dangling symlink
+rm doc/sim_web.php
 
 autoreconf -fi
 %configure \
@@ -314,6 +309,11 @@ 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
 
+### rm wrong link
+cd doc
+rm -f sim_web.php
+ln -s sim/sim_web.php
+cd -
 # Fix spurious-executable-perm
 chmod 0644 doc/*.php
 
@@ -418,6 +418,10 @@ fi
 
 %files -n %{name}-lang -f BOINC-Client.lang
 %defattr(-,root,root)
+%if 0%{?sles_version} == 11
+%dir %{_datadir}/locale/fa_IR
+%dir %{_datadir}/locale/fa_IR/LC_MESSAGES
+%endif
 
 %if %{with manager}
 %files -n boinc-manager

boinc-docbook2x.patch

@@ -8,10 +8,10 @@ of docbook2x-man.
  configure.ac |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: boinc-client_release-7.6-7.6.33/configure.ac
+Index: boinc-client_release-7.8-7.8.3/configure.ac
 ===================================================================
---- boinc-client_release-7.6-7.6.33.orig/configure.ac
+--- boinc-client_release-7.8-7.8.3.orig/configure.ac
-+++ boinc-client_release-7.6-7.6.33/configure.ac
++++ boinc-client_release-7.8-7.8.3/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

boinc-gui.desktop

@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Exec=boinc-manager
 Icon=boinc-gui
 Terminal=false

boinc-guirpcauth.patch

@@ -11,11 +11,11 @@ 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
+Index: boinc-client_release-7.8-7.8.3/client/gui_rpc_server.cpp
 ===================================================================
---- boinc-client_release-7.6-7.6.33.orig/client/gui_rpc_server.cpp
+--- boinc-client_release-7.8-7.8.3.orig/client/gui_rpc_server.cpp
-+++ boinc-client_release-7.6-7.6.33/client/gui_rpc_server.cpp
++++ boinc-client_release-7.8-7.8.3/client/gui_rpc_server.cpp
-@@ -175,12 +175,7 @@ void GUI_RPC_CONN_SET::get_password() {
+@@ -176,12 +176,7 @@ void GUI_RPC_CONN_SET::get_password() {
      // they can cause code to execute as this user.
      // So better protect it.
      //

xlocale.patch

@@ -1,7 +1,7 @@
 From: Jan Engelhardt <jengelh@inai.de>
 Date: 2017-09-03 00:10:38.255132582 +0200
 
-build: use xlocale.h instead of locale.h
+build: use locale.h instead of xlocale.h
 
 glibc-2.26 has dropped xlocale.h.
 ---
@@ -9,10 +9,10 @@ glibc-2.26 has dropped xlocale.h.
  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: boinc-client_release-7.8-7.8.3/clientgui/AsyncRPC.cpp
 ===================================================================
---- boinc-client_release-7.6-7.6.33.orig/clientgui/AsyncRPC.cpp
+--- boinc-client_release-7.8-7.8.3.orig/clientgui/AsyncRPC.cpp
-+++ boinc-client_release-7.6-7.6.33/clientgui/AsyncRPC.cpp
++++ boinc-client_release-7.8-7.8.3/clientgui/AsyncRPC.cpp
 @@ -20,7 +20,7 @@
  #endif
  
@@ -22,11 +22,11 @@ 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: boinc-client_release-7.8-7.8.3/lib/gui_rpc_client.h
 ===================================================================
---- boinc-client_release-7.6-7.6.33.orig/lib/gui_rpc_client.h
+--- boinc-client_release-7.8-7.8.3.orig/lib/gui_rpc_client.h
-+++ boinc-client_release-7.6-7.6.33/lib/gui_rpc_client.h
++++ boinc-client_release-7.8-7.8.3/lib/gui_rpc_client.h
-@@ -801,7 +801,7 @@ struct RPC {
+@@ -807,7 +807,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