[dropwatch/f19] Resolves: bz 990477

[Neil Horman]

commit 12bb30d6f170d29a70830d0fe8226598f7357e87
Author: Neil Horman <nhorman at tuxdriver.com>
Date:   Wed Jul 31 13:16:52 2013 -0400

    Resolves: bz 990477

 dropwatch-ppc64-warnings.patch |   24 ++++++++++++++++++++++++
 dropwatch.spec                 |    8 +++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/dropwatch-ppc64-warnings.patch b/dropwatch-ppc64-warnings.patch
new file mode 100644
index 0000000..d0e3863
--- /dev/null
+++ b/dropwatch-ppc64-warnings.patch
@@ -0,0 +1,24 @@
+diff -up dropwatch-1.4/src/lookup_kas.c.rh1 dropwatch-1.4/src/lookup_kas.c
+--- dropwatch-1.4/src/lookup_kas.c.rh1	2013-07-31 17:34:37.155640182 +0200
++++ dropwatch-1.4/src/lookup_kas.c	2013-07-31 17:47:07.392624689 +0200
+@@ -102,7 +102,7 @@ static int lookup_kas_proc(__u64 pc, str
+ 		 *  - "%pK %c %s\n" (for kernel internal symbols), or
+ 		 *  - "%pK %c %s\t[%s]\n" (for module-provided symbols)
+ 		 */
+-		if (fscanf(pf, "%llx %*s %as [ %*[^]] ]", &ppc, &name) < 0) {
++		if (fscanf(pf, "%llx %*s %as [ %*[^]] ]", (unsigned long long *)&ppc, &name) < 0) {
+ 			perror("Error Scanning File: ");
+ 			break;
+ 		}
+diff -up dropwatch-1.4/src/main.c.rh1 dropwatch-1.4/src/main.c
+--- dropwatch-1.4/src/main.c.rh1	2013-07-31 17:23:14.289302715 +0200
++++ dropwatch-1.4/src/main.c	2013-07-31 17:23:48.113130660 +0200
+@@ -333,7 +333,7 @@ void handle_dm_alert_msg(struct netlink_
+ 			printf ("%d drops at location %p\n", alert->points[i].count, location);
+ 		else
+ 			printf ("%d drops at %s+%llx (%p)\n",
+-				alert->points[i].count, res.symbol, res.offset, location);
++				alert->points[i].count, res.symbol, (unsigned long long)res.offset, location);
+ 		acount++;
+ 		if (alimit && (acount == alimit)) {
+ 			printf("Alert limit reached, deactivating!\n");
diff --git a/dropwatch.spec b/dropwatch.spec
index 8aa37c2..21a043b 100644
--- a/dropwatch.spec
+++ b/dropwatch.spec
@@ -1,7 +1,7 @@
 Summary: Kernel dropped packet monitor 
 Name: dropwatch 
 Version: 1.4
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2
 URL: http://fedorahosted.org/dropwatch
 License: GPLv2+ 
@@ -11,12 +11,15 @@ BuildRequires: kernel-devel, libnl-devel, readline-devel
 BuildRequires: binutils-devel, binutils-static libnl3-devel pkgconfig
 Requires: libnl3, readline
 
+Patch0: dropwatch-ppc64-warnings.patch
+
 %description
 dropwatch is an utility to interface to the kernel to monitor for dropped
 network packets.
 
 %prep
 %setup -q 
+%patch0 -p1
 
 %build
 cd src
@@ -42,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Wed Jul 31 2013 Neil Horman <nhorman at redhat.com> - 1.4-6
+- Fix ppc64 warnings (bz99047)
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild