diff --git a/.dropwatch.metadata b/.dropwatch.metadata new file mode 100644 index 0000000..bccb527 --- /dev/null +++ b/.dropwatch.metadata @@ -0,0 +1 @@ +911917a9c821b8fa9bf59d1236a63c2c4cd65b0f SOURCES/dropwatch-1.4.tbz2 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/dropwatch-1.4-typecast.patch b/SOURCES/dropwatch-1.4-typecast.patch new file mode 100644 index 0000000..7184a6c --- /dev/null +++ b/SOURCES/dropwatch-1.4-typecast.patch @@ -0,0 +1,26 @@ +diff -up dropwatch-1.4/src/lookup_kas.c.typecast dropwatch-1.4/src/lookup_kas.c +--- dropwatch-1.4/src/lookup_kas.c.typecast 2012-08-27 14:00:07.008473145 +0200 ++++ dropwatch-1.4/src/lookup_kas.c 2012-08-27 13:59:41.000000000 +0200 +@@ -102,7 +102,8 @@ 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.typecast dropwatch-1.4/src/main.c +--- dropwatch-1.4/src/main.c.typecast 2012-05-31 00:33:50.000000000 +0200 ++++ dropwatch-1.4/src/main.c 2012-08-27 13:59:56.621473369 +0200 +@@ -333,7 +333,8 @@ 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/SPECS/dropwatch.spec b/SPECS/dropwatch.spec new file mode 100644 index 0000000..70a0243 --- /dev/null +++ b/SPECS/dropwatch.spec @@ -0,0 +1,91 @@ +Summary: Kernel dropped packet monitor +Name: dropwatch +Version: 1.4 +Release: 6%{?dist} +Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2 +URL: http://fedorahosted.org/dropwatch +License: GPLv2+ +Group: Applications/System +Patch0: dropwatch-1.4-typecast.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: kernel-devel, libnl-devel, readline-devel +BuildRequires: binutils-devel, binutils-static libnl3-devel pkgconfig +Requires: libnl3, readline + +%description +dropwatch is an utility to interface to the kernel to monitor for dropped +network packets. + +%prep +%setup -q +%patch0 -p1 -b .typecast + +%build +cd src +export CFLAGS=$RPM_OPT_FLAGS +make + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +install -m0755 src/dropwatch $RPM_BUILD_ROOT%{_bindir} +install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%{_bindir}/* +%{_mandir}/man1/* +%doc README +%doc COPYING + +%changelog +* Sun May 12 2013 Anton Arapov - 1.4-6 +- Fix the build for ppc platform. Typecast issue (#960092) + +* Wed Feb 13 2013 Fedora Release Engineering - 1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jan 20 2013 Dan Horák - 1.4-4 +- rebuilt again for fixed soname in libnl3 + +* Fri Jan 18 2013 Neil Horman - 1.4-3 +- rebuilt to pull in new libnl3 dependencies + +* Wed Jul 18 2012 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jun 01 2012 Neil Horman - 1.4-1 +- Update to latest upstream + +* Fri Jan 13 2012 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 1.2-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jun 30 2010 Neil Horman - 1.2 +- Update to latest upstream + +* Thu Apr 07 2010 Neil Horman - 1.1-2 +- Adding more missing buildrequires + +* Wed Apr 07 2010 Neil Horman - 1.1-1 +- Add missing buildrequires + +* Wed Apr 07 2010 Neil Horman - 1.1-0 +- Move to latest upstream sources + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Mar 20 2009 Neil Horman 1.0-2 +- Fixed up Errors found in package review (bz 491240) + +* Tue Mar 17 2009 Neil Horman 1.0-1 +- Initial build +