From 7da2ca16fd41f7bc27dcde94027f5b1477f79a58 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Nov 29 2016 22:48:29 +0000
Subject: Added patch to fix broken MAC address output (#1063298, #1165349)


---

diff --git a/iftop-1.0-mac-address.patch b/iftop-1.0-mac-address.patch
new file mode 100644
index 0000000..7831339
--- /dev/null
+++ b/iftop-1.0-mac-address.patch
@@ -0,0 +1,19 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for iftop >= 1.0pre4 which fixes
+the regression introduced with 1.0pre4 resulting in a broken MAC address output.
+This patch was proposed to upstream at Mon, 20 Jan 2014 01:58:57 +0100. See also
+the following links for details:
+
+ - https://bugzilla.redhat.com/show_bug.cgi?id=1063298
+ - https://bugzilla.redhat.com/show_bug.cgi?id=1165349
+
+--- iftop-1.0pre4/iftop.c			2014-01-19 21:21:19.000000000 +0100
++++ iftop-1.0pre4/iftop.c.mac-address		2014-01-20 01:55:16.000000000 +0100
+@@ -55,7 +55,7 @@
+ 
+ /* ethernet address of interface. */
+ int have_hw_addr = 0;
+-char if_hw_addr[6];    
++unsigned char if_hw_addr[6];    
+ 
+ /* IP address of interface */
+ int have_ip_addr = 0;
diff --git a/iftop.spec b/iftop.spec
index 4b425d4..de627c0 100644
--- a/iftop.spec
+++ b/iftop.spec
@@ -1,12 +1,13 @@
 Summary:	Command line tool that displays bandwidth usage on an interface
 Name:		iftop
 Version:	1.0
-Release:	0.11.pre4%{?dist}
+Release:	0.12.pre4%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.ex-parrot.com/~pdw/%{name}/
 Source:		http://www.ex-parrot.com/~pdw/%{name}/download/%{name}-%{version}pre4.tar.gz
 Patch0:		iftop-1.0-ncursesw.patch
+Patch1:		iftop-1.0-mac-address.patch
 BuildRequires:	ncurses-devel, %{_includedir}/pcap.h
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,6 +21,7 @@ so slow?".
 %setup -q -n %{name}-%{version}pre4
 %patch0 -p1 -b .ncursesw
 touch -c -r configure.ac{.ncursesw,}
+%patch1 -p1 -b .mac-address
 
 %build
 %configure
@@ -34,11 +36,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README TODO
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc ChangeLog README TODO
 %{_sbindir}/%{name}
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Tue Nov 29 2016 Robert Scheck <robert@fedoraproject.org> 1.0-0.12.pre4
+- Added patch to fix broken MAC address output (#1063298, #1165349)
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.11.pre4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild