From a3436b8f80a7915610f654ccf86a6b09ea40e772d8aff46fd0ec81c7ff605adc Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Thu, 26 Oct 2017 22:08:40 +0000 Subject: [PATCH] Accepting request 536986 from home:aaronpuchert - Update to version 7.8.3. - Removed patch 0001-Fix-1530-null-pointer-dereference.patch that has been integrated upstream, rebased the other patches. - 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. OBS-URL: https://build.opensuse.org/request/show/536986 OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=65 --- 0001-Fix-1530-null-pointer-dereference.patch | 32 --------------- ...GR-support-wxWidgets-without-webview.patch | 12 +++--- 7.6.33.tar.gz | 3 -- 7.8.3.tar.gz | 3 ++ boinc-client.spec | 39 ++++++++----------- boinc-gui.desktop | 1 - boinc-guirpcauth.patch | 2 +- xlocale.patch | 4 +- 8 files changed, 28 insertions(+), 68 deletions(-) delete mode 100644 0001-Fix-1530-null-pointer-dereference.patch delete mode 100644 7.6.33.tar.gz create mode 100644 7.8.3.tar.gz diff --git a/0001-Fix-1530-null-pointer-dereference.patch b/0001-Fix-1530-null-pointer-dereference.patch deleted file mode 100644 index 9c7b41f..0000000 --- a/0001-Fix-1530-null-pointer-dereference.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8416d8a1a423535fbc5d4e7416d6eac8ac5c050b Mon Sep 17 00:00:00 2001 -From: Preston Maness -Date: Tue, 26 Apr 2016 23:06:57 -0500 -Subject: [PATCH] Fix #1530 (null pointer dereference) -X-Patch-added-by: Jan Engelhardt -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 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() ; ) { diff --git a/0001-MGR-support-wxWidgets-without-webview.patch b/0001-MGR-support-wxWidgets-without-webview.patch index 2bdda12..8ef04f9 100644 --- a/0001-MGR-support-wxWidgets-without-webview.patch +++ b/0001-MGR-support-wxWidgets-without-webview.patch @@ -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 - m_noticesBody += strBuffer; - } +@@ -238,7 +246,11 @@ void CNoticeListCtrl::SetItemCount(int n m_noticesBody += wxT(""); + // 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(); } diff --git a/7.6.33.tar.gz b/7.6.33.tar.gz deleted file mode 100644 index 3299d54..0000000 --- a/7.6.33.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d -size 43569544 diff --git a/7.8.3.tar.gz b/7.8.3.tar.gz new file mode 100644 index 0000000..b036225 --- /dev/null +++ b/7.8.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3d5b190ec6cdc3512005469fab90203af110cd9a7880654c5d0b4d4e55f3c17 +size 52038133 diff --git a/boinc-client.spec b/boinc-client.spec index b73a132..7b752e7 100644 --- a/boinc-client.spec +++ b/boinc-client.spec @@ -29,7 +29,7 @@ %endif Name: boinc-client -Version: 7.6.33 +Version: 7.8.3 Release: 0 Summary: The BOINC client License: GPL-3.0+ or LGPL-3.0+ @@ -37,7 +37,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/7.8/%{version}.tar.gz Source1: boinc-icons.tar.bz2 Source2: boinc-gui.desktop Source3: README.SUSE @@ -49,7 +49,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 +160,8 @@ BuildArch: noarch 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 -P 5 -p1 +%setup -q -n %{name}_release-7.8-%{version} -D -a 1 +%patch -P 1 -P 2 -P 4 -P 5 -p1 %build # Install user hints @@ -172,28 +171,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 -touch -r checkin_notes_2005 checkin_notes_2005.utf8 -mv checkin_notes_2005.utf8 checkin_notes_2005 - -iconv -f ISO88591 -t UTF8 < checkin_notes_2009 > checkin_notes_2009.utf8 -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 +for i in 2005 2009 2010 2011; do + iconv -f ISO88591 -t UTF8 < checkin_notes_$i > checkin_notes_$i.utf8 + touch -r checkin_notes_$i checkin_notes_$i.utf8 + mv checkin_notes_$i.utf8 checkin_notes_$i +done ## 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 \ diff --git a/boinc-gui.desktop b/boinc-gui.desktop index b111983..b76a945 100644 --- a/boinc-gui.desktop +++ b/boinc-gui.desktop @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Exec=boinc-manager Icon=boinc-gui Terminal=false diff --git a/boinc-guirpcauth.patch b/boinc-guirpcauth.patch index 1a1dcb7..cf7f504 100644 --- a/boinc-guirpcauth.patch +++ b/boinc-guirpcauth.patch @@ -15,7 +15,7 @@ Index: boinc-client_release-7.6-7.6.33/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 -@@ -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. // diff --git a/xlocale.patch b/xlocale.patch index 253a8b6..0247e60 100644 --- a/xlocale.patch +++ b/xlocale.patch @@ -1,7 +1,7 @@ From: Jan Engelhardt 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. --- @@ -26,7 +26,7 @@ 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 { +@@ -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