From 42ef3f464527556ca1e02a00b07b8f6eacf86a00 Mon Sep 17 00:00:00 2001 From: Gerhard Rieger Date: Mon, 5 Dec 2011 22:28:49 +0100 Subject: [PATCH] version 1.7.2.0 --- CHANGES | 2 ++ Makefile.in | 6 ++++-- README | 4 ++-- VERSION | 2 +- doc/socat.yo | 20 +++++++++++--------- socat.spec | 2 +- socat_buildscript_for_android.sh | 0 7 files changed, 21 insertions(+), 15 deletions(-) mode change 100644 => 100755 socat_buildscript_for_android.sh diff --git a/CHANGES b/CHANGES index a7726d4..bb2e8bf 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ +####################### V 1.7.2.0: + corrections: when UNIX-LISTEN was applied to an existing file it failed as expected but removed the file. Thanks to Bjoern Bosselmann for reporting this diff --git a/Makefile.in b/Makefile.in index 75430ab..88af935 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 -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 \ proxy.sh socks4a-echo.sh testcert.conf 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.AIX-5-3 Config/config.AIX-5-3.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 diff --git a/README b/README index bd89abd..e73a0e5 100644 --- a/README +++ b/README @@ -74,8 +74,8 @@ install ------- Get the tarball and extract it: - gtar xzf socat.tar.gz - cd socat-1.7.1.2 + tar xzf socat.tar.gz + cd socat-1.7.2.0 ./configure make su diff --git a/VERSION b/VERSION index 11171ac..9728451 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -"1.7.1.3+fixes" +"1.7.2.0" diff --git a/doc/socat.yo b/doc/socat.yo index b93c9bf..d266593 100644 --- a/doc/socat.yo +++ b/doc/socat.yo @@ -10,7 +10,7 @@ def(Filan)(0)(bf(Filan)) def(procan)(0)(bf(procan)) def(Procan)(0)(bf(Procan)) -manpage(socat)(1)(Oct 2010)()() +manpage(socat)(1)(Dec 2011)()() whenhtml( label(CONTENTS) @@ -500,6 +500,7 @@ label(ADDRESS_OPENSSL_CONNECT)dit(bf(tt(OPENSSL::))) link(capath)(OPTION_OPENSSL_CAPATH), link(certificate)(OPTION_OPENSSL_CERTIFICATE), link(key)(OPTION_OPENSSL_KEY), + link(compress)(OPTION_OPENSSL_COMPRESS), link(bind)(OPTION_BIND), link(pf)(OPTION_PROTOCOL_FAMILY), link(connect-timeout)(OPTION_CONNECT_TIMEOUT), @@ -527,6 +528,7 @@ label(ADDRESS_OPENSSL_LISTEN)dit(bf(tt(OPENSSL-LISTEN:))) link(capath)(OPTION_OPENSSL_CAPATH), link(certificate)(OPTION_OPENSSL_CERTIFICATE), link(key)(OPTION_OPENSSL_KEY), + link(compress)(OPTION_OPENSSL_COMPRESS), link(fork)(OPTION_FORK), link(bind)(OPTION_BIND), link(range)(OPTION_RANGE), @@ -536,7 +538,7 @@ label(ADDRESS_OPENSSL_LISTEN)dit(bf(tt(OPENSSL-LISTEN:))) link(retry)(OPTION_RETRY)nl() See also: link(OPENSSL)(ADDRESS_OPENSSL_CONNECT), - link(TCP)(ADDRESS_TCP_CONNECT) + link(TCP-LISTEN)(ADDRESS_TCP_LISTEN) label(ADDRESS_NAMED_PIPE)dit(bf(tt(PIPE:))) If link()(TYPE_FILENAME) already exists, it is opened. 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 initial value. openssl is then feeded with output from random\() calls.nl() 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))) 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 @@ -2672,6 +2668,12 @@ label(OPTION_OPENSSL_COMPRESS)dit(bf(tt(compress))) compression-related settings. NOTE: Requires OpenSSL 0.9.8 or higher and disabling compression with 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() startdit()enddit()nl() @@ -3480,7 +3482,7 @@ standard specifications available on the Internet for free. label(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) diff --git a/socat.spec b/socat.spec index 9a4a1c0..4215362 100644 --- a/socat.spec +++ b/socat.spec @@ -1,6 +1,6 @@ %define majorver 1.7 -%define minorver 1.2 +%define minorver 2.0 Summary: socat - multipurpose relay Name: socat diff --git a/socat_buildscript_for_android.sh b/socat_buildscript_for_android.sh old mode 100644 new mode 100755