head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.12
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.10
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.8
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.6
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.4
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.2
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.1.0.10
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.8
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.6
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.4
	pkgsrc-2008Q1:1.1.0.2
	pkgsrc-2008Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2008.10.25.18.21.18;	author adrianp;	state dead;
branches;
next	1.1;

1.1
date	2008.01.27.12.35.17;	author rillig;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 1.7.0.0
2008/10/15: socat version 1.7.0.0 brings support for SCTP stream, raw
interface, and generic sockets. New option escape allows to interrupt raw
terminal connections. Listening and receiving sockets can set a couple of
environment variables. Added base control of System V STREAMS. Lots of
corrections were performed. socat compiles on Mac OS X again.

Patch from Leonardo Taccari
@
text
@$NetBSD: patch-ac,v 1.1 2008/01/27 12:35:17 rillig Exp $

As the author said: Keep the enums and their names in sync.

--- xioopts.h.orig	2007-03-06 22:19:46.000000000 +0100
+++ xioopts.h	2008-01-27 13:32:15.000000000 +0100
@@@@ -49,7 +49,9 @@@@ enum e_types {
    TYPE_LONGLONG,	/* long long */
    TYPE_OFF32,		/* off_t */
    TYPE_OFF64,		/* off64_t */
+#if HAVE_STRUCT_IP_MREQ || HAVE_STRUCT_IP_MREQN
    TYPE_IP_MREQN,	/* for  struct ip_mreq  or  struct ip_mreqn */
+#endif
    TYPE_IP4NAME,	/* IPv4 hostname or address */
 
    TYPE_2BYTE = TYPE_USHORT
@


1.1
log
@Fixed a segmentation fault when calling "socat -hhh".
@
text
@d1 1
a1 1
$NetBSD$
@