diff --git a/package/valentin/kismet/gcc34.patch b/package/valentin/kismet/gcc34.patch deleted file mode 100644 index d3470bd73..000000000 --- a/package/valentin/kismet/gcc34.patch +++ /dev/null @@ -1,39 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/valentin/kismet/gcc34.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -ruN kismet-2004-04-R1/packet.h kismet-2004-04-R1-new/packet.h ---- kismet-2004-04-R1/packet.h 2004-04-02 18:53:36.000000000 +0200 -+++ kismet-2004-04-R1-new/packet.h 2004-05-24 13:58:03.682859328 +0200 -@@ -550,7 +550,7 @@ - // This isn't quite like STL iterators, because I'm too damned lazy to deal with all - // the nasty STL hoop-jumping. This does provide a somewhat-stl-ish interface to - // iterating through the singleton and masked maps -- friend class iterator { -+ class iterator { - friend class macmap; - - public: -@@ -643,6 +643,7 @@ - int vector_itr; - macmap *owner; - }; -+ friend class iterator; - - iterator begin() { - iterator ret(this); diff --git a/package/valentin/kismet/kismet.conf b/package/valentin/kismet/kismet.conf index cf4315be7..d6bb636f8 100644 --- a/package/valentin/kismet/kismet.conf +++ b/package/valentin/kismet/kismet.conf @@ -20,6 +20,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -var_append confopt " " "--enable-syspcap" +var_append confopt " " "--enable-syspcap --sysconfdir=$root/etc/kismet" hook_add preconf 3 "autoheader; autoconf;" diff --git a/package/valentin/kismet/kismet.desc b/package/valentin/kismet/kismet.desc index 869f5d3fb..f7c11348d 100644 --- a/package/valentin/kismet/kismet.desc +++ b/package/valentin/kismet/kismet.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 2004-04-R1 +[V] 2004-10-R1 [P] X -?---5---9 201.400 -[D] 3941410732 kismet-2004-04-R1.tar.gz http://www.kismetwireless.net/code/ +[D] 2556350685 kismet-2004-10-R1.tar.gz http://www.kismetwireless.net/code/ diff --git a/package/valentin/kismet/pcap-bpf_location.patch b/package/valentin/kismet/pcap-bpf_location.patch deleted file mode 100644 index 11adc2131..000000000 --- a/package/valentin/kismet/pcap-bpf_location.patch +++ /dev/null @@ -1,31 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/valentin/kismet/pcap-bpf_location.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -ruN kismet-2004-04-R1/pcapsource.h kismet-2004-04-R1-new/pcapsource.h ---- kismet-2004-04-R1/pcapsource.h 2004-03-21 00:57:04.000000000 +0100 -+++ kismet-2004-04-R1-new/pcapsource.h 2004-05-01 12:02:50.683464560 +0200 -@@ -34,7 +34,7 @@ - extern "C" { - #ifndef HAVE_PCAPPCAP_H - #include --#include -+#include - #else - #include - #include