From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 11 15:00:39 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1CF1037B401 for ; Fri, 11 Apr 2003 15:00:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A2E543F3F for ; Fri, 11 Apr 2003 15:00:38 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h3BM0bUp038220 for ; Fri, 11 Apr 2003 15:00:37 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h3BM0bpW038219; Fri, 11 Apr 2003 15:00:37 -0700 (PDT) Resent-Date: Fri, 11 Apr 2003 15:00:37 -0700 (PDT) Resent-Message-Id: <200304112200.h3BM0bpW038219@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dominic Marks Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E7A237B401 for ; Fri, 11 Apr 2003 14:58:29 -0700 (PDT) Received: from cus.org.uk (host213-106-240-81.no-dns-yet.ntli.net [213.106.240.81]) by mx1.FreeBSD.org (Postfix) with ESMTP id 963D043F75 for ; Fri, 11 Apr 2003 14:58:27 -0700 (PDT) (envelope-from dom@cus.org.uk) Received: from cus.org.uk (localhost.cus.org.uk [127.0.0.1]) by cus.org.uk (8.12.6/8.11.3) with ESMTP id h3BLwQLX081276 for ; Fri, 11 Apr 2003 22:58:26 +0100 (BST) (envelope-from dom@cus.org.uk) Received: (from dom@localhost) by cus.org.uk (8.12.6/8.12.6/Submit) id h3BLwPTl081275; Fri, 11 Apr 2003 22:58:25 +0100 (BST) Message-Id: <200304112158.h3BLwPTl081275@cus.org.uk> Date: Fri, 11 Apr 2003 22:58:25 +0100 (BST) From: Dominic Marks To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/50837: Maintainer Update: net/honeyd X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Dominic Marks List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2003 22:00:39 -0000 >Number: 50837 >Category: ports >Synopsis: Maintainer Update: net/honeyd >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Apr 11 15:00:37 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Dominic Marks >Release: FreeBSD 4.7-RELEASE-p3 i386 >Organization: UMIST >Environment: System: FreeBSD moo.cus.org.uk 4.7-RELEASE-p3 FreeBSD 4.7-RELEASE-p3 #3: Mon Jan 20 23:49:12 GMT 2003 root@moo.cus.org.uk:/usr/obj/usr/src/sys/BAA i386 >Description: net/honeyd 0.3 -> 0.5 o Master site moved to EU because of legal issues. o Patch to fix two bugs taken from the honeyd website follows the cvs diff. >How-To-Repeat: NA >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/honeyd/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 2003/02/21 13:14:43 1.5 +++ Makefile 2003/04/11 21:51:09 @@ -6,9 +6,9 @@ # PORTNAME= honeyd -PORTVERSION= 0.3 +PORTVERSION= 0.5 CATEGORIES= net -MASTER_SITES= http://www.citi.umich.edu/u/provos/honeyd/ +MASTER_SITES= http://niels.xtdnet.nl/honeyd/ MAINTAINER= d.marks@student.umist.ac.uk COMMENT= A utility to simualte services and hosts on a virtual network host @@ -17,10 +17,10 @@ ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-libdnet=${LOCALBASE} \ --with-libevent=${LOCALBASE} \ --with-pcap -WRKSRC= ${WRKDIR}/${PORTNAME} MAN8= honeyd.8 # This is necessary to keep auto* from running. Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/honeyd/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 2002/08/12 06:33:14 1.2 +++ distinfo 2003/04/11 21:51:09 @@ -1 +1 @@ -MD5 (honeyd-0.3.tar.gz) = 027c507bb165bea70403309e4445c601 +MD5 (honeyd-0.5.tar.gz) = 3aec5101f44ef21b29c213496d92c1c1 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/honeyd/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 2002/06/23 08:58:04 1.1 +++ pkg-plist 2003/04/11 21:51:09 @@ -1 +1,9 @@ bin/honeyd +share/honeyd/README +share/honeyd/nmap.assoc +share/honeyd/nmap.prints +share/honeyd/xprobe2.conf +share/honeyd/config.sample +@dirrm share/honeyd +lib/honeyd/libhoneyd.so +@dirrm lib/honeyd Index: ipfrag.c =================================================================== RCS file: /cvs/honeyd/ipfrag.c,v retrieving revision 1.9 diff -u -r1.9 ipfrag.c --- ipfrag.c 17 Apr 2002 16:38:40 -0000 1.9 +++ ipfrag.c 19 Feb 2003 02:59:39 -0000 @@ -241,12 +241,12 @@ if (prev && prev->off + prev->len > off) { overlap = prev->off + prev->len - off; - if (overlap > len) { + if (overlap >= len) { if (fragq->fragp == FRAG_NEW) { u_char *odata = prev->data + off - prev->off; memcpy(odata, ent->data, len); } - goto drop_fragment; + goto free_fragment; } if (fragq->fragp == FRAG_OLD) { @@ -316,6 +316,7 @@ drop_fragment: TAILQ_REMOVE(&fragq->fraglist, ent, next); + free_fragment: ip_fragent_free(ent); return (0); } Index: honeyd.h =================================================================== RCS file: /cvs/honeyd/honeyd.h,v retrieving revision 1.46 diff -u -r1.46 honeyd.h --- honeyd.h 15 Feb 2003 22:14:24 -0000 1.46 +++ honeyd.h 4 Mar 2003 21:46:34 -0000 @@ -68,7 +68,7 @@ }; #define PORT_ISOPEN(x) ((x)->status == PORT_OPEN || \ - (x)->status == PORT_OPEN || \ + (x)->status == PORT_PROXY || \ (x)->status == PORT_SUBSYSTEM) struct subsystem; >Release-Note: >Audit-Trail: >Unformatted: