diff --git a/CHANGES b/CHANGES index 3d06abe..39cd3ee 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ +####################### V 1.7.1.2: + corrections: user-late and group-late, when applied to a pty, affected the system device /dev/ptmx instead of the pty (thanks to Matthew Cloke for diff --git a/README b/README index 5b8aeff..bd89abd 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.1 + cd socat-1.7.1.2 ./configure make su diff --git a/VERSION b/VERSION index 4fdc80b..c41d110 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -"1.7.1.1+64bit+userlate+reneg+sockshtons+subsigchld+sockaddrll" +"1.7.1.2" diff --git a/doc/socat.yo b/doc/socat.yo index e6466dc..4b22bed 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)(May 2009)()() +manpage(socat)(1)(Jan 2010)()() whenhtml( label(CONTENTS) diff --git a/socat.spec b/socat.spec index 37ff655..9a4a1c0 100644 --- a/socat.spec +++ b/socat.spec @@ -1,6 +1,6 @@ %define majorver 1.7 -%define minorver 1.1 +%define minorver 1.2 Summary: socat - multipurpose relay Name: socat diff --git a/test.sh b/test.sh index fba88ab..d15d504 100755 --- a/test.sh +++ b/test.sh @@ -10076,7 +10076,17 @@ case "$TESTS" in TEST="$NAME: OpenSSL connections survives renogotiation" # connect with s_client to socat ssl-l; force a renog, then transfer data. When # data is passed the test succeeded -if ! eval $NUMCOND; then :; else +if ! eval $NUMCOND; then :; +elif ! testaddrs openssl >/dev/null; then + $PRINTF "test $F_n $TEST... ${YELLOW}OPENSSL not available${NORMAL}\n" $N + numCANT=$((numCANT+1)) +elif ! type openssl >/dev/null 2>&1; then + $PRINTF "test $F_n $TEST... ${YELLOW}openssl executable not available${NORMAL}\n" $N + numCANT=$((numCANT+1)) +elif ! testaddrs tcp ip4 >/dev/null || ! runsip4 >/dev/null; then + $PRINTF "test $F_n $TEST... ${YELLOW}TCP/IPv4 not available${NORMAL}\n" $N + numCANT=$((numCANT+1)) +else tf="$td/test$N.stdout" te="$td/test$N.stderr" tdiff="$td/test$N.diff" @@ -10118,7 +10128,17 @@ TEST="$NAME: OpenSSL connections do not block after renogotiation" # connect with s_client to socat ssl-l; force a renog, then transfer data from # socat to the peer. When data is passed this means that the former ssl read no # longer blocks and the test succeeds -if ! eval $NUMCOND; then :; else +if ! eval $NUMCOND; then :; +elif ! testaddrs openssl >/dev/null; then + $PRINTF "test $F_n $TEST... ${YELLOW}OPENSSL not available${NORMAL}\n" $N + numCANT=$((numCANT+1)) +elif ! type openssl >/dev/null 2>&1; then + $PRINTF "test $F_n $TEST... ${YELLOW}openssl executable not available${NORMAL}\n" $N + numCANT=$((numCANT+1)) +elif ! testaddrs tcp ip4 >/dev/null || ! runsip4 >/dev/null; then + $PRINTF "test $F_n $TEST... ${YELLOW}TCP/IPv4 not available${NORMAL}\n" $N + numCANT=$((numCANT+1)) +else tf="$td/test$N.stdout" te="$td/test$N.stderr" tdiff="$td/test$N.diff"