From 51cdebdf0f04f9e52d0317faf5fecf1f97986ca4 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Wed, 16 Nov 2011 08:28:29 +0100
Subject: [PATCH] iotop updated to 0.4.4

---
 .gitignore                 |  1 +
 iotop-0.4.3-rootpriv.patch | 14 --------------
 iotop.spec                 | 11 +++++------
 sources                    |  2 +-
 4 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 iotop-0.4.3-rootpriv.patch

diff --git a/.gitignore b/.gitignore
index b565b7f..967be87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 iotop-0.4.tar.bz2
 /iotop-0.4.3.tar.bz2
+/iotop-0.4.4.tar.bz2
diff --git a/iotop-0.4.3-rootpriv.patch b/iotop-0.4.3-rootpriv.patch
deleted file mode 100644
index fd3e02b..0000000
--- a/iotop-0.4.3-rootpriv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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 65b9464..25b8e0a 100644
--- a/iotop.spec
+++ b/iotop.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name: iotop
-Version: 0.4.3      
-Release: 3%{?dist}
+Version: 0.4.4
+Release: 1%{?dist}
 Summary: Top like utility for I/O       
 
 Group: Applications/System          
@@ -9,9 +9,6 @@ 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
@@ -20,7 +17,6 @@ Requires: python
       
 %prep
 %setup
-%patch1 -p1 -b .rootpriv
 
 %build
 %{__python} setup.py build
@@ -49,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Wed Nov 16 2011 Michal Hlavinka <mhlavink@redhat.com> - 0.4.4-1
+- iotop updated to 0.4.4
+
 * Fri Oct 14 2011 Michal Hlavinka <mhlavink@redhat.com> 0.4.3-3
 - fix typo in last patch
 
diff --git a/sources b/sources
index e2b0c70..6281adb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b05456252d0b25625aff4c93ab4927a2  iotop-0.4.3.tar.bz2
+cdd38b276cbf238676f5d2bcf098ba9c  iotop-0.4.4.tar.bz2