[arch-commits] Commit in kismet/repos (3 files)

[Allan McRae]

    Date: Monday, August 18, 2008 @ 01:51:49
  Author: allan
Revision: 9572

Merged revisions 2-9570 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/kismet/trunk

........
  r356 | aaron | 2008-04-19 08:56:27 +1000 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r4701 | eduardo | 2008-07-09 09:55:54 +1000 (Wed, 09 Jul 2008) | 1 line
........
  r9253 | allan | 2008-08-17 15:40:48 +1000 (Sun, 17 Aug 2008) | 2 lines
  
  upgpkg: kismet 2007_01_R1b-4
      ncurses rebuild
........
  r9267 | allan | 2008-08-17 15:54:26 +1000 (Sun, 17 Aug 2008) | 2 lines
  
  upgpkg: kismet 2007_10_R1-2
      ncurses rebuild
........

Added:
  kismet/repos/testing-x86_64/kismet-gcc43.patch
    (from rev 9267, kismet/trunk/kismet-gcc43.patch)
Modified:
  kismet/repos/testing-x86_64/	(properties)
  kismet/repos/testing-x86_64/PKGBUILD

--------------------+
 PKGBUILD           |   12 ++++++++----
 kismet-gcc43.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)


Property changes on: kismet/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /kismet/trunk:1
   + /kismet/trunk:1-9570

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-08-18 05:51:40 UTC (rev 9571)
+++ testing-x86_64/PKGBUILD	2008-08-18 05:51:49 UTC (rev 9572)
@@ -5,7 +5,7 @@
 pkgname=kismet
 pkgver=2007_10_R1
 _realver=2007-10-R1
-pkgrel=1
+pkgrel=2
 pkgdesc="802.11b sniffing software"
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,12 +16,16 @@
 fi
 url="http://www.kismetwireless.net/"
 backup=('etc/ap_manuf' 'etc/client_manuf' 'etc/kismet.conf' 'etc/kismet_drone.conf' 'etc/kismet_ui.conf')
-source=(http://www.kismetwireless.net/code/kismet-$_realver.tar.gz)
-md5sums=('2100c667e69db0cde35fa2d06c8516e2')
-sha1sums=('a1c682797ad6842b53f9e0f038254aa8326e0fb4')
+source=(http://www.kismetwireless.net/code/kismet-$_realver.tar.gz
+        kismet-gcc43.patch)
+md5sums=('2100c667e69db0cde35fa2d06c8516e2'
+         'b9fd32eec6c2f096873f82dec545a763')
+sha1sums=('a1c682797ad6842b53f9e0f038254aa8326e0fb4'
+          'dbb2aa1a99811a010b1fe9ddbc064b8b312d81d5')
 
 build() {
    cd $startdir/src/kismet-$_realver
+   patch -Np1 -i ${srcdir}/kismet-gcc43.patch
    
    if [ $CARCH == "x86_64" ]; then
      ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \

Copied: kismet/repos/testing-x86_64/kismet-gcc43.patch (from rev 9267, kismet/trunk/kismet-gcc43.patch)
===================================================================
--- testing-x86_64/kismet-gcc43.patch	                        (rev 0)
+++ testing-x86_64/kismet-gcc43.patch	2008-08-18 05:51:49 UTC (rev 9572)
@@ -0,0 +1,33 @@
+diff -Naur kismet-2007-10-R1-old/kismet_wrapper.cc kismet-2007-10-R1/kismet_wrapper.cc
+--- kismet-2007-10-R1-old/kismet_wrapper.cc	2007-10-07 07:50:03.000000000 +1000
++++ kismet-2007-10-R1/kismet_wrapper.cc	2008-08-17 15:51:19.000000000 +1000
+@@ -25,6 +25,7 @@
+ #include <sys/wait.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <cstring>
+ 
+ #include "config.h"
+ 
+diff -Naur kismet-2007-10-R1-old/ringbuf.cc kismet-2007-10-R1/ringbuf.cc
+--- kismet-2007-10-R1-old/ringbuf.cc	2005-12-12 05:14:39.000000000 +1000
++++ kismet-2007-10-R1/ringbuf.cc	2008-08-17 15:50:43.000000000 +1000
+@@ -17,6 +17,7 @@
+ */
+ 
+ #include "ringbuf.h"
++#include <cstring>
+ 
+ RingBuffer::RingBuffer(int in_size) {
+     ring_len = in_size;
+diff -Naur kismet-2007-10-R1-old/util.cc kismet-2007-10-R1/util.cc
+--- kismet-2007-10-R1-old/util.cc	2006-08-29 06:37:29.000000000 +1000
++++ kismet-2007-10-R1/util.cc	2008-08-17 15:51:03.000000000 +1000
+@@ -22,6 +22,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <cstring>
+ 
+ // We need this to make uclibc happy since they don't even have rintf...
+ #ifndef rintf