From 30a3ec3baafa975ad35b57a6a3834592c9060ebf Mon Sep 17 00:00:00 2001 From: Gerhard Rieger Date: Fri, 8 May 2009 16:02:00 +0200 Subject: [PATCH] version 1.7.1.1 --- CHANGES | 7 +++++-- README | 2 +- VERSION | 2 +- compat.h | 4 +++- config.h.in | 2 +- configure.in | 2 +- doc/socat-multicast.html | 4 ++-- socat.spec | 2 +- utils.c | 2 +- xio.h | 3 ++- xioopts.c | 3 +++ 11 files changed, 21 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index d2b0211..8ce1617 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ +####################### V 1.7.1.1: + corrections: corrected the "fixed possible SIGSEGV" fix because SIGSEGV still might occur under those conditions. Thanks to Toni Mattila for first @@ -15,10 +17,11 @@ corrections: fixed a compile problem caused by size_t/socklen_t mismatch on 64bit systems - docu mentions option so-bindtodev but correct name is so-bindtodevice. + docu mentioned option so-bindtodev but correct name is so-bindtodevice. Thanks to Jim Zimmerman for reporting. - added environment example to doc/socat-multicast.html +docu changes: + added environment variables example to doc/socat-multicast.html ####################### V 1.7.1.0: diff --git a/README b/README index ff1577e..5b8aeff 100644 --- a/README +++ b/README @@ -75,7 +75,7 @@ install Get the tarball and extract it: gtar xzf socat.tar.gz - cd socat-1.7.1.0 + cd socat-1.7.1.1 ./configure make su diff --git a/VERSION b/VERSION index 582216a..4026ae1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -"1.7.1.0+sigsegv+ftruncate64+fixsetenv+amd64+uniexec" +"1.7.1.1" diff --git a/compat.h b/compat.h index 78e299e..9e9b257 100644 --- a/compat.h +++ b/compat.h @@ -1,5 +1,5 @@ /* source: compat.h */ -/* Copyright Gerhard Rieger 2001-2008 */ +/* Copyright Gerhard Rieger 2001-2009 */ /* Published under the GNU General Public License V.2, see file COPYING */ #ifndef __compat_h_included @@ -267,6 +267,8 @@ # define F_off "%d" # elif HAVE_BASIC_OFF_T==5 # define F_off "%ld" +# elif HAVE_BASIC_OFF_T==7 +# define F_off "%Ld" # else #error "HAVE_BASIC_OFF_T is out of range:" HAVE_BASIC_OFF_T # endif diff --git a/config.h.in b/config.h.in index 7700c34..becd07b 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,5 @@ /* source: config.h.in */ -/* Copyright Gerhard Rieger 2001-2008 */ +/* Copyright Gerhard Rieger 2001-2009 */ /* Published under the GNU General Public License V.2, see file COPYING */ #ifndef __config_h_included diff --git a/configure.in b/configure.in index 2297c62..7ad0000 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ nl source: configure.in -dnl Copyright Gerhard Rieger 2001-2008 +dnl Copyright Gerhard Rieger 2001-2009 dnl Published under the GNU General Public License V.2, see file COPYING dnl Process this file with autoconf to produce a configure script. diff --git a/doc/socat-multicast.html b/doc/socat-multicast.html index d1aba33..8bf9fcb 100644 --- a/doc/socat-multicast.html +++ b/doc/socat-multicast.html @@ -319,7 +319,7 @@ Example: Start a receiver of the following form (tried on Linux):

-socat -u udp-recvfrom:8888,reuseaddr,ip-add-membership=224.1.0.1:192.168.10.2,ip-pktinfo,fork system:export +socat -u UDP-RECVFROM:8888,reuseaddr,ip-add-membership=224.1.0.1:192.168.10.2,ip-pktinfo,fork SYSTEM:export

@@ -327,7 +327,7 @@ Then send a multicast packet from the client:

-echo |socat -u - udp-datagram:224.1.0.1:8888 +echo |socat -u STDIO UDP-DATAGRAM:224.1.0.1:8888

diff --git a/socat.spec b/socat.spec index ec7c0ae..37ff655 100644 --- a/socat.spec +++ b/socat.spec @@ -1,6 +1,6 @@ %define majorver 1.7 -%define minorver 1.0 +%define minorver 1.1 Summary: socat - multipurpose relay Name: socat diff --git a/utils.c b/utils.c index 21ccf79..6f578e2 100644 --- a/utils.c +++ b/utils.c @@ -1,5 +1,5 @@ /* source: utils.c */ -/* Copyright Gerhard Rieger 2001-2008 */ +/* Copyright Gerhard Rieger 2001-2009 */ /* Published under the GNU General Public License V.2, see file COPYING */ /* useful additions to C library */ diff --git a/xio.h b/xio.h index 35d4d95..653708a 100644 --- a/xio.h +++ b/xio.h @@ -347,12 +347,13 @@ union integral { } ; /* some aliases */ -#define u_off u_long /* please report when this causes problems */ #if HAVE_BASIC_OFF_T==3 # define u_off u_int #elif HAVE_BASIC_OFF_T==5 # define u_off u_long +#elif HAVE_BASIC_OFF_T==7 +# define u_off u_longlong #else # error "unexpected size of off_t, please report this as bug" #endif diff --git a/xioopts.c b/xioopts.c index 4509a61..1079175 100644 --- a/xioopts.c +++ b/xioopts.c @@ -1975,6 +1975,9 @@ int parseopts_table(const char **a, unsigned int groups, struct opt **opts, (*opts)[i].value.u_ulong); break; +#if HAVE_BASIC_OFF_T==7 + case TYPE_OFF32: +#endif #if HAVE_TYPE_LONGLONG case TYPE_LONGLONG: # if HAVE_STAT64 && defined(HAVE_BASIC_OFF64_T) && HAVE_BASIC_OFF64_T==7