From owner-freebsd-ports Sun Jul 21 15: 0:45 2002 Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CFF0437B405; Sun, 21 Jul 2002 15:00:39 -0700 (PDT) Received: from 21322530218.direct.eti.at (21322530218.direct.eti.at [213.225.30.218]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F33743E42; Sun, 21 Jul 2002 15:00:31 -0700 (PDT) (envelope-from tilman@arved.de) Received: from sauna.arved.de (sauna.arved.de [192.168.2.4]) by 21322530218.direct.eti.at (8.11.6/8.11.6) with ESMTP id g6LM0Oj12001; Mon, 22 Jul 2002 00:00:28 +0200 (CEST) (envelope-from tilman@arved.de) Received: from sauna.arved.de (sauna.arved.de [127.0.0.1]) by sauna.arved.de (8.12.5/8.12.5) with ESMTP id g6LM0FQr012185; Mon, 22 Jul 2002 00:00:15 +0200 (CEST) (envelope-from tilman@arved.de) Received: (from tilman@localhost) by sauna.arved.de (8.12.5/8.12.5/Submit) id g6LM0ENJ012184; Mon, 22 Jul 2002 00:00:14 +0200 (CEST) X-Authentication-Warning: sauna.arved.de: tilman set sender to tilman@arved.de using -f Date: Mon, 22 Jul 2002 00:00:11 +0200 From: Tilman Linneweh To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports@FreeBSD.org Subject: Re: ports/40849: Update port net/slirp Message-Id: <20020722000011.1f998cf5.tilman@arved.de> In-Reply-To: <200207211740.g6LHe12S015152@freefall.freebsd.org> References: <200207211730.g6LHUIJC007180@sauna.arved.de> <200207211740.g6LHe12S015152@freefall.freebsd.org> X-Mailer: Sylpheed version 0.8.0 (GTK+ 1.2.10; i386-portbld-freebsd4.6) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org > >Category: ports > >Responsible: freebsd-ports > >Synopsis: Update port net/slirp > >Arrival-Date: Sun Jul 21 10:40:01 PDT 2002 fenner noticed his mistake and updated Makefile without reading my mail, so here's an updated diff. regards arved Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/slirp/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- Makefile 21 Jul 2002 19:18:37 -0000 1.15 +++ Makefile 21 Jul 2002 21:57:38 -0000 @@ -6,13 +6,15 @@ # PORTNAME= slirp -PORTVERSION= 1.0c +PORTVERSION= 1.0.13 +PORTEPOCH= 1 CATEGORIES= net -MASTER_SITES= ftp://blitzen.canberra.edu.au/pub/slirp/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR=slirp MAINTAINER= ports@FreeBSD.Org -WRKSRC= ${WRKDIR}/slirp-1.0c/src +WRKSRC= ${WRKDIR}/${DISTNAME}/src GNU_CONFIGURE= yes MAN1= slirp.1 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/slirp/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 12 Dec 1996 03:24:11 -0000 1.3 +++ distinfo 21 Jul 2002 17:19:31 -0000 @@ -1 +1 @@ -MD5 (slirp-1.0c.tar.gz) = 62aad016f16b51cbdef4c8e34454f31a +MD5 (slirp-1.0.13.tar.gz) = aaa37a0e6433d177f09ba10145c7d8d3 Index: files/patch-ab =================================================================== RCS file: /home/ncvs/ports/net/slirp/files/patch-ab,v retrieving revision 1.1 diff -u -r1.1 patch-ab --- files/patch-ab 16 Apr 1999 16:14:10 -0000 1.1 +++ files/patch-ab 21 Jul 2002 17:25:39 -0000 @@ -1,34 +1,20 @@ ---- tcp_subr.c.orig Fri Dec 29 15:45:51 1995 -+++ tcp_subr.c Fri Apr 16 09:03:57 1999 -@@ -238,14 +238,14 @@ +--- tcp_subr.c.orig Sun Jul 21 19:23:18 2002 ++++ tcp_subr.c Sun Jul 21 19:25:12 2002 +@@ -241,7 +241,7 @@ * then send a RST to peer. */ struct tcpcb * --tcp_drop(tp, errno) -+tcp_drop(tp, err) +-tcp_drop(struct tcpcb *tp, int errno) { ++tcp_drop(struct tcpcb *tp, int err) { + /* tcp_drop(tp, errno) register struct tcpcb *tp; -- int errno; -+ int err; - { + int errno; +@@ -250,7 +250,7 @@ DEBUG_CALL("tcp_drop"); DEBUG_ARG("tp = %lx", (long)tp); - DEBUG_ARG("errno = %d", errno); -+ DEBUG_ARG("err = %d", err); ++ DEBUG_ARG("errno = %d", err); if (TCPS_HAVERCVDSYN(tp->t_state)) { tp->t_state = TCPS_CLOSED; -@@ -253,10 +253,10 @@ - tcpstat.tcps_drops++; - } else - tcpstat.tcps_conndrops++; --/* if (errno == ETIMEDOUT && tp->t_softerror) -- * errno = tp->t_softerror; -+/* if (err == ETIMEDOUT && tp->t_softerror) -+ * err = tp->t_softerror; - */ --/* so->so_error = errno; */ -+/* so->so_error = err; */ - return (tcp_close(tp)); - } - To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message