[iotop/f14] after CVE-2011-2494 fix, iotop needs root privileges New upstream version

[Michal Hlavinka]

commit 461bd9bb1866f7e3040adff1ec2da3ee5a97949e
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Fri Oct 14 19:54:19 2011 +0200

    after CVE-2011-2494 fix, iotop needs root privileges
    New upstream version

 .gitignore                 |    1 +
 iotop-0.4.3-rootpriv.patch |   14 ++++++++++++++
 iotop.spec                 |   13 +++++++++++--
 sources                    |    2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7cb518..b565b7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 iotop-0.4.tar.bz2
+/iotop-0.4.3.tar.bz2
diff --git a/iotop-0.4.3-rootpriv.patch b/iotop-0.4.3-rootpriv.patch
new file mode 100644
index 0000000..fd3e02b
--- /dev/null
+++ b/iotop-0.4.3-rootpriv.patch
@@ -0,0 +1,14 @@
+diff -up iotop-0.4.3/iotop/ui.py.rootpriv iotop-0.4.3/iotop/ui.py
+--- iotop-0.4.3/iotop/ui.py.rootpriv	2011-10-11 16:59:48.204722984 +0200
++++ iotop-0.4.3/iotop/ui.py	2011-10-11 16:59:55.833780660 +0200
+@@ -511,6 +511,10 @@ def main():
+         locale.setlocale(locale.LC_ALL, '')
+     except locale.Error:
+         print 'unable to set locale, falling back to the default locale'
++    if os.getuid() != 0:
++        print 'root privileges required'
++        exit(1)
++
+     parser = optparse.OptionParser(usage=USAGE, version='iotop ' + VERSION)
+     parser.add_option('-o', '--only', action='store_true',
+                       dest='only', default=False,
diff --git a/iotop.spec b/iotop.spec
index 4c4937c..c10655b 100644
--- a/iotop.spec
+++ b/iotop.spec
@@ -1,13 +1,17 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name: iotop
-Version: 0.4       
-Release: 2%{?dist}
+Version: 0.4.3      
+Release: 1%{?dist}
 Summary: Top like utility for I/O       
 
 Group: Applications/System          
 License: GPLv2        
 URL: http://guichaz.free.fr/iotop/            
 Source0: http://guichaz.free.fr/iotop/files/%{name}-%{version}.tar.bz2 
+
+# after CVE-2011-2494 fix, iotop needs root privileges
+Patch1: iotop-0.4.3-rootpriv.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -16,6 +20,7 @@ Requires: python
       
 %prep
 %setup
+%patch1 -p1 -b .rootpriv
 
 %build
 %{__python} setup.py build
@@ -44,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Fri Oct 14 2011 Michal Hlavinka <mhlavink at redhat.com> 0.4.3-1
+- after CVE-2011-2494 fix, iotop needs root privileges
+- New upstream version
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index 1301537..e2b0c70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3607f8b77ed6686efd9a4a7e6c135ceb  iotop-0.4.tar.bz2
+b05456252d0b25625aff4c93ab4927a2  iotop-0.4.3.tar.bz2