Accepting request 449343 from network

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/449343
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boinc-client?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2017-01-10 09:51:37 +00:00 committed by Git OBS Bridge
commit 9c6b3ca049
6 changed files with 62 additions and 17 deletions

View File

@ -0,0 +1,33 @@
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)
---
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 38a0cf5..54f577e 100644
--- a/client/hostinfo_unix.cpp
+++ b/client/hostinfo_unix.cpp
@@ -1989,11 +1989,12 @@ const vector<string> X_display_values_initialize() {
"[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() ; ) {
--
2.10.2

View File

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

3
7.6.33.tar.gz Normal file
View File

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

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Jan 2 10:31:59 UTC 2017 - jengelh@inai.de
- Add argument passing from boinc-manager to boinc-gui [boo#1017705]
-------------------------------------------------------------------
Tue Dec 27 21:18:12 UTC 2016 - jengelh@inai.de
- Update to new upstream release 7.6.33
* Fix a crash near readdir (add
0001-Fix-1530-null-pointer-dereference.patch)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 24 07:31:13 UTC 2016 - jengelh@inai.de Sun Apr 24 07:31:13 UTC 2016 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package boinc-client # spec file for package boinc-client
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 by Aaron Puchert <aaronpuchert@alice-dsl.net> # Copyright (c) 2016 by Aaron Puchert <aaronpuchert@alice-dsl.net>
# Copyright (c) 2011 by Sascha Manns <saigkill@opensuse.org> # Copyright (c) 2011 by Sascha Manns <saigkill@opensuse.org>
# #
@ -18,12 +18,10 @@
# #
# Global definitions %define sonum 7
%define _use_internal_dependency_generator 0
%define soname 7
%define boinc_dir %{_localstatedir}/lib/boinc %define boinc_dir %{_localstatedir}/lib/boinc
Name: boinc-client Name: boinc-client
Version: 7.6.32 Version: 7.6.33
Release: 0 Release: 0
Summary: The BOINC client Summary: The BOINC client
License: GPL-3.0+ or LGPL-3.0+ License: GPL-3.0+ or LGPL-3.0+
@ -48,6 +46,7 @@ Source100: %{name}-rpmlintrc
Patch0: boinc-guirpcauth.patch Patch0: boinc-guirpcauth.patch
# PATCH-FIX-OPENSUSE boinc-docbook2x.patch # PATCH-FIX-OPENSUSE boinc-docbook2x.patch
Patch4: boinc-docbook2x.patch Patch4: boinc-docbook2x.patch
Patch5: 0001-Fix-1530-null-pointer-dereference.patch
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
BuildRequires: docbook2x BuildRequires: docbook2x
BuildRequires: docbook_4 BuildRequires: docbook_4
@ -121,11 +120,11 @@ Requires: openssl-devel
%description devel %description devel
This package contains development files for %{name}. This package contains development files for %{name}.
%package -n libboinc%{soname} %package -n libboinc%{sonum}
Summary: Shared Libs for %{name} Summary: Berkeley Open Infrastructure For Network Computing library
Group: System/Libraries Group: System/Libraries
%description -n libboinc%{soname} %description -n libboinc%{sonum}
The BOINC Manager is a graphical monitor and control utility for the BOINC The BOINC Manager is a graphical monitor and control utility for the BOINC
core client. It gives a detailed overview of the state of the client it is 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
@ -133,17 +132,18 @@ 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.
%package doc %package doc
Summary: Documentation files for %{name} Summary: Documentation files for boinc-client
Group: Documentation/Other Group: Documentation/Other
BuildArch: noarch BuildArch: noarch
%description doc %description doc
This package contains documentation files for %{name}. 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 %patch0
%patch4 %patch4
%patch -P 5 -p1
%build %build
# Install user hints # Install user hints
@ -314,9 +314,9 @@ 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
%post -n libboinc%{soname} -p /sbin/ldconfig %post -n libboinc%{sonum} -p /sbin/ldconfig
%postun -n libboinc%{soname} -p /sbin/ldconfig %postun -n libboinc%{sonum} -p /sbin/ldconfig
%post devel -p /sbin/ldconfig %post devel -p /sbin/ldconfig
@ -361,7 +361,7 @@ fi
%files -n boinc-manager-lang -f BOINC-Manager.lang %files -n boinc-manager-lang -f BOINC-Manager.lang
%defattr(-,root,root) %defattr(-,root,root)
%files -n libboinc%{soname} %files -n libboinc%{sonum}
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/*.so.* %{_libdir}/*.so.*

View File

@ -7,4 +7,4 @@ if ! test -f ~/gui_rpc_auth.cfg ; then
ln -s @boinc_dir@/gui_rpc_auth.cfg ~/. ln -s @boinc_dir@/gui_rpc_auth.cfg ~/.
fi fi
exec boinc-gui -d @boinc_dir@ exec boinc-gui -d @boinc_dir@ "$@"