rpms/powertop
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New version

Browse Source 
Resolves: rhbz#1843773
Dropped coverity-fixes patch (upstreamed)
This commit is contained in:
Jaroslav Škarvada 2020-06-15 10:38:08 +02:00
parent 4ac2db963d
commit e889f18d3b
3 changed files with 9 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
powertop-2.12-coverity-fixes.patch
View File

@ -1,37 +0,0 @@
diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp
index 370b762..8af033b 100644
--- a/src/cpu/intel_cpus.cpp
+++ b/src/cpu/intel_cpus.cpp
@@ -155,8 +155,10 @@ void intel_util::byt_has_ahci()
if (!dir)
byt_ahci_support=0;
else
+ {
byt_ahci_support=1;
- closedir(dir);
+ closedir(dir);
+ }
}
int intel_util::get_byt_ahci_support()
diff --git a/src/devices/devfreq.cpp b/src/devices/devfreq.cpp
index c958865..0509d0f 100644
--- a/src/devices/devfreq.cpp
+++ b/src/devices/devfreq.cpp
@@ -229,7 +229,6 @@ static void devfreq_dev_callback(const char *d_name)
void create_all_devfreq_devices(void)
{
- struct dirent *entry;
int num = 0;
std::string p = "/sys/class/devfreq/";
@@ -240,7 +239,7 @@ void create_all_devfreq_devices(void)
return;
}
- while((entry = readdir(dir)) != NULL)
+ while(readdir(dir) != NULL)
num++;
if (num == 2) {

14
powertop.spec
View File

@ -1,6 +1,6 @@
Name: powertop
Version: 2.12
Release: 2%{?dist}
Version: 2.13
Release: 1%{?dist}
Summary: Power consumption monitor
License: GPLv2
@ -10,8 +10,6 @@ Source1: powertop.service
# Sent upstream
Patch0: powertop-2.7-always-create-params.patch
# https://github.com/fenrus75/powertop/pull/46
Patch1: powertop-2.12-coverity-fixes.patch
BuildRequires: gettext-devel, ncurses-devel, pciutils-devel, zlib-devel, libnl3-devel
BuildRequires: automake, libtool, systemd, autoconf-archive
BuildRequires: gcc, gcc-c++
@ -27,7 +25,6 @@ computer use more power than necessary while it is idle.
%prep
%setup -q
%patch0 -p1 -b .always-create-params
%patch1 -p1 -b .coverity-fixes
echo "v%{version}" > version-long
echo '"v%{version}"' > version-short
@ -60,7 +57,7 @@ install -Dpm 644 %{SOURCE1} %{buildroot}%{_unitdir}/powertop.service
touch %{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results.powertop} &> /dev/null || :
%files -f %{name}.lang
%doc COPYING README TODO
%doc COPYING README.md README.traceevent CONTRIBUTE.md TODO
%dir %{_localstatedir}/cache/powertop
%ghost %{_localstatedir}/cache/powertop/saved_parameters.powertop
%ghost %{_localstatedir}/cache/powertop/saved_results.powertop
@ -70,6 +67,11 @@ touch %{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results.
%{_datadir}/bash-completion/completions/powertop
%changelog
* Mon Jun 15 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.13-1
- New version
Resolves: rhbz#1843773
- Dropped coverity-fixes patch (upstreamed)
* Wed May 13 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.12-2
- Fixed two new issues found by coverity

2
sources
View File

@ -1 +1 @@
SHA512 (powertop-2.12.tar.gz) = c023f216a54612be6d7f2c7b32e18728fd2250f0b5fc3a39d78b208fca166eeab241960a53c167792e188a813bdc1c146eab6e0a1dc29895f43f0afe3d425062
SHA512 (powertop-2.13.tar.gz) = 8ebeccd17b6f76d9e445382d9ce5b1c00ab2daf4f1e6e133c249bceb35ea582ca3e76da5415fd0b55a28b8a124655dc5ac7a18aaf2a3df955547d77495e59181