From bb56798f40fd0e1db1a15d2bb3946c8beb315d8c Mon Sep 17 00:00:00 2001 From: sturm Date: Fri, 5 Dec 2003 22:05:34 +0000 Subject: [PATCH] update to honeyd 0.7a based on a patch from Craig Barraclough --- net/honeyd/Makefile | 19 ++++++++++-- net/honeyd/distinfo | 6 ++-- net/honeyd/patches/patch-Makefile_in | 10 +++---- net/honeyd/patches/patch-honeyd_overload_c | 35 +++++++++++++++++++--- net/honeyd/pkg/PLIST | 16 +++++++++- 5 files changed, 71 insertions(+), 15 deletions(-) diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile index 1dda19efa52..c8b01c96d32 100644 --- a/net/honeyd/Makefile +++ b/net/honeyd/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.3 2003/09/25 06:25:13 jolan Exp $ +# $OpenBSD: Makefile,v 1.4 2003/12/05 22:05:34 sturm Exp $ COMMENT= "utility to create virtual hosts on a network" -DISTNAME= honeyd-0.6a +DISTNAME= honeyd-0.7a CATEGORIES= net MASTER_SITES= ${HOMEPAGE} @@ -18,5 +18,20 @@ USE_LIBTOOL= Yes BUILD_DEPENDS= ${LOCALBASE}/lib/libdnet.a::net/libdnet CONFIGURE_STYLE=gnu +CONFIGURE_ARGS+=--without-python + +SCRIPTS= proxy.pl router-telnet.pl smtp.pl test.sh web.sh +SCRIPTS-snmp= README buildSNMPConfig.pl default.snmp fake-snmp.pl \ + linux-2.4.snmp.tpl windows2000.snmp.tpl + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/honeyd/scripts/snmp +.for f in ${SCRIPTS} + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/${f} ${PREFIX}/share/honeyd/scripts +.endfor +.for f in ${SCRIPTS-snmp} + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/snmp/${f} \ + ${PREFIX}/share/honeyd/scripts/snmp +.endfor .include diff --git a/net/honeyd/distinfo b/net/honeyd/distinfo index 437174a2002..f499ada4248 100644 --- a/net/honeyd/distinfo +++ b/net/honeyd/distinfo @@ -1,3 +1,3 @@ -MD5 (honeyd-0.6a.tar.gz) = d8743bde540db637a7cd7a19214a8265 -RMD160 (honeyd-0.6a.tar.gz) = 1d098292e5656fb5b27e8d7937b35725219390f3 -SHA1 (honeyd-0.6a.tar.gz) = c5a6ea232c8e561770b5655ad7e120bb41c9439e +MD5 (honeyd-0.7a.tar.gz) = 04ae109952d274aba4c0ab398e213ef2 +RMD160 (honeyd-0.7a.tar.gz) = f57a14b4d9d923d75c731c91f986b73139cdc981 +SHA1 (honeyd-0.7a.tar.gz) = 2fb31e04a46a34a599ea57c0fed7c57b24fae8aa diff --git a/net/honeyd/patches/patch-Makefile_in b/net/honeyd/patches/patch-Makefile_in index 17666aca7a2..8099e0a6043 100644 --- a/net/honeyd/patches/patch-Makefile_in +++ b/net/honeyd/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2003/06/27 19:43:36 jolan Exp $ ---- Makefile.in.orig Mon Jun 23 19:24:35 2003 -+++ Makefile.in Tue Jun 24 04:58:58 2003 -@@ -135,7 +135,7 @@ honeyd_LDADD = @LIBOBJS@ @EVENTLIB@ @PCA +$OpenBSD: patch-Makefile_in,v 1.2 2003/12/05 22:05:34 sturm Exp $ +--- Makefile.in.orig 2003-11-27 04:47:00.000000000 +0100 ++++ Makefile.in 2003-12-05 22:28:34.000000000 +0100 +@@ -136,7 +136,7 @@ honeyd_LDADD = @LIBOBJS@ @PYTHONLIB@ @EV # Allow plugins to use honeyd's functions: honeyd_LDFLAGS = -export-dynamic @@ -9,4 +9,4 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2003/06/27 19:43:36 jolan Exp $ +CFLAGS += -Wall -DPATH_HONEYDINCLUDE="\"$(honeydincludedir)\"" -DPATH_HONEYDDATA="\"$(honeyddatadir)\"" -DPATH_HONEYDLIB="\"$(honeydlibdir)\"" -DHONEYD_PLUGINS_DECLARE="$(honeydpluginsdeclare)" -DHONEYD_PLUGINS="$(honeydplugins)" - INCLUDES = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat @EVENTINC@ @PCAPINC@ @DNETINC@ + INCLUDES = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat @PYTHONINC@ @EVENTINC@ @PCAPINC@ @DNETINC@ diff --git a/net/honeyd/patches/patch-honeyd_overload_c b/net/honeyd/patches/patch-honeyd_overload_c index d4cc563f86e..25c5e1f2948 100644 --- a/net/honeyd/patches/patch-honeyd_overload_c +++ b/net/honeyd/patches/patch-honeyd_overload_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-honeyd_overload_c,v 1.1.1.1 2003/06/27 19:43:36 jolan Exp $ ---- honeyd_overload.c.orig Sun Jun 22 14:00:47 2003 -+++ honeyd_overload.c Tue Jun 24 05:41:16 2003 +$OpenBSD: patch-honeyd_overload_c,v 1.2 2003/12/05 22:05:34 sturm Exp $ +--- honeyd_overload.c.orig 2003-06-26 00:04:01.000000000 +0200 ++++ honeyd_overload.c 2003-12-05 22:51:39.000000000 +0100 @@ -595,7 +595,7 @@ poll(struct pollfd *fds, int nfds, int t ssize_t recv(int sock, void *buf, size_t len, int flags) @@ -10,7 +10,7 @@ $OpenBSD: patch-honeyd_overload_c,v 1.1.1.1 2003/06/27 19:43:36 jolan Exp $ INIT; -@@ -611,7 +611,7 @@ ssize_t +@@ -611,14 +611,14 @@ ssize_t recvfrom(int sock, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen) { @@ -19,6 +19,15 @@ $OpenBSD: patch-honeyd_overload_c,v 1.1.1.1 2003/06/27 19:43:36 jolan Exp $ struct fd *nfd; socklen_t flen = fromlen != NULL ? *fromlen : 0; + INIT; + +- DPRINTF((stderr, "%s: called on %d, %p,%d\n", +- __func__, sock, from, len)); ++ DPRINTF((stderr, "%s: called on %d, %p,%ld\n", ++ __func__, sock, from, (long)len)); + + ret = (*libc_recvfrom)(sock, buf, len, flags, from, fromlen); + @@ -640,7 +640,7 @@ sendto(int sock, const void *buf, size_t const struct sockaddr *to, socklen_t tolen) { @@ -28,3 +37,21 @@ $OpenBSD: patch-honeyd_overload_c,v 1.1.1.1 2003/06/27 19:43:36 jolan Exp $ INIT; +@@ -780,7 +780,7 @@ accept(int sock, struct sockaddr *addr, + { + struct fd *nfd; + struct sockaddr_storage sa; +- socklen_t salen; ++ size_t salen; + int fd; + + INIT; +@@ -800,7 +800,7 @@ accept(int sock, struct sockaddr *addr, + } + + /* XXX - something good happened! */ +- DPRINTF((stderr, "%s: got %d (salen %d)\n", __func__, fd, salen)); ++ DPRINTF((stderr, "%s: got %d (salen %ld)\n", __func__, fd, (long)salen)); + + /* Store for later */ + nfd->rsalen = salen; diff --git a/net/honeyd/pkg/PLIST b/net/honeyd/pkg/PLIST index 99463a837c3..0a7ae1fdb8c 100644 --- a/net/honeyd/pkg/PLIST +++ b/net/honeyd/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2003/06/27 19:43:36 jolan Exp $ +@comment $OpenBSD: PLIST,v 1.2 2003/12/05 22:05:34 sturm Exp $ bin/honeyd include/honeyd/debug.h include/honeyd/hooks.h @@ -10,7 +10,21 @@ share/honeyd/README share/honeyd/config.sample share/honeyd/nmap.assoc share/honeyd/nmap.prints +share/honeyd/pf.os +share/honeyd/scripts/proxy.pl +share/honeyd/scripts/router-telnet.pl +share/honeyd/scripts/smtp.pl +share/honeyd/scripts/snmp/README +share/honeyd/scripts/snmp/buildSNMPConfig.pl +share/honeyd/scripts/snmp/default.snmp +share/honeyd/scripts/snmp/fake-snmp.pl +share/honeyd/scripts/snmp/linux-2.4.snmp.tpl +share/honeyd/scripts/snmp/windows2000.snmp.tpl +share/honeyd/scripts/test.sh +share/honeyd/scripts/web.sh share/honeyd/xprobe2.conf +@dirrm share/honeyd/scripts/snmp +@dirrm share/honeyd/scripts @dirrm share/honeyd @dirrm lib/honeyd @dirrm include/honeyd