Accepting request 343375 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/343375
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/powertop?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2015-11-12 18:35:48 +00:00 committed by Git OBS Bridge
commit a83618e4f1
6 changed files with 21 additions and 56 deletions

View File

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

3
powertop-2.8.tar.gz Normal file
View File

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

View File

@ -1,48 +0,0 @@
From 6fd9ecebd3bc277bd91ce057f85f8e54b09bb0a9 Mon Sep 17 00:00:00 2001
From: Michael Mullin <masmullin@hush.com>
Date: Thu, 22 Jan 2015 16:50:10 -0500
Subject: [PATCH] Powertop crashes with 'powertop --auto-tune'
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Please see the following patch to address the reported crash
- ---
- From e994a414f619410877023fce35ade12d1cfce68d Mon Sep 17 00:00:00 2001
From: Michael Mullin <masmullin@hush.com>
Date: Thu, 22 Jan 2015 16:33:31 -0500
Subject: [PATCH] If "dir" is closed early inside create_add_devfreq_devices()
then there is a potential double free due to a second close during the
cleanup phase in clear_all_devfreq()
Signed-off-by: Michael Mullin <masmullin@hush.com>
- ---
src/devices/devfreq.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
src/devices/devfreq.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/devices/devfreq.cpp b/src/devices/devfreq.cpp
index d2e56e3..f652a57 100644
--- a/src/devices/devfreq.cpp
+++ b/src/devices/devfreq.cpp
@@ -247,6 +247,7 @@ void create_all_devfreq_devices(void)
fprintf(stderr, "Devfreq not enabled\n");
is_enabled = false;
closedir(dir);
+ dir = NULL;
return;
}
@@ -327,6 +328,8 @@ void clear_all_devfreq()
}
all_devfreq.clear();
/* close /sys/class/devfreq */
- if (dir != NULL)
+ if (dir != NULL) {
closedir(dir);
+ dir = NULL;
+ }
}

View File

@ -1,7 +1,7 @@
diff -Nru powertop-2.1.orig/src/main.cpp powertop-2.1/src/main.cpp
--- powertop-2.1.orig/src/main.cpp 2012-08-21 01:43:23.616729444 -0400
+++ powertop-2.1/src/main.cpp 2012-08-21 01:44:07.582480500 -0400
@@ -83,7 +83,7 @@
@@ -98,7 +98,7 @@
static void print_version()
{

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Nov 10 01:46:48 UTC 2015 - p.drouand@gmail.com
- Update to version 2.8
* Enable PowerTOP support for: BSW, BDW-H
* bug-fix: added devices/devreq.h to Makefile
* Adding support to SKY platforms.
* Update internal repo with external mainline
* Android Support
* Add C7- C10 support for Intel SKY
* Enabling Intel SKL support
- Remove powertop-fix-crash-with-autotune.patch; fixed on upstream
release
- Update powertop-no-date.patch
-------------------------------------------------------------------
Mon Apr 27 10:38:27 UTC 2015 - zaitor@opensuse.org

View File

@ -17,7 +17,7 @@
Name: powertop
Version: 2.7
Version: 2.8
Release: 0
#Git-Clone: git://github.com/fenrus75/powertop
Summary: A Linux Tool to Find out What is Using Power on a Laptop
@ -27,7 +27,6 @@ Url: https://01.org/powertop/
Source0: https://01.org/sites/default/files/downloads/%{name}/%{name}-%{version}.tar.gz
Source1: powertop.service
Patch2: powertop-1.98-always-create-params.patch
Patch3: powertop-fix-crash-with-autotune.patch
Patch5: powertop-no-date.patch
BuildRequires: gcc-c++
BuildRequires: gettext
@ -53,7 +52,6 @@ doing in terms of power savings.
%prep
%setup -q
%patch2 -p1
%patch3 -p1
%patch5 -p1
# Delete objects files left in tarball