From 67fedbe31ba4e60cd03518ad0636f34bc6eaae48 Mon Sep 17 00:00:00 2001 From: ensc Date: Feb 22 2008 16:11:25 +0000 Subject: fixed build with gcc43 (#434084, thx to Erik van Pienbroek) --- diff --git a/kismet-2007-01-R1-gcc43.patch b/kismet-2007-01-R1-gcc43.patch new file mode 100644 index 0000000..dd94abc --- /dev/null +++ b/kismet-2007-01-R1-gcc43.patch @@ -0,0 +1,30 @@ +--- kismet-2007-10-R1/util.cc.orig 2008-02-22 16:08:42.004091798 +0100 ++++ kismet-2007-10-R1/util.cc 2008-02-22 16:08:55.065091287 +0100 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + // We need this to make uclibc happy since they don't even have rintf... + #ifndef rintf +--- kismet-2007-10-R1/ringbuf.h.orig 2008-02-22 16:09:40.238091139 +0100 ++++ kismet-2007-10-R1/ringbuf.h 2008-02-22 16:09:51.598092831 +0100 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + #include + #include +--- kismet-2007-10-R1/kismet_wrapper.cc.orig 2008-02-22 16:11:53.820091017 +0100 ++++ kismet-2007-10-R1/kismet_wrapper.cc 2008-02-22 16:12:04.434091322 +0100 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/kismet.spec b/kismet.spec index 89f0484..70bef30 100644 --- a/kismet.spec +++ b/kismet.spec @@ -1,4 +1,4 @@ -## $Id: kismet.spec,v 1.12 2008/02/19 02:35:02 jkeating Exp $ +## $Id: kismet.spec,v 1.13 2008/02/22 16:11:25 ensc Exp $ %global _version 2007-10-R1 @@ -32,6 +32,7 @@ Patch7: kismet-2006-04-R1-ssize.patch Patch8: kismet-2007-01-R1-setgroups.patch Patch9: kismet-2007-10-R1-printf.patch Patch10: kismet-2007-01-R1-cast.patch +Patch11: kismet-2007-01-R1-gcc43.patch BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: expat-devel ncurses-devel diffutils BuildRequires: gmp-devel wget libpcap-devel @@ -82,6 +83,7 @@ but introduce dependencies which are not needed for kismet to work. %patch8 -p1 -b .setgroups %patch9 -p1 -b .printf %patch10 -p1 -b .cast +%patch11 -p1 -b .gcc43 sed -e 's!/var/log/kismet!%logdir!g' %SOURCE10 >tmpwatch.kismet touch --reference=%SOURCE10 tmpwatch.kismet || : # keep timestamp @@ -157,7 +159,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Feb 18 2008 Fedora Release Engineering - 0.0.2007.10.R1-3 +* Fri Feb 22 2008 Enrico Scholz - 0.0.2007.10.R1-3 +- fixed build with gcc43 (#434084, thx to Erik van Pienbroek) + +* Mon Feb 18 2008 Fedora Release Engineering - Autorebuild for GCC 4.3 * Sat Nov 10 2007 Enrico Scholz - 0.0.2007.10.R1-2