[arch-commits] Commit in kismet/trunk (PKGBUILD kismet-build.patch)

[Eric Bélanger]

    Date: Wednesday, July 8, 2009 @ 03:13:50
  Author: eric
Revision: 45170

upgpkg: kismet 2008_05_R1-5
    libjpeg rebuild, added build patch, fixed man pages ownership

Added:
  kismet/trunk/kismet-build.patch
Modified:
  kismet/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   37 +++++++++++++++++++++----------------
 kismet-build.patch |   11 +++++++++++
 2 files changed, 32 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-08 07:05:29 UTC (rev 45169)
+++ PKGBUILD	2009-07-08 07:13:50 UTC (rev 45170)
@@ -5,35 +5,40 @@
 pkgname=kismet
 pkgver=2008_05_R1
 _realver=2008-05-R1
-pkgrel=4
+pkgrel=5
 pkgdesc="802.11b sniffing software"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gmp' 'imagemagick' 'libpcap>=1.0.0' 'ncurses' 'dbus')
+depends=('gmp' 'imagemagick' 'libpcap>=1.0.0' 'ncurses' 'dbus' 'libjpeg>=7')
 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')
+options=('!makeflags')
 source=(http://www.kismetwireless.net/code/kismet-$_realver.tar.gz\
-	kismet-2008-05-R1-infinite-loop.diff)
-md5sums=('6ee365d36354b4dee4945e67f8149294' '80350b09c8bece4c4fc08f219bbb1548')
-sha1sums=('a1c682797ad6842b53f9e0f038254aa8326e0fb4'
-          'dbb2aa1a99811a010b1fe9ddbc064b8b312d81d5')
+	kismet-2008-05-R1-infinite-loop.diff kismet-build.patch)
+md5sums=('6ee365d36354b4dee4945e67f8149294' '80350b09c8bece4c4fc08f219bbb1548'\
+         '72201caaa709272c50cb06f1042c553e')
+sha1sums=('8355aeb0374a39549dfdc0c73160125eadd7c6e2'
+          '65f7fd29c3c55466ce6a647b6b80b66161b348f5'
+          '6127b69d6c4dc7db4a32bdd4fdffdced9df33511')
 
 build() {
-   cd $startdir/src/kismet-$_realver
-   patch -p0 -i ${srcdir}/kismet-2008-05-R1-infinite-loop.diff || return 0
+   cd "$srcdir/kismet-$_realver"
+   patch -p0 -i "${srcdir}/kismet-2008-05-R1-infinite-loop.diff" || return 1
+   patch -p0 -i "${srcdir}/kismet-build.patch" || return 1
    # patch -Np1 -i ${srcdir}/kismet-gcc43.patch
    
-   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
 
-   make dep
-   make ||return 1
-   sed -i 's/prism2/wlanng/g' conf/kismet.conf
-   make DESTDIR=$startdir/pkg install
+   make dep || return 1
+   make || return 1
+   sed -i 's/prism2/wlanng/g' conf/kismet.conf || return 1
+   make DESTDIR="$pkgdir" install || return 1
 
-   mkdir -p $startdir/pkg/usr/share/kismet
-   install -m 644 $startdir/src/kismet-$_realver/README $startdir/pkg/usr/share/kismet
+   chown root:root "$pkgdir"/usr/share/man/man{1,5}/*
 
+   install -D -m 644 "$srcdir/kismet-$_realver/README" "$pkgdir/usr/share/kismet/README"
+
    # Fix the *.conf unexpanded ${prefix} problems
-   sed -i 's%\${prefix}%/usr%' $startdir/pkg/etc/*.conf
+   sed -i 's%\${prefix}%/usr%' "$pkgdir"/etc/*.conf || return 1
 }

Added: kismet-build.patch
===================================================================
--- kismet-build.patch	                        (rev 0)
+++ kismet-build.patch	2009-07-08 07:13:50 UTC (rev 45170)
@@ -0,0 +1,11 @@
+--- macaddr.h.orig	2009-07-08 02:29:38.000000000 -0400
++++ macaddr.h	2009-07-08 02:37:54.000000000 -0400
+@@ -73,7 +73,7 @@
+ 			longmac |= (uint64_t) bs_in[5] << ((MAC_LEN - 5 - 1) * 8);
+ 
+             // If it has a mask component, get that
+-            char *in_mask = strchr(in, '/');
++            const char *in_mask = strchr(in, '/');
+             if (in_mask != NULL) {
+                 longmask = 0;
+