bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-06-19 07:16:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for old Scientific/RHEL

Browse source
This commit is contained in:
Gerhard Rieger 2025-01-24 17:28:07 +01:00
parent 19d488a14f
commit 2439276651
4 changed files with 23 additions and 24 deletions

2
CHANGES
View file

@ -74,6 +74,8 @@ Porting:
Fixes for old Debian Fixes for old Debian
Fixes for old Scientific/RHEL
Testing: Testing:
test.sh produces file results.txt with columns of test numbers, names, test.sh produces file results.txt with columns of test numbers, names,
and results. and results.

29
configure.ac
View file

@ -659,23 +659,16 @@ if test -n "$WITH_OPENSSL"; then
AC_CACHE_VAL(sc_cv_have_openssl_ssl_h, AC_CACHE_VAL(sc_cv_have_openssl_ssl_h,
[AC_TRY_COMPILE([#include <openssl/ssl.h>],[;], [AC_TRY_COMPILE([#include <openssl/ssl.h>],[;],
[sc_cv_have_openssl_ssl_h=yes; OPENSSL_BASE=""; ], [sc_cv_have_openssl_ssl_h=yes; OPENSSL_BASE=""; ],
[sc_cv_have_openssl_ssl_h=no [
if test "$OPENSSL_BASE"; then # Another attempt to compile with OPENSSL_NO_KRB5
Ds="$OPENSSL_BASE" AC_MSG_NOTICE(trying with -DOPENSSL_NO_KRB5)
else CFLAGS_ORIG="$CFLAGS"
Ds="/sw /usr/local /opt/freeware /usr/sfw /usr/local/ssl" CFLAGS="$CFLAGS -DOPENSSL_NO_KRB5"
fi AC_TRY_COMPILE([#include <openssl/ssl.h>],[;],
for D in $Ds; do [sc_cv_have_openssl_ssl_h=yes],
I="$D/include" [sc_cv_have_openssl_ssl_h=no
i="$I/openssl/ssl.h" CFLAGS="$CFLAGS_ORIG"])
if test -r "$i"; then ])
#V_INCL="$V_INCL -I$I"
CPPFLAGS="$CPPFLAGS -I$I"
AC_MSG_NOTICE(found $i)
sc_cv_have_openssl_ssl_h=yes; OPENSSL_BASE="$D"
break;
fi
done])
]) ])
if test "$sc_cv_have_openssl_ssl_h" = "yes"; then if test "$sc_cv_have_openssl_ssl_h" = "yes"; then
AC_DEFINE(HAVE_OPENSSL_SSL_H) AC_DEFINE(HAVE_OPENSSL_SSL_H)
@ -2310,7 +2303,7 @@ int allow_severity,deny_severity;],[hosts_access(0)],
AC_TRY_LINK([#include <sys/types.h> AC_TRY_LINK([#include <sys/types.h>
#include <tcpd.h> #include <tcpd.h>
int allow_severity,deny_severity;],[hosts_access(0)], int allow_severity,deny_severity;],[hosts_access(0)],
[sc_cv_have_libwrap='yes'], [sc_cv_have_libwrap='yes'],
[sc_cv_have_libwrap='no']) [sc_cv_have_libwrap='no'])
] ]
) )

4
test.sh
View file

@ -851,7 +851,7 @@ testod () {
# bash before version 3 aborts scripts that contain unquoted '=~' # bash before version 3 aborts scripts that contain unquoted '=~'
# Therefore we create a shell script and quotedly fill it with '=~' for newer # Therefore we create a shell script and quotedly fill it with '=~' for newer
# bashes # bashes [regexp regular expressions]
mkdir -p $td/bin mkdir -p $td/bin
rm -f $td/bin/re_match rm -f $td/bin/re_match
if [ "${BASH_VERSION%%[.]*}" -le 2 ]; then if [ "${BASH_VERSION%%[.]*}" -le 2 ]; then
@ -1886,7 +1886,7 @@ waitudp6port () {
fi ;; fi ;;
FreeBSD) l=$(netstat -an |$GREP_E '^udp(6|46) .*[0-9*]\.'$port' .* \*\.\*') ;; FreeBSD) l=$(netstat -an |$GREP_E '^udp(6|46) .*[0-9*]\.'$port' .* \*\.\*') ;;
NetBSD) l=$(netstat -an |grep '^udp6 .* \*\.'$port' [ ]* \*\.\*') ;; NetBSD) l=$(netstat -an |grep '^udp6 .* \*\.'$port' [ ]* \*\.\*') ;;
OpenBSD) l=$(netstat -an |grep '^udp6 .*[0-9*]\.'$port' [ ]* \*\.\*') ;; OpenBSD) l=$(netstat -an |grep '^udp6 .*[0-9*]\.'$port' [ ]* \*\.\*') ;;
Darwin) l=$(netstat -an |$GREP_E '^udp4?6 +[0-9]+ +[0-9]+ +[0-9a-z:%*]+\.'$port' +[0-9a-z:%*.]+') ;; Darwin) l=$(netstat -an |$GREP_E '^udp4?6 +[0-9]+ +[0-9]+ +[0-9a-z:%*]+\.'$port' +[0-9a-z:%*.]+') ;;
AIX) l=$(netstat -an |grep '^udp[6 ] 0 0 .*[*0-9]\.'$port' .* \*\.\*[ ]*$') ;; AIX) l=$(netstat -an |grep '^udp[6 ] 0 0 .*[*0-9]\.'$port' .* \*\.\*[ ]*$') ;;
SunOS) l=$(netstat -an -f inet6 -P udp |grep '.*[1-9*]\.'$port' [ ]*Idle') ;; SunOS) l=$(netstat -an -f inet6 -P udp |grep '.*[1-9*]\.'$port' [ ]*Idle') ;;

12
xio-ip.c
View file

@ -902,16 +902,20 @@ int xiolog_ancillary_ip(
'\0', '\0',
inet4addr_info(ntohl(pktinfo->ipi_addr.s_addr), inet4addr_info(ntohl(pktinfo->ipi_addr.s_addr),
scratch3, sizeof(scratch3))); scratch3, sizeof(scratch3)));
#if HAVE_PKTINFO_IPI_SPEC_DST
Notice3("Ancillary message: interface \"%s\", locaddr=%s, dstaddr=%s", Notice3("Ancillary message: interface \"%s\", locaddr=%s, dstaddr=%s",
xiogetifname(pktinfo->ipi_ifindex, scratch1, -1), xiogetifname(pktinfo->ipi_ifindex, scratch1, -1),
#if HAVE_PKTINFO_IPI_SPEC_DST
inet4addr_info(ntohl(pktinfo->ipi_spec_dst.s_addr), inet4addr_info(ntohl(pktinfo->ipi_spec_dst.s_addr),
scratch2, sizeof(scratch2)), scratch2, sizeof(scratch2)),
#else
"",
#endif
inet4addr_info(ntohl(pktinfo->ipi_addr.s_addr), inet4addr_info(ntohl(pktinfo->ipi_addr.s_addr),
scratch3, sizeof(scratch3))); scratch3, sizeof(scratch3)));
#else
Notice3("Ancillary message: interface \"%s\", locaddr=%s, dstaddr=%s",
xiogetifname(pktinfo->ipi_ifindex, scratch1, -1),
"",
inet4addr_info(ntohl(pktinfo->ipi_addr.s_addr),
scratch3, sizeof(scratch3)));
#endif
} }
return STAT_OK; return STAT_OK;
#endif /* defined(IP_PKTINFO) && HAVE_STRUCT_IN_PKTINFO */ #endif /* defined(IP_PKTINFO) && HAVE_STRUCT_IN_PKTINFO */