FreeBSD Bugzilla – Attachment 64876 Details for
Bug 96318
[UPDATE]: net/honeyd
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 10.29 KB, created by
Wesley Shields
on 2006-04-25 16:00:33 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Wesley Shields
Created:
2006-04-25 16:00:33 UTC
Size:
10.29 KB
patch
obsolete
>diff -ruN net/honeyd.orig/Makefile net/honeyd/Makefile >--- net/honeyd.orig/Makefile Sun Jan 29 18:27:23 2006 >+++ net/honeyd/Makefile Tue Apr 25 08:20:32 2006 >@@ -6,8 +6,7 @@ > # > > PORTNAME= honeyd >-PORTVERSION= 1.0 >-PORTREVISION= 1 >+PORTVERSION= 1.5a > CATEGORIES= net > MASTER_SITES= http://www.citi.umich.edu/u/provos/honeyd/ \ > http://niels.xtdnet.nl/honeyd/ >@@ -16,16 +15,17 @@ > COMMENT= Simulate virtual network hosts (honeypots) > > BUILD_DEPENDS= ${LOCALBASE}/lib/libdnet.a:${PORTSDIR}/net/libdnet \ >- ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent >+ ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent \ >+ ${LOCALBASE}/lib/libdnsres.a:${PORTSDIR}/devel/libdnsres \ >+ ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre > >-#OPTIONS= PYTHON "Enable Python support" off > USE_REINPLACE= yes > INSTALLS_SHLIB= yes > GNU_CONFIGURE= yes > CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} > CONFIGURE_ARGS= --with-libdnet=${LOCALBASE} \ > --with-libevent=${LOCALBASE} \ >- --with-pcap >+ --with-libdnsres=${LOCALBASE} > > .if defined(WITH_PYTHON) > USE_PYTHON= yes >@@ -38,6 +38,7 @@ > MAN8= honeyd.8 > > .include <bsd.port.pre.mk> >+ > .if ${OSVERSION} < 500000 > LIB_DEPENDS+= edit.6:${PORTSDIR}/devel/libedit > .endif >@@ -53,6 +54,11 @@ > post-configure: > @${REINPLACE_CMD} -e 's|LIBS = |LIBS = ${PTHREAD_LIBS}|' \ > ${WRKSRC}/Makefile >+ >+# Have to make this directory, the Makefile is stupid and tries to >+# install stuff here without making it. >+pre-install: >+ @${MKDIR} ${DATADIR}/webserver > > post-install: > @${MKDIR} ${DATADIR}/scripts/snmp >diff -ruN net/honeyd.orig/distinfo net/honeyd/distinfo >--- net/honeyd.orig/distinfo Sun Jan 22 16:23:07 2006 >+++ net/honeyd/distinfo Thu Apr 20 08:19:35 2006 >@@ -1,3 +1,3 @@ >-MD5 (honeyd-1.0.tar.gz) = 5c5c6cc62d135075d021a6c1bc5c9a5b >-SHA256 (honeyd-1.0.tar.gz) = 5a8763391d02969779ce3af6bb0a10e3959f72886d3f64fec9e3ee431a424967 >-SIZE (honeyd-1.0.tar.gz) = 600339 >+MD5 (honeyd-1.5a.tar.gz) = 5bec8d97c235f910aa56e83ba7d302bc >+SHA256 (honeyd-1.5a.tar.gz) = 86ada31e91c28c29bdb7a4b841b5014cb3f78747adc7d209b623573e82a6be83 >+SIZE (honeyd-1.5a.tar.gz) = 893323 >diff -ruN net/honeyd.orig/files/patch-config.c net/honeyd/files/patch-config.c >--- net/honeyd.orig/files/patch-config.c Mon Apr 18 02:38:15 2005 >+++ net/honeyd/files/patch-config.c Wed Dec 31 19:00:00 1969 >@@ -1,11 +0,0 @@ >---- 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 -ruN net/honeyd.orig/files/patch-dhcpclient.c net/honeyd/files/patch-dhcpclient.c >--- net/honeyd.orig/files/patch-dhcpclient.c Mon Apr 18 02:38:15 2005 >+++ net/honeyd/files/patch-dhcpclient.c Thu Apr 20 08:24:20 2006 >@@ -1,6 +1,6 @@ >---- dhcpclient.c.orig Thu Apr 14 16:07:26 2005 >-+++ dhcpclient.c Thu Apr 14 15:24:19 2005 >-@@ -236,8 +236,8 @@ >+--- dhcpclient.c.orig Thu Apr 20 08:23:52 2006 >++++ dhcpclient.c Thu Apr 20 08:24:15 2006 >+@@ -211,8 +211,8 @@ > { > struct dhcpclient_req *req = tmpl->dhcp_req; > struct dhcp_msg *msg = (struct dhcp_msg *)buf; >@@ -11,23 +11,3 @@ > 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 -ruN net/honeyd.orig/files/patch-honeyd.h net/honeyd/files/patch-honeyd.h >--- net/honeyd.orig/files/patch-honeyd.h Mon Apr 18 02:38:15 2005 >+++ net/honeyd/files/patch-honeyd.h Wed Dec 31 19:00:00 1969 >@@ -1,20 +0,0 @@ >---- 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 <pcap.h> >-+ >- #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 -ruN net/honeyd.orig/files/patch-lex.c net/honeyd/files/patch-lex.c >--- net/honeyd.orig/files/patch-lex.c Mon Apr 18 02:38:15 2005 >+++ net/honeyd/files/patch-lex.c Wed Dec 31 19:00:00 1969 >@@ -1,74 +0,0 @@ >---- 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 -ruN net/honeyd.orig/files/patch-rrdtool.c net/honeyd/files/patch-rrdtool.c >--- net/honeyd.orig/files/patch-rrdtool.c Mon Apr 18 02:38:15 2005 >+++ net/honeyd/files/patch-rrdtool.c Wed Dec 31 19:00:00 1969 >@@ -1,20 +0,0 @@ >---- 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 */ >diff -ruN net/honeyd.orig/pkg-plist net/honeyd/pkg-plist >--- net/honeyd.orig/pkg-plist Mon Apr 18 02:38:15 2005 >+++ net/honeyd/pkg-plist Thu Apr 20 09:21:29 2006 >@@ -1,40 +1,43 @@ > bin/honeyd > bin/honeydctl >+bin/honeydstats > include/honeyd/debug.h > include/honeyd/hooks.h > include/honeyd/plugins.h > include/honeyd/plugins_config.h > lib/honeyd/libhoneyd.so >-share/honeyd/README >-share/honeyd/config.ethernet >-share/honeyd/config.sample >-share/honeyd/nmap.assoc >-share/honeyd/nmap.prints >-share/honeyd/pf.os >-share/honeyd/webserver/htdocs/config.py >-share/honeyd/webserver/htdocs/graphs/traffic_daily.gif >-share/honeyd/webserver/htdocs/graphs/traffic_hourly.gif >-share/honeyd/webserver/htdocs/images/add.gif >-share/honeyd/webserver/htdocs/images/arrow_down.gif >-share/honeyd/webserver/htdocs/images/arrow_right.gif >-share/honeyd/webserver/htdocs/images/delete.gif >-share/honeyd/webserver/htdocs/images/edit.gif >-share/honeyd/webserver/htdocs/images/google_logo.gif >-share/honeyd/webserver/htdocs/images/logo.gif >-share/honeyd/webserver/htdocs/index.py >-share/honeyd/webserver/htdocs/styles/layout.css >-share/honeyd/webserver/htdocs/templates/config_ip.tmpl >-share/honeyd/webserver/htdocs/templates/inc/footer.tmpl >-share/honeyd/webserver/htdocs/templates/inc/header.tmpl >-share/honeyd/webserver/htdocs/templates/inc/main.tmpl >-share/honeyd/webserver/htdocs/templates/inc/nav.tmpl >-share/honeyd/webserver/htdocs/templates/index.tmpl >-share/honeyd/webserver/htdocs/templates/status_connections.tmpl >-share/honeyd/webserver/htdocs/templates/status_stats.tmpl >-share/honeyd/webserver/htmltmpl.py >-share/honeyd/webserver/server.py >-share/honeyd/webserver/support.py >-share/honeyd/xprobe2.conf >+%%DATADIR%%/README >+%%DATADIR%%/config.ethernet >+%%DATADIR%%/config.sample >+%%DATADIR%%/nmap.assoc >+%%DATADIR%%/nmap.prints >+%%DATADIR%%/pf.os >+%%DATADIR%%/proxy >+%%DATADIR%%/smtp >+%%DATADIR%%/webserver/htdocs/config.py >+%%DATADIR%%/webserver/htdocs/graphs/traffic_daily.gif >+%%DATADIR%%/webserver/htdocs/graphs/traffic_hourly.gif >+%%DATADIR%%/webserver/htdocs/images/add.gif >+%%DATADIR%%/webserver/htdocs/images/arrow_down.gif >+%%DATADIR%%/webserver/htdocs/images/arrow_right.gif >+%%DATADIR%%/webserver/htdocs/images/delete.gif >+%%DATADIR%%/webserver/htdocs/images/edit.gif >+%%DATADIR%%/webserver/htdocs/images/google_logo.gif >+%%DATADIR%%/webserver/htdocs/images/logo.gif >+%%DATADIR%%/webserver/htdocs/index.py >+%%DATADIR%%/webserver/htdocs/styles/layout.css >+%%DATADIR%%/webserver/htdocs/templates/config_ip.tmpl >+%%DATADIR%%/webserver/htdocs/templates/inc/footer.tmpl >+%%DATADIR%%/webserver/htdocs/templates/inc/header.tmpl >+%%DATADIR%%/webserver/htdocs/templates/inc/main.tmpl >+%%DATADIR%%/webserver/htdocs/templates/inc/nav.tmpl >+%%DATADIR%%/webserver/htdocs/templates/index.tmpl >+%%DATADIR%%/webserver/htdocs/templates/status_connections.tmpl >+%%DATADIR%%/webserver/htdocs/templates/status_stats.tmpl >+%%DATADIR%%/webserver/htmltmpl.py >+%%DATADIR%%/webserver/server.py >+%%DATADIR%%/webserver/support.py >+%%DATADIR%%/xprobe2.conf > %%DATADIR%%/scripts/snmp/README > %%DATADIR%%/scripts/snmp/buildSNMPConfig.pl > %%DATADIR%%/scripts/snmp/fake-snmp.pl
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 96318
: 64876