From marck@woozle.rinet.ru  Wed Mar 10 23:44:10 2004
Return-Path: <marck@woozle.rinet.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8BF2116A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Mar 2004 23:44:10 -0800 (PST)
Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D709843D45
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Mar 2004 23:44:09 -0800 (PST)
	(envelope-from marck@woozle.rinet.ru)
Received: from woozle.rinet.ru (localhost [127.0.0.1])
	by woozle.rinet.ru (8.12.10/8.12.10) with ESMTP id i2B7i8ci056184
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Mar 2004 10:44:08 +0300 (MSK)
	(envelope-from marck@woozle.rinet.ru)
Received: (from marck@localhost)
	by woozle.rinet.ru (8.12.10/8.12.10/Submit) id i2B7i8Vb056183;
	Thu, 11 Mar 2004 10:44:08 +0300 (MSK)
	(envelope-from marck)
Message-Id: <200403110744.i2B7i8Vb056183@woozle.rinet.ru>
Date: Thu, 11 Mar 2004 10:44:08 +0300 (MSK)
From: Dmitry Morozovsky <marck@rinet.ru>
Reply-To: Dmitry Morozovsky <marck@rinet.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer-update] net-mgmt/ehnt 0.3_3 -> 0.3_4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         64088
>Category:       ports
>Synopsis:       [maintainer-update] net-mgmt/ehnt 0.3_3 -> 0.3_4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 10 23:50:17 PST 2004
>Closed-Date:    Fri Mar 12 01:17:34 PST 2004
>Last-Modified:  Fri Mar 12 01:17:34 PST 2004
>Originator:     Dmitry Morozovsky
>Release:        FreeBSD 4-STABLE i386
>Organization:
Cronyx Plus LLC (RiNet ISP)
>Environment:
System: FreeBSD 4-STABLE 


>Description:

This diff updates net-mgmt/ehnt port:
- fix incorrect accept(2) usage
- clean up distinfo and bring it to modern form [1]

Submitted by:	Trevor Johnson <trevor@jpj.net> [1]

>How-To-Repeat:

>Fix:


Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/ehnt/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	23 Feb 2004 04:41:59 -0000	1.9
+++ Makefile	11 Mar 2004 07:40:29 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	ehnt
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/ehnt/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	5 Oct 2001 20:34:49 -0000	1.2
+++ distinfo	11 Mar 2004 07:40:29 -0000
@@ -1,2 +1,2 @@
 MD5 (ehnt-0.3.tar.gz) = 1477137f5207561cafb421864351562d
-MD5 (ehnt_data-0.3.tar.gz) = b861e0fb0092c45c71b9048e9a4b1679
+SIZE (ehnt-0.3.tar.gz) = 25795
Index: files/patch-ehntserv.c
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/ehnt/files/patch-ehntserv.c,v
retrieving revision 1.1
diff -u -r1.1 patch-ehntserv.c
--- files/patch-ehntserv.c	16 Nov 2002 14:36:35 -0000	1.1
+++ files/patch-ehntserv.c	11 Mar 2004 07:40:29 -0000
@@ -1,8 +1,8 @@
 
-$FreeBSD: ports/net-mgmt/ehnt/files/patch-ehntserv.c,v 1.1 2002/11/16 14:36:35 edwin Exp $
+$FreeBSD$
 
 --- ehntserv.c.orig	Thu Oct  4 22:18:29 2001
-+++ ehntserv.c	Thu Nov 14 22:18:40 2002
++++ ehntserv.c	Fri May 30 14:16:22 2003
 @@ -33,8 +33,8 @@
  #define MAXCLIENTS 256
  #define MAXPACKET 8192
@@ -120,11 +120,18 @@
      for (i=0; i<MAXCLIENTS; i++) {
        if (l_clients[i] > 0) {
  	if (FD_ISSET(l_clients[i],&write_fds)) {
-@@ -220,9 +230,9 @@
+@@ -215,14 +225,14 @@
+   if (FD_ISSET(l_fd,&read_fds)) {   /*we have a new TCP client*/
+     int l_connfd,new_index=-1;
+     socklen_t l_addrlen;
+-    struct sockaddr * l_cliaddr;
++    struct sockaddr l_cliaddr;
+ 
      /*    printf("incoming connection on tcp 4444\n");*/
      l_addrlen=sizeof(l_cliaddr);
-     if ( (l_connfd = accept(l_fd,(struct sockaddr *) l_cliaddr, &l_addrlen)) < 0)
+-    if ( (l_connfd = accept(l_fd,(struct sockaddr *) l_cliaddr, &l_addrlen)) < 0)
 -      { log_error("accept error"); exit(0); }
++    if ( (l_connfd = accept(l_fd, &l_cliaddr, &l_addrlen)) < 0)
 +      { log_error("accept error"); exit(1); }
  
 -    SetTCPOpts(l_connfd);
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Fri Mar 12 01:17:28 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=64088 
>Unformatted:
