Removed obsolete xio.help and obsolete parts of test.sh

This commit is contained in:
Gerhard Rieger 2023-06-23 20:02:24 +02:00
parent 3e282ee7a0
commit 522e82351f
9 changed files with 10 additions and 6161 deletions

View file

@ -41,6 +41,12 @@ Coding:
Renamed xioopts_t to xioparms_t to avoid confusion with xioopts module. Renamed xioopts_t to xioparms_t to avoid confusion with xioopts module.
Testing:
Removed obselete parts from test.sh
Documentation:
Removed obselete file doc/xio.help
####################### V 1.7.4.5 (not released): ####################### V 1.7.4.5 (not released):
Corrections: Corrections:

View file

@ -78,7 +78,7 @@ The entries must be embedded in an IF_... macro of their group for conditional
compiling. compiling.
* For options using some predefined action (see OFUNC above), this might be * For options using some predefined action (see OFUNC above), this might be
enough - test the option and document it in xio.help! enough - test the option and document it in doc/socat.yo!
For OFUNC_SPEC, it might suffice to add another "case" to the OFUNC_SPEC branch For OFUNC_SPEC, it might suffice to add another "case" to the OFUNC_SPEC branch
in applyopts() in xioopts.c. If you need more special handling, you should try in applyopts() in xioopts.c. If you need more special handling, you should try
to understand the address specific functions and add your code there. to understand the address specific functions and add your code there.

1
FILES
View file

@ -24,7 +24,6 @@ compilation
* socat.1: man page of socat * socat.1: man page of socat
* socat.html: html version of man page * socat.html: html version of man page
* xio.help: reference manual of the address definitions (xioopen function)
* daemon.sh: example shell script for running socat as TCP relay daemon * daemon.sh: example shell script for running socat as TCP relay daemon
* ftp.sh: example shell based ftp client, using socat for transport * ftp.sh: example shell based ftp client, using socat for transport

View file

@ -73,7 +73,7 @@ HFILES = sycls.h sslcls.h error.h dalan.h procan.h filan.h hostan.h sysincludes.
xio-ascii.h xiolockfile.h xio-tcpwrap.h xio-fs.h xio-tun.h xio-ascii.h xiolockfile.h xio-tcpwrap.h xio-fs.h xio-tun.h
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 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 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 \
@ -127,8 +127,6 @@ libxio.a: $(XIOOBJS) $(UTLOBJS)
$(AR) r $@ $(XIOOBJS) $(UTLOBJS) $(AR) r $@ $(XIOOBJS) $(UTLOBJS)
$(RANLIB) $@ $(RANLIB) $@
doc: doc/xio.help
#
strip: progs strip: progs
strip $(PROGS) strip $(PROGS)

View file

@ -56,7 +56,7 @@ ACTIVE PHASE:
names (sorted strictly ASCII for binary search) names (sorted strictly ASCII for binary search)
. filan.c: add the option to the appropriate array (sockopts, ipopts, . filan.c: add the option to the appropriate array (sockopts, ipopts,
tcpopts) tcpopts)
. socat.html, socat.1, xio.help: write a short documentation and tell which . socat.html, socat.1: write a short documentation and tell which
platform and version implements this option platform and version implements this option
* problems may occur especially: * problems may occur especially:

3
README
View file

@ -239,9 +239,6 @@ These files reside in the doc subdirectory:
socat.1 is the man page, socat.html is the HTML based man page. It is actual, socat.1 is the man page, socat.html is the HTML based man page. It is actual,
but describes only the more useful options. but describes only the more useful options.
xio.help is an older, but more exact description in text form; with socat
version 1.6.0 it is outdated.
doc/socat-openssltunnel.html is a simple tutorial for a private SSL connection. doc/socat-openssltunnel.html is a simple tutorial for a private SSL connection.
doc/socat-multicast.html is a short tutorial for multicast and broadcast doc/socat-multicast.html is a short tutorial for multicast and broadcast
communications. communications.

File diff suppressed because it is too large Load diff

View file

@ -44,7 +44,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc README CHANGES EXAMPLES SECURITY doc/xio.help doc/socat.html FAQ BUGREPORTS %doc README CHANGES EXAMPLES SECURITY doc/socat.html FAQ BUGREPORTS
%doc COPYING COPYING.OpenSSL FILES PORTING DEVELOPMENT %doc COPYING COPYING.OpenSSL FILES PORTING DEVELOPMENT
%{_bindir}/socat %{_bindir}/socat
%{_bindir}/procan %{_bindir}/procan

1175
test.sh

File diff suppressed because it is too large Load diff