summaryrefslogtreecommitdiff
path: root/net/slirp
diff options
context:
space:
mode:
authorMichael Haro <mharo@FreeBSD.org>1999-04-16 16:14:10 +0000
committerMichael Haro <mharo@FreeBSD.org>1999-04-16 16:14:10 +0000
commit7758e17a1c5a0a578fe749905709d0b18355fa91 (patch)
treeee2bf638382475e0668e8ece289717eb573aebc3 /net/slirp
parentupdate to version 4.1.8 (diff)
Make slirp not broken
PR: 10414 Submitted by: Timothy J. Lee <timlee@netcom.com>
Notes
Notes: svn path=/head/; revision=17927
Diffstat (limited to 'net/slirp')
-rw-r--r--net/slirp/Makefile12
-rw-r--r--net/slirp/files/patch-ab34
2 files changed, 37 insertions, 9 deletions
diff --git a/net/slirp/Makefile b/net/slirp/Makefile
index 3f0d6d2010f2..82f9987f735b 100644
--- a/net/slirp/Makefile
+++ b/net/slirp/Makefile
@@ -3,7 +3,7 @@
# Date created: 25 Aug 1995
# Whom: Alain Kalker <A.C.P.M.Kalker@student.utwente.nl>
#
-# $Id: Makefile,v 1.9 1998/10/14 01:18:49 jseger Exp $
+# $Id: Makefile,v 1.10 1998/11/11 05:37:30 asami Exp $
#
DISTNAME= slirp-1.0c
@@ -12,14 +12,8 @@ MASTER_SITES= ftp://blitzen.canberra.edu.au/pub/slirp/
MAINTAINER= A.C.P.M.Kalker@student.utwente.nl
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 300000
-BROKEN= tcp_subr.c
-.endif
-
WRKSRC= ${WRKDIR}/slirp-1.0c/src
-HAS_CONFIGURE= yes
+GNU_CONFIGURE= yes
MAN1= slirp.1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/slirp/files/patch-ab b/net/slirp/files/patch-ab
new file mode 100644
index 000000000000..1b114247ead0
--- /dev/null
+++ b/net/slirp/files/patch-ab
@@ -0,0 +1,34 @@
+--- 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 @@
+ * then send a RST to peer.
+ */
+ struct tcpcb *
+-tcp_drop(tp, errno)
++tcp_drop(tp, err)
+ register struct tcpcb *tp;
+- int errno;
++ int err;
+ {
+
+ DEBUG_CALL("tcp_drop");
+ DEBUG_ARG("tp = %lx", (long)tp);
+- DEBUG_ARG("errno = %d", errno);
++ DEBUG_ARG("err = %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));
+ }
+