Update to honeyd 1.5

New features include:
* Statistics Collector: A daemon that can process netflow-like information
exported by several Honeyd instances and do computations on the data - see
live data.
* Improved Subsystems: Improved support for subsystems permits running more
complicated UNIX applications like mwcollect as a subsystem for Honeyd.
* Proxy and SMTP subsystems: Example subsystems to simulate open proxies and
mail relays. These subsystems are written with performance in mind and have
no problem in keeping up with a busy network.

Bugfixes include:
A bug in Honeyd's IP reassembly code allows adversaries to remotely fingerprint
honeypots. Thanks to Jon Oberheide for finding the bug; see adv.2006-01 for
more information

1 files changed, 50 insertions, 13 deletions

diff --git a/security/honeyd/patches/patch-aa b/security/honeyd/patches/patch-aa
index c354246ba24..73adfb89f2b 100644
--- a/security/honeyd/patches/patch-aa
+++ b/security/honeyd/patches/patch-aa
@@ -1,7 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2005/04/20 14:34:45 wiz Exp $
---- Makefile.in.orig	2005-01-13 10:48:06.000000000 +0000
-+++ Makefile.in	2005-01-13 10:52:09.000000000 +0000
-@@ -112,10 +112,10 @@
+$NetBSD: patch-aa,v 1.4 2006/02/19 17:23:18 adrianp Exp $
+
+--- Makefile.in.orig	2006-02-12 02:11:06.000000000 +0000
++++ Makefile.in
+@@ -169,7 +169,7 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = -O2 -Wall -g \
++CFLAGS += \
+ 	-DPATH_HONEYDINCLUDE="\"$(honeydincludedir)\"" \
+ 	-DPATH_HONEYDDATA="\"$(honeyddatadir)\"" \
+ 	-DPATH_HONEYDLIB="\"$(honeydlibdir)\"" \
+@@ -321,10 +321,10 @@ libhoneyddir = $(libdir)/honeyd
  libhoneyd_DATA = libhoneyd.so
  
  # Configuration files for Honeyd
@@ -9,17 +19,44 @@ $NetBSD: patch-aa,v 1.3 2005/04/20 14:34:45 wiz Exp $
 +honeyddatadir = $(datadir)/examples/honeyd
  honeydlibdir = $(libdir)/honeyd
  honeydincludedir = $(includedir)/honeyd
--honeyddata_DATA = README nmap.assoc xprobe2.conf nmap.prints config.sample 		config.ethernet pf.os
-+honeyddata_DATA = nmap.assoc xprobe2.conf nmap.prints config.sample config.ethernet pf.os
- 
+-honeyddata_DATA = README nmap.assoc xprobe2.conf nmap.prints config.sample \
++honeyddata_DATA = nmap.assoc xprobe2.conf nmap.prints config.sample \
+ 		config.ethernet pf.os
  
  honeydplugins = @PLUGINS@
-@@ -152,7 +152,7 @@
- honeydctl_INCLUDES = @EDITINC@
- honeydctl_CFLAGS = -O2 -Wall
+@@ -364,7 +364,7 @@ honeydstats_LDADD = @LIBOBJS@ @DNETLIB@ 
+ honeydstats_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
+ 	@EVENTINC@ @DNETINC@ @ZINC@ @DNSRESINC@
+ 
+-honeydstats_CFLAGS = -O0 -Wall
++honeydstats_CFLAGS =
+ 
+ #
+ # Honeyd control application
+@@ -372,7 +372,7 @@ honeydstats_CFLAGS = -O0 -Wall
+ honeydctl_SOURCES = honeydctl.c
+ honeydctl_LDADD = @LIBOBJS@ @EDITLIB@ @LIBCURSES@
+ honeydctl_CPPFLAGS = @EDITINC@
+-honeydctl_CFLAGS = -O2 -Wall
++honeydctl_CFLAGS =
+ INCLUDES = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
+ 	@PYTHONINC@ @EVENTINC@ @PCAPINC@ @DNETINC@ @ZINC@
+ 
+@@ -387,7 +387,7 @@ smtp_LDADD = @LIBOBJS@ @EVENTLIB@ @DNETL
+ smtp_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
+ 	@EVENTINC@ @DNETINC@ @DNSRESINC@ @PCREINC@
  
--CFLAGS = -O2 -Wall -g 	-DPATH_HONEYDINCLUDE="\"$(honeydincludedir)\"" 	-DPATH_HONEYDDATA="\"$(honeyddatadir)\"" 	-DPATH_HONEYDLIB="\"$(honeydlibdir)\"" 	-DHONEYD_PLUGINS_DECLARE="$(honeydpluginsdeclare)" 	-DHONEYD_PLUGINS="$(honeydplugins)" 	-DPATH_RRDTOOL="\"$(PATH_RRDTOOL)\""
-+CFLAGS += -DPATH_HONEYDINCLUDE="\"$(honeydincludedir)\"" 	-DPATH_HONEYDDATA="\"$(sysconfdir)\"" 	-DPATH_HONEYDLIB="\"$(honeydlibdir)\"" 	-DHONEYD_PLUGINS_DECLARE="$(honeydpluginsdeclare)" 	-DHONEYD_PLUGINS="$(honeydplugins)" 	-DPATH_RRDTOOL="\"$(PATH_RRDTOOL)\""
+-smtp_CFLAGS = -O2 -Wall
++smtp_CFLAGS =
+ proxy_SOURCES = subsystems/proxy.c subsystems/proxy.h subsystems/proxy_main.c \
+ 	subsystems/proxy_messages.h subsystems/smtp.c subsystems/smtp.h \
+ 	subsystems/smtp_messages.h atomicio.c \
+@@ -397,7 +397,7 @@ proxy_LDADD = @LIBOBJS@ @EVENTLIB@ @DNET
+ proxy_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
+ 	@EVENTINC@ @DNETINC@ @DNSRESINC@ @PCREINC@
  
+-proxy_CFLAGS = -O2 -Wall
++proxy_CFLAGS =
  
- INCLUDES = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat 	@PYTHONINC@ @EVENTINC@ @PCAPINC@ @DNETINC@ @ZINC@
+ ########################################################################
+ ########################################################################