Commit 1819e048 authored by Raphaël Hertzog's avatar Raphaël Hertzog

Refresh Debian patches (changes to configure.in now applied on configure.ac).

parent 54c84a07
......@@ -4,6 +4,8 @@ kismet (2016.01.R1-0kali1) UNRELEASED; urgency=medium
* Update watch file.
* No longer drop the kismet.desktop file as kali-menu knows how to override
it.
* Refresh Debian patches (changes to configure.in now applied on
configure.ac).
* Remaining changes compared to Debian:
- fixed watch file
- Files-Excluded in debian/copyright
......
Allow different compile arguments to be used for programs and plugins
Index: kismet-debian/Makefile.inc.in
===================================================================
--- kismet-debian.orig/Makefile.inc.in 2013-04-21 18:02:12.468943137 +0200
+++ kismet-debian/Makefile.inc.in 2013-04-21 18:24:15.772306961 +0200
@@ -23,7 +23,7 @@
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
@@ -23,7 +23,7 @@ LIBS = @LIBS@
CLIBS = @CLIBS@
CXXLIBS = @CXXLIBS@
KSLIBS = @KSLIBS@
......@@ -12,7 +10,7 @@ Index: kismet-debian/Makefile.inc.in
CLIENTLIBS = @CLIENTCLIBS@
CAPLIBS = @caplibs@
CLIENTFLAGS = @CLIENTCFLAGS@
@@ -41,5 +41,6 @@
@@ -41,5 +41,6 @@ MAN = ${DESTDIR}@mandir@
LIB = ${DESTDIR}@libdir@
WAV = ${DESTDIR}@datadir@/kismet/wav/
......@@ -20,11 +18,9 @@ Index: kismet-debian/Makefile.inc.in
+PLUGINLDFLAGS = @PLUGINLDFLAGS@
+PLUGINCXXFLAGS = @PLUGINCXXFLAGS@
Index: kismet-debian/client-plugin-example/Makefile
===================================================================
--- kismet-debian.orig/client-plugin-example/Makefile 2013-03-25 18:29:11.000000000 +0100
+++ kismet-debian/client-plugin-example/Makefile 2013-04-21 18:11:11.530166215 +0200
@@ -13,7 +13,7 @@
--- a/client-plugin-example/Makefile
+++ b/client-plugin-example/Makefile
@@ -13,7 +13,7 @@ LD = g++
LDFLAGS = -shared -rdynamic
LIBS = -lstdc++
CFLAGS = -fPIC
......@@ -33,7 +29,7 @@ Index: kismet-debian/client-plugin-example/Makefile
CPPFLAGS = -I/usr/include -I$(KIS_INC_DIR)
PLUGOBJS = kcliplug.o
@@ -25,6 +25,6 @@
@@ -25,6 +25,6 @@ kcliplugin.so: $(PLUGOBJS)
$(CC) $(CFLAGS) -c $*.c -o $@
.cc.o:
......@@ -41,11 +37,9 @@ Index: kismet-debian/client-plugin-example/Makefile
+ $(CXX) $(CPPFLAGS) $(PLUGINCXXFLAGS) -c $*.cc -o $@
.SUFFIXES: .c .cc .o
Index: kismet-debian/configure
===================================================================
--- kismet-debian.orig/configure 2013-04-21 18:18:27.520685076 +0200
+++ kismet-debian/configure 2013-04-21 18:29:49.716108718 +0200
@@ -652,6 +652,7 @@
--- a/configure
+++ b/configure
@@ -652,6 +652,7 @@ LIBOBJS
EGREP
GREP
objc_link
......@@ -53,11 +47,9 @@ Index: kismet-debian/configure
PLUGINLDFLAGS
CPP
SET_MAKE
Index: kismet-debian/disable-plugin-dot15d4/Makefile
===================================================================
--- kismet-debian.orig/disable-plugin-dot15d4/Makefile 2013-03-25 18:29:11.000000000 +0100
+++ kismet-debian/disable-plugin-dot15d4/Makefile 2013-04-21 18:11:11.542166069 +0200
@@ -10,7 +10,7 @@
--- a/disable-plugin-dot15d4/Makefile
+++ b/disable-plugin-dot15d4/Makefile
@@ -10,7 +10,7 @@ top_builddir = $(BLDHOME)
PLUGINLDFLAGS += -shared -rdynamic
LIBS += -lstdc++ -lusb -lpthread
CFLAGS += -I$(KIS_INC_DIR) -g -fPIC
......@@ -66,7 +58,7 @@ Index: kismet-debian/disable-plugin-dot15d4/Makefile
SRVOBJS = packetsource_raven.o packetsource_serialdev.o \
packet_dot15d4.o packet_dot15d4_types.o \
@@ -41,6 +41,6 @@
@@ -41,6 +41,6 @@ clean:
$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@
.cc.o:
......@@ -74,11 +66,9 @@ Index: kismet-debian/disable-plugin-dot15d4/Makefile
+ $(CXX) $(CPPFLAGS) $(PLUGINCXXFLAGS) -c $*.cc -o $@
.SUFFIXES: .c .cc .o
Index: kismet-debian/plugin-alertsyslog/Makefile
===================================================================
--- kismet-debian.orig/plugin-alertsyslog/Makefile 2013-03-25 18:29:11.000000000 +0100
+++ kismet-debian/plugin-alertsyslog/Makefile 2013-04-21 18:11:40.681799734 +0200
@@ -10,7 +10,7 @@
--- a/plugin-alertsyslog/Makefile
+++ b/plugin-alertsyslog/Makefile
@@ -10,7 +10,7 @@ top_builddir = $(BLDHOME)
PLUGINLDFLAGS += -shared -rdynamic
LIBS += -lstdc++
CFLAGS += -I/usr/include -I$(KIS_INC_DIR) -g -fPIC
......@@ -87,7 +77,7 @@ Index: kismet-debian/plugin-alertsyslog/Makefile
PLUGOBJS = alertsyslog.o
PLUGOUT = alertsyslog.so
@@ -36,6 +36,6 @@
@@ -36,6 +36,6 @@ clean:
$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@
.cc.o:
......@@ -95,11 +85,9 @@ Index: kismet-debian/plugin-alertsyslog/Makefile
+ $(CXX) $(CPPFLAGS) $(PLUGINCXXFLAGS) -c $*.cc -o $@
.SUFFIXES: .c .cc .o
Index: kismet-debian/plugin-btscan/Makefile
===================================================================
--- kismet-debian.orig/plugin-btscan/Makefile 2013-03-25 18:29:11.000000000 +0100
+++ kismet-debian/plugin-btscan/Makefile 2013-04-21 18:11:11.542166069 +0200
@@ -10,7 +10,7 @@
--- a/plugin-btscan/Makefile
+++ b/plugin-btscan/Makefile
@@ -10,7 +10,7 @@ top_builddir = $(BLDHOME)
PLUGINLDFLAGS += -shared -rdynamic
LIBS += -lstdc++ -lbluetooth -lpthread
CFLAGS += -I$(KIS_INC_DIR) -g -fPIC
......@@ -108,7 +96,7 @@ Index: kismet-debian/plugin-btscan/Makefile
SRVOBJS = packetsource_linuxbt.o tracker_btscan.o dumpfile_btscantxt.o kismet_btscan.o
SRVOUT = btscan.so
@@ -46,6 +46,6 @@
@@ -46,6 +46,6 @@ clean:
$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@
.cc.o:
......@@ -116,11 +104,9 @@ Index: kismet-debian/plugin-btscan/Makefile
+ $(CXX) $(CPPFLAGS) $(PLUGINCXXFLAGS) -c $*.cc -o $@
.SUFFIXES: .c .cc .o
Index: kismet-debian/plugin-spectools/Makefile
===================================================================
--- kismet-debian.orig/plugin-spectools/Makefile 2013-03-25 18:29:11.000000000 +0100
+++ kismet-debian/plugin-spectools/Makefile 2013-04-21 18:11:11.542166069 +0200
@@ -10,7 +10,7 @@
--- a/plugin-spectools/Makefile
+++ b/plugin-spectools/Makefile
@@ -10,7 +10,7 @@ top_builddir = $(BLDHOME)
PLUGINLDFLAGS += -shared -rdynamic
LIBS += -lstdc++
CFLAGS += -I$(KIS_INC_DIR) -g -fPIC
......@@ -129,7 +115,7 @@ Index: kismet-debian/plugin-spectools/Makefile
CLIOBJS = spectools_ui.o
CLIOUT = spectools_ui.so
@@ -46,6 +46,6 @@
@@ -46,6 +46,6 @@ clean:
$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@
.cc.o:
......@@ -137,11 +123,9 @@ Index: kismet-debian/plugin-spectools/Makefile
+ $(CXX) $(CPPFLAGS) $(PLUGINCXXFLAGS) -c $*.cc -o $@
.SUFFIXES: .c .cc .o
Index: kismet-debian/plugin-syslog/Makefile
===================================================================
--- kismet-debian.orig/plugin-syslog/Makefile 2013-03-25 18:29:11.000000000 +0100
+++ kismet-debian/plugin-syslog/Makefile 2013-04-21 18:11:11.542166069 +0200
@@ -10,7 +10,7 @@
--- a/plugin-syslog/Makefile
+++ b/plugin-syslog/Makefile
@@ -10,7 +10,7 @@ top_builddir = $(BLDHOME)
PLUGINLDFLAGS += -shared -rdynamic
LIBS += -lstdc++
CFLAGS += -I$(KIS_INC_DIR) -g -fPIC
......@@ -150,7 +134,7 @@ Index: kismet-debian/plugin-syslog/Makefile
PLUGOBJS = kismet-syslog.o
PLUGOUT = kismet-syslog.so
@@ -36,6 +36,6 @@
@@ -36,6 +36,6 @@ clean:
$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@
.cc.o:
......@@ -158,11 +142,9 @@ Index: kismet-debian/plugin-syslog/Makefile
+ $(CXX) $(CPPFLAGS) $(PLUGINCXXFLAGS) -c $*.cc -o $@
.SUFFIXES: .c .cc .o
Index: kismet-debian/restricted-plugin-autowep/Makefile
===================================================================
--- kismet-debian.orig/restricted-plugin-autowep/Makefile 2013-03-25 18:29:11.000000000 +0100
+++ kismet-debian/restricted-plugin-autowep/Makefile 2013-04-21 18:11:11.550165968 +0200
@@ -10,7 +10,7 @@
--- a/restricted-plugin-autowep/Makefile
+++ b/restricted-plugin-autowep/Makefile
@@ -10,7 +10,7 @@ top_builddir = $(BLDHOME)
PLUGINLDFLAGS += -shared -rdynamic
LIBS += -lstdc++
CFLAGS += -I$(KIS_INC_DIR) -g -fPIC
......@@ -171,7 +153,7 @@ Index: kismet-debian/restricted-plugin-autowep/Makefile
PLUGOBJS = autowep-kismet.o
PLUGOUT = autowep-kismet.so
@@ -36,6 +36,6 @@
@@ -36,6 +36,6 @@ clean:
$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@
.cc.o:
......@@ -179,11 +161,9 @@ Index: kismet-debian/restricted-plugin-autowep/Makefile
+ $(CXX) $(CPPFLAGS) $(PLUGINCXXFLAGS) -c $*.cc -o $@
.SUFFIXES: .c .cc .o
Index: kismet-debian/restricted-plugin-ptw/Makefile
===================================================================
--- kismet-debian.orig/restricted-plugin-ptw/Makefile 2013-03-25 18:29:11.000000000 +0100
+++ kismet-debian/restricted-plugin-ptw/Makefile 2013-04-21 18:11:11.570165716 +0200
@@ -10,7 +10,7 @@
--- a/restricted-plugin-ptw/Makefile
+++ b/restricted-plugin-ptw/Makefile
@@ -10,7 +10,7 @@ top_builddir = $(BLDHOME)
PLUGINLDFLAGS += -shared -rdynamic
LIBS += -lstdc++ -lssl -lpthread -lcrypto
CFLAGS += -I$(KIS_INC_DIR) -g -fPIC
......@@ -192,7 +172,7 @@ Index: kismet-debian/restricted-plugin-ptw/Makefile
PLUGOBJS = aircrack-crypto.o aircrack-ptw2-lib.o aircrack-kismet.o
PLUGOUT = aircrack-kismet.so
@@ -36,6 +36,6 @@
@@ -36,6 +36,6 @@ clean:
$(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $@
.cc.o:
......@@ -200,11 +180,9 @@ Index: kismet-debian/restricted-plugin-ptw/Makefile
+ $(CXX) $(CPPFLAGS) $(PLUGINCXXFLAGS) -c $*.cc -o $@
.SUFFIXES: .c .cc .o
Index: kismet-debian/configure.in
===================================================================
--- kismet-debian.orig/configure.in 2013-04-21 18:18:27.520685076 +0200
+++ kismet-debian/configure.in 2013-04-21 18:29:27.604386699 +0200
@@ -156,6 +156,7 @@
--- a/configure.ac
+++ b/configure.ac
@@ -159,6 +159,7 @@ fi
# Substitute in the objc linkages if we need them
AC_SUBST(PLUGINLDFLAGS)
......
Add support for kfreebsd architecture
Index: kismet-debian/configure.in
===================================================================
--- kismet-debian.orig/configure.in 2013-04-21 18:23:32.224854426 +0200
+++ kismet-debian/configure.in 2013-04-21 18:26:20.310741300 +0200
@@ -65,7 +65,7 @@
AC_DEFINE(SYS_LINUX, 1, Compiling for Linux OS)
linux="yes"
;;
- freebsd*)
+ freebsd* | kfreebsd*)
AC_MSG_RESULT(none needed)
AC_DEFINE(SYS_FREEBSD, 1, Compiling for FreeBSD)
bsd="yes"
@@ -126,7 +126,7 @@
AC_DEFINE(SYS_LINUX, 1, Compiling for Linux OS)
linux="yes"
;;
- freebsd*)
+ freebsd* | kfreebsd*)
AC_MSG_RESULT(none needed)
AC_DEFINE(SYS_FREEBSD, 1, Compiling for FreeBSD)
bsd="yes"
Index: kismet-debian/packetsource_bsdrt.cc
===================================================================
--- kismet-debian.orig/packetsource_bsdrt.cc 2013-04-21 18:23:32.224854426 +0200
+++ kismet-debian/packetsource_bsdrt.cc 2013-04-21 18:26:20.310741300 +0200
--- a/packetsource_bsdrt.cc
+++ b/packetsource_bsdrt.cc
@@ -27,6 +27,10 @@
#include <net80211/ieee80211_ioctl.h>
#endif
......@@ -36,11 +12,9 @@ Index: kismet-debian/packetsource_bsdrt.cc
#if (defined(HAVE_LIBPCAP) && (defined(SYS_OPENBSD) || defined(SYS_NETBSD) || \
defined(SYS_FREEBSD)))
Index: kismet-debian/packetsource_pcap.cc
===================================================================
--- kismet-debian.orig/packetsource_pcap.cc 2013-04-21 18:23:32.224854426 +0200
+++ kismet-debian/packetsource_pcap.cc 2013-04-21 18:26:20.310741300 +0200
@@ -72,6 +72,7 @@
--- a/packetsource_pcap.cc
+++ b/packetsource_pcap.cc
@@ -72,6 +72,7 @@ extern "C" {
#include <sys/socket.h>
#include <net/if.h>
#include <net/if_media.h>
......@@ -48,11 +22,9 @@ Index: kismet-debian/packetsource_pcap.cc
#ifdef HAVE_RADIOTAP
#include <net80211/ieee80211_ioctl.h>
Index: kismet-debian/configure
===================================================================
--- kismet-debian.orig/configure 2013-04-21 18:23:32.224854426 +0200
+++ kismet-debian/configure 2013-04-21 18:29:12.812572658 +0200
@@ -3710,7 +3710,7 @@
--- a/configure
+++ b/configure
@@ -3710,7 +3710,7 @@ $as_echo "#define SYS_LINUX 1" >>confdef
linux="yes"
;;
......@@ -61,7 +33,7 @@ Index: kismet-debian/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
$as_echo "none needed" >&6; }
@@ -3794,7 +3794,7 @@
@@ -3794,7 +3794,7 @@ $as_echo "#define SYS_LINUX 1" >>confdef
linux="yes"
;;
......@@ -70,3 +42,23 @@ Index: kismet-debian/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
$as_echo "none needed" >&6; }
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ then
AC_DEFINE(SYS_LINUX, 1, Compiling for Linux OS)
linux="yes"
;;
- freebsd*)
+ freebsd* | kfreebsd*)
AC_MSG_RESULT(none needed)
AC_DEFINE(SYS_FREEBSD, 1, Compiling for FreeBSD)
bsd="yes"
@@ -129,7 +129,7 @@ else
AC_DEFINE(SYS_LINUX, 1, Compiling for Linux OS)
linux="yes"
;;
- freebsd*)
+ freebsd* | kfreebsd*)
AC_MSG_RESULT(none needed)
AC_DEFINE(SYS_FREEBSD, 1, Compiling for FreeBSD)
bsd="yes"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment