Index: head/net/honeyd/Makefile =================================================================== --- head/net/honeyd/Makefile (revision 549599) +++ head/net/honeyd/Makefile (revision 549600) @@ -1,67 +1,67 @@ # Created by: Dominic Marks # $FreeBSD$ PORTNAME= honeyd PORTVERSION= 1.5c -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net MASTER_SITES= http://www.honeyd.org/uploads/ \ http://www.citi.umich.edu/u/provos/honeyd/ MAINTAINER= skreuzer@FreeBSD.org COMMENT= Simulate virtual network hosts (honeypots) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:devel/libevent \ libdnet.so:net/libdnet \ libpcre.so:devel/pcre USES= libedit libtool shebangfix SHEBANG_FILES= scripts/*.pl scripts/snmp/*.pl USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libdnet=${LOCALBASE} \ --with-libevent=${LOCALBASE} EXTRA_PATCHES= ${FILESDIR}/honeyd-1.5c-libevent2.patch:-p1 .if defined(WITH_PYTHON) USES+= python CONFIGURE_ARGS+= --with-python .else CONFIGURE_ARGS+= --without-python .endif .include .if !defined(WITH_PYTHON) pre-everything:: @${ECHO_MSG} "===>" @${ECHO_MSG} "===> You can enable Python support by defining the following variable:" @${ECHO_MSG} "===> WITH_PYTHON=yes Enable Python support" @${ECHO_MSG} "===>" .endif post-configure: @${REINPLACE_CMD} -e 's|LIBS = |LIBS = -lpthread|' \ ${WRKSRC}/Makefile # Have to make this directory, the Makefile is stupid and tries to # install stuff here without making it. pre-install: @${MKDIR} ${STAGEDIR}${DATADIR}/webserver post-install: @${MKDIR} ${STAGEDIR}${DATADIR}/scripts/snmp @cd ${WRKSRC}/scripts && \ ${INSTALL_DATA} README* INSTALL* kuang2.conf \ ${STAGEDIR}${DATADIR}/scripts && \ ${INSTALL_SCRIPT} *.pl *.sh ${STAGEDIR}${DATADIR}/scripts @cd ${WRKSRC}/scripts/snmp && \ ${INSTALL_DATA} README default.snmp *.tpl \ ${STAGEDIR}${DATADIR}/scripts/snmp && \ ${INSTALL_SCRIPT} *.pl ${STAGEDIR}${DATADIR}/scripts/snmp .include Index: head/net/honeyd/files/patch-personality.c =================================================================== --- head/net/honeyd/files/patch-personality.c (revision 549599) +++ head/net/honeyd/files/patch-personality.c (revision 549600) @@ -1,38 +1,41 @@ --- personality.c.orig Thu Apr 14 16:07:26 2005 +++ personality.c Thu Apr 14 12:57:11 2005 -@@ -64,6 +64,8 @@ +@@ -64,6 +64,11 @@ #include "xprobe_assoc.h" #include "template.h" +//#define DEBUG_XPROBE_STRUCT ++ ++personalities_t personalities; ++xp_fprints_t xp_fprints; + /* ET - Moved SPLAY_HEAD to personality.h so xprobe_assoc.c could use it. */ int npersons; @@ -1633,6 +1635,7 @@ /* !!!DEBUG FUNCTION!!! */ +#ifdef DEBUG_XPROBE_STRUCT static void print_xprobe_struct(struct xp_fingerprint *pers) { @@ -1693,6 +1696,7 @@ printf ("icmp_unreach_echoed_3bit_flags: %d\n", pers->flags.icmp_unreach_echoed_3bit_flags); } +#endif /* DEBUG_XPROBE_STRUCT */ void print_perstree(void) @@ -1727,7 +1731,9 @@ /* Get a single fingerprint */ new_print = get_fprint (fp); if (new_print != NULL) { - /* print_xprobe_struct (new_print); */ +#ifdef DEBUG_XPROBE_STRUCT + print_xprobe_struct (new_print); +#endif /* DEBUG_XPROBE_STRUCT */ SPLAY_INSERT(xp_fprint_tree, &xp_fprints, new_print); new_print = NULL; } Index: head/net/honeyd/files/patch-personality.h =================================================================== --- head/net/honeyd/files/patch-personality.h (nonexistent) +++ head/net/honeyd/files/patch-personality.h (revision 549600) @@ -0,0 +1,22 @@ +--- personality.h.orig 2007-05-28 08:12:52.000000000 +0200 ++++ personality.h 2020-09-22 15:57:29.215618000 +0200 +@@ -179,7 +179,8 @@ + void print_perstree(void); + + /* Splay stuff here so other modules can use it */ +-SPLAY_HEAD(perstree, personality) personalities; ++typedef SPLAY_HEAD(perstree, personality) personalities_t; ++extern personalities_t personalities; + static int + perscompare(struct personality *a, struct personality *b) + { +@@ -187,7 +187,8 @@ + } + SPLAY_PROTOTYPE(perstree, personality, node, perscompare); + +-SPLAY_HEAD(xp_fprint_tree, xp_fingerprint) xp_fprints; ++typedef SPLAY_HEAD(xp_fprint_tree, xp_fingerprint) xp_fprints_t; ++extern xp_fprints_t xp_fprints; + static int + xp_fprint_compare(struct xp_fingerprint *a, struct xp_fingerprint *b) + { Property changes on: head/net/honeyd/files/patch-personality.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/honeyd/files/patch-stats.h =================================================================== --- head/net/honeyd/files/patch-stats.h (nonexistent) +++ head/net/honeyd/files/patch-stats.h (revision 549600) @@ -0,0 +1,31 @@ +--- stats.h.orig 2007-05-28 06:12:52 UTC ++++ stats.h +@@ -89,10 +89,12 @@ struct stats { + reserved:4; + }; + +-enum { ++typedef enum { + M_COUNTER, M_TV_START, M_TV_END, M_RECORD, M_MAX +-} measurement_tags; ++} measurement_tags_t; + ++extern measurement_tags_t measurement_tags; ++ + struct measurement { + uint32_t counter; + struct timeval tv_start; +@@ -103,9 +105,11 @@ struct measurement { + #define SHA1_DIGESTSIZE 20 + #endif + +-enum { ++typedef enum { + SIG_NAME, SIG_DIGEST, SIG_DATA, SIG_COMPRESSED_DATA, SIG_MAX +-} signature_tags; ++} signature_tags_t; ++ ++extern signature_tags_t signature_tags; + + struct signature { + char *name; Property changes on: head/net/honeyd/files/patch-stats.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/honeyd/files/patch-tagging.h =================================================================== --- head/net/honeyd/files/patch-tagging.h (nonexistent) +++ head/net/honeyd/files/patch-tagging.h (revision 549600) @@ -0,0 +1,33 @@ +--- tagging.h.orig 2020-09-22 13:41:40 UTC ++++ tagging.h +@@ -44,12 +44,14 @@ struct hash { + u_char digest[SHINGLE_SIZE]; + }; + +-enum { ++typedef enum { + REC_TV_START, REC_TV_END, REC_SRC, REC_DST, REC_SRC_PORT, REC_DST_PORT, + REC_PROTO, REC_STATE, REC_OS_FP, REC_HASH, REC_BYTES, REC_FLAGS, + REC_MAX_TAGS +-} record_tags; ++} record_tags_t; + ++extern record_tags_t record_tags; ++ + #define RECORD_STATE_NEW 0x01 + + struct record { +@@ -69,9 +71,11 @@ struct record { + TAILQ_HEAD(hashq, hash) hashes; /* optional */ + }; + +-enum { ++typedef enum { + ADDR_TYPE, ADDR_BITS, ADDR_ADDR, ADDR_MAX_TAGS +-} address_tags; ++} address_tags_t; ++ ++extern address_tags_t address_tags; + + void record_marshal(struct evbuffer *, struct record *); + Property changes on: head/net/honeyd/files/patch-tagging.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property