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

[Andrea Scarpino]

    Date: Friday, May 8, 2009 @ 08:07:33
  Author: andrea
Revision: 38459

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

........
  r37422 | juergen | 2009-05-01 17:12:21 +0200 (Fri, 01 May 2009) | 1 line
  
  Applying OpenSuSE Patch for 64-bit build of gpsmap (fixing FS#14271)
........

Added:
  kismet/repos/extra-i686/kismet-2008-05-R1-infinite-loop.diff
    (from rev 37422, kismet/trunk/kismet-2008-05-R1-infinite-loop.diff)
Modified:
  kismet/repos/extra-i686/	(properties)
  kismet/repos/extra-i686/PKGBUILD

--------------------------------------+
 PKGBUILD                             |   25 ++++++++++---------------
 kismet-2008-05-R1-infinite-loop.diff |   20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 15 deletions(-)


Property changes on: kismet/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /kismet/trunk:1-37381
   + /kismet/trunk:1-38458

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-08 11:59:56 UTC (rev 38458)
+++ extra-i686/PKGBUILD	2009-05-08 12:07:33 UTC (rev 38459)
@@ -1,36 +1,31 @@
 # $Id$
 # Contributer: Jason Chu <jason at archlinux.org>
-# Maintainer: Jason Chu <jason at archlinux.org>
+# Maintainer: Juergen Hoetzel <jason at archlinux.org>
 
 pkgname=kismet
 pkgver=2008_05_R1
 _realver=2008-05-R1
-pkgrel=3
+pkgrel=4
 pkgdesc="802.11b sniffing software"
 arch=(i686 x86_64)
 license=('GPL')
-if [ "${CARCH}" == "x86_64" ]; then
-  depends=('gcc-libs' 'libpcap>=1.0.0' 'ncurses' 'dbus')
-else
-  depends=('gmp' 'imagemagick' 'libpcap>=1.0.0' 'ncurses' 'dbus')
-fi
+depends=('gmp' 'imagemagick' 'libpcap>=1.0.0' 'ncurses' 'dbus')
+optdepends=(perl-libwww)
 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=('6ee365d36354b4dee4945e67f8149294')
+source=(http://www.kismetwireless.net/code/kismet-$_realver.tar.gz\
+	kismet-2008-05-R1-infinite-loop.diff)
+md5sums=('6ee365d36354b4dee4945e67f8149294' '80350b09c8bece4c4fc08f219bbb1548')
 sha1sums=('a1c682797ad6842b53f9e0f038254aa8326e0fb4'
           'dbb2aa1a99811a010b1fe9ddbc064b8b312d81d5')
 
 build() {
    cd $startdir/src/kismet-$_realver
+   patch -p0 -i ${srcdir}/kismet-2008-05-R1-infinite-loop.diff || return 0
    # patch -Np1 -i ${srcdir}/kismet-gcc43.patch
    
-   if [ $CARCH == "x86_64" ]; then
-     ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-                 --disable-gpsmap
-   else
-     ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-   fi
+   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+
    make dep
    make ||return 1
    sed -i 's/prism2/wlanng/g' conf/kismet.conf

Copied: kismet/repos/extra-i686/kismet-2008-05-R1-infinite-loop.diff (from rev 37422, kismet/trunk/kismet-2008-05-R1-infinite-loop.diff)
===================================================================
--- extra-i686/kismet-2008-05-R1-infinite-loop.diff	                        (rev 0)
+++ extra-i686/kismet-2008-05-R1-infinite-loop.diff	2009-05-08 12:07:33 UTC (rev 38459)
@@ -0,0 +1,20 @@
+--- gpsmap.cc
++++ gpsmap.cc
+@@ -874,7 +874,7 @@
+ 
+                 // Break up the path to the gpsxml file and form a path based on that
+                 unsigned int lastslash = 0;
+-                for (unsigned int x = origxmlfile.find('/'); x != string::npos;
++                for (string::size_type x = origxmlfile.find('/'); x != string::npos;
+                      lastslash = x, x = origxmlfile.find('/', lastslash+1)) {
+                     // We don't actually need to do anything...
+                 }
+@@ -882,7 +882,7 @@
+                 comp = origxmlfile.substr(0, lastslash);
+ 
+                 lastslash = 0;
+-                for (unsigned int x = orignetfile.find('/'); x != string::npos;
++                for (string::size_type x = orignetfile.find('/'); x != string::npos;
+                      lastslash = x, x = orignetfile.find('/', lastslash+1)) {
+                     // We don't actually need to do anything...
+                 }