SECURITY:
upgrade to version 200508R1; This fixes several potential security problems, so everyone should upgrade immidiately. From Bernd Ahlers <bernd@ba-net.org>, Matthias Kilian <kili@outback.escape.de> ok pvalchev@
This commit is contained in:
parent
9571031547
commit
32b94333d3
@ -1,12 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.5 2005/08/06 19:11:47 sturm Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 2005/08/16 20:35:58 robert Exp $
|
||||
# Much help came from Alexandre Anriot, Robert Nagy, Bernd Ahlers,
|
||||
# and, last but not least, Pedro la Peu.
|
||||
|
||||
COMMENT= "802.11 layer2 wireless network detector, sniffer, and IDS"
|
||||
|
||||
V= 2005-07-R1a
|
||||
V= 2005-08-R1
|
||||
DISTNAME= kismet-${V}
|
||||
PKGNAME= kismet-${V:S,-,,g}p0
|
||||
PKGNAME= kismet-${V:S,-,,g}
|
||||
CATEGORIES= net security
|
||||
|
||||
HOMEPAGE= http://www.kismetwireless.net/
|
||||
@ -28,8 +28,7 @@ AUTOCONF_VERSION= 2.59
|
||||
CONFDIR= ${SYSCONFDIR}/kismet
|
||||
SUBST_VARS+= CONFDIR
|
||||
|
||||
CONFIGURE_ARGS= --without-ethereal --disable-gpsmap \
|
||||
--sysconfdir=${CONFDIR}
|
||||
CONFIGURE_ARGS= --disable-gpsmap --sysconfdir=${CONFDIR}
|
||||
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
|
||||
|
@ -1,4 +1,4 @@
|
||||
MD5 (kismet-2005-07-R1a.tar.gz) = 9f59bce7d6cc8504ff602f150e578ab5
|
||||
RMD160 (kismet-2005-07-R1a.tar.gz) = e12dd0916ed1fa0f4096ad5fcc3956c700630234
|
||||
SHA1 (kismet-2005-07-R1a.tar.gz) = 93456ab8f345eadfbdce7cc227fc36c2423802b2
|
||||
SIZE (kismet-2005-07-R1a.tar.gz) = 983150
|
||||
MD5 (kismet-2005-08-R1.tar.gz) = 17edb7688e04dd28028d5268a77d0ce7
|
||||
RMD160 (kismet-2005-08-R1.tar.gz) = 1ee1b376d70821e7a4ccc5197ca299c0ebd6f250
|
||||
SHA1 (kismet-2005-08-R1.tar.gz) = 802a019b4d2796b1a6fb58c812ff788a238bd79c
|
||||
SIZE (kismet-2005-08-R1.tar.gz) = 986388
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- Makefile.in.orig Mon Jul 25 16:19:44 2005
|
||||
+++ Makefile.in Wed Jul 27 20:41:04 2005
|
||||
@@ -23,8 +23,8 @@
|
||||
--- Makefile.in.orig Tue Aug 16 03:22:51 2005
|
||||
+++ Makefile.in Tue Aug 16 10:35:14 2005
|
||||
@@ -23,8 +23,8 @@ LD = @CXX@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
CLIBS = @CLIBS@
|
||||
@ -11,7 +11,7 @@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
SUID = @suid@
|
||||
|
||||
@@ -130,52 +130,52 @@
|
||||
@@ -130,52 +130,52 @@ checkuiconfig:
|
||||
fi
|
||||
|
||||
binuserinstall:
|
||||
@ -99,7 +99,7 @@
|
||||
|
||||
@if test -f $(BIN)/kismet_curses; then \
|
||||
echo "Removing old kismet_curses binary. The panels frontend is now kismet_client."; \
|
||||
@@ -188,22 +188,22 @@
|
||||
@@ -188,22 +188,22 @@ suidinstall: $(PS) $(DRONE) $(NC) $(GPSL
|
||||
@if test -f $(ETC)/kismet.conf; then \
|
||||
$(MAKE) -e checkconfig; \
|
||||
else \
|
||||
@ -128,7 +128,7 @@
|
||||
echo "Installed UI config into $(ETC)/kismet_ui.conf."; \
|
||||
fi
|
||||
@echo "Installed kismet into $(BIN)/."
|
||||
@@ -221,22 +221,22 @@
|
||||
@@ -221,22 +221,22 @@ install: $(PS) $(DRONE) $(NC) $(GPSLBUIL
|
||||
@if test -f $(ETC)/kismet.conf; then \
|
||||
$(MAKE) -e checkconfig; \
|
||||
else \
|
||||
@ -157,7 +157,7 @@
|
||||
echo "Installed UI config into $(ETC)/kismet_ui.conf."; \
|
||||
fi
|
||||
@echo "Installed kismet into $(BIN)/."
|
||||
@@ -252,11 +252,11 @@
|
||||
@@ -252,11 +252,11 @@ install: $(PS) $(DRONE) $(NC) $(GPSLBUIL
|
||||
forceinstall: $(PS)
|
||||
$(MAKE) -e commoninstall
|
||||
$(MAKE) -e binuserinstall
|
||||
@ -172,7 +172,7 @@
|
||||
echo "Installed UI config into $(ETC)/kismet_ui.conf.";
|
||||
@echo "Installed kismet into $(BIN)/."
|
||||
@echo "If you have not done so already, read the README file and the FAQ file. Additional"
|
||||
@@ -271,11 +271,11 @@
|
||||
@@ -271,11 +271,11 @@ forceinstall: $(PS)
|
||||
suidforceinstall: $(PS)
|
||||
$(MAKE) -e commoninstall
|
||||
$(MAKE) -e binsuidinstall
|
||||
@ -187,7 +187,7 @@
|
||||
echo "Installed UI config into $(ETC)/kismet_ui.conf.";
|
||||
@echo "Installed kismet into $(BIN)/."
|
||||
@echo "If you have not done so already, read the README file and the FAQ file. Additional"
|
||||
@@ -362,13 +362,11 @@
|
||||
@@ -362,13 +362,11 @@ depend:
|
||||
@$(MAKE) $(DEPEND)
|
||||
|
||||
$(DEPEND):
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-conf_kismet_conf_in,v 1.1.1.1 2005/07/27 21:37:26 robert Exp $
|
||||
--- conf/kismet.conf.in.orig Wed Jun 22 06:22:13 2005
|
||||
+++ conf/kismet.conf.in Wed Jul 6 20:58:14 2005
|
||||
$OpenBSD: patch-conf_kismet_conf_in,v 1.2 2005/08/16 20:35:59 robert Exp $
|
||||
--- conf/kismet.conf.in.orig Tue Aug 16 03:22:41 2005
|
||||
+++ conf/kismet.conf.in Tue Aug 16 10:36:49 2005
|
||||
@@ -10,7 +10,7 @@ version=2005.06.R1
|
||||
servername=Kismet
|
||||
|
||||
@ -22,13 +22,13 @@ $OpenBSD: patch-conf_kismet_conf_in,v 1.1.1.1 2005/07/27 21:37:26 robert Exp $
|
||||
@@ -223,7 +223,7 @@ metric=false
|
||||
# recent versions of GPSDrive's native support of Kismet.
|
||||
waypoints=false
|
||||
# GPSMap waypoint file. This WILL be truncated.
|
||||
# GPSDrive waypoint file. This WILL be truncated.
|
||||
-waypointdata=%h/.gpsdrive/way_kismet.txt
|
||||
+waypointdata=/var/log/kismet/way_kismet.txt
|
||||
# Do we want ESSID or BSSID as the waypoint name ?
|
||||
waypoint_essid=false
|
||||
|
||||
# How many alerts do we backlog for new clients? Only change this if you have
|
||||
# a -very- low memory system and need those extra bytes, or if you have a high
|
||||
@@ -322,7 +322,7 @@ piddir=/var/run/
|
||||
@@ -324,7 +324,7 @@ piddir=/var/run/
|
||||
|
||||
# Where state info, etc, is stored. You shouldnt ever need to change this.
|
||||
# This is a directory.
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- configure.in.orig Mon Jul 25 16:19:44 2005
|
||||
+++ configure.in Sat Aug 6 13:57:52 2005
|
||||
@@ -127,7 +127,7 @@
|
||||
--- configure.in.orig Tue Aug 16 03:22:51 2005
|
||||
+++ configure.in Tue Aug 16 10:39:12 2005
|
||||
@@ -127,7 +127,7 @@ else
|
||||
esac
|
||||
fi
|
||||
|
||||
@ -9,31 +9,15 @@
|
||||
|
||||
AC_CONFIG_SRCDIR([kismet_server.cc])
|
||||
AC_CONFIG_HEADER([config.h])
|
||||
@@ -236,9 +236,9 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
]], [[
|
||||
- int s;
|
||||
- struct sockaddr *addr;
|
||||
- socklen_t *addrlen;
|
||||
+ int s = 0;
|
||||
+ struct sockaddr *addr = NULL;
|
||||
+ socklen_t *addrlen = NULL;
|
||||
|
||||
accept(s, addr, addrlen);
|
||||
return 0;
|
||||
@@ -845,6 +845,14 @@
|
||||
@@ -856,6 +856,11 @@ else
|
||||
gmpl="no"
|
||||
gpslc=""
|
||||
pthr="no"
|
||||
fi
|
||||
+
|
||||
+# Not all OpenBSD archs have apm:
|
||||
+
|
||||
+if test "$bsd" = "yes"; then
|
||||
+ AC_CHECK_HEADERS([machine/apmvar.h])
|
||||
+fi
|
||||
+
|
||||
+
|
||||
+# Not all OpenBSD archs have apm:
|
||||
+if test "$bsd" = "yes"; then
|
||||
+ AC_CHECK_HEADERS([machine/apmvar.h])
|
||||
fi
|
||||
|
||||
|
||||
AC_ARG_ENABLE(optimization, [ --disable-optimization disable -Ox gcc optimization],,wantopto=yes)
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-panelfront_cc,v 1.2 2005/08/06 19:11:47 sturm Exp $
|
||||
--- panelfront.cc.orig Wed Jul 27 12:56:28 2005
|
||||
+++ panelfront.cc Wed Jul 27 12:56:45 2005
|
||||
$OpenBSD: patch-panelfront_cc,v 1.3 2005/08/16 20:35:59 robert Exp $
|
||||
--- panelfront.cc.orig Tue Aug 16 03:22:51 2005
|
||||
+++ panelfront.cc Tue Aug 16 10:35:14 2005
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <dirent.h>
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-panelfront_cc,v 1.2 2005/08/06 19:11:47 sturm Exp $
|
||||
#include <machine/apmvar.h>
|
||||
#endif
|
||||
|
||||
@@ -1535,7 +1535,7 @@
|
||||
@@ -1535,7 +1535,7 @@ int PanelFront::Tick() {
|
||||
closedir(batteries);
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-panelfront_cc,v 1.2 2005/08/06 19:11:47 sturm Exp $
|
||||
|
||||
struct apm_power_info api;
|
||||
int apmfd;
|
||||
@@ -1561,7 +1561,7 @@
|
||||
@@ -1561,7 +1561,7 @@ int PanelFront::Tick() {
|
||||
}
|
||||
if (bat_available == 1) {
|
||||
bat_percentage = (int)api.battery_life;
|
||||
|
Loading…
Reference in New Issue
Block a user