version 1.7.2.0

This commit is contained in:
Gerhard Rieger 2011-12-05 22:28:49 +01:00
parent 97db9bce50
commit 42ef3f4645
7 changed files with 21 additions and 15 deletions

View File

@ -1,4 +1,6 @@
####################### V 1.7.2.0:
corrections: corrections:
when UNIX-LISTEN was applied to an existing file it failed as expected when UNIX-LISTEN was applied to an existing file it failed as expected
but removed the file. Thanks to Bjoern Bosselmann for reporting this but removed the file. Thanks to Bjoern Bosselmann for reporting this

View File

@ -74,7 +74,8 @@ HFILES = sycls.h sslcls.h error.h dalan.h procan.h filan.h hostan.h sysincludes.
DOCFILES = README README.FIPS CHANGES FILES EXAMPLES PORTING SECURITY DEVELOPMENT doc/socat.yo doc/socat.1 doc/socat.html doc/xio.help FAQ BUGREPORTS COPYING COPYING.OpenSSL doc/dest-unreach.css doc/socat-openssltunnel.html doc/socat-multicast.html doc/socat-tun.html doc/socat-genericsocket.html DOCFILES = README README.FIPS CHANGES FILES EXAMPLES PORTING SECURITY DEVELOPMENT doc/socat.yo doc/socat.1 doc/socat.html doc/xio.help FAQ BUGREPORTS COPYING COPYING.OpenSSL doc/dest-unreach.css doc/socat-openssltunnel.html doc/socat-multicast.html doc/socat-tun.html doc/socat-genericsocket.html
SHFILES = daemon.sh mail.sh ftp.sh readline.sh SHFILES = daemon.sh mail.sh ftp.sh readline.sh \
socat_buildscript_for_android.sh
TESTFILES = test.sh socks4echo.sh proxyecho.sh gatherinfo.sh readline-test.sh \ TESTFILES = test.sh socks4echo.sh proxyecho.sh gatherinfo.sh readline-test.sh \
proxy.sh socks4a-echo.sh testcert.conf proxy.sh socks4a-echo.sh testcert.conf
OSFILES = Config/Makefile.Linux-2-6-24 Config/config.Linux-2-6-24.h \ OSFILES = Config/Makefile.Linux-2-6-24 Config/config.Linux-2-6-24.h \
@ -84,7 +85,8 @@ OSFILES = Config/Makefile.Linux-2-6-24 Config/config.Linux-2-6-24.h \
Config/Makefile.OpenBSD-4-3 Config/config.OpenBSD-4-3.h \ Config/Makefile.OpenBSD-4-3 Config/config.OpenBSD-4-3.h \
Config/Makefile.AIX-5-3 Config/config.AIX-5-3.h \ Config/Makefile.AIX-5-3 Config/config.AIX-5-3.h \
Config/Makefile.Cygwin-1-5-25 Config/config.Cygwin-1-5-25.h \ Config/Makefile.Cygwin-1-5-25 Config/config.Cygwin-1-5-25.h \
Config/Makefile.MacOSX-10-5 Config/config.MacOSX-10-5.h Config/Makefile.MacOSX-10-5 Config/config.MacOSX-10-5.h \
Config/Makefile.DragonFly-2-8-2 Config/config.DragonFly-2-8-2.h
all: progs doc all: progs doc

4
README
View File

@ -74,8 +74,8 @@ install
------- -------
Get the tarball and extract it: Get the tarball and extract it:
gtar xzf socat.tar.gz tar xzf socat.tar.gz
cd socat-1.7.1.2 cd socat-1.7.2.0
./configure ./configure
make make
su su

View File

@ -1 +1 @@
"1.7.1.3+fixes" "1.7.2.0"

View File

@ -10,7 +10,7 @@ def(Filan)(0)(bf(Filan))
def(procan)(0)(bf(procan)) def(procan)(0)(bf(procan))
def(Procan)(0)(bf(Procan)) def(Procan)(0)(bf(Procan))
manpage(socat)(1)(Oct 2010)()() manpage(socat)(1)(Dec 2011)()()
whenhtml( whenhtml(
label(CONTENTS) label(CONTENTS)
@ -500,6 +500,7 @@ label(ADDRESS_OPENSSL_CONNECT)dit(bf(tt(OPENSSL:<host>:<port>)))
link(capath)(OPTION_OPENSSL_CAPATH), link(capath)(OPTION_OPENSSL_CAPATH),
link(certificate)(OPTION_OPENSSL_CERTIFICATE), link(certificate)(OPTION_OPENSSL_CERTIFICATE),
link(key)(OPTION_OPENSSL_KEY), link(key)(OPTION_OPENSSL_KEY),
link(compress)(OPTION_OPENSSL_COMPRESS),
link(bind)(OPTION_BIND), link(bind)(OPTION_BIND),
link(pf)(OPTION_PROTOCOL_FAMILY), link(pf)(OPTION_PROTOCOL_FAMILY),
link(connect-timeout)(OPTION_CONNECT_TIMEOUT), link(connect-timeout)(OPTION_CONNECT_TIMEOUT),
@ -527,6 +528,7 @@ label(ADDRESS_OPENSSL_LISTEN)dit(bf(tt(OPENSSL-LISTEN:<port>)))
link(capath)(OPTION_OPENSSL_CAPATH), link(capath)(OPTION_OPENSSL_CAPATH),
link(certificate)(OPTION_OPENSSL_CERTIFICATE), link(certificate)(OPTION_OPENSSL_CERTIFICATE),
link(key)(OPTION_OPENSSL_KEY), link(key)(OPTION_OPENSSL_KEY),
link(compress)(OPTION_OPENSSL_COMPRESS),
link(fork)(OPTION_FORK), link(fork)(OPTION_FORK),
link(bind)(OPTION_BIND), link(bind)(OPTION_BIND),
link(range)(OPTION_RANGE), link(range)(OPTION_RANGE),
@ -536,7 +538,7 @@ label(ADDRESS_OPENSSL_LISTEN)dit(bf(tt(OPENSSL-LISTEN:<port>)))
link(retry)(OPTION_RETRY)nl() link(retry)(OPTION_RETRY)nl()
See also: See also:
link(OPENSSL)(ADDRESS_OPENSSL_CONNECT), link(OPENSSL)(ADDRESS_OPENSSL_CONNECT),
link(TCP)(ADDRESS_TCP_CONNECT) link(TCP-LISTEN)(ADDRESS_TCP_LISTEN)
label(ADDRESS_NAMED_PIPE)dit(bf(tt(PIPE:<filename>))) label(ADDRESS_NAMED_PIPE)dit(bf(tt(PIPE:<filename>)))
If link(<filename>)(TYPE_FILENAME) already exists, it is opened. If link(<filename>)(TYPE_FILENAME) already exists, it is opened.
If it does not exist, a named pipe is created and opened. Beginning with If it does not exist, a named pipe is created and opened. Beginning with
@ -2659,12 +2661,6 @@ label(OPTION_OPENSSL_PSEUDO)dit(bf(tt(pseudo)))
microseconds for feeding the libc pseudo random number generator with an microseconds for feeding the libc pseudo random number generator with an
initial value. openssl is then feeded with output from random\() calls.nl() initial value. openssl is then feeded with output from random\() calls.nl()
NOTE:This mechanism is not sufficient for generation of secure keys! NOTE:This mechanism is not sufficient for generation of secure keys!
label(OPTION_OPENSSL_FIPS)dit(bf(tt(fips)))
Enables FIPS mode if compiled in. For info about the FIPS encryption
implementation standard see lurl(http://oss-institute.org/fips-faq.html).
This mode might require that the involved certificates are generated with a
FIPS enabled version of openssl. Setting or clearing this option on one
socat address affects all OpenSSL addresses of this process.
label(OPTION_OPENSSL_COMPRESS)dit(bf(tt(compress))) label(OPTION_OPENSSL_COMPRESS)dit(bf(tt(compress)))
Enable or disable the use of compression for a connection. Setting this to Enable or disable the use of compression for a connection. Setting this to
"none" disables compression, setting it to "auto" lets OpenSSL choose the best "none" disables compression, setting it to "auto" lets OpenSSL choose the best
@ -2672,6 +2668,12 @@ label(OPTION_OPENSSL_COMPRESS)dit(bf(tt(compress)))
compression-related settings. compression-related settings.
NOTE: Requires OpenSSL 0.9.8 or higher and disabling compression with NOTE: Requires OpenSSL 0.9.8 or higher and disabling compression with
OpenSSL 0.9.8 affects all new connections in the process. OpenSSL 0.9.8 affects all new connections in the process.
label(OPTION_OPENSSL_FIPS)dit(bf(tt(fips)))
Enables FIPS mode if compiled in. For info about the FIPS encryption
implementation standard see lurl(http://oss-institute.org/fips-faq.html).
This mode might require that the involved certificates are generated with a
FIPS enabled version of openssl. Setting or clearing this option on one
socat address affects all OpenSSL addresses of this process.
enddit() enddit()
startdit()enddit()nl() startdit()enddit()nl()
@ -3480,7 +3482,7 @@ standard specifications available on the Internet for free.
label(VERSION) label(VERSION)
manpagesection(VERSION) manpagesection(VERSION)
This man page describes version 1.7.1 of socat(). This man page describes version 1.7.2 of socat().
label(BUGS) label(BUGS)

View File

@ -1,6 +1,6 @@
%define majorver 1.7 %define majorver 1.7
%define minorver 1.2 %define minorver 2.0
Summary: socat - multipurpose relay Summary: socat - multipurpose relay
Name: socat Name: socat

0
socat_buildscript_for_android.sh Normal file → Executable file
View File