Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Jul 2002 19:30:18 +0200 (CEST)
From:      Tilman Linneweh <tilman@arved.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        tilman@arved.de
Subject:   ports/40849: Update port net/slirp
Message-ID:  <200207211730.g6LHUIJC007180@sauna.arved.de>

next in thread | raw e-mail | index | archive | help

>Number:         40849
>Category:       ports
>Synopsis:       Update port net/slirp
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 21 10:40:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Tilman Linneweh
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
BSD Usergroup Austria
>Environment:
System: FreeBSD sauna.arved.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Sun Jul 7 20:02:41 CEST 2002 tilman@sauna.arved.de:/usr/obj/usr/src/sys/SAUNA i386


	
>Description:
	- Update
	- Bump PORTEPOCH, because previous Maintainer added wrong Versionnr.
	- Mastersite moved to SF
	- Correct Maintainer freebsd-ports -> ports, otherwise fenner script 
	is triggered.
	
>How-To-Repeat:
	
>Fix:

	

--- slirp.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/slirp/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	8 Jul 2002 10:57:58 -0000	1.14
+++ Makefile	21 Jul 2002 17:21:17 -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=	freebsd-ports@FreeBSD.Org
+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));
- }
- 
--- slirp.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207211730.g6LHUIJC007180>