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

[Juergen Hoetzel]

    Date: Tuesday, October 21, 2008 @ 07:17:21
  Author: juergen
Revision: 16114

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

........
  r16105 | juergen | 2008-10-21 10:51:08 +0200 (Di, 21 Okt 2008) | 1 line
  
  upgpkg: kismet 2008_05_R1-1
........

Modified:
  kismet/repos/extra-i686/	(properties)
  kismet/repos/extra-i686/PKGBUILD
Deleted:
  kismet/repos/extra-i686/kismet-gcc43.patch

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


Property changes on: kismet/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /kismet/trunk:1-9267
   + /kismet/trunk:1-16113

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-21 11:11:56 UTC (rev 16113)
+++ extra-i686/PKGBUILD	2008-10-21 11:17:21 UTC (rev 16114)
@@ -3,9 +3,9 @@
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=kismet
-pkgver=2007_10_R1
-_realver=2007-10-R1
-pkgrel=2
+pkgver=2008_05_R1
+_realver=2008-05-R1
+pkgrel=1
 pkgdesc="802.11b sniffing software"
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,16 +16,14 @@
 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
-        kismet-gcc43.patch)
-md5sums=('2100c667e69db0cde35fa2d06c8516e2'
-         'b9fd32eec6c2f096873f82dec545a763')
+source=(http://www.kismetwireless.net/code/kismet-$_realver.tar.gz)
+md5sums=('6ee365d36354b4dee4945e67f8149294')
 sha1sums=('a1c682797ad6842b53f9e0f038254aa8326e0fb4'
           'dbb2aa1a99811a010b1fe9ddbc064b8b312d81d5')
 
 build() {
    cd $startdir/src/kismet-$_realver
-   patch -Np1 -i ${srcdir}/kismet-gcc43.patch
+   # patch -Np1 -i ${srcdir}/kismet-gcc43.patch
    
    if [ $CARCH == "x86_64" ]; then
      ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \

Deleted: extra-i686/kismet-gcc43.patch
===================================================================
--- extra-i686/kismet-gcc43.patch	2008-10-21 11:11:56 UTC (rev 16113)
+++ extra-i686/kismet-gcc43.patch	2008-10-21 11:17:21 UTC (rev 16114)
@@ -1,33 +0,0 @@
-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