cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update honeyd to 1.5c

Browse Source 
- fix run under macppc

help and ok aanriot@
This commit is contained in:
rui 2007-07-25 22:27:01 +00:00
parent 9057741b45
commit b606f6e079
9 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/honeyd/Makefile
View File

@ -1,15 +1,17 @@
# $OpenBSD: Makefile,v 1.17 2007/04/03 15:19:52 aanriot Exp $
# $OpenBSD: Makefile,v 1.18 2007/07/25 22:27:01 rui Exp $
SHARED_ONLY= Yes
COMMENT= "utility to create virtual hosts on a network"
DISTNAME= honeyd-1.5b
COMMENT= utility to create virtual hosts on a network
DISTNAME= honeyd-1.5c
CATEGORIES= net
MASTER_SITES= http://www.citi.umich.edu/u/provos/honeyd/ \
http://niels.xtdnet.nl/honeyd/
HOMEPAGE= http://www.honeyd.org/
MAINTAINER= Rui Reis <rui@rui.cx>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -17,13 +19,16 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c edit event m ncurses pcap pthread util z
.if ${MACHINE_ARCH} == "sparc64"
PATCH_LIST= patch-* align-*
.endif
USE_LIBTOOL= Yes
PYTHON_VER= 2.4
LIB_DEPENDS= dnet.>=1::net/libdnet \
python${PYTHON_VER}:python-${PYTHON_VER}.*:lang/python/${PYTHON_VER} \
pcre.>=1::devel/pcre \
dnsres.>=0::net/libdnsres
pcre.>=1::devel/pcre
RUN_DEPENDS= ::net/rrdtool
CONFIGURE_STYLE=gnu

10
net/honeyd/distinfo
View File

@ -1,5 +1,5 @@
MD5 (honeyd-1.5b.tar.gz) = /lcRM8m2XF4dyldRUSKrYg==
RMD160 (honeyd-1.5b.tar.gz) = QOvn06KRW1FFxaLu8EudHeGPuwk=
SHA1 (honeyd-1.5b.tar.gz) = ps7wHdsLZJRCrGDioIsiaxY04/k=
SHA256 (honeyd-1.5b.tar.gz) = LwDr2sTEexV7B24lW9dXpu97fwQ8xJlJPRwPnkWFJ6U=
SIZE (honeyd-1.5b.tar.gz) = 881787
MD5 (honeyd-1.5c.tar.gz) = mIe0QzPjgKIgX2T6JFy3Jw==
RMD160 (honeyd-1.5c.tar.gz) = IxbE+2t0sOzkQp05LEePzXUWtqc=
SHA1 (honeyd-1.5c.tar.gz) = NCzFPo0jyE7Lkce2bG6T5+0qmSo=
SHA256 (honeyd-1.5c.tar.gz) = MYbVQghbe0tn0WjuDrhywsRt0+mIRqd1yfGW6UyAkW0=
SIZE (honeyd-1.5c.tar.gz) = 915465

6
net/honeyd/patches/patch-pool_c → net/honeyd/patches/align-pool_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-pool_c,v 1.2 2007/04/03 15:19:52 aanriot Exp $
--- pool.c.orig Sat Aug 19 09:10:40 2006
+++ pool.c Mon Apr 2 00:12:08 2007
$OpenBSD: align-pool_c,v 1.1 2007/07/25 22:27:01 rui Exp $
--- pool.c.orig Mon May 28 07:12:52 2007
+++ pool.c Wed Jul 18 11:55:09 2007
@@ -92,7 +92,7 @@ pool_alloc_size(struct pool *pool, size_t size)
/* We want to use the last one as return */
if (i < max - 1) {

24
net/honeyd/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2007/04/03 15:19:52 aanriot Exp $
--- Makefile.in.orig Sat Aug 19 09:15:55 2006
+++ Makefile.in Mon Apr 2 11:31:04 2007
@@ -162,7 +162,7 @@ AUTOMAKE = @AUTOMAKE@
$OpenBSD: patch-Makefile_in,v 1.5 2007/07/25 22:27:01 rui Exp $
--- Makefile.in.orig Mon May 28 07:15:43 2007
+++ Makefile.in Wed Jul 18 11:55:08 2007
@@ -182,7 +182,7 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@ -10,16 +10,16 @@ $OpenBSD: patch-Makefile_in,v 1.4 2007/04/03 15:19:52 aanriot Exp $
-DPATH_HONEYDINCLUDE="\"$(honeydincludedir)\"" \
-DPATH_HONEYDDATA="\"$(honeyddatadir)\"" \
-DPATH_HONEYDLIB="\"$(honeydlibdir)\"" \
@@ -358,7 +358,7 @@ honeydstats_LDADD = @LIBOBJS@ @DNETLIB@ @EVENTLIB@ @ZL
@@ -387,7 +387,7 @@ honeydstats_LDADD = @LIBOBJS@ @DNETLIB@ @EVENTLIB@ @ZL
honeydstats_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
@EVENTINC@ @DNETINC@ @ZINC@ @DNSRESINC@
@EVENTINC@ @DNETINC@ @ZINC@
-honeydstats_CFLAGS = -O0 -Wall
+honeydstats_CFLAGS =
#
# Honeyd control application
@@ -366,7 +366,7 @@ honeydstats_CFLAGS = -O0 -Wall
# Honeyd stats sniffer
@@ -408,7 +408,7 @@ hsniff_CFLAGS = -O2 -Wall -DPATH_HONEYDDATA="\"$(honey
honeydctl_SOURCES = honeydctl.c
honeydctl_LDADD = @LIBOBJS@ @EDITLIB@ @LIBCURSES@
honeydctl_CPPFLAGS = @EDITINC@
@ -28,18 +28,18 @@ $OpenBSD: patch-Makefile_in,v 1.4 2007/04/03 15:19:52 aanriot Exp $
INCLUDES = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
@PYTHONINC@ @EVENTINC@ @PCAPINC@ @DNETINC@ @ZINC@
@@ -381,7 +381,7 @@ smtp_LDADD = @LIBOBJS@ @EVENTLIB@ @DNETLIB@ @PCAPLIB@
@@ -423,7 +423,7 @@ smtp_LDADD = @LIBOBJS@ @EVENTLIB@ @DNETLIB@ @PCAPLIB@
smtp_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
@EVENTINC@ @DNETINC@ @DNSRESINC@ @PCREINC@
@EVENTINC@ @DNETINC@ @PCREINC@
-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 \
@@ -391,7 +391,7 @@ proxy_LDADD = @LIBOBJS@ @EVENTLIB@ @DNETLIB@ @PCAPLIB@
@@ -433,7 +433,7 @@ proxy_LDADD = @LIBOBJS@ @EVENTLIB@ @DNETLIB@ @PCAPLIB@
proxy_CPPFLAGS = -I$(top_srcdir)/@DNETCOMPAT@ -I$(top_srcdir)/compat \
@EVENTINC@ @DNETINC@ @DNSRESINC@ @PCREINC@
@EVENTINC@ @DNETINC@ @PCREINC@
-proxy_CFLAGS = -O2 -Wall
+proxy_CFLAGS =

12
net/honeyd/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2007/04/03 15:19:52 aanriot Exp $
--- configure.orig Sat Feb 24 20:59:28 2007
+++ configure Sat Feb 24 20:59:53 2007
@@ -21930,7 +21930,7 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_PYTHON 1
_ACEOF
- PYEXTEND="pyextend.o pydataprocessing.o pydatahoneyd.o"
+ PYEXTEND="pyextend.o"
# Figure out if we have our modules
echo "$as_me:$LINENO: checking for Python dnet module" >&5

6
net/honeyd/patches/patch-honeyd_8
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-honeyd_8,v 1.2 2007/04/03 15:19:52 aanriot Exp $
--- honeyd.8.orig Mon Feb 27 01:27:54 2006
+++ honeyd.8 Wed Mar 28 22:46:46 2007
$OpenBSD: patch-honeyd_8,v 1.3 2007/07/25 22:27:01 rui Exp $
--- honeyd.8.orig Mon May 28 07:05:05 2007
+++ honeyd.8 Wed Jul 18 11:55:08 2007
@@ -574,7 +574,7 @@ add template tcp port 80 "sh scripts/web.sh"
add template tcp port 22 "sh scripts/test.sh $ipsrc $dport"
add template udp port 53 proxy yournameserver:53

16
net/honeyd/patches/patch-honeyd_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-honeyd_c,v 1.3 2007/04/03 15:19:52 aanriot Exp $
--- honeyd.c.orig Sat Aug 19 09:14:36 2006
+++ honeyd.c Mon Apr 2 00:12:08 2007
@@ -161,8 +161,8 @@ int honeyd_show_data_dir;
$OpenBSD: patch-honeyd_c,v 1.4 2007/07/25 22:27:01 rui Exp $
--- honeyd.c.orig Mon May 28 07:12:52 2007
+++ honeyd.c Wed Jul 18 11:55:08 2007
@@ -163,8 +163,8 @@ int honeyd_show_data_dir;
int honeyd_show_version;
int honeyd_show_usage;
int honeyd_debug;
@ -12,7 +12,7 @@ $OpenBSD: patch-honeyd_c,v 1.3 2007/04/03 15:19:52 aanriot Exp $
int honeyd_needsroot; /* Need different IDs */
int honeyd_disable_webserver = 0;
int honeyd_disable_update = 0;
@@ -432,12 +432,6 @@ honeyd_init(void)
@@ -434,12 +434,6 @@ honeyd_init(void)
/* Record our start time */
gettimeofday(&honeyd_uptime, NULL);
@ -25,7 +25,7 @@ $OpenBSD: patch-honeyd_c,v 1.3 2007/04/03 15:19:52 aanriot Exp $
/* Initalize ongoing connection state */
SPLAY_INIT(&tcpcons);
TAILQ_INIT(&tcplru);
@@ -3250,6 +3244,13 @@ main(int argc, char *argv[])
@@ -3256,6 +3250,13 @@ main(int argc, char *argv[])
/* We need reproduceable random numbers for regression testing */
if (setrand)
rand_set(honeyd_rand, &setrand, sizeof(setrand));
@ -37,5 +37,5 @@ $OpenBSD: patch-honeyd_c,v 1.3 2007/04/03 15:19:52 aanriot Exp $
+ if (setenv("EVENT_NOKQUEUE", "Yes", 1))
+ printf("EVENT_NOKQUEUE set");
/* Initalize libevent */
event_init();
/* disables event methods that don't work for bpf */

6
net/honeyd/patches/patch-nmap_prints
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-nmap_prints,v 1.1 2007/04/03 15:19:52 aanriot Exp $
--- nmap.prints.orig Sun Sep 25 00:49:05 2005
+++ nmap.prints Wed Mar 28 22:47:29 2007
$OpenBSD: patch-nmap_prints,v 1.2 2007/07/25 22:27:01 rui Exp $
--- nmap.prints.orig Mon May 28 07:05:05 2007
+++ nmap.prints Wed Jul 18 11:55:09 2007
@@ -662,18 +662,6 @@ T6(DF=N%W=0%ACK=O%Flags=R%Ops=)
T7(DF=N%W=0%ACK=S%Flags=AR%Ops=)
PU(DF=N%TOS=0%IPLEN=38%RIPTL=15C%RID=E%RIPCK=0%UCK=0%ULEN=134%DAT=E)

3
net/honeyd/pkg/PLIST
View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST,v 1.7 2007/04/03 15:19:52 aanriot Exp $
@comment $OpenBSD: PLIST,v 1.8 2007/07/25 22:27:01 rui Exp $
@newgroup _honeyd:!546
@newuser _honeyd:!546:!_honeyd:daemon:honeyd user:/nonexistent:/sbin/nologin
bin/honeyd
bin/honeydctl
bin/honeydstats
bin/hsniff
include/honeyd/
include/honeyd/debug.h
include/honeyd/hooks.h