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

[Allan McRae]

    Date: Sunday, August 17, 2008 @ 01:55:35
  Author: allan
Revision: 9271

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

........
  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-i686/kismet-gcc43.patch
    (from rev 9267, kismet/trunk/kismet-gcc43.patch)
Modified:
  kismet/repos/testing-i686/	(properties)
  kismet/repos/testing-i686/PKGBUILD
Deleted:
  kismet/repos/testing-i686/kismet-gcc43.patch

--------------------+
 PKGBUILD           |   26 ++++++++++++++----------
 kismet-gcc43.patch |   55 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 49 insertions(+), 32 deletions(-)


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

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-08-17 05:55:35 UTC (rev 9270)
+++ testing-i686/PKGBUILD	2008-08-17 05:55:35 UTC (rev 9271)
@@ -3,26 +3,29 @@
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=kismet
-pkgver=2007_01_R1b
-pkgrel=4
+pkgver=2007_10_R1
+_realver=2007-10-R1
+pkgrel=2
 pkgdesc="802.11b sniffing software"
 arch=(i686 x86_64)
 license=('GPL')
 if [ "${CARCH}" == "x86_64" ]; then
-  depends=('gcc-libs' 'libpcap>=0.9.8' 'ncurses')
+  depends=('gcc-libs' 'libpcap>=0.9.8' 'ncurses' 'dbus')
 else
-  depends=('gmp' 'imagemagick' 'libpcap>=0.9.8' 'ncurses')
+  depends=('gmp' 'imagemagick' 'libpcap>=0.9.8' 'ncurses' 'dbus')
 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-2007-01-R1b.tar.gz
+source=(http://www.kismetwireless.net/code/kismet-$_realver.tar.gz
         kismet-gcc43.patch)
-md5sums=('a1dcea71f0c3f881ef72f5bca2db7b39'
-         '6588e63abb801bee918b2b2f375e2fab')
+md5sums=('2100c667e69db0cde35fa2d06c8516e2'
+         'b9fd32eec6c2f096873f82dec545a763')
+sha1sums=('a1c682797ad6842b53f9e0f038254aa8326e0fb4'
+          'dbb2aa1a99811a010b1fe9ddbc064b8b312d81d5')
 
 build() {
-   cd $startdir/src/kismet-2007-01-R1b
-   patch -Np1 -i $srcdir/kismet-gcc43.patch
+   cd $startdir/src/kismet-$_realver
+   patch -Np1 -i ${srcdir}/kismet-gcc43.patch
    
    if [ $CARCH == "x86_64" ]; then
      ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
@@ -36,5 +39,8 @@
    make DESTDIR=$startdir/pkg install
 
    mkdir -p $startdir/pkg/usr/share/kismet
-   install -m 644 $startdir/src/kismet-2007-01-R1b/README $startdir/pkg/usr/share/kismet
+   install -m 644 $startdir/src/kismet-$_realver/README $startdir/pkg/usr/share/kismet
+
+   # Fix the *.conf unexpanded ${prefix} problems
+   sed -i 's%\${prefix}%/usr%' $startdir/pkg/etc/*.conf
 }

Deleted: testing-i686/kismet-gcc43.patch
===================================================================
--- testing-i686/kismet-gcc43.patch	2008-08-17 05:55:35 UTC (rev 9270)
+++ testing-i686/kismet-gcc43.patch	2008-08-17 05:55:35 UTC (rev 9271)
@@ -1,22 +0,0 @@
-diff -Naur kismet-2007-01-R1b-old/ringbuf.cc kismet-2007-01-R1b/ringbuf.cc
---- kismet-2007-01-R1b-old/ringbuf.cc	2005-12-12 05:14:39.000000000 +1000
-+++ kismet-2007-01-R1b/ringbuf.cc	2008-08-16 22:49:23.000000000 +1000
-@@ -17,6 +17,7 @@
- */
- 
- #include "ringbuf.h"
-+#include <cstring>
- 
- RingBuffer::RingBuffer(int in_size) {
-     ring_len = in_size;
-diff -Naur kismet-2007-01-R1b-old/util.cc kismet-2007-01-R1b/util.cc
---- kismet-2007-01-R1b-old/util.cc	2006-08-29 06:37:29.000000000 +1000
-+++ kismet-2007-01-R1b/util.cc	2008-08-16 22:47:57.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

Copied: kismet/repos/testing-i686/kismet-gcc43.patch (from rev 9267, kismet/trunk/kismet-gcc43.patch)
===================================================================
--- testing-i686/kismet-gcc43.patch	                        (rev 0)
+++ testing-i686/kismet-gcc43.patch	2008-08-17 05:55:35 UTC (rev 9271)
@@ -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