diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-11 12:29:23 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-11 12:29:23 +0100 |
| commit | 407f9b8fde3ad9cc55f39f7a548cde6056dab494 (patch) | |
| tree | 0375ea8ddab3502bf6883066f43fc7e328d5c704 /package/kismet | |
| parent | 2ecefcf609e484d04d1546581191831e07ad71ec (diff) | |
| parent | abb858ae43374dc13a5fcef19b9e0ba9442013bb (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/kismet')
| -rw-r--r-- | package/kismet/Makefile | 13 | ||||
| -rw-r--r-- | package/kismet/patches/patch-configure_in | 12 | ||||
| -rw-r--r-- | package/kismet/patches/patch-dumpfile_tuntap_h | 18 |
3 files changed, 38 insertions, 5 deletions
diff --git a/package/kismet/Makefile b/package/kismet/Makefile index b5aa3de05..110f6f78d 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -4,16 +4,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= kismet -PKG_VERSION:= 2011-01-R1 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 1fb1f024a7ca52814b255e2f2faccf3b +PKG_VERSION:= 2013-03-R1b +PKG_RELEASE:= 1 +PKG_MD5SUM:= 596acdd2940887dd05a498ea27475eea PKG_DESCR:= Kismet PKG_SECTION:= wifi PKG_DEPENDS:= libpcap libncurses libpthread -PKG_BUILDDEP:= libpcap ncurses +PKG_BUILDDEP:= autotool libpcap ncurses PKG_URL:= http://www.kismetwireless.net/ PKG_SITES:= http://www.kismetwireless.net/code/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + PKG_SUBPKGS:= KISMET KISMET_CLIENT KISMET_DRONE KISMET_SERVER PKGSD_KISMET_CLIENT:= Kismet client PKGSD_KISMET_SERVER:= Kismet server @@ -26,7 +28,8 @@ $(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELE $(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_DRONE},${PKG_SECTION})) $(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_SERVER},${PKG_SECTION})) -TARGET_LDFLAGS+= -lpthread +AUTOTOOL_STYLE:= autoreconf +TARGET_LDFLAGS+= -lpthread -ltinfo CONFIGURE_ARGS+= --sysconfdir=/etc/kismet pre-build: diff --git a/package/kismet/patches/patch-configure_in b/package/kismet/patches/patch-configure_in new file mode 100644 index 000000000..cb7d45cbd --- /dev/null +++ b/package/kismet/patches/patch-configure_in @@ -0,0 +1,12 @@ +--- kismet-2013-03-R1b.orig/configure.in 2013-03-27 15:41:48.000000000 +0100 ++++ kismet-2013-03-R1b/configure.in 2013-12-31 23:14:38.000000000 +0100 +@@ -406,9 +406,6 @@ AC_ARG_ENABLE(client, + ) + AC_SUBST(wantclient) + +-# Add additional cflags since some distros bury panel.h +-CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" +- + termcontrol="none"; + + if test "$wantclient" = "yes"; then diff --git a/package/kismet/patches/patch-dumpfile_tuntap_h b/package/kismet/patches/patch-dumpfile_tuntap_h new file mode 100644 index 000000000..f669446f5 --- /dev/null +++ b/package/kismet/patches/patch-dumpfile_tuntap_h @@ -0,0 +1,18 @@ +--- kismet-2013-03-R1b.orig/dumpfile_tuntap.h 2013-03-27 15:41:48.000000000 +0100 ++++ kismet-2013-03-R1b/dumpfile_tuntap.h 2014-01-02 20:53:21.000000000 +0100 +@@ -65,7 +65,15 @@ + #include "dumpfile.h" + + #ifdef SYS_LINUX ++#if defined(__GLIBC__) + #include <linux/if_tun.h> ++#else ++#define IFF_TUN 0x0001 ++#define IFF_TAP 0x0002 ++#define IFF_NO_PI 0x1000 ++#define TUNSETNOCSUM _IOW('T', 200, int) ++#define TUNSETIFF _IOW('T', 202, int) ++#endif + + // Linux IEEE80211 link typ to set + #define LNX_LINKTYPE_80211 801 |