Version 1.7.4.5

This commit is contained in:
Gerhard Rieger 2023-06-13 16:19:52 +02:00
parent 33896a3f38
commit f0ca732bd9
5 changed files with 11 additions and 8 deletions

View file

@ -1,4 +1,6 @@
 
####################### V 1.7.4.5:
Corrections: Corrections:
On connect() failure and in some other situations Socat tries to get On connect() failure and in some other situations Socat tries to get
detailled information about the error with recvmsg(). Error return of detailled information about the error with recvmsg(). Error return of

2
README
View file

@ -75,7 +75,7 @@ install
Get the tarball and extract it: Get the tarball and extract it:
tar xzf socat.tar.gz tar xzf socat.tar.gz
cd socat-1.7.4.4 cd socat-1.7.4.5
./configure ./configure
make make
su su

View file

@ -1 +1 @@
"1.7.4.4+" "1.7.4.5"

View file

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

11
test.sh
View file

@ -58,7 +58,7 @@ NUMCOND=true
VERBOSE= VERBOSE=
DEBUG= DEBUG=
FOREIGN= FOREIGN=
EXPECT_FAIL= OPT_EXPECT_FAIL= EXPECT_FAIL=
while [ "$1" ]; do while [ "$1" ]; do
case "X$1" in case "X$1" in
X-h) usage; exit 0 ;; X-h) usage; exit 0 ;;
@ -72,7 +72,7 @@ while [ "$1" ]; do
X-N) shift; NUMCOND="test \$N -ge $1" ;; X-N) shift; NUMCOND="test \$N -ge $1" ;;
X-C) rm -f testcert*.conf testcert.dh testcli*.* testsrv*.* ;; X-C) rm -f testcert*.conf testcert.dh testcli*.* testsrv*.* ;;
X-foreign) FOREIGN=1 ;; # allow access to 3rd party Internet hosts X-foreign) FOREIGN=1 ;; # allow access to 3rd party Internet hosts
X-expect-fail|X--expect-fail) shift; EXPECT_FAIL="$1" ;; X-expect-fail|X--expect-fail) OPT_EXPECT_FAIL=1; shift; EXPECT_FAIL="$1" ;;
X-*) echo "Unknown option \"$1\"" >&2 X-*) echo "Unknown option \"$1\"" >&2
usage >&2 usage >&2
exit 1 ;; exit 1 ;;
@ -9260,7 +9260,7 @@ elif ! runsip6 >/dev/null; then
numCANT=$((numCANT+1)) numCANT=$((numCANT+1))
listCANT="$listCANT $N" listCANT="$listCANT $N"
elif ! echo |$SOCAT -u -t 0.1 - UDP6-SENDTO:[ff02::2]:12002 >/dev/null 2>&1; then elif ! echo |$SOCAT -u -t 0.1 - UDP6-SENDTO:[ff02::2]:12002 >/dev/null 2>&1; then
$PRINTF "test $F_n $TEST... ${YELLOW}IPv6 multicasting dos not work${NORMAL}\n" $N $PRINTF "test $F_n $TEST... ${YELLOW}IPv6 multicasting does not work${NORMAL}\n" $N
numCANT=$((numCANT+1)) numCANT=$((numCANT+1))
listCANT="$listCANT $N" listCANT="$listCANT $N"
else else
@ -16062,6 +16062,7 @@ esac
PORT=$((PORT+1)) PORT=$((PORT+1))
N=$((N+1)) N=$((N+1))
# end of common tests # end of common tests
################################################################################## ##################################################################################
@ -16149,14 +16150,14 @@ if [ "$numFAIL" -gt 0 ]; then
echo "FAILED: $listFAIL" echo "FAILED: $listFAIL"
fi fi
if [ -z "$EXPECT_FAIL" ]; then if [ -z "$OPT_EXPECT_FAIL" ]; then
[ "$numFAIL" -eq 0 ] [ "$numFAIL" -eq 0 ]
exit # with rc from above statement exit # with rc from above statement
fi fi
#set -vx #set -vx
if [ "$EXPECT_FAIL" ]; then if [ "$OPT_EXPECT_FAIL" ]; then
diff <(set -- $(echo "$EXPECT_FAIL" |tr ',' ' '); while [ "$1" ]; do echo "$1"; shift; done) "$td/failed.lst" >"$td/failed.diff" diff <(set -- $(echo "$EXPECT_FAIL" |tr ',' ' '); while [ "$1" ]; do echo "$1"; shift; done) "$td/failed.lst" >"$td/failed.diff"
ln -sf "$td/failed.diff" . ln -sf "$td/failed.diff" .
#grep "^" #grep "^"