[pkgsrc/trunk]: pkgsrc/net/kismet Changes 2008.05.01:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/kismet Changes 2008.05.01:
From: adam <adam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:47:30 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/633976257213
branches:  trunk
changeset: 549132:633976257213
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Oct 28 11:06:38 2008 +0000

description:
Changes 2008.05.01:
* Bug fixes and improvements

diffstat:

 net/kismet/Makefile         |  15 ++++----
 net/kismet/distinfo         |  22 +++++------
 net/kismet/patches/patch-aa |  34 +++++--------------
 net/kismet/patches/patch-ab |  34 -------------------
 net/kismet/patches/patch-ac |  38 ++++++++-------------
 net/kismet/patches/patch-ad |  13 -------
 net/kismet/patches/patch-ae |  78 ++++++++++++++++++++------------------------
 net/kismet/patches/patch-af |   6 +-
 net/kismet/patches/patch-ag |   8 ++--
 net/kismet/patches/patch-ah |  13 +++----
 10 files changed, 88 insertions(+), 173 deletions(-)

diffs (truncated from 492 to 300 lines):

diff -r e0bdf5f2069c -r 633976257213 net/kismet/Makefile
--- a/net/kismet/Makefile       Tue Oct 28 11:03:24 2008 +0000
+++ b/net/kismet/Makefile       Tue Oct 28 11:06:38 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2007/07/04 20:54:50 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/10/28 11:06:38 adam Exp $
 
-DISTNAME=              kismet-2006-04-R1
-PKGNAME=               kismet-2006.04.01
-PKGREVISION=           2
+DISTNAME=              kismet-2008-05-R1
+PKGNAME=               kismet-2008.05.01
 CATEGORIES=            net
 MASTER_SITES=          http://www.kismetwireless.net/code/
 
@@ -10,10 +9,12 @@
 HOMEPAGE=              http://www.kismetwireless.net/
 COMMENT=               802.11 wireless network detector, sniffer and IDS
 
-GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 USE_NCURSES=           yes # needs libpanel
 USE_TOOLS+=            gmake perl:run
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+
 REPLACE_PERL+=         scripts/gpsmap-helper-earthamaps
 LIBS.NetBSD+=          -lm
 
@@ -42,8 +43,6 @@
                                ${PKG_SYSCONFDIR}/kismet_ui.conf
 OWN_DIRS_PERMS+=       ${VARBASE}/log/kismet ${KISMET_USER} ${KISMET_GROUP} 0700
 
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
-
 SUBST_CLASSES+=                user
 SUBST_MESSAGE.user=    Fixing user name.
 SUBST_STAGE.user=      pre-configure
@@ -63,9 +62,9 @@
 
 .include "options.mk"
 
-.include "../../devel/glib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../net/libpcap/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e0bdf5f2069c -r 633976257213 net/kismet/distinfo
--- a/net/kismet/distinfo       Tue Oct 28 11:03:24 2008 +0000
+++ b/net/kismet/distinfo       Tue Oct 28 11:06:38 2008 +0000
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.4 2007/02/19 18:22:58 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/10/28 11:06:38 adam Exp $
 
-SHA1 (kismet-2006-04-R1.tar.gz) = e48ce08e96328bfdac98152df6b5759c27ed9169
-RMD160 (kismet-2006-04-R1.tar.gz) = b709256198820d5ac650ce40dea637716427a8b7
-Size (kismet-2006-04-R1.tar.gz) = 1005068 bytes
-SHA1 (patch-aa) = 5284efe0cb7e2a10c21d5235dae3a1faffff4809
-SHA1 (patch-ab) = a77adf2212909b18f7afb65cdfb19539ee3b2f0b
-SHA1 (patch-ac) = cb02c5d97b22a49e8c59ae2d62537a6cbdd899da
-SHA1 (patch-ad) = 6442e2f571cb266560eaa8dc5e6500ff1b9db4fb
-SHA1 (patch-ae) = d99c33d5db327c33024f316133c1da8c602ab508
-SHA1 (patch-af) = 960246131eda2d8b4a70711b751b1fce9609d2fa
-SHA1 (patch-ag) = 92f302f26abaa1882277c56af4a8c072d4f7db7d
-SHA1 (patch-ah) = 4b7368576edd66df1783d52c0136c7a21dec138d
+SHA1 (kismet-2008-05-R1.tar.gz) = 8355aeb0374a39549dfdc0c73160125eadd7c6e2
+RMD160 (kismet-2008-05-R1.tar.gz) = 5613207b45f85fa72d146009434df984f721ccdc
+Size (kismet-2008-05-R1.tar.gz) = 655362 bytes
+SHA1 (patch-aa) = 84bd0905299e75eb885a299c65752825e85b3234
+SHA1 (patch-ac) = 5e267a8915872f6c1d5d58bd0a6c15223292c4ca
+SHA1 (patch-ae) = eaaf5c5498a38d7b2a6121defdf879622f430003
+SHA1 (patch-af) = e4e176998e78a657178b3e14e614adf27b517eb6
+SHA1 (patch-ag) = 2fbf1fbf9d43cd74599c86e178c810bf93b6e04c
+SHA1 (patch-ah) = 67dfa5a2aedb1b651671863177baace4a65c6f26
diff -r e0bdf5f2069c -r 633976257213 net/kismet/patches/patch-aa
--- a/net/kismet/patches/patch-aa       Tue Oct 28 11:03:24 2008 +0000
+++ b/net/kismet/patches/patch-aa       Tue Oct 28 11:06:38 2008 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2007/02/19 18:22:59 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2008/10/28 11:06:38 adam Exp $
 
---- configure.orig     2006-01-04 15:53:37.000000000 +0000
+--- configure.orig     2008-05-12 22:14:14.000000000 +0200
 +++ configure
-@@ -5689,7 +5689,7 @@ fi
+@@ -6255,7 +6255,7 @@ fi
  
  
  # Do we use uclibc++?
 -if test "$foundcxxl"x == "x"; then
 +if test "$foundcxxl"x = "x"; then
-       echo "$as_me:$LINENO: checking for main in -lstdc++" >&5
- echo $ECHO_N "checking for main in -lstdc++... $ECHO_C" >&6
+       { echo "$as_me:$LINENO: checking for main in -lstdc++" >&5
+ echo $ECHO_N "checking for main in -lstdc++... $ECHO_C" >&6; }
  if test "${ac_cv_lib_stdcpp_main+set}" = set; then
-@@ -5757,7 +5757,7 @@ fi
+@@ -6317,7 +6317,7 @@ fi
  
  fi
  
@@ -20,32 +20,16 @@
        { { echo "$as_me:$LINENO: error: Neither uclibc uClibc++ or standard gcc stdc++ libraries found." >&5
  echo "$as_me: error: Neither uclibc uClibc++ or standard gcc stdc++ libraries found." >&2;}
     { (exit 1); exit 1; }; }
-@@ -7084,6 +7084,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
-           #include <stdio.h>
-+          #include <sys/param.h>
-           #include <sys/socket.h>
-           #include <net/if.h>
-           #include <net/if_media.h>
-@@ -8540,13 +8541,13 @@ echo "${ECHO_T}$ac_cv_header_pthread_h" 
- 
- fi
- if test $ac_cv_header_pthread_h = yes; then
--  echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+  echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+@@ -9614,7 +9614,7 @@ if test "${ac_cv_lib_pthread_pthread_cre
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8625,7 +8626,7 @@ fi
+@@ -9690,7 +9690,7 @@ fi
  echo "$as_me: WARNING: *** GPSMap will be built without pthread support. ***" >&2;};
                threadlib=""
        else
diff -r e0bdf5f2069c -r 633976257213 net/kismet/patches/patch-ab
--- a/net/kismet/patches/patch-ab       Tue Oct 28 11:03:24 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
-
---- libpcap-0.9.1-kis/pcap-int.h.orig  2005-08-16 01:22:47.000000000 +0000
-+++ libpcap-0.9.1-kis/pcap-int.h
-@@ -52,6 +52,14 @@ extern "C" {
- #endif
- 
- /*
-+ * Ultrix, DEC OSF/1^H^H^H^H^H^H^H^H^HDigital UNIX^H^H^H^H^H^H^H^H^H^H^H^H
-+ * Tru64 UNIX, and NetBSD pad to make everything line up on a nice boundary.
-+ */
-+#if defined(ultrix) || defined(__osf__) || defined(__NetBSD__)
-+#define       PCAP_FDDIPAD 3
-+#endif
-+
-+/*
-  * Savefile
-  */
- typedef enum {
-@@ -239,14 +247,6 @@ int       pcap_offline_read(pcap_t *, int, pca
- int   pcap_read(pcap_t *, int cnt, pcap_handler, u_char *);
- 
- 
--/*
-- * Ultrix, DEC OSF/1^H^H^H^H^H^H^H^H^HDigital UNIX^H^H^H^H^H^H^H^H^H^H^H^H
-- * Tru64 UNIX, and NetBSD pad to make everything line up on a nice boundary.
-- */
--#if defined(ultrix) || defined(__osf__) || defined(__NetBSD__)
--#define       PCAP_FDDIPAD 3
--#endif
--
- #ifndef HAVE_STRLCPY
- #define strlcpy(x, y, z) \
-       (strncpy((x), (y), (z)), \
diff -r e0bdf5f2069c -r 633976257213 net/kismet/patches/patch-ac
--- a/net/kismet/patches/patch-ac       Tue Oct 28 11:03:24 2008 +0000
+++ b/net/kismet/patches/patch-ac       Tue Oct 28 11:06:38 2008 +0000
@@ -1,19 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2006/10/09 18:48:35 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2008/10/28 11:06:38 adam Exp $
 
---- pcapsource.cc.orig 2006-04-02 15:13:00.000000000 +0000
+--- pcapsource.cc.orig 2008-05-21 17:56:43.000000000 +0200
 +++ pcapsource.cc
-@@ -44,7 +44,9 @@ typedef unsigned long u64;
- #include <net/if_media.h>
- #include <netinet/in.h>
- #include <netinet/if_ether.h>
-+#if defined(SYS_OPENBSD)
- #include <dev/ic/if_wi_ieee.h>
-+#endif
- 
- #ifdef HAVE_RADIOTAP
- #include <net80211/ieee80211.h>
-@@ -54,12 +56,15 @@ typedef unsigned long u64;
- 
+@@ -72,12 +72,15 @@ extern "C" {
+ }
  #endif
  
 -#ifdef SYS_FREEBSD
@@ -30,7 +20,7 @@
  #include <net80211/ieee80211_ioctl.h>
  #include <net80211/ieee80211_radiotap.h>
  #endif
-@@ -185,7 +190,7 @@ int PcapSource::DatalinkType() {
+@@ -247,7 +250,7 @@ int PcapSource::DatalinkType() {
      datalink_type = pcap_datalink(pd);
  
      // Blow up if we're not valid 802.11 headers
@@ -39,16 +29,16 @@
      if (datalink_type == DLT_EN10MB) {
          fprintf(stderr, "WARNING:  pcap reports link type of EN10MB but we'll fake "
                  "it on BSD.\n"
-@@ -983,7 +988,7 @@ int PcapSourceOpenBSDPrism::FetchChannel
+@@ -1167,7 +1170,7 @@ carrier_type PcapSourceWrt54g::IEEE80211
  }
  #endif
  
 -#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD)))
 +#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD) || defined(__DragonFly__)))
  int PcapSourceRadiotap::OpenSource() {
-     // XXX this is a hack to avoid duplicating code
-     int s = PcapSource::OpenSource();
-@@ -1097,7 +1102,7 @@ KisPacketSource *pcapsource_openbsdprism
+       // XXX this is a hack to avoid duplicating code
+       int s = PcapSource::OpenSource();
+@@ -1289,7 +1292,7 @@ KisPacketSource *pcapsource_openbsdprism
  }
  #endif
  
@@ -57,7 +47,7 @@
  KisPacketSource *pcapsource_radiotap_registrant(string in_name, string in_device,
                                                       char *in_err) {
      return new PcapSourceRadiotap(in_name, in_device);
-@@ -2698,7 +2703,7 @@ int chancontrol_openbsd_prism2(const cha
+@@ -2997,7 +3000,7 @@ int chancontrol_openbsd_prism2(const cha
  }
  #endif
  
@@ -66,7 +56,7 @@
  RadiotapBSD::RadiotapBSD(const char *name) : ifname(name) {
      s = -1;
  }
-@@ -2849,7 +2854,7 @@ bool RadiotapBSD::set80211(int type, int
+@@ -3148,7 +3151,7 @@ bool RadiotapBSD::set80211(int type, int
      return true;
  }
  
@@ -75,7 +65,7 @@
  
  bool RadiotapBSD::get80211(int type, int& val, int len, u_int8_t *data) {
      struct ieee80211req ireq;
-@@ -2898,7 +2903,7 @@ bool RadiotapBSD::getifflags(int& flags)
+@@ -3198,7 +3201,7 @@ bool RadiotapBSD::getifflags(int& flags)
      }
  #if defined(SYS_FREEBSD)
      flags = (ifr.ifr_flags & 0xffff) | (ifr.ifr_flagshigh << 16);
@@ -84,7 +74,7 @@
      flags = ifr.ifr_flags;
  #endif
      return true;
-@@ -2915,7 +2920,7 @@ bool RadiotapBSD::setifflags(int flags) 
+@@ -3215,7 +3218,7 @@ bool RadiotapBSD::setifflags(int flags) 
  #if defined(SYS_FREEBSD)
      ifr.ifr_flags = flags & 0xffff;
      ifr.ifr_flagshigh = flags >> 16;
@@ -93,7 +83,7 @@
      ifr.ifr_flags = flags;
  #endif
      if (ioctl(s, SIOCSIFFLAGS, (caddr_t)&ifr) < 0) {
-@@ -2946,7 +2951,7 @@ bool RadiotapBSD::monitor_enable(int ini
+@@ -3246,7 +3249,7 @@ bool RadiotapBSD::monitor_enable(int ini
      }
  #if defined(SYS_FREEBSD)
      if (!setifflags(prev_flags | IFF_PPROMISC | IFF_UP)) {
diff -r e0bdf5f2069c -r 633976257213 net/kismet/patches/patch-ad
--- a/net/kismet/patches/patch-ad       Tue Oct 28 11:03:24 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
-
---- libpcap-0.9.1-kis/pcap-bpf.c.orig  2005-08-16 01:22:47.000000000 +0000
-+++ libpcap-0.9.1-kis/pcap-bpf.c
-@@ -729,7 +729,7 @@ pcap_open_live(const char *device, int s
- #endif
- #ifdef PCAP_FDDIPAD
-       if (v == DLT_FDDI)
--              p->fddipad = PCAP_FDDIPAD:
-+              p->fddipad = PCAP_FDDIPAD;
-       else
-               p->fddipad = 0;
- #endif
diff -r e0bdf5f2069c -r 633976257213 net/kismet/patches/patch-ae
--- a/net/kismet/patches/patch-ae       Tue Oct 28 11:03:24 2008 +0000
+++ b/net/kismet/patches/patch-ae       Tue Oct 28 11:06:38 2008 +0000
@@ -1,25 +1,27 @@
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc - gok-2.24.0
Next by Date: [pkgsrc/trunk]: pkgsrc/mail Remove unnecessary depends-pattern-line for outda...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc - gok-2.24.0
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail Remove unnecessary depends-pattern-line for outda...
Indexes:
Home | Main Index | Thread Index | Old Index