From 7af2e9ac8a33bceae3da769540a5ded010f27f7b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 05:05:36 +0000 Subject: import iotop-0.6-4.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..558b436 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/iotop-0.6.tar.bz2 diff --git a/.iotop.metadata b/.iotop.metadata new file mode 100644 index 0000000..f3e24d0 --- /dev/null +++ b/.iotop.metadata @@ -0,0 +1 @@ +a65daa859fc44d6a21414c1d358333dda51044cd SOURCES/iotop-0.6.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/iotop-0.3.2-ppcprio.patch b/SOURCES/iotop-0.3.2-ppcprio.patch new file mode 100644 index 0000000..10aacaf --- /dev/null +++ b/SOURCES/iotop-0.3.2-ppcprio.patch @@ -0,0 +1,21 @@ +diff -up iotop-0.6/iotop/ioprio.py.ppcprio iotop-0.6/iotop/ioprio.py +--- iotop-0.6/iotop/ioprio.py.ppcprio 2018-08-02 15:17:46.523099123 +0200 ++++ iotop-0.6/iotop/ioprio.py 2018-08-02 15:19:45.671660952 +0200 +@@ -32,7 +32,7 @@ IOPRIO_GET_ARCH_SYSCALL = [ + ('i*86', '*', 290), + ('ia64*', '*', 1275), + ('parisc*', '*', 268), +- ('powerpc*', '*', 274), ++ ('ppc*', '*', 274), + ('s390*', '*', 283), + ('sparc*', '*', 218), + ('sh*', '*', 289), +@@ -46,7 +46,7 @@ IOPRIO_SET_ARCH_SYSCALL = [ + ('i*86', '*', 289), + ('ia64*', '*', 1274), + ('parisc*', '*', 267), +- ('powerpc*', '*', 273), ++ ('ppc*', '*', 273), + ('s390*', '*', 282), + ('sparc*', '*', 196), + ('sh*', '*', 288), diff --git a/SOURCES/iotop-0.6-aarch64prio.patch b/SOURCES/iotop-0.6-aarch64prio.patch new file mode 100644 index 0000000..8e04729 --- /dev/null +++ b/SOURCES/iotop-0.6-aarch64prio.patch @@ -0,0 +1,19 @@ +diff -urN iotop-0.6.orig/iotop/ioprio.py iotop-0.6/iotop/ioprio.py +--- iotop-0.6.orig/iotop/ioprio.py 2013-05-27 00:44:18.000000003 +0200 ++++ iotop-0.6/iotop/ioprio.py 2018-08-01 15:12:59.460788725 +0200 +@@ -27,6 +27,7 @@ + # 'x86_64' but it will use the i386 syscall number, that's why we consider both + # the architecture name and the word size. + IOPRIO_GET_ARCH_SYSCALL = [ ++ ('aarch64', '*', 31), + ('alpha', '*', 443), + ('arm*', '*', 315), + ('i*86', '*', 290), +@@ -41,6 +42,7 @@ + ] + + IOPRIO_SET_ARCH_SYSCALL = [ ++ ('aarch64', '*', 30), + ('alpha', '*', 442), + ('arm*', '*', 314), + ('i*86', '*', 289), diff --git a/SOURCES/iotop-0.6-splitline.patch b/SOURCES/iotop-0.6-splitline.patch new file mode 100644 index 0000000..b35ea12 --- /dev/null +++ b/SOURCES/iotop-0.6-splitline.patch @@ -0,0 +1,18 @@ +diff -up iotop-0.6/iotop/data.py.splitline iotop-0.6/iotop/data.py +--- iotop-0.6/iotop/data.py.splitline 2013-05-27 00:44:18.000000000 +0200 ++++ iotop-0.6/iotop/data.py 2018-07-09 16:08:04.135771959 +0200 +@@ -193,7 +193,13 @@ def parse_proc_pid_status(pid): + result_dict = {} + try: + for line in open('/proc/%d/status' % pid): +- key, value = line.split(':\t', 1) ++ try: ++ key, value = line.split(':', 1) ++ except ValueError: ++ # Ignore lines that are not formatted correctly as ++ # some downstream kernels may have weird lines and ++ # the needed fields are probably formatted correctly. ++ continue + result_dict[key] = value.strip() + except IOError: + pass # No such process diff --git a/SPECS/iotop.spec b/SPECS/iotop.spec new file mode 100644 index 0000000..f373ab2 --- /dev/null +++ b/SPECS/iotop.spec @@ -0,0 +1,130 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +Name: iotop +Version: 0.6 +Release: 4%{?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 + +# from upstream, for iotop <= 0.6, rhbz#1582821 +Patch1: iotop-0.6-splitline.patch +Patch2: iotop-0.3.2-ppcprio.patch +Patch3: iotop-0.6-aarch64prio.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: python-devel +Requires: python + +%prep +%setup +%patch1 -p1 -b .splitline +%patch2 -p1 -b .ppcprio +%patch3 -p1 -b .aarch64prio + +%build +%{__python} setup.py build + +%description +Linux has always been able to show how much I/O was going on +(the bi and bo columns of the vmstat 1 command). +iotop is a Python program with a top like UI used to +show of behalf of which process is the I/O going on. + + +%install +rm -rf $RPM_BUILD_ROOT +%{__python} setup.py install --root=${RPM_BUILD_ROOT} + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc COPYING NEWS THANKS +%{_sbindir}/iotop +%{_mandir}/man8/iotop.* +%{python_sitelib}/* + +%changelog +* Thu Aug 02 2018 Michal Hlavinka - 0.6-4 +- fix prio field for ppc and aarch64 (#1610912, #1610914) + +* Mon Jul 09 2018 Michal Hlavinka - 0.6-3 +- fix data value unpack with latest kernels (#1582821) + +* Fri Dec 27 2013 Daniel Mach - 0.6-2 +- Mass rebuild 2013-12-27 + +* Wed Mar 29 2013 Michal Hlavinka - 0.6-1 +- iotop updated to 0.6 + +* Tue Feb 05 2013 Michal Hlavinka - 0.5-1 +- iotop updated to 0.5 + +* Thu Jul 19 2012 Fedora Release Engineering - 0.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 16 2011 Michal Hlavinka - 0.4.4-1 +- iotop updated to 0.4.4 + +* Fri Oct 14 2011 Michal Hlavinka 0.4.3-3 +- fix typo in last patch + +* Thu Oct 13 2011 Michal Hlavinka 0.4.3-2 +- after CVE-2011-2494 fix, iotop needs root privileges + +* Sun Sep 18 2011 Adel Gadllah 0.4.3-1 +- New upstream version + +* Wed Feb 09 2011 Fedora Release Engineering - 0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jul 21 2010 David Malcolm - 0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Tue Jan 12 2010 Adel Gadllah 0.4-1 +- New upstream version + +* Fri Jul 24 2009 Fedora Release Engineering - 0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue May 19 2009 Adel Gadllah 0.3-1 +- New upstream version +- fixes RH #475917 + +* Tue Feb 24 2009 Fedora Release Engineering - 0.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.2.1-2 +- Rebuild for Python 2.6 + +* Wed Jul 09 2008 Adel Gadllah 0.2.1-1 +- Update to 0.2.1 + +* Mon Jul 07 2008 Adel Gadllah 0.2-2 +- New upstream tarball.. + +* Mon May 26 2008 Adel Gadllah 0.2-1 +- Update to new upstream version + +* Fri Dec 28 2007 Adel Gadllah 0.1-3 +- Fix build issue + +* Fri Dec 28 2007 Adel Gadllah 0.1-2 +- Fix traceback on xterm-color RH #400071 + +* Sun Nov 3 2007 Adel Gadllah 0.1-1 +- Fix version + +* Sun Nov 3 2007 Adel Gadllah 20070930-1 +- Initial Build