From 93451b16ca5dbf60ee4970b3ab1bb71da825c60e Mon Sep 17 00:00:00 2001 From: pav Date: Mon, 18 Apr 2005 07:38:15 +0000 Subject: - Update to 1.0 PR: ports/79909 Submitted by: Vasil Dimov Approved by: Yann Berthier (maintainer) --- net/honeyd/files/patch-compat-sha1.h | 30 +++++++++++++ net/honeyd/files/patch-config.c | 11 +++++ net/honeyd/files/patch-configure | 17 -------- net/honeyd/files/patch-dhcpclient.c | 33 ++++++++++++++ net/honeyd/files/patch-honeyd.h | 20 +++++++++ net/honeyd/files/patch-honeyd_overload.c | 10 +++++ net/honeyd/files/patch-interface.c | 11 +++++ net/honeyd/files/patch-lex.c | 74 ++++++++++++++++++++++++++++++++ net/honeyd/files/patch-personality.c | 38 ++++++++++++++++ net/honeyd/files/patch-rrdtool.c | 20 +++++++++ 10 files changed, 247 insertions(+), 17 deletions(-) create mode 100644 net/honeyd/files/patch-compat-sha1.h create mode 100644 net/honeyd/files/patch-config.c delete mode 100644 net/honeyd/files/patch-configure create mode 100644 net/honeyd/files/patch-dhcpclient.c create mode 100644 net/honeyd/files/patch-honeyd.h create mode 100644 net/honeyd/files/patch-honeyd_overload.c create mode 100644 net/honeyd/files/patch-interface.c create mode 100644 net/honeyd/files/patch-lex.c create mode 100644 net/honeyd/files/patch-personality.c create mode 100644 net/honeyd/files/patch-rrdtool.c (limited to 'net/honeyd/files') diff --git a/net/honeyd/files/patch-compat-sha1.h b/net/honeyd/files/patch-compat-sha1.h new file mode 100644 index 000000000000..6dab57bf0bdd --- /dev/null +++ b/net/honeyd/files/patch-compat-sha1.h @@ -0,0 +1,30 @@ +--- compat/sha1.h.orig Thu Apr 14 16:07:26 2005 ++++ compat/sha1.h Thu Apr 14 12:52:54 2005 +@@ -18,21 +18,13 @@ + #include + + __BEGIN_DECLS +-void SHA1Transform(u_int32_t [5], const unsigned char [64]) +- __attribute__((__bounded__(__minbytes__,1,5))) +- __attribute__((__bounded__(__minbytes__,2,64))); ++void SHA1Transform(u_int32_t [5], const unsigned char [64]); + void SHA1Init(SHA1_CTX *); +-void SHA1Update(SHA1_CTX *, const unsigned char *, unsigned int) +- __attribute__((__bounded__(__string__,2,3))); +-void SHA1Final(unsigned char [20], SHA1_CTX *) +- __attribute__((__bounded__(__minbytes__,1,20))); +-char *SHA1End(SHA1_CTX *, char *) +- __attribute__((__bounded__(__minbytes__,2,41))); +-char *SHA1File(char *, char *) +- __attribute__((__bounded__(__minbytes__,2,41))); +-char *SHA1Data(const unsigned char *, size_t, char *) +- __attribute__((__bounded__(__string__,1,2))) +- __attribute__((__bounded__(__minbytes__,3,41))); ++void SHA1Update(SHA1_CTX *, const unsigned char *, unsigned int); ++void SHA1Final(unsigned char [20], SHA1_CTX *); ++char *SHA1End(SHA1_CTX *, char *); ++char *SHA1File(char *, char *); ++char *SHA1Data(const unsigned char *, size_t, char *); + __END_DECLS + + #define SHA1_DIGESTSIZE 20 diff --git a/net/honeyd/files/patch-config.c b/net/honeyd/files/patch-config.c new file mode 100644 index 000000000000..67e8535e8c1e --- /dev/null +++ b/net/honeyd/files/patch-config.c @@ -0,0 +1,11 @@ +--- config.c.orig Thu Apr 14 16:07:26 2005 ++++ config.c Thu Apr 14 14:55:34 2005 +@@ -838,7 +838,7 @@ + IP_PROTO_TCP, src.addr_ip, dst.addr_ip); + ip_checksum(pkt, iplen); + +- honeyd_recv_cb(&inter, &pkthdr, pkt); ++ honeyd_recv_cb((u_char *)&inter, &pkthdr, pkt); + } + gettimeofday(&tv_end, NULL); + timersub(&tv_end, &tv_start, &tv_end); diff --git a/net/honeyd/files/patch-configure b/net/honeyd/files/patch-configure deleted file mode 100644 index 72f0d2cfc58c..000000000000 --- a/net/honeyd/files/patch-configure +++ /dev/null @@ -1,17 +0,0 @@ ---- configure Wed Apr 17 17:43:14 2002 -+++ /home/dom/configure Sat May 4 15:05:43 2002 -@@ -2432,11 +2432,11 @@ - *) - echo "$as_me:2433: result: $withval" >&5 - echo "${ECHO_T}$withval" >&6 -- if test -f $withval/event.h -a -f $withval/libevent.a; then -+ if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then - owd=`pwd` - if cd $withval; then withval=`pwd`; cd $owd; fi -- EVENTINC="-I$withval" -- EVENTLIB="-L$withval -levent" -+ EVENTINC="-I$withval/include" -+ EVENTLIB="-L$withval/lib -levent" - else - { { echo "$as_me:2441: error: event.h or libevent.a not found in $withval" >&5 - echo "$as_me: error: event.h or libevent.a not found in $withval" >&2;} diff --git a/net/honeyd/files/patch-dhcpclient.c b/net/honeyd/files/patch-dhcpclient.c new file mode 100644 index 000000000000..95d38335a0cd --- /dev/null +++ b/net/honeyd/files/patch-dhcpclient.c @@ -0,0 +1,33 @@ +--- dhcpclient.c.orig Thu Apr 14 16:07:26 2005 ++++ dhcpclient.c Thu Apr 14 15:24:19 2005 +@@ -236,8 +236,8 @@ + { + struct dhcpclient_req *req = tmpl->dhcp_req; + struct dhcp_msg *msg = (struct dhcp_msg *)buf; +- size_t optlen = buflen - sizeof(*msg); +- uint8_t *p, *end, opt1, opt1len, *opt1p; ++ size_t optlen = buflen - sizeof(*msg), opt1len; ++ uint8_t *p, *end, opt1, *opt1p; + short replyreq = 0, ack = 0, done = 0; + struct netconf nc; + struct addr *which = NULL, ipmask; +@@ -472,7 +472,8 @@ + + memset(buf, 0, sizeof(buf)); + +- eth = (struct eth_hdr *)p = buf; ++ p = buf; ++ eth = (struct eth_hdr *)p; + eth_pack_hdr(eth, ETH_ADDR_BROADCAST, req->ea, ETH_TYPE_IP); + + restlen -= ETH_HDR_LEN; +@@ -524,7 +525,8 @@ + + memset(buf, 0, sizeof(buf)); + +- eth = (struct eth_hdr *)p = buf; ++ p = buf; ++ eth = (struct eth_hdr *)p; + eth_pack_hdr(eth, req->server_ea, req->ea, ETH_TYPE_IP); + + restlen -= ETH_HDR_LEN; diff --git a/net/honeyd/files/patch-honeyd.h b/net/honeyd/files/patch-honeyd.h new file mode 100644 index 000000000000..57eab22b6c11 --- /dev/null +++ b/net/honeyd/files/patch-honeyd.h @@ -0,0 +1,20 @@ +--- honeyd.h.orig Thu Apr 14 16:07:26 2005 ++++ honeyd.h Thu Apr 14 14:30:27 2005 +@@ -32,6 +32,8 @@ + #ifndef _HONEYD_H_ + #define _HONEYD_H_ + ++#include ++ + #define PIDFILE "/var/run/honeyd.pid" + + #define TCP_DEFAULT_SIZE 512 +@@ -300,6 +302,8 @@ + char *honeyd_contoa(const struct tuple *); + + void honeyd_input(const struct interface *, struct ip_hdr *, u_short); ++ ++void honeyd_recv_cb(u_char *, const struct pcap_pkthdr *, const u_char *); + + /* Command prototypes for services */ + void cmd_droppriv(uid_t, gid_t); diff --git a/net/honeyd/files/patch-honeyd_overload.c b/net/honeyd/files/patch-honeyd_overload.c new file mode 100644 index 000000000000..b77df5b2d269 --- /dev/null +++ b/net/honeyd/files/patch-honeyd_overload.c @@ -0,0 +1,10 @@ +--- honeyd_overload.c.orig Thu Apr 14 16:07:26 2005 ++++ honeyd_overload.c Thu Apr 14 15:32:19 2005 +@@ -127,7 +127,6 @@ + DECLARE(setsockopt, int, (int, int, int, const void *, socklen_t)); + DECLARE(getsockname, int, (int, struct sockaddr *, socklen_t *)); + +-DECLARE(recv, ssize_t, (int, void *, size_t, int)); + DECLARE(recvfrom, ssize_t, (int, void *, size_t, int, struct sockaddr *, + socklen_t *)); + diff --git a/net/honeyd/files/patch-interface.c b/net/honeyd/files/patch-interface.c new file mode 100644 index 000000000000..913a6764da01 --- /dev/null +++ b/net/honeyd/files/patch-interface.c @@ -0,0 +1,11 @@ +--- interface.c.orig Thu Apr 14 16:07:26 2005 ++++ interface.c Thu Apr 14 14:12:35 2005 +@@ -64,8 +64,6 @@ + /* Prototypes */ + int pcap_dloff(pcap_t *); + +-void honeyd_recv_cb(u_char *, const struct pcap_pkthdr *, const u_char *); +- + static char *interface_expandips(int, char **, int); + static void interface_recv(int, short, void *); + static void interface_poll_recv(int, short, void *); diff --git a/net/honeyd/files/patch-lex.c b/net/honeyd/files/patch-lex.c new file mode 100644 index 000000000000..90dd070ddb54 --- /dev/null +++ b/net/honeyd/files/patch-lex.c @@ -0,0 +1,74 @@ +--- lex.c.orig Thu Apr 14 16:07:26 2005 ++++ lex.c Thu Apr 14 14:48:11 2005 +@@ -153,8 +153,6 @@ + } \ + while ( 0 ) + +-#define unput(c) yyunput( c, yytext_ptr ) +- + /* The following is because we cannot portably get our hands on size_t + * (without autoconf's help, which isn't available because we want + * flex-generated scanners to compile on their own). +@@ -657,10 +655,6 @@ + #endif + #endif + +-#ifndef YY_NO_UNPUT +-static void yyunput YY_PROTO(( int c, char *buf_ptr )); +-#endif +- + #ifndef yytext_ptr + static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); + #endif +@@ -1662,51 +1656,6 @@ + + return yy_is_jam ? 0 : yy_current_state; + } +- +- +-#ifndef YY_NO_UNPUT +-#ifdef YY_USE_PROTOS +-static void yyunput( int c, register char *yy_bp ) +-#else +-static void yyunput( c, yy_bp ) +-int c; +-register char *yy_bp; +-#endif +- { +- register char *yy_cp = yy_c_buf_p; +- +- /* undo effects of setting up yytext */ +- *yy_cp = yy_hold_char; +- +- if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) +- { /* need to shift things up to make room */ +- /* +2 for EOB chars. */ +- register int number_to_move = yy_n_chars + 2; +- register char *dest = &yy_current_buffer->yy_ch_buf[ +- yy_current_buffer->yy_buf_size + 2]; +- register char *source = +- &yy_current_buffer->yy_ch_buf[number_to_move]; +- +- while ( source > yy_current_buffer->yy_ch_buf ) +- *--dest = *--source; +- +- yy_cp += (int) (dest - source); +- yy_bp += (int) (dest - source); +- yy_current_buffer->yy_n_chars = +- yy_n_chars = yy_current_buffer->yy_buf_size; +- +- if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) +- YY_FATAL_ERROR( "flex scanner push-back overflow" ); +- } +- +- *--yy_cp = (char) c; +- +- +- yytext_ptr = yy_bp; +- yy_hold_char = *yy_cp; +- yy_c_buf_p = yy_cp; +- } +-#endif /* ifndef YY_NO_UNPUT */ + + + #ifdef __cplusplus diff --git a/net/honeyd/files/patch-personality.c b/net/honeyd/files/patch-personality.c new file mode 100644 index 000000000000..31ecd385a3f9 --- /dev/null +++ b/net/honeyd/files/patch-personality.c @@ -0,0 +1,38 @@ +--- personality.c.orig Thu Apr 14 16:07:26 2005 ++++ personality.c Thu Apr 14 12:57:11 2005 +@@ -64,6 +64,8 @@ + #include "xprobe_assoc.h" + #include "template.h" + ++//#define DEBUG_XPROBE_STRUCT ++ + /* 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; + } diff --git a/net/honeyd/files/patch-rrdtool.c b/net/honeyd/files/patch-rrdtool.c new file mode 100644 index 000000000000..8e0f246c2021 --- /dev/null +++ b/net/honeyd/files/patch-rrdtool.c @@ -0,0 +1,20 @@ +--- rrdtool.c.orig Thu Apr 14 16:07:26 2005 ++++ rrdtool.c Thu Apr 14 15:31:15 2005 +@@ -444,7 +444,7 @@ + int + rrdtool_fork(struct rrdtool_drv *drv) + { +- char *argv[3]; ++ const char *argv[3]; + int pair[2]; + sigset_t sigmask; + +@@ -485,7 +485,7 @@ + + close(pair[1]); + +- if (execvp(drv->bin_path, argv) == -1) ++ if (execvp(drv->bin_path, (char *const *)argv) == -1) + err(1, "%s: execv(%s)", __func__, drv->bin_path); + + /* NOT REACHED */ -- cgit